Merge "Add timelapse recording support to effects mode." into ics-mr0
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml
index 5fa4ad2..3ef7baf 100644
--- a/res/layout/effect_setting_popup.xml
+++ b/res/layout/effect_setting_popup.xml
@@ -44,8 +44,9 @@
                         android:minHeight="@dimen/effect_setting_clear_text_min_height"
                         android:background="@drawable/bg_pressed"/>
                 <View style="@style/EffectTitleSeparator"/>
-                <TextView
+                <TextView android:id="@+id/effect_silly_faces_title"
                         android:text="@string/effect_silly_faces"
+                        android:visibility="gone"
                         style="@style/EffectSettingTypeTitle"/>
                 <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_silly_faces"
                         style="@style/EffectSettingGrid"/>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fd4fe91..5049f29 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Plaas jou toestel op \'n stewige oppervlak en maak seker daar is geen beweging agter jou nie. "\n\n"Stap dan uit die kamera se sigveld."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan nie gekies word as die effek aan is nie."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Neem \'n foto tydens video-opname deur op die voorskou-skerm te tik."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video-momentopname is gedeaktiveer wanneer spesiale effekte aan is."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Vee effekte uit"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Lawwe gesigte"</string>
     <string name="effect_background" msgid="6909716214852487679">"Agtergrond"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Sluiterknoppie"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Mees onlangse foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Skakelaar vir voorste of agterste kamera"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera-, video- of panoramakieser"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Meer instellingkontroles"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Maak instellingkontroles toe"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoembeheer"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Verminder %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Vermeerder %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s skakelaar"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a91638a..75b2b0f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"መሳሪያዎን በዝርግ ስፍራ ላይ ያስቀምጡ እና ከእርስዎ ጀርባ ምንም ዓይነት መነቃነቅ እንደሌለ እርግጠኛ ሁን፡፡"\n\n" ከዛ በኋላ ከካሜራው እይታ ለቀው ይውጡ፡፡"</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"ማሳመሪያው ሲበራ ይህ ሊመረጥ አይችልም::"</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"የቅድመ ዕይታ ማያን ነካ በማድረግ በቪዲዮ ቀረፃ ጊዜ ፎቶ አንሳ።"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"ቪዲዮ ማንሻ ልዩ ማሳመሪያዎች ሲበሩ ይቦዝናል::"</string>
     <string name="clear_effects" msgid="5485339175014139481">"ማሳመሪያዎች አጽዳ"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"ሞኛሞኝ ፊቶች"</string>
     <string name="effect_background" msgid="6909716214852487679">"ዳራ"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"የካሜራ ሌንስ መከለያ አዝራር።"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"በጣም የቅርብ ፎቶ"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"የፊትና ኋላ ካሜራ ማብሪያና ማጥፊያ"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"ካሜራ፣ቪድዮ ወይም ፓናሮማ መምረጫ"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"ተጨማሪ ቅንጅቶች መቈጣጠሪያ"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"የቅንጅት መቆጣጠሪያዎች ዝጋ"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"ኣጕላ  መቆጣጠሪያ"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"ቀንስ %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"ጨምር %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1s ማብሪያና ማጥፊያ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 07d67ee..920a42e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"ضع الجهاز على سطح ثابت وتأكد من عدم وجود حركة خلفك."\n\n"ثم انتقل إلى وضع الكاميرا."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"هذا الإعداد غير قابل للتحديد عند تشغيل التأثير."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"التقاط صورة أثناء تسجيل الفيديو بالنقر على شاشة المعاينة."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"يتم تعطيل لقطة الفيديو عند تشغيل التأثيرات الخاصة."</string>
     <string name="clear_effects" msgid="5485339175014139481">"محو التأثيرات"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"وجوه مضحكة"</string>
     <string name="effect_background" msgid="6909716214852487679">"الخلفية"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"زر المصراع"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"أحدث صورة"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"مفتاح التبديل بين الأمام والخلف"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"محدّد الكاميرا أو الفيديو أو البانوراما"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"مزيد من عناصر التحكم في الإعدادات"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"إغلاق عناصر التحكم في الإعدادات"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"التحكم في التكبير/التصغير"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"خفض %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"زيادة %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"مفتاح تبديل %1$s"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8d2a750..6cc6407 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -116,9 +116,28 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Поставете устройството си върху стабилна повърхност и се уверете, че зад вас нищо не се движи."\n\n"След което се отдръпнете от зрителното поле на камерата."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Това не може да се избира при включен ефект."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Напр. снимайте при видеозапис, докосвайки екрана за визуализация"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Моментните снимки в клиповете са деакт. при вкл. спец. ефекти."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Изчистване на ефектите"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Смешни лица"</string>
     <string name="effect_background" msgid="6909716214852487679">"Фон"</string>
+    <!-- no translation found for accessibility_shutter_button (2664037763232556307) -->
+    <skip />
+    <!-- no translation found for accessibility_review_thumbnail (8961275263537513017) -->
+    <skip />
+    <!-- no translation found for accessibility_camera_picker (8807945470215734566) -->
+    <skip />
+    <!-- no translation found for accessibility_mode_picker (3264968460835265505) -->
+    <skip />
+    <!-- no translation found for accessibility_second_level_indicators (3855951632917627620) -->
+    <skip />
+    <!-- no translation found for accessibility_back_to_first_level (5234411571109877131) -->
+    <skip />
+    <!-- no translation found for accessibility_zoom_control (1339909363226825709) -->
+    <skip />
+    <!-- no translation found for accessibility_decrement (1411194318538035666) -->
+    <skip />
+    <!-- no translation found for accessibility_increment (8447850530444401135) -->
+    <skip />
+    <!-- no translation found for accessibility_switch (6995966685498958895) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1882f9a..2eaf007 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -120,4 +120,14 @@
     <string name="clear_effects" msgid="5485339175014139481">"Esborra efectes"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Ganyotes"</string>
     <string name="effect_background" msgid="6909716214852487679">"Fons"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botó de l\'obturador"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto més recent"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Commutador de càmera anterior i posterior"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Càmera, vídeo o selector de panorames"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Més controls de configuració"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Tanca els controls de configuració"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Redueix %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Augmenta %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Commutador %1$s"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 544e5dd..adf7f20 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Umístěte zařízení na pevný povrch a zkontrolujte, zda se za vámi nic nehýbe."\n\n"Poté ustupte ze záběru kamery."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavení nelze vybrat, pokud je efekt zapnutý."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Během nahrávání videa lze fotit klepnutím na obrazovku náhledu."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Jsou-li zapnuty zvláštní efekty, jsou snímky videa zakázány."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Vymazat efekty"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Bláznivé tváře"</string>
     <string name="effect_background" msgid="6909716214852487679">"Pozadí"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Tlačítko závěrky"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Poslední fotografie"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Přepínač mezi předním a zadním fotoaparátem"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Přepínač mezi panoramatickým režimem a režimy fotoaparátu a videokamery"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Další ovládací prvky nastavení"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zavřít ovládací prvky nastavení"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ovládání přiblížení/oddálení"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Snížit %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Zvýšit %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Přepínač %1$s"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9a73b7b..c239da5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Placer enheden på en jævn overflade, og sørg for, at der ikke er noget i baggrunden, der bevæger sig."\n\n"Gå derefter ud af billedet."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dette kan ikke vælges, når effekten er slået til."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Tryk på eksempelskærmen for at tage et foto under videooptagelse."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videoøjebliksbilleder deaktiveres, når specialeffekter er tændt."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Ryd effekter"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Skøre ansigter"</string>
     <string name="effect_background" msgid="6909716214852487679">"Baggrund"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Lukkerknap"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Det seneste foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Skift mellem frontkameraet og bagsidekameraet"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Valg af kamera, video eller panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Flere indstillingskontroller"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Luk indstillingskontroller"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomkontrol"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Formindsk %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Forøg %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s-knappen"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8f6a803..fda168e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -75,7 +75,7 @@
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Bewölkt"</string>
     <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Szenenmodus"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automatisch"</string>
