From 07e97107ce5e6cc4864a78835df08ba0185f492a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 20 Aug 2015 07:37:30 -0700
Subject: [PATCH 1/5] confirm before deleting chat history

Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
---
 .../android/XWords4/res/values/strings.xml    |  3 ++
 .../org/eehouse/android/xw4/ChatDelegate.java | 34 ++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 8e51f1607..590a624f0 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2538,4 +2538,7 @@
     <item quantity="other">%1$s messages sent</item>
   </plurals>
 
+  <string name="confirm_clear_chat">Are you sure you want to delete
+  all chat history for this game?\n\n(This action cannot be
+  undone.)</string>
 </resources>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
index 82d6572eb..bb2cbcd67 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
@@ -21,16 +21,18 @@
 package org.eehouse.android.xw4;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MenuInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.eehouse.android.xw4.DlgDelegate.Action;
 
 public class ChatDelegate extends DelegateBase
     implements View.OnClickListener {
@@ -82,10 +84,7 @@ public class ChatDelegate extends DelegateBase
     {
         boolean handled = R.id.chat_menu_clear == item.getItemId();
         if ( handled ) {
-            DBUtils.clearChatHistory( m_activity, m_rowid );
-            LinearLayout layout = 
-                (LinearLayout)findViewById( R.id.chat_history );
-            layout.removeAllViews();
+            showConfirmThen( R.string.confirm_clear_chat, Action.CLEAR_ACTION );
         }
         return handled;
     }
@@ -105,4 +104,21 @@ public class ChatDelegate extends DelegateBase
         }
         finish();
     }
+
+    @Override
+    public void dlgButtonClicked( Action action, int which, Object[] params )
+    {
+        switch ( action ) {
+        case CLEAR_ACTION:
+            if ( AlertDialog.BUTTON_POSITIVE == which ) {
+                DBUtils.clearChatHistory( m_activity, m_rowid );
+                LinearLayout layout = 
+                    (LinearLayout)findViewById( R.id.chat_history );
+                layout.removeAllViews();
+            }
+            break;
+        default:
+            super.dlgButtonClicked( action, which, params );
+        }
+    }
 }

From 6b455bf743ed7e1cb2b54a9aafa69e0f68122aeb Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 20 Aug 2015 07:15:20 -0700
Subject: [PATCH 2/5] make chat compose space multi-line; scroll chat history
 to bottom on open

---
 xwords4/android/XWords4/res/layout/chat.xml              | 5 +++--
 .../src/org/eehouse/android/xw4/ChatDelegate.java        | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/chat.xml b/xwords4/android/XWords4/res/layout/chat.xml
index e1f02e40b..2ac2bff36 100644
--- a/xwords4/android/XWords4/res/layout/chat.xml
+++ b/xwords4/android/XWords4/res/layout/chat.xml
@@ -9,7 +9,8 @@
   <!-- history is kept in a scrolling list of textview elems so
   different style can be applied based on whether they're local or
   remote.  Inserted at runtime.... -->
-  <ScrollView android:orientation="vertical"
+  <ScrollView android:id="@+id/scroll"
+              android:orientation="vertical"
               android:layout_width="fill_parent" 
               android:layout_height="wrap_content"
               android:layout_weight="1"
@@ -29,7 +30,7 @@
     <EditText android:id="@+id/chat_edit" 
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:singleLine="true"
+              android:singleLine="false"
               android:layout_weight="1"
               />
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
index bb2cbcd67..fa834906e 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
@@ -30,6 +30,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
@@ -67,6 +68,14 @@ public class ChatDelegate extends DelegateBase
                 }
             }
 
+            final ScrollView scroll = (ScrollView)findViewById( R.id.scroll );
+            scroll.post(new Runnable() {            
+                    @Override
+                    public void run() {
+                        scroll.fullScroll(View.FOCUS_DOWN);              
+                    }
+                });
+
             ((Button)findViewById( R.id.send_button ))
                 .setOnClickListener( this );
 

From 79ab1214e71beec97a8e7894f9bcd0553fc1b02b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 20 Aug 2015 07:35:01 -0700
Subject: [PATCH 3/5] replace send button with menuitem, and add icons for it
 and clear

---
 xwords4/android/XWords4/res/layout/chat.xml   | 19 ++-----
 .../android/XWords4/res/menu/chat_menu.xml    |  7 +++
 .../org/eehouse/android/xw4/ChatDelegate.java | 51 +++++++++----------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/chat.xml b/xwords4/android/XWords4/res/layout/chat.xml
