pull/177/head
M66B 5 years ago
parent 440ca6be98
commit fa69e48f0d

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

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

@ -705,6 +705,8 @@
<string name="title_move_to">Move to &#8230;</string>
<string name="title_move_to_folder">Move to &#8230;</string>
<string name="title_move_to_account">Move to %1$s &#8230;</string>
<string name="title_report_spam">Treat as spam</string>
<string name="title_delete_permanently">Delete permanently</string>
<string name="title_snooze">Snooze &#8230;</string>
<string name="title_archive">Archive</string>
<string name="title_reply">Reply</string>

Loading…
Cancel
Save