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

logging and string changes

Browse source
This commit is contained in:
Eric House 2016-12-15 08:09:28 -08:00
parent 9503491890
commit ca0ee429bb
6 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4-dbg/res/layout/.gitignore vendored
View file

@ -27,8 +27,6 @@ rename_game.xml
select_dialog_item.xml
confirm_sms.xml
game_list_group.xml
smsinviter_item.xml
smsinviter.xml
studylist.xml
loc_list_item.xml
loc_main.xml
@ -52,3 +50,5 @@ inviter.xml
bt_buttons.xml
relay_buttons.xml
sms_buttons.xml
inviter_item_frame.xml
two_strs_item.xml

2
xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore vendored
View file

@ -61,7 +61,6 @@ RelayReceiver.java
RelayService.java
SMSCheckBoxPreference.java
SMSInviteActivity.java
SMSListItem.java
SMSReceiver.java
SMSService.java
SelectableItem.java
@ -145,3 +144,4 @@ WiDirService.java
WiDirInviteActivity.java
WiDirInviteDelegate.java
XWPacket.java
TwoStrsItem.java

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

@ -1900,11 +1900,11 @@
<string name="new_move_body">One or more moves has arrived</string>
<!-- -->
<plurals name="invite_bt_desc_fmt">
<item quantity="one">Please select the device
you want to include in this game. Use the \"%2$s\"
<item quantity="one">Please check the device
you want to include in this game.\n\nUse the \"%2$s\"
button if you don\'t see the device you expect.</item>
<item quantity="other">Please select up to %1$d device[s]
you want to include in this game. Use the \"%2$s\"
<item quantity="other">Please check up to %1$d device[s]
you want to include in this game.\n\nUse the \"%2$s\"
button if you don\'t see a device you expect.</item>
</plurals>
<!-- -->
@ -2649,7 +2649,7 @@
nearby device that\'s \"paired\" with yours.</string>
<string name="not_again_comms_p2p">Use WiFi Direct to play against a
nearby WiFi Direct-capable device.</string>
nearby WiFi Direct-capable device with Crosswords installed.</string>
<string name="str_no_hint_found">Cannot find any moves</string>

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

@ -1637,11 +1637,11 @@
<string name="new_move_body">Eno ro erom sevom sah devirra</string>
<!-- -->
<plurals name="invite_bt_desc_fmt">
<item quantity="one">Esaelp tceles eht ecived
uoy tnaw ot edulcni ni siht emag. Esu eht \"%2$s\"
<item quantity="one">Esaelp kcehc eht ecived
uoy tnaw ot edulcni ni siht emag.\n\nEsu eht \"%2$s\"
nottub fi uoy nod\'t ees eht ecived uoy tcepxe.</item>
<item quantity="other">Esaelp tceles pu ot %1$d ]s[ecived
uoy tnaw ot edulcni ni siht emag. Esu eht \"%2$s\"
<item quantity="other">Esaelp kcehc pu ot %1$d ]s[ecived
uoy tnaw ot edulcni ni siht emag.\n\nEsu eht \"%2$s\"
nottub fi uoy nod\'t ees a ecived uoy tcepxe.</item>
</plurals>
<!-- -->
@ -2266,7 +2266,7 @@
<string name="not_again_comms_bt">Esu Htooteulb ot yalp tsniaga a
ybraen ecived taht\'s \"deriap\" htiw sruoy.</string>
<string name="not_again_comms_p2p">Esu IfIw Tcerid ot yalp tsniaga a
ybraen IfIw Elbapac-tcerid ecived.</string>
ybraen IfIw Elbapac-tcerid ecived htiw Sdrowssorc dellatsni.</string>
<string name="str_no_hint_found">Tonnac dnif yna sevom</string>
<string name="not_again_rematch_two_only">Hctamer si detimil ot
nosrep-owt ,semag ta tsael rof ,won esuaceb ti\'s redrah htiw erom

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

@ -1637,11 +1637,11 @@
<string name="new_move_body">ONE OR MORE MOVES HAS ARRIVED</string>
<!-- -->
<plurals name="invite_bt_desc_fmt">
<item quantity="one">PLEASE SELECT THE DEVICE
YOU WANT TO INCLUDE IN THIS GAME. USE THE \"%2$s\"
<item quantity="one">PLEASE CHECK THE DEVICE
YOU WANT TO INCLUDE IN THIS GAME.\n\nUSE THE \"%2$s\"
BUTTON IF YOU DON\'T SEE THE DEVICE YOU EXPECT.</item>
<item quantity="other">PLEASE SELECT UP TO %1$d DEVICE[S]
YOU WANT TO INCLUDE IN THIS GAME. USE THE \"%2$s\"
<item quantity="other">PLEASE CHECK UP TO %1$d DEVICE[S]
YOU WANT TO INCLUDE IN THIS GAME.\n\nUSE THE \"%2$s\"
BUTTON IF YOU DON\'T SEE A DEVICE YOU EXPECT.</item>
</plurals>
<!-- -->
@ -2266,7 +2266,7 @@
<string name="not_again_comms_bt">USE BLUETOOTH TO PLAY AGAINST A
NEARBY DEVICE THAT\'S \"PAIRED\" WITH YOURS.</string>
<string name="not_again_comms_p2p">USE WIFI DIRECT TO PLAY AGAINST A
NEARBY WIFI DIRECT-CAPABLE DEVICE.</string>
NEARBY WIFI DIRECT-CAPABLE DEVICE WITH CROSSWORDS INSTALLED.</string>
<string name="str_no_hint_found">CANNOT FIND ANY MOVES</string>
<string name="not_again_rematch_two_only">REMATCH IS LIMITED TO
TWO-PERSON GAMES, AT LEAST FOR NOW, BECAUSE IT\'S HARDER WITH MORE

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/WiDirService.java
View file

@ -1091,13 +1091,12 @@ public class WiDirService extends XWService {
// After the group negotiation, we can determine the group owner.
if (info.groupFormed ) {
sAmGroupOwner = info.isGroupOwner;
DbgUtils.logd( TAG, "am %sgroup owner", sAmGroupOwner ? "" : "NOT " );
DbgUtils.showf( "Joining WiFi P2p group as %s",
sAmGroupOwner ? "owner" : "guest" );
if ( info.isGroupOwner ) {
DbgUtils.showf( "Joining %s WiFi P2p group as owner", SERVICE_NAME );
DbgUtils.logd( TAG, "am group owner" );
startAcceptThread();
} else {
DbgUtils.logd( TAG, "am NOT group owner" );
DbgUtils.showf( "Joining %s WiFi P2p group as guest", SERVICE_NAME );
stopAcceptThread();
connectToOwner( info.groupOwnerAddress );
// The other device acts as the client. In this case,