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

Commit f6f0971d authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-6.0.1_r22' of... 

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/inputmethods/LatinIME into cm-13.0

Android 6.0.1 release 22
parents bdf269e6 f6d1c5f3

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

+916 −0

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!-- 

/*

**

** Copyright 2014, The Android Open Source Project

** Copyright 2015, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.
@@ -71,6 +71,12 @@ 
    <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Natuur"</string>

    <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Plekke"</string>

    <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simbole"</string>

    <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Vlae"</string>

    <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Emosiekone en mense"</string>

    <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Diere en natuur"</string>

    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Kos en drinkgoed"</string>

    <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Reis en plekke"</string>

    <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Aktiwiteit"</string>

    <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emosiekone"</string>

    <string name="spoken_description_upper_case" msgid="4904835255229433916">"Hoofletter-<xliff:g id="LOWER_LETTER">%s</xliff:g>"</string>

    <string name="spoken_letter_0049" msgid="4743162182646977944">"Hoofletter-I"</string>

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

+916 −0

File changed.

Preview size limit exceeded, changes collapsed.

java/res/values-am/strings-talkback-descriptions.xml

+7 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!-- 

/*

**

** Copyright 2014, The Android Open Source Project

** Copyright 2015, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.
@@ -71,6 +71,12 @@ 
    <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ተፈጥሮ"</string>

    <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ቦታዎች"</string>

    <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"ምልክቶች"</string>

    <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"ጠቋሚዎች"</string>

    <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"ሳቂታዎች እና ሰዎች"</string>

    <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"እንስሳት እና ተፈጥሮ"</string>

    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"ምግብ እና መጠጥ"</string>

    <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"ጉዞ እና ቦታዎች"</string>

    <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"እንቅስቃሴ"</string>

    <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"ስሜት ገላጭ አዶዎች"</string>

    <string name="spoken_description_upper_case" msgid="4904835255229433916">"አቢይ ሆሄ <xliff:g id="LOWER_LETTER">%s</xliff:g>"</string>

    <string name="spoken_letter_0049" msgid="4743162182646977944">"አቢይ ሆሄ አይ"</string>

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

+916 −0

File changed.

Preview size limit exceeded, changes collapsed.