diff options
| author |   android-build-team Robot <android-build-team-robot@google.com> | 2019-08-20 02:43:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-20 02:43:55 +0000 |
| commit | da0d47e3c8a457818c309d76f495e72d48c1f77c (patch) | |
| tree | 25fb74be8d8555ee5d0c6d9d5078f5907617a96c /java | |
| parent | 6587b970ffd15d37ddcef3f932e42f06c255f88d (diff) | |
| parent | 614c5b4d882f656d2462e2701c598b44db03e9cb (diff) | |
| download | latinime-da0d47e3c8a457818c309d76f495e72d48c1f77c.tar.gz latinime-da0d47e3c8a457818c309d76f495e72d48c1f77c.tar.xz latinime-da0d47e3c8a457818c309d76f495e72d48c1f77c.zip | |
Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release
Change-Id: Ide516e25c98341c3da3c554bbcea7d7f54e795cc
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-eu/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/values-gu/strings-emoji-descriptions.xml | 2 | ||||
| -rw-r--r-- | java/res/values-hi/strings-emoji-descriptions.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/java/res/values-eu/strings.xml b/java/res/values-eu/strings.xml index 3cfc47a1e..4e47110fa 100644 --- a/java/res/values-eu/strings.xml +++ b/java/res/values-eu/strings.xml @@ -43,7 +43,7 @@ <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"Datuak hodeitik ezabatuko dira. Ziur hori egin nahi duzula?"</string> <string name="clear_sync_data_ok" msgid="613104067705915132">"Ezabatu"</string> <string name="cloud_sync_cancel" msgid="5877481252150919037">"Utzi"</string> - <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Hiztegi pertsonalizatua sinkronizatu egingo da eta Google zerbitzarietan gordeko da babeskopia gisa. Hitzak erabiltzeko maiztasunari buruzko estatistikak bil daitezke produktuak hobetzen laguntzeko. Informazioaren bilketak eta erabilerak "<a href="https://www.google.com/policies/privacy">"Google Pribatutasun-gidalerroak"</a>" gordeko ditu une oro."</string> + <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Hiztegi pertsonalizatua sinkronizatu egingo da eta Google-ren zerbitzarietan gordeko da babeskopia gisa. Hitzak erabiltzeko maiztasunari buruzko estatistikak bil daitezke produktuak hobetzen laguntzeko. Informazioaren bilketak eta erabilerak "<a href="https://www.google.com/policies/privacy">"Google-ren Pribatutasun-gidalerroak"</a>" gordeko ditu une oro."</string> <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Eginbidea gaitzeko, gehitu Google kontua gailuan"</string> <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Sinkronizazioa ez dago erabilgarri Google Apps for Business kontuak dituzten gailuetan"</string> <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Aldatu idazketa-metodoa"</string> diff --git a/java/res/values-gu/strings-emoji-descriptions.xml b/java/res/values-gu/strings-emoji-descriptions.xml index a5b2611ac..ba1c54a86 100644 --- a/java/res/values-gu/strings-emoji-descriptions.xml +++ b/java/res/values-gu/strings-emoji-descriptions.xml @@ -588,7 +588,7 @@ <string name="spoken_emoji_1F40C" msgid="2704006052881702675">"ગોકળગાય"</string> <string name="spoken_emoji_1F40D" msgid="8648186663643157522">"સાપ"</string> <string name="spoken_emoji_1F40E" msgid="7219137467573327268">"ઘોડો"</string> - <string name="spoken_emoji_1F40F" msgid="7834336676729040395">"ઘેટો"</string> + <string name="spoken_emoji_1F40F" msgid="7834336676729040395">"RAM"</string> <string name="spoken_emoji_1F410" msgid="8686765722255775031">"બકરી"</string> <string name="spoken_emoji_1F411" msgid="3585715397876383525">"ઘેટું"</string> <string name="spoken_emoji_1F412" msgid="4924794582980077838">"વાનર"</string> diff --git a/java/res/values-hi/strings-emoji-descriptions.xml b/java/res/values-hi/strings-emoji-descriptions.xml index 1ccf9ac6d..53a367fef 100644 --- a/java/res/values-hi/strings-emoji-descriptions.xml +++ b/java/res/values-hi/strings-emoji-descriptions.xml @@ -588,7 +588,7 @@ <string name="spoken_emoji_1F40C" msgid="2704006052881702675">"घोंघा"</string> <string name="spoken_emoji_1F40D" msgid="8648186663643157522">"सांप"</string> <string name="spoken_emoji_1F40E" msgid="7219137467573327268">"घोड़ा"</string> - <string name="spoken_emoji_1F40F" msgid="7834336676729040395">"राम"</string> + <string name="spoken_emoji_1F40F" msgid="7834336676729040395">"RAM"</string> <string name="spoken_emoji_1F410" msgid="8686765722255775031">"बकरी"</string> <string name="spoken_emoji_1F411" msgid="3585715397876383525">"भेड़"</string> <string name="spoken_emoji_1F412" msgid="4924794582980077838">"बंदर"</string> |