-    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Aktion"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nachtaufnahme"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonnenuntergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Party"</string>
@@ -90,10 +90,10 @@
     <string name="switch_to_camera_label" msgid="9148663083850199582">"Zu Kamera wechseln"</string>
     <string name="switch_to_video_label" msgid="1167994386902254398">"Zu Video wechseln"</string>
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Zu Panorama wechseln"</string>
-    <string name="share_picture_via" msgid="1375127849431890447">"Bild weiterleiten über"</string>
-    <string name="share_video_via" msgid="5152302809166549015">"Video weiterleiten über"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Kein Bild für Weiterleitung"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Kein Video für Weiterleitung"</string>
+    <string name="share_picture_via" msgid="1375127849431890447">"Bild teilen über"</string>
+    <string name="share_video_via" msgid="5152302809166549015">"Video teilen über"</string>
+    <string name="no_picture_to_share" msgid="7700541451734517445">"Kein Bild zum Teilen"</string>
+    <string name="no_video_to_share" msgid="3775826212074938990">"Kein Video zum Teilen"</string>
     <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Zu schnell"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama wird vorbereitet..."</string>
     <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama konnte nicht gespeichert werden."</string>
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Legen Sie Ihr Gerät auf eine stabile Oberfläche und achten Sie darauf, dass sich hinter Ihnen nichts bewegt."\n\n"Treten Sie anschließend aus dem Bild."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Einstellung nicht wählbar, wenn Effekt aktiviert"</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Durch Tippen Foto während Videoaufzeichnung aufnehmen"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video-Schnappschuss ist bei Spezialeffekten deaktiviert."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Effekte löschen"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Lustige Gesichter"</string>
     <string name="effect_background" msgid="6909716214852487679">"Hintergrund"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Schaltfläche für Verschluss"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Neuestes Foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Zwischen Kamera auf der Vorder- und Rückseite wechseln"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Auswahl für Kamera, Video oder Panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Weitere Einstellungen"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Einstellungen schließen"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom-Steuerung"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Verkleinern %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Vergrößern %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Schalter %1$s"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f5f160b..560fa92 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Τοποθετήστε τη συσκευή σας σε μια σταθερή επιφάνεια και βεβαιωθείτε ότι δεν υπάρχουν κινήσεις πίσω σας."\n\n" Στη συνέχεια, απομακρυνθείτε από το οπτικό πεδίο της κάμερας."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Αδύνατη η επιλογή του όταν το εφέ είναι ενεργό."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Τραβ. μια φωτογρ. κατά την εγγρ. βίντεο πατώντας την οθ.προεπισκ."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Το στιγμιότυπο οθόνης βίντεο απενεργοποιείται με ενεργά τα εφέ."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Διαγραφή εφέ"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Αστεία πρόσωπα"</string>
     <string name="effect_background" msgid="6909716214852487679">"Φόντο"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Κουμπί κλείστρου"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Πιο πρόσφατη φωτογραφία"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Διακόπτης εμπρός και πίσω φωτογραφικής μηχανής"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Επιλογή φωτογραφικής μηχανής, βίντεο ή πανοραμικής εικόνας"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Περισσότερα στοιχεία ελέγχου ρυθμίσεων"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Κλείσιμο στοιχείων ελέγχου ρυθμίσεων"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Έλεγχος εστίασης"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Μείωση %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Αύξηση %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Διακόπτης %1$s"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ed1caa2..1270b1a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -120,4 +120,14 @@
     <string name="clear_effects" msgid="5485339175014139481">"Clear effects"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Silly faces"</string>
     <string name="effect_background" msgid="6909716214852487679">"Background"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Shutter button"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Most recent photo"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Front and back camera switch"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Camera, video or panorama selector"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"More settings controls"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Close settings controls"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom control"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Decrease %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Increase %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s switch"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 66165b4..b2bb1e7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo sobre una superficie firme y asegúrate de que no se produzca ningún movimiento detrás de ti."\n\n"Luego ubícate fuera del alcance de la cámara."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede elegir config. si el efecto está act."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Para tomar fotos en una grabación, toca la pant. de vista previa."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Las instantáneas de video se inhabilitan al activar los efectos."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Borrar efectos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caras graciosas"</string>
     <string name="effect_background" msgid="6909716214852487679">"Fondo"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botón del obturador"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto más reciente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Selector delantero y trasero de la cámara"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Cámara de video o selector de panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Más controles de configuración"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Cerrar controles de configuración"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Disminución de %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Aumentar %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s selector"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f15b4e1..114f2a2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo en una superficie plana y comprueba que no se produzca ningún movimiento detrás."\n\n"A continuación, colócate fuera de la vista de la cámara."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede seleccionar si el efecto está activado."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Toca la pantalla de vista previa para hacer una foto mientras grabas vídeo."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"La instantánea de vídeo se inhabilita al activar efectos especiales."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Borrar efectos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caras graciosas"</string>
     <string name="effect_background" msgid="6909716214852487679">"Fondo"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botón del obturador"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto más reciente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Opción de cámara trasera y delantera"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Cámara, vídeo o modo panorámico"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Más controles de configuración"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Cerrar controles de configuración"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Reducir %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Aumentar %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Interruptor %1$s"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 32e512c..a2cb544 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"دستگاه خود را بر روی یک سطح ثابت و محکم قرار دهید و مطمئن شوید هیچ حرکتی پشت سر شما وجود نداشته باشد."\n\n"سپس از نمای دوربین خارج شوید."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"هنگامی که جلوه روشن است قابل انتخاب نیست."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"هنگام ضبط ویدیو با ضربه زدن روی صفحه پیش نمایش عکس بگیرید."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"هنگام فعال بودن جلوه‌های ویژه، عکس فوری از ویدیو غیرفعال است."</string>
     <string name="clear_effects" msgid="5485339175014139481">"پاک کردن جلوه‌ها"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"چهره‌های احمقانه"</string>
     <string name="effect_background" msgid="6909716214852487679">"پس‌زمینه"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"دکمه شاتر"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"جدیدترین عکس"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"کلید دوربین جلو و عقب"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"انتخابگر دوربین، ویدیو یا پانوراما"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"کنترل‌های تنظیم بیشتر"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"بستن کنترل‌های تنظیم"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"کنترل بزرگنمایی"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"کاهش %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"افزایش %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"کلید %1$s"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 16044c5..862f41c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Sijoita laite vakaalle alustalle ja varmista, että taustalla ei ole liikkuvia kohteita."\n\n"Astu sitten pois kuvasta."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tämä ei ole valittavissa, kun tehoste on käytössä."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Ota kuva videokuvauksen aikana napauttamalla esikatseluruutua."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videon kuvakaappausta ei voi käyttää erikoistehosteiden kanssa."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Tyhjennä tehosteet"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Hauskat kasvot"</string>
     <string name="effect_background" msgid="6909716214852487679">"Tausta"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Laukaisupainike"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Viimeisin valokuva"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Etu- ja takakamerakytkin"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera-, video- tai panoraamavalitsin"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Lisää asetuksia"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Sulje asetukset"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomauksen hallinta"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Vähennä %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Kasvata %1$s-arvoa"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s-kytkin"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 13eae42..d9340f5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Placez l\'appareil sur une surface stable, et assurez-vous qu\'il n\'y a pas de mouvement derrière vous."\n\n"Sortez ensuite du champ de vision de l\'appareil photo."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Sélection impossible lorsque l\'effet est activé."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Appuyez sur écran aperçu pour prendre photo pendant enreg. vidéo"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instantané vidéo désactivé en cas d\'activation des effets spéciaux."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Effacer les effets"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Expressions amusantes"</string>
     <string name="effect_background" msgid="6909716214852487679">"Arrière-plan"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Bouton de l\'obturateur"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Photo la plus récente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interrupteur des appareils photo avant et arrière"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Sélecteur du mode Appareil photo, Vidéo ou Panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Plus de paramètres"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fermer les paramètres"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Contrôle du zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Diminuer %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Augmenter %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Interrupteur %1$s"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
