commit c48313bde93e84070d6c75d77dc714529cc08e12
author Baligh Uddin <baligh@google.com> Wed May 29 21:00:11 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 21:00:12 2013 +0000
tree 7cee63fdb2c75cd045bc5ed556ae78a1f6855e68
parent a8d623a3676f8abdda52b9516556e52e8490dbf7
parent 97b034c3b65a908e69b47ebdf5c95379c51f95b2

Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

res/values-de/strings.xml

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index de6b94e..8088dda 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -169,7 +169,7 @@
   </plurals>
     <string name="sending" msgid="8214361929125649771">"Senden..."</string>
     <string name="send_failed" msgid="750908595144529579">"Nicht gesendet"</string>
-    <string name="me" msgid="6480762904022198669">"Mich"</string>
+    <string name="me" msgid="6480762904022198669">"Ich"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Posteingang"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Diese Konversation löschen?"</item>

res/values-ko/strings.xml

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 14b861f..58e552c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -220,7 +220,7 @@
     <item quantity="other" msgid="8630099095360065837">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;개 삭제됨"</item>
   </plurals>
     <string name="deleted" msgid="2757349161107268029">"삭제됨"</string>
-    <string name="archived" msgid="7533995360704366325">"보관됨"</string>
+    <string name="archived" msgid="7533995360704366325">"보관처리됨"</string>
     <string name="folder_removed" msgid="1047474677580149436">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>에서 삭제됨"</string>
   <plurals name="conversation_folder_changed">
     <item quantity="one" msgid="4930161390461457462">"폴더가 변경되었습니다."</item>
@@ -380,14 +380,14 @@
     <string name="silent_ringtone" msgid="5856834572357761687">"무음"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"보관처리 및 삭제 작업"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="1938422987822134657">"보관처리된 메일만 표시"</item>
-    <item msgid="5737880287951287278">"삭제된 메일만 표시"</item>
-    <item msgid="4279948809971752573">"보관처리 및 삭제된 메일 표시"</item>
+    <item msgid="1938422987822134657">"보관처리만 표시"</item>
+    <item msgid="5737880287951287278">"삭제만 표시"</item>
+    <item msgid="4279948809971752573">"보관처리 및 삭제 모두 표시"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="492039800376391677">"보관처리된 메일만 표시"</item>
-    <item msgid="8350973578419775975">"삭제된 메일만 표시"</item>
-    <item msgid="2967059853409454648">"보관처리 및 삭제된 메일 표시"</item>
+    <item msgid="492039800376391677">"보관처리만 표시"</item>
+    <item msgid="8350973578419775975">"삭제만 표시"</item>
+    <item msgid="2967059853409454648">"보관처리 및 삭제 모두 표시"</item>
   </string-array>
     <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"보관처리 및 삭제 작업"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"전체답장"</string>

res/values-ru/strings.xml

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 24b72d3..d533a32 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -169,7 +169,7 @@
   </plurals>
     <string name="sending" msgid="8214361929125649771">"Отправка…"</string>
     <string name="send_failed" msgid="750908595144529579">"Не отправлено."</string>
-    <string name="me" msgid="6480762904022198669">"мне"</string>
+    <string name="me" msgid="6480762904022198669">"я"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Входящие"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Удалить эту цепочку?"</item>

res/values-sw/strings.xml

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 459a18c..da2ea2a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -392,7 +392,7 @@
     <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Kuweka kwenye kumbukumbu na kufuta"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Jibu wote"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Tumia kama chaguo-msingi la majibu ya ujumbe"</string>
-    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Papasa kwa kasi ili kuweka kwenye kumbukumbu"</string>
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Telezesha ili uweke kwenye kumbukumbu"</string>
     <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Papasa kwa kasi ili kufuta"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Picha ya mtumaji"</string>