modified:   blah/workspace/android/res/values-ar/strings.xml
	modified:   blah/workspace/android/res/values-bg/strings.xml
	modified:   blah/workspace/android/res/values-el/strings.xml
	modified:   blah/workspace/android/res/values-he/strings.xml
	modified:   blah/workspace/android/res/values-hi/strings.xml
	modified:   blah/workspace/android/res/values-iw/strings.xml
	modified:   blah/workspace/android/res/values-ja/strings.xml
	modified:   blah/workspace/android/res/values-ko/strings.xml
	modified:   blah/workspace/android/res/values-pl/strings.xml
modified:   blah/workspace/android/res/values-ru/strings.xml
	modified:   blah/workspace/android/res/values-zh-rCN/strings.xml
	modified:   blah/workspace/android/res/values-zh-rTW/strings.xml
Merge branch 'master' of https://github.com/WhyNotZoidberg/SW6Parrot