new file mode 100644
index 0000000..497d726
--- /dev/null
+++ b/res/values-hi/strings.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<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="6484667504938477337">"कैमरा त्रुटि"</string>
+    <string name="cannot_connect_camera" msgid="8029009101380114174">"कैमरे से कनेक्ट नहीं कर सकता."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"सुरक्षा नीतियों के कारण कैमरा अक्षम कर दिया गया है."</string>
+    <string name="camera_label" msgid="6346560772074764302">"कैमरा"</string>
+    <string name="video_camera_label" msgid="2899292505526427293">"कैमकॉर्डर"</string>
+    <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"कैमरा चित्र"</string>
+    <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"कैमरा वीडियो"</string>
+    <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा करें..."</string>
+    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"कृपया कैमरे का उपयोग करने से पहले USB संग्रहण माउंट करें."</string>
+    <string name="no_storage" product="default" msgid="820691042667338625">"कृपया कैमरे का उपयोग करने से पहले SD कार्ड डालें."</string>
+    <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"आपका USB संग्रहण पूरा भर गया है."</string>
+    <string name="not_enough_space" product="default" msgid="6655334407957844653">"आपका SD कार्ड भरा हुआ है."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB संग्रहण तैयार कर रहा है…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD कार्ड तैयार कर रहा है…"</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB संग्रहण में नहीं पहुंच सका."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD कार्ड में नहीं पहुंच सका."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"डिफ़ॉल्ट पुनर्स्थापित करें"</string>
+    <string name="confirm_restore_message" msgid="5239464943578877295">"कैमरा सेटिंग डिफ़ॉल्ट पर पुनर्स्थापित की जाएगी."</string>
+    <string name="review_play" msgid="6378271587740884696">"चलाएं"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"रद्द करें"</string>
+    <string name="review_ok" msgid="5305096180300056529">"ठीक"</string>
+    <string name="review_retake" msgid="7804864054896088338">"रीटेक"</string>
+    <string name="camera_gallery_photos_text" msgid="6558048736561932758">"गैलरी"</string>
+    <string name="switch_camera_id" msgid="837545176602471325">"कैमरा स्विच करें"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"समय समाप्ति रिकॉर्डिंग"</string>
+    <string name="pref_camera_id_title" msgid="6023059405578511534">"कैमरा चयन करें"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"वापस जाएं"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"सामने"</string>
+    <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_time_lapse_frame_interval_title" msgid="5262531404348504642">"समय समाप्ति अंतराल"</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>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M पिक्‍सेल"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"फ़ोकस मोड"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"स्वत:"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"अनंत"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"मैक्रो"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"फ़्लैश मोड"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"स्वत:"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"चालू"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"बंद"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"श्वेत संतुलन"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"स्वत:"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"अत्यधिक चमकीला"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"दिन का प्रकाश"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"फ़्लोरेसेंट"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"बदली"</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_night" msgid="7606898503102476329">"रात्रि"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"सूर्यास्त"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"पार्टी"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"यह दृश्य मोड में चयन योग्‍य नहीं है"</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"कैमरा सेटिंग"</string>
+    <string name="pref_restore_detail" msgid="5732490002291044791">"डिफ़ॉल्ट पुनर्स्थापित करें"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"एक्स्पोजर"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"ठीक"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"आपके USB संग्रहण में स्थान कम है. गुणवत्ता सेटिंग बदलें या कुछ छवियां या अन्य फ़ाइलें हटाएं."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"आपके SD कार्ड में स्थान कम है. गुणवत्ता सेटिंग बदलें या कुछ छवियां या अन्य फ़ाइलें हटाएं."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"आकार सीमा पहुंची."</string>
+    <string name="switch_to_camera_label" msgid="9148663083850199582">"कैमरे पर स्विच करें"</string>
+    <string name="switch_to_video_label" msgid="1167994386902254398">"वीडियो पर स्विच करें"</string>
+    <string name="switch_to_panorama_label" msgid="858801335653517864">"पैनोरमा पर स्विच करें"</string>
+    <string name="share_picture_via" msgid="1375127849431890447">"इससे चित्र साझा करें:"</string>
+    <string name="share_video_via" msgid="5152302809166549015">"इससे वीडियो साझा करें:"</string>
+    <string name="no_picture_to_share" msgid="7700541451734517445">"साझा करने के लिए कोई चित्र नहीं"</string>
+    <string name="no_video_to_share" msgid="3775826212074938990">"साझा करने के लिए कोई वीडियो नहीं"</string>
+    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"बहुत तेज़"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"पैनोरामा तैयार हो रहा है"</string>
+    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"पैनोरामा सहेजने में विफल"</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"पैनोरामा"</string>
+    <string name="pano_capture_indication" msgid="7431983072966619171">"पैनोरामा कैप्चर हो रहा है"</string>
+    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"सहेजा जा रहा है..."</string>
+    <string name="tap_to_focus" msgid="6417403734418828035">"फ़ोकस करने के लि‍ए टैप करें"</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"प्रभाव"</string>
+    <string name="effect_none" msgid="3601545724573307541">"कोई नहीं"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"पिचका हुआ"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"बड़ी आंखें"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"बड़ा मुंह"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"छोटा मुंह"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"बड़ी नाक"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"छोटी आंखें"</string>
+    <string name="effect_backdropper_space" msgid="1381012939195370792">"अंतरिक्ष में"</string>
+    <string name="effect_backdropper_sunset" msgid="45198943771777870">"सूर्यास्त"</string>
+    <string name="effect_backdropper_disco" msgid="8494822051982972854">"डिस्को"</string>
+    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"स्‍वयं का चुनें"</string>
+    <string name="bg_replacement_message" msgid="7540788298745332389">"अपना उपकरण किसी स्थिर सतह पर रखें और सुनिश्चित करें कि आपके पीछे कोई हलचल नहीं है."\n\n"फिर कैमरे के दृश्य से बाहर आ जाएं."</string>
+    <string name="not_selectable_in_effect" msgid="5093306709878914151">"प्रभाव के चालू रहने पर यह चयन योग्‍य नहीं होता."</string>
+    <string name="video_snapshot_hint" msgid="6479115859014094906">"वीडियो रिकॉर्डिंग के समय पूर्वावलोकन स्‍क्रीन पर टैप करके फ़ोटो लें."</string>
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"विशेष प्रभावों के चालू होने पर वीडियो स्‍नेपशॉट अक्षम हो जाता है."</string>
+    <string name="clear_effects" msgid="5485339175014139481">"प्रभाव साफ़ करें"</string>
+    <string name="effect_silly_faces" msgid="3214174716769421248">"मज़ाकिया चेहरे"</string>
+    <string name="effect_background" msgid="6909716214852487679">"पृष्ठभूमि"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"शटर बटन"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"हाल ही का फ़ोटो"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"अगला और पिछला कैमरा स्‍विच"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"कैमरा, वीडियो या पैनोरामा चयनकर्ता"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिंग नियंत्रण"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिंग नियंत्रण बंद करें"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"ज़ूम नियंत्रण"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s घटाएं"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s बढ़ाएं"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s स्‍विच"</string>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bccd3aa..da1a4a3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -116,9 +116,28 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite uređaj na stabilnu površinu i provjerite da nema kretanja iza vas."\n\n"Tada izađite iz vidokruga kamere."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"To se ne može odabrati kada je efekt uključen."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Dok snimate videozapis, fotografirajte doticanjem zaslona pregleda."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Fotografiranje је onemogućeno kada su posebni efekti uključeni."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Obriši efekte"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Budalasta lica"</string>
     <string name="effect_background" msgid="6909716214852487679">"Pozadina"</string>
+    <!-- no translation found for accessibility_shutter_button (2664037763232556307) -->
+    <skip />
+    <!-- no translation found for accessibility_review_thumbnail (8961275263537513017) -->
+    <skip />
+    <!-- no translation found for accessibility_camera_picker (8807945470215734566) -->
+    <skip />
+    <!-- no translation found for accessibility_mode_picker (3264968460835265505) -->
+    <skip />
+    <!-- no translation found for accessibility_second_level_indicators (3855951632917627620) -->
+    <skip />
+    <!-- no translation found for accessibility_back_to_first_level (5234411571109877131) -->
+    <skip />
+    <!-- no translation found for accessibility_zoom_control (1339909363226825709) -->
+    <skip />
+    <!-- no translation found for accessibility_decrement (1411194318538035666) -->
+    <skip />
+    <!-- no translation found for accessibility_increment (8447850530444401135) -->
+    <skip />
+    <!-- no translation found for accessibility_switch (6995966685498958895) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 63f0a52..f8506b4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Helyezze eszközét egy stabil felületre, és bizonyosodjon meg arról, hogy Ön mögött nincs mozgás."\n\n"Ezután lépjen ki a kamera látószögéből."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ez nem választható, ha az effekt be van kapcsolva."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Képkészítés videofelvétel közben: előnézeti képernyő megérintése"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"A video-pillanatfelvétel letiltva speciális effektek esetén."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Effektek törlése"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Bolondos arcok"</string>
     <string name="effect_background" msgid="6909716214852487679">"Háttér"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Exponáló gomb"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Legutóbbi fotó"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Első és hátsó kamera kapcsolója"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera, videó vagy panoráma választó"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"További beállításvezérlők"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Beállításvezérlők bezárása"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Nagyítás/kicsinyítés vezérlése"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Csökkentés: %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Növelés: %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s kapcsoló"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3788ad2..b9e46a4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -116,9 +116,28 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Tempatkan perangkat pada permukaan yang stabil dan pastikan tidak ada gerakan di belakang Anda."\n\n"Setelah itu keluarlah dari pandangan kamera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setelan ini tidak dapat dipilih jika efek dihidupkan."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Mengambil foto saat merekam video dengan mengetuk layar pratinjau."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Cuplikan video dinonaktifkan bila efek khusus aktif."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Hapus efek"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Wajah konyol"</string>
     <string name="effect_background" msgid="6909716214852487679">"Latar belakang"</string>
+    <!-- no translation found for accessibility_shutter_button (2664037763232556307) -->
+    <skip />
+    <!-- no translation found for accessibility_review_thumbnail (8961275263537513017) -->
+    <skip />
+    <!-- no translation found for accessibility_camera_picker (8807945470215734566) -->
+    <skip />
+    <!-- no translation found for accessibility_mode_picker (3264968460835265505) -->
+    <skip />
+    <!-- no translation found for accessibility_second_level_indicators (3855951632917627620) -->
+    <skip />
+    <!-- no translation found for accessibility_back_to_first_level (5234411571109877131) -->
+    <skip />
+    <!-- no translation found for accessibility_zoom_control (1339909363226825709) -->
+    <skip />
+    <!-- no translation found for accessibility_decrement (1411194318538035666) -->
+    <skip />
+    <!-- no translation found for accessibility_increment (8447850530444401135) -->
+    <skip />
+    <!-- no translation found for accessibility_switch (6995966685498958895) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 703d14b..28fa649 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Posiziona il dispositivo su una superficie stabile e assicurati che non ci sia qualcosa in movimento dietro di te."\n\n"Dopodiché esci dall\'inquadratura della fotocamera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Non selezionabile quando l\'effetto è attivo."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Scatta una foto durante il video toccando lo schermo di anteprima."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Istantanea video disabilitata se gli effetti speciali sono attivi."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Cancella effetti"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Faccine"</string>
     <string name="effect_background" msgid="6909716214852487679">"Sfondo"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Pulsante di scatto"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto più recente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interruttore fotocamera anteriore e posteriore"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Selettore fotocamera, video o panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Altri controlli impostazioni"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Chiudi controlli impostazioni"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Controllo zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Riduci %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Aumenta %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Interruttore %1$s"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1769695..6ecc783 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"הנח את המכשיר על גבי משטח יציב והקפד לוודא שאין תנועה מאחוריך."\n\n"לאחר מכן, צא מטווח הראייה של המצלמה."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"לא ניתן לבחור באפשרות זו כאשר האפקט מופעל."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"צלם תמונה במהלך הקלטת וידאו על ידי הקשה על מסך התצוגה המקדימה."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"האפשרות לצילום תמונה מסרטון וידאו מושבתת כאשר אפקטים מיוחדים מופעלים."</string>
     <string name="clear_effects" msgid="5485339175014139481">"נקה אפקטים"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"פרצופים מצחיקים"</string>
     <string name="effect_background" msgid="6909716214852487679">"רקע"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"לחצן הצמצם."</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"התמונה האחרונה"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"מתג המצלמה הקדמית והאחורית"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"בורר מצלמת וידאו או פנורמה"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"פקדי הגדרות נוספות"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"סגור פקדי הגדרה"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"פקד \'הגדל/הקטן\'"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"הקטן %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"הגדל %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"מתג %1$s"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e2bdd96..4bbd031 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -116,9 +116,28 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"安定した平らな場所にデバイスを置き、後方に動いているものがないか確認します。"\n\n"次に、カメラの視野の外に出ます。"</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"効果がONのときは選択できません。"</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"動画の録画中にプレビュー画面をタップすると静止画を撮影できます。"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"動画スナップショットは特殊効果がONのときは無効です。"</string>
     <string name="clear_effects" msgid="5485339175014139481">"効果設定をクリア"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"変な顔"</string>
     <string name="effect_background" msgid="6909716214852487679">"背景"</string>
