Import revised translations

Change-Id: I4f6e08eb39c31df83d75009f92acfb8e85047c99

20 files changed, 500 insertions, 280 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ba09032..fcaa8a0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Chyba fotoaparátu"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Chyba fotoaparátu"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Nelze se připojit k fotoaparátu."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparát"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Smazat"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Fotografie bude smazána."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Video bude smazáno."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Obnovit nastavení"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Fotoaparát bude nastaven na výchozí hodnoty."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Obnovit výchozí nastavení"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Bude obnoveno výchozí nastavení fotoaparátu."</string>
     <string name="review_play" msgid="6015456244323302817">"PŘEHRÁT"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ZRUŠIT"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Úložiště"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Vypnuto"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Zapnout"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Kvalita videa"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Vysoká (30m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Nízká (30m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Nízká, 30s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Vysoká, 10m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavení fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavení videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost fotografií"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Voda"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastelové barvy"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaika"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Červený nádech"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Modrý nádech"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Zelený nádech"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Červený nádech"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Modrý nádech"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Zelený nádech"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scénický režim"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automaticky"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Akce"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portrét"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Na šířku"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Portrét v noci"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Noční portrét"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Divadlo"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Pláž"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Sníh"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Západ slunce"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Stabilní fotografie"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Nehybná fotografie"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Ohňostroj"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Okamžitý záznam"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Okamžitý záznam"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Zapnout"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Vypnout"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Obnovit nastavení"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Obnovit výchozí hodnoty nastavení fotoaparátu"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Nastavení fotoaparátu"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Obnovit výchozí nastavení"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Expozice"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Kompoziční mřížka"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Zapnout"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Vypnout"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Tento obrázek neobsahuje žádné informace o poloze."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Podrobnosti"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Velikost souboru:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Rozlišení:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Výrobce:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Model:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Vyvážení bílé:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Vyvážení bílé:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Zeměpisná šířka GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Zeměpisná délka GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Poloha:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Sdílet video pomocí"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Na vaší kartě SD je málo místa. Změňte nastavení kvality nebo smažte položky z Galerie."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Bylo dosaženo limitu velikosti."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Přiblížení"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Přepnout do režimu fotoaparát"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Přepnout do režimu video"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0f0612c..9b979a6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Kamerafejl"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamerafejl"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Der kan ikke oprettes forbindelse til kameraet."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Slet"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Billedet slettes."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Videoen slettes."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Gendan indstillinger"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Kameraets standardindstillinger bliver gendannet."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Gendan standarder"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Kameraets standardindstillinger bliver gendannet."</string>
     <string name="review_play" msgid="6015456244323302817">"AFSPIL"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULLER"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lagringsplacering"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Fra"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Til"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Videokvalitet"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Høj (30 m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Lav (30 m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Lav, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Høj, 10 m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Indstillinger for kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Indstillinger for videokamera"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Billedstørrelse"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Vand"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaik"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Rød farvetone"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Blå farvetone"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Grøn farvetone"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Rød farvetone"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blå farvetone"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grøn farvetone"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scenetilstand"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisk"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Handling"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portræt"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Landskab"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nat"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Natportræt"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Natportræt"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teater"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Strand"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Sne"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Roligt foto"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Roligt foto"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fyrværkeri"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Hurtig fotografering"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Hurtig fotografering"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Til"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Fra"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Gendan indstillinger"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Gendan kameraets standardindstillinger"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Indstillinger for kamera"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Gendan til standarder"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Rammegitter"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Til"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Fra"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Der findes ingen placeringsoplysninger i dette billede."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Detaljer"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Filstørrelse:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Opløsning:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Producent:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Model:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Hvidbalance:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Hvidbalance:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS breddegrad:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS længdegrad:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Placering:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Del video via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Der er snart ikke mere plads på diit SD-kort. Rediger indstillingerne for kvaliteten, eller slet elementer fra Galleriet."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Størrelsesgrænse er nået."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Skift til kamera"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Skift til video"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1839326..c88efe8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Kamerafehler"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamerafehler"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Keine Verbindung zur Kamera möglich"</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Löschen"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Das Bild wird gelöscht."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Das Video wird gelöscht."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Einstellungen wiederherstellen"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Die Kameraeinstellungen werden auf die Standardeinstellungen wiederhergestellt."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Standard wiederherstellen"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Die Kameraeinstellungen werden auf die Standardeinstellungen wiederhergestellt."</string>
     <string name="review_play" msgid="6015456244323302817">"WIEDERGEBEN"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ABBRECHEN"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Ort speichern"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Aus"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"An"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Videoqualität"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Hoch (30m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Niedrig (30m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (niedrig, 30s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (hoch, 10m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameraeinstellungen"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcordereinstellungen"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildgröße"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastell"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaik"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Rottöne"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Blautöne"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Grüntöne"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Rottöne"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blautöne"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grüntöne"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Szenenmodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Autom."</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Aktion"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portrait"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Landschaft"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nachtaufnahme"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Nachtportrait"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Nachtportrait"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Theater"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Strand"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Schnee"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonnenuntergang"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Stabilisierung"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stabilisierung"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Feuerwerk"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Quick Capture"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Quick Capture"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Ein"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Aus"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Einstellungen wiederherstellen"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Kameraeinstellungen auf Standard wiederherstellen"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Kameraeinstellungen"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Standard wiederherstellen"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Belichtung"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Gitterlinien"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Ein"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Aus"</string>
     <string name="no_location_image" msgid="6929172123058811834">"In diesem Bild sind keine Standortinformationen enthalten."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Details"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Dateigröße:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Auflösung:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Hersteller:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modell:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Weißabgleich:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Weißabgleich:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS-Breitengrad:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS-Längengrad:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Ort:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Video weiterleiten via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Auf Ihrer SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Ändern Sie die Qualitätseinstellung oder löschen Sie Elemente aus der Galerie."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale Größe erreicht"</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Zu Kamera wechseln"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Zu Video wechseln"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2eb46c2..6e37ade 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Σφάλμα φωτογραφικής μηχανής"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Σφάλμα φωτογραφικής μηχανής"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Δεν είναι δυνατή η σύνδεση με τη φωτογραφική μηχανή."</string>
     <string name="camera_label" msgid="6346560772074764302">"Φωτογ.μηχανή"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Βιντεοκάμ."</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Διαγραφή"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Η εικόνα θα διαγραφεί."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Το βίντεο θα διαγραφεί."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Επαναφορά ρυθμίσεων"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Οι ρυθμίσεις της φωτογραφικής μηχανής θα επανέλθουν στις προεπιλεγμένες."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Επαναφορά προεπιλογών"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Οι ρυθμίσεις της φωτογραφικής μηχανής θα επανέλθουν στις προεπιλογές."</string>
     <string name="review_play" msgid="6015456244323302817">"ΑΝΑΠΑΡΑΓΩΓΗ"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ΑΚΥΡΩΣΗ"</string>
     <string name="review_ok" msgid="5305096180300056529">"ΟΚ"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Αποθήκευση τοποθεσίας"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Ενεργοποιημένο"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Ποιότητα βίντεο"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Υψηλή (30m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Χαμηλή (30m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Χαμηλή, 30s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Υψηλή, 10m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ρυθμίσεις βιντεοκάμερας"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Μέγεθος εικόνας"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Γαλάζιο"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Παστέλ"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Μωσαϊκό"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Κόκκινη απόχρωση"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Μπλε απόχρωση"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Πράσινη απόχρωση"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Κόκκινη απόχρωση"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Μπλε απόχρωση"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Πράσινη απόχρωση"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Λειτουργία σκηνής"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Αυτόματο"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Ενέργεια"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Πορτραίτο"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Τοπίο"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Νύχτα"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Νυχτερινό πορτραίτο"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Νυχτερινό πορτραίτο"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Θέατρο"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Παραλία"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Χιόνι"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ηλιοβασίλεμα"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Σταθερή φωτογραφία"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Σταθερή φωτογραφία"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Πυροτεχνήματα"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Γρήγορη λήψη"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Γρήγορη λήψη"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Ενεργοποίηση"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Απενεργοποίηση"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Επαναφορά ρυθμίσεων"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Επαναφορά ρυθμίσεων φωτογραφικής μηχανής στις προεπιλεγμένες"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Επαναφορά στις προεπιλογές"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Έκθεση"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Πλέγμα γραμμών"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Ενεργοποίηση"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Απενεργοποίηση"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Δεν περιλαμβάνονται πληροφορίες τοποθεσίας σε αυτήν την εικόνα."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Λεπτομέρειες"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Μέγεθος αρχείου:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Ανάλυση:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Κατασκευαστής:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Μοντέλο:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Ισορροπία λευκού:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Ισορροπία λευκού:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Γεωγραφικό πλάτος GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Γεωγραφικό μήκος GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Τοποθεσία:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Κοινή χρήση βίντεο μέσω"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Ο διαθέσιμος χώρος στην κάρτα SD είναι ελάχιστος. Αλλάξτε τη ρύθμιση ποιότητας ή διαγράψτε στοιχεία από τη συλλογή."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Συμπληρώθηκε το όριο μεγέθους."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Εστίαση"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Αλλαγή σε λειτουργία φωτογραφικής μηχανής"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Αλλαγή σε λειτουργία βίντεο"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f6c5e87..de75a78 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Error de cámara"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Error de cámara"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"No se puede conectar a la cámara."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cámara"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Cámara de video"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Eliminar"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"La imagen se eliminará."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"El video se eliminará."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Restaurar configuración"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"La configuración de la cámara se restaurará al modo predeterminado."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar configuraciones predeterminadas"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"La configuración de la cámara se restaurará al modo predeterminado."</string>
     <string name="review_play" msgid="6015456244323302817">"REPRODUCIR"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
     <string name="review_ok" msgid="5305096180300056529">"Aceptar"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Ubicación de tienda"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Apagado"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Encendido"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad del video"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Alta (30 min.)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Baja (30 min.)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Baja, 30 seg.)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Alta, 10 min.)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aguamarina"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Tinte rojo"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Tinte azul"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Tinte verde"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tinte rojo"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tinte azul"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tinte verde"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo de preselección de escenas"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automáticamente"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Acción"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Retrato"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Horizontal"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noche"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Retrato nocturno"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Retrato nocturno"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Cine"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Playa"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Nieve"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Crepúsculo"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Foto fija"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Foto fija"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fuegos artificiales"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Captura rápida"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Encendido"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Apagado"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Restaurar configuración"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Restaurar la configuración de la cámara al modo predeterminado"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar a configuraciones predeterminadas"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Cuadrícula de encuadre"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Encendido"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Apagado"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Esta imagen no contiene información de la ubicación."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Detalles"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Tamaño de archivo:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Resolución:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Fabricante:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modelo:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Balance de blancos:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Equilibrio de blancos:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Latitud del GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Longitud del GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Ubicación:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Compartir video mediante"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Tu tarjeta SD se está quedando sin espacio. Cambia la configuración de calidad o elimina elementos de la galería."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Se alcanzó el límite del tamaño."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Ampliar"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Cambiar a cámara"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Cambiar a video"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6a5a672..a67528a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Error de la cámara"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Error de cámara"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"No se puede establecer conexión con la cámara."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cámara"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videocámara"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Suprimir"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Se eliminará la imagen."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Se eliminará el vídeo."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Restaurar configuración"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Se restaurará la configuración de cámara predeterminada."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar valores predeterminados"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Se restaurará la configuración de cámara predeterminada."</string>
     <string name="review_play" msgid="6015456244323302817">"REPRODUCIR"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
     <string name="review_ok" msgid="5305096180300056529">"Aceptar"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Almacenar ubicación"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desactivada"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activada"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad de vídeo"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Alta (30 min)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Baja (30 m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (baja, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (alta, 10 min)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Agua"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Tono rojo"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Tono azul"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Tono verde"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tono rojo"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tono azul"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tono verde"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo de escena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Acción"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Retrato"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Horizontal"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Retrato nocturno"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Retrato nocturno"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teatro"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Playa"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Nieve"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Atardecer"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Foto fija"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Foto fija"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fuegos artificiales"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Captura rápida"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Activada"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Desactivada"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Restaurar configuración"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Restaurar la configuración de cámara predeterminada"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar a los valores predeterminados"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Cuadrícula de encuadre"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Activada"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Desactivada"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Esta imagen no contiene ninguna información sobre ubicación."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Detalles"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Tamaño de archivo:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Resolución:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Fabricante:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modelo:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Balance de blancos:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Balance de blancos:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Latitud de GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Longitud de GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Ubicación:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Compartir vídeo a través de"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"No queda espacio en la tarjeta SD. Cambia la configuración de calidad o elimina elementos de la galería."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Se ha alcanzado el límite de tamaño."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Cambiar a cámara"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Cambiar a vídeo"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index db472af..bb5adeb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Erreur au niveau de l\'appareil photo"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Erreur au niveau de l\'appareil photo"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Impossible d\'établir une connexion avec l\'appareil photo."</string>
     <string name="camera_label" msgid="6346560772074764302">"Appareil photo"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Caméra"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Supprimer"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"L\'image sera supprimée."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"La vidéo va être supprimée."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Rétablir les paramètres"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Les paramètres par défaut de l\'appareil photo seront rétablis."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Rétablir les paramètres par défaut"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Les paramètres par défaut de l\'appareil photo seront rétablis."</string>
     <string name="review_play" msgid="6015456244323302817">"LIRE"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULER"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Enregistrer la position"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Désactivé"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activé"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualité vidéo"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Élevée (30 mn)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Faible (30 mn)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (faible, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (élevée, 10 mn)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres de l\'appareil photo"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille d\'image"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aquatique"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaïque"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Teinte rouge"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Teinte bleue"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Teinte verte"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Teinte rouge"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Teinte bleue"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Teinte verte"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Mode Scène"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatique"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Action"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portrait"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Paysage"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nuit"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Portrait de nuit"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Portrait de nuit"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Théâtre"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Plage"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Neige"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Coucher de soleil"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Anti-flou"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Anti-flou"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Feux d\'artifice"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Capture rapide"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Capture rapide"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Activée"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Désactivée"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Rétablir les paramètres"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Rétablissez les paramètres par défaut de l\'appareil photo."</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Paramètres de l\'appareil photo"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Rétablir les paramètres par défaut"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposition"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Grille de cadrage"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Activée"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Désactivée"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Cette image ne contient pas d\'informations de localisation."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Détails"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Taille du fichier :"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Résolution :"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Fabricant :"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modèle :"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Balance des blancs :"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Balance des blancs :"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Latitude GPS :"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Longitude GPS :"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Lieu :"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Partager la vidéo via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Votre carte SD est pleine. Modifiez le paramètre de qualité ou supprimez des éléments de la galerie."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Taille maximale atteinte."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Passer en mode appareil photo"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Passer en mode vidéo"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 188a5cf..32aedf8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Errore fotocamera"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Errore fotocamera"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Impossibile collegarsi alla fotocamera."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotocamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videocamera"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Elimina"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"La foto verrà eliminata."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Il video verrà eliminato."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Ripristina impostazioni"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Verranno ripristinate le impostazioni predefinite della fotocamera."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Ripristina predefinite"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Verranno ripristinate le impostazioni predefinite della fotocamera."</string>
     <string name="review_play" msgid="6015456244323302817">"RIPRODUCI"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULLA"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Registra località"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Non attiva"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Attiva"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualità video"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Alta (30 m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Bassa (30 m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (bassa, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (alta, 10 m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Impostazioni fotocamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Impostazioni videocamera"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensioni foto"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Acqua"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastello"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Tinta rossa"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Tinta blu"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Tinta verde"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tinta rossa"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tinta blu"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tinta verde"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modalità scena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatica"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Movimento"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Ritratto"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Paesaggio"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Notturna"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Ritratto notturno"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Ritratto notturno"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teatro"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Spiaggia"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Neve"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Tramonto"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Stabilizzazione foto"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stabilizzazione foto"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fuochi d\'artificio"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Quick Capture"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Quick Capture"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Attivo"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Non attivo"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Ripristina impostazioni"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Ripristina le impostazioni predefinite della fotocamera"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Impostazioni fotocamera"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Ripristina predefinite"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Esposizione"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Griglia di inquadratura"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Attiva"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Non attiva"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Nessuna informazione di posizione contenuta in questa immagine."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Dettagli"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Dim. file:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Risoluzione:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Produttore:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modello:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Bilanciamento bianco:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Bilanciamento del bianco:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Latitudine GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Longitudine GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Posizione:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Condividi video tramite"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Lo spazio della scheda SD si sta esaurendo. Cambia l\'impostazione di qualità o elimina elementi nella galleria."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Limite di dimensione raggiunto."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Passa a fotocamera"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Passa a video"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d344f1d..e9fc0de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"カメラエラー"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"カメラエラー"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"カメラに接続できません。"</string>
     <string name="camera_label" msgid="6346560772074764302">"カメラ"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"ビデオ録画"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"削除"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"画像を削除します。"</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"動画を削除します。"</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"設定を元に戻す"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"カメラを初期設定に戻します。"</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"初期設定に戻す"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"カメラを初期設定に戻します。"</string>
     <string name="review_play" msgid="6015456244323302817">"再生"</string>
     <string name="review_cancel" msgid="8188009385853399254">"キャンセル"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"位置情報を記録する"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"OFF"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"ON"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"動画の画質"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"高（30m）"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"低（30m）"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS（低、30s）"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube（高、10m）"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"表示サイズ"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"アクア"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"パステル"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"モザイク"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"色合い（赤）"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"色合い（青）"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"色合い（緑）"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"色合い（赤）"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"色合い（青）"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"色合い（緑）"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"シーンモード"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"オート"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"操作"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"ポートレイト"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"横向き"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"夜景"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"夜景ポートレイト"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"夜景ポートレイト"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"シアター"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"ビーチ"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"雪"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"夕日"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"手振れ補正"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"手振れ補正"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"花火"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"クイックキャプチャ"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"クイックキャプチャ"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"ON"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"OFF"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"設定を元に戻す"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"カメラを初期設定に戻す"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"カメラ設定"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"初期設定に戻す"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"露出"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"フレームグリッド"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"ON"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"OFF"</string>
     <string name="no_location_image" msgid="6929172123058811834">"この画像には位置情報は含まれていません。"</string>
     <string name="details_panel_title" msgid="4753347516759338122">"詳細情報"</string>
     <string name="details_file_size" msgid="2468878774843246797">"ファイルサイズ:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"解像度:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"メーカー:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"モデル:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"ホワイトバランス:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"ホワイトバランス:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS緯度:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS経度:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"場所:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"動画を共有"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"SDカードの容量が足りません。クオリティ設定を変更するか、ギャラリーからアイテムを削除してください。"</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"サイズ制限に達しました。"</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"ズーム"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"写真に切替"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"ムービーに切替"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3e3e4ce..4c31456 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"카메라 오류"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"카메라 오류"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"카메라에 연결할 수 없습니다."</string>
     <string name="camera_label" msgid="6346560772074764302">"카메라"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"캠코더"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"삭제"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"사진이 삭제됩니다."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"동영상이 삭제됩니다."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"설정 복원"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"카메라 설정이 기본값으로 복원됩니다."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"기본값 복원"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"카메라 설정이 기본값으로 복원됩니다."</string>
     <string name="review_play" msgid="6015456244323302817">"재생"</string>
     <string name="review_cancel" msgid="8188009385853399254">"취소"</string>
     <string name="review_ok" msgid="5305096180300056529">"확인"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"저장 위치"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"사용 안함"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"사용"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"동영상 화질"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"높음(30분)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"낮음(30분)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"멀티미디어 메시지(낮음, 30초)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube(높음, 10분)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"카메라 설정"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"사진 크기"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"아쿠아"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"파스텔"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"모자이크"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"빨간색 농담"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"파란색 농담"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"녹색 농담"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"빨간색 농담"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"파란색 농담"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"녹색 농담"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"장면 모드"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"자동"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"동작"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"인물"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"가로"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"밤"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"야경 인물"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"야경 인물"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"극장"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"해변"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"눈"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"일몰"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"손떨림 방지 사진"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"손떨림 방지 사진"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"불꽃놀이"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"웹캠으로 바로 올리기"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"웹캠으로 바로 올리기"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"사용"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"사용 안함"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"설정 복원"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"카메라 설정을 기본값으로 복원"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"카메라 설정"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"기본값으로 복원"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"노출"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"프레임 격자"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"사용"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"사용 안함"</string>
     <string name="no_location_image" msgid="6929172123058811834">"이미지에 위치 정보가 없습니다."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"세부정보"</string>
     <string name="details_file_size" msgid="2468878774843246797">"파일 크기:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"해상도:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"제조업체:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"모델:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"화이트 밸런스:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"화이트 밸런스:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GSP 위도:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS 경도:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"위치:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"동영상 공유 응용프로그램"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"SD 카드의 공간이 부족합니다. 화질 설정을 변경하거나 갤러리에서 항목을 삭제하세요."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"크기 한도에 도달했습니다."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"확대/축소"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"카메라로 전환"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"동영상으로 전환"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8a91cfe..be3633c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Kamerafeil"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamerafeil"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Kan ikke koble til kameraet."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Video"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Slett"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Bildet vil bli slettet."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Videoen vil bli slettet."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Gjenopprett innstillingene"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Kamerainnstillingene gjenopprettes til standard."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Gjenopprett standardinnstillingene"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamerainnstillingene gjenopprettes til standard."</string>
     <string name="review_play" msgid="6015456244323302817">"Spill"</string>
     <string name="review_cancel" msgid="8188009385853399254">"Avbryt"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lagre sted i bilder"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Av"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"På"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Videokvalitet"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Høy (30 m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Lav (30 m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"Multimediemelding (lav, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (høy, 10 m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainnstillinger"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videoinnstillinger"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildestørrelse"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Vann"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastell"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaikk"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Rødskjær"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Blåskjær"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Grønnskjær"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Rødskjær"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blåskjær"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grønnskjær"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Velg scenemodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisk"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Action"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portrett"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Landskap"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Natt"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Nattportrett"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Nattportrett"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teater"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Strand"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Snø"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Stødig foto"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stødig foto"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fyrverkeri"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Hurtigbilde"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Hurtigbilde"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"På"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Av"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Gjenopprett innstillingene"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Gjenopprett kamerainnstillingene til standard"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Kamerainnstillinger"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Gjenopprett til standardinnstillingene"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Rutenett"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"På"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Av"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Bildet inneholder ingen stedsinformasjon."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Detaljer"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Filstørrelse:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Oppløsning:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Produsent:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modell:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Hvitbalanse:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Hvitbalanse:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS-breddegrad:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS-lengdegrad:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Sted:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Del video via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Minnekortet begynner å gå tom for plass. Endre kvalitetsinnstillingen eller slett bilder fra galleriet."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Videoen ble for stor."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Bytt til kamera"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Bytt til video"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 24b6c13..2de2d9f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Camerafout"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Camerafout"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Kan geen verbinding maken met de camera."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Verwijderen"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"De foto wordt verwijderd."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"De video wordt verwijderd."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Instellingen herstellen"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"De standaardwaarden voor de camera-instellingen worden hersteld."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Standaardwaarden herstellen"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"De standaardwaarden voor de camera-instellingen worden hersteld."</string>
     <string name="review_play" msgid="6015456244323302817">"AFSPELEN"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULEREN"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Locatie opslaan"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Uit"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Aan"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Videokwaliteit"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Hoog (30m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Laag (30m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Laag, 30s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Hoog, 10m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera-instellingen"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder-instellingen"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grootte van foto"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaïek"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Roodtinten"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Blauwtinten"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Groentinten"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Roodtinten"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blauwtinten"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Groentinten"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scènemodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisch"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Actie"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portret"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Liggend"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nacht"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Nachtportret"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Nachtportret"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Theater"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Strand"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Sneeuw"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zonsondergang"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Stabiele foto"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stabiele foto"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Vuurwerk"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Quick Capture"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Quick Capture"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Aan"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Uit"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Instellingen herstellen"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Standaardwaarden voor camera-instellingen herstellen"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Camera-instellingen"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Terugzetten naar standaardwaarden"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Belichting"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Frameraster"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Aan"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Uit"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Deze afbeelding bevat geen locatiegegevens."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Details"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Bestandsgrootte:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Resolutie:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Fabrikant:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Model:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Witbalans:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Witbalans:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS-breedtegraad:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS-lengtegraad:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Locatie:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Video delen via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Er is weinig ruimte beschikbaar op uw SD-kaart. U kunt de kwaliteitsinstelling wijzigen of items uit de galerij verwijderen."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale grootte bereikt"</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoomen"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Overschakelen naar camera"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Overschakelen naar video"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 86cd066..70e2f36 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Błąd aparatu"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Błąd aparatu"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Nie można nawiązać połączenia z aparatem."</string>
     <string name="camera_label" msgid="6346560772074764302">"Aparat"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Usuń"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Zdjęcie zostanie usunięte."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Film wideo zostanie usunięty."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Przywróć ustawienia"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Zostaną przywrócone ustawienia domyślne aparatu."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Przywróć wartości domyślne"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Zostaną przywrócone ustawienia domyślne aparatu."</string>
     <string name="review_play" msgid="6015456244323302817">"ODTWÓRZ"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANULUJ"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lokalizacja przechowywania"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Wyłączona"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Włączona"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Jakość filmu wideo"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Wysoka (30 min)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Niska (30 min)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Niska, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (wysoka, 10 min)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ustawienia aparatu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ustawienia kamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Rozmiar zdjęcia"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Akwarela"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaika"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Odcień czerwony"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Odcień niebieski"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Odcień zielony"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Odcień czerwony"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Odcień niebieski"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Odcień zielony"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Tryb sceny"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatyczny"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Akcja"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Pionowy"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Poziomy"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Nocny portret"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Nocny portret"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teatr"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Plaża"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Śnieg"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zachód słońca"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Statyczne zdjęcie"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Statyczne zdjęcie"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Sztuczne ognie"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Szybkie robienie zdjęć"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Szybkie robienie zdjęć"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Włączone"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Wyłączone"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Przywróć ustawienia"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Przywróć ustawienia domyślne aparatu"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Ustawienia aparatu"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Przywróć wartości domyślne"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozycja"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Siatka ramek"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Włączona"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Wyłączona"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Brak informacji o lokalizacji zapisanych w pliku zdjęcia."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Szczegóły"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Rozmiar pliku:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Rozdzielczość:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Producent:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Model:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Balans bieli:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Balans bieli:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Szerokość geograficzna GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Długość geograficzna GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Lokalizacja:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Prześlij film następującą drogą:"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Na karcie SD brakuje miejsca. Zmień ustawienie jakości lub usuń elementy z Galerii."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Osiągnięto limit rozmiaru."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Powiększenie"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Przełącz na aparat"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Przełącz na wideo"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f9c3b06..b46d5c8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Erro da câmara"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Erro da câmara"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Não é possível efectuar a ligação à câmara."</string>
     <string name="camera_label" msgid="6346560772074764302">"Câmara"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Câmara de vídeo"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Eliminar"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"A imagem será eliminada."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"O vídeo será eliminado."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Restaurar definições"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"As definições da câmara serão restauradas para os valores predefinidos."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar predefinições"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"As definições da câmara serão restauradas para os valores predefinidos."</string>
     <string name="review_play" msgid="6015456244323302817">"REPRODUZIR"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Armazenar localização"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desactivado"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activado"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualidade de vídeo"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Alta (30 m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Baixa (30 m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (baixa, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Alta, 10 m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Definições da câmara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Definições da câmara de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Azul-marinho"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Tonalidade vermelha"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Tonalidade azul"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Tonalidade verde"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tonalidade vermelha"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tonalidade azul"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tonalidade verde"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo cenário"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Acção"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Retrato"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Paisagem"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Retrato nocturno"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Retrato nocturno"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Cinema"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Praia"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Neve"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ocaso"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Fotografia uniforme"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Fotografia uniforme"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fogo-de-artifício"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Captura rápida"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Activada"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Desactivada"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Restaurar definições"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Restaurar definições da câmara para a os valores predefinidos"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Definições da câmara"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar para valores predefinidos"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Grelha de enquadramento"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Activada"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Desactivada"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Nenhuma informação de Localização contida nesta imagem."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Detalhes"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Tamanho do ficheiro:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Resolução:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Fabricante:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modelo:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Equilíbrio de brancos:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Equilíbrio dos brancos:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Latitude GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Longitude GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Local:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Partilhar vídeo através de"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou elimine itens da Galeria."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Limite de tamanho atingido."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Mudar para câmara"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Mudar para vídeo"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 61227fc..b22889d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Erro de câmera"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Erro de câmera"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Não é possível se conectar à câmera."</string>
     <string name="camera_label" msgid="6346560772074764302">"Câmera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Filmadora"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Excluir"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"A imagem será excluída."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"O vídeo será excluído."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Restaurar configurações"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"As configurações da câmera serão restauradas para os valores padrão."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar padrões"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"As configurações da câmera serão restauradas para os valores padrão."</string>
     <string name="review_play" msgid="6015456244323302817">"REPRODUZIR"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Local de armazenamento"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desativado"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Ativado"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualidade do vídeo"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Alta (30m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Baixa (30m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Baixo, 30s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Alta, 10m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configurações da câmera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configurações da filmadora"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Tons pastéis"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Filtro vermelho"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Filtro azul"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Filtro verde"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Filtro vermelho"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Filtro azul"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Filtro verde"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Modo de cena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automático"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Ação"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Retrato"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Paisagem"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Cena noturna"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Retrato noturno"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Retrato noturno"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teatro"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Praia"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Neve"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Pôr-do-sol"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Foto nítida"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Foto nítida"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fogos de artifício"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Captura rápida"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Ativado"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Desativado"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Restaurar configurações"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Restaurar configurações da câmera para os valores padrão."</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Configurações da câmera"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar para os valores padrão"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Grade de framing"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Ativada"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Desativada"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Nenhuma informação de localização contida nesta imagem."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Detalhes"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Tamanho do arquivo:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Resolução:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Fabricante:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modelo:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Equilíbrio de branco:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Balanço de branco:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Latitude GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Longitude GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Localização:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Compartilhar vídeo via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"O seu cartão SD está sem espaço. Mude a configuração de qualidade ou exclua itens da Galeria."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Limite de tamanho atingido."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Alternar para câmera"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Alternar para vídeo"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9eb99c2..92ceb7c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Ошибка камеры"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Ошибка камеры"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Не удается подключиться к камере."</string>
     <string name="camera_label" msgid="6346560772074764302">"Фотокамера"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Видеокамера"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Удалить"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Картинка будет удалена."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Видео будет удалено."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Восстановить настройки"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Для камеры будут восстановлены настройки по умолчанию."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Восстановить настройки по умолчанию"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Для камеры будут восстановлены настройки по умолчанию."</string>
     <string name="review_play" msgid="6015456244323302817">"ВОСПРОИЗВЕСТИ"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ОТМЕНА"</string>
     <string name="review_ok" msgid="5305096180300056529">"ОК"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Записывать местоположение"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Выкл."</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Вкл."</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Качество видео"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Высокое (30 мин.)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Низкое (30 мин.)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (низкое, 30 с.)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (высокое, 10 мин.)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки камеры"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки видеокамеры"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фотографии"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Под водой"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Пастель"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Мозаика"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Красный оттенок"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Синий оттенок"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Зеленый оттенок"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Красный оттенок"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Синий оттенок"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Зеленый оттенок"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Режим съемки"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Авто"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Действие"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Портрет"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Пейзаж"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ночь"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Ночной портрет"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Ночной портрет"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"На сцене"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Пляж"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Снег"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Закат"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Четкость"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Четкость"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Фейерверк"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Запись с камеры"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Запись с камеры"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Вкл."</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Выкл."</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Восстановить настройки"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Восстановить настройки камеры по умолчанию"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Настройки камеры"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Восстановить значения по умолчанию"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Экспозиция"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Сетка кадрирования"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Вкл."</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Выкл."</string>
     <string name="no_location_image" msgid="6929172123058811834">"Это изображение не содержит данных о местоположении."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Сведения"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Размер файла:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Разрешение:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Производитель:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Модель:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Баланс белого:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Баланс белого:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"Широта GPS:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"Долгота GPS:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Местоположение:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Отправить видео при помощи"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Место на вашей SD-карте заканчивается. Измените настройки качества или удалите содержимое из фотоальбома."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Достигнут предельный размер видео."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Масштаб"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Переключить на фото"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Переключить на видео"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 61ac8cf..d819d9d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Kamerafel"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamerafel"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Det går inte att ansluta till kameran."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Ta bort"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Bilden kommer att tas bort."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Videon kommer att tas bort."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Återställ inställningar"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Kamerans standardinställningar återställs."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Återställ standardinställningar"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamerans standardinställningar återställs."</string>
     <string name="review_play" msgid="6015456244323302817">"SPELA"</string>
     <string name="review_cancel" msgid="8188009385853399254">"AVBRYT"</string>
     <string name="review_ok" msgid="5305096180300056529">"OK"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Spara plats"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Av"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"På"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Videokvalitet"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Hög (30 m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Låg (30 m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Låg, 30 s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Hög, 10 m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainställningar"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamerainställningar"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildstorlek"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastell"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaik"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Röd ton"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Blå ton"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Grön ton"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Röd ton"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blå ton"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grön ton"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Scenläge"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatiskt"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Åtgärd"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Porträtt"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Landskap"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Natt"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Nattporträtt"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Nattporträtt"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Teater"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Strand"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Snö"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgång"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Stadigt foto"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stadigt foto"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fyrverkerier"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Snabbtagning"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Snabbtagning"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"På"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Av"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Återställ inställningar"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Återställ kamerans standardinställningar"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Kamerainställningar"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Återställ standardvärden"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Exponering"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Rutnät"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"På"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Av"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Bilden innehöll ingen platsinformation."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Information"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Filstorlek:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Upplösning:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Tillverkare:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Modell:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Vitbalans:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Vitbalans:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS, latitud:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS, longitud:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Plats:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Dela video via"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"Ditt SD-kort börjar bli fullt. Ändra inställningen för kvalitet eller ta bort objekt från Galleri."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Storleksgränsen nådd."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zoom"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Växla till kamera"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Växla till video"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1d98889..9a5ace8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"Kamera Hatası"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"Kamera hatası"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"Kamera bağlantısı yapılamıyor."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Video Kamera"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"Sil"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"Resim silinecek."</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"Video silinecek."</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"Ayarları Geri Yükle"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"Kamera ayarları varsayılan değerlerine geri yüklenecek."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Varsayılanları geri yükle"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamera ayarlarının varsayılan değerleri geri yüklenecek."</string>
     <string name="review_play" msgid="6015456244323302817">"YÜRÜT"</string>
     <string name="review_cancel" msgid="8188009385853399254">"İPTAL"</string>
     <string name="review_ok" msgid="5305096180300056529">"Tamam"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Depo konumu"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Kapalı"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Açık"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Video kalitesi"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"Yüksek (30m)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"Düşük (30m)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (Düşük, 30s)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (Yüksek, 10m)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera ayarları"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Kamera ayarları"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Resim boyutu"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Su"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaik"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"Kırmızı Ton"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"Mavi Ton"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"Yeşil Ton"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Kırmızı ton"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Mavi ton"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Yeşil ton"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Sahne modu"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Otomatik"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"İşlem"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"Portre"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"Yatay"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gece"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"Gece Portresi"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"Gece portresi"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"Tiyatro"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"Kumsal"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"Kar"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Gün batımı"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"Sabit Fotoğraf"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Sabit fotoğraf"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Havai fişekler"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"Hızlı Yakala"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Hızlı yakala"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Açık"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Kapalı"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"Ayarları geri yükle"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"Kamera ayarlarını varsayılan değerlerine geri yükle"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Kamera ayarları"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"Varsayılan değerleri geri yükle"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Pozlama"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"Çerçeve kılavuzu"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"Açık"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"Kapalı"</string>
     <string name="no_location_image" msgid="6929172123058811834">"Bu görselde Konum bilgisi bulunmuyor."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"Ayrıntılar"</string>
     <string name="details_file_size" msgid="2468878774843246797">"Dosya boyutu:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"Çözünürlük:"</string>
     <string name="details_image_make" msgid="2888477930210903540">"Üretici:"</string>
     <string name="details_image_model" msgid="3608007849933924336">"Model:"</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"Beyaz Dengesi:"</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"Beyaz Dengesi:"</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS Enlemi:"</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS Boylamı:"</string>
     <string name="details_image_location" msgid="6460201074393148978">"Konum:"</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"Videoyu şunun aracılığıyla paylaş:"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"SD kartınızda boş alan azalıyor. Kalite ayarlarını değiştirin veya Galeri\'den öğe silin."</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"Boyut sınırına ulaşıldı."</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"Zum:"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"Kameraya geç"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"Videoya geç"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 92fe99a..cf36088 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"相机故障"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"相机故障"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"无法连接到相机。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相机"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"摄像机"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"删除"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"将会删除此照片。"</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"将会删除此视频。"</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"还原设置"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"相机设置将还原为默认值。"</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"还原默认设置"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"相机设置将还原为默认值。"</string>
     <string name="review_play" msgid="6015456244323302817">"播放"</string>
     <string name="review_cancel" msgid="8188009385853399254">"取消"</string>
     <string name="review_ok" msgid="5305096180300056529">"确定"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"存储位置"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"关"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"开"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"视频画质"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"高画质（30 分钟）"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"低画质（30 分钟）"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"彩信（低画质，30 秒）"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube（高画质，10 分钟）"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片大小"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"浅绿色"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"柔和"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"马赛克"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"偏红"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"偏蓝"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"偏绿"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"偏红"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"偏蓝"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"偏绿"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"取景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"自动"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"运动"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"纵向"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"横向"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"夜景"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"夜景人像"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"夜景人像"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"影院"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"海滩"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"雪景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"日落"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"防抖"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"防抖"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"烟火"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"快速拍摄"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"快速拍摄"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"开"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"关"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"还原设置"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"将相机设置还原为默认值"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"相机设置"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"还原为默认设置"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"取景网格"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"开"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"关"</string>
     <string name="no_location_image" msgid="6929172123058811834">"此图片中没有地点信息。"</string>
     <string name="details_panel_title" msgid="4753347516759338122">"详细信息"</string>
     <string name="details_file_size" msgid="2468878774843246797">"文件大小："</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"分辨率："</string>
     <string name="details_image_make" msgid="2888477930210903540">"制造商："</string>
     <string name="details_image_model" msgid="3608007849933924336">"型号："</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"白平衡："</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"白平衡："</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS 纬度："</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS 经度："</string>
     <string name="details_image_location" msgid="6460201074393148978">"地点："</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"分享视频的方式"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"SD 卡空间已快用完。请更改画质设置或删除图库中的部分内容。"</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"已达到大小上限。"</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"缩放"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"切换到相机"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"切换到视频"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ca68729..0cd043b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--  Copyright (C) 2007 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.
@@ -12,10 +12,11 @@
      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.
--->
+ -->
+
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="camera_error_title" msgid="1202232535191653443">"相機發生錯誤"</string>
+    <string name="camera_error_title" msgid="6484667504938477337">"相機發生錯誤"</string>
     <string name="cannot_connect_camera" msgid="8029009101380114174">"無法連接相機。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相機"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"攝錄影機"</string>
@@ -34,8 +35,8 @@
     <string name="confirm_delete_title" msgid="263478358046514887">"刪除"</string>
     <string name="confirm_delete_message" msgid="4161389939579284604">"刪除相片？"</string>
     <string name="confirm_delete_video_message" msgid="5796154324948010221">"刪除這部影片？"</string>
-    <string name="confirm_restore_title" msgid="4786740665995153202">"還原設定"</string>
-    <string name="confirm_restore_message" msgid="7273245528031237204">"相機設定即將還原至預設值。"</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"還原預設值"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"相機設定即將還原成預設值。"</string>
     <string name="review_play" msgid="6015456244323302817">"播放"</string>
     <string name="review_cancel" msgid="8188009385853399254">"取消"</string>
     <string name="review_ok" msgid="5305096180300056529">"確定"</string>
@@ -51,6 +52,11 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"儲存位置"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"關閉"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"開啟"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"影片品質"</string>
+    <string name="pref_video_quality_entry_high" msgid="2874184763684055612">"高 (30 分鐘)"</string>
+    <string name="pref_video_quality_entry_low" msgid="5282945640948667598">"低 (30 分鐘)"</string>
+    <string name="pref_video_quality_entry_mms" msgid="2271260293894247704">"MMS (低，30 秒)"</string>
+    <string name="pref_video_quality_entry_youtube" msgid="3731902408685997150">"YouTube (高，10 分鐘)"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相機設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"攝錄影機設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"相片大小"</string>
@@ -87,34 +93,38 @@
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"水底效果"</string>
     <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"粉蠟筆效果"</string>
     <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"馬賽克效果"</string>
-    <string name="pref_camera_coloreffect_entry_redtint" msgid="6646299498728138294">"紅色調"</string>
-    <string name="pref_camera_coloreffect_entry_bluetint" msgid="918696074928692967">"藍色調"</string>
-    <string name="pref_camera_coloreffect_entry_greentint" msgid="9080254097150221320">"綠色調"</string>
+    <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"紅色調"</string>
+    <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"藍色調"</string>
+    <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"綠色調"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"場景模式"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"自動"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"動態"</string>
     <string name="pref_camera_scenemode_entry_portrait" msgid="9140929538393384095">"人像"</string>
     <string name="pref_camera_scenemode_entry_landscape" msgid="405417518823973264">"風景"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"夜景"</string>
-    <string name="pref_camera_scenemode_entry_night_portrait" msgid="5244280874913294746">"夜間人像"</string>
+    <string name="pref_camera_scenemode_entry_night_portrait" msgid="2643519475791545277">"夜間人像"</string>
     <string name="pref_camera_scenemode_entry_theatre" msgid="3123861130799840901">"劇院"</string>
     <string name="pref_camera_scenemode_entry_beach" msgid="5163939340224174481">"海灘"</string>
     <string name="pref_camera_scenemode_entry_snow" msgid="2110494623725511788">"雪景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"黃昏"</string>
-    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="2147958278893914895">"防手震"</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"防手震"</string>
     <string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"煙火"</string>
-    <string name="pref_camera_quickcapture_title" msgid="5934534901465097886">"快速錄製"</string>
+    <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"快速錄製"</string>
     <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"開啟"</string>
     <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"關閉"</string>
-    <string name="pref_restore_title" msgid="5685941409089844371">"還原設定"</string>
-    <string name="pref_restore_detail" msgid="2399950455369977703">"將相機設定還原至預設值"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"相機設定"</string>
+    <string name="pref_restore_detail" msgid="5326039608800383369">"還原成預設值"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
+    <string name="pref_framing_grid" msgid="7470436096834322280">"視框網格"</string>
+    <string name="pref_framing_grid_entry_on" msgid="387670222002432408">"開啟"</string>
+    <string name="pref_framing_grid_entry_off" msgid="1363434523358481365">"關閉"</string>
     <string name="no_location_image" msgid="6929172123058811834">"此圖片沒有地點資訊。"</string>
     <string name="details_panel_title" msgid="4753347516759338122">"詳細資料"</string>
     <string name="details_file_size" msgid="2468878774843246797">"檔案大小："</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"解析度："</string>
     <string name="details_image_make" msgid="2888477930210903540">"製造商："</string>
     <string name="details_image_model" msgid="3608007849933924336">"型號："</string>
-    <string name="details_image_whitebalance" msgid="4412514247882436065">"白平衡："</string>
+    <string name="details_image_whitebalance" msgid="8297984317708373822">"白平衡："</string>
     <string name="details_image_latitude" msgid="6701704806314765468">"GPS 緯度："</string>
     <string name="details_image_longitude" msgid="5583629669864057389">"GPS 經度："</string>
     <string name="details_image_location" msgid="6460201074393148978">"地點："</string>
@@ -136,6 +146,7 @@
     <string name="sendVideo" msgid="3598567735831863073">"透過…分享影片"</string>
     <string name="spaceIsLow_content" msgid="2848517537672543641">"您的 SD 卡空間已快用完。請變更品質設定或刪除圖庫中的項目。"</string>
     <string name="video_reach_size_limit" msgid="6179877322015552390">"已達大小上限。"</string>
+    <string name="zoom_control_title" msgid="6532562653386981815">"縮放"</string>
     <string name="switch_to_camera_lable" msgid="8248495141797448471">"切換為相機"</string>
     <string name="switch_to_video_lable" msgid="4525451949497982385">"切換為影片"</string>
 </resources>