diff --git a/api/res/values-ca/strings.xml b/api/res/values-ca/strings.xml
index 934b4ddc3..8b5c9892f 100644
--- a/api/res/values-ca/strings.xml
+++ b/api/res/values-ca/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Sincronització en curs...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Última sincronització:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Fallida el: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-cs/strings.xml b/api/res/values-cs/strings.xml
index 5f2d720c9..5c207ea9b 100644
--- a/api/res/values-cs/strings.xml
+++ b/api/res/values-cs/strings.xml
@@ -160,13 +160,13 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Probíhá synchronizace...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Poslední synchronizace:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Selhalo: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
   <string name="sync_status_errors">Sync w/ Errors: %s</string>
   <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Poslední úspěšná synchronizace</string>
+  <string name="sync_status_failed_subtitle">Poslední úspěšná synchronizace: %s</string>
   <!-- Sync Status: never sync'd -->    
   <string name="sync_status_never">Nikdo nesynchronizováno!</string>
 
diff --git a/api/res/values-de/strings.xml b/api/res/values-de/strings.xml
index 73e0a0aaf..08246eacd 100644
--- a/api/res/values-de/strings.xml
+++ b/api/res/values-de/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Synchronisierung läuft...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Letzte Synchronisierung:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Fehlgeschlagen am: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-es/strings.xml b/api/res/values-es/strings.xml
index 212f25f6e..27e7c96f2 100644
--- a/api/res/values-es/strings.xml
+++ b/api/res/values-es/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Sincronización en curso...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Última sincronización:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Falló el: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-fr/strings.xml b/api/res/values-fr/strings.xml
index c32335efc..a4f287d5c 100644
--- a/api/res/values-fr/strings.xml
+++ b/api/res/values-fr/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Synchronisation en cours...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Dernière synchro. :\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Échec sur : %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-it/strings.xml b/api/res/values-it/strings.xml
index a3d815948..c7569d64d 100644
--- a/api/res/values-it/strings.xml
+++ b/api/res/values-it/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Sincronizzazione in corso ...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Ultima Sincronizzazione:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Fallita Su: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-ja/strings.xml b/api/res/values-ja/strings.xml
index 1e69adfc7..d77245312 100644
--- a/api/res/values-ja/strings.xml
+++ b/api/res/values-ja/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">同期中</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">前回の同期:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">失敗: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-ko/strings.xml b/api/res/values-ko/strings.xml
index cd7d4affb..ee69de937 100644
--- a/api/res/values-ko/strings.xml
+++ b/api/res/values-ko/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">동기화 진행중...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">마지막 동기화: \n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">실패: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-nb/strings.xml b/api/res/values-nb/strings.xml
index b304e6ad9..98c216343 100644
--- a/api/res/values-nb/strings.xml
+++ b/api/res/values-nb/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Synkronisering pågår...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Siste synkronisering:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Mislykket: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-nl/strings.xml b/api/res/values-nl/strings.xml
index 686fa5908..7d1c0999d 100644
--- a/api/res/values-nl/strings.xml
+++ b/api/res/values-nl/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Synchronisatie bezig...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Vorige:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Mislukt op: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-sv/strings.xml b/api/res/values-sv/strings.xml
index 95a394b38..a8fac65b7 100644
--- a/api/res/values-sv/strings.xml
+++ b/api/res/values-sv/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">Synkronisering pågår...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Synkroniserades senast:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Misslyckades: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-zh-rCN/strings.xml b/api/res/values-zh-rCN/strings.xml
index 9a85a1b19..7f517088f 100644
--- a/api/res/values-zh-rCN/strings.xml
+++ b/api/res/values-zh-rCN/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">同步中...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">上次同步：\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">失败：%s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/api/res/values-zh-rTW/strings.xml b/api/res/values-zh-rTW/strings.xml
index da237e75c..c329aed4c 100644
--- a/api/res/values-zh-rTW/strings.xml
+++ b/api/res/values-zh-rTW/strings.xml
@@ -160,7 +160,7 @@
   <!-- Status: ongoing -->    
   <string name="sync_status_ongoing">同步中...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">上次同步:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">失敗: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index be131d576..d0ba81946 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -86,7 +86,7 @@
   <string name="actfm_TVA_tag_owner_none">none</string>
 
   <!-- Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Shared With:</string>
+  <string name="actfm_TVA_members_label">Spolupracovníci:</string>
 
   <!-- Tag Settings: tag picture -->
   <string name="actfm_TVA_tag_picture">Obrázek listu</string>
@@ -131,7 +131,7 @@
   <string name="actfm_EPA_assign_custom">Custom...</string>
   
   <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Share with:</string>
+  <string name="actfm_EPA_share_with">Přidat spolupracovníky:</string>
   
   <!-- Toast when assigning a task -->
   <string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
@@ -282,7 +282,7 @@
     <string name="backup_BPr_group_status">Stav</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Předchozí:\n%s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Předchozí zálohování selhalo</string>
     <!-- Backup Status: error subtitle -->    
@@ -324,7 +324,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Chyba v importu</string>
     
-  <string name="export_toast">Zálohovány %1$s do%2$s.</string>
+  <string name="export_toast">Zálohovány %1$s do %2$s.</string>
     
   <string name="export_toast_no_tasks">Žádné úkoly pro export.</string>
   
@@ -449,7 +449,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Žádné úkoly!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Doplňky</string>
@@ -537,7 +537,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Dokončeno\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Upravit</string>
@@ -823,7 +823,7 @@
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">Poznámky budou zobrazeny v liště rychlého přístupu</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Poznámky budou vždy zobrazeny</string>
   
@@ -974,10 +974,10 @@
   
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
+      <item>!!! (Nejvyšší)</item>
       <item>!!</item>
       <item>!</item>
-      <item>o (Lowest)</item>
+      <item>o (Nejnižší)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
@@ -1063,7 +1063,7 @@
     <string name="CFA_type_intersect">také</string>
     
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
-    <string name="CFA_context_chain">% má kritéria</string>
+    <string name="CFA_context_chain">%s má kritéria</string>
     
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Odstranit řádek</string>
@@ -1133,7 +1133,7 @@
   <string name="gcal_TEA_calendar_label">Integrace kalendáře:</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">Vytvořit událost kalendáře</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">Otevřít událost v kalendáři</string>
@@ -1707,7 +1707,7 @@
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Upozorni mě...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
   <string name="TEA_reminder_due">When task is due</string>
@@ -1746,10 +1746,10 @@
   <string name="rmd_NoA_filter">Připomínka!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Dokončeno!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Později...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index f26018a1f..5095a2eca 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -1707,16 +1707,16 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Påmind mig:</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">når deadline er nået</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">når deadline er overskredet</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">tilfældigt hver(t)</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ring/Vibrate Type:</string>
@@ -1746,10 +1746,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">Påmindelse!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Allerede udført!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Slumrefunktion...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -2069,7 +2069,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>Uge(r)</item>
     <item>Måned(er)</item>
     <item>Time(r)</item>
