From 7b7c3f3c08b733fdc09f166ec864c5c22aee2db3 Mon Sep 17 00:00:00 2001
From: Wilhelm Fitzpatrick <rafial@cyngn.com>
Date: Fri, 14 Nov 2014 16:31:35 -0800
Subject: CameraNext: dynamically generate available photo resolutions

Instead of depending on a large matching table, generated the list
of picture sizes to show to the user directly from the supported
list returned by the camera. The list is filtered to remove
uselessly small resolutions on modern devices, to group resolutions
by aspect ratio, and to filter out fairly similar sizes.

Change-Id: I47a67a89786543baec133cf7e71df9819793ebac
---
 res/values-zh-rTW/cm_strings.xml | 52 +++-------------------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

(limited to 'res/values-zh-rTW/cm_strings.xml')

diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index cb5d3495a..8d49b20b4 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,55 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">2100 萬像素</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">2070 萬像素</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">2010 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">1800 萬像素</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">1620 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">1610 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">1600 萬像素</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">1590 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">1300 萬像素</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">1280 萬像素</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">1270 萬像素</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">1260 萬像素</string>
-  <string name="pref_camera_picturesize_entry_12mp">1200 萬像素</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">1190 萬像素</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">1150 萬像素</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">1040 萬像素</string>
-  <string name="pref_camera_picturesize_entry_10mp">1000 萬像素</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">970 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">940 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">900 萬像素</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">820 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">800 萬像素</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">770 萬像素</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">750 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">640 萬像素</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">600 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">500 萬像素</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">450 萬像素</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">400 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">400 萬像素</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">370 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">300 萬像素</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">250 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">250 萬像素</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">210 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">200 萬像素 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">200 萬像素</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">190 萬像素</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">150 萬像素</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">130 萬像素</string>
-  <string name="pref_camera_picturesize_entry_1mp">100 萬像素</string>
-  <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
-  <string name="pref_camera_picturesize_entry_xga">XGA</string>
-  <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-  <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
-  <string name="pref_camera_picturesize_entry_vga">VGA</string>
-  <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
-  <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
-  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <!-- pixels counted by ten thousands for Chinese -->
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.0f 萬像素</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Marco+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">降低動態模糊</string>
   <string name="pref_camera_scenemode_entry_aqua">水色</string>
-- 
cgit v1.2.3