Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-02 20:46:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

use existing string -- Copy to clipboard

Browse source
This commit is contained in:
Eric House 2015-08-23 21:52:07 -07:00
parent 98bd41bc14
commit 5fd477be75
5 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/XWords4/archive/R.java
View file

@ -856,7 +856,7 @@ public final class R {
/** EXPERIMENTAL: "label" for invite on clipboard. If it's shown /** EXPERIMENTAL: "label" for invite on clipboard. If it's shown
it's by some Android utility 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 /** color of the "crosshairs", lines drawn vertically and
horizontally through the square the user is currently horizontally through the square the user is currently
touching in order to guide the fat-fingered (most of us) in 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 initial_player_minutes=0x7f050127;
public static final int invite_choice_bt=0x7f05016c; 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_email=0x7f05016b;
public static final int invite_choice_nfc=0x7f05016d; public static final int invite_choice_nfc=0x7f05016d;
/** EXPLAIN ME /** EXPLAIN ME
@ -1371,7 +1367,7 @@ public final class R {
/** EXPERIMENTAL: Shown as toast when user chooses "My choice" for /** EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation 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_fmt=0x7f05023c;
public static final int invite_dict_missing_body_noname_fmt=0x7f05023d; public static final int invite_dict_missing_body_noname_fmt=0x7f05023d;
public static final int invite_dict_missing_title=0x7f05023b; 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 /** EXPERIMENTAL: Newbie hint next when invite_choice_clip shown
when chosen 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_bt=0x7f05030c;
public static final int not_again_comms_relay=0x7f05030a; public static final int not_again_comms_relay=0x7f05030a;
public static final int not_again_comms_sms=0x7f05030b; public static final int not_again_comms_sms=0x7f05030b;

3
xwords4/android/XWords4/res/values/strings.xml
View file

@ -2541,9 +2541,6 @@
<string name="confirm_clear_chat">Are you sure you want to delete <string name="confirm_clear_chat">Are you sure you want to delete
all chat history for this game?\n\n(This action cannot be all chat history for this game?\n\n(This action cannot be
undone.)</string> undone.)</string>
<!-- EXPERIMENTAL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'ll choose</string>
<!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for <!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation --> invitation -->
<string name="invite_copied">Invitation ready to paste</string> <string name="invite_copied">Invitation ready to paste</string>

3
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

@ -2189,9 +2189,6 @@
<string name="confirm_clear_chat">Era uoy erus uoy tnaw ot eteled <string name="confirm_clear_chat">Era uoy erus uoy tnaw ot eteled
lla tahc yrotsih rof siht ?emag\n\nsIht( noitca tonnac eb lla tahc yrotsih rof siht ?emag\n\nsIht( noitca tonnac eb
enodnu.)</string> enodnu.)</string>
<!-- EXPERIMENTAL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'ll esoohc</string>
<!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for <!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation --> invitation -->
<string name="invite_copied">Noitativni ydaer ot etsap</string> <string name="invite_copied">Noitativni ydaer ot etsap</string>

3
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

@ -2189,9 +2189,6 @@
<string name="confirm_clear_chat">ARE YOU SURE YOU WANT TO DELETE <string name="confirm_clear_chat">ARE YOU SURE YOU WANT TO DELETE
ALL CHAT HISTORY FOR THIS GAME?\n\n(THIS ACTION CANNOT BE ALL CHAT HISTORY FOR THIS GAME?\n\n(THIS ACTION CANNOT BE
UNDONE.)</string> UNDONE.)</string>
<!-- EXPERIMENTAL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'LL CHOOSE</string>
<!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for <!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation --> invitation -->
<string name="invite_copied">INVITATION READY TO PASTE</string> <string name="invite_copied">INVITATION READY TO PASTE</string>

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -632,7 +632,7 @@ public class DlgDelegate {
means.add( DlgClickNotify.InviteMeans.NFC ); means.add( DlgClickNotify.InviteMeans.NFC );
} }
final int clipPos = means.size(); 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 ); means.add( DlgClickNotify.InviteMeans.CLIPBOARD );
final int[] sel = { -1 }; final int[] sel = { -1 };
@ -649,7 +649,7 @@ public class DlgDelegate {
if ( view == clipPos ) { if ( view == clipPos ) {
String msg = String msg =
getString( R.string.not_again_clip_expl_fmt, 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 ); showNotAgainDlgThen( msg, R.string.key_na_clip_expl );
} }
} }