Merge "Build broken." into klp-dev

55 files changed, 179 insertions, 253 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6f79040d1..2da6b036e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"BEWOLK"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Toneelmodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Outo"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Handeling"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nag"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"BELIGTING"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"VOORSTE KAMERA"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoem"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Draai"</string>
     <string name="crop_save" msgid="2841974981340098579">"Stoor"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Kan nie die prent laai nie!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrook-aansig"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3e20a1a72..b1493c6e1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ደመናማ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"የትዕይንት ሁነታ"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ራስ-ሰር"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"ኤች ዲ አር+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"ከፍተኛ ጥራት"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"ከፍተኛ ጥራት"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"ኤች ዲ አር"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"እርምጃ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ሌሊት"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ተጋላጭነት"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"ኤች ዲ አር"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"የፊት ካሜራ"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"አጉላ"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"አሽከርክር"</string>
     <string name="crop_save" msgid="2841974981340098579">"አስቀምጥ"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"ምስሉን መጫን አልተቻለም!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"የድርድር ፊልም እይታ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 82ff0901c..99c26f635 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"غائم"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"وضع المشهد"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"تلقائيًا"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"دقة عالية"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"جودة عالية"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"نطاق عالي الديناميكية"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"حركة"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ليلاً"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"التعرض للضوء"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"نطاق عالي الديناميكية"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"الكاميرا الأمامية"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"تكبير/تصغير"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"تدوير"</string>
     <string name="crop_save" msgid="2841974981340098579">"حفظ"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"عرض شريط الصور"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e233afff1..94d84b5e1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ОБЛАЧНО"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Сценичен режим"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Автоматично"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"ВК"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Действие"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"През нощта"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ЕКСПОНАЦИЯ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ПРЕДНА КАМЕРА"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Мащаб: Промяна"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Завъртане"</string>
     <string name="crop_save" msgid="2841974981340098579">"Запазване"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Изглед „Филмова лента“"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 68d574c8a..9a8b4b065 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ENNUVOLAT"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Mode d\'escena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"Alta definició"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Alta qualitat"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acció"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nit"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSICIÓ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CÀMERA FRONTAL"</string>
@@ -273,7 +274,7 @@
     <string name="set_duration" msgid="1638453882581604341">"Configuració de la durada en segons"</string>
     <string name="count_down_title_text" msgid="7586031110595513050">"Compte enrere per fer una foto"</string>
     <string name="remember_location_title" msgid="3045040613094030429">"Vols que es recordin les ubicacions de les fotos?"</string>
