Eric House
4b14176386
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-17 06:35:41 -07:00
Eric House
55d67f7599
don't show toast after message send unless user-triggered
2015-08-17 06:34:58 -07:00
Eric House
214c503440
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-13 07:35:50 -07:00
Eric House
3898a85f18
catch version code up
2015-08-13 07:34:34 -07:00
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
Eric House
4d4c3d99b7
Merge branch 'android_branch' into android_translate
2015-08-10 07:08:03 -07:00
Eric House
00e6a80fb0
fix permission and other constants that need to be different in variant
2015-08-10 07:07:33 -07:00
Eric House
3eb1dbe9c6
Merge remote-tracking branch 'weblate/android_translate' into android_translate
2015-08-10 06:58:11 -07:00
Eric House
a320c81009
Merge branch 'android_branch' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-ca/strings.xml
xwords4/android/scripts/fix-loc-xmls.py
2015-08-10 06:56:31 -07:00
Eric House
1d14d4cc65
ignore new files
2015-08-10 06:52:31 -07:00
Eric House
c3aeefe706
bring over changes for permissions etc
2015-08-10 06:52:19 -07:00
Eric House
2ef407320e
pick package based on location
2015-08-10 06:43:19 -07:00
Eric House
517cfe6fda
bring over saved file format change from relay_conn branch so builds
...
from each will be able to open each other's files.
2015-08-10 06:24:40 -07:00
Eric House
87e3108296
cleanup: make work based on location if target not specified
2015-08-10 06:23:24 -07: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
bc18f33e5d
generate local.properties if running for first time
2015-08-06 21:24:56 -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
8b90f211ed
progress: compares english and other languages use of format
...
specifiers, but I think is missing mismatches in plurals still.
2015-08-05 07:19:39 -07:00
Eric House
99455a9fcb
progress: compares english and other languages use of format
...
specifiers, but I think is missing mismatches in plurals still.
2015-08-05 07:18:22 -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
624f78af8f
don't replace old-style format strings when "formatted" attribute == false
2015-08-04 20:58:58 -07:00
Eric House
97ebdd0d63
copy changes over from android_translate branch
2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1
name change
2015-08-04 20:15:00 -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
3803341c9b
lots of changes/fixes in progress
2015-08-04 07:57:56 -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