-    <item>Minute(s)</item>
+    <item>Minut(er)</item>
     <item>Year(s)</item>
   </string-array>
   
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 00b94be97..5a0bfeda8 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -191,11 +191,11 @@
   <string name="actfm_ALA_body">Astrid.com lässt Sie ihre Aufgaben online abrufen, teilen, und auf andere übertragen.</string>
 
   <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Connect with Facebook</string>
+  <string name="actfm_ALA_fb_login">Mit Facebook anmelden</string>
 
   <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Connect with Google</string>
-  
+  <string name="actfm_ALA_gg_login">Mit Google anmelden</string>
+
   <!-- share login: Sharing Footer Password Label -->
   <string name="actfm_ALA_pw_login">Kein Google oder Facebook benutzen?</string>
 
@@ -449,7 +449,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Keine Aufgaben!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Add-Ons</string>
@@ -537,7 +537,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Vor %s\nerledigt</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Bearbeiten</string>
@@ -718,7 +718,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Keine Fälligkeit</item>
       <item>Bestimmter Tag</item>
       <item>Heute</item>
       <item>Morgen</item>
@@ -828,7 +828,7 @@
   <string name="EPr_showNotes_desc_enabled">Benachrichtigungen werden immer angezeigt</string>
   
   <!-- Preference: Theme -->
-  <string name="EPr_theme_title">Color Theme</string>
+  <string name="EPr_theme_title">Farb Thema</string>
   <!-- Preference: Theme Description (%s => value) -->
   <string name="EPr_theme_desc">Momentan: %s</string>  
   <!-- Preference: Theme Description (android 1.6) -->
@@ -917,7 +917,7 @@
 <string name="p_about_text">Aktuelle Version: %s\n\n Astrid ist Open-Source und wird stolz von Todoroo, Inc. gepflegt.</string>
 
   <!-- Title of "Help" option in settings -->
-  <string name="p_help">Help</string>
+  <string name="p_help">Hilfe</string>
   
   <!-- ============================================================= Misc == -->
   
@@ -974,10 +974,10 @@
   
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
+      <item>!!! (Höchste)</item>
       <item>!!</item>
       <item>!</item>
-      <item>o (Lowest)</item>
+      <item>o (Niedrigste)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
@@ -1177,7 +1177,7 @@
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
     
     <!-- dialog prompt for creating a new gtasks list -->
-    <string name="gtasks_FEx_creating_list">Creating list...</string>
+    <string name="gtasks_FEx_creating_list">Erstelle Liste...</string>
     
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Neuer Listenname:</string>
@@ -1196,10 +1196,10 @@
     <string name="CFC_gtasks_list_name">In GTasks Liste ...</string>
     
     <!-- Message while clearing completed tasks -->
-    <string name="gtasks_GTA_clearing">Clearing completed tasks...</string>
+    <string name="gtasks_GTA_clearing">Entferne erledigte Aufgaben...</string>
     
     <!-- Label for clear completed menu item -->
-    <string name="gtasks_GTA_clear_completed">Clear Completed</string>
+    <string name="gtasks_GTA_clear_completed">Entferne erledigte Aufgaben</string>
         
     <!-- ============================================ GtasksLoginActivity == -->
     
@@ -1743,10 +1743,10 @@
   <string name="rmd_NoA_filter">Erinnerung!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Schon erledigt!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Später...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -2066,8 +2066,8 @@
     <item>Woche(n)</item>
     <item>Monat(e)</item>
     <item>Stunde(n)</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
+    <item>Minute(n)</item>
+    <item>Jahr(e)</item>
   </string-array>
   
   <string-array name="repeat_type">
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 1421ffe3d..e92e391de 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -282,7 +282,7 @@
     <string name="backup_BPr_group_status">Estado</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Última copia:\n%s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Falló la última copia de seguridad</string>
     <!-- Backup Status: error subtitle -->    
@@ -308,7 +308,7 @@
   <!-- ================================================= BackupActivity == -->
 
   <!-- backup activity label -->
-  <string name="backup_BAc_label">Manage Backups</string>
+  <string name="backup_BAc_label">Copias de seguridad</string>
 
   <!-- backup activity title -->
   <string name="backup_BAc_title">Gestionar sus copias de seguridad</string>
@@ -542,7 +542,7 @@ File %1$s contained %2$s.\n\n
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Terminado\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Editar</string>
@@ -723,7 +723,7 @@ File %1$s contained %2$s.\n\n
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Sin fecha límite</item>
       <item>Día específico</item>
       <item>Hoy</item>
       <item>Mañana</item>
@@ -828,7 +828,7 @@ File %1$s contained %2$s.\n\n
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">Las notas se mostrarán cuando se toca una tarea.</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Se mostrarán siempre las notas</string>
   
@@ -979,10 +979,10 @@ File %1$s contained %2$s.\n\n
   
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
+      <item>!!! (Alto)</item>
       <item>!!</item>
       <item>!</item>
-      <item>o (Lowest)</item>
+      <item>o (Bajo)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
@@ -1750,10 +1750,10 @@ File %1$s contained %2$s.\n\n
   <string name="rmd_NoA_filter">¡Recordatorio!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">¡Ya acabada!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Espera...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -2073,7 +2073,7 @@ File %1$s contained %2$s.\n\n
     <item>Semana(s)</item>
     <item>Mes(es)</item>
     <item>Hora(s)</item>
-    <item>Minute(s)</item>
+    <item>Minuto(s)</item>
     <item>Year(s)</item>
   </string-array>
   
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 5ed47b681..f8f01b51c 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -449,7 +449,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Aucune tâche !</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Extensions</string>
@@ -537,7 +537,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Accomplie\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Modifier</string>
@@ -718,7 +718,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Aucune échéance</item>
       <item>Jour spécifique</item>
       <item>Aujourd\'hui</item>
       <item>Demain</item>
@@ -823,7 +823,7 @@
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">Les notes seront affichées dans la barre d\'action rapide</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Les notes seront toujours affichées</string>
   
@@ -974,10 +974,10 @@
   
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
+      <item>!!! (la plus haute)</item>
       <item>!!</item>
       <item>!</item>
-      <item>o (Lowest)</item>
+      <item>o (la plus basse)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
@@ -1133,7 +1133,7 @@
   <string name="gcal_TEA_calendar_label">Intégration à l\'agenda :</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">Créer un évènement d\'agenda</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">Ouvrir l\'événement de l\'agenda</string>
@@ -1704,16 +1704,16 @@
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Me rappeler...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">... lorsque la tâche est échue</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">... lorsque la tâche est en retard</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">... aléatoirement une fois</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Type de sonnerie/vibration :</string>
@@ -1743,10 +1743,10 @@
   <string name="rmd_NoA_filter">Rappel !</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Déjà fait !</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-he/strings.xml b/astrid/res/values-he/strings.xml
