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

Commit f2917b2a authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-5.1.0_r1' into HEAD 

Android 5.1.0 release 1
parents 24a04629 93a5c853

java/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


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

            android:icon="@drawable/ic_launcher_keyboard"

            android:killAfterRestore="false"

            android:supportsRtl="true"

            android:allowBackup="true">

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
    <string name="spoken_emoji_1F36A" msgid="2726271795913042295">"Koekie"</string>

    <string name="spoken_emoji_1F36B" msgid="6342163604299875931">"Staaf sjokolade"</string>

    <string name="spoken_emoji_1F36C" msgid="2168934753998218790">"Lekkergoed"</string>

    <string name="spoken_emoji_1F36D" msgid="3671507903799975792">"Suiglekker"</string>

    <string name="spoken_emoji_1F36D" msgid="3671507903799975792">"Lollipop"</string>

    <string name="spoken_emoji_1F36E" msgid="4630541402785165902">"Vla"</string>

    <string name="spoken_emoji_1F36F" msgid="5577915387425169439">"Heuningpot"</string>

    <string name="spoken_emoji_1F370" msgid="7243244547866114951">"Broskoek"</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
    <string name="spoken_emoji_1F36A" msgid="2726271795913042295">"كعكة"</string>

    <string name="spoken_emoji_1F36B" msgid="6342163604299875931">"بار شيكولاتة"</string>

    <string name="spoken_emoji_1F36C" msgid="2168934753998218790">"حلوى"</string>

    <string name="spoken_emoji_1F36D" msgid="3671507903799975792">"مصاصة"</string>

    <string name="spoken_emoji_1F36D" msgid="3671507903799975792">"Lollipop"</string>

    <string name="spoken_emoji_1F36E" msgid="4630541402785165902">"كاسترد"</string>

    <string name="spoken_emoji_1F36F" msgid="5577915387425169439">"جرة عسل"</string>

    <string name="spoken_emoji_1F370" msgid="7243244547866114951">"كعكة بسمن وسكر"</string>

java/res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
    <string name="voice_input_disabled_summary" msgid="8141750303464726129">"No hi ha cap mètode d\'introducció activat. Comprova la configuració d\'Idioma i introducció de text."</string>

    <string name="configure_input_method" msgid="373356270290742459">"Configura mètodes d\'entrada"</string>

    <string name="language_selection_title" msgid="3666971864764478269">"Idiomes"</string>

    <string name="help_and_feedback" msgid="5328219371839879161">"Ajuda i opinió"</string>

    <string name="help_and_feedback" msgid="5328219371839879161">"Ajuda i suggeriments"</string>

    <string name="select_language" msgid="5709487854987078367">"Idiomes"</string>

    <string name="hint_add_to_dictionary" msgid="573678656946085380">"Torna a tocar per desar"</string>

    <string name="hint_add_to_dictionary_without_word" msgid="3040385779511255101">"Toca aquí per desar."</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
    <string name="spoken_emoji_1F36A" msgid="2726271795913042295">"Sušenka"</string>

    <string name="spoken_emoji_1F36B" msgid="6342163604299875931">"Tabulka čokolády"</string>

    <string name="spoken_emoji_1F36C" msgid="2168934753998218790">"Bonbon"</string>

    <string name="spoken_emoji_1F36D" msgid="3671507903799975792">"Lízátko"</string>

    <string name="spoken_emoji_1F36D" msgid="3671507903799975792">"Lollipop"</string>

    <string name="spoken_emoji_1F36E" msgid="4630541402785165902">"Pudink"</string>

    <string name="spoken_emoji_1F36F" msgid="5577915387425169439">"Hrnek medu"</string>

    <string name="spoken_emoji_1F370" msgid="7243244547866114951">"Dort"</string>