diff --git a/res/values-af/uploader.xml b/res/values-af/uploader.xml
index 25ec5f0..904581f 100644
--- a/res/values-af/uploader.xml
+++ b/res/values-af/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Versteek details"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Instellings"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s opgelaai"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Rekening"</string>
     <string name="upload" msgid="2615541458361216022">"Laai op"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-am/uploader.xml b/res/values-am/uploader.xml
index 5a0c08e..550d2f7 100644
--- a/res/values-am/uploader.xml
+++ b/res/values-am/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"ዝርዝሮች ደብቅ"</string>
     <string name="menu_settings" msgid="5088116127086866634">"ቅንብሮች"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s ተሰቅሏል"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"መለያ"</string>
     <string name="upload" msgid="2615541458361216022">"ስቀል"</string>
     <string name="ok" msgid="2516349681897895312">"እሺ"</string>
@@ -86,7 +86,7 @@
     <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"ምንም ተጨማሪ ፎቶዎች/ቪዲዮዎች መስቀል አያስፈልግም።"</string>
     <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"ከአገልጋዩ ጋር የመገናኘት ችግር ነበር። እባክዎ ትንሽ ቆይተው እንደገና ይሞክሩ።"</string>
     <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"ሁሉን አስምር ቀርቷል"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"ሁሉንም አሳምር"</string>
+    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"ሁሉንም አስምር"</string>
     <string name="manager_view_completed" msgid="5119780300858727185">"ዕይታ ተጠናቋል"</string>
     <string name="manager_view_pending" msgid="4403346072556950609">"በይደር ያለን እይ"</string>
     <string name="preference_category_title_general" msgid="330919434495694575">"አጠቃላይ"</string>
diff --git a/res/values-ar/uploader.xml b/res/values-ar/uploader.xml
index dae9b4c..dd150b1 100644
--- a/res/values-ar/uploader.xml
+++ b/res/values-ar/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"إخفاء التفاصيل"</string>
     <string name="menu_settings" msgid="5088116127086866634">"الإعدادات"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"تم تحميل %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"الحساب"</string>
     <string name="upload" msgid="2615541458361216022">"تحميل"</string>
     <string name="ok" msgid="2516349681897895312">"موافق"</string>
diff --git a/res/values-be/uploader.xml b/res/values-be/uploader.xml
index eef060d..f8aee8e 100644
--- a/res/values-be/uploader.xml
+++ b/res/values-be/uploader.xml
@@ -28,7 +28,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Схаваць падрабязнасці"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Налады"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Загружана %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Уліковы запіс"</string>
     <string name="upload" msgid="2615541458361216022">"Загрузіць"</string>
     <string name="ok" msgid="2516349681897895312">"ОК"</string>
diff --git a/res/values-bg/uploader.xml b/res/values-bg/uploader.xml
index 1c38811..74ce71d 100644
--- a/res/values-bg/uploader.xml
+++ b/res/values-bg/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Скриване на подробностите"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Настройки"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Качени: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Профил"</string>
     <string name="upload" msgid="2615541458361216022">"Качване"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-ca/uploader.xml b/res/values-ca/uploader.xml
index 13b33af..8e251c9 100644
--- a/res/values-ca/uploader.xml
+++ b/res/values-ca/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Amaga els detalls"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configuració"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Penjats: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Compte"</string>
     <string name="upload" msgid="2615541458361216022">"Penja"</string>
     <string name="ok" msgid="2516349681897895312">"D\'acord"</string>
diff --git a/res/values-cs/uploader.xml b/res/values-cs/uploader.xml
index 0ce8a86..a6f390d 100644
--- a/res/values-cs/uploader.xml
+++ b/res/values-cs/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skrýt podrobnosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nastavení"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Nahráno: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Účet"</string>
     <string name="upload" msgid="2615541458361216022">"Nahrát"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
@@ -127,7 +127,7 @@
     <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Nahrát všechny existující fotky a videa z telefonu"</string>
     <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Vypnuto"</string>
     <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Nahrávání (%1$d%%)"</string>
+    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Nahrávání (%1$d %%)"</string>
     <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d z celkem %2$d"</string>
     <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pozastaveno. Nahrávání obnovíte dotykem."</string>
     <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Nahrát existující fotky"</string>
diff --git a/res/values-da/uploader.xml b/res/values-da/uploader.xml
index cc8f0e8..f2a6f1a 100644
--- a/res/values-da/uploader.xml
+++ b/res/values-da/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skjul detaljer"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Indstillinger"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Uploadet %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
@@ -105,7 +105,7 @@
     <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Betingelser for upload"</string>
     <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Billedernes forbindelsesindstillinger bruges i øjeblikket."</string>
     <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Kun billeder via mobilnetværk"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Billeder og videoer via mobilnetværk"</string>
+    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotos og videoer via mobilnetværk"</string>
     <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Kun billeder og videoer via Wi-Fi"</string>
     <string name="preference_category_title_about" msgid="3001183168471659844">"Om"</string>
     <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Øjebl. upload-v."</string>
diff --git a/res/values-de/uploader.xml b/res/values-de/uploader.xml
index c8a6f21..e04bbda 100644
--- a/res/values-de/uploader.xml
+++ b/res/values-de/uploader.xml
@@ -5,7 +5,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="7812006268714926951">"Sofort-Upload"</string>
     <string name="picasa_default_destination" msgid="2052406684123992574">"Sofort-Upload-Album"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Upload wird durchgeführt"</string>
