diff --git a/jni/feature_mos/src/mosaic/Blend.cpp b/jni/feature_mos/src/mosaic/Blend.cpp
index 18972ee..cce89ff 100644
--- a/jni/feature_mos/src/mosaic/Blend.cpp
+++ b/jni/feature_mos/src/mosaic/Blend.cpp
@@ -226,14 +226,25 @@
     yTopMost = max(0, max(yTopCorners[0], yTopCorners[1]) - fullRect.top + 1);
     yBottomMost = min(Mheight - 1, min(yBottomCorners[0], yBottomCorners[1]) - fullRect.top - 1);
 
+    if (xRightMost <= xLeftMost || yBottomMost <= yTopMost)
+    {
+        LOGE("RunBlend: aborting -consistency check failed,"
+             "(xLeftMost, xRightMost, yTopMost, yBottomMost): (%d, %d, %d, %d)",
+             xLeftMost, xRightMost, yTopMost, yBottomMost);
+        return BLEND_RET_ERROR;
+    }
+
     // Make sure image width is multiple of 4
     Mwidth = (unsigned short) ((Mwidth + 3) & ~3);
     Mheight = (unsigned short) ((Mheight + 3) & ~3);    // Round up.
 
-    if (Mwidth < width || Mheight < height || xRightMost <= xLeftMost)
+    ret = MosaicSizeCheck(LIMIT_SIZE_MULTIPLIER, LIMIT_HEIGHT_MULTIPLIER);
+    if (ret != BLEND_RET_OK)
     {
-        LOGE("RunBlend: aborting - consistency check failed, w=%d, h=%d, xLeftMost=%d, xRightMost=%d", Mwidth, Mheight, xLeftMost, xRightMost);
-        return BLEND_RET_ERROR;
+       LOGE("RunBlend: aborting - mosaic size check failed, "
+            "(frame_width, frame_height) vs (mosaic_width, mosaic_height): "
+            "(%d, %d) vs (%d, %d)", width, height, Mwidth, Mheight);
+       return ret;
     }
 
     LOGI("Allocate mosaic image for blending - size: %d x %d", Mwidth, Mheight);
@@ -296,6 +307,26 @@
     return ret;
 }
 
+int Blend::MosaicSizeCheck(float sizeMultiplier, float heightMultiplier) {
+   if (Mwidth < width || Mheight < height) {
+        return BLEND_RET_ERROR;
+    }
+
+   if ((Mwidth * Mheight) > (width * height * sizeMultiplier)) {
+         return BLEND_RET_ERROR;
+   }
+
+   // We won't do blending for the cases where users swing the device too much
+   // in the secondary direction. We use a short side to determine the
+   // secondary direction because users may hold the device in landsape
+   // or portrait.
+   int shortSide = min(Mwidth, Mheight);
+   if (shortSide > height * heightMultiplier) {
+       return BLEND_RET_ERROR;
+   }
+
+   return BLEND_RET_OK;
+}
 
 int Blend::FillFramePyramid(MosaicFrame *mb)
 {
diff --git a/jni/feature_mos/src/mosaic/Blend.h b/jni/feature_mos/src/mosaic/Blend.h
index 80bb577..ebb3bdc 100644
--- a/jni/feature_mos/src/mosaic/Blend.h
+++ b/jni/feature_mos/src/mosaic/Blend.h
@@ -113,6 +113,11 @@
 
   int  PerformFinalBlending(YUVinfo &imgMos, MosaicRect &cropping_rect);
   void CropFinalMosaic(YUVinfo &imgMos, MosaicRect &cropping_rect);
+
+private:
+   static const float LIMIT_SIZE_MULTIPLIER = 5.0f * 2.0f;
+   static const float LIMIT_HEIGHT_MULTIPLIER = 2.5f;
+   int MosaicSizeCheck(float sizeMultiplier, float heightMultiplier);
 };
 
 #endif
diff --git a/res/layout-sw600dp/pano_review.xml b/res/layout-sw600dp/pano_review.xml
index c16df1a..cf1fb54 100644
--- a/res/layout-sw600dp/pano_review.xml
+++ b/res/layout-sw600dp/pano_review.xml
@@ -28,18 +28,19 @@
 
         <com.android.camera.ui.RotateLayout
                 android:id="@+id/pano_review_cancel_button_layout"
-                android:layout_gravity="center_vertical"
+                android:layout_gravity="right|center_vertical"
                 android:layout_marginRight="20dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
             <TextView android:id="@+id/pano_review_cancel_button"
                     android:text="@string/review_cancel"
-                    android:gravity="right"
+                    android:background="@drawable/bg_pressed"
+                    android:gravity="center"
                     android:clickable="true"
                     android:onClick="onCancelButtonClicked"
-                    android:textAppearance="?android:textAppearanceMedium"
+                    android:textSize="12sp"
                     android:minWidth="@dimen/pano_review_button_width"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_width="wrap_content" />
         </com.android.camera.ui.RotateLayout>
     </LinearLayout>
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index 33a8c7a..b7348b4 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -63,7 +63,7 @@
                     android:layout_width="0dp"
                     android:background="@color/mode_selection_border"
                     android:visibility="gone" />
-            <com.android.camera.ui.ColorFilterImageView
+            <com.android.camera.ui.TwoStateImageView
                     android:id="@+id/back_to_first_level"
                     android:layout_height="match_parent"
                     android:layout_width="wrap_content"
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 2900a5a..fa4f83b 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -65,16 +65,18 @@
 
         <com.android.camera.ui.RotateLayout
                 android:id="@+id/pano_review_cancel_button_layout"
-                android:layout_gravity="center_horizontal"
+                android:layout_gravity="bottom|center_horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
             <TextView android:id="@+id/pano_review_cancel_button"
                     android:text="@string/review_cancel"
+                    android:background="@drawable/bg_pressed"
+                    android:gravity="center"
                     android:clickable="true"
                     android:onClick="onCancelButtonClicked"
