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

40 files changed, 334 insertions, 1885 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 3a8409c62..804ab1339 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -16,58 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f M pieksels</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Verminder vervaag beweging</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
   <string name="pref_camera_scenemode_entry_ar">Augmented realiteit</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 83b554fcf..86d64d566 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -16,55 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 МП</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 Мп</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 Мп</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 Мп</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 Мп</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 Мп</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Мп</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 Мп</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 Мп</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 Мп</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 Мп</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мп</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мп</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 Мп</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 Мп</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 Мп</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 Мп</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 Мп</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Макра+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Зменшыць размыццё падчас руху</string>
   <string name="pref_camera_scenemode_entry_aqua">Вада</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 762ee96fb..fc61d1b7a 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -16,60 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Макро+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Намаляване на замъгляването</string>
   <string name="pref_camera_scenemode_entry_aqua">Вода</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index bb444988c..3b0c301d0 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,61 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f Mp</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducció del difuminat del moviment</string>
   <string name="pref_camera_scenemode_entry_aqua">Aigua</string>
   <string name="pref_camera_scenemode_entry_ar">Realitat augmentada</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 214a934ac..0fc28fd19 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -16,61 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 Mpx</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpx</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 Mpx</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 Mpx</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 Mpx</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpx</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpx</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 Mpx</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 Mpx</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 Mpx</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 Mpx</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 Mpx</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpx</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 Mpx</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 Mpx</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpx</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 Mpx</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 Mpx</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 Mpx</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 Mpx (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 Mpx</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f Mpx</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukce rozmazání</string>
   <string name="pref_camera_scenemode_entry_aqua">Voda</string>
   <string name="pref_camera_scenemode_entry_ar">Rozšířená realita</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 37ed8ac91..4a4011bfb 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,56 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixels</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reduktion af bevægelsesslør</string>
   <string name="pref_camera_scenemode_entry_aqua">Vand</string>
   <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfokal</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index e0108f775..e3bb092dd 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -16,58 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f MP</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Bewegungsunschärfe-Reduktion</string>
   <string name="pref_camera_scenemode_entry_aqua">Wasser</string>
   <string name="pref_camera_scenemode_entry_ar">Erweiterte Realität</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 406b234e3..8efff3655 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -16,61 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Μακροφωτογραφία+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f MP</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Μείωση motion blur</string>
   <string name="pref_camera_scenemode_entry_aqua">Νερό</string>
   <string name="pref_camera_scenemode_entry_ar">Επαυξημένη πραγματικότητα</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 837905a85..9e4e31c25 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -16,57 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Desenfoke murriztailea</string>
   <string name="pref_camera_scenemode_entry_aqua">Ura</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index b14328371..c26e3334c 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -16,61 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapikseliä</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Liikkeen sumennuksen vähentäminen</string>
   <string name="pref_camera_scenemode_entry_aqua">Vesi</string>
   <string name="pref_camera_scenemode_entry_ar">Lisätty todellisuus</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index c56ca6b9f..00c748ab2 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -16,55 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Réduction du flou de mouvement</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f mégapixels</string>
   <string name="pref_camera_scenemode_entry_aqua">Eau</string>
   <string name="pref_camera_scenemode_entry_ar">Réalité augmentée</string>
   <string name="pref_camera_scenemode_entry_asd">Meilleure prise</string>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 4a16f446a..4aef2b2eb 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -16,53 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redución do desenfoque</string>
   <string name="pref_camera_scenemode_entry_aqua">Auga</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 549068543..0a47977ef 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -16,60 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcija zamagljenja zbog gibanja</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 06a384bda..40aeedccd 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,61 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makró+</string>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixel</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Elmosódás csökkentés</string>
   <string name="pref_camera_scenemode_entry_aqua">Víz</string>
   <string name="pref_camera_scenemode_entry_ar">Kiterjesztett valóság</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index c4794be38..165b01106 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -16,57 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16.9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f Mpixel</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Riduzione sfocatura da movimento</string>
   <string name="pref_camera_scenemode_entry_aqua">Acqua</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index ca10121f3..308a1fb74 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,57 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f מגה פיקסל</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">מאקרו+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">הפחתת טשטוש תנועה</string>
   <string name="pref_camera_scenemode_entry_aqua">מים</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index eea7acef4..85ff2c101 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP（16:9）</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1fメガピクセル</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">マクロ+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">被写体ブレ軽減</string>
   <string name="pref_camera_scenemode_entry_aqua">アクア</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 42e64f807..2ba99d9d7 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -16,47 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 메가픽셀 (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 메가픽셀</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 메가픽셀</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.0f만 화소</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">매크로+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">모션 블러 감소</string>
   <string name="pref_camera_scenemode_entry_aqua">아쿠아</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 77258aec3..1879bd3b5 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -16,57 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f M piksler</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro +</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Bevegelsesuskarphet reduksjon</string>
   <string name="pref_camera_scenemode_entry_aqua">Vann</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 97c0cc242..3138e5900 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 megapixel</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixel</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixel</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Beweging verscherpen</string>
   <string name="pref_camera_scenemode_entry_aqua">Water</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 7d4a08363..7854515a4 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -16,57 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f Mpix</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcja rozmazywania</string>
   <string name="pref_camera_scenemode_entry_aqua">Woda</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 5f96a069c..61b0c7fc8 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f MP</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução de borrões de movimento</string>
   <string name="pref_camera_scenemode_entry_aqua">Água</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 201ab4e4a..6f6116ada 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -16,57 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f MP</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução da desfocagem de movimento</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e7286816f..6ca86317a 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1fM pixeli</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
   <string name="pref_camera_scenemode_entry_asd">Cel mai bun cadru</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 11cbbfca2..33cec8417 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 Мп</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 Мп</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 Мп</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 Мп</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 Мп</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 Мп</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 Мп</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 Мп</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 Мп</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 Мп</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 Мп</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 Мп</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 Мп</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 Мп</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 Мп</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 Мп</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 Мп</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 Мп</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,1 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 Мп</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1,2 Мп (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 Мп</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f Мпикс.</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Макро+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Устранение разм. движения</string>
   <string name="pref_camera_scenemode_entry_aqua">Вода</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index a4779dd7d..a34a94a8a 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -16,60 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">(16:9) 20,1 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">(16:9) 16,2 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">(16:9) 16,1 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">(16:9) 15,9 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">(16:9) 11,9 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">(16:9) 9,7 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">(16:9) 9,4 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">(16:9) 8,2 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">(16:9) 7,5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">(16:9) 6 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">(16:9) 4 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">(16:9) 3,7 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">(16:9) 2,5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">(16:9) 2,1 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">(16:9) 2 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 mio.  sl. točk</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">(16:9) 1,2 mio. sl. točk</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 mio.  sl. točk</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">(16:9) nHD</string>
-  <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
-  <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Zmanjšanje zamegljenosti gibanja</string>
   <string name="pref_camera_scenemode_entry_aqua">Akva</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 1514099e6..c0f544ab9 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f мегапиксела</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Макро+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Редукција замагљивања покрета</string>
   <string name="pref_camera_scenemode_entry_aqua">Вода</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 91688dea5..bb0c189e9 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -16,60 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 MP</string>
-  <string name="pref_camera_picturesize_entry_20_1mp_wide">20,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-  <string name="pref_camera_picturesize_entry_16_2mp_wide">16,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16_1mp_wide">16,1 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-  <string name="pref_camera_picturesize_entry_15_9mp_wide">15,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 MP</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 MP</string>
-  <string name="pref_camera_picturesize_entry_12_6mp">12,6 MP</string>
-  <string name="pref_camera_picturesize_entry_12_2mp">12,2 MP</string>
-  <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">11,9 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_11_9mp">11,9 MP</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-  <string name="pref_camera_picturesize_entry_9_7mp_wide">9,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9_4mp_wide">9,4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_9mp">8,9 MP</string>
-  <string name="pref_camera_picturesize_entry_8_2mp_wide">8,2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
-  <string name="pref_camera_picturesize_entry_7_5mp_wide">7,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
-  <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>
-  <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-  <string name="pref_camera_picturesize_entry_3_7mp_wide">3,7 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-  <string name="pref_camera_picturesize_entry_2_5mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 MP</string>
-  <string name="pref_camera_picturesize_entry_2_1mp_wide">2,5 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 MP</string>
-  <string name="pref_camera_picturesize_entry_1_6mp">1,6 MP</string>
-  <string name="pref_camera_picturesize_entry_1_5mp">1,5 MP</string>
-  <string name="pref_camera_picturesize_entry_1_3mp">1,3 MP</string>
-  <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-  <string name="pref_camera_picturesize_entry_1mp">1 MP</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>
+  <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixlar</string>
+  <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reducera rörelseoskärpa</string>
   <string name="pref_camera_scenemode_entry_aqua">Vatten</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 9df877b96..abc10096a 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,60 +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_12_2mp">1220 万像素</string>
-  <string name="pref_camera_picturesize_entry_12mp">1200 万像素</string>
-  <string name="pref_camera_picturesize_entry_11_9mp_wide">1190 万像素 (16:9)</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_9mp">890 万像素</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_6mp">160 万像素</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_1_2mp_wide">120 万像素 (16:9)</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">微距+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">降低动态模糊</string>
   <string name="pref_camera_scenemode_entry_aqua">水底</string>
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>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 642bd4824..a8099c0e1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -167,176 +167,6 @@
         <item>@string/time_lapse_hours</item>
     </string-array>
 
-    <!-- Camera Preferences Picture size dialog box entries -->
-    <string-array name="pref_camera_picturesize_entries" translatable="false">
-        <item>@string/pref_camera_picturesize_entry_24mp</item>
-        <item>@string/pref_camera_picturesize_entry_21mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_13mp</item>
-        <item>@string/pref_camera_picturesize_entry_13mp</item>
-        <item>@string/pref_camera_picturesize_entry_12_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_12_7mp</item>
-        <item>@string/pref_camera_picturesize_entry_12mp</item>
-        <item>@string/pref_camera_picturesize_entry_11_9mp</item>
-        <item>@string/pref_camera_picturesize_entry_11_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_10_4mp</item>
-        <item>@string/pref_camera_picturesize_entry_10mp</item>
-        <item>@string/pref_camera_picturesize_entry_9_7mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_9mp</item>
-        <item>@string/pref_camera_picturesize_entry_8_2mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_7_7mp</item>
-        <item>@string/pref_camera_picturesize_entry_6_4mp</item>
-        <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_4_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_4mp</item>
-        <item>@string/pref_camera_picturesize_entry_3_7mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_2_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_2_1mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_2mp</item>
-        <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_1_9mp</item>
-        <item>@string/pref_camera_picturesize_entry_1_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_1_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1mp</item>
-        <item>@string/pref_camera_picturesize_entry_wxga</item>
-        <item>@string/pref_camera_picturesize_entry_xga</item>
-        <item>@string/pref_camera_picturesize_entry_svga</item>
-        <item>@string/pref_camera_picturesize_entry_wvga</item>
-        <item>@string/pref_camera_picturesize_entry_vga</item>
-        <item>@string/pref_camera_picturesize_entry_nhd_wide</item>
-        <item>@string/pref_camera_picturesize_entry_wqvga</item>
-        <item>@string/pref_camera_picturesize_entry_qvga</item>
-    </string-array>
-
-    <!-- When launching the camera app first time, we will set the picture
-         size to the first one in the list that is also supported by the
-         driver -->
-    <string-array name="pref_camera_picturesize_entryvalues" translatable="false">
-        <item>5656x4242</item>
-        <item>5344x4008</item>
-        <item>4608x3456</item>
-        <item>5312x2988</item>
-        <item>4160x3120</item>
-        <item>4000x3000</item>
-        <item>3840x2160</item>
-        <item>3264x2448</item>
-        <item>2976x2976</item>
-        <item>2592x1944</item>
-        <item>2592x1936</item>
-        <item>2560x1920</item>
-        <item>2688x1512</item>
-        <item>2048x1536</item>
-        <item>2048x1520</item>
-        <item>1920x1080</item>
-        <item>1600x1200</item>
-        <item>1920x1088</item>
-        <item>1440x1080</item>
-        <item>1280x960</item>
-        <item>1280x768</item>
-        <item>1280x720</item>
-        <item>1024x768</item>
-        <item>800x600</item>
-        <item>800x480</item>
-        <item>960x720</item>
-        <item>720x480</item>
-        <item>640x480</item>
-        <item>352x288</item>
-        <item>320x240</item>
-    </string-array>
-
-    <!-- Camera Preferences video snapshot size dialog box entries -->
-    <string-array name="pref_camera_video_snapsize_entries" translatable="false">
-        <item>Auto</item>
-        <item>@string/pref_camera_picturesize_entry_21mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_13mp</item>
-        <item>@string/pref_camera_picturesize_entry_12mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_square</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1920x1080</item>
-        <item>@string/pref_camera_picturesize_entry_2mp</item>
-        <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_1_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_1_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1280x768</item>
-        <item>@string/pref_camera_picturesize_entry_1280x720</item>
-        <item>@string/pref_camera_picturesize_entry_1mp</item>
-        <item>@string/pref_camera_picturesize_entry_800x600</item>
-        <item>@string/pref_camera_picturesize_entry_800x480</item>
-        <item>960 x 720</item>
-        <item>720 x 480</item>
-        <item>@string/pref_camera_picturesize_entry_vga</item>
-        <item>@string/pref_camera_picturesize_entry_352x288</item>
-        <item>@string/pref_camera_picturesize_entry_qvga</item>
-    </string-array>
-
-    <!-- default is auto, which calculates largest snapshot
-         size with same aspect ratio as preview. -->
-    <string-array name="pref_camera_video_snapsize_entryvalues" translatable="false">
-        <item>auto</item>
-        <item>5344x4008</item>
-        <item>4608x3456</item>
-        <item>5312x2988</item>
-        <item>4160x3120</item>
-        <item>4128x3096</item>
-        <item>4128x3088</item>
-        <item>4000x3000</item>
-        <item>3984x2988</item>
-        <item>3920x2940</item>
-        <item>4128x2528</item>
-        <item>4320x2432</item>
-        <item>4160x2340</item>
-        <item>3920x2204</item>
-        <item>3840x2160</item>
-        <item>3264x2448</item>
-        <item>3200x2400</item>
-        <item>3264x1968</item>
-        <item>3264x1840</item>
-        <item>3264x1836</item>
-        <item>2592x1944</item>
-        <item>2592x1936</item>
-        <item>2560x1920</item>
-        <item>2592x1728</item>
-        <item>2688x1520</item>
-        <item>2560x1536</item>
-        <item>2560x1440</item>
-        <item>2048x1536</item>
-        <item>2048x1520</item>
-        <item>2048x1232</item>
-        <item>1920x1080</item>
-        <item>1600x1200</item>
-        <item>1920x1088</item>
-        <item>1392x1392</item>
-        <item>1600x960</item>
-        <item>1280x960</item>
-        <item>1280x720</item>
-        <item>1024x768</item>
-        <item>1024x600</item>
-        <item>800x600</item>
-        <item>800x480</item>
-        <item>640x480</item>
-        <item>640x360</item>
-        <item>480x320</item>
-        <item>320x240</item>
-    </string-array>
-
     <!-- Camera Preferences focus mode dialog box entries -->
     <string-array name="pref_camera_focusmode_entries" translatable="false">
         <item>@string/pref_camera_focusmode_entry_auto</item>
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 250c4da9c..913fdb2a1 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -336,75 +336,6 @@
         <item>1</item>
     </string-array>
 
-    <!-- Camera Preferences Picture size dialog box entries -->
-    <string-array name="pref_camera2_picturesize_entries" translatable="false">
-        <item>@string/pref_camera_picturesize_entry_24mp</item>
-        <item>@string/pref_camera_picturesize_entry_21mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp</item>
-        <item>@string/pref_camera_picturesize_entry_16mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_13mp</item>
-        <item>@string/pref_camera_picturesize_entry_12mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_square</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1920x1080</item>
-        <item>@string/pref_camera_picturesize_entry_2mp</item>
-        <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
-        <item>@string/pref_camera_picturesize_entry_1_5mp</item>
-        <item>@string/pref_camera_picturesize_entry_1_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1280x768</item>
-        <item>@string/pref_camera_picturesize_entry_1280x720</item>
-        <item>@string/pref_camera_picturesize_entry_1mp</item>
-        <item>@string/pref_camera_picturesize_entry_800x600</item>
-        <item>@string/pref_camera_picturesize_entry_800x480</item>
-        <item>@string/pref_camera_picturesize_entry_960x720</item>
-        <item>@string/pref_camera_picturesize_entry_720x480</item>
-        <item>@string/pref_camera_picturesize_entry_vga</item>
-        <item>@string/pref_camera_picturesize_entry_352x288</item>
-        <item>@string/pref_camera_picturesize_entry_qvga</item>
-    </string-array>
-    <!-- When launching the camera app first time, we will set the picture
-         size to the first one in the list that is also supported by the
-         driver -->
-    <string-array name="pref_camera2_picturesize_entryvalues" translatable="false">
-        <item>5656x4242</item>
-        <item>5344x4008</item>
-        <item>4608x3456</item>
-        <item>5312x2988</item>
-        <item>4160x3120</item>
-        <item>4000x3000</item>
-        <item>3840x2160</item>
-        <item>3264x2448</item>
-        <item>2976x2976</item>
-        <item>2592x1944</item>
-        <item>2592x1936</item>
-        <item>2560x1920</item>
-        <item>2688x1512</item>
-        <item>2048x1536</item>
-        <item>2048x1520</item>
-        <item>1920x1080</item>
-        <item>1600x1200</item>
-        <item>1920x1088</item>
-        <item>1440x1080</item>
-        <item>1280x960</item>
-        <item>1280x768</item>
-        <item>1280x720</item>
-        <item>1024x768</item>
-        <item>800x600</item>
-        <item>800x480</item>
-        <item>960x720</item>
-        <item>720x480</item>
-        <item>640x480</item>
-        <item>352x288</item>
-        <item>320x240</item>
-    </string-array>
-
     <!-- Camera Preferences focus mode dialog box entries -->
     <string-array name="pref_camera2_focusmode_entries" translatable="false">
         <item>@string/pref_camera_focusmode_entry_auto</item>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 2dbc886c9..9e99dd5cc 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -16,64 +16,21 @@
 -->
 <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>
-    <!-- Settings screen, dialog choice for 18 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
-    <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_16mp">16M pixels</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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- Settings screen, dialog choice for 10 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_10mp">10M pixels</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>
-    <!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9mp">9M pixels</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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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>
-    <!-- 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 WQVGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
+    <!-- common aspect ratios -->
+    <string name="pref_camera_aspectratio_43" translatable="false">4:3</string>
+    <string name="pref_camera_aspectratio_32" translatable="false">3:2</string>
+    <string name="pref_camera_aspectratio_1610" translatable="false">16:10</string>
+    <string name="pref_camera_aspectratio_53" translatable="false">5:3</string>
+    <string name="pref_camera_aspectratio_169" translatable="false">16:9</string>
+    <string name="pref_camera_aspectratio_11" translatable="false">1:1</string>
+    <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+    <string name="pref_camera_aspectratio_wide">Wide</string>
+
+    <!-- format for entries in the picture size menu. Parameter one is aspect ratio
+         parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
+         NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
+         will be multiplied by 100 as those languages want to count by ten thousands -->
+    <string name="pref_camera_megapixel_format">(%1$s) %2$1.1f megapixels</string>
 
     <!-- Settings screen, scene mode -->
     <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 54efb52c8..883ffc13f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -67,4 +67,6 @@
          will be enabled ONLY for these scenemodes and disabled for others. -->
     <string-array name="longshot_scenemodes"></string-array>
 
+    <!-- Minimum picture size (in pixel) to include in selection list -->
+    <integer name="minimum_picture_size">900000</integer>
 </resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index d8f136635..a91dc0bd9 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -70,9 +70,7 @@
     <IconListPreference
             camera:key="pref_camera_picturesize_key"
             camera:singleIcon="@drawable/ic_settings_picturesize"
-            camera:title="@string/pref_camera_picturesize_title"
-            camera:entries="@array/pref_camera_picturesize_entries"
-            camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
+            camera:title="@string/pref_camera_picturesize_title" />
     <IconListPreference
             camera:key="pref_camera_focusmode_key"
             camera:defaultValue="@array/pref_camera_focusmode_default_array"
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 4a027b2f1..cd8443331 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -151,8 +151,6 @@
         camera:title="@string/pref_camera_id_title"/>
 
     <IconListPreference
-        camera:entries="@array/pref_camera2_picturesize_entries"
-        camera:entryValues="@array/pref_camera2_picturesize_entryvalues"
         camera:key="pref_camera2_picturesize_key"
         camera:singleIcon="@drawable/ic_settings_picturesize"
         camera:title="@string/pref_camera_picturesize_title"/>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index dce15b8f7..a3fd838c2 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -176,9 +176,7 @@
             camera:key="pref_camera_videosnapsize_key"
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
             camera:title="@string/pref_camera_picturesize_title"
-            camera:singleIcon="@drawable/ic_settings_size"
-            camera:entries="@array/pref_camera_video_snapsize_entries"
-            camera:entryValues="@array/pref_camera_video_snapsize_entryvalues" />
+            camera:singleIcon="@drawable/ic_settings_size" />
     <IconListPreference
             camera:key="pref_camera_savepath_key"
             camera:defaultValue="@string/pref_camera_savepath_default"
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index a3ff64953..f5963f84b 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -38,9 +38,12 @@ import android.util.Log;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
+import com.android.camera.util.MultiMap;
+
 import org.codeaurora.snapcam.R;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import android.os.Build;
@@ -444,26 +447,41 @@ public class CameraSettings {
         return supported.get(0);
     }
 
-    public static void initialCameraPictureSize(
-            Context context, Parameters parameters) {
-        // When launching the camera app first time, we will set the picture
-        // size to the first one in the list defined in "arrays.xml" and is also
-        // supported by the driver.
+    public static void initialCameraPictureSize(Context context, Parameters parameters) {
+        // set the picture size to the largest supported size
         List<Size> supported = parameters.getSupportedPictureSizes();
-        if (supported == null) return;
-        for (String candidate : context.getResources().getStringArray(
-                R.array.pref_camera_picturesize_entryvalues)) {
-            if (setCameraPictureSize(candidate, supported, parameters)) {
-                SharedPreferences.Editor editor = ComboPreferences
-                        .get(context).edit();
-                editor.putString(KEY_PICTURE_SIZE, candidate);
-                editor.apply();
-                return;
-            }
+        if (supported == null || supported.isEmpty()) { return; }
+        Size largest = getLargestSize(supported);
+        String candidate = largest.width + "x" + largest.height;
+        if (setCameraPictureSize(candidate, supported, parameters)) {
+            SharedPreferences.Editor editor =
+                    ComboPreferences.get(context).edit();
+            editor.putString(KEY_PICTURE_SIZE, candidate);
+            editor.apply();
+            return;
         }
         Log.e(TAG, "No supported picture size found");
     }
 
+    private static Size getLargestSize(List<Size> sizes) {
+        if (sizes == null || sizes.isEmpty()) {
+            return null;
+        }
+
+        Size max = sizes.get(0);
+        int maxSize = max.width * max.height;
+
+        for (Size candidate : sizes) {
+            int candidateSize = candidate.width * candidate.height;
+            if (candidateSize > maxSize) {
+                maxSize = candidateSize;
+                max = candidate;
+            }
+        }
+
+        return max;
+    }
+
     public static void removePreferenceFromScreen(
             PreferenceGroup group, String key) {
         removePreference(group, key);
@@ -1014,9 +1032,10 @@ public class CameraSettings {
         }
 
         if (pictureSize != null) {
-            filterUnsupportedOptions(group, pictureSize, sizeListToStringList(
-                    mParameters.getSupportedPictureSizes()));
-            filterSimilarPictureSize(group, pictureSize);
+            formatPictureSizes(pictureSize,
+                    fromLegacySizes(mParameters.getSupportedPictureSizes()), mContext);
+            resetIfInvalid(pictureSize);
+
         }
         if (whiteBalance != null) {
             filterUnsupportedOptions(group,
@@ -1222,7 +1241,7 @@ public class CameraSettings {
         resetIfInvalid(pref);
     }
 
-    private static void resetIfInvalid(ListPreference pref) {
+    static void resetIfInvalid(ListPreference pref) {
         // Set the value to the first entry if it is invalid.
         String value = pref.getValue();
         if (pref.findIndexOfValue(value) == NOT_FOUND) {
@@ -1561,4 +1580,173 @@ public class CameraSettings {
         }
         return ret;
     }
+
+    // common aspect ratios used for bucketing camera picture sizes
+    private enum AspectRatio {
+        FourThree(1.27, 1.42, R.string.pref_camera_aspectratio_43),
+        ThreeTwo(1.42, 1.55, R.string.pref_camera_aspectratio_32),
+        SixteenTen(1.55, 1.63, R.string.pref_camera_aspectratio_1610),
+        FiveThree(1.63, 1.73, R.string.pref_camera_aspectratio_53),
+        SixteenNine(1.73, 1.81, R.string.pref_camera_aspectratio_169),
+        OneOne(0.95, 1.05, R.string.pref_camera_aspectratio_11),
+        Wide(1.81, Float.MAX_VALUE, R.string.pref_camera_aspectratio_wide),
+        Other(Float.MIN_VALUE, 1.27, 0);
+
+        public double min;
+        public double max;
+        public int resourceId;
+
+        AspectRatio(double min, double max, int rid) {
+            this.min = min;
+            this.max = max;
+            this.resourceId = rid;
+        }
+
+        boolean contains(double ratio) {
+            return (ratio >= min) && (ratio < max);
+        }
+
+        static AspectRatio of(int width, int height) {
+            double ratio = ((double)width)/height;
+            for(AspectRatio aspect : values()) {
+                if(aspect.contains(ratio)) { return aspect; }
+            }
+            return null;
+        }
+    }
+
+    // track a camera picture size along with some derived info
+    private static class SizeEntry implements Comparable<SizeEntry> {
+        AspectRatio ratio;
+        android.util.Size size;
+        int pixels;
+
+        SizeEntry(android.util.Size size) {
+            this.ratio = AspectRatio.of(size.getWidth(), size.getHeight());
+            this.size = size;
+            this.pixels = size.getWidth() * size.getHeight();
+        }
+
+        @Override
+        public int compareTo(SizeEntry another) {
+            return another.pixels - pixels;
+        }
+
+        String resolution() { return size.getWidth()+"x"+size.getHeight(); }
+
+        String formatted(Context ctx) {
+            double pixelCount = pixels/1000000d; // compute megapixels
+
+            if(pixelCount > 1.9 && pixelCount < 2.0) { //conventional rounding
+                pixelCount = 2.0;
+            }
+
+            pixelCount = adjustForLocale(pixelCount); // some locales group differently
+
+            if(pixelCount > 0.1) {
+                String ratioString = ratio.resourceId == 0
+                        ? resolution() : ctx.getString(ratio.resourceId);
+                return ctx.getString(R.string.pref_camera_megapixel_format,
+                                     ratioString, pixelCount);
+            } else {
+                // for super tiny stuff, just give the raw resolution
+                return resolution();
+            }
+        }
+
+        private static final String KOREAN = Locale.KOREAN.getLanguage();
+        private static final String CHINESE = Locale.CHINESE.getLanguage();
+
+        private double adjustForLocale(double megapixels) {
+            Locale locale = Locale.getDefault();
+            if(locale == null) { return megapixels; }
+            String language = locale.getLanguage();
+            // chinese and korean locales perfer to count by ten thousands
+            // instead of by millions - so we multiply the megapixels by 100
+            // (with a little rounding on the way)
+            if(KOREAN.equals(language) || CHINESE.equals(language)) {
+                megapixels = Math.round(megapixels * 10);
+                return megapixels * 10; // wàn
+            }
+            return megapixels;
+        }
+    }
+
+    static List<android.util.Size> fromLegacySizes(List<Size> oldSizes) {
+        final List<android.util.Size> sizes = new ArrayList<>();
+        if (oldSizes == null || oldSizes.size() == 0) {
+            return sizes;
+        }
+        for (Size oldSize : oldSizes) {
+            sizes.add(new android.util.Size(oldSize.width, oldSize.height));
+        }
+        return sizes;
+    }
+
+    static void formatPictureSizes(
+            ListPreference pictureSize, List<android.util.Size> supported, Context ctx) {
+        if(supported == null || supported.isEmpty()) { return; }
+
+        // convert list of sizes to list of "size entries"
+        List<SizeEntry> sizes = new ArrayList<SizeEntry>(supported.size());
+        for (android.util.Size candidate : supported) { sizes.add(new SizeEntry(candidate)); }
+
+        // sort descending by pixel size
+        Collections.sort(sizes);
+
+        // trim really small sizes but never leave less than six choices
+        int minimum = ctx.getResources().getInteger(R.integer.minimum_picture_size);
+        while(sizes.size() > 6) {
+            int lastIndex = sizes.size()-1;
+            SizeEntry last = sizes.get(lastIndex);
+            if(last.pixels < minimum) { sizes.remove(lastIndex); }
+            else { break; }
+        }
+        // re-sort into aspect ratio buckets
+        MultiMap<AspectRatio,SizeEntry> buckets = new MultiMap<AspectRatio,SizeEntry>();
+        for(SizeEntry size : sizes) { buckets.put(size.ratio, size); }
+
+        // build the final lists - group by aspect ratio, with those
+        // buckets having the largest image sizes positioned first
+        List<String> entries = new ArrayList<String>(buckets.size());
+        List<String> entryValues = new ArrayList<String>(buckets.size());
+        while(!buckets.isEmpty()) {
+            // find the bucket with the largest first element
+            int maxSize = 0;
+            AspectRatio chosenKey = null;
+            for(AspectRatio ratio : buckets.keySet()) {
+                int size = buckets.get(ratio).get(0).pixels;
+                if(size > maxSize) {
+                    maxSize = size;
+                    chosenKey = ratio;
+                }
+            }
+
+            List<SizeEntry> bucket = buckets.remove(chosenKey);
+
+            // trim chosen bucket of similarly sized entries, but
+            // never leave less that three
+            int index = 0;
+            while(bucket.size() > 3 && bucket.size() > index+1) {
+                SizeEntry current = bucket.get(index);
+                SizeEntry next = bucket.get(index+1);
+                // if the two buckets differ in size by less than 30%
+                // remove the smaller one, otherwise advance through the list
+                if(((double)current.pixels)/next.pixels < 1.3) {
+                    bucket.remove(index+1);
+                } else {
+                    index++;
+                }
+            }
+
+            // transfer chosen, trimmed bucket to final list
+            for (SizeEntry size : bucket) {
+                entryValues.add(size.resolution());
+                entries.add(size.formatted(ctx));
+            }
+        }
+
+        pictureSize.setEntries(entries.toArray(new String[entries.size()]));
+        pictureSize.setEntryValues(entryValues.toArray(new String[entryValues.size()]));
+    }
 }
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 374c6eb2b..7ac4257ee 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -517,9 +517,9 @@ public class SettingsManager implements ListMenu.SettingsListener {
         if (cameraIdPref != null) buildCameraId();
 
         if (pictureSize != null) {
-            CameraSettings.filterUnsupportedOptions(mPreferenceGroup,
-                    pictureSize, getSupportedPictureSize(cameraId));
-            CameraSettings.filterSimilarPictureSize(mPreferenceGroup, pictureSize);
+            CameraSettings.formatPictureSizes(pictureSize,
+                    getSupportedPictureSize(cameraId), mContext);
+            CameraSettings.resetIfInvalid(pictureSize);
         }
 
         if (exposure != null) buildExposureCompensation(cameraId);
@@ -836,21 +836,21 @@ public class SettingsManager implements ListMenu.SettingsListener {
                 mValuesMap.get(KEY_FLASH_MODE) != null;
     }
 
-    private List<String> getSupportedPictureSize(int cameraId) {
+    private List<Size> getSupportedPictureSize(int cameraId) {
         StreamConfigurationMap map = mCharacteristics.get(cameraId).get(
                 CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
         Size[] sizes = map.getOutputSizes(ImageFormat.JPEG);
-        List<String> res = new ArrayList<>();
+        List<Size> res = new ArrayList<>();
         if (sizes != null) {
             for (int i = 0; i < sizes.length; i++) {
-                res.add(sizes[i].toString());
+                res.add(sizes[i]);
             }
         }
 
         Size[] highResSizes = map.getHighResolutionOutputSizes(ImageFormat.JPEG);
         if (highResSizes != null) {
             for (int i = 0; i < highResSizes.length; i++) {
-                res.add(highResSizes[i].toString());
+                res.add(highResSizes[i]);
             }
         }
 
diff --git a/src/com/android/camera/util/MultiMap.java b/src/com/android/camera/util/MultiMap.java
new file mode 100644
index 000000000..b2e9003fe
--- /dev/null
+++ b/src/com/android/camera/util/MultiMap.java
@@ -0,0 +1,45 @@
+package com.android.camera.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class MultiMap<K,V> {
+    Map<K,List<V>> map = new HashMap<K,List<V>>();
+
+    public void put(K key, V value) {
+        List<V> l = map.get(key);
+        if(l == null) {
+            l = new ArrayList<V>();
+            map.put(key, l);
+        }
+        l.add(value);
+    }
+
+    public List<V> get(K key) {
+        List<V> l = map.get(key);
+        if(l == null) { return Collections.emptyList(); }
+        else return l;
+    }
+
+    public List<V> remove(K key) {
+        List<V> l = map.remove(key);
+        if(l == null) { return Collections.emptyList(); }
+        else return l;
+    }
+
+    public Set<K> keySet() { return map.keySet(); }
+
+    public int size() {
+        int total = 0;
+        for(List<V> l : map.values()) {
+            total += l.size();
+        }
+        return total;
+    }
+
+    public boolean isEmpty() { return map.isEmpty(); }
+}
\ No newline at end of file