From 566f76f598ce64bf613c01e67838f2f4fa8cc689 Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sat, 29 Sep 2012 12:11:00 +0000
Subject: [PATCH] DroidFish: Fixed wrong text string in edit header dialog.

---
 DroidFish/res/layout/edit_headers.xml             | 4 ++--
 DroidFish/res/values/strings.xml                  | 4 ++--
 DroidFish/src/org/petero/droidfish/DroidFish.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DroidFish/res/layout/edit_headers.xml b/DroidFish/res/layout/edit_headers.xml
index 0dfd2fa..b7007ee 100644
--- a/DroidFish/res/layout/edit_headers.xml
+++ b/DroidFish/res/layout/edit_headers.xml
@@ -69,7 +69,7 @@
           <TextView
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:text="@string/header_white">
+              android:text="@string/white">
           </TextView>
           <EditText
               android:id="@+id/ed_header_white"
@@ -83,7 +83,7 @@
           <TextView
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:text="@string/header_black">
+              android:text="@string/black">
           </TextView>
           <EditText
               android:id="@+id/ed_header_black" 
diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index e92c750..cf2fa94 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -58,6 +58,8 @@ you are not actively using the program.\
     <string name="select_side_to_move_first">Select side to move first</string>
     <string name="white">White</string>
     <string name="black">Black</string>
+    <string name="white_square_character">\u25a0</string>
+    <string name="black_square_character">\u25a1</string>
     <string name="white_king_castle">White king castle</string>
     <string name="white_queen_castle">White queen castle</string>
     <string name="black_king_castle">Black king castle</string>
@@ -124,8 +126,6 @@ you are not actively using the program.\
     <string name="header_site">Site:</string>
     <string name="header_date">Date:</string>
     <string name="header_round">Round:</string>
-    <string name="header_white">\u25a0</string>
-    <string name="header_black">\u25a1</string>
     <string name="comment_before">Before:</string>
     <string name="comment_move">Move:</string>
     <string name="comment_after">After:</string>
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 23c2c41..2cd59a4 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -2940,8 +2940,8 @@ public class DroidFish extends Activity implements GUIInterface {
     @Override
     public void setRemainingTime(long wTime, long bTime, long nextUpdate) {
         if (ctrl.getGameMode().clocksActive()) {
-            whiteTitleText.setText(getString(R.string.header_white) + " " + timeToString(wTime));
-            blackTitleText.setText(getString(R.string.header_black) + " " + timeToString(bTime));
+            whiteTitleText.setText(getString(R.string.white_square_character) + " " + timeToString(wTime));
+            blackTitleText.setText(getString(R.string.black_square_character) + " " + timeToString(bTime));
         } else {
             TreeMap<String,String> headers = new TreeMap<String,String>();
             ctrl.getHeaders(headers);