-    <string name="remember_location_prompt" msgid="5104210757873140169">"Etiqueta les teves fotos i els teus vídeos amb les ubicacions des de les quals s\'han fet.\n\nAltres aplicacions podran accedir a aquesta informació i a les imatges desades."</string>
+    <string name="remember_location_prompt" msgid="5104210757873140169">"Etiqueta les teves fotos i els teus vídeos amb les ubicacions des de les quals s\'han fet.\n\nAltres aplicacions podran accedir a aquesta informació, juntament amb les imatges desades."</string>
     <string name="remember_location_no" msgid="4412802756840226925">"No, gràcies"</string>
     <string name="remember_location_yes" msgid="4339424460683531388">"Sí"</string>
     <string name="camera_menu_more_label" msgid="7951917844735828365">"MÉS OPCIONS"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Gira"</string>
     <string name="crop_save" msgid="2841974981340098579">"Desa"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"No es pot carregar la imatge."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Visualització de tira de pel·lícula"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0661aec6a..d59c2d581 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ZATAŽENO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scénický režim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaticky"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akce"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOZICE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PŘEDNÍ FOTOAPARÁT"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Lupa"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Otáčení"</string>
     <string name="crop_save" msgid="2841974981340098579">"Uložit"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Zobrazení filmového pásu"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 65711812c..85b5b6c4c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"SKYET"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Motivtilstand"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisk"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nat"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EKSPONERING"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONTKAMERA"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Roter"</string>
     <string name="crop_save" msgid="2841974981340098579">"Gem"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrimmel-visning"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4353b3945..752761e23 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"Bewölkt"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Szenenmodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisch"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Bewegung"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nachtaufnahme"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"Belichtung"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"Kamera auf der Vorderseite"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoomen"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Drehen"</string>
     <string name="crop_save" msgid="2841974981340098579">"Speichern"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Bild kann nicht geladen werden."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Ansicht als Filmstreifen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2f7f46ba6..2b39a9c9c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ΣΥΝΝΕΦΙΑ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Λειτουργία σκηνής"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Αυτόματα"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ενέργεια"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Βράδυ"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ΕΚΘΕΣΗ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ΜΠΡΟΣΤΑ"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Εστίαση"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Περιστροφή"</string>
     <string name="crop_save" msgid="2841974981340098579">"Αποθήκευση"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Δεν είναι δυνατή η φόρτωση της εικόνας!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Προβολή σε φιλμ"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 932cefe57..0f28a29a7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"CLOUDY"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scene mode"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSURE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONT CAMERA"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotate"</string>
     <string name="crop_save" msgid="2841974981340098579">"Save"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrip view"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 932cefe57..0f28a29a7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"CLOUDY"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scene mode"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSURE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONT CAMERA"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotate"</string>
     <string name="crop_save" msgid="2841974981340098579">"Save"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrip view"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 88b1f456d..1dfe9f963 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modo Escena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acción"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noche"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSICIÓN"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CÁMARA FRONTAL"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Girar"</string>
     <string name="crop_save" msgid="2841974981340098579">"Guardar"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Tira de diapositivas"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Vista de tira película"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index feb0c55e2..1fe3daaac 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modo de escena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Alta calidad"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"ARD"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acción"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noche"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSICIÓN"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"ARD"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CÁMARA FRONTAL"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Girar"</string>
     <string name="crop_save" msgid="2841974981340098579">"Guardar"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Error al cargar la imagen"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Vista de tira de película"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index e2ade13f0..5cd4834e8 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"PILVES"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Stseenirežiim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaatne"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Kõrge kvaliteet"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Toiming"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Õhtu"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"SÄRIAEG"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ESIKAAMERA"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Suumimine"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Pööramine"</string>
     <string name="crop_save" msgid="2841974981340098579">"Salvesta"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Pilti ei saa laadida!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmiribakuva"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f54714bc7..04a2d05cd 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ابری"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"حالت منظره"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"خودکار"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"عملکرد"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"شب"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"نوردهی"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"دوربین جلو"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"بزرگ‌نمایی"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"چرخاندن"</string>
     <string name="crop_save" msgid="2841974981340098579">"ذخیره"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"نمای نوار فیلم"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"نمایش نوار فیلم"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b007cda43..9bfcbe756 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"PILVINEN"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Kuvaustila"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Korkealaatuinen"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Toiminto"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Yö"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"VALOTUS"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ETUKAMERA"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoomaa"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Kierrä"</string>
     <string name="crop_save" msgid="2841974981340098579">"Tallenna"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filminauhanäkymä"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8a8959ed2..86651a8ac 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUAGEUX"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Mode Scène"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatique"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HD"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nuit"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSITION"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"APPAREIL PHOTO FRONTAL"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoomer"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Pivoter"</string>
     <string name="crop_save" msgid="2841974981340098579">"Enregistrer"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Affichage Pellicule"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Pellicule"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ae7d1d741..c7448199a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUAGEUX"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Mode Scène"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatique"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nuit"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSITION"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CAMÉRA FRONTALE"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotation"</string>
     <string name="crop_save" msgid="2841974981340098579">"Enregistrer"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Pellicule"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 900edff0c..aa59c5f7b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -138,7 +138,7 @@
     <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"स्वतः"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"चालू"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"बंद"</string>
-    <string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"फ़्लैश अपनेआप:"</string>
+    <string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"फ़्लैश स्वत:"</string>
     <string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"फ़्लैश चालू"</string>
     <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"फ़्लैश बंद"</string>
     <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"श्वेत संतुलन"</string>
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"धुंधला"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"दृश्य मोड"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"स्वतः"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"कार्यवाही"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"रात"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"एक्सपोज़र"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"सामने का कैमरा"</string>
@@ -273,9 +273,9 @@
     <string name="set_time_interval_help" msgid="64145154088021389">"समय अंतराल सुविधा बंद है. समय अंतराल सेट करने के लिए इसे चालू करें."</string>
     <string name="set_duration" msgid="1638453882581604341">"अवधि को सेकंड में सेट करें"</string>
     <string name="count_down_title_text" msgid="7586031110595513050">"फ़ोटो लेने के लिए उल्टी गिनती कर रहा है"</string>
