Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad

commit: 8470cae9049959ee6bb28cde1c53185f2ffd10a1 [log] [tgz]
author: Doris Liu <tianliu@google.com> Thu Oct 17 17:46:48 2013 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Oct 17 17:46:48 2013 +0000
tree: 4d59a5eff928fa20c58f9297971546a9f391c68a
parent: f149ec53a0fa3330617ce01751964662d3273c88 [diff]
parent: 3a45c33d74fe0ad0ade9be3d037560a53891c627 [diff]
diff --git a/res/mipmap-hdpi/ic_launcher_camera.png b/res/mipmap-hdpi/ic_launcher_camera.png
index 8781ace..c1ebe77 100644
--- a/res/mipmap-hdpi/ic_launcher_camera.png
+++ b/res/mipmap-hdpi/ic_launcher_camera.png
Binary files differ

diff --git a/res/mipmap-mdpi/ic_launcher_camera.png b/res/mipmap-mdpi/ic_launcher_camera.png
index 963728d..20f1499 100644
--- a/res/mipmap-mdpi/ic_launcher_camera.png
+++ b/res/mipmap-mdpi/ic_launcher_camera.png
Binary files differ

diff --git a/res/mipmap-xhdpi/ic_launcher_camera.png b/res/mipmap-xhdpi/ic_launcher_camera.png
index 01f550d..972ee40 100644
--- a/res/mipmap-xhdpi/ic_launcher_camera.png
+++ b/res/mipmap-xhdpi/ic_launcher_camera.png
Binary files differ

diff --git a/res/mipmap-xxhdpi/ic_launcher_camera.png b/res/mipmap-xxhdpi/ic_launcher_camera.png
index 4cc2e72..4cc58ee 100644
--- a/res/mipmap-xxhdpi/ic_launcher_camera.png
+++ b/res/mipmap-xxhdpi/ic_launcher_camera.png
Binary files differ

diff --git a/res/mipmap-xxxhdpi/ic_launcher_camera.png b/res/mipmap-xxxhdpi/ic_launcher_camera.png
index 25d4c47..00de613 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_camera.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_camera.png
Binary files differ

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ab54a5e..0c4b126 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Skakel HDR+ aan"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Skakel HDR+ af"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Skakel HDR aan"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Skakel HDR af"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Handeling"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nag"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sonsondergang"</string>
@@ -293,5 +289,5 @@
     <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>
