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

Commit dded75c1 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

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
parents 5bb754f6 a1e4c855

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ 
    <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Banderes"</string>

    <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_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_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_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_eight_activity" msgid="4795281669042975993">"Activitat"</string>

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

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