Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into relay_noconn

Browse source 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
This commit is contained in:
Eric House 2015-08-24 07:52:46 -07:00
commit b79836c61b
7 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4-dbg/res_src/values-nl/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
strings.xml

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

@ -865,10 +865,10 @@ public final class R {
public static final int checking_for_fmt=0x7f05030b;
public static final int checking_title=0x7f05030a;
public static final int checkupdates_none_found=0x7f050235;
/** EXPERIMENATL: "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
*/
public static final int clip_label=0x7f05031e;
public static final int clip_label=0x7f05031d;
/** 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
@ -877,7 +877,7 @@ public final class R {
*/
public static final int clr_crosshairs=0x7f050141;
public static final int config_no_connvia=0x7f0502d2;
public static final int confirm_clear_chat=0x7f050320;
public static final int confirm_clear_chat=0x7f05031f;
public static final int confirm_clear_relay=0x7f05020c;
/** Additional text appended to text confirm_delete_dictf in the
wordlist delete confiration dialog in the case where the
@ -1362,10 +1362,7 @@ public final class R {
*/
public static final int initial_player_minutes=0x7f05012a;
public static final int invite_choice_bt=0x7f05016f;
/** EXPERIMENATL: A choice of how to invite, along with SMS,
Bluetooth, email etc
*/
public static final int invite_choice_clip=0x7f05031c;
public static final int invite_choice_clip=0x7f050320;
public static final int invite_choice_email=0x7f05016e;
public static final int invite_choice_nfc=0x7f050170;
public static final int invite_choice_relay=0x7f050171;
@ -1389,10 +1386,10 @@ public final class R {
*/
public static final int invite_chooser_fmt=0x7f050176;
public static final int invite_chooser_sms=0x7f050178;
/** EXPERIMENATL: Shown as toast when user chooses "My choice" for
/** EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation
*/
public static final int invite_copied=0x7f05031d;
public static final int invite_copied=0x7f05031c;
public static final int invite_dict_missing_body_fmt=0x7f050245;
public static final int invite_dict_missing_body_noname_fmt=0x7f050246;
public static final int invite_dict_missing_title=0x7f050244;
@ -2003,10 +2000,10 @@ public final class R {
main Board screen
*/
public static final int not_again_chat=0x7f0501b6;
/** EXPERIMENATL: Newbie hint next when invite_choice_clip shown
/** EXPERIMENTAL: Newbie hint next when invite_choice_clip shown
when chosen
*/
public static final int not_again_clip_expl_fmt=0x7f05031f;
public static final int not_again_clip_expl_fmt=0x7f05031e;
public static final int not_again_comms_bt=0x7f050317;
public static final int not_again_comms_relay=0x7f050315;
public static final int not_again_comms_sms=0x7f050316;

11
xwords4/android/XWords4/img_src/send.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120"
height="120" xml:space="preserve">
<g
id="g12"
transform="matrix(1.25,0,0,-1.25,0,120)">
<g transform='translate(20.24,20.6)' id='g1090'>
<path style='fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none' d='M 0,0 5.287,24.92 38.6,27.24 38.6,27.57 5.287,29.89 0,54.81 55.52,27.4 0,0 z' id='path1092'/>
</g></g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 584 B

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

@ -2565,16 +2565,13 @@
<item quantity="other">%1$s messages sent</item>
</plurals>
<!-- EXPERIMENATL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'ll choose</string>
<!-- EXPERIMENATL: Shown as toast when user chooses "My choice" for
<!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation -->
<string name="invite_copied">Invitation ready to paste</string>
<!-- EXPERIMENATL: "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 -->
<string name="clip_label">Invitation URL</string>
<!-- EXPERIMENATL: Newbie hint next when invite_choice_clip shown
<!-- EXPERIMENTAL: Newbie hint next when invite_choice_clip shown
when chosen -->
<string name="not_again_clip_expl_fmt">The \"%1$s\" option copies an
invitation URL to the clipboard. Paste it into the app of your

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

@ -2210,16 +2210,13 @@
<item quantity="one">Eno egassem tnes</item>
<item quantity="other">%1$s segassem tnes</item>
</plurals>
<!-- EXPERIMENATL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'ll esoohc</string>
<!-- EXPERIMENATL: Shown as toast when user chooses "My choice" for
<!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation -->
<string name="invite_copied">Noitativni ydaer ot etsap</string>
<!-- EXPERIMENATL: "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 -->
<string name="clip_label">Noitativni LRU</string>
<!-- EXPERIMENATL: Newbie hint next when invite_choice_clip shown
<!-- EXPERIMENTAL: Newbie hint next when invite_choice_clip shown
when chosen -->
<string name="not_again_clip_expl_fmt">Eht \"%1$s\" noitpo seipoc na
noitativni LRU ot eht draobpilc. Etsap ti otni eht ppa fo ruoy

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

@ -2210,16 +2210,13 @@
<item quantity="one">ONE MESSAGE SENT</item>
<item quantity="other">%1$s MESSAGES SENT</item>
</plurals>
<!-- EXPERIMENATL: A choice of how to invite, along with SMS,
Bluetooth, email etc -->
<string name="invite_choice_clip">I\'LL CHOOSE</string>
<!-- EXPERIMENATL: Shown as toast when user chooses "My choice" for
<!-- EXPERIMENTAL: Shown as toast when user chooses "My choice" for
invitation -->
<string name="invite_copied">INVITATION READY TO PASTE</string>
<!-- EXPERIMENATL: "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 -->
<string name="clip_label">INVITATION URL</string>
<!-- EXPERIMENATL: Newbie hint next when invite_choice_clip shown
<!-- EXPERIMENTAL: Newbie hint next when invite_choice_clip shown
when chosen -->
<string name="not_again_clip_expl_fmt">THE \"%1$s\" OPTION COPIES AN
INVITATION URL TO THE CLIPBOARD. PASTE IT INTO THE APP OF YOUR

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

@ -138,7 +138,7 @@ public class DlgDelegate {
public interface DlgClickNotify {
public static enum InviteMeans {
SMS, EMAIL, NFC, BLUETOOTH, RELAY, CLIPBOARD,
SMS, EMAIL, NFC, BLUETOOTH, CLIPBOARD, RELAY,
};
void dlgButtonClicked( Action action, int button, Object[] params );
void inviteChoiceMade( Action action, InviteMeans means, Object[] params );
@ -636,7 +636,7 @@ public class DlgDelegate {
means.add( DlgClickNotify.InviteMeans.RELAY );
}
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 };
@ -653,7 +653,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 );
}
}