+    <!-- no translation found for accessibility_shutter_button (2664037763232556307) -->
+    <skip />
+    <!-- no translation found for accessibility_review_thumbnail (8961275263537513017) -->
+    <skip />
+    <!-- no translation found for accessibility_camera_picker (8807945470215734566) -->
+    <skip />
+    <!-- no translation found for accessibility_mode_picker (3264968460835265505) -->
+    <skip />
+    <!-- no translation found for accessibility_second_level_indicators (3855951632917627620) -->
+    <skip />
+    <!-- no translation found for accessibility_back_to_first_level (5234411571109877131) -->
+    <skip />
+    <!-- no translation found for accessibility_zoom_control (1339909363226825709) -->
+    <skip />
+    <!-- no translation found for accessibility_decrement (1411194318538035666) -->
+    <skip />
+    <!-- no translation found for accessibility_increment (8447850530444401135) -->
+    <skip />
+    <!-- no translation found for accessibility_switch (6995966685498958895) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e740b05..4cf1bc8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"기기를 평평한 바닥에 올려놓고 뒤에 움직이는 물체가 없는지 확인합니다. "\n\n"그런 다음 카메라 뷰 밖으로 비켜섭니다."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"효과를 사용 중일 때는 선택할 수 없습니다."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"동영상을 촬영하는 동안 미리보기 화면을 탭하여 사진을 찍을 수 있습니다."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"특수 효과가 설정되어 있으면 동영상 스냅샷이 사용 중지됩니다."</string>
     <string name="clear_effects" msgid="5485339175014139481">"효과 제거"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"웃긴 얼굴"</string>
     <string name="effect_background" msgid="6909716214852487679">"배경"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"셔터 버튼"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"최근 사진"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"전방 및 후방 카메라 사이를 전환"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"카메라, 동영상 또는 파노라마 선택기"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"설정 컨트롤 더보기"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"설정 컨트롤 닫기"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"확대/축소 컨트롤"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s 축소"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s 확대"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s 전환"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7aa43de..4d0a77d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Įrenginį padėkite ant stabilaus paviršiaus ir įsitikinkite, kad už jūsų niekas nejuda."\n\n"Pasitraukite iš kameros regėjimo lauko."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Negalima pasirinkti, kai įjungtas efektas."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Kai įrašomas vaizdo įr., fotograf. paliesdami peržiūros ekraną."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Moment. vaizdo įrašo vaizdas neleidž., kai įjungti spec. efektai."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Išvalyti efektus"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Juokingi veidai"</string>
     <string name="effect_background" msgid="6909716214852487679">"Fonas"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Užrakto mygtukas"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Paskutinė nuotrauka"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Priekinis ir galinis fotoaparato jungikliai"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Fotoaparato, vaizdo įrašo ar panoramos parinkiklis"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Daugiau nustatymų valdiklių"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Uždaryti nustatymų valdiklius"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Mastelio keitimo valdymas"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Sumažinti %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Padidinti %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s jungiklis"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index db45f7f..0f0540f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Novietojiet ierīci uz stabilas virsmas un pārliecinieties, ka aiz jums nenotiek nekāda kustība."\n\n"Pēc tam izejiet no kameras skata."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Šo iestat. nevar atlasīt, kad ir ieslēgts efekts."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografējiet videoieraksta laikā, pieskaroties priekšskat. ekr."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video momentuzņēmums ir atspējots, ja ir ieslēgti specefekti."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Noņemt efektus"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Smieklīgas sejas izt."</string>
     <string name="effect_background" msgid="6909716214852487679">"Fons"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Slēdža poga"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Pēdējais fotoattēls"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Priekšējais un aizmugurējais kameras slēdzis"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kameras, video vai panorāmas atlasītājs"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Vairāk iestatījumu vadīklu"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Aizvērt iestatījumu vadīklas"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Tālummaiņas vadība"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Samazināt %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Palielināt %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s slēdzis"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9884e2f..2a6c0b3 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Letakkan peranti anda di atas permukaan yang stabil dan pastikan tidak ada pergerakan di belakang anda."\n" "\n" Kemudian berjalan keluar dari pandangan kamera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ini tidak boleh dipilih apabila kesan dihidupkan."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Ambil gambar semasa rakaman video dengan mengetik pada skrin pratonton."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Petikan video dilumpuhkan apabila kesan khas dihidupkan."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Padamkan kesan"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Muka bodoh"</string>
     <string name="effect_background" msgid="6909716214852487679">"Latar belakang"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Butang pengatup"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto paling terbaru"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Suis kamera depan dan belakang"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Pemilih kamera, video atau panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Lebih banyak kawalan tetapan"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Tutup kawalan tetapan"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Kawalan zum"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Pengurangan %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Tingkatkan %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Suis %1$s"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d68a68f..d562997 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Plassér enheten på et stødig underlag og sørg for at det ikke er noen bevegelser bak deg."\n\n"Deretter flytter du deg bort fra kamerabildet."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Du kan ikke velge dette når effekten er aktivert."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Ta bilde under videoopptaket ved å trykke på forhåndsvisningen."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Øyeblikksbilder er deaktivert når spesialeffekter er aktivert."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Fjern effekter"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Morsomme ansikter"</string>
     <string name="effect_background" msgid="6909716214852487679">"Bakgrunn"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Lukkerknapp"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Nyeste bilde"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Bryter for foran/bak"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Valg av kamera, video eller panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Flere innstillingskontroller"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Lukk innstillingskontrollene"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomkontroll"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Reduser %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Øk %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s-bryteren"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 23dabfd..e391e1f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nacht"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zonsondergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Feest"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Dit kunt u niet selecteren in de scène-modus"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Dit kunt u niet selecteren in de scènemodus"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Camera-instellingen"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Standaardwaarden herstellen"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Belichting"</string>
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Plaats uw apparaat op een stevige ondergrond en zorg ervoor dat er geen beweging achter u te zien is."\n\n"Stap vervolgens uit beeld."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan niet worden geselecteerd wanneer het effect is ingeschakeld."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Tik voor een foto bij video-opnamen op het voorbeeldscherm."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videosnapshot staat uit als speciale effecten zijn ingeschakeld."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Effecten wissen"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Gekke gezichten"</string>
     <string name="effect_background" msgid="6909716214852487679">"Achtergrond"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Sluiterknop"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Meest recente foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Schakelen tussen camera aan voorzijde en aan achterzijde"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Camera-, video- of panoramakiezer"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Meer instelopties"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Instelopties sluiten"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomregeling"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s verlagen"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s verhogen"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s-schakelaar"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 70d67b4..acb29b6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Umieść urządzenie na stabilnej powierzchni i upewnij się, że za Tobą nic się nie dzieje."\n\n"Następnie wyjdź z pola widzenia aparatu."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Opcji nie można wybrać, gdy efekt jest włączony."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Zrób zdjęcie podczas nagrywania filmu, klikając ekran podglądu."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Stopklatka nie działa, gdy są aktywne efekty specjalne."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Usuń efekty"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Zabawne twarze"</string>
     <string name="effect_background" msgid="6909716214852487679">"Tło"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Przycisk migawki"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Najnowsze zdjęcie"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Przełącznik przedniego i tylnego aparatu"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Wybór aparatu, filmu lub panoramy"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Więcej ustawień"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zamknij ustawienia"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Sterowanie powiększeniem"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Zmniejsz: %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Zwiększ: %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Przełącznik: %1$s"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6a5063a..e595f7f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o aparelho numa superfície estável e certifique-se de que não existe movimento atrás de si."\n\n"Em seguida, saia do alcance visual da câmara."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Isto não é selecionável com o efeito ativado."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma fotografia durante a gravação de vídeo tocando no ecrã de pré-visualização."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instantâneo vídeo desat. quando efeitos especiais estão ativos."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Limpar efeitos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caretas"</string>
     <string name="effect_background" msgid="6909716214852487679">"Fundo"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botão Obturador"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Fotografia mais recente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interruptor da câmara frontal e posterior"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Seletor de câmara, vídeo ou panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mais controlos de definições"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fechar controlos de definições"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Controlo de zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Diminuir %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Aumentar %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Interruptor %1$s"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 04ffd24..11d9726 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o dispositivo sobre uma superfície estável sem movimento atrás de você."\n\n"Em seguida, saia do campo de visão da câmera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Não é possível selecionar com o efeito ativado."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma foto ao gravar um vídeo tocando na tela de visualização."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"O instant. de vídeo é desat. quando os efeitos esp. estão ativad."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Clarear efeitos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caretas"</string>
     <string name="effect_background" msgid="6909716214852487679">"Plano de fundo"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botão \"Tirar foto\""</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto mais recente"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Botão da câmera frontal e traseira"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Seletor de câmera, vídeo ou panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mais controles de ajuste"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fechar controles de ajuste"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Controle de zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Diminuir %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Aumentar %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Botão %1$s"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index d568ac2..7c2a328 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -161,4 +161,24 @@
     <skip />
     <!-- no translation found for effect_background (6909716214852487679) -->
     <skip />
