From 2eb8904a0a31152fb28fbee5853394a7740b84c3 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Thu, 30 Aug 2012 19:11:46 -0700
Subject: [PATCH] rename to cWords-SMS, and move name <string/> into
 strings.xml so it can be substituted too.

---
 xwords4/android/XWords4-sms/build.xml               | 2 +-
 xwords4/android/XWords4-sms/res/values/app_name.xml | 1 -
 xwords4/android/XWords4/res/values/app_name.xml     | 1 -
 xwords4/android/XWords4/res/values/strings.xml      | 2 ++
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4-sms/build.xml b/xwords4/android/XWords4-sms/build.xml
index 5e1d8d6e9..dbb8ff909 100644
--- a/xwords4/android/XWords4-sms/build.xml
+++ b/xwords4/android/XWords4-sms/build.xml
@@ -69,7 +69,7 @@
             <arg value="--variant-name"/>
             <arg value="xw4sms"/>
             <arg value="--app-name"/>
-            <arg value="CrossW-SMS"/>
+            <arg value="CWords-SMS"/>
             <arg value="--dest-dir"/>
             <arg value="./res"/>
             <arg value="--dest-dir"/>
diff --git a/xwords4/android/XWords4-sms/res/values/app_name.xml b/xwords4/android/XWords4-sms/res/values/app_name.xml
index c9aaa8228..caffa71f3 100644
--- a/xwords4/android/XWords4-sms/res/values/app_name.xml
+++ b/xwords4/android/XWords4-sms/res/values/app_name.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="app_name">CrossW-SMS</string>  
   <string name="app_version">4.4 beta 51</string>
 </resources>
diff --git a/xwords4/android/XWords4/res/values/app_name.xml b/xwords4/android/XWords4/res/values/app_name.xml
index ab9980a91..caffa71f3 100644
--- a/xwords4/android/XWords4/res/values/app_name.xml
+++ b/xwords4/android/XWords4/res/values/app_name.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="app_name">Crosswords</string>  
   <string name="app_version">4.4 beta 51</string>
 </resources>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 6d39bf2bf..39c942a01 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2,6 +2,8 @@
 <!-- -*- compile-command: "cd ../../; ant install"; -*- -->
 
 <resources>
+    <!-- The name of the app.  Not localized! -->
+    <string name="app_name">Crosswords</string>  
 
     <!--
        ############################################################