Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f40ccc2 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "Snap for 5622519 from e035e3c3 to... 

Merge "Snap for 5622519 from e035e3c3 to pi-platform-release am: 8c6c1e2b" into pie-gsi
parents 3efa61f8 55f5ab77

java/res/values-de/strings-emoji-descriptions.xml

+3 −3
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ 
    <string name="spoken_emoji_1F194" msgid="4903128609556175887">"Quadrat mit \"ID\""</string>

    <string name="spoken_emoji_1F195" msgid="1433142500411060924">"Quadrat mit \"New\""</string>

    <string name="spoken_emoji_1F196" msgid="8825160701159634202">"Quadrat mit \"NG\" (No Good)"</string>

    <string name="spoken_emoji_1F197" msgid="7841079241554176535">"Quadrat mit \"OK\""</string>

    <string name="spoken_emoji_1F197" msgid="7841079241554176535">"Quadrat mit \"Ok\""</string>

    <string name="spoken_emoji_1F198" msgid="7020298909426960622">"Quadrat mit \"SOS\""</string>

    <string name="spoken_emoji_1F199" msgid="5971252667136235630">"Quadrat mit \"UP\" und Ausrufezeichen"</string>

    <string name="spoken_emoji_1F19A" msgid="4557270135899843959">"Quadrat mit \"VS\" (Versus)"</string>
@@ -651,7 +651,7 @@ 
    <string name="spoken_emoji_1F449" msgid="4764447975177805991">"Handrückseite mit nach rechts deutendem Zeigefinger"</string>

    <string name="spoken_emoji_1F44A" msgid="7197417095486424841">"Faust"</string>

    <string name="spoken_emoji_1F44B" msgid="1975968945250833117">"Winkende Hand"</string>

    <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Handzeichen für \"OK\""</string>

    <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Handzeichen für \"Ok\""</string>

    <string name="spoken_emoji_1F44D" msgid="6182553970602667815">"Daumen hoch"</string>

    <string name="spoken_emoji_1F44E" msgid="8030851867365111809">"Daumen runter"</string>

    <string name="spoken_emoji_1F44F" msgid="5148753662268213389">"Klatschende Hände"</string>
@@ -1082,7 +1082,7 @@ 
    <!-- no translation found for spoken_emoji_1F644 (446284817942609022) -->

    <skip />

    <string name="spoken_emoji_1F645" msgid="5202090629227587076">"Gesicht mit Nicht in Ordnung-Geste"</string>

    <string name="spoken_emoji_1F646" msgid="6734425134415138134">"Gesicht mit OK-Geste"</string>

    <string name="spoken_emoji_1F646" msgid="6734425134415138134">"Gesicht mit Ok-Geste"</string>

    <string name="spoken_emoji_1F647" msgid="1090285518444205483">"Sich tief verneigende Person"</string>

    <string name="spoken_emoji_1F648" msgid="8978535230610522356">"Nichts-Sehen-Affe"</string>

    <string name="spoken_emoji_1F649" msgid="8486145279809495102">"Nichts-Hören-Affe"</string>

java/res/values-de/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
    <string name="switch_accounts" msgid="3321216593719006162">"Konto wechseln"</string>

    <string name="no_accounts_selected" msgid="2073821619103904330">"Keine Konten ausgewählt"</string>

    <string name="account_selected" msgid="2846876462199625974">"Momentan wird <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> verwendet."</string>

    <string name="account_select_ok" msgid="9141195141763227797">"OK"</string>

    <string name="account_select_ok" msgid="9141195141763227797">"Ok"</string>

    <string name="account_select_cancel" msgid="5181012062618504340">"Abbrechen"</string>

    <string name="account_select_sign_out" msgid="3299651159390187933">"Abmelden"</string>

    <string name="account_select_title" msgid="6279711684772922649">"Zu verwendendes Konto auswählen"</string>
@@ -195,7 +195,7 @@ 
    <string name="user_dict_settings_add_screen_title" msgid="5818914331629278758">"Wortgruppe"</string>

    <string name="user_dict_settings_add_dialog_more_options" msgid="5671682004887093112">"Weitere Optionen"</string>

    <string name="user_dict_settings_add_dialog_less_options" msgid="2716586567241724126">"Weniger Optionen"</string>

    <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"OK"</string>

    <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"Ok"</string>

    <string name="user_dict_settings_add_word_option_name" msgid="6665558053408962865">"Wort:"</string>

    <string name="user_dict_settings_add_shortcut_option_name" msgid="3094731590655523777">"Tastaturkürzel:"</string>

    <string name="user_dict_settings_add_locale_option_name" msgid="4738643440987277705">"Sprache:"</string>

java/res/values-en-rAU/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
    <string name="clear_sync_data_ok" msgid="613104067705915132">"Delete"</string>

    <string name="cloud_sync_cancel" msgid="5877481252150919037">"Cancel"</string>

    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Your personal dictionary will be synced and backed up to Google servers. The statistical information of word frequency may be collected to help improve our products. The collection and usage of all the information will be compliant with "<a href="https://www.google.com/policies/privacy">"Google\'s Privacy Policy"</a>"."</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Please add a Google account to this device to enable this feature"</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Please add a Google Account to this device to enable this feature"</string>

    <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Sync is not available for devices with Google Apps for Business accounts"</string>

    <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Switch to other input methods"</string>

    <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Language switch key also covers other input methods"</string>

java/res/values-en-rCA/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
    <string name="clear_sync_data_ok" msgid="613104067705915132">"Delete"</string>

    <string name="cloud_sync_cancel" msgid="5877481252150919037">"Cancel"</string>

    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Your personal dictionary will be synced and backed up to Google servers. The statistical information of word frequency may be collected to help improve our products. The collection and usage of all the information will be compliant with "<a href="https://www.google.com/policies/privacy">"Google\'s Privacy Policy"</a>"."</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Please add a Google account to this device to enable this feature"</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Please add a Google Account to this device to enable this feature"</string>

    <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Sync is not available for devices with Google Apps for Business accounts"</string>

    <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Switch to other input methods"</string>

    <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Language switch key also covers other input methods"</string>

java/res/values-en-rGB/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
    <string name="clear_sync_data_ok" msgid="613104067705915132">"Delete"</string>

    <string name="cloud_sync_cancel" msgid="5877481252150919037">"Cancel"</string>

    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Your personal dictionary will be synced and backed up to Google servers. The statistical information of word frequency may be collected to help improve our products. The collection and usage of all the information will be compliant with "<a href="https://www.google.com/policies/privacy">"Google\'s Privacy Policy"</a>"."</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Please add a Google account to this device to enable this feature"</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Please add a Google Account to this device to enable this feature"</string>

    <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Sync is not available for devices with Google Apps for Business accounts"</string>

    <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Switch to other input methods"</string>

    <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Language switch key also covers other input methods"</string>