+    <string name="summary_title_uploading" msgid="3357617474017589370">"Wird hochgeladen..."</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Abgeschlossen"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Angehalten"</string>
     <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d Fotos • %3$d Videos"</string>
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Details ausblenden"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Einstellungen"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Hochgeladen: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Hochladen"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
@@ -41,10 +41,10 @@
     <string name="upload_state_queued" msgid="3990598443227105526"></string>
     <string name="upload_state_waiting_retry" msgid="471790705731784779">"Warten auf erneuten Versuch"</string>
     <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Warten auf WLAN"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Upload wird durchgeführt"</string>
+    <string name="upload_state_uploading" msgid="82854465974176047">"Wird hochgeladen..."</string>
     <string name="upload_state_failed" msgid="3799932718800848294">"Fehlgeschlagen"</string>
     <string name="upload_state_completed" msgid="5638163990418071018">"Abgeschlossen"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"Hochladen"</string>
+    <string name="pause_state_running" msgid="711411177620353982">"Wird hochgeladen..."</string>
     <string name="pause_state_manually_paused" msgid="4837627990158796573">"Manuell ausgesetzt"</string>
     <string name="pause_state_low_battery" msgid="3154677586511229063">"Ausgesetzt - Akku schwach"</string>
     <string name="pause_state_need_charger" msgid="5014741655713255815">"Ausgesetzt - zuerst Akku laden"</string>
@@ -61,7 +61,7 @@
     <string name="completed_no_file" msgid="6719715000947601844">"Datei nicht gefunden"</string>
     <string name="failed_bad_response" msgid="8357723053952213242">"Dienstfehler"</string>
     <string name="failed_network_error" msgid="2531660472217573602">"Netzwerkfehler"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Authentifizierung fehlgeschlagen"</string>
+    <string name="failed_server_auth" msgid="2428208784689362254">"Fehler bei Authentifizierung"</string>
     <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Ausstehende Uploads [%d]"</string>
     <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Abgeschlossene Uploads [%d]"</string>
     <string name="manager_pause" msgid="7046645023617816964">"Uploads anhalten"</string>
diff --git a/res/values-el/uploader.xml b/res/values-el/uploader.xml
index 5cc8922..62e6b7a 100644
--- a/res/values-el/uploader.xml
+++ b/res/values-el/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Απόκρυψη λεπτομερειών"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ρυθμίσεις"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Μεταφορτώθηκαν %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Λογαριασμός"</string>
     <string name="upload" msgid="2615541458361216022">"Μεταφόρτωση"</string>
     <string name="ok" msgid="2516349681897895312">"ΟΚ"</string>
diff --git a/res/values-en-rGB/uploader.xml b/res/values-en-rGB/uploader.xml
index 17bcf92..884d923 100644
--- a/res/values-en-rGB/uploader.xml
+++ b/res/values-en-rGB/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Hide Details"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Settings"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Uploaded %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"Upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 60ef315..8fc73d3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -268,9 +268,9 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceptar todos)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo del servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
diff --git a/res/values-es-rUS/uploader.xml b/res/values-es-rUS/uploader.xml
index b3d5839..5dda4d0 100644
--- a/res/values-es-rUS/uploader.xml
+++ b/res/values-es-rUS/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalles"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configuración"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s cargados"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cuenta"</string>
     <string name="upload" msgid="2615541458361216022">"Cargar"</string>
     <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
index fb6ff2a..c706c4a 100644
--- a/res/values-es/uploader.xml
+++ b/res/values-es/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalles"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ajustes"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Subido el: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cuenta"</string>
     <string name="upload" msgid="2615541458361216022">"Subir"</string>
     <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
diff --git a/res/values-et/uploader.xml b/res/values-et/uploader.xml
index a13e319..f42e288 100644
--- a/res/values-et/uploader.xml
+++ b/res/values-et/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Peida üksikasjad"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Seaded"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Üles laaditud %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Laadi üles"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-fa/uploader.xml b/res/values-fa/uploader.xml
index f4657da..2be670d 100644
--- a/res/values-fa/uploader.xml
+++ b/res/values-fa/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"در حال آپلود"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"تمام شد"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"موقتاً متوقف شد"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d عکس • %3$d ویدیو"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d عکس ؟؟؟ %2$d ویدیو"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d عکس • %3$d ویدئو"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d عکس ؟؟؟ %2$d ویدئو"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"باتری ضعیف است"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"از تعداد مجاز عکس‌ها بیشتر شد"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"رومینگ"</string>
@@ -30,7 +30,7 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for format_date_uploaded (803752037646090928) -->
     <skip />
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"حساب"</string>
     <string name="upload" msgid="2615541458361216022">"آپلود"</string>
     <string name="ok" msgid="2516349681897895312">"تأیید"</string>
@@ -57,9 +57,9 @@
     <string name="pause_state_need_wifi" msgid="231858819136516913">"موقتاً متوقف شد - در انتظار wifi"</string>
     <string name="pause_state_roaming" msgid="1811348200068311099">"موقتاً متوقف شد - در حال رومینگ"</string>
     <string name="pause_state_retrying" msgid="3734440128828177639">"در انتظار سعی مجدد"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 دقیقه"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 دقیقه"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 دقیقه"</string>
