From f20582442f6a7c49a217b8e9a75e161e750e4ea6 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Sat, 6 Nov 2010 02:02:58 +0000 Subject: [PATCH] Android: replace hardcoded strings with Android strings, allowing translations git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28518 a1c6a512-1295-4272-9138-f99709370657 --- android/res/values/strings.xml | 4 +++- android/src/org/rockbox/RockboxActivity.java | 2 +- android/src/org/rockbox/RockboxService.java | 2 +- 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 @@ Rockbox Keyboard Input Yes No - +Error occured during extraction! +Rockbox is loading. Please wait... + \ 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); } }