diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 79f54caf8..d4cd7ff44 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -332,7 +332,7 @@ public class FilterAdapter extends ArrayAdapter { if (navigationDrawer) { add( new NavigationDrawerAction( - activity.getString(R.string.caldav_create_new_collection), + activity.getString(R.string.new_list), R.drawable.ic_add_24dp, new Intent(activity, CaldavCalendarSettingsActivity.class) .putExtra(EXTRA_CALDAV_ACCOUNT, account), diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java index 485faf1c1..e6101dabb 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java @@ -380,7 +380,7 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv private void removeAccount() { dialogBuilder - .newMessageDialog(R.string.remove_caldav_account_confirmation, caldavAccount.getName()) + .newMessageDialog(R.string.logout_warning, caldavAccount.getName()) .setPositiveButton( R.string.remove, (dialog, which) -> { diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java index bb08c7a0c..bd3efad46 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java @@ -119,7 +119,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi final boolean backButtonSavesTask = preferences.backButtonSavesTask(); toolbar.setTitle( caldavCalendar == null - ? getString(R.string.caldav_create_new_collection) + ? getString(R.string.new_list) : caldavCalendar.getName()); toolbar.setNavigationIcon( ContextCompat.getDrawable( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 745a58273..9c8d5d5b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -602,7 +602,6 @@ File %1$s contained %2$s.\n\n Uncategorized Delete %s? - Remove %s? Timers Active for %s! @@ -884,7 +883,6 @@ File %1$s contained %2$s.\n\n Multiple Google Task accounts Tasker plugins Dashclock extension - Create new collection Requires pro subscription Log out Log out of %s? All data for this account will be removed from your device