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 6ac24c934..6eec69faf 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
@@ -1,6 +1,6 @@
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
/*
- * Copyright 2009 - 2019 by Eric House (xwords@eehouse.org). All rights
+ * Copyright 2009 - 2020 by Eric House (xwords@eehouse.org). All rights
* reserved.
*
* This program is free software; you can redistribute it and/or
@@ -344,6 +344,22 @@ public class GamesListDelegate extends ListDelegateBase
return m_groupPositions;
}
+ String formatGroupNames( long[] groupIDs )
+ {
+ List names = new ArrayList<>();
+ // Iterate in-order to produce strings in order
+ long[] inOrder = getGroupPositions();
+ for ( long id : inOrder ) {
+ for ( long inSet : groupIDs ) {
+ if ( id == inSet ) {
+ names.add( groupName( id ) );
+ break;
+ }
+ }
+ }
+ return TextUtils.join( ", ", names );
+ }
+
int getChildrenCount( long groupID )
{
GameGroupInfo ggi = DBUtils.getGroups( m_activity ).get( groupID );
@@ -2045,8 +2061,9 @@ public class GamesListDelegate extends ListDelegateBase
makeOkOnlyBuilder( msg ).show();
} else {
Assert.assertTrue( 0 < groupIDs.length );
+ String names = m_adapter.formatGroupNames( groupIDs );
msg = getQuantityString( R.plurals.groups_confirm_del_fmt,
- groupIDs.length, groupIDs.length );
+ groupIDs.length, names );
int nGames = 0;
for ( long tmp : groupIDs ) {
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index f85f71f6d..155351245 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1956,14 +1956,16 @@
Move down
My games
New games
+
- - Are you sure you want to delete
- the selected group?
- - Are you sure you want to delete
- the %1$d selected group[s]?
+ - Are you sure you want to delete
+ the group %1$s?
+ - Are you sure you want to delete
+ the groups %1$s?
- - \n\n(one game will also be deleted.)
+ - \n\n(One game will also be deleted.)
- \n\n(%1$d games will also be
deleted.)
diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml
index d29427b5f..4e3761a7e 100644
--- a/xwords4/android/res_src/values-ca/strings.xml
+++ b/xwords4/android/res_src/values-ca/strings.xml
@@ -454,10 +454,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
Mou avall
Partides
Partides noves
-
- - Esteu segur de voler suprimir el grup seleccionat?
- - Esteu segur de voler suprimir els %1$d grups seleccionats?
-
Canvia el nom d\'aquest grup a:
- %1$s (%2$d partida)
diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml
index e4c91d247..b02f777c1 100644
--- a/xwords4/android/res_src/values-de/strings.xml
+++ b/xwords4/android/res_src/values-de/strings.xml
@@ -518,10 +518,6 @@
Nach unten verschieben
Meine Partien
Neue Partien
-
- - Wollen Sie die ausgewählte Gruppe wirklich löschen?
- - Wollen Sie die %1$d ausgewählten Gruppen wirklich löschen?
-
- "
\n
diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml
index 8723b03dc..296958326 100644
--- a/xwords4/android/res_src/values-fr/strings.xml
+++ b/xwords4/android/res_src/values-fr/strings.xml
@@ -2257,14 +2257,7 @@ mots ?
Mes parties
Nouvelles parties
-
-
-
- - Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?
- - Êtes-vous sûr de vouloir supprimer les %1$d groupes sélectionnés ?
-
+