-                    android:textAppearance="?android:textAppearanceMedium"
+                    android:textSize="12sp"
                     android:minWidth="@dimen/pano_review_button_width"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_width="wrap_content" />
         </com.android.camera.ui.RotateLayout>
     </LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f8c3735..bd69cb5 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Herstel Kamera se verstekinstellings?"</string>
     <string name="review_play" msgid="6378271587740884696">"Speel"</string>
     <string name="review_cancel" msgid="8188009385853399254">"KANSELLEER"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <string name="review_ok" msgid="1156261588693116433">"KLAAR"</string>
     <string name="review_retake" msgid="7804864054896088338">"HERNEEM"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galery"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Wissel kamera"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index cf0a28d..b0f8914 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"የካሜራ ነባሪ ቅንጅቶችን እነበረበት መልስ?"</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_ok" msgid="1156261588693116433">"ተከናውኗል"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"ፀሀይ ስትጠልቅ"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ዲስኮ"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"የራስህን  ምረጥ"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"መሳሪያህን ወደታች"\n" አስቀምጥ ለትንሽ ቆይታ ከዕይታ ውጪ ሁን"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"ማሳመሪያው ሲበራ  ሊመረጥ አይችልም::"</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"የቅድመ ዕይታ ማያን በመዳሰስ በማድረግ በቪዲዮ ቀረፃ ጊዜ ፎቶ አንሳ።"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"ቪዲዮ ማንሻ ልዩ ማሳመሪያዎች ሲበሩ ይቦዝናል::"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cafe4c1..2fba39f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"هل تريد استعادة إعدادات الكاميرا الافتراضية؟"</string>
     <string name="review_play" msgid="6378271587740884696">"تشغيل"</string>
     <string name="review_cancel" msgid="8188009385853399254">"إلغاء"</string>
-    <string name="review_ok" msgid="5305096180300056529">"موافق"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"موافق"</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>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1ab9dd8..b99dc18 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Аднавіць налады камеры па змаўчанні?"</string>
     <string name="review_play" msgid="6378271587740884696">"Прайграць"</string>
     <string name="review_cancel" msgid="8188009385853399254">"АДМЯНІЦЬ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"ОК"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"ОК"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Заход"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Дыскатэка"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Выбірайце свой"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Усталюйце прыладу"\n"На імгненне выйдзіце з поля зроку"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Немагчыма выбраць, калі эфект уключаны."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Зрабіце фота падчас запiсу вiдэа, дакрануўшыся да экрану папярэдняга прагляду."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Капiяванне кадра з відэа адключаецца, калі ўключаны спецэфекты."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8a897f9..2785182 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Да се възстановят ли стандартните настройки на камерата?"</string>
     <string name="review_play" msgid="6378271587740884696">"Пускане"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ОТКАЗ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залез"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Изберете сами"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Оставете устройството си"\n"Отдръпнете се от зрителното му поле за момент"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Не може да се избира при включен ефект."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Снимайте при видеозапис, докосвайки екрана за визуализация."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Моментните снимки в клиповете са деакт. при вкл. спец. ефекти."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 574ab90..07e1f69 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Vols restaurar la configuració predeterminada de la càmera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Reprodueix"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCEL·LA"</string>
-    <string name="review_ok" msgid="5305096180300056529">"D\'acord"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"D\'acord"</string>
     <string name="review_retake" msgid="7804864054896088338">"TORNA A CAPTURAR-LA"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Canvia la càmera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Posta del sol"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Tria la teva"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Deixa el dispositiu"\n"Surt un moment de la visualització"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"No es pot seleccionar quan l\'efecte està activat."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Si vols fer una foto mentre graves, toca la pant. visual. prèvia."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Les instantànies del vídeo es desactiven quan hi ha els efectes especials activats."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 41c92ff..1d92131 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Obnovit výchozí nastavení fotoaparátu?"</string>
     <string name="review_play" msgid="6378271587740884696">"Přehrát"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ZRUŠIT"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"Pořídit další"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerie"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Přepnout fotoaparát"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Západ slunce"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Vybrat vlastní"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Odlište své zařízení od ostatních"\n"Vystupte na chvíli z řady"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Nastavení nelze vybrat, pokud je efekt zapnutý."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Během nahrávání videa lze fotit klepnutím na obrazovku náhledu."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Jsou-li zapnuty zvláštní efekty, jsou snímky videa zakázány."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 39b4f54..8c28e06 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Vil du gendanne kameraets standardindstillinger?"</string>
     <string name="review_play" msgid="6378271587740884696">"Afspil"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULLER"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <string name="review_ok" msgid="1156261588693116433">"FÆRDIG"</string>
     <string name="review_retake" msgid="7804864054896088338">"TAG IGEN"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galleri"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Skift kamera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Vælg din egen"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Stil din enhed ned"\n"Træd ud af synsvinklen et øjeblik"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Kan ikke vælges, når effekten er slået til."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Tryk på eksempelskærmen for at tage et foto under videooptagelse."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videoøjebliksbilleder deaktiveres, når specialeffekter er tændt."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ba6ed91..05bdc58 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Standardeinstellungen der Kamera wiederherstellen?"</string>
     <string name="review_play" msgid="6378271587740884696">"Wiedergabe"</string>
     <string name="review_cancel" msgid="8188009385853399254">"Abbrechen"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"Erneut aufnehmen"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerie"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Kamera wechseln"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sonnenuntergang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Eigenes wählen"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Legen Sie Ihr Gerät ab."\n"Treten Sie für einen kurzen Moment aus dem Aufnahmebereich."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Einstellung nicht wählbar, wenn Effekt aktiviert ist"</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Durch Tippen Foto während Videoaufzeichnung aufnehmen"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video-Schnappschuss ist bei Spezialeffekten deaktiviert."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 13e0452..fad5cf0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Επαναφορά προεπιλεγμένων ρυθμίσεων φωτογραφικής μηχανής;"</string>
     <string name="review_play" msgid="6378271587740884696">"Αναπαρ."</string>
     <string name="review_cancel" msgid="8188009385853399254">"ΑΚΥΡΩΣΗ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"ΟΚ"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Δύση ηλίου"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Ντίσκο"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Επιλέξτε το δικό σας"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Αφήστε τη συσκευή σας κάτω"\n"Απομακρυνθείτε από το πεδίο προβολής"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Δεν υπάρχει δυνατότητα επιλογής όταν το εφέ είναι ενεργοποιημένο."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Βγάλτε μια φωτογραφία κατά τη διάρκεια της εγγραφής βίντεο πατώντας την οθόνη προεπισκόπησης."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Το στιγμιότυπο οθόνης βίντεο απενεργοποιείται με ενεργά τα εφέ."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8efd046..3a7faff 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Restore Camera default settings?"</string>
     <string name="review_play" msgid="6378271587740884696">"Play"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCEL"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <string name="review_ok" msgid="1156261588693116433">"DONE"</string>
     <string name="review_retake" msgid="7804864054896088338">"RETAKE"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Gallery"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Switch Camera"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bb16f33..d657b50 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"¿Deseas restablecer la configuración predeterminada de Cámara?"</string>
     <string name="review_play" msgid="6378271587740884696">"Reproducir"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Aceptar"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Aceptar"</string>
     <string name="review_retake" msgid="7804864054896088338">"VOLVER A TOMAR"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galería"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Cambiar cámara"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Crepúsculo"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Elige tu fondo"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Desactiva el dispositivo."\n"Deja de usarlo durante unos minutos."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"No se puede seleccionar si se activó el efecto."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Toca la pant. de vista prev. mientras grabas para tomar una foto."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Las instantáneas de video se inhabilitan al activar los efectos."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8694ba5..be1eb82 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"¿Restaurar ajustes predeterminados de la cámara?"</string>
     <string name="review_play" msgid="6378271587740884696">"Reproducir"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Aceptar"</string>
