diff --git a/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
index 41fdb2f5c..f5095963a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
@@ -94,10 +94,10 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
r.getStringArray(R.array.rmilk_MPr_interval_values),
(String) value);
if (index <= 0)
- preference.setSummary(R.string.rmilk_MPr_interval_desc_disabled);
+ preference.setSummary(R.string.sync_SPr_interval_desc_disabled);
else
preference.setSummary(r.getString(
- R.string.rmilk_MPr_interval_desc,
+ R.string.sync_SPr_interval_desc,
r.getStringArray(R.array.rmilk_MPr_interval_entries)[index]));
}
@@ -109,7 +109,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
// ! logged in - display message, click -> sync
if(!loggedIn) {
- status = r.getString(R.string.rmilk_status_loggedout);
+ status = r.getString(R.string.sync_status_loggedout);
statusColor = Color.RED;
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
@@ -121,16 +121,16 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
}
// sync is occurring
else if(getUtilities().isOngoing()) {
- status = r.getString(R.string.rmilk_status_ongoing);
+ status = r.getString(R.string.sync_status_ongoing);
statusColor = Color.rgb(0, 0, 100);
}
// last sync was error
else if(getUtilities().getLastAttemptedSyncDate() != 0) {
- status = r.getString(R.string.rmilk_status_failed,
+ status = r.getString(R.string.sync_status_failed,
DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
new Date(getUtilities().getLastAttemptedSyncDate())));
if(getUtilities().getLastSyncDate() > 0) {
- subtitle = r.getString(R.string.rmilk_status_failed_subtitle,
+ subtitle = r.getString(R.string.sync_status_failed_subtitle,
DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
new Date(getUtilities().getLastSyncDate())));
}
@@ -144,12 +144,12 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
}
});
} else if(getUtilities().getLastSyncDate() > 0) {
- status = r.getString(R.string.rmilk_status_success,
+ status = r.getString(R.string.sync_status_success,
DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
new Date(getUtilities().getLastSyncDate())));
statusColor = Color.rgb(0, 100, 0);
} else {
- status = r.getString(R.string.rmilk_status_never);
+ status = r.getString(R.string.sync_status_never);
statusColor = Color.rgb(0, 0, 100);
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
@@ -178,7 +178,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
}
});
if(!loggedIn)
- preference.setTitle(R.string.rmilk_MPr_sync_log_in);
+ preference.setTitle(R.string.sync_SPr_sync_log_in);
}
// log out button
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
index fff43d9d1..6e78b5301 100644
--- a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
@@ -3,8 +3,8 @@ package com.todoroo.astrid.rmilk;
import java.util.Date;
import android.content.DialogInterface;
-import android.content.Intent;
import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
@@ -81,10 +81,10 @@ public class MilkPreferences extends TodorooPreferences {
r.getStringArray(R.array.rmilk_MPr_interval_values),
(String) value);
if (index <= 0)
- preference.setSummary(R.string.rmilk_MPr_interval_desc_disabled);
+ preference.setSummary(R.string.sync_SPr_interval_desc_disabled);
else
preference.setSummary(r.getString(
- R.string.rmilk_MPr_interval_desc,
+ R.string.sync_SPr_interval_desc,
r.getStringArray(R.array.rmilk_MPr_interval_entries)[index]));
}
@@ -96,7 +96,7 @@ public class MilkPreferences extends TodorooPreferences {
// ! logged in - display message, click -> sync
if(!loggedIn) {
- status = r.getString(R.string.rmilk_status_loggedout);
+ status = r.getString(R.string.sync_status_loggedout);
statusColor = Color.RED;
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
@@ -108,16 +108,16 @@ public class MilkPreferences extends TodorooPreferences {
}
// sync is occurring
else if(MilkUtilities.isOngoing()) {
- status = r.getString(R.string.rmilk_status_ongoing);
+ status = r.getString(R.string.sync_status_ongoing);
statusColor = Color.rgb(0, 0, 100);
}
// last sync was error
else if(MilkUtilities.getLastAttemptedSyncDate() != 0) {
- status = r.getString(R.string.rmilk_status_failed,
+ status = r.getString(R.string.sync_status_failed,
DateUtilities.getDateStringWithTime(MilkPreferences.this,
new Date(MilkUtilities.getLastAttemptedSyncDate())));
if(MilkUtilities.getLastSyncDate() > 0) {
- subtitle = r.getString(R.string.rmilk_status_failed_subtitle,
+ subtitle = r.getString(R.string.sync_status_failed_subtitle,
DateUtilities.getDateStringWithTime(MilkPreferences.this,
new Date(MilkUtilities.getLastSyncDate())));
}
@@ -131,12 +131,12 @@ public class MilkPreferences extends TodorooPreferences {
}
});
} else if(MilkUtilities.getLastSyncDate() > 0) {
- status = r.getString(R.string.rmilk_status_success,
+ status = r.getString(R.string.sync_status_success,
DateUtilities.getDateStringWithTime(MilkPreferences.this,
new Date(MilkUtilities.getLastSyncDate())));
statusColor = Color.rgb(0, 100, 0);
} else {
- status = r.getString(R.string.rmilk_status_never);
+ status = r.getString(R.string.sync_status_never);
statusColor = Color.rgb(0, 0, 100);
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
@@ -165,7 +165,7 @@ public class MilkPreferences extends TodorooPreferences {
}
});
if(!loggedIn)
- preference.setTitle(R.string.rmilk_MPr_sync_log_in);
+ preference.setTitle(R.string.sync_SPr_sync_log_in);
}
// log out button
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 90c6ac386..91a5b05f1 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -1066,55 +1066,55 @@ to the plugin creator for fastest service.
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Opcions
+ Opcions
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Accions
+ Accions
- Sincronitzar Ara!
+ Sincronitzar Ara!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1135,8 +1135,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- disable
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index dde7a8963..cd66da27b 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -1058,50 +1058,50 @@ to the plugin creator for fastest service.
Remember the Milk
- Stav
+ Stav
- Prosím přihlaš se na RTM!
+ Prosím přihlaš se!
- Probíhá synchronizace...
+ Probíhá synchronizace...
- Poslední synchronizace: %s
+ Poslední synchronizace: %s
- Selhalo: %s
+ Selhalo: %s
- Poslední úspěšná synchronizace: %s
+ Poslední úspěšná synchronizace: %s
- Nikdo nesynchronizováno!
+ Nikdo nesynchronizováno!
- Možnosti
+ Možnosti
- Synchronizace na pozadí
+ Synchronizace na pozadí
- Synchronizace na pozadí je zakázána
+ Synchronizace na pozadí je zakázána
- Současně nastaveno na: %s
+ Současně nastaveno na: %s
- Nastavení jen pro Wifi
+ Nastavení jen pro Wifi
- Synchronizovat na pozadí se bude pouze při zapnuté Wifi
+ Synchronizovat na pozadí se bude pouze při zapnuté Wifi
- Synchronizovat na pozadí se bude vždy
+ Synchronizovat na pozadí se bude vždy
- Činnosti
+ Činnosti
- Synchronizuj teď!
+ Synchronizuj teď!
- Přihlásit se & Synchronizovat!
+ Přihlásit se & Synchronizovat!
- Odhlásit se
+ Odhlásit se
- Vymazat všechny synchronizační data RTM
+ Vymazat všechny synchronizační data
@@ -1122,8 +1122,8 @@ to the plugin creator for fastest service.
Chyba připojení! Zkontroluj Tvé Internetové připojení nebo možná RTM servery (status.rememberthemilk.com), pro možná řešení.
-
-
+
+
- zakázat
- každých patnáct minut
- každých třicet minut
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 1601acdc0..56a1ddfa8 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -1058,50 +1058,50 @@ to the plugin creator for fastest service.
Remember the Milk
- Status
+ Status
- Bitte bei RTM einloggen!
+ Bitte loggen Sie sich ein!
- Synchronisierung läuft...
+ Synchronisierung läuft...
- Letzte Synchronisierung: %s
+ Letzte Synchronisierung: %s
- Fehlgeschlagen am: %s
+ Fehlgeschlagen am: %s
- Letzte erfolgreiche Synchronisierung: %s
+ Letzte erfolgreiche Synchronisierung: %s
- Noch nie synchronisiert!
+ Noch nie synchronisiert!
- Einstellungen
+ Einstellungen
- Hintergrund-Synchronisierung
+ Hintergrund-Synchronisierung
- Hintergrund-Synchronisierung ist deaktiviert
+ Hintergrund-Synchronisierung ist deaktiviert
- Gesetzt auf: %s
+ Gesetzt auf: %s
- WLAN Einstellungen
+ WLAN Einstellungen
- Hintergrund-Synchronisierung nur bei WLAN-Verbindung
+ Hintergrund-Synchronisierung nur bei WLAN-Verbindung
- Hintergrund-Synchronisierung findet immer statt
+ Hintergrund-Synchronisierung findet immer statt
- Aktionen
+ Aktionen
- Jetzt abgleichen!
+ Jetzt abgleichen!
- Einloggen & Synchroniseren!
+ Einloggen & Synchroniseren!
- Abmelden
+ Abmelden
- Alle Daten der RTM-Synchronisierung löschen
+ Alle Daten der Synchronisierung löschen
@@ -1122,8 +1122,8 @@ to the plugin creator for fastest service.
Verbindungsfehler! Bitte überprüfe deine Internetverbindung oder die RTM Server (status.rememberthemilk.com) für zur Lösung des Problems.
-
-
+
+
- deaktivieren
- alle 15 Minuten
- alle 30 Minuten
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 710a8e38c..536d840fb 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -1059,50 +1059,50 @@ Si puede añada Astrid a la lista de exclusión de modo que no sea matada. De ot
Remember the Milk
- Estado
+ Estado
- Por favor, ingrese a RTM
+ Por favor, ingrese
- Sincronización en curso...
+ Sincronización en curso...
- Última sincronización: %s
+ Última sincronización: %s
- Falló el: %s
+ Falló el: %s
- Última sincronización exitosa: %s
+ Última sincronización exitosa: %s
- ¡Jamás se sincronizó!
+ ¡Jamás se sincronizó!
- Opciones
+ Opciones
- Sincronizar en segundo plano
+ Sincronizar en segundo plano
- Sincronización en segundo plano está desactivada
+ Sincronización en segundo plano está desactivada
- Actualmente configurado para: %s
+ Actualmente configurado para: %s
- Wifi ajuste sólo
+ Wifi ajuste sólo
- Sincronización en segundo plano sólo ocurre cuando el Wifi
+ Sincronización en segundo plano sólo ocurre cuando el Wifi
- Sincronización en segundo plano siempre se produce
+ Sincronización en segundo plano siempre se produce
- Acciones
+ Acciones
- ¡Sincronizar ahora!
+ ¡Sincronizar ahora!
- Registrarse y sincronizar!
+ Registrarse y sincronizar!
- Cerrar sesión
+ Cerrar sesión
- Borra todos los datos de sincronización de RTM
+ Borra todos los datos de sincronización
@@ -1123,8 +1123,8 @@ Si puede añada Astrid a la lista de exclusión de modo que no sea matada. De ot
Error de conexión! Compruebe su conexión a Internet o servidores quizá RTM (status.rememberthemilk.com), para posibles soluciones.
-
-
+
+
- desactivar
- cada quince minutos
- cada treinta minutos
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index b561a83f0..cdafa2eae 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -1058,50 +1058,50 @@ to the plugin creator for fastest service.
Remember the Milk
- Statut
+ Statut
- Veuillez vous connecter à RTM !
+ Veuillez vous connecter!
- Synchronisation en cours...
+ Synchronisation en cours...
- Dernière synchro.: %s
+ Dernière synchro.: %s
- Échec sur : %s
+ Échec sur : %s
- Dernière synchro. réussie: %s
+ Dernière synchro. réussie: %s
- Jamais synchronisé !
+ Jamais synchronisé !
- Options
+ Options
- Synchro. en arrière-plan
+ Synchro. en arrière-plan
- Synchronisation en arrière-plan désactivée
+ Synchronisation en arrière-plan désactivée
- Actuellement configuré sur : %s
+ Actuellement configuré sur : %s
- Paramètre Wifi seul
+ Paramètre Wifi seul
- La synchronisation en arrière-plan ne s\'effectue uniquement sous Wifi
+ La synchronisation en arrière-plan ne s\'effectue uniquement sous Wifi
- La synchronisation en arrière-plan s\'effectuera toujours
+ La synchronisation en arrière-plan s\'effectuera toujours
- Actions
+ Actions
- Synchroniser maintenant !
+ Synchroniser maintenant !
- Se connecter et synchroniser !
+ Se connecter et synchroniser !
- Se déconnecter
+ Se déconnecter
- Purger toutes les données de synchronisation RTM
+ Purger toutes les données de synchronisation
@@ -1122,8 +1122,8 @@ to the plugin creator for fastest service.
Erreur de connexion ! Vérifiez votre connexion Internet ou les serveur RTM (status.rememberthemilk.com) pour de possibles solutions.
-
-
+
+
- désactiver
- toutes les quinze minutes
- toutes les trente minutes
diff --git a/astrid/res/values-id/strings.xml b/astrid/res/values-id/strings.xml
index 18e7f872b..369ddd828 100644
--- a/astrid/res/values-id/strings.xml
+++ b/astrid/res/values-id/strings.xml
@@ -1073,55 +1073,55 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Pilihan
+ Pilihan
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Aksi
+ Aksi
- Sinkronkan Sekarang!
+ Sinkronkan Sekarang!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1142,8 +1142,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- tidak difungsikan
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 3c4316be0..21b035e48 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -1061,50 +1061,50 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Stato
+ Stato
- Per favore effettua il login per RTM!
+ Per favore effettua il login!
- Sincronizzazione in corso ...
+ Sincronizzazione in corso ...
- Ultima Sincronizzazione: %s
+ Ultima Sincronizzazione: %s
- Fallita Su: %s
+ Fallita Su: %s
- Ultima sincronizzazione eseguita con successo in data: %s
+ Ultima sincronizzazione eseguita con successo in data: %s
- Mai sincronizzato!
+ Mai sincronizzato!
- Opzioni
+ Opzioni
- Sincronizzazione eseguita in background
+ Sincronizzazione eseguita in background
- La sincronizzazione in background è disattivata
+ La sincronizzazione in background è disattivata
- Attualmente impostata su: %s
+ Attualmente impostata su: %s
- Unica Impostazione Wifi
+ Unica Impostazione Wifi
- la sincronizzazione in background avviene solo quando la rete Wifi è abilitata
+ la sincronizzazione in background avviene solo quando la rete Wifi è abilitata
- La sincronizzazione in background avviene sempre
+ La sincronizzazione in background avviene sempre
- Azioni
+ Azioni
- Sincronizza Ora!
+ Sincronizza Ora!
- Esegui l\'accesso & Sincronizza!
+ Esegui l\'accesso & Sincronizza!
- Esci
+ Esci
- Cancella tutti i dati di sincronizzazione RTM
+ Cancella tutti i dati di sincronizzazione
@@ -1125,8 +1125,8 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Errore di connessione! Verificare la connessione Internet, o magari i server RTM (status.rememberthemilk.com), per le possibili soluzioni.
-
-
+
+
- disabilita
- ogni quindici minuti
- ogni trenta minuti
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index d3b231671..96387054c 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -1064,50 +1064,50 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- 状況
+ 状況
- Remenber The Milkにログインしてください!
+ Remenber The Milkにログインしてください!
- Sync Ongoing...
+ Sync Ongoing...
- 前回の同期: %s
+ 前回の同期: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- オプション
+ オプション
- バックグラウンド同期
+ バックグラウンド同期
- バックグラウンド同期は無効になっています
+ バックグラウンド同期は無効になっています
- 現在の設定: %s
+ 現在の設定: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- アクション
+ アクション
- すぐに同期!
+ すぐに同期!
- ログインと同期
+ ログインと同期
- ログアウト
+ ログアウト
- Remember The Milkとの同期データをすべて削除します
+ Remember The Milkとの同期データをすべて削除します
@@ -1133,8 +1133,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- 無効
- 15分毎
- 30分毎
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index d2ef0d695..6c2d6f4b1 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -1070,55 +1070,55 @@ Astrid might not let you know when your tasks are due.\n
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- 옵션
+ 옵션
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- 설정
+ 설정
- 동기화 시작!
+ 동기화 시작!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1139,8 +1139,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- 사용불가
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 84f93483d..c8aa6e0d8 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -1058,50 +1058,50 @@ to the plugin creator for fastest service.
Remember the Milk
- Status
+ Status
- Vennligst logg inn på RTM!
+ Vennligst logg inn!
- Synkronisering pågår...
+ Synkronisering pågår...
- Siste synkronisering: %s
+ Siste synkronisering: %s
- Feilet: %s
+ Feilet: %s
- Siste vellykkede synkronisering: %s
+ Siste vellykkede synkronisering: %s
- Aldri synkronisert!
+ Aldri synkronisert!
- Alternativer
+ Alternativer
- Bakgrunnssynkronisering
+ Bakgrunnssynkronisering
- Bakgrunnssynkronisering er deaktivert
+ Bakgrunnssynkronisering er deaktivert
- Foreløpig satt til %s
+ Foreløpig satt til %s
- Bare Wifi Innstilling
+ Bare Wifi Innstilling
- Synkronisering i bakgrunnen skal kun utføres med WiFi-tilkobling
+ Synkronisering i bakgrunnen skal kun utføres med WiFi-tilkobling
- Synkronisering i bakgrunnen skal alltid utføres
+ Synkronisering i bakgrunnen skal alltid utføres
- Handlinger
+ Handlinger
- Synkroniser nå!
+ Synkroniser nå!
- Logg Inn & Synkroniser!
+ Logg Inn & Synkroniser!
- Logg av
+ Logg av
- Slett alle RTM synkroniseringsdata
+ Slett alle synkroniseringsdata
@@ -1122,8 +1122,8 @@ to the plugin creator for fastest service.
Tilkoblings feil! Sjekk internettforbindelsen din, evt. RTM serverene (status.rememberthemilk.com), for mulig feilløsning.
-
-
+
+
- deaktiver
- hvert kvarter
- hver halvtime
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 242a32ca4..4853eb624 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -1073,55 +1073,55 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Opties
+ Opties
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Acties
+ Acties
- Synchroniseer nu!
+ Synchroniseer nu!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1142,8 +1142,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- uit
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index bfc4437d9..62447d2a3 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -1070,55 +1070,55 @@ Astrid might not let you know when your tasks are due.\n
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Opcje
+ Opcje
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Działania
+ Działania
- Synchronizuj Teraz
+ Synchronizuj Teraz
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1139,8 +1139,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- disable
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 3b529c262..779b8e154 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -1063,55 +1063,55 @@ Astrid might not let you know when your tasks are due.\n
Remember the Milk
- Estado
+ Estado
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Opções
+ Opções
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Acções
+ Acções
- Sincronizar Agora!
+ Sincronizar Agora!
- Log In & Synchronize!
+ Log In & Synchronize!
- Terminar sessão
+ Terminar sessão
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1132,8 +1132,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- desactivar
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 24ee0b922..29e7428d9 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -1061,50 +1061,50 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Состояние
+ Состояние
- Пожауйста, зайдите в RTM!
+ Пожауйста, зайдите!
- Процесс синхронизации...
+ Процесс синхронизации...
- Последняя синхронизация: %s
+ Последняя синхронизация: %s
- Ошибка: %s
+ Ошибка: %s
- Последняя успешная синхронизация: %s
+ Последняя успешная синхронизация: %s
- Синхронизаций не выполнялось!
+ Синхронизаций не выполнялось!
- Параметры
+ Параметры
- Фоновая синхронизация
+ Фоновая синхронизация
- Фоновая синхронизация отключена
+ Фоновая синхронизация отключена
- Сейчас установлено: %s
+ Сейчас установлено: %s
- Только через Wifi
+ Только через Wifi
- Фоновая синхронизация происходит только через Wifi
+ Фоновая синхронизация происходит только через Wifi
- Фоновая синхронизация происходит всегда
+ Фоновая синхронизация происходит всегда
- Действия
+ Действия
- Синхронизировать!
+ Синхронизировать!
- Войти и синхронизировать!
+ Войти и синхронизировать!
- Выход
+ Выход
- Очистка всех данный синхронизации RTM
+ Очистка всех данный синхронизации
@@ -1125,8 +1125,8 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Ошибка соединения! Проверьте соединение с интернетом и, возможно, сервером RTM (status.rememberthemilk.com) для возможного решения.
-
-
+
+
- отключить
- каждые 15 минут
- каждые 30 минут
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index c473ed31a..481e4bf2f 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -1073,55 +1073,55 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Alternativ
+ Alternativ
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Åtgärder
+ Åtgärder
- Synkronisera Nu!
+ Synkronisera Nu!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1142,8 +1142,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- inaktivera
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index 3cb861fa2..237210de0 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -1073,55 +1073,55 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Ayarlar
+ Ayarlar
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Eylemler
+ Eylemler
- Senkronize et
+ Senkronize et
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1142,8 +1142,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- devre dışı bırak
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 39212c76e..99060b820 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -1073,55 +1073,55 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
Remember the Milk
- Status
+ Status
- Please Log In To RTM!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- 选项
+ 选项
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- 操作
+ 操作
- 现在同步!
+ 现在同步!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all RTM synchronization data
+ Clears all synchronization data synchronization data
- Please Log In and Authorize Astrid:
+ Not Logged In and Authorize Astrid:
@@ -1142,8 +1142,8 @@ Error Message: %s
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
+
+
- disable
- every fifteen minutes
- every thirty minutes
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 7c2dccc15..9748cb0d8 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -1058,50 +1058,50 @@ to the plugin creator for fastest service.
Remember the Milk
- 狀態
+ 狀態
- 請登入RTM
+ 請登
- 同步中...
+ 同步中...
- 上次同步: %s
+ 上次同步: %s
- 失敗: %s
+ 失敗: %s
- 上次成功同步: %s
+ 上次成功同步: %s
- 未同步過!
+ 未同步過!
- 選項
+ 選項
- 背景同步
+ 背景同步
- 背景同步關閉
+ 背景同步關閉
- 目前同步設定: %s
+ 目前同步設定: %s
- Wifi 才可使用之設定
+ Wifi 才可使用之設定
- 使用Wifi才啟動背景同步
+ 使用Wifi才啟動背景同步
- 總是使用背景同步
+ 總是使用背景同步
- 動作
+ 動作
- 現在同步!
+ 現在同步!
- 登入並同步!
+ 登入並同步!
- 登出
+ 登出
- 清除所有RTM同步資料
+ 清除所有同步資料
@@ -1122,8 +1122,8 @@ to the plugin creator for fastest service.
連線錯誤! 檢查網路連線或RTM伺服器(status.rememberthemilk.com).
-
-
+
+
- 停用
- 每15分
- 每30分
diff --git a/astrid/res/values/strings-rmilk.xml b/astrid/res/values/strings-rmilk.xml
index 3ac13841b..5ea47d3b3 100644
--- a/astrid/res/values/strings-rmilk.xml
+++ b/astrid/res/values/strings-rmilk.xml
@@ -7,9 +7,6 @@
Remember the Milk Settings
-
- RTM List: %s
-
RTM Repeating Task
@@ -47,51 +44,53 @@
Remember the Milk
+
+
- Status
+ Status
- Not Logged In!
+ Not Logged In!
- Sync Ongoing...
+ Sync Ongoing...
- Last Sync: %s
+ Last Sync: %s
- Failed On: %s
+ Failed On: %s
- Last Successful Sync: %s
+ Last Successful Sync: %s
- Never Synchronized!
+ Never Synchronized!
- Options
+ Options
- Background Sync
+ Background Sync
- Background synchronization is disabled
+ Background synchronization is disabled
- Currently set to: %s
+ Currently set to: %s
- Wifi Only Setting
+ Wifi Only Setting
- Background synchronization only happens when on Wifi
+ Background synchronization only happens when on Wifi
- Background synchronization will always occur
+ Background synchronization will always occur
- Actions
+ Actions
- Synchronize Now!
+ Synchronize Now!
- Log In & Synchronize!
+ Log In & Synchronize!
- Log Out
+ Log Out
- Clears all synchronization data
+ Clears all synchronization data
diff --git a/astrid/res/xml/preferences_producteev.xml b/astrid/res/xml/preferences_producteev.xml
index 834f91ffe..7f41c5b19 100644
--- a/astrid/res/xml/preferences_producteev.xml
+++ b/astrid/res/xml/preferences_producteev.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
+ android:title="@string/sync_SPr_group_status">
+ android:title="@string/sync_SPr_group_options">
+ android:title="@string/sync_SPr_interval_title" />
+ android:title="@string/sync_SPr_group_actions">
+ android:title="@string/sync_SPr_sync" />
+ android:title="@string/sync_SPr_forget"
+ android:summary="@string/sync_SPr_forget_description" />
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_rmilk.xml b/astrid/res/xml/preferences_rmilk.xml
index bb9ba2f88..8640087bc 100644
--- a/astrid/res/xml/preferences_rmilk.xml
+++ b/astrid/res/xml/preferences_rmilk.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
+ android:title="@string/sync_SPr_group_status">
+ android:title="@string/sync_SPr_group_options">
+ android:title="@string/sync_SPr_interval_title" />
+ android:title="@string/sync_SPr_group_actions">
+ android:title="@string/sync_SPr_sync" />
+ android:title="@string/sync_SPr_forget"
+ android:summary="@string/sync_SPr_forget_description" />