From c0d573c005f86a4f3e63f93e1476e4e875d805d0 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 13 Aug 2020 06:12:58 +0200
Subject: [PATCH 01/25] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Crosswords/Android
Translate-URL: https://hosted.weblate.org/projects/xwords/android/
---
 xwords4/android/res_src/values-ar/strings.xml     | 1 -
 xwords4/android/res_src/values-ca/strings.xml     | 4 ----
 xwords4/android/res_src/values-de/strings.xml     | 4 ----
 xwords4/android/res_src/values-fr/strings.xml     | 5 -----
 xwords4/android/res_src/values-ja/strings.xml     | 4 ----
 xwords4/android/res_src/values-nb-rNO/strings.xml | 4 ----
 xwords4/android/res_src/values-nl/strings.xml     | 3 ---
 xwords4/android/res_src/values-pl/strings.xml     | 4 ----
 xwords4/android/res_src/values-pt/strings.xml     | 4 ----
 xwords4/android/res_src/values-sk/strings.xml     | 4 ----
 10 files changed, 37 deletions(-)

diff --git a/xwords4/android/res_src/values-ar/strings.xml b/xwords4/android/res_src/values-ar/strings.xml
index 58413c4a9..b26276292 100644
--- a/xwords4/android/res_src/values-ar/strings.xml
+++ b/xwords4/android/res_src/values-ar/strings.xml
@@ -57,7 +57,6 @@
     <string name="button_notagain">لا تعرض مجدداً</string>
     <string name="xlator">[فارغ]</string>
     <string name="button_newgroup">مجموعة جديدة</string>
-    <string name="word_search_hint">الأحرف الأولى</string>
     <string name="slmenu_select_all">تحديد الكل</string>
     <string name="loc_menu_xlate">ترجمة</string>
     <string name="loc_filters_prompt">فرز حسب:</string>
diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml
index c905bb359..328227d47 100644
--- a/xwords4/android/res_src/values-ca/strings.xml
+++ b/xwords4/android/res_src/values-ca/strings.xml
@@ -371,12 +371,8 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
     <string name="not_again_lookup">Aquest botó us permet cercar, en línia, les paraules acabades de jugar.</string>
     <string name="button_move">Jugada</string>
     <string name="button_newgroup">Grup nou</string>
-    <string name="button_search">Cerca</string>
-    <string name="word_search_hint">Primeres lletres</string>
     <string name="pick_faceup">Tria les fitxes cara amunt</string>
     <string name="dict_browse_title_fmt">%1$s (%2$d paraules)</string>
-    <string name="dict_browse_title1_fmt">%1$s (%2$d paraules usant %3$d fitxes)</string>
-    <string name="dict_browse_nowords_fmt">No hi ha cap paraula a %1$s que comenci amb %2$s.</string>
     <string name="not_again_browse">Aquest botó obre l\'explorador de diccionaris en el diccionari actual del jugador.</string>
     <string name="not_again_browseall">Aquest botó obre l\'explorador de diccionaris en el diccionari de la vostra elecció.</string>
     <string name="alert_empty_dict_fmt">El diccionari %1$s conté només la informació de fitxes. No hi ha paraules a explorar.</string>
diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml
index a29bd3618..95d329133 100644
--- a/xwords4/android/res_src/values-de/strings.xml
+++ b/xwords4/android/res_src/values-de/strings.xml
@@ -369,14 +369,10 @@
 \n
 \n(Die Gruppe „Archiv“ kann sicher gelöscht werden, sie wird bei Bedarf neu erzeugt.)</string>
     <string name="button_newgroup">Neue Gruppe</string>
-    <string name="button_search">Suchen</string>
-    <string name="word_search_hint">Anfangsbuchstaben</string>
     <string name="tilepick_all_fmt">%1$d für mich auswählen</string>
     <string name="pick_faceup">Spielsteine aufgedeckt auswählen</string>
     <string name="disableds_title">Deaktivierte Adresstypen</string>
     <string name="dict_browse_title_fmt">%1$s (%2$d Wörter)</string>
-    <string name="dict_browse_title1_fmt">%1$s (%2$d Wörter mit %3$d Spielsteinen)</string>
-    <string name="dict_browse_nowords_fmt">Kein Wort in %1$s beginnt mit %2$s.</string>
     <string name="not_again_browse">Dieser Button öffnet den Wortlisten-Browser mit der Wortliste des gegenwärtigen Spielers.</string>
     <string name="not_again_browseall">Dieser Button öffnet den Wortlisten-Browser mit einer Wortliste Ihrer Wahl.</string>
     <string name="alert_empty_dict_fmt">Die Wortliste %1$s enthält nur Spielstein-Informationen, keine Wörter zum Browsen.</string>
diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml
index 24b3a2b1f..d6bfec00a 100644
--- a/xwords4/android/res_src/values-fr/strings.xml
+++ b/xwords4/android/res_src/values-fr/strings.xml
@@ -1858,10 +1858,8 @@ ligne, les mots qui viennent d\'être joués.</string>
     <string name="button_newgroup">Nouveau groupe</string>
     <!--  -->
     <!--<string name="button_search">Find</string>-->
-    <string name="button_search">Trouver</string>
     <!--  -->
     <!--<string name="word_search_hint">First letters</string>-->
-    <string name="word_search_hint">Premières lettres</string>
     <!--  -->
     <!--<string name="tilepick_undo">Undo last\u200C</string>-->
     <!--  -->
@@ -1881,12 +1879,9 @@ ligne, les mots qui viennent d\'être joués.</string>
     <!--<string name="dict_browse_title1_fmt">%1$s (%2$d words using %3$d
       tiles)</string>-->
     <!--<string name="dict_browse_title1_fmt">%1$s (%2$d mots utilisant %3$d jetons)</string>-->
-    <string name="dict_browse_title1_fmt">%1$s (%2$d mots utilisant %3$d jetons)</string>
     <!--  -->
     <!--<string name="dict_browse_nowords_fmt">No word in %1$s starts with
       %2$s.</string>-->
-    <string name="dict_browse_nowords_fmt">Aucun mot de %1$s ne commence par
-%2$s.</string>
     <!--  -->
     <!--<string name="not_again_browse">This button opens the wordlist
       browser on the current player\'s wordlist.</string>-->
diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml
index 10f8a88f7..4db568392 100644
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@@ -348,12 +348,8 @@
     <string name="not_again_lookup">このボタンは、今プレイした単語をオンラインで検索できます。</string>
     <string name="button_move">移動</string>
     <string name="button_newgroup">新しいグループ</string>
-    <string name="button_search">検索</string>
-    <string name="word_search_hint">最初の文字</string>
     <string name="pick_faceup">タイル面を選択</string>
     <string name="dict_browse_title_fmt">%1$s (%2$d 単語)</string>
-    <string name="dict_browse_title1_fmt">%1$s (%2$d 単語 %3$d タイル使用)</string>
-    <string name="dict_browse_nowords_fmt">%1$s に %2$s で開始する単語はありません。</string>
     <string name="not_again_browse">このボタンは、現在のプレイヤーの単語リストで、単語リスト ブラウザーを開きます。</string>
     <string name="not_again_browseall">このボタンは、お好みの単語リストで、単語リスト ブラウザーを開きます。</string>
     <string name="alert_empty_dict_fmt">単語リスト %1$s は、タイルの情報のみが含まれています。参照する単語はありません。</string>
diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml
index 8e1debe3e..b201accee 100644
--- a/xwords4/android/res_src/values-nb-rNO/strings.xml
+++ b/xwords4/android/res_src/values-nb-rNO/strings.xml
@@ -218,13 +218,9 @@
     <string name="not_again_lookup">Denne knappen lar deg slå opp ord som akkurat ble spilt på nett.</string>
     <string name="button_move">Flytt</string>
     <string name="button_newgroup">Ny gruppe</string>
-    <string name="button_search">Finn</string>
-    <string name="word_search_hint">Første bokstaver</string>
     <string name="tilepick_all_fmt">Plukk %1$d for meg</string>
     <string name="disableds_title">Avskrudde adressetyper</string>
     <string name="dict_browse_title_fmt">%1$s (%2$d ord)</string>
