Eric House
fd55d27a63
changes left out of previous merge commit for some reason
2015-08-13 07:24:49 -07:00
Eric House
0c39c61725
Merge branch 'android_branch' into android_translate
...
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
2015-08-13 07:24:05 -07:00
Eric House
34c70825b9
toward figuring out why relay communication stalls: log network
...
availability state changes.
2015-08-13 07:06:12 -07:00
Eric House
3a32d3a17b
return count of messages sent from comms_resendAll(), and post it as a
...
toast so user sees something happened.
2015-08-13 07:05:06 -07:00
Eric House
dea75a815e
vary common-code logging tag by variant
2015-08-13 07:02:57 -07:00
Eric House
7824df67f5
copy over VARIANT compile-time flag stuff. Not sure how it got dropped
...
in this branch.
2015-08-13 06:54:07 -07:00
Eric House
bae6b3f119
copy over from android_translate branch
2015-08-12 21:34:46 -07:00
Eric House
b2970069c1
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-12 07:38:18 -07:00
Eric House
8f7267b3ec
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
2015-08-12 07:36:36 -07:00
Eric House
49e2503146
Merge branch 'android_branch' into android_translate
2015-08-11 07:31:06 -07:00
Eric House
be9b8977e5
turn off email invite attachments
2015-08-11 07:30:34 -07:00
Eric House
ef853d2784
cleanup; include generated file
2015-08-11 07:11:03 -07:00
Eric House
b7cb902775
Merge remote-tracking branch 'weblate/android_translate' into android_translate
2015-08-11 07:01:03 -07:00
Eric House
5d2a5b7649
Merge branch 'android_branch' into android_translate
2015-08-11 06:57:27 -07:00
Eric House
4a28da1348
Show specific notification on receipt of chat, not rehash of last move
...
played.
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2015-08-11 06:50:16 -07:00
Sylvie
28bb7f84be
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (687 of 687 strings)
2015-08-11 12:48:40 +02:00
Sylvie
bdf44dfdb2
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (683 of 683 strings)
2015-08-10 11:40:09 +02:00
Eric House
5bae2dbbd9
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
Conflicts:
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
2015-08-07 08:00:12 -07:00
Eric House
f06071fb39
new generated strings
2015-08-06 07:37:18 -07:00
Eric House
9e0f72e68b
bring over variant-related changes that somehow got dropped from this
...
branch
2015-08-06 07:25:56 -07:00
Eric House
87fef6b186
delete strings no longer used (missing from english strings.xml)
2015-08-05 07:16:25 -07:00
Eric House
74eedbb314
where a plurals has a "one" quantity and an empty "other", delete the
...
empty "other" and make the "one" an "other" instead
2015-08-05 07:00:02 -07:00
Eric House
64c5c4c416
remove empty line
2015-08-04 21:01:02 -07:00
Eric House
debe424c8a
copy over from android_translate branch
2015-08-04 20:13:19 -07:00
Eric House
68f72451cd
Merge remote-tracking branch 'weblate/android_translate' into android_translate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-04 19:48:58 -07:00
Eric House
96ef94fead
changes from translator
2015-08-04 19:11:07 -07:00
Eric House
ed7d44c8ad
add (generated) to-be-translated plurals element
2015-08-04 07:57:39 -07:00
Eric House
dfa6226c1a
fix a few plurals' formatting
2015-08-04 07:56:29 -07:00
Eric House
a79d9272b1
fix a bit of formatting (plurals)
2015-08-04 07:56:12 -07:00
Eric House
f4d53ab076
remove string not in English
2015-08-04 07:05:34 -07:00
Eric House
dc4d4aad0e
insert missing string
2015-08-03 21:10:32 -07:00
Eric House
59ac6ecddf
print in canonical format -- whitespace changes only
2015-08-03 21:09:01 -07:00
Joan Montané
9bbff68eda
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (683 of 683 strings)
2015-08-03 21:12:35 +02:00
Eric House
10c40089e2
fix formatting, mostly of plurals elements
2015-08-03 07:46:09 -07:00
Eric House
a45b698ea9
don't crash when first run without network connection
2015-08-03 05:25:35 -07:00
Eric House
3064420c78
don't crash when first run without network connection
2015-08-03 05:25:10 -07:00
Eric House
013e0e3a4c
Merge branch 'android_branch' into android_translate
2015-08-03 05:10:06 -07:00
Eric House
bcd620a4f9
clean up to make cherry-picked changes work
2015-08-03 05:07:49 -07:00
Eric House
cfa101350a
add logdf, logging for DEBUG builds only
2015-08-03 05:06:38 -07:00
Eric House
a612a89ac6
fix variant crashes: had forgotten PKG_PATH on new method
2015-08-03 04:59:15 -07:00
Eric House
97bf616db1
Problem: NBS port is being ignored by dispatcher to broadcast
...
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
2015-08-03 04:58:46 -07:00
Eric House
1e7f51a88d
move last-pressed button to bottom of screen where it's natural to look for it
2015-08-03 04:58:18 -07:00
Eric House
a5f332dd1d
different logging TAG for different variants
2015-08-03 04:57:35 -07:00
Eric House
6871ef24a6
move several strings, including app name, NBS port, and url prefix, into generated
...
.xml file so Dbg and regular variants can co-exist better
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-03 04:55:59 -07:00
Eric House
1959ff3b2d
fix NPE reported by crittercism
2015-08-03 04:54:42 -07:00
Eric House
b500a4646d
use different uuid for dbg variant so it's not cross-sending BT
...
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
2015-08-03 04:50:56 -07:00
Eric House
2b286fd7ac
Merge branch 'android_branch' into android_translate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-03 04:45:48 -07:00
Eric House
b56924b030
fix off-by-one error that probably had me slowly leaking local obj
...
references for the last few years.
2015-08-02 16:43:52 -07:00
Eric House
36adf7f86c
get rid of About menuitem in board -- in main view is enough
2015-07-31 07:14:04 -07:00
Eric House
4a580eabda
handle maintenance messages from relay
2015-07-31 06:36:35 -07:00
