From 2781c8ef082158250a036bc31632174f8536270d Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Sun, 14 Aug 2016 00:46:08 +0300
Subject: Snap: String improvements

Change-Id: I19f2f857afc848502fded5cc0632e94cf3a65152
---
 res/values/qcomstrings.xml | 10 +++++++++-
 res/values/strings.xml     |  8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'res')

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 2ac9b0e4e..1753e42eb 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -131,7 +131,7 @@
     <string name="pref_camera_manual_focus_entry_off">Off</string>
 
     <!-- Still More -->
-    <string name="pref_camera_advanced_feature_entry_stillmore">Still More</string>
+    <string name="pref_camera_advanced_feature_entry_stillmore" translatable="false">Still More</string>
     <string name="pref_camera_advanced_feature_value_stillmore_on" translatable="false">still-more-on</string>
     <string name="pref_camera_advanced_feature_value_stillmore_off" translatable="false">still-more-off</string>
 
@@ -504,6 +504,14 @@
 
     <string name="initial_recording_seconds" translatable="false">00:00</string>
 
+    <string name="pref_camera_scenemode_entry_optizoom" translatable="false">OptiZoom</string>
+
+    <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+    <string name="disable_CDS_during_SeeMore">Enabling SeeMore will disable CDS</string>
+
+    <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+    <string name="disable_TNR_during_SeeMore">Enabling SeeMore will disable TNR</string>
+
     <!-- TODO: Remove these? -->
     <string name="pref_camera_redeyereduction_entry_disable" translatable="false">disable</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 247e1b873..fecad0815 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -354,8 +354,6 @@
     <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
     <string name="pref_camera_scenemode_entry_party">Party</string>
 
-    <string name="pref_camera_scenemode_entry_optizoom">Opti-Zoom</string>
-
     <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
     <string name="pref_camera_scenemode_label_auto">NONE</string>
     <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
@@ -381,12 +379,6 @@
     <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
     <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
 
-    <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
-    <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
-
-    <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
-    <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
-
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
     <string name="pref_exposure_default" translatable="false">0</string>
-- 
cgit v1.2.3