diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 24ac6854f..ba6f7e69c 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -342,11 +342,11 @@ public final class R { public static final class string { /** copyright info */ - public static final int about_copyright=0x7f0501e2; + public static final int about_copyright=0x7f0501de; /** Another paragraph giving credit for work done other than by Eric House and translators */ - public static final int about_credits=0x7f0501e5; + public static final int about_credits=0x7f0501e1; /** ########################################################### # :Dialogs: @@ -357,22 +357,22 @@ public final class R { String giving version info, which is substituted in. */ - public static final int about_vers_fmt=0x7f0501e1; + public static final int about_vers_fmt=0x7f0501dd; /** Another paragraph in the about dialog */ - public static final int about_web=0x7f0501e3; - public static final int add_done_fmt=0x7f050299; - public static final int add_to_study_fmt=0x7f050291; + public static final int about_web=0x7f0501df; + public static final int add_done_fmt=0x7f050295; + public static final int add_to_study_fmt=0x7f05028d; /** Debugging stuff. No point in localizing it. */ public static final int advanced=0x7f050077; /** This button takes you to the normal Game Configure screen */ - public static final int advanced_config=0x7f05019d; + public static final int advanced_config=0x7f050199; public static final int advanced_summary=0x7f050078; /** */ - public static final int alert_empty_dict_fmt=0x7f0501ff; + public static final int alert_empty_dict_fmt=0x7f0501fb; /** The name of the app. Not localized! */ public static final int app_name=0x7f050001; @@ -380,7 +380,7 @@ public final class R { /** the background color of the area outside the board, e.g. between entries in the scoreboard */ - public static final int background=0x7f05015b; + public static final int background=0x7f050157; /** Appended to the above in the phonies_warn case. User may ignore the warning */ @@ -392,10 +392,10 @@ public final class R { /** title of the dialog in which the above is posted. */ public static final int badwords_title=0x7f050103; - public static final int blue=0x7f05015f; + public static final int blue=0x7f05015b; /** board menu for small devices only */ - public static final int board_menu_dict=0x7f05023b; + public static final int board_menu_dict=0x7f050237; /** ############################################################ # :Menus: @@ -411,7 +411,7 @@ public final class R { public static final int board_menu_file_about=0x7f0500a1; /** */ - public static final int board_menu_file_email=0x7f050204; + public static final int board_menu_file_email=0x7f050200; /** menu on Game submenu: brings up dialog listing all tiles in the language of the game along with how many of each there are and how many points each is worth. This display is the @@ -442,10 +442,10 @@ public final class R { */ public static final int board_menu_game_resend=0x7f05010f; public static final int board_menu_game_resign=0x7f05010e; - public static final int board_menu_invite=0x7f050288; + public static final int board_menu_invite=0x7f050284; /** */ - public static final int board_menu_pass=0x7f0501f1; + public static final int board_menu_pass=0x7f0501ed; /** This menu begins an exchange of tiles: puts the board into trade mode. */ @@ -459,7 +459,7 @@ public final class R { public static final int board_menu_tray_show=0x7f050107; /** */ - public static final int board_menu_undo_current=0x7f050235; + public static final int board_menu_undo_current=0x7f050231; /** 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 @@ -468,7 +468,7 @@ public final class R { public static final int board_menu_undo_last=0x7f050108; /** preference for board size (15x15, 13x13 etc.) */ - public static final int board_size=0x7f050144; + public static final int board_size=0x7f050140; /** Title of submenu */ public static final int board_submenu_game=0x7f050109; @@ -478,64 +478,64 @@ public final class R { tapped. (color for) double-letter bonus squares on the board */ - public static final int bonus_l2x=0x7f050154; + public static final int bonus_l2x=0x7f050150; /** Bonus value hint that's displayed in gray text in the colored bonus square. Double-letter */ public static final int bonus_l2x_summary=0x7f0500ef; /** (color for) triple-letter bonus squares on the board */ - public static final int bonus_l3x=0x7f050155; + public static final int bonus_l3x=0x7f050151; /** Bonus value hint that's displayed in gray text in the colored bonus square. Triple-letter */ public static final int bonus_l3x_summary=0x7f0500f1; /** (color for) double-word squares on the board */ - public static final int bonus_w2x=0x7f050156; + public static final int bonus_w2x=0x7f050152; /** Bonus value hint that's displayed in gray text in the colored bonus square. Double-word */ public static final int bonus_w2x_summary=0x7f0500f0; /** (color for) triple-word squares on the board */ - public static final int bonus_w3x=0x7f050157; + public static final int bonus_w3x=0x7f050153; /** Bonus value hint that's displayed in gray text in the colored bonus square. Triple-word */ public static final int bonus_w3x_summary=0x7f0500f2; /** */ - public static final int bt_bad_proto_fmt=0x7f050213; + public static final int bt_bad_proto_fmt=0x7f05020f; /** EXPLAIN ME */ - public static final int bt_disabled=0x7f050183; + public static final int bt_disabled=0x7f05017f; /** */ - public static final int bt_fail_fmt=0x7f050218; + public static final int bt_fail_fmt=0x7f050214; /** EXPLAIN ME */ - public static final int bt_networked_desc=0x7f050184; + public static final int bt_networked_desc=0x7f050180; /** */ - public static final int bt_pick_clear_button=0x7f05020a; + public static final int bt_pick_clear_button=0x7f050206; /** */ - public static final int bt_pick_rescan_button=0x7f050209; + public static final int bt_pick_rescan_button=0x7f050205; /** */ - public static final int bt_resend_fmt=0x7f050217; + public static final int bt_resend_fmt=0x7f050213; /** */ - public static final int btname_label=0x7f05021a; + public static final int btname_label=0x7f050216; /** text of button for adding new player to game */ public static final int button_add_player=0x7f0500c5; - public static final int button_cancel=0x7f0501ba; + public static final int button_cancel=0x7f0501b6; /** The only button available when the above message is displayed */ - public static final int button_close_game=0x7f0501ae; - public static final int button_decline=0x7f050264; + public static final int button_close_game=0x7f0501aa; + public static final int button_decline=0x7f050260; /** */ public static final int button_default_both=0x7f0500ba; @@ -560,36 +560,36 @@ public final class R { the other option, for discarding changes that would otherwise reset a game. */ - public static final int button_discard=0x7f0501be; + public static final int button_discard=0x7f0501ba; /** */ - public static final int button_done=0x7f0501ee; + public static final int button_done=0x7f0501ea; /** */ - public static final int button_done_fmt=0x7f0501ef; + public static final int button_done_fmt=0x7f0501eb; /** Text of button displayed when downloading is an option */ - public static final int button_download=0x7f0501b1; - public static final int button_go_settings=0x7f05028a; - public static final int button_html=0x7f050189; + public static final int button_download=0x7f0501ad; + public static final int button_go_settings=0x7f050286; + public static final int button_html=0x7f050185; /** */ - public static final int button_invite=0x7f050219; + public static final int button_invite=0x7f050215; /** text of button to juggle (randomly rearrange order of) players */ public static final int button_juggle_players=0x7f0500c6; /** New strings that need to be documented and found a home above. */ - public static final int button_lookup=0x7f0501e8; + public static final int button_lookup=0x7f0501e4; /** */ - public static final int button_lookup_fmt=0x7f0501ea; - public static final int button_lookup_study=0x7f0501e9; - public static final int button_lookup_study_fmt=0x7f0501eb; + public static final int button_lookup_fmt=0x7f0501e6; + public static final int button_lookup_study=0x7f0501e5; + public static final int button_lookup_study_fmt=0x7f0501e7; /** */ - public static final int button_move=0x7f0501f3; + public static final int button_move=0x7f0501ef; /** What is \u200C? English strings are used as keys, so they all need to be unique. This glyph is non-printing and of zero-width, so it should do the trick: @@ -609,12 +609,12 @@ public final class R { /** Games list screen menuitem text for creating a new group */ public static final int button_new_group=0x7f050090; - public static final int button_nfc=0x7f05018a; - public static final int button_no=0x7f0501bc; + public static final int button_nfc=0x7f050186; + public static final int button_no=0x7f0501b8; /** Text for button in new-user-info dialog with title just above. */ - public static final int button_notagain=0x7f0501ca; + public static final int button_notagain=0x7f0501c6; /** ############################################################ # Dialogs @@ -623,13 +623,13 @@ public final class R { Text for buttons at the bottom of dialogs. These first are in many places. */ - public static final int button_ok=0x7f0501b9; - public static final int button_reconnect=0x7f05027a; + public static final int button_ok=0x7f0501b5; + public static final int button_reconnect=0x7f050276; /** 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=0x7f050279; + public static final int button_rematch=0x7f050275; /** 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). @@ -639,7 +639,7 @@ public final class R { connect to the relay failed because the room named does not exist. (I believe this no longer occurs.) */ - public static final int button_retry=0x7f0501bf; + public static final int button_retry=0x7f0501bb; /** ############################################################ # :Menus: @@ -652,29 +652,29 @@ public final class R { text of first menu item. Will revert all preferences to their default/original values */ - public static final int button_revert_all=0x7f05012d; + public static final int button_revert_all=0x7f050129; /** Second menu item. Reverts only the colors to their default/original values */ - public static final int button_revert_colors=0x7f05012f; + public static final int button_revert_colors=0x7f05012b; /** Used in Game config dialog to confirm saving changes that reset a game */ - public static final int button_save=0x7f0501bd; + public static final int button_save=0x7f0501b9; /** */ - public static final int button_search=0x7f0501f4; + public static final int button_search=0x7f0501f0; /** */ - public static final int button_sms_add=0x7f050226; + public static final int button_sms_add=0x7f050222; /** Text of button allowing user to choose to open with a different (but same-language wordlist) */ - public static final int button_substdict=0x7f0501b2; + public static final int button_substdict=0x7f0501ae; /** When an invitation is sent, the user gets to choose between plaintext and html formatting. These two strings are shown in the two buttons in the dialog. */ - public static final int button_text=0x7f050188; + public static final int button_text=0x7f050184; public static final int button_trade_cancel=0x7f0500ed; /** ############################################################ @@ -690,20 +690,20 @@ public final class R { i.e. after user has picked board_menu_trade menu item */ public static final int button_trade_commit=0x7f0500ec; - public static final int button_yes=0x7f0501bb; - public static final int cannot_delete_default_group_fmt=0x7f050276; - public static final int change_group=0x7f05027d; + public static final int button_yes=0x7f0501b7; + public static final int cannot_delete_default_group_fmt=0x7f050272; + public static final int change_group=0x7f050279; /** text of button in About Crosswords dialog summoning above dialog */ - public static final int changes_button=0x7f0501e7; + public static final int changes_button=0x7f0501e3; /** text of dialog showing the set of changes made since the last release */ - public static final int changes_title=0x7f0501e6; + public static final int changes_title=0x7f0501e2; /** Prefix for local messages */ - public static final int chat_local_id=0x7f050193; + public static final int chat_local_id=0x7f05018f; /** ############################################################ # :Menus: @@ -715,14 +715,14 @@ public final class R { other devices in the game: no "clear chat" message is transmitted. */ - public static final int chat_menu_clear=0x7f050196; + public static final int chat_menu_clear=0x7f050192; /** Prefix for remote messages */ - public static final int chat_other_id=0x7f050194; + public static final int chat_other_id=0x7f050190; /** Text on the button that causes the contents of the message-composition field to be sent. */ - public static final int chat_send=0x7f050195; + public static final int chat_send=0x7f050191; /** ############################################################ # :Screens: # Chat screen @@ -737,18 +737,18 @@ public final class R { title of the chat screen. The name of the current game is substituted for %1$s. */ - public static final int chat_title_fmt=0x7f050192; - public static final int checkupdates_none_found=0x7f050253; + public static final int chat_title_fmt=0x7f05018e; + public static final int checkupdates_none_found=0x7f05024f; /** 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 operations that require accurately selecting a single square on the board. */ - public static final int clr_crosshairs=0x7f050158; + public static final int clr_crosshairs=0x7f050154; /** */ - public static final int confirm_clear=0x7f05022c; + public static final int confirm_clear=0x7f050228; /** 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 @@ -767,10 +767,10 @@ public final class R { public static final int confirm_reset_fmt=0x7f0500ae; /** Text of confirmation dialog for above */ - public static final int confirm_revert_all=0x7f050130; + public static final int confirm_revert_all=0x7f05012c; /** Text of confirmation dialog for above */ - public static final int confirm_revert_colors=0x7f05012e; + public static final int confirm_revert_colors=0x7f05012a; /** title of confirmation dialog put up when user has unlocked an in-progress game and wants to save changes (has hit the play button). @@ -782,30 +782,30 @@ public final class R { public static final int confirm_seldeletes_fmt=0x7f0500ad; /** */ - public static final int confirm_sms_expl=0x7f05024c; + public static final int confirm_sms_expl=0x7f050248; /** */ - public static final int confirm_sms_leave=0x7f05024e; + public static final int confirm_sms_leave=0x7f05024a; /** */ - public static final int confirm_sms_prompt=0x7f05024d; + public static final int confirm_sms_prompt=0x7f050249; /** */ - public static final int confirm_sms_title=0x7f05024b; + public static final int confirm_sms_title=0x7f050247; /** */ - public static final int confirm_sms_unlimited=0x7f05024f; + public static final int confirm_sms_unlimited=0x7f05024b; /** */ - public static final int confirm_sms_willpay=0x7f050250; - public static final int confirm_studylist_clear_fmt=0x7f050297; + public static final int confirm_sms_willpay=0x7f05024c; + public static final int confirm_studylist_clear_fmt=0x7f050293; /** text of dialog shown when the menu item board_menu_undo_last is chosen. */ - public static final int confirm_undo_last=0x7f05012b; - public static final int connect_daily=0x7f050177; - public static final int connect_fifteen_mins=0x7f050173; - public static final int connect_five_mins=0x7f050172; + public static final int confirm_undo_last=0x7f050127; + public static final int connect_daily=0x7f050173; + public static final int connect_fifteen_mins=0x7f05016f; + public static final int connect_five_mins=0x7f05016e; /** ############################################################ # :Screens: @@ -818,81 +818,81 @@ public final class R { new moves available and fetches them. This controls how frequently that check is done. */ - public static final int connect_frequency=0x7f050170; + public static final int connect_frequency=0x7f05016c; /** text of separator marking out the connection area of the dialog */ public static final int connect_label_relay=0x7f0500c9; /** */ - public static final int connect_label_sms=0x7f05022e; + public static final int connect_label_sms=0x7f05022a; /** These are the possible values for the connect_frequency setting presented as a drop-down list. */ - public static final int connect_never=0x7f050171; - public static final int connect_one_hour=0x7f050175; - public static final int connect_six_hours=0x7f050176; - public static final int connect_thirty_mins=0x7f050174; + public static final int connect_never=0x7f05016d; + public static final int connect_one_hour=0x7f050171; + public static final int connect_six_hours=0x7f050172; + public static final int connect_thirty_mins=0x7f050170; /** */ - public static final int connstat_bt=0x7f050248; + public static final int connstat_bt=0x7f050244; /** */ - public static final int connstat_lastother_succ_fmt=0x7f050242; + public static final int connstat_lastother_succ_fmt=0x7f05023e; /** */ - public static final int connstat_lastother_unsucc_fmt=0x7f050243; + public static final int connstat_lastother_unsucc_fmt=0x7f05023f; /** */ - public static final int connstat_lastreceipt_fmt=0x7f050244; + public static final int connstat_lastreceipt_fmt=0x7f050240; /** */ - public static final int connstat_lastsend_fmt=0x7f050241; + public static final int connstat_lastsend_fmt=0x7f05023d; /** */ - public static final int connstat_net_fmt=0x7f05023e; + public static final int connstat_net_fmt=0x7f05023a; /** */ - public static final int connstat_nonet=0x7f05023d; + public static final int connstat_nonet=0x7f050239; /** */ - public static final int connstat_noreceipt=0x7f050245; + public static final int connstat_noreceipt=0x7f050241; /** */ - public static final int connstat_relay=0x7f050246; + public static final int connstat_relay=0x7f050242; /** */ - public static final int connstat_sms=0x7f050247; + public static final int connstat_sms=0x7f050243; /** */ - public static final int connstat_succ=0x7f05023f; + public static final int connstat_succ=0x7f05023b; /** */ - public static final int connstat_unsucc=0x7f050240; + public static final int connstat_unsucc=0x7f05023c; /** 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 of each there are are and how many points each is worth. */ - public static final int counts_values_title=0x7f0501c4; - public static final int cur_menu_marker_fmt=0x7f050287; + public static final int counts_values_title=0x7f0501c0; + public static final int cur_menu_marker_fmt=0x7f050283; /** */ - public static final int cur_tiles_fmt=0x7f0501f8; - public static final int data_gsm_only=0x7f0502a9; + public static final int cur_tiles_fmt=0x7f0501f4; + public static final int data_gsm_only=0x7f0502a5; public static final int debug_features=0x7f05007e; public static final int debug_features_summary=0x7f05007f; /** dictionary used by default for human players when creating new game */ - public static final int default_dict=0x7f05013c; + public static final int default_dict=0x7f050138; /** other */ public static final int default_host=0x7f05006c; - public static final int default_loc=0x7f050267; - public static final int default_loc_summary=0x7f050268; + public static final int default_loc=0x7f050263; + public static final int default_loc_summary=0x7f050264; /** Welcome dialog text */ - public static final int default_name_message=0x7f0501e0; + public static final int default_name_message=0x7f0501dc; /** ########################################################### # :Dialogs: @@ -907,41 +907,41 @@ public final class R { Welcome dialog title */ - public static final int default_name_title=0x7f0501df; + public static final int default_name_title=0x7f0501db; /** default new-game setting for handline phonies (words not found in the word list) */ - public static final int default_phonies=0x7f050142; + public static final int default_phonies=0x7f05013e; /** dictionary used by default for robot players when creating new game */ - public static final int default_robodict=0x7f05013d; + public static final int default_robodict=0x7f050139; public static final int default_update_url=0x7f050076; - public static final int delete_dicts=0x7f0502bb; + public static final int delete_dicts=0x7f0502b7; /** */ - public static final int dft_name_fmt=0x7f05021e; + public static final int dft_name_fmt=0x7f05021a; /** */ - public static final int dft_sms_name_fmt=0x7f050222; + public static final int dft_sms_name_fmt=0x7f05021e; /** */ - public static final int dict_browse_nowords_fmt=0x7f0501fc; + public static final int dict_browse_nowords_fmt=0x7f0501f8; /** */ - public static final int dict_browse_title1_fmt=0x7f0501fb; + public static final int dict_browse_title1_fmt=0x7f0501f7; /** */ - public static final int dict_browse_title_fmt=0x7f0501fa; + public static final int dict_browse_title_fmt=0x7f0501f6; public static final int dict_host=0x7f05007b; - public static final int dict_info_fmt=0x7f0502bf; + public static final int dict_info_fmt=0x7f0502bb; /** 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=0x7f0500e8; - public static final int dict_on_server=0x7f0502c1; + public static final int dict_on_server=0x7f0502bd; /** string name="invite_mime">text/plainDisplay snapshots of games */ - public static final int dropped_dupe=0x7f050286; + public static final int dropped_dupe=0x7f050282; /** 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. @@ -990,63 +990,63 @@ public final class R { the same room name over and over so they'll get this warning and it's harmless to ignore it. */ - public static final int dup_game_query_fmt=0x7f0501c0; + public static final int dup_game_query_fmt=0x7f0501bc; /** */ - public static final int email_author_chooser=0x7f050206; + public static final int email_author_chooser=0x7f050202; /** Nor is my email address */ public static final int email_author_email=0x7f05006b; /** */ - public static final int email_author_subject=0x7f050205; + public static final int email_author_subject=0x7f050201; /** */ - public static final int email_body_rev_fmt=0x7f050207; + public static final int email_body_rev_fmt=0x7f050203; /** color of empty squares on the board (that are not bonus squares) */ - public static final int empty=0x7f05015a; + public static final int empty=0x7f050156; /** */ - public static final int empty_sms_inviter=0x7f05022a; + public static final int empty_sms_inviter=0x7f050226; public static final int enable_dupes_summary=0x7f05008c; public static final int enable_dupes_title=0x7f05008a; - public static final int enable_nfc=0x7f050289; + public static final int enable_nfc=0x7f050285; /** */ - public static final int enable_sms=0x7f050249; + public static final int enable_sms=0x7f050245; /** */ - public static final int enable_sms_summary=0x7f05024a; + public static final int enable_sms_summary=0x7f050246; public static final int entering_trade=0x7f0500ee; public static final int expl_update_url=0x7f050075; /** These four strings are displayed as step-by-step instructions */ - public static final int explain_b1=0x7f050198; - public static final int explain_b2=0x7f050199; - public static final int explain_b3=0x7f05019a; - public static final int explain_b4=0x7f05019b; + public static final int explain_b1=0x7f050194; + public static final int explain_b2=0x7f050195; + public static final int explain_b3=0x7f050196; + public static final int explain_b4=0x7f050197; /** 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. */ - public static final int explain_robot=0x7f050162; + public static final int explain_robot=0x7f05015e; /** explanation of the above */ - public static final int explain_robot_summary=0x7f050163; + public static final int explain_robot_summary=0x7f05015f; /** title of dialog brought up in response to the board_menu_game_final menu. The dialog displays the final score and an accounting of it (including subtractions for running out the game timer if there is one.) */ - public static final int finalscores_title=0x7f0501c6; + public static final int finalscores_title=0x7f0501c2; /** Explanatory text appears in the dialog */ public static final int force_expl=0x7f0500e3; - public static final int force_tablet_summary=0x7f0502c6; - public static final int force_tablet_title=0x7f0502c5; + public static final int force_tablet_summary=0x7f0502c2; + public static final int force_tablet_title=0x7f0502c1; /** ############################################################ # :Dialogs: @@ -1072,11 +1072,11 @@ public final class R { public static final int gameOver=0x7f050098; /** */ - public static final int game_btname_title=0x7f05021c; + public static final int game_btname_title=0x7f050218; /** used to create default names of games (when user has not named them.) */ - public static final int game_fmt=0x7f0501b5; + public static final int game_fmt=0x7f0501b1; /** ############################################################ # :Menus: @@ -1089,34 +1089,34 @@ public final class R { public static final int game_item_menu_title_fmt=0x7f0500a2; /** */ - public static final int game_list_tmp=0x7f05023c; + public static final int game_list_tmp=0x7f050238; /** text of checkbox at top of dialog allowing to unlock in-play game to make changes */ public static final int game_locked=0x7f0500c2; - public static final int game_name_group_title=0x7f050275; + public static final int game_name_group_title=0x7f050271; /** */ public static final int game_rename_title=0x7f0500ab; /** */ - public static final int game_smsname_title=0x7f05021d; + public static final int game_smsname_title=0x7f050219; /** Put nothing in the summary space, so it just reads "Game 2" */ - public static final int game_summary_field_empty=0x7f050148; + public static final int game_summary_field_empty=0x7f050144; public static final int game_summary_field_gameid=0x7f050072; /** Put the language there, so it reads "Game 2 (English)" */ - public static final int game_summary_field_language=0x7f050149; + public static final int game_summary_field_language=0x7f050145; public static final int game_summary_field_npackets=0x7f050073; /** List names of opponents (summarized), e.g. "Game 2 (vs Kati)" */ - public static final int game_summary_field_opponents=0x7f05014a; + public static final int game_summary_field_opponents=0x7f050146; public static final int game_summary_field_rowid=0x7f050071; /** List the state of the game, "Game over" or "10 moves made" etc. */ - public static final int game_summary_field_state=0x7f05014b; + public static final int game_summary_field_state=0x7f050147; /** Regardless of the setting of the connect_frequency preference, checks the relay immediately for any moves for networked games on this device and posts a notification if @@ -1125,7 +1125,7 @@ public final class R { public static final int gamel_menu_checkmoves=0x7f05009e; /** */ - public static final int gamel_menu_checkupdates=0x7f050252; + public static final int gamel_menu_checkupdates=0x7f05024e; /** ############################################################ # :Menus: @@ -1140,19 +1140,19 @@ public final class R { public static final int gamel_menu_dicts=0x7f05009c; public static final int gamel_menu_loaddb=0x7f050089; public static final int gamel_menu_storedb=0x7f050088; - public static final int gamel_menu_study=0x7f050294; + public static final int gamel_menu_study=0x7f050290; /** */ - public static final int get_sms_number=0x7f05022b; - public static final int getinfo=0x7f0502ba; + public static final int get_sms_number=0x7f050227; + public static final int getinfo=0x7f0502b6; public static final int git_rev=0x7f05008e; public static final int git_rev_title=0x7f050084; - public static final int green=0x7f05015e; - public static final int group_cur_games=0x7f050270; - public static final int group_name_fmt=0x7f050278; - public static final int group_new_games=0x7f050271; - public static final int groups_confirm_del_fmt=0x7f050272; - public static final int groups_confirm_del_games_fmt=0x7f050273; + public static final int green=0x7f05015a; + public static final int group_cur_games=0x7f05026c; + public static final int group_name_fmt=0x7f050274; + public static final int group_new_games=0x7f05026d; + public static final int groups_confirm_del_fmt=0x7f05026e; + public static final int groups_confirm_del_games_fmt=0x7f05026f; /** Used as the default name for remote players displayed within the Game configure screen */ @@ -1165,17 +1165,17 @@ public final class R { large enough screens that they always know where they're tapping. */ - public static final int hide_crosshairs=0x7f05016c; + public static final int hide_crosshairs=0x7f050168; /** explanation of the above */ - public static final int hide_crosshairs_summary=0x7f05016d; + public static final int hide_crosshairs_summary=0x7f050169; /** Checkbox that when set prevents showing a title bar in the game board window to save space */ - public static final int hide_title=0x7f05014c; + public static final int hide_title=0x7f050148; /** clarification of above */ - public static final int hide_title_summary=0x7f05014d; + public static final int hide_title_summary=0x7f050149; /** text of checkbox. If this checkbox is checked, buttons will appear by which the user can get high- and low-scoring moves generated based on his tray. Can be used to cheat. @@ -1185,13 +1185,13 @@ public final class R { default to having the hint feature enabled(string elsewhere in this file) */ - public static final int hints_allowed_sum=0x7f05013e; + public static final int hints_allowed_sum=0x7f05013a; /** title of dialog brought up in response to the board_menu_game_history menu. A full history of the game up to the last turn is displayed, though details about what's in players' racks is left out if the game is not yet over. */ - public static final int history_title=0x7f0501c5; + public static final int history_title=0x7f0501c1; /** Partial text of alert posted when phonies_warn or phonies_disallow is the current setting and a "phony" is played. One of the two following strings will be appended @@ -1202,32 +1202,32 @@ public final class R { item with text board_menu_game_final and the game is not over */ - public static final int ids_endnow=0x7f0501c7; + public static final int ids_endnow=0x7f0501c3; /** Title of generic dialog used to display information */ - public static final int info_title=0x7f0501c1; + public static final int info_title=0x7f0501bd; /** */ - public static final int inform_dict_diffdict_fmt=0x7f05025c; + public static final int inform_dict_diffdict_fmt=0x7f050258; /** */ - public static final int inform_dict_diffversion_fmt=0x7f05025a; - public static final int inform_dict_download=0x7f05025d; - public static final int inform_dict_title=0x7f05025b; + public static final int inform_dict_diffversion_fmt=0x7f050256; + public static final int inform_dict_download=0x7f050259; + public static final int inform_dict_title=0x7f050257; /** Will new games, on default, randomly rearrange the start order of players. */ - public static final int init_autojuggle=0x7f050140; + public static final int init_autojuggle=0x7f05013c; /** clarification on above */ - public static final int init_autojuggle_sum=0x7f050141; + public static final int init_autojuggle_sum=0x7f05013d; /** default number of minutes on timer for new games */ - public static final int initial_player_minutes=0x7f050143; + public static final int initial_player_minutes=0x7f05013f; /** */ - public static final int invite_bt_desc_fmt=0x7f050216; - public static final int invite_chooser_email=0x7f05018f; + public static final int invite_bt_desc_fmt=0x7f050212; + public static final int invite_chooser_email=0x7f05018b; /** When I've created the invitation, in text or html, I ask Android to launch an app that can send it, typically an email or messaging app. Android then asks the user to choose which @@ -1235,11 +1235,11 @@ public final class R { to have launched. This string is passed to Android and used as the title of the dialog that presents that choice. */ - public static final int invite_chooser_fmt=0x7f05018e; - public static final int invite_chooser_sms=0x7f050190; - public static final int invite_dict_missing_body_fmt=0x7f050262; - public static final int invite_dict_missing_body_noname_fmt=0x7f050263; - public static final int invite_dict_missing_title=0x7f050261; + public static final int invite_chooser_fmt=0x7f05018a; + public static final int invite_chooser_sms=0x7f05018c; + public static final int invite_dict_missing_body_fmt=0x7f05025e; + public static final int invite_dict_missing_body_noname_fmt=0x7f05025f; + public static final int invite_dict_missing_title=0x7f05025d; public static final int invite_host=0x7f05006e; /** This is the body of the html version of the invitation. A URL is created with parameters describing the game and @@ -1247,7 +1247,7 @@ public final class R { encodings for the greater-than and less-than symbols which are not legal in xml strings.) */ - public static final int invite_htm_fmt=0x7f05018c; + public static final int invite_htm_fmt=0x7f050188; public static final int invite_mime=0x7f050070; /** If a networked game is opened and is not complete, i.e. if it is listed as expecting remote players who have not yet shown @@ -1269,22 +1269,22 @@ public final class R { public static final int invite_prefix=0x7f05006f; /** */ - public static final int invite_progress=0x7f05020c; + public static final int invite_progress=0x7f050208; /** */ - public static final int invite_sms_desc_fmt=0x7f050227; + public static final int invite_sms_desc_fmt=0x7f050223; /** This is the subject line of the email/text sent to invite someone to join a game. */ - public static final int invite_subject_fmt=0x7f05018b; + public static final int invite_subject_fmt=0x7f050187; /** */ - public static final int invite_success=0x7f05022d; + public static final int invite_success=0x7f050229; /** This is the body of the text version of the invitation. A URL is created with parameters describing the game and substituted for "%1$s". */ - public static final int invite_txt_fmt=0x7f05018d; + public static final int invite_txt_fmt=0x7f050189; /** text of checkbox asking if user wants to search for open public rooms */ @@ -1294,10 +1294,10 @@ public final class R { users to think about a move without having to touch the screen all the time. */ - public static final int keep_screenon=0x7f050150; + public static final int keep_screenon=0x7f05014c; /** clarification of above */ - public static final int keep_screenon_summary=0x7f050151; + public static final int keep_screenon_summary=0x7f05014d; public static final int key_background=0x7f050017; public static final int key_board_size=0x7f050027; public static final int key_bonus_l2x=0x7f050011; @@ -1307,7 +1307,7 @@ public final class R { /** the color of text, e.g. "2L", shown on a bonus square on the board */ - public static final int key_bonushint=0x7f05015c; + public static final int key_bonushint=0x7f050158; public static final int key_bt_addrs=0x7f05003d; public static final int key_bt_names=0x7f05003c; public static final int key_checked_sms=0x7f050044; @@ -1417,14 +1417,14 @@ public final class R { different wordlists.) */ public static final int lang_label=0x7f0500c7; - public static final int lang_name_fmt=0x7f0502c2; - public static final int lang_unknown=0x7f0502c3; + public static final int lang_name_fmt=0x7f0502be; + public static final int lang_unknown=0x7f0502bf; public static final int langdict_label=0x7f0500c8; - public static final int list_group_default=0x7f05026d; - public static final int list_group_delete=0x7f05026b; - public static final int list_group_movedown=0x7f05026f; - public static final int list_group_moveup=0x7f05026e; - public static final int list_group_rename=0x7f05026c; + public static final int list_group_default=0x7f050269; + public static final int list_group_delete=0x7f050267; + public static final int list_group_movedown=0x7f05026b; + public static final int list_group_moveup=0x7f05026a; + public static final int list_group_rename=0x7f050268; /** ############## menu items ############## pulls up dialog to configure the selected game */ @@ -1453,6 +1453,12 @@ public final class R { except for any configuration. */ public static final int list_item_reset=0x7f0500a7; + public static final int lmi_move_fmt=0x7f0502cb; + /** formatting for last move summary in notifications + */ + public static final int lmi_pass_fmt=0x7f0502ca; + public static final int lmi_phony_fmt=0x7f0502cd; + public static final int lmi_trade_fmt=0x7f0502cc; /** 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. @@ -1470,72 +1476,72 @@ public final class R { /** */ public static final int loc_external=0x7f0500bd; - public static final int loc_filters_all=0x7f0502ac; - public static final int loc_filters_menu=0x7f0502ae; - public static final int loc_filters_modified=0x7f0502af; - public static final int loc_filters_prompt=0x7f0502aa; - public static final int loc_filters_screen=0x7f0502ad; - public static final int loc_fmts_mismatch=0x7f0502b5; + public static final int loc_filters_all=0x7f0502a8; + public static final int loc_filters_menu=0x7f0502aa; + public static final int loc_filters_modified=0x7f0502ab; + public static final int loc_filters_prompt=0x7f0502a6; + public static final int loc_filters_screen=0x7f0502a9; + public static final int loc_fmts_mismatch=0x7f0502b1; /** see move_dictf above */ public static final int loc_internal=0x7f0500bc; - public static final int loc_item_check=0x7f0502b2; + public static final int loc_item_check=0x7f0502ae; /** for loc item edit menu */ - public static final int loc_item_clear=0x7f0502b1; - public static final int loc_item_copy_bless=0x7f0502b4; - public static final int loc_item_copy_eng=0x7f0502b3; - public static final int loc_lang_blessed=0x7f0502a4; - public static final int loc_lang_local=0x7f0502a5; - public static final int loc_main_english=0x7f0502b0; - public static final int loc_menu_xlate=0x7f0502a3; - public static final int loc_search_prompt=0x7f0502ab; + public static final int loc_item_clear=0x7f0502ad; + public static final int loc_item_copy_bless=0x7f0502b0; + public static final int loc_item_copy_eng=0x7f0502af; + public static final int loc_lang_blessed=0x7f0502a0; + public static final int loc_lang_local=0x7f0502a1; + public static final int loc_main_english=0x7f0502ac; + public static final int loc_menu_xlate=0x7f05029f; + public static final int loc_search_prompt=0x7f0502a7; /** This is the "hint" printed in light text in the empty player name field */ - public static final int local_name_hint=0x7f05019c; + public static final int local_name_hint=0x7f050198; public static final int logging_on=0x7f05007c; public static final int logging_on_summary=0x7f05007d; - public static final int lookup_title=0x7f05029f; + public static final int lookup_title=0x7f05029b; /** */ - public static final int manual_owner_name=0x7f050228; + public static final int manual_owner_name=0x7f050224; /** */ - public static final int max_len=0x7f050201; + public static final int max_len=0x7f0501fd; /** */ - public static final int menu_chat=0x7f050239; + public static final int menu_chat=0x7f050235; /** */ - public static final int menu_flip=0x7f050237; + public static final int menu_flip=0x7f050233; /** */ - public static final int menu_hint_next=0x7f050234; + public static final int menu_hint_next=0x7f050230; /** */ - public static final int menu_hint_prev=0x7f050233; + public static final int menu_hint_prev=0x7f05022f; /** */ - public static final int menu_juggle=0x7f050236; + public static final int menu_juggle=0x7f050232; /** text of menu that brings up the Settings (preferences) dialog */ public static final int menu_prefs=0x7f05009d; - public static final int menu_rateme=0x7f05028f; + public static final int menu_rateme=0x7f05028b; /** */ - public static final int menu_toggle_values=0x7f05023a; + public static final int menu_toggle_values=0x7f050236; /** */ - public static final int menu_zoom=0x7f050238; + public static final int menu_zoom=0x7f050234; /** */ - public static final int min_len=0x7f050200; + public static final int min_len=0x7f0501fc; /** label for the field used to set the timer's inital value */ public static final int minutes_label=0x7f0500d4; - public static final int missing_dict_detail=0x7f050260; - public static final int missing_dict_title=0x7f05025f; + public static final int missing_dict_detail=0x7f05025c; + public static final int missing_dict_title=0x7f05025b; /** 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 @@ -1566,7 +1572,7 @@ public final class R { Text of dialog. Player name is substituted */ - public static final int msg_ask_password_fmt=0x7f0501b4; + public static final int msg_ask_password_fmt=0x7f0501b0; /** When a game has been connected and the relay is notified that a device in the game has deleted its part of the game, this message is posted when you connect your end of it to the @@ -1603,22 +1609,22 @@ public final class R { /** Text of progress indicator shown while check is being conducted */ public static final int msgs_progress=0x7f05009f; - public static final int nag_body_fmt=0x7f0502cb; - public static final int nag_days_fmt=0x7f0502ca; - public static final int nag_hours_fmt=0x7f0502c9; + public static final int nag_body_fmt=0x7f0502c7; + public static final int nag_days_fmt=0x7f0502c6; + public static final int nag_hours_fmt=0x7f0502c5; public static final int nag_intervals=0x7f05008d; /** 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], 4 hour[s] ago." */ - public static final int nag_minutes_fmt=0x7f0502c8; + public static final int nag_minutes_fmt=0x7f0502c4; /** Nagging: title of notification reminder message */ - public static final int nag_title=0x7f0502c7; + public static final int nag_title=0x7f0502c3; /** above is inserted in this the last time I warn */ - public static final int nag_warn_last_fmt=0x7f0502cc; + public static final int nag_warn_last_fmt=0x7f0502c8; public static final int name_dict_fmt=0x7f050087; /** text of checkbox. If this checkbox is checked, games created for network play will by default have the hint feature @@ -1629,49 +1635,49 @@ public final class R { will default to having the hint feature enabled(string elsewhere in this file) */ - public static final int nethints_allowed_sum=0x7f05013f; + public static final int nethints_allowed_sum=0x7f05013b; public static final int netstats_title=0x7f050083; - public static final int network_behavior=0x7f05016e; + public static final int network_behavior=0x7f05016a; /** explanation of the above */ - public static final int network_behavior_summary=0x7f05016f; + public static final int network_behavior_summary=0x7f05016b; /** */ - public static final int new_app_avail=0x7f050257; + public static final int new_app_avail=0x7f050253; /** */ - public static final int new_app_avail_fmt=0x7f050256; + public static final int new_app_avail_fmt=0x7f050252; /** */ - public static final int new_bt_body_fmt=0x7f050212; + public static final int new_bt_body_fmt=0x7f05020e; /** */ - public static final int new_bt_title=0x7f050211; + public static final int new_bt_title=0x7f05020d; /** */ - public static final int new_btmove_title=0x7f050214; + public static final int new_btmove_title=0x7f050210; /** */ - public static final int new_dict_avail=0x7f050254; + public static final int new_dict_avail=0x7f050250; /** */ - public static final int new_dict_avail_fmt=0x7f050255; + public static final int new_dict_avail_fmt=0x7f050251; /** */ - public static final int new_move_body=0x7f050215; + public static final int new_move_body=0x7f050211; /** */ - public static final int new_name_body_fmt=0x7f050224; + public static final int new_name_body_fmt=0x7f050220; /** hint (text shown when field is empty) for room name field */ public static final int new_room_hint=0x7f0500cb; /** */ - public static final int new_sms_title=0x7f050223; + public static final int new_sms_title=0x7f05021f; /** */ - public static final int new_smsmove_title=0x7f050225; - public static final int new_xlations_fmt=0x7f0502a6; + public static final int new_smsmove_title=0x7f050221; + public static final int new_xlations_fmt=0x7f0502a2; /** ########################################################### # :Dialogs: @@ -1684,33 +1690,33 @@ public final class R { Title of New user info dialog */ - public static final int newbie_title=0x7f0501c9; + public static final int newbie_title=0x7f0501c5; /** section separator (white-on-gray bar) for third section: bluetooth games */ - public static final int newgame_bt_header=0x7f050182; + public static final int newgame_bt_header=0x7f05017e; /** Text of second of two buttons for new standalone games. Tap this and you'll get taken to the "Game configure" screen */ - public static final int newgame_configure_first=0x7f05017e; - public static final int newgame_enable_bt=0x7f050208; + public static final int newgame_configure_first=0x7f05017a; + public static final int newgame_enable_bt=0x7f050204; /** Text of first of two buttons for new networked games. Tap this and a game will be created, but you probably won't see it immediately because an email or messaging app will be launched to send your invitation. */ - public static final int newgame_invite=0x7f050181; + public static final int newgame_invite=0x7f05017d; /** Text of first of two buttons for new standalone games. Tap this and a new game will be created and opened. If the first player is a robot it will immediately take its turn. */ - public static final int newgame_local=0x7f05017d; + public static final int newgame_local=0x7f050179; /** This is one of two descriptions on this screen. It explains what standalone games are and describes the two buttons used to create them. The name of the language of the default wordlist is substituted in for %1$s. */ - public static final int newgame_local_desc_fmt=0x7f05017c; + public static final int newgame_local_desc_fmt=0x7f050178; /** ############################################################ # :Screens: # New game screen @@ -1724,22 +1730,22 @@ public final class R { section separator (white-on-gray bar) for first section: standalone games */ - public static final int newgame_local_header=0x7f05017b; + public static final int newgame_local_header=0x7f050177; /** This is the second of two descriptions on this screen. It explains what networked games are and describes the two buttons used to create them. */ - public static final int newgame_networked_desc=0x7f050180; + public static final int newgame_networked_desc=0x7f05017c; /** section separator (white-on-gray bar) for second section: networked games */ - public static final int newgame_networked_header=0x7f05017f; + public static final int newgame_networked_header=0x7f05017b; /** */ - public static final int newgame_sms_header=0x7f05021f; - public static final int newgroup_label=0x7f05026a; - public static final int nfc_or_email=0x7f050186; - public static final int nfc_or_sms_or_email=0x7f050187; + public static final int newgame_sms_header=0x7f05021b; + public static final int newgroup_label=0x7f050266; + public static final int nfc_or_email=0x7f050182; + public static final int nfc_or_sms_or_email=0x7f050183; /** Title of dialog for renaming game (triggered by selecting list_item_rename) If you try to copy a networked game you get this error @@ -1750,7 +1756,7 @@ public final class R { just an explanation and this button, after which the game closes. */ - public static final int no_dict_finish=0x7f0501ad; + public static final int no_dict_finish=0x7f0501a9; /** If the missing wordlist is discovered when trying to open the game, we have more options. If there's another wordlist in the same language, we can offer to substitute without needing @@ -1759,12 +1765,12 @@ public final class R { takes wordlist name and language substituted in for %1$ and %2$ */ - public static final int no_dict_fmt=0x7f0501af; + public static final int no_dict_fmt=0x7f0501ab; /** This is an alternative message presented when there's also the option of downloading another wordlist. Game name, wordlist name and language are substituted in. */ - public static final int no_dict_subst_fmt=0x7f0501b0; + public static final int no_dict_subst_fmt=0x7f0501ac; /** ############################################################ # :Dialogs: @@ -1776,18 +1782,18 @@ public final class R { title of alert */ - public static final int no_dict_title=0x7f0501ac; + public static final int no_dict_title=0x7f0501a8; /** If you click on the Play button without having entered a room name you get an alert with this error message. */ - public static final int no_empty_rooms=0x7f05019e; + public static final int no_empty_rooms=0x7f05019a; /** If you choose the above option and have no networked games you get this error message */ public static final int no_games_to_refresh=0x7f0500a0; - public static final int no_hide_titlebar=0x7f05028b; - public static final int no_market=0x7f050290; - public static final int no_move_onegroup=0x7f050277; + public static final int no_hide_titlebar=0x7f050287; + public static final int no_market=0x7f05028c; + public static final int no_move_onegroup=0x7f050273; /** displayed when you long-tap a scoreboard entry and there's no most recent score to show */ @@ -1809,50 +1815,50 @@ public final class R { figuring out how to play and when you tap an empty cell the arrow appears. This explains it. */ - public static final int not_again_arrow=0x7f0501dc; - public static final int not_again_backclears=0x7f050281; + public static final int not_again_arrow=0x7f0501d8; + public static final int not_again_backclears=0x7f05027d; /** */ - public static final int not_again_browse=0x7f0501fd; + public static final int not_again_browse=0x7f0501f9; /** */ - public static final int not_again_browseall=0x7f0501fe; + public static final int not_again_browseall=0x7f0501fa; /** Shown when you tap the chat button on the toolbar of the main Board screen */ - public static final int not_again_chat=0x7f0501d5; + public static final int not_again_chat=0x7f0501d1; /** This is shown in the Board screen when you successfully connecting a game to the relay and are the last device in the game to do so, i.e. the game is now complete and you should expect play to begin. */ - public static final int not_again_conndall=0x7f0501db; + public static final int not_again_conndall=0x7f0501d7; /** This is shown in the Board screen when you successfully connect a game to the relay and are the first device in the game to do so. */ - public static final int not_again_conndfirst=0x7f0501d9; + public static final int not_again_conndfirst=0x7f0501d5; /** This is shown in the Board screen when you successfully connecting a game to the relay and are not the first device in the game but not the last either. So it will only occur for games with more than two devices, which are rare. */ - public static final int not_again_conndmid=0x7f0501da; - public static final int not_again_dicts=0x7f0502c4; + public static final int not_again_conndmid=0x7f0501d6; + public static final int not_again_dicts=0x7f0502c0; /** 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=0x7f0501d7; + public static final int not_again_done=0x7f0501d3; /** Shown when you tap the flip button on the toolbar of the main Board screen */ - public static final int not_again_flip=0x7f0501d2; - public static final int not_again_fmt_expl=0x7f0502b6; + public static final int not_again_flip=0x7f0501ce; + public static final int not_again_fmt_expl=0x7f0502b2; /** Shown when you tap the next hint button on the toolbar of the main Board screen */ - public static final int not_again_hintnext=0x7f0501d0; + public static final int not_again_hintnext=0x7f0501cc; /** Currently not used The new game you have created has two players. Player 1 is a robot; Player 2 is you. Tap the game @@ -1861,76 +1867,76 @@ public final class R { Shown when you tap the Previous Hint button on the toolbar of the main Board screen */ - public static final int not_again_hintprev=0x7f0501cf; + public static final int not_again_hintprev=0x7f0501cb; /** Shown when you tap the juggle button on the toolbar of the main Board screen */ - public static final int not_again_juggle=0x7f0501d1; + public static final int not_again_juggle=0x7f0501cd; /** */ - public static final int not_again_lookup=0x7f0501f2; + public static final int not_again_lookup=0x7f0501ee; /** Shown when you first pick the list_item_new_from menuitem */ - public static final int not_again_newfrom=0x7f0501de; - public static final int not_again_newselect=0x7f050280; - public static final int not_again_sms_ready=0x7f05028d; - public static final int not_again_studycopy=0x7f05029e; + public static final int not_again_newfrom=0x7f0501da; + public static final int not_again_newselect=0x7f05027c; + public static final int not_again_sms_ready=0x7f050289; + public static final int not_again_studycopy=0x7f05029a; /** The following strings (all whose names start with "not_again") appear in the New user info dialog. shown when user chooses the gamel_menu_checkmoves menu */ - public static final int not_again_sync=0x7f0501cb; + public static final int not_again_sync=0x7f0501c7; /** Shown when the user chooses the "board_menu_trade" menu */ - public static final int not_again_trading=0x7f0501cc; - public static final int not_again_trading_buttons=0x7f0501cd; - public static final int not_again_trading_menu=0x7f0501ce; + public static final int not_again_trading=0x7f0501c8; + public static final int not_again_trading_buttons=0x7f0501c9; + public static final int not_again_trading_menu=0x7f0501ca; /** Shown when the board screen is visible and it's just become another players turn. The idea is to give a hint about how to find out about recent moves. */ - public static final int not_again_turnchanged=0x7f0501dd; + public static final int not_again_turnchanged=0x7f0501d9; /** Shown when you tap the undo/redo button on the toolbar of the main Board screen */ - public static final int not_again_undo=0x7f0501d4; + public static final int not_again_undo=0x7f0501d0; /** Shown in the Game configure screen when the game_locked checkbox is checked and you uncheck it. */ - public static final int not_again_unlock=0x7f0501d8; + public static final int not_again_unlock=0x7f0501d4; /** Shown when you tap the values button on the toolbar of the main Board screen. This is intended to allow players to remind themselves how much played tiles are worth while planning a move. */ - public static final int not_again_values=0x7f0501d6; + public static final int not_again_values=0x7f0501d2; /** Shown when you tap the zoom (+/-) button on the toolbar of the main Board screen */ - public static final int not_again_zoom=0x7f0501d3; - public static final int note_none=0x7f0502c0; - public static final int notify_body_fmt=0x7f0501b8; + public static final int not_again_zoom=0x7f0501cf; + public static final int note_none=0x7f0502bc; + public static final int notify_body_fmt=0x7f0501b4; /** 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.) */ - public static final int notify_other_summary=0x7f05017a; + public static final int notify_other_summary=0x7f050176; /** When one or more new moves is found, should I play a notification sound */ - public static final int notify_sound=0x7f050178; + public static final int notify_sound=0x7f050174; /** When a move is fetched from the relay a Notification is posted. These are its title, which appears in the top bar of the device, and the body that appears when you pull the notifications down. */ - public static final int notify_title=0x7f0501b7; + public static final int notify_title=0x7f0501b3; /** When one or more new moves is found, should I vibrate the device */ - public static final int notify_vibrate=0x7f050179; + public static final int notify_vibrate=0x7f050175; /** 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 @@ -1940,8 +1946,8 @@ public final class R { games as well. */ public static final int password_label=0x7f0500eb; - public static final int paste_done_fmt=0x7f050298; - public static final int pct_suffix=0x7f05028e; + public static final int paste_done_fmt=0x7f050294; + public static final int pct_suffix=0x7f05028a; /** 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.) @@ -1951,13 +1957,13 @@ public final class R { though it's not his turn e.g. while the player whose turn it is is temporarily unable to play. */ - public static final int peek_other=0x7f05016a; + public static final int peek_other=0x7f050166; /** explanation of the above */ - public static final int peek_other_summary=0x7f05016b; + public static final int peek_other_summary=0x7f050167; /** */ - public static final int phone_label=0x7f05022f; + public static final int phone_label=0x7f05022b; /** Don't warn, but simply force to skip turn (give 0 points) when user attempts to play word not in the wordlist. */ @@ -1978,10 +1984,10 @@ public final class R { public static final int phonies_warn=0x7f0500db; /** */ - public static final int pick_faceup=0x7f0501f9; + public static final int pick_faceup=0x7f0501f5; /** */ - public static final int pick_url_title_fmt=0x7f0501f0; + public static final int pick_url_title_fmt=0x7f0501ec; /** Text of button at bottom. Press it and you exit this configure screen and open the game into the Board screen */ @@ -2001,7 +2007,7 @@ public final class R { /** used to create default player names. Number between 1 and 4 is substituted */ - public static final int player_fmt=0x7f0501b6; + public static final int player_fmt=0x7f0501b2; /** text of lable identifying the field in which player's name is set/displayed */ @@ -2021,16 +2027,16 @@ public final class R { public static final int players_miss_fmt=0x7f0500f5; /** Label for the first "player name" preference */ - public static final int pref_player1_name=0x7f050135; + public static final int pref_player1_name=0x7f050131; /** Label for the second "player name" preference (unused) */ - public static final int pref_player2_name=0x7f050136; + public static final int pref_player2_name=0x7f050132; /** Label for the third "player name" preference (unused) */ - public static final int pref_player3_name=0x7f050137; + public static final int pref_player3_name=0x7f050133; /** Label for the fourth "player name" preference (unused) */ - public static final int pref_player4_name=0x7f050138; + public static final int pref_player4_name=0x7f050134; /** ############################################################ # :Screens: @@ -2039,10 +2045,10 @@ public final class R { title of this sub-preference */ - public static final int prefs_appearance=0x7f050145; + public static final int prefs_appearance=0x7f050141; /** clarification of the above */ - public static final int prefs_appearance_summary=0x7f050146; + public static final int prefs_appearance_summary=0x7f050142; /** ############################################################ # :Screens: @@ -2051,10 +2057,10 @@ public final class R { title of this sub-preference */ - public static final int prefs_behavior=0x7f050160; + public static final int prefs_behavior=0x7f05015c; /** clarification of the above */ - public static final int prefs_behavior_summary=0x7f050161; + public static final int prefs_behavior_summary=0x7f05015d; /** ############################################################ # :Screens: @@ -2064,10 +2070,10 @@ public final class R { title of this sub-preference */ - public static final int prefs_colors=0x7f050152; + public static final int prefs_colors=0x7f05014e; /** clarification of the above */ - public static final int prefs_colors_summary=0x7f050153; + public static final int prefs_colors_summary=0x7f05014f; /** ############################################################ # :Screens: @@ -2076,33 +2082,33 @@ public final class R { title of this sub-preference */ - public static final int prefs_defaults=0x7f050131; + public static final int prefs_defaults=0x7f05012d; /** clarification of the above */ - public static final int prefs_defaults_summary=0x7f050132; + public static final int prefs_defaults_summary=0x7f05012e; /** sub-preference for dictionaries (soon to be called "word lists") */ - public static final int prefs_dicts=0x7f05013a; + public static final int prefs_dicts=0x7f050136; /** clarification of above */ - public static final int prefs_dicts_summary=0x7f05013b; + public static final int prefs_dicts_summary=0x7f050137; /** sub-preference title for editing default player names. There's only enabled now, though. */ - public static final int prefs_names=0x7f050133; + public static final int prefs_names=0x7f05012f; /** clarification of the above */ - public static final int prefs_names_summary=0x7f050134; + public static final int prefs_names_summary=0x7f050130; /** Used when prev player's name can't be looked up */ - public static final int prev_player=0x7f0502cd; - public static final int progress_title=0x7f0502be; + public static final int prev_player=0x7f0502c9; + public static final int progress_title=0x7f0502ba; /** */ - public static final int prompt_max_len=0x7f050203; + public static final int prompt_max_len=0x7f0501ff; /** */ - public static final int prompt_min_len=0x7f050202; + public static final int prompt_min_len=0x7f0501fe; public static final int proxy_port=0x7f050086; /** Short for "points", this is shown at the right end of the tray in place of the first tile placed along with the points @@ -2118,11 +2124,11 @@ public final class R { /** Title for generic dialog asking a question, usually in the middle of a game, like "do you want to commit this move?" */ - public static final int query_title=0x7f0501c8; + public static final int query_title=0x7f0501c4; /** Text of dialog asking user to confirm a move that exchanges tiles (instead of forming a new word to earn points) */ - public static final int query_trade_fmt=0x7f050191; + public static final int query_trade_fmt=0x7f05018d; /** ############################################################ # :Dialogs: @@ -2135,13 +2141,13 @@ public final class R { Names of the three colors by which colors can be edited in the color preferences dialog */ - public static final int red=0x7f05015d; + public static final int red=0x7f050159; public static final int redir_host=0x7f05007a; /** Title of dialog used to alert players to relay-related problems with the current game. */ public static final int relay_alert=0x7f0500fa; - public static final int relay_alert_title=0x7f05027f; + public static final int relay_alert_title=0x7f05027b; /** ############################################################ # :Screens: # RelayGameActivity screen @@ -2162,24 +2168,24 @@ public final class R { This is the heading above the list of steps. The default language is substituted for %1$s. */ - public static final int relay_game_explain_fmt=0x7f050197; + public static final int relay_game_explain_fmt=0x7f050193; public static final int relay_host=0x7f050079; public static final int relay_port=0x7f050085; /** Shown in toast when relaunching after switching dicts */ - public static final int reload_new_dict_fmt=0x7f05025e; - public static final int remote_digesting=0x7f0502b8; - public static final int remote_empty=0x7f0502b7; + public static final int reload_new_dict_fmt=0x7f05025a; + public static final int remote_digesting=0x7f0502b4; + public static final int remote_empty=0x7f0502b3; /** 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=0x7f0500e6; - public static final int remote_no_net=0x7f0502b9; + public static final int remote_no_net=0x7f0502b5; /** */ - public static final int remote_undone=0x7f050232; - public static final int rename_group_label=0x7f050274; + public static final int remote_undone=0x7f05022e; + public static final int rename_group_label=0x7f050270; /** text within rename dialog (triggered by selecting list_item_rename) */ @@ -2190,10 +2196,10 @@ public final class R { volume) This only applies when the Board screen is frontmost. */ - public static final int ringer_zoom=0x7f050168; + public static final int ringer_zoom=0x7f050164; /** explanation of the above */ - public static final int ringer_zoom_summary=0x7f050169; + public static final int ringer_zoom_summary=0x7f050165; /** checkbox determining if player is robot/automated or human */ public static final int robot_label=0x7f0500ea; @@ -2218,10 +2224,10 @@ public final class R { public static final int room_public_prompt=0x7f0500cd; /** */ - public static final int scan_progress=0x7f05020b; - public static final int sel_games_fmt=0x7f050282; - public static final int sel_groups_fmt=0x7f050283; - public static final int sel_items_fmt=0x7f0502a2; + public static final int scan_progress=0x7f050207; + public static final int sel_games_fmt=0x7f05027e; + public static final int sel_groups_fmt=0x7f05027f; + public static final int sel_items_fmt=0x7f05029e; /** ############################################################ # :Dialogs: @@ -2240,60 +2246,60 @@ public final class R { arrow that then directs where tiles go when tapped in the tray. */ - public static final int show_arrow=0x7f05014e; + public static final int show_arrow=0x7f05014a; /** clarification of above */ - public static final int show_arrow_summary=0x7f05014f; - public static final int show_remote=0x7f0502bc; - public static final int show_wordlist_browser=0x7f05027e; + public static final int show_arrow_summary=0x7f05014b; + public static final int show_remote=0x7f0502b8; + public static final int show_wordlist_browser=0x7f05027a; /** 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) */ - public static final int skip_confirm_turn=0x7f050164; + public static final int skip_confirm_turn=0x7f050160; /** explanation of the above */ - public static final int skip_confirm_turn_summary=0x7f050165; - public static final int slmenu_clear_sel=0x7f050296; - public static final int slmenu_copy_sel=0x7f050295; - public static final int slmenu_deselect_all=0x7f0502a1; - public static final int slmenu_select_all=0x7f0502a0; + public static final int skip_confirm_turn_summary=0x7f050161; + public static final int slmenu_clear_sel=0x7f050292; + public static final int slmenu_copy_sel=0x7f050291; + public static final int slmenu_deselect_all=0x7f05029d; + public static final int slmenu_select_all=0x7f05029c; /** */ - public static final int sms_disabled=0x7f050221; + public static final int sms_disabled=0x7f05021d; /** */ - public static final int sms_networked_desc=0x7f050220; + public static final int sms_networked_desc=0x7f05021c; /** The invitation process begins with this query. The choice is between html and plaintext formatting but I also provide some explanation/guidance. */ - public static final int sms_or_email=0x7f050185; - public static final int sms_ready_text=0x7f05028c; + public static final int sms_or_email=0x7f050181; + public static final int sms_ready_text=0x7f050288; /** */ - public static final int smsname_label=0x7f05021b; - public static final int square_tiles=0x7f05027b; - public static final int square_tiles_summary=0x7f05027c; + public static final int smsname_label=0x7f050217; + public static final int square_tiles=0x7f050277; + public static final int square_tiles_summary=0x7f050278; /** Used in formatting moves and history */ - public static final int str_bonus_all=0x7f050127; + public static final int str_bonus_all=0x7f050123; /** Using the hint feature is cheating by some players, and it can be disabled via the hints_allowed preference. I should be disabling the buttons in this case, but if I don't and you try to get a hint you'll get this message instead. */ - public static final int str_cant_hint_while_disabled=0x7f0501a8; + public static final int str_cant_hint_while_disabled=0x7f0501a4; /** Displayed if you try to use the undo menuitem or button and there are no tiles on the board (no move has yet been made.) [If I'm being clever and disabling those features in this case there may be no way to see this.] */ - public static final int str_cant_undo_tileassign=0x7f0501a7; + public static final int str_cant_undo_tileassign=0x7f0501a3; /** Beginning of the message presented to a user when asking him to confirm committing the current turn */ - public static final int str_commit_confirm=0x7f050124; + public static final int str_commit_confirm=0x7f050120; /** Used to format game name plus some other information as the one-line summary for each game in the main screen. The name of the game is substituted for %1$s. Something else @@ -2302,20 +2308,15 @@ public final class R { ordering is wrong for your language. */ public static final int str_game_name_fmt=0x7f050091; - /** Used in formatting history and move reports; means user - skipped a turn because of an attempted illegal move/play of a - phony - */ - public static final int str_lostturn=0x7f050123; /** Displayed when you try to commit a turn that is illegal because there is empty space between some of the tiles placed, i.e. they do not form a single word. */ - public static final int str_no_empties_in_turn=0x7f0501a0; + public static final int str_no_empties_in_turn=0x7f05019c; /** Same as above, but used when you try to show tiles belonging to a player on another device (a remote player.) */ - public static final int str_no_peek_remote_tiles=0x7f0501a5; + public static final int str_no_peek_remote_tiles=0x7f0501a1; /** Displayed when you try to reveal a robot player's tiles, either by tapping on its "hidden" rack (marked by "?" characters) or by tapping on its scoreboard entry. (The @@ -2323,23 +2324,18 @@ public final class R { controlled by the peek_other preference and is disabled by default.) */ - public static final int str_no_peek_robot_tiles=0x7f0501a4; + public static final int str_no_peek_robot_tiles=0x7f0501a0; /** Used, with remote player's name substituted for %1$s, to indicate that the player is remote. */ - public static final int str_nonlocal_name_fmt=0x7f050125; + public static final int str_nonlocal_name_fmt=0x7f050121; /** Displyed when you try to commit a move and it's not your turn. */ - public static final int str_not_your_turn=0x7f0501a3; + public static final int str_not_your_turn=0x7f05019f; /** Used in formatting game history and move summaries */ public static final int str_pass=0x7f05011a; - /** Used in formatting exchange move summaries: passed means the - user skipped his turn, or made a move involving 0 tiles for 0 - points - */ - public static final int str_passed=0x7f050120; /** Used to alert user to loss of turn when a move is made and phonies is set to lose turn when word used not in wordlist @@ -2356,13 +2352,13 @@ public final class R { many players are expected and only connects devices where the numbers match. */ - public static final int str_reg_unexpected_user=0x7f0501a9; + public static final int str_reg_unexpected_user=0x7f0501a5; /** Used in formatting remote player move summaries */ public static final int str_remote_moved_fmt=0x7f050118; /** Used in formatting final scores display */ - public static final int str_resigned=0x7f050258; + public static final int str_resigned=0x7f050254; /** ############################################################ # Board info/error dialog messages @@ -2378,13 +2374,13 @@ public final class R { play in a different language. As with the above, this should be impossible when connecting via the relay. */ - public static final int str_server_dict_wins=0x7f0501aa; + public static final int str_server_dict_wins=0x7f0501a6; /** Displayed when you try to commit a turn that is illegal because tiles played do not touch other tiles already on the board (or the middle/star square in the case of the initial move.) */ - public static final int str_tiles_must_contact=0x7f0501a2; + public static final int str_tiles_must_contact=0x7f05019e; /** error messages @@ -2392,20 +2388,20 @@ public final class R { because the tiles placed are not all in the same row or column. */ - public static final int str_tiles_not_in_line=0x7f05019f; + public static final int str_tiles_not_in_line=0x7f05019b; /** Displayed when you try to begin a trade but there are not seven or more tiles in the pool. The rules don't allow trading in this case. */ - public static final int str_too_few_tiles_left_to_trade=0x7f0501a6; + public static final int str_too_few_tiles_left_to_trade=0x7f0501a2; /** Displayed when you try to commit the first move of the game and are playing a single tile. The first move must include two or more tiles. */ - public static final int str_two_tiles_first_move=0x7f0501a1; + public static final int str_two_tiles_first_move=0x7f05019d; /** Used in formatting final scores display */ - public static final int str_winner=0x7f050259; + public static final int str_winner=0x7f050255; /** Used in formatting game history (not move summaries since information about the current rack is hidden then) */ @@ -2415,25 +2411,21 @@ public final class R { public static final int strd_remaining_tiles_add_fmt=0x7f050114; /** Intro to the paragraph lisiting all of the tiles remaining */ - public static final int strd_remains_expl_fmt=0x7f05012a; + public static final int strd_remains_expl_fmt=0x7f050126; /** First line in the remaining tiles dialog (reached by tapping the number at left end of the scoreboard) */ - public static final int strd_remains_header_fmt=0x7f050129; + public static final int strd_remains_header_fmt=0x7f050125; /** Notifies user of a robot trade move */ public static final int strd_robot_traded_fmt=0x7f050112; /** I don't know how this is used. :-) */ public static final int strd_time_penalty_sub_fmt=0x7f050119; - /** Used in formatting reports of trades (exchanges of tiles). - Number of tiles traded is substituted for %1$d - */ - public static final int strd_traded_fmt=0x7f050122; /** Used in formatting moves and history. The total score for one turn is substituted for %1$d. */ - public static final int strd_turn_score_fmt=0x7f050128; + public static final int strd_turn_score_fmt=0x7f050124; /** Used in formatting game history and move summaries */ public static final int strd_unused_tiles_sub_fmt=0x7f050115; @@ -2453,28 +2445,24 @@ public final class R { board_menu_game_counts */ public static final int strs_values_header_fmt=0x7f050113; - /** formats tiles and score together, and probably doesn't need - translation unless the colon ':' needs to be replaced - */ - public static final int strsd_summaryscored_fmt=0x7f050121; /** Used in formatting exchange move summaries */ public static final int strss_traded_for_fmt=0x7f05011e; - public static final int study_langpick=0x7f05029b; - public static final int study_no_lang_fmt=0x7f05029c; - public static final int study_no_lists=0x7f05029d; - public static final int studylist_title_fmt=0x7f05029a; + public static final int study_langpick=0x7f050297; + public static final int study_no_lang_fmt=0x7f050298; + public static final int study_no_lists=0x7f050299; + public static final int studylist_title_fmt=0x7f050296; /** 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. */ - public static final int subst_dict_title=0x7f0501b3; + public static final int subst_dict_title=0x7f0501af; /** */ - public static final int summary_conn=0x7f050210; + public static final int summary_conn=0x7f05020c; /** */ - public static final int summary_conn_sms_fmt=0x7f050230; + public static final int summary_conn_sms_fmt=0x7f05022c; /** 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 @@ -2483,10 +2471,10 @@ public final class R { The following strings beginning with "game_summary_field_" are possible values */ - public static final int summary_field=0x7f050147; + public static final int summary_field=0x7f050143; /** */ - public static final int summary_gameover=0x7f05020f; + public static final int summary_gameover=0x7f05020b; /** The display of each networked game includes one of three states it can be in in the process of connecting to the relay. These next three strings are used to create those @@ -2512,35 +2500,35 @@ public final class R { public static final int summary_send_data_sms=0x7f050081; /** explanation of the above */ - public static final int summary_sort_tiles=0x7f050167; - public static final int summary_studyon=0x7f050293; - public static final int summary_thumbsize=0x7f050284; + public static final int summary_sort_tiles=0x7f050163; + public static final int summary_studyon=0x7f05028f; + public static final int summary_thumbsize=0x7f050280; /** */ - public static final int summary_wait_guest=0x7f05020e; + public static final int summary_wait_guest=0x7f05020a; /** */ - public static final int summary_wait_host=0x7f05020d; + public static final int summary_wait_host=0x7f050209; /** Used to indicate that a preference is not enabled, i.e. not part of the game and that the user should ignore it. */ - public static final int tell_unused=0x7f050139; - public static final int thumb_off=0x7f050285; + public static final int tell_unused=0x7f050135; + public static final int thumb_off=0x7f050281; /** color of the tiles' background */ - public static final int tile_back=0x7f050159; + public static final int tile_back=0x7f050155; /** */ - public static final int tilepick_all=0x7f0501f7; + public static final int tilepick_all=0x7f0501f3; /** */ - public static final int tilepick_undo=0x7f0501f6; + public static final int tilepick_undo=0x7f0501f2; /** title of dialog brought up in response to the board_menu_game_left menu. The dialog lists all tiles remaining in the pool, i.e. not on the board or in the rack of the player whose turn it is. */ - public static final int tiles_left_title=0x7f0501c3; + public static final int tiles_left_title=0x7f0501bf; /** ############################################################ # :Screens: @@ -2572,8 +2560,8 @@ public final class R { public static final int title_langs_list=0x7f0500c1; /** */ - public static final int title_lookup=0x7f0501ec; - public static final int title_lookup_study=0x7f0501ed; + public static final int title_lookup=0x7f0501e8; + public static final int title_lookup_study=0x7f0501e9; /** ############################################################ # :Screens: @@ -2586,46 +2574,46 @@ public final class R { window title */ - public static final int title_prefs=0x7f05012c; + public static final int title_prefs=0x7f050128; public static final int title_send_data_sms=0x7f050080; /** 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=0x7f050166; - public static final int title_studyon=0x7f050292; + public static final int title_sort_tiles=0x7f050162; + public static final int title_studyon=0x7f05028e; /** 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=0x7f0501c2; - public static final int update_dicts_fmt=0x7f0502bd; + public static final int title_tile_picker=0x7f0501be; + public static final int update_dicts_fmt=0x7f0502b9; /** text of checkbox controlling whether there's a game timer */ public static final int use_timer=0x7f0500d3; /** Used to separate names of players when listing them on one line in a game summary. The \u0020 is a space in xml. */ - public static final int vs_join=0x7f050126; + public static final int vs_join=0x7f050122; /** */ - public static final int warn_nomobile_fmt=0x7f050229; + public static final int warn_nomobile_fmt=0x7f050225; /** */ - public static final int warn_sms_disabled=0x7f050251; + public static final int warn_sms_disabled=0x7f05024d; /** */ - public static final int warn_unlimited=0x7f050231; + public static final int warn_unlimited=0x7f05022d; /** */ - public static final int word_search_hint=0x7f0501f5; - public static final int xlations_enabled_summary=0x7f0502a8; - public static final int xlations_enabled_title=0x7f0502a7; + public static final int word_search_hint=0x7f0501f1; + public static final int xlations_enabled_summary=0x7f0502a4; + public static final int xlations_enabled_title=0x7f0502a3; public static final int xlations_locale=0x7f05008b; /** Empty in English, this should contain the name of the translator/creator of the strings.xml file for this language */ - public static final int xlator=0x7f0501e4; + public static final int xlator=0x7f0501e0; public static final int xwords_nfc_mime=0x7f05006d; } public static final class style { diff --git a/xwords4/android/XWords4/jni/LocalizedStrIncludes.h b/xwords4/android/XWords4/jni/LocalizedStrIncludes.h index b9afeee58..f7d95ac0b 100644 --- a/xwords4/android/XWords4/jni/LocalizedStrIncludes.h +++ b/xwords4/android/XWords4/jni/LocalizedStrIncludes.h @@ -19,17 +19,13 @@ # define STR_PHONY_REJECTED 13 # define STRD_CUMULATIVE_SCORE 14 # define STRS_NEW_TILES 15 -# define STR_PASSED 16 -# define STRSD_SUMMARYSCORED 17 -# define STRD_TRADED 18 -# define STR_LOSTTURN 19 -# define STR_COMMIT_CONFIRM 20 -# define STR_BONUS_ALL 21 -# define STRD_TURN_SCORE 22 -# define STRD_REMAINS_HEADER 23 -# define STRD_REMAINS_EXPL 24 -# define STR_RESIGNED 25 -# define STR_WINNER 26 +# define STR_COMMIT_CONFIRM 16 +# define STR_BONUS_ALL 17 +# define STRD_TURN_SCORE 18 +# define STRD_REMAINS_HEADER 19 +# define STRD_REMAINS_EXPL 20 +# define STR_RESIGNED 21 +# define STR_WINNER 22 -# define N_AND_USER_STRINGS 26 +# define N_AND_USER_STRINGS 22 #endif diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c index 4821d5a64..1f88874a6 100644 --- a/xwords4/android/XWords4/jni/xwjni.c +++ b/xwords4/android/XWords4/jni/xwjni.c @@ -202,16 +202,6 @@ setJGI( JNIEnv* env, jobject jgi, const CurGameInfo* gi ) } } /* setJGI */ -static void -setLMI( JNIEnv* env, jobject jlmi, const LastMoveInfo* lmi ) -{ - setInt( env, jlmi, "score", lmi->score ); - setInt( env, jlmi, "nTiles", lmi->nTiles ); - setInt( env, jlmi, "moveType", lmi->moveType ); - setString( env, jlmi, "name", lmi->name ); - setString( env, jlmi, "word", lmi->word ); -} - #ifdef COMMON_LAYOUT static const SetInfo bd_ints[] = { ARR_MEMBER( BoardDims, left ) @@ -1143,24 +1133,24 @@ Java_org_eehouse_android_xw4_jni_XwJNI_model_1getNumTilesInTray return result; } -JNIEXPORT jstring JNICALL +JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_model_1getPlayersLastScore ( JNIEnv* env, jclass C, jint gamePtr, jint player, jobject jlmi ) { - jstring result = NULL; XWJNI_START(); XP_ASSERT( !!state->game.model ); - XP_UCHAR buf[64] = {0}; - XP_U16 buflen = sizeof(buf); LastMoveInfo lmi; - if ( !model_getPlayersLastScore( state->game.model, player, &lmi, - buf, &buflen ) ) { - buf[0] = '\0'; + XP_Bool valid = model_getPlayersLastScore( state->game.model, + player, &lmi ); + setBool( env, jlmi, "isValid", valid ); + if ( valid ) { + setInt( env, jlmi, "score", lmi.score ); + setInt( env, jlmi, "nTiles", lmi.nTiles ); + setInt( env, jlmi, "moveType", lmi.moveType ); + setString( env, jlmi, "name", lmi.name ); + setString( env, jlmi, "word", lmi.word ); } - setLMI( env, jlmi, &lmi ); - result = (*env)->NewStringUTF( env, buf ); XWJNI_END(); - return result; } JNIEXPORT jstring JNICALL diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index b5ae69ad0..a3e62b190 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -709,20 +709,6 @@ phonies is set to lose turn when word used not in wordlist --> Illegal word in move; turn lost! - - Passed - - %1$s:%2$d - - Exchanged %1$d tiles - - Lost turn Commit the current move?\n @@ -2281,4 +2267,9 @@ Your opponent + + %1$s passed + %1$s played %2$s for %3$d points + %1$s traded %2$d tiles + %1$s lost a turn diff --git a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml index a3e2e52dc..d9c0f685f 100644 --- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml @@ -602,20 +602,6 @@ phonies is set to lose turn when word used not in wordlist --> Lagelli drow ni evom; nrut !tsol - - Dessap - - %1$s:%2$d - - Degnahcxe %1$d selit - - Tsol nrut Timmoc eht tnerruc ?evom\n @@ -1951,4 +1937,9 @@ Tsal gninraw: %1$s Ruoy tnenoppo + + %1$s dessap + %1$s deyalp %2$s rof %3$d stniop + %1$s dedart %2$d selit + %1$s tsol a nrut diff --git a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml index 63e910942..6991ff9bc 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -602,20 +602,6 @@ phonies is set to lose turn when word used not in wordlist --> ILLEGAL WORD IN MOVE; TURN LOST! - - PASSED - - %1$s:%2$d - - EXCHANGED %1$d TILES - - LOST TURN COMMIT THE CURRENT MOVE?\n @@ -1951,4 +1937,9 @@ LAST WARNING: %1$s YOUR OPPONENT + + %1$s PASSED + %1$s PLAYED %2$s FOR %3$d POINTS + %1$s TRADED %2$d TILES + %1$s LOST A TURN diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java index 411422e61..17463db0f 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java @@ -1416,14 +1416,12 @@ public class BoardDelegate extends DelegateBase public void playerScoreHeld( int player ) { LastMoveInfo lmi = new LastMoveInfo(); - String expl = XwJNI.model_getPlayersLastScore( m_jniGamePtr, - player, lmi ); - expl = lmi.format( m_activity ); - if ( expl.length() == 0 ) { + XwJNI.model_getPlayersLastScore( m_jniGamePtr, player, lmi ); + String expl = lmi.format( m_activity ); + if ( null == expl || 0 == expl.length() ) { expl = getString( R.string.no_moves_made ); } - String name = m_gi.players[player].name; - final String text = String.format( "%s\n%s", name, expl ); + final String text = expl; post( new Runnable() { public void run() { showToast( text ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java index 682f2f4a9..fa0fec20b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java @@ -799,7 +799,7 @@ public class GameUtils { } if ( null != lmi ) { - XwJNI.model_getPlayersLastScore( gamePtr, 0, lmi ); + XwJNI.model_getPlayersLastScore( gamePtr, -1, lmi ); } saveGame( context, gamePtr, gi, lock, false ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LastMoveInfo.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LastMoveInfo.java index 8299da5c2..6f9092a84 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LastMoveInfo.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/LastMoveInfo.java @@ -21,7 +21,19 @@ package org.eehouse.android.xw4.jni; import android.content.Context; +import org.eehouse.android.xw4.R; +import org.eehouse.android.xw4.DbgUtils; +import org.eehouse.android.xw4.loc.LocUtils; + public class LastMoveInfo { + + // Keep in sync with StackMoveType in movestak.h + private static final int ASSIGN_TYPE = 0; + private static final int MOVE_TYPE = 1; + private static final int TRADE_TYPE = 2; + private static final int PHONY_TYPE = 3; + + public boolean isValid; public String name; public int moveType; public int score; @@ -30,6 +42,31 @@ public class LastMoveInfo { public String format( Context context ) { - return String.format( "%s did move type %d", name, moveType ); + String result = null; + if ( isValid ) { + switch( moveType ) { + case ASSIGN_TYPE: + break; + case MOVE_TYPE: + if ( 0 == nTiles ) { + result = LocUtils.getString( context, R.string.lmi_pass_fmt, + name ); + } else { + result = LocUtils.getString( context, R.string.lmi_move_fmt, + name, word, score ); + } + break; + case TRADE_TYPE: + result = LocUtils.getString( context, R.string.lmi_trade_fmt, + name, nTiles ); + break; + case PHONY_TYPE: + result = LocUtils.getString( context, R.string.lmi_phony_fmt, + name ); + break; + } + } + DbgUtils.logf( "LastMoveInfo.format() => %s", result ); + return result; } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java index 29ffeb746..e316af130 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java @@ -87,17 +87,13 @@ public interface UtilCtxt { static final int STR_PHONY_REJECTED = 13; static final int STRD_CUMULATIVE_SCORE = 14; static final int STRS_NEW_TILES = 15; - static final int STR_PASSED = 16; - static final int STRSD_SUMMARYSCORED = 17; - static final int STRD_TRADED = 18; - static final int STR_LOSTTURN = 19; - static final int STR_COMMIT_CONFIRM = 20; - static final int STR_BONUS_ALL = 21; - static final int STRD_TURN_SCORE = 22; - static final int STRD_REMAINS_HEADER = 23; - static final int STRD_REMAINS_EXPL = 24; - static final int STR_RESIGNED = 25; - static final int STR_WINNER = 26; + static final int STR_COMMIT_CONFIRM = 16; + static final int STR_BONUS_ALL = 17; + 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; String getUserString( int stringCode ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java index 6ac19cf57..2fd018cef 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxtImpl.java @@ -189,18 +189,6 @@ public class UtilCtxtImpl implements UtilCtxt { case UtilCtxt.STRS_NEW_TILES: id = R.string.strs_new_tiles_fmt; break; - case UtilCtxt.STR_PASSED: - id = R.string.str_passed; - break; - case UtilCtxt.STRSD_SUMMARYSCORED: - id = R.string.strsd_summaryscored_fmt; - break; - case UtilCtxt.STRD_TRADED: - id = R.string.strd_traded_fmt; - break; - case UtilCtxt.STR_LOSTTURN: - id = R.string.str_lostturn; - break; case UtilCtxt.STR_COMMIT_CONFIRM: id = R.string.str_commit_confirm; break; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java index 0f9e0682b..35f8255db 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java @@ -270,9 +270,9 @@ public class XwJNI { boolean gameOver ); public static native int model_getNMoves( int gamePtr ); public static native int model_getNumTilesInTray( int gamePtr, int player ); - public static native String model_getPlayersLastScore( int gamePtr, - int player, - LastMoveInfo lmi ); + public static native void model_getPlayersLastScore( int gamePtr, + int player, + LastMoveInfo lmi ); // Server public static native void server_reset( int gamePtr ); public static native void server_handleUndo( int gamePtr ); diff --git a/xwords4/common/draw.h b/xwords4/common/draw.h index d542c6f55..ab048886d 100644 --- a/xwords4/common/draw.h +++ b/xwords4/common/draw.h @@ -29,8 +29,7 @@ typedef XP_Bool (*LastScoreCallback)( void* closure, XP_S16 player, - LastMoveInfo* lmi, - XP_UCHAR* expl, XP_U16* explLen ); + LastMoveInfo* lmi ); typedef enum { CELL_NONE = 0x00 diff --git a/xwords4/common/model.c b/xwords4/common/model.c index 605d1e658..9f790ff9b 100644 --- a/xwords4/common/model.c +++ b/xwords4/common/model.c @@ -2189,15 +2189,10 @@ getFirstWord( const XP_UCHAR* word, XP_Bool XP_UNUSED(isLegal), static void scoreLastMove( ModelCtxt* model, MoveInfo* moveInfo, XP_U16 howMany, - LastMoveInfo* lmi, XP_UCHAR* buf, XP_U16* bufLen ) + LastMoveInfo* lmi ) { lmi->nTiles = moveInfo->nTiles; - if ( moveInfo->nTiles == 0 ) { - const XP_UCHAR* str = util_getUserString( model->vol.util, STR_PASSED ); - XP_U16 len = XP_STRLEN( str ); - *bufLen = len; - XP_STRNCPY( buf, str, len + 1 ); - } else { + if ( 0 < moveInfo->nTiles ) { XP_U16 score; const XP_UCHAR* format; WordNotifierInfo notifyInfo; @@ -2222,8 +2217,6 @@ scoreLastMove( ModelCtxt* model, MoveInfo* moveInfo, XP_U16 howMany, model_destroy( tmpModel ); - format = util_getUserString( model->vol.util, STRSD_SUMMARYSCORED ); - *bufLen = XP_SNPRINTF( buf, *bufLen, format, data.word, score ); lmi->score = score; XP_SNPRINTF( lmi->word, VSIZE(lmi->word), "%s", data.word ); } @@ -2375,10 +2368,10 @@ model_listWordsThrough( ModelCtxt* model, XP_U16 col, XP_U16 row, #endif XP_Bool -model_getPlayersLastScore( ModelCtxt* model, XP_S16 player, - LastMoveInfo* lmi, - XP_UCHAR* expl, XP_U16* explLen ) +model_getPlayersLastScore( ModelCtxt* model, XP_S16 player, LastMoveInfo* lmi ) { + XP_LOGF( "%s(player=%d)", __func__, player ); + StackCtxt* stack = model->vol.stack; XP_S16 nEntries, which; StackEntry entry; @@ -2386,39 +2379,36 @@ model_getPlayersLastScore( ModelCtxt* model, XP_S16 player, XP_MEMSET( lmi, 0, sizeof(*lmi) ); XP_ASSERT( !!stack ); - XP_ASSERT( player >= 0 ); nEntries = stack_getNEntries( stack ); for ( which = nEntries; which >= 0; ) { if ( stack_getNthEntry( stack, --which, &entry ) ) { - if ( entry.playerNum == player ) { + if ( -1 == player || entry.playerNum == player ) { found = XP_TRUE; break; } } } + if ( found ) { /* success? */ - const XP_UCHAR* format; - XP_U16 nTiles; - lmi->name = model->vol.gi->players[player].name; + XP_ASSERT( -1 == player || player == entry.playerNum ); + + XP_LOGF( "%s: found move %d", __func__, which ); + lmi->name = model->vol.gi->players[entry.playerNum].name; lmi->moveType = entry.moveType; + switch ( entry.moveType ) { case MOVE_TYPE: - scoreLastMove( model, &entry.u.move.moveInfo, - nEntries - which, lmi, expl, explLen ); + scoreLastMove( model, &entry.u.move.moveInfo, nEntries - which, + lmi ); + lmi->nTiles = entry.u.move.moveInfo.nTiles; break; case TRADE_TYPE: - nTiles = entry.u.trade.oldTiles.nTiles; lmi->nTiles = entry.u.trade.oldTiles.nTiles; - format = util_getUserString( model->vol.util, STRD_TRADED ); - *explLen = XP_SNPRINTF( expl, *explLen, format, nTiles ); break; case PHONY_TYPE: - format = util_getUserString( model->vol.util, STR_LOSTTURN ); - *explLen = XP_STRLEN( format ); - XP_STRCAT( expl, format ); break; case ASSIGN_TYPE: found = XP_FALSE; @@ -2426,6 +2416,7 @@ model_getPlayersLastScore( ModelCtxt* model, XP_S16 player, } } + LOG_RETURNF( "%d", found ); return found; } /* model_getPlayersLastScore */ diff --git a/xwords4/common/model.h b/xwords4/common/model.h index 79461291c..07e85d992 100644 --- a/xwords4/common/model.h +++ b/xwords4/common/model.h @@ -272,8 +272,7 @@ XP_Bool getCurrentMoveScoreIfLegal( ModelCtxt* model, XP_S16 turn, XP_S16 model_getPlayerScore( ModelCtxt* model, XP_S16 player ); XP_Bool model_getPlayersLastScore( ModelCtxt* model, XP_S16 player, - LastMoveInfo* info, - XP_UCHAR* expl, XP_U16* explLen ); + LastMoveInfo* info ); #ifdef XWFEATURE_BOARDWORDS void model_listWordsThrough( ModelCtxt* model, XP_U16 col, XP_U16 row, XWStreamCtxt* stream ); diff --git a/xwords4/common/scorebdp.c b/xwords4/common/scorebdp.c index 5a759459f..bb3539bf7 100644 --- a/xwords4/common/scorebdp.c +++ b/xwords4/common/scorebdp.c @@ -29,13 +29,10 @@ extern "C" { #endif static XP_Bool -board_ScoreCallback( void* closure, XP_S16 player, - LastMoveInfo* lmi, - XP_UCHAR* expl, XP_U16* explLen) +board_ScoreCallback( void* closure, XP_S16 player, LastMoveInfo* lmi ) { ModelCtxt* model = (ModelCtxt*)closure; - return model_getPlayersLastScore( model, player, - lmi, expl, explLen ); + return model_getPlayersLastScore( model, player, lmi ); } /* board_ScoreCallback */ #ifdef XWFEATURE_SCOREONEPASS diff --git a/xwords4/linux/LocalizedStrIncludes.h b/xwords4/linux/LocalizedStrIncludes.h index 1f75b4c02..4ceb837ff 100644 --- a/xwords4/linux/LocalizedStrIncludes.h +++ b/xwords4/linux/LocalizedStrIncludes.h @@ -45,11 +45,6 @@ enum { STR_ROBOT_MOVED, STRS_REMOTE_MOVED, - STR_PASSED, - STRSD_SUMMARYSCORED, - STRD_TRADED, - STR_LOSTTURN, - STR_LOCALPLAYERS, STR_TOTALPLAYERS, STR_REMOTE, diff --git a/xwords4/linux/gtkboard.c b/xwords4/linux/gtkboard.c index 17c91b1b9..06ed49b62 100644 --- a/xwords4/linux/gtkboard.c +++ b/xwords4/linux/gtkboard.c @@ -2015,14 +2015,12 @@ gtk_util_playerScoreHeld( XW_UtilCtxt* uc, XP_U16 player ) GtkGameGlobals* globals = (GtkGameGlobals*)uc->closure; - XP_UCHAR scoreExpl[128] = {0}; - XP_U16 explLen = sizeof(scoreExpl); - LastMoveInfo lmi; if ( model_getPlayersLastScore( globals->cGlobals.game.model, - player, &lmi, scoreExpl, &explLen ) ) { - formatLMI( &lmi, scoreExpl, VSIZE(scoreExpl) ); - (void)gtkask( globals->window, scoreExpl, GTK_BUTTONS_OK, NULL ); + player, &lmi ) ) { + XP_UCHAR buf[128]; + formatLMI( &lmi, buf, VSIZE(buf) ); + (void)gtkask( globals->window, buf, GTK_BUTTONS_OK, NULL ); } } #endif diff --git a/xwords4/linux/linuxutl.c b/xwords4/linux/linuxutl.c index 547f6739e..3e69371b9 100644 --- a/xwords4/linux/linuxutl.c +++ b/xwords4/linux/linuxutl.c @@ -314,15 +314,6 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code ) case STRS_REMOTE_MOVED: return (XP_UCHAR*)"Remote player \"%s\" moved:\n"; - case STR_PASSED: - return (XP_UCHAR*)"Passed"; - case STRSD_SUMMARYSCORED: - return (XP_UCHAR*)"%s:%d"; - case STRD_TRADED: - return (XP_UCHAR*)"Traded %d"; - case STR_LOSTTURN: - return (XP_UCHAR*)"Lost turn"; - #ifndef XWFEATURE_STANDALONE_ONLY case STR_LOCALPLAYERS: return (XP_UCHAR*)"Local players";