Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

change final score formatting so it can be properly localized.

Browse source 
Note: because the substitution is done in common code I can't use the
positional specifiers (%1$s vs %s) and so this breaks the generated
"translations". The scripts that do the generation need to be fixed to
understand the formatted="false" attribute.
This commit is contained in:
Eric House 2015-05-13 07:51:32 -07:00
parent 520611399b
commit e66260950e
10 changed files with 259 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -444,23 +444,23 @@ public final class R {
/** Another paragraph in the about dialog
*/
public static final int about_web=0x7f0501bb;
public static final int add_done_fmt=0x7f050266;
public static final int add_to_study_fmt=0x7f050260;
public static final int add_done_fmt=0x7f050268;
public static final int add_to_study_fmt=0x7f050262;
/** Debugging stuff. Localize if you think your langauge users will
care.
*/
public static final int advanced=0x7f0502cb;
public static final int advanced=0x7f0502cd;
/** This button takes you to the normal Game Configure screen
*/
public static final int advanced_config=0x7f050176;
public static final int advanced_summary=0x7f0502cc;
public static final int advanced_summary=0x7f0502ce;
/**
*/
public static final int alert_empty_dict_fmt=0x7f0501d6;
/** The name of the app. Not localized!
*/
public static final int app_name=0x7f050001;
public static final int app_not_found_fmt=0x7f0502ab;
public static final int app_not_found_fmt=0x7f0502ad;
public static final int app_version=0x7f050000;
/** the background color of the area outside the board,
e.g. between entries in the scoreboard
@ -518,7 +518,7 @@ public final class R {
asking.
*/
public static final int board_menu_game_left=0x7f0500f2;
public static final int board_menu_game_netstats=0x7f0502d6;
public static final int board_menu_game_netstats=0x7f0502d8;
/** 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
@ -527,7 +527,7 @@ public final class R {
*/
public static final int board_menu_game_resend=0x7f0500f6;
public static final int board_menu_game_resign=0x7f0500f5;
public static final int board_menu_invite=0x7f050259;
public static final int board_menu_invite=0x7f05025b;
/**
*/
public static final int board_menu_pass=0x7f0501c9;
@ -598,7 +598,7 @@ public final class R {
/** Title of device picker during invitation to a game via Bluetooth
*/
public static final int bt_invite_title=0x7f0501f0;
public static final int bt_no_devs=0x7f0502aa;
public static final int bt_no_devs=0x7f0502ac;
/** <string name="newgame_enable_bt">Turn Bluetooth on</string>
In the Bluetooth invite device dialog
*/
@ -616,7 +616,7 @@ public final class R {
/** The only button available when the above message is displayed
*/
public static final int button_close_game=0x7f050187;
public static final int button_decline=0x7f050239;
public static final int button_decline=0x7f05023b;
/**
*/
public static final int button_default_both=0x7f0500a4;
@ -642,7 +642,7 @@ public final class R {
reset a game.
*/
public static final int button_discard=0x7f050196;
public static final int button_discard_changes=0x7f0502c5;
public static final int button_discard_changes=0x7f0502c7;
/**
*/
public static final int button_done=0x7f0501c6;
@ -652,10 +652,10 @@ public final class R {
/** Text of button displayed when downloading is an option
*/
public static final int button_download=0x7f05018a;
public static final int button_edit=0x7f0502c4;
public static final int button_edit=0x7f0502c6;
public static final int button_enable_bt=0x7f050225;
public static final int button_enable_sms=0x7f050224;
public static final int button_go_settings=0x7f05025b;
public static final int button_go_settings=0x7f05025d;
/**
*/
public static final int button_invite=0x7f0501ef;
@ -734,12 +734,12 @@ public final class R {
in many places.
*/
public static final int button_ok=0x7f050191;
public static final int button_reconnect=0x7f05024b;
public static final int button_reconnect=0x7f05024d;
/** Button shown in game over dialog triggering creation of new
game with the same players and parameters as the one that
just ended.
*/
public static final int button_rematch=0x7f05024a;
public static final int button_rematch=0x7f05024c;
/** 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).
@ -796,8 +796,8 @@ public final class R {
*/
public static final int button_trade_commit=0x7f0500d5;
public static final int button_yes=0x7f050193;
public static final int cannot_delete_default_group_fmt=0x7f050249;
public static final int change_group=0x7f05024e;
public static final int cannot_delete_default_group_fmt=0x7f05024b;
public static final int change_group=0x7f050250;
/** text of button in About Crosswords dialog summoning above
dialog
*/
@ -851,7 +851,7 @@ public final class R {
on the board.
*/
public static final int clr_crosshairs=0x7f05013a;
public static final int config_no_connvia=0x7f0502c3;
public static final int config_no_connvia=0x7f0502c5;
/**
*/
public static final int confirm_clear=0x7f0501ff;
@ -861,7 +861,7 @@ public final class R {
of the language is substituted for %1$s.
*/
public static final int confirm_deleteonly_dicts_fmt=0x7f0500a0;
public static final int confirm_get_locdict_fmt=0x7f0502ca;
public static final int confirm_get_locdict_fmt=0x7f0502cc;
/** Text of confirmation dialog for above
*/
public static final int confirm_revert_all=0x7f05010f;
@ -927,7 +927,7 @@ public final class R {
public static final int connect_one_hour=0x7f050157;
public static final int connect_six_hours=0x7f050158;
public static final int connect_thirty_mins=0x7f050156;
public static final int connection_via_label=0x7f0502bc;
public static final int connection_via_label=0x7f0502be;
/**
*/
public static final int connstat_lastother_succ_fmt=0x7f050214;
@ -967,13 +967,13 @@ public final class R {
of each there are are and how many points each is worth.
*/
public static final int counts_values_title=0x7f05019c;
public static final int cur_menu_marker_fmt=0x7f050258;
public static final int cur_menu_marker_fmt=0x7f05025a;
/**
*/
public static final int cur_tiles_fmt=0x7f0501d1;
public static final int data_gsm_only=0x7f050275;
public static final int debug_features=0x7f0502d2;
public static final int debug_features_summary=0x7f0502d3;
public static final int data_gsm_only=0x7f050277;
public static final int debug_features=0x7f0502d4;
public static final int debug_features_summary=0x7f0502d5;
/** dictionary used by default for human players when creating
new game
*/
@ -983,9 +983,9 @@ public final class R {
public static final int default_host=0x7f050073;
/** label within default wordlists in app preferences
*/
public static final int default_language=0x7f0502ac;
public static final int default_loc=0x7f05023c;
public static final int default_loc_summary=0x7f05023d;
public static final int default_language=0x7f0502ae;
public static final int default_loc=0x7f05023e;
public static final int default_loc_summary=0x7f05023f;
/** Welcome dialog text
*/
public static final int default_name_message=0x7f0501b8;
@ -1013,7 +1013,7 @@ public final class R {
*/
public static final int default_robodict=0x7f05011d;
public static final int default_update_url=0x7f050079;
public static final int delete_dicts=0x7f050297;
public static final int delete_dicts=0x7f050299;
/**
<string name="sms_disabled">Playing via SMS is currently disabled.
You can enable it in Settings->Network game settings.</string>
@ -1023,16 +1023,16 @@ public final class R {
/**
*/
public static final int dict_browse_nowords_fmt=0x7f0501d3;
public static final int dict_desc_fmt=0x7f05029e;
public static final int dict_host=0x7f0502cf;
public static final int dict_info_fmt=0x7f05029b;
public static final int dict_desc_fmt=0x7f0502a0;
public static final int dict_host=0x7f0502d1;
public static final int dict_info_fmt=0x7f05029d;
/** 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
"%1$s".
*/
public static final int dict_lang_label_fmt=0x7f0500d1;
public static final int dict_on_server=0x7f05029d;
public static final int dict_on_server=0x7f05029f;
/** string name="invite_mime">text/plain</string
*/
public static final int dict_url=0x7f050078;
@ -1061,20 +1061,20 @@ public final class R {
will use is substituted in for "%1$s".
*/
public static final int dicts_list_prompt_fmt=0x7f0500d2;
public static final int disable_nag_summary=0x7f0502c9;
public static final int disable_nag_title=0x7f0502c8;
public static final int disable_nag_summary=0x7f0502cb;
public static final int disable_nag_title=0x7f0502ca;
/** text of item at bottom of dicts choice spinner. It
launches the browser pointed at the site where additional
wordlists can be found.
*/
public static final int download_dicts=0x7f05009b;
public static final int download_done=0x7f05023a;
public static final int download_failed=0x7f05023b;
public static final int download_path_title=0x7f05023e;
public static final int download_done=0x7f05023c;
public static final int download_failed=0x7f05023d;
public static final int download_path_title=0x7f050240;
public static final int downloading_dict_fmt=0x7f050184;
/** <string name="summary_thumb_enabled">Display snapshots of games</string>
*/
public static final int dropped_dupe=0x7f050257;
public static final int dropped_dupe=0x7f050259;
/** 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.
@ -1102,24 +1102,24 @@ public final class R {
/** Shows in SMS Invite dialog when no phone numbers have been saved previously
*/
public static final int empty_sms_inviter=0x7f0501fd;
public static final int enable_dupes_summary=0x7f0502e0;
public static final int enable_dupes_title=0x7f0502de;
public static final int enable_nfc=0x7f05025a;
public static final int enable_nfc_toself_summary=0x7f0502e3;
public static final int enable_nfc_toself_title=0x7f0502e2;
public static final int enable_pubroom_summary=0x7f0502bb;
public static final int enable_pubroom_title=0x7f0502ba;
public static final int enable_dupes_summary=0x7f0502e2;
public static final int enable_dupes_title=0x7f0502e0;
public static final int enable_nfc=0x7f05025c;
public static final int enable_nfc_toself_summary=0x7f0502e5;
public static final int enable_nfc_toself_title=0x7f0502e4;
public static final int enable_pubroom_summary=0x7f0502bd;
public static final int enable_pubroom_title=0x7f0502bc;
/**
*/
public static final int enable_sms=0x7f05021a;
/**
*/
public static final int enable_sms_summary=0x7f05021b;
public static final int enable_sms_toself_summary=0x7f0502e5;
public static final int enable_sms_toself_title=0x7f0502e4;
public static final int enable_sms_toself_summary=0x7f0502e7;
public static final int enable_sms_toself_title=0x7f0502e6;
public static final int entering_trade=0x7f0500d7;
public static final int err_dup_invite_fmt=0x7f0502b5;
public static final int expl_update_url=0x7f0502ef;
public static final int err_dup_invite_fmt=0x7f0502b7;
public static final int expl_update_url=0x7f0502f1;
/** 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.
@ -1138,9 +1138,9 @@ public final class R {
/** Explanatory text appears in the dialog
*/
public static final int force_expl=0x7f0500cc;
public static final int force_radio_title=0x7f0502e6;
public static final int force_tablet_summary=0x7f0502a2;
public static final int force_tablet_title=0x7f0502a1;
public static final int force_radio_title=0x7f0502e8;
public static final int force_tablet_summary=0x7f0502a4;
public static final int force_tablet_title=0x7f0502a3;
/**
############################################################
# :Dialogs:
@ -1188,7 +1188,7 @@ public final class R {
game to make changes
*/
public static final int game_locked=0x7f0500ab;
public static final int game_name_group_title=0x7f050248;
public static final int game_name_group_title=0x7f05024a;
/**
*/
public static final int game_name_label=0x7f0501f4;
@ -1201,15 +1201,15 @@ public final class R {
/** Put nothing in the summary space, so it just reads "Game 2"
*/
public static final int game_summary_field_empty=0x7f050128;
public static final int game_summary_field_gameid=0x7f0502ed;
public static final int game_summary_field_gameid=0x7f0502ef;
/** Put the language there, so it reads "Game 2 (English)"
*/
public static final int game_summary_field_language=0x7f050129;
public static final int game_summary_field_npackets=0x7f0502ee;
public static final int game_summary_field_npackets=0x7f0502f0;
/** List names of opponents (summarized), e.g. "Game 2 (vs Kati)"
*/
public static final int game_summary_field_opponents=0x7f05012a;
public static final int game_summary_field_rowid=0x7f0502ec;
public static final int game_summary_field_rowid=0x7f0502ee;
/** List the state of the game, "Game over" or "10 moves made"
etc.
*/
@ -1235,20 +1235,20 @@ public final class R {
Brings up the Wordlists (formerly Dictionaries) screen
*/
public static final int gamel_menu_dicts=0x7f050088;
public static final int gamel_menu_loaddb=0x7f0502dd;
public static final int gamel_menu_storedb=0x7f0502dc;
public static final int gamel_menu_study=0x7f050263;
public static final int gamel_menu_loaddb=0x7f0502df;
public static final int gamel_menu_storedb=0x7f0502de;
public static final int gamel_menu_study=0x7f050265;
/**
*/
public static final int get_sms_number=0x7f0501fe;
public static final int getinfo=0x7f050296;
public static final int getinfo=0x7f050298;
public static final int git_rev=0x7f05007b;
public static final int git_rev_title=0x7f0502d8;
public static final int got_langdict_summary=0x7f0502f1;
public static final int got_langdict_title=0x7f0502f0;
public static final int git_rev_title=0x7f0502da;
public static final int got_langdict_summary=0x7f0502f3;
public static final int got_langdict_title=0x7f0502f2;
public static final int green=0x7f050140;
public static final int group_cur_games=0x7f050245;
public static final int group_new_games=0x7f050246;
public static final int group_cur_games=0x7f050247;
public static final int group_new_games=0x7f050248;
/** Used as the default name for remote players displayed within
the Game configure screen
*/
@ -1311,12 +1311,12 @@ public final class R {
public static final int info_title=0x7f050199;
/**
*/
public static final int inform_dict_diffdict_fmt=0x7f050231;
public static final int inform_dict_diffdict_fmt=0x7f050233;
/**
*/
public static final int inform_dict_diffversion_fmt=0x7f05022f;
public static final int inform_dict_download=0x7f050232;
public static final int inform_dict_title=0x7f050230;
public static final int inform_dict_diffversion_fmt=0x7f050231;
public static final int inform_dict_download=0x7f050234;
public static final int inform_dict_title=0x7f050232;
/** Will new games, on default, randomly rearrange the start
order of players.
*/
@ -1350,9 +1350,9 @@ public final class R {
*/
public static final int invite_chooser_fmt=0x7f05016d;
public static final int invite_chooser_sms=0x7f05016f;
public static final int invite_dict_missing_body_fmt=0x7f050237;
public static final int invite_dict_missing_body_noname_fmt=0x7f050238;
public static final int invite_dict_missing_title=0x7f050236;
public static final int invite_dict_missing_body_fmt=0x7f050239;
public static final int invite_dict_missing_body_noname_fmt=0x7f05023a;
public static final int invite_dict_missing_title=0x7f050238;
public static final int invite_host=0x7f050075;
/** This is the body of the html version of the invitation. A URL
is created with parameters describing the game and
@ -1365,8 +1365,8 @@ public final class R {
*/
public static final int invite_if_nfc=0x7f0500dd;
public static final int invite_mime=0x7f050077;
public static final int invite_multi_summary=0x7f0502b9;
public static final int invite_multi_title=0x7f0502b8;
public static final int invite_multi_summary=0x7f0502bb;
public static final int invite_multi_title=0x7f0502ba;
/** 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
@ -1379,7 +1379,7 @@ public final class R {
/**
*/
public static final int invite_progress_title=0x7f0501e1;
public static final int invite_stays=0x7f0502c0;
public static final int invite_stays=0x7f0502c2;
/** <string name="sms_or_email">Send invitation using SMS (texting) or
via email?</string>
<string name="nfc_or_email">Send invitation using NFC (Android
@ -1542,30 +1542,30 @@ public final class R {
different wordlists.)
*/
public static final int lang_label=0x7f0500b0;
public static final int lang_name_arabic=0x7f050280;
public static final int lang_name_catalan=0x7f050287;
public static final int lang_name_czech=0x7f05028a;
public static final int lang_name_danish=0x7f050284;
public static final int lang_name_dutch=0x7f050286;
public static final int lang_name_english=0x7f05027c;
public static final int lang_name_french=0x7f05027d;
public static final int lang_name_german=0x7f05027e;
public static final int lang_name_greek=0x7f05028b;
public static final int lang_name_italian=0x7f050285;
public static final int lang_name_polish=0x7f050283;
public static final int lang_name_portuguese=0x7f050288;
public static final int lang_name_russian=0x7f050289;
public static final int lang_name_slovak=0x7f05028c;
public static final int lang_name_spanish=0x7f050281;
public static final int lang_name_swedish=0x7f050282;
public static final int lang_name_turkish=0x7f05027f;
public static final int lang_unknown=0x7f05029f;
public static final int lang_name_arabic=0x7f050282;
public static final int lang_name_catalan=0x7f050289;
public static final int lang_name_czech=0x7f05028c;
public static final int lang_name_danish=0x7f050286;
public static final int lang_name_dutch=0x7f050288;
public static final int lang_name_english=0x7f05027e;
public static final int lang_name_french=0x7f05027f;
public static final int lang_name_german=0x7f050280;
public static final int lang_name_greek=0x7f05028d;
public static final int lang_name_italian=0x7f050287;
public static final int lang_name_polish=0x7f050285;
public static final int lang_name_portuguese=0x7f05028a;
public static final int lang_name_russian=0x7f05028b;
public static final int lang_name_slovak=0x7f05028e;
public static final int lang_name_spanish=0x7f050283;
public static final int lang_name_swedish=0x7f050284;
public static final int lang_name_turkish=0x7f050281;
public static final int lang_unknown=0x7f0502a1;
public static final int langdict_label=0x7f0500b1;
public static final int list_group_default=0x7f050242;
public static final int list_group_delete=0x7f050240;
public static final int list_group_movedown=0x7f050244;
public static final int list_group_moveup=0x7f050243;
public static final int list_group_rename=0x7f050241;
public static final int list_group_default=0x7f050244;
public static final int list_group_delete=0x7f050242;
public static final int list_group_movedown=0x7f050246;
public static final int list_group_moveup=0x7f050245;
public static final int list_group_rename=0x7f050243;
/** ############## menu items ##############
pulls up dialog to configure the selected game
*/
@ -1596,9 +1596,9 @@ public final class R {
public static final int list_item_reset=0x7f050093;
/** formatting for last move summary in notifications
*/
public static final int lmi_pass_fmt=0x7f0502a7;
public static final int lmi_phony_fmt=0x7f0502a8;
public static final int lmi_tiles_fmt=0x7f0502a9;
public static final int lmi_pass_fmt=0x7f0502a9;
public static final int lmi_phony_fmt=0x7f0502aa;
public static final int lmi_tiles_fmt=0x7f0502ab;
/** 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.
@ -1616,32 +1616,32 @@ public final class R {
/**
*/
public static final int loc_external=0x7f0500a7;
public static final int loc_filters_all=0x7f050278;
public static final int loc_filters_menu=0x7f05027a;
public static final int loc_filters_modified=0x7f05027b;
public static final int loc_filters_prompt=0x7f050276;
public static final int loc_filters_screen=0x7f050279;
public static final int loc_fmts_mismatch=0x7f050291;
public static final int loc_filters_all=0x7f05027a;
public static final int loc_filters_menu=0x7f05027c;
public static final int loc_filters_modified=0x7f05027d;
public static final int loc_filters_prompt=0x7f050278;
public static final int loc_filters_screen=0x7f05027b;
public static final int loc_fmts_mismatch=0x7f050293;
/** see move_dictf above
*/
public static final int loc_internal=0x7f0500a6;
public static final int loc_item_check=0x7f05028e;
public static final int loc_item_check=0x7f050290;
/** for loc item edit menu
*/
public static final int loc_item_clear=0x7f05028d;
public static final int loc_item_copy_bless=0x7f050290;
public static final int loc_item_copy_eng=0x7f05028f;
public static final int loc_lang_blessed=0x7f050271;
public static final int loc_lang_local=0x7f050272;
public static final int loc_menu_xlate=0x7f050270;
public static final int loc_search_prompt=0x7f050277;
public static final int loc_item_clear=0x7f05028f;
public static final int loc_item_copy_bless=0x7f050292;
public static final int loc_item_copy_eng=0x7f050291;
public static final int loc_lang_blessed=0x7f050273;
public static final int loc_lang_local=0x7f050274;
public static final int loc_menu_xlate=0x7f050272;
public static final int loc_search_prompt=0x7f050279;
/** This is the "hint" printed in light text in the empty player
name field
*/
public static final int local_name_hint=0x7f050175;
public static final int logging_on=0x7f0502d0;
public static final int logging_on_summary=0x7f0502d1;
public static final int lookup_title=0x7f05026c;
public static final int logging_on=0x7f0502d2;
public static final int logging_on_summary=0x7f0502d3;
public static final int lookup_title=0x7f05026e;
/**
*/
public static final int manual_owner_name=0x7f0501fb;
@ -1666,7 +1666,7 @@ public final class R {
/** text of menu that brings up the Settings (preferences) dialog
*/
public static final int menu_prefs=0x7f050089;
public static final int menu_rateme=0x7f05025e;
public static final int menu_rateme=0x7f050260;
/**
*/
public static final int menu_toggle_values=0x7f05020c;
@ -1682,11 +1682,11 @@ public final class R {
/** body of notification shown when invitation requires a
wordslist that's not installed
*/
public static final int missing_dict_detail=0x7f050235;
public static final int missing_dict_detail=0x7f050237;
/** Title of notification shown when invitation requires a
wordslist that's not installed
*/
public static final int missing_dict_title=0x7f050234;
public static final int missing_dict_title=0x7f050236;
/** 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
@ -1741,16 +1741,16 @@ public final class R {
/** Text of progress indicator shown while check is being conducted
*/
public static final int msgs_progress=0x7f05008b;
public static final int nag_body_fmt=0x7f0502a4;
public static final int nag_intervals=0x7f0502e1;
public static final int nag_body_fmt=0x7f0502a6;
public static final int nag_intervals=0x7f0502e3;
/** Nagging: title of notification reminder message
*/
public static final int nag_title=0x7f0502a3;
public static final int nag_title=0x7f0502a5;
/** above is inserted in this the last time I warn
*/
public static final int nag_warn_last_fmt=0x7f0502a5;
public static final int nag_warn_last_fmt=0x7f0502a7;
public static final int name_copy_fmt=0x7f0501f5;
public static final int name_dict_fmt=0x7f0502db;
public static final int name_dict_fmt=0x7f0502dd;
public static final int nbs_port=0x7f05007a;
/** text of checkbox. If this checkbox is checked, games created
for network play will by default have the hint feature
@ -1762,9 +1762,9 @@ public final class R {
elsewhere in this file)
*/
public static final int nethints_allowed_sum=0x7f05011f;
public static final int netstats_title=0x7f0502d7;
public static final int network_advanced_summary=0x7f0502b7;
public static final int network_advanced_title=0x7f0502b6;
public static final int netstats_title=0x7f0502d9;
public static final int network_advanced_summary=0x7f0502b9;
public static final int network_advanced_title=0x7f0502b8;
public static final int network_behavior=0x7f050150;
/** explanation of the above
*/
@ -1790,11 +1790,11 @@ public final class R {
/**
*/
public static final int new_dict_avail_fmt=0x7f05022a;
public static final int new_game=0x7f0502ae;
public static final int new_game_message=0x7f0502b0;
public static final int new_game_message_net=0x7f0502b2;
public static final int new_game_message_nodflt=0x7f0502b1;
public static final int new_game_networked=0x7f0502af;
public static final int new_game=0x7f0502b0;
public static final int new_game_message=0x7f0502b2;
public static final int new_game_message_net=0x7f0502b4;
public static final int new_game_message_nodflt=0x7f0502b3;
public static final int new_game_networked=0x7f0502b1;
/**
*/
public static final int new_move_body=0x7f0501ec;
@ -1871,9 +1871,9 @@ public final class R {
/**
*/
public static final int newgame_sms_header=0x7f0501f6;
public static final int newgroup_label=0x7f05023f;
public static final int nfc_just_tap=0x7f0502c1;
public static final int nfc_to_self=0x7f0502eb;
public static final int newgroup_label=0x7f050241;
public static final int nfc_just_tap=0x7f0502c3;
public static final int nfc_to_self=0x7f0502ed;
/** Title of dialog for renaming game (triggered by selecting
list_item_rename)
If you try to copy a networked game you get this error
@ -1919,7 +1919,7 @@ public final class R {
you get this error message
*/
public static final int no_games_to_refresh=0x7f05008c;
public static final int no_market=0x7f05025f;
public static final int no_market=0x7f050261;
/** displayed when you long-tap a scoreboard entry and there's no
most recent score to show
*/
@ -1942,7 +1942,7 @@ public final class R {
arrow appears. This explains it.
*/
public static final int not_again_arrow=0x7f0501b4;
public static final int not_again_backclears=0x7f050252;
public static final int not_again_backclears=0x7f050254;
/**
*/
public static final int not_again_browse=0x7f0501d4;
@ -1970,19 +1970,19 @@ public final class R {
for games with more than two devices, which are rare.
*/
public static final int not_again_conndmid=0x7f0501b2;
public static final int not_again_dicts=0x7f0502a0;
public static final int not_again_dicts=0x7f0502a2;
/** 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.
*/
public static final int not_again_done=0x7f0501af;
public static final int not_again_enablepublic=0x7f0502c7;
public static final int not_again_enablepublic=0x7f0502c9;
/** Shown when you tap the flip button on the toolbar of the main
Board screen
*/
public static final int not_again_flip=0x7f0501aa;
public static final int not_again_fmt_expl=0x7f050292;
public static final int not_again_hidenewgamebuttons=0x7f0502be;
public static final int not_again_fmt_expl=0x7f050294;
public static final int not_again_hidenewgamebuttons=0x7f0502c0;
/** Shown when you tap the next hint button on the toolbar of the
main Board screen
*/
@ -2006,8 +2006,8 @@ public final class R {
/** Shown when you first pick the list_item_new_from menuitem
*/
public static final int not_again_newfrom=0x7f0501b6;
public static final int not_again_newselect=0x7f050251;
public static final int not_again_studycopy=0x7f05026b;
public static final int not_again_newselect=0x7f050253;
public static final int not_again_studycopy=0x7f05026d;
/** The following strings (all whose names start with
"not_again") appear in the New user info dialog.
@ -2042,7 +2042,7 @@ public final class R {
the main Board screen
*/
public static final int not_again_zoom=0x7f0501ab;
public static final int note_none=0x7f05029c;
public static final int note_none=0x7f05029e;
/** 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.)
@ -2063,7 +2063,7 @@ public final class R {
device
*/
public static final int notify_vibrate=0x7f05015b;
public static final int nplayers_prompt=0x7f0502b4;
public static final int nplayers_prompt=0x7f0502b6;
/** 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
@ -2078,7 +2078,7 @@ public final class R {
can tap a nearby person\'s device to invite him/her to
play &#8211; if he/she is also using NFC.</string>
*/
public static final int pct_suffix=0x7f05025d;
public static final int pct_suffix=0x7f05025f;
/** 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.)
@ -2152,17 +2152,17 @@ public final class R {
non-networked games
*/
public static final int players_label_standalone=0x7f0500ac;
public static final int pref_group_l10n_summary=0x7f0502f7;
public static final int pref_group_l10n_title=0x7f0502f6;
public static final int pref_group_relay_summary=0x7f0502f5;
public static final int pref_group_relay_title=0x7f0502f4;
public static final int pref_group_sms_summary=0x7f0502f3;
public static final int pref_group_sms_title=0x7f0502f2;
public static final int pref_group_l10n_summary=0x7f0502f9;
public static final int pref_group_l10n_title=0x7f0502f8;
public static final int pref_group_relay_summary=0x7f0502f7;
public static final int pref_group_relay_title=0x7f0502f6;
public static final int pref_group_sms_summary=0x7f0502f5;
public static final int pref_group_sms_title=0x7f0502f4;
/** Label for the first "human player" name preference
*/
public static final int pref_human_name=0x7f050118;
public static final int pref_item_update_summary=0x7f0502f9;
public static final int pref_item_update_title=0x7f0502f8;
public static final int pref_item_update_summary=0x7f0502fb;
public static final int pref_item_update_title=0x7f0502fa;
/** Label for the first player color preference
*/
public static final int pref_player1_name=0x7f050114;
@ -2239,15 +2239,15 @@ public final class R {
public static final int prefs_names_summary=0x7f050113;
/** Used when prev player's name can't be looked up
*/
public static final int prev_player=0x7f0502a6;
public static final int progress_title=0x7f05029a;
public static final int prev_player=0x7f0502a8;
public static final int progress_title=0x7f05029c;
/**
*/
public static final int prompt_max_len=0x7f0501da;
/**
*/
public static final int prompt_min_len=0x7f0501d9;
public static final int proxy_port=0x7f0502da;
public static final int proxy_port=0x7f0502dc;
/** 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.
@ -2263,10 +2263,10 @@ public final class R {
middle of a game, like "do you want to commit this move?"
*/
public static final int query_title=0x7f0501a0;
public static final int radio_name_cdma=0x7f0502ea;
public static final int radio_name_gsm=0x7f0502e9;
public static final int radio_name_real=0x7f0502e7;
public static final int radio_name_tablet=0x7f0502e8;
public static final int radio_name_cdma=0x7f0502ec;
public static final int radio_name_gsm=0x7f0502eb;
public static final int radio_name_real=0x7f0502e9;
public static final int radio_name_tablet=0x7f0502ea;
/**
############################################################
# :Dialogs:
@ -2280,30 +2280,30 @@ public final class R {
the color preferences dialog
*/
public static final int red=0x7f05013f;
public static final int redir_host=0x7f0502ce;
public static final int redir_host=0x7f0502d0;
/** Title of dialog used to alert players to relay-related
problems with the current game.
*/
public static final int relay_alert=0x7f0500e1;
public static final int relay_alert_title=0x7f050250;
public static final int relay_host=0x7f0502cd;
public static final int relay_port=0x7f0502d9;
public static final int relay_alert_title=0x7f050252;
public static final int relay_host=0x7f0502cf;
public static final int relay_port=0x7f0502db;
/** Shown in toast when relaunching after switching dicts
*/
public static final int reload_new_dict_fmt=0x7f050233;
public static final int rematch_msg=0x7f0502c6;
public static final int remote_digesting=0x7f050294;
public static final int remote_empty=0x7f050293;
public static final int reload_new_dict_fmt=0x7f050235;
public static final int rematch_msg=0x7f0502c8;
public static final int remote_digesting=0x7f050296;
public static final int remote_empty=0x7f050295;
/** 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.)
*/
public static final int remote_label=0x7f0500cf;
public static final int remote_no_net=0x7f050295;
public static final int remote_no_net=0x7f050297;
/**
*/
public static final int remote_undone=0x7f050204;
public static final int rename_group_label=0x7f050247;
public static final int rename_group_label=0x7f050249;
/** text within rename dialog (triggered by selecting
list_item_rename)
*/
@ -2340,9 +2340,9 @@ public final class R {
/** title for popup of public rooms found on server
*/
public static final int room_public_prompt=0x7f0500b6;
public static final int sel_games_fmt=0x7f050253;
public static final int sel_groups_fmt=0x7f050254;
public static final int sel_items_fmt=0x7f05026f;
public static final int sel_games_fmt=0x7f050255;
public static final int sel_groups_fmt=0x7f050256;
public static final int sel_items_fmt=0x7f050271;
/**
############################################################
# :Dialogs:
@ -2354,7 +2354,7 @@ public final class R {
possible answers are the three button text strings below.
*/
public static final int set_default_message_fmt=0x7f0500a1;
public static final int set_pref=0x7f0502bd;
public static final int set_pref=0x7f0502bf;
/** text of separator marking out other-setting area of the dialog
*/
public static final int settings_label=0x7f0500b9;
@ -2366,8 +2366,8 @@ public final class R {
/** clarification of above
*/
public static final int show_arrow_summary=0x7f050131;
public static final int show_remote=0x7f050298;
public static final int show_wordlist_browser=0x7f05024f;
public static final int show_remote=0x7f05029a;
public static final int show_wordlist_browser=0x7f050251;
/** 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)
@ -2376,17 +2376,17 @@ public final class R {
/** explanation of the above
*/
public static final int skip_confirm_turn_summary=0x7f050147;
public static final int slmenu_clear_sel=0x7f050265;
public static final int slmenu_copy_sel=0x7f050264;
public static final int slmenu_deselect_all=0x7f05026e;
public static final int slmenu_select_all=0x7f05026d;
public static final int slmenu_clear_sel=0x7f050267;
public static final int slmenu_copy_sel=0x7f050266;
public static final int slmenu_deselect_all=0x7f050270;
public static final int slmenu_select_all=0x7f05026f;
public static final int sms_bad_proto_fmt=0x7f0501ea;
/** Title of phone number picker during invitation to a game via SMS
*/
public static final int sms_invite_title=0x7f0501f1;
public static final int sms_ready_text=0x7f05025c;
public static final int square_tiles=0x7f05024c;
public static final int square_tiles_summary=0x7f05024d;
public static final int sms_ready_text=0x7f05025e;
public static final int square_tiles=0x7f05024e;
public static final int square_tiles_summary=0x7f05024f;
/** Used in formatting moves and history
*/
public static final int str_bonus_all=0x7f050108;
@ -2447,6 +2447,7 @@ public final class R {
*/
public static final int str_phony_rejected=0x7f050104;
public static final int str_placer_fmt=0x7f050230;
/** Shown when using the the Game configure screen to configure a
networked game and you try to make all players local.
*/
@ -2465,6 +2466,7 @@ public final class R {
/** Used in formatting final scores display
*/
public static final int str_resigned=0x7f05022d;
public static final int str_resigned_fmt=0x7f05022f;
/**
############################################################
# Board info/error dialog messages
@ -2507,7 +2509,7 @@ public final class R {
public static final int str_two_tiles_first_move=0x7f05017a;
/** Used in formatting final scores display
*/
public static final int str_winner=0x7f05022e;
public static final int str_winner_fmt=0x7f05022e;
/** Used in formatting game history (not move summaries since
information about the current rack is hidden then)
*/
@ -2544,10 +2546,10 @@ public final class R {
/** Used in formatting exchange move summaries
*/
public static final int strss_traded_for_fmt=0x7f050103;
public static final int study_langpick=0x7f050268;
public static final int study_no_lang_fmt=0x7f050269;
public static final int study_no_lists=0x7f05026a;
public static final int studylist_title_fmt=0x7f050267;
public static final int study_langpick=0x7f05026a;
public static final int study_no_lang_fmt=0x7f05026b;
public static final int study_no_lists=0x7f05026c;
public static final int studylist_title_fmt=0x7f050269;
/** 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.
@ -2593,12 +2595,12 @@ public final class R {
cannot happen.
*/
public static final int summary_relay_wait_fmt=0x7f050082;
public static final int summary_send_data_sms=0x7f0502d5;
public static final int summary_send_data_sms=0x7f0502d7;
/** explanation of the above
*/
public static final int summary_sort_tiles=0x7f050149;
public static final int summary_studyon=0x7f050262;
public static final int summary_thumbsize=0x7f050255;
public static final int summary_studyon=0x7f050264;
public static final int summary_thumbsize=0x7f050257;
/**
*/
public static final int summary_wait_guest=0x7f0501e4;
@ -2609,7 +2611,7 @@ public final class R {
part of the game and that the user should ignore it.
*/
public static final int tell_unused=0x7f050119;
public static final int thumb_off=0x7f050256;
public static final int thumb_off=0x7f050258;
/** color of the tiles' background
*/
public static final int tile_back=0x7f05013b;
@ -2628,7 +2630,7 @@ public final class R {
/** Title of preference in which you select which addressing
modes network games will use to communicate
*/
public static final int title_addrs_pref=0x7f0502ad;
public static final int title_addrs_pref=0x7f0502af;
/**
############################################################
# :Screens:
@ -2672,19 +2674,19 @@ public final class R {
window title
*/
public static final int title_prefs=0x7f05010b;
public static final int title_send_data_sms=0x7f0502d4;
public static final int title_send_data_sms=0x7f0502d6;
/** If this preference is checked, tiles in the rack will be
re-ordered alphabetically whenever tiles are added,
i.e. after ever move.
*/
public static final int title_sort_tiles=0x7f050148;
public static final int title_studyon=0x7f050261;
public static final int title_studyon=0x7f050263;
/** title of dialog allowing user to pick tiles "face up". (This
feature is not yet supported on Android.)
*/
public static final int title_tile_picker=0x7f05019a;
public static final int update_dicts_fmt=0x7f050299;
public static final int use_defaults=0x7f0502b3;
public static final int update_dicts_fmt=0x7f05029b;
public static final int use_defaults=0x7f0502b5;
/** text of checkbox controlling whether there's a game timer
*/
public static final int use_timer=0x7f0500bc;
@ -2692,9 +2694,9 @@ public final class R {
line in a game summary. The \u0020 is a space in xml.
*/
public static final int vs_join=0x7f050107;
public static final int waiting_title=0x7f0502bf;
public static final int waiting_title=0x7f0502c1;
public static final int warn_bt_disabled=0x7f050223;
public static final int warn_no_comms=0x7f0502c2;
public static final int warn_no_comms=0x7f0502c4;
/**
*/
public static final int warn_nomobile_fmt=0x7f0501fc;
@ -2707,9 +2709,9 @@ public final class R {
/**
*/
public static final int word_search_hint=0x7f0501ce;
public static final int xlations_enabled_summary=0x7f050274;
public static final int xlations_enabled_title=0x7f050273;
public static final int xlations_locale=0x7f0502df;
public static final int xlations_enabled_summary=0x7f050276;
public static final int xlations_enabled_title=0x7f050275;
public static final int xlations_locale=0x7f0502e1;
/** Empty in English, this should contain the name of the
translator/creator of the strings.xml file for this
language

7
xwords4/android/XWords4/jni/LocalizedStrIncludes.h
View file

@ -24,8 +24,9 @@
# define STRD_TURN_SCORE 18
# define STRD_REMAINS_HEADER 19
# define STRD_REMAINS_EXPL 20
# define STR_RESIGNED 21
# define STR_WINNER 22
# define STRSD_RESIGNED 21
# define STRSD_WINNER 22
# define STRDSD_PLACER 23
# define N_AND_USER_STRINGS 22
# define N_AND_USER_STRINGS 23
#endif

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

@ -2050,7 +2050,9 @@
<!-- Used in formatting final scores display -->
<string name="str_resigned">Resigned</string>
<!-- Used in formatting final scores display -->
<string name="str_winner">Winner</string>
<string name="str_winner_fmt" formatted="false">[Winner] %s: %d</string>
<string name="str_resigned_fmt" formatted="false">[Resigned] %s: %d</string>
<string name="str_placer_fmt" formatted="false">[#%d] %s: %d</string>
<!-- -->
<string name="inform_dict_diffversion_fmt">You and the host of this

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

@ -1781,7 +1781,9 @@
<!-- Used in formatting final scores display -->
<string name="str_resigned">Dengiser</string>
<!-- Used in formatting final scores display -->
<string name="str_winner">Renniw</string>
<string name="str_winner_fmt" formatted="false">]Renniw[ s%: d%</string>
<string name="str_resigned_fmt" formatted="false">]Dengiser[ s%: d%</string>
<string name="str_placer_fmt" formatted="false">]d%#[ s%: d%</string>
<!-- -->
<string name="inform_dict_diffversion_fmt">Uoy dna eht tsoh fo siht
emag era gnisu tnereffid snoisrev fo eht tsildrow %1$s.</string>

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

@ -1781,7 +1781,9 @@
<!-- Used in formatting final scores display -->
<string name="str_resigned">RESIGNED</string>
<!-- Used in formatting final scores display -->
<string name="str_winner">WINNER</string>
<string name="str_winner_fmt" formatted="false">[WINNER] %S: %D</string>
<string name="str_resigned_fmt" formatted="false">[RESIGNED] %S: %D</string>
<string name="str_placer_fmt" formatted="false">[#%D] %S: %D</string>
<!-- -->
<string name="inform_dict_diffversion_fmt">YOU AND THE HOST OF THIS
GAME ARE USING DIFFERENT VERSIONS OF THE WORDLIST %1$s.</string>

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java
View file

@ -94,8 +94,10 @@ public interface UtilCtxt {
static final int STRD_TURN_SCORE = 18;
static final int STRD_REMAINS_HEADER = 19;
static final int STRD_REMAINS_EXPL = 20;
static final int STR_RESIGNED = 21;
static final int STR_WINNER = 22;
static final int STRSD_RESIGNED = 21;
static final int STRSD_WINNER = 22;
static final int STRDSD_PLACER = 23;
String getUserString( int stringCode );
String getUserQuantityString( int stringCode, int quantity );

11
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
View file

@ -197,11 +197,14 @@ public class UtilCtxtImpl implements UtilCtxt {
case UtilCtxt.STRD_TURN_SCORE:
id = R.string.strd_turn_score_fmt;
break;
case UtilCtxt.STR_RESIGNED:
id = R.string.str_resigned;
case UtilCtxt.STRSD_RESIGNED:
id = R.string.str_resigned_fmt;
break;
case UtilCtxt.STR_WINNER:
id = R.string.str_winner;
case UtilCtxt.STRSD_WINNER:
id = R.string.str_winner_fmt;
break;
case UtilCtxt.STRDSD_PLACER:
id = R.string.str_placer_fmt;
break;
default:

35
xwords4/common/server.c
View file

@ -3121,8 +3121,6 @@ server_writeFinalScores( ServerCtxt* server, XWStreamCtxt* stream )
XP_UCHAR buf[128];
XP_S16 thisScore = IMPOSSIBLY_LOW_SCORE;
XP_S16 thisIndex = -1;
const XP_UCHAR* placeStr = NULL;
XP_UCHAR placeBuf[32];
XP_UCHAR tmpbuf[48];
XP_U16 ii, placeKey = 0;
XP_Bool firstDone;
@ -3145,21 +3143,12 @@ server_writeFinalScores( ServerCtxt* server, XWStreamCtxt* stream )
XP_ASSERT( !quitterDone );
thisIndex = quitter;
quitterDone = XP_TRUE;
placeKey = STR_RESIGNED;
placeKey = STRSD_RESIGNED;
} else {
break; /* we're done */
}
} else if ( thisScore == winningScore ) {
placeKey = STR_WINNER;
}
if ( !placeStr ) {
if ( 0 < placeKey ) {
placeStr = util_getUserString( server->vol.util, placeKey );
} else {
XP_SNPRINTF( placeBuf, VSIZE(placeBuf), "#%d", place );
placeStr = placeBuf;
}
placeKey = STRSD_WINNER;
}
timeStr = (XP_UCHAR*)"";
@ -3182,12 +3171,24 @@ server_writeFinalScores( ServerCtxt* server, XWStreamCtxt* stream )
tilePenalties.arr[thisIndex]:
-tilePenalties.arr[thisIndex] );
XP_SNPRINTF( buf, sizeof(buf),
(XP_UCHAR*)"[%s] %s: %d" XP_CR " (%d %s%s)", placeStr,
emptyStringIfNull(gi->players[thisIndex].name),
scores.arr[thisIndex],
const XP_UCHAR* name = emptyStringIfNull(gi->players[thisIndex].name);
if ( 0 == placeKey ) {
const XP_UCHAR* fmt = util_getUserString( server->vol.util,
STRDSD_PLACER );
XP_SNPRINTF( buf, sizeof(buf), fmt, place,
name, scores.arr[thisIndex] );
} else {
const XP_UCHAR* fmt = util_getUserString( server->vol.util,
placeKey );
XP_SNPRINTF( buf, sizeof(buf), fmt, name,
scores.arr[thisIndex] );
}
XP_UCHAR buf2[64];
XP_SNPRINTF( buf2, sizeof(buf2), XP_CR " (%d %s%s)",
model_getPlayerScore( model, thisIndex ),
tmpbuf, timeStr );
XP_STRCAT( buf, buf2 );
if ( 1 < place ) {
stream_catString( stream, XP_CR );

5
xwords4/linux/LocalizedStrIncludes.h
View file

@ -53,8 +53,9 @@ enum {
STRD_REMAINS_HEADER,
STRD_REMAINS_EXPL,
STR_RESIGNED,
STR_WINNER,
STRSD_RESIGNED,
STRSD_WINNER,
STRDSD_PLACER,
STR_LAST
};

12
xwords4/linux/linuxutl.c
View file

@ -330,10 +330,14 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code )
return (XP_UCHAR*)"%d tiles left in pool.";
case STRD_REMAINS_EXPL:
return (XP_UCHAR*)"%d tiles left in pool and all tray[s]:\n";
case STR_RESIGNED:
return "Resigned";
case STR_WINNER:
return "Winner";
case STRSD_RESIGNED:
return "[Resigned] %s: %d";
case STRSD_WINNER:
return "[Winner] %s: %d";
case STRDSD_PLACER:
return "[#%d] %s: %d";
default:
return (XP_UCHAR*)"unknown code to linux_util_getUserString";
}