+    <string name="review_ok" msgid="1156261588693116433">"LISTO"</string>
     <string name="review_retake" msgid="7804864054896088338">"VOLVER A REALIZAR"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galería"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Cambiar cámara"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Atardecer"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Personalizada"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Desactiva el dispositivo."\n"Deja de usarlo durante unos minutos."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"No se puede seleccionar si el efecto está activado."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Toca la pantalla de vista previa para hacer una foto mientras grabas vídeo."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"La instantánea de vídeo se inhabilita al activar efectos especiales."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8978e66..c94092c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Kas taastada kaamera vaikeseaded?"</string>
     <string name="review_play" msgid="6378271587740884696">"Esita"</string>
     <string name="review_cancel" msgid="8188009385853399254">"TÜHISTA"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"TEE UUESTI"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerii"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Vaheta kaamerat"</string>
@@ -113,7 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Päikeseloojang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Valige ise"</string>
-    <string name="bg_replacement_message" msgid="6828585054971662284">"Pange seade käest ära"\n"Astuge korraks vaateväljast ära"</string>
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Pange seade käest"\n"Lahkuge korraks vaateväljast"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Võimatu valida, kui efekt on sisse lülitatud."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Videot salvestades foto jäädvustamiseks koputage eelvaate kuval."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Kui eriefektid on sisse lülitatud, on video hetktõmmis keelatud."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4938842..ac45d88 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"بازیابی تنظیمات پیش‌فرض دوربین؟"</string>
     <string name="review_play" msgid="6378271587740884696">"پخش"</string>
     <string name="review_cancel" msgid="8188009385853399254">"لغو"</string>
-    <string name="review_ok" msgid="5305096180300056529">"تأیید"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"تأیید"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"غروب آفتاب"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"دیسکو"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"انتخاب مورد خود"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"دستگاه خود را کنار بگذارید"\n"چند لحظه از دید خارج شوید"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"زمان روشن بودن جلوه قابل انتخاب نیست."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"در حین ضبط ویدیو با لمس کردن صفحه پیش‌نمایش یک عکس بگیرید."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"هنگام فعال بودن جلوه‌های ویژه، عکس فوری از ویدیو غیرفعال است."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d5d402a..29d8be7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Palautetaanko kameran oletusasetukset?"</string>
     <string name="review_play" msgid="6378271587740884696">"Toista"</string>
     <string name="review_cancel" msgid="8188009385853399254">"PERUUTA"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"UUSI KUVA"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galleria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Vaihda kameraa"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Auringonlasku"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Valitse oma"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Aseta laite alustalle"\n"Astu hetkeksi pois kuvasta"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Ei valittavissa, kun tehoste on käytössä."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Ota kuva videokuvauksen aikana koskettamalla esikatseluruutua."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videon kuvakaappausta ei voi käyttää erikoistehosteiden kanssa."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5807c33..4104e31 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Rétablir les paramètres par défaut de l\'appareil photo ?"</string>
     <string name="review_play" msgid="6378271587740884696">"Lire"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULER"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"AUTRE PHOTO"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerie"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Changer de caméra"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Coucher soleil"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Sélectionner arrière-plan"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Posez votre appareil."\n"Sortez du cadre quelques instants."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Sélection impossible lorsque l\'effet est activé."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Appuyez sur écran aperçu pour prendre photo pendant enreg. vidéo."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instantané vidéo désactivé en cas d\'activation des effets spéciaux."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 85321fd..d0dbfe7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"कैमरा डिफ़ॉल्‍ट सेटिंग पुनर्स्‍थापित करें?"</string>
     <string name="review_play" msgid="6378271587740884696">"चलाएं"</string>
     <string name="review_cancel" msgid="8188009385853399254">"रद्द करें"</string>
-    <string name="review_ok" msgid="5305096180300056529">"ठीक"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"ठीक"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"सूर्यास्त"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"डिस्को"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"स्‍वयं का चुनें"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"अपने उपकरण को सेट करें"\n"कुछ समय के लिए दृश्य से बाहर निकलें"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"प्रभाव के चालू होने पर चयन योग्‍य नहीं."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"वीडियो रिकॉ. के समय पूर्वावलोकन स्‍क्रीन स्‍पर्श करके फ़ोटो लें."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"विशेष प्रभावों के चालू होने पर वीडियो स्‍नेपशॉट अक्षम हो जाता है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1bb632f..194d763 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Vratiti zadane postavke fotoaparata?"</string>
     <string name="review_play" msgid="6378271587740884696">"Reproduk."</string>
     <string name="review_cancel" msgid="8188009385853399254">"ODUSTANI"</string>
-    <string name="review_ok" msgid="5305096180300056529">"U redu"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"U redu"</string>
     <string name="review_retake" msgid="7804864054896088338">"PONOVNO SNIMANJE"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerija"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Promijeni kameru"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zalazak sunca"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Odaberite svoj"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Odložite uređaj"\n"Na trenutak izađite iz vidokruga"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Kada je efekt uključen ne može se odabirati."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Tijekom snimanja videozapisa dodirom zaslona pregleda snimite fotografiju."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Fotografiranje је onemogućeno kada su posebni efekti uključeni."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fbda5bb..fe8f71c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Visszaállítja a fényképezőgép alapértelmezett beállításait?"</string>
     <string name="review_play" msgid="6378271587740884696">"Lejátszás"</string>
     <string name="review_cancel" msgid="8188009385853399254">"MÉGSE"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <string name="review_ok" msgid="1156261588693116433">"KÉSZ"</string>
     <string name="review_retake" msgid="7804864054896088338">"ÚJ FELVÉTEL"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galéria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Kamera váltása"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Napnyugta"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Diszkó"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Saját videó"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Tegye le a készüléket"\n"Lépjen ki a képből egy pillanatra"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Nem választható, ha a hatás be van kapcsolva."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Az előnézeti képernyő megérintésével fényképet készíthet."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"A video-pillanatfelvétel letiltva speciális effektek esetén."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0ad11cb..e1495e1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Pulihkan setelan bawaan Kamera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Putar"</string>
     <string name="review_cancel" msgid="8188009385853399254">"BATAL"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"AMBIL ULANG"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeri"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Ubah Kamera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Mthari trbenam"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Plh mlik sndri"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Setel perangkat Anda ke bawah"\n"Keluarkan dari tampilan untuk beberapa saat"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Tidak dapat dipilih jika efek dinyalakan."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Ambil foto saat merekam video dengan menyentuh layar pratinjau."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Cuplikan video dinonaktifkan bila efek khusus aktif."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 588b02a..d85ff5b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Ripristinare le impostazioni predefinite della fotocamera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Riproduci"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULLA"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <string name="review_ok" msgid="1156261588693116433">"FINE"</string>
     <string name="review_retake" msgid="7804864054896088338">"SCATTA DI NUOVO"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galleria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Cambia fotocamera"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 047f7ae..12ca9de 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"לשחזר את הגדרות ברירת המחדל של המצלמה?"</string>
     <string name="review_play" msgid="6378271587740884696">"הפעל"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ביטול"</string>
