Enable the on-screen settings in Camcorder and also use different settings

in Camera and Camcorder.

Change-Id: I2444a2c8f7a040b2b5fc449df0fc988fba1b7aaf

23 files changed, 75 insertions, 120 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 16b6002..d960cd3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Tapeta"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Obecné nastavení"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Nastavení prezentace"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Obecné nastavení"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Zobrazovaná velikost"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Vyberte zobrazovanou velikost obrázků a videí"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Velikost fotografií"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Zobrazit fotografie v náhodném pořadí"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"K fotografiím ukládat místo pořízení"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"V údajích o fotografii zaznamenat místo pořízení"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Nastavení videa"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Kvalita videa"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Nízká (pro zprávy MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Vysoká (pro kartu SD)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 min"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 min"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Délka videa"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Nastavení fotografií"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9a2ecfe..6886848 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Tapet"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Generelle indstillinger"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Diasshowindstillinger"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Generelle indstillinger"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Visningsstørrelse"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Vælg, hvilken størrelse billeder og videoer skal vises i"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Billedstørrelse"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Vis billeder i tilfældig rækkefølge"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Gem plac. i billeder"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Registrer placering i billeddata"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Videoindstillinger"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videokvalitet"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Lav (til MMS-beskeder)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Høj (til SD-kort)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutter"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutter"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Varighed på video"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Billedindstillinger"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3ff0a13..cab587a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Hintergrund"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Allgemeine Einstellungen"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Einstellungen für Diashow"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Allgemeine Einstellungen"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Anzeigegröße"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Anzeigegröße für Bilder und Videos auswählen"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Bildgröße"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Bilder in zufälliger Reihenfolge anzeigen"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Aufnahmeort speichern"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Aufnahmeort in Bilddaten speichern"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Videoeinstellungen"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videoqualität"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Niedrig (für MMS-Mitteilungen)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Hoch (für SD-Karte)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 Minuten"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 Minuten"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Videodauer"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Bildeinstellungen"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 050e9d2..cd9b3b1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Ταπετσαρία"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Γενικές ρυθμίσεις"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Ρυθμίσεις προβολής διαφανειών (slideshow)"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Γενικές ρυθμίσεις"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Μέγεθος προβολής"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Επιλέξτε το μέγεθος προβολής των εικόνων και των βίντεο"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Μέγεθος εικόνας"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Εμφάνιση εικόνων με τυχαία σειρά"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Αποθήκευση τοποθεσίας στις εικόνες"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Εγγραφή τοποθεσίας στα δεδομένα εικόνας"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Ρυθμίσεις βίντεο"</string>
     <!-- no translation found for pref_camera_videoquality_title (4127153321803677407) -->
     <skip />
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Χαμηλή (για μηνύματα MMS)"</string>
@@ -135,7 +133,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 λεπτά"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 λεπτά"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Διάρκεια βίντεο"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Ρυθμίσεις εικόνας"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index aeac4bc..a07eed4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Papel tapiz"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Configuración general"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Conf. present. de diapositivas"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Configuración general"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Visualizar tamaño"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Seleccionar el tamaño de visualización de imágenes y videos"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Tamaño de imagen"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostrar imágenes en orden aleatorio"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Almac. ubic. en imág."</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Grabar la ubicación en los datos de la imagen"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Configuración de video"</string>
     <!-- no translation found for pref_camera_videoquality_title (4127153321803677407) -->
     <skip />
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Bajo (para mensajes MMS)"</string>
@@ -135,7 +133,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Duración del video"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Configuración de imágenes"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index edbd0a4..e4aa1db 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Fondo de pantalla"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Configuración general"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Configuración de presentación"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Configuración general"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Tamaño de visualización"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Seleccionar el tamaño de visualización de imágenes y vídeos"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Tamaño de imagen"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostrar imágenes en orden aleatorio"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Almacenar en imágenes"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Registrar ubicación en datos de imagen"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Configuración de vídeo"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Calidad de vídeo"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Baja (para mensajes MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (para tarjeta SD)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Duración de vídeo"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Configuración de imagen"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 251ea60..153f7e1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Fond d\'écran"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Paramètres généraux"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Paramètres du diaporama"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Paramètres généraux"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Taille d\'affichage"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Sélectionner la taille d\'affichage des images et des vidéos"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Taille de l\'image"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Afficher les images"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Enregistrer le lieu"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Enregistrer la position géographique dans les données d\'image"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Paramètres vidéo"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualité vidéo"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Basse (MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Haute (carte SD)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutes"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutes"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Durée de la vidéo"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Paramètres d\'image"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4722dc4..204f2f3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Sfondo"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Impostazioni generali"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Impostazioni presentazione"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Impostazioni generali"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Dimensioni schermo"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Seleziona dimensioni di visualizz. di foto e video"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Dimensioni foto"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostra le foto in ordine casuale"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Salva località nelle foto"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Registra località nei dati della foto"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Impostazioni video"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualità video"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Bassa (per MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (per scheda SD)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minuti"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minuti"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Durata video"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Impostazioni foto"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6c46ed0..2b21bf0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"壁紙"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"全般設定"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"スライドショー設定"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"全般設定"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"表示サイズ"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"画像や動画の表示サイズ"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"表示サイズ"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"ランダムに表示する"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"位置情報を写真に記録する"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"位置情報を写真データに記録する"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"動画設定"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"動画のクオリティ"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"低（メール添付向け）"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"高 (SDカード向け)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10分"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30分"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"動画の再生時間"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"写真設定"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1727594..0f3746e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"배경화면"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"일반 설정"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"슬라이드쇼 설정"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"일반 설정"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"디스플레이 크기"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"사진 및 동영상 표시 크기 선택"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"사진 크기"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"무작위로 사진 표시"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"사진에 위치 저장"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"사진 데이터에 위치 기록"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"동영상 설정"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"동영상 화질"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"저화질(MMS 메시지용)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"높음(SD 카드용)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10분"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30분"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"동영상 길이"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"사진 설정"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M(2592x1936)"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a5acb63..1afabbd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Bakgrunnsbilde"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Generelle innstillinger"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Innstillinger for lysbildevisning"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Generelle innstillinger"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Bildestørrelse"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Velg hvor stort bilder skal vises"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Bildestørrelse"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Vis bilder i tilfeldig rekkefølge"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Lagre sted i bilder"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Lagre sted i bildedata"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Videoinnstillinger"</string>
     <!-- no translation found for pref_camera_videoquality_title (4127153321803677407) -->
     <skip />
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Lav (for MMS-meldinger)"</string>
@@ -135,7 +133,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutter"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutter"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Videolengde"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Bildeinnstillinger"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0df7f0d..e40ba74 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Achtergrond"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Algemene instellingen"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Instellingen van diavoorstelling"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Algemene instellingen"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Weergavegrootte"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"De weergavegrootte van foto\'s en video\'s selecteren"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Grootte van foto"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Foto\'s in willekeurige volgorde weergeven"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Locatie opslaan in foto\'s"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Locatie vastleggen in de gegevens van de foto"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Video-instellingen"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videokwaliteit"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Laag (voor MMS-berichten)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Hoog (voor SD-kaart)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minuten"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minuten"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Duur van video"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Foto-instellingen"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6a89292..002f68e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Tapeta"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Ustawienia ogólne"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Ustawienia pokazu slajdów"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Ustawienia ogólne"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Rozmiar zdjęć i filmów"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Ustaw wyświetlany rozmiar zdjęć i filmów"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Rozmiar"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Wyświetlaj zdjęcia w kolejności losowej"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Lokalizacja w zdjęciach"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Zapisz lokalizację w danych zdjęcia"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Ustawienia wideo"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Jakość wideo"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Niska (dla wiadomości MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Wysoka (dla karty SD)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minut"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minut"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Czas trwania filmu wideo"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Ustawienia zdjęcia"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 94499cf..382b206 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Imagem de fundo"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Definições gerais"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Definições da apresentação de diapositivos"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Definições gerais"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Tamanho da visualização"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Seleccione o tamanho da apresentação de imagens e vídeo"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Tamanho da imagem"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostrar imagens por ordem aleatória"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Armazenar localização nas imagens"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Gravar localização nos dados da imagem"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Definições de vídeo"</string>
     <!-- no translation found for pref_camera_videoquality_title (4127153321803677407) -->
     <skip />
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Baixa (para mensagens MMS)"</string>
@@ -135,7 +133,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Duração do vídeo"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Definições da imagem"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 30b282b..45fd67c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Papel de parede"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Configurações gerais"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Configurações da apresentação de slides"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Configurações gerais"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Tamanho da exibição"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Selecione o tamanho de exibição das imagens e vídeos"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Tamanho da imagem"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostrar imagens em ordem aleatória"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Armazenar o local nas imagens"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Gravar o local nos dados da imagem"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Configurações de vídeo"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualidade do vídeo"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Baixa (para mensagens MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (para cartão SD)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Duração do vídeo"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Configurações de imagem"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592 x 1936)"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 614eb8c..8554a5b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Обои"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Общие настройки"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Настройки слайд-шоу"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Общие настройки"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Отображаемый размер"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Выбор отображаемого размера изображений и видео"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Размер картинки"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Показ фотографий в случайном порядке"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Сохранять местоположение"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Записывать местоположение в данных фотографии"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Настройки видео"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Качество видео"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Низкое (для сообщений MMS)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Высокое (для SD-карты)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 минут"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 минут"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Длительность видео"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Настройки фотографий"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592 x 1936)"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 730ff58..e071520 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Bakgrund"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Allmänna inställningar"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Bildspelsinställningar"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Allmänna inställningar"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Visningsstorlek"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Välj visningsstorlek för bilder och videor"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Bildstorlek"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Visa bilder i slumpmässig ordning"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Spara plats i bilder"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Registrera plats i bilddata"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Videoinställningar"</string>
     <!-- no translation found for pref_camera_videoquality_title (4127153321803677407) -->
     <skip />
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Låg (för MMS)"</string>
@@ -135,7 +133,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minuter"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minuter"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Videons längd"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Bildinställningar"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e106dba..1a26bda 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Duvar Kağıdı"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Genel ayarlar"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Slayt gösterisi ayarları"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"Genel ayarlar"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Görüntü boyutu"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"Resimlerin ve videoların görüntülenme boyutunu seçin"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Resim boyutu"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Resimleri rasgele sırada göster"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Resimlerde konumu depola"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Konumu resim verilerinde kaydet"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"Video ayarları"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Video kalitesi"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Düşük (MMS mesajları için)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Yüksek (SD kart için)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 dakika"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 dakika"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"Video süresi"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"Resim ayarları"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5M (2592x1936)"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a63bb05..191ff3c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"壁纸"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"常规设置"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"幻灯片设置"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"常规设置"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"显示大小"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"选择图片和视频的显示大小"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"图片大小"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"以随机顺序显示图片"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"在照片中存储位置"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"在照片数据中记录位置"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"视频设置"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"视频质量"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"低（对于彩信）"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"高（对于 SD 卡）"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 分钟"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 分钟"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"视频长度"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"照片设置"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <string name="pref_camera_picturesize_entry_2592x1936" msgid="2293389043895753549">"5 百万 (2592x1936)"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6ea785f..1f9cad7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -84,7 +84,6 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"桌布"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"一般設定"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"投影片設定"</string>
-    <string name="pref_camera_general_settings_category" msgid="2135384248699549300">"一般設定"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"顯示大小"</string>
     <string name="pref_gallery_size_summary" msgid="8179967445295243638">"選取相片和影片的顯示大小"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"相片大小"</string>
@@ -122,7 +121,6 @@
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"隨機顯示相片"</string>
     <string name="pref_camera_recordlocation_title" msgid="273727672426306702">"在相片儲存位置資訊"</string>
     <string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"在相片中記錄位置資訊"</string>
-    <string name="pref_camera_video_settings_category" msgid="5788821601203523037">"影片設定"</string>
     <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"影片品質"</string>
     <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"低 (適用於多媒體簡訊)"</string>
     <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"高 (適用於 SD 卡)"</string>
@@ -134,7 +132,6 @@
     <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 分鐘"</string>
     <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 分鐘"</string>
     <string name="pref_camera_video_duration_dialogtitle" msgid="5762031980003877975">"影片長度"</string>
-    <string name="pref_camera_picture_settings_category" msgid="1513001949820030759">"相片設定"</string>
     <!-- no translation found for pref_camera_picturesize_title (4333724936665883006) -->
     <skip />
     <!-- no translation found for pref_camera_picturesize_entry_2592x1936 (2293389043895753549) -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 96f1e7a..221e51a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -210,7 +210,6 @@
 
     <!-- Settings screen, section heading  -->
     <string name="pref_slideshow_category">Slideshow settings</string>
-    <string name="pref_camera_general_settings_category">General settings</string>
 
     <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_size_title">Display size</string>
@@ -322,9 +321,6 @@
     <!-- Settings screen, setting summary text -->
     <string name="pref_camera_recordlocation_summary">Record location in picture data</string>
 
-    <!-- Settings screen, Video setting category title -->
-    <string name="pref_camera_video_settings_category">Video settings</string>
-
     <!-- Default video quality setting. A numerical value. -->
     <string name="pref_camera_videoquality_default" translatable="false">1</string>
 
@@ -354,8 +350,11 @@
     <!-- Settings screen, Video duration dialog title -->
     <string name="pref_camera_video_duration_dialogtitle">Video duration</string>
 
-    <!-- Settings screen, Picture setting category title -->
-    <string name="pref_camera_picture_settings_category">Picture settings</string>
+    <!-- Settings screen, Camera setting category title -->
+    <string name="pref_camera_settings_category">Camera settings</string>
+
+    <!-- Settings screen, Camcorder setting category title -->
+    <string name="pref_camcorder_settings_category">Camcorder settings</string>
 
     <!-- Default picture size setting. -->
     <string name="pref_camera_picturesize_default" translatable="false">2048x1536</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 2dd4ff3..92ade83 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -14,42 +14,35 @@
      limitations under the License.
 -->
 
-<!-- This is a primitive example showing the different types of preferences available. -->
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory
-      android:title="@string/pref_camera_general_settings_category">
-
+            android:title="@string/pref_camera_settings_category">
         <CheckBoxPreference
                 android:key="pref_camera_recordlocation_key"
                 android:title="@string/pref_camera_recordlocation_title"
                 android:summary="@string/pref_camera_recordlocation_summary"
                 android:defaultValue="false"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-      android:title="@string/pref_camera_video_settings_category">
-        <!-- android:summary is filled in by CameraSettings -->
         <ListPreference
-                android:key="pref_camera_videoquality_key"
-                android:defaultValue="@string/pref_camera_videoquality_default"
-                android:title="@string/pref_camera_videoquality_title"
-                android:entries="@array/pref_camera_videoquality_entries"
-                android:entryValues="@array/pref_camera_videoquality_entryvalues"
-                android:dialogTitle="@string/pref_camera_videoquality_dialogtitle" />
+                android:key="pref_camera_scenemode_key"
+                android:defaultValue="@string/pref_camera_scenemode_default"
+                android:title="@string/pref_camera_scenemode_title"
+                android:entries="@array/pref_camera_scenemode_entries"
+                android:entryValues="@array/pref_camera_scenemode_entryvalues"
+                android:dialogTitle="@string/pref_camera_scenemode_dialogtitle" />
         <ListPreference
-                android:key="pref_camera_video_duration_key"
-                android:defaultValue="@string/pref_camera_video_duration_default"
-                android:title="@string/pref_camera_video_duration_title"
-                android:entries="@array/pref_camera_video_duration_entries"
-                android:entryValues="@array/pref_camera_video_duration_entryvalues"
-                android:dialogTitle="@string/pref_camera_video_duration_dialogtitle" />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-      android:title="@string/pref_camera_picture_settings_category">
-        <!-- summary, entries, entryValues are filled in by CameraSettings -->
+                android:key="pref_camera_whitebalance_key"
+                android:defaultValue="@string/pref_camera_whitebalance_default"
+                android:title="@string/pref_camera_whitebalance_title"
+                android:entries="@array/pref_camera_whitebalance_entries"
+                android:entryValues="@array/pref_camera_whitebalance_entryvalues"
+                android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" />
+        <ListPreference
+                android:key="pref_camera_coloreffect_key"
+                android:defaultValue="@string/pref_camera_coloreffect_default"
+                android:title="@string/pref_camera_coloreffect_title"
+                android:entries="@array/pref_camera_coloreffect_entries"
+                android:entryValues="@array/pref_camera_coloreffect_entryvalues"
+                android:dialogTitle="@string/pref_camera_coloreffect_dialogtitle" />
         <ListPreference
                 android:key="pref_camera_picturesize_key"
                 android:defaultValue="@string/pref_camera_picturesize_default"
@@ -57,7 +50,6 @@
                 android:entries="@array/pref_camera_picturesize_entries"
                 android:entryValues="@array/pref_camera_picturesize_entryvalues"
                 android:dialogTitle="@string/pref_camera_picturesize_dialogtitle" />
-
         <ListPreference
                 android:key="pref_camera_jpegquality_key"
                 android:defaultValue="@string/pref_camera_jpegquality_default"
@@ -65,7 +57,6 @@
                 android:entries="@array/pref_camera_jpegquality_entries"
                 android:entryValues="@array/pref_camera_jpegquality_entryvalues"
                 android:dialogTitle="@string/pref_camera_jpegquality_dialogtitle" />
-
         <ListPreference
                 android:key="pref_camera_focusmode_key"
                 android:defaultValue="@string/pref_camera_focusmode_default"
@@ -73,29 +64,5 @@
                 android:entries="@array/pref_camera_focusmode_entries"
                 android:entryValues="@array/pref_camera_focusmode_entryvalues"
                 android:dialogTitle="@string/pref_camera_focusmode_dialogtitle" />
-
-        <ListPreference
-                android:key="pref_camera_whitebalance_key"
-                android:defaultValue="@string/pref_camera_whitebalance_default"
-                android:title="@string/pref_camera_whitebalance_title"
-                android:entries="@array/pref_camera_whitebalance_entries"
-                android:entryValues="@array/pref_camera_whitebalance_entryvalues"
-                android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" />
-
-        <ListPreference
-                android:key="pref_camera_coloreffect_key"
-                android:defaultValue="@string/pref_camera_coloreffect_default"
-                android:title="@string/pref_camera_coloreffect_title"
-                android:entries="@array/pref_camera_coloreffect_entries"
-                android:entryValues="@array/pref_camera_coloreffect_entryvalues"
-                android:dialogTitle="@string/pref_camera_coloreffect_dialogtitle" />
-
-        <ListPreference
-                android:key="pref_camera_scenemode_key"
-                android:defaultValue="@string/pref_camera_scenemode_default"
-                android:title="@string/pref_camera_scenemode_title"
-                android:entries="@array/pref_camera_scenemode_entries"
-                android:entryValues="@array/pref_camera_scenemode_entryvalues"
-                android:dialogTitle="@string/pref_camera_scenemode_dialogtitle" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
new file mode 100644
index 0000000..3617f79
--- /dev/null
+++ b/res/xml/video_preferences.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+            android:title="@string/pref_camcorder_settings_category">
+        <ListPreference
+                android:key="pref_camera_videoquality_key"
+                android:defaultValue="@string/pref_camera_videoquality_default"
+                android:title="@string/pref_camera_videoquality_title"
+                android:entries="@array/pref_camera_videoquality_entries"
+                android:entryValues="@array/pref_camera_videoquality_entryvalues"
+                android:dialogTitle="@string/pref_camera_videoquality_dialogtitle" />
+        <ListPreference
+                android:key="pref_camera_video_duration_key"
+                android:defaultValue="@string/pref_camera_video_duration_default"
+                android:title="@string/pref_camera_video_duration_title"
+                android:entries="@array/pref_camera_video_duration_entries"
+                android:entryValues="@array/pref_camera_video_duration_entryvalues"
+                android:dialogTitle="@string/pref_camera_video_duration_dialogtitle" />
+        <ListPreference
+                android:key="pref_camera_whitebalance_key"
+                android:defaultValue="@string/pref_camera_whitebalance_default"
+                android:title="@string/pref_camera_whitebalance_title"
+                android:entries="@array/pref_camera_whitebalance_entries"
+                android:entryValues="@array/pref_camera_whitebalance_entryvalues"
+                android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" />
+        <ListPreference
+                android:key="pref_camera_coloreffect_key"
+                android:defaultValue="@string/pref_camera_coloreffect_default"
+                android:title="@string/pref_camera_coloreffect_title"
+                android:entries="@array/pref_camera_coloreffect_entries"
+                android:entryValues="@array/pref_camera_coloreffect_entryvalues"
+                android:dialogTitle="@string/pref_camera_coloreffect_dialogtitle" />
+    </PreferenceCategory>
+</PreferenceScreen>