unify string resources, cleanup translations

fixes spelling of OK, unifies all OK usages to one GEN_OK
removes unused translations, including the DB upgrade notice

Signed-off-by: Aron Heinecke <aron.heinecke@t-online.de>

Author: 0xpr03

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/ImportLogDialog.java

@@ -5,7 +5,6 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
-import android.util.Log;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
 
@@ -40,7 +39,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         alertDialog.setTitle(R.string.Import_Finished_Title);
         alertDialog.setMessage(getArguments().getString(LOG));
 
-        alertDialog.setPositiveButton(R.string.GEN_Ok, (dialog, whichButton) -> this.dismiss());
+        alertDialog.setPositiveButton(R.string.GEN_OK, (dialog, whichButton) -> this.dismiss());
         return alertDialog.create();
     }
 }

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/TrainerResultDialog.java

@@ -64,7 +64,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         alertDialog.setTitle(R.string.Trainer_Diag_finished_Title);
         alertDialog.setMessage(R.string.Trainer_Diag_finished_MSG);
 
-        alertDialog.setPositiveButton(R.string.Trainer_btn_ok, (dialog, whichButton) -> callFinishAction());
+        alertDialog.setPositiveButton(R.string.GEN_OK, (dialog, whichButton) -> callFinishAction());
         return alertDialog.create();
     }
 

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/VEntryEditorDialog.java

@@ -135,7 +135,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         tAddition.setSingleLine();
         tAddition.setText(addition);
 
-        builder.setPositiveButton(R.string.Editor_Diag_edit_btn_OK, (dialog, whichButton) -> {
+        builder.setPositiveButton(R.string.GEN_OK, (dialog, whichButton) -> {
             List<String> mA = getMeanings(meaningsA);
             List<String> mB = getMeanings(meaningsB);
 

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/VListEditorDialog.java

@@ -140,7 +140,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         alertDialog.setView(view);
 
-        alertDialog.setPositiveButton(R.string.Editor_Diag_table_btn_Ok, (dialog, whichButton) -> {
+        alertDialog.setPositiveButton(R.string.GEN_OK, (dialog, whichButton) -> {
             if (iColA.getText().length() == 0 || iColB.length() == 0 || iName.getText().length() == 0) {
                 Log.d(TAG, "empty insert");
             }

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ExportFragment.java

@@ -336,7 +336,7 @@ private void checkInputOk() {
             alert.setCancelable(true);
             alert.setTitle(R.string.Export_Error_Format_Multivalue_Title);
             alert.setMessage(R.string.Export_Error_Format_Multivalue_Text);
-            alert.setNeutralButton(R.string.GEN_Ok, (dialogInterface, i) -> {
+            alert.setNeutralButton(R.string.GEN_OK, (dialogInterface, i) -> {
                 formatWarnDialog = false; // clear state
             });
             alert.show();

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/FormatFragment.java

@@ -216,7 +216,7 @@ private boolean verifyFormat(){
 
             errorDiag.setTitle(R.string.Format_Diag_error_Title);
             errorDiag.setMessage(msg);
-            errorDiag.setPositiveButton(R.string.GEN_Ok, (dialog, whichButton) -> {
+            errorDiag.setPositiveButton(R.string.GEN_OK, (dialog, whichButton) -> {
             });
 
             errorDiag.show();

app/src/main/res/layout/activity_file.xml

@@ -64,7 +64,7 @@
             android:layout_marginBottom="8dp"
             android:layout_marginEnd="8dp"
             android:onClick="onOkPressed"
-            android:text="@string/File_btn_OK"
+            android:text="@string/GEN_OK"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/bFileCancel"
             app:layout_constraintRight_toRightOf="parent" />

app/src/main/res/layout/fragment_export.xml

@@ -123,7 +123,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:text="@string/Export_Ok"
+            android:text="@string/Export_OK"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/chkExportMulti" />

app/src/main/res/layout/fragment_import.xml

@@ -262,7 +262,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:text="@string/Import_Ok"
+            android:text="@string/Import_OK"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/rgImportMultiple" />

app/src/main/res/layout/fragment_list_selector.xml

@@ -24,7 +24,7 @@
         android:layout_marginBottom="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
-        android:text="@string/GEN_Ok"
+        android:text="@string/GEN_OK"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"