Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

use <plurals> for dictionary deletion string

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1257
xwords4/android/XWords4/archive/R.java
View file

File diff suppressed because it is too large Load diff

13
xwords4/android/XWords4/res/values-fr/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<!-- What is \u200C? English strings are used as keys, so they all
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
wordlist is substituted for %1$s. Sometimes one of the two
strings below is appended. -->
<string name="confirm_delete_dict_fmt">Êtes-vous sûr de vouloir effacer les
listes de mots %1$s ?</string>
<plurals name="confirm_delete_dict_fmt">
<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
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>
<!-- 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
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>-->
<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
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>-->

8
xwords4/android/XWords4/res/values/strings.xml
View file

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

8
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

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

8
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

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

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
View file

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