diff --git a/scripts/clean_translations.rb b/scripts/clean_translations.rb index c6a8c9c64..7bdf9d9c0 100644 --- a/scripts/clean_translations.rb +++ b/scripts/clean_translations.rb @@ -71,14 +71,15 @@ def clean(path) remove_items(doc, 'string', find_duplicate_strings(doc)) remove_items(doc, 'string-array', find_duplicate_string_arrays(doc)) remove_items(doc, 'plurals', find_duplicate_plurals(doc)) - head, *tail = doc.to_s.split("\n").reject { |x| x.strip.eql? "" } + prolog, root, *tail = doc.to_s.split("\n").reject { |x| x.strip.eql? "" } File.open(path, 'w') do |f| - f.puts head + f.puts prolog f.puts "" f.puts "" f.puts "" f.puts "" f.puts "" + f.puts '' f.print tail.join("\n") end end diff --git a/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java b/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java index a97d80487..f87544bca 100644 --- a/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java +++ b/src/amazon/java/com/todoroo/astrid/gtasks/GtasksListService.java @@ -19,4 +19,8 @@ public class GtasksListService { public GtasksList getList(long storeId) { return null; } + + public List getSortedGtasksList() { + return Collections.emptyList(); + } } diff --git a/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java b/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java index a97d80487..f87544bca 100644 --- a/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java +++ b/src/generic/java/com/todoroo/astrid/gtasks/GtasksListService.java @@ -19,4 +19,8 @@ public class GtasksListService { public GtasksList getList(long storeId) { return null; } + + public List getSortedGtasksList() { + return Collections.emptyList(); + } } diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index c9b9c31cc..a60e7ba3b 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -4,7 +4,7 @@ - + مسح الصورة إضافة تعليق ... النسخ الإحتياطي diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index da6ddfc9d..ebeed3c14 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -4,7 +4,7 @@ - + Изчисти Картинка Добави коментар... Име diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index a4ebba346..39b3d9e19 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -4,7 +4,7 @@ - + Neteja la selecció d\'imatge Afegiu un comentari... Còpies de seguretat diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 1b8e7ca82..8c89375a8 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -4,7 +4,7 @@ - + Odebrat obrázek Přidej comment... Zálohy diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index de7c3bd3a..a5e655580 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -4,7 +4,7 @@ - + Ryd markering Tilføj en kommentar Backup diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 74c15361d..df01a355c 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -4,7 +4,7 @@ - + Bild entfernen Kommentar hinzufügen … Schlagwort eingeben @@ -152,6 +152,7 @@ Nächster Monat Mindestpriorität ? Priorität... + Tag... Tag-Name enthält... Tag-Name enthält: ? Titel enthält … diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 3699a1fff..17f6e0cb3 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -4,7 +4,7 @@ - + Καθαρή εικόνα Προσθήκη σχόλιου... Αντίγραφα ασφαλείας diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index d43d73ec3..6e723676d 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -4,7 +4,7 @@ - + Borrar imagen Añadir un comentario... Nombre diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 085149f3a..2ab62d111 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -4,7 +4,7 @@ - + پاک کردن عکس اضافه کردن نظر نام diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 6fc854805..fb6b91358 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -4,7 +4,7 @@ - + Manuaalinen järjestys osatehtäviin Älykäs sorttaus Otsikoittain diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 04fcc89ec..159fcab4f 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -4,7 +4,7 @@ - + Supprimer l\'image Ajouter un commentaire Nom @@ -152,6 +152,7 @@ Mois suivant Priorité au dernier ? Priorité... + Tag... Le nom du tag contient ... Le nom du tag contient: ? Titre contient... diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index f9c4638ca..d5e668284 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -4,7 +4,7 @@ - + Hozzászólás írása... Visszavonás Érintsd meg a beállításhoz diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 5f6759a94..0cfa925fe 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -4,7 +4,7 @@ - + Deseleziona Immagine Aggiungi un commento... Nome diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 6d4d7609c..ff9707a11 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -4,7 +4,7 @@ - + הסר תמונה הוסף הערה שם diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 4739f8eec..96a1c9ce3 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -4,7 +4,7 @@ - + 写真を削除 コメントする 名前 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 42338da78..24166d2d8 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -4,7 +4,7 @@ - + 사진 제거하기 댓글 쓰기... 이름 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index a41890e97..a66840034 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -4,7 +4,7 @@ - + Sikkerhetskopier Importer oppgaver Eksporter oppgaver diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 5cd8fe8da..75b118f52 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -4,7 +4,7 @@ - + Verwijder Foto Voeg een opmerking toe Naam diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 8cc77b150..8e2b30c2a 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -4,7 +4,7 @@ - + Usuń obrazek Dodaj komentarz... Nazwa @@ -152,6 +152,7 @@ Przyszły miesiąc Priorytet przynajmniej? Priorytet... + Tag... Nazwa taga zawiera... Nazwa taga zawiera: ? Tytuł zawiera... diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 8d6dc18c4..d3c740b9f 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -4,7 +4,7 @@ - + Limpar imagem Comentar... Importar tarefas diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 825417e10..7849d6ad0 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -4,7 +4,7 @@ - + Limpar imagem Adicionar um comentário... Nome diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 1be3e114d..713ae8e79 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -4,7 +4,7 @@ - + Убрать изображение Добавить комментарий... Тег: diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index d020ba65a..3ed33aebb 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -4,7 +4,7 @@ - + Vymazať obrázok Komentovať... Názov diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 23c8ed53b..11f339abe 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -4,7 +4,7 @@ - + Zbriši fotografijo Dodaj komentar... Varnostne kopije diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 0861b2dd0..0c2056ce8 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -4,7 +4,7 @@ - + Rensa bild Lägg till en kommentar... Namn diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml index 405f99524..9c6aabe6a 100644 --- a/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -4,7 +4,7 @@ - + ล้างภาพ สำรองข้อมูล กำลังอ่านแผนงาน %d... diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index feae96bea..ca919e615 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -4,7 +4,7 @@ - + Resmi sil Yorum Gir Yedekler diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 7933bf798..a4a6bad87 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -4,7 +4,7 @@ - + Очистити картинку Додати коментар... Ім\'я diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 666c25890..7addc350c 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -4,7 +4,7 @@ - + 取消选择 添加注释... 备份 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 9d3ce3b61..8cab61bfd 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -4,7 +4,7 @@ - + 清除圖片 添加評論 備份 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3b93774f3..3b22e404a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -9,7 +9,7 @@ - Add a comment... + Add a comment… Name @@ -52,7 +52,7 @@ File %1$s contained %2$s.\n\n - Reading task %d... + Reading task %d… @@ -217,7 +217,7 @@ File %1$s contained %2$s.\n\n ----Hide Always---- - Load more... + Load more… @@ -407,7 +407,7 @@ File %1$s contained %2$s.\n\n Due By: ? - Due By... + Due By… No Due Date Next Month @@ -415,20 +415,20 @@ File %1$s contained %2$s.\n\n Priority at least ? - Priority... + Priority… Tag: ? - Tag... + Tag… - Tag name contains... + Tag name contains… Tag name contains: ? - Title contains... + Title contains… Title contains: ? @@ -463,7 +463,7 @@ File %1$s contained %2$s.\n\n In List: ? - In GTasks List... + In GTasks List… Clear Completed @@ -481,7 +481,7 @@ File %1$s contained %2$s.\n\n - Authenticating... + Authenticating… @@ -498,7 +498,7 @@ File %1$s contained %2$s.\n\n - Account %s not found--please log out and log back in from the Google Tasks settings. + Account %s not found—please log out and log back in from the Google Tasks settings. Record a note @@ -679,7 +679,7 @@ File %1$s contained %2$s.\n\n - Please wait... + Please wait…