+    <string name="retry_in_1min" msgid="2242454935194420914">"۱ دقیقه"</string>
+    <string name="retry_in_2min" msgid="5845688527405283031">"۲ دقیقه"</string>
+    <string name="retry_in_5min" msgid="3153220715959570358">"۵ دقیقه"</string>
     <string name="retry_no_data" msgid="630347885498641534">"بدون اتصال داده"</string>
     <string name="account_out_of_quota" msgid="1849612079678906607">"فضای دیسک حساب پر است"</string>
     <string name="completed_no_file" msgid="6719715000947601844">"فایل یافت نشد"</string>
@@ -87,8 +87,8 @@
     <string name="notify_paused" msgid="3999817913227671338">"آپلود موقتاً متوقف شد"</string>
     <string name="notify_activation_reminder" msgid="1639234651193843030">"Instant Upload هنوز فعال نشده است"</string>
     <string name="dialog_first_wifi" msgid="4318047428346248089">"فایل‌های بزرگ فقط از طریق اتصال WiFi آپلود می‌شوند."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"درحال اسکن فایل‌ها..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"آماده‌سازی <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> عکس و <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> ویدیو برای آپلود..."</string>
+    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"در حال اسکن فایل‌ها..."</string>
+    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"آماده‌سازی <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> عکس و <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> ویدئو برای آپلود..."</string>
     <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"لازم نیست هیچ عکس/ویدیوی دیگری آپلود شود."</string>
     <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"هنگام ارتباط با سرور مشکلی پیش آمد. لطفاً بعداً دوباره امتحان کنید."</string>
     <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"همگام‌سازی همه لغو شد"</string>
@@ -105,14 +105,14 @@
     <string name="preference_title_photos_account" msgid="1235191190019405102">"حساب"</string>
     <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"شرایط آپلود"</string>
     <string name="preference_title_photo_size" msgid="2291608017215972660">"اندازه عکس"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"ویدیوها"</string>
+    <string name="preference_category_title_videos" msgid="8962400910793075570">"ویدئوها"</string>
     <string name="preference_title_videos_account" msgid="6675545508568161301">"حساب"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"از حساب عکس‌ها برای آپلودهای ویدیو استفاده می‌شود."</string>
+    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"از حساب عکس‌ها برای آپلودهای ویدئو استفاده می‌شود."</string>
     <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"شرایط آپلود"</string>
     <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"در حال حاضر از تنظیمات اتصال عکس‌ها استفاده می‌شود."</string>
     <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"فقط عکس‌ها از طریق شبکه‌های تلفن همراه"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"عکس‌ها و ویدیوها از طریق شبکه‌های تلفن همراه"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"آپلود عکس‌ها و ویدیوها فقط از طریق Wi-Fi"</string>
+    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"عکس‌ها و ویدئوها از طریق شبکه‌های تلفن همراه"</string>
+    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"آپلود عکس‌ها و ویدئوها فقط از طریق Wi-Fi"</string>
     <string name="preference_category_title_about" msgid="3001183168471659844">"درباره"</string>
     <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"نسخه Instant Upload"</string>
     <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"توصیه می‌شود: 1600 پیکسل (برای اشتراک‌گذاری، موارد چاپی و محافظ‌های صفحه)"</string>
@@ -121,25 +121,25 @@
     <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"کارت SD موجود نیست"</string>
     <string name="preference_plus_title" msgid="8505499389432915393">"تنظیمات Instant Upload"</string>
     <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"آپلود عکس‌ها و ویدیوهای جدید به صورت خودکار در یک آلبوم وب خصوصی"</string>
+    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"آپلود عکس‌ها و ویدئوهای جدید به صورت خودکار در یک آلبوم وب خصوصی"</string>
     <string name="preference_plus_upload_status" msgid="7925576302519589779">"وضعیت آپلود"</string>
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"پیشرفته"</string>
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"آپلودهای تلفن همراه"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"آپلودهای رومینگ"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"آپلود  عکس‌ها و ویدیوها در هنگام رومینگ در شبکه داده انجام شود"</string>
+    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"آپلود  عکس‌ها و ویدئوها در هنگام رومینگ در شبکه داده انجام شود"</string>
     <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"آپلودهای باتری"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"آپلود عکس‌ها و ویدیوها فقط هنگام شارژ کردن"</string>
+    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"آپلود عکس‌ها و ویدئوها فقط هنگام شارژ کردن"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"آپلود عکس‌های موجود"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"هرگونه عکس و ویدیوی موجود در تلفن خود را هم اکنون آپلود کنید"</string>
+    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"هرگونه عکس و ویدیوی موجود در تلفن خود را هم‌اکنون آپلود کنید"</string>
     <string name="summary_subtitle_disabled" msgid="8964378166312900703">"غیرفعال شد"</string>
     <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"درحال آپلود (%1$d%%)"</string>
+    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"در حال آپلود (%1$d%%)"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
     <skip />
     <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"موقتاً متوقف شد: برای از سرگیری آپلود، لمس کنید"</string>
     <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"آپلود عکس‌های موجود"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"آپلود عکس‌ها و ویدیوهایی که هنوز از تلفن شما در یک آلبوم خصوصی روی وب آپلود نشده‌اند ممکن است کمی طول بکشد، اما در پس زمینه انجام خواهد شد. آیا مطمئن هستید که می‌خواهید ادامه دهید؟"</string>