index ca55ee272..09cff88d8 100644
--- a/astrid/res/values-he/strings.xml
+++ b/astrid/res/values-he/strings.xml
@@ -283,7 +283,7 @@
     <string name="backup_BPr_group_status">מצב</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">עדכני ביותר: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">הגיבוי האחרון נכשל</string>
     <!-- Backup Status: error subtitle -->    
@@ -457,7 +457,7 @@ File %1$s contained %2$s.\n\n
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">אין משימות!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">תוספים</string>
@@ -545,7 +545,7 @@ File %1$s contained %2$s.\n\n
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">הסתיימה\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">עריכה</string>
@@ -726,7 +726,7 @@ File %1$s contained %2$s.\n\n
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>אין מועד סף</item>
       <item>יום מסוים</item>
       <item>היום</item>
       <item>מחר</item>
@@ -1152,7 +1152,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="gcal_TEA_calendar_label">שילוב בלוח השנה:</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">יצירת אירוע בלוח השנה</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">פתיחת אירוע בלוח השנה</string>
@@ -2092,7 +2092,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <item>שבוע/(ות)</item>
     <item>חודש/ים</item>
     <item>שעה/ות</item>
-    <item>Minute(s)</item>
+    <item>דקה/דקות</item>
     <item>Year(s)</item>
   </string-array>
   
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 84f8f6943..d70df0c1f 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -450,7 +450,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Nessuna Attività!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Componenti aggiuntivi</string>
@@ -538,7 +538,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Terminata\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Modifica</string>
@@ -719,7 +719,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Nessun Termine</item>
       <item>Giorno Specifico</item>
       <item>Oggi</item>
       <item>Domani</item>
@@ -1284,10 +1284,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="intro_task_1_summary">Crea la tua prima attività</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">Due modi per aggiungere un\'attività:\n 1) Aggiunta Rapida: scrivi il titolo dell\'attività nel campo in basso e premi il pulsante + che appare a sinistra.\n\n 2) Aggiunta normale: premi il pulsante sulla destra del campo in basso. Aggiungi le informazioni base (data di terminazione, etichette, note) o imposta opzioni più avanzate. Salva l\'attività con il pulsante di salvataggio o il pulsante indietro sul tuo telefono.\n\n</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">Aggiungi un widget sul tuo desktop</string>
@@ -1708,16 +1705,16 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Ricordami...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">... quando l\'attività deve terminare</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">... quando l\'attività è in ritardo</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">.. casualmente una volta</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Tipo di Suono/Vibrazione:</string>
@@ -1747,10 +1744,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">Promemoria!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Completata</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Rimanda...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -2070,7 +2067,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <item>Settimana(e)</item>
     <item>Mese(i)</item>
     <item>Ora(e)</item>
-    <item>Minute(s)</item>
+    <item>Minuto(i)</item>
     <item>Year(s)</item>
   </string-array>
   
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 7b4f0e60d..2b2bbb66d 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -283,7 +283,7 @@
     <string name="backup_BPr_group_status">状況</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">最新: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">バックアップ失敗</string>
     <!-- Backup Status: error subtitle -->    
@@ -309,7 +309,7 @@
   <!-- ================================================= BackupActivity == -->
 
   <!-- backup activity label -->
-  <string name="backup_BAc_label">Manage Backups</string>
+  <string name="backup_BAc_label">バックアップ</string>
 
   <!-- backup activity title -->
   <string name="backup_BAc_title">バックアップの管理</string>
@@ -325,7 +325,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">インポートに失敗</string>
     
-  <string name="export_toast">Backed Up %1$s to %2$s.</string>
+  <string name="export_toast">%1$s を %2$s にバックアップしました。</string>
     
   <string name="export_toast_no_tasks">エクスポートするタスクがありません</string>
   
@@ -336,12 +336,7 @@
   <string name="import_summary_title">復元の概要</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">
-File %1$s contained %2$s.\n\n
-%3$s imported,\n
-%4$s already exist\n
-%5$s had errors\n
-  </string>
+  <string name="import_summary_message">ファイル %1$s の %2$s 中、\n\n成功: %3$s\n既に存在: %4$s\n失敗: %5$s\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">インポート中</string>
@@ -457,7 +452,7 @@ File %1$s contained %2$s.\n\n
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">タスクなし</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">アドオン</string>
@@ -545,7 +540,7 @@ File %1$s contained %2$s.\n\n
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">%s\nに完了</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">編集</string>
@@ -831,7 +826,7 @@ File %1$s contained %2$s.\n\n
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">メモはタスクをタップしたときに表示されます</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">メモは常に表示されます</string>
   
@@ -1116,14 +1111,14 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <string name="CFC_importance_name">重要度</string>        
     
     <!-- Criteria: tag - display text (? -> user input) -->
-    <string name="CFC_tag_text">List: ?</string>
+    <string name="CFC_tag_text">タグ: ?</string>
     <!-- Criteria: tag - name of criteria -->
-    <string name="CFC_tag_name">List...</string>
+    <string name="CFC_tag_name">タグ</string>
     
     <!-- Criteria: tag_contains - name of criteria -->
-    <string name="CFC_tag_contains_name">List name contains...</string>
+    <string name="CFC_tag_contains_name">タグ中の語句</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
-    <string name="CFC_tag_contains_text">List name contains: ?</string>
+    <string name="CFC_tag_contains_text">タグに ? を含む ?</string>
     
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">タイトル中の語句</string>
@@ -1146,7 +1141,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="gcal_TEA_calendar_label">カレンダーと連携</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">カレンダーに登録</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">カレンダーのイベントを開く</string>
@@ -1297,10 +1292,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="intro_task_1_summary">Create your first task</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">タスクを登録する2つの方法\n 1) 素早い登録: 入力欄にタスク名を入力し、入力欄の左に表示される + ボタンを押します。\n\n2) 標準の登録: 入力欄の右側にあるボタンを押します。期限やタグ、メモやより高度な設定を行えます。保存ボタンか電話機のバックボタンで保存します。\n\n</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">ホーム画面にウィジェットを追加する</string>
@@ -1722,16 +1714,16 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">通知するのは...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">期限になったとき</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">期限を過ぎたとき</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">ランダムに</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">通知音、振動</string>
@@ -1761,10 +1753,10 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="rmd_NoA_filter">お知らせ</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">既に完了しています!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">後で通知</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -1784,7 +1776,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <!-- Reminder Preference: Quiet Hours Start Title -->
   <string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
   <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the setting below! </string>
+  <string name="rmd_EPr_quiet_hours_start_desc">%s 以降、通知音は鳴りません</string>
   <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
   <string name="rmd_EPr_quiet_hours_desc_none">消音は無効です</string>
   
@@ -1834,11 +1826,11 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="rmd_EPr_vibrate_desc_false">通知するときに振動しません</string>
 
   <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Encouragements</string>
+  <string name="rmd_EPr_nagging_title">Astridの通知</string>
   <!-- Reminder Preference: Nagging Description (true) -->
   <string name="rmd_EPr_nagging_desc_true">通知画面に励ましメッセージを表示します</string>
   <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid will not give you any encouragement messages</string>
