use <plurals> for dictionary deletion string

This commit is contained in:
Eric House 2015-03-25 04:52:02 -07:00
parent 51e86269ac
commit 1cd450bb7b
6 changed files with 658 additions and 640 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version='1.0' encoding='UTF-8'?>
<resources> <resources>
<!-- What is \u200C? English strings are used as keys, so they all <!-- What is \u200C? English strings are used as keys, so they all
need to be unique. This glyph is non-printing and of need to be unique. This glyph is non-printing and of
@ -235,8 +234,10 @@ toutes les informations de connexion.)</item>
beside the listing of a wordlist is tapped. The name of the beside the listing of a wordlist is tapped. The name of the
wordlist is substituted for %1$s. Sometimes one of the two wordlist is substituted for %1$s. Sometimes one of the two
strings below is appended. --> strings below is appended. -->
<string name="confirm_delete_dict_fmt">Êtes-vous sûr de vouloir effacer les <plurals name="confirm_delete_dict_fmt">
listes de mots %1$s ?</string> <item quantity="other">Êtes-vous sûr de vouloir effacer les
listes de mots %1$s ?</item>
</plurals>
<!-- Additional text appended to text confirm_delete_dictf in the <!-- Additional text appended to text confirm_delete_dictf in the
wordlist delete confiration dialog in the case where the wordlist delete confiration dialog in the case where the
@ -754,7 +755,7 @@ coup ?</string>
<string name="board_menu_undo_last">Annuler le dernier tour</string> <string name="board_menu_undo_last">Annuler le dernier tour</string>
<!-- Title of submenu --> <!-- Title of submenu -->
<string name="board_submenu_game">Partie -></string> <string name="board_submenu_game">Partie -&gt;</string>
<!-- menu on Game submenu: brings up dialog listing all tiles in <!-- menu on Game submenu: brings up dialog listing all tiles in
the language of the game along with how many of each there the language of the game along with how many of each there
@ -2569,7 +2570,7 @@ activer les parties par SMS, allez dans Paramètres->Paramètres des parties en
réseau.)</string>--> réseau.)</string>-->
<string name="warn_sms_disabled">Les parties par SMS sont actuellement <string name="warn_sms_disabled">Les parties par SMS sont actuellement
désactivées, donc aucun coup ne sera envoyé pour cette partie. (Si vous voulez désactivées, donc aucun coup ne sera envoyé pour cette partie. (Si vous voulez
activer les parties par SMS, allez dans Paramètres->Paramètres des parties en réseau.)</string> activer les parties par SMS, allez dans Paramètres-&gt;Paramètres des parties en réseau.)</string>
<!-- --> <!-- -->
<!--<string name="gamel_menu_checkupdates">Check for updates</string>--> <!--<string name="gamel_menu_checkupdates">Check for updates</string>-->

View file

@ -233,8 +233,12 @@
beside the listing of a wordlist is tapped. The name of the beside the listing of a wordlist is tapped. The name of the
wordlist is substituted for %1$s. Sometimes one of the two wordlist is substituted for %1$s. Sometimes one of the two
strings below is appended. --> strings below is appended. -->
<string name="confirm_delete_dict_fmt">Are you sure you want to <plurals name="confirm_delete_dict_fmt">
delete the wordlist[s] %1$s?</string> <item quantity="one">Are you sure you want to delete the
wordlist %1$s?</item>
<item quantity="other">Are you sure you want to delete the
wordlists %1$s?</item>
</plurals>
<!-- Additional text appended to text confirm_delete_dictf in the <!-- Additional text appended to text confirm_delete_dictf in the
wordlist delete confiration dialog in the case where the wordlist delete confiration dialog in the case where the

View file

@ -205,8 +205,12 @@
beside the listing of a wordlist is tapped. The name of the beside the listing of a wordlist is tapped. The name of the
wordlist is substituted for %1$s. Sometimes one of the two wordlist is substituted for %1$s. Sometimes one of the two
strings below is appended. --> strings below is appended. -->
<string name="confirm_delete_dict_fmt">Era uoy erus uoy tnaw ot <plurals name="confirm_delete_dict_fmt">
eteled eht ]s[tsildrow %1$s?</string> <item quantity="one">Era uoy erus uoy tnaw ot eteled eht
tsildrow %1$s?</item>
<item quantity="other">Era uoy erus uoy tnaw ot eteled eht
stsildrow %1$s?</item>
</plurals>
<!-- Additional text appended to text confirm_delete_dictf in the <!-- Additional text appended to text confirm_delete_dictf in the
wordlist delete confiration dialog in the case where the wordlist delete confiration dialog in the case where the
wordlist to be deleted is the last in its language. The name wordlist to be deleted is the last in its language. The name

View file

@ -205,8 +205,12 @@
beside the listing of a wordlist is tapped. The name of the beside the listing of a wordlist is tapped. The name of the
wordlist is substituted for %1$s. Sometimes one of the two wordlist is substituted for %1$s. Sometimes one of the two
strings below is appended. --> strings below is appended. -->
<string name="confirm_delete_dict_fmt">ARE YOU SURE YOU WANT TO <plurals name="confirm_delete_dict_fmt">
DELETE THE WORDLIST[S] %1$s?</string> <item quantity="one">ARE YOU SURE YOU WANT TO DELETE THE
WORDLIST %1$s?</item>
<item quantity="other">ARE YOU SURE YOU WANT TO DELETE THE
WORDLISTS %1$s?</item>
</plurals>
<!-- Additional text appended to text confirm_delete_dictf in the <!-- Additional text appended to text confirm_delete_dictf in the
wordlist delete confiration dialog in the case where the wordlist delete confiration dialog in the case where the
wordlist to be deleted is the last in its language. The name wordlist to be deleted is the last in its language. The name

View file

@ -709,8 +709,8 @@ public class DictsDelegate extends ListDelegateBase
private void deleteSelected() private void deleteSelected()
{ {
XWListItem[] items = getSelItems(); XWListItem[] items = getSelItems();
String msg = getString( R.string.confirm_delete_dict_fmt, String msg = getQuantityString( R.plurals.confirm_delete_dict_fmt,
getJoinedNames( items ) ); items.length, getJoinedNames( items ) );
// Confirm. And for each dict, warn if (after ALL are deleted) any // Confirm. And for each dict, warn if (after ALL are deleted) any
// game will no longer be openable without downloading. For now // game will no longer be openable without downloading. For now