From ee48894dfda0c60661cffb117434ab9f4d3222ad Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 28 Sep 2011 16:34:42 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE.

Change-Id: I805a9b5d9143ae1a2917406d3fca2893c680d17a
---
 res/values-af/strings.xml  | 4 ++--
 res/values-am/strings.xml  | 2 +-
 res/values-fr/uploader.xml | 2 +-
 res/values-lt/strings.xml  | 2 +-
 res/values-sw/strings.xml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4262899c9..5a466fc25 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -322,7 +322,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikernaam of wagwoord verkeerd."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan nie veilig aan bediener koppel nie."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan nie veilig aan bediener koppel nie."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kliëntsertifikaat vereis. Koppel aan bediener met kliëntsertifikaat?"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"Kliëntsertifikaat vereis. Koppel aan bediener met die kliëntsertifikaat?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"Sertifikaat ongeldig of ontoeganklik."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Die bediener het met \'n fout gereageer; kontroleer jou gebruikernaam en wagwoord en probeer weer."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan nie aan bediener koppel nie."</string>
@@ -442,7 +442,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Reusagtig"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Antwoord almal"</string>
-    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Maak \"Antwoord almal\" die verstek vir die antwoord van boodskappe"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Maak \"Antwoord almal\" die verstek vir reageer op boodskappe"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Laai verstek vir \"Wys prente\" terug"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Laai verstek terug vir alle senders (moenie prente outomaties wys nie)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Wys prente\" uitgevee."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1c91d323d..7eb6426ad 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -322,7 +322,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ተጠቃሚ ስም ወይም ይለፍ ቃል ተሳስቷል።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ወደ አገልጋዩበደህና ማገናኘት አልተቻልም።"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"ወደ አገልጋዩበደህና ማገናኘት አልተቻልም።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"የደንበኛ ምስክር ይጠበቃል። ከደንበኛ ምስርክር ጋር ወደ አገልጋይ ይገናኝ?"</string>
+    <string name="account_setup_failed_certificate_required" msgid="6885740669437744865">"የደንበኛ የዕውቅና ማረጋገጫ ይጠበቃል። ከደንበኛ የዕውቅና ማረጋገጫ ጋር ወደ አገልጋይ ይገናኝ?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="4343495223208675649">"ልክ ያልሆነ የዕውቅና ማረጋገጫ ወይም ተደራሽ ያልሆነ"</string>
     <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"አገልጋዩ ከክስተት ጋር መልሷል፤ እባክዎ የተጠቃሚ ስምዎን እና የይለፍ ቃልዎን ይመልከቱ እና እንደገና ይሞክሩ።"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"ወደ አገልጋይ መገናኘት አልቻልም።"</string>
diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
index f8b44cb98..3f9a2dab9 100644
--- a/res/values-fr/uploader.xml
+++ b/res/values-fr/uploader.xml
@@ -121,7 +121,7 @@
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Transferts via connexion mobile"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Transferts en itinérance"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Transférer les photos et les vidéos en itinérance"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Transferts lorsque la batterie est en charge"</string>
+    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Transferts en charge"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Transférer les photos et les vidéos uniquement lors de la mise en charge"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Transférer les photos existantes"</string>
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Transférer toutes les photos et les vidéos de votre téléphone"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0ec9fb523..44e219cb4 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -442,7 +442,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Didelis"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Itin didelis"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atsakyti visiems"</string>
-    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Atsakymams į praneš. pasirinkite „Atsakyti visiems“ kaip numat. nust."</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Atsakyti į pranešimus pasirinkite „Atsakyti visiems“ kaip numat. nust."</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Atkurti numatytuosius funkcijos „Rodyti paveikslėlius“ nustatymus"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Atkurti visų siuntėjų numatytuosius nustatymus (automatiškai nerodyti paveikslėlių)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Rodyti paveikslėlius“ išvalyta."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7f18f7021..6c5230547 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -442,7 +442,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Kubwa"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kubwa mno"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Jibu wote"</string>
-    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Fanya \'Jibu wote\' iwe chaguo-msingi ya kujibu ujumbe"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Fanya \'Jibu wote\' iwe chaguo mbadala ya kujibu ujumbe"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Rejesha chaguo-msingi la \"Onyesha picha\""</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Rejesha chaguo-msingi kwa watumaji wote (usionyeshe picha kiotomatiki)"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Onyesha picha zilizoondolewa."</string>