-    <string name="remember_location_title" msgid="3045040613094030429">"फ़ोटो के स्थान याद रखना हैं?"</string>
+    <string name="remember_location_title" msgid="3045040613094030429">"फ़ोटो के स्थान याद रखें?"</string>
     <string name="remember_location_prompt" msgid="5104210757873140169">"अपने फ़ोटो और वीडियो को उन स्थानों के साथ टैग करें जहां वे लिए गए हैं.\n\nअन्य एप्लिकेशन आपके सहेजे गए चित्रों सहित इस जानकारी का उपयोग कर सकते हैं."</string>
-    <string name="remember_location_no" msgid="4412802756840226925">"नहीं,रहने दें"</string>
+    <string name="remember_location_no" msgid="4412802756840226925">"नहीं धन्यवाद"</string>
     <string name="remember_location_yes" msgid="4339424460683531388">"हां"</string>
     <string name="camera_menu_more_label" msgid="7951917844735828365">"अधिक विकल्प"</string>
     <string name="camera_menu_settings_label" msgid="3862756725328016822">"सेटिंग"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"ज़ूम करें"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"घुमाएं"</string>
     <string name="crop_save" msgid="2841974981340098579">"सहेजें"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"फ़िल्मस्ट्रिप दृश्य"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 382ce6fd8..7b0e90dc4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"OBLAČNO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Način scene"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatski"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Visoka kvaliteta"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"VDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Radnja"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noć"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EKSPOZICIJA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"VDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PREDNJI FOTOAPARAT"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zumiranje"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Okretanje"</string>
     <string name="crop_save" msgid="2841974981340098579">"Spremi"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Prikaz filmske vrpce"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 53a0362f9..e2e576fcb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"FELHŐS"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Fotó üzemmód"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatikus"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Jó minőség"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Mozgásban"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Éjszaka"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOZÍCIÓ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ELÜLSŐ KAMERA"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Nagyít/kicsinyít"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Elforgatás"</string>
     <string name="crop_save" msgid="2841974981340098579">"Mentés"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Nem sikerült betölteni a képet!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmszalagnézet"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 44035cf82..13b94595f 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ԱՄՊԱՄԱԾ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Տեսարանային ռեժիմ"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Ավտոմատ"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Գործողություն"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Գիշերային"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ԼՈՒՍԱՎՈՐՈՒԹՅՈՒՆ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ԱՌՋԵՎԻ ՏԵՍԱԽՑԻԿ"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Խոշորացնել"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Պտտել"</string>
     <string name="crop_save" msgid="2841974981340098579">"Պահել"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Կինոժապավենի տեսք"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0059573d5..c9d49d2f6 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"BERAWAN"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Mode adegan"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Otomatis"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tindakan"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Malam"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"PENCAHAYAAN"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"KAMERA DEPAN"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Putar"</string>
     <string name="crop_save" msgid="2841974981340098579">"Simpan"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Tampilan strip film"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fb836d564..c5f20c3cd 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUVOLOSO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modalità scena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatica"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Alta qualità"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Azione"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Notte"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ESPOSIZIONE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FOTOCAMERA ANTERIORE"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Ruota"</string>
     <string name="crop_save" msgid="2841974981340098579">"Salva"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Impossibile caricare l\'immagine."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Visualizzazione sequenza"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 972d0f7f4..e5fd2b255 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"מעונן"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"מצב נוף"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"אוטומטי"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+‎"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"פעולה"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"לילה"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"חשיפה"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"מצלמה חזיתית"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"שנה מרחק מתצוגה"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"סובב"</string>
     <string name="crop_save" msgid="2841974981340098579">"שמור"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"לא ניתן לטעון את התמונה."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"תצוגה בסרט שקופיות"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3e416b9fb..1ae7136a3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"曇り"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"撮影モード"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"オート"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"スポーツ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"露出"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"前面カメラ"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"ズーム"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"回転"</string>
     <string name="crop_save" msgid="2841974981340098579">"保存"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"フィルムストリップ表示"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 87179fb67..2c87dd718 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"მოღრუბლული"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"ხედის რეჟიმი"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ავტომატური"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"მოქმედება"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ღამე"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ექსპოზიცია"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"წინა კამერა"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"მასშტაბი"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"შეტრიალება"</string>
     <string name="crop_save" msgid="2841974981340098579">"შენახვა"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"ფოტოფირის ხედი"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index abc73c6aa..82ba398a2 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ពពក"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"របៀប​រូបភាព"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ស្វ័យប្រវត្តិ"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"សកម្មភាព"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"រាត្រី"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"បង្ហាញ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ម៉ាស៊ីន​ថត​ខាងមុខ"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"ពង្រីក/បង្រួម"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"បង្វិល"</string>
     <string name="crop_save" msgid="2841974981340098579">"រក្សាទុក"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"ទិដ្ឋភាព​ហ្វីល"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3b263efa7..656d8dbda 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"흐림"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"장면 모드"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"자동"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"고화질"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"액션"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"밤"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"노출"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"전면 카메라"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"확대/축소"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"회전"</string>
     <string name="crop_save" msgid="2841974981340098579">"저장"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"슬라이드 보기"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index f90b8db09..2767bfb9e 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ຟ້າບົດ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"ຮູບແບບສາກ"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ອັດຕະໂນມັດ"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"ແອັກຊັນ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ຕອນຄ່ຳ"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ການຮັບແສງ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ກ້ອງຫນ້າ"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"ຊູມ"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"ໝຸນ"</string>
     <string name="crop_save" msgid="2841974981340098579">"ບັນທຶກ"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"ມຸມມອງ Filmstrip"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e3e0c48b3..26ada4f11 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"DEBESUOTA"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Vaizdo režimas"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatinis"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Aukštos kokybės"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Veiksmas"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Naktis"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"IŠLAIKYMAS"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PRIEKINIS FOTOAPARATAS"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Keisti mastelį"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Pasukti"</string>
     <string name="crop_save" msgid="2841974981340098579">"Išsaugoti"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Nepavyksta įkelti vaizdo."</string>
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Diafilmo rodinys"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmo juostos rodinys"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 68d140cd3..f1a8d9b6a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MĀKOŅAINS"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Ainavas režīms"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automātiski"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"Augsts din.diap."</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"Augsta izšķ."</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Augsta kvalitāte"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"Augsts din.diap."</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Kustība"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nakts"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EKSPOZĪCIJA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"Augsts dinamiskais diapazons"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PRIEKŠĒJĀ KAMERA"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Tālummainīt"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Pagriezt"</string>
     <string name="crop_save" msgid="2841974981340098579">"Saglabāt"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Nevar ielādēt attēlu."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Kinolentes skatījums"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 4e54f823b..1a3a3d02b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ҮҮЛТЭЙ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Тохируулсан горим"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Автомат"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Үйлдэл"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Шөнө"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ГАРГАХ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"УРД КАМЕР"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Томруулах"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Эргүүлэх"</string>
     <string name="crop_save" msgid="2841974981340098579">"Хадгалах"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Зургийн хальсаар харах"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dd0b2fdba..037f5275c 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MENDUNG"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Mod pemandangan"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"KT"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tindakan"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Malam"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"DEDAHAN"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"KAMERA DEPAN"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zum"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Putar"</string>
     <string name="crop_save" msgid="2841974981340098579">"Simpan"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Paparan jalur filem"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Pandangan jalur filem"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b48832829..785105fd6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"OVERSKYET"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scenemodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Høy kvalitet"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Natt"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EKSPONERING"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONTKAMERA"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotér"</string>
     <string name="crop_save" msgid="2841974981340098579">"Lagre"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Kan ikke laste inn bildet."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstripevisning"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7785d59bf..c3c24fd07 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"BEWOLKT"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scènemodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisch"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Hoge kwaliteit"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Actie"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nacht"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"BELICHTING"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CAMERA AAN VOORZIJDE"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"In-/uitzoomen"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Draaien"</string>
     <string name="crop_save" msgid="2841974981340098579">"Opslaan"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Kan de afbeelding niet laden."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrookweergave"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f3eca80aa..25adb388e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ZACHMURZENIE"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Tryb scenerii"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatycznie"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Wysoka jakość"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akcja"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EKSPOZYCJA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PRZEDNI APARAT"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Powiększ"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Obróć"</string>
     <string name="crop_save" msgid="2841974981340098579">"Zapisz"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Nie można wczytać zdjęcia."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Widok taśmy filmowej"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5540e7035..eb4bff3c4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modo de cenário"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ação"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noite"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSIÇÃO"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CÂMARA FRONTAL"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rodar"</string>
     <string name="crop_save" msgid="2841974981340098579">"Guardar"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Não é possível carregar a imagem!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Vista de película"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 50b812590..aaf4edeeb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUBLADO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modo de cena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"Alta definição"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Alta qualidade"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ação"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noite"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSIÇÃO"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CÂMERA FRONTAL"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Girar"</string>
     <string name="crop_save" msgid="2841974981340098579">"Salvar"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Visualização de película"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3f5093862..f31e5df5a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ÎNNORAT"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Mod Scenă"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automat"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Înaltă calitate"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acțiune"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noapte"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPUNERE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CAMERA FOTO FAȚĂ"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotație"</string>
     <string name="crop_save" msgid="2841974981340098579">"Salvați"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Afișare tip peliculă"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Afişare tip bandă de film"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ffa007afe..78325fb41 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ПАСМУРНЫЙ ДЕНЬ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Режим съемки"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Авто"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"В движении"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ночная съемка"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ВЫДЕРЖКА"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ПЕРЕДНЯЯ КАМЕРА"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Масштаб"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Поворот"</string>
     <string name="crop_save" msgid="2841974981340098579">"Сохранить"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Лента"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 80a70e3fb..f9da7a01c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ZAMRAČENÉ"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scénický režim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaticky"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akcia"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOZÍCIA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PREDNÝ FOTOAPARÁT"</string>
