diff options
| author |   Geoff Mendal <mendal@google.com> | 2016-02-02 15:48:11 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2016-02-02 15:48:11 +0000 |
| commit | 904a89c20bf86040a6fcae8f379c7a956eb61b98 (patch) | |
| tree | 2c91dcfdb089866be86653de205a97c2a6202dec /java | |
| parent | 89266e7eef1ea9cb11a0ef28f70de6dc712e8e91 (diff) | |
| parent | 4303801153ae8f586cbe067664305cd826de3b06 (diff) | |
| download | latinime-904a89c20bf86040a6fcae8f379c7a956eb61b98.tar.gz latinime-904a89c20bf86040a6fcae8f379c7a956eb61b98.tar.xz latinime-904a89c20bf86040a6fcae8f379c7a956eb61b98.zip | |
Merge branch 'mnc-dr2-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/inputmethods/LatinIME into mnc-dr2-dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-ca/strings-emoji-descriptions.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw/strings-emoji-descriptions.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/values-ca/strings-emoji-descriptions.xml b/java/res/values-ca/strings-emoji-descriptions.xml index d0ed7a236..86ba6a8f8 100644 --- a/java/res/values-ca/strings-emoji-descriptions.xml +++ b/java/res/values-ca/strings-emoji-descriptions.xml @@ -778,7 +778,7 @@ <string name="spoken_emoji_1F4C8" msgid="8007686702282833600">"Gràfic d\'increment"</string> <string name="spoken_emoji_1F4C9" msgid="2271951411192893684">"Gràfic de disminució"</string> <string name="spoken_emoji_1F4CA" msgid="3525692829622381444">"Gràfic de barres"</string> - <string name="spoken_emoji_1F4CB" msgid="977639227554095521">"Portanotes"</string> + <string name="spoken_emoji_1F4CB" msgid="977639227554095521">"Porta-retalls"</string> <string name="spoken_emoji_1F4CC" msgid="156107396088741574">"Xinxeta"</string> <string name="spoken_emoji_1F4CD" msgid="4266572175361190231">"Xinxeta rodona"</string> <string name="spoken_emoji_1F4CE" msgid="6294288509864968290">"Clip"</string> diff --git a/java/res/values-sw/strings-emoji-descriptions.xml b/java/res/values-sw/strings-emoji-descriptions.xml index a348f0f7e..beb63b3d4 100644 --- a/java/res/values-sw/strings-emoji-descriptions.xml +++ b/java/res/values-sw/strings-emoji-descriptions.xml @@ -778,7 +778,7 @@ <string name="spoken_emoji_1F4C8" msgid="8007686702282833600">"Emoji ya chati inayoonesha grafu ikipanda"</string> <string name="spoken_emoji_1F4C9" msgid="2271951411192893684">"Emoji ya chati inayoonesha grafu ikishuka"</string> <string name="spoken_emoji_1F4CA" msgid="3525692829622381444">"Emoji ya chati inayotumia miche kuwakilisha data zake"</string> - <string name="spoken_emoji_1F4CB" msgid="977639227554095521">"Emoji ya ubao maalum wenye kishikizio cha karatasi, aghalabu kwa urahisi wa kuandika au kusoma"</string> + <string name="spoken_emoji_1F4CB" msgid="977639227554095521">"Ubao wa kunakili"</string> <string name="spoken_emoji_1F4CC" msgid="156107396088741574">"Emoji ya kipini maalum kinachotumika kushikizia karatasi ukutani"</string> <string name="spoken_emoji_1F4CD" msgid="4266572175361190231">"Emoji ya kipini chenye kichwa cha mduara kinachotumika kushikizia karatasi kwenye kuta maalum zinazoweza kutumika na vipini hivyo"</string> <string name="spoken_emoji_1F4CE" msgid="6294288509864968290">"Emoji ya kibanio cha karatasi"</string> |