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

Commit 7a267166 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"

parents 149b9d4f 55f3303c

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

+1 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ 
    <string name="spoken_emoji_1F68E" msgid="6234042976027309654">"حافلة ترولي"</string>

    <string name="spoken_emoji_1F68F" msgid="5871099334672012107">"موقف حافلات"</string>

    <string name="spoken_emoji_1F690" msgid="8080964620200195262">"حافلة صغيرة"</string>

    <string name="spoken_emoji_1F691" msgid="999173032408730501">"سيارة إسعاف"</string>

    <string name="spoken_emoji_1F691" msgid="999173032408730501">"إسعاف"</string>

    <string name="spoken_emoji_1F692" msgid="1712863785341849487">"سيارة إطفاء"</string>

    <string name="spoken_emoji_1F693" msgid="7987109037389768934">"سيارة شرطة"</string>

    <string name="spoken_emoji_1F694" msgid="6061658916653884608">"سيارة شرطة عن قرب"</string>

java/res/values-es-rUS/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"Se eliminarán los datos sincronizados de la nube. ¿Estás seguro?"</string>

    <string name="clear_sync_data_ok" msgid="613104067705915132">"Eliminar"</string>

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

    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Se creará una copia de tu diccionario personal y se sincronizará con los servidores de Google. Es posible que se recopile información estadística de la frecuencia de palabras para mejorar nuestros productos. La recopilación y el uso de toda la información se realizará conforme a la "<a href="https://www.google.com/policies/privacy">"Política de privacidad de Google"</a>"."</string>

    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Se creará una copia de tu diccionario personal y se sincronizará con los servidores de Google. Es posible que se recopile información estadística de la frecuencia de palabras para mejorar nuestros productos. La recopilación y el uso de toda la información se realizará conforme a la "<a href="https://www.google.com/policies/privacy">"Política de Privacidad de Google"</a>"."</string>

    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Para habilitar esta función, agrega una cuenta de Google."</string>

    <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Sinc. no disponible en dispositivos con cuentas de Google Apps for Business"</string>

    <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Otros métodos de entrada"</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -677,8 +677,8 @@ 
    <string name="spoken_emoji_1F463" msgid="5850772903593010699">"Jejak kaki"</string>

    <string name="spoken_emoji_1F464" msgid="1228335905487734913">"Siluet patung dada"</string>

    <string name="spoken_emoji_1F465" msgid="4461307702499679879">"Siluet patung dada"</string>

    <string name="spoken_emoji_1F466" msgid="1938873085514108889">"Anak laki-laki"</string>

    <string name="spoken_emoji_1F467" msgid="8237080594860144998">"Anak perempuan"</string>

    <string name="spoken_emoji_1F466" msgid="1938873085514108889">"Laki-laki"</string>

    <string name="spoken_emoji_1F467" msgid="8237080594860144998">"Perempuan"</string>

    <string name="spoken_emoji_1F468" msgid="6081300722526675382">"Pria"</string>

    <string name="spoken_emoji_1F469" msgid="1090140923076108158">"Wanita"</string>

    <string name="spoken_emoji_1F46A" msgid="5063570981942606595">"Keluarga"</string>

java/res/values-mr/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ 
    <string name="enable_split_keyboard" msgid="4177264923999493614">"विभाजित कीबोर्ड सुरू करा"</string>

    <string name="cloud_sync_title" msgid="8579271074443847055">"Google कीबोर्ड सिंक"</string>

    <string name="cloud_sync_summary" msgid="7684887161145650857">"सिंक चालू केले आहे"</string>

    <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"डिव्‍हाइसेस वरून आपला वैयक्तिक शब्दकोश संकालित करा"</string>

    <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"डिव्‍हाइसेस वरून तुमचा वैयक्तिक शब्दकोश संकालित करा"</string>

    <string name="sync_now_title" msgid="3088838136743277721">"आता सिंक करा"</string>

    <string name="clear_sync_data_title" msgid="8582001557037069154">"क्लाउड डेटा हटवा"</string>

    <string name="clear_sync_data_summary" msgid="993477139012576584">"Google वरून आपला संकालित केलेला डेटा हटविते"</string>

    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"आपला संकालित केलेला डेटा मेघवरून हटवला जाईल. आपल्‍याला खात्री आहे?"</string>

    <string name="clear_sync_data_summary" msgid="993477139012576584">"Google वरून तुमचा संकालित केलेला डेटा हटविते"</string>

    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"तुमचा संकालित केलेला डेटा मेघवरून हटवला जाईल. आपल्‍याला खात्री आहे?"</string>

    <string name="clear_sync_data_ok" msgid="613104067705915132">"हटवा"</string>

    <string name="cloud_sync_cancel" msgid="5877481252150919037">"रद्द करा"</string>

    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"तुमची वैयक्तिक डिरेक्टरी Google सर्व्हरवर सिंक केली जाईल आणि बॅकअप घेतला जाईल. आमचे उत्पादन सुधारित करण्यात मदत करण्यासाठी शब्दाच्या वारंवारतेची आकडेवारी माहिती गोळा केली जाऊ शकते. सर्व माहितीचे संकलन आणि वापर "<a href="https://www.google.com/policies/privacy">"Google चे गोपनीयता धोरण"</a>" शी सुसंगत असेल."</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ 
    <string name="spoken_emoji_1F522" msgid="8419130286280673347">"Invoersymbool voor cijfers"</string>

    <string name="spoken_emoji_1F523" msgid="3318053476401719421">"Invoersymbool voor symbolen"</string>

    <string name="spoken_emoji_1F524" msgid="1625073997522316331">"Invoersymbool voor Latijnse letters"</string>

    <string name="spoken_emoji_1F525" msgid="4083884189172963790">"Vuur"</string>

    <string name="spoken_emoji_1F525" msgid="4083884189172963790">"Brandweer"</string>

    <string name="spoken_emoji_1F526" msgid="2035494936742643580">"Zaklamp"</string>

    <string name="spoken_emoji_1F527" msgid="134257142354034271">"Moersleutel"</string>

    <string name="spoken_emoji_1F528" msgid="700627429570609375">"Hamer"</string>