Eric House
0ce2d50504
merge latest French translation
2015-09-16 06:47:46 -07:00
Eric House
2d0dc6e192
Merge remote-tracking branch 'weblate/android_translate' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-fr/strings.xml
2015-08-27 21:55:08 -07:00
Bernard Massot
a09e60d06e
Translated using Weblate (French)
...
Currently translated at 99.8% (689 of 690 strings)
2015-08-27 19:39:09 +02:00
Eric House
75eb955050
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-27 07:46:45 -07:00
Eric House
53025f8a99
clean up plurals, adding quantity="one" elements in a few places where
...
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
2015-08-27 07:42:16 -07:00
Eric House
47f8bd8125
Merge branch 'android_branch' into android_translate
2015-08-27 06:42:44 -07:00
Eric House
8e17e43d9a
fix to not stop removing after removing the first elem
2015-08-27 06:41:47 -07:00
Eric House
a4e25576ad
bring over changes from android_translate branch (via brute-force copy)
2015-08-26 07:00:54 -07:00
Eric House
0e3044bb16
fix what looks like a weblate bug: replace empty <other> elem with
...
what was there before.
2015-08-26 06:49:15 -07:00
Weblate
d1b25999a3
Merge remote-tracking branch 'origin/android_translate' into android_translate
2015-08-26 07:42:41 +02:00
Bernard Massot
0b1ba099e2
Translated using Weblate (French)
...
Currently translated at 100.0% (691 of 691 strings)
2015-08-26 07:42:41 +02:00
Eric House
83d3163f0e
rename variable
2015-08-25 22:19:00 -07:00
Eric House
9a75ef29f2
fix misspelling
2015-08-25 06:46:03 -07:00
Eric House
41817d896c
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-25 06:39:14 -07:00
Eric House
26114f83a6
fix chat view not being opened if move had arrived after chat by
...
removing unneeded variable whose presence was clearing flags.
2015-08-25 06:38:14 -07:00
Eric House
2aa9740814
up strings and changelog for new release
2015-08-25 05:24:58 -07:00
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
c35acdd773
ignore case where no files exist (so that /* doesn't expand)
2015-08-24 07:35:00 -07:00
Eric House
daaa346bb5
generate local.properties if running for first time
2015-08-24 07:24:28 -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
255ca56ed7
when no moves found, reset engine and try again. Works around bug
...
where you do "hint", then "prev hint" and get told there are no moves
found only to have the next "prev hint" succeed. This is a hack, but
the right fix is eluding me, and will certainly be riskier.
2015-08-19 07:43:00 -07:00
Eric House
6d7123c27a
fix curses app for standalone games (at least to not crash)
2015-08-19 06:05:18 -07:00
Eric House
884eda0603
cleanup: use temp ptr to avoid too many dereferences
2015-08-18 08:00:22 -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
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
