Commit graph

9511 commits

Author SHA1 Message Date
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
618c5ee11c Merge remote-tracking branch 'weblate/android_translate' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-08-06 07:13:36 -07:00
Sylvie
274b1ede7b Translated using Weblate (Dutch)
Currently translated at 100.0% (683 of 683 strings)
2015-08-05 17:24:12 +02: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
abb9153d36 Translated using Weblate (Dutch)
Currently translated at 99.7% (681 of 683 strings)
2015-08-05 10:41:08 +02: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
ec581d1dbd Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/common_rsrc.xml
2015-08-04 20:17:56 -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
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
c83d3368ad allow using script for any project with an AndroidManifest.xml 2015-08-03 04:58:34 -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
a148680e44 catch up: it's been a few commits since I included this. 2015-08-02 16:43:23 -07:00
Eric House
a349ab4bee add commented-out getClassName() in case it's useful in the future. 2015-08-02 16:41:28 -07:00
Eric House
b3ca4ee223 fix off-by-one error that probably had me slowly leaking local obj
references for the last few years.
2015-08-02 16:29:53 -07:00
Eric House
56082d2f7b fix variant crashes: had forgotten PKG_PATH on new method 2015-08-02 16:15:32 -07:00
Eric House
a26e642c8e 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-02 14:35:05 -07:00
Eric House
7875d34757 allow using script for any project with an AndroidManifest.xml 2015-08-02 14:15:14 -07:00
Eric House
1fb55c8a78 move last-pressed button to bottom of screen where it's natural to look for it 2015-08-02 14:14:19 -07:00
Eric House
af8c6d618d different logging TAG for different variants 2015-08-02 10:29:17 -07:00
Eric House
8182fc7822 move several strings, including app name, NBS port, and url prefix, into generated
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:40:24 -07:00
Eric House
0425df7a5e move several strings, including app name, NBS port, and url prefix, into generated
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:39:00 -07:00