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
..
values-ba_CK	Merge branch 'android_branch' into android_translate	2015-08-27 07:46:45 -07:00
values-ca	clean up plurals, adding quantity="one" elements in a few places where	2015-08-27 07:42:16 -07:00
values-ca_PS	Merge branch 'android_branch' into android_translate	2015-08-27 07:46:45 -07:00
values-cs	use android's build-in OK and Cancel strings	2015-05-27 07:05:59 -07:00
values-fr	clean up plurals, adding quantity="one" elements in a few places where	2015-08-27 07:42:16 -07:00
values-nl	clean up plurals, adding quantity="one" elements in a few places where	2015-08-27 07:42:16 -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