@@ -273,8 +273,8 @@
     <string name="set_time_interval_help" msgid="64145154088021389">"Funkcia časozberného videa je vypnutá. Zapnite ju a a nastavte časový interval."</string>
     <string name="set_duration" msgid="1638453882581604341">"Nastavte dobu trvania v sekundách"</string>
     <string name="count_down_title_text" msgid="7586031110595513050">"Odpočítavanie spúšte fotoaparátu"</string>
-    <string name="remember_location_title" msgid="3045040613094030429">"Zapamätať si, kde boli fotky vytvorené?"</string>
-    <string name="remember_location_prompt" msgid="5104210757873140169">"Pridajte k fotkám a videám polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám spolu s prístupom k vašim uloženým snímkam."</string>
+    <string name="remember_location_title" msgid="3045040613094030429">"Zapamätať si, kde boli fotografie vytvorené?"</string>
+    <string name="remember_location_prompt" msgid="5104210757873140169">"Označte pre fotografie a videá polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám aj k vašim uloženým snímkam."</string>
     <string name="remember_location_no" msgid="4412802756840226925">"Nie, nemám záujem"</string>
     <string name="remember_location_yes" msgid="4339424460683531388">"Áno"</string>
     <string name="camera_menu_more_label" msgid="7951917844735828365">"ĎALŠIE MOŽNOSTI"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Lupa"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Otáčanie"</string>
     <string name="crop_save" msgid="2841974981340098579">"Uložiť"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Zobrazenie filmového pásu"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 22e598f0a..034554847 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"OBLAČNO"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Način prizora"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Samodejno"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Visoka kakovost"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Gibanje"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ponoči"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"OSVETLITEV"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FOTOAPARAT SPREDAJ"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Povečaj/pomanj."</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Zasukaj"</string>
     <string name="crop_save" msgid="2841974981340098579">"Shrani"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Pogled filmskega traku"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b4621f534..bd5f666c0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ОБЛАЧНО"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Режим сцене"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Аутоматски"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Висок квалитет"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Радња"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ноћ"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ЕКСПОЗИЦИЈА"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ПРЕДЊА КАМЕРА"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Зумирај"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Ротирај"</string>
     <string name="crop_save" msgid="2841974981340098579">"Сачувај"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Приказ филмске траке"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 537eb4dae..520756c05 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MOLNIGT"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scenläge"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ-kvalitet"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Rörligt objekt"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Natt"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPONERING"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRÄMRE KAMERA"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zooma"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotera"</string>
     <string name="crop_save" msgid="2841974981340098579">"Spara"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmremsevy"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d8e418ffb..1793dfb24 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MAWINGU"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Hali ya mandhari"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Kiotomatiki"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Ubora wa Juu"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Kitendo"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Usiku"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"KIASI CHA MWANGAZA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"KAMERA YA MBELE"</string>