-    <string name="review_ok" msgid="5305096180300056529">"אישור"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"אישור"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"שקיעה"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"דיסקו"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"בחר פריט משלך"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"הנח את המכשיר"\n"צא לרגע מהתמונה"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"לא ניתן לבחירה כאשר האפקט מופעל."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"צלם תמונה במהלך הקלטת סרטון וידאו על ידי נגיעה במסך התצוגה המקדימה."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"האפשרות לצילום תמונה מסרטון וידאו מושבתת כאשר אפקטים מיוחדים מופעלים."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index be00d08..ffcac01 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"カメラをデフォルト設定に戻しますか？"</string>
     <string name="review_play" msgid="6378271587740884696">"再生"</string>
     <string name="review_cancel" msgid="8188009385853399254">"キャンセル"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"夕焼け"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ディスコ"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"ギャラリーから"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"端末をセッティングします"\n"少しの間フレームの外に出ます"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"効果がONのときは選択できません。"</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"動画の録画中にプレビュー画面をタップすると静止画を撮影できます。"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"動画スナップショットは特殊効果がONのときは無効です。"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 283838b..6b09a4c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"카메라 기본 설정값을 복원하시겠습니까?"</string>
     <string name="review_play" msgid="6378271587740884696">"재생"</string>
     <string name="review_cancel" msgid="8188009385853399254">"취소"</string>
-    <string name="review_ok" msgid="5305096180300056529">"확인"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"확인"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"일몰"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"디스코"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"내 동영상 선택"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"기기를 내려놓습니다."\n"잠시 동안 시야를 벗어납니다."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"효과를 사용 중일 때는 선택할 수 없습니다."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"동영상을 촬영하는 동안 미리보기 화면을 터치하여 사진을 찍을 수 있습니다."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"특수 효과가 설정되어 있으면 동영상 스냅샷이 사용 중지됩니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f0823f7..cedfdb7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Atkurti numatytuosius fotoaparato nustatymus?"</string>
     <string name="review_play" msgid="6378271587740884696">"Paleisti"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ATŠAUKTI"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Gerai"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Gerai"</string>
     <string name="review_retake" msgid="7804864054896088338">"FOTOGRAFUOTI IŠ NAUJO"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerija"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Perjungti fotokamerą"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulėlydis"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Pasir. savo"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Išjunkite įrenginį"\n"Trumpam pašalinkite iš rodinio"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Negalima pasirinkti, kai įjungtas efektas."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Kai įrašomas vaizdo įraš., fotograf. paliesdami peržiūros ekraną."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Moment. vaizdo įrašo vaizdas neleidž., kai įjungti spec. efektai."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3b67d1b..b37617b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Vai atjaunot kameras noklusējuma iestatījumus?"</string>
     <string name="review_play" msgid="6378271587740884696">"Atskaņot"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ATCELT"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Labi"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Labi"</string>
     <string name="review_retake" msgid="7804864054896088338">"Uzņemt vēlreiz"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerija"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Pārslēgt kameru"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulriets"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Izvēlēties"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Novietojiet ierīci uz leju."\n"Uz brīdi izejiet no kameras skata."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Šo iestat. nevar atlasīt, kad ir ieslēgts efekts."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Uzņemiet fotoatt. videoieraksta laikā, piesk. priekšsk. ekrānam."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video momentuzņēmums ir atspējots, ja ir ieslēgti specefekti."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 49f2581..dfee85c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Pulihkan tetapan lalai Kamera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Main"</string>
     <string name="review_cancel" msgid="8188009385853399254">"BATAL"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"AMBIL SEMULA"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeri"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Tukar Kamera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Matahari Terbenam"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Plh milik sndr"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Tetapkan peranti anda ke bawah"\n"Keluar dari pandangan seketika"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Tidak boleh dipilih apabila kesan dihidupkan."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Ambil gmbr semasa rakaman video dgn menyentuh pd skrin pratonton."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Petikan video dilumpuhkan apabila kesan khas dihidupkan."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 59fe342..28435a3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Vil du gjenopprette standardinnstillingene for kameraet?"</string>
     <string name="review_play" msgid="6378271587740884696">"Spill av"</string>
     <string name="review_cancel" msgid="8188009385853399254">"Avbryt"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"Ta på nytt"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galleri"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Bytt kamera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Velg din egen"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Sett enheten ned"\n"Hold deg ute av syne et øyeblikk"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Kan ikke velges når effekten er slått på."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Ta bilder under videoopptak ved å trykke på forhåndsvisningen."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Øyeblikksbilder er deaktivert når spesialeffekter er aktivert."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ccd3a37..2b938ad 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Standaardinstellingen van camera herstellen?"</string>
     <string name="review_play" msgid="6378271587740884696">"Afspelen"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANNULEREN"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"OPNIEUW OPNEMEN"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerij"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Camera wijzigen"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zonsondergang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Eigen keuze"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Zet uw apparaat neer."\n"Stap even uit beeld."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Kan niet worden geselecteerd wanneer het effect is ingeschakeld."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Raak het voorbeeldscherm aan voor een foto bij video-opnamen."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videosnapshot staat uit als speciale effecten zijn ingeschakeld."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 81de6b9..16b87cd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Czy przywrócić domyślne ustawienia aparatu?"</string>
     <string name="review_play" msgid="6378271587740884696">"Odtwórz"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ANULUJ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"ZRÓB PONOWNIE"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Przełącz aparat"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zachód słońca"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Wybierz własny"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Skieruj urządzenie w dół"\n"Opuść na chwilę widok"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Opcji nie można wybrać, gdy efekt jest włączony."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Zrób zdjęcie podczas nagrywania filmu, klikając ekran podglądu."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Stopklatka nie działa, gdy są aktywne efekty specjalne."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a244808..cedaeb7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Restaurar predefinições da Câmara?"</string>
     <string name="review_play" msgid="6378271587740884696">"Reproduzir"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"VOLTAR A TIRAR"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Trocar câmara"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr do Sol"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Escolher o seu"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Pouse o aparelho"\n"Afaste-se por uns instantes"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Não selecionável ​​quando efeito ativado."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Tire fotografia durante grav. vídeo tocando no ecrã pré-visual."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instantâneo vídeo desat. quando efeitos especiais estão ativos."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 533a89f..42402d0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Restaurar as configurações padrão da câmera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Reproduzir"</string>
     <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"TIRAR OUTRA"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Alternar câmera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Pôr-do-sol"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Discoteca"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Escolher o seu"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Abaixe seu dispositivo"\n"Saia de vista por um momento"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Não pode ser selecionado com o efeito ativado."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Tire uma foto na gravação do vídeo tocando tela de visualização."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"O instant. de vídeo é desat. quando os efeitos esp. estão ativad."</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 2d7c0f4..bd50a7b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -37,7 +37,7 @@
     <!-- outdated translation 5239464943578877295 -->     <string name="confirm_restore_message" msgid="6649481842684452641">"Ils parameters predefinids da la camera vegnan restaurads."</string>
     <!-- outdated translation 6015456244323302817 -->     <string name="review_play" msgid="6378271587740884696">"REPRODUCIR"</string>
     <string name="review_cancel" msgid="8188009385853399254">"INTERRUMPER"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 5305096180300056529 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"AUTRA FOTO"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Catalog"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Midar la camera"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bb62894..b2d0689 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Reveniţi la setările prestabilite ale camerei foto?"</string>
     <string name="review_play" msgid="6378271587740884696">"Redaţi"</string>
     <string name="review_cancel" msgid="8188009385853399254">"Anulaţi"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"ALTĂ FOTOGRAFIE"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerie"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Schimbaţi camera foto"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Apus de soare"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Propriu"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Aşezaţi dispozitivul jos"\n"Ieşiţi din cadru un moment"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Nu este selectabil când efectul este activat."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Pozaţi în timpul înregistrării atingând ecranul previzualizare."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Instant. video este dezact. când efectele speciale sunt pornite."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c8c6619..05033c4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Восстановить настройки по умолчанию?"</string>
     <string name="review_play" msgid="6378271587740884696">"Воспроизвести"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ОТМЕНА"</string>