+  <string name="rmd_EPr_nagging_desc_false">励ましメッセージを表示しません</string>
 
   <!-- Reminder Preference: Snooze Dialog Title -->  
   <string name="rmd_EPr_snooze_dialog_title">スヌーズの時刻指定</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index daa3da1a2..708a64341 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -283,7 +283,7 @@
     <string name="backup_BPr_group_status">상태</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">마지막:%s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">마지막 백업 실패</string>
     <!-- Backup Status: error subtitle -->    
@@ -309,7 +309,7 @@
   <!-- ================================================= BackupActivity == -->
 
   <!-- backup activity label -->
-  <string name="backup_BAc_label">Manage Backups</string>
+  <string name="backup_BAc_label">백업</string>
 
   <!-- backup activity title -->
   <string name="backup_BAc_title">백업 관리</string>
@@ -450,7 +450,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">작업이 없네요!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">확장기능</string>
@@ -538,7 +538,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">%s\n전에 완료됨</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">편집</string>
@@ -719,8 +719,8 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
-      <item>Specific Day</item>
+      <item>마감일 없음</item>
+      <item>정해진 일자/시간</item>
       <item>오늘</item>
       <item>내일</item>
       <item>(몇일 후)</item>
@@ -1037,7 +1037,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <string name="BFE_Custom">필터 만들기...</string>
     
     <!-- Saved Filters Header -->
-    <string name="BFE_Saved">Filters</string>
+    <string name="BFE_Saved">저장된 필터</string>
     
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">필터 삭제</string>
@@ -1136,7 +1136,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="gcal_TEA_calendar_label">캘린더 연동:</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">캘린더에 일정 생성하기</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">캘린더 일정 열기</string>
@@ -1712,16 +1712,16 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">알려주세요...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">... 마감일이 되었을 때</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">... 마감일을 지났을 때</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">... 아무때나 한번</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">소리/진동 선택:</string>
@@ -1751,10 +1751,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">Reminder!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">이미 마침!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Snooze...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 186f36788..c8b05442b 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -283,7 +283,7 @@
     <string name="backup_BPr_group_status">Status</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Siste: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Siste sikkerhetskopiering mislyktes</string>
     <!-- Backup Status: error subtitle -->    
@@ -719,7 +719,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Ingen frist</item>
       <item>Spesifikk dag</item>
       <item>I dag</item>
       <item>I morgen</item>
@@ -1177,7 +1177,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <string name="gtasks_FEx_list">Etter liste</string>
     
     <!-- filter title for GTasks lists (%s => list name) -->
-    <string name="gtasks_FEx_title">Google Tasks</string>
+    <string name="gtasks_FEx_title">Google Tasks: %s</string>
     
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Creating list...</string>
@@ -1708,16 +1708,16 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Minn meg på...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">...når oppgaven forfaller</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">... når oppgaven har forfalt</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">... tilfeldig tidspunkt, en gang.</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ringe- og vibrasjonstype:</string>
@@ -1747,10 +1747,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">Påminnelse!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Allerede utført!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Slumre</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index b7212f20f..c415ec282 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -143,7 +143,7 @@
   <string name="actfm_EPA_list">Lijst: %s</string>
   
   <!-- task sharing dialog: assigned hint -->
-  <string name="actfm_EPA_assigned_hint">Contact Name</string>
+  <string name="actfm_EPA_assigned_hint">Naam contactpersoon</string>
   
   <!-- task sharing dialog: message label text -->
   <string name="actfm_EPA_message_text">Uitnodigings bericht:</string>
@@ -191,13 +191,13 @@
   <string name="actfm_ALA_body">Astrid.com geeft online toegang tot de taken, waarbij deze gedeeld en gedelegeerd kunnen worden met anderen.</string>
 
   <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Connect with Facebook</string>
+  <string name="actfm_ALA_fb_login">Aanmelden bij Facebook</string>
 
   <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Connect with Google</string>
-  
+  <string name="actfm_ALA_gg_login">Aanmelden bij Google</string>
+
   <!-- share login: Sharing Footer Password Label -->
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
+  <string name="actfm_ALA_pw_login">Nog geen Google of Facebook account?</string>
 
   <!-- share login: Sharing Password Link -->
   <string name="actfm_ALA_pw_link">Registreer hier</string>
@@ -282,7 +282,7 @@
     <string name="backup_BPr_group_status">Status</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Laatste: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Laatste back-up mislukt</string>
     <!-- Backup Status: error subtitle -->    
@@ -718,7 +718,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Geen einddatum</item>
       <item>Specifieke dag</item>
       <item>Vandaag</item>
       <item>Morgen</item>
@@ -823,7 +823,7 @@
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">Notities zullen in de snelle toegangsbalk worden weergegeven</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Notities altijd weergeven</string>
   
@@ -859,7 +859,7 @@
   <string name="EPr_manage_delete_completed_status">%d taken verwijderd!</string>
   <string name="EPr_manage_purge_deleted">Verwijderde taken opschonen</string>
   <string name="EPr_manage_purge_deleted_message">Alle verwijderde taken werkelijk opschonen?\n\nDeze taken zijn dan definitief verwijderd!</string>
-  <string name="EPr_manage_purge_deleted_status">%s verwijderde taken opgeschoond!</string>
+  <string name="EPr_manage_purge_deleted_status">%d verwijderde taken opgeschoond!</string>
   <string name="EPr_manage_purge_deleted_summary">Waarschuwing: Opgeschoonde verwijderde taken kunnen zonder backup-bestand niet worden hersteld!</string>
   <string name="EPr_manage_clear_all">Clear All Data</string>
   <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning: can\'t be undone!</string>
@@ -1280,32 +1280,20 @@
   <string name="intro_task_1_summary">Eerste taak aanmaken</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">Twee manieren om een taak te maken:\n 1) Snel toevoegen: Beschrijf de taak in het veld onderin en druk op de + knop aan de linker kant.\n\n 2) Normaal toevoegen: Druk op de knop aan de rechter kant van het veld onderin. Vul de standaard details in (einddatum, labels, notities) of gebruik de geavanceerde opties. Bewaar de taak met de bewaarknop of gebruik de \'Terug\' toets op het toestel.\n\n</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">Widget toevoegen aan het hoofdscherm</string>
 
   <!-- Task 2 Note -->
-  <string name="intro_task_2_note">
-  1) Long Press on your phone\'s desktop\n
-       2) Choose \"Widget\"\n
-       3) Choose the Astrid widget\n
-       4) Select the list you want and press OK.\n
-  </string>
+  <string name="intro_task_2_note">Een bureaublad widget is een geweldige manier om de te doen taken bij te houden en een manier om snel nieuwe taken toe te voegen.\n\n Hoe een widget toevoegen?:\n 1) Druk lang op het bureaublad.\n 2) Kies \"Widget\" uit het menu\n 3) Selecteer de Astrid widget.\n 4) Selecteer een Astrid filter. Selecteer \"Actieve taken\" voor alle taken\n\n Bonus: Gebruik de widget om een taak toe te voegen!</string>
   
     <!-- Task 3 Summary  -->
   <string name="intro_task_3_summary">Instellingen synchroniseren met Astrid.com</string>
 
   <!-- Task 3 Note -->
