Email: cmcc cleanup

* Rename enhancement settings to attachment settings
* move select contacts up to general settings
* Make strings clearer

Change-Id: I7740fe698b8efb80823d7ee40db27ab2ef48fc58
Signed-off-by: Roman Birg <roman@cyngn.com>

5 files changed, 13 insertions, 13 deletions

diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 7bbc470ca..76289d610 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -41,7 +41,7 @@
   <string name="account_setup_options_mail_sync_size_500k">500KB</string>
   <string name="account_setup_options_mail_sync_size_1M">1MB</string>
   <string name="category_label_general_settings">常规设置</string>
-  <string name="category_label_enhancement_settings">附加设置</string>
+  <string name="category_label_attachment_settings">附加设置</string>
   <string name="general_preference_add_attachment_label">添加任意文件为附件</string>
   <string name="general_preference_select_recipients_label">从联系人中选择收件人</string>
   <string name="general_preference_confirm_forward_label">转发前先确认</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index d1d8a04a8..7da6fa652 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -31,7 +31,7 @@
   <string name="account_setup_options_mail_sync_size_500k">500KB</string>
   <string name="account_setup_options_mail_sync_size_1M">1MB</string>
   <string name="category_label_general_settings">一般設定</string>
-  <string name="category_label_enhancement_settings">附加設定</string>
+  <string name="category_label_attachment_settings">附加設定</string>
   <string name="general_preference_add_attachment_label">附加任意文件為附件</string>
   <string name="general_preference_select_recipients_label">從聯繫人中選擇收件人</string>
   <string name="general_preference_confirm_forward_label">轉寄前須確認</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 7dd8bdfe8..2218cbbbf 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -31,7 +31,7 @@
   <string name="account_setup_options_mail_sync_size_500k">500KB</string>
   <string name="account_setup_options_mail_sync_size_1M">1MB</string>
   <string name="category_label_general_settings">一般設定</string>
-  <string name="category_label_enhancement_settings">附加設定</string>
+  <string name="category_label_attachment_settings">附加設定</string>
   <string name="general_preference_add_attachment_label">附加任意文件為附件</string>
   <string name="general_preference_select_recipients_label">從聯繫人中選擇收件人</string>
   <string name="general_preference_confirm_forward_label">轉寄前須確認</string>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index a3887a8c3..6304a34db 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -58,11 +58,11 @@
     <!-- Label of general settings category to describe general preferences [CHAR LIMIT=32] -->
     <string name="category_label_general_settings">General settings</string>
     <!-- Label of enhancement settings category to describe general preferences [CHAR LIMIT=32] -->
-    <string name="category_label_enhancement_settings">Enhancement settings</string>
+    <string name="category_label_attachment_settings">Attachment settings</string>
     <!-- General preference: Label of the setting for adding any file as attachment CHAR LIMIT=32] -->
-    <string name="general_preference_add_attachment_label">Add any file as attachment</string>
+    <string name="general_preference_add_attachment_label">Add any file type</string>
     <!-- General preference: Label of the setting for select recipients from Contact CHAR LIMIT=32] -->
-    <string name="general_preference_select_recipients_label">Select recipients from Contact</string>
+    <string name="general_preference_select_recipients_label">Select recipients from Contacts</string>
     <!-- General preference: Label of the setting for confirm before forward CHAR LIMIT=32] -->
     <string name="general_preference_confirm_forward_label">Confirmation before forwarding</string>
     <string name="general_preference_confirm_forward_summary">Choose whether to use attachments from mail server, or download to device prior to forwarding</string>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 9bf98ea91..8203a7708 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -63,11 +63,17 @@
             android:title="@string/preference_swipe_title_delete"
             android:summary="@string/preference_swipe_description" />
 
+        <CheckBoxPreference
+            android:key="select_recipients"
+            android:persistent="true"
+            android:defaultValue="true"
+            android:title="@string/general_preference_select_recipients_label" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="enhancement_settings"
-        android:title="@string/category_label_enhancement_settings">
+        android:title="@string/category_label_attachment_settings">
 
         <CheckBoxPreference
             android:key="confirm_forward"
@@ -82,11 +88,5 @@
             android:defaultValue="true"
             android:title="@string/general_preference_add_attachment_label" />
 
-        <CheckBoxPreference
-            android:key="select_recipients"
-            android:persistent="true"
-            android:defaultValue="true"
-            android:title="@string/general_preference_select_recipients_label" />
-
     </PreferenceCategory>
 </PreferenceScreen>