-    <string name="setting_wallpaper" msgid="2397759659347872725">"Stel muurpapier in"</string>
+    <string name="setting_wallpaper" msgid="2397759659347872725">"Stel tans muurpapier in"</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3ba3c45..1cbc2d9 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"ኤች ዲ አር"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"ኤች ዲ አር+ አብራ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"ኤች ዲ አር+ አጥፋ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"ኤች ዲ አር አብራ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"ኤች ዲ አር አጥፋ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"እርምጃ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ሌሊት"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ፀሀይ ስትጠልቅ"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 705a54e..db3e3d9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"نطاق عالي الديناميكية"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"تشغيل النطاق عالي الديناميكية الأفضل"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"إيقاف النطاق عالي الديناميكية الأفضل"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"تشغيل النطاق عالي الديناميكية"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"إيقاف النطاق عالي الديناميكية"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"حركة"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ليلاً"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"الغروب"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 46b6608..ad99c7c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Включване на HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Изключване на HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Включване на HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Изключване на HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Действие"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"През нощта"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Залез"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c929e19..1cccc3c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activa l\'HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desactiva l\'HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activa l\'HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desactiva l\'HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acció"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Posta de sol"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6338da2..e6d9436 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaticky"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Zapnout HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Vypnout HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Zapnout HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Vypnout HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akce"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Západ slunce"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bf684b9..3edce31 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisk"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Slå HDR+ til"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Slå HDR+ fra"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Slå HDR til"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Slå HDR fra"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nat"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Solnedgang"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0c5dbf4..19c2381 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ aktivieren"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ deaktivieren"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR aktivieren"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR deaktivieren"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Bewegung"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nachtaufnahme"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sonnenuntergang"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ca1b5a3..b985182 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ενεργοποίηση του HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Απενεργοποίηση του HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ενεργοποίηση του HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Απενεργοποίηση του HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ενέργεια"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Βράδυ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Ηλιοβασίλεμα"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7d2c4a2..c8d07eb 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Turn HDR+ On"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Turn HDR+ Off"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Turn HDR On"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Turn HDR Off"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sunset"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7d2c4a2..c8d07eb 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Turn HDR+ On"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Turn HDR+ Off"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Turn HDR On"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Turn HDR Off"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sunset"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4e09d23..85a7d5f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desactivar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desactivar 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Atardecer"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ca988dc..0c3333e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"ARD"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desactivar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desactivar 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Atardecer"</string>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index bdb0ff4..7b841ae 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ sisselülitamine"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ väljalülitamine"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR-i sisselülitamine"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR-i väljalülitamine"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Toiming"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Õhtu"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Päikeseloojang"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 40959bf..00cd0f8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"روشن کردن HDR+‎"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"خاموش کردن HDR+‎"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"روشن کردن HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"خاموش کردن HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"عملکرد"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"شب"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"غروب آفتاب"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6930556..5dc4183 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ota HDR+ käyttöön"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Poista HDR+ käytöstä"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ota HDR käyttöön"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Poista HDR käytöstä"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Toiminto"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Yö"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Auringonlasku"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b51e301..9ff83bb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatique"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activer le mode HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Désactiver le mode HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activer le mode HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Désactiver le mode HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nuit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"C. de soleil"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 70777b3..4cd432c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -105,7 +105,7 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Son compte rebours"</string>
+    <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Compte à rebours sonore"</string>
     <string name="setting_off" msgid="6782191065550276632">"Désactivé"</string>
     <string name="setting_on" msgid="9086728135773197891">"Activé"</string>
     <string name="pref_video_quality_title" msgid="5887153490982738588">"Qualité vidéo"</string>
@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatique"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activer le mode HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Désactiver le mode HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activer le mode HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Désactiver le mode HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nuit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Coucher de soleil"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c1fd523..830adca 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ चालू करें"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ बंद करें"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR चालू करें"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR बंद करें"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"कार्यवाही"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"रात"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"सूर्यास्त"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 873cf2f..22b5759 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatski"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"VDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"VDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Uključi VDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Isključi VDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Uključi VDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Isključi VDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Radnja"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noć"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zalazak sunca"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 736eedd..0384019 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ bekapcsolása"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ kikapcsolása"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR bekapcsolása"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR kikapcsolása"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Mozgásban"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Éjszaka"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Napnyugta"</string>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 2761a75..0e4f67b 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Միացնել HDR+ը"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Անջատել HDR+ը"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Միացնել HDR-ը"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Անջատել HDR-ը"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Գործողություն"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Գիշերային"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Մայրամուտ"</string>
@@ -281,7 +277,7 @@
     <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_prompt" msgid="5104210757873140169">"Ձեր լուսանկարներում և տեսանյութերում նշեք, թե որտեղ են դրանք կատարվել:\n\nԱյլ ծրագրերը կարող են օգտվել այդ տեղեկատվությունից՝ ձեր պահած նկարների հետ միասին:"</string>
+    <string name="remember_location_prompt" msgid="5104210757873140169">"Լուսանկարներում և տեսանյութերում նշել, թե որտեղ են դրանք արվել:\n\nԱյլ ծրագրեր կարող են օգտվել այդ տեղեկատվությունից՝ ձեր պահած նկարների հետ մեկտեղ:"</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>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 625bced..b426249 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Otomatis"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Aktifkan HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Nonaktifkan HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Aktifkan HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Nonaktifkan HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tindakan"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Malam"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Terbenam"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9d04cb7..b5dcf63 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Attiva HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Disattiva HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Attiva HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Disattiva HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Azione"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Notte"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Tramonto"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index df4cabe..27601f1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"הפעל HDR+‎"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"כבה HDR+‎"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"הפעל HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"כבה HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"פעולה"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"לילה"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"שקיעה"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cd1dd5c..761a48b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+をONにする"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+をOFFにする"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDRをONにする"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDRをOFFにする"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"スポーツ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"夕焼け"</string>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2b87a26..8722085 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+\'ის ჩართვა"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+\'ის გამორთვა"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR-ის ჩართვა"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR-ის გამორთვა"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"მოქმედება"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ღამე"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"მზის ჩასვლა"</string>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 1544fb5..e76c2c9 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"បើក HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"បិទ HDR++"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"បើក HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"បិទ HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"សកម្មភាព"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"រាត្រី"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ថ្ងៃលិច"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bffe462..c63af8f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -116,7 +116,7 @@
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"사진 크기"</string>
     <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300만 화소"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8백만 화소"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800만 화소"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500만 화소"</string>
     <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"400만 화소"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300만 화소"</string>
