From 11574724466d0a363b9cd8a99aa4e2f6841aa4a2 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Thu, 14 Apr 2011 14:02:55 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE

Change-Id: Ie71335ec0b6f8b728afdd5834b242406e816c22f
---
 res/values-de/strings.xml     | 2 +-
 res/values-iw/strings.xml     | 2 +-
 res/values-zh-rTW/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2f429eb6a..c805bda7b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -66,7 +66,7 @@
   </plurals>
     <string name="cannot_move_protocol_not_supported_toast" msgid="8321714399405096556">"Verschieben wird für POP3-Konten nicht unterstützt."</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="4111097224275445005">"Verschieben nicht möglich. Auswahl enthält mehrere Konten."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="2533188790446456804">"Nachrichten in \"Entwürfe\", dem Postausgang und \"Gesendet\" können nicht verschoben werden."</string>
+    <string name="cannot_move_special_mailboxes_toast" msgid="2533188790446456804">"Nachrichten im Postausgang und den Ordnern \"Entwürfe\" und \"Gesendet\" können nicht verschoben werden."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 830049d9d..fbf61df0c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -89,7 +89,7 @@
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"דואר זבל"</string>
     <string name="debug_version_fmt" msgid="6160213145745376955">"גרסה: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"חשבונות"</string>
-    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"תיבת דואר נכנס"</string>
+    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"דואר נכנס"</string>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"מסומן בכוכב"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"טיוטות"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"תיבת דואר יוצא"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a5584b41e..a7a076713 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -328,7 +328,7 @@
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步處理此帳戶的電子郵件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"震動"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到電子郵件時震動提醒"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"永遠要"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"一律"</string>
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"靜音時才啟用"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永遠不要"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"震動"</string>