Update README, help, strings

README.md

@@ -69,9 +69,9 @@ Select coloured theme from the **Theme** button in the toolbar.
 ## Options
  * **Confetti** – Select confetti display on guessing word.
  * **Fanfare** – Select fanfare on guessing word.
- * **Default word** – Select to enable default word. The first word
-   entered will become the default word entered at the beginning of
-   each game. Reset to clear word.
+ * **Default word** – Select to enable default word. The first
+   word entered will become the default word entered at the beginning
+   of each game. Reset to clear word.
 
 ## Dictionary
 Select the dictionary to look up a word meaning. Wiktionary (online)

src/main/java/org/billthefarmer/gurgle/Gurgle.java

@@ -576,12 +576,12 @@ public void onPause()
             PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = preferences.edit();
 
-        editor.putInt(PREF_THEME, theme);
-        editor.putInt(PREF_WRONG, wrong);
-        editor.putInt(PREF_LANG, language);
         editor.putInt(PREF_CONT, contains);
         editor.putInt(PREF_CORR, correct);
         editor.putInt(PREF_DICT, dict);
+        editor.putInt(PREF_LANG, language);
+        editor.putInt(PREF_THEME, theme);
+        editor.putInt(PREF_WRONG, wrong);
         editor.putString(PREF_FIRST, first);
         editor.putBoolean(PREF_CONF, confetti);
         editor.putBoolean(PREF_FARE, fanfare);
@@ -1866,7 +1866,7 @@ private void about()
 
         // Add the buttons
         builder.setPositiveButton(android.R.string.ok, null);
-        builder.setNeutralButton(R.string.more, (d, i) ->
+        builder.setNeutralButton(R.string.help, (d, i) ->
         {
             showToast(word);
             solved = true;

src/main/res/raw/help.html

@@ -73,9 +73,9 @@ <h2>Options</h2>
   display on guessing word.<br>
   &nbsp; &bullet;&nbsp; <b>Fanfare</b> &ndash; Select fanfare on
   guessing word.<br>
-  &nbsp; &bullet;&nbsp; <b>Default word</b> &ndash; Select to enable default word.
-  The first word entered will become the default word entered at the
-  beginning of each game. Reset to clear word.<br>
+  &nbsp; &bullet;&nbsp; <b>Default word</b> &ndash; Select to enable
+  default word. The first word entered will become the default word
+  entered at the beginning of each game. Reset to clear word.<br>
 </p>
 <h2>Dictionary</h2>
 <p>

src/main/res/values-af/strings.xml

@@ -20,7 +20,6 @@
   <string name="getCode">Kry kode</string>
   <string name="enterCode">Voer kode in</string>
   <string name="about">Aangaande</string>
-  <string name="more">Meer</string>
 
   <string name="language">Taal</string>
   <string name="afrikaans">Afrikaans</string>

src/main/res/values-hu/strings.xml

@@ -20,7 +20,6 @@
   <string name="getCode">Kód beolvasása</string>
   <string name="enterCode">Kód megadása</string>
   <string name="about">Az alkalmazásról</string>
-  <string name="more">Továbbiak</string>
 
   <string name="language">Nyelvek</string>
   <string name="afrikaans">Délafrikai holland</string>

src/main/res/values-it/strings.xml

@@ -20,7 +20,6 @@
   <string name="getCode">Ottieni codice</string>
   <string name="enterCode">Inserisci codice</string>
   <string name="about">Informazioni</string>
-  <string name="more">Più</string>
 
   <string name="language">Lingua</string>
   <string name="afrikaans">Afrikaans</string>

src/main/res/values/strings.xml

@@ -20,7 +20,6 @@
   <string name="getCode">Get code</string>
   <string name="enterCode">Enter code</string>
   <string name="about">About</string>
-  <string name="more">More</string>
 
   <string name="language">Language</string>
   <string name="afrikaans">Afrikaans</string>