@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ 켜기"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ 끄기"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR 켜기"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR 끄기"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"액션"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"밤"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"일몰"</string>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index dc6d71e..6225075 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"ເປີດໂໝດ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"ປິດໂໝດ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"ເປີດໂໝດ HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"ປິດໂໝດ HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"ແອັກຊັນ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ຕອນຄ່ຳ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ຕາເວັນຕົກ"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 27ff4b0..1f45d26 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Įjungti HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Išjungti HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Įjungti HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Išjungti HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Veiksmas"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Naktis"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Saulėlydis"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dfeaf77..ebe4801 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"Augsts din.diap."</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ieslēgt HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Izslēgt HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ieslēgt HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Izslēgt HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Kustība"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nakts"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Saulriets"</string>

diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index e2bf7b3..bf0df9d 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ асаах"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ унтраах"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR-г асаах"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR-г унтраах"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Үйлдэл"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Шөнө"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Нар жаргах"</string>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 8d27063..ce35304 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Hidupkan HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Matikan HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Hidupkan HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Matikan HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tindakan"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Malam"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Senja"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d5760e3..eb8c0d0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Slå på HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Slå av HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Slå på HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Slå av HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Solnedgang"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d8133c9..1c886db 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ inschakelen"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ uitschakelen"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR inschakelen"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR uitschakelen"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Actie"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nacht"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zonsondergang"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4d8a334..dfa2353 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Włącz HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Wyłącz HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Włącz HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Wyłącz HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akcja"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zachód słońca"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 368fb92..73ead39 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ativar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desativar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ativar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desativar 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Pôr do sol"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 14cf429..b972942 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ativar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desativar HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ativar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desativar 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Pôr do sol"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0341ea7..c11fef4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automat"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activați HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Dezactivați HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activați HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Dezactivați 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Apus de soare"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3c854c9..fa18753 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Включить HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Отключить HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Включить HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Отключить HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"В движении"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ночная съемка"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Закат"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 77dd57a..b81cf02 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaticky"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Zapnúť HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Vypnúť HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Zapnúť HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Vypnúť HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akcia"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Západ slnka"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f7b6956..4881384 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Samodejno"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Vklop načina HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Izklop načina HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Vklop načina HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Izklop načina 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sončni zahod"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e395a79..5553bbd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Укључи HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Искључи HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Укључи HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Искључи HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Радња"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ноћ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Залазак сунца"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 505bdca..b4cf2d7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Aktivera HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Inaktivera HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Aktivera HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Inaktivera 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Solnedgång"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index dc0298f..5d715ba 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Kiotomatiki"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Washa HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Zima HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Washa HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Zima HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Kitendo"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Usiku"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Machweo"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d44e010..49cc1b2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"เปิด HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"ปิด HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"เปิด HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"ปิด HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"การทำงาน"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"กลางคืน"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ดวงอาทิตย์ตก"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 951fe89..6789ac0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"I-on ang HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"I-off ang HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"I-on ang HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"I-off ang HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Aksyon"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gabi"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Takipsilim"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3cae7f0..1597fd5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Otomatik"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+\'yı Aç"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+\'yı Kapat"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR\'yi Aç"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR\'yi Kapat"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Hareket"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gece"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Gün batımı"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index af2cd5e..c4a6bdf 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Увімкнути режим HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Вимкнути режим HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Увімкнути режим HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Вимкнути режим HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Під час руху"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ніч"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Захід сонця"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index bae2594..b5b72da 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -157,14 +157,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Tự động"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Bật HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Tắt HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Bật HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Tắt 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Hoàng hôn"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 54a6148..136e579 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"开启 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"关闭 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"开启 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"关闭 HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"运动"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜间"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"日落"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 36fdeda..9e58a1b 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"高動態範圍"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"開啟 HDR+ (高動態範圍)"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"關閉 HDR+ (高動態範圍)"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"開啟 HDR (高動態範圍)"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"關閉 HDR (高動態範圍)"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"日落"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dd17bcd..77d1ca7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"高動態範圍"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"開啟 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"關閉 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"開啟 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"關閉 HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"黃昏"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1d7edaf..999bc0b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -157,14 +157,10 @@
     <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_hdr" msgid="3098836808080630955">"I-HDR"</string>
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_on (4762986338359862238) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_plus_off (8027383906480914303) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_on (8567522693524539332) -->
-    <skip />
-    <!-- no translation found for pref_camera_scenemode_entry_turn_hdr_off (1121637502250585531) -->
-    <skip />
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Vula i-HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Vala i-HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Vula i-HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Vala 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>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Ukushona kwelanga"</string>

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e9ca280..aeca3dd 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java

