diff options
| author |   Geoff Mendal <mendal@google.com> | 2016-02-02 15:54:00 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2016-02-02 15:54:00 +0000 |
| commit | 6de2f31f45cd51e14cc3191c6908af00674cfb0e (patch) | |
| tree | 2843a2907890288f243b65644c10efeeed955cb2 /java | |
| parent | 1bfc6ebc536a9feb8d26c363b6a7e8642d761012 (diff) | |
| parent | 904a89c20bf86040a6fcae8f379c7a956eb61b98 (diff) | |
| download | latinime-6de2f31f45cd51e14cc3191c6908af00674cfb0e.tar.gz latinime-6de2f31f45cd51e14cc3191c6908af00674cfb0e.tar.xz latinime-6de2f31f45cd51e14cc3191c6908af00674cfb0e.zip | |
Merge branch \'mnc-dr2-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/inputmethods/LatinIME into mnc-dr2-dev
am: 904a89c20b
* commit '904a89c20bf86040a6fcae8f379c7a956eb61b98':
Import translations. DO NOT MERGE
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 0a356f8e2..a5bb534e2 100644 --- a/java/res/values-ca/strings-emoji-descriptions.xml +++ b/java/res/values-ca/strings-emoji-descriptions.xml @@ -562,7 +562,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 329bf398a..949f13115 100644 --- a/java/res/values-sw/strings-emoji-descriptions.xml +++ b/java/res/values-sw/strings-emoji-descriptions.xml @@ -562,7 +562,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> |