-    <string name="review_ok" msgid="5305096180300056529">"ОК"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"ОК"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Закат"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Выбрать видео"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Установите устройство на твердой поверхности."\n"Затем отойдите, чтобы вас было видно в камеру."</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Недоступно при использовании эффекта."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Чтобы сделать снимок при видеосъемке, нажмите на экран просмотра."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Невозможно сделать снимок при включенных спецэффектах."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a8c37f2..7e2b5b3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Obnoviť predvolené nastavenia fotoaparátu?"</string>
     <string name="review_play" msgid="6378271587740884696">"Prehrať"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ZRUŠIŤ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"NASNÍMAŤ ZNOVA"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galéria"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Prepnúť fotoaparát"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Západ slnka"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Zvoliť vlastné"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Položte svoje zariadenie"\n"Vyjdite na chvíľu zo zorného poľa"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Nastavenie nie je možné vybrať pri zap. efekte."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Počas nahrávania videa môžete fotiť dotknutím sa obrazovky ukážky."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Pri zapnutých špeciálnych efektoch je vytváranie snímok zakázané."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 32544c7..d2e29a3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Želite obnoviti privzete nastavitve fotoaparata?"</string>
     <string name="review_play" msgid="6378271587740884696">"Predvajaj"</string>
     <string name="review_cancel" msgid="8188009385853399254">"PREKLIČI"</string>
-    <string name="review_ok" msgid="5305096180300056529">"V redu"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"V redu"</string>
     <string name="review_retake" msgid="7804864054896088338">"ZNOVA POSNEMI"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galerija"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Menjava kamere"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sončni zahod"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Izberite si svojega"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Postavite napravo na trdo podlago"\n"Za trenutek stopite iz vidnega polja"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Ni mogoče izbrati, ko je vklopljen učinek."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Med snemanjem fotografirate tako, da se dotaknete predogleda."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Videoposnetek je onemogočen, ko so vklopljeni posebni učinki."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0696121..3219fad 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Желите ли да вратите подразумевана подешавања Камере?"</string>
     <string name="review_play" msgid="6378271587740884696">"Пусти"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ОТКАЖИ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Потврди"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Потврди"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залазак сунца"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Изаберите своје"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Спустите уређај"\n"Изађите из кадра на тренутак"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Ово не може да се изабере када је ефекат укључен."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Снимите слику током снимања видео снимка додиром на екран прегледа."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Видео снимак је онемогућен када су специјални ефекти укључени."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 302e7f6..bc138a6 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Vill du återställa standardinställningarna för kameran?"</string>
     <string name="review_play" msgid="6378271587740884696">"Spela"</string>
     <string name="review_cancel" msgid="8188009385853399254">"AVBRYT"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</string>
     <string name="review_retake" msgid="7804864054896088338">"TA OM"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galleri"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Byt kamera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgång"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Välj en egen"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Lägg ned enheten"\n"Ställ dig utom synhåll för ett ögonblick"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Det går inte att välja detta när effekten är på."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Ta ett foto under videoinspelningen genom att trycka på skärmen."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Ögonblicksbilden av en video inaktiveras när specialeffekter är aktiverade."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1e82d90..137f60f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Rejesha mipangilio ya chaguo-msingi ya kamera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Cheza"</string>
     <string name="review_cancel" msgid="8188009385853399254">"GHAIRI"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Sawa"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Sawa"</string>
     <string name="review_retake" msgid="7804864054896088338">"PIGA TENA"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Matunzio"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Badilisha Kamera"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Jua kutua"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Chagua yako mwenyewe"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Weka kifaa chako chini "\n" Toka nje ya muonekano kwa muda"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Haiwezi kuchaguliwa wakati athari imewashwa."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Chukua picha wakati wa kurekodi video kwa kugusa skrini ya hakiki."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Picha ya video imelemazwa wakati athari maalum imewashwa."</string>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index a8f4d7b..65d3683 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -34,9 +34,6 @@
         <item name="android:layout_width">32dp</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_centerHorizontal">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:focusable">true</item>
-        <item name="android:background">@drawable/bg_pressed</item>
     </style>
     <style name="ReviewControlText">
         <item name="android:layout_height">wrap_content</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index fa62881..9242673 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"คืนค่าเริ่มต้นของกล้องหรือไม่"</string>
     <string name="review_play" msgid="6378271587740884696">"เล่น"</string>
     <string name="review_cancel" msgid="8188009385853399254">"ยกเลิก"</string>
