diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index f8cd15d53..e8be48e31 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -856,7 +856,7 @@ public final class R { /** EXPERIMENTAL: "label" for invite on clipboard. If it's shown it's by some Android utility */ - public static final int clip_label=0x7f050311; + public static final int clip_label=0x7f050310; /** 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 @@ -1342,10 +1342,6 @@ public final class R { */ public static final int initial_player_minutes=0x7f050127; public static final int invite_choice_bt=0x7f05016c; - /** EXPERIMENTAL: A choice of how to invite, along with SMS, - Bluetooth, email etc - */ - public static final int invite_choice_clip=0x7f05030f; public static final int invite_choice_email=0x7f05016b; public static final int invite_choice_nfc=0x7f05016d; /** EXPLAIN ME @@ -1371,7 +1367,7 @@ public final class R { /** EXPERIMENTAL: Shown as toast when user chooses "My choice" for invitation */ - public static final int invite_copied=0x7f050310; + public static final int invite_copied=0x7f05030f; public static final int invite_dict_missing_body_fmt=0x7f05023c; public static final int invite_dict_missing_body_noname_fmt=0x7f05023d; public static final int invite_dict_missing_title=0x7f05023b; @@ -1984,7 +1980,7 @@ public final class R { /** EXPERIMENTAL: Newbie hint next when invite_choice_clip shown when chosen */ - public static final int not_again_clip_expl_fmt=0x7f050312; + public static final int not_again_clip_expl_fmt=0x7f050311; public static final int not_again_comms_bt=0x7f05030c; public static final int not_again_comms_relay=0x7f05030a; public static final int not_again_comms_sms=0x7f05030b; diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 04682f157..f5a0507ad 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -2541,9 +2541,6 @@ Are you sure you want to delete all chat history for this game?\n\n(This action cannot be undone.) - - I\'ll choose Invitation ready to paste 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 8e405921f..c750480f1 100644 --- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml @@ -2189,9 +2189,6 @@ Era uoy erus uoy tnaw ot eteled lla tahc yrotsih rof siht ?emag\n\nsIht( noitca tonnac eb enodnu.) - - I\'ll esoohc Noitativni ydaer ot etsap 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 e5ea81946..b001f0284 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -2189,9 +2189,6 @@ ARE YOU SURE YOU WANT TO DELETE ALL CHAT HISTORY FOR THIS GAME?\n\n(THIS ACTION CANNOT BE UNDONE.) - - I\'LL CHOOSE INVITATION READY TO PASTE diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java index 6906a7a15..8c0b101b4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java @@ -632,7 +632,7 @@ public class DlgDelegate { means.add( DlgClickNotify.InviteMeans.NFC ); } final int clipPos = means.size(); - items.add( getString( R.string.invite_choice_clip ) ); + items.add( getString( R.string.slmenu_copy_sel ) ); means.add( DlgClickNotify.InviteMeans.CLIPBOARD ); final int[] sel = { -1 }; @@ -649,7 +649,7 @@ public class DlgDelegate { if ( view == clipPos ) { String msg = getString( R.string.not_again_clip_expl_fmt, - getString(R.string.invite_choice_clip) ); + getString(R.string.slmenu_copy_sel) ); showNotAgainDlgThen( msg, R.string.key_na_clip_expl ); } }