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
..
values-ba_CK	changes left out of previous merge commit for some reason	2015-08-13 07:24:49 -07:00
values-ca	copy over new translations from translation branch.	2015-08-17 07:04:10 -07:00
values-ca_PS	changes left out of previous merge commit for some reason	2015-08-13 07:24:49 -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	copy over new translations from translation branch.	2015-08-17 07:04:10 -07:00
values-pt	delete strings no longer used (missing from english strings.xml)	2015-08-05 07:16:25 -07:00
values-sk	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00