@@ -227,7 +227,7 @@
     <string name="accessibility_review_retake" msgid="2547112860787022130">"Kagua upigaji tena wa picha"</string>
     <string name="capital_on" msgid="1118214824959797269">"WASHA"</string>
     <string name="capital_off" msgid="3020696135020167263">"ZIMA"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Kimezimwa"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Imezimwa"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"Sekunde 0.5"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"Sekunde 1"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"Sekunde 1.5"</string>
@@ -286,7 +286,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Kuza"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Zungusha"</string>
     <string name="crop_save" msgid="2841974981340098579">"Hifadhi"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Mwonekano wa utepe wa filamu"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 103159c0f..ccd7eadd1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"เมฆมาก"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"โหมดสำเร็จรูป"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ออโต้"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"คุณภาพสูง"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"การทำงาน"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"กลางคืน"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"การรับแสง"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"กล้องด้านหน้า"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"ซูม"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"หมุน"</string>
     <string name="crop_save" msgid="2841974981340098579">"บันทึก"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"มุมมองฟิล์มภาพยนตร์"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cb3dc4046..d9c235220 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MAULAP"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scene mode"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Aksyon"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gabi"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSURE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CAMERA SA HARAP"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"I-zoom"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"I-rotate"</string>
     <string name="crop_save" msgid="2841974981340098579">"I-save"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrip view"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 51b081232..4ca89bfe4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"BULUTLU"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Sahne modu"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Otomatik"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Hareket"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gece"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"POZLAMA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"ÖN KAMERA"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zum"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Döndürme"</string>
     <string name="crop_save" msgid="2841974981340098579">"Kaydet"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Film şeridi görünümü"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 976059e1d..30210429f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"ХМАРНО"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Режим зйомки"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Авто"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Висока якість"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Під час руху"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ніч"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ЕКСПОЗИЦІЯ"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"КАМЕРА НА ПЕРЕДНІЙ ПАНЕЛІ"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Масштаб"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Обертати"</string>
     <string name="crop_save" msgid="2841974981340098579">"Зберегти"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Неможливо завантажити зображення."</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Діафільм"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2ffeb1d87..e08131e4c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NHIỀU MÂY"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Chế độ phong cảnh"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Tự động"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"Chất lượng cao"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tác vụ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Đêm"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"ĐỘ PHƠI SÁNG"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"MÁY ẢNH MẶT TRƯỚC"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Thu phóng"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Xoay"</string>
     <string name="crop_save" msgid="2841974981340098579">"Lưu"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Chế độ xem cuộn phim"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 55780a0e4..afbab64bf 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"阴天"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"取景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自动"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"高清"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"高画质"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"运动"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜间"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"曝光"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"前置摄像头"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"缩放"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"旋转"</string>
     <string name="crop_save" msgid="2841974981340098579">"保存"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"胶卷视图"</string>
