translation update (zh-CN)
translation update (zh-CN)
Merge pull request #14 from struq/upstream

 	translation update (zh-CN)
Update strings.xml
Merge pull request #16 from spear1403/patch-1

Update strings.xml
profiles: add basic layouts for profiles

 * Profiles can be added via a dynamic layout change.
 * They also can be deleted in one place, notice we don't
   use any listviews here to reduce the overhead.

 * Needed to force update the language files, because otherwise
   the application would most likely crash.

Signed-off-by: Blechd0se <alex.christ@hotmail.de>
Merge branch 'master' of https://github.com/Blechd0se/android_packages_apps_AeroControl
translation: move arrays to the right place

 * This makes future changes on the arrays easier

 * Also fix a bug in memory fragment and the latest
   merge.

Signed-off-by: Blechd0se <alex.christ@hotmail.de>
defy: add the basic defy parts layout

 * Just layout, nothing more.
 * Baseband Switchter is missing for now

 * Also update language files a bit to be more
   consistent

Signed-off-by: Blechd0se <alex.christ@hotmail.de>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AeroControl/res/values-zh-rCN/strings.xml