index 2ac2bff36..422ccfcd7 100644
--- a/xwords4/android/XWords4/res/layout/chat.xml
+++ b/xwords4/android/XWords4/res/layout/chat.xml
@@ -22,24 +22,11 @@
                   />
   </ScrollView>
 
-  <LinearLayout android:orientation="horizontal"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content"
-                >
-
-    <EditText android:id="@+id/chat_edit" 
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:singleLine="false"
-              android:layout_weight="1"
-              />
-
-    <Button android:id="@+id/send_button"
-            android:layout_width="wrap_content" 
+  <EditText android:id="@+id/chat_edit" 
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/chat_send" 
+            android:singleLine="false"
             android:layout_weight="0"
             />
 
-  </LinearLayout>
 </LinearLayout>
diff --git a/xwords4/android/XWords4/res/menu/chat_menu.xml b/xwords4/android/XWords4/res/menu/chat_menu.xml
index 9ce17dcd1..3dda1c98f 100644
--- a/xwords4/android/XWords4/res/menu/chat_menu.xml
+++ b/xwords4/android/XWords4/res/menu/chat_menu.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/chat_menu_send"
+          android:title="@string/chat_send"
+          android:showAsAction="ifRoom"
+          android:icon="@drawable/send__gen"
+          />
     <item android:id="@+id/chat_menu_clear"
           android:title="@string/chat_menu_clear"
+          android:showAsAction="ifRoom"
+          android:icon="@drawable/content_discard__gen"
           />
 </menu>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
index fa834906e..b4bdd2b6d 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
@@ -24,10 +24,8 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
@@ -35,8 +33,7 @@ import android.widget.TextView;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-public class ChatDelegate extends DelegateBase
-    implements View.OnClickListener {
+public class ChatDelegate extends DelegateBase {
 
     private long m_rowid;
     private Activity m_activity;
@@ -76,9 +73,6 @@ public class ChatDelegate extends DelegateBase
                     }
                 });
 
-            ((Button)findViewById( R.id.send_button ))
-                .setOnClickListener( this );
-
             String title = getString( R.string.chat_title_fmt, 
                                       GameUtils.getName( m_activity, m_rowid ) );
             setTitle( title );