+    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"آپلود عکس‌ها و ویدئوهایی که هنوز از تلفن شما در یک آلبوم خصوصی روی وب آپلود نشده‌اند ممکن است کمی طول بکشد، اما در پس‌زمینه انجام خواهد شد. آیا مطمئن هستید که می‌خواهید ادامه دهید؟"</string>
     <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"بله"</string>
     <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"خیر"</string>
 </resources>
diff --git a/res/values-fi/uploader.xml b/res/values-fi/uploader.xml
index 8ca406f..1705717 100644
--- a/res/values-fi/uploader.xml
+++ b/res/values-fi/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Piilota tiedot"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Asetukset"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Ladattu %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Tili"</string>
     <string name="upload" msgid="2615541458361216022">"Lataa"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
index 42de0bc..f3e16a1 100644
--- a/res/values-fr/uploader.xml
+++ b/res/values-fr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Masquer les détails"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Paramètres"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Transféré le %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Compte"</string>
     <string name="upload" msgid="2615541458361216022">"Transférer"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-hi/uploader.xml b/res/values-hi/uploader.xml
index b06101a..162d1e2 100644
--- a/res/values-hi/uploader.xml
+++ b/res/values-hi/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"विवरण छुपाएं"</string>
     <string name="menu_settings" msgid="5088116127086866634">"सेटिंग"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"अपलोड किया गया %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"खाता"</string>
     <string name="upload" msgid="2615541458361216022">"अपलोड करें"</string>
     <string name="ok" msgid="2516349681897895312">"ठीक"</string>
@@ -64,7 +64,7 @@
     <string name="failed_server_auth" msgid="2428208784689362254">"प्रमाणीकरण विफल"</string>
     <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"लंबित अपलोड [%d]"</string>
     <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"पूर्ण किए गए अपलोड [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"अपलोड रोकें"</string>
+    <string name="manager_pause" msgid="7046645023617816964">"अपलोड पॉज़ करें"</string>
     <string name="manager_resume" msgid="1608630525599824933">"अपलोड फिर से शुरू करें"</string>
     <string name="manager_upload_now" msgid="2284408578936376342">"अभी अपलोड करें"</string>
     <string name="manager_upload_later" msgid="5453932124711705632">"बाद में अपलोड करें"</string>
@@ -90,7 +90,7 @@
     <string name="manager_view_completed" msgid="5119780300858727185">"पूर्ण देखें"</string>
     <string name="manager_view_pending" msgid="4403346072556950609">"लंबित देखें"</string>
     <string name="preference_category_title_general" msgid="330919434495694575">"सामान्य"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"सभी अपलोड रोकें"</string>
+    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"सभी अपलोड पॉज़ करें"</string>
     <string name="preference_title_need_power" msgid="9165152026296632685">"पावर"</string>
     <string name="preference_summary_need_power" msgid="1829578224249216151">"केवल तभी अपलोड करें जब फ़ोन चार्ज किया जा रहा हो."</string>
     <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
diff --git a/res/values-hr/uploader.xml b/res/values-hr/uploader.xml
index e84da77..124e7f1 100644
--- a/res/values-hr/uploader.xml
+++ b/res/values-hr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sakrij pojedinosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Postavke"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Preneseno %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Račun"</string>
     <string name="upload" msgid="2615541458361216022">"Šalji"</string>
     <string name="ok" msgid="2516349681897895312">"U redu"</string>
diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
index 2560959..480cddb 100644
--- a/res/values-hu/uploader.xml
+++ b/res/values-hu/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Részletek elrejtése"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Beállítások"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"%s feltöltve"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Fiók"</string>
     <string name="upload" msgid="2615541458361216022">"Feltöltés"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-in/uploader.xml b/res/values-in/uploader.xml
index fa9c3be..8d8230b 100644
--- a/res/values-in/uploader.xml
+++ b/res/values-in/uploader.xml
@@ -3,8 +3,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Unggah Sekejap"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album Unggah Sekejap"</string>
+    <string name="application_name" msgid="7812006268714926951">"Upload Instan"</string>
+    <string name="picasa_default_destination" msgid="2052406684123992574">"Album Upload Instan"</string>
     <string name="summary_title_uploading" msgid="3357617474017589370">"Mengunggah"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Selesai"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Dijeda"</string>
@@ -19,23 +19,23 @@
     <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"mencoba ulang dalam %s"</string>
     <string name="summary_menu_show_pending" msgid="658361192495996">"Tampilkan Unggahan yang Tertunda"</string>
     <string name="summary_menu_show_finished" msgid="8544099132633066086">"Tampilkan Unggahan yang Sudah Selesai"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Lihat Secara Daring"</string>
+    <string name="menu_view_online" msgid="6546633605818509942">"Lihat Secara Online"</string>
     <string name="menu_show_pending_items" msgid="8798191388238604213">"Tampilkan Unggahan yang Tertunda"</string>
     <string name="menu_hide_pending_items" msgid="9216079748638469160">"Sembunyikan Unggahan yang Tertunda"</string>
     <string name="menu_show_completed_items" msgid="4380487776635859783">"Tampilkan Detail"</string>
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sembunyikan Detail"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Setelan"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Diunggah %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Akun"</string>
     <string name="upload" msgid="2615541458361216022">"Unggah"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
