From bee97f8862882a5923171fdc3971789ccfc1ee67 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 12 Aug 2014 07:17:36 -0700
Subject: [PATCH] tweak text of reminder (prev-known-as "nag") message to be
 less harsh

---
 xwords4/android/XWords4/archive/R.java                   | 8 +++++++-
 xwords4/android/XWords4/res/values/strings.xml           | 7 +++++--
 xwords4/android/XWords4/res_src/values-ba_CK/strings.xml | 7 +++++--
 xwords4/android/XWords4/res_src/values-ca_PS/strings.xml | 7 +++++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java
index 5caf98959..4f253702a 100644
--- a/xwords4/android/XWords4/archive/R.java
+++ b/xwords4/android/XWords4/archive/R.java
@@ -1605,10 +1605,14 @@ public final class R {
         /**  Text of progress indicator shown while check is being conducted 
          */
         public static final int msgs_progress=0x7f06009d;
+        /**  body of warning notification reminder message 
+         */
         public static final int nag_body_fmt=0x7f0602c6;
-        /**  Nagging 
+        /**  Nagging: title of notification reminder message 
          */
         public static final int nag_title=0x7f0602c5;
+        /**  above is inserted in this the last time I warn 
+         */
         public static final int nag_warn_last_fmt=0x7f0602c7;
         public static final int name_dict_fmt=0x7f060086;
         /**  text of checkbox.  If this checkbox is checked, games created
@@ -2084,6 +2088,8 @@ public final class R {
         /**  clarification of the above 
          */
         public static final int prefs_names_summary=0x7f060132;
+        /**  Used when prev player's name can't be looked up 
+         */
         public static final int prev_player=0x7f0602c8;
         public static final int progress_title=0x7f0602bc;
         /**   
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 1174828d1..926fda4c0 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2266,9 +2266,12 @@
     <string name="force_tablet_title">Force tablet layout</string>
     <string name="force_tablet_summary">Even if my screen is too small</string>
 
-    <!-- Nagging -->
+    <!-- Nagging: title of notification reminder message -->
     <string name="nag_title">Reminder: It\'s your turn</string>
-    <string name="nag_body_fmt">%1$s has been waiting more than %2$d hours.</string>
+    <!-- body of warning notification reminder message -->
+    <string name="nag_body_fmt">%1$s moved more than %2$d hours ago.</string>
+    <!-- above is inserted in this the last time I warn -->
     <string name="nag_warn_last_fmt">Last warning: %1$s</string>
+    <!-- Used when prev player's name can't be looked up -->
     <string name="prev_player">Your opponent</string>
 </resources>
diff --git a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
index 89dc8a876..29b33b19e 100644
--- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
+++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
@@ -1937,9 +1937,12 @@
     tahw\'s elbaliava.</string>
   <string name="force_tablet_title">Ecrof telbat tuoyal</string>
   <string name="force_tablet_summary">Neve fi ym neercs si oot llams</string>
-  <!-- Nagging -->
+  <!-- Nagging: title of notification reminder message -->
   <string name="nag_title">Rednimer: Ti\'s ruoy nrut</string>
-  <string name="nag_body_fmt">%1$s sah neeb gnitiaw erom naht %2$d sruoh.</string>
+  <!-- body of warning notification reminder message -->
+  <string name="nag_body_fmt">%1$s devom erom naht %2$d sruoh oga.</string>
+  <!-- above is inserted in this the last time I warn -->
   <string name="nag_warn_last_fmt">Tsal gninraw: %1$s</string>
+  <!-- Used when prev player's name can't be looked up -->
   <string name="prev_player">Ruoy tnenoppo</string>
 </resources>
diff --git a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
index 0e5f9e037..8fa4a3236 100644
--- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
+++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
@@ -1937,9 +1937,12 @@
     WHAT\'S AVAILABLE.</string>
   <string name="force_tablet_title">FORCE TABLET LAYOUT</string>
   <string name="force_tablet_summary">EVEN IF MY SCREEN IS TOO SMALL</string>
-  <!-- Nagging -->
+  <!-- Nagging: title of notification reminder message -->
   <string name="nag_title">REMINDER: IT\'S YOUR TURN</string>
-  <string name="nag_body_fmt">%1$s HAS BEEN WAITING MORE THAN %2$d HOURS.</string>
+  <!-- body of warning notification reminder message -->
+  <string name="nag_body_fmt">%1$s MOVED MORE THAN %2$d HOURS AGO.</string>
+  <!-- above is inserted in this the last time I warn -->
   <string name="nag_warn_last_fmt">LAST WARNING: %1$s</string>
+  <!-- Used when prev player's name can't be looked up -->
   <string name="prev_player">YOUR OPPONENT</string>
 </resources>