+    <!-- no translation found for accessibility_shutter_button (2664037763232556307) -->
+    <skip />
+    <!-- no translation found for accessibility_review_thumbnail (8961275263537513017) -->
+    <skip />
+    <!-- no translation found for accessibility_camera_picker (8807945470215734566) -->
+    <skip />
+    <!-- no translation found for accessibility_mode_picker (3264968460835265505) -->
+    <skip />
+    <!-- no translation found for accessibility_second_level_indicators (3855951632917627620) -->
+    <skip />
+    <!-- no translation found for accessibility_back_to_first_level (5234411571109877131) -->
+    <skip />
+    <!-- no translation found for accessibility_zoom_control (1339909363226825709) -->
+    <skip />
+    <!-- no translation found for accessibility_decrement (1411194318538035666) -->
+    <skip />
+    <!-- no translation found for accessibility_increment (8447850530444401135) -->
+    <skip />
+    <!-- no translation found for accessibility_switch (6995966685498958895) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2a22e21..fee6b4e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Aşezaţi dispozitivul pe o suprafaţă stabilă şi asiguraţi-vă că nu există mişcare în spatele dvs."\n\n"Apoi, ieşiţi din vizorul camerei foto."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setarea nu poate fi selectată cu efectul activat."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografiaţi când înregistraţi video atingând ecranul."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instant. video este dezact. când efectele speciale sunt pornite."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Ştergeţi efectul"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Feţe stupide"</string>
     <string name="effect_background" msgid="6909716214852487679">"Fundal"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Butonul Declanşaţi"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Cea mai recentă fotografie"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Comutator pentru camera foto din faţă şi din spate"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Selector pentru modurile cameră foto, cameră video sau panoramă"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mai multe comenzi pentru setări"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Închideţi comenzile pentru setări"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Comandă mărire/micşorare"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Reduceţi %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Măriţi %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Comutator %1$s"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 66c1d10..53196a5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -95,8 +95,8 @@
     <string name="no_picture_to_share" msgid="7700541451734517445">"Нет картинок для отправки"</string>
     <string name="no_video_to_share" msgid="3775826212074938990">"Нет видео для отправки"</string>
     <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Очень быстро"</string>
-    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Подготовка панорамы..."</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Не удалось сохранить панораму"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Обработка..."</string>
+    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Не удалось сохранить файл"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
     <string name="pano_capture_indication" msgid="7431983072966619171">"Создание панорамы..."</string>
     <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Сохранение..."</string>
@@ -113,12 +113,21 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Закат"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
     <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Выбрать видео"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Поставьте устройство на твердую поверхность и убедитесь, что позади вас нет движущихся предметов или людей."\n\n"Затем отойдите от камеры."</string>
+    <string name="bg_replacement_message" msgid="7540788298745332389">"Установите устройство на твердой поверхности и убедитесь, что позади вас нет движущихся предметов или людей."\n\n"Затем отойдите, чтобы вас было видно в камеру."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Недоступно при использовании этого эффекта."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Чтобы сделать снимок при видеосъемке, нажмите на экран просмотра."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Невозможно сделать снимок при включенных спецэффектах."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Убрать эффекты"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Смешные рожицы"</string>
     <string name="effect_background" msgid="6909716214852487679">"Фон"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Кнопка \"Затвор\""</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Недавние фото"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Переключение на переднюю или заднюю камеру"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Переключатель между фото, видео и режимом панорамной съемки"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Дополнительные настройки"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Закрыть окно настроек"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Масштабирование"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Уменьшить %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Увеличить %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Переключить %1$s"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6d4beaa..e4861e9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Umiestnite zariadenie na pevný povrch a uistite sa, že sa za vami nič nehýbe."\n\n"Potom ustúpte zo záberu fotoaparátu."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavenie nie je možné vybrať pri zapnutom efekte."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Počas nahrávania videa môžete fotiť klepnutím na obrazovku ukážky."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Pri zapnutých špeciálnych efektoch je vytváranie snímok zakázané."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Vymazať efekty"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Bláznivé tváre"</string>
     <string name="effect_background" msgid="6909716214852487679">"Pozadie"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Tlačidlo uzávierky"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Posledná fotografia"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Prepínač medzi predným a zadným fotoaparátom"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Prepínač medzi panoramatickým režimom a režimami fotoaparátu a videokamery"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Ďalšie ovládacie prvky nastavenia"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zavrieť ovládacie prvky nastavenia"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ovládanie priblíženia/oddialenia"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Znížiť %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Zvýšiť %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Prepínač %1$s"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e457da1..2c1ccec 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite napravo na stabilno površino in se prepričajte, da za vami ni gibanja."\n\n"Nato se umaknite iz prizora."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tega ni mogoče izbrati, ko je vklopljen učinek."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Če želite med snemanjem videa fotografirati, tapnite zaslon za predogled."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videoposnetek je onemogočen, ko so vklopljeni posebni učinki."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Počisti učinke"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Norčavi obrazi"</string>
     <string name="effect_background" msgid="6909716214852487679">"Ozadje"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Gumb za fotografiranje"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Najnovejša fotografija"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Preklop med fotoaparatom na sprednji in na hrbtni strani"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Izbirnik fotoaparata, videokamere ali panorame"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Več kontrolnikov nastavitev"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zapri kontrolnike nastavitev"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Nadzor povečave/pomanjšave"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Pomanjšaj %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Povečaj %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Stikalo %1$s"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index db0fd1e..c053b0b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Поставите уређај на стабилну површину и уверите се да се иза вас ништа не помера."\n\n"Затим изађите из кадра камере."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ово није могуће изабрати када је ефекат укључен."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Снимите слику током снимања видео снимка додиром на екран за преглед."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Видео снимак је онемогућен када су специјални ефекти укључени."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Обриши ефекте"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Смешна лица"</string>
     <string name="effect_background" msgid="6909716214852487679">"Позадина"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Дугме затварача"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Новија фотографија"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Промена предње и задње камере"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Бирач камере, видео снимка или панораме"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Још контрола подешавања"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Затвори контроле подешавања"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Контрола зума"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Смањи %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Повећај %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Прекидач %1$s"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4f3c091..02fe5c1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -120,4 +120,14 @@
     <string name="clear_effects" msgid="5485339175014139481">"Ta bort effekter"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Roliga grimaser"</string>
     <string name="effect_background" msgid="6909716214852487679">"Bakgrund"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Slutarknappen"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Senaste fotot"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Kameraläge framåt/bakåt"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Väljare för kamera, video och panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Fler inställningskontroller"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Stäng inställningskontrollerna"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomkontroll"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Minska %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Öka %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s-växlare"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 17f7fd6..abcc475 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Weka kifaa chako sehemu imara isiyoyumba na hakikisha hakuna harakati zozote nyuma yako."\n" "\n" Kisha toka mbele ya kamera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hii haiwezi kuchagulika  wakati athari imewashwa."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Piga picha wakati video inarekodi kwa kugusa kwenye skrini ya onyesho la awali."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Picha ya video imelemazwa wakati athari maalum imewashwa."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Athari Wazi"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Sura pumbavu"</string>
     <string name="effect_background" msgid="6909716214852487679">"Mandhari nyuma"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Kitufe cha kilango cha kamera"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Picha ya hivi karibuni"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Geuza kamera mbele na nyuma"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera, video au kichaguzi panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mipangilio zaidi ya kudhibiti"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Mipangilio ya karibu ya kufunga"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Dhibiti kukuza"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Punguza %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"KOngeza %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Geuza %1$s"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ec70cdc..21cdc68 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"วางอุปกรณ์ของคุณบนพื้นผิวที่มั่นคงและแน่ใจว่าไม่มีการเคลื่อนไหวด้านหลังคุณ"\n\n"จากนั้นออกจากมุมมองของกล้อง"</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"เลือกการตั้งค่านี้ไม่ได้หากเปิดใช้เอฟเฟ็กต์อยู่"</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"ถ่ายภาพระหว่างการบันทึกวิดีโอโดยการแตะบนหน้าจอดูตัวอย่าง"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"การจับภาพวิดีโอจะถูกปิดใช้งานเมื่อเปิดใช้เอฟเฟ็กต์พิเศษ"</string>
     <string name="clear_effects" msgid="5485339175014139481">"ล้างเอฟเฟ็กต์"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"หน้าตลก"</string>
     <string name="effect_background" msgid="6909716214852487679">"พื้นหลัง"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"ปุ่มชัตเตอร์"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"ภาพล่าสุด"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"ปุ่มเปิด/ปิดกล้องด้านหน้าและด้านหลัง"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"ตัวเลือกกล้องถ่ายรูป วิดีโอ หรือภาพพาโนรามา"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"การควบคุมการตั้งค่าเพิ่มเติม"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"ปิดการควบคุมการตั้งค่า"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"การควบคุมการย่อ/ขยาย"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"ลดลง %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"เพิ่มขึ้น %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"ปุ่มเปิด/ปิด %1$s"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 882c783..e6b5a1b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Ipatong ang iyong device sa isang matatag na bagay at tiyaking walang kumikilos sa iyong likuran."\n\n"Pagkatapos ay umalis sa view ng camera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hindi ito napipili kapag naka-on ang effect."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Kumuha ng larawan habang nagre-record ng video sa pamamagitan ng pagtapik sa screen ng preview."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Hindi pinapagana ang snapshot sa video kapag naka-on ang mga espesyal na effect."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Mga clear na effect"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Mga katawa-tawang mukha"</string>
     <string name="effect_background" msgid="6909716214852487679">"Background"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Button ng shutter"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Pinakakamakailang larawan"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Switch ng camera sa harap at likod"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Tagapili ng camera, video o panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Higit pang mga kontrol ng setting"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Isara ang mga kontrol ng setting"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Kontrol ng pag-zoom"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Bawasan ang %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Dagdagan ang %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s na switch"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b33df35..e15728c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Cihazınızı sabit bir yüzeye yerleştirin ve arkanızda hiçbir hareket olmadığından emin olun."\n\n"Sonra kameranın görüş alanından çıkın."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Efekt açıkken bu ayar seçilemez."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Video kaydında önizleme ekranına hafifçe vurarak fotoğraf çekin."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Özel efektler açıkken video anlık görüntü yakalama devre dışıdır."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Efektleri temizle"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Komik suratlar"</string>
     <string name="effect_background" msgid="6909716214852487679">"Arka plan"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Deklanşör düğmesi"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"En son fotoğraf"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Ön/arka kamera anahtarı"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera, video veya panorama seçici"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Diğer ayar denetimleri"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Ayar denetimlerini kapat"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zum denetimi"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"%1$s azalt"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"%1$s artır"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s anahtarı"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 812bde5..063fef5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Покладіть свій пристрій на нерухому поверхню та переконайтеся, що за вами немає жодного руху."\n\n"Потім вийдіть із поля зору камери."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Це не можна вибрати, якщо ввімкнено ефект."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Зробіть фото під час відеозйомки, торкнувшись екрана перегляду."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Функцію миттєвого знімка відео вимкнено, коли ввімк. спецефекти."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Очистити ефекти"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Кумедні обличчя"</string>
     <string name="effect_background" msgid="6909716214852487679">"Фон"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Кнопка \"Витримка\""</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Останні фото"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Перемикач між передньою та задньою камерами"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Перемикач фото, відео чи панорами"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Інші елементи керування налаштуваннями"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Закрити елементи керування налаштуваннями"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Керувати масштабом"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Зменшити %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Збільшити %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Перемикач %1$s"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 02351da..6ede70f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Đặt thiết bị của bạn lên bề mặt chắc chắn và đảm bảo không có chuyển động nào phía sau bạn."\n\n"Sau đó, thoát khỏi chế độ xem của máy ảnh."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Không thể chọn cài đặt này khi hiệu ứng này bật."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Chụp ảnh khi đang quay video bằng cách bấm vào màn hình xem trước."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Chụp nhanh video bị vô hiệu khi các hiệu ứng đặc biệt được bật."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Xóa hiệu ứng"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Khuôn mặt ngớ ngẩn"</string>
     <string name="effect_background" msgid="6909716214852487679">"Nền"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Nút chụp"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Ảnh gần đây nhất"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Chuyển đổi giữa máy ảnh trước và sau"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Bộ chọn chế độ máy ảnh, video hoặc toàn cảnh"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Kiểm soát cài đặt khác"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Đóng kiểm soát cài đặt"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Điều khiển thu phóng"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Giảm %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Tăng %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Chuyển đổi %1$s"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7119905..9a1ad86 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"将您的设备放置在一个平稳的表面上,并确保您的身后没有任何移动的物体。"\n\n"然后走出摄像头的取景范围。"</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"无法在效果开启时选择此设置。"</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"录制视频时点按预览屏幕可拍摄照片。"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"启用特殊效果时停用视频快照。"</string>
     <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"趣味表情"</string>
     <string name="effect_background" msgid="6909716214852487679">"背景"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"“快门”按钮"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"最新照片"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"前视和后视相机开关"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"相机、视频或全景模式选择器"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"更多设置控件"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"关闭设置控件"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"缩放控件"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"减少%1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"增加%1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s开关"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 44a1872..b5be62f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"將您的裝置放在平穩的表面上,確定自己身後沒有移動的物體。"\n\n"然後離開相機鏡頭的視野範圍。"</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"效果啟用時無法選取這項設定。"</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"影片錄製期間,只要輕按預覽畫面即可拍攝相片。"</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"特殊效果啟用時無法使用影片快照。"</string>
     <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"耍笨臉"</string>
     <string name="effect_background" msgid="6909716214852487679">"背景"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"[快門] 按鈕"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"最近的相片"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"前置和後置鏡頭開關"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"相機、影片或全景選取工具"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"更多設定控制"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"關閉設定控制"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"縮放控制"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"縮小 %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"放大 %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s 開關"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c963b79..fbf3132 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -116,9 +116,18 @@
     <string name="bg_replacement_message" msgid="7540788298745332389">"Beka i-device yakho endaweni enganyakazi bese uqinisekisa ukuthi akukho ukunyakaza ngemuva kwakho."\n\n"Bese usuka lapho kubheke khona ikhamera."</string>
     <string name="not_selectable_in_effect" msgid="5093306709878914151">"Lokhu akukhetheki uma isinandisi sisavulekile."</string>
     <string name="video_snapshot_hint" msgid="6479115859014094906">"Thatha isithombe ngesikhathi sokuqoshwa kwevidyo ngokuchofoza eskrinini sokubuka ngaphambili kokudlala."</string>