+    <string name="ok" msgid="2516349681897895312">"Oke"</string>
     <string name="cancel" msgid="1207103189404543868">"Batal"</string>
     <string name="uploading_to" msgid="3986362895940069510">"Mengunggah ke "<b>"%s"</b></string>
     <string name="uploading_for" msgid="1735961974624867111">" untuk "<b>"%s"</b></string>
     <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
     <string name="toast_intent_error" msgid="6164928822619692280">"Inisiasi unggahan gagal."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Berkas tidak tersedia."</string>
+    <string name="toast_file_error" msgid="1315722681020841350">"File tidak tersedia."</string>
     <string name="account_error" msgid="1904775271866104941">"Gagal mengambil informasi akun."</string>
     <string name="toast_failed_auth" msgid="2196450105656960566">"Terjadi masalah saat masuk ke akun Anda."</string>
     <string name="upload_state_queued" msgid="3990598443227105526"></string>
@@ -57,10 +57,10 @@
     <string name="retry_in_2min" msgid="5845688527405283031">"2 menit"</string>
     <string name="retry_in_5min" msgid="3153220715959570358">"5 menit"</string>
     <string name="retry_no_data" msgid="630347885498641534">"Tidak ada sambungan data"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Kuota diska akun habis"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Berkas tidak ditemukan"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Galat layanan"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Galat jaringan"</string>
+    <string name="account_out_of_quota" msgid="1849612079678906607">"Kuota disk akun habis"</string>
+    <string name="completed_no_file" msgid="6719715000947601844">"File tidak ditemukan"</string>
+    <string name="failed_bad_response" msgid="8357723053952213242">"Kesalahan layanan"</string>
+    <string name="failed_network_error" msgid="2531660472217573602">"Kesalahan jaringan"</string>
     <string name="failed_server_auth" msgid="2428208784689362254">"Autentikasi gagal"</string>
     <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Unggahan yang tertunda [%d]"</string>
     <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Unggahan yang selesai [%d]"</string>
@@ -76,12 +76,12 @@
     <string name="manager_sync_all" msgid="5207146576940014345">"Sinkronkan semua"</string>
     <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Sinkronisasi Terakhir:"\n"%1$s"\n"%2$s"</string>
     <string name="finished_empty" msgid="689924777356099393">"Daftar item yang selesai kosong."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Unggah Sekejap"</string>
+    <string name="notify_uploads" msgid="8593982942665493037">"Upload Instan"</string>
     <string name="notify_resolved" msgid="8111194870485485674">"Unggahan selesai"</string>
     <string name="notify_paused" msgid="3999817913227671338">"Unggahan dijeda"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Unggah Sekejap belum diaktifkan"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Berkas berukuran besar akan diunggah melalui sambungan WiFi saja."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Memindai berkas..."</string>
+    <string name="notify_activation_reminder" msgid="1639234651193843030">"Upload Instan belum diaktifkan"</string>
+    <string name="dialog_first_wifi" msgid="4318047428346248089">"File berukuran besar akan diunggah melalui sambungan WiFi saja."</string>
+    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Memindai file..."</string>
     <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Menyiapkan <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto dan <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video untuk diunggah..."</string>
     <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Tidak ada foto/video tambahan yang perlu diunggah."</string>
     <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Terjadi masalah saat berkomunikasi dengan server. Coba lagi nanti."</string>
@@ -108,13 +108,13 @@
     <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Foto &amp; video melalui jaringan seluler"</string>
     <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Foto &amp; video melalui Wi-Fi saja"</string>
     <string name="preference_category_title_about" msgid="3001183168471659844">"Tentang"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Versi Unggah Sekejap"</string>
+    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Versi Upload Instan"</string>
     <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Disarankan: 1600 piksel (untuk berbagi, dicetak, dan screensaver)"</string>
     <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Ukuran asli (unggahan paling lambat)"</string>
     <string name="pause_state_need_media" msgid="3849758767808306320">"dijeda - kartu SD tidak tersedia"</string>
     <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Kartu SD tidak tersedia"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Setelan Unggah Sekejap"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Unggah Sekejap"</string>
+    <string name="preference_plus_title" msgid="8505499389432915393">"Setelan Upload Instan"</string>
+    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Upload Instan"</string>
     <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Otomatis mengunggah foto &amp; video baru ke album web pribadi"</string>
     <string name="preference_plus_upload_status" msgid="7925576302519589779">"Status unggahan"</string>
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Lanjutan"</string>
diff --git a/res/values-it/uploader.xml b/res/values-it/uploader.xml
index e1fa61b..7441ef0 100644
--- a/res/values-it/uploader.xml
+++ b/res/values-it/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Nascondi dettagli"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Impostazioni"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Data caricamento: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"Carica"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-iw/uploader.xml b/res/values-iw/uploader.xml
index 712280b..4d34fdf 100644
--- a/res/values-iw/uploader.xml
+++ b/res/values-iw/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"הסתר פרטים"</string>
     <string name="menu_settings" msgid="5088116127086866634">"הגדרות"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"הועלה בתאריך %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"חשבון"</string>
     <string name="upload" msgid="2615541458361216022">"העלה"</string>
     <string name="ok" msgid="2516349681897895312">"אישור"</string>
