Quick setup titles

app/src/main/java/eu/faircode/email/FragmentGmail.java

@@ -83,7 +83,7 @@ public class FragmentGmail extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_setup_quick);
+        setSubtitle(R.string.title_setup_gmail);
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_gmail, container, false);

app/src/main/java/eu/faircode/email/FragmentQuickSetup.java

@@ -86,7 +86,7 @@ public class FragmentQuickSetup extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_setup_quick);
+        setSubtitle(R.string.title_setup_other);
         setHasOptionsMenu(true);
 
         view = (ViewGroup) inflater.inflate(R.layout.fragment_quick_setup, container, false);

app/src/main/java/eu/faircode/email/FragmentSetup.java

@@ -182,7 +182,8 @@ public class FragmentSetup extends FragmentBase {
                 Menu menu = popupMenu.getMenu();
 
                 int order = 1;
-                menu.add(Menu.NONE, R.string.title_setup_gmail, order++, R.string.title_setup_gmail);
+                String gmail = getString(R.string.title_setup_oauth, getString(R.string.title_setup_gmail));
+                menu.add(Menu.NONE, R.string.title_setup_gmail, order++, gmail);
 
                 for (EmailProvider provider : EmailProvider.loadProfiles(context))
                     if (provider.oauth != null &&

app/src/main/res/values/strings.xml

@@ -176,7 +176,7 @@
     <string name="title_setup_account_identity_hint">You can configure the name, color and swipe actions in the account settings, and configure a signature in the identity settings</string>
     <string name="title_setup_accounts">Accounts</string>
     <string name="title_setup_identities">Identities</string>
-    <string name="title_setup_gmail" translatable="false">Gmail (OAuth)</string>
+    <string name="title_setup_gmail" translatable="false">Gmail</string>
     <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
     <string name="title_setup_other">Other provider</string>
     <string name="title_setup_pop3">POP3 account</string>