diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2023-03-14 02:48:53 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2023-03-14 02:48:53 +0200 |
| commit | 58e86508593eba7d58f0ecae5adc99769b897dae (patch) | |
| tree | f9fca5a795ab2deca1ae60257bcffdec2f095d2f | |
| parent | 35d6342df0dd6ffe05eb97313316b35113568984 (diff) | |
| parent | 1475fe9a7d4fb3026dfc68b3014a9ffcc3c26300 (diff) | |
Merge tag 'android-13.0.0_r35' into staging/lineage-20.0_merge-android-13.0.0_r35
Android 13.0.0 release 35
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jpwAKCRDorT+BmrEO
# eH7xAJ41bDgK+valbjRLMoDmdOJTZkkwaACePKRd7VxM5jsabKewwwR+z7P9yUU=
# =rYWQ
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar 13 19:55:51 2023 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1575 signatures in the past
# 16 months. Encrypted 4 messages in the past 14 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Bill Yi
# Via Android Build Coastguard Worker (5) and Bill Yi (1)
* tag 'android-13.0.0_r35':
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Change-Id: Ifac475a0b581baccee1fd44009f5541db86a37d0
| -rw-r--r-- | tools/recovery_l10n/res/values-en-rCA/strings.xml | 2 | ||||
| -rw-r--r-- | tools/recovery_l10n/res/values-eu/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/recovery_l10n/res/values-en-rCA/strings.xml b/tools/recovery_l10n/res/values-en-rCA/strings.xml index 6451e5b6..69be4bb0 100644 --- a/tools/recovery_l10n/res/values-en-rCA/strings.xml +++ b/tools/recovery_l10n/res/values-en-rCA/strings.xml @@ -9,6 +9,6 @@ <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Cannot load Android system. Your data may be corrupt. If you continue to get this message, you may need to perform a factory data reset and erase all user data stored on this device."</string> <string name="recovery_try_again" msgid="7168248750158873496">"Try again"</string> <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Factory data reset"</string> - <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Wipe all user data?\n\n THIS CANNOT BE UNDONE!"</string> + <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Wipe all user data?\n\n THIS CAN NOT BE UNDONE!"</string> <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancel"</string> </resources> diff --git a/tools/recovery_l10n/res/values-eu/strings.xml b/tools/recovery_l10n/res/values-eu/strings.xml index 005a0426..963101fa 100644 --- a/tools/recovery_l10n/res/values-eu/strings.xml +++ b/tools/recovery_l10n/res/values-eu/strings.xml @@ -9,6 +9,6 @@ <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Ezin da kargatu Android sistema. Zure datuak hondatuta egon daitezke. Mezu hau jasotzen jarraitzen baduzu, jatorrizko datuak berrezarri beharko dituzu eta gailuan gordetako erabiltzaile-datu guztiak ezabatu beharko dituzu."</string> <string name="recovery_try_again" msgid="7168248750158873496">"Saiatu berriro"</string> <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Berrezarri jatorrizko datuak"</string> - <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Erabiltzailearen datu guztiak xahutu nahi dituzu?\n\n EKINTZA HORI EZIN DA DESEGIN!"</string> + <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Erabiltzaile-datu guztiak xahutu nahi dituzu?\n\n EKINTZA HORI EZIN DA DESEGIN!"</string> <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Utzi"</string> </resources> |