From 70cac5464f7cff9219e60e9975bcc62b0dfa2178 Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sat, 17 Dec 2011 08:54:14 +0000 Subject: [PATCH] DroidFish: Moved "delete game/delete file" strings to strings.xml. --- DroidFish/res/menu-de/edit_file_options_menu.xml | 8 -------- DroidFish/res/menu/edit_file_options_menu.xml | 2 +- DroidFish/res/values-de/strings.xml | 1 + DroidFish/res/values/strings.xml | 4 ++++ .../src/org/petero/droidfish/activities/EditPGN.java | 6 +++--- 5 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 DroidFish/res/menu-de/edit_file_options_menu.xml diff --git a/DroidFish/res/menu-de/edit_file_options_menu.xml b/DroidFish/res/menu-de/edit_file_options_menu.xml deleted file mode 100644 index ac69520..0000000 --- a/DroidFish/res/menu-de/edit_file_options_menu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/DroidFish/res/menu/edit_file_options_menu.xml b/DroidFish/res/menu/edit_file_options_menu.xml index bc66142..d49cc26 100644 --- a/DroidFish/res/menu/edit_file_options_menu.xml +++ b/DroidFish/res/menu/edit_file_options_menu.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:title="@string/delete_file"> diff --git a/DroidFish/res/values-de/strings.xml b/DroidFish/res/values-de/strings.xml index 55d2bf0..c7e1488 100644 --- a/DroidFish/res/values-de/strings.xml +++ b/DroidFish/res/values-de/strings.xml @@ -333,4 +333,5 @@ oder dass Sie das Programm beenden, wenn Sie es nicht aktiv nutzen.\ Bevor: Zug: Nach: + Datei löschen diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml index ad86177..d9daea9 100644 --- a/DroidFish/res/values/strings.xml +++ b/DroidFish/res/values/strings.xml @@ -365,4 +365,8 @@ you are not actively using the program.\ Heavy CPU usage Background processing DroidFish is using a lot of CPU power + Delete game? + Delete file + Delete file? + Delete file %s? diff --git a/DroidFish/src/org/petero/droidfish/activities/EditPGN.java b/DroidFish/src/org/petero/droidfish/activities/EditPGN.java index 2900dd2..5845708 100644 --- a/DroidFish/src/org/petero/droidfish/activities/EditPGN.java +++ b/DroidFish/src/org/petero/droidfish/activities/EditPGN.java @@ -310,7 +310,7 @@ public class EditPGN extends ListActivity { final GameInfo gi = selectedGi; selectedGi = null; AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Delete game?"); + builder.setTitle(R.string.delete_game); String msg = gi.toString(); builder.setMessage(msg); builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { @@ -352,9 +352,9 @@ public class EditPGN extends ListActivity { } case DELETE_PGN_FILE_DIALOG: { AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle("Delete file?"); + builder.setTitle(R.string.delete_file_question); String name = new File(pgnFile.getName()).getName(); - String msg = String.format("Delete file %s?", name); + String msg = String.format(getString(R.string.delete_named_file), name); builder.setMessage(msg); builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) {