diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml index 6d16fbc7f..76748cf12 100644 --- a/xwords4/android/XWords4/AndroidManifest.xml +++ b/xwords4/android/XWords4/AndroidManifest.xml @@ -69,7 +69,7 @@ android:name=".XWApp" > - - - - Another paragraph in the about dialog */ public static final int about_web=0x7f0501d4; - public static final int activity_button=0x7f0502ca; /** %1$s added to %2$s studylist */ public static final int add_done_fmt=0x7f05028d; @@ -650,7 +646,7 @@ tous les chevalets :\n XLATE-ME For debugging */ - public static final int advanced=0x7f0502fc; + public static final int advanced=0x7f0502fa; /** This button takes you to the normal Game Configure screen This button takes you to the normal Game Configure screen Advanced game settings @@ -660,7 +656,7 @@ XLATE-ME /** XLATE-ME You should never need these... */ - public static final int advanced_summary=0x7f0502fd; + public static final int advanced_summary=0x7f0502fb; /** The wordlist %1$s contains only @@ -673,7 +669,7 @@ XLATE-ME on the device %1$s. Please check that the device is within range and that Crosswords is installed on it. */ - public static final int app_not_found_fmt=0x7f0502d4; + public static final int app_not_found_fmt=0x7f0502d2; public static final int app_version=0x7f050000; /** the background color of the area outside the board, e.g. between entries in the scoreboard @@ -812,7 +808,7 @@ XLATE-ME /** XLATE-ME Network stats */ - public static final int board_menu_game_netstats=0x7f050307; + public static final int board_menu_game_netstats=0x7f050305; /** Meaningful only for networked games, this menu causes all messages that have not yet been acknowledged by a remote device in the game to be resent. Eventually I hope to be @@ -834,7 +830,7 @@ XLATE-ME /** Resign */ public static final int board_menu_game_resign=0x7f050105; - public static final int board_menu_game_showInvites=0x7f050308; + public static final int board_menu_game_showInvites=0x7f050306; /** Invite */ public static final int board_menu_invite=0x7f050280; @@ -1014,7 +1010,7 @@ XLATE-ME one or more?\n\n(You may also need to open it on the device you want to pair with.) */ - public static final int bt_no_devs=0x7f0502d3; + public static final int bt_no_devs=0x7f0502d1; /** Turn Bluetooth on In the Bluetooth invite device dialog In the Bluetooth invite device dialog @@ -1155,7 +1151,7 @@ XLATE-ME /** XLATE-ME Discard changes */ - public static final int button_discard_changes=0x7f0502f3; + public static final int button_discard_changes=0x7f0502f1; /** Done @@ -1191,8 +1187,8 @@ XLATE-ME /** XLATE-ME Edit */ - public static final int button_edit=0x7f0502f2; - public static final int button_enable=0x7f050337; + public static final int button_edit=0x7f0502f0; + public static final int button_enable=0x7f050335; /** XLATE-ME Enable Bluetooth */ @@ -1345,7 +1341,7 @@ XLATE-ME /** Reconnect */ public static final int button_reconnect=0x7f050272; - public static final int button_reinvite=0x7f0502ed; + public static final int button_reinvite=0x7f0502eb; /** */ public static final int button_relay_add=0x7f050217; @@ -1501,7 +1497,7 @@ XLATE-ME public static final int button_trade_commit=0x7f0500e0; /** Button for alert with title above */ - public static final int button_wait=0x7f0502ec; + public static final int button_wait=0x7f0502ea; /** ############################################################ # Dialogs @@ -1674,17 +1670,17 @@ XLATE-ME public static final int chat_title_fmt=0x7f050187; /** Checking for wordlists in %1$s… */ - public static final int checking_for_fmt=0x7f05032e; + public static final int checking_for_fmt=0x7f05032c; /** Checking */ - public static final int checking_title=0x7f05032d; + public static final int checking_title=0x7f05032b; /** Everything is up-to-date. */ public static final int checkupdates_none_found=0x7f05024e; /** EXPERIMENTAL: "label" for invite on clipboard. If it's shown it's by some Android utility */ - public static final int clip_label=0x7f050340; + public static final int clip_label=0x7f05033e; /** 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 @@ -1708,8 +1704,8 @@ XLATE-ME and cannot be saved. Would you like to discard your changes, or edit to give it a way to connect? */ - public static final int config_no_connvia=0x7f0502f1; - public static final int confirm_clear_chat=0x7f050342; + public static final int config_no_connvia=0x7f0502ef; + public static final int confirm_clear_chat=0x7f050340; public static final int confirm_clear_relay=0x7f05021e; /** Additional text appended to text confirm_delete_dictf in the wordlist delete confiration dialog in the case where the @@ -1721,14 +1717,14 @@ XLATE-ME of the language is substituted for %1$s. */ public static final int confirm_deleteonly_dicts_fmt=0x7f0500ab; - public static final int confirm_drop_relay=0x7f050333; - public static final int confirm_drop_relay_bt=0x7f050335; - public static final int confirm_drop_relay_sms=0x7f050336; + public static final int confirm_drop_relay=0x7f050331; + public static final int confirm_drop_relay_bt=0x7f050333; + public static final int confirm_drop_relay_sms=0x7f050334; /** Your device is set up for %1$s. Would you like to download a wordlist so you can play Crosswords in %1$s? */ - public static final int confirm_get_locdict_fmt=0x7f0502fb; + public static final int confirm_get_locdict_fmt=0x7f0502f9; /** Text of confirmation dialog for above Text of confirmation dialog for above Are you sure you want to restore @@ -1923,7 +1919,7 @@ XLATE-ME /** XLATE-ME Change Communicate via */ - public static final int connection_via_label=0x7f0502e6; + public static final int connection_via_label=0x7f0502e4; /** (Last failure was %1$s) @@ -2016,16 +2012,16 @@ XLATE-ME public static final int data_gsm_only=0x7f05029c; /** SD card write complete. */ - public static final int db_store_done=0x7f05032f; + public static final int db_store_done=0x7f05032d; /** XLATE-ME Enable debug features */ - public static final int debug_features=0x7f050303; + public static final int debug_features=0x7f050301; /** XLATE-ME Menuitems etc. (release builds only) */ - public static final int debug_features_summary=0x7f050304; + public static final int debug_features_summary=0x7f050302; /** dictionary used by default for human players when creating new game clarification of above @@ -2053,7 +2049,7 @@ XLATE-ME label within default wordlists in app preferences Default language */ - public static final int default_language=0x7f0502d5; + public static final int default_language=0x7f0502d3; /** Store wordlists internally */ public static final int default_loc=0x7f050263; @@ -2133,7 +2129,7 @@ XLATE-ME /** Delete wordlist[s] */ public static final int delete_dicts=0x7f0502be; - public static final int devid_title=0x7f05030b; + public static final int devid_title=0x7f050309; /** Playing via SMS is currently disabled. You can enable it in Settings->Network game settings. @@ -2175,7 +2171,7 @@ XLATE-ME /** XLATE-ME Wordlist download URL */ - public static final int dict_host=0x7f050300; + public static final int dict_host=0x7f0502fe; /** Number of words: %1$d\nDownload size: %2$dK\nNote: %3$s */ @@ -2285,15 +2281,15 @@ XLATE-ME will use is substituted in for "%s". */ public static final int dicts_list_prompt_fmt=0x7f0500dd; - public static final int disable_nag_solo_title=0x7f0502fa; + public static final int disable_nag_solo_title=0x7f0502f8; /** Do not notify me no matter how long it\'s been my turn */ - public static final int disable_nag_summary=0x7f0502f9; + public static final int disable_nag_summary=0x7f0502f7; /** Disable turn reminders */ - public static final int disable_nag_title=0x7f0502f8; - public static final int disable_nags_title=0x7f0502f7; + public static final int disable_nag_title=0x7f0502f6; + public static final int disable_nags_title=0x7f0502f5; public static final int disable_relay=0x7f050164; public static final int disable_relay_summary=0x7f050165; /** text of item at bottom of dicts choice spinner. It @@ -2325,7 +2321,7 @@ XLATE-ME /** Downloading %1$s… */ public static final int downloading_dict_fmt=0x7f05019c; - public static final int drop_relay_warning_fmt=0x7f050332; + public static final int drop_relay_warning_fmt=0x7f050330; /** Display snapshots of games Display snapshots of games Invitation received but ignored: it @@ -2399,11 +2395,11 @@ XLATE-ME /** XLATE-ME Accept invitations more than once */ - public static final int enable_dupes_summary=0x7f050313; + public static final int enable_dupes_summary=0x7f050311; /** XLATE-ME Accept duplicate invites */ - public static final int enable_dupes_title=0x7f050311; + public static final int enable_dupes_title=0x7f05030f; /** NFC is turned off on this device. You can use the Android Settings app to turn it on . */ @@ -2411,21 +2407,21 @@ XLATE-ME /** XLATE-ME Fake invitation to aid debugging */ - public static final int enable_nfc_toself_summary=0x7f050316; + public static final int enable_nfc_toself_summary=0x7f050314; /** XLATE-ME Enable NFC to self */ - public static final int enable_nfc_toself_title=0x7f050315; + public static final int enable_nfc_toself_title=0x7f050313; /** XLATE-ME Rooms others can see and join */ - public static final int enable_pubroom_summary=0x7f0502e5; + public static final int enable_pubroom_summary=0x7f0502e3; /** XLATE-ME Enable public rooms */ - public static final int enable_pubroom_title=0x7f0502e4; - public static final int enable_relay_toself_summary=0x7f05033e; - public static final int enable_relay_toself_title=0x7f05033d; + public static final int enable_pubroom_title=0x7f0502e2; + public static final int enable_relay_toself_summary=0x7f05033c; + public static final int enable_relay_toself_title=0x7f05033b; /** Allow games via SMS @@ -2442,11 +2438,11 @@ XLATE-ME /** XLATE-ME Skip radio when phone numbers same */ - public static final int enable_sms_toself_summary=0x7f050318; + public static final int enable_sms_toself_summary=0x7f050316; /** XLATE-ME Short-circuit SMS to self */ - public static final int enable_sms_toself_title=0x7f050317; + public static final int enable_sms_toself_title=0x7f050315; /** Tap tiles to select… */ public static final int entering_trade=0x7f0500e2; @@ -2455,11 +2451,11 @@ XLATE-ME device \"%1$s\" has already accepted an invitation to this game. */ - public static final int err_dup_invite_fmt=0x7f0502df; + public static final int err_dup_invite_fmt=0x7f0502dd; /** XLATE-ME Update checks URL */ - public static final int expl_update_url=0x7f050322; + public static final int expl_update_url=0x7f050320; /** 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. @@ -2484,7 +2480,7 @@ XLATE-ME explanation of the above */ public static final int explain_robot_summary=0x7f050155; - public static final int fetching_from_relay=0x7f050344; + public static final int fetching_from_relay=0x7f050342; /** 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 @@ -2514,7 +2510,7 @@ XLATE-ME /** XLATE-ME Pretend to have radio */ - public static final int force_radio_title=0x7f050319; + public static final int force_radio_title=0x7f050317; /** Even if my screen is too small */ public static final int force_tablet_summary=0x7f0502c9; @@ -2575,7 +2571,6 @@ XLATE-ME always pick the first. */ public static final int forced_consistent=0x7f0500d8; - public static final int fragment_button=0x7f0502cb; /** Games that have ended are listed with this string Displayed as a "Toast" (mini window briefly displayed) if you didn't choose a remote player and I was forced to pick one. I @@ -2671,7 +2666,7 @@ XLATE-ME /** XLATE-ME gameid */ - public static final int game_summary_field_gameid=0x7f050320; + public static final int game_summary_field_gameid=0x7f05031e; /** Put the language there, so it reads "Game 2 (English)" Put the language there, so it reads "Game 2 (English)" Game language\u200C @@ -2681,7 +2676,7 @@ XLATE-ME /** XLATE-ME Pending packet count */ - public static final int game_summary_field_npackets=0x7f050321; + public static final int game_summary_field_npackets=0x7f05031f; /** List names of opponents (summarized), e.g. "Game 2 (vs Kati)" List names of opponents (summarized), e.g. "Game 2 (vs Kati)" Opponent name[s] @@ -2691,7 +2686,7 @@ XLATE-ME /** XLATE-ME rowid */ - public static final int game_summary_field_rowid=0x7f05031f; + public static final int game_summary_field_rowid=0x7f05031d; /** List the state of the game, "Game over" or "10 moves made" etc. List the state of the game, "Game over" or "10 moves made" @@ -2763,13 +2758,13 @@ XLATE-ME /** XLATE-ME Load DB from SD card */ - public static final int gamel_menu_loaddb=0x7f050310; + public static final int gamel_menu_loaddb=0x7f05030e; /** XLATE-ME %1$s/%2$s XLATE-ME Write DB to SD card */ - public static final int gamel_menu_storedb=0x7f05030f; + public static final int gamel_menu_storedb=0x7f05030d; /** Studylist… */ public static final int gamel_menu_study=0x7f05028a; @@ -2787,13 +2782,13 @@ XLATE-ME /** XLATE-ME Source version id */ - public static final int git_rev_title=0x7f05030a; + public static final int git_rev_title=0x7f050308; /** Don\'t try a second time */ - public static final int got_langdict_summary=0x7f050324; + public static final int got_langdict_summary=0x7f050322; /** Fetch default wordlist for language */ - public static final int got_langdict_title=0x7f050323; + public static final int got_langdict_title=0x7f050321; /** Green */ public static final int green=0x7f050150; @@ -3081,7 +3076,7 @@ XLATE-ME sms */ public static final int invite_chooser_sms=0x7f050186; - public static final int invite_copied=0x7f05033f; + public static final int invite_copied=0x7f05033d; /** %1$s has invited you to play Crosswords using the wordlist %2$s (for play in %3$s), but it is not installed. Would you like to download the wordlist or @@ -3134,11 +3129,11 @@ XLATE-ME /** XLATE-ME Invite more than one player per remote device */ - public static final int invite_multi_summary=0x7f0502e3; + public static final int invite_multi_summary=0x7f0502e1; /** XLATE-ME Invite multiple */ - public static final int invite_multi_title=0x7f0502e2; + public static final int invite_multi_title=0x7f0502e0; /** Most users create games with only two players, which is the default, but Crosswords supports up to four. When I'm using the above string to encourage the opener of a game missing @@ -3188,7 +3183,7 @@ XLATE-ME expect it to take a while. They will still be able to connect.) */ - public static final int invite_stays=0x7f0502ee; + public static final int invite_stays=0x7f0502ec; /** Send invitation using SMS (texting) or via email? Send invitation using NFC (Android @@ -3318,6 +3313,8 @@ XLATE-ME public static final int key_enable_sms=0x7f050036; public static final int key_enable_sms_toself=0x7f05006d; public static final int key_explain_robot=0x7f050004; + /** key_enable_dualpane + */ public static final int key_force_radio=0x7f05003e; public static final int key_force_tablet=0x7f05003d; public static final int key_gcmvers_regid=0x7f050046; @@ -3495,7 +3492,7 @@ XLATE-ME pulls up dialog to delete the selected game */ public static final int list_item_delete=0x7f05009d; - public static final int list_item_deselect=0x7f050347; + public static final int list_item_deselect=0x7f050345; /** pulls up dialog to change the group of the selected game pulls up dialog to change the group of the selected game pulls up dialog to change the group of the selected game @@ -3534,18 +3531,18 @@ XLATE-ME except for any configuration. */ public static final int list_item_reset=0x7f05009e; - public static final int list_item_select=0x7f050346; + public static final int list_item_select=0x7f050344; /** formatting for last move summary in notifications formatting for last move summary in notifications %1$s passed (0 points) */ - public static final int lmi_pass_fmt=0x7f0502d0; + public static final int lmi_pass_fmt=0x7f0502ce; /** %1$s lost a turn */ - public static final int lmi_phony_fmt=0x7f0502d1; + public static final int lmi_phony_fmt=0x7f0502cf; /** Tiles assigned to %1$s */ - public static final int lmi_tiles_fmt=0x7f0502d2; + public static final int lmi_tiles_fmt=0x7f0502d0; /** 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. @@ -3686,11 +3683,11 @@ XLATE-ME /** XLATE-ME Enable logging */ - public static final int logging_on=0x7f050301; + public static final int logging_on=0x7f0502ff; /** XLATE-ME (release builds only) */ - public static final int logging_on_summary=0x7f050302; + public static final int logging_on_summary=0x7f050300; /** Word lookup */ public static final int lookup_title=0x7f050293; @@ -3939,26 +3936,28 @@ XLATE-ME public static final int msgs_progress=0x7f050096; /** %1$s moved more than %2$s ago. */ - public static final int nag_body_fmt=0x7f0502cd; + public static final int nag_body_fmt=0x7f0502cb; /** XLATE-ME Reminder intervals (minutes1,minutes2,...) */ - public static final int nag_intervals=0x7f050314; - /** Nagging: title of notification reminder message + public static final int nag_intervals=0x7f050312; + /** Enable dualpane + Side-by-side views, very experimental! + Nagging: title of notification reminder message Nagging: title of notification reminder message Reminder: It\'s your turn */ - public static final int nag_title=0x7f0502cc; + public static final int nag_title=0x7f0502ca; /** above is inserted in this the last time I warn above is inserted in this the last time I warn Last warning: %1$s */ - public static final int nag_warn_last_fmt=0x7f0502ce; + public static final int nag_warn_last_fmt=0x7f0502cc; /** XLATE-ME %1$s copy */ public static final int name_copy_fmt=0x7f050212; - public static final int name_dict_fmt=0x7f05030e; + public static final int name_dict_fmt=0x7f05030c; public static final int nbs_port=0x7f050084; /** text of checkbox. If this checkbox is checked, games created for network play will by default have the hint feature @@ -3987,15 +3986,15 @@ XLATE-ME /** XLATE-ME Game network stats */ - public static final int netstats_title=0x7f050309; + public static final int netstats_title=0x7f050307; /** XLATE-ME For experienced players */ - public static final int network_advanced_summary=0x7f0502e1; + public static final int network_advanced_summary=0x7f0502df; /** XLATE-ME Advanced */ - public static final int network_advanced_title=0x7f0502e0; + public static final int network_advanced_title=0x7f0502de; /** Network game settings */ public static final int network_behavior=0x7f050160; @@ -4046,27 +4045,27 @@ XLATE-ME /** XLATE-ME New one-device game */ - public static final int new_game=0x7f0502d7; + public static final int new_game=0x7f0502d5; /** XLATE-ME Would you like to create this game using default settings?\n\nOr would you like to configure it first? */ - public static final int new_game_message=0x7f0502da; + public static final int new_game_message=0x7f0502d8; /** XLATE-ME (You will have a chance to invite other players when it is open.) */ - public static final int new_game_message_net=0x7f0502dc; + public static final int new_game_message_net=0x7f0502da; /** XLATE-ME This game must be configured before it can be opened. */ - public static final int new_game_message_nodflt=0x7f0502db; + public static final int new_game_message_nodflt=0x7f0502d9; /** XLATE-ME New networked game */ - public static final int new_game_networked=0x7f0502d8; + public static final int new_game_networked=0x7f0502d6; /** @@ -4268,7 +4267,7 @@ XLATE-ME of this device against the one you want to invite—any time the game is open. */ - public static final int nfc_just_tap=0x7f0502ef; + public static final int nfc_just_tap=0x7f0502ed; /** XLATE-ME GSM XLATE-ME @@ -4276,7 +4275,7 @@ XLATE-ME XLATE-ME Send via NFC to self? */ - public static final int nfc_to_self=0x7f05031e; + public static final int nfc_to_self=0x7f05031c; /** Title of dialog for renaming game (triggered by selecting list_item_rename) If you try to copy a networked game you get this error @@ -4518,7 +4517,7 @@ XLATE-ME you get this error message */ public static final int no_games_to_refresh=0x7f050097; - public static final int no_invites=0x7f050349; + public static final int no_invites=0x7f050347; /** Google Play app not found */ public static final int no_market=0x7f050286; @@ -4545,7 +4544,7 @@ XLATE-ME substituted. */ public static final int no_name_found_fmt=0x7f0500c3; - public static final int no_relay_conn=0x7f050331; + public static final int no_relay_conn=0x7f05032f; /** This is not currently shown Crosswords wordlists, which are just compressed lists of words plus tile information, determine @@ -4620,10 +4619,10 @@ XLATE-ME /** EXPERIMENTAL: Newbie hint next when invite_choice_clip shown when chosen */ - public static final int not_again_clip_expl_fmt=0x7f050341; - public static final int not_again_comms_bt=0x7f05033a; - public static final int not_again_comms_relay=0x7f050338; - public static final int not_again_comms_sms=0x7f050339; + public static final int not_again_clip_expl_fmt=0x7f05033f; + public static final int not_again_comms_bt=0x7f050338; + public static final int not_again_comms_relay=0x7f050336; + public static final int not_again_comms_sms=0x7f050337; /** 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 @@ -4674,7 +4673,7 @@ XLATE-ME for games with more than two devices, which are rare. */ public static final int not_again_conndmid=0x7f0501cb; - public static final int not_again_dfltname_fmt=0x7f050348; + public static final int not_again_dfltname_fmt=0x7f050346; /** This screen lets you install new wordslists and view the ones you already have.\n\nWhat wordlists you have installed determines:\n• What languages you can play @@ -4703,7 +4702,7 @@ XLATE-ME and want them back, enable them now. You can turn them off again in Settings. */ - public static final int not_again_enablepublic=0x7f0502f6; + public static final int not_again_enablepublic=0x7f0502f4; /** Shown when you tap the flip button on the toolbar of the main Board screen Shown when you tap the flip button on the toolbar of the main @@ -4728,7 +4727,7 @@ XLATE-ME section of App settings). */ - public static final int not_again_hidenewgamebuttons=0x7f0502e8; + public static final int not_again_hidenewgamebuttons=0x7f0502e6; /** Shown when you tap the next hint button on the toolbar of the main Board screen Shown when you tap the next hint button on the toolbar of the @@ -4797,7 +4796,7 @@ XLATE-ME \"Actionbar.\" */ public static final int not_again_newselect=0x7f050278; - public static final int not_again_rematch_two_only=0x7f05033c; + public static final int not_again_rematch_two_only=0x7f05033a; /** The selected words will be copied to the system clipboard. You can then paste them into any app that supports pasting text, e.g. an email app. @@ -4956,7 +4955,7 @@ XLATE-ME /** XLATE-ME Number on this device */ - public static final int nplayers_prompt=0x7f0502de; + public static final int nplayers_prompt=0x7f0502dc; /** 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 @@ -5376,24 +5375,25 @@ XLATE-ME non-networked games */ public static final int players_label_standalone=0x7f0500b7; - /** Prefs related to in-app localization + /** Tablets Stuff +Prefs related to in-app localization */ - public static final int pref_group_l10n_summary=0x7f05032a; + public static final int pref_group_l10n_summary=0x7f050328; /** Localization Stuff */ - public static final int pref_group_l10n_title=0x7f050329; + public static final int pref_group_l10n_title=0x7f050327; /** Prefs related to play via internet/relay */ - public static final int pref_group_relay_summary=0x7f050328; + public static final int pref_group_relay_summary=0x7f050326; /** Relay Stuff */ - public static final int pref_group_relay_title=0x7f050327; + public static final int pref_group_relay_title=0x7f050325; /** Prefs related to play-via-sms */ - public static final int pref_group_sms_summary=0x7f050326; + public static final int pref_group_sms_summary=0x7f050324; /** SMS Stuff */ - public static final int pref_group_sms_title=0x7f050325; + public static final int pref_group_sms_title=0x7f050323; /** Label for the first "human player" name preference Label for the first "human player" name preference Human player @@ -5401,10 +5401,10 @@ XLATE-ME public static final int pref_human_name=0x7f050128; /** Get intermediate builds */ - public static final int pref_item_update_summary=0x7f05032c; + public static final int pref_item_update_summary=0x7f05032a; /** Update between releases */ - public static final int pref_item_update_title=0x7f05032b; + public static final int pref_item_update_title=0x7f050329; /** Label for the first player color preference Label for the first player color preference First player @@ -5608,8 +5608,8 @@ XLATE-ME Used when prev player's name can't be looked up Your opponent */ - public static final int prev_player=0x7f0502cf; - public static final int processing_games=0x7f050345; + public static final int prev_player=0x7f0502cd; + public static final int processing_games=0x7f050343; /** Downloading */ public static final int progress_title=0x7f0502c1; @@ -5628,7 +5628,7 @@ XLATE-ME /** XLATE-ME Relay device port */ - public static final int proxy_port=0x7f05030d; + public static final int proxy_port=0x7f05030b; /** Short for "points", this is shown at the right end of the tray in place of the first tile placed along with the points the current move would earn if committed. @@ -5662,16 +5662,16 @@ XLATE-ME middle of a game, like "do you want to commit this move?" */ public static final int query_title=0x7f0501b9; - public static final int radio_name_cdma=0x7f05031d; - public static final int radio_name_gsm=0x7f05031c; + public static final int radio_name_cdma=0x7f05031b; + public static final int radio_name_gsm=0x7f05031a; /** XLATE-ME Don\'t pretend */ - public static final int radio_name_real=0x7f05031a; + public static final int radio_name_real=0x7f050318; /** XLATE-ME Tablet/no radio */ - public static final int radio_name_tablet=0x7f05031b; + public static final int radio_name_tablet=0x7f050319; /** ############################################################ # :Dialogs: @@ -5711,8 +5711,8 @@ XLATE-ME /** XLATE-ME Invite redirect host */ - public static final int redir_host=0x7f0502ff; - public static final int rel_invite_title=0x7f050343; + public static final int redir_host=0x7f0502fd; + public static final int rel_invite_title=0x7f050341; /** Title of dialog used to alert players to relay-related problems with the current game. the color of text, e.g. "2L", shown on a bonus square on the @@ -5736,12 +5736,12 @@ XLATE-ME /** XLATE-ME Relay host */ - public static final int relay_host=0x7f0502fe; + public static final int relay_host=0x7f0502fc; public static final int relay_invite_title=0x7f05020e; /** XLATE-ME Relay game port */ - public static final int relay_port=0x7f05030c; + public static final int relay_port=0x7f05030a; /** Shown in toast when relaunching after switching dicts Shown in toast when relaunching after switching dicts Reloading game with %1$s @@ -5754,9 +5754,9 @@ XLATE-ME keep this game open while waiting. You will be notified when the game is ready to play. */ - public static final int rematch_msg=0x7f0502f5; - public static final int rematch_name_fmt=0x7f0502d9; - public static final int rematch_sent_toast=0x7f0502f4; + public static final int rematch_msg=0x7f0502f3; + public static final int rematch_name_fmt=0x7f0502d7; + public static final int rematch_sent_toast=0x7f0502f2; /** Processing wordlist information… */ public static final int remote_digesting=0x7f0502bb; @@ -5877,7 +5877,7 @@ XLATE-ME title for popup of public rooms found on server */ public static final int room_public_prompt=0x7f0500c1; - public static final int seeking_relay=0x7f050330; + public static final int seeking_relay=0x7f05032e; /** Games: %1$d */ public static final int sel_games_fmt=0x7f05027a; @@ -5910,7 +5910,7 @@ XLATE-ME /** XLATE-ME Hide buttons */ - public static final int set_pref=0x7f0502e7; + public static final int set_pref=0x7f0502e5; /** text of separator marking out other-setting area of the dialog see move_dictf above @@ -6114,7 +6114,7 @@ XLATE-ME placed, i.e. they do not form a single word. */ public static final int str_no_empties_in_turn=0x7f050191; - public static final int str_no_hint_found=0x7f05033b; + public static final int str_no_hint_found=0x7f050339; /** Same as above, but used when you try to show tiles belonging to a player on another device (a remote player.) Same as above, but used when you try to show tiles belonging @@ -6553,7 +6553,7 @@ string name="str_robot_moved">O robô fez esta jogada:\u0020(GSM phones only) */ - public static final int summary_send_data_sms=0x7f050306; + public static final int summary_send_data_sms=0x7f050304; /** explanation of the above explanation of the above Sort racks whenever new tiles @@ -6638,7 +6638,7 @@ string name="str_robot_moved">O robô fez esta jogada:\u0020Communicate via */ - public static final int title_addrs_pref=0x7f0502d6; + public static final int title_addrs_pref=0x7f0502d4; /** ############################################################ # :Screens: @@ -6759,7 +6759,7 @@ string name="str_robot_moved">O robô fez esta jogada:\u0020Send SMS as data */ - public static final int title_send_data_sms=0x7f050305; + public static final int title_send_data_sms=0x7f050303; /** If this preference is checked, tiles in the rack will be re-ordered alphabetically whenever tiles are added, i.e. after ever move. @@ -6887,7 +6887,7 @@ string name="str_robot_moved">O robô fez esta jogada:\u0020Use defaults */ - public static final int use_defaults=0x7f0502dd; + public static final int use_defaults=0x7f0502db; /** text of checkbox controlling whether there's a game timer text of checkbox. If this checkbox is checked, games created for network play will by default have the hint feature @@ -6906,12 +6906,12 @@ string name="str_robot_moved">O robô fez esta jogada:\u0020Waiting for players */ - public static final int waiting_title=0x7f0502e9; + public static final int waiting_title=0x7f0502e7; /** XLATE-ME Bluetooth is currently off on this device. No moves will be sent via Bluetooth.\n\nYou can enable @@ -6925,7 +6925,7 @@ string name="str_robot_moved">O robô fez esta jogada:\u0020 */ - public static final int warn_no_comms=0x7f0502f0; + public static final int warn_no_comms=0x7f0502ee; /** The number %1$s for %2$s is not @@ -6955,7 +6955,7 @@ réseau.) */ public static final int warn_unlimited=0x7f050222; - public static final int wifi_warning=0x7f050334; + public static final int wifi_warning=0x7f050332; /** First letters @@ -6971,7 +6971,7 @@ réseau.) /** XLATE-ME Fake locale for translation */ - public static final int xlations_locale=0x7f050312; + public static final int xlations_locale=0x7f050310; /** Empty in English, this should contain the name of the translator/creator of the strings.xml file for this language @@ -6998,12 +6998,6 @@ réseau.) public static final int expander_label=0x7f09000a; public static final int group_items=0x7f090006; public static final int new_game_buttons=0x7f09000c; - /** - */ public static final int newgame_connicon=0x7f09000b; public static final int relay_explain=0x7f090007; public static final int role_config_hint=0x7f090001; diff --git a/xwords4/android/XWords4/res/layout/main.xml b/xwords4/android/XWords4/res/layout/main.xml deleted file mode 100644 index 510c2b7d6..000000000 --- a/xwords4/android/XWords4/res/layout/main.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -