From 16602f712367e2f40045b26c32d23a7a24b0c0e7 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 24 Sep 2012 11:24:46 -0700
Subject: [PATCH 1/3] Import translations. DO NOT MERGE

Change-Id: I5d7bc8b88fab1c6d156e1f0a2c9cb3da0a8f2ba9
Auto-generated-cl: translation import
---
 res/values-am/strings.xml     | 3 +--
 res/values-ar/strings.xml     | 3 +--
 res/values-bg/strings.xml     | 3 +--
 res/values-ca/strings.xml     | 5 ++---
 res/values-cs/strings.xml     | 3 +--
 res/values-da/strings.xml     | 3 +--
 res/values-de/strings.xml     | 3 +--
 res/values-el/strings.xml     | 3 +--
 res/values-en-rGB/strings.xml | 3 +--
 res/values-es-rUS/strings.xml | 3 +--
 res/values-es/strings.xml     | 3 +--
 res/values-fa/strings.xml     | 3 +--
 res/values-fi/strings.xml     | 3 +--
 res/values-hu/strings.xml     | 3 +--
 res/values-iw/strings.xml     | 3 +--
 res/values-lt/strings.xml     | 3 +--
 res/values-ms/strings.xml     | 3 +--
 res/values-nb/strings.xml     | 3 +--
 res/values-nl/strings.xml     | 3 +--
 res/values-pl/strings.xml     | 3 +--
 res/values-pt-rPT/strings.xml | 3 +--
 res/values-pt/strings.xml     | 3 +--
 res/values-sl/strings.xml     | 3 +--
 res/values-sw/strings.xml     | 3 +--
 res/values-uk/strings.xml     | 3 +--
 res/values-zh-rCN/strings.xml | 3 +--
 res/values-zh-rTW/strings.xml | 3 +--
 27 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index bfb7dbdc2..026406609 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለእዚህ መለያ ቦዝኗል፡፡"</string>
     <string name="confirm_response" msgid="9151965975158906286">"ምላሽ በመላክ ላይ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"መልዕክቶች የሉም።"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"የአቃፊ መራጭ"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"ለ<xliff:g id="ACCOUNT">%s</xliff:g> የአገልጋይ መጣያ ይምረጡ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d5c1e82b2..55d3eac3e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"تم تعطيل المزامنة في الخلفية لهذا الحساب أثناء التجوال."</string>
     <string name="confirm_response" msgid="9151965975158906286">"جارٍ إرسال الرد..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"ليست هناك أية رسائل."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"منتقي المجلد"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"حدد مجلد المهملات التابع للخادم لـ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cbd40f444..bc8417ed9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизирането на заден план за този профил е деактивирано при роуминг."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Отговорът се изпраща…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Няма съобщения."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Инструмент за избор на папки"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Изберете папка „Кошче“ на сървъра за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e83b0d932..3fb68824f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -500,11 +500,10 @@
     <string name="quick_2" msgid="4188036352885736617">"Em sembla molt bé."</string>
     <string name="quick_3" msgid="8061819976353395585">"Ho llegiré més tard i et respondré."</string>
     <string name="quick_4" msgid="3988974084396883051">"Organitzem una reunió per parlar-ne."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"La sincronització de fons per a aquest compte està desactivada en itinerància."</string>