-    <string name="dict_browse_title1_fmt">%1$s (%2$d ord ved bruk av %3$d flis</string>
-    <string name="dict_browse_nowords_fmt">Ingen ord i %1$s starter med %2$s.</string>
     <string name="not_again_browse">Denne knappen åpner ordlisteutforskeren i gjeldende spillers ordliste.</string>
     <string name="not_again_browseall">Denne knappen åpner ordlisteutforskeren i ordlisten du ønsker.</string>
     <string name="alert_empty_dict_fmt">Ordlisten %1$s inneholder kun flisinformasjon. Det er ingen ord å utforske.</string>
diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml
index e42f5dd9b..682d75283 100644
--- a/xwords4/android/res_src/values-nl/strings.xml
+++ b/xwords4/android/res_src/values-nl/strings.xml
@@ -350,11 +350,8 @@
     <string name="not_again_lookup">Met deze knop kun je de net gespeelde woorden online opzoeken.</string>
     <string name="button_move">Zet</string>
     <string name="button_newgroup">Nieuwe groep</string>
-    <string name="button_search">Vind</string>
-    <string name="word_search_hint">Eerste letters</string>
     <string name="pick_faceup">Pak letters met de letter naar boven</string>
     <string name="dict_browse_title_fmt">%1$s (%2$d woorden)</string>
-    <string name="dict_browse_nowords_fmt">Geen woord in %1$s begint met %2$s.</string>
     <string name="not_again_browse">Deze knop opent de woordenlijst browser voor de woordenlijst van de speler die aan de beurt is.</string>
     <string name="not_again_browseall">Deze knop opent de woordenlijst browser voor de woordenlijst van jouw keuze.</string>
     <string name="alert_empty_dict_fmt">De woordenlijst %1$s heeft enkel letterinformatie. Er zitten geen woorden in.</string>
diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml
index 05fbcf7fa..7f86a4a67 100644
--- a/xwords4/android/res_src/values-pl/strings.xml
+++ b/xwords4/android/res_src/values-pl/strings.xml
@@ -145,8 +145,6 @@
     <string name="default_name_message">Wpisz tutaj swoje imię. Będzie ono używane podczas tworzenia nowych gier. (Możesz zmienić go później w sekcji „Nowa gra domyślna” w Ustawieniach.)</string>
     <string name="not_again_lookup">Ten przycisk pozwala przeglądać w Internecie słowa, które właśnie zostały odtworzone.</string>
     <string name="button_newgroup">Nowa grupa</string>
-    <string name="button_search">Znajdź</string>
-    <string name="word_search_hint">Pierwsze litery</string>
     <string name="disableds_title">Wyłączone typy adresów</string>
     <string name="min_len">Minimalna długość</string>
     <string name="max_len">Maksymalna długość</string>
@@ -460,8 +458,6 @@
     <string name="button_move">Rusz się.</string>
     <string name="tilepick_all_fmt">Wybierz %1$d dla mnie</string>
     <string name="dict_browse_title_fmt">"%1$s (%2$d słów)"</string>
-    <string name="dict_browse_title1_fmt">%1$s (%2$d wyrazy przy użyciu %3$d kafelków)</string>
-    <string name="dict_browse_nowords_fmt">Żadne słowo w %1$s nie zaczyna się od %2$s.</string>
     <string name="not_again_browse">Ten przycisk otwiera przeglądarkę listy słów na liście słów bieżącego gracza.</string>
     <string name="not_again_browseall">Ten przycisk otwiera przeglądarkę listy słów na wybranej przez Ciebie liście słów.</string>
     <string name="alert_empty_dict_fmt">Lista słów %1$s zawiera tylko informacje o kafelkach. Nie ma słów do przeglądania.</string>
diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index 61ff0979d..3deaebbcb 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -1446,9 +1446,7 @@
     <!--  -->
     <string name="button_move">Jogar</string>
     <!--  -->
-    <string name="button_search">Procurar</string>
     <!--  -->
-    <string name="word_search_hint">Primeiras letras</string>
     <!--  -->
     <!--  -->
     <!--  -->
@@ -1457,8 +1455,6 @@
     <!--  -->
     <!--  -->
     <!--  -->
-    <string name="dict_browse_nowords_fmt">Nenhuma palavra em %1$s começa com
-      %2$s.</string>
     <!--  -->
     <string name="not_again_browse">Esse botão abre o navegador de
     listas de palavras na lista do jogador atual.</string>
diff --git a/xwords4/android/res_src/values-sk/strings.xml b/xwords4/android/res_src/values-sk/strings.xml
index fced902c6..236ecaad3 100644
--- a/xwords4/android/res_src/values-sk/strings.xml
+++ b/xwords4/android/res_src/values-sk/strings.xml
@@ -1170,17 +1170,13 @@
     <string name="not_again_browse">XLATE ME: This button opens the wordlist
       browser on the current player\'s wordlist.</string>
     <!--  -->
-    <string name="dict_browse_nowords_fmt">XLATE ME: No word in %1$s starts with
-      %2$s.</string>
     <!--  -->
     <string name="pick_faceup">XLATE ME: Pick tiles face-up</string>
     <!--  -->
     <!--  -->
     <!--  -->
     <!--  -->
-    <string name="word_search_hint">XLATE ME: First letters</string>
     <!--  -->
-    <string name="button_search">XLATE ME: Find</string>
     <!--  -->
     <string name="button_move">XLATE ME: Move</string>
     <!--  -->

From f573c132b7e301646f8a2703606bfcbf15c77b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Thu, 13 Aug 2020 10:01:07 +0000
Subject: [PATCH 02/25] Translated using Weblate (Turkish)

Currently translated at 2.0% (18 of 861 strings)
---
 xwords4/android/res_src/values-tr/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/res_src/values-tr/strings.xml b/xwords4/android/res_src/values-tr/strings.xml
index 52daed98e..34fe5e176 100644
--- a/xwords4/android/res_src/values-tr/strings.xml
+++ b/xwords4/android/res_src/values-tr/strings.xml
@@ -4,8 +4,8 @@
     <string name="str_game_name_fmt">%1$s (%2$s)</string>
     <string name="robot_name_fmt">%1$s (robot)</string>
     <string name="missing_player">(burada değil henüz...)</string>
-    <string name="summary_relay_conf_fmt">\"%1$s\" odası için yapılandırıldı</string>
-    <string name="summary_relay_wait_fmt">\"%1$s\" odasındaki oyuncuları bekliyor</string>
+    <string name="summary_relay_conf_fmt">“%1$s” odası için yapılandırıldı</string>
+    <string name="summary_relay_wait_fmt">“%1$s” odasındaki oyuncuları bekliyor</string>
     <string name="msgs_progress">Hareketler için röle gözden geçiriliyor…</string>
     <string name="gamel_menu_checkmoves">Hareketleri gözetle</string>
     <string name="menu_prefs">Uygulama ayarları…</string>
@@ -17,8 +17,8 @@
         <item quantity="other">%1$d hareket edildi</item>
     </plurals>
     <string name="gameOver">Oyun bitti</string>
-    <string name="summary_invites_out_fmt">Oyuncular oda \'\'%1$s\'\'e davet edildi</string>
+    <string name="summary_invites_out_fmt">Oyuncular “%1$s” odasına davet edildi</string>
     <string name="summary_invites_out">Oyuncular davet edildi</string>
-    <string name="summary_relay_gameover_fmt">Oda \'\'%1$s\'\'de oyun bitti</string>
-    <string name="summary_relay_conn_fmt">\'\'%1$s\'\' odasında oyun devam ediyor</string>
+    <string name="summary_relay_gameover_fmt">“%1$s” odasında oyun bitti</string>
+    <string name="summary_relay_conn_fmt">“%1$s” odasında oyun devam ediyor</string>
 </resources>
\ No newline at end of file

From 5a8f586e815ae30027b3c6dc5762047791bbf66e Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 25 Aug 2020 23:55:41 +0200
Subject: [PATCH 03/25] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Crosswords/Android
Translate-URL: https://hosted.weblate.org/projects/xwords/android/
---
 xwords4/android/res_src/values-ar/strings.xml | 1 -
 xwords4/android/res_src/values-cs/strings.xml | 1 -
 xwords4/android/res_src/values-es/strings.xml | 1 -
 xwords4/android/res_src/values-ja/strings.xml | 6 ++----
 xwords4/android/res_src/values-sk/strings.xml | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/res_src/values-ar/strings.xml b/xwords4/android/res_src/values-ar/strings.xml
index b26276292..0440a5152 100644
--- a/xwords4/android/res_src/values-ar/strings.xml
+++ b/xwords4/android/res_src/values-ar/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="button_new_group">إضافة مجموعة</string>
     <string name="str_game_name_fmt">%1$s (%2$s)</string>
     <string name="button_delete">حذف</string>
     <string name="menu_prefs">إعدادات التطبيق…</string>
diff --git a/xwords4/android/res_src/values-cs/strings.xml b/xwords4/android/res_src/values-cs/strings.xml
index ac40cac96..d6d3e6d43 100644
--- a/xwords4/android/res_src/values-cs/strings.xml
+++ b/xwords4/android/res_src/values-cs/strings.xml
@@ -150,7 +150,6 @@
     <string name="game_fmt">Hra %1$d</string>
     <string name="player_fmt">Hráč %1$d</string>
     <string name="initial_player_minutes">Délka hry v minutách</string>
-    <string name="button_new_group">Přidat skupinu</string>
     <string name="str_game_name_fmt">%1$s (%2$s)</string>
     <string name="missing_player">(není tu ještě…)</string>
     <string name="summary_relay_conf_fmt">Nastaveno pro místnost
diff --git a/xwords4/android/res_src/values-es/strings.xml b/xwords4/android/res_src/values-es/strings.xml
index dae0acec1..e5e8daf80 100644
--- a/xwords4/android/res_src/values-es/strings.xml
+++ b/xwords4/android/res_src/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="button_new_group">Añadir grupo</string>
     <string name="str_game_name_fmt">%1$s (%2$s)</string>
     <string name="robot_name_fmt">%1$s (robot)</string>
     <string name="missing_player">(estableciendo conexión…)</string>
diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml
index 4db568392..e6779fd33 100644
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@@ -468,7 +468,6 @@
     <string name="list_group_movedown">下に移動</string>
     <string name="group_cur_games">マイ ゲーム</string>
     <string name="group_new_games">新しいゲーム</string>
-
     <plurals name="groups_confirm_del_games_fmt">
         <item quantity="other">"
 \n
@@ -489,10 +488,10 @@
     <string name="not_again_newselect">ゲームをタップすると開きます。\n\n代わりに、左にあるアイコンをタップしてゲームを選択または選択解除し、選択したゲームを操作することができます。例えば、削除する場合は、メニューまたは \"アクションバー\" を使用します</string>
     <string name="not_again_backclears">戻るボタンは、終了ではなくすべての選択がクリアされます。アプリを終了するには、もう一度押してください。</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">ゲーム: %1$d</item>
+        <item quantity="other">ゲーム: %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">グループ: %1$d</item>
+        <item quantity="other">グループ: %1$d</item>
     </plurals>
     <string name="summary_thumbsize">サムネイルのサイズ</string>
     <string name="thumb_off">無効</string>
@@ -984,7 +983,6 @@ WiFi ダイレクト経由で接続可能なデバイスはありません。</s
     <string name="mqtt_invite_title">MQTT 招待状</string>
     <string name="invite_choice_mqtt">Internet/MQTT</string>
     <string name="no_tiles_exist">\"%1$s\" は %2$s のタイルで正しくスペルできません。</string>
-    <string name="pick_tiles_title">「スペル」のタイルを選択してください</string>
     <string name="expl_mqtt_url">新しい MQTT ベースのリレー API の URL</string>
     <string name="mqtt_qos">MQTT QOS</string>
     <string name="mqtt_port">MQTT ポート</string>
diff --git a/xwords4/android/res_src/values-sk/strings.xml b/xwords4/android/res_src/values-sk/strings.xml
index 236ecaad3..abb2c130b 100644
--- a/xwords4/android/res_src/values-sk/strings.xml
+++ b/xwords4/android/res_src/values-sk/strings.xml
@@ -9,7 +9,6 @@
          ordering is wrong for your language.-->
     <string name="str_game_name_fmt">XLATE ME: %1$s (%2$s)</string>
     <!-- Games list screen menuitem text for creating a new group -->
-    <string name="button_new_group">XLATE ME: Add group</string>
     <string name="list_item_config">Konfigurovať</string>
     <!-- pulls up dialog to change the group of the selected game -->
     <string name="list_item_move">XLATE ME: Move to group…</string>

From 4edf9f6a4fb08c8f9d550647792a871018990f7c Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 8 Sep 2020 07:22:15 +0200
Subject: [PATCH 04/25] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Crosswords/Android
Translate-URL: https://hosted.weblate.org/projects/xwords/android/
---
 xwords4/android/res_src/values-ca/strings.xml     |  9 ++-------
 xwords4/android/res_src/values-de/strings.xml     |  9 ++-------
 xwords4/android/res_src/values-fr/strings.xml     | 13 ++-----------
 xwords4/android/res_src/values-ja/strings.xml     |  5 -----
 xwords4/android/res_src/values-nb-rNO/strings.xml |  9 ++-------
 xwords4/android/res_src/values-nl/strings.xml     |  9 ++-------
 xwords4/android/res_src/values-pl/strings.xml     | 11 +++--------
 xwords4/android/res_src/values-pt/strings.xml     |  3 ---
 xwords4/android/res_src/values-sk/strings.xml     |  3 ---
 9 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml
index 059463518..410aeb717 100644
--- a/xwords4/android/res_src/values-ca/strings.xml
+++ b/xwords4/android/res_src/values-ca/strings.xml
@@ -458,10 +458,10 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
     <string name="change_group">Mou les partides seleccionades a:</string>
     <string name="relay_alert_title">Missatge del dia</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">Partides: %1$d</item>
+        <item quantity="other">Partides: %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">Grups: %1$d</item>>
+        <item quantity="other">Grups: %1$d</item>&gt;
     </plurals>
     <string name="summary_thumbsize">Mida de la miniatura</string>
     <string name="thumb_off">Desactivat</string>
@@ -556,8 +556,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
     <string name="relay_port">Port del repetidor de partides</string>
     <string name="gamel_menu_storedb">Escriu les partides a la targeta SD</string>
     <string name="gamel_menu_loaddb">Carrega les partides de la targeta SD</string>
-    <string name="enable_dupes_title">Accepta invitacions duplicades</string>
-    <string name="enable_dupes_summary">Accepta invitacions més d\'una vegada</string>
     <string name="radio_name_gsm">GSM</string>
     <string name="radio_name_cdma">CDMA</string>
     <string name="game_summary_field_rowid">rowid</string>
@@ -657,7 +655,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
     <string name="square_tiles">Fitxes els faristol quadrades</string>
     <string name="update_dicts_fmt">Les actualitzacions són disponibles per a algun dels diccionaris. Voleu baixar la versió nova de %1$s ara?</string>
     <string name="netstats_title">Estadístiques de la partida en xarxa</string>
-    <string name="git_rev_title">ID de la versió de codi font</string>
     <string name="proxy_port">Port de l\'aparell repetidor</string>
     <string name="enable_sms_toself_title">SMS curtcircuit a un mateix</string>
     <string name="force_radio_title">Simula tenir ràdio</string>
@@ -672,7 +669,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
     <string name="not_again_comms_sms">Jugar via SMS usa la mateixa tecnologia que els missatges SMS. Els missatges seran invisibles, l\'operadora els considera missatges de text, per tant potser preferiu inhabilitar aquesta característica llevat que tingueu missatges SMS il·limitats (o un bon pressupost). Noteu que l\'Android només permet aquesta característica en els dispositius amb operadora GSM, això és qualsevol operadora mundial, excepte Verizon i Sprint.</string>
     <string name="not_again_comms_bt">Useu Bluetooth per a jugar contra un aparell proper que estigui aparellat amb el vostre.</string>
     <string name="force_tablet_title">Voleu usar la disposició de tauleta (costat per costat)?</string>
-    <string name="dup_game_query_fmt">Ja teniu una partida que sembla s\'ha creat (el %1$s) amb la mateixa invitació. Esteu segur de voler crear-ne una altra?</string>
     <string name="not_again_sync">Aquesta acció comprova que no hi hagin jugades o missatges pendents al repetidor de totes partides i marca aquelles amb jugades pendents. Si obriu una partida marcada connectarà i sincronitzarà. (en una versió posterior aquestes jugades es baixaran en segon pla.)</string>
     <string name="not_again_conndfirst">Teniu una partida connectada i iniciada en una sala nova. Una vegada els aparells que falten s\'hagin unit a la vostra sala, i el CrossWords hagi assignat les fitxes, la partida pot començar.</string>
     <string name="not_again_conndmid">Heu connectat i unit a una partida al repetidor. Rebreu notificacions quan els aparells que manquen s\'hi hagin unit a la sala i pugui començar la partida.</string>
@@ -850,7 +846,6 @@ de %2$d destinataris. Useu el botó de tornar a
     <string name="warn_relay_havegames">Esteu segur de voler desactivar el joc via repetidor?</string>
     <string name="force_tablet_tablet">Força la disposició de tauleta</string>
     <string name="force_tablet_phone">Força la disposició de telèfon</string>
-    <string name="devid_title">ID de l\'aparell (en el repetidor)</string>
     <string name="gamel_menu_writegit">Copia la informació git al porta-retalls</string>
     <string name="expl_relay_url">URL per a l\'API web del repetidor</string>
     <string name="not_again_comms_p2p">Usa WiFi Direct per a jugar contra aparells propers amb WiFi Direct i el CrossWords instal·lat.</string>
diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml
index ed4037279..8bc396ec6 100644
--- a/xwords4/android/res_src/values-de/strings.xml
+++ b/xwords4/android/res_src/values-de/strings.xml
@@ -316,7 +316,6 @@
     <string name="button_save">Speichern</string>
     <string name="button_discard">Verwerfen</string>
     <string name="button_retry">Erneut versuchen</string>
-    <string name="dup_game_query_fmt">Sie haben bereits eine Partie, die anscheinend von der selben Einladung erzeugt wurde (auf %1$s). Sind Sie sicher, dass Sie eine weitere erzeugen wollen?</string>
     <string name="info_title">Zur Information …</string>
     <string name="tile_button_txt_fmt">%1$s (%2$d)</string>
     <string name="tile_pick_summary_fmt">Aktuelle Auswahl: %1$s</string>
@@ -541,10 +540,10 @@
 \nSie können stattdessen die Icons links antippen, um Partien aus- oder abzuwählen, und dann mit den ausgewählten Partien etwas tun, z. B. sie löschen, indem Sie das Menü oder die „Aktionsleiste“ benutzen.</string>
     <string name="not_again_backclears">Der Zurück-Button löscht die Auswahl anstatt die App zu beenden. Drücken Sie ihn erneut, um die App zu beenden.</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">Partien: %1$d</item>
+        <item quantity="other">Partien: %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">Gruppen: %1$d</item>
+        <item quantity="other">Gruppen: %1$d</item>
     </plurals>
     <string name="summary_thumbsize">Vorschaubildgröße</string>
     <string name="thumb_off">Deaktiviert</string>
@@ -717,7 +716,6 @@
     <string name="board_menu_game_netstats">Netzwerk-Statistiken</string>
     <string name="gamel_menu_loaddb">Partien von SD-Karte laden</string>
     <string name="gamel_menu_writegit">Git-Informationen in die Zwischenablage kopieren</string>
-    <string name="enable_dupes_summary">Einladungen mehrfach annehmen</string>
     <string name="nag_intervals">Erinnerungsintervall (Minuten1, Minuten2, …)</string>
     <string name="radio_name_gsm">GSM</string>
     <string name="radio_name_cdma">CDMA</string>
@@ -837,13 +835,10 @@
     <string name="debug_features_summary">Menüeinträge usw. (nur Release-Builds)</string>
     <string name="board_menu_game_showInvites">Einladungen zeigen</string>
     <string name="netstats_title">Partie-Netzwerkstatistik</string>
-    <string name="git_rev_title">Version des Quellcodes</string>
-    <string name="devid_title">Geräte-ID (auf Zwischenstation)</string>
     <string name="relay_port">Spiel-Port auf Zwischenstation</string>
     <string name="proxy_port">Geräte-Port auf Zwischenstation</string>
     <string name="name_dict_fmt">%1$s/%2$s</string>
     <string name="gamel_menu_storedb">Partien auf SD-Kartie speichern</string>
-    <string name="enable_dupes_title">Doppelte Einladungen annehmen</string>
     <string name="xlations_locale">Pseudo-Locale zum Übersetzen</string>
     <string name="enable_sms_toself_title">SMS-Selbstverbindung aktivieren</string>
     <string name="enable_sms_toself_summary">Mobilfunk weglassen bei gleichen Nummern</string>
diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml
index db155a0a1..70946aeb3 100644
--- a/xwords4/android/res_src/values-fr/strings.xml
+++ b/xwords4/android/res_src/values-fr/strings.xml
@@ -1522,9 +1522,6 @@ mots)</string>
     <!--<string name="dup_game_query_fmt">You already have a game that seems
     to have been created (on %1$s) from the same invitation.  Are you
     sure you want to create another?</string>-->
-    <string name="dup_game_query_fmt">Vous avez déjà une partie qui semble
-avoir été créée (sur %1$s) avec la même invitation. Êtes-vous sûr de vouloir en
-créer une autre ?</string>
     <!-- Title of generic dialog used to display information -->
     <!--<string name="info_title">FYI…</string>-->
     <string name="info_title">Pour information…</string>
@@ -1783,7 +1780,6 @@ modèle.</string>
        # Dialog giving copyright and other basic info about # the app
        ########################################################### 
       -->
-
     <!-- copyright info -->
     <!--<string name="about_copyright">Copyright (C) 1998-2015 by Eric
         House. This free/open source software is released under the GNU Public
@@ -2245,7 +2241,6 @@ mots ?</string>
     <string name="group_cur_games">Mes parties</string>
     <!--<string name="group_new_games">New games</string>-->
     <string name="group_new_games">Nouvelles parties</string>
-
     <!--<string name="groups_confirm_del_games_fmt">\n\n(%1$d game[s] will
     also be deleted.)</string>-->
     <!--<string name="groups_confirm_del_games_fmt">\n\n(%1$d parties seront aussi
@@ -2300,10 +2295,10 @@ effacées.)</string>-->
     <string name="not_again_backclears">Le bouton retour efface les sélections
 au lieu de quitter. Pressez le de nouveau pour quitter l\'application.</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">Parties : %1$d</item>
+        <item quantity="other">Parties : %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">Groupes : %1$d</item>
+        <item quantity="other">Groupes : %1$d</item>
     </plurals>
     <!--<string name="summary_thumbsize">Thumbnail size</string>-->
     <string name="summary_thumbsize">Taille des vignettes</string>
@@ -2788,7 +2783,6 @@ changement, ou l\'éditer pour lui attribuer une façon de se connecter ?</stri
     <string name="netstats_title">Statistiques réseau de la partie</string>
     <!--XLATE-ME-->
     <!--<string name="git_rev_title">Source version id</string>-->
-    <string name="git_rev_title">Identifiant de version du source</string>
     <!--XLATE-ME-->
     <!--<string name="relay_port">Relay game port</string>-->
     <string name="relay_port">Port de partie du relai</string>
@@ -2806,13 +2800,11 @@ changement, ou l\'éditer pour lui attribuer une façon de se connecter ?</stri
     <string name="gamel_menu_loaddb">Charger BDD depuis carte SD</string>
     <!--XLATE-ME-->
     <!--<string name="enable_dupes_title">Accept duplicate invites</string>-->
-    <string name="enable_dupes_title">Accepter les invitations redondantes</string>
     <!--XLATE-ME-->
     <!--<string name="xlations_locale">Fake locale for translation</string>-->
     <string name="xlations_locale">Fausse locale pour les traductions</string>
     <!--XLATE-ME-->
     <!--<string name="enable_dupes_summary">Accept invitations more than once</string>-->
-    <string name="enable_dupes_summary">Accepter les invitations plusieurs fois</string>
     <!--XLATE-ME-->
     <!--<string name="nag_intervals">Reminder intervals (minutes1,minutes2,...)</string>-->
     <string name="nag_intervals">Intervalles des rappels (minutes1,minutes2,…)</string>
@@ -2945,7 +2937,6 @@ pour la langue</string>
         <item quantity="other">Êtes-vous sûr de vouloir supprimer les %1$d numéros de téléphone cochés ?</item>
     </plurals>
     <string name="disable_nag_solo_title">Désactiver les rappels de parties en solo</string>
-    <string name="devid_title">Identifiant d\'appareil (sur le relai)</string>
     <string name="fetching_from_relay">Récupération des parties du relai</string>
     <string name="processing_games">Traitement des parties</string>
     <string name="list_item_select">Sélectionner</string>
diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml
index 16f01deff..61392c2e2 100644
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@@ -292,7 +292,6 @@
     <string name="button_save">保存</string>
     <string name="button_discard">破棄</string>
     <string name="button_retry">再試行</string>
-    <string name="dup_game_query_fmt">既に同じ招待状から (%1$s) 作成されていると思われるゲームがあります。別に作成してもよろしいですか?</string>
     <string name="info_title">参考までに…</string>
     <string name="tiles_left_title">残りのタイル</string>
     <string name="counts_values_title">タイルの数と値</string>
@@ -653,15 +652,12 @@
     <string name="debug_features_summary">メニュー項目等 (リリース ビルドのみ)</string>
     <string name="board_menu_game_netstats">ネットワーク統計情報</string>
     <string name="netstats_title">ゲーム ネットワーク統計情報</string>
-    <string name="git_rev_title">ソース バージョン id</string>
     <string name="relay_port">リレー ゲーム ポート</string>
     <string name="proxy_port">リレー デバイス ポート</string>
     <string name="name_dict_fmt">%1$s/%2$s</string>
     <string name="gamel_menu_storedb">SD カードにゲームを書き込む</string>
     <string name="gamel_menu_loaddb">SD カードからゲームをロード</string>
-    <string name="enable_dupes_title">重複する招待を受け入れる</string>
     <string name="xlations_locale">翻訳の擬似地域</string>
-    <string name="enable_dupes_summary">2 回以上の招待を受け入れます</string>
     <string name="nag_intervals">リマインダーの間隔 (1分、2分、…)</string>
     <string name="enable_sms_toself_title">自分に SMS を短絡させる</string>
     <string name="enable_sms_toself_summary">電話番号が同じときに無線をスキップします</string>
@@ -724,7 +720,6 @@
     <string name="rematch_name_fmt">再戦: %1$s</string>
     <string name="disable_nags_title">リマインダーの切り替え</string>
     <string name="disable_nag_solo_title">一人ゲーム リマインダーを無効にする</string>
-    <string name="devid_title">デバイス ID (リレー上の)</string>
     <string name="not_again_rematch_two_only">再戦は2人のゲームに限られていますが、少なくとも今のところは、より多くのデバイスでは難しく、2人以上でプレイすることはまれだと思います。私が間違っているようであれば、優先順位を上げますのでお知らせください。</string>
     <string name="rel_invite_title">招待タイトルのリレー</string>
     <string name="fetching_from_relay">リレーからゲームを取得中</string>
diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml
index ac861da32..773f67458 100644
--- a/xwords4/android/res_src/values-nb-rNO/strings.xml
+++ b/xwords4/android/res_src/values-nb-rNO/strings.xml
@@ -298,10 +298,10 @@
     <string name="button_reconnect">Koble til igjen</string>
     <string name="change_group">Flytt valgte spill til:</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">Spill: %1$d</item>
+        <item quantity="other">Spill: %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">Grupper: %1$d</item>
+        <item quantity="other">Grupper: %1$d</item>
     </plurals>
     <string name="summary_thumbsize">Miniatyrbildestørrelse</string>
     <string name="thumb_off">Avskrudd</string>
@@ -414,7 +414,6 @@
     <string name="name_dict_fmt">%1$s/%2$s</string>
     <string name="gamel_menu_storedb">Skriv spill til SD-kort</string>
     <string name="gamel_menu_loaddb">Last spill fra SD-kort</string>
-    <string name="enable_dupes_summary">Godta invitasjoner mer enn én gang</string>
     <string name="enable_sms_toself_title">Kortslutt SMS til deg selv</string>
     <string name="force_radio_title">Lat som du har radio</string>
     <string name="radio_name_real">Ikke lat som</string>
@@ -654,12 +653,9 @@
     <string name="dict_host">Ordlistenedlastingsnettadresse</string>
     <string name="debug_features_summary">Menyelementer osv. (kun utgivelsesbygg)</string>
     <string name="netstats_title">Spillnettverksstatistikk</string>
-    <string name="git_rev_title">Kildekodeversjons-ID</string>
-    <string name="devid_title">Enhets-ID (på relé)</string>
     <string name="relay_port">Relé-spillport</string>
     <string name="proxy_port">Relé-enhetsport</string>
     <string name="gamel_menu_writegit">Kopier Git-info til utklippstavle</string>
-    <string name="enable_dupes_title">Godta duplikatinvitasjoner</string>
     <string name="xlations_locale">Juks til lokale for oversettelse</string>
     <string name="nag_intervals">Påminnelsesintervall (minutt1,minutt2,…)</string>
     <string name="nfc_to_self">Send via NFC til egen ehet?</string>
@@ -692,7 +688,6 @@
     <string name="subst_dict_title">Erstatningsordliste (antall ord)</string>
     <string name="notify_title_fmt">Trekk i spillet %1$s</string>
     <string name="notify_title_turn_fmt">Din tur i spillet %1$s</string>
-    <string name="dup_game_query_fmt">Du har allerede et spill som ser ut til å ha blitt opprettet (den %1$s) fra samme invitasjon. Er du sikker på at du vil opprette en ny?</string>
     <string name="info_title">Til din opplysning…</string>
     <string name="tile_tray_picker">Velg nye flis for stativet</string>
     <string name="counts_values_title">Flisopptellinger og -verdier</string>
diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml
index c311dfbc2..c8e9cac59 100644
--- a/xwords4/android/res_src/values-nl/strings.xml
+++ b/xwords4/android/res_src/values-nl/strings.xml
@@ -299,7 +299,6 @@
     <string name="button_save">Opslaan</string>
     <string name="button_discard">Annuleren</string>
     <string name="button_retry">Opnieuw proberen</string>
-    <string name="dup_game_query_fmt">Je hebt al een spel dat gemaakt is (via %1$s) met dezelfde uitnodiging. Weet je zeker dat je nog een spel aan wilt maken?</string>
     <string name="info_title">Ter informatie…</string>
     <string name="tiles_left_title">Letters in zak</string>
     <string name="counts_values_title">Letter hoeveelheid en waardes</string>
@@ -476,10 +475,10 @@
     <string name="not_again_newselect">Als je drukt op een spel open je het.\n\nJe kunt op de iconen aan de linkerkant drukken om spellen te selecteren of deselecteren. Daarna kun je de spellen bewerken, bijvoorbeeld verwijderen, met behulp van het menu of de actiebalk.</string>
     <string name="not_again_backclears">De terug knop maakt de selectie leeg in plaats van af te sluiten. Druk er nogmaals op om de app af te sluiten.</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">Spellen: %1$d</item>
+        <item quantity="other">Spellen: %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">Groepen: %1$d</item>
+        <item quantity="other">Groepen: %1$d</item>
     </plurals>
     <string name="summary_thumbsize">Voorbeeldgrootte</string>
     <string name="thumb_off">Uitgeschakeld</string>
@@ -643,15 +642,12 @@
     <string name="debug_features_summary">Menuitems etc. (enkel uitgegeven versies)</string>
     <string name="board_menu_game_netstats">Netwerkstatistieken</string>
     <string name="netstats_title">Netwerkstatistieken spel</string>
-    <string name="git_rev_title">Bron versie ID</string>
     <string name="relay_port">Relay spel poort</string>
     <string name="proxy_port">Relay apparaat poort</string>
     <string name="name_dict_fmt">%1$s/%2$s</string>
     <string name="gamel_menu_storedb">Schrijf spellen naar SD kaart</string>
     <string name="gamel_menu_loaddb">Laad spellen van SD kaart</string>
-    <string name="enable_dupes_title">Accepteer dubbele uitnodigingen</string>
     <string name="xlations_locale">Neppe taal voor vertalingen</string>
-    <string name="enable_dupes_summary">Accepteer uitnodigingen meer dan eens</string>
     <string name="nag_intervals">Herinnering intervallen (minuten1,minuten2,...)</string>
     <string name="enable_sms_toself_title">Stuur SMS berichten naar zelf</string>
     <string name="enable_sms_toself_summary">Schakel radio over als telefoonnummers gelijk zijn</string>
@@ -753,7 +749,6 @@
     <string name="disable_nags_title">Beurt herinneringen</string>
     <string name="disable_nag_solo_title">Schakel solo spel herinneringen uit</string>
     <string name="board_menu_game_showInvites">Toon uitnodigingen</string>
-    <string name="devid_title">Apparaat ID (op relay)</string>
     <string name="not_again_rematch_two_only">Rematch is momenteel enkel beschikbaar voor spellen met twee personen, omdat dit moeilijker is met meer apparaten en ik denk dat het niet vaak gebeurt dat mensen met meer dan twee spelen. Laat het me weten als ik het mis heb, dan hoog ik de prioriteit op.</string>
     <string name="rel_invite_title">Relay uitnodigingstitel</string>
     <string name="fetching_from_relay">Spellen ophalen van relay</string>
diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml
index 9386bd536..3b9fa9b5e 100644
--- a/xwords4/android/res_src/values-pl/strings.xml
+++ b/xwords4/android/res_src/values-pl/strings.xml
@@ -398,7 +398,6 @@
     <string name="player_fmt">Gracz %1$d</string>
     <string name="notify_title_fmt">Poruszaj się w grze %1$s</string>
     <string name="notify_chat_title_fmt">Wiadomość czatu w grze %1$s</string>
-    <string name="dup_game_query_fmt">"Masz już tę grę, która wydaje się być utworzona (na  %1$s) z tego samego zaproszenia. Czy na pewno chcesz utworzyć nową\?"</string>
     <string name="info_title">INFORMUJĘ, ŻE.…</string>
     <string name="title_blank_picker">Wybierz kafelek dla pustego</string>
     <string name="tile_tray_picker">Wybierz nowe kafelki do zasobnika</string>
@@ -590,10 +589,10 @@
 \nMożesz zamiast tego możesz stuknąć ikony po lewej stronie, aby wybrać lub odznaczyć gry, a następnie wykonać różne działania w wybranych grach, np. aby je usunąć, za pomocą menu lub „Paska zadań”</string>
     <string name="not_again_backclears">Przycisk Wstecz usuwa wszystkie zaznaczenia zamiast wyjść. Naciśnij go ponownie, aby opuścić aplikację.</string>
     <plurals name="sel_games_fmt">
-      <item quantity="other">Gry: %1$d</item>
+        <item quantity="other">Gry: %1$d</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="other">Grupy: %1$d</item>
+        <item quantity="other">Grupy: %1$d</item>
     </plurals>
     <string name="summary_thumbsize">Rozmiar miniaturki</string>
     <string name="thumb_off">Wyłączone</string>
@@ -757,17 +756,13 @@
     <string name="board_menu_game_netstats">Statystyki sieci</string>
     <string name="board_menu_game_showInvites">Pokaż zaproszenia</string>
     <string name="netstats_title">Statystyki gry sieciowej</string>
-    <string name="git_rev_title">Identyfikator wersji źródła</string>
-    <string name="devid_title">Identyfikator urządzenia (na przekaźniku)</string>
     <string name="relay_port">Przekaźnik portu gier</string>
     <string name="proxy_port">Przekaźnik portu urządzenia</string>
     <string name="name_dict_fmt">%1$s/%2$s</string>
     <string name="gamel_menu_storedb">Zapisz gry na kartę SD</string>
     <string name="gamel_menu_loaddb">Załaduj gry z karty SD</string>
     <string name="gamel_menu_writegit">Skopiuj informacje git do schowka</string>
-    <string name="enable_dupes_title">Zaakceptuj duplikaty zaproszeń</string>
     <string name="xlations_locale">Fałszywy język do tłumaczenia</string>
-    <string name="enable_dupes_summary">Akceptuj zaproszenia więcej niż raz</string>
     <string name="nag_intervals">Przypomnienie w odstępach (1 minuty, 2 minut,...)</string>
     <string name="enable_sms_toself_title">Akceptuj SMS do siebie</string>
     <string name="radio_name_gsm">GSM</string>
@@ -991,4 +986,4 @@
     <string name="bonus_w2x_summary">2W</string>
     <string name="bonus_l2x_summary">2L</string>
     <string name="use_duptimer">Włącz licznik na ruch</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index e617450d4..57fbc14f8 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -1200,9 +1200,6 @@
          confused.  But some people who play together all the time use
          the same room name over and over so they'll get this warning
          and it's harmless to ignore it. -->