-    <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
-    <skip />
+    <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Umfanekiso wevidyo awusebenzi uma izinandisi ezikhethekile zivuliwe."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Izinandisi ezicacile"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Ubuso obungasile"</string>
     <string name="effect_background" msgid="6909716214852487679">"Ingemuva"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Inkinobho Yokuvala"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Isithombe sakamuva"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Iswishi yekhamera yangaphambili kanye nangemuva"</string>
+    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Ikhamera, ividiyo noma ukhetho lwe-panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Okunye ukulawula kokuhlela"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Vala ukulawula kokuhlela"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ukulawula i-Zumu"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Nciphisa %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Yandisa %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s iswishi"</string>
 </resources>
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 8cc5816..685319f 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -122,6 +122,9 @@
     private Parameters mInitialParams;
     private boolean mFocusAreaSupported;
     private boolean mMeteringAreaSupported;
+    private boolean mAeLockSupported;
+    private boolean mAwbLockSupported;
+    private boolean mAeAwbLock;
 
     private MyOrientationEventListener mOrientationListener;
     // The degrees of the device rotated clockwise from its natural orientation.
@@ -1037,6 +1040,7 @@
             findViewById(R.id.btn_cancel).setVisibility(View.VISIBLE);
         } else {
             mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail);
+            mThumbnailView.enableFilter(false);
             mThumbnailView.setVisibility(View.VISIBLE);
         }
 
@@ -1177,6 +1181,7 @@
         }
         if (mModePicker != null) mModePicker.setEnabled(enable);
         if (mZoomControl != null) mZoomControl.setEnabled(enable);
+        if (mThumbnailView != null) mThumbnailView.setEnabled(enable);
     }
 
     public static int roundOrientation(int orientation) {
@@ -1357,7 +1362,19 @@
         // Do not do focus if there is not enough storage.
         if (pressed && !canTakePicture()) return;
 
+        // Lock AE and AWB so users can half-press shutter and recompose.
+        mAeAwbLock = pressed;
+        if (mAeAwbLock && (mAeLockSupported || mAwbLockSupported)) {
+            setCameraParameters(UPDATE_PARAM_PREFERENCE);
+        }
+
         mFocusManager.doFocus(pressed);
+
+        // Unlock AE and AWB after cancelAutoFocus. Camera API does not
+        // guarantee setParameters can be called during autofocus.
+        if (!mAeAwbLock && (mAeLockSupported || mAwbLockSupported)) {
+            setCameraParameters(UPDATE_PARAM_PREFERENCE);
+        }
     }
 
     @Override
@@ -1501,7 +1518,7 @@
             unregisterReceiver(mReceiver);
             mDidRegister = false;
         }
-        mLocationManager.recordLocation(false);
+        if (mLocationManager != null) mLocationManager.recordLocation(false);
         updateExposureOnScreenIndicator(0);
 
         mFocusManager.releaseSoundPlayer();
@@ -1743,6 +1760,7 @@
 
         setPreviewDisplay(mSurfaceHolder);
         setDisplayOrientation();
+        mAeAwbLock = false; // Unlock AE and AWB.
         setCameraParameters(UPDATE_PARAM_ALL);
         // If the focus mode is continuous autofocus, call cancelAutoFocus to
         // resume it because it may have been paused by autoFocus call.
@@ -1816,6 +1834,14 @@
     }
 
     private void updateCameraParametersPreference() {
+        if (mAeLockSupported) {
+            mParameters.setAutoExposureLock(mAeAwbLock);
+        }
+
+        if (mAwbLockSupported) {
+            mParameters.setAutoWhiteBalanceLock(mAeAwbLock);
+        }
+
         if (mFocusAreaSupported) {
             mParameters.setFocusAreas(mFocusManager.getFocusAreas());
         }
@@ -2078,7 +2104,7 @@
 
     private boolean switchToOtherMode(int mode) {
         if (isFinishing()) return false;
-        mImageSaver.waitDone();
+        if (mImageSaver != null) mImageSaver.waitDone();
         MenuHelper.gotoMode(mode, Camera.this);
         mHandler.removeMessages(FIRST_TIME_INIT);
         finish();
@@ -2213,5 +2239,7 @@
                 && isSupported(Parameters.FOCUS_MODE_AUTO,
                         mInitialParams.getSupportedFocusModes()));
         mMeteringAreaSupported = (mInitialParams.getMaxNumMeteringAreas() > 0);
+        mAeLockSupported = mInitialParams.isAutoExposureLockSupported();
+        mAwbLockSupported = mInitialParams.isAutoWhiteBalanceLockSupported();
     }
 }
diff --git a/src/com/android/camera/panorama/MosaicFrameProcessor.java b/src/com/android/camera/panorama/MosaicFrameProcessor.java
index 7660f5e..300e4e3 100644
--- a/src/com/android/camera/panorama/MosaicFrameProcessor.java
+++ b/src/com/android/camera/panorama/MosaicFrameProcessor.java
@@ -65,7 +65,8 @@
     private int mPreviewBufferSize;
 
     public interface ProgressListener {
-        public void onProgress(boolean isFinished, float panningRateX, float panningRateY);
+        public void onProgress(boolean isFinished, float panningRateX, float panningRateY,
+                float progressX, float progressY);
     }
 
     public MosaicFrameProcessor(int previewWidth, int previewHeight, int bufSize) {
@@ -173,11 +174,15 @@
 
                 // Publish progress of the ongoing processing
                 if (mProgressListener != null) {
-                    mProgressListener.onProgress(false, mPanningRateX, mPanningRateY);
+                    mProgressListener.onProgress(false, mPanningRateX, mPanningRateY,
+                            mTranslationLastX * HR_TO_LR_DOWNSAMPLE_FACTOR / mPreviewWidth,
+                            mTranslationLastY * HR_TO_LR_DOWNSAMPLE_FACTOR / mPreviewHeight);
                 }
             } else {
                 if (mProgressListener != null) {
-                    mProgressListener.onProgress(true, mPanningRateX, mPanningRateY);
+                    mProgressListener.onProgress(true, mPanningRateX, mPanningRateY,
+                            mTranslationLastX * HR_TO_LR_DOWNSAMPLE_FACTOR / mPreviewWidth,
+                            mTranslationLastY * HR_TO_LR_DOWNSAMPLE_FACTOR / mPreviewHeight);
                 }
             }
         }
