Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-10 05:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_branch' into android_translate

Browse source 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
This commit is contained in:
Eric House 2015-08-23 21:54:18 -07:00
commit 11aae82051
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1256,7 +1256,7 @@
--> -->
<!-- title of the chat screen. The name of the current game is <!-- title of the chat screen. The name of the current game is
substituted for %1$s. --> substituted for %1$s. -->
<string name="chat_title_fmt">%1$s message history</string> <string name="chat_title_fmt">%1$s messages</string>
<!-- Prefix for local messages --> <!-- Prefix for local messages -->
<string name="chat_local_id">Me:\u0020</string> <string name="chat_local_id">Me:\u0020</string>
<!-- Prefix for remote messages --> <!-- Prefix for remote messages -->
@ -2566,5 +2566,15 @@
<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: Shown as toast when user chooses "Copy to
clipboard" for invitation -->
<string name="invite_copied">Invitation ready to paste</string>
<!-- EXPERIMENTAL: "label" for invite on clipboard. If it's shown
it's by some Android utility -->
<string name="clip_label">Invitation URL</string>
<!-- 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
choice and send it to your friend.</string>
</resources> </resources>

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 );
} }
} }