From 84dbac39754ed431c99b8f2858ff758898788374 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 1 Apr 2013 13:22:54 -0700 Subject: [PATCH] Fixed typo, imported updated translations --- api/res/values-de/strings.xml | 2 +- api/res/values-es/strings.xml | 2 +- api/res/values-iw/strings.xml | 0 api/res/values-nl/strings.xml | 6 +- astrid/res/values-de/strings.xml | 188 +++++---- astrid/res/values-es/strings.xml | 94 +++-- astrid/res/values-fr/strings.xml | 38 +- astrid/res/values-it/strings.xml | 44 ++- astrid/res/values-iw/strings.xml | 34 +- astrid/res/values-ja/strings.xml | 33 +- astrid/res/values-ko/strings.xml | 31 +- astrid/res/values-nl/strings.xml | 361 +++++++++--------- astrid/res/values-pl/strings.xml | 31 +- astrid/res/values-pt-rBR/strings.xml | 37 +- astrid/res/values-ru/strings.xml | 33 +- astrid/res/values-sv/strings.xml | 33 +- astrid/res/values-tr/strings.xml | 31 +- astrid/res/values-zh-rCN/strings.xml | 31 +- astrid/res/values-zh-rTW/strings.xml | 31 +- .../astrid/service/UpgradeService.java | 2 +- 20 files changed, 681 insertions(+), 381 deletions(-) mode change 100644 => 100755 api/res/values-iw/strings.xml mode change 100644 => 100755 astrid/res/values-iw/strings.xml diff --git a/api/res/values-de/strings.xml b/api/res/values-de/strings.xml index 9797d562c..45dff2116 100755 --- a/api/res/values-de/strings.xml +++ b/api/res/values-de/strings.xml @@ -152,7 +152,7 @@ Synchronisation - Sync now + Jetzt synchronisieren Astrid.com, Google Tasks, gespeicherte Daten, lokale Backups diff --git a/api/res/values-es/strings.xml b/api/res/values-es/strings.xml index 15222a97e..ca543ccbc 100755 --- a/api/res/values-es/strings.xml +++ b/api/res/values-es/strings.xml @@ -152,7 +152,7 @@ Sincronización & copia de seguridad - Sync now + Sincronizar ahora Astrid.com, Google Tasks, información guardada, copia de seguridad local diff --git a/api/res/values-iw/strings.xml b/api/res/values-iw/strings.xml old mode 100644 new mode 100755 diff --git a/api/res/values-nl/strings.xml b/api/res/values-nl/strings.xml index 53b72d7f7..50f5c74f8 100755 --- a/api/res/values-nl/strings.xml +++ b/api/res/values-nl/strings.xml @@ -126,10 +126,10 @@ Nee - Sluiten + Sluit - Gereed + Gedaan Er is een fout opgetreden:\n\n%s @@ -152,7 +152,7 @@ Synchronisatie - Sync now + Nu synchroniseren Astrid.com, Google Taken, opgeslagen data, lokale back-up diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml index b6241d145..cc3b0916d 100755 --- a/astrid/res/values-de/strings.xml +++ b/astrid/res/values-de/strings.xml @@ -58,7 +58,7 @@ Du hast %s geblockt. - You\'ve ignored %s. + Du hast %s ignoriert. Du bist jetzt mit %s befreundet! Füge jetzt Aufgaben für ihn hinzu. @@ -218,6 +218,8 @@ Nicht hinzufügen + (owner) + @@ -233,10 +235,10 @@ Mit Google verbinden - Sign in: %s + Anmelden: %s - Not %s? + Nicht %s? Vorname @@ -312,7 +314,10 @@ - Sie synchrolisieren Ihre Aufgaben mit Google Tasks. Beachten Sie bitte, das das Synchronisieren mit beiden Services in einigen Fällen zu unerwarteten Ergebnissen führen kann. Sind Sie sicher, das Sie mit Astrid.com synchronisieren möchten ? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Konto-Typ @@ -336,33 +341,43 @@ - Using Astrid.com + Google without Duplicates - Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup & Sync, or downgrade to Google Tasks only sync - Stick with Astrid - Downgrade to Google Tasks - - Upgrade to Astrid Sync for Free! - Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)! - Upgrade to Astrid Sync - Stick with Google Tasks - - Free backup & Sync! - Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere. + Nutze Astrid.com und Google ohne Dubletten + Lass uns ehrlich sein: Google Tasks is bequem, aber nicht so cool wie Astrid. Um doppelte Einträge zu vermeiden, kannst du nicht mehr mit Astrid.com synchronisieren ... + Bleibe bei Astrid + Herunterstufen zu Google Tasks + + Gratis upgraden zu Astrid Sync! + Zugang zu deinen Aufgaben von all deinen Geräten und von Gmail duch Astrid.com Sync. Zu Astrid sync upgraden (du kannst jederzeit zu Google Tasks zurückkehren ...) + Upgraden zu Astrid Sync + Bei Google Tasks bleiben + + Synchronisation + Gefährde deine To-do-Liste nicht! Deine Aufgaben mit der neuen und verbesserten Astrid-Synchronisation von überall erreichen und bearbeiten. Jetzt registrieren - You have been logged out of Astrid + Du hast dich aus Astrid ausgeloggt + + Daten löschen? + Möchtest du deine Aufgaben und Listen löschen? + Daten löschen + Daten nicht löschen - Clear data? - Would you like to clear your tasks and lists? - Clear data - Keep data + Als anderer Nutzer einloggen + Möchtest Du die bestehenden Aufgaben auf Deinem Telefon vor der Synchronisation löschen? + Daten nicht löschen + Alle Daten löschen + Verarbeite vorhandene Daten ... - Logging in as different user - Would you like to delete existing phone tasks before syncing? - Keep data - Clear all data - Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Neue Liste anlegen + Leave list + Synchronisierung läuft... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -721,7 +736,7 @@ Gelöschte Aufgaben anzeigen - Manual order with subtasks + Manuelle Sortierung mit Subtasks Astrid Smart Sort @@ -733,7 +748,7 @@ Nach Fälligkeit - By priority + Nach Priorität Nach letzter Änderung @@ -799,7 +814,7 @@ Wann - Aufgabenüberblick + Task name Priorität @@ -813,7 +828,7 @@ Keine - Hide until + Verbergen bis Aufgabe wird bis %s versteckt @@ -825,7 +840,7 @@ Beschreibung - Enter task description... + Aufgabenbeschreibung eingeben ... Wie lang wird es dauern? @@ -843,7 +858,7 @@ Aufgabe löschen - Refresh comments + Kommentare aktualisieren Kommentare @@ -868,7 +883,7 @@ - No date + Kein Datum Bestimmter Tag Heute Morgen @@ -882,7 +897,7 @@ - Never + Nie Fälligkeitsdatum Tag vor der Fälligkeit Woche vor der Fälligkeit @@ -1105,7 +1120,7 @@ Astrid: Einstellungen - Share Astrid + Astrid teilen Erzähle von Astrid auf deinem bevorzugten sozialen Netzwerk @@ -1131,7 +1146,7 @@ Größe der Aufgabenliste - Filters to show + Angezeigte Filter Bestätigung für Smart-Erinnerungen anzeigen @@ -1142,19 +1157,19 @@ - Show description in task + Zeige Beschreibung in der Aufgabe - Edit screen options + Bildschirmeinstellungen bearbeiten - Edit screen order + Bearbeite Anordnung - Customize + Einstellen - 5 minute increments + 5 Minuten Steigerung - Use date shortcuts + Nutze Datumsabkürzung Erscheinungsbild Aufgabenseite anpassen @@ -1164,7 +1179,7 @@ Description will be accessible from the task edit screen - Description will always be displayed + Beschreibung werden immer angezegt Kompakte Aufgabenzeile @@ -1203,14 +1218,14 @@ Row style: %s - Use filters + Filter nutzen Lets you create custom filters Show list members in shared lists - Simple text boxes + Einfachen Textboxen Advanced quickadd controls @@ -1219,7 +1234,7 @@ Menu items - List view + Listenansicht Show comments in task edit @@ -1263,7 +1278,7 @@ Set configuration - Default + Standard Astrid Lite @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1319,7 +1337,7 @@ Night - Transparent (white text) + Transparent (weißer Text) Transparent (schwarzer Text) @@ -1331,8 +1349,8 @@ Tag - Rot Sky blue Night - Transparent (white text) - Transparent (black text) + Transparent (weißer Text) + Transparent (schwarzer Text) Retro @@ -1553,6 +1571,9 @@ Meine Aufgaben + + + Waiting On Me @@ -1598,7 +1619,7 @@ Zeile löschen - Hier können Sie neue Filter erstellen. Fügen Sie mit der Schaltfläche unten Kriterien hinzu, kurz oder lang tippen zum Anpassen, und dann wählen Sie \"Anzeigen\"! + Long press on items for additional options Kriterium hinzufügen @@ -1789,15 +1810,15 @@ Fehler bei der Hintergrunautehntifizierung. Starte eine Synchronisation in der App. - Importing Google Tasks... + Google Tasks importieren The list %1$s is shared with others! Do you still want to add the task %2$s to it? Google Tasks Import - Add task + Aufgabe hinzufügen - Don\'t add task + Aufgabe nicht hinzufügen @@ -1854,7 +1875,6 @@ Kein Interesse "Melde dich an, um alles aus Astrid rauszuholen! Gratis, du kannst mit Astrid.com synchronisieren, Aufgaben per email hinzufügen und du kannst sogar Aufgaben mit Freunden teilen!" - - Once + Einmal - Five times + Fünfmal - Until I dismiss alarm + Bis ich den Alarm abschalte @@ -2318,11 +2338,11 @@ Erinnerungen können mit dem \"Alle Löschen\" Button gelöscht werden - Social encouragement + Soziale Förderung - Reminders will show who is counting on you for shared tasks + Die Erinnerung wird Zeigen, wer auf Dich bei geteilten Aufgaben zählt. - Reminders will not show who is counting on you for shared tasks + Die Erinnerung wird nicht Zeigen, wer auf Dich bei geteilten Aufgaben zählt. @@ -2586,7 +2606,7 @@ Wiederholungsintervall - Repeating? + Wiederkehrend? Nicht wiederholen @@ -2612,11 +2632,11 @@ Tage - weekdays - weeks - months - years - hours + Wochentage + Wochen + Monate + Jahre + Stunden Minuten @@ -2721,8 +2741,8 @@ Listen - Add to lists - + Zur Liste hinzufügen + Wähle eine Liste @@ -2759,7 +2779,7 @@ - In keiner Liste + Uncategorized @@ -2860,18 +2880,18 @@ %1$s hat kommentiert: %3$s - %1$s on $link_task: %3$s - %1$s on %2$s: %3$s + %1$s in $link_task: %3$s + %1$s in %2$s: %3$s Sie - yourself + Du selbst Sie - (a deleted user) + (Ein gelöschter Nutzer) diese Liste diese Aufgabe - added %1$s to %2$s - removed %1$s from %2$s + füge %1$s zu %2$s hinzu + lösche %1$s von %2$s attached %1$s to %2$s removed %1$s from %2$s left %s diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml index 1210ae7e2..daa3d321f 100755 --- a/astrid/res/values-es/strings.xml +++ b/astrid/res/values-es/strings.xml @@ -58,7 +58,7 @@ Ha bloqueado a %s. - You\'ve ignored %s. + Ha ignorado %s. Es amigo/a de %s. Añada tareas para ellos abajo. @@ -165,7 +165,7 @@ Compartir con: - Share + Compartir Lista: %s @@ -218,6 +218,8 @@ No agregar + (owner) + @@ -233,10 +235,10 @@ Conectarse con Google - Sign in: %s + Iniciar sesión: %s - Not %s? + ¿No es %s? Nombre @@ -312,7 +314,10 @@ - Está sincronizando con Google Tasks. Tenga en cuenta que sincronizar con ambos servicios puede llevar en algunos casos a resultados inesperados. ¿Estas seguro que quiere sincronizar con Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Tipo de cuenta @@ -336,8 +341,8 @@ - Using Astrid.com + Google without Duplicates - Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup & Sync, or downgrade to Google Tasks only sync + Usando Astrid.com + Google sin Duplicados + Seamos honestos. Google Tasks es práctico pero no es tan guay como Astrid. Para evitar duplicados ya no puedes sincronizar con Astrid.com y al mismo tiempo sincronizar en segundo plano con Google Tasks. Todavía puedes importar tus Google Tasks yendo a Configuración → Copias y Sincronización o reducir la sincronización a sólo con Google Tasks. Stick with Astrid Downgrade to Google Tasks @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Crea una nueva lista + Leave list + + Sincronización en marcha + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ Cuando - Descripción de la tarea + Task name Prioridad @@ -843,7 +858,7 @@ Borrar Tarea - Refresh comments + Actualizar comentarios Comentarios @@ -1105,7 +1120,7 @@ Astrid: Preferencias - Share Astrid + Compartir Astrid Comparte Astrid en tu red social favorita @@ -1131,7 +1146,7 @@ Tamaño de la lista de tareas - Filters to show + Filtros a mostrar Mostrar confirmación para recordatorios inteligentes @@ -1142,7 +1157,7 @@ - Show description in task + Mostrar descripción en tarea Edit screen options @@ -1150,7 +1165,7 @@ Edit screen order - Customize + Personalizar 5 minute increments @@ -1203,7 +1218,7 @@ Row style: %s - Use filters + Usar filtros Lets you create custom filters @@ -1263,7 +1278,7 @@ Set configuration - Default + Predeterminado Astrid Lite @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1461,7 +1479,7 @@ Astrid podría no avisarle cuanto venza una tarea.\n Actualmente: %s - Default priority + Prioridad predeterminada Actualmente: %s @@ -1554,6 +1572,9 @@ Astrid podría no avisarle cuanto venza una tarea.\n Mis Tareas + + + Waiting On Me @@ -1599,9 +1620,7 @@ Astrid podría no avisarle cuanto venza una tarea.\n Eliminar fila - Esta pantalla le permite crear nuevos filtros. Agregue -criterios usando el botón inferior, un toque corto o largo para ajustarlos, -luego presione en \"Ver\"! + Long press on items for additional options Añadir Criterio @@ -1801,9 +1820,9 @@ Intenta acceder desde el navegador, a continuación vuelve a reintentarlo nuevam Google Tasks Import - Add task + Añadir tarea - Don\'t add task + No añadir tarea @@ -1862,7 +1881,6 @@ Intenta acceder desde el navegador, a continuación vuelve a reintentarlo nuevam ¡Inicia sesión para aprovechar Astrid al máximo! Es gratis, obtienes copias de seguridad en línea, sincronización completa con Astrid.com, podrás agregar tareas vía correo electrónico, e incluso compartir listas de tareas con tus amigos! - - Once + Una vez - Five times + Cinco veces - Until I dismiss alarm + Hasta que cancele la alarma @@ -2623,11 +2641,11 @@ no le será posible hacer compras. días - weekdays - weeks - months - years - hours + días laborales + semanas + meses + años + horas minutos @@ -2732,8 +2750,8 @@ no le será posible hacer compras. Listas - Add to lists - + Añadir a listas + Nueva lista @@ -2770,7 +2788,7 @@ no le será posible hacer compras. - En ninguna lista + Uncategorized @@ -2843,7 +2861,7 @@ no le será posible hacer compras. Tareas que se están cronometrando - Timer + Temporizador diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml index c5575f717..9ca28d9cf 100755 --- a/astrid/res/values-fr/strings.xml +++ b/astrid/res/values-fr/strings.xml @@ -218,6 +218,8 @@ Ne pas ajouter + (owner) + @@ -312,7 +314,10 @@ - Vous êtes actuellement synchronisé avec Google Task. La synchronisation avec les deux services peut provoquer des résultats inattendus. Êtes-vous sûr de vouloir vous synchroniser avec Astrid.com ? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Type de compte @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Créer une nouvelle liste + Leave list + + Synchronisation en cours... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ Quand - Résumé des tâches + Task name Priorité @@ -882,7 +897,7 @@ - Never + Jamais Date d\'échéance Jour avant échéance Semaine avant échéance @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1314,7 +1332,7 @@ Jour - Rouge - Sky blue + Bleu ciel Night @@ -1552,6 +1570,9 @@ Mes tâches + + + Waiting On Me @@ -1597,7 +1618,7 @@ Supprimer la ligne - Cet écran vous permet de créer un nouveau filtre. Ajoutez des critères en utilisant le bouton ci-dessous, appuyez ou maintenez appuyé pour ajuster, puis cliquez sur \"Voir\" ! + Long press on items for additional options Ajouter un critère @@ -1853,7 +1874,6 @@ Non merci "Connectez-vous pour tirer le maximum d\'Astrid! Cela comprend la sauvegarde en ligne, la syncronisation complète avec le serveur Astrid.com, la possibilité d\'ajout de taches par courriel, et même de partager des listes de taches avec ses amis et tout cela gratuitement!" - Add to lists - + Nouvelle liste @@ -2758,7 +2778,7 @@ - Dans aucune liste + Uncategorized @@ -2913,7 +2933,7 @@ removed %s repeat shared %1$s with %2$s unshared %1$s with %2$s - every %s + Chaque %s on %s after completion viewed %s diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml index 91231d933..4f627d84b 100755 --- a/astrid/res/values-it/strings.xml +++ b/astrid/res/values-it/strings.xml @@ -165,7 +165,7 @@ Condividi con: - Share + Condividi Lista: %s @@ -218,6 +218,8 @@ Non aggiungere + (owner) + @@ -234,10 +236,10 @@ condividerle e delegarle ad altri. Connetti con Google - Sign in: %s + Accedi: %s - Not %s? + Non sei %s? Nome @@ -313,9 +315,10 @@ condividerle e delegarle ad altri. - Stai attualmente sincronizzando i tuoi compiti con Google Tasks. -Sappi che sincronizzare i dati tra due servizi potrebbe talvolta portare a risultati inaspettati. -Sei sicuro di voler sincronizzare con Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Tipo di account @@ -339,8 +342,8 @@ Sei sicuro di voler sincronizzare con Astrid.com? - Using Astrid.com + Google without Duplicates - Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup & Sync, or downgrade to Google Tasks only sync + Usare Astrid.com + Google senza duplicati + Siamo onesti. Google Tasks è utile, ma non fico come Astrid. Per non avere più duplicati, non è più possibile sincronizzare Astrid.com e Google Tasks contemporaneamente nei due sensi. Puoi ancora importare le attività di Google Tasks da Impostazioni → Backup & Sync, o tornare indietro alla sola sincronizzazione con Google Tasks. Stick with Astrid Downgrade to Google Tasks @@ -366,6 +369,16 @@ Sei sicuro di voler sincronizzare con Astrid.com? Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Crea nuova lista + Leave list + + Sincronizzazione in corso... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -802,7 +815,7 @@ Sei sicuro di voler sincronizzare con Astrid.com? Quando - Riepilogo Attività + Task name Priorità @@ -1277,6 +1290,9 @@ Sei sicuro di voler sincronizzare con Astrid.com? default + + Show save and cancel + @@ -1557,6 +1573,9 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Le mie attività + + + Waiting On Me @@ -1602,7 +1621,7 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Cancella Riga - Questa schermata permette di creare nuovi filtri. Aggiungi criteri usando il tasto più in basso, premi brevemente o a lungo per sistemarli, e clicca \"Mostra\"! + Long press on items for additional options Aggiungi Criteri @@ -1861,7 +1880,6 @@ Prova ad autenticarti con un browser, poi torna e riprova: Accedi per ottenere il massimo da Astrid! Gratuitamente, hai il backup online, la sincronizzazione completa con Astrid.com, la possibilità di aggiungere attività via email, e puoi anche condividere elenchi di attività con gli amici! - Add to lists - + Nuova lista @@ -2772,7 +2790,7 @@ non potrai fare acquisti. - In nessuna Lista + Uncategorized diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml old mode 100644 new mode 100755 index ffad16839..d106d084c --- a/astrid/res/values-iw/strings.xml +++ b/astrid/res/values-iw/strings.xml @@ -218,6 +218,8 @@ אל תוסיף + (owner) + @@ -312,7 +314,10 @@ - אתה מסנכרן כעת עם ״משימות גוגל״. שים לב שסינכרון מול שני השירותים יכול במקרים מסויימים להביא לתוצאות בלתי צפויות. האם אתה בטוח שברצונך להסתנכרן גם עם אתר astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? סוג חשבון @@ -363,6 +368,16 @@ הסרת כל הנתונים מעבדת נתונים קיימים... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + צור רשימה חדשה + Leave list + + הסינכרון מתבצע + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ מתי - תקציר המשימה + Task name עדיפות @@ -1274,6 +1289,9 @@ מחדל + + Show save and cancel + @@ -1558,6 +1576,9 @@ המשימות שלי + + + Waiting On Me @@ -1603,9 +1624,7 @@ מַחֲקִי שורה - מסך זה מאפשר יצירת מַסְנְנִים חדשים. הכפתור למטה -יוסיף קריטריונים. התאם את הקריטריונים ע״י לחיצה -קצרה או ארוכה, ואז הקלק ״הצג!״ + Long press on items for additional options הוסף קריטריון @@ -1861,7 +1880,6 @@ לא, תודה עליך להרשם כדי להפיק את המירב מאסטריד! תוכל לקבל גיבויים חינם, סינכרון מלא עם אתר astrid.com, אפשרות להוסיף משימות בדוא״ל, ואפילו אפשרות לשתף משימות עם חברים! - הוסף לרשימות - + רשימה חדשה @@ -2773,7 +2791,7 @@ - לא בשום רשימה + Uncategorized diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml index 6c039faf6..63dcd954e 100755 --- a/astrid/res/values-ja/strings.xml +++ b/astrid/res/values-ja/strings.xml @@ -218,6 +218,8 @@ 追加しないで + (owner) + @@ -300,7 +302,7 @@ - Status - Logged in as %s + Logged in as %s Astrid.com @@ -313,8 +315,9 @@ - You are currently synchronizing with Google Tasks. - Be advised that synchronizing with both services can in some cases lead to unexpected results. + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. Are you sure you want to sync with Astrid.com? @@ -366,6 +369,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + 同期中 + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -804,7 +817,7 @@ いつ - タスクの概要 + Task name 優先順位 @@ -1279,6 +1292,9 @@ default + + Show save and cancel + @@ -1566,6 +1582,9 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget 私のタスク + + + Waiting On Me @@ -1611,7 +1630,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget 条件の削除 - 新しいフィルタを作るには、左下のボタンで条件を追加し、項目のタップまたは長押しで条件を設定してください。右下のボタンで結果を表示します。 + Long press on items for additional options 条件の追加 @@ -2747,7 +2766,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget Add to lists - + New list @@ -2784,7 +2803,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget - Not in any List + Uncategorized diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml index 54f0e0b41..784ce9916 100755 --- a/astrid/res/values-ko/strings.xml +++ b/astrid/res/values-ko/strings.xml @@ -218,6 +218,8 @@ 추가하지 않기 + (owner) + @@ -312,7 +314,10 @@ - 당신은 지금 구글 일정과 동기화하고 있습니다. 두 서비스를 동기화 할 때 경우에 따라 예상치 못한 결과가 발생할 수 있음을 유의해 주십시오. 구글 일정과 Astrid.com을 동기화 하시겠습니까? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? 계정 유형 @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + 동기화 진행 중... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ 시간 - 일정 요약 + Task name 우선순위 @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1552,6 +1570,9 @@ 내 할 일 + + + Waiting On Me @@ -1597,7 +1618,7 @@ 가로줄 삭제 - 이 화면은 새 필터를 만들도록 도와줍니다. 아래의 버튼으로 새 필터 기준을 추가하고, 길게 또는 짧게 눌러서 조정할 수 있습니다. 모두 마친 후에는 \"보기\" 버튼을 눌러 주세요. + Long press on items for additional options 기준 추가 @@ -2720,7 +2741,7 @@ Add to lists - + 새 목록 @@ -2757,7 +2778,7 @@ - 어떤 목록에도 없음 + Uncategorized diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml index 7a03df279..1f36b4546 100755 --- a/astrid/res/values-nl/strings.xml +++ b/astrid/res/values-nl/strings.xml @@ -58,7 +58,7 @@ Je hebt %s geblokkeerd. - You\'ve ignored %s. + Je hebt %s genegeerd Je bent bevriend met %s! Voeg hieronder voor hem/haar een taak toe. @@ -84,7 +84,7 @@ Activiteit - Instellingen voor Lijst + Lijst Voorkeuren @@ -165,7 +165,7 @@ Deel met: - Share + Delen Lijst: %s @@ -218,6 +218,8 @@ Niet toevoegen + (owner) + @@ -233,10 +235,10 @@ Verbind met Google - Sign in: %s + Inloggen als %s - Not %s? + Niet %s? Voornaam @@ -312,7 +314,10 @@ - Op dit moment synchroniseer je met Google Tasks. Let erop dat synchroniseren met beide diensten in sommige gevallen kan leiden tot onverwachte resultaten. Weet je zeker dat je wilt synchroniseren met Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Type account @@ -336,33 +341,43 @@ - Using Astrid.com + Google without Duplicates - Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup & Sync, or downgrade to Google Tasks only sync - Stick with Astrid - Downgrade to Google Tasks - - Upgrade to Astrid Sync for Free! - Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)! - Upgrade to Astrid Sync - Stick with Google Tasks - - Free backup & Sync! - Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere. + Gebruik Astrid.com + Google zonder duplicaten + Laten we eerlijk zijn. Google Taken is gemakkelijk maar niet zo cool als Astrid. Om duplicaten te voorkomen kun je niet langer tegelijkertijd zowel Astrid.com als Google Taken synchroniseren. Je kunt nog wel je Google Taken importeren via Instelllingen → Backup & Sync, of downgraden naar enkel synchronisatie met Google Taken. + Blijf bij Astrid + Downgrade naar Google Taken + + Upgrade gratis naar Astrid Sync! + Toegang tot je taken op al je apparaten en op Gmail met Astrid.com sync. Upgrade naar Astrid.com Sync (je kunt altijd terug naar Google Taken - maar zul je niet willen)! + Upgrade naar Astrid Sync + Blijf bij Google Taken + + Gratis backyp & Sync! + Loop geen risico met je to-do\'s! Nieuwe en verbeterde Astrid sync om je taken te bewaren en er overal toegang tot te hebben. Registreer nu - You have been logged out of Astrid + Je bent uitgelogd uit Astrid + + Data wissen? + Wil je jouw taken en lijsten wissen? + Data wissen + Data behouden + + Inloggen als een andere gebruiker + Wil je de bestaande telefoon taken verwijderen voor synchronisatie? + Data behouden + Alle gegevens wissen + Verwerken van bestaande data - Clear data? - Would you like to clear your tasks and lists? - Clear data - Keep data + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Maak een nieuwe lijst + Leave list - Logging in as different user - Would you like to delete existing phone tasks before syncing? - Keep data - Clear all data - Processing existing data... + Synchronisatie bezig... + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -384,7 +399,7 @@ - Alarm! + Voeg Alarm toe @@ -591,7 +606,7 @@ Uitbreidingen - Sort + Sorteren Nu Synchroniseren @@ -640,8 +655,8 @@ Actief Vandaag Binnenkort - Te laat - Gereed + Te Laat + Gedaan Verborgen @@ -721,7 +736,7 @@ Verwijderde taken weergeven - Manual order with subtasks + Handmatige volgorde met subtaken Astrid Slim Sorteren @@ -733,7 +748,7 @@ Op einddatum - By priority + Op prioriteit Op datum gewijzigd @@ -799,7 +814,7 @@ Wanneer - Samenvatting taak + Task name Prioriteit @@ -813,7 +828,7 @@ Geen - Hide until + Verbergen tot Taak is verborgen tot %s @@ -825,7 +840,7 @@ Omschrijving - Enter task description... + Voer taakomschrijving in Tijdsduur @@ -843,7 +858,7 @@ Taak verwijderen - Refresh comments + Opmerkingen vernieuwen Opmerkingen @@ -868,7 +883,7 @@ - No date + Geen datum Specifieke dag Vandaag Morgen @@ -882,7 +897,7 @@ - Never + Nooit Einddatum Dag voor einddatum Week voor einddatum @@ -1105,7 +1120,7 @@ Astrid: Instellingen - Share Astrid + Deel Astrid Deel over Astrid op je favoriete sociale netwerk @@ -1131,7 +1146,7 @@ Taaklijst lettertypegrootte - Filters to show + Te tonen filters Laat bevestiging zien voor slimme herinneringen @@ -1142,19 +1157,19 @@ - Show description in task + Toon omschrijving in taak - Edit screen options + Scherm opties bewerken - Edit screen order + Scherm volgorde bewerken - Customize + Aanpassen - 5 minute increments + stappen van 5 minuten - Use date shortcuts + Gebruik datum snelkoppelingen Pas de layout van het Taak Wijzigingsscherm aan @@ -1162,9 +1177,9 @@ Standaardinstellingen herstellen - Description will be accessible from the task edit screen + Omschrijving zal toegankelijk zijn vanaf het bewerk taak scherm - Description will always be displayed + Omschrijving zal altijd worden getoond Compacte Taakrij @@ -1188,41 +1203,41 @@ - Original - Simple - Title only + Origineel + Simpel + Enkel titel Titel afkappen naar twee regels met datum aan rechterkant Titel afkappen tot één regel met datum en onderstaande lijsten - Single line title only + Enkele regel enkel titel - Row style: %s + Regel stijl %s - Use filters - Lets you create custom filters + Gebruik filters + Laat je eigen filters definieren - Show list members in shared lists + Toon ledenlijst in gedeelde lijsten - Simple text boxes + Eenvoudige tekst vakken - Advanced quickadd controls + Geavanceerde snel toevoegen controls Menu items - List view + Lijst weergave - Show comments in task edit + Toon opmerkingen in taak bewerken Kleuren Thema @@ -1253,26 +1268,29 @@ Krijg ideeën om je te helpen taken te voltooien - Calendar event time - End calendar events at due time - Start calendar events at due time + Agenda item tijd + Agendai tem op tijd afronden + Agenda item op tijd starten Gebruik telefoon layout Laat aanbevolen lijsten zien - Set configuration - Default + Configuratie instellen + Standaard Astrid Lite - Set configuration? + Configuratie instellen? - Reset preferences to the %s configuration? + Reset voorkeuren naar de %s configuratie? - default + standaard + + + Show save and cancel @@ -1314,11 +1332,11 @@ Dag - Rood - Sky blue + Hemelsblauw - Night + Nacht - Transparent (white text) + Transparant (witte tekst) Transparant (Zwarte Tekst) @@ -1328,10 +1346,10 @@ Zelfde als app Dag - Blauw Dag - Rood - Sky blue - Night - Transparent (white text) - Transparent (black text) + Hemelsblauw + Nacht + Transparant (witte tekst) + Transparant (zwarte tekst) Oude Stijl @@ -1451,7 +1469,7 @@ Basisinstellingen nieuwe taak - Priority, due date, add to calendar + Prioriteit, eind datum, toevoegen aan agenda Standaard prioriteit @@ -1459,7 +1477,7 @@ Nu: %s - Default priority + Standaard prioriteit Nu: %s @@ -1552,6 +1570,9 @@ Mijn taken + + + Waiting On Me @@ -1597,7 +1618,7 @@ Regel verwijderen - Met dit scherm kunnen nieuwe filters worden gemaakt. Criteria kunnen met onderstaande knop worden toegevoegd, kort of lang drukken om ze aan te passen en klik daarna op \"Weergeven\". + Long press on items for additional options Criteria toevoegen @@ -1626,9 +1647,9 @@ - Priority at least ? + Prioriteit ten minste ? - Priority... + Prioriteit... Lijst: ? @@ -1677,7 +1698,7 @@ Niet toevoegen - To calendar? + Naar agenda? Agenda-item @@ -1788,15 +1809,15 @@ Error authenticatie op achtergrond bezig. Probeer alstublieft een synchronisatie te starten wanneer Astrid is gestart. - Importing Google Tasks... + Google Taken importeren - The list %1$s is shared with others! Do you still want to add the task %2$s to it? + De lijst %1$s is gedeeld met anderen! Wil je de taak %2$s nog steeds toevoegen? - Google Tasks Import + Google Taken import - Add task + Taak toevoegen - Don\'t add task + Taak niet toevoegen @@ -2138,15 +2159,15 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope Meer informatie - Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked. - Special offer aborted - Special offer declined - There was an error processing this offer. Please try again later. + Bedankt voor deelname aan deze aanbieding! Je maand gratis Astrid Premium is nu actief. + Speciale aanbieding afgebroken + Speciale aanbieding afgewezen + Er was een fout tijdens het verwerken van deze aanbieding. Probeer het later opnieuw. - Special Offer - Want one month of Astrid Premium for free? - To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.) - Get it free! + Speciale aanbieding + Wil je één maand gratis Astrid Premium? + Om een maand gratis Astrid Premium te krijgen kun je een korte video bekijken van deze sponsor (Ze zullen je ook vragen om je e-mail adres.) + Krijg het gratis! Astrid Premium 1 maand @@ -2200,13 +2221,13 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope Geluid/Trillen: - Once + Eens - Five times + Vijf keer - Until I dismiss alarm + Totdat ik het alarm stop @@ -2318,11 +2339,11 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope Herinneringen kunnen met de \"Alles wissen\" knop worden uitgezet - Social encouragement + Sociale aanmoediging - Reminders will show who is counting on you for shared tasks + Herinneringen zullen je laten zien wie er op je rekent voor gedeelde taken - Reminders will not show who is counting on you for shared tasks + Herinneringen zullen je niet laten zien wie er op je rekent voor gedeelde taken @@ -2523,7 +2544,7 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope Lege lijsten zijn mooie lijsten... Waarom niet vandaag? Maak het af, ik word er niet goed van! - Kan dit af? Natuurlijk kan dit af! + Kan dit af? Natuurlijk! Gaat dit ooit afkomen? Zo gaat \'ie goed! Zet door! Ik ben trots op je! Kom op! @@ -2586,7 +2607,7 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope Herhaal interval - Repeating? + Herhalend? Niet herhalen @@ -2612,11 +2633,11 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope dagen - weekdays - weeks - months - years - hours + weekdagen + weken + maanden + jaren + uren minuten @@ -2721,8 +2742,8 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope Lijsten - Add to lists - + Voeg toe aan lijsten + Nieuwe lijst @@ -2759,7 +2780,7 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope - Niet in een Lijst + Uncategorized @@ -2860,66 +2881,66 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope %1$s heeft gereageerd: %3$s - %1$s on $link_task: %3$s - %1$s on %2$s: %3$s + %1$s op $link_task: %3$s + %1$s op %2$s: %3$s Jij - yourself + jijzelf jij - (a deleted user) + (een verwijderde gebruiker) deze lijst deze taak - added %1$s to %2$s - removed %1$s from %2$s - attached %1$s to %2$s - removed %1$s from %2$s - left %s - deleted %s - undeleted %s - completed %s - uncompleted %s - changed %1$s priority from %2$s to %3$s - changed %1$s title from %2$s to %3$s - set %1$s title to %2$s - changed name from %1$s to %2$s - set name to %2$s - changed description from %1$s to %2$s - set description to %2$s - made %s public - made %s private - silenced %s - unsilenced %s - favorited %s - unfavorited %s - change this list\'s picture - added %1$d characters to %2$s description - removed %s description - removed %1$d characters from %2$s description - updated %s description - changed list owner to %s - created this list - unassigned %s - claimed %s - assigned %1$s to %2$s - created %1$s for %2$s - created %s - changed %1$s due date from %2$s to %3$s - set %1$s due date to %2$s - removed %s due date - completed %1$s (now due on %2$s) - added %1$s to %2$s - removed %1$s from %2$s - changed %1$s repeat to %2$s - removed %s repeat - shared %1$s with %2$s - unshared %1$s with %2$s - every %s - on %s - after completion - viewed %s - - changed %1$s to %2$s + %1$s toegevoegd aan %2$s + %1$s verwijderd van %2$s + %1$s bijgevoegd aan %2$s + %1$s verwijderd van %2$s + resterend %s + verwijderd %s + herstelde %s + voltooid %s + onvoltooid %s + prioriteit %1$s veranderd van %2$s naar %3$s + %1$s titel veranderd van %2$s naar %3$s + %1$s tiltel ingesteld op %2$s + naam van %1$s veranderd in %2$s + naam ingesteld op %2$s + omschrijving %1$s veranderd in %2$s + omschrijving ingesteld op %2$s + %s openbaar gemaakt + %s prive gemaakt + %s gedempt + %s niet langer gedempt + %s gemarkeerd als favoriet + %s verwijderd als favoriet + veranderd de afbeelding van deze lijst + %1$d tekens toegevoegd aan de omschrijving van %2$s + omschrijving van %s verwijderd + %1$d tekens van de omschrijving van %2$s verwijderd + omschrijving van %s bijgewerkt + lijst eigenaar van %s bijgewerkt + deze lijst aangemaakt + niet toegewezen %s + %s geclaimed + %1$s toegewezen aan %2$s + %1$s aangemaakt voor %2$s + %s aangemaakt + einddatum %1$s veranderd van %2$s naar %3$s + %1$s einddatum ingesteld op %2$s + einddatum %s verwijderd + voltooid %1$s (verloopt nu op %2$s) + %1$s toegevoegd aan %2$s + %1$s verwijderd van %2$s + herhaling van %1$s gewijzigd in %2$s + herhaling van %s verwijderd + %1$s gedeeld met %2$s + %1$s niet langer gedeeld met %2$s + elke %s + op %s + na voltooing + %s bekeken + + %1$s veranderd in %2$s @@ -312,7 +314,10 @@ - W tej chwili korzystasz z usługi synchronizacji z usługą Google Tasks. Pamiętaj że synchronizowanie z obydwiema usługami może prowadzić do niespodziewanych efektów. Czy na pewno chcesz synchronizować z Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Typ konta @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + Synchronizacja trwa... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ Kiedy - Podsumowanie zadania + Task name Priorytet @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1555,6 +1573,9 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import Moje zadania + + + Waiting On Me @@ -1600,7 +1621,7 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import Usuń kryterium - To okno pozwoli Ci stworzyć nowe filtry. Dodaj własne kryteria używając przycisku poniżej, dopasuj poprzez długie lub krótkie przytrzymanie i kliknij \"Wyświetl\"! + Long press on items for additional options Dodaj kryterium @@ -2729,7 +2750,7 @@ ale nie będziesz mógł robić zakupów. Add to lists - + Nowa lista @@ -2766,7 +2787,7 @@ ale nie będziesz mógł robić zakupów. - Na żadnej Liście + Uncategorized diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml index 7988f03f4..745f91fb1 100755 --- a/astrid/res/values-pt-rBR/strings.xml +++ b/astrid/res/values-pt-rBR/strings.xml @@ -218,6 +218,8 @@ Não adicionar + (owner) + @@ -312,7 +314,10 @@ - Atualmente você está sincronizando com as tarefas do Google. Esteja ciente de que a sincronização com ambos os serviços podem, em alguns casos, levar a resultados inesperados. Tem certeza de que deseja sincronizar com Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Tipo de Conta @@ -336,10 +341,10 @@ - Using Astrid.com + Google without Duplicates - Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup & Sync, or downgrade to Google Tasks only sync + Usando Astrid.com + Google sem Duplicações + Vamos ser honestos. A Tarefas do Google são convenientes, mas não tão legais como as do Astrid. Para evitar duplicações você não pode mais sincronizar com Astrid.com e sincronizar em segundo plano com as Tarefas do Google ao mesmo tempo. Você ainda oide importar as tarefas do Google visitando Configuração → Backup & Sincronização ou desatualizar para só sincronizar com as tarefas do Google Stick with Astrid - Downgrade to Google Tasks + Dezatualise para Tarefas do Google Upgrade to Astrid Sync for Free! Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)! @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Criar nova lista + Leave list + + Sincronizando... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ Quando - Resumo da Tarefa + Task name Prioridade @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1552,6 +1570,9 @@ Minhas Tarefas + + + Waiting On Me @@ -1597,7 +1618,7 @@ Remover critério - Esta tela permite que você crie um novo filtro. Adicione critérios utilizando o botão abaixo. Dê um toque rápido ou lento no critério para ajustá-lo, e então toque em Visualizar! + Long press on items for additional options Adicionar critério @@ -2720,7 +2741,7 @@ Add to lists - + Nova lista @@ -2757,7 +2778,7 @@ - Em nenhuma lista + Uncategorized diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml index 1be44fdcf..557c23485 100755 --- a/astrid/res/values-ru/strings.xml +++ b/astrid/res/values-ru/strings.xml @@ -58,7 +58,7 @@ Пользователь %s заблокирован. - You\'ve ignored %s. + Вы проигнорировали %s. Вы и %s теперь друзья! Добавить задания для друга можно ниже. @@ -218,6 +218,8 @@ Не добавлять + (owner) + @@ -313,7 +315,10 @@ - Сейчас происходит синхронизация с Google Tasks. Имейте в виду, что синхронизация с обеими службами в некоторых случаях может привести к ошибкам. Вы уверены, что хотите синхронизироваться с Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Тип учётной записи @@ -364,6 +369,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Создать новый список + Leave list + + Процесс синхронизации… + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -802,7 +817,7 @@ Когда - Описание задачи + Task name Приоритет @@ -1277,6 +1292,9 @@ default + + Show save and cancel + @@ -1558,6 +1576,9 @@ Мои задания + + + Waiting On Me @@ -1603,7 +1624,7 @@ Удалить строку - Этот экран позволяет создавать новые фильтры. Добавьте критерий с помощью кнопки ниже, коротко или долго нажмите на него для настройки, а затем нажмите «Просмотреть»! + Long press on items for additional options Добавить критерий @@ -2729,7 +2750,7 @@ Add to lists - + Новый список @@ -2766,7 +2787,7 @@ - Не входит в списки + Uncategorized diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml index 23c2f8115..ac358c72c 100755 --- a/astrid/res/values-sv/strings.xml +++ b/astrid/res/values-sv/strings.xml @@ -218,6 +218,8 @@ Lägg inte till + (owner) + @@ -312,9 +314,10 @@ - Du synkroniserar för närvarande med Google Tasks. -Var vänlig notera att synkning av båda tjänsterna samtidigt i vissa fall kan ge oväntade resultat. -Är du säker på att du vill synkronisera med Astrid.com? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Kontotyp @@ -365,6 +368,16 @@ Var vänlig notera att synkning av båda tjänsterna samtidigt i vissa fall kan Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + Synkronisering pågår... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -801,7 +814,7 @@ Var vänlig notera att synkning av båda tjänsterna samtidigt i vissa fall kan När - Uppgiftssammanfattning + Task name Priority @@ -1276,6 +1289,9 @@ Var vänlig notera att synkning av båda tjänsterna samtidigt i vissa fall kan default + + Show save and cancel + @@ -1558,6 +1574,9 @@ och återställer dina aktuella uppgifter från en backup My Tasks + + + Waiting On Me @@ -1603,7 +1622,7 @@ och återställer dina aktuella uppgifter från en backup Radera rad - Denna skärm låter dig skapa nya filter. Lägg till kriterier med hjälp av knappen nedan. Klicka eller klicka och håll på ett kriterium för att göra inställningar och klicka sedan på \"Visa\"! + Long press on items for additional options Lägg till kriterium @@ -2729,7 +2748,7 @@ kommer inte att kunna utföra köp. Add to lists - + Ny lista @@ -2766,7 +2785,7 @@ kommer inte att kunna utföra köp. - Ingen lista + Uncategorized diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml index 37a1b656b..f93271178 100755 --- a/astrid/res/values-tr/strings.xml +++ b/astrid/res/values-tr/strings.xml @@ -218,6 +218,8 @@ Ekleme + (owner) + @@ -312,7 +314,10 @@ - Google Görevleri ile eşleştirme yapıyordunuz. Her iki hizmetle eşleştirme yapmanız istenmeyen sonuçlara sebep olabilir. Astrid.com ile eşleştirmek istediğinize emin misiniz? + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? Hesap Türü @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + Senkronizasyon devam ediyor... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ Ne Zaman - Görev Özeti + Task name Priority @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1556,6 +1574,9 @@ My Tasks + + + Waiting On Me @@ -1601,7 +1622,7 @@ Satırı Sil - Bu ekran yeni süzgeçler oluşturmanızı sağlar. Aşağıdaki tuşa basarak kriter belirleyin, kısa ya da uzun basarak hızını ayarlayın ve sonra \"Görüntüle\" ye basın! + Long press on items for additional options Ölçüt Ekle @@ -2724,7 +2745,7 @@ Add to lists - + Yeni liste @@ -2761,7 +2782,7 @@ - Herhangi bir listede olmayan + Uncategorized diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml index 2fcb06cf0..1de680f55 100755 --- a/astrid/res/values-zh-rCN/strings.xml +++ b/astrid/res/values-zh-rCN/strings.xml @@ -218,6 +218,8 @@ 不要添加 + (owner) + @@ -312,7 +314,10 @@ - 您当前正在和 Google 工作表同步。请注意，在一些情况下，和两个服务一起同步可能会导致出现意外的结果。您真的想和 Astrid.com 同步吗？ + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? 帐号类型 @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + 同步中... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ 时间 - 任务摘要 + Task name Priority @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1552,6 +1570,9 @@ My Tasks + + + Waiting On Me @@ -1597,7 +1618,7 @@ 删除列 - 本屏用来建立新的筛选条件。使用下列按钮添加条件，短按或长按进行调整，之后请按 \"查看\"! + Long press on items for additional options 添加条件 @@ -2720,7 +2741,7 @@ Add to lists - + 新建列表 @@ -2757,7 +2778,7 @@ - 不在任何列表 + Uncategorized diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml index 353a91590..b8ffc8220 100755 --- a/astrid/res/values-zh-rTW/strings.xml +++ b/astrid/res/values-zh-rTW/strings.xml @@ -218,6 +218,8 @@ 不要增加。 + (owner) + @@ -312,7 +314,10 @@ - 您當前正在和Google 工作表同步。請注意，在一些情況下，和兩個服務一起同步可能會導致出現意外的結果。您真的想和Astrid.com 同步嗎？ + You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, + Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page, + or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension. + Are you sure you want to sync with Astrid.com? 帳號類型 @@ -363,6 +368,16 @@ Clear all data Processing existing data... + Not authorized + You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name? + Create new list + Leave list + + 同步中... + + Reset sync + Resets some local data to help resolve sync errors + The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue? @@ -799,7 +814,7 @@ 時間 - 工作摘要 + Task name Priority @@ -1274,6 +1289,9 @@ default + + Show save and cancel + @@ -1552,6 +1570,9 @@ My Tasks + + + Waiting On Me @@ -1597,7 +1618,7 @@ 刪除列 - 本視窗可讓您建立新的篩選。使用以下按鍵加入條件、排序或長按調整，之後請按 \"檢視\"！ + Long press on items for additional options 加入條件 @@ -2720,7 +2741,7 @@ Add to lists - + 新建列表 @@ -2757,7 +2778,7 @@ - 不在任何列表 + Uncategorized diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index b1fd7a259..45f36b4f6 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -297,7 +297,7 @@ public final class UpgradeService { if (from < V4_6_0) { newVersionString(changeLog, "4.6.0 (4/01/13)", new String[] { "4.6 is a big step towards FLAWLESS sync with Astrid.com! This update also includes numerous bug fixes and UI improvements. " + - "Note: Simultaneous sync with Google Tasks and Astrid.com is no longer supported. Still want to with your tasks in Gmail? Remind Me by Astrid on the Chrome Store." + "Note: Simultaneous sync with Google Tasks and Astrid.com is no longer supported. Still want to view your tasks in Gmail? Try Remind Me by Astrid on the Chrome Store." }); }