Merge remote-tracking branch 'weblate/android_translate' into android_translate

Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
This commit is contained in:
Eric House 2015-08-06 07:13:36 -07:00
commit 618c5ee11c

Diff content is not available