@@ -211,20 +216,20 @@
         mTotalTranslationY += mDeltaY[idx];
         mTotalDeltaTime += mDeltaTime[idx];
 
-        mTranslationLastX = translationCurrX;
-        mTranslationLastY = translationCurrY;
-        mLastProcessedFrameTimestamp = now;
-        mOldestIdx = (mOldestIdx + 1) % WINDOW_SIZE;
-
         // The panning rate is measured as the rate of the translation percentage in
         // image width/height. Take the horizontal panning rate for example, the image width
         // used in finding the translation is (PreviewWidth / HR_TO_LR_DOWNSAMPLE_FACTOR).
         // To get the horizontal translation percentage, the horizontal translation,
         // (translationCurrX - mTranslationLastX), is divided by the
         // image width. We then get the rate by dividing the translation percentage with deltaTime.
-        mPanningRateX = mTotalTranslationX / (mPreviewWidth / HR_TO_LR_DOWNSAMPLE_FACTOR)
-                / mTotalDeltaTime;
-        mPanningRateY = mTotalTranslationY / (mPreviewHeight / HR_TO_LR_DOWNSAMPLE_FACTOR)
-                / mTotalDeltaTime;
+        mPanningRateX = mTotalTranslationX /
+                (mPreviewWidth / HR_TO_LR_DOWNSAMPLE_FACTOR) / mTotalDeltaTime;
+        mPanningRateY = mTotalTranslationY /
+                (mPreviewHeight / HR_TO_LR_DOWNSAMPLE_FACTOR) / mTotalDeltaTime;
+
+        mTranslationLastX = translationCurrX;
+        mTranslationLastY = translationCurrY;
+        mLastProcessedFrameTimestamp = now;
+        mOldestIdx = (mOldestIdx + 1) % WINDOW_SIZE;
     }
 }
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index f11bc3a..48a455e 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -49,8 +49,6 @@
 import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
 import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.net.Uri;
 import android.os.Bundle;
@@ -543,6 +541,7 @@
         mShutterButton.setBackgroundResource(R.drawable.btn_shutter_pan_recording);
         mCaptureIndicator.setVisibility(View.VISIBLE);
         showDirectionIndicators(PanoProgressBar.DIRECTION_NONE);
+        mThumbnailView.setEnabled(false);
 
         mCompassValueXStart = mCompassValueXStartBuffer;
         mCompassValueYStart = mCompassValueYStartBuffer;
@@ -554,13 +553,14 @@
 
         mMosaicFrameProcessor.setProgressListener(new MosaicFrameProcessor.ProgressListener() {
             @Override
-            public void onProgress(boolean isFinished, float panningRateX, float panningRateY) {
+            public void onProgress(boolean isFinished, float panningRateX, float panningRateY,
+                    float progressX, float progressY) {
                 if (isFinished
                         || (mMaxAngleX - mMinAngleX >= DEFAULT_SWEEP_ANGLE)
                         || (mMaxAngleY - mMinAngleY >= DEFAULT_SWEEP_ANGLE)) {
                     stopCapture(false);
                 } else {
-                    updateProgress(panningRateX);
+                    updateProgress(panningRateX, progressX, progressY);
                 }
             }
         });
@@ -580,6 +580,7 @@
         mCaptureIndicator.setVisibility(View.GONE);
         hideTooFastIndication();
         hideDirectionIndicators();
+        mThumbnailView.setEnabled(true);
 
         mMosaicFrameProcessor.setProgressListener(null);
         stopCameraPreview();
@@ -625,7 +626,7 @@
         mRightIndicator.setEnabled(false);
     }
 
-    private void updateProgress(float panningRate) {
+    private void updateProgress(float panningRate, float progressX, float progressY) {
         mMosaicView.setReady();
         mMosaicView.requestRender();
 
@@ -637,6 +638,7 @@
         } else {
             hideTooFastIndication();
         }
+        mPanoProgressBar.setProgress((int) (progressX * mHorizontalViewAngle));
     }
 
     private void createContentView() {
@@ -679,6 +681,7 @@
         mCaptureIndicator = (TextView) findViewById(R.id.pano_capture_indicator);
 
         mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail);
+        mThumbnailView.enableFilter(false);
 
         mReviewLayout = (View) findViewById(R.id.pano_review_layout);
         mReview = (ImageView) findViewById(R.id.pano_reviewarea);
@@ -773,11 +776,14 @@
                     int orientation = Exif.getOrientation(jpeg.data);
                     Uri uri = savePanorama(jpeg.data, jpeg.width, jpeg.height, orientation);
                     if (uri != null) {
-                        // Create a thumbnail whose width is equal or bigger
-                        // than the entire screen.
-                        int ratio = (int) Math.ceil((double) jpeg.width /
-                                mPanoLayout.getWidth());
-                        int inSampleSize = Integer.highestOneBit(ratio);
+                        // Create a thumbnail whose width or height is equal or bigger
+                        // than the screen's width or height.
+                        int widthRatio = (int) Math.ceil((double) jpeg.width
+                                / mPanoLayout.getWidth());
+                        int heightRatio = (int) Math.ceil((double) jpeg.height
+                                / mPanoLayout.getHeight());
+                        int inSampleSize = Integer.highestOneBit(
+                                Math.max(widthRatio, heightRatio));
                         mThumbnail = Thumbnail.createThumbnail(
                                 jpeg.data, orientation, inSampleSize, uri);
                     }
@@ -909,7 +915,6 @@
         releaseCamera();
         mMosaicView.onPause();
         clearMosaicFrameProcessorIfNeeded();
-        mSensorManager.unregisterListener(mListener);
         mOrientationEventListener.disable();
         System.gc();
     }
@@ -920,14 +925,6 @@
 
         mPausing = false;
         mOrientationEventListener.enable();
-        /*
-         * It is not necessary to get accelerometer events at a very high rate,
-         * by using a game rate (SENSOR_DELAY_UI), we get an automatic
-         * low-pass filter, which "extracts" the gravity component of the
-         * acceleration. As an added benefit, we use less power and CPU
-         * resources.
-         */
-        mSensorManager.registerListener(mListener, mSensor, SensorManager.SENSOR_DELAY_UI);
 
         mCaptureState = CAPTURE_STATE_VIEWFINDER;
         setupCamera();
@@ -938,55 +935,6 @@
         mMosaicView.onResume();
     }
 
