diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java index 236a8025c..144bc2353 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -56,17 +56,7 @@ public class GtasksPreferences extends SyncProviderPreferences { @Override public void startSync() { if (!gtasksPreferenceService.isLoggedIn()) { - if (actFmPreferenceService.isLoggedIn()) { - DialogUtilities.okCancelDialog(this, getString(R.string.DLG_warning), getString(R.string.gtasks_dual_sync_warning), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - startLogin(); - } - }, null); - } else { - startLogin(); - } + startLogin(); } else { syncOrImport(); } diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml index fdfa02bfb..6ba7bcb36 100755 --- a/astrid/res/values-de/strings.xml +++ b/astrid/res/values-de/strings.xml @@ -1788,8 +1788,6 @@ Fehler bei der Hintergrunautehntifizierung. Starte eine Synchronisation in der App. - - Sie synchrolisieren Ihre Aufgaben mit Astrid.com. 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 Google Tasks synchronisieren möchten ? Importing Google Tasks... diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml index 8b3810083..6c5940384 100755 --- a/astrid/res/values-es/strings.xml +++ b/astrid/res/values-es/strings.xml @@ -1794,10 +1794,6 @@ Intenta acceder desde el navegador, a continuación vuelve a reintentarlo nuevam Error al autenticarse en un segundo plano. Por favor, intente iniciar la sincronización mientras Astrid está ejecutándose. - - Ahora estás sincronizando con Astrid.com. -Ten en cuenta que sincronizarse con ambos servicios puede, en algún caso, llevar a resultados inesperados. -¿Estás seguro que quieres sincronizar con Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml index 66bc457f1..c718dc434 100755 --- a/astrid/res/values-fr/strings.xml +++ b/astrid/res/values-fr/strings.xml @@ -1787,8 +1787,6 @@ "Erreur d\'authentification en arrière plan. Réessayez de vous synchroniser quand Astrid est lancé." - - "Vous êtes actuellement en train de synchroniser avec Astrid.com. Notez que la synchronisation avec les deux services peut, dans certains cas, avoir des effets inattendus. Êtes-vous certain de vouloir synchroniser avec Google Tasks ?" Importing Google Tasks... diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml index efb236192..467874aa5 100755 --- a/astrid/res/values-it/strings.xml +++ b/astrid/res/values-it/strings.xml @@ -1793,10 +1793,6 @@ Prova ad autenticarti con un browser, poi torna e riprova: Errore di autenticazione in background. Per favore prova ad avviare una sincronizzazione durante l\'esecuzione di Astrid. - - Sei attualmente sincronizzato con Astrid.com. -Ti avvisiamo che sincronizzarsi con entrambi i servizi talvolta potrebbe avere conseguenze impreviste. -Sei sicuro di volerti sincronizzare con Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml index 63a708d50..6d31f7a9a 100644 --- a/astrid/res/values-iw/strings.xml +++ b/astrid/res/values-iw/strings.xml @@ -1795,10 +1795,6 @@ האימות המתבצע ברקע נכשל. אנא נסה להתחיל את הסינכרון בזמן שאסטריד פועלת. - - הסנכרון כעת הוא מול אתר astrid.com. - שים לב שסינכרון מול שני האתרים יכול במקרים מסויימים להביא לתוצאות בלתי צפויות. - האם אתה בטוח שברצונך להסתנכרן מול ״משימות גוגל״? מייבאת את ״משימות גוגל״ diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml index c051c6a1e..152e37cdb 100755 --- a/astrid/res/values-ja/strings.xml +++ b/astrid/res/values-ja/strings.xml @@ -1805,10 +1805,6 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget Error authenticating in background. Please try initiating a sync while Astrid is running. - - You are currently synchronizing with Astrid.com. - Be advised that synchronizing with both services can in some cases lead to unexpected results. - Are you sure you want to sync with Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml index 6609e8d0b..4646b1a49 100755 --- a/astrid/res/values-ko/strings.xml +++ b/astrid/res/values-ko/strings.xml @@ -1787,8 +1787,6 @@ 백그라운드에서 인증 에러가 발생했습니다. Astrid가 실행중일 때 동기화를 시작해 보세요. - - 현재 Astrid.com 과 동기화 중입니다. 두 서비스를 동시에 동기화하면 예상치 않은 결과가 나타날 수 있습니다. 구글 일정과 동기화 하시겠습니까? Importing Google Tasks... diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml index bef220984..da004e5bd 100755 --- a/astrid/res/values-nl/strings.xml +++ b/astrid/res/values-nl/strings.xml @@ -1787,8 +1787,6 @@ Error authenticatie op achtergrond bezig. Probeer alstublieft een synchronisatie te starten wanneer Astrid is gestart. - - Op dit moment synchroniseer je met Astrid.com. Let erop dat synchroniseren met beide diensten in sommige gevallen kan leiden tot onverwachte resultaten. Weet je zeker dat je wilt synchroniseren met Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml index 3009ddd04..4d6e62522 100755 --- a/astrid/res/values-pl/strings.xml +++ b/astrid/res/values-pl/strings.xml @@ -1790,8 +1790,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import Błąd uwierzytelniania w tle. Spróbuj zainicjalizować synchronizację, gdy aplikacja Astrid będzie włączone. - - Jesteś zsynchronizowany z Astrid.com. Pamiętaj, że synchronizacja z obydwoma serwisami może w pewnych przypadkach prowadzić do nieoczekiwanych rezultatów. Jesteś pewny, że chcesz się zsynchronizować z Listą zadań Google? Importing Google Tasks... diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml index 38d0d08ab..ccb270406 100755 --- a/astrid/res/values-pt-rBR/strings.xml +++ b/astrid/res/values-pt-rBR/strings.xml @@ -1787,8 +1787,6 @@ Erro ao autenticar em plano de fundo. Por favor tente iniciar a sincronização enquanto o Astrid estiver rodando. - - Atualmente você está sincronizando com Astrid.com. 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 o Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml index d13b4525a..b27fd26f6 100755 --- a/astrid/res/values-ru/strings.xml +++ b/astrid/res/values-ru/strings.xml @@ -1793,8 +1793,6 @@ Ошибка фоновой аутентификации. Пожалуйста, попробуйте синхронизироваться, когда Astrid запущен. - - Сейчас происходит синхронизация с Astrid.com. Имейте в виду, что синхронизация с обеими службами в некоторых случаях может привести к ошибкам. Вы уверены, что хотите синхронизироваться с Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml index b320eed99..fa4240df9 100755 --- a/astrid/res/values-sv/strings.xml +++ b/astrid/res/values-sv/strings.xml @@ -1793,10 +1793,6 @@ och återställer dina aktuella uppgifter från en backup Autentisering i bakgrunden misslyckades. Vänligen försök starta en synkronisering medan Astrid körs. - - Du synkroniserar för närvarande med med Astrid.com. -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 Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml index 33076b9fb..294d9e1f6 100755 --- a/astrid/res/values-tr/strings.xml +++ b/astrid/res/values-tr/strings.xml @@ -1791,8 +1791,6 @@ Artalanda kimlik doğrulama hatası. Lütfen Astrid çalışırken bir eşlemeyi sıfırlamayı deneyin. - - Şu anda Astrid.com ile eşleştirme yapıyorsunuz. Şu aklınızda olsun ki iki hizmet ile de eşleştirme yapmak bazı istenmeyen durumlara sebep olabilir. Google Görevleri ile eşleştirme yapmak istiyor musunuz? Importing Google Tasks... diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml index 08b656f2d..503981dd5 100755 --- a/astrid/res/values-zh-rCN/strings.xml +++ b/astrid/res/values-zh-rCN/strings.xml @@ -1787,10 +1787,6 @@ 后台验证出错了。请在清单小助理运行时尝试启动同步。 - - You are currently synchronizing with Astrid.com. - Be advised that synchronizing with both services can in some cases lead to unexpected results. - Are you sure you want to sync with Google Tasks? Importing Google Tasks... diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml index a3e83d15f..18f70da23 100755 --- a/astrid/res/values-zh-rTW/strings.xml +++ b/astrid/res/values-zh-rTW/strings.xml @@ -1787,8 +1787,6 @@ 後台驗證出錯了。請在Astrid 運行時嘗試啟動同步。 - - 您當前正在和Astrid.com 同步。請注意,在一些情況下,和兩個服務一起同步可能會導致出現意外的結果。您真的想和Google 工作表同步嗎? Importing Google Tasks... diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml index ba0330727..d33db2433 100644 --- a/astrid/res/values/strings-actfm.xml +++ b/astrid/res/values/strings-actfm.xml @@ -315,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? diff --git a/astrid/res/values/strings-gtasks.xml b/astrid/res/values/strings-gtasks.xml index d0372b136..43c5b85f4 100644 --- a/astrid/res/values/strings-gtasks.xml +++ b/astrid/res/values/strings-gtasks.xml @@ -98,10 +98,6 @@ Error authenticating in background. Please try initiating a sync while Astrid is running. - - You are currently synchronizing with Astrid.com. - Be advised that synchronizing with both services can in some cases lead to unexpected results. - Are you sure you want to sync with Google Tasks? Importing Google Tasks...