-  <string name="intro_task_3_note">
-    1) Press your Menu button\n
-         2) Choose \"Sync Now\"\n
-         3) Select \"Astrid.com\"\n
-         4) Log In &amp; Synchronize!\n
-  </string>
+  <string name="intro_task_3_note">Astrid maakt het mogelijk de taken te synchroniseren met Astrid.com, Google Taken en Producteev.\n\n Om synchroniseren vanuit Astrid in te schakelen, druk \"Menu\"-&gt; \"Instellingen\" -&gt; \"Synchronisatie\" en selecteer de gewenste provider.</string>
+
  
   <!-- NEW USER EXPERIENCE -->
   
@@ -1743,10 +1731,10 @@
   <string name="rmd_NoA_filter">Herinnering!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Reeds voltooid!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Sluimeren...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index f9c36732c..ac84da123 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -413,11 +413,11 @@
   <string name="DLG_loading">Ładowanie...</string>
   
   <!-- Dialog - dismiss -->
-  <string name="DLG_dismiss">Dismiss</string>
+  <string name="DLG_dismiss">Porzuć</string>
   
   <string name="DLG_ok">OK</string>
   
-  <string name="DLG_cancel">Cancel</string>
+  <string name="DLG_cancel">Anuluj</string>
   
   <string name="DLG_undo">Undo</string>
   