-    <string name="review_ok" msgid="5305096180300056529">"ตกลง"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"ตกลง"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"พระอาทิตย์ตก"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ดิสโก้"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"เลือกโดยคุณเอง"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"พักอุปกรณ์ของคุณ"\n"ออกจากการแสดงผลเป็นเวลาสักครู่หนึ่ง"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"ไม่สามารถเลือกหากเปิดใช้เอฟเฟ็กต์อยู่"</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"ถ่ายภาพระหว่างการบันทึกวิดีโอโดยการแตะหน้าจอดูตัวอย่าง"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"การจับภาพวิดีโอจะถูกปิดใช้งานเมื่อเปิดใช้เอฟเฟ็กต์พิเศษ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 492ad63..918327f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Ipanumbalik ang mga default na setting ng camera?"</string>
     <string name="review_play" msgid="6378271587740884696">"I-play"</string>
     <string name="review_cancel" msgid="8188009385853399254">"KANSELAHIN"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"KUHANIN MULI"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Gallery"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Lumipat ng Camera"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 82826d3..085374b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Kameranın varsayılan ayarları geri yüklensin mi?"</string>
     <string name="review_play" msgid="6378271587740884696">"Oynat"</string>
     <string name="review_cancel" msgid="8188009385853399254">"İPTAL"</string>
-    <string name="review_ok" msgid="5305096180300056529">"Tamam"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Tamam"</string>
     <string name="review_retake" msgid="7804864054896088338">"YENİDEN ÇEK"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Galeri"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Kamerayı Değiştir"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Gün Batımı"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Kendinizinkini seçin"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Cihazınızı yerleştirin"\n"Kısa bir süre için görüntüden çıkın"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Efekt açıkken seçilemez."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Video kaydı sırasında önizleme ekranına dokunarak fotoğraf çekin."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Özel efektler açıkken video anlık görüntü yakalama devre dışıdır."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index cb49d57..5bfd1ce 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Відновити налаштування Камери за умовчанням?"</string>
     <string name="review_play" msgid="6378271587740884696">"Відтворити"</string>
     <string name="review_cancel" msgid="8188009385853399254">"СКАСУВАТИ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"OK"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Захід сонця"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Вибрати власне"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Покладіть свій пристрій"\n"На декілька секунд вийдіть із поля зору"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Неможливо вибрати, якщо ввімкнено ефект."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Зробіть фото під час відеозйомки, торкнувшись екрана перегляду."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Функцію миттєвого знімка відео вимкнено, коли ввімк. спецефекти."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f4ec404..1663de4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Khôi phục cài đặt mặc định của Máy ảnh?"</string>
     <string name="review_play" msgid="6378271587740884696">"Phát"</string>
     <string name="review_cancel" msgid="8188009385853399254">"HUỶ"</string>
-    <string name="review_ok" msgid="5305096180300056529">"OK"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"Ok"</string>
     <string name="review_retake" msgid="7804864054896088338">"CHỤP LẠI"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Thư viện"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Chuyển Máy ảnh"</string>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Hoàng hôn"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Chọn hình nền của chính bạn"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Đặt thiết bị của bạn xuống"\n"Thoát khỏi chế độ xem trong giây lát"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"Không thể chọn khi hiệu ứng này được bật."</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"Chụp ảnh khi quay video bằng cách chạm vào màn hình xem trước."</string>
     <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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f11ed0f..b71322b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"要恢复“相机”的默认设置吗？"</string>
     <string name="review_play" msgid="6378271587740884696">"播放"</string>
     <string name="review_cancel" msgid="8188009385853399254">"取消"</string>
-    <string name="review_ok" msgid="5305096180300056529">"确定"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"确定"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"日落"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"迪斯科"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"自行选择"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"把设备放好"\n"离开镜头前片刻"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"无法在启用该效果时选择。"</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"录制视频时触摸预览屏幕可拍照。"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"启用特殊效果时停用视频快照。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 100bf5d..3cfcbb4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"要還原相機預設值嗎？"</string>
     <string name="review_play" msgid="6378271587740884696">"播放"</string>
     <string name="review_cancel" msgid="8188009385853399254">"取消"</string>
-    <string name="review_ok" msgid="5305096180300056529">"確定"</string>
+    <!-- outdated translation 4750691949877864726 -->     <string name="review_ok" msgid="1156261588693116433">"確定"</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>
@@ -113,10 +113,7 @@
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"黃昏"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"迪斯可"</string>
     <string name="effect_backdropper_gallery" msgid="3271387403091819540">"選擇您自己的影片"</string>
-    <!-- unknown placeholder BREAK_0 in bg_replacement_message -->
-    <skip />
-    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
-    <skip />
+    <string name="bg_replacement_message" msgid="6828585054971662284">"放下您的裝置"\n"暫時離開畫面"</string>
     <string name="not_selectable_in_effect" msgid="7967729203855039239">"效果啟用時無法選取。"</string>
     <string name="video_snapshot_hint" msgid="8159602664271448241">"影片錄製期間，只要輕觸預覽畫面即可拍攝相片。"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"特殊效果啟用時無法使用影片快照。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0cb23c2..d61c9e8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -36,7 +36,7 @@
     <string name="confirm_restore_message" msgid="6649481842684452641">"Buyisela Izisetho zekhamera?"</string>
     <string name="review_play" msgid="6378271587740884696">"Dlala"</string>
     <string name="review_cancel" msgid="8188009385853399254">"KHANSELA"</string>
-    <string name="review_ok" msgid="5305096180300056529">"KULUNGILE"</string>
+    <string name="review_ok" msgid="1156261588693116433">"KUQEDIWE"</string>
     <string name="review_retake" msgid="7804864054896088338">"THATHA FUTHI"</string>
     <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Igalari"</string>
     <string name="switch_camera_id" msgid="837545176602471325">"Shintsha Ikhamera"</string>
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 9c7bbfe..1fad8a8 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -143,6 +143,7 @@
     private GestureDetector mPopupGestureDetector;
     private boolean mOpenCameraFail = false;
     private boolean mCameraDisabled = false;
+    private boolean mFaceDetectionStarted = false;
 
     private View mPreviewPanel;  // The container of PreviewFrameLayout.
     private PreviewFrameLayout mPreviewFrameLayout;
