diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 34914a0f7..9e484c1b7 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Chyba v importu</string>
     
-  <string name="export_toast">Odzálohovány %s do %s.</string>
+  <string name="export_toast">Odzálohovány %1$s do %2$s.</string>
     
   <string name="export_toast_no_tasks">No Tasks to Export.</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Souhrn obnovy</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Soubor %s obsahoval %s.\n\n %s importováno,\n %s již existuje\n %s obsahovalo chyby\n</string>
+  <string name="import_summary_message">Soubor %1$s obsahoval %2$s.\n\n %3$s importováno,\n %4$s již existuje\n %5$s obsahovalo chyby\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Probíhá import...</string>
@@ -1414,10 +1414,10 @@
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 3ed6cd962..d3e39ca82 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Fehler beim Importieren</string>
     
-  <string name="export_toast">%s auf %s gesichert.</string>
+  <string name="export_toast">%1$s auf %2$s gesichert.</string>
     
   <string name="export_toast_no_tasks">Keine Aufgaben für den Export.</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Zusammenfassung \"Wiederherstellen\"</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Datei %s beeinhaltet %s.\n\n %s importiert,\n %s existiert bereits\n %s hat Fehler\n</string>
+  <string name="import_summary_message">Datei %1$s beeinhaltet %2$s.\n\n %3$s importiert,\n %4$s existiert bereits\n %5$s hat Fehler\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importiere...</string>
@@ -1409,10 +1409,10 @@
   <string name="TEA_no_tags_modified">Es gibt keine Änderungen</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Es wurde %s mit %s ersetzt in %d Tasks</string>
+  <string name="TEA_tags_renamed">Es wurde %1$s mit %2$s ersetzt in %3$d Tasks</string>
 
 
 
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index ce6dd57c2..0aa90a9c6 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Error de importación</string>
     
-  <string name="export_toast">Se hicieron copias de seguridad de %s tareas en %s.</string>
+  <string name="export_toast">Se hicieron copias de seguridad de %1$s tareas en %2$s.</string>
     
   <string name="export_toast_no_tasks">No hay tareas para exportar</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Resumen de restauración</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">El archivo %s contenido en %s.\n\n %s importados,\n %s ya existentes\n %s tuvieron errores\n</string>
+  <string name="import_summary_message">El archivo %1$s contenido en %2$s.\n\n %3$s importados,\n %4$s ya existentes\n %5$s tuvieron errores\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importando...</string>
@@ -1412,10 +1412,10 @@ Si puede añada Astrid a la lista de exclusión de modo que no sea matada. De ot
   <string name="TEA_no_tags_modified">No se realizaron cambios</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Se eliminó la etiqueta %s de %d tareas</string>
+  <string name="TEA_tags_deleted">Se eliminó la etiqueta %1$s de %2$d tareas</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Se reemplazó %s con %s en %d tareas</string>
+  <string name="TEA_tags_renamed">Se reemplazó %1$s con %2$s en %3$d tareas</string>
 
 
 
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 299bc8186..a117957ca 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Erreur d\'importation</string>
     
-  <string name="export_toast">Sauvegardé(s) de %s à %s.</string>
+  <string name="export_toast">Sauvegardé(s) de %1$s à %2$s.</string>
     
   <string name="export_toast_no_tasks">Pas de tâche à exporter.</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Restauration de l\'index</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Le fichier %s contenait %s.\n\n %s importé,\n %s existe déjà\n %s contenait des erreurs\n</string>
+  <string name="import_summary_message">Le fichier %1$s contenait %2$s.\n\n %3$s importé,\n %4$s existe déjà\n %5$s contenait des erreurs\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importation...</string>
@@ -1383,10 +1383,10 @@
   <string name="TEA_no_tags_modified">Aucun changement effectué</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Étiquette %s supprimée de %d tâches</string>
+  <string name="TEA_tags_deleted">Étiquette %1$s supprimée de %2$d tâches</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Remplacement de %s par %s dans %d tâches</string>
+  <string name="TEA_tags_renamed">Remplacement de %1$s par %2$s dans %3$d tâches</string>
 
 
 
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 6dc78f8f4..6b48e6da2 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Errore d\'importazione</string>
     
-  <string name="export_toast">Backup di %s su %s eseguito.</string>
+  <string name="export_toast">Backup di %1$s su %2$s eseguito.</string>
     
   <string name="export_toast_no_tasks">Nessuna attività di esportazione</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Ripristina sommario</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Il File %s contiene %s.\n\n %s importati\n %s esiste già\n %s contiene errori\n</string>