@@ -449,7 +449,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Brak zadań!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Dodatki</string>
@@ -648,7 +648,7 @@
   <string name="TEA_title_label">Tytuł</string>
   
   <!-- Task when label (note the <u> tags - be sure to leave those in when localizing! -->
-  <string name="TEA_when_header_label">When</string>
+  <string name="TEA_when_header_label">Kiedy</string>
   
   <!-- Task title hint (displayed when edit box is empty) -->
   <string name="TEA_title_hint">Podsumowanie zadania</string>
@@ -828,7 +828,7 @@
   <string name="EPr_showNotes_desc_enabled">Notatki będą zawsze wyświetlane</string>
   
   <!-- Preference: Theme -->
-  <string name="EPr_theme_title">Color Theme</string>
+  <string name="EPr_theme_title">Kolorystyka</string>
   <!-- Preference: Theme Description (%s => value) -->
   <string name="EPr_theme_desc">Aktualnie: %s</string>  
   <!-- Preference: Theme Description (android 1.6) -->
@@ -843,10 +843,10 @@
     
   <string-array name="EPr_themes">
     <!-- theme_settings: labels for Theme preference menu -->
-    <item>Day</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
+    <item>Dzień</item>
+    <item>Noc</item>
+    <item>Przezroczysty (biały tekst)</item>
+    <item>Przezroczysty (czarny tekst)</item>
   </string-array>
   
   <!-- ========================================== Task Management Settings == -->
@@ -864,15 +864,15 @@
   <string name="EPr_manage_clear_all">Clear All Data</string>
   <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning: can\'t be undone!</string>
 
-  <string name="EPr_manage_delete_completed_gcal">Delete Calendar Events for Completed Tasks</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
+  <string name="EPr_manage_delete_completed_gcal">Usuń wydarzenia kalendarza dla zakończonych zadań</string>
+  <string name="EPr_manage_delete_completed_gcal_message">Na pewno chcesz usunąć wszystkie wydarzenia dla zakończonych zadań?</string>
   <string name="EPr_manage_delete_completed_gcal_summary"/>
-  <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
+  <string name="EPr_manage_delete_completed_gcal_status">Usunięto %d wydarzeń kalendarza!</string>
       
-  <string name="EPr_manage_delete_all_gcal">Delete All Calendar Events for Tasks</string>
-  <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
+  <string name="EPr_manage_delete_all_gcal">Usuń wszystkie zdarzenia kalendarza dla zadań</string>
+  <string name="EPr_manage_delete_all_gcal_message">Na pewno chcesz usunąć wszystkie wydarzenia dla zadań?</string>
   <string name="EPr_manage_delete_all_gcal_summary"/>
-  <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
+  <string name="EPr_manage_delete_all_gcal_status">Usunięto %d wydarzeń kalendarza!</string>
       
   <!-- ==================================================== AddOnActivity == -->
   
@@ -914,7 +914,7 @@
   <string name="p_about">O Astrid</string>
   
   <!-- About text (%s => current version)-->
-<string name="p_about_text">Bieżąca wersja: %\n\n Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
+<string name="p_about_text">Bieżąca wersja: %s\n\n Astrid ma otwarte źródła i jest zarządzana z dumą przez Todoroo, Inc.</string>
 
   <!-- Title of "Help" option in settings -->
   <string name="p_help">Pomoc</string>
@@ -961,28 +961,28 @@
   <string name="EPr_default_reminders_desc">Aktualnie: %s</string>
   
   <!-- Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Default Add To Calendar</string>
+  <string name="EPr_default_addtocalendar_title">Domyślnie dodawaj do kalendarza</string>
   <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the Google Calendar</string>
+  <string name="EPr_default_addtocalendar_desc_disabled">Nowe zadania nie utworzą wydarzeń w Kalendarzu Google</string>
   <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
+  <string name="EPr_default_addtocalendar_desc">Nowe zadania będą w kalendarzu: \"%s\"</string>
   
   <!-- Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Default Ring/Vibrate type</string>
+  <string name="EPr_default_reminders_mode_title">Domyślny dzwonek/wibracja</string>
   <!-- Preference: Default Reminders Description (%s => setting) -->
   <string name="EPr_default_reminders_mode_desc">Aktualnie: %s</string>
   
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
+      <item>!!! (Najwyższy)</item>
       <item>!!</item>
       <item>!</item>
-      <item>o (Lowest)</item>
+      <item>o (Najniższy)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
       <!-- urgency: labels for "Task Defaults" preference item. -->
-      <item>No Deadline</item>
+      <item>Bez nieprzekraczalnego terminu</item>
       <item>Dzisiaj</item>
       <item>Jutro</item>
       <item>Pojutrze</item>
@@ -991,10 +991,10 @@
   
   <string-array name="EPr_default_hideUntil">
       <!-- hideUntil: labels for "Task Defaults" preference item. -->
-      <item>Don\'t hide</item>
-      <item>Task is due</item>
-      <item>Dzień przez wymaganiem</item>
-      <item>Tydzień przed wymaganiem</item>
+      <item>Nie ukrywaj</item>
+      <item>Do terminu zadania</item>
+      <item>Do dnia przed terminem</item>
+      <item>Do tygodnia przed terminem</item>
   </string-array>
   
   <string-array name="EPr_default_reminders">
@@ -1196,10 +1196,10 @@
     <string name="CFC_gtasks_list_name">Na liście GTasks...</string>
     
     <!-- Message while clearing completed tasks -->
-    <string name="gtasks_GTA_clearing">Clearing completed tasks...</string>
+    <string name="gtasks_GTA_clearing">Czyszczenie zakończonych zadań...</string>
     
     <!-- Label for clear completed menu item -->
-    <string name="gtasks_GTA_clear_completed">Clear Completed</string>
+    <string name="gtasks_GTA_clear_completed">Wyczyść zakończone</string>
         
     <!-- ============================================ GtasksLoginActivity == -->
     
@@ -1252,16 +1252,16 @@
     <string name="gtasks_notification_title">Astrid: Zadania Google</string>
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error. The service may be down, please try again later.</string>
+    <string name="gtasks_error_backend">API Zadań Google jest w fazie beta i napotkano błąd. Serwis może być niedostępny, spróbuj ponownie później.</string>
     
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
+    <string name="gtasks_error_accountNotFound">Nie znaleziono konta %s --proszę wyloguj się i zaloguj ponownie w ustawieniach Google Zadań.</string>
     
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
+    <string name="gtasks_error_authRefresh">Uwierzytelnienie w Google Zadania nieudane. Proszę, sprawdź poprawność swego hasła lub spróbuj ponownie później.</string>
     
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
+    <string name="gtasks_error_accountManager">Błąd w menadżerze kont Twojego telefonu. Proszę, wyloguj się i zaloguj ponownie w ustawieniach Google Zadań.</string>
 
     
         
@@ -1311,16 +1311,16 @@
   
   <!-- help bubbles -->
   <!-- Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Start by adding a task or two</string>
+  <string name="help_popover_add_task">Dodaj zadanie tutaj</string>
 
   <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Tap task to edit and share</string>
+  <string name="help_popover_tap_task">Puknij zadanie by je edytować i udostępnić</string>
   
   <!-- Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Tap to edit or share this list</string>
+  <string name="help_popover_list_settings">Puknij ustawienia listy by udostępnić całą listę</string>
   
   <!-- Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">People you share with can help you build your list or finish tasks</string>
+  <string name="help_popover_collaborators">Współpracownicy mogą Ci pomóc stworzyć listę lub wykonać zadania</string>
   
   <!-- Shown after user adds a task on tablet-->
   <string name="help_popover_add_lists">Tap add a list</string>
@@ -1337,23 +1337,23 @@
   
   <string name="welcome_login_intro"/>
   
-  <string name="welcome_login_tos_base">By using Astrid you agree to the</string>
+  <string name="welcome_login_tos_base">Używając Astrid zgadzasz się na</string>
   
-  <string name="welcome_login_tos_link">\"Terms of Service\"</string>
+  <string name="welcome_login_tos_link">\"Warunki korzystania z usług\"</string>
   
-  <string name="welcome_login_pw">Login with Username/Password</string>
+  <string name="welcome_login_pw">Zaloguj za pomocą loginu/hasła</string>
   
-  <string name="welcome_login_later">Connect Later</string>
+  <string name="welcome_login_later">Zaloguj później</string>
   
-  <string name="welcome_login_confirm_later_title">Why not sign in?</string>
+  <string name="welcome_login_confirm_later_title">Czemu by się nie zalogować?</string>
   
-  <string name="welcome_login_confirm_later_ok">I\'ll do it!</string>
+  <string name="welcome_login_confirm_later_ok">Zrobię to!</string>
   
-  <string name="welcome_login_confirm_later_cancel">No thanks</string>
+  <string name="welcome_login_confirm_later_cancel">Nie, dzięki</string>
   
-  <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid! 
-  For free, you get online backup, full synchronization with Astrid.com, the 
-  ability to add tasks via email, and you can even share task lists with friends!</string>
+  <string name="welcome_login_confirm_later_dialog">Zaloguj się by wyciągnąć z Astrid jeszcze więcej!
+  Za darmo otrzymasz kopię zapasową online, pełną synchronizację z Astrid.com,
+  możliwość dodawania zadań przez e-mail i będziesz mógł dzielić się swoimi listami zadań ze znajomymi!</string>
   
 
 
@@ -1743,10 +1743,10 @@
   <string name="rmd_NoA_filter">Przypomnienie!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Już wykonano!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Wstrzymaj...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -1757,11 +1757,11 @@
   <string name="rmd_EPr_alerts_header">Ustawienia przypomnienia</string>
     
   <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Reminders Enabled?</string>
+  <string name="rmd_EPr_enabled_title">Przypomnienia włączone?</string>
   <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled (this is normal)</string>
+  <string name="rmd_EPr_enabled_desc_true">Przypomnienia Astrid są włączone (to normalne)</string>
   <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Astrid reminders will never appear on your phone</string>  
+  <string name="rmd_EPr_enabled_desc_false">Przypomnienia Astrid nigdy nie pojawią się na Twoim telefonie</string>  
     
   <!-- Reminder Preference: Quiet Hours Start Title -->
   <string name="rmd_EPr_quiet_hours_start_title">Początek czasu wyciszenia</string>
@@ -1778,7 +1778,7 @@
   <!-- Reminder Preference: Default Reminder Title -->
   <string name="rmd_EPr_rmd_time_title">Domyślne przypomnienie</string>
   <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Powiadomienia zadań bez odpowiedniego czasu pojawi się na% s</string>
+  <string name="rmd_EPr_rmd_time_desc">Powiadomienia zadań bez odpowiedniego czasu pojawi się na %s</string>
 
   <!-- Reminder Preference: Notification Ringtone Title -->
   <string name="rmd_EPr_ringtone_title">Dźwięk powiadomienia</string>
@@ -2212,7 +2212,7 @@
   <string name="tag_FEx_untagged">Not in any List</string>
   
   <!-- clarifying title for people who have Google and Astrid lists -->
-  <string name="tag_FEx_untagged_w_astrid">Not in an Astrid List</string>
+  <string name="tag_FEx_untagged_w_astrid">Poza listą Astrid</string>
   
   <!-- %s => tag name -->
   <string name="tag_FEx_name">Lista: %s</string>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 51cdddcc2..ba85f8762 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -143,7 +143,7 @@
   <string name="actfm_EPA_list">List: %s</string>
   
   <!-- task sharing dialog: assigned hint -->
-  <string name="actfm_EPA_assigned_hint">Contact Name</string>
+  <string name="actfm_EPA_assigned_hint">Nome de Contacto</string>
   
   <!-- task sharing dialog: message label text -->
   <string name="actfm_EPA_message_text">Invitation Message:</string>
@@ -283,7 +283,7 @@
     <string name="backup_BPr_group_status">Estado</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Ultimo: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Ultima cópia de segurança falhou.</string>
     <!-- Backup Status: error subtitle -->    
@@ -450,7 +450,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Sem Tarefas!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Add-ons</string>
@@ -538,7 +538,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Terminado\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Editar</string>
@@ -719,7 +719,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Sem Prazo</item>
       <item>Dia Específico</item>
       <item>Hoje</item>
       <item>Amanhã</item>
@@ -1759,10 +1759,10 @@ Astrid might not let you know when your tasks are due.\n
   <string name="rmd_NoA_filter">Lembrete!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Já Terminada!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Parar...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 668bd9f60..272c9b350 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -282,7 +282,7 @@
     <string name="backup_BPr_group_status">Состояние</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Последняя: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Резервирование не удалось</string>
     <!-- Backup Status: error subtitle -->    
@@ -449,7 +449,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">Нет задач!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Расширения</string>
@@ -537,7 +537,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Завершена\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Правка</string>
@@ -718,7 +718,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>Нет срока выполнения</item>
       <item>Определённого дня</item>
       <item>Сегодня</item>
       <item>Завтра</item>
@@ -976,10 +976,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
+      <item>!!! (Наивысшая)</item>
       <item>!!</item>
       <item>!</item>
-      <item>o (Lowest)</item>
+      <item>o (Низшая)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
@@ -1283,10 +1283,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="intro_task_1_summary">Создайте первую задачу</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">Есть два способа добавить задачу:\n 1) Быстрое добавление: просто опишите задачу в поле быстрого ввода и нажмите кнопку + слева от него.\n\n 2) Обычное добавление: нажмите кнопку справа от поля быстрого ввода. Назначьте основные параметры (намеченную дату, метки, примечания) или используйте расширенные настройки. Сохраните задачу с помощью кнопки сохрания или кнопки назад на телефоне.\n\n</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">Добавьте виджет на рабочий стол</string>
@@ -1707,16 +1704,16 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Напомнить мне…</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">… при наступлении срока задания</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">… при завершении намеченного времени</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">… один раз случайно</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Тип звонка/вибрации</string>
@@ -1746,10 +1743,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">Напоминание!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Уже готово!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Дремать…</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 8ad24b713..9e9192324 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -283,7 +283,7 @@
     <string name="backup_BPr_group_status">Status</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">Senaste: %s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">Senaste säkerhetskopieringen misslyckades</string>
     <!-- Backup Status: error subtitle -->    
@@ -538,7 +538,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">Avslutad\n%s</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">Redigera</string>
@@ -719,8 +719,8 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
-      <item>Specific Day</item>
+      <item>Ingen frist</item>
+      <item>Specifik dag</item>
       <item>Idag</item>
       <item>Imorgon</item>
       <item>(dagen efter)</item>
@@ -824,7 +824,7 @@
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">Anteckningar visas när du klickar på en uppgift</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Anteckningar visas alltid</string>
   
@@ -1136,7 +1136,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="gcal_TEA_calendar_label">Kalenderintergrering:</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">Skapa kalenderhändelse</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">Öppna kalenderhändelse</string>
@@ -1283,10 +1283,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="intro_task_1_summary">Skapa din första aktivitet</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">Två sätt att lägga till en uppgift:\n 1) Snabbtillägg: Skriv bara uppgiften i snabbinmatningsrutan och klicka på +-knappen som visas till vänster.\n\n 2) Vanligt tillägg: Klicka på knappen till höger om snabbinmatningsrutan. Lägg till grundläggande detaljer (deadline, etiketter, anteckningar) eller ange mer avancerade alternativ. Spara uppgiften med spara-knappen eller din telefons bakåtknapp.\n\n</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">Lägg till en widget på skrivbordet</string>
@@ -1707,16 +1704,16 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Påminn mig...</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
+  <string name="TEA_reminder_due">...när uppgiften förfaller</string>
 
   <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
+  <string name="TEA_reminder_overdue">...när uppgiften har förfallit</string>
 
   <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_random">Randomly once</string>
+  <string name="TEA_reminder_random">...tillfälligtvis en gång</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ring/Vibrationsinställning:</string>
@@ -1746,10 +1743,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">Påminnelse!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">Redan klar!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">Vänta...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index 927c3157f..e2e9f4112 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -457,7 +457,7 @@ File %1$s contained %2$s.\n\n
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">ไม่มีแผนงานใดๆ !</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">ส่วนเสริม</string>
@@ -726,8 +726,8 @@ File %1$s contained %2$s.\n\n
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
-      <item>Specific Day</item>
+      <item>ไม่มีเส้นตาย</item>
+      <item>ระบุ วัน/เวลา</item>
       <item>วันนี้</item>
       <item>พรุ่งนี้</item>
       <item>(วันให้หลัง)</item>
@@ -1767,10 +1767,10 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="rmd_NoA_filter">เตือนความจำ!</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">เสร็จเรียบร้อยแล้ว!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">หลับ..</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 8d16a7840..c03610353 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -143,7 +143,7 @@
   <string name="actfm_EPA_list">列表：%s</string>
   
   <!-- task sharing dialog: assigned hint -->
-  <string name="actfm_EPA_assigned_hint">Contact Name</string>
+  <string name="actfm_EPA_assigned_hint">联系人姓名</string>
   
   <!-- task sharing dialog: message label text -->
   <string name="actfm_EPA_message_text">邀请信息：</string>
@@ -191,13 +191,13 @@
   <string name="actfm_ALA_body">Astrid.com能让您轻松在线访问、共享和委托您的任务。</string>
 
   <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Connect with Facebook</string>
+  <string name="actfm_ALA_fb_login">使用Facebook帐号登录</string>
 
   <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Connect with Google</string>
-  
+  <string name="actfm_ALA_gg_login">使用Google帐号登录</string>
+
   <!-- share login: Sharing Footer Password Label -->
-  <string name="actfm_ALA_pw_login">Don\'t use Google or Facebook?</string>
+  <string name="actfm_ALA_pw_login">尚未拥有Google或Facebook帐号？</string>
 
   <!-- share login: Sharing Password Link -->
   <string name="actfm_ALA_pw_link">点此登录</string>
@@ -282,7 +282,7 @@
     <string name="backup_BPr_group_status">状态</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Latest backup:\n%s</string>
+    <string name="backup_status_success">最近一次:%s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
     <string name="backup_status_failed">上次备份失败</string>
     <!-- Backup Status: error subtitle -->    
@@ -537,7 +537,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">完成\n%s 项</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">编辑</string>
@@ -718,7 +718,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>无截止日</item>
       <item>指定哪天</item>
       <item>今天</item>
       <item>明天</item>
@@ -823,7 +823,7 @@
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">笔记将会在快速行动条中显示</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">总是显示备注</string>
   
@@ -1063,7 +1063,7 @@
     <string name="CFA_type_intersect">且</string>
     
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
-    <string name="CFA_context_chain">% 含条件</string>
+    <string name="CFA_context_chain">%s 含条件</string>
     
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">删除列</string>
@@ -1133,7 +1133,7 @@
   <string name="gcal_TEA_calendar_label">日程表整合：</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">建立日程表事件</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">打开日程表事件</string>
@@ -1280,32 +1280,20 @@
   <string name="intro_task_1_summary">建立您的第一个任务</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">两种新增任务的方式:\n 1)快速新增:只要在快速输入框中输入任务并按下左侧的+按钮。\n\n 2)一般新增:按下快速输入框右侧的按钮。加入一般细节(到期日、标签、备注)或设定更多进阶选项。按下储存按钮或是手机上的返回键将任务储存。</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">在桌面上添加小工具</string>
 
   <!-- Task 2 Note -->
-  <string name="intro_task_2_note">
-  1) Long Press on your phone\'s desktop\n
-       2) Choose \"Widget\"\n
-       3) Choose the Astrid widget\n
-       4) Select the list you want and press OK.\n
-  </string>
+  <string name="intro_task_2_note">桌面小工具是一种跟踪您要做的事及添加新任务的极好的方式。\n\n 如何添加小工具：\n 1) 长按您手机的桌面\n 2) 在出现的菜单中选择“小工具”\n 3) 选择 Astrid 小工具。\n 4) 您可以选择一个 Astrid 过滤器，或选择“活动任务”来显示所有任务。\n\n 提示：可以用小工具来添加任务！</string>
   
     <!-- Task 3 Summary  -->
   <string name="intro_task_3_summary">设置与 Astrid.com 的同步</string>
 
   <!-- Task 3 Note -->
