Snap: More strings cleanup

* Set untranslatables
* Move all resolution strings in one place & improve them
* TODO: Automatically calculate MP from picture size
  and get rid of the resolutions array

Change-Id: I579d6ba7378849d891d7ed64a6b8c70e2b62ca3c

1 files changed, 51 insertions, 27 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 05befe761..5b3950798 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -17,63 +17,87 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Settings screen, dialog choice for 20.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
+    <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
     <!-- Settings screen, dialog choice for 18 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
+    <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
     <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_16mp">16M pixels</string>
+    <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
     <!-- Settings screen, dialog choice for 15.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M pixels (16:9)</string>
+    <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
     <!-- Settings screen, dialog choice for 12.8 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
+    <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
     <!-- Settings screen, dialog choice for 12.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
-    <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
+    <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
+    <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
     <!-- Settings screen, dialog choice for 11.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_11_9mp">11.9M pixels</string>
+    <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
     <!-- Settings screen, dialog choice for 11.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
+    <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
     <!-- Settings screen, dialog choice for 10.4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
+    <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
     <!-- Settings screen, dialog choice for 10 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
+    <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
     <!-- Settings screen, dialog choice for 9.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M pixels (16:9)</string>
+    <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
     <!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
+    <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
     <!-- Settings screen, dialog choice for 8.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M pixels (16:9)</string>
+    <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
     <!-- Settings screen, dialog choice for 7.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels</string>
+    <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
     <!-- Settings screen, dialog choice for 6.4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
+    <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
     <!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_6mp_wide">6M pixels (16:9)</string>
+    <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
     <!-- Settings screen, dialog choice for 4.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
-    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
+    <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
+    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
     <!-- Settings screen, dialog choice for 3.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M pixels (16:9)</string>
+    <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
     <!-- Settings screen, dialog choice for 2.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
+    <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
     <!-- Settings screen, dialog choice for 2.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M pixels (16:9)</string>
+    <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
+    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
     <!-- Settings screen, dialog choice for 1.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
+    <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
+    <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
+    <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
+    <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_1mp">1 MP</string>
     <!-- Settings screen, dialog choice for WXGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
     <!-- Settings screen, dialog choice for XGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_xga">XGA</string>
     <!-- Settings screen, dialog choice for SVGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-    <!-- Settings screen, dialog choice for nHD picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
     <!-- Settings screen, dialog choice for WVGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
+    <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_vga">VGA</string>
+    <!-- Settings screen, dialog choice for nHD picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
     <!-- Settings screen, dialog choice for WQVGA picture size [CHAR LIMIT=15] -->
     <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
+    <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
 
     <!-- Settings screen, scene mode -->
     <string name="pref_camera_scenemode_entry_refocus">Macro+</string>