From bd7bfb328e35ff812d37c1566789263152e411e7 Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 20 Mar 2015 07:28:40 -0700 Subject: [PATCH] use localized language names; add some quantity="one" plurals items for English; revert one to because the quantity is fixed and knowable and a pain to pass to getQuantityString(). --- xwords4/android/XWords4/archive/R.java | 554 +++++++++--------- .../android/XWords4/res/values-fr/strings.xml | 8 +- .../XWords4/res/values/common_rsrc.xml | 34 +- .../android/XWords4/res/values/strings.xml | 74 ++- .../XWords4/res_src/values-ba_CK/strings.xml | 44 +- .../XWords4/res_src/values-ca_PS/strings.xml | 44 +- .../org/eehouse/android/xw4/DlgDelegate.java | 4 +- 7 files changed, 406 insertions(+), 356 deletions(-) diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 106a1cabf..3b542ae90 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -337,15 +337,7 @@ public final class R { /** %1$d bluetooth errors so far %1$d erreurs Bluetooth jusqu\'à maintenant */ - public static final int bt_err_count_fmt=0x7f07001c; - /** - -Bluetooth send to %1$s failed; retry %3$d in - %2$d seconds. -Un envoi Bluetooth à %1$s a échoué ; essai -%3$d dans %2$d secondes. - */ - public static final int bt_resend_fmt=0x7f07000e; + public static final int bt_err_count_fmt=0x7f07001b; /** Text of confirmation dialog posted when list_item_reset menu is selected Text of confirmation dialog posted when list_item_reset menu @@ -364,7 +356,7 @@ toutes les informations de connexion.) Êtes-vous sûr de vouloir effacer les %1$d mots sélectionnés ?\n\n(Cette action ne peut pas être annulée.) */ - public static final int confirm_studylist_clear_fmt=0x7f070013; + public static final int confirm_studylist_clear_fmt=0x7f070012; /** %1$s (%2$d words using %3$d @@ -383,19 +375,19 @@ les %1$d mots sélectionnés ?\n\n(Cette action ne peut pas être annulée.)%1$s (%2$d games) %1$s (%2$d parties) */ - public static final int group_name_fmt=0x7f070012; + public static final int group_name_fmt=0x7f070011; /** Are you sure you want to delete the %1$d selected group[s]? Êtes-vous sûr de vouloir effacer les %1$d groupes sélectionnés ? */ - public static final int groups_confirm_del_fmt=0x7f070010; + public static final int groups_confirm_del_fmt=0x7f07000f; /** \n\n(%1$d game[s] will also be deleted.) \n\n(%1$d parties seront aussi effacées.) */ - public static final int groups_confirm_del_games_fmt=0x7f070011; + public static final int groups_confirm_del_games_fmt=0x7f070010; /** Please select the %1$d device[s] @@ -437,19 +429,19 @@ fait ? Vérifiez les %1$d numéros de téléphone que vous voulez inviter à votre partie, puis touchez \"%2$s\". */ - public static final int invite_sms_desc_fmt=0x7f07000f; + public static final int invite_sms_desc_fmt=0x7f07000e; /** %1$s (%2$d wordlists) %1$s (%2$d listes de mots) */ - public static final int lang_name_fmt=0x7f070016; + public static final int lang_name_fmt=0x7f070015; /** %1$s played %2$s for %3$d points %1$s a joué %2$s pour %3$d points */ - public static final int lmi_move_fmt=0x7f07001a; + public static final int lmi_move_fmt=0x7f070019; /** %1$s traded %2$d tiles %1$s a échangé %2$d jetons */ - public static final int lmi_trade_fmt=0x7f07001b; + public static final int lmi_trade_fmt=0x7f07001a; /** Otherwise they're listed with this to give some indication of how far along they are. I may list "tiles left" someday instead... @@ -479,11 +471,11 @@ relai dans le salon \"%2$s\". En attente de %3$d joueur[s]. /** %1$d day[s] %1$d jour[s] */ - public static final int nag_days_fmt=0x7f070019; + public static final int nag_days_fmt=0x7f070018; /** %1$d hour[s] %1$d heure[s] */ - public static final int nag_hours_fmt=0x7f070018; + public static final int nag_hours_fmt=0x7f070017; /** body of warning notification reminder message. First three are used to build a string based on the length of time that's then inserted in the fourth. E.g "PlayerName moved more than 2 day[s], @@ -495,20 +487,20 @@ relai dans le salon \"%2$s\". En attente de %3$d joueur[s]. %1$d minute[s] %1$d minute[s] */ - public static final int nag_minutes_fmt=0x7f070017; + public static final int nag_minutes_fmt=0x7f070016; /** Installed %1$d new translations %1$d nouvelles traductions installées */ - public static final int new_xlations_fmt=0x7f070015; + public static final int new_xlations_fmt=0x7f070014; /** XLATE-ME %1$d player[s] %1$d joueur[s] */ - public static final int nplayers_fmt=0x7f07001d; + public static final int nplayers_fmt=0x7f07001c; /** %1$d word[s] copied %1$d mots copiés */ - public static final int paste_done_fmt=0x7f070014; + public static final int paste_done_fmt=0x7f070013; /** Toast shown when players are missing, same time as above but more subtle. Toast shown when players are missing, same time as above @@ -601,16 +593,16 @@ tous les chevalets :\n public static final int about_web=0x7f0501ba; /** %1$s added to %2$s studylist */ - public static final int add_done_fmt=0x7f050264; + public static final int add_done_fmt=0x7f050265; /** Add %1$s to studylist */ - public static final int add_to_study_fmt=0x7f05025e; + public static final int add_to_study_fmt=0x7f05025f; /** Debugging stuff. Localize if you think your langauge users will care. XLATE-ME For debugging */ - public static final int advanced=0x7f0502c5; + public static final int advanced=0x7f0502c6; /** This button takes you to the normal Game Configure screen This button takes you to the normal Game Configure screen Advanced game settings @@ -619,7 +611,7 @@ XLATE-ME /** XLATE-ME You should never need these... */ - public static final int advanced_summary=0x7f0502c6; + public static final int advanced_summary=0x7f0502c7; /** The wordlist %1$s contains only @@ -633,7 +625,7 @@ XLATE-ME on the device %1$s. Please check that the device is within range and that Crosswords is installed on it. */ - public static final int app_not_found_fmt=0x7f0502a8; + public static final int app_not_found_fmt=0x7f0502a9; public static final int app_version=0x7f050000; /** the background color of the area outside the board, e.g. between entries in the scoreboard @@ -669,7 +661,7 @@ XLATE-ME board menu for small devices only Browse wordlist */ - public static final int board_menu_dict=0x7f05020b; + public static final int board_menu_dict=0x7f05020c; /** ############################################################ # :Menus: @@ -738,7 +730,7 @@ XLATE-ME /** XLATE-ME Network stats */ - public static final int board_menu_game_netstats=0x7f0502d0; + public static final int board_menu_game_netstats=0x7f0502d1; /** Meaningful only for networked games, this menu causes all messages that have not yet been acknowledged by a remote device in the game to be resent. Eventually I hope to be @@ -757,7 +749,7 @@ XLATE-ME public static final int board_menu_game_resign=0x7f0500f4; /** Invite */ - public static final int board_menu_invite=0x7f050257; + public static final int board_menu_invite=0x7f050258; /** Pass @@ -784,7 +776,7 @@ XLATE-ME Undo/Redo */ - public static final int board_menu_undo_current=0x7f050205; + public static final int board_menu_undo_current=0x7f050206; /** Undos the last *committed* turn. Note that this is different from the undo button that undoes or redoes an in-progress not-yet-committed turn. This is disabled for networked @@ -870,18 +862,18 @@ XLATE-ME Bluetooth sends to %1$s have failed too many times. Re-open the game to try again. */ - public static final int bt_fail_fmt=0x7f0501ec; + public static final int bt_fail_fmt=0x7f0501ed; /** Title of device picker during invitation to a game via Bluetooth Title of device picker during invitation to a game via Bluetooth Bluetooth Invitation */ - public static final int bt_invite_title=0x7f0501ee; + public static final int bt_invite_title=0x7f0501ef; /** You currently have no paired Bluetooth devices. Would you like to open the Android Settings Panel to add one or more?\n\n(You may also need to open it on the device you want to pair with.) */ - public static final int bt_no_devs=0x7f0502a7; + public static final int bt_no_devs=0x7f0502a8; /** Turn Bluetooth on In the Bluetooth invite device dialog In the Bluetooth invite device dialog @@ -893,6 +885,14 @@ XLATE-ME Remove checked */ public static final int bt_pick_clear_button=0x7f0501df; + /** + +Bluetooth send to %1$s failed; retry %3$d in + %2$d seconds. +Un envoi Bluetooth à %1$s a échoué ; essai +%3$d dans %2$d secondes. + */ + public static final int bt_resend_fmt=0x7f0501ec; /** text of button for adding new player to game text of button for adding new player to game Add player @@ -908,7 +908,7 @@ XLATE-ME public static final int button_close_game=0x7f050186; /** Decline */ - public static final int button_decline=0x7f050237; + public static final int button_decline=0x7f050238; /** */ @@ -953,7 +953,7 @@ XLATE-ME /** XLATE-ME Discard changes */ - public static final int button_discard_changes=0x7f0502c2; + public static final int button_discard_changes=0x7f0502c3; /** Done @@ -972,21 +972,21 @@ XLATE-ME /** XLATE-ME Edit */ - public static final int button_edit=0x7f0502c1; + public static final int button_edit=0x7f0502c2; /** XLATE-ME Enable Bluetooth */ - public static final int button_enable_bt=0x7f050223; + public static final int button_enable_bt=0x7f050224; /** XLATE-ME Enable SMS */ - public static final int button_enable_sms=0x7f050222; - public static final int button_go_settings=0x7f050259; + public static final int button_enable_sms=0x7f050223; + public static final int button_go_settings=0x7f05025a; /** Invite checked */ - public static final int button_invite=0x7f0501ed; + public static final int button_invite=0x7f0501ee; /** text of button to juggle (randomly rearrange order of) players text of button to juggle (randomly rearrange order of) players Shuffle players @@ -995,7 +995,7 @@ XLATE-ME /** XLATE-ME Later */ - public static final int button_later=0x7f050224; + public static final int button_later=0x7f050225; /** New strings that need to be documented and found a home above. New strings that need to be documented and found a home @@ -1085,7 +1085,7 @@ XLATE-ME public static final int button_ok=0x7f050190; /** Reconnect */ - public static final int button_reconnect=0x7f050249; + public static final int button_reconnect=0x7f05024a; /** Button shown in game over dialog triggering creation of new game with the same players and parameters as the one that just ended. @@ -1094,7 +1094,7 @@ XLATE-ME just ended. Rematch */ - public static final int button_rematch=0x7f050248; + public static final int button_rematch=0x7f050249; /** 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). @@ -1158,7 +1158,7 @@ XLATE-ME Import contact */ - public static final int button_sms_add=0x7f0501f8; + public static final int button_sms_add=0x7f0501f9; /** Text of button allowing user to choose to open with a different (but same-language wordlist) Text of button allowing user to choose to open with a @@ -1202,10 +1202,10 @@ XLATE-ME /** The group for new games, %1$s, cannot be deleted. */ - public static final int cannot_delete_default_group_fmt=0x7f050247; + public static final int cannot_delete_default_group_fmt=0x7f050248; /** Move selected games to: */ - public static final int change_group=0x7f05024c; + public static final int change_group=0x7f05024d; /** text of button in About Crosswords dialog summoning above dialog text of button in About Crosswords dialog summoning above @@ -1291,7 +1291,7 @@ XLATE-ME public static final int chat_title_fmt=0x7f05016f; /** Everything is up-to-date. */ - public static final int checkupdates_none_found=0x7f050226; + public static final int checkupdates_none_found=0x7f050227; /** color of the "crosshairs", lines drawn vertically and horizontally through the square the user is currently touching in order to guide the fat-fingered (most of us) in @@ -1310,13 +1310,13 @@ XLATE-ME and cannot be saved. Would you like to discard your changes, or edit to give it a way to connect? */ - public static final int config_no_connvia=0x7f0502c0; + public static final int config_no_connvia=0x7f0502c1; /** Are you sure you want to delete the checked phone number[s]? */ - public static final int confirm_clear=0x7f0501fd; + public static final int confirm_clear=0x7f0501fe; /** text of confirmation dialog posted when the delete 'X' button beside the listing of a wordlist is tapped. The name of the wordlist is substituted for %1$s. Sometimes one of the two @@ -1374,32 +1374,32 @@ XLATE-ME charge you for each and every message!\n\nShould play via SMS be enabled? */ - public static final int confirm_sms_expl=0x7f05021b; + public static final int confirm_sms_expl=0x7f05021c; /** No: leave disabled */ - public static final int confirm_sms_leave=0x7f05021d; + public static final int confirm_sms_leave=0x7f05021e; /** Enable play via SMS? */ - public static final int confirm_sms_prompt=0x7f05021c; + public static final int confirm_sms_prompt=0x7f05021d; /** Confirm your SMS plan */ - public static final int confirm_sms_title=0x7f05021a; + public static final int confirm_sms_title=0x7f05021b; /** Yes: I have unlimited texting */ - public static final int confirm_sms_unlimited=0x7f05021e; + public static final int confirm_sms_unlimited=0x7f05021f; /** Yes: I\'ll pay all carrier charges */ - public static final int confirm_sms_willpay=0x7f05021f; + public static final int confirm_sms_willpay=0x7f050220; /** text of dialog shown when the menu item board_menu_undo_last is chosen. text of dialog shown when the menu item board_menu_undo_last @@ -1451,7 +1451,7 @@ XLATE-ME Connection (via SMS/text) */ - public static final int connect_label_sms=0x7f0501fe; + public static final int connect_label_sms=0x7f0501ff; /** These are the possible values for the connect_frequency setting presented as a drop-down list. These are the possible values for the connect_frequency @@ -1471,65 +1471,65 @@ XLATE-ME /** XLATE-ME Change Communicate via */ - public static final int connection_via_label=0x7f0502b9; + public static final int connection_via_label=0x7f0502ba; /** (Last failure was %1$s) */ - public static final int connstat_lastother_succ_fmt=0x7f050212; + public static final int connstat_lastother_succ_fmt=0x7f050213; /** (Last successful send was %1$s) */ - public static final int connstat_lastother_unsucc_fmt=0x7f050213; + public static final int connstat_lastother_unsucc_fmt=0x7f050214; /** Last receipt was %1$s */ - public static final int connstat_lastreceipt_fmt=0x7f050214; + public static final int connstat_lastreceipt_fmt=0x7f050215; /** Last send was %1$s (%2$s) */ - public static final int connstat_lastsend_fmt=0x7f050211; + public static final int connstat_lastsend_fmt=0x7f050212; /** Network status for game connected via %1$s: */ - public static final int connstat_net_fmt=0x7f05020e; + public static final int connstat_net_fmt=0x7f05020f; /** This is a standalone game. There is no network status. */ - public static final int connstat_nonet=0x7f05020d; + public static final int connstat_nonet=0x7f05020e; /** No messages have been received. */ - public static final int connstat_noreceipt=0x7f050215; + public static final int connstat_noreceipt=0x7f050216; /** internet/relay */ - public static final int connstat_relay=0x7f050216; + public static final int connstat_relay=0x7f050217; /** sms/texting */ - public static final int connstat_sms=0x7f050217; + public static final int connstat_sms=0x7f050218; /** successful */ - public static final int connstat_succ=0x7f05020f; + public static final int connstat_succ=0x7f050210; /** unsuccessful */ - public static final int connstat_unsucc=0x7f050210; + public static final int connstat_unsucc=0x7f050211; /** title of dialog brought up in response to the board_menu_game_counts menu. The dialog lists all tiles in the language being used for the game together with how many @@ -1543,7 +1543,7 @@ XLATE-ME public static final int counts_values_title=0x7f05019b; /** %1$s (in use) */ - public static final int cur_menu_marker_fmt=0x7f050256; + public static final int cur_menu_marker_fmt=0x7f050257; /** Tile picker\n(so far: %1$s) @@ -1551,16 +1551,16 @@ XLATE-ME public static final int cur_tiles_fmt=0x7f0501d0; /** SMS Data is only available on GSM phones. */ - public static final int data_gsm_only=0x7f050273; + public static final int data_gsm_only=0x7f050274; /** XLATE-ME Enable debug features */ - public static final int debug_features=0x7f0502cc; + public static final int debug_features=0x7f0502cd; /** XLATE-ME Menuitems etc. (release builds only) */ - public static final int debug_features_summary=0x7f0502cd; + public static final int debug_features_summary=0x7f0502ce; /** dictionary used by default for human players when creating new game dictionary used by default for human players when creating @@ -1575,13 +1575,13 @@ XLATE-ME label within default wordlists in app preferences Default language */ - public static final int default_language=0x7f0502a9; + public static final int default_language=0x7f0502aa; /** Store wordlists internally */ - public static final int default_loc=0x7f05023a; + public static final int default_loc=0x7f05023b; /** (Not in external/sdcard memory) */ - public static final int default_loc_summary=0x7f05023b; + public static final int default_loc_summary=0x7f05023c; /** Welcome dialog text Welcome dialog text Thanks for installing @@ -1636,7 +1636,7 @@ XLATE-ME public static final int default_update_url=0x7f050077; /** Delete wordlist[s] */ - public static final int delete_dicts=0x7f050295; + public static final int delete_dicts=0x7f050296; /** Playing via SMS is currently disabled. You can enable it in Settings->Network game settings. @@ -1644,7 +1644,7 @@ XLATE-ME SMS Game %1$X */ - public static final int dft_sms_name_fmt=0x7f0501f5; + public static final int dft_sms_name_fmt=0x7f0501f6; /** No word in %1$s starts with @@ -1654,11 +1654,11 @@ XLATE-ME /** XLATE-ME Wordlist download URL */ - public static final int dict_host=0x7f0502c9; + public static final int dict_host=0x7f0502ca; /** Number of words: %1$d\nDownload size: %2$dK\nNote: %3$s */ - public static final int dict_info_fmt=0x7f050299; + public static final int dict_info_fmt=0x7f05029a; /** label for dropdown by which wordlist is chosen that this player will use. The language the game will use (which constrains the choice of wordlists) is substituted in for @@ -1672,7 +1672,7 @@ XLATE-ME public static final int dict_lang_label_fmt=0x7f0500d0; /** Tap to download */ - public static final int dict_on_server=0x7f05029b; + public static final int dict_on_server=0x7f05029c; /** string name="invite_mime">text/plainDownload finished */ - public static final int download_done=0x7f050238; + public static final int download_done=0x7f050239; /** Download unsuccessful */ - public static final int download_failed=0x7f050239; + public static final int download_failed=0x7f05023a; /** Downloads Directory */ - public static final int download_path_title=0x7f05023c; + public static final int download_path_title=0x7f05023d; /** Downloading %1$s… */ public static final int downloading_dict_fmt=0x7f050183; @@ -1746,7 +1746,7 @@ XLATE-ME Invitation received but ignored: it has already been used to create a game. */ - public static final int dropped_dupe=0x7f050255; + public static final int dropped_dupe=0x7f050256; /** Shown in the main screen when you launch Crosswords from an invitation (received in email or messaging app, say) and there's already a game running that matches that invitation. @@ -1795,53 +1795,53 @@ XLATE-ME \"Import contact\" button to add people you want to invite, the + button to enter numbers directly. */ - public static final int empty_sms_inviter=0x7f0501fb; + public static final int empty_sms_inviter=0x7f0501fc; /** XLATE-ME Accept invitations more than once */ - public static final int enable_dupes_summary=0x7f0502da; + public static final int enable_dupes_summary=0x7f0502db; /** XLATE-ME Accept duplicate invites */ - public static final int enable_dupes_title=0x7f0502d8; + public static final int enable_dupes_title=0x7f0502d9; /** NFC is turned off on this device. You can use the Android Settings app to turn it on . */ - public static final int enable_nfc=0x7f050258; + public static final int enable_nfc=0x7f050259; /** XLATE-ME Fake invitation to aid debugging */ - public static final int enable_nfc_toself_summary=0x7f0502dd; + public static final int enable_nfc_toself_summary=0x7f0502de; /** XLATE-ME Enable NFC to self */ - public static final int enable_nfc_toself_title=0x7f0502dc; + public static final int enable_nfc_toself_title=0x7f0502dd; /** XLATE-ME Rooms others can see and join */ - public static final int enable_pubroom_summary=0x7f0502b8; + public static final int enable_pubroom_summary=0x7f0502b9; /** XLATE-ME Enable public rooms */ - public static final int enable_pubroom_title=0x7f0502b7; + public static final int enable_pubroom_title=0x7f0502b8; /** Allow games via SMS */ - public static final int enable_sms=0x7f050218; + public static final int enable_sms=0x7f050219; /** Only if you have unlimited texting! */ - public static final int enable_sms_summary=0x7f050219; + public static final int enable_sms_summary=0x7f05021a; /** XLATE-ME Skip radio when phone numbers same */ - public static final int enable_sms_toself_summary=0x7f0502df; + public static final int enable_sms_toself_summary=0x7f0502e0; /** XLATE-ME Short-circuit SMS to self */ - public static final int enable_sms_toself_title=0x7f0502de; + public static final int enable_sms_toself_title=0x7f0502df; /** Tap tiles to select… */ public static final int entering_trade=0x7f0500d6; @@ -1850,11 +1850,11 @@ XLATE-ME device \"%1$s\" has already accepted an invitation to this game. */ - public static final int err_dup_invite_fmt=0x7f0502b2; + public static final int err_dup_invite_fmt=0x7f0502b3; /** XLATE-ME Update checks URL */ - public static final int expl_update_url=0x7f0502e9; + public static final int expl_update_url=0x7f0502ea; /** 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. @@ -1893,13 +1893,13 @@ XLATE-ME /** XLATE-ME Pretend to have radio */ - public static final int force_radio_title=0x7f0502e0; + public static final int force_radio_title=0x7f0502e1; /** Even if my screen is too small */ - public static final int force_tablet_summary=0x7f05029f; + public static final int force_tablet_summary=0x7f0502a0; /** Force tablet layout */ - public static final int force_tablet_title=0x7f05029e; + public static final int force_tablet_title=0x7f05029f; /** ############################################################ # :Dialogs: @@ -1946,7 +1946,7 @@ XLATE-ME Bluetooth game name */ - public static final int game_btname_title=0x7f0501f0; + public static final int game_btname_title=0x7f0501f1; /** used to create default names of games (when user has not named them.) used to create default names of games (when user has not @@ -1976,7 +1976,7 @@ XLATE-ME Building game summary… */ - public static final int game_list_tmp=0x7f05020c; + public static final int game_list_tmp=0x7f05020d; /** text of checkbox at top of dialog allowing to unlock in-play game to make changes text of checkbox at top of dialog allowing to unlock in-play @@ -1986,17 +1986,17 @@ XLATE-ME public static final int game_locked=0x7f0500aa; /** Name group */ - public static final int game_name_group_title=0x7f050246; + public static final int game_name_group_title=0x7f050247; /** XLATE-ME New game name: */ - public static final int game_name_label=0x7f0501f2; + public static final int game_name_label=0x7f0501f3; /** XLATE-ME Name your game */ - public static final int game_name_title=0x7f0501f1; + public static final int game_name_title=0x7f0501f2; /** */ @@ -2009,7 +2009,7 @@ XLATE-ME /** XLATE-ME gameid */ - public static final int game_summary_field_gameid=0x7f0502e7; + public static final int game_summary_field_gameid=0x7f0502e8; /** Put the language there, so it reads "Game 2 (English)" Put the language there, so it reads "Game 2 (English)" Game language\u200C @@ -2018,7 +2018,7 @@ XLATE-ME /** XLATE-ME Pending packet count */ - public static final int game_summary_field_npackets=0x7f0502e8; + public static final int game_summary_field_npackets=0x7f0502e9; /** List names of opponents (summarized), e.g. "Game 2 (vs Kati)" List names of opponents (summarized), e.g. "Game 2 (vs Kati)" Opponent name[s] @@ -2027,7 +2027,7 @@ XLATE-ME /** XLATE-ME rowid */ - public static final int game_summary_field_rowid=0x7f0502e6; + public static final int game_summary_field_rowid=0x7f0502e7; /** List the state of the game, "Game over" or "10 moves made" etc. List the state of the game, "Game over" or "10 moves made" @@ -2049,7 +2049,7 @@ XLATE-ME Check for updates */ - public static final int gamel_menu_checkupdates=0x7f050225; + public static final int gamel_menu_checkupdates=0x7f050226; /** ############################################################ # :Menus: @@ -2075,36 +2075,36 @@ XLATE-ME /** XLATE-ME Load DB from SD card */ - public static final int gamel_menu_loaddb=0x7f0502d7; + public static final int gamel_menu_loaddb=0x7f0502d8; /** XLATE-ME Write DB to SD card */ - public static final int gamel_menu_storedb=0x7f0502d6; + public static final int gamel_menu_storedb=0x7f0502d7; /** Studylist… */ - public static final int gamel_menu_study=0x7f050261; + public static final int gamel_menu_study=0x7f050262; /** Enter phone number: */ - public static final int get_sms_number=0x7f0501fc; + public static final int get_sms_number=0x7f0501fd; /** Get info */ - public static final int getinfo=0x7f050294; + public static final int getinfo=0x7f050295; public static final int git_rev=0x7f050079; /** XLATE-ME Source version id */ - public static final int git_rev_title=0x7f0502d2; + public static final int git_rev_title=0x7f0502d3; /** Green */ public static final int green=0x7f05013f; /** My games */ - public static final int group_cur_games=0x7f050243; + public static final int group_cur_games=0x7f050244; /** New games */ - public static final int group_new_games=0x7f050244; + public static final int group_new_games=0x7f050245; /** Used as the default name for remote players displayed within the Game configure screen Used as the default name for remote players displayed within @@ -2220,20 +2220,20 @@ XLATE-ME %1$s but the game host is using %2$s. Would you like to use %3$s too? */ - public static final int inform_dict_diffdict_fmt=0x7f05022f; + public static final int inform_dict_diffdict_fmt=0x7f050230; /** You and the host of this game are using different versions of the wordlist %1$s. */ - public static final int inform_dict_diffversion_fmt=0x7f05022d; + public static final int inform_dict_diffversion_fmt=0x7f05022e; /** \u0020(You will have to download it first.) */ - public static final int inform_dict_download=0x7f050230; + public static final int inform_dict_download=0x7f050231; /** Wordlist mismatch */ - public static final int inform_dict_title=0x7f05022e; + public static final int inform_dict_title=0x7f05022f; /** Will new games, on default, randomly rearrange the start order of players. Will new games, on default, randomly rearrange the start @@ -2290,16 +2290,16 @@ XLATE-ME is not installed. Would you like to download the wordlist or decline the invitation? */ - public static final int invite_dict_missing_body_fmt=0x7f050235; + public static final int invite_dict_missing_body_fmt=0x7f050236; /** You have been invited to play Crosswords using the wordlist %2$s (for play in %3$s), but it is not installed. Would you like to download the wordlist? */ - public static final int invite_dict_missing_body_noname_fmt=0x7f050236; + public static final int invite_dict_missing_body_noname_fmt=0x7f050237; /** Missing wordlist */ - public static final int invite_dict_missing_title=0x7f050234; + public static final int invite_dict_missing_title=0x7f050235; public static final int invite_host=0x7f050073; /** This is the body of the html version of the invitation. A URL is created with parameters describing the game and @@ -2332,11 +2332,11 @@ XLATE-ME /** XLATE-ME Invite more than one player per remote device */ - public static final int invite_multi_summary=0x7f0502b6; + public static final int invite_multi_summary=0x7f0502b7; /** XLATE-ME Invite multiple */ - public static final int invite_multi_title=0x7f0502b5; + public static final int invite_multi_title=0x7f0502b6; /** Most users create games with only two players, which is the default, but Crosswords supports up to four. When I'm using the above string to encourage the opener of a game missing @@ -2367,7 +2367,7 @@ XLATE-ME expect it to take a while. They will still be able to connect.) */ - public static final int invite_stays=0x7f0502bd; + public static final int invite_stays=0x7f0502be; /** Send invitation using SMS (texting) or via email? Send invitation using NFC (Android @@ -2557,44 +2557,44 @@ XLATE-ME Game language */ public static final int lang_label=0x7f0500af; - public static final int lang_name_arabic=0x7f05027e; - public static final int lang_name_catalan=0x7f050285; - public static final int lang_name_czech=0x7f050288; - public static final int lang_name_danish=0x7f050282; - public static final int lang_name_dutch=0x7f050284; - public static final int lang_name_english=0x7f05027a; - public static final int lang_name_french=0x7f05027b; - public static final int lang_name_german=0x7f05027c; - public static final int lang_name_greek=0x7f050289; - public static final int lang_name_italian=0x7f050283; - public static final int lang_name_polish=0x7f050281; - public static final int lang_name_portuguese=0x7f050286; - public static final int lang_name_russian=0x7f050287; - public static final int lang_name_slovak=0x7f05028a; - public static final int lang_name_spanish=0x7f05027f; - public static final int lang_name_swedish=0x7f050280; - public static final int lang_name_turkish=0x7f05027d; + public static final int lang_name_arabic=0x7f05027f; + public static final int lang_name_catalan=0x7f050286; + public static final int lang_name_czech=0x7f050289; + public static final int lang_name_danish=0x7f050283; + public static final int lang_name_dutch=0x7f050285; + public static final int lang_name_english=0x7f05027b; + public static final int lang_name_french=0x7f05027c; + public static final int lang_name_german=0x7f05027d; + public static final int lang_name_greek=0x7f05028a; + public static final int lang_name_italian=0x7f050284; + public static final int lang_name_polish=0x7f050282; + public static final int lang_name_portuguese=0x7f050287; + public static final int lang_name_russian=0x7f050288; + public static final int lang_name_slovak=0x7f05028b; + public static final int lang_name_spanish=0x7f050280; + public static final int lang_name_swedish=0x7f050281; + public static final int lang_name_turkish=0x7f05027e; /** Unknown */ - public static final int lang_unknown=0x7f05029c; + public static final int lang_unknown=0x7f05029d; /** Game language/wordlist */ public static final int langdict_label=0x7f0500b0; /** Put new games here */ - public static final int list_group_default=0x7f050240; + public static final int list_group_default=0x7f050241; /** Delete group */ - public static final int list_group_delete=0x7f05023e; + public static final int list_group_delete=0x7f05023f; /** Move down */ - public static final int list_group_movedown=0x7f050242; + public static final int list_group_movedown=0x7f050243; /** Move up */ - public static final int list_group_moveup=0x7f050241; + public static final int list_group_moveup=0x7f050242; /** Rename */ - public static final int list_group_rename=0x7f05023f; + public static final int list_group_rename=0x7f050240; /** ############## menu items ############## pulls up dialog to configure the selected game ############## menu items ############## @@ -2641,13 +2641,13 @@ XLATE-ME formatting for last move summary in notifications %1$s passed (0 points) */ - public static final int lmi_pass_fmt=0x7f0502a4; + public static final int lmi_pass_fmt=0x7f0502a5; /** %1$s lost a turn */ - public static final int lmi_phony_fmt=0x7f0502a5; + public static final int lmi_phony_fmt=0x7f0502a6; /** Tiles assigned to %1$s */ - public static final int lmi_tiles_fmt=0x7f0502a6; + public static final int lmi_tiles_fmt=0x7f0502a7; /** One of the strings used in the right column of the list of installed wordlists to describe those that are part of Crosswords and that cannot be uninstalled or moved. @@ -2678,54 +2678,54 @@ XLATE-ME public static final int loc_external=0x7f0500a6; /** All */ - public static final int loc_filters_all=0x7f050276; + public static final int loc_filters_all=0x7f050277; /** Latest menu */ - public static final int loc_filters_menu=0x7f050278; + public static final int loc_filters_menu=0x7f050279; /** Modified by me */ - public static final int loc_filters_modified=0x7f050279; + public static final int loc_filters_modified=0x7f05027a; /** Filter by: */ - public static final int loc_filters_prompt=0x7f050274; + public static final int loc_filters_prompt=0x7f050275; /** Latest screen */ - public static final int loc_filters_screen=0x7f050277; + public static final int loc_filters_screen=0x7f050278; /** Illegal translation: a translated string must have the same format specifiers (e.g. %1$s) as the original. */ - public static final int loc_fmts_mismatch=0x7f05028f; + public static final int loc_fmts_mismatch=0x7f050290; /** see move_dictf above see move_dictf above */ public static final int loc_internal=0x7f0500a5; /** Check */ - public static final int loc_item_check=0x7f05028c; + public static final int loc_item_check=0x7f05028d; /** for loc item edit menu for loc item edit menu Clear */ - public static final int loc_item_clear=0x7f05028b; + public static final int loc_item_clear=0x7f05028c; /** Copy official */ - public static final int loc_item_copy_bless=0x7f05028e; + public static final int loc_item_copy_bless=0x7f05028f; /** Copy English */ - public static final int loc_item_copy_eng=0x7f05028d; + public static final int loc_item_copy_eng=0x7f05028e; /** %1$s (official) */ - public static final int loc_lang_blessed=0x7f05026f; + public static final int loc_lang_blessed=0x7f050270; /** %1$s (yours) */ - public static final int loc_lang_local=0x7f050270; + public static final int loc_lang_local=0x7f050271; /** Translate */ - public static final int loc_menu_xlate=0x7f05026e; + public static final int loc_menu_xlate=0x7f05026f; /** Search for: */ - public static final int loc_search_prompt=0x7f050275; + public static final int loc_search_prompt=0x7f050276; /** This is the "hint" printed in light text in the empty player name field ############################################################ @@ -2753,19 +2753,19 @@ XLATE-ME /** XLATE-ME Enable logging */ - public static final int logging_on=0x7f0502ca; + public static final int logging_on=0x7f0502cb; /** XLATE-ME (release builds only) */ - public static final int logging_on_summary=0x7f0502cb; + public static final int logging_on_summary=0x7f0502cc; /** Word lookup */ - public static final int lookup_title=0x7f05026a; + public static final int lookup_title=0x7f05026b; /** (Not in contacts) */ - public static final int manual_owner_name=0x7f0501f9; + public static final int manual_owner_name=0x7f0501fa; /** Max length @@ -2775,44 +2775,44 @@ XLATE-ME Chat */ - public static final int menu_chat=0x7f050209; + public static final int menu_chat=0x7f05020a; /** Flip board */ - public static final int menu_flip=0x7f050207; + public static final int menu_flip=0x7f050208; /** Next hint */ - public static final int menu_hint_next=0x7f050204; + public static final int menu_hint_next=0x7f050205; /** Prev hint */ - public static final int menu_hint_prev=0x7f050203; + public static final int menu_hint_prev=0x7f050204; /** Juggle rack */ - public static final int menu_juggle=0x7f050206; + public static final int menu_juggle=0x7f050207; /** text of menu that brings up the Settings (preferences) dialog text of menu that brings up the Settings (preferences) dialog */ public static final int menu_prefs=0x7f050087; /** Rate Crosswords */ - public static final int menu_rateme=0x7f05025c; + public static final int menu_rateme=0x7f05025d; /** Toggle values */ - public static final int menu_toggle_values=0x7f05020a; + public static final int menu_toggle_values=0x7f05020b; /** Zoom in/out */ - public static final int menu_zoom=0x7f050208; + public static final int menu_zoom=0x7f050209; /** Min length @@ -2829,14 +2829,14 @@ XLATE-ME wordslist that's not installed Tap to download missing wordlist */ - public static final int missing_dict_detail=0x7f050233; + public static final int missing_dict_detail=0x7f050234; /** Title of notification shown when invitation requires a wordslist that's not installed Title of notification shown when invitation requires a wordslist that's not installed Game invitation pending */ - public static final int missing_dict_title=0x7f050232; + public static final int missing_dict_title=0x7f050233; /** Used as a substitute for the names of remote players when they aren't available yet because the connection is not complete. Displayed in the lists of players found in each @@ -2940,29 +2940,29 @@ XLATE-ME public static final int msgs_progress=0x7f050089; /** %1$s moved more than %2$s ago. */ - public static final int nag_body_fmt=0x7f0502a1; + public static final int nag_body_fmt=0x7f0502a2; /** XLATE-ME Reminder intervals (minutes1,minutes2,...) */ - public static final int nag_intervals=0x7f0502db; + public static final int nag_intervals=0x7f0502dc; /** Nagging: title of notification reminder message Nagging: title of notification reminder message Reminder: It\'s your turn */ - public static final int nag_title=0x7f0502a0; + public static final int nag_title=0x7f0502a1; /** above is inserted in this the last time I warn above is inserted in this the last time I warn Last warning: %1$s */ - public static final int nag_warn_last_fmt=0x7f0502a2; + public static final int nag_warn_last_fmt=0x7f0502a3; /** XLATE-ME %1$s copy */ - public static final int name_copy_fmt=0x7f0501f3; + public static final int name_copy_fmt=0x7f0501f4; /** XLATE-ME %1$s/%2$s */ - public static final int name_dict_fmt=0x7f0502d5; + public static final int name_dict_fmt=0x7f0502d6; public static final int nbs_port=0x7f050078; /** text of checkbox. If this checkbox is checked, games created for network play will by default have the hint feature @@ -2985,15 +2985,15 @@ XLATE-ME /** XLATE-ME Game network stats */ - public static final int netstats_title=0x7f0502d1; + public static final int netstats_title=0x7f0502d2; /** XLATE-ME For experienced players */ - public static final int network_advanced_summary=0x7f0502b4; + public static final int network_advanced_summary=0x7f0502b5; /** XLATE-ME Advanced */ - public static final int network_advanced_title=0x7f0502b3; + public static final int network_advanced_title=0x7f0502b4; /** Network game settings */ public static final int network_behavior=0x7f05014f; @@ -3007,12 +3007,12 @@ XLATE-ME Tap to download and install */ - public static final int new_app_avail=0x7f05022a; + public static final int new_app_avail=0x7f05022b; /** New version of %1$s */ - public static final int new_app_avail_fmt=0x7f050229; + public static final int new_app_avail_fmt=0x7f05022a; /** From a player on the device %1$s wants to start a game @@ -3031,36 +3031,36 @@ XLATE-ME New wordlist available */ - public static final int new_dict_avail=0x7f050227; + public static final int new_dict_avail=0x7f050228; /** Tap to update %1$s */ - public static final int new_dict_avail_fmt=0x7f050228; + public static final int new_dict_avail_fmt=0x7f050229; /** XLATE-ME New one-device game */ - public static final int new_game=0x7f0502ab; + public static final int new_game=0x7f0502ac; /** XLATE-ME Would you like to create this game using default settings?\n\nOr would you like to configure it first? */ - public static final int new_game_message=0x7f0502ad; + public static final int new_game_message=0x7f0502ae; /** XLATE-ME (You will have a chance to invite other players when it is open.) */ - public static final int new_game_message_net=0x7f0502af; + public static final int new_game_message_net=0x7f0502b0; /** XLATE-ME This game must be configured before it can be opened. */ - public static final int new_game_message_nodflt=0x7f0502ae; + public static final int new_game_message_nodflt=0x7f0502af; /** XLATE-ME New networked game */ - public static final int new_game_networked=0x7f0502ac; + public static final int new_game_networked=0x7f0502ad; /** One or more moves has arrived @@ -3070,7 +3070,7 @@ XLATE-ME %1$s has invited you to play */ - public static final int new_name_body_fmt=0x7f0501f7; + public static final int new_name_body_fmt=0x7f0501f8; /** hint (text shown when field is empty) for room name field hint (text shown when field is empty) for room name field Room name @@ -3080,7 +3080,7 @@ XLATE-ME New game via SMS */ - public static final int new_sms_title=0x7f0501f6; + public static final int new_sms_title=0x7f0501f7; /** ########################################################### # :Dialogs: @@ -3207,20 +3207,20 @@ XLATE-ME New SMS Game */ - public static final int newgame_sms_header=0x7f0501f4; + public static final int newgame_sms_header=0x7f0501f5; /** Name your new group: */ - public static final int newgroup_label=0x7f05023d; + public static final int newgroup_label=0x7f05023e; /** XLATE-ME To invite via NFC just touch the back of this device against the one you want to invite—any time the game is open. */ - public static final int nfc_just_tap=0x7f0502be; + public static final int nfc_just_tap=0x7f0502bf; /** XLATE-ME Send via NFC to self? */ - public static final int nfc_to_self=0x7f0502e5; + public static final int nfc_to_self=0x7f0502e6; /** Title of dialog for renaming game (triggered by selecting list_item_rename) If you try to copy a networked game you get this error @@ -3312,7 +3312,7 @@ XLATE-ME public static final int no_games_to_refresh=0x7f05008a; /** Google Play app not found */ - public static final int no_market=0x7f05025d; + public static final int no_market=0x7f05025e; /** displayed when you long-tap a scoreboard entry and there's no most recent score to show displayed when you long-tap a scoreboard entry and there's no @@ -3366,7 +3366,7 @@ XLATE-ME selection instead of exiting. Hit it again to exit the app. */ - public static final int not_again_backclears=0x7f050250; + public static final int not_again_backclears=0x7f050251; /** This button opens the wordlist @@ -3434,7 +3434,7 @@ XLATE-ME legal.\n\nCheck the \"Show downloadable\" box at the top to see what\'s available. */ - public static final int not_again_dicts=0x7f05029d; + public static final int not_again_dicts=0x7f05029e; /** This is shown when you choose the board_menu_done menu item. It's to let you know that there's a shortcut that does almost the same thing. @@ -3452,7 +3452,7 @@ XLATE-ME and want them back, enable them now. You can turn them off again in Settings. */ - public static final int not_again_enablepublic=0x7f0502c4; + public static final int not_again_enablepublic=0x7f0502c5; /** Shown when you tap the flip button on the toolbar of the main Board screen Shown when you tap the flip button on the toolbar of the main @@ -3466,7 +3466,7 @@ XLATE-ME the same ones as the original.\n\n(You will not be able to save it unless it does.) */ - public static final int not_again_fmt_expl=0x7f050290; + public static final int not_again_fmt_expl=0x7f050291; /** XLATE-ME These two buttons do the same thing as the first two items in this window\'s Action Bar @@ -3475,7 +3475,7 @@ XLATE-ME section of App settings). */ - public static final int not_again_hidenewgamebuttons=0x7f0502bb; + public static final int not_again_hidenewgamebuttons=0x7f0502bc; /** Shown when you tap the next hint button on the toolbar of the main Board screen Shown when you tap the next hint button on the toolbar of the @@ -3530,12 +3530,12 @@ XLATE-ME then act on selected games, e.g. to delete them, using the menu or \"Actionbar.\" */ - public static final int not_again_newselect=0x7f05024f; + public static final int not_again_newselect=0x7f050250; /** The selected words will be copied to the system clipboard. You can then paste them into any app that supports pasting text, e.g. an email app. */ - public static final int not_again_studycopy=0x7f050269; + public static final int not_again_studycopy=0x7f05026a; /** The following strings (all whose names start with "not_again") appear in the New user info dialog. @@ -3620,7 +3620,7 @@ XLATE-ME public static final int not_again_zoom=0x7f0501aa; /** (None) */ - public static final int note_none=0x7f05029a; + public static final int note_none=0x7f05029b; /** This text is displayed as the "summary" for both of the notify choices above, as extra information. (There could be different strings if it makes more sense in your language.) @@ -3660,7 +3660,7 @@ XLATE-ME /** XLATE-ME Number on this device */ - public static final int nplayers_prompt=0x7f0502b1; + public static final int nplayers_prompt=0x7f0502b2; /** text of label identifying the field where human players can enter an option password. The label and field disappear when the robot player checkbox is checked because it makes no @@ -3684,7 +3684,7 @@ XLATE-ME play – if he/she is also using NFC. \u0020pct. */ - public static final int pct_suffix=0x7f05025b; + public static final int pct_suffix=0x7f05025c; /** If this preference is checked, tapping on the scoreboard entry for any player reveals that player's tiles and any pending move (after asking for his password if one is set.) @@ -3714,7 +3714,7 @@ XLATE-ME Connected number[s]: */ - public static final int phone_label=0x7f0501ff; + public static final int phone_label=0x7f050200; /** Don't warn, but simply force to skip turn (give 0 points) when user attempts to play word not in the wordlist. Don't warn, but simply force to skip turn (give 0 points) @@ -3962,10 +3962,10 @@ XLATE-ME Used when prev player's name can't be looked up Your opponent */ - public static final int prev_player=0x7f0502a3; + public static final int prev_player=0x7f0502a4; /** Downloading */ - public static final int progress_title=0x7f050298; + public static final int progress_title=0x7f050299; /** Words no longer than @@ -3979,7 +3979,7 @@ XLATE-ME /** XLATE-ME Relay device port */ - public static final int proxy_port=0x7f0502d4; + public static final int proxy_port=0x7f0502d5; /** Short for "points", this is shown at the right end of the tray in place of the first tile placed along with the points the current move would earn if committed. @@ -4011,19 +4011,19 @@ XLATE-ME /** XLATE-ME CDMA */ - public static final int radio_name_cdma=0x7f0502e4; + public static final int radio_name_cdma=0x7f0502e5; /** XLATE-ME GSM */ - public static final int radio_name_gsm=0x7f0502e3; + public static final int radio_name_gsm=0x7f0502e4; /** XLATE-ME Don\'t pretend */ - public static final int radio_name_real=0x7f0502e1; + public static final int radio_name_real=0x7f0502e2; /** XLATE-ME Tablet/no radio */ - public static final int radio_name_tablet=0x7f0502e2; + public static final int radio_name_tablet=0x7f0502e3; /** ############################################################ # :Dialogs: @@ -4052,7 +4052,7 @@ XLATE-ME /** XLATE-ME Invite redirect host */ - public static final int redir_host=0x7f0502c8; + public static final int redir_host=0x7f0502c9; /** Title of dialog used to alert players to relay-related problems with the current game. Title of dialog used to alert players to relay-related @@ -4062,33 +4062,33 @@ XLATE-ME public static final int relay_alert=0x7f0500e0; /** Message from relay */ - public static final int relay_alert_title=0x7f05024e; + public static final int relay_alert_title=0x7f05024f; /** XLATE-ME Relay host */ - public static final int relay_host=0x7f0502c7; + public static final int relay_host=0x7f0502c8; /** XLATE-ME Relay game port */ - public static final int relay_port=0x7f0502d3; + public static final int relay_port=0x7f0502d4; /** Shown in toast when relaunching after switching dicts Shown in toast when relaunching after switching dicts Reloading game with %1$s */ - public static final int reload_new_dict_fmt=0x7f050231; + public static final int reload_new_dict_fmt=0x7f050232; /** XLATE-ME Issuing rematch invitation. You will see this message until it has been accepted.\n\nYou do not need to keep this game open while waiting. You will be notified when the game is ready to play. */ - public static final int rematch_msg=0x7f0502c3; + public static final int rematch_msg=0x7f0502c4; /** Processing wordlist information… */ - public static final int remote_digesting=0x7f050292; + public static final int remote_digesting=0x7f050293; /** Fetching wordlist information from server… */ - public static final int remote_empty=0x7f050291; + public static final int remote_empty=0x7f050292; /** checkbox determining of this player is on this device or remote. If remote, then the rest of the fields disappear (since they will be set by the remote device.) @@ -4101,15 +4101,15 @@ XLATE-ME /** Unable to fetch wordlist information from server. */ - public static final int remote_no_net=0x7f050293; + public static final int remote_no_net=0x7f050294; /** Remote device undid a turn. */ - public static final int remote_undone=0x7f050202; + public static final int remote_undone=0x7f050203; /** Change the name of this group to: */ - public static final int rename_group_label=0x7f050245; + public static final int rename_group_label=0x7f050246; /** text within rename dialog (triggered by selecting list_item_rename) text within rename dialog (triggered by selecting @@ -4178,13 +4178,13 @@ XLATE-ME public static final int room_public_prompt=0x7f0500b5; /** Games: %1$d */ - public static final int sel_games_fmt=0x7f050251; + public static final int sel_games_fmt=0x7f050252; /** Groups: %1$d */ - public static final int sel_groups_fmt=0x7f050252; + public static final int sel_groups_fmt=0x7f050253; /** Selected: %1$d */ - public static final int sel_items_fmt=0x7f05026d; + public static final int sel_items_fmt=0x7f05026e; /** ############################################################ # :Dialogs: @@ -4208,7 +4208,7 @@ XLATE-ME /** XLATE-ME Hide buttons */ - public static final int set_pref=0x7f0502ba; + public static final int set_pref=0x7f0502bb; /** text of separator marking out other-setting area of the dialog text of separator marking out other-setting area of the dialog Other settings @@ -4231,10 +4231,10 @@ XLATE-ME public static final int show_arrow_summary=0x7f050130; /** Show downloadable */ - public static final int show_remote=0x7f050296; + public static final int show_remote=0x7f050297; /** Wordlist browser */ - public static final int show_wordlist_browser=0x7f05024d; + public static final int show_wordlist_browser=0x7f05024e; /** If this preference is checked, the user will not be asked to confirm after selecting the "Turn done" menu (or tapping the points display at the right end of the tray) @@ -4252,16 +4252,16 @@ XLATE-ME public static final int skip_confirm_turn_summary=0x7f050146; /** Delete selected */ - public static final int slmenu_clear_sel=0x7f050263; + public static final int slmenu_clear_sel=0x7f050264; /** Copy to clipboard */ - public static final int slmenu_copy_sel=0x7f050262; + public static final int slmenu_copy_sel=0x7f050263; /** Unselect all */ - public static final int slmenu_deselect_all=0x7f05026c; + public static final int slmenu_deselect_all=0x7f05026d; /** Select all */ - public static final int slmenu_select_all=0x7f05026b; + public static final int slmenu_select_all=0x7f05026c; /** XLATE-ME The version of Crosswords on the phone with number \"%1$s\" is incompatible with this one for play @@ -4273,16 +4273,16 @@ XLATE-ME Title of phone number picker during invitation to a game via SMS SMS Invitation */ - public static final int sms_invite_title=0x7f0501ef; + public static final int sms_invite_title=0x7f0501f0; /** Tap the receiving device now */ - public static final int sms_ready_text=0x7f05025a; + public static final int sms_ready_text=0x7f05025b; /** Square rack tiles */ - public static final int square_tiles=0x7f05024a; + public static final int square_tiles=0x7f05024b; /** Even if they can be taller */ - public static final int square_tiles_summary=0x7f05024b; + public static final int square_tiles_summary=0x7f05024c; /** Used in formatting moves and history Used in formatting moves and history Bonus for using all tiles: 50\n @@ -4431,7 +4431,7 @@ XLATE-ME Used in formatting final scores display Resigned */ - public static final int str_resigned=0x7f05022b; + public static final int str_resigned=0x7f05022c; /** ############################################################ # Board info/error dialog messages @@ -4516,7 +4516,7 @@ XLATE-ME Used in formatting final scores display Winner */ - public static final int str_winner=0x7f05022c; + public static final int str_winner=0x7f05022d; /** Used in formatting game history (not move summaries since information about the current rack is hidden then) Used in formatting game history (not move summaries since @@ -4580,18 +4580,18 @@ XLATE-ME public static final int strss_traded_for_fmt=0x7f050102; /** Your words for: */ - public static final int study_langpick=0x7f050266; + public static final int study_langpick=0x7f050267; /** You have not yet saved any words into a studylist for %1$s. */ - public static final int study_no_lang_fmt=0x7f050267; + public static final int study_no_lang_fmt=0x7f050268; /** You have not yet saved any words into a studylist. */ - public static final int study_no_lists=0x7f050268; + public static final int study_no_lists=0x7f050269; /** Studylist for %1$s */ - public static final int studylist_title_fmt=0x7f050265; + public static final int studylist_title_fmt=0x7f050266; /** If substituting an existing same-language wordlist by choosing button_substdict user gets to choose from a list of wordlists. This is the title of that list. @@ -4610,7 +4610,7 @@ XLATE-ME Game in play with %1$s */ - public static final int summary_conn_sms_fmt=0x7f050200; + public static final int summary_conn_sms_fmt=0x7f050201; /** Preference to control what's listed next to game name in the first line of a game summary in the main games-list screen, e.g., if the option is "Game Language", "English" in the @@ -4672,7 +4672,7 @@ XLATE-ME /** XLATE-ME (GSM phones only) */ - public static final int summary_send_data_sms=0x7f0502cf; + public static final int summary_send_data_sms=0x7f0502d0; /** explanation of the above explanation of the above Sort racks whenever new tiles @@ -4682,10 +4682,10 @@ XLATE-ME /** Offer to add to and display lists of words to remember */ - public static final int summary_studyon=0x7f050260; + public static final int summary_studyon=0x7f050261; /** Thumbnail size */ - public static final int summary_thumbsize=0x7f050253; + public static final int summary_thumbsize=0x7f050254; /** Unconnected @@ -4705,7 +4705,7 @@ XLATE-ME public static final int tell_unused=0x7f050118; /** Disabled */ - public static final int thumb_off=0x7f050254; + public static final int thumb_off=0x7f050255; /** color of the tiles' background color of the tiles' background Tile background @@ -4738,7 +4738,7 @@ XLATE-ME modes network games will use to communicate Communicate via */ - public static final int title_addrs_pref=0x7f0502aa; + public static final int title_addrs_pref=0x7f0502ab; /** ############################################################ # :Screens: @@ -4823,7 +4823,7 @@ XLATE-ME /** XLATE-ME Send SMS as data */ - public static final int title_send_data_sms=0x7f0502ce; + public static final int title_send_data_sms=0x7f0502cf; /** If this preference is checked, tiles in the rack will be re-ordered alphabetically whenever tiles are added, i.e. after ever move. @@ -4835,7 +4835,7 @@ XLATE-ME public static final int title_sort_tiles=0x7f050147; /** Enable studylists */ - public static final int title_studyon=0x7f05025f; + public static final int title_studyon=0x7f050260; /** title of dialog allowing user to pick tiles "face up". (This feature is not yet supported on Android.) title of dialog allowing user to pick tiles "face up". (This @@ -4847,11 +4847,11 @@ XLATE-ME installed wordlists. Would you like to download the new version[s] of %1$s now? */ - public static final int update_dicts_fmt=0x7f050297; + public static final int update_dicts_fmt=0x7f050298; /** XLATE-ME Use defaults */ - public static final int use_defaults=0x7f0502b0; + public static final int use_defaults=0x7f0502b1; /** text of checkbox controlling whether there's a game timer text of checkbox controlling whether there's a game timer Enable game timer @@ -4867,27 +4867,27 @@ XLATE-ME /** XLATE-ME Waiting for players */ - public static final int waiting_title=0x7f0502bc; + public static final int waiting_title=0x7f0502bd; /** XLATE-ME Bluetooth is currently off on this device. No moves will be sent via Bluetooth.\n\nYou can enable Bluetooth now, or later. */ - public static final int warn_bt_disabled=0x7f050221; + public static final int warn_bt_disabled=0x7f050222; /** XLATE-ME Every networked game must have at least one way of communicating. If you have no default connection options every new networked game will have to be configured manually. */ - public static final int warn_no_comms=0x7f0502bf; + public static final int warn_no_comms=0x7f0502c0; /** The number %1$s for %2$s is not a \"mobile\" number. Import anyway? */ - public static final int warn_nomobile_fmt=0x7f0501fa; + public static final int warn_nomobile_fmt=0x7f0501fb; /** Play via SMS is currently @@ -4899,13 +4899,13 @@ désactivées, donc aucun coup ne sera envoyé pour cette partie. (Si vous voule activer les parties par SMS, allez dans Paramètres->Paramètres des parties en réseau.) */ - public static final int warn_sms_disabled=0x7f050220; + public static final int warn_sms_disabled=0x7f050221; /** Are you certain this number is on an account with unlimited texting? Click cancel if you are not. */ - public static final int warn_unlimited=0x7f050201; + public static final int warn_unlimited=0x7f050202; /** First letters @@ -4913,14 +4913,14 @@ réseau.) public static final int word_search_hint=0x7f0501cd; /** Add option to every screen menu */ - public static final int xlations_enabled_summary=0x7f050272; + public static final int xlations_enabled_summary=0x7f050273; /** Enable local translating */ - public static final int xlations_enabled_title=0x7f050271; + public static final int xlations_enabled_title=0x7f050272; /** XLATE-ME Fake locale for translation */ - public static final int xlations_locale=0x7f0502d9; + public static final int xlations_locale=0x7f0502da; /** Empty in English, this should contain the name of the translator/creator of the strings.xml file for this language diff --git a/xwords4/android/XWords4/res/values-fr/strings.xml b/xwords4/android/XWords4/res/values-fr/strings.xml index d88206119..d2022b891 100644 --- a/xwords4/android/XWords4/res/values-fr/strings.xml +++ b/xwords4/android/XWords4/res/values-fr/strings.xml @@ -2356,12 +2356,8 @@ voyez pas un périphérique que vous attendez. %2$d seconds.--> - - Un envoi Bluetooth à %1$s a échoué ; essai -%3$d dans %2$d seconde. - Un envoi Bluetooth à %1$s a échoué ; essai -%3$d dans %2$d secondes. - + Un envoi Bluetooth à %1$s a échoué ; essai + %3$d dans %2$d secondes. diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml index ee17c630a..9e21e6f53 100644 --- a/xwords4/android/XWords4/res/values/common_rsrc.xml +++ b/xwords4/android/XWords4/res/values/common_rsrc.xml @@ -195,25 +195,25 @@ @string/lang_unknown - English - French - German - Turkish - Arabic - Spanish - Swedish - Polish - Danish - Italian - Dutch - Catalan - Portuguese + @string/lang_name_english + @string/lang_name_french + @string/lang_name_german + @string/lang_name_turkish + @string/lang_name_arabic + @string/lang_name_spanish + @string/lang_name_swedish + @string/lang_name_polish + @string/lang_name_danish + @string/lang_name_italian + @string/lang_name_dutch + @string/lang_name_catalan + @string/lang_name_portuguese - Russian + @string/lang_name_russian - Czech - Greek - Slovak + @string/lang_name_czech + @string/lang_name_greek + @string/lang_name_slovak diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 0bdc2a926..af04aace9 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -162,15 +162,22 @@ (on this device only) to: + Are you sure you want to delete + the %1$d selected game? This action cannot be undone. Are you sure you want to delete - the %1$d selected game[s]? This action cannot be undone. + the %1$d selected games? This action cannot be undone. - Are you sure you want to reset the %1$d - selected game[s]?\n\n(Resetting erases all moves and any connection - information.) + + Are you sure you want to reset the %1$d + selected game?\n\n(Resetting erases all moves and any connection + information.) + Are you sure you want to reset the %1$d + selected games?\n\n(Resetting erases all moves and any connection + information.) + - This game is waiting for %1$d remote - player[s]. Would you like to invite someone to join -- assuming - you haven\'t already? + + This game is waiting for %1$d remote + player. Would you like to invite someone to join -- assuming you + haven\'t already? + This game is waiting for %1$d remote + players. Would you like to invite someone to join -- assuming + you haven\'t already? + Or just Tap to Invite -- if the other @@ -536,7 +548,10 @@ - %1$d player[s] missing + + %1$d player missing + %1$d players missing + - Device %1$d connected to relay in - room \"%2$s\". Waiting for %3$d player[s]. + + Device %1$d connected to relay in + room \"%2$s\". Waiting for %3$d player. + Device %1$d connected to relay in + room \"%2$s\". Waiting for %3$d players. + Resend messages - Resend finished; sent %1$d message[s]. + + Resend finished; sent %1$d message. + Resend finished; sent %1$d messages. + Refused attempt to register - unexpected user[s]. + unexpected user. One or more moves has arrived - Please select up to %1$d device[s] - you want to include in this game. Use the \"%2$s\" - button if you don\'t see a device you expect. - - Bluetooth send to %1$s failed; retry %3$d in - %2$d seconds. - + + Please select up to %1$d device[s] + you want to include in this game. Use the \"%2$s\" + button if you don\'t see a device you expect. + + + Bluetooth send to %1$s failed; retry + %3$d in %2$d seconds. + Bluetooth sends to %1$s have failed too many times. Re-open the game to try again. @@ -2084,7 +2108,10 @@ The group for new games, %1$s, cannot be deleted. - %1$s (%2$d games) + + %1$s (%2$d game) + %1$s (%2$d games) + + Era uoy erus uoy tnaw ot teser eht %1$d + detceles ?emag\n\ngNitteser( sesare lla sevom dna yna noitcennoc + noitamrofni.) Era uoy erus uoy tnaw ot teser eht %1$d - detceles ?]s[emag\n\ngNitteser( sesare lla sevom dna yna noitcennoc - noitamrofni.) + detceles ?semag\n\ngNitteser( sesare lla sevom dna yna noitcennoc + noitamrofni.) + Siht emag si gnitiaw rof %1$d etomer + reyalp. Dluow uoy ekil ot etivni enoemos ot nioj -- gnimussa uoy + nevah\'t ?ydaerla Siht emag si gnitiaw rof %1$d etomer - ]s[reyalp. Dluow uoy ekil ot etivni enoemos ot nioj -- gnimussa - uoy nevah\'t ?ydaerla + sreyalp. Dluow uoy ekil ot etivni enoemos ot nioj -- gnimussa + uoy nevah\'t ?ydaerla Ro tsuj Pat ot Etivni -- fi eht rehto @@ -458,7 +466,8 @@ - %1$d ]s[reyalp gnissim + %1$d reyalp gnissim + %1$d sreyalp gnissim + Ecived %1$d detcennoc ot yaler ni + moor \"%2$s\". Gnitiaw rof %3$d reyalp. Ecived %1$d detcennoc ot yaler ni - moor \"%2$s\". Gnitiaw rof %3$d ]s[reyalp. + moor \"%2$s\". Gnitiaw rof %3$d sreyalp. Dneser segassem - Dneser dehsinif; tnes %1$d ]s[egassem. + Dneser dehsinif; tnes %1$d egassem. + Dneser dehsinif; tnes %1$d segassem. Desufer tpmetta ot retsiger - detcepxenu ]s[resu. + detcepxenu resu. @@ -1608,14 +1620,12 @@ Esaelp tceles pu ot %1$d ]s[ecived - uoy tnaw ot edulcni ni siht emag. Esu eht \"%2$s\" - nottub fi uoy nod\'t ees a ecived uoy tcepxe. + uoy tnaw ot edulcni ni siht emag. Esu eht \"%2$s\" + nottub fi uoy nod\'t ees a ecived uoy tcepxe. - - Htooteulb dnes ot %1$s deliaf; yrter %3$d ni - %2$d sdnoces. - + Htooteulb dnes ot %1$s deliaf; yrter + %3$d ni %2$d sdnoces. Htooteulb sdnes ot %1$s evah deliaf oot ynam semit. Nepo-er eht emag ot yrt niaga. @@ -1822,6 +1832,7 @@ Eht puorg rof wen ,semag %1$s, tonnac eb deteled. + %1$s (%2$d )emag %1$s (%2$d )semag + ARE YOU SURE YOU WANT TO RESET THE %1$d + SELECTED GAME?\n\n(RESETTING ERASES ALL MOVES AND ANY CONNECTION + INFORMATION.) ARE YOU SURE YOU WANT TO RESET THE %1$d - SELECTED GAME[S]?\n\n(RESETTING ERASES ALL MOVES AND ANY CONNECTION - INFORMATION.) + SELECTED GAMES?\n\n(RESETTING ERASES ALL MOVES AND ANY CONNECTION + INFORMATION.) + THIS GAME IS WAITING FOR %1$d REMOTE + PLAYER. WOULD YOU LIKE TO INVITE SOMEONE TO JOIN -- ASSUMING YOU + HAVEN\'T ALREADY? THIS GAME IS WAITING FOR %1$d REMOTE - PLAYER[S]. WOULD YOU LIKE TO INVITE SOMEONE TO JOIN -- ASSUMING - YOU HAVEN\'T ALREADY? + PLAYERS. WOULD YOU LIKE TO INVITE SOMEONE TO JOIN -- ASSUMING + YOU HAVEN\'T ALREADY? OR JUST TAP TO INVITE -- IF THE OTHER @@ -458,7 +466,8 @@ - %1$d PLAYER[S] MISSING + %1$d PLAYER MISSING + %1$d PLAYERS MISSING + DEVICE %1$d CONNECTED TO RELAY IN + ROOM \"%2$s\". WAITING FOR %3$d PLAYER. DEVICE %1$d CONNECTED TO RELAY IN - ROOM \"%2$s\". WAITING FOR %3$d PLAYER[S]. + ROOM \"%2$s\". WAITING FOR %3$d PLAYERS. RESEND MESSAGES - RESEND FINISHED; SENT %1$d MESSAGE[S]. + RESEND FINISHED; SENT %1$d MESSAGE. + RESEND FINISHED; SENT %1$d MESSAGES. REFUSED ATTEMPT TO REGISTER - UNEXPECTED USER[S]. + UNEXPECTED USER. @@ -1608,14 +1620,12 @@ PLEASE SELECT UP TO %1$d DEVICE[S] - YOU WANT TO INCLUDE IN THIS GAME. USE THE \"%2$s\" - BUTTON IF YOU DON\'T SEE A DEVICE YOU EXPECT. + YOU WANT TO INCLUDE IN THIS GAME. USE THE \"%2$s\" + BUTTON IF YOU DON\'T SEE A DEVICE YOU EXPECT. - - BLUETOOTH SEND TO %1$s FAILED; RETRY %3$d IN - %2$d SECONDS. - + BLUETOOTH SEND TO %1$s FAILED; RETRY + %3$d IN %2$d SECONDS. BLUETOOTH SENDS TO %1$s HAVE FAILED TOO MANY TIMES. RE-OPEN THE GAME TO TRY AGAIN. @@ -1822,6 +1832,7 @@ THE GROUP FOR NEW GAMES, %1$s, CANNOT BE DELETED. + %1$s (%2$d GAME) %1$s (%2$d GAMES)