-    private void updateCompassValue() {
-        if (mCaptureState == CAPTURE_STATE_VIEWFINDER) return;
-        // By what angle has the camera moved since start of capture?
-        mTraversedAngleX = (int) (mCompassValueX - mCompassValueXStart);
-        mTraversedAngleY = (int) (mCompassValueY - mCompassValueYStart);
-        mMinAngleX = Math.min(mMinAngleX, mTraversedAngleX);
-        mMaxAngleX = Math.max(mMaxAngleX, mTraversedAngleX);
-        mMinAngleY = Math.min(mMinAngleY, mTraversedAngleY);
-        mMaxAngleY = Math.max(mMaxAngleY, mTraversedAngleY);
-
-        // Use orientation to identify if the user is panning to the right or the left.
-        switch (mDeviceOrientation) {
-            case 0:
-                mPanoProgressBar.setProgress(-mTraversedAngleX);
-                break;
-            case 90:
-                mPanoProgressBar.setProgress(mTraversedAngleY);
-                break;
-            case 180:
-                mPanoProgressBar.setProgress(mTraversedAngleX);
-                break;
-            case 270:
-                mPanoProgressBar.setProgress(-mTraversedAngleY);
-                break;
-        }
-        mPanoProgressBar.invalidate();
-    }
-
-    private final SensorEventListener mListener = new SensorEventListener() {
-        public void onSensorChanged(SensorEvent event) {
-            if (event.sensor.getType() == Sensor.TYPE_GYROSCOPE) {
-                if (mTimestamp != 0) {
-                    final float dT = (event.timestamp - mTimestamp) * NS2S;
-                    mCompassValueX += event.values[1] * dT * 180.0f / Math.PI;
-                    mCompassValueY += event.values[0] * dT * 180.0f / Math.PI;
-                    mCompassValueXStartBuffer = mCompassValueX;
-                    mCompassValueYStartBuffer = mCompassValueY;
-                    updateCompassValue();
-                }
-                mTimestamp = event.timestamp;
-
-            }
-        }
-
-        @Override
-        public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        }
-    };
-
     public MosaicJpeg generateFinalMosaic(boolean highRes) {
         if (mMosaicFrameProcessor.createMosaic(highRes) == Mosaic.MOSAIC_RET_CANCELLED) {
             return null;
diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java
index 606524b..c4a4d49 100644
--- a/src/com/android/camera/ui/EffectSettingPopup.java
+++ b/src/com/android/camera/ui/EffectSettingPopup.java
@@ -36,19 +36,30 @@
 // effects.
 public class EffectSettingPopup extends AbstractSettingPopup implements
         AdapterView.OnItemClickListener, View.OnClickListener {
-    private final String TAG = "EffectSettingPopup";
+    private static final String TAG = "EffectSettingPopup";
+    private String mNoEffect;
     private IconListPreference mPreference;
     private Listener mListener;
     private View mClearEffects;
     private GridView mSillyFacesGrid;
     private GridView mBackgroundGrid;
 
+    // Data for silly face items. (text, image, and preference value)
+    ArrayList<HashMap<String, Object>> mSillyFacesItem =
+            new ArrayList<HashMap<String, Object>>();
+
+    // Data for background replacer items. (text, image, and preference value)
+    ArrayList<HashMap<String, Object>> mBackgroundItem =
+            new ArrayList<HashMap<String, Object>>();
+
+
     static public interface Listener {
         public void onSettingChanged();
     }
 
     public EffectSettingPopup(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mNoEffect = context.getString(R.string.pref_video_effect_default);
     }
 
     @Override
@@ -64,6 +75,7 @@
         mPreference = preference;
         Context context = getContext();
         CharSequence[] entries = mPreference.getEntries();
+        CharSequence[] entryValues = mPreference.getEntryValues();
         int[] iconIds = mPreference.getImageIds();
         if (iconIds == null) {
             iconIds = mPreference.getLargeIconIds();
@@ -72,39 +84,45 @@
         // Set title.
         mTitle.setText(mPreference.getTitle());
 
-        // Prepare goofy face GridView.
-        ArrayList<HashMap<String, Object>> sillyFacesItem =
-                new ArrayList<HashMap<String, Object>>();
-        // The first is clear effect. Skip it.
-        for(int i = 1; i < EffectsRecorder.NUM_OF_GF_EFFECTS + 1; ++i) {
+        for(int i = 0; i < entries.length; ++i) {
+            String value = entryValues[i].toString();
+            if (value.equals(mNoEffect)) continue;  // no effect, skip it.
             HashMap<String, Object> map = new HashMap<String, Object>();
+            map.put("value", value);
             map.put("text", entries[i].toString());
             if (iconIds != null) map.put("image", iconIds[i]);
-            sillyFacesItem.add(map);
+            if (value.startsWith("goofy_face")) {
+                mSillyFacesItem.add(map);
+            } else if (value.startsWith("backdropper")) {
+                mBackgroundItem.add(map);
+            }
         }
-        SimpleAdapter sillyFacesItemAdapter = new SimpleAdapter(context,
-                sillyFacesItem, R.layout.effect_setting_item,
-                new String[] {"text", "image"},
-                new int[] {R.id.text, R.id.image});
-        mSillyFacesGrid.setAdapter(sillyFacesItemAdapter);
-        mSillyFacesGrid.setOnItemClickListener(this);
 
-        // Prepare background replacer GridView.
-        ArrayList<HashMap<String, Object>> backgroundItem =
-                new ArrayList<HashMap<String, Object>>();
-        for(int i = EffectsRecorder.NUM_OF_GF_EFFECTS + 1; i < entries.length; ++i) {
-            HashMap<String, Object> map = new HashMap<String, Object>();
-            map.put("text", entries[i].toString());
-            if (iconIds != null) map.put("image", iconIds[i]);
-            backgroundItem.add(map);
+        boolean hasSillyFaces = mSillyFacesItem.size() > 0;
+        boolean hasBackground = mBackgroundItem.size() > 0;
+
+        // Initialize goofy face if it is supported.
+        if (hasSillyFaces) {
+            findViewById(R.id.effect_silly_faces_title).setVisibility(View.VISIBLE);
+            mSillyFacesGrid.setVisibility(View.VISIBLE);
+            SimpleAdapter sillyFacesItemAdapter = new SimpleAdapter(context,
+                    mSillyFacesItem, R.layout.effect_setting_item,
+                    new String[] {"text", "image"},
+                    new int[] {R.id.text, R.id.image});
+            mSillyFacesGrid.setAdapter(sillyFacesItemAdapter);
+            mSillyFacesGrid.setOnItemClickListener(this);
         }
-        // Initialize background replacer if it is supported.
-        if (backgroundItem.size() > 0) {
+
+        if (hasSillyFaces && hasBackground) {
             findViewById(R.id.effect_background_separator).setVisibility(View.VISIBLE);
+        }
+
+        // Initialize background replacer if it is supported.
+        if (hasBackground) {
             findViewById(R.id.effect_background_title).setVisibility(View.VISIBLE);
             mBackgroundGrid.setVisibility(View.VISIBLE);
             SimpleAdapter backgroundItemAdapter = new SimpleAdapter(context,
-                    backgroundItem, R.layout.effect_setting_item,
+                    mBackgroundItem, R.layout.effect_setting_item,
                     new String[] {"text", "image"},
                     new int[] {R.id.text, R.id.image});
             mBackgroundGrid.setAdapter(backgroundItemAdapter);
@@ -120,8 +138,8 @@
             if (getVisibility() != View.VISIBLE) {
                 // Do not show or hide "Clear effects" button when the popup
                 // is already visible. Otherwise it looks strange.
-                int index = mPreference.findIndexOfValue(mPreference.getValue());
-                mClearEffects.setVisibility((index <= 0) ? View.GONE : View.VISIBLE);
+                boolean noEffect = mPreference.getValue().equals(mNoEffect);
+                mClearEffects.setVisibility(noEffect ? View.GONE : View.VISIBLE);
             }
             reloadPreference();
         }
@@ -131,19 +149,28 @@
     // The value of the preference may have changed. Update the UI.
     @Override
     public void reloadPreference() {
-        int index = mPreference.findIndexOfValue(mPreference.getValue());
-        if (index >= 0) {
-            mBackgroundGrid.setItemChecked(mBackgroundGrid.getCheckedItemPosition(), false);
-            mSillyFacesGrid.setItemChecked(mSillyFacesGrid.getCheckedItemPosition(), false);
-            if (index >= 1 && index < EffectsRecorder.NUM_OF_GF_EFFECTS + 1) {
-                mSillyFacesGrid.setItemChecked(index - 1, true);
-            } else if (index >= EffectsRecorder.NUM_OF_GF_EFFECTS + 1) {
-                mBackgroundGrid.setItemChecked(index - EffectsRecorder.NUM_OF_GF_EFFECTS - 1, true);
+        mBackgroundGrid.setItemChecked(mBackgroundGrid.getCheckedItemPosition(), false);
+        mSillyFacesGrid.setItemChecked(mSillyFacesGrid.getCheckedItemPosition(), false);
+
+        String value = mPreference.getValue();
+        if (value.equals(mNoEffect)) return;
+
+        for (int i = 0; i < mSillyFacesItem.size(); i++) {
+            if (value.equals(mSillyFacesItem.get(i).get("value"))) {
+                mSillyFacesGrid.setItemChecked(i, true);
+                return;
             }
-        } else {
-            Log.e(TAG, "Invalid preference value.");
-            mPreference.print();
         }
+
+        for (int i = 0; i < mBackgroundItem.size(); i++) {
+            if (value.equals(mBackgroundItem.get(i).get("value"))) {
+                mBackgroundGrid.setItemChecked(i, true);
+                return;
+            }
+        }
+
+        Log.e(TAG, "Invalid preference value: " + value);
+        mPreference.print();
     }
 
     public void setSettingChangedListener(Listener listener) {
@@ -154,10 +181,11 @@
     public void onItemClick(AdapterView<?> parent, View view,
             int index, long id) {
         if (parent == mSillyFacesGrid) {
-            // The first one is clear effect.
-            mPreference.setValueIndex(index + 1);
-        } else { // Background replace grid.
-            mPreference.setValueIndex(index + EffectsRecorder.NUM_OF_GF_EFFECTS + 1);
+            String value = (String) mSillyFacesItem.get(index).get("value");
+            mPreference.setValue(value);
+        } else if (parent == mBackgroundGrid) {
+            String value = (String) mBackgroundItem.get(index).get("value");
+            mPreference.setValue(value);
         }
         reloadPreference();
         if (mListener != null) mListener.onSettingChanged();
@@ -166,7 +194,7 @@
     @Override
     public void onClick(View v) {
         // Clear the effect.
-        mPreference.setValueIndex(0);
+        mPreference.setValue(mNoEffect);
         reloadPreference();
         if (mListener != null) mListener.onSettingChanged();
     }
diff --git a/src/com/android/camera/ui/SharePopup.java b/src/com/android/camera/ui/SharePopup.java
index 84bada4..3917c54 100644
--- a/src/com/android/camera/ui/SharePopup.java
+++ b/src/com/android/camera/ui/SharePopup.java
@@ -198,10 +198,9 @@
                 new RelativeLayout.LayoutParams(lpOld.width, lpOld.height);
 
         mRootView.setBackgroundDrawable(null);
-        if (mBitmapWidth > mBitmapHeight*2) {
+        if (mBitmapWidth > mBitmapHeight * 2 || mBitmapHeight > mBitmapWidth * 2) {
             // panorama image
-            lpNew.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-            lpNew.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+            lpNew.addRule(RelativeLayout.CENTER_HORIZONTAL);
             lpNew.addRule(RelativeLayout.CENTER_VERTICAL);
 
             // panorama images block the preview from showing in the background
diff --git a/tests/src/com/android/camera/stress/SwitchPreview.java b/tests/src/com/android/camera/stress/SwitchPreview.java
index 6af915e..c5dd7c1 100755
--- a/tests/src/com/android/camera/stress/SwitchPreview.java
+++ b/tests/src/com/android/camera/stress/SwitchPreview.java
@@ -97,10 +97,13 @@
             for (int i=0; i< TOTAL_NUMBER_OF_SWITCHING; i++) {
                 Thread.sleep(WAIT_FOR_PREVIEW);
                 Intent intent = new Intent();
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 intent.setClass(getInstrumentation().getTargetContext(),
                         VideoCamera.class);
                 getActivity().startActivity(intent);
                 Thread.sleep(WAIT_FOR_PREVIEW);
+                intent = new Intent();
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 intent.setClass(getInstrumentation().getTargetContext(),
                         Camera.class);
                 getActivity().startActivity(intent);