diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 3ca5799b3..763b09b3f 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -70,14 +70,15 @@ public final class R { public static final int save__gen=0x7f02001f; public static final int search__gen=0x7f020020; public static final int select_all__gen=0x7f020021; - public static final int shuffle=0x7f020022; - public static final int sologame__gen=0x7f020023; - public static final int stat_notify_chat=0x7f020024; - public static final int stat_notify_sync=0x7f020025; - public static final int undo=0x7f020026; - public static final int up__gen=0x7f020027; - public static final int values=0x7f020028; - public static final int zoom=0x7f020029; + public static final int send__gen=0x7f020022; + public static final int shuffle=0x7f020023; + public static final int sologame__gen=0x7f020024; + public static final int stat_notify_chat=0x7f020025; + public static final int stat_notify_sync=0x7f020026; + public static final int undo=0x7f020027; + public static final int up__gen=0x7f020028; + public static final int values=0x7f020029; + public static final int zoom=0x7f02002a; } public static final class id { public static final int about_xlator=0x7f0a0001; @@ -120,9 +121,10 @@ public final class R { public static final int button_study=0x7f0a0061; public static final int change_connection=0x7f0a003b; 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=0x7f0a00a0; + public static final int chat_edit=0x7f0a0011; + public static final int chat_history=0x7f0a0010; + public static final int chat_menu_clear=0x7f0a00a1; + public static final int chat_menu_send=0x7f0a00a0; public static final int checkbox=0x7f0a0051; public static final int color_display_sample=0x7f0a0012; public static final int color_edit_sample=0x7f0a0013; @@ -137,11 +139,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=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 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 divider=0x7f0a0024; public static final int download_button=0x7f0a0072; public static final int dwnld_message=0x7f0a004f; @@ -160,31 +162,31 @@ 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=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_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_menu_study=0x7f0a0090; public static final int group_done=0x7f0a0084; public static final int group_exchange=0x7f0a0095; @@ -200,10 +202,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=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_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_search_button=0x7f0a005e; public static final int loc_search_field=0x7f0a005d; public static final int local_label=0x7f0a0059; @@ -244,18 +246,18 @@ public final class R { public static final int room_edit=0x7f0a0036; public static final int room_spinner=0x7f0a0039; public static final int screen=0x7f0a002a; + public static final int scroll=0x7f0a000f; public static final int search_button=0x7f0a0021; public static final int seek_blue=0x7f0a0018; public static final int seek_green=0x7f0a0016; public static final int seek_red=0x7f0a0014; - 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=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 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 smart_robot=0x7f0a0040; public static final int state=0x7f0a004d; public static final int summary=0x7f0a0060; @@ -859,6 +861,7 @@ public final class R { */ public static final int clr_crosshairs=0x7f05013d; public static final int config_no_connvia=0x7f0502c7; + public static final int confirm_clear_chat=0x7f05030d; /** Additional text appended to text confirm_delete_dictf in the wordlist delete confiration dialog in the case where the wordlist to be deleted is the last in its language. The name diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 590a624f0..c84bfb1b7 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -1256,7 +1256,7 @@ --> - %1$s message history + %1$s messages Me:\u0020 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 1474ab684..e4e8b5c59 100644 --- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml @@ -1086,7 +1086,7 @@ --> - %1$s egassem yrotsih + %1$s segassem Em:\u0020 @@ -2186,4 +2186,7 @@ Eno egassem tnes %1$s segassem tnes + Era uoy erus uoy tnaw ot eteled + lla tahc yrotsih rof siht ?emag\n\nsIht( noitca tonnac eb + enodnu.) 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 52bb792fa..6553d1616 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -1086,7 +1086,7 @@ --> - %1$s MESSAGE HISTORY + %1$s MESSAGES ME:\u0020 @@ -2186,4 +2186,7 @@ ONE MESSAGE SENT %1$s MESSAGES SENT + ARE YOU SURE YOU WANT TO DELETE + ALL CHAT HISTORY FOR THIS GAME?\n\n(THIS ACTION CANNOT BE + UNDONE.)