From 24e4582b8a92e5ccc61f290cba0fda21b9e0bf08 Mon Sep 17 00:00:00 2001
From: Ian Fraser <ian@bigwave.org.uk>
Date: Tue, 19 Apr 2011 22:36:07 +0100
Subject: [PATCH 1/2] Add missing %s to cz translation, fix one failure in
 testFormatStringsMatch

---
 api/res/values-cs/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/res/values-cs/strings.xml b/api/res/values-cs/strings.xml
index 25a4c49ea..8e01a54da 100644
--- a/api/res/values-cs/strings.xml
+++ b/api/res/values-cs/strings.xml
@@ -140,7 +140,7 @@
   <!-- Sync Status: error status (%s -> last attempted sync date) -->    
   <string name="sync_status_failed">Selhalo: %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>
 

From 52af1265c103b37eec629294df60b0702557761d Mon Sep 17 00:00:00 2001
From: Ian Fraser <ian@bigwave.org.uk>
Date: Tue, 19 Apr 2011 22:38:14 +0100
Subject: [PATCH 2/2] Delete redundant translations of English text that no
 longer exists, fix failure in testFormatStringsMatch

---
 astrid/res/values-ca/strings.xml     | 6 ------
 astrid/res/values-cs/strings.xml     | 6 ------
 astrid/res/values-da/strings.xml     | 6 ------
 astrid/res/values-de/strings.xml     | 6 ------
 astrid/res/values-es/strings.xml     | 6 ------
 astrid/res/values-fr/strings.xml     | 6 ------
 astrid/res/values-he/strings.xml     | 6 ------
 astrid/res/values-it/strings.xml     | 6 ------
 astrid/res/values-ja/strings.xml     | 6 ------
 astrid/res/values-ko/strings.xml     | 6 ------
 astrid/res/values-nb/strings.xml     | 6 ------
 astrid/res/values-nl/strings.xml     | 6 ------
 astrid/res/values-pl/strings.xml     | 6 ------
 astrid/res/values-pt/strings.xml     | 6 ------
 astrid/res/values-ru/strings.xml     | 6 ------
 astrid/res/values-sv/strings.xml     | 6 ------
 astrid/res/values-th/strings.xml     | 6 ------
 astrid/res/values-zh-rCN/strings.xml | 6 ------
 astrid/res/values-zh-rTW/strings.xml | 6 ------
 19 files changed, 114 deletions(-)

diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 8da9a6354..05512df0c 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -1020,12 +1020,6 @@ File %1$s contained %2$s.\n\n
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Tipus de So/Vibració</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Sona una vegada</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Sona fins que es cancel·la l\'alarma</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>una hora</item>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index fac7f2ab0..d4abbc6ee 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -1007,12 +1007,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Typ vyzvánění/vybrací:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Vyzvánět jednou</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Vyzvánět dokud nezruším Alarm</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>hodina</item>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index ce3791f3e..2df2adb4b 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -1003,12 +1003,6 @@ File %1$s contained %2$s.\n\n
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ring/Vibrate Type:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Ring en gang</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Ring indtil jeg slår alarmen fra</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>en time</item>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 93a4cda69..79d55e779 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -987,12 +987,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Klingeln/Vibrieren Typ:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Einmal klingeln</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Klingeln, bis ich den Arlarm abschalte</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>pro Stunde</item>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 3d1db1d69..1ad65e92d 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -1005,12 +1005,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Tipo de Tono/Vibración:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Sonar una vez</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Sonar hasta que apague la alarma</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>una hora</item>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 379681589..e0457c7fa 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -987,12 +987,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Type de sonnerie/vibration :</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Sonner une fois</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Sonner jusqu\'à ce que je l\'interrompe</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>une heure</item>
diff --git a/astrid/res/values-he/strings.xml b/astrid/res/values-he/strings.xml
index f011654f1..24716ef17 100644
--- a/astrid/res/values-he/strings.xml
+++ b/astrid/res/values-he/strings.xml
@@ -1033,12 +1033,6 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">סוג צלצול/רטט:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">צלצול יחיד</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">צלצול עד להתעלמות מהאזעקה</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>an hour</item>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index e7e9e61b8..539b52c1f 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -987,12 +987,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Tipo di Suono/Vibrazione:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Suona una volta</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Suona fino a che io tolga l\'allarme</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>un\'ora</item>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 5001dd900..e9e5a5425 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -1005,12 +1005,6 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">通知音、振動</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">一度だけ鳴らす</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">解除するまで鳴らす</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>一時間ごと</item>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 8fa1d5aaa..0e24d612e 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -1015,12 +1015,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">소리/진동 선택:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">한번 소리내기</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">알람끌 때까지 소리내기</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>한시간</item>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index d94ce13c5..7eb0c5ce4 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -1015,12 +1015,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ringe- og vibrasjonstype:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Ring én gang</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Ring til jeg slår av alarmen</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>i timen</item>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index c4745875d..271a2afa0 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -989,12 +989,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Audio / Trilstand:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Maak 1x geluid</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Maak geluid totdat ik uitzet</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>eens per uur</item>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index c4228fb01..0c4c3dffb 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -1015,12 +1015,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Rodzaj dzwonka/wibracji:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Zadzwoń raz</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Dzwoń, dopóki nie odwołam alarmu</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>za godzinę</item>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 54978bf1f..fcae9b43e 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -1023,12 +1023,6 @@ Astrid might not let you know when your tasks are due.\n
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ring/Vibrate Type:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Ring Once</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Ring Until I Dismiss Alarm</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>an hour</item>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 059e2334c..2881e2a7a 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -1006,12 +1006,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Тип звонка/вибрации</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Один звонок</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Звонить до выключения звонка</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>за час</item>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index ea5305ee9..b510c9d65 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -994,12 +994,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ring/Vibrationsinställning:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">Ring en gång</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">Ring tills jag stänger av alarmet</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>i timmen</item>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index 163002af4..33cf42480 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -1024,12 +1024,6 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">รูปแบบเสียงเตือน/สั่น</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">ส่งเสียงเตือนหนึ่งครั้ง</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">ส่งเสียงเตือนจนกว่าฉันจะปิดการเตือน</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>หนึ่งชั่วโมง</item>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 6ea21d8a8..e58377dca 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -1008,12 +1008,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">响铃/振动类型：</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">响铃一次</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">响铃到我取消为止</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>一小时</item>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index e43ddcd6b..5192799a0 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -1015,12 +1015,6 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">鈴響/震動類型:</string>
 
-  <!-- Task Edit: Reminder alarm clock toggle: off -->  
-  <string name="TEA_reminder_alarm_off">響鈴一次</string>
-
-  <!-- Task Edit: Reminder alarm clock toggle: on -->  
-  <string name="TEA_reminder_alarm_on">響鈴直到關閉鬧鈴</string>
-
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
     <item>1小時</item>