summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <invisiblek@cyanogenmod.org>2016-12-05 20:36:37 -0600
committerDan Pasanen <invisiblek@cyanogenmod.org>2016-12-05 20:36:37 -0600
commitdded75c18f5dc9449eac12b28ec86f3418ca749c (patch)
tree76dd9b9ea386b8df52db973d55cae1fd8f2c79b8
parent5bb754f672b64a59a04aa52010f674c62647a6be (diff)
parenta1e4c8558983f894231ee0e5e872ed9fbb6781be (diff)
downloadandroid_packages_inputmethods_LatinIME-dded75c18f5dc9449eac12b28ec86f3418ca749c.tar.gz
android_packages_inputmethods_LatinIME-dded75c18f5dc9449eac12b28ec86f3418ca749c.tar.bz2
android_packages_inputmethods_LatinIME-dded75c18f5dc9449eac12b28ec86f3418ca749c.zip
Merge tag 'android-7.1.1_r4' into cm-14.1
Android 7.1.1 release 4 # gpg: Signature made Thu Dec 1 13:07:06 2016 CST # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
-rw-r--r--java/res/values-ca/strings-talkback-descriptions.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/res/values-ca/strings-talkback-descriptions.xml b/java/res/values-ca/strings-talkback-descriptions.xml
index 61c3ca037..0464601f4 100644
--- a/java/res/values-ca/strings-talkback-descriptions.xml
+++ b/java/res/values-ca/strings-talkback-descriptions.xml
@@ -74,7 +74,7 @@
<string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Banderes"</string>
<string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Somriures i persones"</string>
<string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Animals i naturalesa"</string>
- <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Alimentació i begudes"</string>
+ <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Menjar i beure"</string>
<string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Viatges i llocs"</string>
<string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Activitat"</string>
<string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticones"</string>