@@ -91,29 +85,34 @@ public class ChatDelegate extends DelegateBase
     @Override
     public boolean onOptionsItemSelected( MenuItem item ) 
     {
-        boolean handled = R.id.chat_menu_clear == item.getItemId();
-        if ( handled ) {
-            showConfirmThen( R.string.confirm_clear_chat, Action.CLEAR_ACTION );
+        boolean handled = true;
+        switch ( item.getItemId() ) {
+        case R.id.chat_menu_clear:
+            if ( handled ) {
+                showConfirmThen( R.string.confirm_clear_chat, Action.CLEAR_ACTION );
+            }
+            break;
+        case R.id.chat_menu_send:
+            EditText edit = (EditText)findViewById( R.id.chat_edit );
+            String text = edit.getText().toString();
+            if ( null == text || text.length() == 0 ) {
+                setResult( Activity.RESULT_CANCELED );
+            } else {
+                DBUtils.appendChatHistory( m_activity, m_rowid, text, true );
+
+                Intent result = new Intent();
+                result.putExtra( BoardDelegate.INTENT_KEY_CHAT, text );
+                setResult( Activity.RESULT_OK, result );
+            }
+            finish();
+            break;
+        default:
+            handled = false;
+            break;
         }
         return handled;
     }
 
-    public void onClick( View view ) 
-    {
-        EditText edit = (EditText)findViewById( R.id.chat_edit );
-        String text = edit.getText().toString();
-        if ( null == text || text.length() == 0 ) {
-            setResult( Activity.RESULT_CANCELED );
-        } else {
-            DBUtils.appendChatHistory( m_activity, m_rowid, text, true );
-
-            Intent result = new Intent();
-            result.putExtra( BoardDelegate.INTENT_KEY_CHAT, text );
-            setResult( Activity.RESULT_OK, result );
-        }
-        finish();
-    }
-
     @Override
     public void dlgButtonClicked( Action action, int which, Object[] params )
     {

From e0327b0f62db2c861f9cb8cd92b76b751b17942f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 20 Aug 2015 07:41:48 -0700
Subject: [PATCH 4/5] ignore files

---
 xwords4/android/XWords4-dbg/res/values-fr/.gitignore | 1 +
 xwords4/android/XWords4-dbg/res/values-nl/.gitignore | 1 +
 xwords4/android/XWords4/res/values-nl/.gitignore     | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 xwords4/android/XWords4-dbg/res/values-fr/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res/values-nl/.gitignore
 create mode 100644 xwords4/android/XWords4/res/values-nl/.gitignore

diff --git a/xwords4/android/XWords4-dbg/res/values-fr/.gitignore b/xwords4/android/XWords4-dbg/res/values-fr/.gitignore
new file mode 100644
index 000000000..be5186f01
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/values-fr/.gitignore
@@ -0,0 +1 @@
+strings.xml
diff --git a/xwords4/android/XWords4-dbg/res/values-nl/.gitignore b/xwords4/android/XWords4-dbg/res/values-nl/.gitignore
new file mode 100644
index 000000000..be5186f01
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res/values-nl/.gitignore
@@ -0,0 +1 @@
+strings.xml
diff --git a/xwords4/android/XWords4/res/values-nl/.gitignore b/xwords4/android/XWords4/res/values-nl/.gitignore
new file mode 100644
index 000000000..1e28ff4b4
--- /dev/null
+++ b/xwords4/android/XWords4/res/values-nl/.gitignore
@@ -0,0 +1 @@
+/strings.xml

From 8f936303507be5952ed4bd5c6009f108b8d881d7 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 21 Aug 2015 06:56:47 -0700
Subject: [PATCH 5/5] shorten string to make action bar more obvious (and catch
 up with generated string file changes)

---
 xwords4/android/XWords4/archive/R.java        | 105 +++++++++---------
 .../android/XWords4/res/values/strings.xml    |   2 +-
 .../XWords4/res_src/values-ba_CK/strings.xml  |   5 +-
 .../XWords4/res_src/values-ca_PS/strings.xml  |   5 +-
 4 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java
index 3ca5799b3..763b09b3f 100644
--- a/xwords4/android/XWords4/archive/R.java
+++ b/xwords4/android/XWords4/archive/R.java
@@ -70,14 +70,15 @@ public final class R {
         public static final int save__gen=0x7f02001f;
         public static final int search__gen=0x7f020020;
         public static final int select_all__gen=0x7f020021;
-        public static final int shuffle=0x7f020022;
-        public static final int sologame__gen=0x7f020023;
-        public static final int stat_notify_chat=0x7f020024;
-        public static final int stat_notify_sync=0x7f020025;
-        public static final int undo=0x7f020026;
-        public static final int up__gen=0x7f020027;
-        public static final int values=0x7f020028;
-        public static final int zoom=0x7f020029;
+        public static final int send__gen=0x7f020022;
+        public static final int shuffle=0x7f020023;
+        public static final int sologame__gen=0x7f020024;
+        public static final int stat_notify_chat=0x7f020025;
+        public static final int stat_notify_sync=0x7f020026;
+        public static final int undo=0x7f020027;
+        public static final int up__gen=0x7f020028;
+        public static final int values=0x7f020029;
+        public static final int zoom=0x7f02002a;
     }
     public static final class id {
         public static final int about_xlator=0x7f0a0001;
@@ -120,9 +121,10 @@ public final class R {
         public static final int button_study=0x7f0a0061;
         public static final int change_connection=0x7f0a003b;
         public static final int chat_button=0x7f0a0080;
-        public static final int chat_edit=0x7f0a0010;
-        public static final int chat_history=0x7f0a000f;
-        public static final int chat_menu_clear=0x7f0a00a0;
+        public static final int chat_edit=0x7f0a0011;
+        public static final int chat_history=0x7f0a0010;
+        public static final int chat_menu_clear=0x7f0a00a1;
+        public static final int chat_menu_send=0x7f0a00a0;
         public static final int checkbox=0x7f0a0051;
         public static final int color_display_sample=0x7f0a0012;
         public static final int color_edit_sample=0x7f0a0013;
@@ -137,11 +139,11 @@ public final class R {
         public static final int dict_label=0x7f0a0069;
         public static final int dict_spinner=0x7f0a002d;
         public static final int dictlist_button=0x7f0a007f;
-        public static final int dicts_delete=0x7f0a00a3;
-        public static final int dicts_deselect_all=0x7f0a00a2;
-        public static final int dicts_download=0x7f0a00a1;
-        public static final int dicts_move=0x7f0a00a4;
-        public static final int dicts_select=0x7f0a00a5;
+        public static final int dicts_delete=0x7f0a00a4;
+        public static final int dicts_deselect_all=0x7f0a00a3;
+        public static final int dicts_download=0x7f0a00a2;
+        public static final int dicts_move=0x7f0a00a5;
+        public static final int dicts_select=0x7f0a00a6;
         public static final int divider=0x7f0a0024;
         public static final int download_button=0x7f0a0072;
         public static final int dwnld_message=0x7f0a004f;
@@ -160,31 +162,31 @@ public final class R {
         public static final int game_locked_check=0x7f0a0028;
         public static final int game_name=0x7f0a0046;
         public static final int gamel_menu_checkmoves=0x7f0a0091;
-        public static final int games_game_config=0x7f0a00b1;
-        public static final int games_game_copy=0x7f0a00b6;
-        public static final int games_game_delete=0x7f0a00b0;
-        public static final int games_game_move=0x7f0a00b2;
-        public static final int games_game_new_from=0x7f0a00b4;
-        public static final int games_game_rename=0x7f0a00b5;
-        public static final int games_game_reset=0x7f0a00b3;
-        public static final int games_group_default=0x7f0a00ba;
-        public static final int games_group_delete=0x7f0a00b9;
-        public static final int games_group_movedown=0x7f0a00b8;
-        public static final int games_group_moveup=0x7f0a00b7;
-        public static final int games_group_rename=0x7f0a00bb;
-        public static final int games_menu_about=0x7f0a00ad;
-        public static final int games_menu_checkmoves=0x7f0a00af;
-        public static final int games_menu_checkupdates=0x7f0a00bc;
-        public static final int games_menu_dicts=0x7f0a00ab;
-        public static final int games_menu_email=0x7f0a00ac;
-        public static final int games_menu_loaddb=0x7f0a00be;
-        public static final int games_menu_newgame_net=0x7f0a00a7;
-        public static final int games_menu_newgame_solo=0x7f0a00a6;
-        public static final int games_menu_newgroup=0x7f0a00a8;
-        public static final int games_menu_prefs=0x7f0a00a9;
-        public static final int games_menu_rateme=0x7f0a00aa;
-        public static final int games_menu_resend=0x7f0a00ae;
-        public static final int games_menu_storedb=0x7f0a00bd;
+        public static final int games_game_config=0x7f0a00b2;
+        public static final int games_game_copy=0x7f0a00b7;
+        public static final int games_game_delete=0x7f0a00b1;
+        public static final int games_game_move=0x7f0a00b3;
+        public static final int games_game_new_from=0x7f0a00b5;
+        public static final int games_game_rename=0x7f0a00b6;
+        public static final int games_game_reset=0x7f0a00b4;
+        public static final int games_group_default=0x7f0a00bb;
+        public static final int games_group_delete=0x7f0a00ba;
+        public static final int games_group_movedown=0x7f0a00b9;
+        public static final int games_group_moveup=0x7f0a00b8;
+        public static final int games_group_rename=0x7f0a00bc;
+        public static final int games_menu_about=0x7f0a00ae;
+        public static final int games_menu_checkmoves=0x7f0a00b0;
+        public static final int games_menu_checkupdates=0x7f0a00bd;
+        public static final int games_menu_dicts=0x7f0a00ac;
+        public static final int games_menu_email=0x7f0a00ad;
+        public static final int games_menu_loaddb=0x7f0a00bf;
+        public static final int games_menu_newgame_net=0x7f0a00a8;
+        public static final int games_menu_newgame_solo=0x7f0a00a7;
+        public static final int games_menu_newgroup=0x7f0a00a9;
+        public static final int games_menu_prefs=0x7f0a00aa;
+        public static final int games_menu_rateme=0x7f0a00ab;
+        public static final int games_menu_resend=0x7f0a00af;
+        public static final int games_menu_storedb=0x7f0a00be;
         public static final int games_menu_study=0x7f0a0090;
         public static final int group_done=0x7f0a0084;
         public static final int group_exchange=0x7f0a0095;
@@ -200,10 +202,10 @@ public final class R {
         public static final int label=0x7f0a0025;
         public static final int lang_separator=0x7f0a002b;
         public static final int lang_spinner=0x7f0a002c;
-        public static final int loc_item_check=0x7f0a00c0;
-        public static final int loc_item_clear=0x7f0a00bf;
-        public static final int loc_item_copy_bless=0x7f0a00c2;
-        public static final int loc_item_copy_eng=0x7f0a00c1;
+        public static final int loc_item_check=0x7f0a00c1;
+        public static final int loc_item_clear=0x7f0a00c0;
+        public static final int loc_item_copy_bless=0x7f0a00c3;
+        public static final int loc_item_copy_eng=0x7f0a00c2;
         public static final int loc_search_button=0x7f0a005e;
         public static final int loc_search_field=0x7f0a005d;
         public static final int local_label=0x7f0a0059;
@@ -244,18 +246,18 @@ public final class R {
         public static final int room_edit=0x7f0a0036;
         public static final int room_spinner=0x7f0a0039;
         public static final int screen=0x7f0a002a;
+        public static final int scroll=0x7f0a000f;
         public static final int search_button=0x7f0a0021;
         public static final int seek_blue=0x7f0a0018;
         public static final int seek_green=0x7f0a0016;
         public static final int seek_red=0x7f0a0014;
-        public static final int send_button=0x7f0a0011;
         public static final int show_remote=0x7f0a001e;
         public static final int shuffle_button=0x7f0a007d;
-        public static final int slmenu_clear_sel=0x7f0a00c7;
-        public static final int slmenu_copy_sel=0x7f0a00c6;
-        public static final int slmenu_deselect_all=0x7f0a00c5;
-        public static final int slmenu_lookup_sel=0x7f0a00c3;
-        public static final int slmenu_select_all=0x7f0a00c4;
+        public static final int slmenu_clear_sel=0x7f0a00c8;
+        public static final int slmenu_copy_sel=0x7f0a00c7;
+        public static final int slmenu_deselect_all=0x7f0a00c6;
+        public static final int slmenu_lookup_sel=0x7f0a00c4;
+        public static final int slmenu_select_all=0x7f0a00c5;
         public static final int smart_robot=0x7f0a0040;
         public static final int state=0x7f0a004d;
         public static final int summary=0x7f0a0060;
@@ -859,6 +861,7 @@ public final class R {
          */
         public static final int clr_crosshairs=0x7f05013d;
         public static final int config_no_connvia=0x7f0502c7;
+        public static final int confirm_clear_chat=0x7f05030d;
         /**  Additional text appended to text confirm_delete_dictf in the
          wordlist delete confiration dialog in the case where the
          wordlist to be deleted is the last in its language.  The name
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 590a624f0..c84bfb1b7 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -1256,7 +1256,7 @@
       -->
     <!-- title of the chat screen.  The name of the current game is
          substituted for %1$s. -->
-    <string name="chat_title_fmt">%1$s message history</string>
+    <string name="chat_title_fmt">%1$s messages</string>
     <!-- Prefix for local messages -->
     <string name="chat_local_id">Me:\u0020</string>
     <!-- Prefix for remote messages -->
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 1474ab684..e4e8b5c59 100644
--- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
+++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
@@ -1086,7 +1086,7 @@
       -->
   <!-- title of the chat screen.  The name of the current game is
          substituted for %1$s. -->
-  <string name="chat_title_fmt">%1$s egassem yrotsih</string>
+  <string name="chat_title_fmt">%1$s segassem</string>
   <!-- Prefix for local messages -->
   <string name="chat_local_id">Em:\u0020</string>
   <!-- Prefix for remote messages -->
@@ -2186,4 +2186,7 @@
     <item quantity="one">Eno egassem tnes</item>
     <item quantity="other">%1$s segassem tnes</item>
   </plurals>
+  <string name="confirm_clear_chat">Era uoy erus uoy tnaw ot eteled
+  lla tahc yrotsih rof siht ?emag\n\nsIht( noitca tonnac eb
+  enodnu.)</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 52bb792fa..6553d1616 100644
--- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
+++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
@@ -1086,7 +1086,7 @@
       -->
   <!-- title of the chat screen.  The name of the current game is
          substituted for %1$s. -->
-  <string name="chat_title_fmt">%1$s MESSAGE HISTORY</string>
+  <string name="chat_title_fmt">%1$s MESSAGES</string>
   <!-- Prefix for local messages -->
   <string name="chat_local_id">ME:\u0020</string>
   <!-- Prefix for remote messages -->
@@ -2186,4 +2186,7 @@
     <item quantity="one">ONE MESSAGE SENT</item>
     <item quantity="other">%1$s MESSAGES SENT</item>
   </plurals>
+  <string name="confirm_clear_chat">ARE YOU SURE YOU WANT TO DELETE
+  ALL CHAT HISTORY FOR THIS GAME?\n\n(THIS ACTION CANNOT BE
+  UNDONE.)</string>
 </resources>