diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 933fea9f01..6861e4bac0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -1732,12 +1732,12 @@ public class FragmentAccount extends FragmentBase { EntityFolder junk = new EntityFolder(); junk.id = SWIPE_ACTION_JUNK; - junk.name = getString(R.string.title_spam); + junk.name = getString(R.string.title_report_spam); folders.add(junk); EntityFolder delete = new EntityFolder(); delete.id = SWIPE_ACTION_DELETE; - delete.name = getString(R.string.title_delete); + delete.name = getString(R.string.title_delete_permanently); folders.add(delete); folders.addAll(_folders); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 7294505f2d..513f7965bd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1836,8 +1836,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. popupMenu.getMenu().add(Menu.NONE, R.string.title_flag_color, 5, R.string.title_flag_color); popupMenu.getMenu().add(Menu.NONE, R.string.title_move, 6, R.string.title_move); - popupMenu.getMenu().add(Menu.NONE, R.string.title_spam, 7, R.string.title_spam); - popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, 8, R.string.title_delete); + popupMenu.getMenu().add(Menu.NONE, R.string.title_report_spam, 7, R.string.title_report_spam); + popupMenu.getMenu().add(Menu.NONE, R.string.title_delete_permanently, 8, R.string.title_delete_permanently); popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override @@ -1868,10 +1868,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. case R.string.title_move: onSwipeMove(message); return true; - case R.string.title_spam: + case R.string.title_report_spam: onSwipeJunk(message); return true; - case R.string.title_delete: + case R.string.title_delete_permanently: onSwipeDelete(message); return true; default: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7441b75665..3295019a7c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -705,6 +705,8 @@ Move to … Move to … Move to %1$s … + Treat as spam + Delete permanently Snooze … Archive Reply