archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Copy update

Browse Source
pull/14/head
Sam Bosley 11 years ago
parent 5cc5dd9b0d
commit 6f7b4349dd
18 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File

12
astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
Unescape Escape View File

@ -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();
}

2
astrid/res/values-de/strings.xml
Unescape Escape View File

@ -1788,8 +1788,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Fehler bei der Hintergrunautehntifizierung. Starte eine Synchronisation in der App.</string>
<string name="gtasks_dual_sync_warning">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 ?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

4
astrid/res/values-es/strings.xml
Unescape Escape View File

@ -1794,10 +1794,6 @@ Intenta acceder desde el navegador, a continuación vuelve a reintentarlo nuevam
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Error al autenticarse en un segundo plano. Por favor, intente iniciar la sincronización mientras Astrid está ejecutándose.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-fr/strings.xml
Unescape Escape View File

@ -1787,8 +1787,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">"Erreur d\'authentification en arrière plan. Réessayez de vous synchroniser quand Astrid est lancé."</string>
<string name="gtasks_dual_sync_warning">"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 ?"</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

4
astrid/res/values-it/strings.xml
Unescape Escape View File

@ -1793,10 +1793,6 @@ Prova ad autenticarti con un browser, poi torna e riprova:</string>
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Errore di autenticazione in background. Per favore prova ad avviare una sincronizzazione durante l\'esecuzione di Astrid.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

4
astrid/res/values-iw/strings.xml
Unescape Escape View File

@ -1795,10 +1795,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">האימות המתבצע ברקע נכשל. אנא נסה להתחיל את הסינכרון בזמן שאסטריד פועלת.</string>
<string name="gtasks_dual_sync_warning">הסנכרון כעת הוא מול אתר astrid.com.
שים לב שסינכרון מול שני האתרים יכול במקרים מסויימים להביא לתוצאות בלתי צפויות.
האם אתה בטוח שברצונך להסתנכרן מול ״משימות גוגל״?</string>
<string name="gtasks_import_progress"> מייבאת את ״משימות גוגל״</string>

4
astrid/res/values-ja/strings.xml
Unescape Escape View File

@ -1805,10 +1805,6 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-ko/strings.xml
Unescape Escape View File

@ -1787,8 +1787,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">백그라운드에서 인증 에러가 발생했습니다. Astrid가 실행중일 때 동기화를 시작해 보세요.</string>
<string name="gtasks_dual_sync_warning">현재 Astrid.com 과 동기화 중입니다. 두 서비스를 동시에 동기화하면 예상치 않은 결과가 나타날 수 있습니다. 구글 일정과 동기화 하시겠습니까?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-nl/strings.xml
Unescape Escape View File

@ -1787,8 +1787,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Error authenticatie op achtergrond bezig. Probeer alstublieft een synchronisatie te starten wanneer Astrid is gestart.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-pl/strings.xml
Unescape Escape View File

@ -1790,8 +1790,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Błąd uwierzytelniania w tle. Spróbuj zainicjalizować synchronizację, gdy aplikacja Astrid będzie włączone.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -1787,8 +1787,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Erro ao autenticar em plano de fundo. Por favor tente iniciar a sincronização enquanto o Astrid estiver rodando.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-ru/strings.xml
Unescape Escape View File

@ -1793,8 +1793,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Ошибка фоновой аутентификации. Пожалуйста, попробуйте синхронизироваться, когда Astrid запущен.</string>
<string name="gtasks_dual_sync_warning">Сейчас происходит синхронизация с Astrid.com. Имейте в виду, что синхронизация с обеими службами в некоторых случаях может привести к ошибкам. Вы уверены, что хотите синхронизироваться с Google Tasks?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

4
astrid/res/values-sv/strings.xml
Unescape Escape View File

@ -1793,10 +1793,6 @@ och återställer dina aktuella uppgifter från en backup
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Autentisering i bakgrunden misslyckades. Vänligen försök starta en synkronisering medan Astrid körs.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-tr/strings.xml
Unescape Escape View File

@ -1791,8 +1791,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Artalanda kimlik doğrulama hatası. Lütfen Astrid çalışırken bir eşlemeyi sıfırlamayı deneyin.</string>
<string name="gtasks_dual_sync_warning">Ş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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

4
astrid/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -1787,10 +1787,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">后台验证出错了。请在清单小助理运行时尝试启动同步。</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

2
astrid/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -1787,8 +1787,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">後台驗證出錯了。請在Astrid 運行時嘗試啟動同步。</string>
<string name="gtasks_dual_sync_warning">您當前正在和Astrid.com 同步。請注意，在一些情況下，和兩個服務一起同步可能會導致出現意外的結果。您真的想和Google 工作表同步嗎？</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

5
astrid/res/values/strings-actfm.xml
Unescape Escape View File

@ -315,8 +315,9 @@
<!-- text for notification when comments are received -->
<string name="actfm_dual_sync_warning">You are currently synchronizing with Google Tasks.
Be advised that synchronizing with both services can in some cases lead to unexpected results.
<string name="actfm_dual_sync_warning">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?</string>
<!-- account types -->

4
astrid/res/values/strings-gtasks.xml
Unescape Escape View File

@ -98,10 +98,6 @@
<!-- Error when authorization error happens in background sync -->
<string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
<string name="gtasks_dual_sync_warning">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?</string>
<string name="gtasks_import_progress">Importing Google Tasks...</string>

Write Preview
Loading…
Cancel
Save