summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/res/layout/buttons.xml2
-rw-r--r--android/res/layout/picker_entry.xml5
-rw-r--r--android/res/values/strings.xml25
-rw-r--r--android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java2
-rw-r--r--android/src/com/artifex/mupdfdemo/MuPDFActivity.java24
-rw-r--r--android/src/com/artifex/mupdfdemo/MuPDFCore.java4
-rw-r--r--android/src/com/artifex/mupdfdemo/SearchTask.java2
7 files changed, 29 insertions, 35 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>
diff --git a/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java b/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
index 06b2fd13..c7b8ef2e 100644
--- a/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
+++ b/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
@@ -68,7 +68,7 @@ public class ChoosePDFActivity extends ListActivity {
Resources res = getResources();
String appName = res.getString(R.string.app_name);
String version = res.getString(R.string.version);
- String title = res.getString(R.string.picker_title);
+ String title = res.getString(R.string.picker_title_App_Ver_Dir);
setTitle(String.format(title, appName, version, mDirectory));
mParent = mDirectory.getParentFile();
diff --git a/android/src/com/artifex/mupdfdemo/MuPDFActivity.java b/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
index 2c10b248..5fea13e3 100644
--- a/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
+++ b/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
@@ -154,7 +154,7 @@ public class MuPDFActivity extends Activity
mAlertDialog.setButton(AlertDialog.BUTTON2, getString(R.string.cancel), listener);
pressed[1] = MuPDFAlert.ButtonPressed.Cancel;
case Ok:
- mAlertDialog.setButton(AlertDialog.BUTTON1, getString(R.string.ok), listener);
+ mAlertDialog.setButton(AlertDialog.BUTTON1, getString(R.string.okay), listener);
pressed[0] = MuPDFAlert.ButtonPressed.Ok;
break;
case YesNoCancel:
@@ -247,8 +247,8 @@ public class MuPDFActivity extends Activity
if (core == null) {
core = (MuPDFCore)getLastNonConfigurationInstance();
- if (savedInstanceState != null && savedInstanceState.containsKey(getString(R.string.filename))) {
- mFileName = savedInstanceState.getString(getString(R.string.filename));
+ if (savedInstanceState != null && savedInstanceState.containsKey("FileName")) {
+ mFileName = savedInstanceState.getString("FileName");
}
}
if (core == null) {
@@ -263,7 +263,7 @@ public class MuPDFActivity extends Activity
Cursor cursor = getContentResolver().query(uri, new String[]{"_data"}, null, null, null);
if (cursor.moveToFirst()) {
String str = cursor.getString(0);
- String failString = null;
+ String reason = null;
if (str == null) {
try {
InputStream is = getContentResolver().openInputStream(uri);
@@ -275,19 +275,17 @@ public class MuPDFActivity extends Activity
catch (java.lang.OutOfMemoryError e)
{
System.out.println("Out of memory during buffer reading");
- failString = e.toString();
+ reason = e.toString();
}
catch (Exception e) {
- failString = e.toString();
+ reason = e.toString();
}
- if (failString != null)
+ if (reason != null)
{
buffer = null;
Resources res = getResources();
AlertDialog alert = mAlertBuilder.create();
- String contentFailure = res.getString(R.string.content_failure);
- String openFailed = res.getString(R.string.open_failed);
- setTitle(String.format(contentFailure, openFailed, failString));
+ setTitle(String.format(res.getString(R.string.cannot_open_document_Reason), reason));
alert.setButton(AlertDialog.BUTTON_POSITIVE, getString(R.string.dismiss),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
@@ -319,7 +317,7 @@ public class MuPDFActivity extends Activity
if (core == null)
{
AlertDialog alert = mAlertBuilder.create();
- alert.setTitle(R.string.open_failed);
+ alert.setTitle(R.string.cannot_open_document);
alert.setButton(AlertDialog.BUTTON_POSITIVE, getString(R.string.dismiss),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
@@ -341,7 +339,7 @@ public class MuPDFActivity extends Activity
AlertDialog alert = mAlertBuilder.create();
alert.setTitle(R.string.enter_password);
alert.setView(mPasswordView);
- alert.setButton(AlertDialog.BUTTON_POSITIVE, getString(R.string.ok),
+ alert.setButton(AlertDialog.BUTTON_POSITIVE, getString(R.string.okay),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
if (core.authenticatePassword(mPasswordView.getText().toString())) {
@@ -629,7 +627,7 @@ public class MuPDFActivity extends Activity
super.onSaveInstanceState(outState);
if (mFileName != null && mDocView != null) {
- outState.putString(getString(R.string.filename), mFileName);
+ outState.putString("FileName", mFileName);
// Store current page in the prefs against the file name,
// so that we can pick it up each time the file is loaded
diff --git a/android/src/com/artifex/mupdfdemo/MuPDFCore.java b/android/src/com/artifex/mupdfdemo/MuPDFCore.java
index 0d50aacc..bc1fea71 100644
--- a/android/src/com/artifex/mupdfdemo/MuPDFCore.java
+++ b/android/src/com/artifex/mupdfdemo/MuPDFCore.java
@@ -74,7 +74,7 @@ public class MuPDFCore
globals = openFile(filename);
if (globals == 0)
{
- throw new Exception(context.getString(R.string.failed_to_open_)+filename);
+ throw new Exception(String.format(context.getString(R.string.cannot_open_file_Path), filename));
}
file_format = fileFormatInternal();
}
@@ -85,7 +85,7 @@ public class MuPDFCore
globals = openBuffer();
if (globals == 0)
{
- throw new Exception(context.getString(R.string.failed_to_open_buffer));
+ throw new Exception(context.getString(R.string.cannot_open_buffer));
}
file_format = fileFormatInternal();
}
diff --git a/android/src/com/artifex/mupdfdemo/SearchTask.java b/android/src/com/artifex/mupdfdemo/SearchTask.java
index ae7951af..d3969f10 100644
--- a/android/src/com/artifex/mupdfdemo/SearchTask.java
+++ b/android/src/com/artifex/mupdfdemo/SearchTask.java
@@ -90,7 +90,7 @@ public abstract class SearchTask {
if (result != null) {
onTextFound(result);
} else {
- mAlertBuilder.setTitle(SearchTaskResult.get() == null ? R.string.text_not_found : R.string.no_further_occurences_found);
+ mAlertBuilder.setTitle(SearchTaskResult.get() == null ? R.string.text_not_found : R.string.no_further_occurrences_found);
AlertDialog alert = mAlertBuilder.create();
alert.setButton(AlertDialog.BUTTON_POSITIVE, mContext.getString(R.string.dismiss),
(DialogInterface.OnClickListener)null);
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 23:42:32 +0000