diff --git a/res/values-ja/uploader.xml b/res/values-ja/uploader.xml
index c3d7ec4..bcd33ca 100644
--- a/res/values-ja/uploader.xml
+++ b/res/values-ja/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"詳細を表示しない"</string>
     <string name="menu_settings" msgid="5088116127086866634">"設定"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"アップロード済み: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"アカウント"</string>
     <string name="upload" msgid="2615541458361216022">"アップロード"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 302f19e..dea494b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -399,7 +399,7 @@
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"동기화 옵션"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"동기화 옵션(<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_preferences_header" msgid="9077316556563252246">"동기화 설정"</string>
-    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"주파수 확인"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"확인 빈도"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"동기화할 일 수"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"이메일 계정"</string>
     <string name="account_shortcut_picker_title" msgid="1039929224016048015">"계정 선택"</string>
diff --git a/res/values-ko/uploader.xml b/res/values-ko/uploader.xml
index adbc79f..64dec28 100644
--- a/res/values-ko/uploader.xml
+++ b/res/values-ko/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"세부정보 숨기기"</string>
     <string name="menu_settings" msgid="5088116127086866634">"설정"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"업로드 날짜: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"계정"</string>
     <string name="upload" msgid="2615541458361216022">"업로드"</string>
     <string name="ok" msgid="2516349681897895312">"확인"</string>
diff --git a/res/values-lt/uploader.xml b/res/values-lt/uploader.xml
index d1a65c6..281fd8c 100644
--- a/res/values-lt/uploader.xml
+++ b/res/values-lt/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Slėpti išsamią informaciją"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nustatymai"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Įkelta %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Paskyra"</string>
     <string name="upload" msgid="2615541458361216022">"Įkelti"</string>
     <string name="ok" msgid="2516349681897895312">"Gerai"</string>
diff --git a/res/values-lv/uploader.xml b/res/values-lv/uploader.xml
index d333de6..82b74df 100644
--- a/res/values-lv/uploader.xml
+++ b/res/values-lv/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Slēpt informāciju"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Iestatījumi"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Augšupielādēts: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konts"</string>
     <string name="upload" msgid="2615541458361216022">"Augšupielādēt"</string>
     <string name="ok" msgid="2516349681897895312">"Labi"</string>
diff --git a/res/values-ms/uploader.xml b/res/values-ms/uploader.xml
index 1b760de..3d1ce5d 100644
--- a/res/values-ms/uploader.xml
+++ b/res/values-ms/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sembunyikan Butiran"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Tetapan"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Dimuat naik %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Akaun"</string>
     <string name="upload" msgid="2615541458361216022">"Muat naik"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-nb/uploader.xml b/res/values-nb/uploader.xml
index 0846aff..cdf19ce 100644
--- a/res/values-nb/uploader.xml
+++ b/res/values-nb/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skjul detaljer"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Innstillinger"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Lastet opp %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Last opp"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
@@ -54,8 +54,8 @@
     <string name="pause_state_roaming" msgid="1811348200068311099">"satt på pause – roaming"</string>
     <string name="pause_state_retrying" msgid="3734440128828177639">"venter på å prøve på nytt"</string>
     <string name="retry_in_1min" msgid="2242454935194420914">"Ett minutt"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"To minutter"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"Fem minutter"</string>
+    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutter"</string>
+    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutter"</string>
     <string name="retry_no_data" msgid="630347885498641534">"Ingen datatilkobling"</string>
     <string name="account_out_of_quota" msgid="1849612079678906607">"Kontoen har ingen tilgjengelig diskkvote"</string>
     <string name="completed_no_file" msgid="6719715000947601844">"Finner ikke filen"</string>
diff --git a/res/values-nl/uploader.xml b/res/values-nl/uploader.xml
index f2d6c82..451f05e 100644
--- a/res/values-nl/uploader.xml
+++ b/res/values-nl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Details verbergen"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Instellingen"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Geüpload op %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"Uploaden"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-pl/uploader.xml b/res/values-pl/uploader.xml
index c409683..5c7a8ee 100644
--- a/res/values-pl/uploader.xml
+++ b/res/values-pl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ukryj szczegóły"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ustawienia"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Przesłano: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Prześlij"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-pt-rPT/uploader.xml b/res/values-pt-rPT/uploader.xml
index fe226aa..8421814 100644
--- a/res/values-pt-rPT/uploader.xml
+++ b/res/values-pt-rPT/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar Detalhes"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configurações"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Carregados: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Conta"</string>
     <string name="upload" msgid="2615541458361216022">"fazer upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-pt/uploader.xml b/res/values-pt/uploader.xml
index bf9b379..f236164 100644
--- a/res/values-pt/uploader.xml
+++ b/res/values-pt/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalhes"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Configurações"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Enviado %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Conta"</string>
     <string name="upload" msgid="2615541458361216022">"Enviar"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-rm/uploader.xml b/res/values-rm/uploader.xml
index 1faf9ef..1f6568e 100644
--- a/res/values-rm/uploader.xml
+++ b/res/values-rm/uploader.xml
@@ -49,7 +49,7 @@
     <skip />
     <!-- no translation found for format_date_uploaded (803752037646090928) -->
     <skip />
-    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <!-- no translation found for format_progress_percent (4347398038122210157) -->
     <skip />
     <!-- no translation found for account (5199161365824352613) -->
     <skip />