-  <string name="intro_task_3_note">
-    1) Press your Menu button\n
-         2) Choose \"Sync Now\"\n
-         3) Select \"Astrid.com\"\n
-         4) Log In &amp; Synchronize!\n
-  </string>
+  <string name="intro_task_3_note">可用 Astrid 将您的任务与 Astrid.com，Google Tasks 和 Producteev 同步。\n\n 要在 Astrid 开启同步，请点击“菜单” -&gt; “设置” -&gt; “同步”。然后选择您喜好的同步提供者。</string>
+
  
   <!-- NEW USER EXPERIENCE -->
   
@@ -1743,10 +1731,10 @@
   <string name="rmd_NoA_filter">提醒！</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">已完成!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">晚点提醒...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
@@ -1857,16 +1845,16 @@
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
+    <item>00:00</item>
+    <item>01:00</item>
+    <item>02:00</item>
+    <item>03:00</item>
+    <item>04:00</item>
+    <item>05:00</item>
+    <item>06:00</item>
+    <item>07:00</item>
+    <item>08:00</item>
+    <item>09:00</item>
     <item>10:00</item>
     <item>11:00</item>
     <item>12:00</item>
@@ -1876,12 +1864,12 @@
     <item>16:00</item>
     <item>17:00</item>
     <item>18:00</item>
