Replace new list and remove account caldav strings

pull/685/merge
Alex Baker 6 years ago
parent a25e64d196
commit fc08eba05c

@ -332,7 +332,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
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),

@ -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) -> {

@ -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(

@ -602,7 +602,6 @@ File %1$s contained %2$s.\n\n
<string name="tag_FEx_untagged">Uncategorized</string>
<string name="delete_tag_confirmation">Delete %s?</string>
<string name="remove_caldav_account_confirmation">Remove %s?</string>
<!-- Android Notification Title (%s => # tasks) -->
<string name="TPl_notification">Timers Active for %s!</string>
@ -884,7 +883,6 @@ File %1$s contained %2$s.\n\n
<string name="pro_multiple_google_task_accounts">Multiple Google Task accounts</string>
<string name="pro_tasker_plugins">Tasker plugins</string>
<string name="pro_dashclock_extension">Dashclock extension</string>
<string name="caldav_create_new_collection">Create new collection</string>
<string name="requires_pro_subscription">Requires pro subscription</string>
<string name="logout">Log out</string>
<string name="logout_warning">Log out of %s? All data for this account will be removed from your device</string>

Loading…
Cancel
Save