diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 418c68b86..ec0d1b1f9 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -84,30 +84,29 @@ public final class R { public static final int add_player=0x7f0a0030; public static final int advertise_new_room_check=0x7f0a0037; public static final int blessed_label=0x7f0a0057; - public static final int board_menu_chat=0x7f0a009f; - public static final int board_menu_dict=0x7f0a009b; + public static final int board_menu_chat=0x7f0a009e; + public static final int board_menu_dict=0x7f0a009a; public static final int board_menu_done=0x7f0a0085; - public static final int board_menu_file_about=0x7f0a0093; public static final int board_menu_file_prefs=0x7f0a0092; - public static final int board_menu_flip=0x7f0a009d; + public static final int board_menu_flip=0x7f0a009c; public static final int board_menu_game_counts=0x7f0a008b; public static final int board_menu_game_history=0x7f0a008d; public static final int board_menu_game_left=0x7f0a008c; - public static final int board_menu_game_netstats=0x7f0a0094; + public static final int board_menu_game_netstats=0x7f0a0093; public static final int board_menu_game_resend=0x7f0a008f; public static final int board_menu_game_resign=0x7f0a008e; - public static final int board_menu_hint_next=0x7f0a0099; - public static final int board_menu_hint_prev=0x7f0a0098; - public static final int board_menu_invite=0x7f0a0095; - public static final int board_menu_juggle=0x7f0a009c; - public static final int board_menu_toggle=0x7f0a00a0; + public static final int board_menu_hint_next=0x7f0a0098; + public static final int board_menu_hint_prev=0x7f0a0097; + public static final int board_menu_invite=0x7f0a0094; + public static final int board_menu_juggle=0x7f0a009b; + public static final int board_menu_toggle=0x7f0a009f; public static final int board_menu_trade=0x7f0a0086; public static final int board_menu_trade_cancel=0x7f0a0087; public static final int board_menu_trade_commit=0x7f0a0088; public static final int board_menu_tray=0x7f0a008a; - public static final int board_menu_undo_current=0x7f0a009a; + public static final int board_menu_undo_current=0x7f0a0099; public static final int board_menu_undo_last=0x7f0a0089; - public static final int board_menu_zoom=0x7f0a009e; + public static final int board_menu_zoom=0x7f0a009d; public static final int board_root=0x7f0a0002; public static final int board_view=0x7f0a0003; public static final int boardsize_spinner=0x7f0a0043; @@ -123,7 +122,7 @@ public final class R { public static final int chat_button=0x7f0a0080; public static final int chat_edit=0x7f0a0010; public static final int chat_history=0x7f0a000f; - public static final int chat_menu_clear=0x7f0a00a1; + public static final int chat_menu_clear=0x7f0a00a0; public static final int checkbox=0x7f0a0051; public static final int color_display_sample=0x7f0a0012; public static final int color_edit_sample=0x7f0a0013; @@ -138,11 +137,11 @@ public final class R { public static final int dict_label=0x7f0a0069; public static final int dict_spinner=0x7f0a002d; public static final int dictlist_button=0x7f0a007f; - public static final int dicts_delete=0x7f0a00a4; - public static final int dicts_deselect_all=0x7f0a00a3; - public static final int dicts_download=0x7f0a00a2; - public static final int dicts_move=0x7f0a00a5; - public static final int dicts_select=0x7f0a00a6; + public static final int dicts_delete=0x7f0a00a3; + public static final int dicts_deselect_all=0x7f0a00a2; + public static final int dicts_download=0x7f0a00a1; + public static final int dicts_move=0x7f0a00a4; + public static final int dicts_select=0x7f0a00a5; public static final int divider=0x7f0a0024; public static final int download_button=0x7f0a0072; public static final int dwnld_message=0x7f0a004f; @@ -161,35 +160,35 @@ public final class R { public static final int game_locked_check=0x7f0a0028; public static final int game_name=0x7f0a0046; public static final int gamel_menu_checkmoves=0x7f0a0091; - public static final int games_game_config=0x7f0a00b2; - public static final int games_game_copy=0x7f0a00b7; - public static final int games_game_delete=0x7f0a00b1; - public static final int games_game_move=0x7f0a00b3; - public static final int games_game_new_from=0x7f0a00b5; - public static final int games_game_rename=0x7f0a00b6; - public static final int games_game_reset=0x7f0a00b4; - public static final int games_group_default=0x7f0a00bb; - public static final int games_group_delete=0x7f0a00ba; - public static final int games_group_movedown=0x7f0a00b9; - public static final int games_group_moveup=0x7f0a00b8; - public static final int games_group_rename=0x7f0a00bc; - public static final int games_menu_about=0x7f0a00ae; - public static final int games_menu_checkmoves=0x7f0a00b0; - public static final int games_menu_checkupdates=0x7f0a00bd; - public static final int games_menu_dicts=0x7f0a00ac; - public static final int games_menu_email=0x7f0a00ad; - public static final int games_menu_loaddb=0x7f0a00bf; - public static final int games_menu_newgame_net=0x7f0a00a8; - public static final int games_menu_newgame_solo=0x7f0a00a7; - public static final int games_menu_newgroup=0x7f0a00a9; - public static final int games_menu_prefs=0x7f0a00aa; - public static final int games_menu_rateme=0x7f0a00ab; - public static final int games_menu_resend=0x7f0a00af; - public static final int games_menu_storedb=0x7f0a00be; + public static final int games_game_config=0x7f0a00b1; + public static final int games_game_copy=0x7f0a00b6; + public static final int games_game_delete=0x7f0a00b0; + public static final int games_game_move=0x7f0a00b2; + public static final int games_game_new_from=0x7f0a00b4; + public static final int games_game_rename=0x7f0a00b5; + public static final int games_game_reset=0x7f0a00b3; + public static final int games_group_default=0x7f0a00ba; + public static final int games_group_delete=0x7f0a00b9; + public static final int games_group_movedown=0x7f0a00b8; + public static final int games_group_moveup=0x7f0a00b7; + public static final int games_group_rename=0x7f0a00bb; + public static final int games_menu_about=0x7f0a00ad; + public static final int games_menu_checkmoves=0x7f0a00af; + public static final int games_menu_checkupdates=0x7f0a00bc; + public static final int games_menu_dicts=0x7f0a00ab; + public static final int games_menu_email=0x7f0a00ac; + public static final int games_menu_loaddb=0x7f0a00be; + public static final int games_menu_newgame_net=0x7f0a00a7; + public static final int games_menu_newgame_solo=0x7f0a00a6; + public static final int games_menu_newgroup=0x7f0a00a8; + public static final int games_menu_prefs=0x7f0a00a9; + public static final int games_menu_rateme=0x7f0a00aa; + public static final int games_menu_resend=0x7f0a00ae; + public static final int games_menu_storedb=0x7f0a00bd; public static final int games_menu_study=0x7f0a0090; public static final int group_done=0x7f0a0084; - public static final int group_exchange=0x7f0a0096; - public static final int group_hint=0x7f0a0097; + public static final int group_exchange=0x7f0a0095; + public static final int group_hint=0x7f0a0096; public static final int hideable=0x7f0a004b; public static final int hints_allowed=0x7f0a003c; public static final int invite_desc=0x7f0a0009; @@ -201,10 +200,10 @@ public final class R { public static final int label=0x7f0a0025; public static final int lang_separator=0x7f0a002b; public static final int lang_spinner=0x7f0a002c; - public static final int loc_item_check=0x7f0a00c1; - public static final int loc_item_clear=0x7f0a00c0; - public static final int loc_item_copy_bless=0x7f0a00c3; - public static final int loc_item_copy_eng=0x7f0a00c2; + public static final int loc_item_check=0x7f0a00c0; + public static final int loc_item_clear=0x7f0a00bf; + public static final int loc_item_copy_bless=0x7f0a00c2; + public static final int loc_item_copy_eng=0x7f0a00c1; public static final int loc_search_button=0x7f0a005e; public static final int loc_search_field=0x7f0a005d; public static final int local_label=0x7f0a0059; @@ -252,11 +251,11 @@ public final class R { public static final int send_button=0x7f0a0011; public static final int show_remote=0x7f0a001e; public static final int shuffle_button=0x7f0a007d; - public static final int slmenu_clear_sel=0x7f0a00c8; - public static final int slmenu_copy_sel=0x7f0a00c7; - public static final int slmenu_deselect_all=0x7f0a00c6; - public static final int slmenu_lookup_sel=0x7f0a00c4; - public static final int slmenu_select_all=0x7f0a00c5; + public static final int slmenu_clear_sel=0x7f0a00c7; + public static final int slmenu_copy_sel=0x7f0a00c6; + public static final int slmenu_deselect_all=0x7f0a00c5; + public static final int slmenu_lookup_sel=0x7f0a00c3; + public static final int slmenu_select_all=0x7f0a00c4; public static final int smart_robot=0x7f0a0040; public static final int state=0x7f0a004d; public static final int summary=0x7f0a0060; @@ -458,9 +457,7 @@ public final class R { /** */ public static final int alert_empty_dict_fmt=0x7f0501d8; - /** The name of the app. Not localized! - */ - public static final int app_name=0x7f050001; + public static final int app_name=0x7f05007b; public static final int app_not_found_fmt=0x7f0502ad; public static final int app_version=0x7f050000; /** the background color of the area outside the board, @@ -706,6 +703,11 @@ public final class R { Any changes you make to it will be lost. + DO NOT EDIT THIS FILE!!!! + It was generated (from res_src/values-nl/strings.xml). + Any changes you make to it will be lost. + + DO NOT EDIT THIS FILE!!!! It was generated (from res_src/values-pt/strings.xml). Any changes you make to it will be lost. @@ -981,7 +983,7 @@ public final class R { public static final int default_dict=0x7f05011f; /** other */ - public static final int default_host=0x7f050076; + public static final int default_host=0x7f050075; /** label within default wordlists in app preferences */ public static final int default_language=0x7f0502ae; @@ -1013,7 +1015,7 @@ public final class R { new game */ public static final int default_robodict=0x7f050120; - public static final int default_update_url=0x7f05007c; + public static final int default_update_url=0x7f05007a; public static final int delete_dicts=0x7f050299; /** Playing via SMS is currently disabled. @@ -1036,7 +1038,7 @@ public final class R { public static final int dict_on_server=0x7f05029f; /** string name="invite_mime">text/plainkey_notagain_sms_ready */ - public static final int key_notagain_newselect=0x7f05004c; - public static final int key_notagain_relay=0x7f05004f; - public static final int key_notagain_sync=0x7f05004b; - public static final int key_notagain_trading=0x7f05005e; - public static final int key_notagain_turnchanged=0x7f05005c; - public static final int key_notagain_undo=0x7f050055; - public static final int key_notagain_unlock=0x7f050057; - public static final int key_notagain_zoom=0x7f050054; - public static final int key_notify_sound=0x7f050033; - public static final int key_notify_vibrate=0x7f050034; - public static final int key_peek_other=0x7f050009; - public static final int key_player0=0x7f050010; - public static final int key_player1=0x7f050011; - public static final int key_player1_name=0x7f05002d; - public static final int key_player2=0x7f050012; - public static final int key_player3=0x7f050013; - public static final int key_proxy_port=0x7f050021; - public static final int key_relay_host=0x7f05001d; - public static final int key_relay_port=0x7f05001e; - public static final int key_relay_regid=0x7f050045; - public static final int key_relay_regid_ackd=0x7f050046; - public static final int key_ringer_zoom=0x7f05000c; - public static final int key_robot_name=0x7f05002e; - public static final int key_show_arrow=0x7f050003; - public static final int key_show_sms=0x7f050025; - public static final int key_skip_confirm=0x7f050006; - public static final int key_sms_phones=0x7f050041; - public static final int key_sms_port=0x7f050022; - public static final int key_sort_tiles=0x7f050008; - public static final int key_square_tiles=0x7f050004; - public static final int key_studyon=0x7f050039; - public static final int key_summary_field=0x7f05003a; - public static final int key_thumbsize=0x7f050038; - public static final int key_tile_back=0x7f050018; - public static final int key_udp_interval=0x7f05004a; - public static final int key_update_prerel=0x7f050020; - public static final int key_update_url=0x7f05001f; - public static final int key_xlations_enabled=0x7f05006f; - public static final int key_xlations_locale=0x7f05006e; + public static final int key_notagain_newselect=0x7f05004b; + public static final int key_notagain_relay=0x7f05004e; + public static final int key_notagain_sync=0x7f05004a; + public static final int key_notagain_trading=0x7f05005d; + public static final int key_notagain_turnchanged=0x7f05005b; + public static final int key_notagain_undo=0x7f050054; + public static final int key_notagain_unlock=0x7f050056; + public static final int key_notagain_zoom=0x7f050053; + public static final int key_notify_sound=0x7f050032; + public static final int key_notify_vibrate=0x7f050033; + public static final int key_peek_other=0x7f050008; + public static final int key_player0=0x7f05000f; + public static final int key_player1=0x7f050010; + public static final int key_player1_name=0x7f05002c; + public static final int key_player2=0x7f050011; + public static final int key_player3=0x7f050012; + public static final int key_proxy_port=0x7f050020; + public static final int key_relay_host=0x7f05001c; + public static final int key_relay_port=0x7f05001d; + public static final int key_relay_regid=0x7f050044; + public static final int key_relay_regid_ackd=0x7f050045; + public static final int key_ringer_zoom=0x7f05000b; + public static final int key_robot_name=0x7f05002d; + public static final int key_show_arrow=0x7f050002; + public static final int key_show_sms=0x7f050024; + public static final int key_skip_confirm=0x7f050005; + public static final int key_sms_phones=0x7f050040; + public static final int key_sms_port=0x7f050021; + public static final int key_sort_tiles=0x7f050007; + public static final int key_square_tiles=0x7f050003; + public static final int key_studyon=0x7f050038; + public static final int key_summary_field=0x7f050039; + public static final int key_thumbsize=0x7f050037; + public static final int key_tile_back=0x7f050017; + public static final int key_udp_interval=0x7f050049; + public static final int key_update_prerel=0x7f05001f; + public static final int key_update_url=0x7f05001e; + public static final int key_xlations_enabled=0x7f05006e; + public static final int key_xlations_locale=0x7f05006d; /** text of separator marking out the language area of the dialog. First is used for single-device games, and second for networked games (where players aren't allowed to have @@ -2727,7 +2729,7 @@ public final class R { language */ public static final int xlator=0x7f0501be; - public static final int xwords_nfc_mime=0x7f050077; + public static final int xwords_nfc_mime=0x7f050076; } public static final class style { public static final int about_items=0x7f080005; diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml index ead3423ee..34a9f39ac 100644 --- a/xwords4/android/XWords4/res/values/common_rsrc.xml +++ b/xwords4/android/XWords4/res/values/common_rsrc.xml @@ -2,8 +2,6 @@ - - Crosswords key_color_tiles