diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
index dc188fc52..9045bf8e5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
@@ -388,6 +388,13 @@ public class PrefsDelegate extends DelegateBase
             hideOne( R.string.key_show_fcm, R.string.pref_group_relay_title );
         }
 
+        if ( BuildConfig.DEBUG ) {
+            hideOne( R.string.key_logging_on, R.string.advanced_summary );
+            hideOne( R.string.key_enable_debug, R.string.advanced_summary );
+        } else {
+            hideOne( R.string.key_unhide_dupmode, R.string.advanced_summary );
+        }
+
         if ( CommonPrefs.getDupModeHidden( m_activity ) ) {
             hideOne( R.string.key_init_dupmodeon, R.string.key_prefs_defaults );
         }
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 5e330dc4d..3e7fbb12c 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2196,10 +2196,8 @@
     <string name="relay_via_http_first_summary">(instead of as fallback for custom protocol)</string>
     <string name="dict_host">Wordlist download URL</string>
     <string name="logging_on">Enable logging</string>
-    <string name="logging_on_summary">(release builds only)</string>
     <string name="debug_features">Enable debug features</string>
-    <string name="debug_features_summary">Menuitems etc. (release builds
-  only)</string>
+    <string name="debug_features_summary">Menuitems etc.</string>
     <string name="board_menu_game_netstats">Network stats</string>
     <string name="board_menu_game_showInvites">Show invites</string>
     <string name="netstats_title">Game network stats</string>
diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml
index 159235d74..7892f5df3 100644
--- a/xwords4/android/app/src/main/res/xml/xwprefs.xml
+++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml
@@ -373,11 +373,11 @@
   <!-- For Debugging -->
   <PreferenceScreen android:title="@string/advanced"
                     android:summary="@string/advanced_summary"
+                    android:key="@string/advanced_summary"
                     >
 
     <CheckBoxPreference android:key="@string/key_logging_on"
                         android:title="@string/logging_on"
-                        android:summary="@string/logging_on_summary"
                         android:defaultValue="false"
                         />
     <CheckBoxPreference android:key="@string/key_enable_debug"
diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml
index c2555f1f2..ea1e48359 100644
--- a/xwords4/android/res_src/values-ca/strings.xml
+++ b/xwords4/android/res_src/values-ca/strings.xml
@@ -652,7 +652,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
     <string name="advanced">Per a depuració</string>
     <string name="advanced_summary">No hauríeu de necessitar això...</string>
     <string name="relay_host">Amfitrió de repetició</string>
-    <string name="logging_on_summary">(només construccions de desenvolupament)</string>
     <string name="debug_features">Habilita les característiques de depuració</string>
     <string name="debug_features_summary">Elements del menú, etc. (només construccions de depuració)</string>
     <string name="name_dict_fmt">%1$s/%2$s</string>
diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml
index 9048f1863..303dff83f 100644
--- a/xwords4/android/res_src/values-de/strings.xml
+++ b/xwords4/android/res_src/values-de/strings.xml
@@ -733,7 +733,6 @@
     <string name="disable_nag_summary">Nicht benachrichtigen, egal wie lange ich schon am Zug bin</string>
     <string name="advanced">Zur Fehlersuche</string>
     <string name="logging_on">Protokollierung aktivieren</string>
-    <string name="logging_on_summary">(nur bei Release-Builds)</string>
     <string name="debug_features">Fehlersuche aktivieren</string>
     <string name="board_menu_game_netstats">Netzwerk-Statistiken</string>
     <string name="gamel_menu_loaddb">Partien von SD-Karte laden</string>
diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml
index 9bcf9f355..f3152d3ba 100644
--- a/xwords4/android/res_src/values-fr/strings.xml
+++ b/xwords4/android/res_src/values-fr/strings.xml
@@ -2864,9 +2864,6 @@ changement, ou l\'éditer pour lui attribuer une façon de se connecter ?</stri
     <!--<string name="logging_on">Enable logging</string>-->
     <string name="logging_on">Activer les logs</string>
     <!--XLATE-ME-->
-    <!--<string name="logging_on_summary">(release builds only)</string>-->
-    <string name="logging_on_summary">(seulement pour les release builds)</string>
-    <!--XLATE-ME-->
     <!--<string name="debug_features">Enable debug features</string>-->
     <string name="debug_features">Activer les fonctionnalités de débuggage</string>
     <!--XLATE-ME-->
diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml
index 0baa9eb25..00cbc5a5b 100644
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@@ -710,7 +710,6 @@
     <string name="redir_host">リダイレクト ホストを招待</string>
     <string name="dict_host">単語リストのダウンロード URL</string>
     <string name="logging_on">ログを有効にする</string>
-    <string name="logging_on_summary">(リリース ビルドのみ)</string>
     <string name="debug_features">デバッグ機能を有効にする</string>
     <string name="debug_features_summary">メニュー項目等 (リリース ビルドのみ)</string>
     <string name="title_send_data_sms">データとして SMS を送信</string>
diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml
index 651bb7366..b4a067195 100644
--- a/xwords4/android/res_src/values-nb-rNO/strings.xml
+++ b/xwords4/android/res_src/values-nb-rNO/strings.xml
@@ -666,7 +666,6 @@
     <string name="relay_host">Relé-vert</string>
     <string name="relay_via_http_first">Bruk vev-API-er først</string>
     <string name="dict_host">Ordlistenedlastingsnettadresse</string>
-    <string name="logging_on_summary">(kun utgivelsesbygg)</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>
diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml
index 9ff9ff937..0d496400f 100644
--- a/xwords4/android/res_src/values-nl/strings.xml
+++ b/xwords4/android/res_src/values-nl/strings.xml
@@ -712,7 +712,6 @@
   <string name="redir_host">Host om uitnodigingen door te sturen</string>
   <string name="dict_host">Woordenlijst download URL</string>
   <string name="logging_on">Schakel logs in</string>
-  <string name="logging_on_summary">(enkel uitgegeven versies)</string>
   <string name="debug_features">Schakel debug functies in</string>
   <string name="debug_features_summary">Menuitems etc. (enkel uitgegeven versies)</string>
   <string name="title_send_data_sms">Verstuur SMS als data</string>
diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml
index f437b4c97..2326c18b5 100644
--- a/xwords4/android/res_src/values-pl/strings.xml
+++ b/xwords4/android/res_src/values-pl/strings.xml
@@ -765,7 +765,6 @@
     <string name="relay_via_http_first_summary">(zamiast jako powrót do niestandardowego protokołu)</string>
     <string name="dict_host">Adres URL pobierania listy słów kluczowych</string>
     <string name="logging_on">Włącz rejestrowanie</string>
-    <string name="logging_on_summary">(tylko wersje kompilacji)</string>
     <string name="debug_features">Włącz funkcje debugowania</string>
     <string name="debug_features_summary">Elementy menu itp. (Tylko wersje kompilacji)</string>
     <string name="board_menu_game_netstats">Statystyki sieci</string>