@@ -101,6 +101,7 @@
     private static final int CAMERA_OPEN_DONE = 8;
     private static final int OPEN_CAMERA_FAIL = 9;
     private static final int CAMERA_DISABLED = 10;
+    private static final int SWITCH_TO_GCAM_MODULE = 11;
 
     // The subset of parameters we need to update in setCameraParameters().
     private static final int UPDATE_PARAM_INITIALIZE = 1;
@@ -340,6 +341,10 @@
                             R.string.camera_disabled);
                     break;
                 }
+
+                case SWITCH_TO_GCAM_MODULE: {
+                    mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX);
+                }
             }
         }
     }
@@ -1743,7 +1748,7 @@
 
         // Switch to gcam module if HDR+ was selected
         if (doModeSwitch && !mIsImageCaptureIntent) {
-            mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX);
+            mHandler.sendEmptyMessage(SWITCH_TO_GCAM_MODULE);
         }
     }
 

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 4f66a18..cd3b9a5 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java

@@ -613,6 +613,9 @@
     }
 
     public boolean collapseCameraControls() {
+        // TODO: Mode switcher should behave like a popup and should hide itself when there
+        // is a touch outside of it.
+        mSwitcher.closePopup();
         // Remove all the popups/dialog boxes
         boolean ret = false;
         if (mPopup != null) {
@@ -847,6 +850,7 @@
 
     @Override
     public void onDisplayChanged() {
+        Log.d(TAG, "Device flip detected.");
         mCameraControls.checkLayoutFlip();
         mController.updateCameraOrientation();
     }

diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 074f80b..564dd5d 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java

@@ -2695,7 +2695,11 @@
 
         @Override
         public boolean onScroll(float x, float y, float dx, float dy) {
-            if (mViewItem[mCurrentItem] == null) {
+            ViewItem currItem = mViewItem[mCurrentItem];
+            if (currItem == null) {
+                return false;
+            }
+            if (!mDataAdapter.canSwipeInFullScreen(currItem.getId())) {
                 return false;
             }
             // When image is zoomed in to be bigger than the screen
@@ -2760,6 +2764,9 @@
             if (currItem == null) {
                 return false;
             }
+            if (!mDataAdapter.canSwipeInFullScreen(currItem.getId())) {
+                return false;
+            }
             if (mController.isZoomStarted()) {
                 // Fling within the zoomed image
                 mController.flingInsideZoomView(velocityX, velocityY);

diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 666fa13..3967f79 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java

@@ -905,6 +905,7 @@
     }
 
     public void setFocus(int x, int y) {
+        mOverlay.removeCallbacks(mDisappear);
         mFocusX = x;
         mFocusY = y;
         setCircle(mFocusX, mFocusY);

diff --git a/src/com/android/camera/ui/RotatableLayout.java b/src/com/android/camera/ui/RotatableLayout.java
index 04c3633..6867e6a 100644
--- a/src/com/android/camera/ui/RotatableLayout.java
+++ b/src/com/android/camera/ui/RotatableLayout.java

@@ -19,11 +19,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.graphics.Point;
 import android.util.AttributeSet;
-import android.view.Display;
 import android.view.Gravity;
-import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -73,14 +70,16 @@
         // we need to rotate the view if necessary. After that, onConfigurationChanged
         // call will track all the subsequent device rotation.
         if (mPrevRotation == UNKOWN_ORIENTATION) {
-            calculateDefaultOrientation();
+            mIsDefaultToPortrait = CameraUtil.isDefaultToPortrait((Activity) getContext());
             if (mIsDefaultToPortrait) {
                 // Natural orientation for tablet is landscape
                 mPrevRotation =  mInitialOrientation == Configuration.ORIENTATION_PORTRAIT ?
                         0 : 90;
             } else {
+                // When tablet orientation is 0 or 270 (i.e. getUnifiedOrientation
+                // = 0 or 90), we load the layout resource without any rotation.
                 mPrevRotation =  mInitialOrientation == Configuration.ORIENTATION_LANDSCAPE ?
-                        0 : 90;
+                        0 : 270;
             }
 
             // check if there is any rotation before the view is attached to window
@@ -88,22 +87,6 @@
         }
     }
 
-    private void calculateDefaultOrientation() {
-        Display currentDisplay = getDisplay();
-        Point displaySize = new Point();
-        currentDisplay.getSize(displaySize);
-        int orientation = currentDisplay.getRotation();
-        int naturalWidth, naturalHeight;
-        if (orientation == Surface.ROTATION_0 || orientation == Surface.ROTATION_180) {
-            naturalWidth = displaySize.x;
-            naturalHeight = displaySize.y;
-        } else {
-            naturalWidth = displaySize.y;
-            naturalHeight = displaySize.x;
-        }
-        mIsDefaultToPortrait = naturalWidth < naturalHeight;
-    }
-
     private void rotateIfNeeded() {
         if (mPrevRotation == UNKOWN_ORIENTATION) {
             return;

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 458ae04..eff0c40 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java

@@ -43,6 +43,7 @@
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Display;
 import android.view.OrientationEventListener;
 import android.view.Surface;
 import android.view.View;
@@ -411,6 +412,28 @@
         return 0;
     }
 
+    /**
+     * Calculate the default orientation of the device based on the width and
+     * height of the display when rotation = 0 (i.e. natural width and height)
+     * @param activity the activity context
+     * @return whether the default orientation of the device is portrait
+     */
+    public static boolean isDefaultToPortrait(Activity activity) {
+        Display currentDisplay = activity.getWindowManager().getDefaultDisplay();
+        Point displaySize = new Point();
+        currentDisplay.getSize(displaySize);
+        int orientation = currentDisplay.getRotation();
+        int naturalWidth, naturalHeight;
+        if (orientation == Surface.ROTATION_0 || orientation == Surface.ROTATION_180) {
+            naturalWidth = displaySize.x;
+            naturalHeight = displaySize.y;
+        } else {
+            naturalWidth = displaySize.y;
+            naturalHeight = displaySize.x;
+        }
+        return naturalWidth < naturalHeight;
+    }
+
     public static int getDisplayOrientation(int degrees, int cameraId) {
         // See android.hardware.Camera.setDisplayOrientation for
         // documentation.
commit	8470cae9049959ee6bb28cde1c53185f2ffd10a1	[log] [tgz]
author	Doris Liu <tianliu@google.com>	Thu Oct 17 17:46:48 2013 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Oct 17 17:46:48 2013 +0000
tree	4d59a5eff928fa20c58f9297971546a9f391c68a
parent	f149ec53a0fa3330617ce01751964662d3273c88 [diff]
parent	3a45c33d74fe0ad0ade9be3d037560a53891c627 [diff]