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
..
values-ba_CK	show a toast when hint can't find anything, on the principle that user	2015-07-26 12:09:15 -07:00
values-ca	bring in Catalan changes from android_translate branch, and fix a	2015-07-29 05:47:08 -07:00
values-ca_PS	show a toast when hint can't find anything, on the principle that user	2015-07-26 12:09:15 -07:00
values-cs	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00
values-fr	more, and hopefully last, French strings	2015-06-19 20:52:40 -07:00
values-nl	Merge remote-tracking branch 'weblate/android_translate' into android_translate	2015-07-29 05:28:07 -07:00
values-pt	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00
values-sk	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00