+    <string name="require_manual_sync_message" msgid="7777357288642785955">"La sincronització en segon pla d\'aquest compte s\'ha desactivat en itinerància."</string>
     <string name="confirm_response" msgid="9151965975158906286">"S\'està enviant la resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hi ha missatges."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selector de carpeta"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecciona la carpeta de la paperera del servidor per a: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 987c65d88..35cbbd340 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizace na pozadí je v tomto účtu při roamingu zakázána."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Odesílání odpovědi..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žádné zprávy."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Výběr složky"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Vyberte Koš serveru pro účet <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b2060e72e..601cb6a75 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Baggrundssynkronisering for denne konto deaktiveres under roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Sender svar..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ingen meddelelser."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mappevælger"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Vælg serverens papirkurv for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fdcb2abd1..34f0d4a4b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Die Hintergrundsynchronisierung ist für dieses Konto während des Roamings deaktiviert."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Antwort wird gesendet…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Keine Nachrichten"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Ordnerauswahl"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Papierkorb des Servers für <xliff:g id="ACCOUNT">%s</xliff:g> auswählen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 63461933e..efb2a88d5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ο συγχρονισμός στο παρασκήνιο για αυτόν το λογαριασμό είναι απενεργοποιημένος κατά την περιαγωγή."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Αποστολή απάντησης..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Δεν υπάρχουν μηνύματα."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Επιλογέας φακέλου"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Επιλ.φακέλου απορ.διακομ.για <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 243b21f5b..e2c04da92 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Background sync for this account is disabled while roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Sending response…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No messages."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Folder picker"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Select server recycle folder for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 894ab6638..96922d4e4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Enviando respuesta…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hay mensajes."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selector de carpeta"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecciona la carpeta de papelera del servidor para <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2ee0c2a8d..5ab91553a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Enviando respuesta…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hay ningún mensaje."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selector de carpetas"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecciona la papelera del servidor de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 25750634b..256b04cd7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"هنگام رومینگ، همگام‌سازی پس‌زمینه برای این حساب غیرفعال است."</string>
     <string name="confirm_response" msgid="9151965975158906286">"در حال ارسال پاسخ…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"پیامی موجود نیست."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"انتخابگر پوشه"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"پوشه حذف‌ شده‌های سرور را برای <xliff:g id="ACCOUNT">%s</xliff:g> انتخاب کنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bf861e80a..a9a793477 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Tämän tilin taustasynkronointi on pois käytöstä roaming-tilassa."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Vastausta lähetetään..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ei viestejä."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Kansionvalitsin"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Valitse roskakori tilille <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8eed35420..2c081ef49 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A fiók háttérben zajló szinkronizálása le van tiltva barangolás közben."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Válasz küldése..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nincsenek üzenetek."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mappaválasztó"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Szerver Kuka mappájának kiválasztása – <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ceff5b39e..ea6ccc620 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"סינכרון ברקע של חשבון זה מושבת בזמן נדידה."</string>
     <string name="confirm_response" msgid="9151965975158906286">"שולח תגובה…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"אין הודעות."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"בוחר תיקיות"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"בחר את תיקיית האשפה של השרת עבור <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4fb141dc0..d6d27ff7e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Foninis šios paskyros sinchronizavimas neleidžiamas perduodant duomenis tarptinkliniu ryšiu."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Siunčiamas atsakymas…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Pranešimų nėra."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP prieiga"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Aplanko rinkiklis"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Pas. <xliff:g id="ACCOUNT">%s</xliff:g> server. šiukšliad. apl."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6ca32b701..dced741f4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Segerakkan latar belakang untuk akaun ini dilumpuhkan semasa perayauan."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Menghantar jawapan…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Tiada mesej."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Pemilih folder"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Pilih folder sampah pelayan untuk <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 200ba2525..ade160dbc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrunnssynkronisering for denne kontoen er deaktivert under streifing."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Sender svaret ditt ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ingen e-poster."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mappevelger"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Velg tjenerens papirkurvmappe for <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 874eef6d5..516a16287 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Achtergrondsynchronisatie voor dit account is uitgeschakeld tijdens roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Reactie verzenden…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Geen berichten."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mapkiezer"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Prullenbak van server selecteren voor <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 442787cb2..d4a8307e1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizacja w tle z tym kontem jest podczas roamingu wyłączona."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Wysyłam odpowiedź…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Brak wiadomości."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selektor folderów"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Wybierz folder kosza na serwerze dla: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5d78df56e..03bd27d4e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano desta conta está desativada quando está em roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"A enviar resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Não tem mensagens."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Seletor de pastas"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecionar a pasta de lixo do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b227937d4..39c75961d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano para essa conta é desativada durante o roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Enviando resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nenhuma mensagem."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Seletor de pasta"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Pasta Lixeira do servidor p/ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1b98980fe..6d8e47fda 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinhronizacija v ozadju je za ta račun med gostovanjem onemogočena."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Pošiljanje odgovora ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ni sporočil."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Izbirnik map"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Izberite mapo koša strežnika za račun <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 511f50cd1..822f5d07f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ulandanishi wa mandharinyuma ya akaunti hii imelemazwa wakati wa kuzurura."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Inatuma mwitikio…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Hakuna ujumbe."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Kichukuaji folda"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Chagua folda ya taka ya seva kwa ajili ya <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ed3e716da..82ec80e24 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"У роумінгу фонову синхронізацію для цього облікового запису вимкнено."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Надсилання відповіді…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Немає повідомлень."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Засіб вибору папки"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>: виберіть \"Кошик\" на сервері"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index df097a0e8..7e1ad46dc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"漫游时停用了此帐户的后台同步功能。"</string>
     <string name="confirm_response" msgid="9151965975158906286">"正在发送回复…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"无邮件。"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"选择文件夹"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"选择 <xliff:g id="ACCOUNT">%s</xliff:g> 在服务器上的已删除邮件文件夹"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0b98c1204..10fe2a781 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"系統會在漫遊時停用這個帳戶的背景同步處理。"</string>
     <string name="confirm_response" msgid="9151965975158906286">"正在傳送回應…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"沒有任何郵件。"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"資料夾選取工具"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"選取 <xliff:g id="ACCOUNT">%s</xliff:g> 伺服器的垃圾桶資料夾"</string>