+  <string name="import_summary_message">Il File %1$s contiene %2$s.\n\n %3$s importati\n %4$s esiste già\n %5$s contiene errori\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importazione in corso...</string>
@@ -1417,10 +1417,10 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="TEA_no_tags_modified">Nessuna modifica effettuata</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index 26a90aa3c..fea3d3c7c 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">インポートに失敗</string>
     
-  <string name="export_toast">%s を %s にバックアップしました。</string>
+  <string name="export_toast">%1$s を %2$s にバックアップしました。</string>
     
   <string name="export_toast_no_tasks">エクスポートするタスクがありません</string>
   
@@ -84,7 +84,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">ファイル %s の %s 中、\n\n成功: %s\n既に存在: %s\n失敗: %s\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>
@@ -1406,10 +1406,10 @@ Error Message: %s
   <string name="TEA_no_tags_modified">変更されませんでした</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag \'%s\' removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag \'%1$s\' removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index fa554802f..8498bb715 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">가져오기 오류</string>
     
-  <string name="export_toast">%s 에서 %s (을)를 백업하다.</string>
+  <string name="export_toast">%1$s 에서 %2$s (을)를 백업하다.</string>
     
   <string name="export_toast_no_tasks">내보낼 작업 없음.</string>
   
@@ -84,7 +84,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">%s 파일은 %s 개의 할일을 포함하고 있습니다. \n\n %s 개 가져오기 성공,\n %s 개 이미 존재, \n %s 개 에러 발생\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>
@@ -1411,7 +1411,7 @@
   <string name="TEA_no_tags_modified">변경 없음.</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">%s 태그가 %d 작업에서 삭제됨.</string>
+  <string name="TEA_tags_deleted">%1$s 태그가 %2$d 작업에서 삭제됨.</string>
 
   <!-- Toast notification that a tag has been renamed -->
 
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 9ec69a9f2..26b3887a6 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Importfeil</string>
     
-  <string name="export_toast">Sikkerhetskopierte %s til %s</string>
+  <string name="export_toast">Sikkerhetskopierte %1$s til %2$s</string>
     
   <string name="export_toast_no_tasks">Ingen oppgaver å eksportere</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Gjennopprettingssammendrag</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Filen %s inneholdt %s.\n\n %s importerte,\n %s eksisterer allerede\n %s hadde feil\n</string>
+  <string name="import_summary_message">Filen %1$s inneholdt %2$s.\n\n %3$s importerte,\n %4$s eksisterer allerede\n %5$s hadde feil\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importerer...</string>
@@ -1411,10 +1411,10 @@
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 205b9713c..47c55737d 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Fout tijdens importeren</string>
     
-  <string name="export_toast">%s gebackupped naar %s.</string>
+  <string name="export_toast">%1$s gebackupped naar %2$s.</string>
     
   <string name="export_toast_no_tasks">Geen taken om te Exporteren</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Herstel samenvatting</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">%s bestanden bevatten %s.\n\n %s geimporteerd,\n %s bestaan al\n %s hadden fouten\n</string>
+  <string name="import_summary_message">%1$s bestanden bevatten %2$s.\n\n %3$s geimporteerd,\n %4$s bestaan al\n %5$s hadden fouten\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importeren...</string>
@@ -1427,10 +1427,10 @@ Error Message: %s
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index 7010bb914..28c66256d 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Błąd podczas importowania</string>
     
-  <string name="export_toast">Zachowano %s do %s</string>
+  <string name="export_toast">Zachowano %1$s do %2$s</string>
     
   <string name="export_toast_no_tasks">Brak zadań do eksportowania.</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Podsumowanie odzyskiwania</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Plik %s zawiera %s.\n %s zaimportowanych,\n %s ju,\n %s podczas</string>
+  <string name="import_summary_message">Plik %1$s zawiera %2$s.\n %3$s zaimportowanych,\n %4$s ju,\n %5$s podczas</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importowanie...</string>
@@ -1411,10 +1411,10 @@
   <string name="TEA_no_tags_modified">Nie wprowadzono żadnych zmian</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Etykieta %s została usunięta z %d zadań</string>
+  <string name="TEA_tags_deleted">Etykieta %1$s została usunięta z %2$d zadań</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Zastąpiono %s przez %s w %d zadaniach</string>
+  <string name="TEA_tags_renamed">Zastąpiono %1$s przez %2$s w %3$d zadaniach</string>
 
 
 
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 86ae20104..80f72c217 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Erro de Importação</string>
     
-  <string name="export_toast">Cópia de Segurança de %s para %s</string>
+  <string name="export_toast">Cópia de Segurança de %1$s para %2$s</string>
     
   <string name="export_toast_no_tasks">No Tasks to Export.</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Sumário de Restauro</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">O ficheiro %s continha %s.\n\n %s importadas,\n %s já existiam\n %s tinham erros\n</string>
