diff --git a/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
index f5095963a..0c90c8499 100644
--- a/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/common/SyncProviderPreferences.java
@@ -91,18 +91,18 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
if (r.getString(getUtilities().getSyncIntervalKey()).equals(
preference.getKey())) {
int index = AndroidUtilities.indexOf(
- r.getStringArray(R.array.rmilk_MPr_interval_values),
+ r.getStringArray(R.array.sync_SPr_interval_values),
(String) value);
if (index <= 0)
preference.setSummary(R.string.sync_SPr_interval_desc_disabled);
else
preference.setSummary(r.getString(
R.string.sync_SPr_interval_desc,
- r.getStringArray(R.array.rmilk_MPr_interval_entries)[index]));
+ r.getStringArray(R.array.sync_SPr_interval_entries)[index]));
}
// status
- else if (r.getString(R.string.rmilk_MPr_status_key).equals(preference.getKey())) {
+ else if (r.getString(R.string.sync_SPr_status_key).equals(preference.getKey())) {
boolean loggedIn = getUtilities().isLoggedIn();
String status;
String subtitle = ""; //$NON-NLS-1$
@@ -168,7 +168,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
}
// sync button
- else if (r.getString(R.string.rmilk_MPr_sync_key).equals(preference.getKey())) {
+ else if (r.getString(R.string.sync_SPr_sync_key).equals(preference.getKey())) {
boolean loggedIn = getUtilities().isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
@@ -182,12 +182,12 @@ abstract public class SyncProviderPreferences extends TodorooPreferences {
}
// log out button
- else if (r.getString(R.string.rmilk_MPr_forget_key).equals(preference.getKey())) {
+ else if (r.getString(R.string.sync_SPr_forget_key).equals(preference.getKey())) {
boolean loggedIn = getUtilities().isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
dialogUtilities.okCancelDialog(SyncProviderPreferences.this,
- r.getString(R.string.rmilk_forget_confirm), new OnClickListener() {
+ r.getString(R.string.sync_forget_confirm), new OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
int which) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java
index ea5fd583b..99ba4d183 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java
@@ -32,10 +32,8 @@ import com.todoroo.astrid.producteev.sync.ProducteevTask;
*/
public class ProducteevFilterExposer extends BroadcastReceiver {
- @SuppressWarnings("nls")
private Filter filterFromList(Context context, ProducteevDashboard dashboard) {
- String dashboardTitle = context.getString(R.string.producteev_FEx_dashboard_item).
- replace("$N", dashboard.getName());
+ String dashboardTitle = dashboard.getName();
String title = context.getString(R.string.producteev_FEx_dashboard_title, dashboard.getName());
ContentValues values = new ContentValues();
values.put(Metadata.KEY.name, ProducteevTask.METADATA_KEY);
diff --git a/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java b/astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
index 6e78b5301..865e59b78 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.DialogInterface.OnClickListener;
import android.content.Intent;
+import android.content.DialogInterface.OnClickListener;
import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
@@ -78,18 +78,18 @@ public class MilkPreferences extends TodorooPreferences {
if (r.getString(R.string.rmilk_MPr_interval_key).equals(
preference.getKey())) {
int index = AndroidUtilities.indexOf(
- r.getStringArray(R.array.rmilk_MPr_interval_values),
+ r.getStringArray(R.array.sync_SPr_interval_values),
(String) value);
if (index <= 0)
preference.setSummary(R.string.sync_SPr_interval_desc_disabled);
else
preference.setSummary(r.getString(
R.string.sync_SPr_interval_desc,
- r.getStringArray(R.array.rmilk_MPr_interval_entries)[index]));
+ r.getStringArray(R.array.sync_SPr_interval_entries)[index]));
}
// status
- else if (r.getString(R.string.rmilk_MPr_status_key).equals(preference.getKey())) {
+ else if (r.getString(R.string.sync_SPr_status_key).equals(preference.getKey())) {
boolean loggedIn = MilkUtilities.isLoggedIn();
String status;
String subtitle = ""; //$NON-NLS-1$
@@ -155,7 +155,7 @@ public class MilkPreferences extends TodorooPreferences {
}
// sync button
- else if (r.getString(R.string.rmilk_MPr_sync_key).equals(preference.getKey())) {
+ else if (r.getString(R.string.sync_SPr_sync_key).equals(preference.getKey())) {
boolean loggedIn = MilkUtilities.isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
@@ -169,12 +169,12 @@ public class MilkPreferences extends TodorooPreferences {
}
// log out button
- else if (r.getString(R.string.rmilk_MPr_forget_key).equals(preference.getKey())) {
+ else if (r.getString(R.string.sync_SPr_forget_key).equals(preference.getKey())) {
boolean loggedIn = MilkUtilities.isLoggedIn();
preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference p) {
dialogUtilities.okCancelDialog(MilkPreferences.this,
- r.getString(R.string.rmilk_forget_confirm), new OnClickListener() {
+ r.getString(R.string.sync_forget_confirm), new OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
int which) {
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 89a23d4cf..332190f37 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -178,10 +178,10 @@
p_def_hide
-
+
-
-
+
+
- 0
- 900
- 1800
@@ -195,14 +195,16 @@
- rmilk_status
+ sync_status
- sync_bgwifi
+ sync_bgwifi
- rmilk_sync
+ sync_sync
- rmilk_forget
+ sync_forget
+
+
sync_freq
diff --git a/astrid/res/values/strings-producteev.xml b/astrid/res/values/strings-producteev.xml
index ef9d1b684..6b368884e 100644
--- a/astrid/res/values/strings-producteev.xml
+++ b/astrid/res/values/strings-producteev.xml
@@ -4,23 +4,20 @@
-
- W: %s
-
-
- R: %s
-
Producteev
- Producteev Workspaces
+ Workspaces
+
+
+ %s
-
- $N
+
+ Assigned To
- Workspace \'%s\'
+ Assigned To \'%s\'
diff --git a/astrid/res/values/strings-rmilk.xml b/astrid/res/values/strings-rmilk.xml
index 5ea47d3b3..1724c50fb 100644
--- a/astrid/res/values/strings-rmilk.xml
+++ b/astrid/res/values/strings-rmilk.xml
@@ -47,7 +47,7 @@
- Status
+ Status
Not Logged In!
@@ -73,24 +73,41 @@
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
+
+
+ Log out / clear synchronization data?
+
+
+
+ - disable
+ - every fifteen minutes
+ - every thirty minutes
+ - every hour
+ - every three hours
+ - every six hours
+ - every twelve hours
+ - every day
+ - every three days
+ - every week
+
@@ -109,27 +126,9 @@ Error Message: %s
Astrid: Remember the Milk
-
- Log out / clear synchronization data?
-
Connection Error! Check your Internet connection,
or maybe RTM servers (status.rememberthemilk.com), for possible solutions.
-
-
-
- - disable
- - every fifteen minutes
- - every thirty minutes
- - every hour
- - every three hours
- - every six hours
- - every twelve hours
- - every day
- - every three days
- - every week
-
-
-
+
diff --git a/astrid/res/xml/preferences_producteev.xml b/astrid/res/xml/preferences_producteev.xml
index 7f41c5b19..7c7627ce7 100644
--- a/astrid/res/xml/preferences_producteev.xml
+++ b/astrid/res/xml/preferences_producteev.xml
@@ -7,7 +7,7 @@
@@ -19,7 +19,7 @@
diff --git a/astrid/res/xml/preferences_rmilk.xml b/astrid/res/xml/preferences_rmilk.xml
index 8640087bc..537f4e168 100644
--- a/astrid/res/xml/preferences_rmilk.xml
+++ b/astrid/res/xml/preferences_rmilk.xml
@@ -7,7 +7,7 @@
@@ -19,7 +19,7 @@
@@ -28,11 +28,11 @@
android:title="@string/sync_SPr_group_actions">