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
Signed-off-by: Chippa-a <vusal1372@gmail.com>

73 files changed, 324 insertions, 1041 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 67103add3..65e401f6e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kamera-instellings"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videokamera-instellings"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Prentgrootte"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pieksels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pieksels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M pieksels"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokusmodus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Outo"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Oneindig"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 804fc9b6e..fc76fe50b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"የካሜራ ቅንብሮች"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"የካምኮርደር ቅንብሮች"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"የምስል መጠን"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4ሚ ፒክሰል (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2ሚ ፒክሰሎች (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1ሚ ፒክሰሎች"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"የትኩረት ሁነታ"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"ራስ-ሰር"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"የትየሌለ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9c2a55702..d86b1bb62 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"إعدادات الكاميرا"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"إعدادات كاميرا الفيديو"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"حجم الصورة"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 ميغا بكسل (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ميغا بكسل (16‏:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"وضع البؤرة"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"تلقائيًا"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"بلا نهاية"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 54b53514a..f4f8f4f9b 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -112,17 +112,6 @@
     <string name="pref_camera_settings_category" msgid="4286755118301278593">"Kamera parametrləri"</string>
     <string name="pref_camcorder_settings_category" msgid="4617708050480193189">"Videokamera ayarları"</string>
     <string name="pref_camera_picturesize_title" msgid="7285867796470070880">"Şəklin ölçüsü"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="3084140665950405601">"13N piksel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="6497793506352769366">"8M piksel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="8813718385379530965">"5M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="8546276478576735924">"4M piksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="6233692859150247237">"3M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="542341433431186453">"2M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="607495602129189476">"2M piksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="2279105572299544416">"1.3M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="4015199907773658431">"1M piksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="5417241189390562935">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="5211497128670067462">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="4675290599521989576">"Fokus rejimi"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="2359207328353055475">"Avto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="2864044462778663709">"Sonsuzluq"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 31f5eff7f..1f27a7382 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Настройки на камерата"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Настройки на видеокамерата"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Размер на снимката"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 мегапиксела (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 мегапиксела (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 мегапиксел"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Фокусен режим"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Автоматично"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Безкрайност"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 656083ce0..ae33713ae 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Configuració de la càmera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Configuració de la càmera de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Mida de la foto"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mp"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mp"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mp"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Mp (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mp"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mp"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mp (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Mp"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mp"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mp"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Mode d\'enfocament"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinit"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ed699c38e..e15430a2c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Nastavení fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Nastavení videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Velikost fotografie"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Mpx (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpx (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Režim zaostření"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automaticky"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Nekonečno"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f7771221f..f40c75078 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kameraindstillinger"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Indstillinger for Videokamera"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Billedstørrelse"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokustilstand"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatisk"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Uendeligt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index abcc8a709..397792a55 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kameraeinstellungen"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Camcorder-Einstellungen"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Bildgröße"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokussierungsmodus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatisch"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Unendlich"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b4dae8f5a..2aa240c79 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Ρυθμίσεις βιντεοκάμερας"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Μέγεθος εικόνας"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 εκ.εικονοστ.(16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M εικονοστ. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Λειτουργία εστίασης"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Αυτόματα"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Άπειρο"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ef35e9e9e..c1137396a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Camera settings"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Camcorder settings"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Picture size"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Focus mode"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinity"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index ef35e9e9e..c1137396a 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Camera settings"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Camcorder settings"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Picture size"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Focus mode"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinity"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 25d65b7ce..26ebcfe4b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Configuración de la cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Configuración de cámara de video"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Tamaño de imagen"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapíxeles"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapíxeles"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapíxeles"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapíxeles"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapíxeles"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapíxeles (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 MP"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapíxeles"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapíxel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Modo Enfoque"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinito"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bf8e52f7f..e7954e350 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Ajustes de la cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Ajustes de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Tamaño de imagen"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 MP"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Modo de enfoque"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinito"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index f69805a26..a2532dd45 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kaamera seaded"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videokaamera seaded"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Pildi suurus"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pikslit (16 : 9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16 : 9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Teravustamisrežiim"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automaatne"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Lõpmatus"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8b41d958d..3ec9f5e96 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -124,14 +124,6 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kaamera seaded"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokaamera seaded"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Pildi suurus"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikslit"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pikslit"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pikslit"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M pikslit"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3M pikslit"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M pikslit"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Teravustamisrežiim"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaatne"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Lõpmatus"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0f9dda3c3..495f2c604 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"تنظیمات دوربین"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"تنظیمات دوربین فیلم‌برداری"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"اندازه تصویر"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"۱۳ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"۸ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"۵ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"‫۴ مگاپیکسل (۱۶:۹)‏"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"۳ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"۲ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"‫۲ مگاپیکسل (۱۶:۹)‏"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"‫۱٫۵ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"۱٫۳ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"۱ مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"حالت فوکوس"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"خودکار"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"بی‌نهایت"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 98577967c..9801d67d3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kameran asetukset"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videokameran asetukset"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Kuvan koko"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiks. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megap. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapikseli"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Tarkennustila"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Loputon"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 11bc8ac08..974ccd3e9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Paramètres de l\'appareil photo"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Paramètres de la caméra"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Taille de l\'image"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 mégapixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mégapixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mégapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 mégapixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 mégapixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Mode de mise au point"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatique"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infini"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6dfe14c68..9bd165072 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Paramètres de l\'application Appareil photo"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Paramètres de la caméra"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Taille de l\'image"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 mégapixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 mégapixels"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mégapixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mégapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 mégapixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 mégapixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Mode de mise au point"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatique"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infini"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 532b62ec8..ed40942ff 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"कैमरा सेटिंग"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"कैमकॉर्डर सेटिंग"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"फ़ोटो आकार"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M पिक्सेल (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M पिक्सेल (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"फ़ोकस मोड"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"स्वतः"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"अनंत"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f3a5315fb..80971d9ae 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Postavke fotoaparata"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Postavke kamere"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Veličina slike"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiksela (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mpiks. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapiksela"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Način fokusa"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatski"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Beskonačno"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 50b435db4..762d651b0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kamerabeállítások"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videokamera beállításai"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Képméret"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fókuszálás módja"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatikus"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Végtelen"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 7f93a9c8e..4dec9266a 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Տեսախցիկի կարգավորումներ"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Տեսախցիկի կարգավորումներ"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Նկարի չափը"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4Մ պիքսել (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2Մ պիքսել (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1Մ պիքսել"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Կենտրոնացման ռեժիմ"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Ավտոմատ"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Անսահման"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a72bec4ae..50dea5e9e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Setelan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Setelan perekam video"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Ukuran gambar"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M piksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M px (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Mode fokus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Otomatis"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Tak Terbatas"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9c42c1c49..0bc6c97f8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Impostazioni della fotocamera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Impostazioni videocamera"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Dimensioni immagine"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Mpixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Modalità messa a fuoco"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatica"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinito"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e262df3c8..d70eda788 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"הגדרות המצלמה"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"הגדרות של מצלמת וידאו"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"גודל תמונה"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 מגה פיקסל (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 מגה פיקסל (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 מגה פיקסל"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"מגה פיקסל אחד"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"מצב מיקוד"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"אוטומטי"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"אינסוף"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 963b69345..550978268 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"カメラの設定"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"ビデオ録画の設定"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"画像サイズ"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4Mピクセル（16:9）"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2Mピクセル（16:9）"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5Mピクセル"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"フォーカスモード"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"オート"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"無限遠"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 138a71550..208f512b0 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"კამერის პარამეტრები"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"ვიდეოჩამწერის პარამეტრები"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"სურათის ზომა"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 მეგაპიქსელი (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 მეგაპიქსელი (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 მეგაპიქსელი"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"ფოკუს რეჟიმი"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"ავტომატური"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"უსასრულობა"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 55c1ad836..c871c020e 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"ការ​កំណត់​ម៉ាស៊ីន​ថត"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"ការ​កំណត់​ម៉ាស៊ីន​ថត​វីដេអូ"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"ទំហំ​រូបភាព"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"១៣ មេហ្គាភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"៨ មេហ្គា​ភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"៥ មេហ្គា​ភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"៤ មេហ្គា​ភីកសែល (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"៣ មេហ្គា​ភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"២ មេហ្គា​ភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"២ មេហ្គាភីក​សែល (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"១.៥ មេហ្គាភីក​សែល"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"១.៣ មេហ្គា​ភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"១ មេហ្គា​ភីកសែល"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"របៀប​ផ្ដោត"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"ស្វ័យប្រវត្តិ"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"និរន្ត"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 728934487..1491019c7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"카메라 설정"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"사진 크기"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300만 화소"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800만 화소"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500만 화소"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4백만 화소(16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300만 화소"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200만 화소"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200만 화소(16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150만 화소"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130만 화소"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"100만 화소"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"초점 모드"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"자동"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"무한대"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 056402adf..32f2e0e63 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"ການຕັ້ງຄ່າກ້ອງ"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"ຕັ້ງຄ່າກ້ອງວິດີໂອ"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"ຂະໜາດຮູບ"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 ລ້ານພິກເຊວ (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ລ້ານພິກເຊວ (16:9​)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 ລ້ານພິກເຊວ"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"ໂໝດໂຟກັສ"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"ອັດຕະໂນມັດ"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"ອິນຟິນິຕີ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e7ddb52cb..e1807afb9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Fotoaparato nustatymai"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Vaizdo kameros nustatymai"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Nuotraukos dydis"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikselių"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikseliai"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikseliai"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiks. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseliai"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseliai"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiks. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapiks."</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikselio"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapikselis"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokusavimo režimas"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatinis"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Begalybė"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fab48546d..b051b4ac0 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kameras iestatījumi"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videokameras iestatījumi"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Attēla lielums"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapikseļi (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiks. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapikselis"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokusa režīms"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automātiski"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Bezgalība"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 8a33e905f..a8d2f90b7 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Камерын тохиргоо"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Камерын тохиргоо"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Зургийн хэмжээ"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M пиксел (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M пиксел (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M пиксел"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Фокус горим"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Автомат"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Хязгааргүй"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index d507e3a00..4b7859a18 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Tetapan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Tetapan kamkorder"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Saiz gambar"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M piksel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M piksel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M piksel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M piksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M piksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M piksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Mod fokus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infiniti"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 59a8594a0..305066dfa 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -124,14 +124,6 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"Piksel 8M"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1.3M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1M piksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mod fokus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infiniti"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2b8b7fb40..2bd8ccae0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kamerainnstillinger"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videoinnstillinger"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Bildestørrelse"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M piksler (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiksler (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M piksler"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokusmodus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Uendelig"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index f84686124..c1598ff59 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -115,17 +115,6 @@
     <string name="pref_camera_settings_category" msgid="4286755118301278593">"क्यामरा सेटिङहरू"</string>
     <string name="pref_camcorder_settings_category" msgid="4617708050480193189">"क्यामकोडर सेटिङहरू"</string>
     <string name="pref_camera_picturesize_title" msgid="7285867796470070880">"चित्र आकार"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="3084140665950405601">"13M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="6497793506352769366">"8M पिक्सल"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="8813718385379530965">"5M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="8546276478576735924">"4M पिक्सेल (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="6233692859150247237">"3M पिक्सल"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="542341433431186453">"२ मेगा पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="607495602129189476">"2M पिक्सेल (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="2279105572299544416">"1.3M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="4015199907773658431">"१ मेगा पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="5417241189390562935">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="5211497128670067462">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="4675290599521989576">"फोकस मोड"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="2359207328353055475">"स्वतः"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="2864044462778663709">"अनन्तता"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5f10988fd..f8c73e472 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Camera-instellingen"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Camcorderinstellingen"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Grootte van foto"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Scherpstelmodus"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatisch"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Oneindig"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 78b44015b..c9c2a6a93 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Ustawienia aparatu"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Ustawienia kamery"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Rozmiar zdjęcia"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiksele (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpix (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mln pikseli"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpix"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Tryb ostrości"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatycznie"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Nieskończoność"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7efbe23da..a28091686 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Definições da câmara"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Definições da câmara de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Tamanho da imagem"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapíxeis (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapíxeis"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Modo de focagem"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinito"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ab30fc5e9..f65364fd2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Configurações da câmera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Configurações da câmera de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Tamanho da imagem"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 MP"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Modo de foco"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automático"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinito"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 84a7d426c..0f1e29703 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Setări cameră foto"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Setările camerei video"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Dimensiune fotografie"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 MP"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Mod focalizare"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automat"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinit"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bde08da8e..61dfa68d7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Настройки камеры"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Настройки видеокамеры"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Размер изображения"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Мпикс. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Мпикс. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Мпикс."</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"640 х 480 пикс."</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"320 x 240 пикс."</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Режим фокусировки"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Авто"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Бесконечность"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 31d9e5aa4..53385e7f6 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -112,17 +112,6 @@
     <string name="pref_camera_settings_category" msgid="4286755118301278593">"කැමරා සැකසීම්"</string>
     <string name="pref_camcorder_settings_category" msgid="4617708050480193189">"කැම්කෝඩර සැකසීම්"</string>
     <string name="pref_camera_picturesize_title" msgid="7285867796470070880">"පින්තූර ප්‍රමාණය"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="3084140665950405601">"පික්සල් 13M"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="6497793506352769366">"පික්සල 8M"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="8813718385379530965">"පික්සල 5M"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="8546276478576735924">"4M පික්සල් (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="6233692859150247237">"පික්සල 3M"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="542341433431186453">"පික්සල 2M"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="607495602129189476">"2M පික්සල් (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="2279105572299544416">"පික්සල 1.3M"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="4015199907773658431">"පික්සල 1M"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="5417241189390562935">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="5211497128670067462">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="4675290599521989576">"නාභිගත ප්‍රකාරය"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="2359207328353055475">"ස්වයං"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="2864044462778663709">"අනන්තය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d42c0ac95..6146a5a8a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Nastavenia fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Nastavenie videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Veľkosť fotografie"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixely (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpx (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Režim zaostrenia"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automaticky"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Nekonečno"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2c1daafe9..e784a3587 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Nastavitve fotoaparata"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Nastavitve videokamere"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Velikost slike"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 mio. pik (16 : 9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pik (16 : 9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mio. sl. pik"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Način ostrenja"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Samodejno"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Neskončno"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4aa8cdaf4..07a6903e9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Подешавања камере"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Подешавања камкордера"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Величина слике"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 мегапиксела (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 мегапиксела (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 мегапиксел"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Режим фокуса"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Аутоматски"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Бесконачност"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a9662e237..d6c791bf9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kamerainställningar"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Videokamerainställningar"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Bildstorlek"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixlar (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixlar (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Fokusläge"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Oändligt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index da6e26625..8df8a4768 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Mipangilio ya kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Mipangilio ya kamkoda"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Ukubwa wa picha"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"Megapikseli 13"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"Megapikseli 8"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"Megapikseli 5"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"Pikseli milioni 4 (16:09)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"Megapikseli 3"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"Megapikseli 2"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"Megapikseli 2  (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"Pikseli Milioni 1.5"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"Megapikseli 1.3"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"Megapikseli 1"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Hali ya kulenga"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Kiotomatiki"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Pasipo mwisho"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 12418580a..657161404 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"การตั้งค่ากล้องถ่ายรูป"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"การตั้งค่ากล้องวิดีโอ"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"ขนาดของภาพ"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M พิกเซล (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ล้านพิกเซล (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"โหมดโฟกัส"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"ออโต้"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"อินฟินิตี"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5ef715552..bf7aefa56 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Mga setting ng camera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Mga setting ng camcorder"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Laki ng larawan"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M pixel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M pixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M pixel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M pixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Focus mode"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinity"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 34164bb62..a78b4fd5a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Kamera ayarları"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Video kamera ayarları"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Resim boyutu"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M piksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiksel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M piksel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Odak modu"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Otomatik"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Sonsuz"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 80d71c91f..e6a3c2b64 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Налаштування камери"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Налаштування відеокамери"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Розмір фото"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Мпікс. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Мпікс. (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mпікс."</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Мпікс."</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Режим фокусу"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Авто"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Безкінечність"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ab352573b..0d4f801d2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Cài đặt máy ảnh"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Cài đặt máy quay video"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Kích thước hình ảnh"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M pixel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M pixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M pixel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M pixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Chế độ tiêu điểm"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Tự động"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Vô cực"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b7ee237d2..b5ad575a2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -115,24 +115,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"摄像机设置"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"照片尺寸"</string>
-    <string name="pref_camera_picturesize_entry_24mp">"24M 像素"</string>
-    <string name="pref_camera_picturesize_entry_21mp">"2100 万像素"</string>
-    <string name="pref_camera_picturesize_entry_16mp">"1600 万像素"</string>
-    <string name="pref_camera_picturesize_entry_16mp_wide">"1600 万像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_13mp">"1300万像素"</string>
-    <string name="pref_camera_picturesize_entry_12mp">"1200 万像素"</string>
-    <string name="pref_camera_picturesize_entry_8mp">"800万像素"</string>
-    <string name="pref_camera_picturesize_entry_square">"方形 (1:1)"</string>
-    <string name="pref_camera_picturesize_entry_5mp">"500万像素"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400万像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300万像素"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200万像素"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200万像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150万像素"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130万像素"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"100万像素"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"对焦方式"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"自动"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"无限远"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index cd335d0a9..0fcf006e1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"相機設定"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"攝錄機設定"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"相片大小"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1,300 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400 萬像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 百萬像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"對焦模式"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"自動"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"無限"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 11ed532af..8f4c6214a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"相機設定"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"攝錄影機設定"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"圖片大小"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400 萬像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200 萬像素 (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"100 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"對焦模式"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"自動"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"無限遠"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 90bcfb28e..3d86a3d07 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -114,18 +114,6 @@
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Izilungiselelo zekhamela"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Izilungiselelo zevidiyo-khamela"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Usayizi wesithombe"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M amaphikiseli (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M amaphikiseli (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M amaphikiseli"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"I-VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"I-QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Imodi yefokhasi"</string>
     <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Okuzenzakalelayo"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Kwaphakade"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ec7130af6..2a39275d4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -28,7 +28,7 @@
         <item>@string/pref_video_quality_entry_vga</item>
         <item>@string/pref_video_quality_entry_cif</item>
         <item>@string/pref_video_quality_entry_qvga</item>
-   </string-array>
+    </string-array>
     <string-array name="pref_video_quality_entryvalues" translatable="false">
         <item>4096x2160</item>
         <item>3840x2160</item>
@@ -167,146 +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_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_1280x400</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>
-    <!-- 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>1280x400</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>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_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 f28b2d682..066c34c31 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -433,85 +433,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_48mp</item>
-        <item>@string/pref_camera_picturesize_entry_32mp</item>
-        <item>@string/pref_camera_picturesize_entry_24mp</item>
-        <item>@string/pref_camera_picturesize_entry_21mp</item>
-        <item>5184 x 3880</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>4208 x 3120</item>
-        <item>@string/pref_camera_picturesize_entry_12mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp_wide</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_1280x400</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>8000x6000</item>
-        <item>6560x4928</item>
-        <item>5656x4242</item>
-        <item>5344x4008</item>
-        <item>5184x3880</item>
-        <item>4608x3456</item>
-        <item>5312x2988</item>
-        <item>4160x3120</item>
-        <item>4208x3120</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>1280x400</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>
-
     <string-array name="pref_camera2_picture_format_entries" translatable="false">
         <item>@string/pref_camera2_picture_format_entry_0</item>
         <item>@string/pref_camera2_picture_format_entry_1</item>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 2908dba18..8ce5ba208 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -16,6 +16,22 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <!-- 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">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string>
+ 
     <!-- Settings screen, scene mode -->
     <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
     <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index f0b611fe6..023ce2dd4 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -68,4 +68,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/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 70bb5c388..a9bc02a6b 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -809,17 +809,6 @@
      <string name="pref_camera_histogram_value_enable">enable</string>
      <string name="pref_camera_histogram_value_disable">disable</string>
 
-    <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
-    <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
-    <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
-    <string name="pref_camera_picturesize_entry_1280x400">1280 x 400</string>
-    <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
-    <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
-    <string name="pref_camera_picturesize_entry_960x720">960 x 720</string>
-    <string name="pref_camera_picturesize_entry_720x480">720 x 480</string>
-    <string name="pref_camera_picturesize_entry_352x288">CIF</string>
-    <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
-
     <!-- Default auto scene detection setting. -->
     <string name="pref_camera_scenedetect_default" translatable="false">off</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 98b5f5b7c..d3e1cb5a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -273,47 +273,6 @@
 
     <!-- Settings screen, Picture size title -->
     <string name="pref_camera_picturesize_title">Picture size</string>
-    <!-- Settings screen, dialog choice for 48 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_48mp">48M pixels</string>
-    <!-- Settings screen, dialog choice for 32 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_32mp">32M pixels</string>
-    <!-- Settings screen, dialog choice for 24 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_24mp">24M pixels</string>
-    <!-- Settings screen, dialog choice for 20 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_21mp">21M pixels</string>
-    <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_16mp">16M pixels</string>
-    <!-- Settings screen, dialog choice for 16 megapixels wide picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_16mp_wide">16M pixels (16:9)</string>
-    <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_13mp">13M 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 8 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
-    <string name="pref_camera_picturesize_entry_8mp_wide">8M pixels (16:9)</string>
-    <!-- Settings screen, dialog choice for square picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_square">Square (1:1)</string>
-    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_5mp">5M pixels</string>
-    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_4mp_wide">4M pixels (16:9)</string>
-    <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_3mp">3M pixels</string>
-    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_2mp">2M pixels</string>
-    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>
-    <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_1_5mp">1.5M pixels</string>
-    <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>
-    <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_1mp">1M pixels</string>
-    <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_vga">VGA</string>
-    <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
 
     <!-- Settings screen, Focus mode title -->
     <string name="pref_camera_focusmode_title">Focus mode</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 5990ae8ef..68d6d3148 100755
--- 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 782a8001d..5c47e7bed 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -149,8 +149,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/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 51b858947..7524388bb 100755
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -84,8 +84,6 @@
             android:layout="@layout/preference"
             android:title="@string/pref_camera_selfiemirror_title" />
         <ListPreference
-            android:entries="@array/pref_camera2_picturesize_entries"
-            android:entryValues="@array/pref_camera2_picturesize_entryvalues"
             android:icon="@drawable/picture_size"
             android:key="pref_camera2_picturesize_key"
             android:layout="@layout/preference"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 1843bc1bb..1189356f3 100755
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -168,9 +168,7 @@
     <ListPreference
             camera:key="pref_camera_videosnapsize_key"
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
-            camera:title="@string/pref_camera_picturesize_title"
-            camera:entries="@array/pref_camera_video_snapsize_entries"
-            camera:entryValues="@array/pref_camera_video_snapsize_entryvalues" />
+            camera:title="@string/pref_camera_picturesize_title" />
     <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 62197b864..46262fcd1 100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -40,11 +40,14 @@ import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
 import com.android.camera.util.PersistUtil;
+import com.android.camera.util.MultiMap;
+
 import org.codeaurora.snapcam.R;
 import org.codeaurora.snapcam.wrapper.CamcorderProfileWrapper;
 import org.codeaurora.snapcam.wrapper.ParametersWrapper;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import android.os.Build;
@@ -545,26 +548,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);
@@ -1154,10 +1172,12 @@ 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,
                     whiteBalance, mParameters.getSupportedWhiteBalance());
@@ -1368,7 +1388,7 @@ public class CameraSettings {
         return false;
     }
 
-    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) {
@@ -1680,4 +1700,173 @@ public class CameraSettings {
         Log.d(TAG,"getSupportedDegreesOfBlur str =" +str);
         return split(str);
     }
+
+    // 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 prefer 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 51ac90b20..839755d1b 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -355,23 +355,18 @@ public class SettingsManager implements ListMenu.SettingsListener {
     }
 
     public void updatePictureAndVideoSize() {
-        ListPreference picturePref = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
-        ListPreference videoQualityPref = mPreferenceGroup.findPreference(KEY_VIDEO_QUALITY);
-        if (picturePref != null) {
-            picturePref.setEntries(mContext.getResources().getStringArray(
-                    R.array.pref_camera2_picturesize_entries));
-            picturePref.setEntryValues(mContext.getResources().getStringArray(
-                    R.array.pref_camera2_picturesize_entryvalues));
-            filterUnsupportedOptions(picturePref, getSupportedPictureSize(
-                    getCurrentCameraId()));
-        }
-        if (videoQualityPref != null) {
-            videoQualityPref.setEntries(mContext.getResources().getStringArray(
-                    R.array.pref_camera2_video_quality_entries));
-            videoQualityPref.setEntryValues(mContext.getResources().getStringArray(
-                    R.array.pref_camera2_video_quality_entryvalues));
-            filterUnsupportedOptions(videoQualityPref,getSupportedVideoSize(
-                    getCurrentCameraId()));
+            ListPreference pictureSize = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
+            ListPreference videoQualityPref = mPreferenceGroup.findPreference(KEY_VIDEO_QUALITY);
+            CameraSettings.formatPictureSizes(pictureSize,
+                    getSupportedPictureSizeList(getCurrentCameraId()), mContext);
+            CameraSettings.resetIfInvalid(pictureSize);
+            if (videoQualityPref != null) {
+                videoQualityPref.setEntries(mContext.getResources().getStringArray(
+                        R.array.pref_camera2_video_quality_entries));
+                videoQualityPref.setEntryValues(mContext.getResources().getStringArray(
+                        R.array.pref_camera2_video_quality_entryvalues));
+                filterUnsupportedOptions(videoQualityPref,getSupportedVideoSize(
+                        getCurrentCameraId()));
         }
     }
 
@@ -408,7 +403,11 @@ public class SettingsManager implements ListMenu.SettingsListener {
         /* Video Size */
         String[] videoSizes = getEntryValues(R.array.pref_camera2_video_quality_entryvalues);
         /* Picture Size */
-        String[] pictSizes = getEntryValues(R.array.pref_camera2_picturesize_entryvalues);
+        ListPreference pictureSize = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE);
+        CameraSettings.formatPictureSizes(pictureSize,
+                getSupportedPictureSizeList(getCurrentCameraId()), mContext);
+        CameraSettings.resetIfInvalid(pictureSize);
+        String[] pictSizes = convertToStringArray(pictureSize.getEntryValues());
         // back support pictureSizes
         List<String> backPLists = getSupportList(getSupportedPictureSize(0), pictSizes);
         supportLists.add("<Back camera support PictureSizes>");
@@ -458,6 +457,15 @@ public class SettingsManager implements ListMenu.SettingsListener {
         return list;
     }
 
+    private String[] convertToStringArray(CharSequence[] charSequences) {
+        String[] resultStr = new String[charSequences.length];
+        for (int i = 0; i < charSequences.length; i++) {
+	        resultStr[i] = charSequences[i].toString();
+        }
+
+        return resultStr;
+    }
+
     private String[] getEntryValues(int id) {
         return mContext.getResources().getStringArray(id);
 
@@ -973,13 +981,9 @@ public class SettingsManager implements ListMenu.SettingsListener {
         if (cameraIdPref != null) buildCameraId();
 
         if (pictureSize != null) {
-            if (filterUnsupportedOptions(pictureSize, getSupportedPictureSize(cameraId))) {
-                mFilteredKeys.add(pictureSize.getKey());
-            } else {
-                if (filterSimilarPictureSize(mPreferenceGroup, pictureSize)) {
-                    mFilteredKeys.add(pictureSize.getKey());
-                }
-            }
+            CameraSettings.formatPictureSizes(pictureSize,
+                    getSupportedPictureSizeList(cameraId), mContext);
+            CameraSettings.resetIfInvalid(pictureSize);
         }
 
         if (exposure != null) buildExposureCompensation(cameraId);
@@ -1633,6 +1637,27 @@ public class SettingsManager implements ListMenu.SettingsListener {
                 mValuesMap.get(KEY_FLASH_MODE) != null;
     }
 
+    private List<Size> getSupportedPictureSizeList(int cameraId) {
+        StreamConfigurationMap map = mCharacteristics.get(cameraId).get(
+                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+        Size[] sizes = map.getOutputSizes(ImageFormat.JPEG);
+        List<Size> res = new ArrayList<>();
+        if (sizes != null) {
+            for (int i = 0; i < sizes.length; i++) {
+                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]);
+            }
+        }
+
+        return res;
+    }
+
     private List<String> getSupportedPictureSize(int cameraId) {
         StreamConfigurationMap map = mCharacteristics.get(cameraId).get(
                 CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
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