summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2010-11-06 02:02:58 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2010-11-06 02:02:58 +0000
commitf20582442f6a7c49a217b8e9a75e161e750e4ea6 (patch)
tree2deb05d300e963c8d6bd986e8bd0ab409991e1f6
parent13f7dffb09f47b909a50e622d0089289d8cbd9cd (diff)
downloadrockbox-f20582442f6a7c49a217b8e9a75e161e750e4ea6.tar.gz
rockbox-f20582442f6a7c49a217b8e9a75e161e750e4ea6.tar.bz2
rockbox-f20582442f6a7c49a217b8e9a75e161e750e4ea6.zip
Android: replace hardcoded strings with Android strings, allowing translations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28518 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--android/res/values/strings.xml4
-rw-r--r--android/src/org/rockbox/RockboxActivity.java2
-rw-r--r--android/src/org/rockbox/RockboxService.java2
3 files changed, 5 insertions, 3 deletions
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 729935c196..8034eab086 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -8,4 +8,6 @@
<string name="KbdInputTitle">Rockbox Keyboard Input</string>
<string name="Yes">Yes</string>
<string name="No">No</string>
-</resources>
+<string name="error_extraction">Error occured during extraction!</string>
+<string name="rockbox_extracting">Rockbox is loading. Please wait...</string>
+</resources> \ No newline at end of file
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index b9a8c54204..06ceb9c35f 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -55,7 +55,7 @@ public class RockboxActivity extends Activity
private void createProgressDialog()
{
loadingdialog = new ProgressDialog(RockboxActivity.this);
- loadingdialog.setMessage("Rockbox is loading. Please wait...");
+ loadingdialog.setMessage(getString(R.string.rockbox_extracting));
loadingdialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
loadingdialog.setIndeterminate(true);
loadingdialog.setCancelable(false);
diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java
index 4aa7bc1916..0737bf88ce 100644
--- a/android/src/org/rockbox/RockboxService.java
+++ b/android/src/org/rockbox/RockboxService.java
@@ -207,7 +207,7 @@ public class RockboxService extends Service
e.printStackTrace();
if (resultReceiver != null) {
Bundle bundle = new Bundle();
- bundle.putString("error", "Error occured during extraction!");
+ bundle.putString("error", getString(R.string.error_extraction));
resultReceiver.send(RESULT_ERROR_OCCURED, bundle);
}
}