-    <item>7 PM</item>
+    <item>19:00</item>
   </string-array>
   
   <string-array name="EPr_quiet_hours_end">
     <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don't change the times! -->
-    <item>9 AM</item>
+    <item>09:00</item>
     <item>10:00</item>
     <item>11:00</item>
     <item>12:00</item>
@@ -1891,25 +1879,25 @@
     <item>16:00</item>
     <item>17:00</item>
     <item>18:00</item>
-    <item>7 PM</item>
+    <item>19:00</item>
     <item>20:00</item>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
+    <item>00:00</item>
+    <item>01:00</item>
+    <item>02:00</item>
+    <item>03:00</item>
+    <item>04:00</item>
+    <item>05:00</item>
+    <item>06:00</item>
+    <item>07:00</item>
+    <item>08:00</item>
   </string-array>
   
   <string-array name="EPr_rmd_time">
     <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don't change the times! -->
-    <item>9 AM</item>
+    <item>09:00</item>
     <item>10:00</item>
     <item>11:00</item>
     <item>12:00</item>
@@ -1919,20 +1907,20 @@
     <item>16:00</item>
     <item>17:00</item>
     <item>18:00</item>
-    <item>7 PM</item>
+    <item>19:00</item>
     <item>20:00</item>
     <item>21:00</item>
     <item>22:00</item>
     <item>23:00</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
+    <item>00:00</item>
+    <item>01:00</item>
+    <item>02:00</item>
+    <item>03:00</item>
+    <item>04:00</item>
+    <item>05:00</item>
+    <item>06:00</item>
+    <item>07:00</item>
+    <item>08:00</item>
   </string-array>
   
   <!-- =============================================== random reminders == -->
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index bed6d7c48..8af6e6aa4 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -450,7 +450,7 @@
   <!-- ================================================= TaskListActivity == -->
   
   <!-- Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+  <string name="TLA_no_items">無工作!</string>
   
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">附加程式</string>
@@ -538,7 +538,7 @@
   <string name="TAd_flingText"/>
   
   <!-- indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
+  <string name="TAd_completed">%s\n完成</string>
   
   <!-- Action Button: edit task -->
   <string name="TAd_actionEditTask">編輯</string>
@@ -719,7 +719,7 @@
   
   <string-array name="TEA_urgency">
       <!-- urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No deadline</item>
+      <item>無截止日</item>
       <item>指定哪天</item>
       <item>今天</item>
       <item>明天</item>
@@ -1066,7 +1066,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
     <string name="CFA_type_intersect">也</string>
     
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
-    <string name="CFA_context_chain">% 含條件</string>
+    <string name="CFA_context_chain">%s 含條件</string>
     
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">刪除列</string>
@@ -1136,7 +1136,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="gcal_TEA_calendar_label">整合行事曆</string>
 
   <!-- Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+  <string name="gcal_TEA_addToCalendar_label">建立行事曆事項</string>
   
   <!-- Label when calendar event already exists -->
   <string name="gcal_TEA_showCalendar_label">打開行事曆事項</string>
@@ -1284,10 +1284,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="intro_task_1_summary">建立ˋ您的第一個工作</string>
 
   <!-- Task 1 Note -->
-  <string name="intro_task_1_note">Two ways to add a task:\n
-  1) Quick Add: Type the task into the quick entry box at bottom of screen and press the + button on the right.\n
-  2) Regular Add: Press the + button of the quick entry box. Add as much detail as you want. Then press \"Save\" or use your phone\'s back button.\n
-  </string>
+  <string name="intro_task_1_note">兩種新增工作的方式:\n 1)快速新增:只要在快速輸入框中輸入工作並按下左側的+按鈕。\n\n 2)一般新增:按下快速輸入框右側的按鈕。加入一般細節(到期日、標籤、備註)或設定更多進階選項。按下儲存按鈕或是手機上的返回鍵將工作儲存。</string>
   
   <!-- Task 2 Summary  -->
   <string name="intro_task_2_summary">新增小工具到桌面</string>
@@ -1747,10 +1744,10 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   <string name="rmd_NoA_filter">提醒！</string>
   
   <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
+  <string name="rmd_NoA_done">已完成!</string>
   
   <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
+  <string name="rmd_NoA_snooze">晚點提醒...</string>
   
   <!-- Reminder: Completed Toast -->
   <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 950bad740..f0083de9f 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -291,7 +291,7 @@
   <!-- Task title label -->
   <string name="TEA_title_label">Title</string>
   
-  <!-- Task when label (note the <u> tags - be sure to leave those in when localizing! -->
+  <!-- Task when label -->
   <string name="TEA_when_header_label">When</string>
   
   <!-- Task title hint (displayed when edit box is empty) -->