diff --git a/res/values-ro/uploader.xml b/res/values-ro/uploader.xml
index b06fe41..a3af219 100644
--- a/res/values-ro/uploader.xml
+++ b/res/values-ro/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ascundeţi detaliile"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Setări"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Încărcat pe %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cont"</string>
     <string name="upload" msgid="2615541458361216022">"Încărcaţi"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-ru/uploader.xml b/res/values-ru/uploader.xml
index 08dbd9e..247ac01 100644
--- a/res/values-ru/uploader.xml
+++ b/res/values-ru/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Скрыть подробности"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Настройки"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Загружено %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Аккаунт"</string>
     <string name="upload" msgid="2615541458361216022">"Загрузить"</string>
     <string name="ok" msgid="2516349681897895312">"ОК"</string>
diff --git a/res/values-sk/uploader.xml b/res/values-sk/uploader.xml
index ffbdfd6..a12915a 100644
--- a/res/values-sk/uploader.xml
+++ b/res/values-sk/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skryť podrobnosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nastavenia"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Odovzdané: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Účet"</string>
     <string name="upload" msgid="2615541458361216022">"Odovzdať"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-sl/uploader.xml b/res/values-sl/uploader.xml
index d7b6591..0e6e813 100644
--- a/res/values-sl/uploader.xml
+++ b/res/values-sl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skrij podrobnosti"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Nastavitve"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Preneseno: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Račun"</string>
     <string name="upload" msgid="2615541458361216022">"Prenesi"</string>
     <string name="ok" msgid="2516349681897895312">"V redu"</string>
diff --git a/res/values-sr/uploader.xml b/res/values-sr/uploader.xml
index 43f162d..30f30a8 100644
--- a/res/values-sr/uploader.xml
+++ b/res/values-sr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Сакриј детаље"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Подешавања"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Отпремљено %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Налог"</string>
     <string name="upload" msgid="2615541458361216022">"Отпреми"</string>
     <string name="ok" msgid="2516349681897895312">"Потврди"</string>
@@ -49,7 +49,7 @@
     <string name="pause_state_low_battery" msgid="3154677586511229063">"паузирано – слаба батерија"</string>
     <string name="pause_state_need_charger" msgid="5014741655713255815">"паузирано – одложено до пуњења"</string>
     <string name="pause_state_need_connectivity" msgid="338696137467815955">"паузирано – чека се веза"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"паузирано – премашена је квота Picasa веб албума"</string>
+    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"паузирано – премашена је квота Picasa веб-албума"</string>
     <string name="pause_state_need_wifi" msgid="231858819136516913">"паузирано – чека се wifi"</string>
     <string name="pause_state_roaming" msgid="1811348200068311099">"паузирано – роминг"</string>
     <string name="pause_state_retrying" msgid="3734440128828177639">"чека се поновни покушај"</string>
@@ -115,7 +115,7 @@
     <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD картица је недоступна"</string>
     <string name="preference_plus_title" msgid="8505499389432915393">"Подешавања Инстант отпремања"</string>
     <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Инстант отпремање"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Аутоматско отпремање нових фотографија и видео снимака у приватни веб албум"</string>
+    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Аутоматско отпремање нових фотографија и видео снимака у приватни веб-албум"</string>
     <string name="preference_plus_upload_status" msgid="7925576302519589779">"Статус отпремања"</string>
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Напредна подешавања"</string>
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Отпремања са мобилног уређаја"</string>
@@ -131,7 +131,7 @@
     <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d од %2$d"</string>
     <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Паузирано: додирните да бисте наставили отпремање"</string>
     <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Отпремање постојећих фотографија"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Отпремање фотографија и видео снимака који нису до сада отпремљени са телефона у приватни албум на Вебу може мало да потраје, али ће се обавити у позадини. Да ли заиста желите да наставите?"</string>
+    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Отпремање фотографија и видео снимака који нису до сада отпремљени са телефона у приватни албум на вебу може мало да потраје, али ће се обавити у позадини. Да ли заиста желите да наставите?"</string>
     <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Да"</string>
     <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Не"</string>
 </resources>
diff --git a/res/values-sv/uploader.xml b/res/values-sv/uploader.xml
index af8cfcb..f3b3b1e 100644
--- a/res/values-sv/uploader.xml
+++ b/res/values-sv/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Dölj detaljer"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Inställningar"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Överförde %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Konto"</string>
     <string name="upload" msgid="2615541458361216022">"Överför"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-sw/uploader.xml b/res/values-sw/uploader.xml
index 9544b3e..df32aa5 100644
--- a/res/values-sw/uploader.xml
+++ b/res/values-sw/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ficha Maelezo"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Mipangilio"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Imepakia %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"Kishika nafasi<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Akaunti"</string>
     <string name="upload" msgid="2615541458361216022">"Pakia"</string>
     <string name="ok" msgid="2516349681897895312">"Sawa"</string>
@@ -118,7 +118,7 @@
     <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Pakiza otomatiki picha mpya na video &amp; kwa albamu faragha ya wavuti"</string>
     <string name="preference_plus_upload_status" msgid="7925576302519589779">"Hali ya kupakia"</string>
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Mahiri"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Vipakizi vya simu ya mkononi"</string>
+    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Vipakiwa vya simu ya mkononi"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Vipakizi vya urandaji"</string>
     <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Pakia picha na video za na; wakati  wa urandaji katika mtandao wa data"</string>
     <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Vipakizi vya betri"</string>
