Merge branch 'main' of github.com:opendocument-app/OpenDocument.droid

Author: TomTasche

app/src/main/java/at/tomtasche/reader/ui/activity/DocumentFragment.java

@@ -555,7 +555,7 @@ private void offerUpload(Activity activity, FileLoader.Options options, boolean
             builder.setTitle(R.string.toast_error_illegal_file);
             builder.setMessage(R.string.dialog_upload_file);
 
-            builder.setPositiveButton(getString(android.R.string.ok),
+            builder.setPositiveButton(getString(R.string.action_upload),
                     new DialogInterface.OnClickListener() {
 
                         @Override

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

@@ -39,6 +39,7 @@
     <string name="action_tts_next">Next</string>
     <string name="action_tts_previous">Previous</string>
     <string name="action_edit_save">Save</string>
+    <string name="action_upload">Upload</string>
     <string name="action_edit_banner">Edit your document below and press Save</string>
     <string name="landing_welcome_title">Welcome to \nOpenDocument Reader</string>
     <string name="landing_intro_view">OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg) wherever you are.</string>
@@ -66,4 +67,4 @@
     <string name="error">Error</string>
     <string name="back_to_documents">Back to documents</string>
 
-</resources>
+</resources>