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

Commit f630b9d1 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE: Merge Oreo MR1 into master 

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ib1ef5bebfccf8eab11bb080c0e13cdf4cff9e79e
parents a3addf11 f99e090a

java/AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -35,6 +35,23 @@ 
    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />



    <!-- A signature-protected permission to ask AOSP Keyboard to close the software keyboard.

         To use this, add the following line into calling application's AndroidManifest.xml

         <pre>

         {@code

         <uses-permission android:name="com.android.inputmethod.latin.HIDE_SOFT_INPUT"/>

         }

         </pre>

         then call {@link android.content.Context#sendBroadcast(Intent)} as follows:

         <pre>

         {@code

         sendBroadcast(new Intent("com.android.inputmethod.latin.HIDE_SOFT_INPUT")

                 .setPackage("com.android.inputmethod.latin"));

         }

         </pre> -->

    <permission android:name="com.android.inputmethod.latin.HIDE_SOFT_INPUT"

                android:protectionLevel="signature" />



    <application android:label="@string/english_ime_name"

            android:icon="@drawable/ic_launcher_keyboard"

            android:supportsRtl="true"

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
    <string name="spoken_emoji_25FD" msgid="7673439755069217479">"মাঝারি আকারের ছোট সাদা চৌকো"</string>

    <string name="spoken_emoji_25FE" msgid="6782214109919768923">"মাঝারি আকারের ছোট কালো চৌকো"</string>

    <string name="spoken_emoji_2600" msgid="2272722634618990413">"রশ্মি সহ কালো সূর্য"</string>

    <string name="spoken_emoji_2601" msgid="6205136889311537150">"মেঘ"</string>

    <string name="spoken_emoji_2601" msgid="6205136889311537150">"ক্লাউড"</string>

    <!-- no translation found for spoken_emoji_2602 (6293136501817877234) -->

    <skip />

    <!-- no translation found for spoken_emoji_2603 (7285313121103197207) -->

java/res/values-bs/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
    <string name="account_selected" msgid="2846876462199625974">"Trenutno koristite račun <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>

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

    <string name="account_select_cancel" msgid="5181012062618504340">"Otkaži"</string>

    <string name="account_select_sign_out" msgid="3299651159390187933">"Odjavi me"</string>

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

    <string name="account_select_title" msgid="6279711684772922649">"Odaberite račun koji ćete koristiti"</string>

    <string name="subtype_en_GB" msgid="88170601942311355">"engleski (UK)"</string>

    <string name="subtype_en_US" msgid="6160452336634534239">"engleski (SAD)"</string>
@@ -153,7 +153,7 @@ 
    <string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim odaberite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" kao vaš aktivni način unosa teksta."</string>

    <string name="setup_step2_action" msgid="1660330307159824337">"Zamijeni načine unosa"</string>

    <string name="setup_step3_title" msgid="3154757183631490281">"Odlično, sve je spremno!"</string>

    <string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete kucati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>

    <string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete upisivati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>

    <string name="setup_step3_action" msgid="600879797256942259">"Konfiguriraj dodatne jezike"</string>

    <string name="setup_finish_action" msgid="276559243409465389">"Završeno"</string>

    <string name="show_setup_wizard_icon" msgid="5008028590593710830">"Prikaži ikonu aplikacije"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ 
    <string name="spoken_emoji_1F3B0" msgid="7440244806527891956">"Txanpon-makina"</string>

    <string name="spoken_emoji_1F3B1" msgid="545544382391379234">"Billarra"</string>

    <string name="spoken_emoji_1F3B2" msgid="8302262034774787493">"Dadoa"</string>

    <string name="spoken_emoji_1F3B3" msgid="5180870610771027520">"Boloak"</string>

    <string name="spoken_emoji_1F3B3" msgid="5180870610771027520">"Bola-jokoa"</string>

    <string name="spoken_emoji_1F3B4" msgid="4723852033266071564">"Lore-joko japoniarren kartak"</string>

    <string name="spoken_emoji_1F3B5" msgid="1998470239850548554">"Musika-nota"</string>

    <string name="spoken_emoji_1F3B6" msgid="3827730457113941705">"Hainbat musika-nota"</string>

java/res/values-hi/strings-appname.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="english_ime_name" msgid="5940510615957428904">"Android कीबोर्ड (AOSP)"</string>

    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android स्पेलिंग जांचने वाली सेवा (AOSP)"</string>

    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android स्पेलिंग जाँचने वाली सेवा (AOSP)"</string>

    <string name="english_ime_settings" msgid="5760361067176802794">"Android कीबोर्ड सेटिंग (AOSP)"</string>

    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android स्पेलिंग जांचने वाली सेवा के लिए सेटिंग (AOSP)"</string>

    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android स्पेलिंग जाँचने वाली सेवा के लिए सेटिंग (AOSP)"</string>

</resources>