diff --git a/res/values-th/uploader.xml b/res/values-th/uploader.xml
index 3c4cd2d..9849adf 100644
--- a/res/values-th/uploader.xml
+++ b/res/values-th/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"ซ่อนรายละเอียด"</string>
     <string name="menu_settings" msgid="5088116127086866634">"การตั้งค่า"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"อัปโหลดแล้ว %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"บัญชี"</string>
     <string name="upload" msgid="2615541458361216022">"อัปโหลด"</string>
     <string name="ok" msgid="2516349681897895312">"ตกลง"</string>
diff --git a/res/values-tl/uploader.xml b/res/values-tl/uploader.xml
index 157de85..b21305c 100644
--- a/res/values-tl/uploader.xml
+++ b/res/values-tl/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Itago ang Mga Detalye"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Mga Setting"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Na-upload %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Account"</string>
     <string name="upload" msgid="2615541458361216022">"I-upload"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-tr/uploader.xml b/res/values-tr/uploader.xml
index 1c367db..a7a3076 100644
--- a/res/values-tr/uploader.xml
+++ b/res/values-tr/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ayrıntıları Gizle"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Ayarlar"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Yükleme tarihi: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="PERCENTSIGN">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Hesap"</string>
     <string name="upload" msgid="2615541458361216022">"Yükle"</string>
     <string name="ok" msgid="2516349681897895312">"TAMAM"</string>
diff --git a/res/values-uk/uploader.xml b/res/values-uk/uploader.xml
index f894c08..6f6af5b 100644
--- a/res/values-uk/uploader.xml
+++ b/res/values-uk/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Сховати деталі"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Налаштування"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Завантажено: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Обліковий запис"</string>
     <string name="upload" msgid="2615541458361216022">"Завантажити"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
index f8ad2a0..66c6374 100644
--- a/res/values-vi/uploader.xml
+++ b/res/values-vi/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ẩn chi tiết"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Cài đặt"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Đã tải lên %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Tài khoản"</string>
     <string name="upload" msgid="2615541458361216022">"Tải lên"</string>
     <string name="ok" msgid="2516349681897895312">"OK"</string>
diff --git a/res/values-zh-rCN/uploader.xml b/res/values-zh-rCN/uploader.xml
index e227885..d7c3cc3 100644
--- a/res/values-zh-rCN/uploader.xml
+++ b/res/values-zh-rCN/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"隐藏详情"</string>
     <string name="menu_settings" msgid="5088116127086866634">"设置"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"上传时间：%s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"帐户"</string>
     <string name="upload" msgid="2615541458361216022">"上传"</string>
     <string name="ok" msgid="2516349681897895312">"确定"</string>
@@ -120,7 +120,7 @@
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"高级"</string>
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"使用移动网络时的上传设置"</string>
     <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"漫游时的上传设置"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"在数据网络中漫游时上传照片和视频"</string>
+    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"在移动数据网络中漫游时上传照片和视频"</string>
     <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"充电时上传"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"仅在充电时上传照片和视频"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"上传现有照片"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 32bb0b6..f8392bc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -448,7 +448,7 @@
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"「顯示圖片」已清除。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步處理"</string>
-    <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"您的電子郵件即將顯示。"</string>
+    <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"即將顯示您的電子郵件。"</string>
     <string name="widget_other_views" msgid="4988574907386539499">"輕觸圖示即可變更。"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"整合式收件匣"</string>
     <string name="widget_unread" msgid="4404711399009077833">"未讀取"</string>
diff --git a/res/values-zh-rTW/uploader.xml b/res/values-zh-rTW/uploader.xml
index 4b32be3..3fd744b 100644
--- a/res/values-zh-rTW/uploader.xml
+++ b/res/values-zh-rTW/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"隱藏詳細資料"</string>
     <string name="menu_settings" msgid="5088116127086866634">"設定"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"上傳日期：%s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"帳戶"</string>
     <string name="upload" msgid="2615541458361216022">"上傳"</string>
     <string name="ok" msgid="2516349681897895312">"確定"</string>
diff --git a/res/values-zu/uploader.xml b/res/values-zu/uploader.xml
index 47750de..60a78f1 100644
--- a/res/values-zu/uploader.xml
+++ b/res/values-zu/uploader.xml
@@ -26,7 +26,7 @@
     <string name="menu_hide_completed_items" msgid="6126007571523662799">"Fihla imininingwane"</string>
     <string name="menu_settings" msgid="5088116127086866634">"Izilungiselelo"</string>
     <string name="format_date_uploaded" msgid="803752037646090928">"Kulayishiwe %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+    <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"I-akhawunti"</string>
     <string name="upload" msgid="2615541458361216022">"Layisha"</string>
     <string name="ok" msgid="2516349681897895312">"KULUNGILE"</string>
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index 6496ef9..c4ee10b 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -239,8 +239,8 @@
     private Intent getOpenMessageIntent(final Context context, final long messageId,
             final long mailboxId) {
         Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
-        return Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
-                        mailboxId, messageId);
+        return (mailbox == null) ? null : Welcome.createOpenMessageIntent(context,
+                mailbox.mAccountKey, mailboxId, messageId);
     }
 
     private void setTextViewTextAndDesc(RemoteViews views, final int id, String text) {