From 7c5e1af58b388cb28d63e40ff3132cc2240ef670 Mon Sep 17 00:00:00 2001
From: Marco Brohet <therbom@gmail.com>
Date: Tue, 23 Apr 2013 16:40:52 +0200
Subject: LegacyCamera: Refactor default translations

Change-Id: Iee4e5dec6235097ec5abe18c733a828a90e2045c
---
 res/values/cm_strings.xml | 38 ++++++++++++++++++++++++++++++++++++++
 res/values/strings.xml    | 26 +++-----------------------
 2 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 res/values/cm_strings.xml

(limited to 'res')

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 0000000..968f374
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Settings screen, Picture size dialog radio button choices additions-->
+    <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+    <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+    <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+    <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+    <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+    <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (W)</string>
+    <string name="pref_camera_picturesize_entry_3264x1952">6MP (W)</string>
+    <string name="pref_camera_picturesize_entry_2592x1552">4MP (W)</string>
+    <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+    <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+    <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (W)</string>
+    <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+    <string name="pref_camera_picturesize_entry_1600x960">1.5MP (W)</string>
+    <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+    <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+    <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+    <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+    <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+    <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+    <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16fd303..7061029 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -138,33 +138,13 @@
     <string name="pref_camera_picturesize_title">Picture size</string>
 
     <!-- Settings screen, Picture size dialog radio button choices -->
-    <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
-    <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
-    <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
-    <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
-    <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
-    <string name="pref_camera_picturesize_entry_3264x1968">6.5MP(W)</string>
-    <string name="pref_camera_picturesize_entry_3264x1952">6MP(W)</string>
     <string name="pref_camera_picturesize_entry_2592x1936">5MP</string>
-    <string name="pref_camera_picturesize_entry_2592x1552">4MP(W)</string>
-    <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
-    <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
     <string name="pref_camera_picturesize_entry_2048x1536">3MP</string>
-    <string name="pref_camera_picturesize_entry_2048x1216">2.5MP(W)</string>
-    <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
-    <string name="pref_camera_picturesize_entry_1600x1200">UXGA</string>
-    <string name="pref_camera_picturesize_entry_1600x960">1.5MP(W)</string>
-    <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
-    <string name="pref_camera_picturesize_entry_1280x960">SXGA(4:3)</string>
-    <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
-    <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
-    <string name="pref_camera_picturesize_entry_1024x768">XGA</string>
-    <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
-    <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+    <string name="pref_camera_picturesize_entry_1600x1200">2MP</string>
+    <string name="pref_camera_picturesize_entry_1280x960">1.3MP</string>
+    <string name="pref_camera_picturesize_entry_1024x768">1MP</string>
     <string name="pref_camera_picturesize_entry_640x480">VGA</string>
-    <string name="pref_camera_picturesize_entry_352x288">CIF</string>
     <string name="pref_camera_picturesize_entry_320x240">QVGA</string>
-    <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
 
     <!-- Settings screen, Focus mode title -->
     <string name="pref_camera_focusmode_title">Focus mode</string>
-- 
cgit v1.1