Commit graph

220 commits

Author SHA1 Message Date
Bernard Massot
2b29ec82fe Translated using Weblate (French)
Currently translated at 100.0% (691 of 691 strings)
2015-08-23 21:19:03 +02:00
Sylvie
407d96e343 Translated using Weblate (Dutch)
Currently translated at 100.0% (691 of 691 strings)
2015-08-21 17:22:31 +02:00
Eric House
6ae73ab99b Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-08-17 07:05:58 -07:00
Eric House
cbe2c6f5f3 copy over new translations from translation branch. 2015-08-17 07:04:10 -07:00
Eric House
d6d1bbe2e0 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-17 06:46:55 -07:00
Sylvie
29f410a2e0 Translated using Weblate (Dutch)
Currently translated at 100.0% (688 of 688 strings)
2015-08-14 16:11:02 +02:00
Joan Montané
fe86eb9dbf Translated using Weblate (Catalan)
Currently translated at 100.0% (688 of 688 strings)
2015-08-14 12:17:17 +02:00
Eric House
fd55d27a63 changes left out of previous merge commit for some reason 2015-08-13 07:24:49 -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
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
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
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
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
9b785e230c Merge branch 'android_branch' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-ca/strings.xml
2015-07-29 05:49:11 -07:00
Eric House
cb7b8660dc bring in Catalan changes from android_translate branch, and fix a
couple of typos
2015-07-29 05:47:08 -07:00
Eric House
d94f7bbf49 Merge remote-tracking branch 'weblate/android_translate' into android_translate
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-07-29 05:28:07 -07:00
Eric House
5bf674ca76 Merge branch 'android_branch' into android_translate 2015-07-28 20:35:30 -07:00
Joan Montané
0e797e2679 Translated using Weblate (Catalan)
Currently translated at 100.0% (682 of 682 strings)
2015-07-28 20:53:21 +02:00
Joan Montané
0cb49e7379 Translated using Weblate (Catalan)
Currently translated at 90.9% (620 of 682 strings)
2015-07-27 01:04:01 +02:00
Eric House
0bb51e8b93 show a toast when hint can't find anything, on the principle that user
should see some response to every action.

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
a40ee96439 first set of Dutch strings 2015-07-23 19:37:31 -07:00
Weblate
c58fdd0273 Merge remote-tracking branch 'origin/android_translate' into android_translate 2015-07-23 18:45:26 +02:00
Sylvie
235d4d232c Translated using Weblate (Dutch)
Currently translated at 19.3% (132 of 682 strings)
2015-07-23 18:45:25 +02:00
Eric House
fa00eef151 convert string to plurals and add some "one" items to others to allow
removing [s]. There's more to do still.
2015-07-23 06:57:37 -07:00
Eric House
a48468eca1 convert string to plurals and add some "one" items to others to allow
removing [s]. There's more to do still.
2015-07-23 06:56:12 -07:00
Eric House
2a009e620b empty file for Dutch strings 2015-07-22 20:59:13 -07:00
Eric House
8a575bc789 fill in help text for communication means 2015-06-26 06:18:42 -07:00
Eric House
63aae3d4e8 add newbie hints to checkboxes enabling communication types (bt, sms,
etc.)
2015-06-25 06:38:40 -07:00
Eric House
b8193d635d SMS-enable alert: Add cancel button, and disable OK button until user
selects an enabling option
2015-06-23 08:11:18 -07:00
Eric House
54b18c898d more, and hopefully last, French strings 2015-06-19 20:52:40 -07:00