From 4931b8beff86626989bd1dd46dc7a301773140c8 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Tue, 25 Sep 2012 12:16:44 -0700
Subject: [PATCH 2/3] Import translations. DO NOT MERGE

Change-Id: I760f093c30a8ea25f1d6f8362449c0013198bc27
Auto-generated-cl: translation import
---
 res/values-af/strings.xml | 3 +--
 res/values-be/strings.xml | 3 +--
 res/values-et/strings.xml | 3 +--
 res/values-fr/strings.xml | 3 +--
 res/values-hi/strings.xml | 3 +--
 res/values-hr/strings.xml | 3 +--
 res/values-in/strings.xml | 3 +--
 res/values-it/strings.xml | 3 +--
 res/values-ja/strings.xml | 3 +--
 res/values-ko/strings.xml | 3 +--
 res/values-lv/strings.xml | 3 +--
 res/values-ro/strings.xml | 3 +--
 res/values-ru/strings.xml | 3 +--
 res/values-sk/strings.xml | 3 +--
 res/values-sr/strings.xml | 3 +--
 res/values-sv/strings.xml | 3 +--
 res/values-th/strings.xml | 3 +--
 res/values-tl/strings.xml | 3 +--
 res/values-tr/strings.xml | 3 +--
 res/values-vi/strings.xml | 3 +--
 res/values-zu/strings.xml | 3 +--
 21 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e93a0f4f3..cf246401d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Agtergrond-sinkronisasie vir hierdie rekening is gedeaktiveer tydens swerwing."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Stuur tans antwoord..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Geen boodskappe nie."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Vouerkieser"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Kies bediener se asblikvouer vir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 27ff51920..a2e8d88cd 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Фонавая сінхранізацыя для гэтага ўліковага запісу адключана ў роўмінгу."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Адпраўка адказу..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Паведамленняў няма."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Выбаршчык тэчак"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Выберыце на серверы тэчку са смеццем для запiсу: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0476339f6..eb0e629ef 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Taustsünkroonimine on sellel kontol rändluse ajal keelatud."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Vastuse saatmine ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Sõnumeid pole."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Kausta valija"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Valige <xliff:g id="ACCOUNT">%s</xliff:g> jaoks serveri prügikast"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ee6e8e472..626ed993b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"La synchronisation en arrière-plan pour ce compte est désactivée en itinérance."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Envoi de la réponse en cours…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Aucun message"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Sélecteur de dossier"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Sélect. dossier \"Corbeille\" du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 877ef3c7b..44c1b296d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"रोमिंग के दौरान इस खाते के लिए पृष्ठभूमि समन्‍वयन अक्षम है."</string>
     <string name="confirm_response" msgid="9151965975158906286">"प्रतिक्रिया भेज रहा है..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"कोई संदेश नहीं."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"फ़ोल्डर पिकर"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> का सर्वर ट्रैश फ़ोल्डर चुनें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bf0622fe5..f1e31b779 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Pozadinska sinkronizacija za ovaj račun onemogućena je u roamingu."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Slanje odgovora..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nema poruka."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Alat za odabir mape"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Odaberite mapu za otpad poslužitelja za <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 97f13c3be..263caba2e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinkronisasi latar belakang untuk akun ini dinonaktifkan saat roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Mengirim tanggapan..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Tidak ada pesan."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Pemilih folder"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Plh folder sampah server utk <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2fdf9d735..1cc3a8804 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizzazione dello sfondo per questo account disattivata durante il roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Invio risposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nessun messaggio."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selettore cartelle"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selez. cartella Cestino server per <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 77a03db7d..17d929b94 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"このアカウントのバックグラウンドでの同期は、ローミング中は無効です。"</string>
     <string name="confirm_response" msgid="9151965975158906286">"出欠状況を送信しています…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"メッセージはありません。"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"フォルダの選択"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>のサーバーのゴミ箱フォルダを選択してください"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f84591146..8d6013f47 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"계정 백그라운드 동기화가 로밍하는 동안 사용 중지됩니다."</string>
     <string name="confirm_response" msgid="9151965975158906286">"응답을 보내는 중..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"메시지가 없습니다."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"폴더 선택기"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"서버의 <xliff:g id="ACCOUNT">%s</xliff:g>용 휴지통 폴더 선택"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index cc62effe0..6fb828e33 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Viesabonēšanas laikā fona sinhronizācija šajā kontā ir atspējota."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Notiek atbildes sūtīšana..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nav ziņojumu."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mapju atlasītājs"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>: atlasīt servera atkritnes mapi"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e673bef72..8260384fc 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizarea în fundal pentru acest cont este dezactivată în roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Se trimite răspunsul…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Niciun mesaj."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selector dosare"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Dosarul coş de gunoi pentru <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e61a455f1..1eb0076dd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Для этого аккаунта отключена фоновая синхронизация в роуминге."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Отправка ответа…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Писем нет."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Выберите папку"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>: выберите папку на сервере"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 17fe296ed..d32699331 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Odosiela sa odpoveď..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Výber priečinka"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Priečinok Kôš servera pre <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2b30f292f..274eb5084 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизација у позадини за овај налог је онемогућена у ромингу."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Слање одговора..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Нема порука."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP приступ"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Бирач директоријума"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Изаберите директоријум за отпад на серверу за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bbe345767..5ad06a32d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrundssynkronisering för det här kontot har inaktiverats vid roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Skickar svar ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Inga meddelanden."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mappväljaren"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Välj mapp för papperskorgen på servern för <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 98c9d9fed..2dd88d54b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"การซิงค์พื้นหลังสำหรับบัญชีนี้ถูกปิดใช้งานขณะโรมมิ่ง"</string>
     <string name="confirm_response" msgid="9151965975158906286">"กำลังส่งการตอบกลับ…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"ไม่มีข้อความ"</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"เครื่องมือเลือกโฟลเดอร์"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"เลือกโฟลเดอร์ถังขยะของเซิร์ฟเวอร์สำหรับ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index be2206b7c..37265818f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Hindi pinapagana ang background na pag-sync para sa account na ito habang nagro-roam."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Ipinapadala ang tugon…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Walang mga mensahe."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Picker ng folder"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Piliin server trash folder sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5fd79768c..7a0412fe0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Dolaşımdayken bu hesabın arka plan senkronizasyonu devre dışı bırakılır."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Yanıt gönderiliyor…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"İleti yok."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Klasör seçici"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> için sunucunun çöp kutusu klasörünü seçin"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 293d84d5f..40b7dfe28 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Đồng bộ hóa nền cho tài khoản này bị tắt trong khi chuyển vùng."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Đang gửi trả lời..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Không có thư nào."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Công cụ chọn thư mục"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Chọn thư mục thùng rác trên máy chủ cho <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index abfe6aa5e..d957c9439 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -503,8 +503,7 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ukuvumelaniswa okungemumva kule-akhawunti ayisebenzi ngesikhathi usazula zula."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Ithumela impendulo..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ayikho imilayezo."</string>