-    <string name="dup_game_query_fmt">Você já tem um jogo aparentemente
-    criado (em %1$s) do mesmo convite.  Tem certeza que você quer
-    criar outro?</string>
     <!-- Title of generic dialog used to display information -->
     <string name="info_title">Para sua informação...</string>
     <!-- title of dialog allowing user to pick tiles "face up".  (This
diff --git a/xwords4/android/res_src/values-sk/strings.xml b/xwords4/android/res_src/values-sk/strings.xml
index abb2c130b..785eb41d2 100644
--- a/xwords4/android/res_src/values-sk/strings.xml
+++ b/xwords4/android/res_src/values-sk/strings.xml
@@ -76,9 +76,6 @@
          confused.  But some people who play together all the time use
          the same room name over and over so they'll get this warning
          and it's harmless to ignore it. -->
-    <string name="dup_game_query_fmt">XLATE ME: You already have a game that seems
-    to have been created (on %1$s) from the same invitation.  Are you
-    sure you want to create another?</string>
     <!-- Used for a button when informing user that his attempt to
          connect to the relay failed because the room named does not
          exist.  (I believe this no longer occurs.) -->

From c949033ad65b5caa124d7b561900d94fb7d230fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dimitry=20Barr=C3=A9?= <dimitry.barre@speach.me>
Date: Thu, 10 Sep 2020 14:50:55 +0000
Subject: [PATCH 05/25] Translated using Weblate (English)

Currently translated at 100.0% (858 of 858 strings)
---
 .../app/src/main/res/values/strings.xml       | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 606e88f37..bee8e941f 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -51,7 +51,7 @@
     <string name="summary_invites_out">Players invited</string>
     <string name="summary_invites_out_fmt">Players invited to room “%1$s”</string>
     <!-- Games that have ended are listed with this string -->
-    <string name="gameOver">Game over</string>
+    <string name="gameOver">Game over sddsf</string>
     <!-- Otherwise they're listed with this to give some indication of
          how far along they are.  I may list "tiles left" someday
          instead... -->
@@ -1385,7 +1385,6 @@
     settings, e.g. the number of players, cannot be changed without
     restarting it.  When you leave this page you will have a chance to
     discard changes to avoid a restart.</string>
-
     <!-- This is shown in the Board screen when you successfully
          connect a game to the relay and are the first device in the
          game to do so. -->
@@ -1429,7 +1428,6 @@
     arrow.” Then tiles in the rack replace the arrow when you tap
     them. Tap the arrow to change its direction or to hide it.
     </string>
-
     <!-- Shown when the board screen is visible and it's just become
          another players turn. The idea is to give a hint about how to
          find out about recent moves. -->
@@ -1474,9 +1472,7 @@
     \n\tVersion code: %3$d
     \n\tSource (git) rev: %4$s
     \n\tBuilt: %5$s</string>
-
     <string name="about_devid_fmt">Device ID: %1$s</string>
-
     <!-- copyright info -->
     <string name="about_copyright">CrossWords for Android \nCopyright
     (C) 1998-2020 by Eric House. This free/open source software is
@@ -1533,7 +1529,6 @@
     <!--  -->
     <string name="button_move">Move</string>
     <string name="button_newgroup">New group</string>
-
     <!-- For user to confirm/apply wordlist filter -->
     <string name="button_useconfig">Apply Filter</string>
     <!-- Button in wordlist filter: keep it short!!!! -->
@@ -1551,13 +1546,11 @@
     <!-- title of dialog showing the list of tiles. Passed language
          name, e.g. Tiles for English -->
     <string name="show_tiles_title_fmt">Tiles for %1$s</string>
-
     <!-- Menuitem in Wordlist browser, and title of the alert you get
          when you choose it. The alert shows the note that's part of
          the wordlist, typically telling where it comes from. If
          there's no note in a wordlist the menuitem is disabled. -->
     <string name="show_note_menu">About Wordlist</string>
-
     <!-- Label for first field in wordlist browser filter -->
     <string name="pat_starts_with">Starts with</string>
     <!-- Label for middle field in wordlist browser filter -->
@@ -1569,7 +1562,6 @@
          words ending in GIN if the box under this head is
          checked-->
     <string name="pat_col_anyorder">Any Order</string>
-
     <!-- Headers for columns in tiles table: 1: letter on tile -->
     <string name="tiles_header_face">Letter</string>
     <!-- Headers for columns in tiles table: 2: Number of tiles with
@@ -1577,7 +1569,6 @@
     <string name="tiles_header_count">Number</string>
     <!-- Headers for columns in tiles table: 3: Value of each tile -->
     <string name="tiles_header_value">Value</string>
-
     <!--  -->
     <string name="tilepick_all_fmt">Pick %1$d for me</string>
     <!--  -->
@@ -1604,19 +1595,16 @@
     <!--  -->
     <string name="prompt_max_len">Words no longer than</string>
     <!--  -->
-
     <!-- Shown when user tries to make a wordlist filter where max < min -->
     <string name="error_min_gt_max">The minimum length value cannot be
     greater than the maximum value.</string>
     <!-- shown when something goes wrong building a filter -->
     <string name="alrt_bad_filter">Unable to apply filter.</string>
-
     <!-- Title of progress alert shown while wordlist is loading. For
          huge lists like Polish this can take a few seconds. -->
     <string name="filter_title_fmt">Loading %1$s…</string>
     <!-- Message in progress alert shown while wordlist is loading -->
     <string name="filter_progress_fmt">Processing %1$d words</string>
-
     <!-- Text of alert shown when user first opens wordlist
          browser. Shown until not-again checkbox checked. -->
     <string name="new_feature_filter">You can now filter wordlists by
@@ -1624,7 +1612,6 @@
     by tapping the Expander Arrow at the upper-right corner of the
     window.\n\nRead more in the FAQ by tapping the button
     below.</string>
-
     <string name="board_menu_file_email">Email author…</string>
     <!--  -->
     <string name="email_author_subject">Comment about CrossWords</string>
@@ -1958,9 +1945,9 @@
     <!-- Shown to confirm deletion of one or more game-groups. Names
          of the groups, joined by ", ", are substituted for %1$s. -->
     <plurals name="groups_confirm_del_fmt">
-      <item quantity="one">Are you sure you want to delete
+        <item quantity="one">Are you sure you want to delete
       the group %1$s?</item>
-      <item quantity="other">Are you sure you want to delete
+        <item quantity="other">Are you sure you want to delete
       the groups %1$s?</item>
     </plurals>
     <plurals name="groups_confirm_del_games_fmt">
@@ -1999,12 +1986,12 @@
     selection instead of exiting. Hit it again to exit the
     app.</string>
     <plurals name="sel_games_fmt">
-      <item quantity="one">One game selected</item>
-      <item quantity="other">%1$d games selected</item>
+        <item quantity="one">One game selected</item>
+        <item quantity="other">%1$d games selected</item>
     </plurals>
     <plurals name="sel_groups_fmt">
-      <item quantity="one">One group selected</item>
-      <item quantity="other">%1$d groups selected</item>
+        <item quantity="one">One group selected</item>
+        <item quantity="other">%1$d groups selected</item>
     </plurals>
     <string name="summary_thumbsize">Thumbnail size</string>
     <string name="thumb_off">Disabled</string>
@@ -2482,9 +2469,7 @@
     words.\n\nUse this feature to check the validity of words you’re
     thinking of playing, or to look up an unfamiliar word provided as a
     hint.</string>
-
     <string name="servicedesc">For transmitting CrossWords moves</string>
-
     <!-- New strings for duplicate mode play -->
     <!-- Checkbox in game config dialog -->
     <string name="duplicate_check">Duplicate mode</string>
@@ -2492,7 +2477,6 @@
     <string name="dup_tag">Dup</string>
     <!-- Mark game title; will produce something like "Kati vs. Eric (dup.)" -->
     <string name="dupe_title_fmt">%1$s (dup.)</string>
-
     <!-- Used instead of str_commit_confirm when in duplicate mode -->
     <string name="str_submit_confirm">Submit the current move?\n</string>
     <!-- In new-game preferences, do we default to dup-mode being on or off? -->
@@ -2501,10 +2485,8 @@
     where all players have the same tiles</string>
     <!-- These are temporary: debug-only preferences to unhide duplicate
          mode. Will go away once it's no longer experimental. -->
-
     <string name="unhide_dupmode_title">Unhide duplicate-mode options</string>
     <string name="unhide_dupmode_summary">(It’s too experimental right now)</string>
-
     <!-- dup mode: tile assignment -->
     <string name="lmi_tiles_dup">Same tiles assigned to all players</string>
     <!-- dup mode: A "pass" is when nobody can score -->
@@ -2571,7 +2553,6 @@
     <string name="history_pause_fmt">Paused by: %1$s.</string>
     <string name="history_msg_fmt"> Message: %1$s.</string>
     <string name="history_autopause">Auto-paused.</string>
-
     <string name="unsafe_open_warning">CrossWords seems to have
     crashed recently while this game was open. It may be damaged, and
     opening it might cause another crash. Do you want to try opening
@@ -2596,7 +2577,6 @@
     <!-- Debug-build-only question asked to confirm deletion of saved logs -->
     <string name="logstore_clear_confirm">Are you sure you want to
     erase your debug logs? This action cannot be undone.</string>
-
     <!-- Shown when there's more than one sequence of tiles with which
          to "spell" the string a user has entered in the wordlist
          browser. Displayed below are the possible
@@ -2608,14 +2588,11 @@
          substituted is user's string; second substitution is name of
          language -->
     <string name="no_tiles_exist">“%1$s” cannot be spelled with %2$s tiles.</string>
-
     <string name="new_feature_title">New Feature Alert</string>
-
     <string name="button_faq">Show FAQ</string>
-
     <!-- MQTT stuff. May not see the light of day -->
     <string name="invite_choice_mqtt">Internet/MQTT</string>
     <string name="mqtt_invite_title">MQTT Invitation</string>
     <string name="not_again_comms_mqtt">I’m experimenting with this
     as a replacement for the relay.</string>
-</resources>
+</resources>
\ No newline at end of file

From 8d518bba1cb0fd94820fbd6c44e95ced6607a22e Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Mon, 28 Sep 2020 14:00:28 +0000
Subject: [PATCH 06/25] Translated using Weblate (Portuguese)

Currently translated at 40.6% (349 of 858 strings)
---
 xwords4/android/res_src/values-pt/strings.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index 57fbc14f8..a9af86314 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -822,8 +822,7 @@
     <!-- title of this sub-preference -->
     <string name="prefs_behavior">Comportamento</string>
     <!-- clarification of the above -->
-    <string name="prefs_behavior_summary">Configurações do
-    comportamento do aplicativo</string>
+    <string name="prefs_behavior_summary">Configurações do comportamento da app</string>
     <!-- if this preference is checked, a dialog will be posted every
          time a robot makes a move or a move is received from a remote
          player. -->
@@ -1710,8 +1709,8 @@
     <string name="msg_dev_deleted_fmt">O jogo chamado \"%1$s\" foi deletado em outro dispositivo. Não será mais possível jogá-lo.</string>
     <string name="invit_expl_notarget_fmt">Convite enviado via %1$s em %2$s. Destinatário desconhecido.</string>
     <string name="invit_expl_bt_fmt">Convite enviado via Bluetooth para o dispositivo pareado \"%1$s\" em %2$s</string>
-    <string name="sms_invite_fail">Não foi possível iniciar o aplicativo de SMS</string>
-    <string name="sms_invite_flakey">Essa nova opção inicia seu aplicativo padrão de SMS com um convite pronto para ser enviado -- quando funciona. Cada aplicativo de SMS é diferente e alguns não cooperam.</string>
+    <string name="sms_invite_fail">Não foi possível iniciar a app de SMS</string>
+    <string name="sms_invite_flakey">Essa nova opção inicia a sua app predefinida de SMS com um convite pronto para ser enviado — se funcionam. Cada app de SMS é diferente e alguns não cooperam.</string>
     <string name="invit_expl_usrsms_fmt">Convite enviado via SMS para %1$s em %2$s</string>
     <string name="invit_expl_sms_fmt">Convite enviado via Data SMS para o número de telefone %1$s em %2$s</string>
     <string name="invite_if_nfc">Ou apenas toque no Convite -- se o outro dispositivo também possuir Android Beaming e estiver perto.</string>

From bb6afba2147f2ef6185869b021dce48d129c9478 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Thu, 1 Oct 2020 21:25:58 +0000
Subject: [PATCH 07/25] Translated using Weblate (Portuguese)

Currently translated at 40.6% (349 of 858 strings)
---
 xwords4/android/res_src/values-pt/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index a9af86314..4a8abe862 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -74,7 +74,7 @@
     <!-- Brings up the Wordlists (formerly Dictionaries) screen -->
     <string name="gamel_menu_dicts">Listas de palavras</string>
     <!-- text of menu that brings up the Settings (preferences) dialog -->
-    <string name="menu_prefs">Configurações</string>
+    <string name="menu_prefs">Configurações da app…</string>
     <!-- Regardless of the setting of the connect_frequency
          preference, checks the relay immediately for any moves for
          networked games on this device and posts a notification if
@@ -105,7 +105,7 @@
     <!-- pulls up dialog to change the group of the selected game -->
     <string name="list_item_move">Mover para grupo...</string>
     <!-- pulls up dialog to delete the selected game -->
-    <string name="list_item_delete">Excluir</string>
+    <string name="list_item_delete">Apagar o jogo</string>
     <!-- pulls up dialog to reset the selected game, that is to remove
          all moves so that it's the same as a newly created game
          except for any configuration. -->
@@ -1672,8 +1672,8 @@
     <string name="square_tiles_summary">Mesmo se puderem ser mais altas</string>
     <string name="rename_label_caveat">Altere o nome deste jogo (apenas neste dispositivo) para:</string>
     <plurals name="confirm_seldeletes_fmt">
-        <item quantity="one">Você tem certeza que deseja excluir o 1 jogo selecionado? Esta ação não poderá ser desfeita.</item>
-        <item quantity="other">Você tem certeza que deseja excluir os %1$d jogos selecionados? Esta ação não poderá ser desfeita.</item>
+        <item quantity="one">Tem certeza que deseja apagar o 1 jogo selecionado\? Esta ação não poderá ser desfeita.</item>
+        <item quantity="other">Tem certeza que deseja apagar os %1$d jogos selecionados\? Esta ação não poderá ser desfeita.</item>
     </plurals>
     <plurals name="confirm_reset_fmt">
         <item quantity="one">Você tem certeza de que deseja redefinir o 1 jogo selecionado?\n\n(Redefinir apaga todos os movimentos e as informações de conexão.)</item>

From c316be6adbd1bc18007dc2fe204c58b8114d90f1 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Sun, 4 Oct 2020 07:49:49 +0000
Subject: [PATCH 08/25] Translated using Weblate (Portuguese)

Currently translated at 40.6% (349 of 858 strings)
---
 xwords4/android/res_src/values-pt/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index 4a8abe862..cc768cb4e 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -57,7 +57,7 @@
          list_item_delete contextual menu, you are asked to confirm.
          This is the text of the first button ("Cancel" is the
          second).  -->
-    <string name="button_delete">Excluir</string>
+    <string name="button_delete">Apagar</string>
     <!-- When you select the list_item_reset contextual menu, you are
           asked to confirm.  This is the text of the first button
           ("Cancel" is the second).  -->

From 07ad77930650dd268bbd58e86990771c42ed2972 Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Thu, 8 Oct 2020 03:26:35 +0200
Subject: [PATCH 09/25] Added translation using Weblate (Portuguese (Brazil))

---
 xwords4/android/res_src/values-pt-rBR/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 xwords4/android/res_src/values-pt-rBR/strings.xml

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From c7282603f54473ecefe2e39427b45c286a4fcdc3 Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Fri, 9 Oct 2020 01:50:57 +0000
Subject: [PATCH 10/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 17.8% (153 of 858 strings)
---
 .../android/res_src/values-pt-rBR/strings.xml | 187 +++++++++++++++++-
 1 file changed, 186 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index a6b3daec9..27e74f5b6 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -1,2 +1,187 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="str_pass">passar
+\n</string>
+    <string name="strd_time_penalty_sub_fmt">- %1$d [tempo]</string>
+    <string name="str_remote_moved_fmt">"Jogador remoto %1$s fez essa jogada: "</string>
+    <string name="strd_cumulative_score_fmt">Ponto cumulativo: %1$d
+\n</string>
+    <string name="board_menu_tray_show">Mostrar quadrados</string>
+    <string name="board_menu_tray_hide">Esconder quadrados</string>
+    <string name="entering_trade">Toque nos quadrados para selecionar…</string>
+    <string name="strs_new_tiles_fmt">Novos quadrados: %1$s</string>
+    <plurals name="strd_robot_traded_fmt">
+        <item quantity="one">Um quadrado trocado.</item>
+        <item quantity="other">%1$d quadrados trocados.</item>
+    </plurals>
+    <string name="strd_unused_tiles_sub_fmt">- %1$d [quadrados não usados]</string>
+    <string name="strd_remaining_tiles_add_fmt">+ %1$d [todos os quadrados restantes]</string>
+    <string name="strs_values_header_fmt">%1$s contagens/valores:
+\n</string>
+    <string name="str_robot_moved_fmt">"O robô t %1$s fez essa jogada: "</string>
+    <string name="board_menu_game_resend">Reenviar jogadas</string>
+    <string name="board_menu_game_resign">Abandonar</string>
+    <string name="board_menu_game_final">Pontuação final</string>
+    <string name="board_menu_game_history">Histórico do jogo…</string>
+    <string name="board_menu_game_left">Quadros restantes…</string>
+    <string name="board_menu_game_counts">Contagens e valores…</string>
+    <string name="board_submenu_game">Jogo</string>
+    <string name="board_menu_undo_last">Desfazer último</string>
+    <string name="board_menu_trade">Trocar</string>
+    <string name="board_menu_done">Turno terminado</string>
+    <string name="badwords_title">Palavra ilegal[s]</string>
+    <string name="badwords_lost">Turno perdido.</string>
+    <string name="badwords_accept">" Você ainda quer aceitar essa jogada\?"</string>
+    <string name="ids_badwords_fmt">Palavra[s] %1$s não encontrada na lista de palavras %2$s.</string>
+    <string name="msg_dev_deleted_fmt">O jogo de nome “%1$s” foi apagado em outro dispositivo. Você não poderá jogar mais.</string>
+    <string name="msg_lost_other">O servidor perdeu contato com outro dispositivo neste jogo.</string>
+    <string name="msg_dup_room">Outro host já registrou uma sala usando este nome. Renomeei o seu ou tente novamente mais tarde.</string>
+    <string name="msg_no_room">Nenhum host registrou uma sala por este nome.</string>
+    <string name="msg_too_many">Você está com mais jogadores do que o host exige.</string>
+    <string name="relay_alert">Problema de conexão</string>
+    <string name="msg_relay_all_here_fmt">Todos os jogadores estão na sala “%1$s”.</string>
+    <plurals name="msg_relay_waiting_fmt">
+        <item quantity="one">Dispositivo %1$d conectado ao servidor na sala “%2$s”. Aguardando por um jogador.</item>
+        <item quantity="other">Dispositivo %1$d conectado ao servidor na sala “%2$s”. Aguardando por %3$d jogadores.</item>
+    </plurals>
+    <string name="pts">pontos</string>
+    <string name="invit_expl_notarget_fmt">Convite enviado via %1$s no %2$s. Recebedor desconhecido.</string>
+    <string name="invit_expl_relay_fmt">Convite enviado pelo servidor para outro dispositivo no %1$s</string>
+    <string name="invit_expl_bt_fmt">Convite enviado via Bluetooth para dispositivos emparelhados “%1$s” no %2$s</string>
+    <string name="sms_invite_flakey">Esta opção envia seu SMS padrão do app com um convite pronto para envio—Quando funciona. Cada SMS do aplicativo é diferente, e algum deles não cooperam.</string>
+    <string name="sms_invite_fail">Impossibilitado de mandar SMS do aplicativo</string>
+    <string name="invit_expl_usrsms_fmt">Convite enviado via SMS para %1$s no %2$s</string>
+    <string name="invit_expl_sms_fmt">Convite enviado via Dados de SMS para o número de telefone %1$s no %2$s</string>
+    <string name="invite_multiple">" (Você está esperando vários jogadores remotos. Você não precisa convida-los um de cada vez, mas este alerta não será rejeitado até que todo mundo tenha sido convidado e todos os convites tenham sido aceitos.)"</string>
+    <string name="invite_if_nfc">Ou apenas toque para Convidar -- Se o outro dispositivo também tiver Android Beaming e estiver próximo.</string>
+    <string name="invited_msg">Esse jogo foi criado a partir de um convite que você recebeu. Assim que conectar a quem o enviou e qualquer outro convidado que apareceu o jogo irá começar.</string>
+    <plurals name="invite_sent_fmt">
+        <item quantity="one">Você já enviou um convite para um jogador remoto desse jogo. Estamos aguardando ele/ela responder. Por favor, use o botão reenviar convite se você acha que ele não foi enviado.</item>
+        <item quantity="other">Você já enviou %1$d únicos convites para esse jogo. Estamos aguardando por %2$d jogadores responder. Por favor, use o botão reenviar convites se você acha que eles não foram enviados.</item>
+    </plurals>
+    <plurals name="invite_msg_fmt">
+        <item quantity="one">Essa partida está aguardando por um jogador remoto. Você gostaria de convidar alguém para participar—Considerando que você não começou a partida\?</item>
+        <item quantity="other">Essa partida está aguardando por %1$d jogadores remotos. Você gostaria de convidar alguém para participar—Considerando que você não começou a partida\?</item>
+    </plurals>
+    <string name="no_moves_made">(Sem jogadas ainda)</string>
+    <string name="force_expl">Em um partida com muitos dispositivos deve ter pelo menos um jogador desse dispositivo e outro não. Por favor, verifique os jogadores remotos.</string>
+    <string name="bonus_l2x_summary">2L</string>
+    <string name="bonus_w3x_summary">3P</string>
+    <string name="bonus_l3x_summary">3L</string>
+    <string name="bonus_w2x_summary">2P</string>
+    <string name="button_trade_cancel">Cancelar troca</string>
+    <string name="button_trade_commit">Trocar</string>
+    <string name="password_label">Senha:</string>
+    <string name="robot_label">Jogador robô</string>
+    <string name="dicts_list_prompt_fmt">Listas de palavras instaladas (in %1$s)</string>
+    <string name="dict_lang_label_fmt">Lista de palavras (%1$s)</string>
+    <string name="player_label">Nome:</string>
+    <string name="remote_label">Jogador remoto</string>
+    <string name="player_edit_title">Editar jogador</string>
+    <string name="forced_consistent">Modificar primeiro jogador.</string>
+    <string name="force_title">Jogador[s] remoto</string>
+    <string name="play">Jogar</string>
+    <string name="confirm_save_title">Confirmar salvamento</string>
+    <string name="confirm_save">Este partida está em progresso. Se você salvar essas mudanças podem ser restauradas. Você quer salvar essas mudanças\?</string>
+    <string name="guest_name">(jogador remoto)</string>
+    <string name="str_reg_server_sans_remote">Pelo menos um jogador deve estar marcado como \"Remoto\" para um jogo começar como principal.</string>
+    <string name="phonies_block">Bloquear palavras falsas</string>
+    <string name="phonies_disallow">Proibir palavras falsas</string>
+    <string name="phonies_warn">Avisar se são palavras falsas</string>
+    <string name="phonies_ignore">ignorar as palavras falsas</string>
+    <string name="phonies_spinner_prompt">Como lidar com \"palavras falsas\" (palavras que não estão na lista)</string>
+    <string name="phonies_label">Palavras Falsas</string>
+    <string name="robot_smartest">O robô mais inteligente</string>
+    <string name="robot_smarter">Robô mais inteligente</string>
+    <string name="robot_spinner_prompt">Quão inteligente o robô jogador pode ser\?</string>
+    <string name="robot_smart">Robô inteligente</string>
+    <string name="robot_iq_label">QI do Robô</string>
+    <string name="dup_minutes_label">Minutos por turno</string>
+    <string name="minutes_label">Minutos por jogador</string>
+    <string name="use_duptimer">Permitir timer por jogada</string>
+    <string name="use_timer">Permitir timer do jogo</string>
+    <string name="nethints_allowed">Permitir dicas (em rede)</string>
+    <string name="hints_allowed">Permitir dicas</string>
+    <string name="settings_label">Outras configurações</string>
+    <string name="no_name_found_fmt">Salas públicas não encontradas para %1$d-jogador na partida %2$s. Tente atualizar ou criar sua própria sala.</string>
+    <string name="public_names_progress_fmt">Buscando salas públicas para %1$d-jogadores na partida %2$s.</string>
+    <string name="room_public_prompt">Selecionar sala pública</string>
+    <string name="room_public">Criar uma nova sala pública</string>
+    <string name="new_room_hint">Nome da sala</string>
+    <string name="join_room">Entrar em sala pública</string>
+    <string name="connect_label_fmt">Conexão (via %1$s)</string>
+    <string name="langdict_label">Idioma do jogo/lista de palavras</string>
+    <string name="lang_label">Idioma do jogo</string>
+    <string name="button_juggle_players">Misturar jogadores</string>
+    <string name="button_add_player">Adicionar jogador</string>
+    <string name="title_gamenet_config_fmt">%1$s configurações (na rede)</string>
+    <string name="title_game_config_fmt">Configurações para %1$s</string>
+    <string name="loc_downloads">Baixados</string>
+    <string name="players_label_host_fmt">Jogadores (%1$d local, %2$d remoto)</string>
+    <string name="players_label_standalone">Jogadores (toque para editar)</string>
+    <string name="confirm_deleteonly_dicts_fmt">Apagar %1$s deixará você sem qualquer %2$s listas de palavras. Um ou mais jogos não abrirão (até você baixar uma lista de substituição.)</string>
+    <string name="rename_label_caveat">Mude o nome desse jogo (somente nesse dispositivo) para:</string>
+    <string name="rename_label">Mude o nome desse jogo para:</string>
+    <string name="no_copy_network">Partidas que já foram conectadas no servidor não podem ser copiadas. Use \"Novo jogo de\" para criar uma cópia para jogar com as mesmas configurações.</string>
+    <plurals name="confirm_seldeletes_fmt">
+        <item quantity="one">Você tem certeza que quer apagar o jogo selecionado\? Esta ação não poder ser desfeita.</item>
+        <item quantity="other">Você tem certeza que quer apagar %1$d jogos selecionados\? Esta ação não poder ser desfeita.</item>
+    </plurals>
+    <string name="no_games_to_refresh">Nenhum jogo encontrado que conecte pelo servidor.</string>
+    <string name="msgs_progress">Verificar servidor para jogadas etc…</string>
+    <string name="summary_relay_conn_fmt">Partida iniciada na sala “%1$s”</string>
+    <plurals name="moves_fmt">
+        <item quantity="one">Uma jogada realizada</item>
+        <item quantity="other">%1$d jogadas realizadas</item>
+    </plurals>
+    <string name="button_reset">Redefinir</string>
+    <string name="menu_prefs">Configurações do APP…</string>
+    <string name="game_locked">Bloquear configurações</string>
+    <string name="download_more">Baixar mais…</string>
+    <string name="set_default_message_fmt">Para quais jogadores a lista de palavras %1$s pode ser padrão para novas partidas\? (O idioma %2$s será padrão para ambos.)</string>
+    <string name="str_game_name_fmt">%1$s (%2$s)</string>
+    <string name="title_langs_list">Idiomas (baseados nas listas de palavras instaladas)</string>
+    <string name="loc_external">Externo</string>
+    <string name="loc_internal">Interno</string>
+    <string name="move_dict_fmt">Local para lista de palavras %1$s</string>
+    <string name="button_default_both">Ambos</string>
+    <string name="button_default_robot">Robô</string>
+    <string name="button_default_human">Humano</string>
+    <plurals name="confirm_delete_dict_fmt">
+        <item quantity="one">Você tem certeza que quer apagar a lista de palavra %1$s\?</item>
+        <item quantity="other">Você tem certeza que quer deletar as listas de palavras %1$s\?</item>
+    </plurals>
+    <string name="dicts_item_select">Tornar padrão</string>
+    <string name="dicts_item_move">Mudar local de armazenamento</string>
+    <string name="loc_builtin">Incluir</string>
+    <string name="title_dicts_list">Lista de palavras do CrossWords</string>
+    <plurals name="confirm_reset_fmt">
+        <item quantity="one">Você tem certeza que quer reiniciar o jogo selecionado\?
+\n
+\n(Reiniciar apaga todas as jogadas e qualquer informação de conexão.)</item>
+        <item quantity="other">Você tem certeza que quer reiniciar %1$d jogos selecionados\?
+\n
+\n(Reiniciar apaga todas as jogadas e qualquer informação de conexão.)</item>
+    </plurals>
+    <string name="game_rename_title">Renomear jogo</string>
+    <string name="list_item_netstats">Conexões…</string>
+    <string name="list_item_copy">Copiar</string>
+    <string name="list_item_new_from">Novo jogo de</string>
+    <string name="list_item_reset">Restaurar</string>
+    <string name="list_item_delete">Apagar jogo</string>
+    <string name="list_item_move">Mudar para grupo…</string>
+    <string name="list_item_rename">Renomear…</string>
+    <string name="list_item_config">Opções de jogo…</string>
+    <string name="board_menu_file_about">Sobre o CrossWords…</string>
+    <string name="gamel_menu_checkmoves">Verificar jogadas</string>
+    <string name="gamel_menu_dicts">Listas de palavras…</string>
+    <string name="button_delete">Apagar</string>
+    <string name="gameOver">Fim de jogo sddsf</string>
+    <string name="summary_invites_out_fmt">Jogadores convidados para a sala “%1$s”</string>
+    <string name="summary_invites_out">Jogadores convidados</string>
+    <string name="summary_relay_gameover_fmt">Fim de jogo na sala “%1$s”</string>
+    <string name="summary_relay_conf_fmt">Configurado para sala “%1$s”</string>
+    <string name="summary_relay_wait_fmt">Aguardando jogadores na sala “%1$s”</string>
+    <string name="missing_player">(não está aqui…)</string>
+    <string name="robot_name_fmt">%1$s (robô)</string>
+</resources>
\ No newline at end of file

From 2f6019f4c2dd8a290dc23c6bbd22d4355d78906e Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Sun, 11 Oct 2020 23:21:27 +0000
Subject: [PATCH 11/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 18.4% (158 of 858 strings)
---
 xwords4/android/res_src/values-pt-rBR/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index 27e74f5b6..1c0b8c9b5 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -184,4 +184,12 @@
     <string name="summary_relay_wait_fmt">Aguardando jogadores na sala “%1$s”</string>
     <string name="missing_player">(não está aqui…)</string>
     <string name="robot_name_fmt">%1$s (robô)</string>
+    <string name="str_phony_rejected">palavra ilegal na jogada; turno perdido!</string>
+    <string name="strss_traded_for_fmt">Trocado %1$s para %2$s.</string>
+    <string name="strs_tray_at_start_fmt">Histórico do inicio: %1$s
+\n</string>
+    <string name="strs_move_down_fmt">jogada (de %1$s baixo)
+\n</string>
+    <string name="strs_move_across_fmt">jogada (de %1$s cruzado)
+\n</string>
 </resources>
\ No newline at end of file

From c01bd4e8d08dccfb11792a8562e3e823a8b57ac5 Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Tue, 13 Oct 2020 20:12:03 +0000
Subject: [PATCH 12/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 18.9% (163 of 858 strings)
---
 xwords4/android/res_src/values-pt-rBR/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index 1c0b8c9b5..de5afbcb4 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -191,5 +191,13 @@
     <string name="strs_move_down_fmt">jogada (de %1$s baixo)
 \n</string>
     <string name="strs_move_across_fmt">jogada (de %1$s cruzado)
+\n</string>
+    <string name="strd_turn_score_fmt">Pontuação por turno: %1$d
+\n</string>
+    <string name="str_bonus_all">Bônus por usar todos os quadrados: 50
+\n</string>
+    <string name="vs_join">" vs. "</string>
+    <string name="str_nonlocal_name_fmt">%1$s (remoto)</string>
+    <string name="str_commit_confirm">Executar a jogada atual\?
 \n</string>
 </resources>
\ No newline at end of file

From 21f22bbb3db2ada69519ba5e39d00e5fd788c91c Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Thu, 15 Oct 2020 02:53:43 +0000
Subject: [PATCH 13/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 22.4% (193 of 858 strings)
---
 .../android/res_src/values-pt-rBR/strings.xml | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index de5afbcb4..1979a9905 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -200,4 +200,42 @@
     <string name="str_nonlocal_name_fmt">%1$s (remoto)</string>
     <string name="str_commit_confirm">Executar a jogada atual\?
 \n</string>
+    <string name="prefs_appearance">Aparência</string>
+    <string name="board_size">Tamanho do tabuleiro</string>
+    <string name="initial_player_minutes">Minutos por jogador</string>
+    <string name="phonies_found_title">Palavras falsas encontradas</string>
+    <string name="default_phonies">Lidar com palavras falsas</string>
+    <string name="init_autojuggle_sum">Aleatoriamente, para novos jogos</string>
+    <string name="init_autojuggle">Alternar jogadores</string>
+    <string name="nethints_allowed_sum">Permitir dicas para dois dispositivos do jogo</string>
+    <string name="hints_allowed_sum">Permitir a função de dicas</string>
+    <string name="default_robodict">Lista de Palavras para robôs</string>
+    <string name="default_dict">Listas de palavras para humanos</string>
+    <string name="prefs_dicts_summary">Listas de Palavras padrão</string>
+    <string name="prefs_dicts">Listas de Palavras</string>
+    <string name="pref_human_name">Jogador humano (seu nome)</string>
+    <string name="pref_player4_name">Quarto jogador</string>
+    <string name="pref_player3_name">Terceiro jogador</string>
+    <string name="pref_player2_name">Segundo jogador</string>
+    <string name="pref_player1_name">Primeiro jogador</string>
+    <string name="prefs_names_summary">Predefinição dos nomes dos jogadores</string>
+    <string name="prefs_names">Nomes dos jogadores</string>
+    <string name="prefs_defaults_summary">Configurações padrões para novos jogos</string>
+    <string name="prefs_defaults">Novos predefinições do jogo</string>
+    <string name="confirm_revert_all">Você tem certeza que quer restaurar as configurações para o seus valores padrões\?</string>
+    <string name="button_revert_colors">Restaurar cores</string>
+    <string name="confirm_revert_colors">Você tem certeza que restaurar todas as configurações de cores para os valores padrões delas\?</string>
+    <string name="button_revert_all">Restaurar tudo</string>
+    <string name="title_prefs">Configurações do CrossWords</string>
+    <string name="confirm_undo_last">Você tem certeza que quer desfazer o último turno executado\? (Não há opção de refazer.)</string>
+    <plurals name="strd_remains_header_fmt">
+        <item quantity="one">Falta um quadrado no agrupamento.</item>
+        <item quantity="other">Faltam %1$d quadrados no agrupamento .</item>
+    </plurals>
+    <plurals name="strd_remains_expl_fmt">
+        <item quantity="one">Falta um quadrado no quadro escondido:
+\n</item>
+        <item quantity="other">Faltam %1$d quadrados no agrupamento e no quadro escondido:
+\n</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 30b42fcedf130279d4bf512da9556bc75568e4f0 Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Wed, 21 Oct 2020 01:49:19 +0000
Subject: [PATCH 14/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 23.7% (204 of 858 strings)
---
 xwords4/android/res_src/values-pt-rBR/strings.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index 1979a9905..21f3befe8 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -201,7 +201,7 @@
     <string name="str_commit_confirm">Executar a jogada atual\?
 \n</string>
     <string name="prefs_appearance">Aparência</string>
-    <string name="board_size">Tamanho do tabuleiro</string>
+    <string name="board_size">Tamanho do quadro</string>
     <string name="initial_player_minutes">Minutos por jogador</string>
     <string name="phonies_found_title">Palavras falsas encontradas</string>
     <string name="default_phonies">Lidar com palavras falsas</string>
@@ -238,4 +238,15 @@
         <item quantity="other">Faltam %1$d quadrados no agrupamento e no quadro escondido:
 \n</item>
     </plurals>
+    <string name="show_arrow">Mostrar a seta do quadro</string>
+    <string name="hide_newgames_summary">Esconder os botões do jogo na tela principal deixa os jogos mais visíveis</string>
+    <string name="hide_newgames_title">Esconder botões do novo jogo</string>
+    <string name="hide_title_summary">Esconder o nome do jogo deixa o quadro levemente mais largo</string>
+    <string name="hide_title">Esconder barra de título</string>
+    <string name="game_summary_field_state">Estado do jogo</string>
+    <string name="game_summary_field_opponents">Nome(s) do(s) oponente(s)</string>
+    <string name="game_summary_field_language">Idioma do jogo</string>
+    <string name="game_summary_field_empty">&lt;Nada&gt;</string>
+    <string name="summary_field">Incluir na lista do jogo</string>
+    <string name="prefs_appearance_summary">Configurações da aparência do controle</string>
 </resources>
\ No newline at end of file

From 8971cdeebc18e433f6327b3a69497dcd4b01b4fe Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Fri, 23 Oct 2020 14:55:36 +0000
Subject: [PATCH 15/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 26.8% (230 of 858 strings)
---
 .../android/res_src/values-pt-rBR/strings.xml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index 21f3befe8..9e2dd3441 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -249,4 +249,30 @@
     <string name="game_summary_field_empty">&lt;Nada&gt;</string>
     <string name="summary_field">Incluir na lista do jogo</string>
     <string name="prefs_appearance_summary">Configurações da aparência do controle</string>
+    <string name="explain_robot_summary">Mostrar resumo da pontuação depois do turno de cada jogador robô ou remoto</string>
+    <string name="title_sort_tiles">Novos tipos de quadrados</string>
+    <string name="skip_confirm_turn_summary">Não mostrar resumo da pontuação depois do turno de cada jogador humano</string>
+    <string name="skip_confirm_turn">Pular confirmação do turno</string>
+    <string name="explain_robot">Explicar outras jogadas</string>
+    <string name="prefs_behavior">Funcionamento</string>
+    <string name="prefs_behavior_summary">Controlar configurações do funcionamento do app</string>
+    <string name="blue">Azul</string>
+    <string name="green">Verde</string>
+    <string name="red">Vermelho</string>
+    <string name="cellline">Linhas do quadro</string>
+    <string name="key_bonushint">Dica de bônus no quadrado</string>
+    <string name="empty">Célula vazia/cores de fundo</string>
+    <string name="background">Cores de fundo do quadro</string>
+    <string name="tile_back">Cores de fundo do quadrado</string>
+    <string name="clr_crosshairs">Cores das linhas</string>
+    <string name="bonus_w3x">Palavra tripla</string>
+    <string name="bonus_w2x">Palavra dupla</string>
+    <string name="bonus_l3x">Letra tripla</string>
+    <string name="bonus_l2x">Letra dupla</string>
+    <string name="prefs_colors_summary">Editar cores usadas no quadro</string>
+    <string name="prefs_colors">Cores individuais</string>
+    <string name="board_line_pct">espessura da linha da célula (percentagem, limite de 1 a 25)</string>
+    <string name="keep_screenon_summary">Manter a tela do quadro ligada por 10 min</string>
+    <string name="keep_screenon">Manter a tela ligada</string>
+    <string name="show_arrow_summary">Quadrados tocados ficam nesta seta quando está visível</string>
 </resources>
\ No newline at end of file

From 1d41eea48d0dc4d65acd2c7b5be8648f32e980e2 Mon Sep 17 00:00:00 2001
From: Vanessa Regina Andrade dos Santos <vanaregi.santos@gmail.com>
Date: Mon, 26 Oct 2020 19:16:14 +0000
Subject: [PATCH 16/25] Translated using Weblate (Portuguese (Brazil))

Currently translated at 26.8% (230 of 858 strings)
---
 xwords4/android/res_src/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml
index 9e2dd3441..ff4dea469 100644
--- a/xwords4/android/res_src/values-pt-rBR/strings.xml
+++ b/xwords4/android/res_src/values-pt-rBR/strings.xml
@@ -251,7 +251,7 @@
     <string name="prefs_appearance_summary">Configurações da aparência do controle</string>
     <string name="explain_robot_summary">Mostrar resumo da pontuação depois do turno de cada jogador robô ou remoto</string>
     <string name="title_sort_tiles">Novos tipos de quadrados</string>
-    <string name="skip_confirm_turn_summary">Não mostrar resumo da pontuação depois do turno de cada jogador humano</string>
+    <string name="skip_confirm_turn_summary">NÃO mostrar resumo da pontuação depois do turno de cada jogador humano</string>
     <string name="skip_confirm_turn">Pular confirmação do turno</string>
     <string name="explain_robot">Explicar outras jogadas</string>
     <string name="prefs_behavior">Funcionamento</string>

From a5f8b874781458bf08ab4d7a08da25185d32ffa1 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 7 Sep 2020 17:59:53 -0700
Subject: [PATCH 17/25] remove dead code

---
 xwords4/common/device.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/xwords4/common/device.c b/xwords4/common/device.c
index 5c099fe66..0e4f59d2f 100644
--- a/xwords4/common/device.c
+++ b/xwords4/common/device.c
@@ -106,7 +106,7 @@ dvc_getMQTTDevID( XW_DUtilCtxt* dutil, XWEnv xwe, MQTTDevID* devID )
 
 typedef enum { CMD_INVITE, CMD_MSG, CMD_DEVGONE, } MQTTCmd;
 
-#define PROTO_0 0
+// #define PROTO_0 0
 #define PROTO_1 1        /* moves gameID into "header" relay2 knows about */
 
 static void
@@ -158,9 +158,9 @@ dvc_parseMQTTPacket( XW_DUtilCtxt* dutil, XWEnv xwe, const XP_U8* buf, XP_U16 le
     stream_putBytes( stream, buf, len );
 
     XP_U8 proto = stream_getU8( stream );
-    if ( proto != PROTO_0 && proto != PROTO_1 ) {
-        XP_LOGFF( "read proto %d, expected %d or %d; dropping packet",
-                  proto, PROTO_0, PROTO_1 );
+    if ( proto != PROTO_1 ) {
+        XP_LOGFF( "read proto %d, expected %d; dropping packet",
+                  proto, PROTO_1 );
     } else {
         MQTTDevID myID;
         stream_getBytes( stream, &myID, sizeof(myID) );
@@ -169,15 +169,8 @@ dvc_parseMQTTPacket( XW_DUtilCtxt* dutil, XWEnv xwe, const XP_U8* buf, XP_U16 le
         MQTTCmd cmd;
         XP_U32 gameID = 0;
 
-        if ( PROTO_0 == proto ) {
-            cmd = stream_getU8( stream );
-            if ( CMD_INVITE != cmd ) {
-                gameID = stream_getU32( stream );
-            }
-        } else {
-            gameID = stream_getU32( stream );
-            cmd = stream_getU8( stream );
-        }
+        gameID = stream_getU32( stream );
+        cmd = stream_getU8( stream );
 
         switch ( cmd ) {
         case CMD_INVITE: {

From d65fb80dff6758a78f015434eb84e9df41a6a05f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 7 Sep 2020 18:30:21 -0700
Subject: [PATCH 18/25] don't commit me

---
 .../src/main/java/org/eehouse/android/xw4/GamesListDelegate.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 689301c76..8e2ccf93a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -2347,6 +2347,7 @@ public class GamesListDelegate extends ListDelegateBase
             // creates
             for ( long rowid : rowids.keySet() ) {
                 if ( nli.forceChannel == rowids.get(rowid) ) {
+                    DbgUtils.printStack( TAG );
                     makeOkOnlyBuilder( R.string.dropped_dupe )
                         .setActionPair( Action.OPEN_GAME,
                                         R.string.button_open_game )

From b6955696ebfa694dcf632e921d3858d3e92573ca Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 7 Sep 2020 18:35:45 -0700
Subject: [PATCH 19/25] again

---
 .../src/main/java/org/eehouse/android/xw4/GamesListDelegate.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 8e2ccf93a..08a24babf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -2348,6 +2348,7 @@ public class GamesListDelegate extends ListDelegateBase
             for ( long rowid : rowids.keySet() ) {
                 if ( nli.forceChannel == rowids.get(rowid) ) {
                     DbgUtils.printStack( TAG );
+
                     makeOkOnlyBuilder( R.string.dropped_dupe )
                         .setActionPair( Action.OPEN_GAME,
                                         R.string.button_open_game )

From fa3a33f13301ad3029aca03f26cebb1a2af9c6f4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 9 Sep 2020 15:12:27 -0700
Subject: [PATCH 20/25] offer to hide new-game buttons immediately

Don't wait for user to tap one of the buttons. Instead notice when
scrolling becomes possible, and offer once per launch until user says
"hide" or clicks the don't-ask-again box.
---
 .../org/eehouse/android/xw4/DlgDelegate.java  |  1 -
 .../android/xw4/GamesListDelegate.java        | 60 ++++++++-----------
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index 866497397..294b77649 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -46,7 +46,6 @@ public class DlgDelegate {
         OPEN_GAME,
         CLEAR_SELS,
         NEW_NET_GAME,
-        NEW_GAME_PRESSED,
         SET_HIDE_NEWGAME_BUTTONS,
         DWNLD_LOC_DICT,
         NEW_GAME_DFLT_NAME,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 08a24babf..e26b75995 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -997,8 +997,12 @@ public class GamesListDelegate extends ListDelegateBase
         mCurScrollState = OnScrollListener.SCROLL_STATE_IDLE;
         lv.setOnScrollListener( new OnScrollListener() {
                 @Override
-                public void onScroll( AbsListView absListView, int ii, int i1, int i2 )
+                public void onScroll( AbsListView absListView, int firstVis,
+                                      int visCount, int totalCount )
                 {
+                    if ( 0 < visCount && visCount < totalCount ) {
+                        checkOfferHideButtons();
+                    }
                     if ( mCurScrollState == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL ) {
                         lv.setFastScrollEnabled( true );
                     }
@@ -1105,6 +1109,24 @@ public class GamesListDelegate extends ListDelegateBase
         super.onSaveInstanceState( outState );
     }
 
+    // Only called when scrolling's necessary
+    private boolean m_offeredHideButtons = false;
+    private void checkOfferHideButtons()
+    {
+        if ( !m_offeredHideButtons ) {
+            if ( XWPrefs.getHideNewgameButtons( m_activity ) ) {
+                m_offeredHideButtons = true; // don't do expensive check again
+            } else {
+                m_offeredHideButtons = true;
+                makeNotAgainBuilder( R.string.not_again_hidenewgamebuttons,
+                                     R.string.key_notagain_hidenewgamebuttons )
+                    .setActionPair( Action.SET_HIDE_NEWGAME_BUTTONS,
+                                    R.string.set_pref )
+                    .show();
+            }
+        }
+    }
+
     private void getBundledData( Bundle bundle )
     {
         if ( null != bundle ) {
@@ -1399,11 +1421,8 @@ public class GamesListDelegate extends ListDelegateBase
             break;
 
         case SET_HIDE_NEWGAME_BUTTONS:
-            XWPrefs.setHideNewgameButtons(m_activity, true);
+            XWPrefs.setHideNewgameButtons( m_activity, true );
             setupButtons();
-            // FALLTHRU
-        case NEW_GAME_PRESSED:
-            handleNewGame( m_mySIS.nextIsSolo );
             break;
 
         case DELETE_GROUPS:
@@ -2147,39 +2166,10 @@ public class GamesListDelegate extends ListDelegateBase
         }
     }
 
-    private void handleNewGame( boolean solo )
-    {
-        m_mySIS.nextIsSolo = solo;
-        showDialogFragment( DlgID.GAMES_LIST_NEWGAME, solo );
-    }
-
     private void handleNewGameButton( boolean solo )
     {
         m_mySIS.nextIsSolo = solo;
-
-        boolean skipOffer = XWPrefs.getHideNewgameButtons( m_activity );
-        if ( ! skipOffer ) {
-            // If the API's availble, offer to hide buttons as soon as there
-            // are enough games that the list is scrollable. Otherwise fall
-            // back to there being at least four games.
-            if ( Build.VERSION.SDK_INT >= 19 ) {
-                ListView list = getListView();
-                skipOffer = !list.canScrollList( 1 ) && !list.canScrollList( -1 );
-            } else {
-                skipOffer = 4 > m_adapter.getCount();
-            }
-        }
-
-        if ( skipOffer ) {
-            handleNewGame( solo );
-        } else {
-            makeNotAgainBuilder( R.string.not_again_hidenewgamebuttons,
-                                 R.string.key_notagain_hidenewgamebuttons,
-                                 Action.NEW_GAME_PRESSED )
-                .setActionPair( Action.SET_HIDE_NEWGAME_BUTTONS,
-                                R.string.set_pref )
-                .show();
-        }
+        showDialogFragment( DlgID.GAMES_LIST_NEWGAME, solo );
     }
 
     @Override

From 88dbc40180f8e5bf870c2be24838a565518e5a0e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 10 Sep 2020 11:13:30 -0700
Subject: [PATCH 21/25] test script: strip extension when making logs dir

---
 xwords4/linux/scripts/discon_ok2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/linux/scripts/discon_ok2.py b/xwords4/linux/scripts/discon_ok2.py
index 3b0466766..f7d4c94cc 100755
--- a/xwords4/linux/scripts/discon_ok2.py
+++ b/xwords4/linux/scripts/discon_ok2.py
@@ -914,7 +914,7 @@ def parseArgs():
 def assignDefaults(args):
     if not args.NROOMS: args.NROOMS = args.NGAMES
     if len(args.DICTS) == 0: args.DICTS.append('CollegeEng_2to8.xwd')
-    args.LOGDIR = os.path.basename(sys.argv[0]) + '_logs'
+    args.LOGDIR = os.path.splitext(os.path.basename(sys.argv[0]))[0] + '_logs'
     # Move an existing logdir aside
     if os.path.exists(args.LOGDIR):
         shutil.move(args.LOGDIR, '/tmp/' + args.LOGDIR + '_' + str(random.randint(0, 100000)))

From 81799d3903724c1ccb265891fd7101c05ffc71a9 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 10 Sep 2020 15:11:22 -0700
Subject: [PATCH 22/25] add addrType to comms' main addr when added to channel

I'm fixing android client not showing stats for or allowing to disable
mqtt after it's added automatically to a game that connects
otherwise. Problem was that only the channel got the mqtt address
flag. So now add the flag for any type that's added.
---
 .../org/eehouse/android/xw4/BTService.java    |  3 +-
 .../android/xw4/ConnViaViewLayout.java        |  1 +
 .../eehouse/android/xw4/jni/CommsAddrRec.java | 14 ++++++
 xwords4/android/jni/andutils.c                |  1 -
 xwords4/android/jni/xwjni.c                   |  6 +--
 xwords4/common/comms.c                        | 43 ++++++++++++++-----
 xwords4/common/comms.h                        | 14 +++---
 xwords4/linux/linuxmain.c                     |  2 -
 xwords4/linux/scripts/discon_ok2.py           |  7 ++-
 9 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 068f04999..302dc96a1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -558,7 +558,8 @@ public class BTService extends XWJIService {
                 // listenUsingRfcommWithServiceRecord() in background (on
                 // Android 9)
                 m_serverSocket = null;
-                Log.ex( TAG, ex );
+                // I'm seeing too much of this on two-user systems.
+                // Log.ex( TAG, ex );
             }
 
             int nBadCount = 0;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
index 60f037ec9..e528ffb46 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
@@ -38,6 +38,7 @@ import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
 import org.eehouse.android.xw4.loc.LocUtils;
 
 public class ConnViaViewLayout extends LinearLayout {
+    private static final String TAG = ConnViaViewLayout.class.getSimpleName();
     private CommsConnTypeSet m_curSet;
     private DlgDelegate.HasDlgDelegate m_dlgDlgt;
     private Activity m_activity;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
index 4afd8b889..50f4cc45a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
@@ -213,6 +213,20 @@ public class CommsAddrRec {
             }
         }
 
+        @Override
+        public String toString()
+        {
+            if ( BuildConfig.NON_RELEASE ) {
+                List<String> tmp = new ArrayList<>();
+                for ( CommsConnType typ : getTypes() ) {
+                    tmp.add( typ.toString() );
+                }
+                return TextUtils.join(",", tmp );
+            } else {
+                return super.toString();
+            }
+        }
+
         public String toString( Context context, boolean longVersion )
         {
             String result;
diff --git a/xwords4/android/jni/andutils.c b/xwords4/android/jni/andutils.c
index 31bddfc0b..87d9fc4f2 100644
--- a/xwords4/android/jni/andutils.c
+++ b/xwords4/android/jni/andutils.c
@@ -603,7 +603,6 @@ addrTypesToJ( JNIEnv* env, const CommsAddrRec* addr )
                                   "(Ljava/lang/Object;)Z" );
     XP_ASSERT( !!mid2 );
     CommsConnType typ;
-    /* far as it gets */
     for ( XP_U32 st = 0; addr_iter( addr, &typ, &st ); ) {
         jobject jtyp = intToJEnum( env, typ, 
                                    PKG_PATH("jni/CommsAddrRec$CommsConnType") );
diff --git a/xwords4/android/jni/xwjni.c b/xwords4/android/jni/xwjni.c
index 51a9f01ca..a07454ecc 100644
--- a/xwords4/android/jni/xwjni.c
+++ b/xwords4/android/jni/xwjni.c
@@ -2183,15 +2183,15 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1summarize
             server_getDupTimerExpires(server) );
     
     if ( !!state->game.comms ) {
-        CommsAddrRec addr;
         CommsCtxt* comms = state->game.comms;
-        comms_getAddr( comms, &addr );
         setInt( env, jsummary, "seed", comms_getChannelSeed( comms ) );
         setInt( env, jsummary, "missingPlayers", 
                 server_getMissingPlayers( server ) );
         setInt( env, jsummary, "nPacketsPending", 
                 comms_countPendingPackets( state->game.comms ) );
 
+        CommsAddrRec addr;
+        comms_getAddr( comms, &addr );
         setTypeSetFieldIn( env, &addr, jsummary, "conTypes" );
 
         CommsConnType typ;
@@ -2226,7 +2226,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1summarize
                     case COMMS_CONN_SMS: addrps[ii] = (XP_UCHAR*)&addrs[ii].u.sms.phone; break;
                     default: XP_ASSERT(0); break;
                     }
-                    XP_LOGF( "%s: adding btaddr/phone/mac %s", __func__, addrps[ii] );
+                    XP_LOGFF( "adding btaddr/phone/mac %s", addrps[ii] );
                 }
                 setStringArray( env, jsummary, "remoteDevs", count, addrps );
             }
diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c
index f410a689f..5b6f0a253 100644
--- a/xwords4/common/comms.c
+++ b/xwords4/common/comms.c
@@ -194,9 +194,10 @@ static AddressRecord* rememberChannelAddress( CommsCtxt* comms, XWEnv xwe,
                                               XP_PlayerAddr channelNo, 
                                               XWHostID id, 
                                               const CommsAddrRec* addr );
-static void augmentChannelAddr( AddressRecord* rec, const CommsAddrRec* addr,
-                                XWHostID hostID );
-static void augmentAddr( CommsAddrRec* dest, const CommsAddrRec* src );
+static void augmentChannelAddr( CommsCtxt* comms, AddressRecord* rec,
+                                const CommsAddrRec* addr, XWHostID hostID );
+static void augmentAddr( CommsCtxt* comms, CommsAddrRec* dest,
+                         const CommsAddrRec* src );
 static XP_Bool channelToAddress( CommsCtxt* comms, XWEnv xwe, XP_PlayerAddr channelNo,
                                  const CommsAddrRec** addr );
 static AddressRecord* getRecordFor( CommsCtxt* comms, XWEnv xwe,
@@ -1031,7 +1032,7 @@ comms_augmentHostAddr( CommsCtxt* comms, XWEnv xwe, const CommsAddrRec* addr )
         && ! addr_hasType( &comms->addr, COMMS_CONN_RELAY );
 
     CommsAddrRec tmp = comms->addr;
-    augmentAddr( &tmp, addr );
+    augmentAddr( comms, &tmp, addr );
     util_addrChange( comms->util, xwe, &comms->addr, &tmp );
     comms->addr = tmp;
 
@@ -1061,7 +1062,7 @@ comms_addMQTTDevID( CommsCtxt* comms, XP_PlayerAddr channelNo,
             CommsAddrRec addr = {0};
             addr_setType( &addr, COMMS_CONN_MQTT );
             addr.u.mqtt.devID = *devID;
-            augmentAddr( &rec->addr, &addr );
+            augmentAddr( comms, &rec->addr, &addr );
         }
     }
     if ( !found ) {
@@ -2266,7 +2267,7 @@ validateInitialMessage( CommsCtxt* comms, XWEnv xwe,
         XP_LOGF( TAGFMT() "looking at %s", TAGPRMS, cbuf );
         rec = getRecordFor( comms, xwe, addr, *channelNo, XP_TRUE );
         if ( !!rec ) {
-            augmentChannelAddr( rec, addr, senderID );
+            augmentChannelAddr( comms, rec, addr, senderID );
             /* reject: we've already seen init message on channel */
             XP_LOGF( TAGFMT() "rejecting duplicate INIT message", TAGPRMS );
             rec = NULL;
@@ -2341,7 +2342,7 @@ validateChannelMessage( CommsCtxt* comms, XWEnv xwe, const CommsAddrRec* addr,
     if ( !!rec ) {
         removeFromQueue( comms, xwe, channelNo, lastMsgRcd );
 
-        augmentChannelAddr( rec, addr, senderID );
+        augmentChannelAddr( comms, rec, addr, senderID );
 
         if ( msgID == rec->lastMsgRcd + 1 ) {
             XP_LOGF( TAGFMT() "expected %d AND got %d", TAGPRMS,
@@ -2924,20 +2925,31 @@ logAddrs( const CommsCtxt* comms, XWEnv xwe, const char* caller )
 #endif
 
 static void
-augmentChannelAddr( AddressRecord* const rec, const CommsAddrRec* addr,
-                    XWHostID hostID )
+augmentChannelAddr( CommsCtxt* comms, AddressRecord* const rec,
+                    const CommsAddrRec* addr, XWHostID hostID )
 {
-    augmentAddr( &rec->addr, addr );
+    augmentAddr( comms, &rec->addr, addr );
     if ( addr_hasType( &rec->addr, COMMS_CONN_RELAY ) ) {
         if ( 0 != hostID ) {
             rec->rr.hostID = hostID;
             XP_LOGF( "%s: set hostID for rec %p to %d", __func__, rec, hostID );
         }
     }
+
+#ifdef DEBUG
+    CommsConnType typ;
+    for ( XP_U32 st = 0; addr_iter( addr, &typ, &st ); ) {
+        if ( !addr_hasType( &comms->addr, typ ) ) {
+            XP_LOGFF( "main addr missing type %s", ConnType2Str(typ) );
+            XP_ASSERT(0);       /* firing */
+        }
+    }
+#endif
 }
 
 static void
-augmentAddr( CommsAddrRec* destAddr, const CommsAddrRec* srcAddr )
+augmentAddr( CommsCtxt* comms, CommsAddrRec* destAddr,
+             const CommsAddrRec* srcAddr )
 {
     if ( !!srcAddr ) {
         CommsConnType typ;
@@ -2945,6 +2957,15 @@ augmentAddr( CommsAddrRec* destAddr, const CommsAddrRec* srcAddr )
             if ( ! addr_hasType( destAddr, typ ) ) {
                 XP_LOGFF( "adding new type %s to rec", ConnType2Str(typ) );
                 addr_addType( destAddr, typ );
+
+                /* If an address is getting added to a channel, the top-level
+                   address should also include the type. The specifics of the
+                   address don't make sense to copy, however. */
+                if ( ! addr_hasType( &comms->addr, typ ) ) {
+                    XP_ASSERT( destAddr != &comms->addr ); /* we just added it, so can't be comms->addr */
+                    XP_LOGFF( "adding %s to comms->addr", ConnType2Str(typ) );
+                    addr_addType( &comms->addr, typ );
+                }
             }
 
             const void* src = NULL;
diff --git a/xwords4/common/comms.h b/xwords4/common/comms.h
index b36e991f1..e389600df 100644
--- a/xwords4/common/comms.h
+++ b/xwords4/common/comms.h
@@ -37,14 +37,14 @@ typedef XP_U8 XWHostID;
 
 typedef enum {
     COMMS_CONN_NONE           /* I want errors on uninited case */
-    ,COMMS_CONN_IR
-    ,COMMS_CONN_IP_DIRECT
-    ,COMMS_CONN_RELAY
-    ,COMMS_CONN_BT
-    ,COMMS_CONN_SMS
+    ,COMMS_CONN_IR            /* 1 */
+    ,COMMS_CONN_IP_DIRECT       /* 2 */
+    ,COMMS_CONN_RELAY           /* 3 */
+    ,COMMS_CONN_BT              /* 4 */
+    ,COMMS_CONN_SMS             /* 5 */
     ,COMMS_CONN_P2P             /* a.k.a. Wifi direct */
-    ,COMMS_CONN_NFC
-    ,COMMS_CONN_MQTT
+    ,COMMS_CONN_NFC             /* 7 */
+    ,COMMS_CONN_MQTT            /* 8 */
 
     ,COMMS_CONN_NTYPES
 } CommsConnType;
diff --git a/xwords4/linux/linuxmain.c b/xwords4/linux/linuxmain.c
index b2e8ff13a..eaa629b9c 100644
--- a/xwords4/linux/linuxmain.c
+++ b/xwords4/linux/linuxmain.c
@@ -2947,11 +2947,9 @@ main( int argc, char** argv )
             addr_addType( &mainParams.addr, COMMS_CONN_MQTT );
             break;
         case CMD_MQTTHOST:
-            addr_addType( &mainParams.addr, COMMS_CONN_MQTT );
             mainParams.connInfo.mqtt.hostName = optarg;
             break;
         case CMD_MQTTPORT:
-            addr_addType( &mainParams.addr, COMMS_CONN_MQTT );
             mainParams.connInfo.mqtt.port = atoi(optarg);
             break;
         case CMD_INVITEE_MQTTDEVID:
diff --git a/xwords4/linux/scripts/discon_ok2.py b/xwords4/linux/scripts/discon_ok2.py
index f7d4c94cc..55e392c64 100755
--- a/xwords4/linux/scripts/discon_ok2.py
+++ b/xwords4/linux/scripts/discon_ok2.py
@@ -472,8 +472,10 @@ def build_cmds(args):
                         PARAMS += [ '--invitee-sms-number', makeSMSPhoneNo(GAME, dev) ]
 
             PARAMS += [ '--mqtt-port', args.MQTT_PORT, '--mqtt-host', args.MQTT_HOST ]
-            if args.ADD_MQTT and DEV == 1:
-                PARAMS += [ '--force-invite' ]
+            if args.ADD_MQTT:
+                PARAMS += [ '--with-mqtt' ]
+                if DEV == 1:
+                    PARAMS += [ '--force-invite' ]
 
             if args.UNDO_PCT > 0:
                 PARAMS += ['--undo-pct', args.UNDO_PCT]
@@ -648,6 +650,7 @@ def run_cmds(args, devs):
                 devs.remove(dev)
         else:
             time.sleep(1.0)
+        print('.', end='', flush=True)
 
     # if we get here via a break, kill any remaining games
     if devs:

From a8a8f801f7bfe1d490224006689ed42487665f4e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 10 Sep 2020 15:33:06 -0700
Subject: [PATCH 23/25] tweak string

---
 xwords4/android/app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index bee8e941f..eb8ef61bf 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -502,7 +502,7 @@
     number %1$s on %2$s</string>
     <string name="invit_expl_usrsms_fmt">Invite sent via SMS to %1$s on %2$s</string>
     <!-- shown when user chooses to invite via the default SMS app -->
-    <string name="sms_invite_flakey">This new option launches your
+    <string name="sms_invite_flakey">This option launches your
     default SMS app with an invitation ready to send—when it
     works. Each SMS app is different, and some won’t
     cooperate.</string>

From db366bb515783eba1c9adeb70cd9606666eb5835 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Sep 2020 09:37:23 -0700
Subject: [PATCH 24/25] cleanup

---
 .../app/src/main/java/org/eehouse/android/xw4/GameUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 116628213..88c203c92 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -1088,7 +1088,7 @@ public class GameUtils {
                 }
             } catch ( GameLock.GameLockedException gle ) {
                 DbgUtils.toastNoLock( TAG, context, rowid,
-                                      "feedMessage(): dropping message "
+                                      "feedMessage(): dropping message"
                                       + " for %d", rowid );
             }
         }

From 0cee3c8d60f13796911595c4d4c8f9f695fd3061 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Sep 2020 15:54:59 -0700
Subject: [PATCH 25/25] add systemd service file for relay

---
 xwords4/relay/relay.service | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 xwords4/relay/relay.service

diff --git a/xwords4/relay/relay.service b/xwords4/relay/relay.service
new file mode 100644
index 000000000..57f5097c8
--- /dev/null
+++ b/xwords4/relay/relay.service
@@ -0,0 +1,24 @@
+[Unit]
+#  specifies metadata and dependencies
+Description=Start legacy CrossWords relay
+After=postgresql.service
+
+StartLimitIntervalSec=500
+StartLimitBurst=5
+
+[Service]
+# Service specify the user and group under which our process will run.
+User=relay
+
+WorkingDirectory=/home/relay/dev/git/xwords/xwords4/relay
+ExecStart=/home/relay/dev/git/xwords/xwords4/relay/xwrelay -F -D
+
+# on-failure ignores SIGTERM and a couple of other signals making it
+# harder to test. Not sure if there's downside to 'always' but that's
+# what I'm using for now
+# Restart=on-failure
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target