+  <string name="import_summary_message">O ficheiro %1$s continha %2$s.\n\n %3$s importadas,\n %4$s já existiam\n %5$s tinham erros\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">A importar...</string>
@@ -1424,10 +1424,10 @@ Error Message: %s
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 98de44ad7..b959a9f9a 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Ошибка импорта</string>
     
-  <string name="export_toast">Cохранено %s в %s</string>
+  <string name="export_toast">Cохранено %1$s в %2$s</string>
     
   <string name="export_toast_no_tasks">Нет задач для экспорта.</string>
   
@@ -84,7 +84,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">Файл %s содержал %s.\n\n %s импортировано,\n %s уже существует\n %s содержали ошибки\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>
@@ -1403,10 +1403,10 @@
   <string name="TEA_no_tags_modified">Без изменений</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Метка %s удалена из %d задач</string>
+  <string name="TEA_tags_deleted">Метка %1$s удалена из %2$d задач</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Заменено %s на %s в %d задачах</string>
+  <string name="TEA_tags_renamed">Заменено %1$s на %2$s в %3$d задачах</string>
 
 
 
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 9851f1687..c66959a5e 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Importfel</string>
     
-  <string name="export_toast">Säkerhetskopierade %s till %s.</string>
+  <string name="export_toast">Säkerhetskopierade %1$s till %2$s.</string>
     
   <string name="export_toast_no_tasks">Inga uppgifter att exportera</string>
   
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Återställningssammanfattning</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Filen %s innehöll %s.\n\n %s importerade,\n %s existerar redan\n %s hade fel\n</string>
+  <string name="import_summary_message">Filen %1$s innehöll %2$s.\n\n %3$s importerade,\n %4$s existerar redan\n %5$s hade fel\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importerar...</string>
@@ -1414,10 +1414,10 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
   <string name="TEA_no_tags_modified">Inga ändringar gjordes</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Taggen %s togs bort från %d uppgifter</string>
+  <string name="TEA_tags_deleted">Taggen %1$s togs bort från %2$d uppgifter</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Ersatte %s med %s i %d uppgifter</string>
+  <string name="TEA_tags_renamed">Ersatte %1$s med %2$s i %3$d uppgifter</string>
 
 
 
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index f41bfad16..6ea21d8a8 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">导入错误</string>
     
-  <string name="export_toast">已备份 %s 到 %s。</string>
+  <string name="export_toast">已备份 %1$s 到 %2$s。</string>
     
   <string name="export_toast_no_tasks">没有待导出的任务。</string>
   
@@ -84,7 +84,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">文件 %s 包含%s个任务。\n\n %s个已导入 \n %s个已存在 \n %s个有错误\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>
@@ -1408,10 +1408,10 @@
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index cc09550c3..c97e51b09 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -73,7 +73,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">匯入錯誤</string>
     
-  <string name="export_toast">備份 %s 至 %s.</string>
+  <string name="export_toast">備份 %1$s 至 %2$s.</string>
     
   <string name="export_toast_no_tasks">No Tasks to Export.</string>
   
@@ -84,7 +84,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">檔案 %s 已包含 %s.\n\n %s 已匯入,\n %s 已存在\n %s 有問題\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>
@@ -1411,10 +1411,10 @@
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 
 
diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index 9a548740c..687fef94c 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -55,7 +55,7 @@
   <!-- Message displayed when error occurs -->
   <string name="backup_TXI_error">Import Error</string>
     
-  <string name="export_toast">Backed Up %s to %s.</string>
+  <string name="export_toast">Backed Up %1$s to %2$s.</string>
     
   <string name="export_toast_no_tasks">No Tasks to Export.</string>
   
@@ -67,10 +67,10 @@
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
   <string name="import_summary_message">
-File %s contained %s.\n\n
-%s imported,\n
-%s already exist\n
-%s had errors\n
+File %1$s contained %2$s.\n\n
+%3$s imported,\n
+%4$s already exist\n
+%5$s had errors\n
   </string>
   
   <!-- Progress Dialog Title for importing -->    
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index e35e0dc61..2dba4c1d1 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -45,9 +45,9 @@
   <string name="TEA_no_tags_modified">No changes made</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">Tag %s removed from %d tasks</string>
+  <string name="TEA_tags_deleted">Tag %1$s removed from %2$d tasks</string>
 
   <!-- Toast notification that a tag has been renamed -->
-  <string name="TEA_tags_renamed">Replaced %s with %s on %d tasks</string>
+  <string name="TEA_tags_renamed">Replaced %1$s with %2$s on %3$d tasks</string>
 
 </resources>