android: Clean up string resources.

3 files changed, 14 insertions, 18 deletions

diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml
index 74657d42..3659b3e9 100644
--- a/android/res/layout/buttons.xml
+++ b/android/res/layout/buttons.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/reflowButton"
-                android:contentDescription="@string/link_control"
+                android:contentDescription="@string/toggle_links"
                 android:background="@drawable/button"
                 android:src="@drawable/ic_link" />
 
diff --git a/android/res/layout/picker_entry.xml b/android/res/layout/picker_entry.xml
index e4d53a59..fe4b580c 100644
--- a/android/res/layout/picker_entry.xml
+++ b/android/res/layout/picker_entry.xml
@@ -9,8 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_alignParentLeft="true"
-        android:contentDescription="@string/link_control" />
+        android:layout_alignParentLeft="true" />
 
     <TextView
         android:id="@+id/name"
@@ -23,4 +22,4 @@
         android:paddingTop="8dp"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 6f41caec..5df402c3 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -2,21 +2,19 @@
 <resources>
     <string name="app_name">MuPDF</string>
     <string name="version">1.2</string>
-    <string name="no_media_warning">Storage Media not present</string>
+    <string name="no_media_warning">Storage media not present</string>
     <string name="no_media_hint">Sharing the storage media with a PC can make it inaccessible</string>
-    <string name="open_failed">Unable to open document</string>
-    <string name="content_failure">%1$s: %2$s</string>
     <string name="cancel">Cancel</string>
     <string name="search_backwards">Search backwards</string>
     <string name="search_forwards">Search forwards</string>
     <string name="search_document">Search document</string>
-    <string name="picker_title">%1$s %2$s: %3$s</string>
+    <string name="picker_title_App_Ver_Dir">%1$s %2$s: %3$s</string>
     <string name="outline_title">Table of Contents</string>
-    <string name="enter_password">Enter Password</string>
+    <string name="enter_password">Enter password</string>
     <string name="text_not_found">Text not found</string>
     <string name="searching_">Searching&#8230;</string>
-    <string name="link_control">Link highlighting and enabling</string>
-    <string name="no_further_occurences_found">No further occurrences found</string>
+    <string name="toggle_links">Highlight and enable links</string>
+    <string name="no_further_occurrences_found">No further occurrences found</string>
     <string name="select">Select</string>
     <string name="search">Search</string>
     <string name="copy">Copy</string>
@@ -30,11 +28,8 @@
     <string name="print">Print</string>
     <string name="dismiss">Dismiss</string>
     <string name="_up_one_level_">[Up one level]</string>
-    <string name="ok">Ok</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="filename">FileName</string>
-    <string name="out_of_memory_during_buffer_reading">Out of memory during buffer reading</string>
     <string name="entering_reflow_mode">Entering reflow mode</string>
     <string name="leaving_reflow_mode">Leaving reflow mode</string>
     <string name="print_failed">Print failed</string>
@@ -44,11 +39,13 @@
     <string name="draw_annotation">Draw annotation</string>
     <string name="nothing_to_save">Nothing to save</string>
     <string name="document_has_changes_save_them_">Document has changes. Save them?</string>
-    <string name="failed_to_open_">"Failed to open "</string>
-    <string name="failed_to_open_buffer">Failed to open buffer</string>
-    <string name="fill_out_text_field">fill out text field</string>
+    <string name="cannot_open_document">Cannot open document</string>
+    <string name="cannot_open_document_Reason">Cannot open document: %1$s</string>
+    <string name="cannot_open_file_Path">Cannot open file: %1$s</string>
+    <string name="cannot_open_buffer">Cannot open buffer</string>
+    <string name="fill_out_text_field">Fill out text field</string>
     <string name="okay">Okay</string>
-    <string name="choose_value">choose value</string>
+    <string name="choose_value">Choose value</string>
     <string name="not_supported">Not supported</string>
     <string name="copy_text_to_the_clipboard">Copy text to the clipboard</string>
     <string name="more">More</string>