diff --git a/DroidFish/res/layout-land/editboard.xml b/DroidFish/res/layout-land/editboard.xml
index 3d38755..a77dd73 100644
--- a/DroidFish/res/layout-land/editboard.xml
+++ b/DroidFish/res/layout-land/editboard.xml
@@ -27,7 +27,7 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content">
 			<Button
-				android:text="@string/ok"
+				android:text="@android:string/ok"
 				android:id="@+id/eb_ok"
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
diff --git a/DroidFish/res/layout/editboard.xml b/DroidFish/res/layout/editboard.xml
index 061938e..5f8ccd7 100644
--- a/DroidFish/res/layout/editboard.xml
+++ b/DroidFish/res/layout/editboard.xml
@@ -23,7 +23,7 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content">
 		<Button
-			android:text="@string/ok"
+			android:text="@android:string/ok"
 			android:id="@+id/eb_ok"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
diff --git a/DroidFish/res/values-de/strings.xml b/DroidFish/res/values-de/strings.xml
index bdd5a8d..ac02bb1 100644
--- a/DroidFish/res/values-de/strings.xml
+++ b/DroidFish/res/values-de/strings.xml
@@ -259,7 +259,6 @@ wenn Sie es nicht aktiv nutzen.\
     <string name="load_next_game">Nächste Partie laden</string>
     <string name="no_prev_game">Keine vorherige Partie</string>
     <string name="no_next_game">Keine nächste Partie</string>
-    <string name="ok">Okay</string>
     <string name="cancel">Abbrechen</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
diff --git a/DroidFish/res/values-es/strings.xml b/DroidFish/res/values-es/strings.xml
index e793820..ee0af99 100644
--- a/DroidFish/res/values-es/strings.xml
+++ b/DroidFish/res/values-es/strings.xml
@@ -259,7 +259,6 @@ Si está usted utilizando la batería, se recomienda que cambie los ajustes para
     <string name="load_next_game">Cargar Siguiente Partida</string>
     <string name="no_prev_game">No hay Partida Anterior</string>
     <string name="no_next_game">No hay Partida Siguiente</string>
-    <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 562519e..8b4fe7c 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -261,7 +261,6 @@ you are not actively using the program.\
     <string name="load_next_game">Load Next Game</string>
     <string name="no_prev_game">No previous game</string>
     <string name="no_next_game">No next game</string>
-    <string name="ok">Ok</string>
     <string name="cancel">Cancel</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 1e3e49e..66902a9 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -1404,7 +1404,7 @@ public class DroidFish extends Activity implements GUIInterface {
                     }
                 }
             };
-            builder.setPositiveButton(R.string.ok, new Dialog.OnClickListener() {
+            builder.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     gotoMove.run();
                 }
@@ -1598,7 +1598,7 @@ public class DroidFish extends Activity implements GUIInterface {
                     savePGNToFile(pathName, false);
                 }
             };
-            builder.setPositiveButton(R.string.ok, new Dialog.OnClickListener() {
+            builder.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     savePGN.run();
                 }
@@ -1729,7 +1729,7 @@ public class DroidFish extends Activity implements GUIInterface {
                         black.setText(headers.get("Black"));
 
                         builder.setNegativeButton(R.string.cancel, null);
-                        builder.setPositiveButton(R.string.ok, new Dialog.OnClickListener() {
+                        builder.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 headers.put("Event", event.getText().toString().trim());
                                 headers.put("Site",  site .getText().toString().trim());
@@ -1767,7 +1767,7 @@ public class DroidFish extends Activity implements GUIInterface {
                         nag.setText(nagStr);
 
                         builder.setNegativeButton(R.string.cancel, null);
-                        builder.setPositiveButton(R.string.ok, new Dialog.OnClickListener() {
+                        builder.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 String pre = preComment.getText().toString().trim();
                                 String post = postComment.getText().toString().trim();