+    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"幻灯片视图"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 432ac9136..bfef5a12a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"陰天"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"場景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自動"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"高清"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"高畫質"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"高動態範圍"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"曝光"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"高動態範圍"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"前置鏡頭"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"縮放"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"旋轉"</string>
     <string name="crop_save" msgid="2841974981340098579">"儲存"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"幻燈片檢視"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8da4a382a..844034782 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -155,8 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"陰天"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"場景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自動"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_hdr_plus (6759085555519758794) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD 高畫質"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"HQ 高畫質"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"高動態範圍"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
@@ -177,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"曝光"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"高動態範圍"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"前置鏡頭"</string>
@@ -284,7 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"縮放"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"旋轉"</string>
     <string name="crop_save" msgid="2841974981340098579">"儲存"</string>
-    <!-- no translation found for cannot_load_image (4100136187076585580) -->
-    <skip />
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"幻燈片檢視"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9dd5c1e75..d5bf7d42f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -155,7 +155,8 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"KUNAMAFU"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Imodi yesigcawu"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Okuzenzakalelayo"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"I-HDR+"</string>
+    <string name="pref_camera_scenemode_entry_hd" msgid="2194755994575191142">"HD"</string>
+    <string name="pref_camera_scenemode_entry_hq" msgid="6784456971235328315">"I-HQ"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"I-HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Isenzo"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ebusuku"</string>
@@ -176,7 +177,7 @@
     <string name="pref_exposure_label" msgid="2604738602400261218">"UKUBONISWA"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
     <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+    <!-- no translation found for pref_camera_hq_default (4772072038191191096) -->
     <skip />
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"I-HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"IKHAMELA ENGAPHAMBILI"</string>
@@ -283,6 +284,5 @@
     <string name="tiny_planet_zoom" msgid="2985522360577158474">"Sondeza"</string>
     <string name="tiny_planet_rotate" msgid="5445336705705350004">"Phendula"</string>
     <string name="crop_save" msgid="2841974981340098579">"Londoloza"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Ayikwazi ukulayisha isithombe!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Ukubukwa komsweswe wefilimu"</string>
 </resources>