-    <!-- no translation found for imap_name (5030473997603483793) -->
-    <skip />
+    <string name="imap_name" msgid="5030473997603483793">"I-IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Isikhethi sefolda"</string>
     <string name="trash_folder_selection_title" msgid="8052880079616386185">"Khetha ifolda kadoti yeseva ye-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>

From 580c81f396dc138a8db77b1eb6f252cd568700ae Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Wed, 26 Sep 2012 15:16:58 -0700
Subject: [PATCH 3/3] Import translations. DO NOT MERGE

Change-Id: If6568db82a1e4aba8cddefb73b33e4511608049e
Auto-generated-cl: translation import
---
 res/values-es-rUS/strings.xml | 2 +-
 res/values-es/strings.xml     | 2 +-
 res/values-zh-rCN/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 96922d4e4..963a305ac 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -102,7 +102,7 @@
   </plurals>
     <string name="debug_version_fmt" msgid="6160213145745376955">"Versión: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Bandeja de entrada"</string>
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcado con asterisco"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacados"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bandeja de salida"</string>
     <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5ab91553a..82c4767a1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -480,7 +480,7 @@
     <string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Cargando…"</string>
-    <string name="widget_touch_to_configure" msgid="7062039013915225323">"Toca para configurar."</string>
+    <string name="widget_touch_to_configure" msgid="7062039013915225323">"Toca para configurar"</string>
     <string name="widget_no_accounts" msgid="2412482205591224408">"Aún no se ha configurado una cuenta de correo electrónico."</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
     <string name="search_hint" msgid="2200412192574686497">"Buscar correo"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7e1ad46dc..cb68a2cc4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -382,7 +382,7 @@
     <string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"签名"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"快速回复"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"编辑您在撰写电子邮件时经常插入的文本"</string>
+    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"编辑您在写电子邮件时经常插入的文本"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"在您发送的邮件中附加文本"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"数据使用"</string>