Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-10 05:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8977 commits 21 branches 243 tags 33 MiB
Commit graph

4088 commits

Author SHA1 Message Date
Eric House
be64f78252 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-24 07:44:58 -07:00
Eric House
a073ad68ae add missing image 2015-08-24 07:42:36 -07:00
Eric House
bb2ea6a522 remove duplicate strings (likely added by merge when I wasn't paying attention) 2015-08-24 07:17:50 -07:00
Eric House
11aae82051 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
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
 2015-08-23 21:54:18 -07:00
Eric House
5fd477be75 use existing string -- Copy to clipboard 2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14 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-23 21:44:45 -07:00
Sylvie
ec3af948e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:17:16 -07:00
Joan Montané
ab791fb430 Translated using Weblate (Catalan) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:14:34 -07:00
Bernard Massot
8da25dcdd4 Translated using Weblate (French) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:14:20 -07:00
Joan Montané
36689676c5 Translated using Weblate (Catalan) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 23:13:35 +02:00
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
8f93630350 shorten string to make action bar more obvious (and catch up with 
generated string file changes)
 2015-08-21 06:56:47 -07:00
Eric House
598ee7599b Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2015-08-20 07:43:16 -07:00
Eric House
e0327b0f62 ignore files 2015-08-20 07:41:48 -07:00
Eric House
79ab1214e7 replace send button with menuitem, and add icons for it and clear 2015-08-20 07:38:09 -07:00
Eric House
6b455bf743 make chat compose space multi-line; scroll chat history to bottom on 
open
 2015-08-20 07:37:51 -07:00
Eric House
07e97107ce confirm before deleting chat history 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2015-08-20 07:37:30 -07:00
Eric House
a11e5beded goes with prev commit 2015-08-18 06:41:57 -07:00
Eric House
ff3d587179 really only post messages sent toast when user chose the menuitem 2015-08-18 06:41:34 -07:00
Eric House
0d8fef5c56 cleanup 2015-08-17 08:01:36 -07: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
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
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
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