@@ -520,7 +521,9 @@
 
     @Override
     public void startFaceDetection() {
+        if (mFaceDetectionStarted || mCameraState != IDLE) return;
         if (mParameters.getMaxNumDetectedFaces() > 0) {
+            mFaceDetectionStarted = true;
             mFaceView = (FaceView) findViewById(R.id.face_view);
             mFaceView.clear();
             mFaceView.setVisibility(View.VISIBLE);
@@ -535,7 +538,9 @@
 
     @Override
     public void stopFaceDetection() {
+        if (!mFaceDetectionStarted) return;
         if (mParameters.getMaxNumDetectedFaces() > 0) {
+            mFaceDetectionStarted = false;
             mCameraDevice.setFaceDetectionListener(null);
             mCameraDevice.stopFaceDetection();
             if (mFaceView != null) mFaceView.clear();
@@ -982,6 +987,7 @@
 
         mCameraDevice.takePicture(mShutterCallback, mRawPictureCallback,
                 mPostViewPictureCallback, new JpegPictureCallback(loc));
+        mFaceDetectionStarted = false;
         setCameraState(SNAPSHOT_IN_PROGRESS);
         return true;
     }
@@ -1461,7 +1467,7 @@
                 initializeCapabilities();
                 resetExposureCompensation();
                 startPreview();
-                if (mFirstTimeInitialized) startFaceDetection();
+                startFaceDetection();
             } catch (CameraHardwareException e) {
                 Util.showErrorAndFinish(this, R.string.cannot_connect_camera);
                 return;
@@ -1683,7 +1689,7 @@
         // display rotation in onCreate may not be what we want.
         if (mCameraState == PREVIEW_STOPPED) {
             startPreview();
-            if (mFirstTimeInitialized) startFaceDetection();
+            startFaceDetection();
         } else {
             if (Util.getDisplayRotation(this) != mDisplayRotation) {
                 setDisplayOrientation();
@@ -1717,6 +1723,7 @@
     private void closeCamera() {
         if (mCameraDevice != null) {
             CameraHolder.instance().release();
+            mFaceDetectionStarted = false;
             mCameraDevice.setZoomChangeListener(null);
             mCameraDevice.setFaceDetectionListener(null);
             mCameraDevice.setErrorCallback(null);
@@ -1795,6 +1802,7 @@
             Log.v(TAG, "stopPreview");
             mCameraDevice.cancelAutoFocus(); // Reset the focus.
             mCameraDevice.stopPreview();
+            mFaceDetectionStarted = false;
         }
         setCameraState(PREVIEW_STOPPED);
         mFocusManager.onPreviewStopped();
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index 07caeb2..576e9c4 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -47,26 +47,6 @@
     private static final String PANORAMA_CLASS = "com.android.camera.panorama.PanoramaActivity";
     private static final String VIDEO_CAMERA_CLASS = "com.android.camera.VideoCamera";
 
-    public static void confirmAction(Context context, String title,
-            String message, final Runnable action) {
-        OnClickListener listener = new OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                switch (which) {
-                    case DialogInterface.BUTTON_POSITIVE:
-                        if (action != null) action.run();
-                }
-            }
-        };
-        new AlertDialog.Builder(context)
-            .setIconAttribute(android.R.attr.alertDialogIcon)
-            .setTitle(title)
-            .setMessage(message)
-            .setPositiveButton(android.R.string.ok, listener)
-            .setNegativeButton(android.R.string.cancel, listener)
-            .create()
-            .show();
-    }
-
     public static void addSwitchModeMenuItem(Menu menu, int mode,
             final Runnable r) {
         int labelId, iconId;
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 21d97c3..ba8a4f7 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -413,6 +413,37 @@
         return optimalSize;
     }
 
+    // Returns the largest picture size which matches the given aspect ratio.
+    public static Size getOptimalVideoSnapshotPictureSize(
+            List<Size> sizes, double targetRatio) {
+        // Use a very small tolerance because we want an exact match.
+        final double ASPECT_TOLERANCE = 0.001;
+        if (sizes == null) return null;
+
+        Size optimalSize = null;
+
+        // Try to find a size matches aspect ratio and has the largest width
+        for (Size size : sizes) {
+            double ratio = (double) size.width / size.height;
+            if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
+            if (optimalSize == null || size.width > optimalSize.width) {
+                optimalSize = size;
+            }
+        }
+
+        // Cannot find one that matches the aspect ratio. This should not happen.
+        // Ignore the requirement.
+        if (optimalSize == null) {
+            Log.w(TAG, "No picture size match the aspect ratio");
+            for (Size size : sizes) {
+                if (optimalSize == null || size.width > optimalSize.width) {
+                    optimalSize = size;
+                }
+            }
+        }
+        return optimalSize;
+    }
+
     public static void dumpParameters(Parameters parameters) {
         String flattened = parameters.flatten();
         StringTokenizer tokenizer = new StringTokenizer(flattened, ";");
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 2cc07a5..75cba44 100755
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -151,6 +151,7 @@
     private int mSurfaceWidth;
     private int mSurfaceHeight;
     private View mReviewControl;
+    private RotateDialogController mRotateDialog;
 
     private Toast mNoShareToast;
     // An review image having same size as preview. It is displayed when
@@ -418,6 +419,8 @@
             mModePicker.setOnModeChangeListener(this);
         }
 
+        mRotateDialog = new RotateDialogController(this, R.layout.rotate_dialog);
+
         mPreviewPanel = findViewById(R.id.frame_layout);
         mPreviewFrameLayout = (PreviewFrameLayout) findViewById(R.id.frame);
         mReviewImage = (ImageView) findViewById(R.id.review_image);
@@ -569,7 +572,7 @@
     private void setOrientationIndicator(int orientation) {
         Rotatable[] indicators = {mThumbnailView, mModePicker, mSharePopup,
                 mBgLearningMessageRotater, mIndicatorControlContainer,
-                mReviewDoneButton, mReviewPlayButton, mReviewCancelButton};
+                mReviewDoneButton, mReviewPlayButton, mReviewCancelButton, mRotateDialog};
         for (Rotatable indicator : indicators) {
             if (indicator != null) indicator.setOrientation(orientation);
         }
@@ -1914,15 +1917,18 @@
         }
 
         // Set picture size.
-        String pictureSize = mPreferences.getString(
-                CameraSettings.KEY_PICTURE_SIZE, null);
-        if (pictureSize == null) {
-            CameraSettings.initialCameraPictureSize(this, mParameters);
-        } else {
-            List<Size> supported = mParameters.getSupportedPictureSizes();
-            CameraSettings.setCameraPictureSize(
-                    pictureSize, supported, mParameters);
+        // The logic here is different from the logic in still-mode camera.
+        // There we determine the preview size based on the picture size, but
+        // here we determine the picture size based on the preview size.
+        List<Size> supported = mParameters.getSupportedPictureSizes();
+        Size optimalSize = Util.getOptimalVideoSnapshotPictureSize(supported,
+                (double) mDesiredPreviewWidth / mDesiredPreviewHeight);
+        Size original = mParameters.getPictureSize();
+        if (!original.equals(optimalSize)) {
+            mParameters.setPictureSize(optimalSize.width, optimalSize.height);
         }
+        Log.v(TAG, "Video snapshot size is " + optimalSize.width + "x" +
+                optimalSize.height);
 
         // Set JPEG quality.
         int jpegQuality = CameraProfile.getJpegEncodingQualityParameter(mCameraId,
@@ -2045,10 +2051,11 @@
                 restorePreferences();
             }
         };
-        MenuHelper.confirmAction(this,
+        mRotateDialog.showAlertDialog(
                 getString(R.string.confirm_restore_title),
                 getString(R.string.confirm_restore_message),
-                runnable);
+                getString(android.R.string.ok), runnable,
+                getString(android.R.string.cancel), null);
     }
 
     private void restorePreferences() {
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 8b9c65a..a65d263 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -989,9 +989,20 @@
         keepScreenOnAwhile();
     }
 
+    /**
+     * Generate the final mosaic image.
+     *
+     * @param highRes flag to indicate whether we want to get a high-res version.
+     * @return a MosaicJpeg with its isValid flag set to true if successful; null if the generation
+     *         process is cancelled; and a MosaicJpeg with its isValid flag set to false if there
+     *         is an error in generating the final mosaic.
+     */
     public MosaicJpeg generateFinalMosaic(boolean highRes) {
-        if (mMosaicFrameProcessor.createMosaic(highRes) == Mosaic.MOSAIC_RET_CANCELLED) {
+        int mosaicReturnCode = mMosaicFrameProcessor.createMosaic(highRes);
+        if (mosaicReturnCode == Mosaic.MOSAIC_RET_CANCELLED) {
             return null;
+        } else if (mosaicReturnCode == Mosaic.MOSAIC_RET_ERROR) {
+            return new MosaicJpeg();
         }
 
         byte[] imageData = mMosaicFrameProcessor.getFinalMosaicNV21();
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 24451a9..92f658a 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -187,7 +187,7 @@
         if (rotatable) {
             view = new RotateImageView(context);
         } else {
-            view = new ColorFilterImageView(context);
+            view = new TwoStateImageView(context);
         }
         view.setImageResource(resourceId);
         view.setOnClickListener(this);
@@ -298,7 +298,6 @@
         double increment = Math.toRadians(expectedAngle)
                 - mChildRadians[mSecondLevelStartIndex];
         for (int i = 0 ; i < getChildCount(); ++i) mChildRadians[i] += increment;
-        requestLayout();
    }
 
     @Override
@@ -317,7 +316,6 @@
         for (int i = 0; i < getChildCount(); ++i) {
             View view = getChildAt(i);
             // We still need to show the disabled indicators in the second level.
-            if (!view.isEnabled() && (mCurrentLevel == 0)) continue;
             double radian = mChildRadians[i];
             double startVisibleRadians = mInAnimation
                     ? mStartVisibleRadians[1]
@@ -325,8 +323,9 @@
             double endVisibleRadians = mInAnimation
                     ? mEndVisibleRadians[1]
                     : mEndVisibleRadians[mCurrentLevel];
-            if ((radian < (startVisibleRadians - HIGHLIGHT_RADIANS / 2)) ||
-                    (radian > (endVisibleRadians + HIGHLIGHT_RADIANS / 2))) {
+            if ((!view.isEnabled() && (mCurrentLevel == 0))
+                    || (radian < (startVisibleRadians - HIGHLIGHT_RADIANS / 2))
+                    || (radian > (endVisibleRadians + HIGHLIGHT_RADIANS / 2))) {
                 view.setVisibility(View.GONE);
                 continue;
             }
diff --git a/src/com/android/camera/ui/RotateImageView.java b/src/com/android/camera/ui/RotateImageView.java
index f47a26b..39c4df2 100644
--- a/src/com/android/camera/ui/RotateImageView.java
+++ b/src/com/android/camera/ui/RotateImageView.java
@@ -32,7 +32,7 @@
 /**
  * A @{code ImageView} which can rotate it's content.
  */
-public class RotateImageView extends ColorFilterImageView implements Rotatable {
+public class RotateImageView extends TwoStateImageView implements Rotatable {
 
     @SuppressWarnings("unused")
     private static final String TAG = "RotateImageView";
diff --git a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
index 1fb9a80..fbf1585 100644
--- a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
+++ b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
@@ -89,6 +89,12 @@
         return (mNonIndicatorButtonCount + ((baselineX - x) / buttonRange));
     }
 
+    private void dispatchRelativeTouchEvent(View view, MotionEvent event) {
+        event.offsetLocation(-view.getLeft(), -view.getTop());
+        view.dispatchTouchEvent(event);
+        event.offsetLocation(view.getLeft(), view.getTop());
+    }
+
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
         if (!onFilterTouchEventForSecurity(event)) return false;
@@ -106,19 +112,19 @@
         int index = getTouchViewIndex((int) x, width);
         if (index == -1) return true;
         View b = getChildAt(index);
-        b.dispatchTouchEvent(event);
+        dispatchRelativeTouchEvent(b, event);
         if ((mSelectedIndex != -1) && (index != mSelectedIndex)) {
             View v = getChildAt(mSelectedIndex);
             if (v instanceof AbstractIndicatorButton) {
                 AbstractIndicatorButton c = (AbstractIndicatorButton) v;
                 event.setAction(MotionEvent.ACTION_CANCEL);
-                c.dispatchTouchEvent(event);
+                dispatchRelativeTouchEvent(c, event);
                 c.dismissPopup();
             }
 
             if (action == MotionEvent.ACTION_MOVE) {
                 event.setAction(MotionEvent.ACTION_DOWN);
-                b.dispatchTouchEvent(event);
+                dispatchRelativeTouchEvent(b, event);
             }
         }
         mSelectedIndex = index;
diff --git a/src/com/android/camera/ui/ColorFilterImageView.java b/src/com/android/camera/ui/TwoStateImageView.java
similarity index 73%
rename from src/com/android/camera/ui/ColorFilterImageView.java
rename to src/com/android/camera/ui/TwoStateImageView.java
index 56bef82..beb6bf5 100644
--- a/src/com/android/camera/ui/ColorFilterImageView.java
+++ b/src/com/android/camera/ui/TwoStateImageView.java
@@ -23,18 +23,17 @@
 import android.widget.ImageView;
 
 /**
- * A @{code ImageView} which grey out the icon if disabled.
+ * A @{code ImageView} which change the opacity of the icon if disabled.
  */
-public class ColorFilterImageView extends ImageView {
-    private final int DISABLED_COLOR;
+public class TwoStateImageView extends ImageView {
+    private final float DISABLED_ALPHA = 0.4f;
     private boolean mFilterEnabled = true;
 
-    public ColorFilterImageView(Context context, AttributeSet attrs) {
+    public TwoStateImageView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        DISABLED_COLOR = context.getResources().getColor(R.color.icon_disabled_color);
     }
 
-    public ColorFilterImageView(Context context) {
+    public TwoStateImageView(Context context) {
         this(context, null);
     }
 
@@ -43,9 +42,9 @@
         super.setEnabled(enabled);
         if (mFilterEnabled) {
             if (enabled) {
-                clearColorFilter();
+                setAlpha(1.0f);
             } else {
-                setColorFilter(DISABLED_COLOR);
+                setAlpha(DISABLED_ALPHA);
             }
         }
     }