diff options
author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 12:26:50 +0000 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-03-10 12:26:50 +0000 |
commit | 66cdcd0db4eb9566dbdb424df5a4e9592113c64f (patch) | |
tree | 2dac1856168a9bf0d909bb7e01955ed0a117f19c | |
parent | 35cd1a81b7f10040c9254dc3384ff38ee53b64b8 (diff) | |
parent | 4aa14f03551fafee2b87eccbc4dafee04d46a9b8 (diff) | |
download | android_packages_apps_Tag-staging/cm-12.1.tar.gz android_packages_apps_Tag-staging/cm-12.1.tar.bz2 android_packages_apps_Tag-staging/cm-12.1.zip |
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3C
Android 5.1.0 release 1
-rw-r--r-- | res/values-hi/strings.xml | 4 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 2 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index c1f672c..4646875 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -20,11 +20,11 @@ <string name="title_scanned_tag" msgid="4347835407095551450">"नए टैग एकत्रित किए गए"</string> <string name="title_existing_tag" msgid="5656560272594190244">"टैग"</string> <string name="tag_unknown" msgid="2897956823877728783">"अज्ञात टैग प्रकार"</string> - <string name="tag_empty" msgid="3726529819932095782">"खाली टैग"</string> + <string name="tag_empty" msgid="3726529819932095782">"रिक्त टैग"</string> <string name="button_done" msgid="7048822758098308158">"पूर्ण"</string> <string name="action_text" msgid="577417996159152923">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> को SMS भेजें"</string> <string name="action_call" msgid="6226253647953184035">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> को कॉल करें"</string> - <string name="empty_tag_prompt" msgid="4206394383309956030">"यह टैग खाली है."</string> + <string name="empty_tag_prompt" msgid="4206394383309956030">"यह टैग रिक्त है."</string> <string name="import_vcard" msgid="5104299047930666528">"^1 आयात करें"</string> <string name="mime_display_name" msgid="5926357152623764485">"NFC टैग से डेटा"</string> <string name="vcard_title" msgid="7122634780732426007">"^1 के लिए संपर्क जानकारी"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 873bfb3..f2b3085 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -22,7 +22,7 @@ <string name="tag_unknown" msgid="2897956823877728783">"Tipo de tag desconhecido"</string> <string name="tag_empty" msgid="3726529819932095782">"Tag vazia"</string> <string name="button_done" msgid="7048822758098308158">"Concluído"</string> - <string name="action_text" msgid="577417996159152923">"Enviar SMS para <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string> + <string name="action_text" msgid="577417996159152923">"Enviar mensagem de texto para <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string> <string name="action_call" msgid="6226253647953184035">"Chamar <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string> <string name="empty_tag_prompt" msgid="4206394383309956030">"Esta tag está vazia."</string> <string name="import_vcard" msgid="5104299047930666528">"Importar ^1"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 58a2563..3edbc23 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -26,6 +26,6 @@ <string name="action_call" msgid="6226253647953184035">"呼叫 <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string> <string name="empty_tag_prompt" msgid="4206394383309956030">"该标签是空的。"</string> <string name="import_vcard" msgid="5104299047930666528">"导入 ^1"</string> - <string name="mime_display_name" msgid="5926357152623764485">"来自NFC标签的数据"</string> + <string name="mime_display_name" msgid="5926357152623764485">"NFC 标签的数据"</string> <string name="vcard_title" msgid="7122634780732426007">"^1的联系人信息"</string> </resources> |