diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 23114db..ad6755f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,7 +31,6 @@
         </receiver>
         <activity android:name="com.android.camera.Camera"
                 android:configChanges="orientation|screenSize|keyboardHidden"
-                android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
@@ -52,7 +51,6 @@
                 android:label="@string/video_camera_label"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:icon="@mipmap/ic_launcher_video_camera"
-                android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
@@ -67,7 +65,6 @@
         <activity android:name="com.android.camera.panorama.PanoramaActivity"
                 android:label="@string/pano_dialog_title"
                 android:configChanges="orientation|screenSize|keyboardHidden"
-                android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
         </activity>
diff --git a/jni/mosaic_renderer_jni.cpp b/jni/mosaic_renderer_jni.cpp
index fbf6862..bb01e7f 100644
--- a/jni/mosaic_renderer_jni.cpp
+++ b/jni/mosaic_renderer_jni.cpp
@@ -118,6 +118,10 @@
 double gUILayoutScalingX = 1.0f;
 double gUILayoutScalingY = 1.0f;
 
+// Whether the view that we will render preview FBO onto is in landscape or portrait
+// orientation.
+bool gIsLandscapeOrientation = true;
+
 // State of the viewfinder. Set to false when the viewfinder hits the UI edge.
 bool gPanViewfinder = true;
 
@@ -137,12 +141,26 @@
 double g_dTranslationToFBOCenter[16];
 
 // GL 4x4 Identity transformation
-GLfloat g_dAffinetransIdent[] = {
+GLfloat g_dAffinetransIdentGL[] = {
     1., 0., 0., 0.,
     0., 1., 0., 0.,
     0., 0., 1., 0.,
     0., 0., 0., 1.};
 
+// GL 4x4 Rotation transformation (column-majored): 90 degree
+GLfloat g_dAffinetransRotation90GL[] = {
+    0., 1., 0., 0.,
+    -1., 0., 0., 0.,
+    0., 0., 1., 0.,
+    0., 0., 0., 1.};
+
+// 3x3 Rotation transformation (row-majored): 90 degree
+double gRotation90[] = {
+    0., -1., 0.,
+    1., 0., 0.,
+    0., 0., 1.,};
+
+
 float g_dIdent3x3[] = {
     1.0, 0.0, 0.0,
     0.0, 1.0, 0.0,
@@ -219,6 +237,39 @@
     matGL44[15] = mat33[8];
 }
 
+bool continuePanningFBO(double panOffset) {
+    double normalizedScreenLimitLeft = -1.0 + VIEWPORT_BORDER_FACTOR_HORZ * 2.0;
+    double normalizedScreenLimitRight = 1.0 - VIEWPORT_BORDER_FACTOR_HORZ * 2.0;
+    double normalizedXPositionOnScreenLeft;
+    double normalizedXPositionOnScreenRight;
+
+    // Compute the position of the current frame in the screen coordinate system
+    if (gIsLandscapeOrientation) {
+        normalizedXPositionOnScreenLeft = (2.0 *
+            (gCenterOffsetX + panOffset) / gPreviewFBOWidth - 1.0) *
+            gUILayoutScalingX;
+        normalizedXPositionOnScreenRight = (2.0 *
+            ((gCenterOffsetX + panOffset) + gPreviewImageWidth[HR]) /
+            gPreviewFBOWidth - 1.0) * gUILayoutScalingX;
+    } else {
+        normalizedXPositionOnScreenLeft = (2.0 *
+            (gCenterOffsetX + panOffset) / gPreviewFBOWidth - 1.0) *
+            gUILayoutScalingY;
+        normalizedXPositionOnScreenRight = (2.0 *
+            ((gCenterOffsetX + panOffset) + gPreviewImageWidth[HR]) /
+            gPreviewFBOWidth - 1.0) * gUILayoutScalingY;
+    }
+
+    // Stop the viewfinder panning if we hit the maximum border allowed for
+    // this UI layout
+    if (normalizedXPositionOnScreenRight > normalizedScreenLimitRight ||
+            normalizedXPositionOnScreenLeft < normalizedScreenLimitLeft) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
 // This function computes fills the 4x4 matrices g_dAffinetrans,
 // and g_dAffinetransPan using the specified 3x3 affine
 // transformation between the first captured frame and the current frame.
@@ -289,23 +340,7 @@
     }
 
     gLastTx = gThisTx;
-
-    // Compute the position of the current frame in the screen coordinate system
-    // and stop the viewfinder panning if we hit the maximum border allowed for
-    // this UI layout
-    double normalizedXPositionOnScreenLeft = (2.0 *
-            (gCenterOffsetX + gPanOffset) / gPreviewFBOWidth - 1.0) *
-            gUILayoutScalingX;
-    double normalizedScreenLimitLeft = -1.0 + VIEWPORT_BORDER_FACTOR_HORZ * 2.0;
-
-    double normalizedXPositionOnScreenRight = (2.0 *
-            ((gCenterOffsetX + gPanOffset) + gPreviewImageWidth[HR]) /
-            gPreviewFBOWidth - 1.0) * gUILayoutScalingX;
-    double normalizedScreenLimitRight = 1.0 - VIEWPORT_BORDER_FACTOR_HORZ * 2.0;
-
-    if(normalizedXPositionOnScreenRight > normalizedScreenLimitRight ||
-            normalizedXPositionOnScreenLeft < normalizedScreenLimitLeft)
-        gPanViewfinder = false;
+    gPanViewfinder = continuePanningFBO(gPanOffset);
 
     db_Identity3x3(H);
     H[2] = gPanOffset;
@@ -315,7 +350,13 @@
     db_Multiply3x3_3x3(Htemp1, H, gKm);
     db_Multiply3x3_3x3(Hp, gKminv, Htemp1);
 
-    ConvertAffine3x3toGL4x4(g_dAffinetransPan, Hp);
+    if (gIsLandscapeOrientation) {
+        ConvertAffine3x3toGL4x4(g_dAffinetransPan, Hp);
+    } else {
+        // rotate Hp by 90 degress.
+        db_Multiply3x3_3x3(Htemp1, gRotation90, Hp);
+        ConvertAffine3x3toGL4x4(g_dAffinetransPan, Htemp1);
+    }
 }
 
 void AllocateTextureMemory(int widthHR, int heightHR, int widthLR, int heightLR)
@@ -421,7 +462,8 @@
     JNIEXPORT jint JNICALL Java_com_android_camera_panorama_MosaicRenderer_init(
             JNIEnv * env, jobject obj);
     JNIEXPORT void JNICALL Java_com_android_camera_panorama_MosaicRenderer_reset(
-            JNIEnv * env, jobject obj,  jint width, jint height);
+            JNIEnv * env, jobject obj,  jint width, jint height,
+            jboolean isLandscapeOrientation);
     JNIEXPORT void JNICALL Java_com_android_camera_panorama_MosaicRenderer_preprocess(
             JNIEnv * env, jobject obj, jfloatArray stMatrix);
     JNIEXPORT void JNICALL Java_com_android_camera_panorama_MosaicRenderer_transferGPUtoCPU(
@@ -461,19 +503,48 @@
 }
 
 
-JNIEXPORT void JNICALL Java_com_android_camera_panorama_MosaicRenderer_reset(
-        JNIEnv * env, jobject obj,  jint width, jint height)
-{
-    // Scale the current frame's height to the height of view and
-    // maintain the aspect ratio of the current frame on the screen.
-    gUILayoutScalingY = PREVIEW_FBO_HEIGHT_SCALE;
+void calculateUILayoutScaling(int width, int height, bool isLandscape) {
+    if (isLandscape) {
+        //  __________        ______
+        // |__________|  =>  |______|
+        // (Preview FBO)      (View)
+        //
+        // Scale the preview FBO's height to the height of view and
+        // maintain the aspect ratio of the current frame on the screen.
+        gUILayoutScalingY = PREVIEW_FBO_HEIGHT_SCALE;
 
-    // Note that OpenGL scales a texture to view's width and height automatically.
-    // The "width / height" inverts the scaling, so as to maintain the aspect ratio
-    // of the current frame.
-    gUILayoutScalingX = ((float) (PREVIEW_FBO_WIDTH_SCALE * gPreviewImageWidth[LR])
-            / (PREVIEW_FBO_HEIGHT_SCALE * gPreviewImageHeight[LR]) *  PREVIEW_FBO_HEIGHT_SCALE)
-            / ((float) width / height);
+        // Note that OpenGL scales a texture to view's width and height automatically.
+        // The "width / height" inverts the scaling, so as to maintain the aspect ratio
+        // of the current frame.
+        gUILayoutScalingX = ((float) (PREVIEW_FBO_WIDTH_SCALE * gPreviewImageWidth[LR])
+                / (PREVIEW_FBO_HEIGHT_SCALE * gPreviewImageHeight[LR]) *  PREVIEW_FBO_HEIGHT_SCALE)
+                / ((float) width / height);
+    } else {
+        //                     __
+        //  __________        |  |
+        // |__________|  =>   |  |
+        // (Preview FBO)      |  |
+        //                    |__|
+        //                   (View)
+        // Scale the preview FBO's height to the width of view and
+        // maintain the aspect ratio of the current frame on the screen.
+        gUILayoutScalingX = PREVIEW_FBO_HEIGHT_SCALE;
+
+        // Note that OpenGL scales a texture to view's width and height automatically.
+        // The "height / width" inverts the scaling, so as to maintain the aspect ratio
+        // of the current frame.
+        gUILayoutScalingY = ((float) (PREVIEW_FBO_WIDTH_SCALE * gPreviewImageWidth[LR])
+                / (PREVIEW_FBO_HEIGHT_SCALE * gPreviewImageHeight[LR]) *  PREVIEW_FBO_HEIGHT_SCALE)
+                / ((float) height / width);
+
+    }
+}
+
+JNIEXPORT void JNICALL Java_com_android_camera_panorama_MosaicRenderer_reset(
+        JNIEnv * env, jobject obj,  jint width, jint height, jboolean isLandscapeOrientation)
+{
+    gIsLandscapeOrientation = isLandscapeOrientation;
+    calculateUILayoutScaling(width, height, gIsLandscapeOrientation);
 
     gBuffer[0].Init(gPreviewFBOWidth, gPreviewFBOHeight, GL_RGBA);
     gBuffer[1].Init(gPreviewFBOWidth, gPreviewFBOHeight, GL_RGBA);
@@ -543,6 +614,7 @@
     gPreview.SetupGraphics(width, height);
     gPreview.Clear(0.0, 0.0, 0.0, 1.0);
     gPreview.SetViewportMatrix(1, 1, 1, 1);
+
     // Scale the previewFBO so that the viewfinder window fills the layout height
     // while maintaining the image aspect ratio
     gPreview.SetScalingMatrix(gUILayoutScalingX, -1.0f * gUILayoutScalingY);
@@ -560,8 +632,8 @@
 
     env->ReleaseFloatArrayElements(stMatrix, stmat, 0);
 
-    gSurfTexRenderer[LR].DrawTexture(g_dAffinetransIdent);
-    gSurfTexRenderer[HR].DrawTexture(g_dAffinetransIdent);
+    gSurfTexRenderer[LR].DrawTexture(g_dAffinetransIdentGL);
+    gSurfTexRenderer[HR].DrawTexture(g_dAffinetransIdentGL);
 }
 
 #ifndef now_ms
@@ -626,7 +698,12 @@
         gPreview.SetInputTextureName(gBuffer[gCurrentFBOIndex].GetTextureName());
 
         gWarper2.DrawTexture(g_dTranslationToFBOCenterGL);
-        gPreview.DrawTexture(g_dAffinetransIdent);
+
+        if (gIsLandscapeOrientation) {
+            gPreview.DrawTexture(g_dAffinetransIdentGL);
+        } else {
+            gPreview.DrawTexture(g_dAffinetransRotation90GL);
+        }
     }
     else
     {
diff --git a/res/anim/grow_fade_in_from_bottom.xml b/res/anim/first_level_fade_in.xml
similarity index 92%
copy from res/anim/grow_fade_in_from_bottom.xml
copy to res/anim/first_level_fade_in.xml
index e2ea9ff..9cd50b7 100644
--- a/res/anim/grow_fade_in_from_bottom.xml
+++ b/res/anim/first_level_fade_in.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="300" />
+    <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="300" />
 </set>
diff --git a/res/anim/grow_fade_in_from_bottom.xml b/res/anim/first_level_fade_out.xml
similarity index 92%
rename from res/anim/grow_fade_in_from_bottom.xml
rename to res/anim/first_level_fade_out.xml
index e2ea9ff..102b695 100644
--- a/res/anim/grow_fade_in_from_bottom.xml
+++ b/res/anim/first_level_fade_out.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="300" />
+    <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="300" />
 </set>
diff --git a/res/anim/grow_fade_in_from_top.xml b/res/anim/grow_fade_in_from_top.xml
deleted file mode 100644
index 22c33f7..0000000
--- a/res/anim/grow_fade_in_from_top.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="-100%p" android:toYDelta="0" android:duration="300" />
-</set>
diff --git a/res/anim/mode_selection_fade_in.xml b/res/anim/mode_selection_fade_in.xml
index bb710bb..be31689 100644
--- a/res/anim/mode_selection_fade_in.xml
+++ b/res/anim/mode_selection_fade_in.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="66%p" android:toYDelta="0" android:duration="200" />
+    <translate android:fromXDelta="-66%p" android:toXDelta="0" android:duration="200" />
 </set>
diff --git a/res/anim/mode_selection_fade_out.xml b/res/anim/mode_selection_fade_out.xml
index c770420..a4d225b 100644
--- a/res/anim/mode_selection_fade_out.xml
+++ b/res/anim/mode_selection_fade_out.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="0" android:toYDelta="66%p" android:duration="200" />
+    <translate android:fromXDelta="0" android:toXDelta="-66%p" android:duration="200" />
 </set>
diff --git a/res/anim/shrink_fade_out_from_bottom.xml b/res/anim/second_level_fade_in.xml
similarity index 92%
copy from res/anim/shrink_fade_out_from_bottom.xml
copy to res/anim/second_level_fade_in.xml
index 04bfd6e..baf165f 100644
--- a/res/anim/shrink_fade_out_from_bottom.xml
+++ b/res/anim/second_level_fade_in.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="0" android:toYDelta="-100%p" android:duration="300" />
+    <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="300" />
 </set>
diff --git a/res/anim/shrink_fade_out_from_bottom.xml b/res/anim/second_level_fade_out.xml
similarity index 92%
rename from res/anim/shrink_fade_out_from_bottom.xml
rename to res/anim/second_level_fade_out.xml
index 04bfd6e..272f171 100644
--- a/res/anim/shrink_fade_out_from_bottom.xml
+++ b/res/anim/second_level_fade_out.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="0" android:toYDelta="-100%p" android:duration="300" />
+    <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="300" />
 </set>
diff --git a/res/anim/shrink_fade_out_from_top.xml b/res/anim/shrink_fade_out_from_top.xml
deleted file mode 100644
index 4d31904..0000000
--- a/res/anim/shrink_fade_out_from_top.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator">
-    <translate android:fromYDelta="0" android:toYDelta="100%p" android:duration="300" />
-</set>
diff --git a/res/drawable-hdpi/btn_close_settings.png b/res/drawable-hdpi/btn_close_settings.png
index 96e65bc..f7b863d 100644
--- a/res/drawable-hdpi/btn_close_settings.png
+++ b/res/drawable-hdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_holo_light.png b/res/drawable-hdpi/ic_exposure_holo_light.png
index 8307baa..1d0311a 100644
--- a/res/drawable-hdpi/ic_exposure_holo_light.png
+++ b/res/drawable-hdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_gallery.png b/res/drawable-hdpi/ic_gallery.png
index bfccaa6..039f38b 100644
--- a/res/drawable-hdpi/ic_gallery.png
+++ b/res/drawable-hdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_quality_1080p.png b/res/drawable-hdpi/ic_quality_1080p.png
new file mode 100644
index 0000000..77fa550
--- /dev/null
+++ b/res/drawable-hdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_quality_480p.png b/res/drawable-hdpi/ic_quality_480p.png
new file mode 100644
index 0000000..93bf39c
--- /dev/null
+++ b/res/drawable-hdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_quality_720p.png b/res/drawable-hdpi/ic_quality_720p.png
new file mode 100644
index 0000000..fdf6f8b
--- /dev/null
+++ b/res/drawable-hdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_scn_holo_light.png b/res/drawable-hdpi/ic_scn_holo_light.png
new file mode 100644
index 0000000..6b62dce
--- /dev/null
+++ b/res/drawable-hdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_holo_light.png b/res/drawable-hdpi/ic_settings_holo_light.png
index 24d074c..01bd507 100644
--- a/res/drawable-hdpi/ic_settings_holo_light.png
+++ b/res/drawable-hdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_1.png b/res/drawable-hdpi/ic_timelapse_1.png
index 0fa1f3d..b9603a7 100644
--- a/res/drawable-hdpi/ic_timelapse_1.png
+++ b/res/drawable-hdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_10.png b/res/drawable-hdpi/ic_timelapse_10.png
index e168279..25832a4 100644
--- a/res/drawable-hdpi/ic_timelapse_10.png
+++ b/res/drawable-hdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_1_5.png b/res/drawable-hdpi/ic_timelapse_1_5.png
index 9e5e32b..eb220c5 100644
--- a/res/drawable-hdpi/ic_timelapse_1_5.png
+++ b/res/drawable-hdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_2.png b/res/drawable-hdpi/ic_timelapse_2.png
index 25889b6..1f315af 100644
--- a/res/drawable-hdpi/ic_timelapse_2.png
+++ b/res/drawable-hdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_2_5.png b/res/drawable-hdpi/ic_timelapse_2_5.png
index 40ea506..f57ed7d 100644
--- a/res/drawable-hdpi/ic_timelapse_2_5.png
+++ b/res/drawable-hdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_3.png b/res/drawable-hdpi/ic_timelapse_3.png
index 3aa85cb..8a8e370 100644
--- a/res/drawable-hdpi/ic_timelapse_3.png
+++ b/res/drawable-hdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_5.png b/res/drawable-hdpi/ic_timelapse_5.png
index 1e5b3af..6831b4a 100644
--- a/res/drawable-hdpi/ic_timelapse_5.png
+++ b/res/drawable-hdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_none.png b/res/drawable-hdpi/ic_timelapse_none.png
index 91193ac..6283f57 100644
--- a/res/drawable-hdpi/ic_timelapse_none.png
+++ b/res/drawable-hdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_video_effects_background_disco_holo.png b/res/drawable-hdpi/ic_video_effects_background_disco_holo.png
index 046f8d6..367b5cf 100644
--- a/res/drawable-hdpi/ic_video_effects_background_disco_holo.png
+++ b/res/drawable-hdpi/ic_video_effects_background_disco_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_video_effects_background_fields_of_wheat_holo.png b/res/drawable-hdpi/ic_video_effects_background_fields_of_wheat_holo.png
index 900b27f..963c860 100644
--- a/res/drawable-hdpi/ic_video_effects_background_fields_of_wheat_holo.png
+++ b/res/drawable-hdpi/ic_video_effects_background_fields_of_wheat_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_video_effects_background_intergalactic_holo.png b/res/drawable-hdpi/ic_video_effects_background_intergalactic_holo.png
index 78a9cf0..dd375e6 100644
--- a/res/drawable-hdpi/ic_video_effects_background_intergalactic_holo.png
+++ b/res/drawable-hdpi/ic_video_effects_background_intergalactic_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_video_effects_background_normal_holo_dark.png b/res/drawable-hdpi/ic_video_effects_background_normal_holo_dark.png
index 04aa623..f01e41b 100644
--- a/res/drawable-hdpi/ic_video_effects_background_normal_holo_dark.png
+++ b/res/drawable-hdpi/ic_video_effects_background_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_scene_mode.png b/res/drawable-hdpi/ic_viewfinder_scene_mode.png
deleted file mode 100644
index 6bfa713..0000000
--- a/res/drawable-hdpi/ic_viewfinder_scene_mode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_1080p.png b/res/drawable-hdpi/ic_viewfinder_video_quality_1080p.png
deleted file mode 100644
index d2a39e4..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_1080p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_480p.png b/res/drawable-hdpi/ic_viewfinder_video_quality_480p.png
deleted file mode 100644
index 398a4b9..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_480p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_720p.png b/res/drawable-hdpi/ic_viewfinder_video_quality_720p.png
deleted file mode 100644
index 5567eb0..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_quality_720p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_zoom_big.9.png b/res/drawable-hdpi/ic_zoom_big.9.png
index 8e6380e..8c6cdea 100644
--- a/res/drawable-hdpi/ic_zoom_big.9.png
+++ b/res/drawable-hdpi/ic_zoom_big.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_zoom_big_dark.9.png b/res/drawable-hdpi/ic_zoom_big_dark.9.png
index 340254b..63ba20e 100644
--- a/res/drawable-hdpi/ic_zoom_big_dark.9.png
+++ b/res/drawable-hdpi/ic_zoom_big_dark.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_divider.9.png b/res/drawable-hdpi/list_divider.9.png
new file mode 100644
index 0000000..986ab0b
--- /dev/null
+++ b/res/drawable-hdpi/list_divider.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_close_settings.png b/res/drawable-mdpi/btn_close_settings.png
index 4a04aa5..dc24d94 100644
--- a/res/drawable-mdpi/btn_close_settings.png
+++ b/res/drawable-mdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_holo_light.png b/res/drawable-mdpi/ic_exposure_holo_light.png
index 0d916f9..7236345 100644
--- a/res/drawable-mdpi/ic_exposure_holo_light.png
+++ b/res/drawable-mdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_gallery.png b/res/drawable-mdpi/ic_gallery.png
index b164c59..963f007 100644
--- a/res/drawable-mdpi/ic_gallery.png
+++ b/res/drawable-mdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_quality_1080p.png b/res/drawable-mdpi/ic_quality_1080p.png
new file mode 100644
index 0000000..767e7ac
--- /dev/null
+++ b/res/drawable-mdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_quality_480p.png b/res/drawable-mdpi/ic_quality_480p.png
new file mode 100644
index 0000000..acf9809
--- /dev/null
+++ b/res/drawable-mdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_quality_720p.png b/res/drawable-mdpi/ic_quality_720p.png
new file mode 100644
index 0000000..27037c4
--- /dev/null
+++ b/res/drawable-mdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_scn_holo_light.png b/res/drawable-mdpi/ic_scn_holo_light.png
new file mode 100644
index 0000000..b413d60
--- /dev/null
+++ b/res/drawable-mdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_holo_light.png b/res/drawable-mdpi/ic_settings_holo_light.png
index dba8990..cb0a902 100644
--- a/res/drawable-mdpi/ic_settings_holo_light.png
+++ b/res/drawable-mdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_1.png b/res/drawable-mdpi/ic_timelapse_1.png
index fa50e0c..48070f8 100644
--- a/res/drawable-mdpi/ic_timelapse_1.png
+++ b/res/drawable-mdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_10.png b/res/drawable-mdpi/ic_timelapse_10.png
index dd75068..3a8dbf1 100644
--- a/res/drawable-mdpi/ic_timelapse_10.png
+++ b/res/drawable-mdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_1_5.png b/res/drawable-mdpi/ic_timelapse_1_5.png
index a40e530..172fb03 100644
--- a/res/drawable-mdpi/ic_timelapse_1_5.png
+++ b/res/drawable-mdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_2.png b/res/drawable-mdpi/ic_timelapse_2.png
index ea7075e..07be67a 100644
--- a/res/drawable-mdpi/ic_timelapse_2.png
+++ b/res/drawable-mdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_2_5.png b/res/drawable-mdpi/ic_timelapse_2_5.png
index 99a2151..f6e11aa 100644
--- a/res/drawable-mdpi/ic_timelapse_2_5.png
+++ b/res/drawable-mdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_3.png b/res/drawable-mdpi/ic_timelapse_3.png
index 992b779..0807ffe 100644
--- a/res/drawable-mdpi/ic_timelapse_3.png
+++ b/res/drawable-mdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_5.png b/res/drawable-mdpi/ic_timelapse_5.png
index 7a7eb3a..ab58057 100644
--- a/res/drawable-mdpi/ic_timelapse_5.png
+++ b/res/drawable-mdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_none.png b/res/drawable-mdpi/ic_timelapse_none.png
index 09f0a1a..122e6fa 100644
--- a/res/drawable-mdpi/ic_timelapse_none.png
+++ b/res/drawable-mdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_video_effects_background_disco_holo.png b/res/drawable-mdpi/ic_video_effects_background_disco_holo.png
index f110ab0..1e04423 100644
--- a/res/drawable-mdpi/ic_video_effects_background_disco_holo.png
+++ b/res/drawable-mdpi/ic_video_effects_background_disco_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_video_effects_background_fields_of_wheat_holo.png b/res/drawable-mdpi/ic_video_effects_background_fields_of_wheat_holo.png
index e6e838f..7b4e579 100644
--- a/res/drawable-mdpi/ic_video_effects_background_fields_of_wheat_holo.png
+++ b/res/drawable-mdpi/ic_video_effects_background_fields_of_wheat_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_video_effects_background_intergalactic_holo.png b/res/drawable-mdpi/ic_video_effects_background_intergalactic_holo.png
index da27e8d..ec9c1bc 100644
--- a/res/drawable-mdpi/ic_video_effects_background_intergalactic_holo.png
+++ b/res/drawable-mdpi/ic_video_effects_background_intergalactic_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_video_effects_background_normal_holo_dark.png b/res/drawable-mdpi/ic_video_effects_background_normal_holo_dark.png
index 26ab64e..f055c48 100644
--- a/res/drawable-mdpi/ic_video_effects_background_normal_holo_dark.png
+++ b/res/drawable-mdpi/ic_video_effects_background_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_scene_mode.png b/res/drawable-mdpi/ic_viewfinder_scene_mode.png
deleted file mode 100644
index 8e29c53..0000000
--- a/res/drawable-mdpi/ic_viewfinder_scene_mode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_1080p.png b/res/drawable-mdpi/ic_viewfinder_video_quality_1080p.png
deleted file mode 100644
index 199e0ef..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_1080p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_480p.png b/res/drawable-mdpi/ic_viewfinder_video_quality_480p.png
deleted file mode 100644
index e0b4974..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_480p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_720p.png b/res/drawable-mdpi/ic_viewfinder_video_quality_720p.png
deleted file mode 100644
index 1104ce5..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_quality_720p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_zoom_big.9.png b/res/drawable-mdpi/ic_zoom_big.9.png
index e551fd0..f5e31b4 100644
--- a/res/drawable-mdpi/ic_zoom_big.9.png
+++ b/res/drawable-mdpi/ic_zoom_big.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_zoom_big_dark.9.png b/res/drawable-mdpi/ic_zoom_big_dark.9.png
index 4c12ae5..919db3f 100644
--- a/res/drawable-mdpi/ic_zoom_big_dark.9.png
+++ b/res/drawable-mdpi/ic_zoom_big_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_divider.9.png b/res/drawable-mdpi/list_divider.9.png
new file mode 100644
index 0000000..986ab0b
--- /dev/null
+++ b/res/drawable-mdpi/list_divider.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/bg_camera_pattern.png b/res/drawable-sw600dp-hdpi/bg_camera_pattern.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/bg_camera_pattern.png
rename to res/drawable-sw600dp-hdpi/bg_camera_pattern.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_camera_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_camera_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_camera_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_camera_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_camera_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_camera_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_close_settings.png b/res/drawable-sw600dp-hdpi/btn_close_settings.png
new file mode 100644
index 0000000..0172abf
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_retake_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_retake_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_retake_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_retake_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_retake_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_retake_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_recording_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-hdpi/ic_effects_holo_light.png
new file mode 100644
index 0000000..eac6dba
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_effects_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png
new file mode 100644
index 0000000..ee45cfc
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_flash_auto_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_off_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_flash_off_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_on_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_flash_on_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_gallery.png b/res/drawable-sw600dp-hdpi/ic_gallery.png
new file mode 100644
index 0000000..12f586a
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_menu_overflow.png b/res/drawable-sw600dp-hdpi/ic_menu_overflow.png
new file mode 100644
index 0000000..a7bdbeb
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-hdpi/ic_pan_border_fast.9.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_border_fast.9.png
rename to res/drawable-sw600dp-hdpi/ic_pan_border_fast.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png
rename to res/drawable-sw600dp-hdpi/ic_pan_left_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_left_indicator_fast.png
rename to res/drawable-sw600dp-hdpi/ic_pan_left_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_progression.png b/res/drawable-sw600dp-hdpi/ic_pan_progression.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_progression.png
rename to res/drawable-sw600dp-hdpi/ic_pan_progression.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png
rename to res/drawable-sw600dp-hdpi/ic_pan_right_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_right_indicator_fast.png
rename to res/drawable-sw600dp-hdpi/ic_pan_right_indicator_fast.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_quality_1080p.png b/res/drawable-sw600dp-hdpi/ic_quality_1080p.png
new file mode 100644
index 0000000..8800ada
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_quality_480p.png b/res/drawable-sw600dp-hdpi/ic_quality_480p.png
new file mode 100644
index 0000000..8140410
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_quality_720p.png b/res/drawable-sw600dp-hdpi/ic_quality_720p.png
new file mode 100644
index 0000000..a3d7598
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-hdpi/ic_scn_holo_light.png
new file mode 100644
index 0000000..e0dd705
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-hdpi/ic_settings_holo_light.png
new file mode 100644
index 0000000..13c9991
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-hdpi/ic_snapshot_border.9.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_snapshot_border.9.png
rename to res/drawable-sw600dp-hdpi/ic_snapshot_border.9.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-sw600dp-hdpi/ic_switch_photo_facing_holo_light.png
new file mode 100644
index 0000000..a415e8c
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_switch_photo_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_switch_video_facing_holo_light.png b/res/drawable-sw600dp-hdpi/ic_switch_video_facing_holo_light.png
new file mode 100644
index 0000000..743aea3
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_switch_video_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_1.png b/res/drawable-sw600dp-hdpi/ic_timelapse_1.png
new file mode 100644
index 0000000..f4b788e
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_10.png b/res/drawable-sw600dp-hdpi/ic_timelapse_10.png
new file mode 100644
index 0000000..fae0820
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png
new file mode 100644
index 0000000..9a2232c
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_2.png b/res/drawable-sw600dp-hdpi/ic_timelapse_2.png
new file mode 100644
index 0000000..dbb59df
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png
new file mode 100644
index 0000000..41245f6
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_3.png b/res/drawable-sw600dp-hdpi/ic_timelapse_3.png
new file mode 100644
index 0000000..b3dd3c5
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_5.png
new file mode 100644
index 0000000..38a7279
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_timelapse_none.png b/res/drawable-sw600dp-hdpi/ic_timelapse_none.png
new file mode 100644
index 0000000..33e462f
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_white_balance_auto_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_auto_holo_light.png
new file mode 100644
index 0000000..dc5efea
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_cloudy_holo_light.png
new file mode 100644
index 0000000..9bf242d
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_cloudy_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_fluorescent_holo_light.png
new file mode 100644
index 0000000..1c2d104
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_fluorescent_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_incandescent_holo_light.png
new file mode 100644
index 0000000..b3a0393
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_incandescent_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_sunlight_holo_light.png
new file mode 100644
index 0000000..37212aa
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_sunlight_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_in_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_in_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_out_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_out_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/bg_camera_pattern.png b/res/drawable-sw600dp-mdpi/bg_camera_pattern.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/bg_camera_pattern.png
rename to res/drawable-sw600dp-mdpi/bg_camera_pattern.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_camera_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_camera_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_camera_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_camera_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_camera_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_camera_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_close_settings.png b/res/drawable-sw600dp-mdpi/btn_close_settings.png
new file mode 100644
index 0000000..d876ac8
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml b/res/drawable-sw600dp-mdpi/btn_ic_camera_shutter.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml
rename to res/drawable-sw600dp-mdpi/btn_ic_camera_shutter.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml b/res/drawable-sw600dp-mdpi/btn_ic_mode_switch_camera.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml
rename to res/drawable-sw600dp-mdpi/btn_ic_mode_switch_camera.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml b/res/drawable-sw600dp-mdpi/btn_ic_mode_switch_video.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml
rename to res/drawable-sw600dp-mdpi/btn_ic_mode_switch_video.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_retake_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_retake_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_retake_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_retake_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_retake_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_retake_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_shutter.xml b/res/drawable-sw600dp-mdpi/btn_shutter.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_shutter.xml
rename to res/drawable-sw600dp-mdpi/btn_shutter.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_recording_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png
rename to res/drawable-sw600dp-mdpi/button_ic_camera_shutter.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter_pressed.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png
rename to res/drawable-sw600dp-mdpi/button_ic_camera_shutter_pressed.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-mdpi/ic_effects_holo_light.png
new file mode 100644
index 0000000..9935f9c
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_effects_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png
new file mode 100644
index 0000000..4f4cc74
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_flash_auto_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_off_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_flash_off_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_on_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_flash_on_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_gallery.png b/res/drawable-sw600dp-mdpi/ic_gallery.png
new file mode 100644
index 0000000..9388931
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_menu_overflow.png b/res/drawable-sw600dp-mdpi/ic_menu_overflow.png
new file mode 100644
index 0000000..f927168
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-mdpi/ic_pan_border_fast.9.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_border_fast.9.png
rename to res/drawable-sw600dp-mdpi/ic_pan_border_fast.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png
rename to res/drawable-sw600dp-mdpi/ic_pan_left_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_left_indicator_fast.png
rename to res/drawable-sw600dp-mdpi/ic_pan_left_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_progression.png b/res/drawable-sw600dp-mdpi/ic_pan_progression.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_progression.png
rename to res/drawable-sw600dp-mdpi/ic_pan_progression.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png
rename to res/drawable-sw600dp-mdpi/ic_pan_right_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_right_indicator_fast.png
rename to res/drawable-sw600dp-mdpi/ic_pan_right_indicator_fast.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_quality_1080p.png b/res/drawable-sw600dp-mdpi/ic_quality_1080p.png
new file mode 100644
index 0000000..65ec0c7
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_quality_480p.png b/res/drawable-sw600dp-mdpi/ic_quality_480p.png
new file mode 100644
index 0000000..24915f3
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_quality_720p.png b/res/drawable-sw600dp-mdpi/ic_quality_720p.png
new file mode 100644
index 0000000..28c58eb
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_recording_indicator.png b/res/drawable-sw600dp-mdpi/ic_recording_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_recording_indicator.png
rename to res/drawable-sw600dp-mdpi/ic_recording_indicator.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-mdpi/ic_scn_holo_light.png
new file mode 100644
index 0000000..0b3866e
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-mdpi/ic_settings_holo_light.png
new file mode 100644
index 0000000..2b89fef
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-mdpi/ic_snapshot_border.9.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_snapshot_border.9.png
rename to res/drawable-sw600dp-mdpi/ic_snapshot_border.9.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-sw600dp-mdpi/ic_switch_photo_facing_holo_light.png
new file mode 100644
index 0000000..cbb0c83
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_switch_photo_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_switch_video_facing_holo_light.png b/res/drawable-sw600dp-mdpi/ic_switch_video_facing_holo_light.png
new file mode 100644
index 0000000..bf353d2
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_switch_video_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_1.png b/res/drawable-sw600dp-mdpi/ic_timelapse_1.png
new file mode 100644
index 0000000..5707841
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_10.png b/res/drawable-sw600dp-mdpi/ic_timelapse_10.png
new file mode 100644
index 0000000..da69f4b
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png
new file mode 100644
index 0000000..a2bf827
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_2.png b/res/drawable-sw600dp-mdpi/ic_timelapse_2.png
new file mode 100644
index 0000000..83e0ed1
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png
new file mode 100644
index 0000000..770a898
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_3.png b/res/drawable-sw600dp-mdpi/ic_timelapse_3.png
new file mode 100644
index 0000000..9f7cbb2
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_5.png
new file mode 100644
index 0000000..f86780b
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_timelapse_none.png b/res/drawable-sw600dp-mdpi/ic_timelapse_none.png
new file mode 100644
index 0000000..67e36a6
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_white_balance_auto_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_auto_holo_light.png
new file mode 100644
index 0000000..b8ec090
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_cloudy_holo_light.png
new file mode 100644
index 0000000..3dbb1e2
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_cloudy_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_fluorescent_holo_light.png
new file mode 100644
index 0000000..a60a97a
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_fluorescent_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_incandescent_holo_light.png
new file mode 100644
index 0000000..8176071
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_incandescent_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_sunlight_holo_light.png
new file mode 100644
index 0000000..a5a0ab2
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_sunlight_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_in_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_in_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_out_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_out_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/bg_camera_pattern.png b/res/drawable-sw600dp-xhdpi/bg_camera_pattern.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/bg_camera_pattern.png
rename to res/drawable-sw600dp-xhdpi/bg_camera_pattern.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_camera_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_camera_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_camera_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_camera_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_close_settings.png b/res/drawable-sw600dp-xhdpi/btn_close_settings.png
new file mode 100644
index 0000000..dcc7f8d
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_retake_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_retake_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_retake_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_retake_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png
new file mode 100644
index 0000000..8590a9e
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png
new file mode 100644
index 0000000..ed73752
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_flash_auto_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_off_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_flash_off_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_on_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_flash_on_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_gallery.png b/res/drawable-sw600dp-xhdpi/ic_gallery.png
new file mode 100644
index 0000000..5bc1a2e
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_menu_overflow.png b/res/drawable-sw600dp-xhdpi/ic_menu_overflow.png
new file mode 100644
index 0000000..cd509d2
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-xhdpi/ic_pan_border_fast.9.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_border_fast.9.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_border_fast.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_left_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_left_indicator_fast.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_left_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_progression.png b/res/drawable-sw600dp-xhdpi/ic_pan_progression.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_progression.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_progression.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_right_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_right_indicator_fast.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_right_indicator_fast.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_quality_1080p.png b/res/drawable-sw600dp-xhdpi/ic_quality_1080p.png
new file mode 100644
index 0000000..0dd9598
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_quality_480p.png b/res/drawable-sw600dp-xhdpi/ic_quality_480p.png
new file mode 100644
index 0000000..6dab5c4
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_quality_720p.png b/res/drawable-sw600dp-xhdpi/ic_quality_720p.png
new file mode 100644
index 0000000..d129bb5
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png
new file mode 100644
index 0000000..4369205
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png
new file mode 100644
index 0000000..9fa8f72
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-xhdpi/ic_snapshot_border.9.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_snapshot_border.9.png
rename to res/drawable-sw600dp-xhdpi/ic_snapshot_border.9.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_switch_photo_facing_holo_light.png
new file mode 100644
index 0000000..cf8edf8
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_switch_photo_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_switch_video_facing_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_switch_video_facing_holo_light.png
new file mode 100644
index 0000000..d48e403
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_switch_video_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_1.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_1.png
new file mode 100644
index 0000000..aa89d30
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_10.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_10.png
new file mode 100644
index 0000000..2a1b617
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png
new file mode 100644
index 0000000..923cec8
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_2.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_2.png
new file mode 100644
index 0000000..a701142
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png
new file mode 100644
index 0000000..c12ecd7
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_3.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_3.png
new file mode 100644
index 0000000..d3f681f
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_5.png
new file mode 100644
index 0000000..1eca86f
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_timelapse_none.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_none.png
new file mode 100644
index 0000000..ace6b36
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_white_balance_auto_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_auto_holo_light.png
new file mode 100644
index 0000000..cc41997
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_cloudy_holo_light.png
new file mode 100644
index 0000000..b47c796
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_cloudy_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
new file mode 100644
index 0000000..6792345
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_incandescent_holo_light.png
new file mode 100644
index 0000000..9d0f1a3
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_incandescent_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_sunlight_holo_light.png
new file mode 100644
index 0000000..5388a66
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_sunlight_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_zoom_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_zoom_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png
rename to res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_effects_holo_light.png b/res/drawable-w1024dp-hdpi/ic_effects_holo_light.png
deleted file mode 100644
index aa46d68..0000000
--- a/res/drawable-w1024dp-hdpi/ic_effects_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png b/res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png
deleted file mode 100644
index 0285708..0000000
--- a/res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_gallery.png b/res/drawable-w1024dp-hdpi/ic_gallery.png
deleted file mode 100644
index 18da118..0000000
--- a/res/drawable-w1024dp-hdpi/ic_gallery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_menu_overflow.png b/res/drawable-w1024dp-hdpi/ic_menu_overflow.png
deleted file mode 100644
index a12aedf..0000000
--- a/res/drawable-w1024dp-hdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_settings_holo_light.png b/res/drawable-w1024dp-hdpi/ic_settings_holo_light.png
deleted file mode 100644
index 0711f10..0000000
--- a/res/drawable-w1024dp-hdpi/ic_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-w1024dp-hdpi/ic_switch_photo_facing_holo_light.png
deleted file mode 100644
index b73a52a..0000000
--- a/res/drawable-w1024dp-hdpi/ic_switch_photo_facing_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_switch_video_facing_holo_light.png b/res/drawable-w1024dp-hdpi/ic_switch_video_facing_holo_light.png
deleted file mode 100644
index d61eb24..0000000
--- a/res/drawable-w1024dp-hdpi/ic_switch_video_facing_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_1.png b/res/drawable-w1024dp-hdpi/ic_timelapse_1.png
deleted file mode 100644
index 97aa325..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_10.png b/res/drawable-w1024dp-hdpi/ic_timelapse_10.png
deleted file mode 100644
index 56652c3..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_10.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png b/res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png
deleted file mode 100644
index 80aeecd..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_2.png b/res/drawable-w1024dp-hdpi/ic_timelapse_2.png
deleted file mode 100644
index bbc0cf2..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png b/res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png
deleted file mode 100644
index 0de667d..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_3.png b/res/drawable-w1024dp-hdpi/ic_timelapse_3.png
deleted file mode 100644
index 64c7187..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_5.png b/res/drawable-w1024dp-hdpi/ic_timelapse_5.png
deleted file mode 100644
index e11ae4b..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_none.png b/res/drawable-w1024dp-hdpi/ic_timelapse_none.png
deleted file mode 100644
index aae1eb9..0000000
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_none.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_viewfinder_scene_mode.png b/res/drawable-w1024dp-hdpi/ic_viewfinder_scene_mode.png
deleted file mode 100644
index 187aa24..0000000
--- a/res/drawable-w1024dp-hdpi/ic_viewfinder_scene_mode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_auto_holo_light.png b/res/drawable-w1024dp-hdpi/ic_white_balance_auto_holo_light.png
deleted file mode 100644
index 3be5827..0000000
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_auto_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-w1024dp-hdpi/ic_white_balance_cloudy_holo_light.png
deleted file mode 100644
index 07a008e..0000000
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_cloudy_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-w1024dp-hdpi/ic_white_balance_fluorescent_holo_light.png
deleted file mode 100644
index 1f1db44..0000000
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_fluorescent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-w1024dp-hdpi/ic_white_balance_incandescent_holo_light.png
deleted file mode 100644
index f8ee467..0000000
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_incandescent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-w1024dp-hdpi/ic_white_balance_sunlight_holo_light.png
deleted file mode 100644
index 26f56a8..0000000
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_sunlight_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_effects_holo_light.png b/res/drawable-w1024dp-mdpi/ic_effects_holo_light.png
deleted file mode 100644
index ed09cc9..0000000
--- a/res/drawable-w1024dp-mdpi/ic_effects_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png b/res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png
deleted file mode 100644
index 5ba7530..0000000
--- a/res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_gallery.png b/res/drawable-w1024dp-mdpi/ic_gallery.png
deleted file mode 100644
index c977213..0000000
--- a/res/drawable-w1024dp-mdpi/ic_gallery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_menu_overflow.png b/res/drawable-w1024dp-mdpi/ic_menu_overflow.png
deleted file mode 100644
index 4a3bde3..0000000
--- a/res/drawable-w1024dp-mdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_settings_holo_light.png b/res/drawable-w1024dp-mdpi/ic_settings_holo_light.png
deleted file mode 100644
index 9ddcafe..0000000
--- a/res/drawable-w1024dp-mdpi/ic_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-w1024dp-mdpi/ic_switch_photo_facing_holo_light.png
deleted file mode 100644
index 566b5fc..0000000
--- a/res/drawable-w1024dp-mdpi/ic_switch_photo_facing_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_switch_video_facing_holo_light.png b/res/drawable-w1024dp-mdpi/ic_switch_video_facing_holo_light.png
deleted file mode 100644
index c1411dd..0000000
--- a/res/drawable-w1024dp-mdpi/ic_switch_video_facing_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_1.png b/res/drawable-w1024dp-mdpi/ic_timelapse_1.png
deleted file mode 100644
index 555846f..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_10.png b/res/drawable-w1024dp-mdpi/ic_timelapse_10.png
deleted file mode 100644
index b0d1f2b..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_10.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png b/res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png
deleted file mode 100644
index 1b15630..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_2.png b/res/drawable-w1024dp-mdpi/ic_timelapse_2.png
deleted file mode 100644
index ea99e6e..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png b/res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png
deleted file mode 100644
index b7160a1..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_3.png b/res/drawable-w1024dp-mdpi/ic_timelapse_3.png
deleted file mode 100644
index ce42c43..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_5.png b/res/drawable-w1024dp-mdpi/ic_timelapse_5.png
deleted file mode 100644
index 3222564..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_none.png b/res/drawable-w1024dp-mdpi/ic_timelapse_none.png
deleted file mode 100644
index afc8210..0000000
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_none.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_scene_mode.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_scene_mode.png
deleted file mode 100644
index f3fc6d0..0000000
--- a/res/drawable-w1024dp-mdpi/ic_viewfinder_scene_mode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_auto_holo_light.png b/res/drawable-w1024dp-mdpi/ic_white_balance_auto_holo_light.png
deleted file mode 100644
index e26b8a8..0000000
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_auto_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-w1024dp-mdpi/ic_white_balance_cloudy_holo_light.png
deleted file mode 100644
index 5e936ef..0000000
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_cloudy_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-w1024dp-mdpi/ic_white_balance_fluorescent_holo_light.png
deleted file mode 100644
index 558c333..0000000
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_fluorescent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-w1024dp-mdpi/ic_white_balance_incandescent_holo_light.png
deleted file mode 100644
index 0f0b9bf..0000000
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_incandescent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-w1024dp-mdpi/ic_white_balance_sunlight_holo_light.png
deleted file mode 100644
index 326f386..0000000
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_sunlight_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png
deleted file mode 100644
index 020cdf8..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png
deleted file mode 100644
index 078925d..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_gallery.png b/res/drawable-w1024dp-xhdpi/ic_gallery.png
deleted file mode 100644
index 0d6b27f..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_gallery.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png b/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png
deleted file mode 100644
index 715cff8..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png
deleted file mode 100644
index 526d123..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_switch_photo_facing_holo_light.png
deleted file mode 100644
index d6b4f81..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_switch_photo_facing_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_switch_video_facing_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_switch_video_facing_holo_light.png
deleted file mode 100644
index 376d868..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_switch_video_facing_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_1.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_1.png
deleted file mode 100644
index 291a22b..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_10.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_10.png
deleted file mode 100644
index 09ae468..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_10.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png
deleted file mode 100644
index 4304281..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_2.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_2.png
deleted file mode 100644
index 2101bd4..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png
deleted file mode 100644
index a2d62d1..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_3.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_3.png
deleted file mode 100644
index 100ab32..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_none.png b/res/drawable-w1024dp-xhdpi/ic_timelapse_none.png
deleted file mode 100644
index eecb9a5..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_none.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_viewfinder_scene_mode.png b/res/drawable-w1024dp-xhdpi/ic_viewfinder_scene_mode.png
deleted file mode 100644
index b62bf69..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_viewfinder_scene_mode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_auto_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_white_balance_auto_holo_light.png
deleted file mode 100644
index c5e7c28..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_auto_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_white_balance_cloudy_holo_light.png
deleted file mode 100644
index b5b23cb..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_cloudy_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
deleted file mode 100644
index 63c9fad..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_white_balance_incandescent_holo_light.png
deleted file mode 100644
index f00a901..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_incandescent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-w1024dp-xhdpi/ic_white_balance_sunlight_holo_light.png
deleted file mode 100644
index 977501b..0000000
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_sunlight_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_close_settings.png b/res/drawable-xhdpi/btn_close_settings.png
index d252c65..4226f34 100644
--- a/res/drawable-xhdpi/btn_close_settings.png
+++ b/res/drawable-xhdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_holo_light.png b/res/drawable-xhdpi/ic_exposure_holo_light.png
index 85d6f56..5f4b57b 100644
--- a/res/drawable-xhdpi/ic_exposure_holo_light.png
+++ b/res/drawable-xhdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gallery.png b/res/drawable-xhdpi/ic_gallery.png
index eb189f8..e7654ee 100644
--- a/res/drawable-xhdpi/ic_gallery.png
+++ b/res/drawable-xhdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_quality_1080p.png b/res/drawable-xhdpi/ic_quality_1080p.png
new file mode 100644
index 0000000..d3da634
--- /dev/null
+++ b/res/drawable-xhdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_quality_480p.png b/res/drawable-xhdpi/ic_quality_480p.png
new file mode 100644
index 0000000..d4da42e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_quality_720p.png b/res/drawable-xhdpi/ic_quality_720p.png
new file mode 100644
index 0000000..7124c4e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_recording_indicator.png b/res/drawable-xhdpi/ic_recording_indicator.png
new file mode 100644
index 0000000..fb3fc69
--- /dev/null
+++ b/res/drawable-xhdpi/ic_recording_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scn_holo_light.png b/res/drawable-xhdpi/ic_scn_holo_light.png
new file mode 100644
index 0000000..503f11f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_holo_light.png b/res/drawable-xhdpi/ic_settings_holo_light.png
index 3a5d0ba..9ce2266 100644
--- a/res/drawable-xhdpi/ic_settings_holo_light.png
+++ b/res/drawable-xhdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_1.png b/res/drawable-xhdpi/ic_timelapse_1.png
index 7143a6d..978a5f9 100644
--- a/res/drawable-xhdpi/ic_timelapse_1.png
+++ b/res/drawable-xhdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_10.png b/res/drawable-xhdpi/ic_timelapse_10.png
index f81164a..2c26374 100644
--- a/res/drawable-xhdpi/ic_timelapse_10.png
+++ b/res/drawable-xhdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_1_5.png b/res/drawable-xhdpi/ic_timelapse_1_5.png
index 62932aa..51b800f 100644
--- a/res/drawable-xhdpi/ic_timelapse_1_5.png
+++ b/res/drawable-xhdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_2.png b/res/drawable-xhdpi/ic_timelapse_2.png
index 51cb628..ff02d1f 100644
--- a/res/drawable-xhdpi/ic_timelapse_2.png
+++ b/res/drawable-xhdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_2_5.png b/res/drawable-xhdpi/ic_timelapse_2_5.png
index d49bf64..e38fc04 100644
--- a/res/drawable-xhdpi/ic_timelapse_2_5.png
+++ b/res/drawable-xhdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_3.png b/res/drawable-xhdpi/ic_timelapse_3.png
index 7f85a57..401c733 100644
--- a/res/drawable-xhdpi/ic_timelapse_3.png
+++ b/res/drawable-xhdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_5.png b/res/drawable-xhdpi/ic_timelapse_5.png
index 14e7ea5..7ed793b 100644
--- a/res/drawable-xhdpi/ic_timelapse_5.png
+++ b/res/drawable-xhdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_none.png b/res/drawable-xhdpi/ic_timelapse_none.png
index 93a172b..265f59b 100644
--- a/res/drawable-xhdpi/ic_timelapse_none.png
+++ b/res/drawable-xhdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_video_effects_background_disco_holo.png b/res/drawable-xhdpi/ic_video_effects_background_disco_holo.png
index 4637f30..9cfab7e 100644
--- a/res/drawable-xhdpi/ic_video_effects_background_disco_holo.png
+++ b/res/drawable-xhdpi/ic_video_effects_background_disco_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_video_effects_background_fields_of_wheat_holo.png b/res/drawable-xhdpi/ic_video_effects_background_fields_of_wheat_holo.png
index bde0833..cfca0b2 100644
--- a/res/drawable-xhdpi/ic_video_effects_background_fields_of_wheat_holo.png
+++ b/res/drawable-xhdpi/ic_video_effects_background_fields_of_wheat_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_video_effects_background_intergalactic_holo.png b/res/drawable-xhdpi/ic_video_effects_background_intergalactic_holo.png
index 6a3b2ff..7426510 100644
--- a/res/drawable-xhdpi/ic_video_effects_background_intergalactic_holo.png
+++ b/res/drawable-xhdpi/ic_video_effects_background_intergalactic_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_video_effects_background_normal_holo_dark.png b/res/drawable-xhdpi/ic_video_effects_background_normal_holo_dark.png
index af56bff..93ca230 100644
--- a/res/drawable-xhdpi/ic_video_effects_background_normal_holo_dark.png
+++ b/res/drawable-xhdpi/ic_video_effects_background_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_scene_mode.png b/res/drawable-xhdpi/ic_viewfinder_scene_mode.png
deleted file mode 100644
index 18b7bbb..0000000
--- a/res/drawable-xhdpi/ic_viewfinder_scene_mode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.png b/res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.png
deleted file mode 100644
index 606e66d..0000000
--- a/res/drawable-xhdpi/ic_viewfinder_video_quality_1080p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_video_quality_480p.png b/res/drawable-xhdpi/ic_viewfinder_video_quality_480p.png
deleted file mode 100644
index 3dd4fb2..0000000
--- a/res/drawable-xhdpi/ic_viewfinder_video_quality_480p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_viewfinder_video_quality_720p.png b/res/drawable-xhdpi/ic_viewfinder_video_quality_720p.png
deleted file mode 100644
index c4e08d9..0000000
--- a/res/drawable-xhdpi/ic_viewfinder_video_quality_720p.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_zoom_big.9.png b/res/drawable-xhdpi/ic_zoom_big.9.png
index 48b9e24..48dbf4f 100644
--- a/res/drawable-xhdpi/ic_zoom_big.9.png
+++ b/res/drawable-xhdpi/ic_zoom_big.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_zoom_big_dark.9.png b/res/drawable-xhdpi/ic_zoom_big_dark.9.png
index b33b546..43b2740 100644
--- a/res/drawable-xhdpi/ic_zoom_big_dark.9.png
+++ b/res/drawable-xhdpi/ic_zoom_big_dark.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_divider.9.png b/res/drawable-xhdpi/list_divider.9.png
new file mode 100644
index 0000000..e62f011
--- /dev/null
+++ b/res/drawable-xhdpi/list_divider.9.png
Binary files differ
diff --git a/res/layout-w1024dp/camera.xml b/res/layout-sw600dp/camera.xml
similarity index 100%
rename from res/layout-w1024dp/camera.xml
rename to res/layout-sw600dp/camera.xml
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-sw600dp/camera_control.xml
similarity index 100%
rename from res/layout-w1024dp/camera_control.xml
rename to res/layout-sw600dp/camera_control.xml
diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-sw600dp/mode_picker.xml
similarity index 100%
rename from res/layout-w1024dp/mode_picker.xml
rename to res/layout-sw600dp/mode_picker.xml
diff --git a/res/layout-sw600dp/pano_capture.xml b/res/layout-sw600dp/pano_capture.xml
new file mode 100644
index 0000000..2f58b10
--- /dev/null
+++ b/res/layout-sw600dp/pano_capture.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/pano_capture_layout"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="horizontal">
+
+    <RelativeLayout android:id="@+id/frame_layout"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+        <LinearLayout android:id="@+id/pano_capture_preview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+            <!-- The top bar with capture indication -->
+            <FrameLayout android:id="@+id/pano_capture_indicator_layout"
+                    style="@style/PanoViewHorizontalBar"
+                    android:padding="5dp">
+
+                <com.android.camera.ui.RotateLayout
+                        android:id="@+id/pano_capture_indicator"
+                        android:visibility="gone"
+                        android:layout_gravity="top|left"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+                    <TextView
+                            android:text="@string/pano_capture_indication"
+                            android:paddingLeft="0dp"
+                            android:drawablePadding="5sp"
+                            android:drawableLeft="@drawable/ic_pan_recording_indicator"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginTop="16dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                </com.android.camera.ui.RotateLayout>
+            </FrameLayout>
+
+            <RelativeLayout
+                    android:layout_gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/pano_mosaic_surface_height">
+                <com.android.camera.panorama.MosaicRendererSurfaceView
+                        android:id="@+id/pano_renderer"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                <View
+                        android:id="@+id/pano_speed_indication_border"
+                        android:visibility="gone"
+                        android:background="@drawable/ic_pan_border_fast"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+            </RelativeLayout>
+
+            <!-- The bottom bar with progress bar and direction indicators -->
+            <RelativeLayout
+                style="@style/PanoViewHorizontalBar">
+
+                <com.android.camera.ui.RotateLayout
+                        android:id="@+id/pano_pan_progress_bar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true">
+                    <com.android.camera.panorama.PanoProgressBar
+                            android:id="@+id/pano_pan_progress_bar"
+                            android:visibility="gone"
+                            android:src="@drawable/ic_pan_progression"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                </com.android.camera.ui.RotateLayout>
+                <ImageView
+                        android:id="@+id/pano_pan_left_indicator"
+                        android:src="@drawable/pano_direction_left_indicator"
+                        android:visibility="gone"
+                        android:layout_marginRight="5dp"
+                        android:layout_toLeftOf="@id/pano_pan_progress_bar_layout"
+                        android:layout_centerVertical="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                <ImageView
+                        android:id="@+id/pano_pan_right_indicator"
+                        android:src="@drawable/pano_direction_right_indicator"
+                        android:visibility="gone"
+                        android:layout_marginLeft="5dp"
+                        android:layout_toRightOf="@id/pano_pan_progress_bar_layout"
+                        android:layout_centerVertical="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <!-- The hint for "Too fast" text view-->
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_capture_too_fast_textview_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true">
+            <TextView android:id="@+id/pano_capture_too_fast_textview"
+                    android:text="@string/pano_too_fast_prompt"
+                    android:textAppearance="?android:textAppearanceMedium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/pano_capture_too_fast_text_height"
+                    android:visibility="gone" />
+        </com.android.camera.ui.RotateLayout>
+    </RelativeLayout>
+
+    <include layout="@layout/camera_control" />
+
+</LinearLayout>
diff --git a/res/layout-sw600dp/pano_review.xml b/res/layout-sw600dp/pano_review.xml
new file mode 100644
index 0000000..c16df1a
--- /dev/null
+++ b/res/layout-sw600dp/pano_review.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/pano_review_layout"
+        android:visibility="invisible"
+        android:orientation="vertical"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+
+    <LinearLayout android:id="@+id/pano_review_control"
+            style="@style/PanoViewHorizontalBar"
+            android:gravity="right"
+            android:orientation="horizontal">
+
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_review_cancel_button_layout"
+                android:layout_gravity="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:clickable="true"
+                    android:onClick="onCancelButtonClicked"
+                    android:textAppearance="?android:textAppearanceMedium"
+                    android:minWidth="@dimen/pano_review_button_width"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content" />
+        </com.android.camera.ui.RotateLayout>
+    </LinearLayout>
+
+    <ImageView android:id="@+id/pano_reviewarea"
+            android:scaleType="fitCenter"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/pano_mosaic_surface_height" />
+
+    <RelativeLayout style="@style/PanoViewHorizontalBar">
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_review_saving_indication_layout"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            <TextView android:id="@+id/pano_review_saving_indication"
+                    android:text="@string/pano_review_saving_indication_str"
+                    android:textAppearance="?android:textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content" />
+        </com.android.camera.ui.RotateLayout>
+
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_saving_progress_bar_layout"
+                android:layout_centerInParent="true"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content">
+            <com.android.camera.panorama.PanoProgressBar
+                    android:id="@+id/pano_saving_progress_bar"
+                    android:src="@drawable/ic_pan_progression"
+                    android:layout_centerInParent="true"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content" />
+        </com.android.camera.ui.RotateLayout>
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-sw600dp/preview_frame.xml
similarity index 96%
rename from res/layout-w1024dp/preview_frame.xml
rename to res/layout-sw600dp/preview_frame.xml
index 961a407..896d394 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-sw600dp/preview_frame.xml
@@ -31,6 +31,6 @@
                 android:visibility="gone"/>
         <include layout="@layout/focus_indicator"/>
         <include layout="@layout/priority_indicators"/>
-        <include layout="@layout/tap_to_focus_toast"/>
+        <include layout="@layout/first_hint_toast"/>
     </com.android.camera.PreviewFrameLayout>
 </RelativeLayout>
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-sw600dp/preview_frame_video.xml
similarity index 97%
rename from res/layout-w1024dp/preview_frame_video.xml
rename to res/layout-sw600dp/preview_frame_video.xml
index 69b7fe3..4e59c90 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-sw600dp/preview_frame_video.xml
@@ -44,5 +44,6 @@
                 android:background="@drawable/bg_pressed"
                 android:visibility="gone"
                 android:onClick="onReviewPlayClicked" />
+        <include layout="@layout/first_hint_toast"/>
     </com.android.camera.PreviewFrameLayout>
 </RelativeLayout>
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-sw600dp/review_control.xml
similarity index 100%
rename from res/layout-w1024dp/review_control.xml
rename to res/layout-sw600dp/review_control.xml
diff --git a/res/layout-sw600dp/share_popup.xml b/res/layout-sw600dp/share_popup.xml
new file mode 100644
index 0000000..5f72365
--- /dev/null
+++ b/res/layout-sw600dp/share_popup.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Use a full-screen popup window because UI has some intermediate problems
+     when its size is changed. -->
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/share_popup_background">
+    <FrameLayout android:id="@+id/root"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center">
+        <RelativeLayout android:id="@+id/share_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/border_last_picture">
+            <com.android.camera.ui.RotateLayout
+                    android:id="@+id/thumbnail_rotate_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentLeft="true">
+                <!-- The size of the thumbnail is calculated in SharePopup.java -->
+                <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" >
+                    <ImageView android:id="@+id/thumbnail"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
+                            android:scaleType="fitCenter"/>
+                    <ImageView android:id="@+id/play"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:scaleType="center"
+                            style="@style/ReviewPlayIcon"/>
+                </FrameLayout>
+            </com.android.camera.ui.RotateLayout>
+        </RelativeLayout>
+        <LinearLayout
+                android:layout_width="@dimen/share_item_width"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_gravity="right"
+                android:background="@color/share_icon_background">
+            <com.android.camera.ui.RotateLayout
+                    android:layout_marginTop="8dip"
+                    android:id="@+id/goto_gallery_button_rotate"
+                    android:layout_gravity="center"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" >
+                <ImageButton
+                        android:id="@+id/goto_gallery_button"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_gallery" />
+            </com.android.camera.ui.RotateLayout>
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_margin="8dip"
+                    android:layout_height="1dp"
+                    android:background="#5affffff" />
+
+            <GridView android:id="@+id/share_list"
+                    style="@style/OneColumnGrid" />
+        </LinearLayout>
+    </FrameLayout>
+</FrameLayout>
diff --git a/res/layout-w1024dp/video_camera.xml b/res/layout-sw600dp/video_camera.xml
similarity index 100%
rename from res/layout-w1024dp/video_camera.xml
rename to res/layout-sw600dp/video_camera.xml
diff --git a/res/layout-sw600dp/viewfinder_labels_video.xml b/res/layout-sw600dp/viewfinder_labels_video.xml
new file mode 100644
index 0000000..6fa7d2d
--- /dev/null
+++ b/res/layout-sw600dp/viewfinder_labels_video.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+    <TextView android:id="@+id/recording_time"
+            style="@style/OnViewfinderLabel"
+            android:gravity="center"
+            android:drawableLeft="@drawable/ic_recording_indicator"
+            android:drawablePadding="5dp"
+            android:visibility="gone" />
+    <TextView android:id="@+id/time_lapse_label"
+            android:text="@string/time_lapse_title"
+            style="@style/OnViewfinderLabel"
+            android:visibility="gone" />
+</LinearLayout>
diff --git a/res/layout-w1024dp/priority_indicators.xml b/res/layout-w1024dp/priority_indicators.xml
new file mode 100644
index 0000000..4926484
--- /dev/null
+++ b/res/layout-w1024dp/priority_indicators.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp">
+    <ImageView style="@style/OnScreenIndicator"
+            android:id="@+id/onscreen_gps_indicator_no_signal"
+            android:src="@drawable/ic_viewfinder_gps_no_signal"/>
+    <ImageView style="@style/OnScreenIndicator"
+            android:id="@+id/onscreen_gps_indicator_on"
+            android:src="@drawable/ic_viewfinder_gps_on"/>
+    <TextView style="@style/OnScreenIndicator"
+            android:id="@+id/onscreen_exposure_indicator"
+            android:gravity="center_vertical"
+            android:textSize="15dp"
+            android:textColor="@android:color/white"/>
+</LinearLayout>
diff --git a/res/layout/bg_replacement_training_message.xml b/res/layout/bg_replacement_training_message.xml
index ee0464e..449e8df 100644
--- a/res/layout/bg_replacement_training_message.xml
+++ b/res/layout/bg_replacement_training_message.xml
@@ -16,36 +16,36 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/bg_replace_message_frame"
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_width="match_parent"
         android:visibility="gone"
         android:onClick="onProtectiveCurtainClick"
         android:background="#77000000">
     <com.android.camera.ui.RotateLayout
             android:id="@+id/bg_replace_message"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_centerInParent="true">
         <LinearLayout
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:orientation="horizontal"
                 android:background="@drawable/dialog_full_holo_dark">
             <TextView
-                    android:layout_width="300dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:text="@string/bg_replacement_message"
                     android:padding="32dp" />
 
             <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1px"
+                    android:layout_height="match_parent"
+                    android:layout_width="1px"
                     android:background="#aaaaaa" />
 
             <Button android:id="@+id/bg_replace_cancel_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dip"
+                    android:layout_height="match_parent"
+                    android:layout_width="48dip"
                     android:layout_gravity="center"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     style="?android:attr/borderlessButtonStyle"
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index bc9e313..939007a 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -17,7 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/app_root"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     <include layout="@layout/preview_frame"/>
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index 366393d..3595849 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -16,15 +16,15 @@
 
 <com.android.camera.ui.ControlPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/control_panel"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:minWidth="76dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="76dp"
         android:background="@drawable/bg_camera_pattern">
     <include layout="@layout/review_thumbnail" />
     <include layout="@layout/review_control" />
     <com.android.camera.ShutterButton android:id="@+id/shutter_button"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_centerInParent="true"
             android:scaleType="center"
             android:clickable="true"
diff --git a/res/layout/effect_setting_item.xml b/res/layout/effect_setting_item.xml
index 0b212c3..86d09dd 100644
--- a/res/layout/effect_setting_item.xml
+++ b/res/layout/effect_setting_item.xml
@@ -17,8 +17,8 @@
         style="@style/EffectSettingItem">
 
         <ImageView android:id="@+id/image"
-                android:layout_width="@dimen/effect_setting_item_icon_width"
                 android:layout_height="@dimen/effect_setting_item_icon_width"
+                android:layout_width="@dimen/effect_setting_item_icon_width"
                 android:layout_gravity="center_horizontal"
                 android:scaleType="fitCenter"
                 android:adjustViewBounds="true" />
diff --git a/res/layout/tap_to_focus_toast.xml b/res/layout/first_hint_toast.xml
similarity index 92%
rename from res/layout/tap_to_focus_toast.xml
rename to res/layout/first_hint_toast.xml
index 1ea67e7..fb60d29 100644
--- a/res/layout/tap_to_focus_toast.xml
+++ b/res/layout/first_hint_toast.xml
@@ -17,13 +17,12 @@
 */
 -->
 <com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/tap_to_focus_prompt"
+        android:id="@+id/first_use_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:visibility="gone">
-    <TextView
-            android:text="@string/tap_to_focus"
+    <TextView android:id="@+id/toast_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
@@ -32,4 +31,5 @@
             android:paddingBottom="5dp"
             android:textAppearance="?android:textAppearanceMedium"
             android:background="@color/on_viewfinder_label_background_color" />
-</com.android.camera.ui.RotateLayout>
\ No newline at end of file
+</com.android.camera.ui.RotateLayout>
+
diff --git a/res/layout/focus_indicator.xml b/res/layout/focus_indicator.xml
index 0e67061..9e66b40 100644
--- a/res/layout/focus_indicator.xml
+++ b/res/layout/focus_indicator.xml
@@ -16,10 +16,10 @@
 
 <com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/focus_indicator_rotate_layout"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:layout_centerInParent="true">
     <com.android.camera.ui.FocusIndicatorView android:id="@+id/focus_indicator"
-            android:layout_width="120dp"
-            android:layout_height="120dp"/>
+            android:layout_height="120dp"
+            android:layout_width="120dp"/>
 </com.android.camera.ui.RotateLayout>
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index 764d6d6..33a8c7a 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -15,59 +15,58 @@
 -->
 <com.android.camera.ui.IndicatorControlBarContainer xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/indicator_control"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
         android:clickable="true"
-        android:layout_alignParentRight="true">
+        android:layout_alignParentBottom="true">
 
     <RelativeLayout
             android:id="@+id/control_bars"
-            android:layout_toRightOf="@+id/zoom_index_bar"
-            android:layout_width="@dimen/indicator_bar_width"
-            android:layout_height="match_parent">
+            android:layout_height="@dimen/indicator_bar_width"
+            android:layout_width="match_parent">
         <com.android.camera.ui.IndicatorControlBar
                 android:id="@+id/indicator_bar"
                 android:padding="8dp"
-                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_centerHorizontal="true">
+                android:layout_width="match_parent"
+                android:layout_centerVertical="true">
             <com.android.camera.ui.ZoomControlBar
                     android:id="@+id/zoom_control"
-                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_width="match_parent"
                     android:visibility="gone" />
             <com.android.camera.ui.RotateImageView
                     android:id="@+id/second_level_indicator_bar_icon"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content"
+                    android:layout_alignParentLeft="true"
                     android:contentDescription="@string/accessibility_second_level_indicators"
                     android:src="@drawable/ic_settings_holo_light" />
         </com.android.camera.ui.IndicatorControlBar>
 
         <com.android.camera.ui.SecondLevelIndicatorControlBar
                 android:id="@+id/second_level_indicator_bar"
-                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:layout_centerHorizontal="true"
+                android:layout_width="match_parent"
+                android:paddingRight="8dp"
+                android:paddingLeft="8dp"
+                android:layout_centerVertical="true"
                 android:background="@color/indicator_background"
                 android:visibility="gone">
             <View android:id="@+id/divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="match_parent"
+                    android:layout_width="1dp"
                     android:background="@android:color/white" />
             <View android:id="@+id/indicator_highlight"
-                    android:layout_alignParentLeft="true"
-                    android:layout_width="3dp"
-                    android:layout_height="0dp"
+                    android:layout_alignParentTop="true"
+                    android:layout_height="3dp"
+                    android:layout_width="0dp"
                     android:background="@color/mode_selection_border"
                     android:visibility="gone" />
             <com.android.camera.ui.ColorFilterImageView
                     android:id="@+id/back_to_first_level"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content"
                     android:contentDescription="@string/accessibility_back_to_first_level"
                     android:src="@drawable/btn_close_settings" />
         </com.android.camera.ui.SecondLevelIndicatorControlBar>
diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml
index 12c9618..1b5e16b 100644
--- a/res/layout/mode_picker.xml
+++ b/res/layout/mode_picker.xml
@@ -15,90 +15,91 @@
 -->
 <com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/mode_picker"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
+            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_alignParentLeft="true"
             android:visibility="gone">
     <RelativeLayout android:id="@+id/current_mode"
-            android:orientation="vertical"
-            android:layout_alignBottom="@+id/mode_selection"
-            android:layout_width="match_parent"
-            android:layout_height="55dp"
+            android:orientation="horizontal"
+            android:layout_alignLeft="@+id/mode_selection"
+            android:layout_height="match_parent"
+            android:layout_width="55dp"
             android:contentDescription="@string/accessibility_mode_picker"
             android:background="@drawable/bg_mode_picker">
-        <View android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@android:color/white"/>
         <RelativeLayout
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 android:contentDescription="@string/empty"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_width="match_parent">
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_0"
+                    android:layout_height="32dp"
                     android:layout_width="32dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="8dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginTop="8dp"
                     android:scaleType="fitCenter"
                     android:contentDescription="@string/empty"
                     android:src="@drawable/ic_switch_video_holo_light" />
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_1"
+                    android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
                     android:layout_centerInParent="true"
                     android:scaleType="fitCenter"
                     android:contentDescription="@string/empty"
                     android:src="@drawable/ic_switch_camera_holo_light" />
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_2"
+                    android:layout_height="32dp"
                     android:layout_width="32dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="8dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="8dp"
                     android:scaleType="fitCenter"
                     android:contentDescription="@string/empty"
                     android:src="@drawable/ic_switch_pan_holo_light" />
         </RelativeLayout>
+        <View android:layout_height="match_parent"
+                android:layout_width="1dp"
+                android:layout_alignParentRight="true"
+                android:background="@android:color/white"/>
     </RelativeLayout>
     <RelativeLayout android:id="@+id/mode_selection"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="198dp"
+            android:orientation="horizontal"
+            android:layout_height="match_parent"
+            android:layout_width="198dp"
             android:background="@drawable/bg_switcher"
             android:visibility="gone">
-        <View android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_alignParentTop="true"
-                android:background="@color/mode_selection_border"/>
         <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true">
+                android:orientation="horizontal"
+                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_centerHorizontal="true">
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
                     android:contentDescription="@string/switch_to_camera_label"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
                     android:scaleType="center"
                     android:background="@drawable/bg_pressed"
                     android:src="@drawable/ic_switch_camera_holo_light" />
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_video"
                     android:contentDescription="@string/switch_to_video_label"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
                     android:scaleType="center"
                     android:background="@drawable/bg_pressed"
                     android:src="@drawable/ic_switch_video_holo_light" />
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
                     android:contentDescription="@string/switch_to_panorama_label"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content"
                     android:scaleType="center"
                     android:background="@drawable/bg_pressed"
                     android:src="@drawable/ic_switch_pan_holo_light" />
         </LinearLayout>
+        <View android:layout_height="match_parent"
+                android:layout_width="1dp"
+                android:layout_alignParentRight="true"
+                android:background="@color/mode_selection_border"/>
     </RelativeLayout>
 </com.android.camera.ModePicker>
diff --git a/res/layout/on_screen_hint.xml b/res/layout/on_screen_hint.xml
index 312ff6d..b47a9e6 100644
--- a/res/layout/on_screen_hint.xml
+++ b/res/layout/on_screen_hint.xml
@@ -18,15 +18,15 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
     android:background="@drawable/on_screen_hint_frame">
 
     <TextView
         android:id="@+id/message"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:layout_weight="1"
         android:textAppearance="@style/OnScreenHintTextAppearance.Small"
         android:textColor="#ffffffff"
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index a91104a..d6430f4 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -16,42 +16,63 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/pano_capture_layout"
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:orientation="vertical">
 
     <RelativeLayout android:id="@+id/frame_layout"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1">
 
         <LinearLayout android:id="@+id/pano_capture_preview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:orientation="horizontal">
 
-            <!-- The top bar with capture indication -->
-            <FrameLayout android:id="@+id/pano_capture_indicator_layout"
-                    style="@style/PanoViewHorizontalBar">
+            <!-- The bottom bar with progress bar and direction indicators -->
+            <RelativeLayout
+                style="@style/PanoViewHorizontalBar">
 
-                <TextView
-                        android:id="@+id/pano_capture_indicator"
-                        android:text="@string/pano_capture_indication"
-                        android:paddingTop="0dp"
-                        android:drawablePadding="5sp"
-                        android:drawableLeft="@drawable/ic_pan_recording_indicator"
+                <com.android.camera.ui.RotateLayout
+                        android:id="@+id/pano_pan_progress_bar_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true">
+                    <com.android.camera.panorama.PanoProgressBar
+                            android:id="@+id/pano_pan_progress_bar"
+                            android:visibility="gone"
+                            android:src="@drawable/ic_pan_progression"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                </com.android.camera.ui.RotateLayout>
+                <ImageView
+                        android:id="@+id/pano_pan_left_indicator"
+                        android:src="@drawable/pano_direction_left_indicator"
+                        android:rotation="90"
                         android:visibility="gone"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginTop="16dp"
-                        android:layout_gravity="top|left"
+                        android:layout_marginBottom="5dp"
+                        android:layout_above="@id/pano_pan_progress_bar_layout"
+                        android:layout_centerHorizontal="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
-            </FrameLayout>
+
+                <ImageView
+                        android:id="@+id/pano_pan_right_indicator"
+                        android:src="@drawable/pano_direction_right_indicator"
+                        android:rotation="90"
+                        android:visibility="gone"
+                        android:layout_marginTop="5dp"
+                        android:layout_below="@id/pano_pan_progress_bar_layout"
+                        android:layout_centerHorizontal="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+            </RelativeLayout>
 
             <RelativeLayout
                     android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/pano_mosaic_surface_height">
+                    android:layout_width="@dimen/pano_mosaic_surface_height"
+                    android:layout_height="match_parent">
                 <com.android.camera.panorama.MosaicRendererSurfaceView
                         android:id="@+id/pano_renderer"
                         android:layout_width="match_parent"
@@ -62,50 +83,46 @@
                         android:background="@drawable/ic_pan_border_fast"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
-
             </RelativeLayout>
 
-            <!-- The bottom bar with progress bar and direction indicators -->
-            <RelativeLayout
-                style="@style/PanoViewHorizontalBar">
-                <com.android.camera.panorama.PanoProgressBar
-                        android:id="@+id/pano_pan_progress_bar"
-                        android:visibility="gone"
-                        android:src="@drawable/ic_pan_progression"
-                        android:layout_centerInParent="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-                <ImageView
-                        android:id="@+id/pano_pan_left_indicator"
-                        android:src="@drawable/pano_direction_left_indicator"
-                        android:visibility="gone"
-                        android:layout_marginRight="5dp"
-                        android:layout_toLeftOf="@id/pano_pan_progress_bar"
-                        android:layout_centerVertical="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+            <!-- The top bar with capture indication -->
+            <FrameLayout android:id="@+id/pano_capture_indicator_layout"
+                    style="@style/PanoViewHorizontalBar"
+                    android:padding="5dp">
 
-                <ImageView
-                        android:id="@+id/pano_pan_right_indicator"
-                        android:src="@drawable/pano_direction_right_indicator"
+                <com.android.camera.ui.RotateLayout
+                        android:id="@+id/pano_capture_indicator"
                         android:visibility="gone"
-                        android:layout_marginLeft="5dp"
-                        android:layout_toRightOf="@id/pano_pan_progress_bar"
-                        android:layout_centerVertical="true"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-            </RelativeLayout>
+                        android:layout_gravity="top|right"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+                    <TextView
+                            android:text="@string/pano_capture_indication"
+                            android:paddingTop="0dp"
+                            android:drawablePadding="5sp"
+                            android:drawableLeft="@drawable/ic_pan_recording_indicator"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginTop="16dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                </com.android.camera.ui.RotateLayout>
+            </FrameLayout>
 
         </LinearLayout>
 
         <!-- The hint for "Too fast" text view-->
-        <TextView android:id="@+id/pano_capture_too_fast_textview"
-                android:text="@string/pano_too_fast_prompt"
-                android:textAppearance="?android:textAppearanceMedium"
-                android:layout_height="@dimen/pano_capture_too_fast_text_height"
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_capture_too_fast_textview_layout"
                 android:layout_width="wrap_content"
-                android:visibility="gone"
-                android:layout_centerInParent="true" />
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true">
+            <TextView android:id="@+id/pano_capture_too_fast_textview"
+                    android:text="@string/pano_too_fast_prompt"
+                    android:textAppearance="?android:textAppearanceMedium"
+                    android:layout_width="@dimen/pano_capture_too_fast_text_height"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+        </com.android.camera.ui.RotateLayout>
     </RelativeLayout>
 
     <include layout="@layout/camera_control" />
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 5b9c2fc..2900a5a 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -17,47 +17,65 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/pano_review_layout"
         android:visibility="invisible"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:orientation="horizontal"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+
+    <RelativeLayout style="@style/PanoViewHorizontalBar">
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_review_saving_indication_layout"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            <TextView android:id="@+id/pano_review_saving_indication"
+                    android:text="@string/pano_review_saving_indication_str"
+                    android:textAppearance="?android:textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content" />
+        </com.android.camera.ui.RotateLayout>
+
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_saving_progress_bar_layout"
+                android:layout_centerInParent="true"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content">
+            <com.android.camera.panorama.PanoProgressBar
+                    android:id="@+id/pano_saving_progress_bar"
+                    android:src="@drawable/ic_pan_progression"
+                    android:layout_centerInParent="true"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content" />
+        </com.android.camera.ui.RotateLayout>
+    </RelativeLayout>
+
+    <ImageView android:id="@+id/pano_reviewarea"
+            android:rotation="90"
+            android:scaleType="fitCenter"
+            android:layout_height="match_parent"
+            android:layout_width="@dimen/pano_mosaic_surface_height" />
 
     <LinearLayout android:id="@+id/pano_review_control"
             style="@style/PanoViewHorizontalBar"
-            android:gravity="right"
-            android:orientation="horizontal"
+            android:gravity="bottom"
+            android:orientation="vertical"
             android:layout_alignParentBottom="true"
-            android:layout_width="match_parent">
+            android:layout_height="match_parent">
 
-        <TextView android:id="@+id/pano_review_cancel_button"
-                android:text="@string/review_cancel"
-                android:clickable="true"
-                android:onClick="onCancelButtonClicked"
-                android:textAppearance="?android:textAppearanceMedium"
-                android:minWidth="@dimen/pano_review_button_width"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/pano_review_button_height" />
+        <com.android.camera.ui.RotateLayout
+                android:id="@+id/pano_review_cancel_button_layout"
+                android:layout_gravity="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:clickable="true"
+                    android:onClick="onCancelButtonClicked"
+                    android:textAppearance="?android:textAppearanceMedium"
+                    android:minWidth="@dimen/pano_review_button_width"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content" />
+        </com.android.camera.ui.RotateLayout>
     </LinearLayout>
-
-    <ImageView android:id="@+id/pano_reviewarea"
-            android:scaleType="fitCenter"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/pano_mosaic_surface_height" />
-
-    <RelativeLayout style="@style/PanoViewHorizontalBar">
-        <TextView android:id="@+id/pano_review_saving_indication"
-                android:text="@string/pano_review_saving_indication_str"
-                android:textSize="@dimen/pano_review_saving_indication_size"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="20dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        <com.android.camera.panorama.PanoProgressBar
-                android:id="@+id/pano_saving_progress_bar"
-                android:src="@drawable/ic_pan_progression"
-                android:layout_centerInParent="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-    </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout/pano_rotate_dialog.xml b/res/layout/pano_rotate_dialog.xml
new file mode 100644
index 0000000..456bb02
--- /dev/null
+++ b/res/layout/pano_rotate_dialog.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <com.android.camera.ui.RotateLayout
+            android:id="@+id/rotate_dialog_layout"
+            android:visibility="gone"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+        <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/popup_background">
+
+            <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                <LinearLayout android:id="@+id/rotate_dialog_title_layout"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                    <TextView android:id="@+id/rotate_dialog_title"
+                            style="@android:style/TextAppearance.Holo.DialogWindowTitle"
+                            android:gravity="center_vertical"
+                            android:layout_marginLeft="16dip"
+                            android:layout_marginRight="16dip"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:minHeight="64dp"/>
+                    <View android:id="@+id/rotate_dialog_title_divider"
+                            layout_weight="bottom"
+                            style="@style/PopupTitleSeperator" />
+                </LinearLayout>
+
+                <LinearLayout
+                        android:id="@+id/dialog_layout"
+                        android:orientation="horizontal"
+                        android:background="@color/popup_background"
+                        android:padding="9dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                    <ProgressBar
+                            android:id="@+id/rotate_dialog_spinner"
+                            android:layout_gravity="center_vertical"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                    <TextView
+                            style="@android:style/TextAppearance.Holo.Medium"
+                            android:id="@+id/rotate_dialog_text"
+                            android:layout_gravity="center_vertical"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+                </LinearLayout>
+
+                <LinearLayout android:id="@+id/rotate_dialog_button_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:minHeight="48dp"
+                        android:orientation="vertical"
+                        android:divider="@drawable/list_divider"
+                        android:showDividers="beginning"
+                        android:dividerPadding="0dip">
+
+                    <Button android:id="@+id/rotate_dialog_button"
+                            style="@android:style/Widget.Holo.Button.Borderless"
+                            android:gravity="center"
+                            android:text="@string/review_ok"
+                            android:maxLines="2"
+                            android:minHeight="48dp"
+                            android:textSize="14sp"
+                            android:onClick="onAlertDialogButtonClicked"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                </LinearLayout>
+            </LinearLayout>
+        </FrameLayout>
+    </com.android.camera.ui.RotateLayout>
+</FrameLayout>
diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml
index 2b25fe1..d56cca0 100644
--- a/res/layout/panorama.xml
+++ b/res/layout/panorama.xml
@@ -17,9 +17,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/pano_layout"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <include layout="@layout/pano_capture" />
     <include layout="@layout/pano_review" />
+    <include layout="@layout/pano_rotate_dialog" />
 </RelativeLayout>
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index c225a58..31ba61b 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -32,7 +32,7 @@
                 android:visibility="gone"/>
         <include layout="@layout/focus_indicator"/>
         <include layout="@layout/priority_indicators"/>
-        <include layout="@layout/tap_to_focus_toast"/>
+        <include layout="@layout/first_hint_toast"/>
     </com.android.camera.PreviewFrameLayout>
     <include layout="@layout/indicator_bar" />
 </RelativeLayout>
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml
index 5e27169..992eb46 100644
--- a/res/layout/preview_frame_video.xml
+++ b/res/layout/preview_frame_video.xml
@@ -16,25 +16,25 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/frame_layout"
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_width="match_parent"
         android:layout_weight="1">
     <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
-            android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_width="match_parent"
             android:layout_centerInParent="true"
             android:background="@drawable/border_preview">
         <SurfaceView android:id="@+id/camera_preview"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:layout_width="match_parent" />
         <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"
                 style="@style/ViewfinderLableLayout">
 
             <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" />
         </com.android.camera.ui.RotateLayout>
         <ImageView android:id="@+id/review_image"
-                android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_width="match_parent"
                 android:visibility="gone"
                 android:background="@android:color/black"/>
         <com.android.camera.ui.RotateImageView
@@ -44,13 +44,14 @@
                 android:src="@drawable/ic_gallery_play"
                 android:visibility="gone"
                 android:onClick="onReviewPlayClicked"/>
+        <include layout="@layout/first_hint_toast"/>
     </com.android.camera.PreviewFrameLayout>
 
     <!-- Fill up the space below preview frame with black. -->
     <View
         android:background="#ff000000"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
+        android:layout_height="match_parent"
+        android:layout_width="0dip"
         android:layout_below="@+id/frame"
         android:layout_alignParentBottom="true" />
 
diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml
index 4926484..794dfb8 100644
--- a/res/layout/priority_indicators.xml
+++ b/res/layout/priority_indicators.xml
@@ -14,20 +14,24 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:layout_alignParentLeft="true"
+        android:orientation="vertical"
+        android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:padding="8dp">
     <ImageView style="@style/OnScreenIndicator"
+            android:padding="1dp"
             android:id="@+id/onscreen_gps_indicator_no_signal"
             android:src="@drawable/ic_viewfinder_gps_no_signal"/>
     <ImageView style="@style/OnScreenIndicator"
+            android:padding="1dp"
             android:id="@+id/onscreen_gps_indicator_on"
             android:src="@drawable/ic_viewfinder_gps_on"/>
     <TextView style="@style/OnScreenIndicator"
             android:id="@+id/onscreen_exposure_indicator"
+            android:layout_marginTop="6dp"
+            android:rotation="90.0"
             android:gravity="center_vertical"
             android:textSize="15dp"
             android:textColor="@android:color/white"/>
diff --git a/res/layout/review_control.xml b/res/layout/review_control.xml
index 6a25d2c..d590dbd 100644
--- a/res/layout/review_control.xml
+++ b/res/layout/review_control.xml
@@ -16,18 +16,18 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/review_control"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
     <com.android.camera.ui.RotateImageView android:id="@+id/btn_done"
             style="@style/ReviewControlIcon"
             android:visibility="gone"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="20dp"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="20dp"
             android:onClick="onReviewDoneClicked"
             android:src="@drawable/ic_menu_done_holo_light" />
     <ImageView android:id="@+id/btn_retake"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_centerInParent="true"
             android:clickable="true"
             android:focusable="true"
@@ -37,8 +37,8 @@
     <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel"
             style="@style/ReviewControlIcon"
             android:visibility="gone"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="20dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="20dp"
             android:onClick="onReviewCancelClicked"
             android:src="@drawable/ic_menu_cancel_holo_light" />
 </RelativeLayout>
diff --git a/res/layout/setting_item.xml b/res/layout/setting_item.xml
index 5bcf3f7..3af3c3e 100644
--- a/res/layout/setting_item.xml
+++ b/res/layout/setting_item.xml
@@ -22,8 +22,8 @@
         <TextView android:id="@+id/text"
                 style="@style/SettingItemTitle" />
         <ImageView android:id="@+id/image"
-                android:layout_width="@dimen/setting_item_icon_width"
                 android:layout_height="@dimen/setting_item_icon_width"
+                android:layout_width="@dimen/setting_item_icon_width"
                 android:scaleType="fitCenter"
                 android:adjustViewBounds="true" />
 </LinearLayout>
diff --git a/res/layout/share_icon.xml b/res/layout/share_icon.xml
index 7ab2e3b..17b2eef 100644
--- a/res/layout/share_icon.xml
+++ b/res/layout/share_icon.xml
@@ -14,14 +14,14 @@
      limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/share_item_height">
+        android:layout_height="@dimen/share_item_height"
+        android:layout_width="@dimen/share_item_width">
     <com.android.camera.ui.RotateLayout android:id="@+id/share_icon_rotate_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
             android:layout_gravity="center">
         <ImageView android:id="@+id/icon"
-                android:layout_width="@dimen/share_icon_length"
-                android:layout_height="@dimen/share_icon_length"/>
+                android:layout_height="@dimen/share_icon_length"
+                android:layout_width="@dimen/share_icon_length"/>
     </com.android.camera.ui.RotateLayout>
 </FrameLayout>
diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index ccc74d9..d8035a0 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -19,30 +19,31 @@
 <FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_width="match_parent"
         android:background="@color/share_popup_background">
     <FrameLayout android:id="@+id/root"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_gravity="left|center">
         <RelativeLayout android:id="@+id/share_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
                 android:background="@drawable/border_last_picture">
             <com.android.camera.ui.RotateLayout
                     android:id="@+id/thumbnail_rotate_layout"
-                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true">
+                    android:layout_width="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true">
                 <!-- The size of the thumbnail is calculated in SharePopup.java -->
                 <FrameLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" >
                     <ImageView android:id="@+id/thumbnail"
-                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
                             android:adjustViewBounds="true"
                             android:scaleType="fitCenter"/>
                     <ImageView android:id="@+id/play"
@@ -52,40 +53,43 @@
                             android:scaleType="center"
                             style="@style/ReviewPlayIcon"/>
                 </FrameLayout>
-            </com.android.camera.ui.RotateLayout> 
+            </com.android.camera.ui.RotateLayout>
         </RelativeLayout>
-        <LinearLayout
-                android:layout_width="@dimen/share_item_width"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_gravity="right"
+        <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/share_item_height"
+                android:layout_gravity="bottom"
                 android:background="@color/share_icon_background">
             <com.android.camera.ui.RotateLayout
-                    android:layout_marginTop="8dip"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="8dip"
                     android:id="@+id/goto_gallery_button_rotate"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_centerVertical="true"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content">
                 <ImageButton
                         android:id="@+id/goto_gallery_button"
                         android:background="?android:attr/selectableItemBackground"
                         android:layout_gravity="center"
-                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
                         android:src="@drawable/ic_gallery" />
             </com.android.camera.ui.RotateLayout>
             <View
-                    android:layout_width="match_parent"
+                    android:id="@+id/gallery_button_divider"
+                    android:layout_toLeftOf="@+id/goto_gallery_button_rotate"
+                    android:layout_height="match_parent"
                     android:layout_margin="8dip"
-                    android:layout_height="1dp"
+                    android:layout_width="1dp"
                     android:background="#5affffff" />
 
-            <ListView android:id="@+id/share_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:choiceMode="singleChoice"
-                    style="@android:style/Widget.Holo.ListView" />
-        </LinearLayout>
+            <com.android.camera.ui.RightAlignedHorizontalScrollView android:id="@+id/share_list_container"
+                    android:layout_toLeftOf="@+id/gallery_button_divider"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content">
+                <com.android.camera.ui.OneRowGridView android:id="@+id/share_list"
+                        style="@style/OneRowGrid"/>
+            </com.android.camera.ui.RightAlignedHorizontalScrollView>
+        </RelativeLayout>
     </FrameLayout>
 </FrameLayout>
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 809c7a5..e8ae19a 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -17,12 +17,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/app_root"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
     <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:orientation="vertical"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent">
         <include layout="@layout/preview_frame_video"/>
         <include layout="@layout/camera_control"/>
     </LinearLayout>
diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml
index 9e9c892..75a4449 100644
--- a/res/layout/viewfinder_labels_video.xml
+++ b/res/layout/viewfinder_labels_video.xml
@@ -16,8 +16,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
     <TextView android:id="@+id/recording_time"
             style="@style/OnViewfinderLabel"
             android:gravity="center"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5049f29..f8c3735 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamerafout"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Kan nie aan kamera koppel nie."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Kan nie aan die kamera koppel nie."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera is gedeaktiveer weens sekuriteitsbeleide."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kameraprente"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kameravideo\'s"</string>
     <string name="wait" msgid="8600187532323801552">"Wag asseblief…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Heg asseblief USB-berging voordat kamera gebruik word."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Sit asseblief \'n SD-kaart in voor jy die kamera gebruik."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Heg USB-berging voordat kamera gebruik word."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Sit \'n SD-kaart in voor jy die kamera gebruik."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Jou USB-berging is vol."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Jou SD-kaart is vol."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Berei tans USB-berging voor…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Kon nie toegang tot USB-berging kry nie."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Kon nie toegang tot SD-kaart kry."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Stel verstek instellings terug"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamera-instellings sal na verstek instellings teruggestel word."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera-instellings"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera-instellings"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Prentgrootte"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M pixels"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokus-modus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nag"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonsondergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Partytjie"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Dit kan nie in die toneelmodus gekies word nie"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan nie in toneelmodus gekies word nie."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kamera-instellings"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Laai verstek instellings terug"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Blootstelling"</string>
@@ -92,30 +92,30 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Skakel oor na panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Deel prent via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Deel video via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Geen prent om te deel nie"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Geen video om te deel nie"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Te vinnig"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Geen prent om te deel nie."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Geen video om te deel nie."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Te vinnig"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Berei panorame voor"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Kon nie panorama stoor nie"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Kon nie panorama stoor nie."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Lê panorama vas"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Stoor tans…"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tik om te fokus"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Lê panorama vas"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Stoor tans…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Raak om te fokus."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekte"</string>
     <string name="effect_none" msgid="3601545724573307541">"Geen"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Druk"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Groot oë"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Groot mond"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Klein mond"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Groot neus"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Klein oë"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"In die ruimte"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Groot oë"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Groot mond"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Klein mond"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Groot neus"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Klein oë"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"In die ruimte"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sonsondergang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Kies jou eie"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Plaas jou toestel op \'n stewige oppervlak en maak seker daar is geen beweging agter jou nie. "\n\n"Stap dan uit die kamera se sigveld."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan nie gekies word as die effek aan is nie."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Neem \'n foto tydens video-opname deur op die voorskou-skerm te tik."</string>
+    <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Kies jou eie"</string>
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Sit jou toestel neer"\n"Stap vir \'n oomblik buite sig"</string>
+    <string name="not_selectable_in_effect" msgid="7967729203855039239">"Kan nie gekies word as die effek aan is nie."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Neem \'n foto tydens video-opname deur die voorskou-skerm te raak."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video-momentopname is gedeaktiveer wanneer spesiale effekte aan is."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Vee effekte uit"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Lawwe gesigte"</string>
@@ -123,7 +123,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Sluiterknoppie"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Mees onlangse foto"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Skakelaar vir voorste of agterste kamera"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera-, video- of panoramakieser"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera-, video- of panoramakieser"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Meer instellingkontroles"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Maak instellingkontroles toe"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoembeheer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 75b2b0f..cf0a28d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"ካሜራ ስህተት"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"ከካሜራ ጋር ማገናኘት አልተቻለም።"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"ከካሜራ ጋር ማገናኘት አልተቻለም።"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"በደህንነት ፖሊሲዎች ምክንያት ካሜራ ቦዝኗል።"</string>
     <string name="camera_label" msgid="6346560772074764302">"ካሜራ"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"ካምኮርድ"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"የካሜራ ምስሎች"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"የካሜራ ቫዲዮዎች"</string>
     <string name="wait" msgid="8600187532323801552">"እባክዎ ይጠብቁ…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"እባክዎካሜራ ከመጠቀምዎ በፊት USB ይሰኩ።"</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"እባክዎ ካሜራውን ከመጠቀምዎ በፊት የSD ካርድ ያስገቡ።"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"እባክህ ካሜራ ከመጠቀምህ በፊት USB ሰካ።"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"እባክህ ካሜራውን ከመጠቀምህ በፊት የSD ካርድ አስገባ።"</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"የUSB  ማከማቻዎ ሙሉ ነው።"</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"የSD ካርድዎ ሙሉ ነው።"</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"የUSB ማከማቻ በማዘጋጀት ላይ..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB ማከማችን መድረስ አልተቻለም፡፡"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD ካርድን መድረስ አልተቻለም፡፡"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"ወደ ነባሪዎች መልስ"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"የካሜራ ቅንብሮች ወደ ነባሪ እነበረበት ይመለሳል።"</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"የካሜራ ቅንብሮች"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"የካምኮርድ ቅንብሮች"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"የምስል መጠን"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M ፒክስል"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M ፒክስል"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M ፒክስል"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M ፒክስል"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M ፒክስል"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M ፒክስል"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M ፒክስል"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M ፒክሴል"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M ፒክስል"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"የማተኮር ሁነታ"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"ማታ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"ፀሀይ ስትጠልቅ"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"ፓርቲ"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"ይህ በትዕይንት ሁነታ መመረጥ የሚችል አይደለም።"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">" በትዕይንት ሁኔታ መመረጥ የሚችል አይደለም።"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"የካሜራ ቅንብሮች"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"ወደ ነባሪዎች  እነበረበት መልስ"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"የተጋለጠ"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"ወደ ፓኖራማ ቀይር"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"ፎቶ  አጋራ  በ"</string>
     <string name="share_video_via" msgid="5152302809166549015">"ይህን ቪዲዮ አጋራ  በ"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"ለማጋራት ምንም  ፎቶ የለም"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"ለማጋራት ምንም ቪዲዮ የለም"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"በጣም ፈጥኖዋል"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"ለማጋራት ምንም ፎቶ የለም"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"ለማጋራት ምንም ቪዲዮ የለም"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"በጣም ፈጥኖዋል"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"ፓናሮማ በማዘጋጀት ላይ"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"ፓኖራማ ለማስቀመጥ ተስኗል"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"ፓኖራማ  ማስቀመጥ አልተቻለም::"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"ፓኖራማ"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"ፓኖራማ በማንሳት ላይ"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"በማስቀመጥ ላይ..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"ለማተኮር ሁለቴ ንካ"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"ፓኖራማ በማንሳት ላይ"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"በማስቀመጥ ላይ&amp;hellip;"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"ዳሰስ ለማተኮር፡፡"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"ማሳመሪያዎች"</string>
     <string name="effect_none" msgid="3601545724573307541">"ምንም የለም"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"ጭመቅ"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"ትላልቅ ዓይኖች"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"ትልቅ አፍ"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"ትንሽ አፍ"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"ትልቅ አፍንጫ"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"ትናንሽ ዓይኖች"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"In Space"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ትላልቅ ዓይኖች"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ትልቅ አፍ"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"ትንሽ አፍ"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"ትልቅ አፍንጫ"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"ትናንሽ ዓይኖች"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"ቦታ ውስጥ"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"ፀሀይ ስትጠልቅ"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ዲስኮ"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"የራስህን ምረጥ"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"መሳሪያዎን በዝርግ ስፍራ ላይ ያስቀምጡ እና ከእርስዎ ጀርባ ምንም ዓይነት መነቃነቅ እንደሌለ እርግጠኛ ሁን፡፡"\n\n" ከዛ በኋላ ከካሜራው እይታ ለቀው ይውጡ፡፡"</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"ማሳመሪያው ሲበራ ይህ ሊመረጥ አይችልም::"</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"የቅድመ ዕይታ ማያን ነካ በማድረግ በቪዲዮ ቀረፃ ጊዜ ፎቶ አንሳ።"</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"ማሳመሪያው ሲበራ  ሊመረጥ አይችልም::"</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"የቅድመ ዕይታ ማያን በመዳሰስ በማድረግ በቪዲዮ ቀረፃ ጊዜ ፎቶ አንሳ።"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"ቪዲዮ ማንሻ ልዩ ማሳመሪያዎች ሲበሩ ይቦዝናል::"</string>
     <string name="clear_effects" msgid="5485339175014139481">"ማሳመሪያዎች አጽዳ"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"ሞኛሞኝ ፊቶች"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"የካሜራ ሌንስ መከለያ አዝራር።"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"በጣም የቅርብ ፎቶ"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"የፊትና ኋላ ካሜራ ማብሪያና ማጥፊያ"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"ካሜራ፣ቪድዮ ወይም ፓናሮማ መምረጫ"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"ካሜራ፣ቪድዮ ወይም ፓናሮማ መምረጫ"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"ተጨማሪ ቅንጅቶች መቈጣጠሪያ"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"የቅንጅት መቆጣጠሪያዎች ዝጋ"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"ኣጕላ  መቆጣጠሪያ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 920a42e..cafe4c1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"خطأ في الكاميرا"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"لا يمكن الاتصال بالكاميرا."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"يتعذر الاتصال بالكاميرا."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"تم تعطيل الكاميرا بسبب سياسات الأمان."</string>
     <string name="camera_label" msgid="6346560772074764302">"الكاميرا"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"كاميرا فيديو"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"صور الكاميرا"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"مقاطع فيديو الكاميرا"</string>
     <string name="wait" msgid="8600187532323801552">"يرجى الانتظار…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"الرجاء تركيب وحدة تخزين USB قبل استخدام الكاميرا."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"الرجاء إدراج بطاقة SD قبل استخدام الكاميرا."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"حمِّل وحدة تخزين USB قبل استخدام الكاميرا."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"أدرج بطاقة SD قبل استخدام الكاميرا."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"وحدة تخزين USB ممتلئة."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"بطاقة SD ممتلئة."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"جارٍ تحضير وحدة تخزين USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"تعذر الدخول إلى وحدة تخزين USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"تعذر الدخول إلى بطاقة SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"استعادة الإعدادات الافتراضية"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"ستتم استعادة إعدادات الكاميرا إلى الإعدادات الافتراضية."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"إعدادات الكاميرا"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"إعدادات كاميرا الفيديو"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"حجم الصورة"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3 ميغا بكسل"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3 ميغا بكسل"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"وضع التركيز"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"ليلي"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"الغروب"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"مجموعة"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"لا يمكن تحديد هذا الإعداد في وضع المشهد."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"لا يمكن تحديده في وضع المشهد."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"إعدادات الكاميرا"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"استعادة الإعدادات الافتراضية"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"التعرض"</string>
@@ -92,30 +92,30 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"تبديل إلى بانوراما"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"مشاركة الصورة عبر"</string>
     <string name="share_video_via" msgid="5152302809166549015">"مشاركة الفيديو عبر"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"لا توجد صورة لمشاركتها"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"لا يوجد فيديو لمشاركته"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"سريع للغاية"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"لا تتوفر صورة لمشاركتها."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"لا يتوفر فيديو لمشاركته."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"سريع للغاية"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"جارٍ تحضير العرض البانورامي"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"أخفق حفظ العرض البانورامي"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"تعذر حفظ بانوراما."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"عرض بانورامي"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"جارٍ التقاط عرض بانورامي"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"جارٍ الحفظ..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"انقر للتركيز"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"جارٍ التقاط عرض بانورامي"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"جارٍ الحفظ..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"المس للتركيز."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"تأثيرات"</string>
     <string name="effect_none" msgid="3601545724573307541">"بلا"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"ضغط"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"عيون كبيرة"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"فم كبير"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"فم صغير"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"أنف كبير"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"عيون صغيرة"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"في الفضاء"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"عيون كبيرة"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"فم كبير"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"فم صغير"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"أنف كبير"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"عيون صغيرة"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"في الفضاء"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"الغروب"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ديسكو"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"اختيارك الخاص"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"ضع الجهاز على سطح ثابت وتأكد من عدم وجود حركة خلفك."\n\n"ثم انتقل إلى وضع الكاميرا."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"هذا الإعداد غير قابل للتحديد عند تشغيل التأثير."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"التقاط صورة أثناء تسجيل الفيديو بالنقر على شاشة المعاينة."</string>
+    <string name="effect_backdropper_gallery" msgid="3271387403091819540">"الاختيار الذاتي"</string>
+    <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>
     <string name="clear_effects" msgid="5485339175014139481">"محو التأثيرات"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"وجوه مضحكة"</string>
@@ -123,7 +123,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"زر المصراع"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"أحدث صورة"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"مفتاح التبديل بين الأمام والخلف"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"محدّد الكاميرا أو الفيديو أو البانوراما"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"محدّد الكاميرا أو الفيديو أو البانوراما"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"مزيد من عناصر التحكم في الإعدادات"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"إغلاق عناصر التحكم في الإعدادات"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"التحكم في التكبير/التصغير"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 0000000..1ab9dd8
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="camera_error_title" msgid="6484667504938477337">"Памылка камеры"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Не атрымлiваецца падключыцца да камеры."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Камера адключана з-за палітыкі бяспекі."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
+    <string name="video_camera_label" msgid="2899292505526427293">"Відэакамера"</string>
+    <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Фота з камеры"</string>
+    <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Відэа з камеры"</string>
+    <string name="wait" msgid="8600187532323801552">"Чакайце..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Перш чым выкарыстоўваць камеру, падключыце USB-назапашвальнiк."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Устаўце SD-карту перад выкарыстаннем камеры."</string>
+    <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Ваш USB-назапашвальнiк поўны."</string>
+    <string name="not_enough_space" product="default" msgid="6655334407957844653">"Ваша SD-карта запоўненая."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Падрыхтоўка USB-назапашвальнiка..."</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"Падрыхтоўка SD-карты..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Немагчыма атрымаць доступ да USB-назапашвальніка."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Немагчыма атрымаць доступ да SD-карты."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Аднавіць налады па змаўчанні"</string>
+    <string name="confirm_restore_message" msgid="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_retake" msgid="7804864054896088338">"ЗРАБІЦЬ ЗНОЎ"</string>
+    <string name="camera_gallery_photos_text" msgid="6558048736561932758">"Галерэя"</string>
+    <string name="switch_camera_id" msgid="837545176602471325">"Пераключыць камеру"</string>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Запіс на працягу доўгага часу"</string>
+    <string name="pref_camera_id_title" msgid="6023059405578511534">"Выберыце камеру"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Назад"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Перад"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Месцазнаходжанне крамы"</string>
+    <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Адключана"</string>
+    <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Уключана"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Якасць відэа"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="5262531404348504642">"Інтэрвал здымак на працягу доўгага часу"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Налады камеры"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Налады відэакамеры"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Памер малюнка"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 мегапiкселяў"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 мегапiкселi"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 мегапiкселi"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 мегапікселя"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 мегапiксель"</string>
+    <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Рэжым факусоўкі"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Аўтаматычна"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бясконцасць"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Макра"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Рэжым успышкі"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Аўтаматычна"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Уключана"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Адключана"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Баланс белага"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Аўтаматычна"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Белы напал"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Дзённае святло"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Флюарэсцэнтны"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Пахмурна"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Рэжым здымкаў"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Аўтаматычна"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Дзеянне"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ноч"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Заход"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Вечарына"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Немагчыма выбраць у рэжыме здымкi."</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Налады камеры"</string>
+    <string name="pref_restore_detail" msgid="5732490002291044791">"Усталяваць налады па змаўчанні"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Экспазіцыя"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"ОК"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Месца на вашым USB-назапашвальнiку заканчваецца. Змяніце параметры якасці або выдаліце некаторыя выявы цi іншыя файлы."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Месца на вашай SD-карце заканчваецца. Змяніце параметры якасці або выдаліце некаторыя выявы цi іншыя файлы."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Дасягнуты максімальны памер."</string>
+    <string name="switch_to_camera_label" msgid="9148663083850199582">"Пераключэнне ў рэжым камеры"</string>
+    <string name="switch_to_video_label" msgid="1167994386902254398">"Пераключэнне ў рэжым відэа"</string>
+    <string name="switch_to_panorama_label" msgid="858801335653517864">"Пераключэнне ў рэжым панарамы"</string>
+    <string name="share_picture_via" msgid="1375127849431890447">"Апублікаваць малюнак з дапам."</string>
+    <string name="share_video_via" msgid="5152302809166549015">"Апублікаваць відэа з дапам."</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Няма выяў для публiкацыi"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Няма відэа для публікацыі."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Занад. хутка"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Падрыхтоўка панарамы"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Немагчыма захаваць панараму."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Панарама"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Захоп панарамы"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Захаванне..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Націсніце, каб наладзiць фокус."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Эфекты"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Няма"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Сцicнуць"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Вялiкiя вочы"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Вялiкi рот"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Маленькi рот"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Вялікі нос"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Маленькiя вочы"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"У космасе"</string>
+    <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="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>
+    <string name="clear_effects" msgid="5485339175014139481">"Выдалiць эфекты"</string>
+    <string name="effect_silly_faces" msgid="3214174716769421248">"Дурныя твары"</string>
+    <string name="effect_background" msgid="6909716214852487679">"Фонавыя"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Кнопка затвора"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Апошнія фатаграфii"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Пераключэнне пярэдняй i задняй камеры"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Камера, вiдэа або панарама"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Іншыя налады"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Закрыць налады"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Кiраванне маштабаваннем..."</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Памяншэнне на %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Павелічэнне %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Пераключэнне %1$s"</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 21696e8..8a897f9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Грешка в камерата"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Не може да се осъществи връзка с камера."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Не може да се осъществи връзка с камерата."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камерата е деактивирана заради правилата за сигурност."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Видеокамера"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Снимки от камера"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Видеоклипове от камера"</string>
     <string name="wait" msgid="8600187532323801552">"Моля, изчакайте…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Моля, свържете USB хранилището, преди да използвате камерата."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Моля, поставете SD карта, преди да ползвате камерата."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Свържете USB хранилището, преди да използвате камерата."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Поставете SD карта, преди да използвате камерата."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB хранилището ви е пълно."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD картата ви е пълна."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB хранилището се подготвя..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Няма достъп до USB хранилището."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Няма достъп до SD картата."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Стандартни опции"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Ще бъдат възстановени стандартните настройки на камерата."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки на камера"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки на видеокамера"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер на снимка"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5М пиксела"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3М пиксела"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2М пиксела"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M пиксела"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 мегапиксел"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Фокусен режим"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Нощ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Залез"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Празненство"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Това не може да се избира в сценичен режим"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Не може да се избира в сценичен режим."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Настройки на камера"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Възстановяване на стандартните настройки"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Eкспониране"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Превключване към панорама"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Споделяне на снимката чрез"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Споделяне на видеоклипа чрез"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Няма снимка за споделяне"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Няма видеоклип за споделяне"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Твърде бързо"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Няма снимка за споделяне."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Няма видеоклип за споделяне."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Твърде бързо"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Панорамата се подготвя"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Запазването на панорамата не бе успешно"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Панорамата не можа да бъде запазена."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Панорамата се заснема"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Запазва се..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Докоснете за фокусиране"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Панорамата се заснема"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Запазва се..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Докоснете за фокусиране."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Ефекти"</string>
     <string name="effect_none" msgid="3601545724573307541">"Без ефекти"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Разкривяване"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Големи очи"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Голяма уста"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Малка уста"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Голям нос"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Малки очи"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"В космоса"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Големи очи"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Голяма уста"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Малка уста"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Голям нос"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Малки очи"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"В космоса"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залез"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Изберете свой"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Поставете устройството си върху стабилна повърхност и се уверете, че зад вас нищо не се движи."\n\n"След което се отдръпнете от зрителното поле на камерата."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Това не може да се избира при включен ефект."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Напр. снимайте при видеозапис, докосвайки екрана за визуализация"</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"Не може да се избира при включен ефект."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Снимайте при видеозапис, докосвайки екрана за визуализация."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Моментните снимки в клиповете са деакт. при вкл. спец. ефекти."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Изчистване на ефектите"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Смешни лица"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Бутон на затвора"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Най-скорошна снимка"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Превключване между предната и задната камера"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Инструмент за избор между камера, видеокамера или панорама"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Избор между камера, видеокамера или панорама"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Още контроли за настройки"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Затваряне на контролите за настройки"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Контрола за промяна на мащаба"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2eaf007..574ab90 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Error de la càmera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"No es pot connectar amb la càmera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"No es pot connectar a la càmera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"La càmera s\'ha desactivat a causa de les polítiques de seguretat."</string>
     <string name="camera_label" msgid="6346560772074764302">"Càmera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Càmera de vídeo"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Imatges de la càmera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Vídeos de la càmera"</string>
     <string name="wait" msgid="8600187532323801552">"Espereu-vos…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Instal·la l\'emmagatzematge USB abans d\'utilitzar la càmera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Inseriu una targeta SD abans d\'utilitzar la càmera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Instal·la l\'emmagatzematge USB abans d\'utilitzar la càmera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Insereix una targeta SD abans d\'utilitzar la càmera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"L\'emmagatzematge USB és ple."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"La targeta SD és plena."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Prep. l\'emmagatzematge USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"No s\'ha pogut accedir a l\'emmagatzematge USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"No s\'ha pogut accedir a la targeta SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restauració del valors predeterminats"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"La configuració de la càmera es restaurarà als valors predeterminats."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuració de la càmera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuració de la càmera de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Mida de la imatge"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 milions de píxels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 milions de píxels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 milions de píxels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 milions de píxels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 milió de píxels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 milions de píxels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 milions de píxels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 milions de píxels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 milions de píxels"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 milió de píxels"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode d\'enfocament"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturn"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Posta del sol"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Festa"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"No es pot seleccionar en mode d\'escena"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"No es pot seleccionar en mode d\'escena."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Configuració de la càmera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restaura els valors predeterminats"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposició"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Canvia a panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Comparteix imatge mitjançant"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Comparteix vídeo mitjançant"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Cap imatge per compartir"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Cap vídeo per compartir"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Massa ràpid"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Cap imatge per compartir"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Cap vídeo per compartir."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Massa ràpid"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"S\'està preparant el panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"S\'ha produït un error en desar panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"No s\'ha pogut desar el panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"S\'està capturant un panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"S\'està desant..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Pica per enfocar"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"S\'està capturant un panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"S\'està desant..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Toca per enfocar."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efectes"</string>
     <string name="effect_none" msgid="3601545724573307541">"Cap"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Aixafa"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Ulls grans"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Boca gran"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Boca petita"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nas gran"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ulls petits"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"A l\'espai"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Ulls grans"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Boca gran"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Boca petita"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nas gran"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Ulls petits"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"A l\'espai"</string>
     <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="1393338187462207584">"Tria\'n un"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Col·loca el dispositiu sobre una superfície estable i assegura\'t que no hi hagi res que es mogui darrere teu."\n\n"A continuació, surt del davant de la càmera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Aquesta opció no es pot seleccionar quan l\'efecte està activat."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Per fer una foto durant l\'enregistrament de vídeo, pica la pantalla de visualització prèvia."</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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Esborra efectes"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Ganyotes"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botó de l\'obturador"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto més recent"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Commutador de càmera anterior i posterior"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Càmera, vídeo o selector de panorames"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Càmera, vídeo o selector de panorames"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Més controls de configuració"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Tanca els controls de configuració"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index adf7f20..41c92ff 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Chyba fotoaparátu"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nelze se připojit k fotoaparátu."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nelze se připojit k fotoaparátu."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparát byl z důvodu zásad zabezpečení deaktivován."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparát"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Pořízené fotografie"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Pořízená videa"</string>
     <string name="wait" msgid="8600187532323801552">"Čekejte prosím..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Před použitím fotoaparátu připojte sdílené úložiště."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Než začnete používat fotoaparát, vložte kartu SD."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Před použitím fotoaparátu připojte úložiště USB."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Před použitím fotoaparátu prosím vložte SD kartu."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Úložiště USB je plné."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Vaše karta SD je plná."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Příprava úložiště USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nelze získat přístup k úložišti USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nelze získat přístup ke kartě SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Obnovit výchozí nastavení"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Bude obnoveno výchozí nastavení fotoaparátu."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavení fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavení videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost fotografií"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapixelů"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixely"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixely"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 megapixelů"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixelů"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixely"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixely"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixelů"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Režim zaostření"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Západ slunce"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Párty"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Tuto možnost nelze vybrat ve scénickém režimu."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Tuto možnost nelze ve scénickém režimu vybrat."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Nastavení fotoaparátu"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Obnovit výchozí nastavení"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expozice"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Přepnout do panoramatického režimu"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Sdílet fotografii pomocí"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Sdílet video pomocí"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Žádná fotka ke sdílení"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Žádné video ke sdílení"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Příliš rychle"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Žádná fotka ke sdílení"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Žádné video ke sdílení"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Moc rychle"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Příprava panoramatu"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama se nepodařilo uložit"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoramatickou fotku nelze uložit."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Snímání panoramatu"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Ukládání..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Klepnutím zaostříte"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Snímání panoramatu"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Ukládání..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Dotykem zaostříte."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekty"</string>
     <string name="effect_none" msgid="3601545724573307541">"Žádný"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Zmáčknout"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Velké oči"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Velká ústa"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Malá ústa"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Velký nos"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Malé oči"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Ve vesmíru"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Velké oči"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Velká ústa"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Malá ústa"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Velký nos"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Malé oči"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Ve vesmíru"</string>
     <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="1393338187462207584">"Vlastní"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Umístěte zařízení na pevný povrch a zkontrolujte, zda se za vámi nic nehýbe."\n\n"Poté ustupte ze záběru kamery."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavení nelze vybrat, pokud je efekt zapnutý."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Během nahrávání videa lze fotit klepnutím na obrazovku náhledu."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Vymazat efekty"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Bláznivé tváře"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Tlačítko závěrky"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Poslední fotografie"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Přepínač mezi předním a zadním fotoaparátem"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Přepínač mezi panoramatickým režimem a režimy fotoaparátu a videokamery"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Přepínač mezi panoramatickým režimem a režimy fotoaparátu a videokamery"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Další ovládací prvky nastavení"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zavřít ovládací prvky nastavení"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ovládání přiblížení/oddálení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fab8166..39b4f54 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamerafejl"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Der kan ikke oprettes forbindelse til kameraet."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Der kan ikke oprettes forbindelse til kameraet."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kameraet er deaktiveret på grund af sikkerhedspolitikker."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kamerabilleder"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kameravideoer"</string>
     <string name="wait" msgid="8600187532323801552">"Vent ..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Isæt USB-lager, inden du bruger kameraet."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Indsæt et SD-kort, inden du bruger kameraet."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Isæt USB-lager, før du tager kameraet i brug."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Indsæt et SD-kort, før kameraet tages i brug."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Dit USB-lager er fyldt."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Dit SD-kort er fuldt."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Forbereder USB-lager…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Der kunne ikke fås adgang til USB-lagring."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Der kunne ikke fås adgang til SD-kortet."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Gendan standarder"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Kameraets standardindstillinger bliver gendannet."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Indstillinger for kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Indstillinger for videokamera"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Billedstørrelse"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokustilstand"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nat"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fest"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Dette kan ikke vælges i scenetilstand"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan ikke vælges i motivtilstand."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Indstillinger for kamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Gendan standarder"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Skift til panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Del billede via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Del video via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Intet billede at dele"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Ingen video at dele"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"For hurtig"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Intet billede at dele."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ingen video at dele."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"For hurtig"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Forbereder panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama kunne ikke gemmes"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panorama kunne ikke gemmes."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Optagelse af panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Gemmer…"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tryk for at fokusere"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Optagelse af panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Gemmer..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Tryk for at fokusere."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekter"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ingen"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Klem"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Store øjne"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Stor mund"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Lille mund"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Stor næse"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Små øjne"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"I rummet"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Store øjne"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Stor mund"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Lille mund"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Stor næse"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Små øjne"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"I rummet"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Vælg din egen"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Placer enheden på en jævn overflade, og sørg for, at der ikke er noget i baggrunden, der bevæger sig."\n\n"Gå derefter ud af billedet."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dette kan ikke vælges, når effekten er slået til."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Tryk på eksempelskærmen for at tage et foto under videooptagelse."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Ryd effekter"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Skøre ansigter"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Lukkerknap"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Det seneste foto"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Skift mellem frontkameraet og bagsidekameraet"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Valg af kamera, video eller panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Valg af kamera, video eller panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Flere indstillingskontroller"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Luk indstillingskontroller"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomkontrol"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5f7c504..ba6ed91 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamerafehler"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Keine Verbindung zur Kamera möglich"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Keine Verbindung zur Kamera möglich"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Die Kamera wurde aufgrund von Sicherheitsrichtlinien deaktiviert."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kamerabilder"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kameravideos"</string>
     <string name="wait" msgid="8600187532323801552">"Bitte warten..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Stellen Sie vor Verwendung der Kamera einen USB-Speicher bereit."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Legen Sie vor Verwendung der Kamera eine SD-Karte ein."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Stellen Sie vor Verwendung der Kamera einen USB-Speicher bereit."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Legen Sie vor Verwendung der Kamera eine SD-Karte ein."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Ihr USB-Speicher ist voll."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Ihre SD-Karte ist voll."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB-Speicher wird vorbereitet"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Kein Zugriff auf USB-Speicher möglich"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Kein Zugriff auf SD-Karte möglich"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Standard wiederherstellen"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Die Kameraeinstellungen werden auf die Standardeinstellungen wiederhergestellt."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameraeinstellungen"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcordereinstellungen"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildgröße"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 Millionen Pixel"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 Millionen Pixel"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 Millionen Pixel"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Million Pixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 Millionen Pixel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 Millionen Pixel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 Millionen Pixel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 Megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 Million Pixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokussierungsmodus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nachtaufnahme"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonnenuntergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Party"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Diese Einstellung kann im Szenenmodus nicht ausgewählt werden."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Diese Einstellung kann im Szenenmodus nicht ausgewählt werden."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kameraeinstellungen"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Standard wiederherstellen"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Belichtung"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Zu Panorama wechseln"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Bild teilen über"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Video teilen über"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Kein Bild zum Teilen"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Kein Video zum Teilen"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Zu schnell"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Kein Bild zum Teilen"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Kein Video zum Teilen"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Zu schnell"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama wird vorbereitet..."</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama konnte nicht gespeichert werden."</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panorama konnte nicht gespeichert werden."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama wird aufgenommen..."</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Speichern..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Zum Fokussieren tippen"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panorama wird aufgenommen..."</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Speichert..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Zum Fokussieren tippen"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekte"</string>
     <string name="effect_none" msgid="3601545724573307541">"Effekt löschen"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Quetschen"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Große Augen"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Großer Mund"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Kleiner Mund"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Große Nase"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Kleine Augen"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Im Weltraum"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Große Augen"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Großer Mund"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Kleiner Mund"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Große Nase"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Kleine Augen"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Im All"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sonnenuntergang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Eigenen wählen"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Legen Sie Ihr Gerät auf eine stabile Oberfläche und achten Sie darauf, dass sich hinter Ihnen nichts bewegt."\n\n"Treten Sie anschließend aus dem Bild."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Einstellung nicht wählbar, wenn Effekt aktiviert"</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Durch Tippen Foto während Videoaufzeichnung aufnehmen"</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Effekte löschen"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Lustige Gesichter"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Schaltfläche für Blende"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Neuestes Foto"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Zwischen Kamera auf der Vorder- und Rückseite wechseln"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Auswahl: Kamera, Video oder Panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Auswahl: Kamera, Video oder Panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Weitere Einstellungen"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Einstellungen schließen"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom-Steuerung"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 560fa92..13e0452 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Σφάλμα φωτογραφικής μηχανής"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Δεν είναι δυνατή η σύνδεση με τη φωτογραφική μηχανή."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Δεν είναι δυνατή η σύνδεση με τη φωτογραφική μηχανή."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Η φωτογραφική μηχανή έχει απενεργοποιηθεί λόγω των πολιτικών ασφαλείας."</string>
     <string name="camera_label" msgid="6346560772074764302">"Φωτογ.μηχανή"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Βιντεοκάμ."</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Εικόνες φωτογραφικής μηχανής"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Βίντεο φωτογραφικής μηχανής"</string>
     <string name="wait" msgid="8600187532323801552">"Περιμένετε..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Προσαρτήστε τον χώρο αποθήκευσης USB προτού κάνετε χρήση της φωτογραφικής μηχανής."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Πριν χρησιμοποιήσετε τη φωτογραφική μηχανή, εισάγετε μία κάρτα SD."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Προσαρτήστε τον χώρο αποθήκευσης USB προτού κάνετε χρήση της φωτογραφικής μηχανής."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Εισαγάγετε κάρτα SD πριν χρησιμοποιήσετε τη φωτογραφική μηχανή."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Ο χώρος αποθήκευσης USB είναι πλήρης."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Η κάρτα SD είναι πλήρης."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Προετοιμασία χώρου αποθ. USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Δεν ήταν δυνατή η πρόσβαση στο χώρο αποθήκευσης USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Δεν ήταν δυνατή η πρόσβαση στην κάρτα SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Επαναφορά προεπιλογών"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Οι ρυθμίσεις της φωτογραφικής μηχανής θα επανέλθουν στις προεπιλογές."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ρυθμίσεις βιντεοκάμερας"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Μέγεθος εικόνας"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M εικονοστοιχεία"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M εικονοστοιχεία"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 M εικονοστοιχεία"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M εικονοστοιχεία"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M  εικονοστοιχεία"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M εικονοστοιχεία"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M εικονοστοιχεία"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Λειτουργία εστίασης"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Νύχτα"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ηλιοβασίλεμα"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Πάρτι"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Δεν μπορείτε να επιλέξετε αυτήν τη ρύθμιση στη λειτουργία σκηνής"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Δεν υπάρχει δυνατότητα επιλογής στη λειτουργία σκηνής."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Επαναφορά προεπιλογών"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Έκθεση"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Μετάβαση σε πανόραμα"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Κοινή χρήση εικόνας μέσω"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Κοινή χρήση βίντεο μέσω"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Καμία εικόνα για κοινή χρήση"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Κανένα βίντεο για κοινή χρήση"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Πολύ γρήγορα"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Καμία εικόνα για κοινή χρήση."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Κανένα βίντεο για κοινή χρήση."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Πολύ γρήγορα"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Προετοιμασία πανοραμικής εικ."</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Η αποθήκευση του πανοράματος απέτυχε"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Δεν ήταν δυνατή η αποθήκευση του πανοράματος."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Πανόραμα"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Λήψη πανοράματος"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Αποθήκευση..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Πατήστε για εστίαση"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Λήψη πανοράματος"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Aποθήκευση..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Πατήστε για εστίαση."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Εφέ"</string>
     <string name="effect_none" msgid="3601545724573307541">"Κανένα"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Πιέστε"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Μεγάλα μάτια"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Μεγάλο στόμα"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Μικρό στόμα"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Μεγάλη μύτη"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Μικρά μάτια"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Στο διάστημα"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Μεγάλα μάτια"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Μεγάλο στόμα"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Μικρό στόμα"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Μεγάλη μύτη"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Μικρά μάτια"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Στο διάστημα"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Δύση ηλίου"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Ντίσκο"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Επιλέξτε"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Τοποθετήστε τη συσκευή σας σε μια σταθερή επιφάνεια και βεβαιωθείτε ότι δεν υπάρχουν κινήσεις πίσω σας."\n\n" Στη συνέχεια, απομακρυνθείτε από το οπτικό πεδίο της κάμερας."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Αδύνατη η επιλογή του όταν το εφέ είναι ενεργό."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Τραβ. μια φωτογρ. κατά την εγγρ. βίντεο πατώντας την οθ.προεπισκ."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"Δεν υπάρχει δυνατότητα επιλογής όταν το εφέ είναι ενεργοποιημένο."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Βγάλτε μια φωτογραφία κατά τη διάρκεια της εγγραφής βίντεο πατώντας την οθόνη προεπισκόπησης."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Το στιγμιότυπο οθόνης βίντεο απενεργοποιείται με ενεργά τα εφέ."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Διαγραφή εφέ"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Αστεία πρόσωπα"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Κουμπί κλείστρου"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Πιο πρόσφατη φωτογραφία"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Διακόπτης εμπρός και πίσω φωτογραφικής μηχανής"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Επιλογή φωτογραφικής μηχανής, βίντεο ή πανοραμικής εικόνας"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Επιλογέας φωτογραφικής μηχανής, βίντεο ή πανοράματος"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Περισσότερα στοιχεία ελέγχου ρυθμίσεων"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Κλείσιμο στοιχείων ελέγχου ρυθμίσεων"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Έλεγχος εστίασης"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1270b1a..8efd046 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Camera error"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Cannot connect to camera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Can\'t connect to the camera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Camera has been disabled because of security policies."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Camera pictures"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Camera videos"</string>
     <string name="wait" msgid="8600187532323801552">"Please wait…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Please mount USB storage before using the camera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Please insert an SD card before using the camera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Please mount USB storage before using the camera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Insert an SD card before using the camera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Your USB storage is full."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Your SD card is full."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparing USB storage…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Couldn\'t access USB storage."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Couldn\'t access SD card."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restore defaults"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Camera settings will be restored to defaults."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera settings"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder settings"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Picture size"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3 M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M Pixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M Pixels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M pixels"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Focus mode"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Night"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sunset"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Party"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"This is not selectable in scene mode"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Not selectable in scene mode."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Camera settings"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restore defaults"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposure"</string>
@@ -92,30 +92,30 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Switch to panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Share picture via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Share video via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"No picture to share"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"No video to share"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Too Fast"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"No picture to share."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"No video to share."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Too fast"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparing panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Failed to save panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Couldn\'t save panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Capturing Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Saving..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tap to focus"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capturing panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Saving…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Touch to focus."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effects"</string>
     <string name="effect_none" msgid="3601545724573307541">"None"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Squeeze"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Big Eyes"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Big Mouth"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Small Mouth"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Big Nose"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Small Eyes"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"In Space"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Big eyes"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Big mouth"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Small mouth"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Big nose"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Small eyes"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"In space"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Sunset"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Choose your own"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Place your device on a steady surface and make sure that there\'s no movement behind you."\n\n"Then move out of the camera\'s view."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"This is not selectable when the effect is on."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Take a photo during video recording by tapping the preview screen."</string>
+    <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Choose your own"</string>
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Put your device down"\n"Step out of view for a moment"</string>
+    <string name="not_selectable_in_effect" msgid="7967729203855039239">"Not selectable when the effect is on."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Take a photo during video recording by touching the preview screen."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video snapshot is disabled when special effects are on."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Clear effects"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Silly faces"</string>
@@ -123,7 +123,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Shutter button"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Most recent photo"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Front and back camera switch"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Camera, video or panorama selector"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Camera, video or panorama selector"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"More settings controls"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Close settings controls"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoom control"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d0f2a25..bb16f33 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Error de cámara"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"No se puede conectar a la cámara."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"No se puede establecer conexión con la cámara."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"La cámara ha sido desactivada por políticas de seguridad."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cámara"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Cámara de video"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Imágenes de la cámara"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Videos de la cámara"</string>
     <string name="wait" msgid="8600187532323801552">"Espera, por favor..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Activa el almacenamiento USB antes de usar la cámara."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Inserta una tarjeta SD antes de utilizar la cámara."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Activa el almacenamiento USB antes de usar la cámara."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Inserta una tarjeta SD antes de usar la cámara."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"El espacio de almacenamiento USB está lleno."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Tu tarjeta SD está llena."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparando almacenamiento USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"No se pudo acceder al almacenamiento USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"No se pudo acceder a la tarjeta SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar configuraciones predeterminadas"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"La configuración de la cámara se restaurará al modo predeterminado."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M píxeles"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M píxeles"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M píxeles"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 millones de píxeles"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M píxeles"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M píxeles"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M píxeles"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M píxeles"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3M píxeles"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M píxeles"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de enfoque"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noche"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Crepúsculo"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fiesta"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Esto no puede seleccionarse en el modo de escena."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"No se puede seleccionar en el modo Escena."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restaurar configuraciones predeterminadas"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Cambiar a modo panorámico"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Compartir imagen por"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Compartir video por"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Ninguna imagen para compartir"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Ningún video para compartir"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Muy rápida"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Ninguna imagen para compartir"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ningún video para compartir"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Muy rápido"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparando el panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Error al guardar panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"No se pudo guardar la im. panorámica."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Capturando panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Guardando..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tocar para enfocar"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capturando el panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Guardando..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Toca para enfocar."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efectos"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ninguno"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Comprimir"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Ojos grandes"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Boca grande"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Boca pequeña"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nariz grande"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ojos pequeños"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"En el espacio"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Ojos grandes"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Boca grande"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Boca pequeña"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nariz grande"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Ojos pequeños"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"En el espacio"</string>
     <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="1393338187462207584">"Elige el tuyo"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo sobre una superficie firme y asegúrate de que no se produzca ningún movimiento detrás de ti."\n\n"Luego ubícate fuera del alcance de la cámara."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede elegir config. si el efecto está act."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Para tomar fotos en una grabación, toca la pant. de vista previa."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Borrar efectos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caras graciosas"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botón del obturador"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto más reciente"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Selector de cámara delantera y trasera"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Selector de cámara, video o modo panorámico"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Selector de cámara, video o panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Más controles de configuración"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Cerrar controles de configuración"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 506eb18..8694ba5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Error de cámara"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"No se puede establecer conexión con la cámara."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"No se puede acceder a la cámara."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Se ha inhabilitado la cámara debido a las políticas de seguridad."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cámara"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videocámara"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Imágenes de cámara"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Vídeos de cámara"</string>
     <string name="wait" msgid="8600187532323801552">"Por favor, espera..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Activa el almacenamiento USB antes de utilizar la cámara."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Inserta o activa la tarjeta SD para poder utilizar la cámara."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Para poder usar la cámara, activa el almacenamiento USB."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Para poder usar la cámara, inserta una tarjeta SD."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"El almacenamiento USB está lleno."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"La tarjeta SD está llena."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparando almacenamiento USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"No se ha podido acceder al almacenamiento USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"No se ha podido acceder a la tarjeta SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar valores"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Se restaurará la configuración de cámara predeterminada."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño imagen"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 Mpx"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 Mpx"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de enfoque"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Atardecer"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fiesta"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Esta opción no se puede seleccionar en el modo de escena."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"No se puede seleccionar en el modo de escena."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restaurar valores predeterminados"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Cambiar a modo panorámico"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Compartir imagen por"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Compartir vídeo por"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"No hay imágenes para compartir"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"No hay vídeos para compartir"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Demasiado rápido"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"No hay imágenes para compartir."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"No hay vídeos para compartir."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Muy rápido"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparando modo panorámico"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Error al guardar en modo panorámico"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Error al guardar imagen panorámica"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorámico"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Capturando panorámica"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Guardando..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tocar para enfocar"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capturando panorámica"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Guardando..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Toca para enfocar"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efectos"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ninguno"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Comprimir"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Ojos grandes"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Boca grande"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Boca pequeña"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nariz grande"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ojos pequeños"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"En el espacio"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Ojos grandes"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Boca grande"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Boca pequeña"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nariz grande"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Ojos pequeños"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"En el espacio"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Atardecer"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Personalizado"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo en una superficie plana y comprueba que no se produzca ningún movimiento detrás."\n\n"A continuación, colócate fuera de la vista de la cámara."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede seleccionar si el efecto está activado."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Toca la pantalla de vista previa para hacer una foto mientras grabas vídeo."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Borrar efectos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caras graciosas"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botón del obturador"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto más reciente"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Opción de cámara trasera y delantera"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Cámara, vídeo o modo panorámico"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Cámara, vídeo o modo panorámico"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Más controles de configuración"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Cerrar controles de configuración"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Control de zoom"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
new file mode 100644
index 0000000..8978e66
--- /dev/null
+++ b/res/values-et/strings.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="camera_error_title" msgid="6484667504938477337">"Kaamera viga"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Ei saa kaameraga ühendada."</string>
+    <string name="camera_disabled" msgid="8923911090533439312">"Kaamera on keelatud turvaeeskirjade tõttu."</string>
+    <string name="camera_label" msgid="6346560772074764302">"Kaamera"</string>
+    <string name="video_camera_label" msgid="2899292505526427293">"Videokaamera"</string>
+    <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kaamera pildid"</string>
+    <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kaamera videod"</string>
+    <string name="wait" msgid="8600187532323801552">"Oodake ..."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Paigaldage USB-mäluseade enne kaamera kasutamist."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Enne kaamera kasutamist sisestage SD-kaart."</string>
+    <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Teie USB-mäluseade on täis."</string>
+    <string name="not_enough_space" product="default" msgid="6655334407957844653">"Teie SD-kaart on täis."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB-seadme ettevalmistamine…"</string>
+    <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD-kaardi ettevalmistamine ..."</string>
+    <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Juurdepääs USB-mäluseadmele ebaõnnestus."</string>
+    <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Juurdepääs SD-kaardile ebaõnnestus."</string>
+    <string name="confirm_restore_title" msgid="1229914538263792180">"Vaikeseadete taastamine"</string>
+    <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>
+    <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>
+    <string name="time_lapse_title" msgid="4360632427760662691">"Aeglase filmimise salvestamine"</string>
+    <string name="pref_camera_id_title" msgid="6023059405578511534">"Kaamera valimine"</string>
+    <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Tagasi"</string>
+    <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Eestvaade"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Talletuse asukoht"</string>
+    <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Väljas"</string>
+    <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Sees"</string>
+    <string name="pref_video_quality_title" msgid="8245379279801096922">"Video kvaliteet"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="5262531404348504642">"Aeglase filmimise ajavahemik"</string>
+    <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kaamera seaded"</string>
+    <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokaamera seaded"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Pildi suurus"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 miljonit pikslit"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 miljonit pikslit"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 miljonit pikslit"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 miljonit pikslit"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 miljon pikslit"</string>
+    <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
+    <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
+    <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Teravustamisrežiim"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaatne"</string>
+    <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Lõpmatus"</string>
+    <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string>
+    <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Välgurežiim"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automaatne"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Sees"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Väljas"</string>
+    <string name="pref_camera_whitebalance_title" msgid="677420930596673340">"Valge tasakaal"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="6580665476983469293">"Automaatne"</string>
+    <string name="pref_camera_whitebalance_entry_incandescent" msgid="8856667786449549938">"Hõõglamp"</string>
+    <string name="pref_camera_whitebalance_entry_daylight" msgid="2534757270149561027">"Päevavalgus"</string>
+    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"Päevavalguslamp"</string>
+    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"Pilves"</string>
+    <string name="pref_camera_scenemode_title" msgid="1420535844292504016">"Stseenirežiim"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="7113995286836658648">"Automaatne"</string>
+    <string name="pref_camera_scenemode_entry_action" msgid="616748587566110484">"Toiming"</string>
+    <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Öö"</string>
+    <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Päikeseloojang"</string>
+    <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Pidu"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Seda ei saa stseenirežiimis valida."</string>
+    <string name="pref_restore_title" msgid="6479274979730178961">"Kaamera seaded"</string>
+    <string name="pref_restore_detail" msgid="5732490002291044791">"Taasta vaikeseaded"</string>
+    <string name="pref_exposure_title" msgid="1229093066434614811">"Säriaeg"</string>
+    <string name="dialog_ok" msgid="6263301364153382152">"OK"</string>
+    <string name="spaceIsLow_content" product="nosdcard" msgid="4401325203349203177">"Teie USB-mäluseadme ruum on otsa saamas. Muutke kvaliteediseadeid või kustutage kujutisi või teisi faile."</string>
+    <string name="spaceIsLow_content" product="default" msgid="1732882643101247179">"Teie SD-kaardi ruum on otsa saamas. Muutke kvaliteedi seadeid või kustutage kujutisi või teisi faile."</string>
+    <string name="video_reach_size_limit" msgid="6179877322015552390">"Suuruspiirang on saavutatud."</string>
+    <string name="switch_to_camera_label" msgid="9148663083850199582">"Lülitu kaamerale"</string>
+    <string name="switch_to_video_label" msgid="1167994386902254398">"Lülitu videole"</string>
+    <string name="switch_to_panorama_label" msgid="858801335653517864">"Lülitu panoraamile"</string>
+    <string name="share_picture_via" msgid="1375127849431890447">"Pildi jagamine rakenduse kaudu:"</string>
+    <string name="share_video_via" msgid="5152302809166549015">"Video jagamine rakenduse kaudu:"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Jagatavad pildid puuduvad."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Jagatavad videod puuduvad."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Liiga kiire"</string>
+    <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panoraami ettevalmistus"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoraami ei saanud salvestada."</string>
+    <string name="pano_dialog_title" msgid="5755531234434437697">"Panoraam"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panoraami jäädvustamine"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Salvestus ..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Puudutage fokuseerimiseks."</string>
+    <string name="pref_video_effect_title" msgid="8243182968457289488">"Efektid"</string>
+    <string name="effect_none" msgid="3601545724573307541">"Mitte ühtegi"</string>
+    <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Pitsita"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Suured silmad"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Suur suu"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Väike suu"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Suur nina"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Väiksed silmad"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmoses"</string>
+    <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="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>
+    <string name="clear_effects" msgid="5485339175014139481">"Nulli efektid"</string>
+    <string name="effect_silly_faces" msgid="3214174716769421248">"Naljakad näod"</string>
+    <string name="effect_background" msgid="6909716214852487679">"Taust"</string>
+    <string name="accessibility_shutter_button" msgid="2664037763232556307">"Päästiku nupp"</string>
+    <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Viimane foto"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Eesmise ja tagumise kaamera lüliti"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kaamera, video või panoraami valija"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Rohkem seadete juhtnuppe"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Sule seadete juhtnupud"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Suumi juhtimine"</string>
+    <string name="accessibility_decrement" msgid="1411194318538035666">"Vähenda %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Suurenda %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Lüliti %1$s"</string>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a2cb544..4938842 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"خطای دوربین"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"اتصال به دوربین انجام نشد."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"اتصال به دوربین امکان‌پذیر نیست."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"به دلیل خط مشی های امنیتی، دوربین غیرفعال شده است."</string>
     <string name="camera_label" msgid="6346560772074764302">"دوربین"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"دوربین فیلمبرداری"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"عکس های دوربین"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"ویدیوهای دوربین"</string>
     <string name="wait" msgid="8600187532323801552">"لطفاً منتظر بمانید…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"لطفاً قبل از استفاده از دوربین حافظه USB را وصل کنید."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"لطفاً قبل از استفاده از دوربین، یک کارت SD وارد کنید."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"قبل از استفاده از دوربین حافظه USB را وصل کنید."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"قبل از استفاده از دوربین یک کارت SD وارد کنید."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"حافظه USB پر است."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"کارت SD شما پر است."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"آماده سازی حافظه USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"دسترسی به حافظه USB ممکن نیست."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"دسترسی به کارت SD ممکن نیست."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"بازیابی پیش فرض ها"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"تنظیمات دوربین روی موارد پیش فرض بازیابی می شوند."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"تنظیمات دوربین"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"تنظیمات دوربین فیلمبرداری"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"اندازه تصویر"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3 مگاپیکسل"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3 مگاپیکسل"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"حالت فوکوس"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"شب"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"غروب آفتاب"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"طرف مقابل"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"این مورد در حالت صحنه قابل انتخاب نیست"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"در حالت صحنه قابل انتخاب نیست."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"تنظیمات دوربین"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"بازیابی موارد پیش فرض"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"نوردهی"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"رفتن به پانوراما"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"اشتراک گذاری تصویر از طریق"</string>
     <string name="share_video_via" msgid="5152302809166549015">"اشتراک گذاری ویدیو از طریق"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"تصویری برای اشتراک گذاری وجود ندارد"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"ویدیویی برای اشتراک گذاری وجود ندارد"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"بسیار سریع"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"عکسی برای اشتراک وجود ندارد."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"ویدیویی برای اشتراک‌گذاری وجود ندارد."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"بسیار سریع"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"تهیه پانوراما"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"ذخیره پانوراما انجام نشد"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"ذخیره پانوراما امکان‌پذیر نیست."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"پانوراما"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"گرفتن عکس پانوراما"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"در حال ذخیره..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"برای فوکوس کردن ضربه بزنید"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"گرفتن عکس پانوراما"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"در حال ذخیره..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"برای فوکوس لمس کنید."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"جلوه‌ها"</string>
     <string name="effect_none" msgid="3601545724573307541">"هیچکدام"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"کوچک کردن"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"چشمان بزرگ"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"دهان بزرگ"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"دهان کوچک"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"بینی بزرگ"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"چشمان کوچک"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"در فضا"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"چشمان بزرگ"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"دهان بزرگ"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"دهان کوچک"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"بینی بزرگ"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"چشمان کوچک"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"در فضا"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"غروب آفتاب"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"دیسکو"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"انتخاب شما"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"دستگاه خود را بر روی یک سطح ثابت و محکم قرار دهید و مطمئن شوید هیچ حرکتی پشت سر شما وجود نداشته باشد."\n\n"سپس از نمای دوربین خارج شوید."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"هنگامی که جلوه روشن است قابل انتخاب نیست."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"هنگام ضبط ویدیو با ضربه زدن روی صفحه پیش نمایش عکس بگیرید."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"زمان روشن بودن جلوه قابل انتخاب نیست."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"در حین ضبط ویدیو با لمس کردن صفحه پیش‌نمایش یک عکس بگیرید."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"هنگام فعال بودن جلوه‌های ویژه، عکس فوری از ویدیو غیرفعال است."</string>
     <string name="clear_effects" msgid="5485339175014139481">"پاک کردن جلوه‌ها"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"چهره‌های احمقانه"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"دکمه شاتر"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"جدیدترین عکس"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"کلید دوربین جلو و عقب"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"انتخابگر دوربین، ویدیو یا پانوراما"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"انتخابگر دوربین، ویدیو یا پانوراما"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"کنترل‌های تنظیم بیشتر"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"بستن کنترل‌های تنظیم"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"کنترل بزرگنمایی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 862f41c..d5d402a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kameravirhe"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Kameraan ei voi muodostaa yhteyttä."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Ei saada yhteyttä kameraan."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera on poistettu käytöstä suojauskäytäntöjen vuoksi."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kameran kuvat"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kameran videot"</string>
     <string name="wait" msgid="8600187532323801552">"Odota…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Ota USB-tallennustila käyttöön ennen kameran käyttöä."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Aseta SD-kortti ennen kameran käyttämistä."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Ota USB-tallennustila käyttöön ennen kameran käyttöä."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Aseta SD-kortti ennen kameran käyttämistä."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB-tallennustilasi on täynnä."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD-kortti on täynnä."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Valmistellaan USB-tilaa..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB-tallennuslaitetta ei voi käyttää."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD-korttia ei voi käyttää."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Palauta oletukset"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Kameran asetukset palautetaan oletusarvoihin."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameran asetukset"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokameran asetukset"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Kuvan koko"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 megapikseliä"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapikseli"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapikseliä"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapikseliä"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapikseliä"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapikseliä"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapikseli"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Tarkennustila"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Yö"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Auringonlasku"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Juhlat"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Tämä ei ole valittavissa kuvaustilassa"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ei valittavissa kuvaustilassa."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kameran asetukset"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Palauta oletukset"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Valotus"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Vaihda panoraamaan"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Jaa kuva palvelussa"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Jaa video palvelussa"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Ei jaettavia kuvia"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Ei jaettavia videoita"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Liian nopea"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Ei jaettavia kuvia."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ei jaettavia videoita."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Liian nopea"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Valmistellaan panoraamaa"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panoraaman tallennus epäonnistui"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoraaman tallennus epäonnistui."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panoraama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panoraamakuvaus"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Tallennetaan"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Aktivoi napauttamalla"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panoraamakuvaus"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Tallennetaan…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Tarkenna koskettamalla."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Tehosteet"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ei mitään"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Litistetty"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Isot silmät"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Iso suu"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Pieni suu"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Iso nenä"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Pienet silmät"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Avaruus"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Isot silmät"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Iso suu"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Pieni suu"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Iso nenä"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Pienet silmät"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Avaruus"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Auringonlasku"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Valitse oma"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Sijoita laite vakaalle alustalle ja varmista, että taustalla ei ole liikkuvia kohteita."\n\n"Astu sitten pois kuvasta."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tämä ei ole valittavissa, kun tehoste on käytössä."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Ota kuva videokuvauksen aikana napauttamalla esikatseluruutua."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Tyhjennä tehosteet"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Hauskat kasvot"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Laukaisupainike"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Viimeisin valokuva"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Etu- ja takakamerakytkin"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera-, video- tai panoraamavalitsin"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera-, video- tai panoraamavalitsin"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Lisää asetuksia"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Sulje asetukset"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomauksen hallinta"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6fe55a6..5807c33 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Erreur de l\'appareil photo."</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Impossible d\'établir une connexion avec l\'appareil photo."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Impossible d\'établir une connexion avec l\'appareil photo."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"L\'appareil photo a été désactivé en raison des règles de sécurité."</string>
     <string name="camera_label" msgid="6346560772074764302">"Appareil photo"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Caméra"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Photos de l\'appareil"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Vidéos de la caméra"</string>
     <string name="wait" msgid="8600187532323801552">"Veuillez patienter..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Une mémoire de stockage USB doit être installée pour utiliser l\'appareil photo."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Veuillez insérer une carte SD avant d\'utiliser l\'appareil photo."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Veuillez installer une mémoire de stockage USB avant d\'utiliser l\'appareil photo."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Veuillez insérer une carte SD avant d\'utiliser l\'appareil photo."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"La mémoire de stockage USB est pleine."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Votre carte SD est pleine."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Préparation mémoire de stockage USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Impossible d\'accéder à la mémoire de stockage USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Impossible d\'accéder à la carte SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Rétablir les paramètres par défaut"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Les paramètres par défaut de l\'appareil photo seront rétablis."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres appareil photo"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille d\'image"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M pixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 M pixels"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mise au point"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nuit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Coucher de soleil"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fête"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Ce paramètre ne peut pas être sélectionné en mode Scène."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ce paramètre ne peut pas être sélectionné en mode Scène."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Paramètres de l\'appareil photo"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Rétablir les paramètres par défaut"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposition"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Passer en mode panoramique"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Partager l\'image via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Partager la vidéo via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Aucune image à partager."</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Aucune vidéo à partager."</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Trop rapide"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Aucune image à partager."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Aucune vidéo à partager."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Trop rapide"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Préparation vue panoramique..."</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Échec enregistrement vue panoramique."</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Impossible d\'enregistrer le panoramique."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panoramique"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Capture vue panoramique…"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Enregistrement…"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Appuyez pour autofocus."</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capture vue panoramique…"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Enreg…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Appuyez pour mise au point."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effets"</string>
     <string name="effect_none" msgid="3601545724573307541">"Aucun"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Compresser"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Grands yeux"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Grande bouche"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Petite bouche"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Gros nez"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Petits yeux"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Dans l\'espace"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Grands yeux"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Grande bouche"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Petite bouche"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Gros nez"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Petits yeux"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Dans l\'espace"</string>
     <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="1393338187462207584">"Personnalisé"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Placez l\'appareil sur une surface stable, et assurez-vous qu\'il n\'y a pas de mouvement derrière vous."\n\n"Sortez ensuite du champ de vision de l\'appareil photo."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Sélection impossible lorsque l\'effet est activé."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Appuyez sur écran aperçu pour prendre photo pendant enreg. vidéo"</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Effacer les effets"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Drôles de têtes"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Bouton de l\'obturateur"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Photo la plus récente"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interrupteur des caméras avant et arrière"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Sélecteur du mode Appareil photo, Vidéo ou Panoramique"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Sélecteur du mode Photo, Vidéo ou Panoramique"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Plus de paramètres"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fermer les paramètres"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Contrôle du zoom"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 497d726..85321fd 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"कैमरा त्रुटि"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"कैमरे से कनेक्ट नहीं कर सकता."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"कैमरे से कनेक्‍ट नहीं कर सकता."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"सुरक्षा नीतियों के कारण कैमरा अक्षम कर दिया गया है."</string>
     <string name="camera_label" msgid="6346560772074764302">"कैमरा"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"कैमकॉर्डर"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"कैमरा चित्र"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"कैमरा वीडियो"</string>
     <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा करें..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"कृपया कैमरे का उपयोग करने से पहले USB संग्रहण माउंट करें."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"कृपया कैमरे का उपयोग करने से पहले SD कार्ड डालें."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"कैमरे का उपयोग करने से पहले USB संग्रहण माउंट करें."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"कैमरे का उपयोग करने से पहले SD कार्ड डालें."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"आपका USB संग्रहण पूरा भर गया है."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"आपका SD कार्ड भरा हुआ है."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB संग्रहण तैयार कर रहा है…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB संग्रहण में नहीं पहुंच सका."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD कार्ड में नहीं पहुंच सका."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"डिफ़ॉल्ट पुनर्स्थापित करें"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"कैमरा सेटिंग डिफ़ॉल्ट पर पुनर्स्थापित की जाएगी."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"कैमरा सेटिंग"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"कैमकॉर्डर सेटिंग"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"चित्र आकार"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M पिक्सेल"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M पिक्‍सेल"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M पिक्सेल"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M पिक्‍सेल"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"फ़ोकस मोड"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"रात्रि"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"सूर्यास्त"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"पार्टी"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"यह दृश्य मोड में चयन योग्‍य नहीं है"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"दृश्य मोड में चयन योग्य नहीं."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"कैमरा सेटिंग"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"डिफ़ॉल्ट पुनर्स्थापित करें"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"एक्स्पोजर"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"पैनोरमा पर स्विच करें"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"इससे चित्र साझा करें:"</string>
     <string name="share_video_via" msgid="5152302809166549015">"इससे वीडियो साझा करें:"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"साझा करने के लिए कोई चित्र नहीं"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"साझा करने के लिए कोई वीडियो नहीं"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"बहुत तेज़"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"साझा करने हेतु कोई चित्र नहीं."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"साझा के लिए कोई वीडियो नहीं."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"बहुत तेज़"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"पैनोरामा तैयार हो रहा है"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"पैनोरामा सहेजने में विफल"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"पैनोरामा नहीं सहेज सका."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"पैनोरामा"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"पैनोरामा कैप्चर हो रहा है"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"सहेजा जा रहा है..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"फ़ोकस करने के लि‍ए टैप करें"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"पैनोरामा कैप्चर हो रहा है"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"सहेजा जा रहा है..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"फ़ोकस करने हेतु स्‍पर्श करें."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"प्रभाव"</string>
     <string name="effect_none" msgid="3601545724573307541">"कोई नहीं"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"पिचका हुआ"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"बड़ी आंखें"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"बड़ा मुंह"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"छोटा मुंह"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"बड़ी नाक"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"छोटी आंखें"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"अंतरिक्ष में"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"बड़ी आंखें"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"बड़ा मुंह"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"छोटा मुंह"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"बड़ी नाक"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"छोटी आंखें"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"अंतरिक्ष में"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"सूर्यास्त"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"डिस्को"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"स्‍वयं का चुनें"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"अपना उपकरण किसी स्थिर सतह पर रखें और सुनिश्चित करें कि आपके पीछे कोई हलचल नहीं है."\n\n"फिर कैमरे के दृश्य से बाहर आ जाएं."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"प्रभाव के चालू रहने पर यह चयन योग्‍य नहीं होता."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"वीडियो रिकॉर्डिंग के समय पूर्वावलोकन स्‍क्रीन पर टैप करके फ़ोटो लें."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"प्रभाव के चालू होने पर चयन योग्‍य नहीं."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"वीडियो रिकॉ. के समय पूर्वावलोकन स्‍क्रीन स्‍पर्श करके फ़ोटो लें."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"विशेष प्रभावों के चालू होने पर वीडियो स्‍नेपशॉट अक्षम हो जाता है."</string>
     <string name="clear_effects" msgid="5485339175014139481">"प्रभाव साफ़ करें"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"मज़ाकिया चेहरे"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"शटर बटन"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"हाल ही का फ़ोटो"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"अगला और पिछला कैमरा स्‍विच"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"कैमरा, वीडियो या पैनोरामा चयनकर्ता"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"कैमरा, वीडियो या पैनोरामा चयनकर्ता"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिंग नियंत्रण"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिंग नियंत्रण बंद करें"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"ज़ूम नियंत्रण"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a671189..1bb632f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Pogreška fotoaparata"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Povezivanje s fotoaparatom nije moguće."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Povezivanje s fotoaparatom nije moguće."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparat je onemogućen zbog sigurnosnih pravila."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparat"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Slike fotoaparata"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Videozapisi na fotoaparatu"</string>
     <string name="wait" msgid="8600187532323801552">"Pričekajte…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Instalirajte USB memoriju prije upotrebe kamere."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Prije upotrebe fotoaparata umetnite SD karticu."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Prije upotrebe fotoaparata instalirajte USB memoriju."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Prije upotrebe fotoaparata umetnite SD karticu."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Vaša je USB memorija puna."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD kartica je puna."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Pripremanje USB memorije..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nije moguć pristup USB pohrani."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nije moguć pristup SD kartici."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Vrati zadano"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Postavke fotoaparata bit će vraćene na zadane."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Postavke fotoaparata"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Postavke kamere"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veličina slike"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M piksela"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M piksela"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M piksela"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M piksela"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M piksela"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Način fokusa"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noć"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zalazak sunca"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Zabava"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"To nije podesivo u načinu scene"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"U načinu scene ne može se odabirati."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Postavke fotoaparata"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Vrati zadano"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozicija"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Prebaci na način Panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Dijeljenje slike putem"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Dijeljenje videozapisa putem"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nema slike za dijeljenje"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nema videozapisa za dijeljenje"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Prebrzo"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Nema slike za dijeljenje."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Nema videozapisa za dijeljenje."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Prebrzo"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Priprema panorame"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Spremanje panorame nije uspjelo"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panoramu nije moguće spremiti."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Snimanje panorame"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Spremanje..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Dotaknite za fokus"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Snimanje panorame"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Spremanje..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Dodirnite za fokus."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekti"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ništa"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Stisnuto"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Velike oči"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Velika usta"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Mala usta"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Veliki nos"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Male oči"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"U svemiru"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Velike oči"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Velika usta"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Mala usta"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Veliki nos"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Male oči"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"U svemiru"</string>
     <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="1393338187462207584">"Izaberite svoj"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite uređaj na stabilnu površinu i provjerite da nema kretanja iza vas."\n\n"Tada izađite iz vidokruga kamere."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"To se ne može odabrati kada je efekt uključen."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Dok snimate videozapis, fotografirajte doticanjem zaslona pregleda."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Obriši efekte"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Budalasta lica"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Gumb Okidač"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Najnovija fotografija"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Prednji i stražnji prekidač fotoaparata"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Birač fotoaparata, videozapisa ili panorame"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Birač fotoaparata, videozapisa ili panorame"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Više kontrola postavke"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Kontrole postavke zatvaranja"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Upravljanje povećavanjem/smanjivanjem"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f8506b4..fbda5bb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamerahiba"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nem lehet kapcsolódni a kamerához."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nem lehet csatlakozni a fényképezőgéphez."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"A biztonsági házirendek miatt a kamera le van tiltva."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Saját képek"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Saját videók"</string>
     <string name="wait" msgid="8600187532323801552">"Kérjük, várjon..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Kérjük, csatoljon egy USB-tárat a kamera használata előtt."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Kérjük, a kamera használata előtt helyezzen be SD-kártyát."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kérjük, csatoljon egy USB-tárat a fényképezőgép használata előtt."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"A fényképezőgép használatához helyezzen be egy SD-kártyát."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Az USB-tár megtelt."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Az SD-kártya megtelt."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Az USB-tár előkészítése..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nem lehet hozzáférni az USB-háttértárhoz"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nem lehet hozzáférni az SD-kártyához"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Alapértelmezés visszaállítása"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"A kamera beállításai visszaállnak az alapértékekre."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera beállításai"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera beállításai"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Képméret"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M képpont"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fókuszálás módja"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Éjszakai"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Napnyugta"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Buli"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Ez nem választható jelenet módban"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nem választható ebben a módban."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kamera beállításai"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Alapbeállítások"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expozíció"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Váltás panoráma módra"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Kép megosztása itt:"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Videó megosztása itt:"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nincs megosztható kép"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nincs megosztható videó"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Túl gyors"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Nincs megosztható kép."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Nincs megosztható videó."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Túl gyors"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panoráma előkészítése"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"A panoráma mentése nem sikerült"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Nem lehet menteni a panorámát."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panoráma"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panoráma rögzítése"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Mentés..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Koppintva fókuszálhat"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panoráma rögzítése"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Mentés..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"A fókuszáláshoz érintse meg."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Hatások"</string>
     <string name="effect_none" msgid="3601545724573307541">"Nincs"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Összenyomás"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Nagy szemek"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Nagy száj"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Kis száj"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nagy orr"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Kis szemek"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Az űrben"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Nagy szemek"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Nagy száj"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Kis száj"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nagy orr"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Kis szemek"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Az űrben"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Napnyugta"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Diszkó"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Válassza ki sajátját"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Helyezze eszközét egy stabil felületre, és bizonyosodjon meg arról, hogy Ön mögött nincs mozgás."\n\n"Ezután lépjen ki a kamera látószögéből."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ez nem választható, ha az effekt be van kapcsolva."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Képkészítés videofelvétel közben: előnézeti képernyő megérintése"</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Effektek törlése"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Bolondos arcok"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Exponáló gomb"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Legutóbbi fotó"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Első és hátsó kamera kapcsolója"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera, videó vagy panoráma választó"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera, videó vagy panoráma kiválasztása"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"További beállításvezérlők"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Beállításvezérlők bezárása"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Nagyítás/kicsinyítés vezérlése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 77f7348..0ad11cb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Galat kamera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Tidak dapat terhubung ke kamera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Tidak dapat terhubung ke kamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera telah dinonaktifkan karena kebijakan keamanan."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Perekam video"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Gambar kamera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Video kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Harap tunggu…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Pasang penyimpanan USB sebelum menggunakan kamera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Masukkan kartu SD sebelum menggunakan kamera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pasang penyimpanan USB sebelum menggunakan kamera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Masukkan kartu SD sebelum menggunakan kamera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Penyimpanan USB penuh."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Kartu SD Anda penuh."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Menyiapkan penyimpanan USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Tidak dapat mengakses penyimpanan USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Tidak dapat mengakses kartu SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Pulihkan bawaan"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Setelan kamera akan dipulihkan ke bawaan."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Setelan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Setelan perekam video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Ukuran gambar"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Piksel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 M piksel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode fokus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Malam"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Matahari terbenam"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Pesta"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Ini tidak dapat dipilih dalam mode adegan"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Tidak dapat dipilih dalam mode adegan."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Setelan kamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Pulihkan bawaan"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Pencahayaan"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Beralih ke panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Bagikan gambar melalui"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Bagikan video melalui"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Tak ada gambar untuk dibagikan"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Tak ada video untuk dibagikan"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Trlalu Cepat"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Tak ada gambar utk dibagikan."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Tak ada video untuk dibagikan."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Terlalu cpt"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Menyiapkan panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Gagal menyimpan panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Tidak dapat menyimpan panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Mengambil Gambar Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Menyimpan..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Ketuk untuk memfokuskan"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Mengambil gambar panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Menyimpan…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Sentuh untuk memfokuskan."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efek"</string>
     <string name="effect_none" msgid="3601545724573307541">"Tidak Ada"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Peras"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Mata Besar"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Mulut Besar"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Mulut Kecil"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Hidung Besar"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mata Kecil"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Luar Angkasa"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Mata besar"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Mulut besar"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Mulut kecil"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Hidung besar"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Mata kecil"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Luar angkasa"</string>
     <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="1393338187462207584">"Pilih sendiri"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Tempatkan perangkat pada permukaan yang stabil dan pastikan tidak ada gerakan di belakang Anda."\n\n"Setelah itu keluarlah dari pandangan kamera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setelan ini tidak dapat dipilih jika efek dihidupkan."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Mengambil foto saat merekam video dengan mengetuk layar pratinjau."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Hapus efek"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Wajah konyol"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Tombol rana"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto terbaru"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Beralih kamera depan dan belakang"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Pemilih kamera, video, atau panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Pemilih kamera, video, atau panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Kontrol setelan lainnya"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Tutup kontrol setelan"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Kontrol perbesar/perkecil"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e676bae..588b02a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Errore fotocamera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Impossibile collegarsi alla fotocamera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Impossibile collegarsi alla fotocamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"La fotocamera è stata disattivata in base a norme di sicurezza."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotocamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videocamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Foto"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Video"</string>
     <string name="wait" msgid="8600187532323801552">"Attendere..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Monta l\'archivio USB prima di utilizzare la fotocamera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Per usare la fotocamera devi inserire una scheda SD."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Monta l\'archivio USB prima di utilizzare la fotocamera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Per usare la fotocamera devi inserire una scheda SD."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"L\'archivio USB è pieno."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"La scheda SD è piena."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparazione archivio USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Accesso ad archivio USB non riuscito."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Accesso a scheda SD non riuscito."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Ripristina predefinite"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Verranno ripristinate le impostazioni predefinite della fotocamera."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Impostazioni fotocamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Impostazioni videocamera"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensioni foto"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 Megapixel"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3 M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Messa a fuoco"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Notturna"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Tramonto"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Festa"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Non è selezionabile in modalità scena"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Non selezionabile in modalità scena."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Impostazioni fotocamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Ripristina predefinite"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Esposizione"</string>
@@ -92,30 +92,30 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Passa a panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Condividi foto via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Condividi video via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nessuna immagine da condividere"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nessun video da condividere"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Troppo veloce"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Nessuna immagine da condividere."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Nessun video da condividere."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Troppo veloce"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparazione panoramica"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Impossibile salvare la panoramica"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Salvataggio panoramica non riuscito."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panoramica"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Acquisizione panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Salvataggio..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tocca per mettere a fuoco"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Acquisizione panoramica"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Salvataggio..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Tocca per mettere a fuoco."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effetti"</string>
     <string name="effect_none" msgid="3601545724573307541">"Nessuno"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Schiaccia"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Occhi grandi"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Bocca grande"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Bocca piccola"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Naso grande"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Occhi piccoli"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Nello spazio"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Occhi grandi"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Bocca grande"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Bocca piccola"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Naso grande"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Occhi piccoli"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Nello spazio"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Tramonto"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Scegli il tuo"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Posiziona il dispositivo su una superficie stabile e assicurati che non ci sia qualcosa in movimento dietro di te."\n\n"Dopodiché esci dall\'inquadratura della fotocamera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Non selezionabile quando l\'effetto è attivo."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Scatta una foto durante il video toccando lo schermo di anteprima."</string>
+    <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Scegli il tuo"</string>
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Imposta il tuo dispositivo in basso"\n"Esci dalla visualizzazione per un attimo"</string>
+    <string name="not_selectable_in_effect" msgid="7967729203855039239">"Non selezionabile quando l\'effetto è attivo."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Scatta una foto durante il video toccando lo schermo di anteprima."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Istantanea video disabilitata se gli effetti speciali sono attivi."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Cancella effetti"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Faccine"</string>
@@ -123,7 +123,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Pulsante di scatto"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto più recente"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interruttore fotocamera anteriore e posteriore"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Selettore fotocamera, video o panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Selettore fotocamera, video o panoramica"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Altri controlli"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Chiudi controlli"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Controllo zoom"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6ecc783..047f7ae 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"שגיאת מצלמה"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"אין אפשרות להתחבר למצלמה."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"לא ניתן להתחבר למצלמה."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"המצלמה הושבתה בשל מדיניות אבטחה."</string>
     <string name="camera_label" msgid="6346560772074764302">"מצלמה"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"מצלמת וידאו"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"תמונות מצלמה"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">" סרטוני וידאו של המצלמה"</string>
     <string name="wait" msgid="8600187532323801552">"המתן..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"טען אמצעי אחסון מסוג USB לפני השימוש במצלמה."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"הכנס כרטיס SD לפני שתשתמש במצלמה."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"טען אמצעי אחסון מסוג USB לפני השימוש במצלמה."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"הכנס כרטיס SD לפני השימוש במצלמה."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"אמצעי האחסון מסוג USB מלא."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"כרטיס SD מלא."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"מכין אמצעי אחסון מסוג USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"לא ניתן לגשת לאחסון ה-USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"לא ניתן לגשת לכרטיס ה-SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"שחזר ברירות מחדל"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"הגדרות מצלמה ישוחזרו לברירות המחדל."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"הגדרות מצלמה"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"הגדרות מצלמת וידאו"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"גודל תמונה"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 מגה פיקסלים"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 מגה פיקסלים"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 מגה פיקסלים"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3 מיליון פיקסלים"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3 מגה פיקסלים"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"מגה פיקסל אחד"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"מצב מיקוד"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"לילה"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"שקיעה"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"מסיבה"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"לא ניתן לבחור זאת במצב נוף"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"לא ניתן לבחירה במצב נוף."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"הגדרות מצלמה"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"שחזר ברירות מחדל"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"חשיפה"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"עבור לפנורמה"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"שתף תמונה באמצעות"</string>
     <string name="share_video_via" msgid="5152302809166549015">"שתף סרטון וידאו באמצעות"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"אין תמונה לשיתוף"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"אין סרטון וידאו לשיתוף"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"מהר מדי"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"אין תמונה לשיתוף."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"אין סרטון וידאו לשיתוף."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"מהר מדי"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"מכין פנורמה"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"תקלה בשמירת פנורמה"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"לא ניתן לשמור את הפנורמה."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"פנורמה"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"מבצע צילום פנורמה"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"שומר..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"הקש כדי להתמקד"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"מבצע צילום פנורמה"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"שומר…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"גע כדי להתמקד."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"אפקטים"</string>
     <string name="effect_none" msgid="3601545724573307541">"ללא"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"כיווץ"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"עיניים גדולות"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"פה גדול"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"פה קטן"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"אף גדול"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"עיניים קטנות"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"בחלל"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"עיניים גדולות"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"פה גדול"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"פה קטן"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"אף גדול"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"עיניים קטנות"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"בחלל"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"שקיעה"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"דיסקו"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"בחר סרטון משלך"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"הנח את המכשיר על גבי משטח יציב והקפד לוודא שאין תנועה מאחוריך."\n\n"לאחר מכן, צא מטווח הראייה של המצלמה."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"לא ניתן לבחור באפשרות זו כאשר האפקט מופעל."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"צלם תמונה במהלך הקלטת וידאו על ידי הקשה על מסך התצוגה המקדימה."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"לא ניתן לבחירה כאשר האפקט מופעל."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"צלם תמונה במהלך הקלטת סרטון וידאו על ידי נגיעה במסך התצוגה המקדימה."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"האפשרות לצילום תמונה מסרטון וידאו מושבתת כאשר אפקטים מיוחדים מופעלים."</string>
     <string name="clear_effects" msgid="5485339175014139481">"נקה אפקטים"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"פרצופים מצחיקים"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"לחצן הצמצם."</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"התמונה האחרונה"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"מתג המצלמה הקדמית והאחורית"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"בורר מצלמת וידאו או פנורמה"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"בורר מצב מצלמה, וידאו או פנורמה"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"פקדי הגדרות נוספות"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"סגור פקדי הגדרה"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"פקד \'הגדל/הקטן\'"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7136b67..be00d08 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"カメラエラー"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"カメラに接続できません。"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"カメラに接続できません。"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"カメラはセキュリティポリシーにより無効になっています。"</string>
     <string name="camera_label" msgid="6346560772074764302">"カメラ"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"ビデオ録画"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"カメラ (写真)"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"カメラ (動画)"</string>
     <string name="wait" msgid="8600187532323801552">"お待ちください..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"カメラを使用する前にUSBストレージをマウントしてください。"</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"カメラを使用する前にSDカードを挿入してください。"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"カメラを使用する前にUSBストレージをマウントしてください。"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"カメラを使用する前にSDカードを挿入してください。"</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USBストレージに空き領域がありません。"</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SDカードがいっぱいです。"</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USBストレージの準備中..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USBストレージにアクセスできませんでした。"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SDカードにアクセスできませんでした。"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"初期設定に戻す"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"カメラを初期設定に戻します。"</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"表示サイズ"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3メガピクセル"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3メガピクセル"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"フォーカスモード"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"夕焼け"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"パーティー"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"撮影モードでは選択できません"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"撮影モードでは選択できません。"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"カメラ設定"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"初期設定に戻す"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"露出"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"パノラマに切り替え"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"画像の共有方法"</string>
     <string name="share_video_via" msgid="5152302809166549015">"動画の共有方法"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"共有する画像はありません"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"共有する動画はありません"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"速すぎます"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"共有する画像はありません。"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"共有する動画はありません。"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"速すぎます"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"パノラマを準備しています"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"パノラマを保存できませんでした"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"パノラマを保存できませんでした。"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"パノラマ"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"パノラマを撮影中"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"保存中..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"タップしてフォーカス"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"パノラマを撮影中"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"保存中..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"タップしてフォーカスします。"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"効果"</string>
     <string name="effect_none" msgid="3601545724573307541">"なし"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"スクイーズ"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"大きな目"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"大きな口"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"小さな口"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"大きな鼻"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"小さな目"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"宇宙空間"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"大きな目"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"大きな口"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"小さな口"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"大きな鼻"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"小さな目"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"宇宙空間"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"夕焼け"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ディスコ"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"ギャラリーから"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"安定した平らな場所にデバイスを置き、後方に動いているものがないか確認します。"\n\n"次に、カメラの視野の外に出ます。"</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"効果がONのときは選択できません。"</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"動画の録画中にプレビュー画面をタップすると静止画を撮影できます。"</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="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>
     <string name="clear_effects" msgid="5485339175014139481">"効果設定をクリア"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"変な顔"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"シャッターボタン"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"最近の写真"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"前後カメラの切り替え"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"カメラ、ビデオ、パノラマの切り替え"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"カメラ、ビデオ、パノラマの切り替え"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"その他の設定コントロール"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"設定コントロールを閉じる"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"ズームコントロール"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7548e66..283838b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"카메라 오류"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"카메라에 연결할 수 없습니다."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"카메라에 연결할 수 없습니다."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"보안 정책으로 인해 카메라 사용이 중지되었습니다."</string>
     <string name="camera_label" msgid="6346560772074764302">"카메라"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"캠코더"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"카메라 사진"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"카메라 동영상"</string>
     <string name="wait" msgid="8600187532323801552">"잠시 기다려 주세요..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"카메라를 사용하기 전에 USB 저장소를 마운트하세요."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"카메라를 사용하려면 SD 카드를 넣으세요."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"카메라를 사용하기 전에 USB 저장소를 마운트하세요."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"카메라를 사용하기 전에 SD 카드를 삽입하세요."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB 저장소가 꽉 찼습니다."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD 카드가 꽉 찼습니다."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB 저장소 준비 중…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB 저장소에 액세스하지 못했습니다."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD 카드에 액세스하지 못했습니다."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"기본값 복원"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"카메라 설정이 기본값으로 복원됩니다."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"카메라 설정"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"사진 크기"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M 픽셀"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M 픽셀"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M 픽셀"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M 픽셀"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M 픽셀"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M 픽셀"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"초점 모드"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"야간"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"일몰"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"파티"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"장면 모드에서 선택할 수 없습니다."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"장면 모드에서 선택할 수 없습니다."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"카메라 설정"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"기본값 복원"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"노출"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"파노라마로 전환"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"사진 공유 애플리케이션"</string>
     <string name="share_video_via" msgid="5152302809166549015">"동영상 공유 애플리케이션"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"공유할 사진 없음"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"공유할 동영상 없음"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"너무 빠름"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"공유할 사진 없음"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"공유할 동영상 없음"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"너무 빠름"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"파노라마 준비 중"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"파노라마를 저장하지 못했습니다."</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"파노라마를 저장하지 못했습니다."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"파노라마"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"파노라마 캡처 중"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"저장 중..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"탭하여 초점 맞추기"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"파노라마 캡처 중"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"저장 중…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"초점을 맞추려면 터치하세요."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"효과"</string>
     <string name="effect_none" msgid="3601545724573307541">"없음"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"찌그러뜨리기"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"눈 크게"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"입 크게"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"입 작게"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"코 크게"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"눈 작게"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"우주"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"눈 크게"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"입 크게"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"입 작게"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"코 크게"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"눈 작게"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"우주"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"일몰"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"디스코"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"직접 선택"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"기기를 평평한 바닥에 올려놓고 뒤에 움직이는 물체가 없는지 확인합니다. "\n\n"그런 다음 카메라 뷰 밖으로 비켜섭니다."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"효과를 사용 중일 때는 선택할 수 없습니다."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"동영상을 촬영하는 동안 미리보기 화면을 탭하여 사진을 찍을 수 있습니다."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"효과를 사용 중일 때는 선택할 수 없습니다."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"동영상을 촬영하는 동안 미리보기 화면을 터치하여 사진을 찍을 수 있습니다."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"특수 효과가 설정되어 있으면 동영상 스냅샷이 사용 중지됩니다."</string>
     <string name="clear_effects" msgid="5485339175014139481">"효과 제거"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"웃긴 얼굴"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"셔터 버튼"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"최근 사진"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"전방 및 후방 카메라 전환"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"카메라, 동영상 또는 파노라마 선택기"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"카메라, 동영상 또는 파노라마 선택기"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"설정 컨트롤 더보기"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"설정 컨트롤 닫기"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"확대/축소 컨트롤"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2b5e4ba..f0823f7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Fotoaparato klaida"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nepavyksta prijungti prie fotoaparato."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nepavyksta prisijungti prie kameros."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Dėl saugumo politikos kamera neleidžiama."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparatas"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Nešiojamoji vaizdo kamera ir magnetofonas"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Fotoaparato paveikslėliai"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Fotoaparato vaizdo įrašai"</string>
     <string name="wait" msgid="8600187532323801552">"Palaukite..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Prieš naudodami fotokamerą prijunkite USB atmintinę."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Prieš naudodami fotoaparatą, įdėkite SD kortelę."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Prieš naudodami fotoaparatą įrenkite USB atmintį."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Prieš naudodami fotoaparatą įdėkite SD kortelę."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB atmintinė pilna."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Jūsų SD kortelė pilna."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Ruošiama USB atmintinė..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nepavyko pasiekti USB atminties."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nepavyko pasiekti SD kortelės."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Atkurti numatytuosius nustatymus"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Bus atkurti numatytieji fotoaparato nustatymai."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Fotoaparato nustatymai"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nešiojamosios vaizdo kameros ir magnetofono nustatymai"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Paveikslėlio dydis"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 mln. pikselių"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 mln. pikselių"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 mln. pikselių"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 mln. piks."</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 mln. pikselių"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 mln. pikselių"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 mln. pikselių"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 mln. pikselių"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 mln. pikselių"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 mln. pikselių"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusavimo režimas"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Naktis"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Saulėlydis"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Vakarėlis"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"To pasirinkti scenos režimu negalima"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Negalima pasirinkti, kai veikia scenos režimas."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Fotoaparato nustatymai"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Atkurti numatytuosius nustatymus"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Išlaikymas"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Perjungti į panoramos režimą"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Bendrinti paveikslėlį per"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Bendrinti vaizdo įrašą per"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nėra bendrinamo paveikslėlio"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nėra bendrinamo vaizdo įrašo"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Per greitai"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Nėra bendrinamo paveikslėlio."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Nėra bendrinamo vaizdo įrašo."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Per greitai"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Ruošiama panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Nepavyko išsaugoti panoramos"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Nepavyko išsaugoti panoramos."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Fiksuojama panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Išsaugoma..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Fokusuoti (palieskite)"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Fiksuojama panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Išsaugoma..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Palieskite, kad fokusuot."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efektai"</string>
     <string name="effect_none" msgid="3601545724573307541">"Joks"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Suspausti"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Didelės akys"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Didelė burna"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Maža burna"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Didelė nosis"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mažos akys"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Kosmose"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Didelės akys"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Didelė burna"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Maža burna"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Didelė nosis"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Mažos akys"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmose"</string>
     <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="1393338187462207584">"Pasirink. savo"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Įrenginį padėkite ant stabilaus paviršiaus ir įsitikinkite, kad už jūsų niekas nejuda."\n\n"Pasitraukite iš kameros regėjimo lauko."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Negalima pasirinkti, kai įjungtas efektas."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Kai įrašomas vaizdo įr., fotograf. paliesdami peržiūros ekraną."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Išvalyti efektus"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Juokingi veidai"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Užrakto mygtukas"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Naujausia nuotrauka"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Priekinis ir galinis fotoaparato jungikliai"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Fotoaparato, vaizdo įrašo ar panoramos parinkiklis"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kameros, vaizdo įrašo ar panoramos parinkiklis"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Daugiau nustatymų valdiklių"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Uždaryti nustatymų valdiklius"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Mastelio keitimo valdymas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0f0540f..3b67d1b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kameras kļūda"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nevar izveidot savienojumu ar kameru."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nevar izveidot savienojumu ar kameru."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera ir atspējota drošības politiku dēļ."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kameras attēli"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kameras video"</string>
     <string name="wait" msgid="8600187532323801552">"Lūdzu, uzgaidiet…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Pirms kameras lietošanas, lūdzu, uzstādiet USB atmiņu."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Lūdzu, pirms kameras izmantošanas ievietojiet SD karti."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pirms kameras lietošanas pievienojiet USB atmiņu."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Pirms kameras izmantošanas ievietojiet SD karti."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB atmiņa ir pilna."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD karte ir pilna."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Notiek USB atm. sagatavošana"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nevarēja piekļūt USB atmiņai."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nevarēja piekļūt SD kartei."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Atjaunot noklusējuma iestatījumus"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Tiks atjaunoti kameras noklusējuma iestatījumi."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameras iestatījumi"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokameras iestatījumi"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Attēla izmērs"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 megapikseļi"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapikselis"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapikseļi"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapikseļi"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapikseļi"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapikseļi"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapikselis"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusa režīms"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nakts"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Saulriets"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Viesības"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"To nevar iestatīt profila režīmā."</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nevar atlasīt ainavas režīmā."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kameras iestatījumi"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Atjaunot noklusējuma iestatījumus"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozīcija"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Pārslēgt uz panorāmas režīmu"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Kopīgot attēlu, izmantojot"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Kopīgot videoklipu, izmantojot"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nav kopīgojamu attēlu."</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nav kopīgojamu videoklipu."</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Pārāk ātri"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Nav kopīgojamu attēlu."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Nav kopīgojamu videoklipu."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Pārāk ātri"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Notiek panorāmas sagatavošana"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Neizdevās saglabāt panorāmu."</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Nevarēja saglabāt panorāmu."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorāma"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Tiek tverta panorāma"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Saglabā"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Pieskarieties, lai fokusētu."</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Notiek panorāmas tveršana"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Saglabā..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Pieskarieties, lai fokusētu."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekti"</string>
     <string name="effect_none" msgid="3601545724573307541">"Nav"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Saspiest"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Lielas acis"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Liela mute"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Maza mute"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Liels deguns"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mazas acis"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Kosmosā"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Lielas acis"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Liela mute"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Maza mute"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Liels deguns"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Mazas acis"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kosmosā"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Saulriets"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Izvēlēties"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Novietojiet ierīci uz stabilas virsmas un pārliecinieties, ka aiz jums nenotiek nekāda kustība."\n\n"Pēc tam izejiet no kameras skata."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Šo iestat. nevar atlasīt, kad ir ieslēgts efekts."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografējiet videoieraksta laikā, pieskaroties priekšskat. ekr."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Noņemt efektus"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Smieklīgas sejas izt."</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Slēdža poga"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Pēdējais fotoattēls"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Priekšējais un aizmugurējais kameras slēdzis"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kameras, video vai panorāmas atlasītājs"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kameras, videokameras vai panorāmas atlasītājs"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Vairāk iestatījumu vadīklu"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Aizvērt iestatījumu vadīklas"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Tālummaiņas vadība"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 4e498f6..49f2581 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Ralat kamera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Tidak boleh bersambung ke kamera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Tidak boleh menyambung kepada kamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera telah dilumpuhkan kerana dasar keselamatan."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Kamkorder"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Gambar kamera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kamera video"</string>
     <string name="wait" msgid="8600187532323801552">"Sila tunggu..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Sila lekapkan storan USB sebelum menggunakan kamera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Sila masukkan kad SD sebelum menggunakan kamera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Lekapkan storan USB sebelum menggunakan kamera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Masukkan kad SD sebelum menggunakan kamera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Storan USB anda penuh."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Kad SD anda penuh."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Menyediakan storan USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Tidak dapat mengakses storan USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Tidak dapat mengakses kad SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Pulihkan lalai"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Tetapan kamera akan dipulihkan kepada lalai."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"Piksel 5M"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"Piksel 3M"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"Piksel 2M"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Piksel 1M"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M piksel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mod fokus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Malam"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Matahari Terbenam"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Parti"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Ini tidak boleh dipilih dalam mod pemandangan"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Tidak boleh dipilih dalam mod pemandangan."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Tetapan kamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Pulihkan lalai"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Dedahan"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Tukar kepada panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Berkongsi gambar melalui"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Berkongsi video melalui"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Tiada gambar untuk dikongsi"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Tiada video untuk dikongsi"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Terlalu Cepat"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Tiada gambar untuk dikongsi."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Tiada video untuk dikongsi."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Trlalu cepat"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Menyediakan panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Gagal untuk menyimpan panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Tidak dapat menyimpan panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Menangkap Gambar Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Menyimpan..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Ketik untuk memfokus"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Menangkap gambar panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Menyimpan…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Sentuh untuk memfokus."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Kesan"</string>
     <string name="effect_none" msgid="3601545724573307541">"Tiada"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Picit"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Mata Besar"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Mulut Besar"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Mulut Kecil"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Hidung Besar"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Mata Kecil"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Di Angkasa"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Mata besar"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Mulut besar"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Mulut kecil"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Hidung besar"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Mata kecil"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Di angkasa"</string>
     <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="1393338187462207584">"Pilih sendiri"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Letakkan peranti anda di atas permukaan yang stabil dan pastikan tidak ada pergerakan di belakang anda."\n" "\n" Kemudian berjalan keluar dari pandangan kamera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ini tidak boleh dipilih apabila kesan dihidupkan."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Ambil gambar semasa rakaman video dengan mengetik pada skrin pratonton."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Padamkan kesan"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Muka bodoh"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Butang pengatup"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto paling terbaru"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Suis kamera depan dan belakang"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Pemilih kamera, video atau panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Pemilih kamera, video atau panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Lagi kawalan tetapan"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Tutup kawalan tetapan"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Kawalan zum"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d562997..59fe342 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamerafeil"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Kan ikke koble til kameraet."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Kan ikke koble til kameraet."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kameraet har blitt deaktivert på grunn av retningslinjer for sikkerhet."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Video"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Bilder fra kamera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Videoer fra kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Vent litt…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Sett inn enhet for USB-lagring før du bruker kameraet."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Sett inn et minnekort før du bruker kameraet."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Sett inn en USB-lagring før du bruker kameraet."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Sett inn et SD-kort før du bruker kameraet."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB-lagringsenheten er full."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Minnekortet er fullt."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Forbereder USB-lagring …"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Får ikke tilgang til USB-lagring."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Får ikke tilgang til SD-kort."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Gjenopprett standardinnstillingene"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamerainnstillingene gjenopprettes til standard."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainnstillinger"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videoinnstillinger"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildestørrelse"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M (2592x1936)"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M (2048x1536)"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M (1600x1200)"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 megapiksler"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M (1024x768)"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"Fem megapiksler"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"Tre megapiksler"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"To megapiksler"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapiksler"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"Én megapiksel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusmodus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fest"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Dette kan ikke velges i scenemodus"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan ikke velges i scenemodus."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kamerainnstillinger"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Gjenopprett standardinnstillingene"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Bytt til panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Del bilde via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Del videoen via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Ikke noe bilde for deling"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Ingen video for deling"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"For rask"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Ingen bilder kan deles"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ingen videoer kan deles."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"For rask"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Forbereder panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Lagring av panorama mislyktes"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Kunne ikke lagre panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panoramaopptak"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Lagrer …"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Trykk for å fokusere"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panoramaopptak"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Lagrer …"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Trykk for å fokusere."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekter"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ingen"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Klem sammen"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Store øyne"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Stor munn"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Liten munn"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Stor nese"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Små øyne"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Verdensrommet"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Store øyne"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Stor munn"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Liten munn"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Stor nese"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Små øyne"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Verdensrommet"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Solnedgang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Velg din egen"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Plassér enheten på et stødig underlag og sørg for at det ikke er noen bevegelser bak deg."\n\n"Deretter flytter du deg bort fra kamerabildet."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Du kan ikke velge dette når effekten er aktivert."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Ta bilde under videoopptaket ved å trykke på forhåndsvisningen."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Fjern effekter"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Morsomme ansikter"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Lukkerknapp"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Nyeste bilde"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Bryter for foran/bak"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Valg av kamera, video eller panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Valg av kamera, video eller panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Flere innstillingskontroller"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Lukk innstillingskontrollene"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomkontroll"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e391e1f..ccd3a37 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Camerafout"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Kan geen verbinding maken met de camera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Kan geen verbinding maken met de camera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"De camera is uitgeschakeld vanwege het beveiligingsbeleid."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Camerafoto\'s"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Cameravideo\'s"</string>
     <string name="wait" msgid="8600187532323801552">"Een ogenblik geduld..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Koppel de USB-opslag voordat u de camera gebruikt."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Plaats een SD-kaart voordat u de camera gebruikt."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Koppel de USB-opslag voordat u de camera gebruikt."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Plaats een SD-kaart voordat u de camera gebruikt."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Uw USB-opslag is vol."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"De SD-kaart is vol."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB-opslag voorbereiden…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Geen toegang tot USB-opslag."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Geen toegang tot SD-kaart."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Standaardwaarden herstellen"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"De standaardwaarden voor de camera-instellingen worden hersteld."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera-instellingen"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder-instellingen"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grootte van foto"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5000 pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Scherpstelmodus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nacht"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zonsondergang"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Feest"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Dit kunt u niet selecteren in de scènemodus"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Kan niet worden geselecteerd in scènemodus."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Camera-instellingen"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Standaardwaarden herstellen"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Belichting"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Overschakelen naar panoramamodus"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Foto delen via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Video delen via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Geen afbeelding om te delen"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Geen video om te delen"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Te snel"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Geen afbeelding om te delen."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Geen video om te delen."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Te snel"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama voorbereiden"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Kan panorama niet opslaan"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Kan panorama niet opslaan."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama vastleggen"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Opslaan..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tikken voor autofocus"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panorama vastleggen"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Opslaan…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Raak aan voor scherpstellen."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effecten"</string>
     <string name="effect_none" msgid="3601545724573307541">"Geen"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Samendrukken"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Grote ogen"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Grote mond"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Kleine mond"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Grote neus"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Kleine ogen"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"In de ruimte"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Grote ogen"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Grote mond"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Kleine mond"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Grote neus"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Kleine ogen"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"In de ruimte"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Zonsondergang"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Zelf kiezen"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Plaats uw apparaat op een stevige ondergrond en zorg ervoor dat er geen beweging achter u te zien is."\n\n"Stap vervolgens uit beeld."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan niet worden geselecteerd wanneer het effect is ingeschakeld."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Tik voor een foto bij video-opnamen op het voorbeeldscherm."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Effecten wissen"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Gekke gezichten"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Sluiterknop"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Meest recente foto"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Schakelen tussen camera aan voorzijde en aan achterzijde"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Camera-, video- of panoramakiezer"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Camera-, video- of panoramakiezer"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Meer instelopties"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Instelopties sluiten"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomregeling"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index acb29b6..81de6b9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Błąd aparatu"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nie można nawiązać połączenia z aparatem."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nie można nawiązać połączenia z aparatem."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Aparat został wyłączony z powodu zasad bezpieczeństwa."</string>
     <string name="camera_label" msgid="6346560772074764302">"Aparat"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Zdjęcia z aparatu"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Filmy z aparatu"</string>
     <string name="wait" msgid="8600187532323801552">"Proszę czekać…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Przed użyciem aparatu podłącz nośnik USB."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Zanim zaczniesz korzystać z aparatu fotograficznego, włóż kartę SD."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Zanim użyjesz aparatu podłącz nośnik USB."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Przed przystąpieniem do korzystania z aparatu włóż kartę SD."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Nośnik USB jest pełny."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Karta SD jest pełna."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Przygotowywanie nośnika USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nie można uzyskać dostępu do pamięci USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nie można uzyskać dostępu do karty SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Przywróć wartości domyślne"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Zostaną przywrócone ustawienia domyślne aparatu."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ustawienia aparatu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ustawienia kamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Rozmiar zdjęcia"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapikseli"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapiksele"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapiksele"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 mln pikseli"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapiksel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapikseli"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapiksele"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapiksele"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapiksela"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Tryb ostrości"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zachód słońca"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Impreza"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Niedostępne w trybie scenerii"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Opcja niedostępna w trybie scenerii."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Ustawienia aparatu"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Przywróć wartości domyślne"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozycja"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Przełącz na panoramę"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Udostępnij zdjęcie przez:"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Udostępnij film za pomocą"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Brak zdjęcia do udostępnienia"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Brak filmu do udostępnienia"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Zbyt szybko"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Brak zdjęć do udostępnienia."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Brak filmów do udostępnienia."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Zbyt szybko"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Przygotowywanie panoramy"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Nie można zapisać panoramy."</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Nie można zapisać panoramy."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Tworzenie panoramy"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Zapisuje..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Dotknij, aby wyostrzyć"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Tworzenie panoramy"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Zapis..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Ustaw ostrość, klikając."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekty"</string>
     <string name="effect_none" msgid="3601545724573307541">"Brak"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Ściśnięcie"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Wielkie oczy"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Wielkie usta"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Małe usta"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Wielki nos"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Małe oczy"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"W kosmosie"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Wielkie oczy"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Wielkie usta"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Małe usta"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Wielki nos"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Małe oczy"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"W kosmosie"</string>
     <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="1393338187462207584">"Wybierz własne"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Umieść urządzenie na stabilnej powierzchni i upewnij się, że za Tobą nic się nie dzieje."\n\n"Następnie wyjdź z pola widzenia aparatu."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Opcji nie można wybrać, gdy efekt jest włączony."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Zrób zdjęcie podczas nagrywania filmu, klikając ekran podglądu."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Usuń efekty"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Zabawne twarze"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Przycisk migawki"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Najnowsze zdjęcie"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Przełącznik przedniego i tylnego aparatu"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Wybór aparatu, filmu lub panoramy"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Wybór aparatu, filmu lub panoramy"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Więcej ustawień"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zamknij ustawienia"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Sterowanie powiększeniem"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e595f7f..a244808 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Erro da câmara"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Não é possível efectuar a ligação à câmara."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Não é possível efetuar ligação à câmara."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Devido a políticas de segurança, a câmara foi desativada."</string>
     <string name="camera_label" msgid="6346560772074764302">"Câmara"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Câmara de vídeo"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Imagens da câmara"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Vídeos da câmara"</string>
     <string name="wait" msgid="8600187532323801552">"Aguarde..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Monte o armazenamento USB antes de utilizar a câmara."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Insira um cartão SD antes de utilizar a câmara."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Monte a memória de armazenamento USB antes de utilizar a câmara."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Insira um cartão SD antes de utilizar a câmara."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"O armazenamento USB está cheio."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"O cartão SD está cheio."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparar armazenamento USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Não foi possível aceder à memória de armazenamento USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Não foi possível aceder ao cartão SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar predefinições"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"As definições da câmara serão restauradas para os valores predefinidos."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Definições da câmara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Definições da câmara de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de focagem"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Nocturno"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ocaso"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Partido"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Não é seleccionável no modo cenário"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Não selecionável no modo de cena."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Definições da câmara"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restaurar predefinições"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Mudar para panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Partilhar imagem através de"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Partilhar vídeo através de"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nenhuma imagem para partilhar"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Não há vídeo para partilhar"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Muito rápido"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Sem fotografia para partilhar"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Nenhum vídeo para partilhar."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Muito rápido"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"A preparar panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Falha ao guardar o panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Não foi possível guardar panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"A Capturar Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"A guardar..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Toque para focar"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"A tirar foto de panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"A guardar..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Toque para focar."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efeitos"</string>
     <string name="effect_none" msgid="3601545724573307541">"Nenhum"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Comprimir"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Olhos Grandes"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Boca Grande"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Boca Pequena"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nariz Grande"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Olhos Pequenos"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"No Espaço"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Olhos grandes"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Boca grande"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Boca pequena"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nariz grande"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Olhos pequenos"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"No espaço"</string>
     <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="1393338187462207584">"Escolha o seu"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o aparelho numa superfície estável e certifique-se de que não existe movimento atrás de si."\n\n"Em seguida, saia do alcance visual da câmara."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Isto não é selecionável com o efeito ativado."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma fotografia durante a gravação de vídeo tocando no ecrã de pré-visualização."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Limpar efeitos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caretas"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botão Obturador"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Fotografia mais recente"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Interruptor da câmara frontal e posterior"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Seletor de câmara, vídeo ou panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Seletor de câmara, vídeo ou panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mais controlos de definições"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fechar controlos de definições"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Controlo de zoom"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 11d9726..533a89f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Erro de câmera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Não é possível se conectar à câmera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Não é possível conectar à câmera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"A câmera foi desativada devido às políticas de segurança."</string>
     <string name="camera_label" msgid="6346560772074764302">"Câmera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Filmadora"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Imagens da câmera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Vídeos de câmera"</string>
     <string name="wait" msgid="8600187532323801552">"Aguarde..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Conecte o armazenamento USB antes de usar a câmera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Insira um cartão SD antes de usar a câmera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Monte o armazenamento USB antes de usar a câmera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Insira um cartão SD antes de usar a câmera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Seu armazenamento USB está cheio."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"O seu cartão SD está cheio."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparando armazenamento USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Não foi possível acessar o armazenamento USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Não foi possível acessar o cartão SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar padrões"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"As configurações da câmera serão restauradas para os valores padrão."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configurações da câmera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configurações da filmadora"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixels"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de foco"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Cena noturna"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Pôr-do-sol"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Festa"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Isso não é selecionável no modo de cena"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Não pode ser selecionado no modo de cena."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Configurações da câmera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restaurar padrões"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Mudar para panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Compartilhar imagem via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Compartilhar vídeo via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nenhuma imagem para compartilhar"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nenhum vídeo para compartilhar"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Muito rápido"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Sem imagem para compartilhar."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Sem vídeo para compartilhar."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Muito rápido"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Preparando panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Falha ao salvar o panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Não foi possível salvar panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Capturando panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Salvando..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Toque para obter foco"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Capturando panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Salvando..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Toque para ajustar o foco."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efeitos"</string>
     <string name="effect_none" msgid="3601545724573307541">"Nenhum"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Comprimir"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Olhos grandes"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Boca grande"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Boca pequena"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nariz grande"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Olhos pequenos"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"No espaço"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Olhos grandes"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Boca grande"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Boca pequena"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nariz grande"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Olhos pequenos"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"No espaço"</string>
     <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="1393338187462207584">"Escolher"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o dispositivo sobre uma superfície estável sem movimento atrás de você."\n\n"Em seguida, saia do campo de visão da câmera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Não é possível selecionar com o efeito ativado."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma foto ao gravar um vídeo tocando na tela de visualização."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Clarear efeitos"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Caretas"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Botão \"Tirar foto\""</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Foto mais recente"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Botão da câmera frontal e traseira"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Seletor de câmera, vídeo ou panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Seletor de câmera, vídeo ou panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mais controles de ajuste"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Fechar controles de ajuste"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Controle de zoom"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 7c2a328..2d7c0f4 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Errur da la camera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Impussibel da connectar cun la camera."</string>
+    <!-- outdated translation 8029009101380114174 -->     <string name="cannot_connect_camera" msgid="955440687597185163">"Impussibel da connectar cun la camera."</string>
     <!-- no translation found for camera_disabled (8923911090533439312) -->
     <skip />
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
@@ -25,8 +25,8 @@
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Fotos da la camera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Videos da la camera"</string>
     <string name="wait" msgid="8600187532323801552">"Spetgar..."</string>
-    <!-- outdated translation 820691042667338625 -->     <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Inseri per plaschair ina carta SD avant che utilisar la camera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Inseri per plaschair ina carta SD avant che utilisar la camera."</string>
+    <!-- outdated translation 820691042667338625 -->     <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Inseri per plaschair ina carta SD avant che utilisar la camera."</string>
+    <!-- outdated translation 820691042667338625 -->     <string name="no_storage" product="default" msgid="5137703033746873624">"Inseri per plaschair ina carta SD avant che utilisar la camera."</string>
     <!-- outdated translation 6655334407957844653 -->     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Vossa carta SD è plaina."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Vossa carta SD è plaina."</string>
     <!-- outdated translation 2914969119574812666 -->     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Preparar la carta SD..."</string>
@@ -34,7 +34,7 @@
     <!-- outdated translation 4427585260986849912 -->     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Impussibel d\'acceder a la carta SD."</string>
     <!-- outdated translation 4427585260986849912 -->     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Impussibel d\'acceder a la carta SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restaurar ils parameters predefinids"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Ils parameters predefinids da la camera vegnan restaurads."</string>
+    <!-- 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>
@@ -55,12 +55,12 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Parameters da la camera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Parameters da la camera da video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grondezza dal maletg"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 milliuns pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 milliuns pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 milliuns pixels"</string>
-    <!-- no translation found for pref_camera_picturesize_entry_1280x960 (1648390393603363042) -->
+    <!-- outdated translation 1871154452633783418 -->     <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 milliuns pixels"</string>
+    <!-- outdated translation 8763841848102861602 -->     <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 milliuns pixels"</string>
+    <!-- outdated translation 3802531502504271124 -->     <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 milliuns pixels"</string>
+    <!-- no translation found for pref_camera_picturesize_entry_1280x960 (7820672028447972964) -->
     <skip />
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 milliun pixels"</string>
+    <!-- outdated translation 6557686202570581693 -->     <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 milliun pixels"</string>
     <!-- no translation found for pref_camera_picturesize_entry_640x480 (5557572917973022995) -->
     <skip />
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
@@ -85,7 +85,7 @@
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Rendida dal sulegl"</string>
     <!-- no translation found for pref_camera_scenemode_entry_party (907053529286788253) -->
     <skip />
-    <!-- no translation found for not_selectable_in_scene_mode (2345574961174762643) -->
+    <!-- no translation found for not_selectable_in_scene_mode (2970291701448555126) -->
     <skip />
     <string name="pref_restore_title" msgid="6479274979730178961">"Parameters da la camera"</string>
     <!-- outdated translation 5326039608800383369 -->     <string name="pref_restore_detail" msgid="5732490002291044791">"Restaurar ils parameters predefinids"</string>
@@ -105,23 +105,23 @@
     <skip />
     <!-- no translation found for share_video_via (5152302809166549015) -->
     <skip />
-    <!-- no translation found for no_picture_to_share (7700541451734517445) -->
+    <!-- no translation found for no_picture_to_share (5352574090121328815) -->
     <skip />
-    <!-- no translation found for no_video_to_share (3775826212074938990) -->
+    <!-- no translation found for no_video_to_share (7567298642707627096) -->
     <skip />
-    <!-- no translation found for pano_too_fast_prompt (3893565956616588385) -->
+    <!-- no translation found for pano_too_fast_prompt (2823839093291374709) -->
     <skip />
     <!-- no translation found for pano_dialog_prepare_preview (4788441554128083543) -->
     <skip />
-    <!-- no translation found for pano_dialog_panorama_failed (6286761234243958706) -->
+    <!-- no translation found for pano_dialog_panorama_failed (2155692796549642116) -->
     <skip />
     <!-- no translation found for pano_dialog_title (5755531234434437697) -->
     <skip />
-    <!-- no translation found for pano_capture_indication (7431983072966619171) -->
+    <!-- no translation found for pano_capture_indication (8248825828264374507) -->
     <skip />
-    <!-- no translation found for pano_review_saving_indication_str (6239883905955317473) -->
+    <!-- no translation found for pano_review_saving_indication_str (2054886016665130188) -->
     <skip />
-    <!-- no translation found for tap_to_focus (6417403734418828035) -->
+    <!-- no translation found for tap_to_focus (8863427645591903760) -->
     <skip />
     <!-- no translation found for pref_video_effect_title (8243182968457289488) -->
     <skip />
@@ -129,29 +129,29 @@
     <skip />
     <!-- no translation found for effect_goofy_face_squeeze (1207235692524289171) -->
     <skip />
-    <!-- no translation found for effect_goofy_face_big_eyes (1942377617761116861) -->
+    <!-- no translation found for effect_goofy_face_big_eyes (3945182409691408412) -->
     <skip />
-    <!-- no translation found for effect_goofy_face_big_mouth (2342636750478741367) -->
+    <!-- no translation found for effect_goofy_face_big_mouth (7528748779754643144) -->
     <skip />
-    <!-- no translation found for effect_goofy_face_small_mouth (4424498213697804087) -->
+    <!-- no translation found for effect_goofy_face_small_mouth (3848209817806932565) -->
     <skip />
-    <!-- no translation found for effect_goofy_face_big_nose (5738964679340745774) -->
+    <!-- no translation found for effect_goofy_face_big_nose (5180533098740577137) -->
     <skip />
-    <!-- no translation found for effect_goofy_face_small_eyes (8007886544327361111) -->
+    <!-- no translation found for effect_goofy_face_small_eyes (1070355596290331271) -->
     <skip />
-    <!-- no translation found for effect_backdropper_space (1381012939195370792) -->
+    <!-- no translation found for effect_backdropper_space (7935661090723068402) -->
     <skip />
     <!-- no translation found for effect_backdropper_sunset (45198943771777870) -->
     <skip />
     <!-- no translation found for effect_backdropper_disco (8494822051982972854) -->
     <skip />
-    <!-- no translation found for effect_backdropper_gallery (1393338187462207584) -->
+    <!-- no translation found for effect_backdropper_gallery (3271387403091819540) -->
     <skip />
-    <!-- no translation found for bg_replacement_message (7540788298745332389) -->
+    <!-- no translation found for bg_replacement_message (6828585054971662284) -->
     <skip />
-    <!-- no translation found for not_selectable_in_effect (5093306709878914151) -->
+    <!-- no translation found for not_selectable_in_effect (7967729203855039239) -->
     <skip />
-    <!-- no translation found for video_snapshot_hint (6479115859014094906) -->
+    <!-- no translation found for video_snapshot_hint (8159602664271448241) -->
     <skip />
     <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) -->
     <skip />
@@ -167,7 +167,7 @@
     <skip />
     <!-- no translation found for accessibility_camera_picker (8807945470215734566) -->
     <skip />
-    <!-- no translation found for accessibility_mode_picker (3264968460835265505) -->
+    <!-- no translation found for accessibility_mode_picker (3278002189966833100) -->
     <skip />
     <!-- no translation found for accessibility_second_level_indicators (3855951632917627620) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fee6b4e..bb62894 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Eroare cameră foto"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nu se poate realiza conectarea la camera foto."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nu se poate conecta la camera foto."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Camera foto a fost dezactivată din cauza politicilor de securitate."</string>
     <string name="camera_label" msgid="6346560772074764302">"Cameră foto"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Cameră video"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Fotografii cameră"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Videoclipuri cameră"</string>
     <string name="wait" msgid="8600187532323801552">"Aşteptaţi…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Înainte de a utiliza camera foto, montaţi dispozitivul de stocare USB."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Inseraţi un card SD înainte de a utiliza camera foto."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Înainte de a utiliza camera foto, montaţi dispozitivul de stocare USB."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Introduceţi un card SD înainte de a utiliza camera foto."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Spaţiul de stocare USB s-a terminat."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Cardul SD este plin."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Se pregăteşte stocarea USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nu s-a putut accesa stocarea USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nu s-a putut accesa cardul SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Restabiliţi valorile prestabilite"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Setările camerei foto vor fi restabilite la valorile prestabilite."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Setările camerei foto"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Setările camerei video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensiune fotografie"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 M pixeli"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 M pixeli"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 M pixeli"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 M pixeli"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixeli"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 MP"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 MP"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 MP"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 MP"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mod focus"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noapte"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Apus de soare"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Petrecere"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Această setare nu este selectabilă în modul scenă"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nu este selectabil în modul scenă."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Setările camerei foto"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Restabiliţi valorile prestabilite"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expunere"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Comutaţi la panoramă"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Distribuiţi fotografia prin"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Distribuiţi videoclipul prin"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Nu există imag. de distribuit"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Nu există video. de distribuit"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Prea repede"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Nicio imagine de distribuit."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Niciun videoclip de distrib."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Prea repede"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Se pregăteşte panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Salvarea panoramei a eşuat"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panorama nu a putut fi salvată."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panoramă"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Se capturează panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Salvare..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Apăsaţi pt. a focaliza"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Se capturează panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Se salvează.."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Atingeţi pentru a focaliza."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efecte"</string>
     <string name="effect_none" msgid="3601545724573307541">"Niciunul"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Comprimare"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Ochi mari"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Gură mare"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Gură mică"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Nas mare"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Ochi mici"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"În spaţiu"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Ochi mari"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Gură mare"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Gură mică"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Nas mare"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Ochi mici"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"În spaţiu"</string>
     <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="1393338187462207584">"Alegeţi unul"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Aşezaţi dispozitivul pe o suprafaţă stabilă şi asiguraţi-vă că nu există mişcare în spatele dvs."\n\n"Apoi, ieşiţi din vizorul camerei foto."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setarea nu poate fi selectată cu efectul activat."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografiaţi când înregistraţi video atingând ecranul."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Ştergeţi efectul"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Feţe stupide"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Butonul Declanşaţi"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Cea mai recentă fotografie"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Comutator pentru camera foto din faţă şi din spate"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Selector pentru modurile cameră foto, cameră video sau panoramă"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Selector pentru modurile cameră foto, cameră video sau panoramă"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mai multe comenzi pentru setări"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Închideţi comenzile pentru setări"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Comandă mărire/micşorare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ea9a1e3..c8c6619 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Ошибка камеры"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Не удается подключиться к камере."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Не удалось подключиться к камере."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камера отключена в соответствии с политикой безопасности."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Видеокамера"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Снимки, сделанные камерой"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Видео"</string>
     <string name="wait" msgid="8600187532323801552">"Подождите..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Перед использованием камеры подключите USB-накопитель."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Прежде чем использовать камеру, вставьте SD-карту."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Подключите USB-накопитель перед использованием камеры."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Вставьте SD-карту перед использованием камеры."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"На USB-накопителе нет места."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Ваша SD-карта заполнена."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Подготовка USB-накопителя…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Нет доступа к USB-накопителю."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Нет доступа к SD-карте."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Восстановить настройки по умолчанию"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Для камеры будут восстановлены настройки по умолчанию."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки камеры"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки видеокамеры"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фото"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 мегапикселей"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 мегапикселя"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 мегапикселя"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 мегапикселя"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 мегапиксель"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 Мпикс."</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 Мпикс."</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 Мпикс."</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 Мпикс."</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокусировки"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ночь"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Закат"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Вечеринка"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Недоступно в режиме съемки"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Недоступно в режиме съемки"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Настройки камеры"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Восстановить настройки по умолчанию"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Экспозиция"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Переключить в режим панорамы"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Отправка картинки"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Отправка видео"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Нет картинок для отправки"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Нет видео для отправки"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Очень быстро"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Нет ни одного изображения."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Нет ни одного видео."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Очень быстро"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Обработка..."</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Не удалось сохранить файл"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Не удалось сохранить файл."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Создание панорамы..."</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Сохранение..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Нажмите для фокусировки"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Создание панорамы..."</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Сохранение…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Нажмите для фокусировки."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Эффекты"</string>
     <string name="effect_none" msgid="3601545724573307541">"Без эффектов"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Сжатие"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Большие глаза"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Большой рот"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Маленький рот"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Большой нос"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Мал. глаза"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Космос"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Большие глаза"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Большой рот"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Маленький рот"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Большой нос"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Глаза в точку"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Космос"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Закат"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Выбрать видео"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Установите устройство на твердой поверхности и убедитесь, что позади вас нет движущихся предметов или людей."\n\n"Затем отойдите, чтобы вас было видно в камеру."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Недоступно при использовании этого эффекта."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Чтобы сделать снимок при видеосъемке, нажмите на экран просмотра."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"Недоступно при использовании эффекта."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Чтобы сделать снимок при видеосъемке, нажмите на экран просмотра."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Невозможно сделать снимок при включенных спецэффектах."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Убрать эффекты"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Смешные рожицы"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Кнопка \"Затвор\""</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Недавние фото"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Переключение на переднюю или заднюю камеру"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Переключатель между режимами \"Фото\", \"Видео\" и \"Панорама\""</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Переключатель между режимами \"Фото\", \"Видео\" и \"Панорама\""</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Дополнительные настройки"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Закрыть"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Зум"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 39c7a4c..a8c37f2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Chyba fotoaparátu"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Nedá sa pripojiť k fotoaparátu."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Nedá sa pripojiť k fotoaparátu."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparát je zakázaný z dôvodu bezpečnostných pravidiel."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparát"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Nasnímané fotografie"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Nasnímané videá"</string>
     <string name="wait" msgid="8600187532323801552">"Čakajte, prosím..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Pred použitím fotoaparátu pripojte zdieľaný ukladací priestor."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Kým začnete používať fotoaparát, vložte kartu SD."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pred použitím fotoaparátu pripojte zdieľané úložisko USB."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Pred použitím fotoaparátu vložte kartu SD."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Ukladací priestor USB je plný."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Vaša karta SD je plná."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Príprava uklad. priestoru USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Nepodarilo sa získať prístup k ukladaciemu priestoru USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Nepodarilo sa získať prístup ku karte SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Obnoviť predvolené nastavenia"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Bude obnovené predvolené nastavenie fotoaparátu."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavenia fotoaparátu"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavenie videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veľkosť fotografie"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapixlov"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixle"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixle"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 milióna pixlov"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixlov"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixle"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixle"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixlov"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Režim zaostrenia"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Západ slnka"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Strana"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Táto možnosť sa nedá vybrať v scénickom režime"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Nie je možné vybrať v scénickom režime."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Nastavenia fotoaparátu"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Obnoviť predvolené nastavenia"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Expozícia"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Prepnúť na panorámu"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Zdieľať fotografiu pomocou"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Zdieľať video pomocou"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Žiadna fotografia na zdieľanie"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Žiadne video na zdieľanie"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Príliš rýchlo"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Žiadna fotografia na zdieľanie."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Žiadne video na zdieľanie."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Veľmi rýchlo"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Príprava panorámy"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorámu sa nepodarilo uložiť"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panorámu sa nepodarilo uložiť."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panoráma"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Snímanie panorámy"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Ukladá sa..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Klepnutím zaostrite"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Snímanie panorámy"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Ukladá sa..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Dotykom zaostríte."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efekty"</string>
     <string name="effect_none" msgid="3601545724573307541">"Žiadne"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Stlačiť"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Veľké oči"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Veľké ústa"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Malé ústa"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Veľký nos"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Malé oči"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Vo vesmíre"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Veľké oči"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Veľké ústa"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Malé ústa"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Veľký nos"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Malé oči"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Vo vesmíre"</string>
     <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="1393338187462207584">"Zvoliť vlastné"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Umiestnite zariadenie na pevný povrch a uistite sa, že sa za vami nič nehýbe."\n\n"Potom ustúpte zo záberu fotoaparátu."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavenie nie je možné vybrať pri zapnutom efekte."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Počas nahrávania videa môžete fotiť klepnutím na obrazovku ukážky."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Vymazať efekty"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Bláznivé tváre"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Tlačidlo uzávierky"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Posledná fotografia"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Prepínač medzi prednou a zadnou kamerou"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Prepínač medzi panoramatickým režimom a režimami fotoaparátu a videokamery"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Prepínač medzi panoramatickým režimom a režimami fotoaparátu a videokamery"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Ďalšie ovládacie prvky nastavenia"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zavrieť ovládacie prvky nastavenia"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ovládanie priblíženia/oddialenia"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2c1ccec..32544c7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Napaka kamere"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Povezava s fotoaparatom ni mogoča."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Povezava s fotoaparatom ni mogoča."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Fotoaparat je onemogočen zaradi varnostnih pravilnikov."</string>
     <string name="camera_label" msgid="6346560772074764302">"Fotoaparat"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Kamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Slike fotoaparata"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Videoposnetki fotoaparata"</string>
     <string name="wait" msgid="8600187532323801552">"Počakajte ..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Vpnite pomnilnik USB pred uporabo kamere."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Vstavite kartico SD pred uporabo fotoaparata."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pred uporabo fotoaparata vpnite pomnilnik USB."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Pred uporabo fotoaparata vstavite kartico SD."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Pomnilnik USB je poln."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Kartica SD je polna."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Priprava pomnilnika USB ..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Do pomnilnika USB ni bilo mogoče dostopiti."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Do kartice SD ni bilo mogoče dostopiti."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Ponastavi na privzeto"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Nastavitve fotoaparata bodo obnovljene na privzete vrednosti."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavitve fotoaparata"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavitve kamere"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost slike"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 MB slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 MB slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 MB slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 milijona slikovnih pik"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 MB slikovnih pik"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 MB slikovnih pik"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 MB slikovnih pik"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 MB slikovnih pik"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 milijona slikovnih pik"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 MB slikovnih pik"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Način ostrenja"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Noč"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sončni zahod"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Stranka"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Tega ni mogoče izbrati v načinu prizora"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ni mogoče izbrati v načinu prizora."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Nastavitve fotoaparata"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Ponastavi na privzeto"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Osvetlitev"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Preklop na panoramo"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Skupna raba slike:"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Skupna raba videa:"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Ni slik za skupno rabo"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Ni videov za skupno rabo"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Prehitro"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Ni slik za deljenje z drugimi"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ni videoposnetkov za deljenje"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Prehitro"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Priprava panorame"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorame ni bilo mogoče shraniti"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panorame ni bilo mogoče shraniti."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Zajemanje panorame"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Shranjevanje ..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tapnite za ostrenje"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Snemanje panorame"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Shranjev. ..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Dotaknite se za ostrenje."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Učinki"</string>
     <string name="effect_none" msgid="3601545724573307541">"Brez"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Stiskanje"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Velike oči"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Velika usta"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Majhna usta"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Velik nos"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Majhne oči"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"V vesolju"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Velike oči"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Velika usta"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Majhna usta"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Velik nos"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Majhne oči"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"V vesolju"</string>
     <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="1393338187462207584">"Izberite svoje"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite napravo na stabilno površino in se prepričajte, da za vami ni gibanja."\n\n"Nato se umaknite iz prizora."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tega ni mogoče izbrati, ko je vklopljen učinek."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Če želite med snemanjem videa fotografirati, tapnite zaslon za predogled."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Počisti učinke"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Norčavi obrazi"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Gumb za fotografiranje"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Najnovejša fotografija"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Preklop med fotoaparatom na sprednji in na hrbtni strani"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Izbirnik fotoaparata, videokamere ali panorame"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Izbirnik fotoaparata, videokamere ali panorame"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Več kontrolnikov nastavitev"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Zapri kontrolnike nastavitev"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Nadzor povečave/pomanjšave"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e232d27..0696121 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Грешка камере"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Није могуће повезати се са камером."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Није могуће повезати се са камером."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камера је онемогућена због смерница за безбедност."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Камкордер"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Слике камере"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Видео снимци камере"</string>
     <string name="wait" msgid="8600187532323801552">"Сачекајте…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Прикључите USB меморију пре коришћења камере."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Уметните SD картицу да бисте могли да користите камеру."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Прикључите USB меморију пре коришћења камере."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Уметните SD картицу пре коришћења камере."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB меморија је пуна."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD картица је пуна."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Припрема USB меморије…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Није било могуће приступити USB меморији."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Није било могуће приступити SD картици."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Врати на подразумевано"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Биће враћена подразумевана подешавања камере."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Подешавања камере"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Подешавања камкордера"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Величина слике"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 M пиксела"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 мил пиксела"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 мил пиксела"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 мегапиксела"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 мил пиксела"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 мегапиксела"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 мил пиксела"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокуса"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ноћ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Залазак сунца"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Странка"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Ово не можете да изаберете у режиму за сцене"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Ово не може да се изабере у режиму сцене."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Подешавања камере"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Врати на подразумевано"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Видљивост"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Пребаци на панораму"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Дељење слика преко"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Дељење видео снимка преко"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Нема слике за дељење"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Нема видео снимка за дељење"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Пребрзо"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Нема слике за дељење."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Нема видео снимка за дељење."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Пребрзо"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Припремање панораме"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Чување панораме није успело"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Није могуће сачувати панораму."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Снимање панораме"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Чување..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Додирните за фокусирање"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Снимање панораме"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Чување..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Додирните за фокусирање."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Ефекти"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ништа"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Стисни"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Велике очи"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Велика уста"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Мала уста"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Велики нос"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Мале очи"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"У свемиру"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Велике очи"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Велика уста"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Мала уста"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Велики нос"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Мале очи"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"У свемиру"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Залазак сунца"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Изаберите свој"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Поставите уређај на стабилну површину и уверите се да се иза вас ништа не помера."\n\n"Затим изађите из кадра камере."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ово није могуће изабрати када је ефекат укључен."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Снимите слику током снимања видео снимка додиром на екран за преглед."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"Ово не може да се изабере када је ефекат укључен."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Снимите слику током снимања видео снимка додиром на екран прегледа."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Видео снимак је онемогућен када су специјални ефекти укључени."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Обриши ефекте"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Смешна лица"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Дугме затварача"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Најновија фотографија"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Промена предње и задње камере"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Бирач камере, видео снимка или панораме"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Бирач камере, видео снимка или панораме"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Још контрола подешавања"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Затвори контроле подешавања"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Контрола зума"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 02fe5c1..302e7f6 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamerafel"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Det går inte att ansluta till kameran."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Det går inte att ansluta till kameran."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kameran har inaktiverats på grund av gällande säkerhetspolicyer."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Videokamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kamerabilder"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kameravideor"</string>
     <string name="wait" msgid="8600187532323801552">"Vänta…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Sätt i USB-lagringsenheten innan du använder kameran."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Sätt i ett SD-kort innan du använder kameran."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Sätt i USB-lagringsenheten innan du använder kameran."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Sätt i ett SD-kort innan du använder kameran."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB-lagringsenheten är full."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Ditt SD-kort är fullt."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB-lagring förbereds…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Det gick inte att komma åt USB-enheten."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Det gick inte att öppna SD-kortet."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Återställ standardinställningar"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamerans standardinställningar återställs."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainställningar"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamerainställningar"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildstorlek"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 megapixlar"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M-bildpunkter"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 megapixlar"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 megapixlar"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 megapixlar"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 megapixlar"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusläge"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgång"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Fest"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Detta är inte valbart i skärmläge"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Inte valbart i scenläget."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kamerainställningar"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Återställ standardinställningar"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Exponering"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Byt till panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Dela bild via"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Dela video via"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Det finns ingen bild att dela"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Det finns ingen video att dela"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"För snabbt"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Det finns ingen bild att dela."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ingen video att dela."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"För snabbt"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Förbereder panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Det gick inte att spara panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Det gick inte att spara panoramabild."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama fotas"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Sparar …"</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Knacka lätt för fokus"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Ta panoramafoto"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Sparar ..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Fokusera genom att trycka."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekter"</string>
     <string name="effect_none" msgid="3601545724573307541">"Ingen"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Hopklämning"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Stora ögon"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Stor mun"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Liten mun"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Stor näsa"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Små ögon"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"I rymden"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Stora ögon"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Stor mun"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Liten mun"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Stor näsa"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Små ögon"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"I rymden"</string>
     <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="1393338187462207584">"Välj en egen"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Placera enheten på en stadig yta och se till att det är lugnt bakom dig."\n\n"Gå åt sidan så du inte syns på bilden."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Det går inte att välja detta när effekten är på."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Knacka lätt på skärmen om du vill fota under inspelningen."</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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Ta bort effekter"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Roliga grimaser"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Slutarknappen"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Senaste fotot"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Kameraläge framåt/bakåt"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Väljare för kamera, video och panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Väljare för kamera, video och panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Fler inställningskontroller"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Stäng inställningskontrollerna"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zoomkontroll"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index abcc475..1e82d90 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Hitilafu ya kamera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Haiwezi kuunganisha kwa kamera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Haiwezi kuungana na kamera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera imelemazwa kwa sababu ya sera za usalama."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Kamkoda"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Picha za kamera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Video za kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Tafadhali subiri…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Tafadhali weka h ifadhi ya USB kabla ya kutumia kamera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Tafadhali ingiza kadi ya SD kabla ya kutumia kamera"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Pachika hifadhi ya USB kabla ya kutumia kamera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Tafadhali chomeka kadi ya SD kabla ya kutumia kamera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Hifadhi yako ya USB imejaa."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Kadi yako ya SD imejaa"</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Inaandaa hifadhi ya USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Haikuweza kufikia hifadhi ya USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Haikuweza kufikia kadi ya SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Rejesha kwa chaguo-msingi"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Mipangilio ya kamera itarejeshwa kwa chaguo-msingi."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Mipangilio ya kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mipangilio ya kamkoda"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Ukubwa wa picha"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"Pikseli 5M"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"Pikseli 3M"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"Pikseli 2M"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"Pikseli 1.3M"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Pikseli 1M"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"Pikseli 5M"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"Pikseli 3M"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"Pikseli 2M"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"Pikseli 1.3M"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"Pikseli 1M"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Hali ya kulenga"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Usiku"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Machweo"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Karamu"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Hii haiwezi kuchaguliwa katika hali ya mandhari"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Haiwezi kuchaguliwa ikiwa katika hali-tumizi ya mandhari."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Mipangilio ya kamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Rejesha kwa chaguo misingi"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Mfichuo"</string>
@@ -92,42 +92,45 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Badili Mwonekano"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Shiriki picha kupitia"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Shiriki video kupitia"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Hakuna picha ya kushiriki"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Hakuna video ya kushiriki"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Haraka Zaidi"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Hakuna picha ya kugawa"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Hakuna video ya kugawa."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Haraka mno"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama inaandaliwa"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Imeshindwa kuhifadhi mandhari"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Haikuweza kuhifadhi Picha ya mandhari."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Mandhari"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Nasa Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Inahifadhi..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Gonga kuzingatia"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Piga Picha ya mandhari"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Inahifadhi…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Gusa ili kulenga."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Athari"</string>
     <string name="effect_none" msgid="3601545724573307541">"Hamna"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Finya"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Macho Makubwa"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Mdomo Mkubwa"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Mdomo Mdogo"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Pua Kubwa"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Macho Madogo"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Katika nafasi/ katika anga"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Macho Makubwa"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Mdomo Mkubwa"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Mdomo Mdogo"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"pua kubwa"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Macho Madogo"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Kwenya nafasi"</string>
     <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="1393338187462207584">"Chagua yako mwenyewe"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Weka kifaa chako sehemu imara isiyoyumba na hakikisha hakuna harakati zozote nyuma yako."\n" "\n" Kisha toka mbele ya kamera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hii haiwezi kuchagulika  wakati athari imewashwa."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Piga picha wakati video inarekodi kwa kugusa kwenye skrini ya onyesho la awali."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Athari Wazi"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Sura pumbavu"</string>
     <string name="effect_background" msgid="6909716214852487679">"Mandhari nyuma"</string>
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Kitufe cha kilango cha kamera"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Picha ya hivi karibuni"</string>
-    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Geuza kamera mbele na nyuma"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera, video au kichaguzi panorama"</string>
-    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Mipangilio zaidi ya kudhibiti"</string>
-    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Mipangilio ya karibu ya kufunga"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"Swichi ya mbele na nyuma ya kamera"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera, video au Picha ya mandhari"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Vidhibiti zaidi vya mpangilio"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Funga vidhibiti mipangilio"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Dhibiti kukuza"</string>
     <string name="accessibility_decrement" msgid="1411194318538035666">"Punguza %1$s"</string>
-    <string name="accessibility_increment" msgid="8447850530444401135">"KOngeza %1$s"</string>
-    <string name="accessibility_switch" msgid="6995966685498958895">"Geuza %1$s"</string>
+    <string name="accessibility_increment" msgid="8447850530444401135">"Ongeza %1$s"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"Swichi %1$s"</string>
 </resources>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-sw600dp/dimens.xml
similarity index 100%
rename from res/values-w1024dp/dimens.xml
rename to res/values-sw600dp/dimens.xml
diff --git a/res/values-w1024dp/styles.xml b/res/values-sw600dp/styles.xml
similarity index 73%
rename from res/values-w1024dp/styles.xml
rename to res/values-sw600dp/styles.xml
index 1e354e2..ed3f5da 100644
--- a/res/values-w1024dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -30,9 +30,13 @@
         <item name="android:background">@drawable/bg_pressed</item>
     </style>
     <style name="ReviewControlIcon">
-        <item name="android:layout_height">60dp</item>
-        <item name="android:layout_width">60dp</item>
+        <item name="android:layout_width">75dp</item>
+        <item name="android:layout_height">50dp</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>
@@ -56,7 +60,20 @@
         <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item>
         <item name="android:visibility">gone</item>
     </style>
+    <style name="PanoViewHorizontalBar">
+        <item name="android:background">#000000</item>
+        <item name="android:alpha">1.0</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">0.5</item>
+    </style>
     <style name="PanoCustomDialogText">
         <item name="android:textAppearance">@android:style/TextAppearance.Large</item>
     </style>
+    <style name="OneColumnGrid">
+        <item name="android:columnWidth">@dimen/share_item_width</item>
+        <item name="android:numColumns">1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
 </resources>
diff --git a/res/values-w1280dp/dimens.xml b/res/values-sw800dp/dimens.xml
similarity index 100%
rename from res/values-w1280dp/dimens.xml
rename to res/values-sw800dp/dimens.xml
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 59f3344..fa62881 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"ข้อผิดพลาดกล้องถ่ายรูป"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"ไม่สามารถเชื่อมต่อกับกล้องถ่ายรูป"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"ไม่สามารถเชื่อมต่อกับกล้องถ่ายรูป"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"กล้องถ่ายรูปถูกปิดใช้งานเนื่องจากนโยบายด้านความปลอดภัย"</string>
     <string name="camera_label" msgid="6346560772074764302">"กล้อง"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"กล้องวิดีโอ"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"ภาพจากกล้องถ่ายรูป"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"วิดีโอจากกล้องถ่ายรูป"</string>
     <string name="wait" msgid="8600187532323801552">"โปรดรอสักครู่..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"โปรดต่อเชื่อมที่เก็บข้อมูล USB ก่อนใช้กล้องถ่ายรูป"</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"โปรดใส่การ์ด SD ก่อนใช้กล้องถ่ายรูป"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"ต่อเชื่อมที่จัดเก็บข้อมูล USB ก่อนใช้กล้องถ่ายรูป"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"ใส่การ์ด SD ก่อนใช้กล้องถ่ายรูป"</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"ที่เก็บข้อมูล USB ของคุณเต็ม"</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"การ์ด SD ของคุณเต็ม"</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"กำลังเตรียมที่เก็บข้อมูล USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"ไม่สามารถเข้าถึงที่เก็บข้อมูล USB"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"ไม่สามารถเข้าถึงการ์ด SD"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"คืนค่าเริ่มต้น"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"การตั้งค่ากล้องถ่ายรูปจะถูกคืนค่าเริ่มต้น"</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"การตั้งค่ากล้องถ่ายรูป"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"การตั้งค่ากล้องวิดีโอ"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ขนาดของภาพ"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 ล้านพิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M พิกเซล"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3 ล้านพิกเซล"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"โหมดโฟกัส"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"กลางคืน"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"ดวงอาทิตย์ตก"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"งานเลี้ยง"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"ไม่สามารถเลือกได้ในโหมดสำเร็จรูป"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"ไม่สามารถเลือกได้ในโหมดสำเร็จรูป"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"การตั้งค่ากล้องถ่ายรูป"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"คืนค่าเริ่มต้น"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"การรับแสง"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"เปลี่ยนเป็นภาพมุมกว้าง"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"แบ่งปันภาพทาง"</string>
     <string name="share_video_via" msgid="5152302809166549015">"แบ่งปันวิดีโอทาง"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"ไม่มีภาพที่จะแบ่งปัน"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"ไม่มีวิดีโอที่จะแบ่งปัน"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"เร็วเกินไป"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"ไม่มีภาพที่จะแบ่งปัน"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"ไม่มีวิดีโอที่จะแบ่งปัน"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"เร็วเกินไป"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"กำลังสร้างพาโนรามา"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"ไม่สามารถบันทึกภาพพาโนรามา"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"ไม่สามารถบันทึกภาพพาโนรามา"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"พาโนรามา"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"กำลังจับภาพพาโนรามา"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"บันทึก..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"แตะเพื่อโฟกัส"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"กำลังจับภาพพาโนรามา"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"บันทึก..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"แตะเพื่อโฟกัส"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"เอฟเฟ็กต์"</string>
     <string name="effect_none" msgid="3601545724573307541">"ไม่มี"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"บีบ"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"ตาโต"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"ปากใหญ่"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"ปากเล็ก"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"จมูกใหญ่"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"ตาเล็ก"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"พื้นที่ว่าง"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"ตาโต"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"ปากใหญ่"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"ปากจู๋"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"จมูกโต"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"ตาเล็ก"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"พื้นที่ว่าง"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"พระอาทิตย์ตก"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"ดิสโก้"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"เลือกเอง"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"วางอุปกรณ์ของคุณบนพื้นผิวที่มั่นคงและแน่ใจว่าไม่มีการเคลื่อนไหวด้านหลังคุณ"\n\n"จากนั้นออกจากมุมมองของกล้อง"</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"เลือกการตั้งค่านี้ไม่ได้หากเปิดใช้เอฟเฟ็กต์อยู่"</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"ถ่ายภาพระหว่างการบันทึกวิดีโอโดยการแตะบนหน้าจอดูตัวอย่าง"</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"ไม่สามารถเลือกหากเปิดใช้เอฟเฟ็กต์อยู่"</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"ถ่ายภาพระหว่างการบันทึกวิดีโอโดยการแตะหน้าจอดูตัวอย่าง"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"การจับภาพวิดีโอจะถูกปิดใช้งานเมื่อเปิดใช้เอฟเฟ็กต์พิเศษ"</string>
     <string name="clear_effects" msgid="5485339175014139481">"ล้างเอฟเฟ็กต์"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"หน้าตลก"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"ปุ่มชัตเตอร์"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"ภาพล่าสุด"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"สลับระหว่างกล้องด้านหน้าและด้านหลัง"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"ตัวเลือกกล้องถ่ายรูป วิดีโอ หรือภาพพาโนรามา"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"ตัวเลือกกล้องถ่ายรูป วิดีโอ หรือภาพพาโนรามา"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"การควบคุมการตั้งค่าเพิ่มเติม"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"ปิดการควบคุมการตั้งค่า"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"การควบคุมการย่อ/ขยาย"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e6b5a1b..492ad63 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Error sa kamera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Hindi makakonekta sa kamera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Hindi makakonekta sa camera."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Hindi na pinagana ang camera dahil sa mga patakaran sa seguridad."</string>
     <string name="camera_label" msgid="6346560772074764302">"Camera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Camcorder"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Mga larawan sa camera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Mga video sa kamera"</string>
     <string name="wait" msgid="8600187532323801552">"Pakihintay…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Paki-mount ang imbakan na USB bago gamitin ang camera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Mangyaring magpasok ng SD card bago gamitin ang camera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"I-mount ang USB storage bago gamitin ang camera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Magpasok ng isang SD card bago gamitin ang camera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Puno na ang iyong imbakan na USB."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Puno ang iyong SD card."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Ihinahanda imbakan na USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Hindi ma-access ang USB storage."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Hindi ma-access ang SD card."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Ibalik ang mga default"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Ibabalik ang mga setting ng kamera sa mga default."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Mga setting ng kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mga setting ng camcorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Laki ng larawan"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Pixels"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1.3M Pixel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixels"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M pixels"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M pixels"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M pixels"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Focus mode"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gabi"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Paglubog ng araw"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Partido"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Ito ay hindi maaaring piliin sa scene mode"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Hindi mapipili sa mode ng scene."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Mga setting ng kamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Ibalik ang Mga default"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Pagkakalantad"</string>
@@ -92,30 +92,30 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Lumipat sa panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Ibahagi ang larawan gamit ang"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Ibahagi ang video gamit ang"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Walang larawang ibabahagi"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Walang video na ibabahagi"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Msyado Bilis"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Walang ibabahaging larawan."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Walang ibabahaging video."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Masyadong mabilis"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Ihinahanda ang panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Nabigong i-save ang panorama"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Hindi ma-save ang panorama."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Kinukunan ang Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Sine-save..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Tapikin upang ituon"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Kinukunan ang panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Sine-save…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Pindutin upang tumuon."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Mga Effect"</string>
     <string name="effect_none" msgid="3601545724573307541">"Wala"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Squeeze"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Malaking Mata"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Malaking Bibig"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Maliit Bibig"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Malaking Ilong"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Maliit na Mata"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Sa Kalawakan"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Malalaking mata"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Malaking bibig"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Maliit na bibig"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Malaking ilong"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Maliliit na mata"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Sa kalawakan"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Paglubog ng araw"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disco"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Pumili ng sa iyo"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Ipatong ang iyong device sa isang matatag na bagay at tiyaking walang kumikilos sa iyong likuran."\n\n"Pagkatapos ay umalis sa view ng camera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hindi ito napipili kapag naka-on ang effect."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Kumuha ng larawan habang nagre-record ng video sa pamamagitan ng pagtapik sa screen ng preview."</string>
+    <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Pumili ng sarili mo"</string>
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Huwag munang gamitin ang iyong device"\n"Umalis muna nang ilang sandali"</string>
+    <string name="not_selectable_in_effect" msgid="7967729203855039239">"Hindi mapipili kapag naka-on ang effect."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Kumuha ng isang larawan habang nagre-record ng video sa pamamagitan ng pagpindot sa screen ng preview."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Hindi pinapagana ang snapshot sa video kapag naka-on ang mga espesyal na effect."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Mga clear na effect"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Mga katawa-tawang mukha"</string>
@@ -123,7 +123,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Button ng shutter"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Pinakakamakailang larawan"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Switch ng camera sa harap at likod"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Tagapili ng camera, video o panorama"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Tagapili ng camera, video, o panorama"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Higit pang mga kontrol ng setting"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Isara ang mga kontrol ng setting"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Kontrol ng pag-zoom"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e15728c..82826d3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Kamera hatası"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Kamera bağlantısı yapılamıyor."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Kameraya bağlanılamıyor."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Kamera, güvenlik politikaları nedeniyle devre dışı bırakıldı."</string>
     <string name="camera_label" msgid="6346560772074764302">"Kamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Video Kamera"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Kamera resimleri"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Kamera videoları"</string>
     <string name="wait" msgid="8600187532323801552">"Lütfen bekleyin..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Lütfen kamerayı kullanmadan önce USB depolama birimini ekleyin."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Kamerayı kullanmadan önce lütfen bir SD kart takın."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kamerayı kullanmadan önce USB depolama birimini ekleyin."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Kamerayı kullanmadan önce bir SD kart takın."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"USB depolama biriminiz dolu."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD kartınız dolu."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"USB deplm birimi hazırlanıyor…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB depolama birimine erişilemedi."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD karta erişilemedi."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Varsayılanları geri yükle"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Kamera ayarlarının varsayılan değerleri geri yüklenecek."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera ayarları"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Kamera ayarları"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Resim boyutu"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3M Piksel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Piksel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M piksel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3M piksel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M piksel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Odak modu"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Gece"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Gün batımı"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Parti"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Bu ayar, sahne modunda seçilemez"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Sahne modunda seçilemez."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Kamera ayarları"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Varsayılanları geri yükle"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Pozlama"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Panorama moduna geç"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Resmi şunun üzerinden paylaş:"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Videoyu şunun üzerndn  paylaş:"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Paylaşılacak resim yok"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Paylaşılacak video yok"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Çok Hızlı"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Paylaşılacak resim yok."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Paylaşılacak video yok."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Çok hızlı"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama hazırlanıyor"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama kaydedilemedi"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Panorama kaydedilemedi."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama kaydediliyor"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Kaydediliyor..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Odaklmk içn hafifç vurun"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Panorama kaydediliyor"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Kaydediliyor..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Odaklamak için dokunun."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Efektler"</string>
     <string name="effect_none" msgid="3601545724573307541">"Yok"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Sıkıştır"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Büyük Gözler"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Büyük Ağız"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Küçük Ağız"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Büyük Burun"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Küçük Gözler"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Uzayda"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Büyük gözler"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Büyük ağız"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Küçük ağız"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Büyük burun"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Küçük gözler"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Uzayda"</string>
     <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="1393338187462207584">"Kendiniz seçin"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Cihazınızı sabit bir yüzeye yerleştirin ve arkanızda hiçbir hareket olmadığından emin olun."\n\n"Sonra kameranın görüş alanından çıkın."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Efekt açıkken bu ayar seçilemez."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Video kaydında önizleme ekranına hafifçe vurarak fotoğraf çekin."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Efektleri temizle"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Komik suratlar"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Deklanşör düğmesi"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"En son fotoğraf"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Ön/arka kamera anahtarı"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Kamera, video veya panorama seçici"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Kamera, video veya panorama seçici"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Diğer ayar denetimleri"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Ayar denetimlerini kapat"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Zum denetimi"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 063fef5..cb49d57 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Помилка камери"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Підключ. до камери неможл."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Неможливо підключитися до камери."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Камеру вимкнено відповідно до правил безпеки."</string>
     <string name="camera_label" msgid="6346560772074764302">"Камера"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Відеокамера"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Фото з камери"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Відео з камери"</string>
     <string name="wait" msgid="8600187532323801552">"Зачекайте…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Підключіть носій USB перед тим, як користуватися камерою."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Вставте карту SD перед тим, як користув. камерою."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Підключіть носій USB перед тим, як користуватися камерою."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Вставте карту SD перед тим, як користуватися камерою."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Носій USB заповнено."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Карту SD заповнено."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Підготовка носія USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Не вдалося отримати доступ до носія USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Не вдалося отримати доступ до карти SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Знач-ня за умовч."</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Налашт. камери буде відновлено до стандартних."</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Налашт-ня камери"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Налашт-ня відеокамери"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Розмір фото"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 Мпікс"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 Мпікс"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 Мпікс"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3 Mпікс"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Мпікс"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 Мпікс"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 Мпікс"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 Мпікс"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 Mпікс"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 Мпікс"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокусу"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ніч"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Захід сонця"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"У приміщенні"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Не можна вибирати в режимі зйомки"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Неможливо вибрати в режимі зйомки."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Налашт-ня камери"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Налашт. за умовч."</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Експозиція"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Перейти в режим панорами"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Надіслати фото через"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Надіслати відео через"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Немає знімків для надсилання"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Немає відео для надсилання"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Зашвидко"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Немає знімків для надсилання."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Немає відео для надсилання."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Зашвидко"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Підготовка панорами"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Не вдалося зберегти панораму"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Не вдалося зберегти панораму."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Панорама"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Панорамна зйомка"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Збереження..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Торкніться, щоб фокусув."</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Панорамна зйомка"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Збереження..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Торкніться, щоб фокусувати."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Ефекти"</string>
     <string name="effect_none" msgid="3601545724573307541">"Немає"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Стиснення"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Великі очі"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Великий рот"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Маленький рот"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Великий ніс"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Маленькі очі"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"У космосі"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Великі очі"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Великий рот"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Маленький рот"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Великий ніс"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Маленькі очі"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"У космосі"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Захід сонця"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"Диско"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Власний варіант"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Покладіть свій пристрій на нерухому поверхню та переконайтеся, що за вами немає жодного руху."\n\n"Потім вийдіть із поля зору камери."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Це не можна вибрати, якщо ввімкнено ефект."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Зробіть фото під час відеозйомки, торкнувшись екрана перегляду."</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"Неможливо вибрати, якщо ввімкнено ефект."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Зробіть фото під час відеозйомки, торкнувшись екрана перегляду."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Функцію миттєвого знімка відео вимкнено, коли ввімк. спецефекти."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Очистити ефекти"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Кумедні обличчя"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Кнопка \"Витримка\""</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Останні фото"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Перемикач між передньою та задньою камерами"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Перемикач фото, відео чи панорами"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Перемикач фото, відео чи панорами"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Інші елементи керування налаштуваннями"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Закрити елементи керування налаштуваннями"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Керувати масштабом"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 6ede70f..f4ec404 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Lỗi máy ảnh"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Không thể kết nối với máy ảnh."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Không thể kết nối với máy ảnh."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Máy ảnh đã bị tắt do chính sách bảo mật."</string>
     <string name="camera_label" msgid="6346560772074764302">"Máy ảnh"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Máy quay video"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Ảnh từ máy ảnh"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Video của máy ảnh"</string>
     <string name="wait" msgid="8600187532323801552">"Vui lòng đợi..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Vui lòng kết nối bộ nhớ USB trước khi sử dụng máy ảnh."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Vui lòng lắp thẻ SD trước khi sử dụng máy ảnh."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Kết nối bộ nhớ USB trước khi sử dụng máy ảnh."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Lắp thẻ SD trước khi sử dụng máy ảnh."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Bộ nhớ USB đầy."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Thẻ SD của bạn đã đầy."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Đang chuẩn bị bộ nhớ USB…"</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Không thể truy cập bộ nhớ USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Không thể truy cập thẻ SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Khôi phục mặc định"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Cài đặt máy ảnh sẽ được khôi phục về mặc định."</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Cài đặt máy ảnh"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Cài đặt máy quay video"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Kích thước ảnh"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5M Pixel"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3M Pixel"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2M Pixel"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"1,3M Pixel"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixel"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M pixel"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M pixel"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M pixel"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3M pixel"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M pixel"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Chế độ tiêu điểm"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ban đêm"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Hoàng hôn"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Đảng"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Không thể chọn trong chế độ cảnh"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Không thể chọn trong chế độ cảnh."</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Cài đặt máy ảnh"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Khôi phục mặc định"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Phơi sáng"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Chuyển sang chế độ toàn cảnh"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Chia sẻ ảnh qua"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Chia sẻ video qua"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Không có ảnh nào để chia sẻ"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Không có video nào để chia sẻ"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Quá nhanh"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Không có ảnh nào để chia sẻ."</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Không có video nào để chia sẻ."</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Quá nhanh"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Đang tạo xem trước toàn cảnh"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Không thể lưu toàn cảnh"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Không thể lưu toàn cảnh."</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"Toàn cảnh"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Đang chụp toàn cảnh"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Đang lưu..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Chạm để lấy tiêu điểm"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Đang chụp toàn cảnh"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Đang lưu…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Chạm để lấy tiêu cự."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Hiệu ứng"</string>
     <string name="effect_none" msgid="3601545724573307541">"Bỏ chọn tất cả"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Xoa"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Đôi mắt to"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Miệng lớn"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Miệng nhỏ"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Mũi to"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Đôi mắt nhỏ"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Trong dấu cách"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Đôi mắt to"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Miệng lớn"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Miệng nhỏ"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Mũi to"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Đôi mắt nhỏ"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Trong vũ trụ"</string>
     <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="1393338187462207584">"Chọn video của riêng bạn"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Đặt thiết bị của bạn lên bề mặt chắc chắn và đảm bảo không có chuyển động nào phía sau bạn."\n\n"Sau đó, thoát khỏi chế độ xem của máy ảnh."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Không thể chọn cài đặt này khi hiệu ứng này bật."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Chụp ảnh khi đang quay video bằng cách bấm vào màn hình xem trước."</string>
+    <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="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>
     <string name="clear_effects" msgid="5485339175014139481">"Xóa hiệu ứng"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Khuôn mặt ngớ ngẩn"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Nút chụp"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Ảnh gần đây nhất"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Chuyển đổi giữa máy ảnh trước và sau"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Bộ chọn chế độ máy ảnh, video hoặc toàn cảnh"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Bộ chọn chế độ máy ảnh, video hoặc toàn cảnh"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Kiểm soát cài đặt khác"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Đóng kiểm soát cài đặt"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"Điều khiển thu phóng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 68a1a98..f11ed0f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"相机故障"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"无法连接到相机。"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"无法连接到相机。"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"由于安全政策的限制，相机已被停用。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相机"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"摄像机"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"用相机拍摄的照片"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"用相机拍摄的视频"</string>
     <string name="wait" msgid="8600187532323801552">"请稍候..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"请先装载 USB 存储设备，再使用相机。"</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"使用相机前请先插入 SD 卡。"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"使用相机前请先装载 USB 存储设备。"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"使用相机前请先插入 SD 卡。"</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"您的 USB 存储设备空间已满。"</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD 卡已满。"</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"正在准备 USB 存储设备..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"无法访问 USB 存储设备。"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"无法访问 SD 卡。"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"还原默认设置"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"相机设置将还原为默认值。"</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片大小"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 百万像素"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 百万像素"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 百万像素"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"130 万像素"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 百万像素"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 百万像素"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 百万像素"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 百万像素"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"130 万像素"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 百万像素"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"对焦方式"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"日落"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"派对"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"此设置在取景模式下不可选"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"无法在取景模式下选择。"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"相机设置"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"还原默认设置"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"切换到全景"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"照片分享方式"</string>
     <string name="share_video_via" msgid="5152302809166549015">"视频分享方式"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"无照片可分享"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"无视频可分享"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"太快"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"无照片可分享。"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"无视频可分享。"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"过快"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"正在生成全景图"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"保存全景图失败"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"无法保存全景照片。"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"全景图"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"正在拍摄全景图"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"正在保存..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"点按即可对焦"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"正在拍摄全景照片"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"正在保存..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"触摸对焦。"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"效果"</string>
     <string name="effect_none" msgid="3601545724573307541">"无"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"面部哈哈镜"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"大眼睛"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"大嘴巴"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"小嘴巴"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"大鼻子"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"小眼睛"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"太空背景"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"大眼睛"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"大嘴巴"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"小嘴巴"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"大鼻子"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"小眼睛"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"太空背景"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"日落"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"迪斯科"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"自选背景"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"将您的设备放置在一个平稳的表面上，并确保您的身后没有任何移动的物体。"\n\n"然后走出摄像头的取景范围。"</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"无法在效果开启时选择此设置。"</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"录制视频时点按预览屏幕可拍摄照片。"</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"无法在启用该效果时选择。"</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"录制视频时触摸预览屏幕可拍照。"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"启用特殊效果时停用视频快照。"</string>
     <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"趣味表情"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"“快门”按钮"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"最新照片"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"前视和后视相机开关"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"相机、视频或全景模式选择器"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"相机、视频或全景模式选择器"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"更多设置控件"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"关闭设置控件"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"缩放控件"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b5be62f..100bf5d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"相機發生錯誤"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"無法連接相機。"</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"無法連接相機。"</string>
     <string name="camera_disabled" msgid="8923911090533439312">"由於安全性政策規定，相機已遭停用。"</string>
     <string name="camera_label" msgid="6346560772074764302">"相機"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"攝錄影機"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"相機圖片"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"相機影片"</string>
     <string name="wait" msgid="8600187532323801552">"請稍候…"</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"使用相機前，請先掛接 USB 儲存裝置。"</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"使用相機前請先插入 SD 卡。"</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"使用相機前，請先插入 USB 儲存裝置。"</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"使用相機前，請先插入 SD 卡。"</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"您的 USB 儲存裝置已滿。"</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"SD 卡已滿。"</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"正在準備 USB 儲存裝置..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"無法存取 USB 儲存裝置。"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"無法存取 SD 卡。"</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"還原預設值"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"相機設定即將還原成預設值。"</string>
+    <string name="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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相機設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"攝錄影機設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"相片大小"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 百萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"130 萬像素"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 百萬像素"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"130 萬像素"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"對焦模式"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"黃昏"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"派對模式"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"無法在場景模式下選取此設定"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"在場景模式中無法選取。"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"相機設定"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"還原預設值"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
@@ -92,30 +92,33 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"切換至全景模式"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"相片分享方式"</string>
     <string name="share_video_via" msgid="5152302809166549015">"影片分享方式"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"沒有可分享的相片"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"沒有可分享的影片"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"速度過快"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"沒有可供分享的相片。"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"沒有可供分享的影片。"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"速度過快"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"正在準備全景預覽"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"無法儲存全景"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"無法儲存全景。"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"全景"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"全景拍攝中"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"儲存中..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"輕按即可聚焦"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"全景拍攝中"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"儲存中..."</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"輕觸即可對焦。"</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"效果"</string>
     <string name="effect_none" msgid="3601545724573307541">"無"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"擠眉弄眼"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"大眼睛"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"大嘴巴"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"小嘴巴"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"大鼻子"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"小眼睛"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"太空"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"大眼睛"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"大嘴巴"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"小嘴巴"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"大鼻子"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"小眼睛"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"太空"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"黃昏"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"迪斯可"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"自行挑選"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"將您的裝置放在平穩的表面上，確定自己身後沒有移動的物體。"\n\n"然後離開相機鏡頭的視野範圍。"</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"效果啟用時無法選取這項設定。"</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"影片錄製期間，只要輕按預覽畫面即可拍攝相片。"</string>
+    <string name="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="not_selectable_in_effect" msgid="7967729203855039239">"效果啟用時無法選取。"</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"影片錄製期間，只要輕觸預覽畫面即可拍攝相片。"</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"特殊效果啟用時無法使用影片快照。"</string>
     <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"耍笨臉"</string>
@@ -123,7 +126,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"[快門] 按鈕"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"最近的相片"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"前置和後置鏡頭開關"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"相機、影片或全景選取工具"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"相機、影片或全景選取工具"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"更多設定控制"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"關閉設定控制"</string>
     <string name="accessibility_zoom_control" msgid="1339909363226825709">"縮放控制"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index fbf3132..0cb23c2 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -17,15 +17,15 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="camera_error_title" msgid="6484667504938477337">"Iphutha lekhamera"</string>
-    <string name="cannot_connect_camera" msgid="8029009101380114174">"Ayikwazi ukuxhuma kwikhamera."</string>
+    <string name="cannot_connect_camera" msgid="955440687597185163">"Ayikwazi ukuxhuma ekhamereni."</string>
     <string name="camera_disabled" msgid="8923911090533439312">"Ikhamera inqunyiwe ngenxa yepolisi yezokuphepha."</string>
     <string name="camera_label" msgid="6346560772074764302">"Ikhamera"</string>
     <string name="video_camera_label" msgid="2899292505526427293">"Ikhamera enerekhoda"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Izithombe zekhamera"</string>
     <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Amavidiyo ekhamera"</string>
     <string name="wait" msgid="8600187532323801552">"Sicela ulinde..."</string>
-    <string name="no_storage" product="nosdcard" msgid="5876548364041592119">"Sicela ukhweze isitoreji se-USB ngaphambi kokusebenzisa ikhamera."</string>
-    <string name="no_storage" product="default" msgid="820691042667338625">"Sicela ufake ikhadi le-SD ngaphambi kokusebenzisa ikhamera."</string>
+    <string name="no_storage" product="nosdcard" msgid="7335975356349008814">"Sicela ukhweze isitoreji se-USB ngaphambi kokusebenzisa ikhamera."</string>
+    <string name="no_storage" product="default" msgid="5137703033746873624">"Sicela ufake ikhadi le-SD ngaphambi kokusebenzisa ikhamera."</string>
     <string name="not_enough_space" product="nosdcard" msgid="6452370395538050134">"Isitoreji se-USB sigcwele"</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"Ikhadi lakho le-SD ligcwele."</string>
     <string name="preparing_sd" product="nosdcard" msgid="6104019983528341353">"Ilungiselela isitoreji se-USB..."</string>
@@ -33,7 +33,7 @@
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"Yehlulekile ukufinyelela kwindawo egcina i-USB."</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"Yehlukekile ukufinyelela kwikhadi le-SD."</string>
     <string name="confirm_restore_title" msgid="1229914538263792180">"Buyisela esimweni okuzenzakalelayo"</string>
-    <string name="confirm_restore_message" msgid="5239464943578877295">"Izilungiselelo zekhamera zibuyiselwa kokuzenzakalelayo"</string>
+    <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>
@@ -52,11 +52,11 @@
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Izilungiselelo zekhamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Izilungiselelo zekhamera enerekhoda"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Usayizi wesithombe"</string>
-    <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"Amaphikseli angu-5"</string>
-    <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"Amaphikseli e-3M"</string>
-    <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"Amaphikseli e-2M"</string>
-    <string name="pref_camera_picturesize_entry_1280x960" msgid="1648390393603363042">"Amaphikseli e-1.3M"</string>
-    <string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Amaphikseli e-IM"</string>
+    <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5M Amaphikseli"</string>
+    <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M Amaphikseli"</string>
+    <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M Amaphikseli"</string>
+    <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"Amaphikseli e-1.3M"</string>
+    <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M Amaphikseli"</string>
     <string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"i-VGA"</string>
     <string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"i-QVGA"</string>
     <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Imodi yefokhasi"</string>
@@ -79,7 +79,7 @@
     <string name="pref_camera_scenemode_entry_night" msgid="7606898503102476329">"Ebusuku"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ukushona kwelanga"</string>
     <string name="pref_camera_scenemode_entry_party" msgid="907053529286788253">"Inhlangano"</string>
-    <string name="not_selectable_in_scene_mode" msgid="2345574961174762643">"Lokhu akukhetheki kwimodi yesiqephu"</string>
+    <string name="not_selectable_in_scene_mode" msgid="2970291701448555126">"Akukhetheki esimweni sokubuka"</string>
     <string name="pref_restore_title" msgid="6479274979730178961">"Izilungiselelo zekhamera"</string>
     <string name="pref_restore_detail" msgid="5732490002291044791">"Buyisela esimeni okumisiwe"</string>
     <string name="pref_exposure_title" msgid="1229093066434614811">"Isibonelelo"</string>
@@ -92,30 +92,30 @@
     <string name="switch_to_panorama_label" msgid="858801335653517864">"Shintshela kwi-panorama"</string>
     <string name="share_picture_via" msgid="1375127849431890447">"Yabelana ngesithombe nge"</string>
     <string name="share_video_via" msgid="5152302809166549015">"Yabelana ngevidiyo nge"</string>
-    <string name="no_picture_to_share" msgid="7700541451734517445">"Asikho isithombe sokwabelana"</string>
-    <string name="no_video_to_share" msgid="3775826212074938990">"Ayikho ividiyo yokwabelana ngayo"</string>
-    <string name="pano_too_fast_prompt" msgid="3893565956616588385">"Ishesha Kakhulu"</string>
+    <string name="no_picture_to_share" msgid="5352574090121328815">"Asikho isithombe sokwabelana"</string>
+    <string name="no_video_to_share" msgid="7567298642707627096">"Ayikho ividiyo yokwabelana ngayo"</string>
+    <string name="pano_too_fast_prompt" msgid="2823839093291374709">"Ishesha Kakhulu"</string>
     <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Ilungiselela i-panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Ihlulekile ukulondoloza i-Panaroma"</string>
+    <string name="pano_dialog_panorama_failed" msgid="2155692796549642116">"Yehlulekile ukulondoloza i-panaroma"</string>
     <string name="pano_dialog_title" msgid="5755531234434437697">"I-Panorama"</string>
-    <string name="pano_capture_indication" msgid="7431983072966619171">"Ilondoloza i-Panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Iyalondoloza..."</string>
-    <string name="tap_to_focus" msgid="6417403734418828035">"Thepha ukuze uqondanise"</string>
+    <string name="pano_capture_indication" msgid="8248825828264374507">"Ilondoloza i-Panorama"</string>
+    <string name="pano_review_saving_indication_str" msgid="2054886016665130188">"Iyalondoloza…"</string>
+    <string name="tap_to_focus" msgid="8863427645591903760">"Thinta ukuze kume kahle isithombe."</string>
     <string name="pref_video_effect_title" msgid="8243182968457289488">"Imithelela"</string>
     <string name="effect_none" msgid="3601545724573307541">"Lutho"</string>
     <string name="effect_goofy_face_squeeze" msgid="1207235692524289171">"Shutheka"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="1942377617761116861">"Amehlo amakhulu"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2342636750478741367">"Umlomo Omkhulu"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="4424498213697804087">"Umlomo Omncane"</string>
-    <string name="effect_goofy_face_big_nose" msgid="5738964679340745774">"Ikhala Elikhulu"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="8007886544327361111">"Amehlo Amancane"</string>
-    <string name="effect_backdropper_space" msgid="1381012939195370792">"Eskhaleni"</string>
+    <string name="effect_goofy_face_big_eyes" msgid="3945182409691408412">"Amehlo amakhulu"</string>
+    <string name="effect_goofy_face_big_mouth" msgid="7528748779754643144">"Umlomo Omkhulu"</string>
+    <string name="effect_goofy_face_small_mouth" msgid="3848209817806932565">"Umlomo Omncane"</string>
+    <string name="effect_goofy_face_big_nose" msgid="5180533098740577137">"Ikhala Elikhulu"</string>
+    <string name="effect_goofy_face_small_eyes" msgid="1070355596290331271">"Amehlo Amancane"</string>
+    <string name="effect_backdropper_space" msgid="7935661090723068402">"Eskhaleni"</string>
     <string name="effect_backdropper_sunset" msgid="45198943771777870">"Ukushona kwelanga"</string>
     <string name="effect_backdropper_disco" msgid="8494822051982972854">"i-Disco!"</string>
-    <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Khetha eyakho"</string>
-    <string name="bg_replacement_message" msgid="7540788298745332389">"Beka i-device yakho endaweni enganyakazi bese uqinisekisa ukuthi akukho ukunyakaza ngemuva kwakho."\n\n"Bese usuka lapho kubheke khona ikhamera."</string>
-    <string name="not_selectable_in_effect" msgid="5093306709878914151">"Lokhu akukhetheki uma isinandisi sisavulekile."</string>
-    <string name="video_snapshot_hint" msgid="6479115859014094906">"Thatha isithombe ngesikhathi sokuqoshwa kwevidyo ngokuchofoza eskrinini sokubuka ngaphambili kokudlala."</string>
+    <string name="effect_backdropper_gallery" msgid="3271387403091819540">"Khetha okwakho"</string>
+    <string name="bg_replacement_message" msgid="6828585054971662284">"Setha idivayisi yakho iyephansi"\n"Phuma kancane ekubukeni"</string>
+    <string name="not_selectable_in_effect" msgid="7967729203855039239">"Lokhu akukhetheki uma isinandisi sisavulekile."</string>
+    <string name="video_snapshot_hint" msgid="8159602664271448241">"Thatha isithombe ngesikhathi sokuqoshwa kwevidyo ngokuchofoza eskrinini sokubuka ngaphambili kokudlala."</string>
     <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Umfanekiso wevidyo awusebenzi uma izinandisi ezikhethekile zivuliwe."</string>
     <string name="clear_effects" msgid="5485339175014139481">"Izinandisi ezicacile"</string>
     <string name="effect_silly_faces" msgid="3214174716769421248">"Ubuso obungasile"</string>
@@ -123,11 +123,11 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"Inkinobho Yokuvala"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"Isithombe sakamuva"</string>
     <string name="accessibility_camera_picker" msgid="8807945470215734566">"Iswishi yekhamera yangaphambili kanye nangemuva"</string>
-    <string name="accessibility_mode_picker" msgid="3264968460835265505">"Ikhamera, ividiyo noma ukhetho lwe-panorama"</string>
-    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Okunye ukulawula kokuhlela"</string>
-    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Vala ukulawula kokuhlela"</string>
-    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ukulawula i-Zumu"</string>
+    <string name="accessibility_mode_picker" msgid="3278002189966833100">"Ikhamera, ividiyo noma ukhetho lwe-panorama"</string>
+    <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"Izilawuli zezilungiselelo ezingaphezulu"</string>
+    <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"Vala izilawulo zezilungiso"</string>
+    <string name="accessibility_zoom_control" msgid="1339909363226825709">"Ulawulo lokulwiza"</string>
     <string name="accessibility_decrement" msgid="1411194318538035666">"Nciphisa %1$s"</string>
     <string name="accessibility_increment" msgid="8447850530444401135">"Yandisa %1$s"</string>
-    <string name="accessibility_switch" msgid="6995966685498958895">"%1$s iswishi"</string>
+    <string name="accessibility_switch" msgid="6995966685498958895">"inkinobho ye-%1$s"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d5bf75f..e258ad2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -33,9 +33,9 @@
     </string-array>
 
     <array name="video_quality_largeicons" translatable="false">
-        <item>@drawable/ic_viewfinder_video_quality_1080p</item>
-        <item>@drawable/ic_viewfinder_video_quality_720p</item>
-        <item>@drawable/ic_viewfinder_video_quality_480p</item>
+        <item>@drawable/ic_quality_1080p</item>
+        <item>@drawable/ic_quality_720p</item>
+        <item>@drawable/ic_quality_480p</item>
     </array>
 
     <!-- Video Preferences Time Lapse Frame Interval icons -->
@@ -294,4 +294,10 @@
         <item>@drawable/ic_video_effects_background_disco_holo</item>
         <item>@drawable/ic_video_effects_background_normal_holo_dark</item>
     </array>
+
+    <!-- Default focus mode setting.-->
+    <string-array name="pref_camera_focusmode_default_array" translatable="false">
+        <item>continuous-picture</item>
+        <item>auto</item>
+    </string-array>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 567d205..b6b272a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -19,7 +19,7 @@
     </declare-styleable>
     <declare-styleable name="ListPreference">
         <attr name="key" format="string" />
-        <attr name="defaultValue" format="string" />
+        <attr name="defaultValue" format="string|reference" />
         <attr name="entryValues" format="reference" />
         <attr name="entries" format="reference" />
     </declare-styleable>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6b3b279..9618ae1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,7 +41,7 @@
     <dimen name="setting_item_list_margin">14dp</dimen>
     <dimen name="indicator_bar_width">48dp</dimen>
     <dimen name="popup_title_text_size">22dp</dimen>
-    <dimen name="popup_title_frame_min_height">60dp</dimen>
+    <dimen name="popup_title_frame_min_height">49dp</dimen>
     <dimen name="big_setting_popup_window_width">320dp</dimen>
     <dimen name="setting_item_icon_width">28dp</dimen>
     <dimen name="effect_setting_item_icon_width">40dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7cc61f4..d1cde99 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="camera_error_title">Camera error</string>
 
     <!-- message for the dialog showing the error of camera hardware -->
-    <string name="cannot_connect_camera">Cannot connect to camera.</string>
+    <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
 
     <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
     <string name="camera_disabled">Camera has been disabled because of security policies.</string>
@@ -41,9 +41,9 @@
     <string name="wait">Please wait\u2026</string>
 
     <!-- alert to the user that USB storage must be available before using the camera [CHAR LIMIT=NONE] -->
-    <string name="no_storage" product="nosdcard">Please mount USB storage before using the camera.</string>
+    <string name="no_storage" product="nosdcard">Mount USB storage before using the camera.</string>
     <!-- alert to the user that an SD card must be installed before using the camera -->
-    <string name="no_storage" product="default">Please insert an SD card before using the camera.</string>
+    <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
 
     <!-- alert to the user that the USB storage is too full to complete the operation [CHAR LIMIT=NONE] -->
     <string name="not_enough_space" product="nosdcard">Your USB storage is full.</string>
@@ -62,7 +62,7 @@
 
     <!-- Confirmation dialog when restoring settings -->
     <string name="confirm_restore_title">Restore defaults</string>
-    <string name="confirm_restore_message">Camera settings will be restored to defaults.</string>
+    <string name="confirm_restore_message">Restore Camera default settings?</string>
 
     <!-- button in review mode indicating that the video just taken should be played [CHAR LIMIT=10] -->
     <string name="review_play">Play</string>
@@ -138,17 +138,14 @@
     <string name="pref_camera_picturesize_title">Picture size</string>
 
     <!-- Settings screen, Picture size dialog radio button choices -->
-    <string name="pref_camera_picturesize_entry_2592x1936">5M Pixels</string>
-    <string name="pref_camera_picturesize_entry_2048x1536">3M Pixels</string>
-    <string name="pref_camera_picturesize_entry_1600x1200">2M Pixels</string>
-    <string name="pref_camera_picturesize_entry_1280x960">1.3M Pixels</string>
-    <string name="pref_camera_picturesize_entry_1024x768">1M Pixels</string>
+    <string name="pref_camera_picturesize_entry_2592x1936">5M pixels</string>
+    <string name="pref_camera_picturesize_entry_2048x1536">3M pixels</string>
+    <string name="pref_camera_picturesize_entry_1600x1200">2M pixels</string>
+    <string name="pref_camera_picturesize_entry_1280x960">1.3M pixels</string>
+    <string name="pref_camera_picturesize_entry_1024x768">1M pixels</string>
     <string name="pref_camera_picturesize_entry_640x480">VGA</string>
     <string name="pref_camera_picturesize_entry_320x240">QVGA</string>
 
-    <!-- Default focus mode setting.-->
-    <string name="pref_camera_focusmode_default" translatable="false">continuous-picture</string>
-
     <!-- Settings screen, Focus mode title -->
     <string name="pref_camera_focusmode_title">Focus mode</string>
 
@@ -205,7 +202,7 @@
     <string name="pref_camera_scenemode_entry_party">Party</string>
 
     <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
-    <string name="not_selectable_in_scene_mode">This is not selectable in scene mode</string>
+    <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
 
     <!-- Restore settings item in preference -->
     <string name="pref_restore_title">Camera settings</string>
@@ -254,31 +251,31 @@
     <string name="share_video_via">Share video via</string>
 
     <!-- Toast saying that there is no picture to share. [CHAR LIMIT=30] -->
-    <string name="no_picture_to_share">No picture to share</string>
+    <string name="no_picture_to_share">No picture to share.</string>
 
     <!-- Toast saying that there is no video to share. [CHAR LIMIT=30] -->
-    <string name="no_video_to_share">No video to share</string>
+    <string name="no_video_to_share">No video to share.</string>
 
     <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=12] -->
-    <string name="pano_too_fast_prompt">Too Fast</string>
+    <string name="pano_too_fast_prompt">Too fast</string>
 
     <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
     <string name="pano_dialog_prepare_preview">Preparing panorama</string>
 
     <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
-    <string name="pano_dialog_panorama_failed">Failed to save panorama</string>
+    <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
 
     <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
     <string name="pano_dialog_title">Panorama</string>
 
     <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
-    <string name="pano_capture_indication">Capturing Panorama</string>
+    <string name="pano_capture_indication">Capturing panorama</string>
 
     <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
-    <string name="pano_review_saving_indication_str">Saving...</string>
+    <string name="pano_review_saving_indication_str">Saving\u2026</string>
 
     <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
-    <string name="tap_to_focus">Tap to focus</string>
+    <string name="tap_to_focus">Touch to focus.</string>
 
     <!-- Default effect setting that clears the effect. -->
     <string name="pref_video_effect_default" translatable="false">none</string>
@@ -291,32 +288,32 @@
     <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
     <string name="effect_goofy_face_squeeze">Squeeze</string>
     <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
-    <string name="effect_goofy_face_big_eyes">Big Eyes</string>
+    <string name="effect_goofy_face_big_eyes">Big eyes</string>
     <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
-    <string name="effect_goofy_face_big_mouth">Big Mouth</string>
+    <string name="effect_goofy_face_big_mouth">Big mouth</string>
     <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
-    <string name="effect_goofy_face_small_mouth">Small Mouth</string>
+    <string name="effect_goofy_face_small_mouth">Small mouth</string>
     <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
-    <string name="effect_goofy_face_big_nose">Big Nose</string>
+    <string name="effect_goofy_face_big_nose">Big nose</string>
     <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
-    <string name="effect_goofy_face_small_eyes">Small Eyes</string>
+    <string name="effect_goofy_face_small_eyes">Small eyes</string>
     <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
-    <string name="effect_backdropper_space">In Space</string>
+    <string name="effect_backdropper_space">In space</string>
     <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
     <string name="effect_backdropper_sunset">Sunset</string>
     <!-- Effect setting item that replaces background with a disco effect. [CHAR LIMIT=14] -->
     <string name="effect_backdropper_disco">Disco</string>
     <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
-    <string name="effect_backdropper_gallery">Pick your own</string>
+    <string name="effect_backdropper_gallery">Choose your own</string>
 
     <!-- Message displayed in overlay during background replacement training [CHAR LIMIT=180]-->
-    <string name="bg_replacement_message">Place your device on a steady surface and be sure there\'s no movement behind you.\n\nThen step out of the camera\'s view.</string>
+    <string name="bg_replacement_message">Set your device down\nStep out of view for a moment</string>
 
     <!-- Toast after trying to select a setting that is not allowed to change in effect [CHAR LIMIT=50] -->
-    <string name="not_selectable_in_effect">This is not selectable when the effect is on.</string>
+    <string name="not_selectable_in_effect">Not selectable when the effect is on.</string>
 
     <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=65] -->
-    <string name="video_snapshot_hint">Take a photo during video recording by tapping on the preview screen.</string>
+    <string name="video_snapshot_hint">Take a photo during video recording by touching the preview screen.</string>
 
     <!-- Toast telling users video snapshot is disabled when the effects are on and a user tries to tap on the viewfinder [CHAR LIMIT=65] -->
     <string name="disable_video_snapshot_hint">Video snapshot is disabled when special effects are on.</string>
@@ -337,7 +334,7 @@
     <!-- The front/back camera switch. [CHAR LIMIT = NONE] -->
     <string name="accessibility_camera_picker">Front and back camera switch</string>
     <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
-    <string name="accessibility_mode_picker">Camera, video or panorama selector</string>
+    <string name="accessibility_mode_picker">Camera, video, or panorama selector</string>
     <!-- The button to switch to the second-level indicators of the camera settings. [CHAR LIMIT = NONE] -->
     <string name="accessibility_second_level_indicators">More setting controls</string>
     <!-- The button to back to the first-level indicators of the camera settings. [CHAR LIMIT = NONE] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9127479..bc3c301 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -38,10 +38,10 @@
         <item name="android:windowExitAnimation">@anim/on_screen_hint_exit</item>
     </style>
     <style name="ReviewControlIcon">
-        <item name="android:layout_height">50dp</item>
-        <item name="android:layout_width">75dp</item>
+        <item name="android:layout_width">50dp</item>
+        <item name="android:layout_height">75dp</item>
         <item name="android:gravity">center</item>
-        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_centerVertical">true</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
         <item name="android:background">@drawable/bg_pressed</item>
@@ -72,9 +72,9 @@
     <style name="SettingPopupWindow">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_toLeftOf">@+id/indicator_control</item>
-        <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_above">@+id/indicator_control</item>
+        <item name="android:layout_marginBottom">@dimen/setting_popup_right_margin</item>
         <item name="android:visibility">gone</item>
     </style>
     <style name="PopupTitleText">
@@ -85,7 +85,6 @@
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/popup_title_color</item>
         <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:paddingLeft">16dp</item>
     </style>
     <style name="PopupTitleSeperator">
         <item name="android:layout_width">match_parent</item>
@@ -169,8 +168,8 @@
     <style name="PanoViewHorizontalBar">
         <item name="android:background">#000000</item>
         <item name="android:alpha">1.0</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:layout_weight">0.5</item>
     </style>
     <style name="PanoCustomDialogText">
@@ -179,8 +178,8 @@
     <style name="ReviewThumbnail">
         <item name="android:layout_width">52dp</item>
         <item name="android:layout_height">52dp</item>
-        <item name="android:layout_alignParentTop">true</item>
-        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
     </style>
     <style name="AnimationPopup" parent="android:Animation">
         <item name="android:windowEnterAnimation">@anim/share_popup_enter</item>
@@ -232,4 +231,10 @@
         <item name="android:paddingBottom">4dp</item>
         <item name="android:background">@android:drawable/divider_horizontal_dark</item>
     </style>
+    <style name="OneRowGrid">
+        <item name="android:stretchMode">none</item>
+        <item name="android:columnWidth">@dimen/share_item_width</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
 </resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index feaa0b0..d9ffcd6 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -34,7 +34,7 @@
             camera:key="pref_camera_scenemode_key"
             camera:defaultValue="@string/pref_camera_scenemode_default"
             camera:title="@string/pref_camera_scenemode_title"
-            camera:singleIcon="@drawable/ic_viewfinder_scene_mode"
+            camera:singleIcon="@drawable/ic_scn_holo_light"
             camera:entries="@array/pref_camera_scenemode_entries"
             camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
     <IconListPreference
@@ -60,7 +60,7 @@
             camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
     <ListPreference
             camera:key="pref_camera_focusmode_key"
-            camera:defaultValue="@string/pref_camera_focusmode_default"
+            camera:defaultValue="@array/pref_camera_focusmode_default_array"
             camera:title="@string/pref_camera_focusmode_title"
             camera:entries="@array/pref_camera_focusmode_entries"
             camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java
index b2ef481..ea523c8 100644
--- a/src/com/android/camera/ActivityBase.java
+++ b/src/com/android/camera/ActivityBase.java
@@ -20,13 +20,14 @@
 
 import android.app.Activity;
 import android.app.KeyguardManager;
-import android.view.KeyEvent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.hardware.Camera;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.KeyEvent;
 
 /**
  * Superclass of Camera and VideoCamera activities.
@@ -41,6 +42,11 @@
 
     @Override
     public void onCreate(Bundle icicle) {
+        if (Util.isTabletUI()) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         super.onCreate(icicle);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
     }
@@ -61,11 +67,16 @@
         // Don't grab the camera if in use by lockscreen. For example, face
         // unlock may be using the camera. Camera may be already opened in
         // onCreate. doOnResume should continue if mCameraDevice != null.
-        if (mCameraDevice == null && !hasWindowFocus() && isKeyguardLocked()) {
-            if (LOGV) Log.v(TAG, "onRsume. mOnResumePending=true");
+        // Suppose camera app is in the foreground. If users turn off and turn
+        // on the screen very fast, camera app can still have the focus when the
+        // lock screen shows up. The keyguard takes input focus, so the caemra
+        // app will lose focus when it is displayed.
+        if (LOGV) Log.v(TAG, "onResume. hasWindowFocus()=" + hasWindowFocus());
+        if (mCameraDevice == null && isKeyguardLocked()) {
+            if (LOGV) Log.v(TAG, "onResume. mOnResumePending=true");
             mOnResumePending = true;
         } else {
-            if (LOGV) Log.v(TAG, "onRsume. mOnResumePending=false");
+            if (LOGV) Log.v(TAG, "onResume. mOnResumePending=false");
             doOnResume();
             mOnResumePending = false;
         }
@@ -124,6 +135,12 @@
 
     private boolean isKeyguardLocked() {
         KeyguardManager kgm = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+        if (LOGV) {
+            if (kgm != null) {
+                Log.v(TAG, "kgm.isKeyguardLocked()="+kgm.isKeyguardLocked()
+                        + ". kgm.isKeyguardSecure()="+kgm.isKeyguardSecure());
+            }
+        }
         // isKeyguardSecure excludes the slide lock case.
         return (kgm != null) && kgm.isKeyguardLocked() && kgm.isKeyguardSecure();
     }
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 1bedb4f..1bd759b 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -33,6 +33,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences.Editor;
+import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Face;
@@ -82,7 +83,7 @@
         View.OnTouchListener, ShutterButton.OnShutterButtonListener,
         SurfaceHolder.Callback, ModePicker.OnModeChangeListener,
         FaceDetectionListener, CameraPreference.OnPreferenceChangedListener,
-        LocationManager.Listener, ShutterButton.OnShutterButtonLongPressListener {
+        LocationManager.Listener {
 
     private static final String TAG = "camera";
 
@@ -303,7 +304,7 @@
                 }
 
                 case DISMISS_TAP_TO_FOCUS_TOAST: {
-                    View v = findViewById(R.id.tap_to_focus_prompt);
+                    View v = findViewById(R.id.first_use_hint);
                     v.setVisibility(View.GONE);
                     v.setAnimation(AnimationUtils.loadAnimation(Camera.this,
                             R.anim.on_screen_hint_exit));
@@ -370,7 +371,6 @@
         // Initialize shutter button.
         mShutterButton = (ShutterButton) findViewById(R.id.shutter_button);
         mShutterButton.setOnShutterButtonListener(this);
-        mShutterButton.setOnShutterButtonLongPressListener(this);
         mShutterButton.setVisibility(View.VISIBLE);
 
         // Initialize focus UI.
@@ -389,7 +389,7 @@
         startFaceDetection();
         // Show the tap to focus toast if this is the first start.
         if (mFocusAreaSupported &&
-                mPreferences.getBoolean(CameraSettings.KEY_TAP_TO_FOCUS_PROMPT_SHOWN, true)) {
+                mPreferences.getBoolean(CameraSettings.KEY_CAMERA_FIRST_USE_HINT_SHOWN, true)) {
             // Delay the toast for one second to wait for orientation.
             mHandler.sendEmptyMessageDelayed(SHOW_TAP_TO_FOCUS_TOAST, 1000);
         }
@@ -824,7 +824,11 @@
             r.width = width;
             r.height = height;
             r.dateTaken = System.currentTimeMillis();
-            r.previewWidth = mPreviewFrameLayout.getWidth();
+            if (getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+                r.previewWidth = mPreviewFrameLayout.getHeight();
+            } else {
+                r.previewWidth = mPreviewFrameLayout.getWidth();
+            }
             synchronized (this) {
                 while (mQueue.size() >= QUEUE_LIMIT) {
                     try {
@@ -1026,8 +1030,9 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         getPreferredCameraId();
-        mFocusManager = new FocusManager(mPreferences,
-                getString(R.string.pref_camera_focusmode_default));
+        String[] defaultFocusModes = getResources().getStringArray(
+                R.array.pref_camera_focusmode_default_array);
+        mFocusManager = new FocusManager(mPreferences, defaultFocusModes);
 
         /*
          * To reduce startup time, we start the camera open and preview threads.
@@ -1217,16 +1222,13 @@
         }
     }
 
-    private void setOrientationIndicator(int degree) {
-        if (mThumbnailView != null) mThumbnailView.setDegree(degree);
-        if (mModePicker != null) mModePicker.setDegree(degree);
-        if (mSharePopup != null) mSharePopup.setOrientation(degree);
-        if (mIndicatorControlContainer != null) mIndicatorControlContainer.setDegree(degree);
-        if (mZoomControl != null) mZoomControl.setDegree(degree);
-        if (mFocusIndicator != null) mFocusIndicator.setOrientation(degree);
-        if (mFaceView != null) mFaceView.setOrientation(degree);
-        if (mReviewCancelButton != null) mReviewCancelButton.setOrientation(degree);
-        if (mReviewDoneButton != null) mReviewDoneButton.setOrientation(degree);
+    private void setOrientationIndicator(int orientation) {
+        Rotatable[] indicators = {mThumbnailView, mModePicker, mSharePopup,
+                mIndicatorControlContainer, mZoomControl, mFocusIndicator, mFaceView,
+                mReviewCancelButton, mReviewDoneButton};
+        for (Rotatable indicator : indicators) {
+            if (indicator != null) indicator.setOrientation(orientation);
+        }
     }
 
     @Override
@@ -1393,15 +1395,6 @@
         mFocusManager.doSnap();
     }
 
-    @Override
-    public void onShutterButtonLongPressed() {
-        if (mPausing || mCameraState == SNAPSHOT_IN_PROGRESS
-                || mCameraDevice == null || mPicturesRemaining <= 0) return;
-
-        Log.v(TAG, "onShutterButtonLongPressed");
-        mFocusManager.shutterLongPressed();
-    }
-
     private OnScreenHint mStorageHint;
 
     private void updateStorageHint() {
@@ -2216,15 +2209,18 @@
     }
 
     private void showTapToFocusToast() {
+        // Set the text of toast
+        TextView textView = (TextView) findViewById(R.id.toast_text);
+        textView.setText(R.string.tap_to_focus);
         // Show the toast.
-        RotateLayout v = (RotateLayout) findViewById(R.id.tap_to_focus_prompt);
+        RotateLayout v = (RotateLayout) findViewById(R.id.first_use_hint);
         v.setOrientation(mOrientationCompensation);
         v.startAnimation(AnimationUtils.loadAnimation(this, R.anim.on_screen_hint_enter));
         v.setVisibility(View.VISIBLE);
         mHandler.sendEmptyMessageDelayed(DISMISS_TAP_TO_FOCUS_TOAST, 5000);
         // Clear the preference.
         Editor editor = mPreferences.edit();
-        editor.putBoolean(CameraSettings.KEY_TAP_TO_FOCUS_PROMPT_SHOWN, false);
+        editor.putBoolean(CameraSettings.KEY_CAMERA_FIRST_USE_HINT_SHOWN, false);
         editor.apply();
     }
 
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 9c3104b..c861366 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -50,7 +50,8 @@
     public static final String KEY_EXPOSURE = "pref_camera_exposure_key";
     public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key";
     public static final String KEY_CAMERA_ID = "pref_camera_id_key";
-    public static final String KEY_TAP_TO_FOCUS_PROMPT_SHOWN = "pref_tap_to_focus_prompt_shown_key";
+    public static final String KEY_CAMERA_FIRST_USE_HINT_SHOWN = "pref_camera_first_use_hint_shown_key";
+    public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN = "pref_video_first_use_hint_shown_key";
 
     public static final String EXPOSURE_DEFAULT_VALUE = "0";
 
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index 1af634c..bea2ffd 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -76,7 +76,8 @@
         return key.equals(CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL)
                 || key.equals(CameraSettings.KEY_CAMERA_ID)
                 || key.equals(CameraSettings.KEY_RECORD_LOCATION)
-                || key.equals(CameraSettings.KEY_TAP_TO_FOCUS_PROMPT_SHOWN)
+                || key.equals(CameraSettings.KEY_CAMERA_FIRST_USE_HINT_SHOWN)
+                || key.equals(CameraSettings.KEY_VIDEO_FIRST_USE_HINT_SHOWN)
                 || key.equals(CameraSettings.KEY_VIDEO_EFFECT);
     }
 
diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index d5f83ef..bb7c813 100644
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -93,6 +93,7 @@
     private long mMaxFileSize = 0;
     private int mMaxDurationMs = 0;
     private int mCameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
+    private boolean mAppIsLandscape;
 
     private int mEffect = EFFECT_NONE;
     private int mCurrentEffect = EFFECT_NONE;
@@ -375,6 +376,16 @@
         setRecordingOrientation();
     }
 
+    /** Passes the native orientation of the Camera app (device dependent)
+     * to allow for correct output aspect ratio. Defaults to portrait */
+    public void setAppToLandscape(boolean landscape) {
+        if (mState != STATE_CONFIGURE) {
+            throw new RuntimeException(
+                "setAppToLandscape called after configuration!");
+        }
+        mAppIsLandscape = landscape;
+    }
+
     public void setCameraFacing(int facing) {
         switch (mState) {
             case STATE_RELEASED:
@@ -419,7 +430,12 @@
             Log.v(TAG, "Effects framework initializing. Recording size "
                   + mProfile.videoFrameWidth + ", " + mProfile.videoFrameHeight);
         }
-
+        if (!mAppIsLandscape) {
+            int tmp;
+            tmp = mProfile.videoFrameWidth;
+            mProfile.videoFrameWidth = mProfile.videoFrameHeight;
+            mProfile.videoFrameHeight = tmp;
+        }
         mGraphEnv.addReferences(
                 "textureSourceCallback", mSourceReadyCallback,
                 "recordingWidth", mProfile.videoFrameWidth,
diff --git a/src/com/android/camera/FocusManager.java b/src/com/android/camera/FocusManager.java
index 86b92c2..bdf4766 100644
--- a/src/com/android/camera/FocusManager.java
+++ b/src/com/android/camera/FocusManager.java
@@ -56,7 +56,6 @@
 
     private boolean mInitialized;
     private boolean mFocusAreaSupported;
-    private boolean mInLongPress;
     private boolean mLockAeAwbNeeded;
     private boolean mAeAwbLock;
     private Matrix mMatrix;
@@ -68,7 +67,7 @@
     private List<Area> mFocusArea; // focus area in driver format
     private List<Area> mMeteringArea; // metering area in driver format
     private String mFocusMode;
-    private String mDefaultFocusMode;
+    private String[] mDefaultFocusModes;
     private String mOverrideFocusMode;
     private Parameters mParameters;
     private ComboPreferences mPreferences;
@@ -97,9 +96,9 @@
         }
     }
 
-    public FocusManager(ComboPreferences preferences, String defaultFocusMode) {
+    public FocusManager(ComboPreferences preferences, String[] defaultFocusModes) {
         mPreferences = preferences;
-        mDefaultFocusMode = defaultFocusMode;
+        mDefaultFocusModes = defaultFocusModes;
         mHandler = new MainHandler();
         mMatrix = new Matrix();
     }
@@ -174,22 +173,6 @@
         }
     }
 
-    public void shutterLongPressed() {
-        if (Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)
-                && isSupported(Parameters.FOCUS_MODE_AUTO, mParameters.getSupportedFocusModes())) {
-            if (mState == STATE_IDLE || mState == STATE_FOCUSING_SNAP_ON_FINISH) {
-                Log.e(TAG, "Invalid focus state=" + mState);
-            }
-            mInLongPress = true;
-            // Cancel any outstanding Auto focus requests. The auto focus mode
-            // will be changed from CAF to auto in cancelAutoFocus.
-            onShutterUp();
-            // Call Autofocus
-            onShutterDown();
-            mInLongPress = false;
-        }
-    }
-
     public void doSnap() {
         if (!mInitialized) return;
 
@@ -378,20 +361,28 @@
     // This can only be called after mParameters is initialized.
     public String getFocusMode() {
         if (mOverrideFocusMode != null) return mOverrideFocusMode;
+        List<String> supportedFocusModes = mParameters.getSupportedFocusModes();
 
-        if (mInLongPress) {
-            // Users long-press the shutter button in CAF. Change it to auto
-            // mode, so it will do a full scan.
-            mFocusMode = Parameters.FOCUS_MODE_AUTO;
-        } else if (mFocusAreaSupported && mFocusArea != null) {
+        if (mFocusAreaSupported && mFocusArea != null) {
             // Always use autofocus in tap-to-focus.
             mFocusMode = Parameters.FOCUS_MODE_AUTO;
         } else {
             // The default is continuous autofocus.
             mFocusMode = mPreferences.getString(
-                    CameraSettings.KEY_FOCUS_MODE, mDefaultFocusMode);
+                    CameraSettings.KEY_FOCUS_MODE, null);
+
+            // Try to find a supported focus mode from the default list.
+            if (mFocusMode == null) {
+                for (int i = 0; i < mDefaultFocusModes.length; i++) {
+                    String mode = mDefaultFocusModes[i];
+                    if (isSupported(mode, supportedFocusModes)) {
+                        mFocusMode = mode;
+                        break;
+                    }
+                }
+            }
         }
-        if (!isSupported(mFocusMode, mParameters.getSupportedFocusModes())) {
+        if (!isSupported(mFocusMode, supportedFocusModes)) {
             // For some reasons, the driver does not support the current
             // focus mode. Fall back to auto.
             if (isSupported(Parameters.FOCUS_MODE_AUTO,
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 6885a37..32cf692 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -21,6 +21,7 @@
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.TypedValue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +34,7 @@
     private final String TAG = "ListPreference";
     private final String mKey;
     private String mValue;
-    private final String mDefaultValue;
+    private final CharSequence[] mDefaultValues;
 
     private CharSequence[] mEntries;
     private CharSequence[] mEntryValues;
@@ -47,7 +48,20 @@
 
         mKey = Util.checkNotNull(
                 a.getString(R.styleable.ListPreference_key));
-        mDefaultValue = a.getString(R.styleable.ListPreference_defaultValue);
+
+        // We allow the defaultValue attribute to be a string or an array of
+        // strings. The reason we need multiple default values is that some
+        // of them may be unsupported on a specific platform (for example,
+        // continuous auto-focus). In that case the first supported value
+        // in the array will be used.
+        int attrDefaultValue = R.styleable.ListPreference_defaultValue;
+        TypedValue tv = a.peekValue(attrDefaultValue);
+        if (tv != null && tv.type == TypedValue.TYPE_REFERENCE) {
+            mDefaultValues = a.getTextArray(attrDefaultValue);
+        } else {
+            mDefaultValues = new CharSequence[1];
+            mDefaultValues[0] = a.getString(attrDefaultValue);
+        }
 
         setEntries(a.getTextArray(R.styleable.ListPreference_entries));
         setEntryValues(a.getTextArray(
@@ -77,12 +91,27 @@
 
     public String getValue() {
         if (!mLoaded) {
-            mValue = getSharedPreferences().getString(mKey, mDefaultValue);
+            mValue = getSharedPreferences().getString(mKey,
+                    findSupportedDefaultValue());
             mLoaded = true;
         }
         return mValue;
     }
 
+    // Find the first value in mDefaultValues which is supported.
+    private String findSupportedDefaultValue() {
+        for (int i = 0; i < mDefaultValues.length; i++) {
+            for (int j = 0; j < mEntryValues.length; j++) {
+                // Note that mDefaultValues[i] may be null (if unspecified
+                // in the xml file).
+                if (mEntryValues[j].equals(mDefaultValues[i])) {
+                    return mDefaultValues[i].toString();
+                }
+            }
+        }
+        return null;
+    }
+
     public void setValue(String value) {
         if (findIndexOfValue(value) < 0) throw new IllegalArgumentException();
         mValue = value;
diff --git a/src/com/android/camera/ModePicker.java b/src/com/android/camera/ModePicker.java
index 528bc3d..ccde71d 100644
--- a/src/com/android/camera/ModePicker.java
+++ b/src/com/android/camera/ModePicker.java
@@ -17,6 +17,7 @@
 package com.android.camera;
 
 import com.android.camera.ui.PopupManager;
+import com.android.camera.ui.Rotatable;
 import com.android.camera.ui.RotateImageView;
 
 import android.content.Context;
@@ -36,7 +37,7 @@
  * a current mode indicator.
  */
 public class ModePicker extends RelativeLayout implements View.OnClickListener,
-    PopupManager.OnOtherPopupShowedListener {
+    PopupManager.OnOtherPopupShowedListener, Rotatable {
     public static final int MODE_CAMERA = 0;
     public static final int MODE_VIDEO = 1;
     public static final int MODE_PANORAMA = 2;
@@ -188,11 +189,11 @@
         return true;
     }
 
-    public void setDegree(int degree) {
+    public void setOrientation(int orientation) {
         for (int i = 0; i < MODE_NUM; ++i) {
-            mModeSelectionIcon[i].setDegree(degree);
+            mModeSelectionIcon[i].setOrientation(orientation);
             if (mCurrentModeFrame != null) {
-                mCurrentModeIcon[i].setDegree(degree);
+                mCurrentModeIcon[i].setOrientation(orientation);
             }
         }
     }
diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java
index 5d31e2b..8429259 100644
--- a/src/com/android/camera/PreviewFrameLayout.java
+++ b/src/com/android/camera/PreviewFrameLayout.java
@@ -16,10 +16,9 @@
 
 package com.android.camera;
 
-import com.android.camera.R;
-
+import android.app.Activity;
 import android.content.Context;
-import android.graphics.Rect;
+import android.content.pm.ActivityInfo;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 /**
@@ -31,14 +30,21 @@
         public void onSizeChanged();
     }
 
-    private double mAspectRatio = 4.0 / 3.0;
+    private double mAspectRatio;
 
     public PreviewFrameLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setAspectRatio(4.0 / 3.0);
     }
 
     public void setAspectRatio(double ratio) {
         if (ratio <= 0.0) throw new IllegalArgumentException();
+
+        if (((Activity) getContext()).getRequestedOrientation()
+                == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            ratio = 1 / ratio;
+        }
+
         if (mAspectRatio != ratio) {
             mAspectRatio = ratio;
             requestLayout();
diff --git a/src/com/android/camera/ShutterButton.java b/src/com/android/camera/ShutterButton.java
index ace154e..c7f792a 100755
--- a/src/com/android/camera/ShutterButton.java
+++ b/src/com/android/camera/ShutterButton.java
@@ -26,7 +26,7 @@
  * It's currently an {@code ImageView} that can call a delegate when the
  * pressed state changes.
  */
-public class ShutterButton extends ImageView implements View.OnLongClickListener {
+public class ShutterButton extends ImageView {
     /**
      * A callback to be invoked when a ShutterButton's pressed state changes.
      */
@@ -40,30 +40,17 @@
         void onShutterButtonClick();
     }
 
-    /**
-     * A callback to be invoked when a ShutterButton's long pressed.
-     */
-    public interface OnShutterButtonLongPressListener {
-        void onShutterButtonLongPressed();
-    }
-
     private OnShutterButtonListener mListener;
-    private OnShutterButtonLongPressListener mLongPressListener;
     private boolean mOldPressed;
 
     public ShutterButton(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setOnLongClickListener(this);
     }
 
     public void setOnShutterButtonListener(OnShutterButtonListener listener) {
         mListener = listener;
     }
 
-    public void setOnShutterButtonLongPressListener(OnShutterButtonLongPressListener listener) {
-        mLongPressListener = listener;
-    }
-
     /**
      * Hook into the drawable state changing to get changes to isPressed -- the
      * onPressed listener doesn't always get called when the pressed state
@@ -122,12 +109,4 @@
         }
         return result;
     }
-
-    @Override
-    public boolean onLongClick(View v) {
-        if (mLongPressListener != null) {
-            mLongPressListener.onShutterButtonLongPressed();
-        }
-        return false;
-    }
 }
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 564c088..38a6d48 100644
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -84,10 +84,16 @@
             values.put(ImageColumns.LONGITUDE, location.getLongitude());
         }
 
-        Uri uri = resolver.insert(Images.Media.EXTERNAL_CONTENT_URI, values);
-        if (uri == null) {
-            Log.e(TAG, "Failed to write MediaStore");
-            return null;
+        Uri uri = null;
+        try {
+            uri = resolver.insert(Images.Media.EXTERNAL_CONTENT_URI, values);
+        } catch (Throwable th)  {
+            // This can happen when the external volume is already mounted, but
+            // MediaScanner has not notify MediaProvider to add that volume.
+            // The picture is still safe and MediaScanner will find it and
+            // insert it into MediaProvider. The only problem is that the user
+            // cannot click the thumbnail to review the picture.
+            Log.e(TAG, "Failed to write MediaStore" + th);
         }
         return uri;
     }
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 4c28e56..21d97c3 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -90,7 +90,7 @@
     }
 
     public static void initialize(Context context) {
-        sIsTabletUI = (context.getResources().getConfiguration().screenWidthDp >= 1024);
+        sIsTabletUI = (context.getResources().getConfiguration().smallestScreenWidthDp >= 600);
 
         DisplayMetrics metrics = new DisplayMetrics();
         WindowManager wm = (WindowManager)
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 9f47d5c..2cc07a5 100755
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -32,6 +32,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.hardware.Camera.CameraInfo;
@@ -64,6 +66,7 @@
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -94,6 +97,8 @@
     private static final int CLEAR_SCREEN_DELAY = 4;
     private static final int UPDATE_RECORD_TIME = 5;
     private static final int ENABLE_SHUTTER_BUTTON = 6;
+    private static final int SHOW_TAP_TO_SNAPSHOT_TOAST = 7;
+    private static final int DISMISS_TAP_TO_SNAPSHOT_TOAST = 8;
 
     private static final int SCREEN_DELAY = 2 * 60 * 1000;
 
@@ -111,7 +116,7 @@
             CamcorderProfile.QUALITY_TIME_LAPSE_720P,
             CamcorderProfile.QUALITY_TIME_LAPSE_480P,
             CamcorderProfile.QUALITY_TIME_LAPSE_CIF,
-            1007, /* TODO: replace it with QUALITY_TIME_LAPSE_QVGA if public. */
+            CamcorderProfile.QUALITY_TIME_LAPSE_QVGA,
             CamcorderProfile.QUALITY_TIME_LAPSE_QCIF};
 
     private static final int[] VIDEO_QUALITY = {
@@ -119,7 +124,7 @@
             CamcorderProfile.QUALITY_720P,
             CamcorderProfile.QUALITY_480P,
             CamcorderProfile.QUALITY_CIF,
-            7, /* TODO: replace it with CamcorderProfile.QUALITY_QVGA */
+            CamcorderProfile.QUALITY_QVGA,
             CamcorderProfile.QUALITY_QCIF};
 
     /**
@@ -178,6 +183,7 @@
 
     private MediaRecorder mMediaRecorder;
     private EffectsRecorder mEffectsRecorder;
+    private boolean mEffectsDisplayResult;
 
     private int mEffectType = EffectsRecorder.EFFECT_NONE;
     private Object mEffectParameter = null;
@@ -296,6 +302,19 @@
                     break;
                 }
 
+                case SHOW_TAP_TO_SNAPSHOT_TOAST: {
+                    showTapToSnapshotToast();
+                    break;
+                }
+
+                case DISMISS_TAP_TO_SNAPSHOT_TOAST: {
+                    View v = findViewById(R.id.first_use_hint);
+                    v.setVisibility(View.GONE);
+                    v.setAnimation(AnimationUtils.loadAnimation(VideoCamera.this,
+                            R.anim.on_screen_hint_exit));
+                    break;
+                }
+
                 default:
                     Log.v(TAG, "Unhandled message: " + msg.what);
                     break;
@@ -538,22 +557,27 @@
                     setOrientationIndicator(mOrientationCompensation);
                 }
             }
+
+            // Show the toast after getting the first orientation changed.
+            if (mHandler.hasMessages(SHOW_TAP_TO_SNAPSHOT_TOAST)) {
+                mHandler.removeMessages(SHOW_TAP_TO_SNAPSHOT_TOAST);
+                showTapToSnapshotToast();
+            }
         }
     }
 
-    private void setOrientationIndicator(int degree) {
-        if (mThumbnailView != null) mThumbnailView.setDegree(degree);
-        if (mModePicker != null) mModePicker.setDegree(degree);
-        if (mSharePopup != null) mSharePopup.setOrientation(degree);
-        if (mBgLearningMessageRotater != null) mBgLearningMessageRotater.setOrientation(degree);
-        if (mIndicatorControlContainer != null) mIndicatorControlContainer.setDegree(degree);
-        if (mReviewDoneButton != null) mReviewDoneButton.setOrientation(degree);
-        if (mReviewPlayButton != null) mReviewPlayButton.setOrientation(degree);
-        if (mReviewCancelButton!= null) mReviewCancelButton.setOrientation(degree);
+    private void setOrientationIndicator(int orientation) {
+        Rotatable[] indicators = {mThumbnailView, mModePicker, mSharePopup,
+                mBgLearningMessageRotater, mIndicatorControlContainer,
+                mReviewDoneButton, mReviewPlayButton, mReviewCancelButton};
+        for (Rotatable indicator : indicators) {
+            if (indicator != null) indicator.setOrientation(orientation);
+        }
+
         // We change the orientation of the linearlayout only for phone UI because when in portrait
         // the width is not enough.
         if (mLabelsLinearLayout != null) {
-            if (((degree / 90) & 1) == 1) {
+            if (((orientation / 90) & 1) == 1) {
                 mLabelsLinearLayout.setOrientation(mLabelsLinearLayout.VERTICAL);
             } else {
                 mLabelsLinearLayout.setOrientation(mLabelsLinearLayout.HORIZONTAL);
@@ -602,14 +626,15 @@
     }
 
     private void onStopVideoRecording(boolean valid) {
+        mEffectsDisplayResult = true;
         stopVideoRecording();
         if (mIsVideoCaptureIntent) {
             if (mQuickCapture) {
                 doReturnToCaller(valid);
-            } else {
+            } else if (!effectsActive()) {
                 showAlert();
             }
-        } else {
+        } else if (!effectsActive()) {
             getThumbnail();
         }
     }
@@ -926,12 +951,13 @@
         // This is similar to what mShutterButton.performClick() does,
         // but not quite the same.
         if (mMediaRecorderRecording) {
+            mEffectsDisplayResult = true;
             if (mIsVideoCaptureIntent) {
                 stopVideoRecording();
-                showAlert();
+                if (!effectsActive()) showAlert();
             } else {
                 stopVideoRecording();
-                getThumbnail();
+                if (!effectsActive()) getThumbnail();
             }
         } else {
             stopVideoRecording();
@@ -1235,12 +1261,18 @@
         // If the mCameraDevice is null, then this activity is going to finish
         if (mCameraDevice == null) return;
 
+        boolean inLandscape =
+                (getRequestedOrientation() ==
+                 ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
         CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
 
+        mEffectsDisplayResult = false;
         mEffectsRecorder = new EffectsRecorder(this);
 
         // TODO: Confirm none of the foll need to go to initializeEffectsRecording()
         // and none of these change even when the preview is not refreshed.
+        mEffectsRecorder.setAppToLandscape(inLandscape);
         mEffectsRecorder.setCamera(mCameraDevice);
         mEffectsRecorder.setCameraFacing(info.facing);
         mEffectsRecorder.setProfile(mProfile);
@@ -1947,8 +1979,20 @@
             mBgLearningMessageFrame.setVisibility(View.GONE);
             checkQualityAndStartPreview();
         } else if (effectMsg == EffectsRecorder.EFFECT_MSG_RECORDING_DONE) {
-            addVideoToMediaStore();
-            getThumbnail();
+            // TODO: This assumes the codepath from onStopVideoRecording.  It
+            // does not appear to cause problems for the other codepaths, but
+            // should be properly thought through.
+            if (mEffectsDisplayResult) {
+                addVideoToMediaStore();
+                if (mIsVideoCaptureIntent) {
+                    if (!mQuickCapture) {
+                        showAlert();
+                    }
+                } else {
+                    getThumbnail();
+                }
+            }
+            mEffectsDisplayResult = false;
         } else if (effectId == EffectsRecorder.EFFECT_BACKDROPPER) {
             switch (effectMsg) {
                 case EffectsRecorder.EFFECT_MSG_STARTED_LEARNING:
@@ -2271,6 +2315,12 @@
     private void initializeVideoSnapshot() {
         if (mParameters.isVideoSnapshotSupported() && !mIsVideoCaptureIntent) {
             findViewById(R.id.camera_preview).setOnTouchListener(this);
+            // Show the tap to focus toast if this is the first start.
+            if (mPreferences.getBoolean(
+                        CameraSettings.KEY_VIDEO_FIRST_USE_HINT_SHOWN, true)) {
+                // Delay the toast for one second to wait for orientation.
+                mHandler.sendEmptyMessageDelayed(SHOW_TAP_TO_SNAPSHOT_TOAST, 1000);
+            }
         }
     }
 
@@ -2384,4 +2434,20 @@
             mVideoFileDescriptor = null;
         }
     }
+
+    private void showTapToSnapshotToast() {
+        // Set the text of toast
+        TextView textView = (TextView) findViewById(R.id.toast_text);
+        textView.setText(R.string.video_snapshot_hint);
+        // Show the toast.
+        RotateLayout v = (RotateLayout) findViewById(R.id.first_use_hint);
+        v.setOrientation(mOrientationCompensation);
+        v.startAnimation(AnimationUtils.loadAnimation(this, R.anim.on_screen_hint_enter));
+        v.setVisibility(View.VISIBLE);
+        mHandler.sendEmptyMessageDelayed(DISMISS_TAP_TO_SNAPSHOT_TOAST, 5000);
+        // Clear the preference.
+        Editor editor = mPreferences.edit();
+        editor.putBoolean(CameraSettings.KEY_VIDEO_FIRST_USE_HINT_SHOWN, false);
+        editor.apply();
+    }
 }
diff --git a/src/com/android/camera/panorama/MosaicRenderer.java b/src/com/android/camera/panorama/MosaicRenderer.java
index 1ff307d..f055c0e 100644
--- a/src/com/android/camera/panorama/MosaicRenderer.java
+++ b/src/com/android/camera/panorama/MosaicRenderer.java
@@ -43,8 +43,9 @@
       *
       * @param width width of the drawing surface in pixels.
       * @param height height of the drawing surface in pixels.
+      * @param isLandscapeOrientation is the orientation of the activity layout in landscape.
       */
-     public static native void reset(int width, int height);
+     public static native void reset(int width, int height, boolean isLandscapeOrientation);
 
      /**
       * Calling this function will render the SurfaceTexture to a new 2D texture
diff --git a/src/com/android/camera/panorama/MosaicRendererSurfaceView.java b/src/com/android/camera/panorama/MosaicRendererSurfaceView.java
index 08d4eff..b2acfde 100644
--- a/src/com/android/camera/panorama/MosaicRendererSurfaceView.java
+++ b/src/com/android/camera/panorama/MosaicRendererSurfaceView.java
@@ -16,7 +16,9 @@
 
 package com.android.camera.panorama;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.graphics.PixelFormat;
 import android.opengl.GLSurfaceView;
 import android.os.ConditionVariable;
@@ -33,23 +35,34 @@
     private static final boolean DEBUG = false;
     private MosaicRendererSurfaceViewRenderer mRenderer;
     private ConditionVariable mPreviewFrameReadyForProcessing;
+    private boolean mIsLandscapeOrientation = true;
 
     public MosaicRendererSurfaceView(Context context) {
         super(context);
-        init(false, 0, 0);
-        setZOrderMediaOverlay(true);
+        initialize(context, false, 0, 0);
     }
 
     public MosaicRendererSurfaceView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init(false, 0, 0);
+        initialize(context, false, 0, 0);
+    }
+
+    public MosaicRendererSurfaceView(Context context, boolean translucent,
+            int depth, int stencil) {
+        super(context);
+        initialize(context, translucent, depth, stencil);
+    }
+
+    private void initialize(Context context, boolean translucent, int depth, int stencil) {
+        getDisplayOrientation(context);
+        init(translucent, depth, stencil);
         setZOrderMediaOverlay(true);
     }
 
-    public MosaicRendererSurfaceView(Context context, boolean translucent, int depth, int stencil) {
-        super(context);
-        init(translucent, depth, stencil);
-        setZOrderMediaOverlay(true);
+    private void getDisplayOrientation(Context context) {
+        Activity activity = (PanoramaActivity) context;
+        mIsLandscapeOrientation = (activity.getRequestedOrientation()
+                == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE );
     }
 
     private void init(boolean translucent, int depth, int stencil) {
@@ -78,7 +91,7 @@
             new ConfigChooser(5, 6, 5, 0, depth, stencil));
 
         /* Set the renderer responsible for frame rendering */
-        mRenderer = new MosaicRendererSurfaceViewRenderer();
+        mRenderer = new MosaicRendererSurfaceViewRenderer(mIsLandscapeOrientation);
         setRenderer(mRenderer);
         setRenderMode(RENDERMODE_WHEN_DIRTY);
         mPreviewFrameReadyForProcessing = new ConditionVariable();
diff --git a/src/com/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java b/src/com/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
index b2b2f56..3089972 100755
--- a/src/com/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
+++ b/src/com/android/camera/panorama/MosaicRendererSurfaceViewRenderer.java
@@ -25,9 +25,14 @@
 public class MosaicRendererSurfaceViewRenderer implements GLSurfaceView.Renderer
 {
     private static final String TAG = "MosaicRendererSurfaceViewRenderer";
+    private boolean mIsLandscapeOrientation;
 
     private MosaicSurfaceCreateListener mSurfaceCreateListener;
 
+    public MosaicRendererSurfaceViewRenderer(boolean isLandscapeOrientation) {
+        mIsLandscapeOrientation = isLandscapeOrientation;
+    }
+
     /** A callback to be called when the surface is created */
     public interface MosaicSurfaceCreateListener {
         public void onMosaicSurfaceCreated(final int surface);
@@ -41,7 +46,7 @@
 
     @Override
     public void onSurfaceChanged(GL10 gl, int width, int height) {
-        MosaicRenderer.reset(width, height);
+        MosaicRenderer.reset(width, height, mIsLandscapeOrientation);
         Log.i(TAG, "Renderer: onSurfaceChanged");
         if (mSurfaceCreateListener != null) {
             mSurfaceCreateListener.onMosaicSurfaceChanged();
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 7a7cf78..ab220de 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -30,15 +30,18 @@
 import com.android.camera.Storage;
 import com.android.camera.Thumbnail;
 import com.android.camera.Util;
+import com.android.camera.ui.Rotatable;
 import com.android.camera.ui.RotateImageView;
+import com.android.camera.ui.RotateLayout;
 import com.android.camera.ui.SharePopup;
 
-import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.AssetFileDescriptor;
+import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -60,18 +63,23 @@
 import android.os.SystemProperties;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.OrientationEventListener;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.File;
 import java.util.List;
+import java.util.Vector;
 
 /**
  * Activity to handle panorama capturing.
@@ -88,6 +96,9 @@
     private static final int MSG_RESET_TO_PREVIEW_WITH_THUMBNAIL = 2;
     private static final int MSG_GENERATE_FINAL_MOSAIC_ERROR = 3;
     private static final int MSG_RESET_TO_PREVIEW = 4;
+    private static final int MSG_CLEAR_SCREEN_DELAY = 5;
+
+    private static final int SCREEN_DELAY = 2 * 60 * 1000;
 
     private static final String TAG = "PanoramaActivity";
     private static final int PREVIEW_STOPPED = 0;
@@ -109,7 +120,7 @@
     private View mCaptureLayout;
     private View mReviewLayout;
     private ImageView mReview;
-    private TextView mCaptureIndicator;
+    private RotateLayout mCaptureIndicator;
     private PanoProgressBar mPanoProgressBar;
     private PanoProgressBar mSavingProgressBar;
     private View mFastIndicationBorder;
@@ -120,11 +131,19 @@
     private ShutterButton mShutterButton;
     private Object mWaitObject = new Object();
 
+    private RotateLayout mRotateDialog;
+    private View mRotateDialogTitleLayout;
+    private View mRotateDialogButtonLayout;
+    private TextView mRotateDialogTitle;
+    private View mRotateDialogTitleSeperator;
+    private ProgressBar mRotateDialogSpinner;
+    private TextView mRotateDialogText;
+    private TextView mRotateDialogButton;
+
     private String mPreparePreviewString;
-    private AlertDialog mAlertDialog;
-    private ProgressDialog mProgressDialog;
     private String mDialogTitle;
-    private String mDialogOk;
+    private String mDialogOkString;
+    private String mDialogPanoramaFailedString;
 
     private int mIndicatorColor;
     private int mIndicatorColorFast;
@@ -251,8 +270,6 @@
         super.onCreate(icicle);
 
         Window window = getWindow();
-        window.setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
-                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         Util.enterLightsOutMode(window);
         Util.initializeScreenBrightness(window, getContentResolver());
 
@@ -271,7 +288,9 @@
         mPreparePreviewString =
                 getResources().getString(R.string.pano_dialog_prepare_preview);
         mDialogTitle = getResources().getString(R.string.pano_dialog_title);
-        mDialogOk = getResources().getString(R.string.dialog_ok);
+        mDialogOkString = getResources().getString(R.string.dialog_ok);
+        mDialogPanoramaFailedString =
+                getResources().getString(R.string.pano_dialog_panorama_failed);
 
         mMainHandler = new Handler() {
             @Override
@@ -297,36 +316,28 @@
                         if (mPausing) {
                             resetToPreview();
                         } else {
-                            mAlertDialog.show();
+                            showAlertDialog(
+                                    mDialogTitle, mDialogPanoramaFailedString, mDialogOkString);
                         }
                         break;
                     case MSG_RESET_TO_PREVIEW:
                         onBackgroundThreadFinished();
                         resetToPreview();
+                        break;
+                    case MSG_CLEAR_SCREEN_DELAY:
+                        getWindow().clearFlags(WindowManager.LayoutParams.
+                                FLAG_KEEP_SCREEN_ON);
+                        break;
                 }
                 clearMosaicFrameProcessorIfNeeded();
             }
         };
-
-        mAlertDialog = (new AlertDialog.Builder(this))
-                .setTitle(mDialogTitle)
-                .setMessage(R.string.pano_dialog_panorama_failed)
-                .create();
-        mAlertDialog.setCancelable(false);
-        mAlertDialog.setButton(DialogInterface.BUTTON_POSITIVE, mDialogOk,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                        resetToPreview();
-                    }
-                });
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        updateThumbnailButton();
+    @OnClickAttr
+    public void onAlertDialogButtonClicked(View v) {
+        dismissDialog();
+        resetToPreview();
     }
 
     private void setupCamera() {
@@ -577,6 +588,7 @@
         mPanoProgressBar.setIndicatorWidth(20);
         mPanoProgressBar.setMaxProgress(DEFAULT_SWEEP_ANGLE);
         mPanoProgressBar.setVisibility(View.VISIBLE);
+        keepScreenOn();
     }
 
     private void stopCapture(boolean aborted) {
@@ -592,7 +604,7 @@
         mSurfaceTexture.setOnFrameAvailableListener(null);
 
         if (!aborted && !mThreadRunning) {
-            showDialog(mPreparePreviewString);
+            showWaitingDialog(mPreparePreviewString);
             runBackgroundThread(new Thread() {
                 @Override
                 public void run() {
@@ -612,6 +624,7 @@
         }
         // do we have to wait for the thread to complete before enabling this?
         if (mModePicker != null) mModePicker.setEnabled(true);
+        keepScreenOnAwhile();
     }
 
     private void showTooFastIndication() {
@@ -682,7 +695,7 @@
         mSavingProgressBar.setBackgroundColor(appRes.getColor(R.color.pano_progress_empty));
         mSavingProgressBar.setDoneColor(appRes.getColor(R.color.pano_progress_indication));
 
-        mCaptureIndicator = (TextView) findViewById(R.id.pano_capture_indicator);
+        mCaptureIndicator = (RotateLayout) findViewById(R.id.pano_capture_indicator);
 
         mThumbnailView = (RotateImageView) findViewById(R.id.thumbnail);
         mThumbnailView.enableFilter(false);
@@ -702,6 +715,29 @@
         mShutterButton.setOnShutterButtonListener(this);
 
         mPanoLayout = findViewById(R.id.pano_layout);
+
+        mRotateDialog = (RotateLayout) findViewById(R.id.rotate_dialog_layout);
+        mRotateDialogTitleLayout = findViewById(R.id.rotate_dialog_title_layout);
+        mRotateDialogButtonLayout = findViewById(R.id.rotate_dialog_button_layout);
+        mRotateDialogTitle = (TextView) findViewById(R.id.rotate_dialog_title);
+        mRotateDialogTitleSeperator = (View) findViewById(R.id.rotate_dialog_title_divider);
+        mRotateDialogSpinner = (ProgressBar) findViewById(R.id.rotate_dialog_spinner);
+        mRotateDialogText = (TextView) findViewById(R.id.rotate_dialog_text);
+        mRotateDialogButton = (Button) findViewById(R.id.rotate_dialog_button);
+
+        if (getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            Rotatable[] rotateLayout = {
+                    (Rotatable) findViewById(R.id.pano_pan_progress_bar_layout),
+                    (Rotatable) findViewById(R.id.pano_capture_too_fast_textview_layout),
+                    (Rotatable) findViewById(R.id.pano_review_saving_indication_layout),
+                    (Rotatable) findViewById(R.id.pano_saving_progress_bar_layout),
+                    (Rotatable) findViewById(R.id.pano_review_cancel_button_layout),
+                    (Rotatable) mRotateDialog,
+                    (Rotatable) mCaptureIndicator};
+            for (Rotatable r : rotateLayout) {
+                r.setOrientation(270);
+            }
+        }
     }
 
     @Override
@@ -755,6 +791,14 @@
         t.start();
     }
 
+    private void initThumbnailButton() {
+        // Load the thumbnail from the disk.
+        if (mThumbnail == null) {
+            mThumbnail = Thumbnail.loadFrom(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME));
+        }
+        updateThumbnailButton();
+    }
+
     private void updateThumbnailButton() {
         // Update last image if URI is invalid and the storage is ready.
         ContentResolver contentResolver = getContentResolver();
@@ -801,10 +845,39 @@
         reportProgress();
     }
 
-    private void showDialog(String str) {
-          mProgressDialog = new ProgressDialog(this);
-          mProgressDialog.setMessage(str);
-          mProgressDialog.show();
+    private void resetRotateDialog() {
+        mRotateDialogTitleLayout.setVisibility(View.GONE);
+        mRotateDialogSpinner.setVisibility(View.GONE);
+        mRotateDialogButtonLayout.setVisibility(View.GONE);
+    }
+
+    private void dismissDialog() {
+        if (mRotateDialog.getVisibility() != View.INVISIBLE) {
+            mRotateDialog.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    private void showAlertDialog(String title, String msg, String buttonText) {
+        resetRotateDialog();
+
+        mRotateDialogTitle.setText(title);
+        mRotateDialogTitleLayout.setVisibility(View.VISIBLE);
+
+        mRotateDialogText.setText(msg);
+
+        mRotateDialogButton.setText(buttonText);
+        mRotateDialogButtonLayout.setVisibility(View.VISIBLE);
+
+        mRotateDialog.setVisibility(View.VISIBLE);
+    }
+
+    private void showWaitingDialog(String msg) {
+        resetRotateDialog();
+
+        mRotateDialogText.setText(msg);
+        mRotateDialogSpinner.setVisibility(View.VISIBLE);
+
+        mRotateDialog.setVisibility(View.VISIBLE);
     }
 
     private void runBackgroundThread(Thread thread) {
@@ -814,10 +887,7 @@
 
     private void onBackgroundThreadFinished() {
         mThreadRunning = false;
-        if (mProgressDialog != null) {
-            mProgressDialog.dismiss();
-            mProgressDialog = null;
-        }
+        dismissDialog();
     }
 
     private void cancelHighResComputation() {
@@ -951,6 +1021,7 @@
         mMosaicView.onPause();
         clearMosaicFrameProcessorIfNeeded();
         mOrientationEventListener.disable();
+        resetScreenOn();
         System.gc();
     }
 
@@ -968,6 +1039,9 @@
         // has to be decided by camera device.
         initMosaicFrameProcessorIfNeeded();
         mMosaicView.onResume();
+
+        initThumbnailButton();
+        keepScreenOnAwhile();
     }
 
     public MosaicJpeg generateFinalMosaic(boolean highRes) {
@@ -1021,9 +1095,10 @@
         // the screen).
         if (mCameraState != PREVIEW_STOPPED) stopCameraPreview();
 
-        int orientation = Util.getDisplayOrientation(Util.getDisplayRotation(this),
-                CameraHolder.instance().getBackCameraId());
-        mCameraDevice.setDisplayOrientation(orientation);
+        // Set the display orientation to 0, so that the underlying mosaic library
+        // can always get undistorted mPreviewWidth x mPreviewHeight image data
+        // from SurfaceTexture.
+        mCameraDevice.setDisplayOrientation(0);
 
         setPreviewTexture(mSurfaceTexture);
 
@@ -1044,4 +1119,26 @@
         }
         mCameraState = PREVIEW_STOPPED;
     }
+
+    @Override
+    public void onUserInteraction() {
+        super.onUserInteraction();
+        if (mCaptureState != CAPTURE_STATE_MOSAIC) keepScreenOnAwhile();
+    }
+
+    private void resetScreenOn() {
+        mMainHandler.removeMessages(MSG_CLEAR_SCREEN_DELAY);
+        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    }
+
+    private void keepScreenOnAwhile() {
+        mMainHandler.removeMessages(MSG_CLEAR_SCREEN_DELAY);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        mMainHandler.sendEmptyMessageDelayed(MSG_CLEAR_SCREEN_DELAY, SCREEN_DELAY);
+    }
+
+    private void keepScreenOn() {
+        mMainHandler.removeMessages(MSG_CLEAR_SCREEN_DELAY);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    }
 }
diff --git a/src/com/android/camera/ui/AbstractIndicatorButton.java b/src/com/android/camera/ui/AbstractIndicatorButton.java
index a661586..0ff7b19 100644
--- a/src/com/android/camera/ui/AbstractIndicatorButton.java
+++ b/src/com/android/camera/ui/AbstractIndicatorButton.java
@@ -106,10 +106,10 @@
     }
 
     @Override
-    public void setDegree(int degree) {
-        super.setDegree(degree);
+    public void setOrientation(int orientation) {
+        super.setOrientation(orientation);
         if (mPopup != null) {
-            mPopup.setOrientation(degree);
+            mPopup.setOrientation(orientation);
         }
     }
 
diff --git a/src/com/android/camera/ui/ControlPanelLayout.java b/src/com/android/camera/ui/ControlPanelLayout.java
index f85d955..24efb8b 100644
--- a/src/com/android/camera/ui/ControlPanelLayout.java
+++ b/src/com/android/camera/ui/ControlPanelLayout.java
@@ -16,7 +16,9 @@
 
 package com.android.camera.ui;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.RelativeLayout;
@@ -25,8 +27,7 @@
  * A layout which handles the the width of the control panel, which contains
  * the shutter button, thumbnail, front/back camera picker, and mode picker.
  * The purpose of this is to have a consistent width of control panel in camera,
- * camcorder, and panorama modes. The control panel can also be GONE and the
- * preview can expand to full-screen in panorama.
+ * camcorder, and panorama modes.
  */
 public class ControlPanelLayout extends RelativeLayout {
     private static final String TAG = "ControlPanelLayout";
@@ -39,29 +40,43 @@
     protected void onMeasure(int widthSpec, int heightSpec) {
         int widthSpecSize = MeasureSpec.getSize(widthSpec);
         int heightSpecSize = MeasureSpec.getSize(heightSpec);
-        int widthMode = MeasureSpec.getMode(widthSpec);
-        int measuredWidth = 0;
+        int measuredSize = 0;
+        int mode, longSideSize, shortSideSize, specSize;
 
-        if (widthSpecSize > 0 && heightSpecSize > 0 && widthMode == MeasureSpec.AT_MOST) {
-            // Calculate how big 4:3 preview occupies. Then deduct it from the
-            // width of the parent.
-            measuredWidth = (int) (widthSpecSize - heightSpecSize / 3.0 * 4.0 - 16);
+        boolean isLandscape = (((Activity) getContext()).getRequestedOrientation()
+                == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+        if (isLandscape) {
+            mode = MeasureSpec.getMode(widthSpec);
+            longSideSize = widthSpecSize;
+            shortSideSize = heightSpecSize;
+            specSize = widthSpecSize;
         } else {
-            Log.e(TAG, "layout_width of ControlPanelLayout should be wrap_content");
+            mode = MeasureSpec.getMode(heightSpec);
+            longSideSize = heightSpecSize;
+            shortSideSize = widthSpecSize;
+            specSize = heightSpecSize;
         }
 
-        // Make sure the width is bigger than the minimum width.
-        int minWidth = getSuggestedMinimumWidth();
-        if (minWidth > measuredWidth) {
-            measuredWidth = minWidth;
+        if (widthSpecSize > 0 && heightSpecSize > 0 && mode == MeasureSpec.AT_MOST) {
+            // Calculate how big 4:3 preview occupies. Then deduct it from the
+            // width of the parent.
+            measuredSize = (int) (longSideSize - shortSideSize / 3.0 * 4.0);
+        } else {
+            Log.e(TAG, "layout_xxx of ControlPanelLayout should be wrap_content");
         }
 
         // The width cannot be bigger than the constraint.
-        if (widthMode == MeasureSpec.AT_MOST && measuredWidth > widthSpecSize) {
-            measuredWidth = widthSpecSize;
+        if (mode == MeasureSpec.AT_MOST && measuredSize > specSize) {
+            measuredSize = specSize;
         }
 
-        super.onMeasure(MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY),
-                heightSpec);
+        if (isLandscape) {
+            widthSpec = MeasureSpec.makeMeasureSpec(measuredSize, MeasureSpec.EXACTLY);
+        } else {
+            heightSpec = MeasureSpec.makeMeasureSpec(measuredSize, MeasureSpec.EXACTLY);
+        }
+
+        super.onMeasure(widthSpec, heightSpec);
     }
 }
diff --git a/src/com/android/camera/ui/EffectSettingPopup.java b/src/com/android/camera/ui/EffectSettingPopup.java
index c4a4d49..a0f9be0 100644
--- a/src/com/android/camera/ui/EffectSettingPopup.java
+++ b/src/com/android/camera/ui/EffectSettingPopup.java
@@ -180,11 +180,19 @@
     @Override
     public void onItemClick(AdapterView<?> parent, View view,
             int index, long id) {
+        String value;
         if (parent == mSillyFacesGrid) {
-            String value = (String) mSillyFacesItem.get(index).get("value");
-            mPreference.setValue(value);
+            value = (String) mSillyFacesItem.get(index).get("value");
         } else if (parent == mBackgroundGrid) {
-            String value = (String) mBackgroundItem.get(index).get("value");
+            value = (String) mBackgroundItem.get(index).get("value");
+        } else {
+            return;
+        }
+
+        // Tapping the selected effect will deselect it (clear effects).
+        if (value.equals(mPreference.getValue())) {
+            mPreference.setValue(mNoEffect);
+        } else {
             mPreference.setValue(value);
         }
         reloadPreference();
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 9018886..ed59682 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -29,7 +29,7 @@
 import android.util.Log;
 import android.view.View;
 
-public class FaceView extends View implements FocusIndicator {
+public class FaceView extends View implements FocusIndicator, Rotatable {
     private final String TAG = "FaceView";
     private final boolean LOGV = false;
     // The value for android.hardware.Camera.setDisplayOrientation.
diff --git a/src/com/android/camera/ui/IndicatorControl.java b/src/com/android/camera/ui/IndicatorControl.java
index 86b0cc9..cac38b8 100644
--- a/src/com/android/camera/ui/IndicatorControl.java
+++ b/src/com/android/camera/ui/IndicatorControl.java
@@ -35,7 +35,7 @@
  * A view that contains camera setting indicators.
  */
 public abstract class IndicatorControl extends RelativeLayout implements
-        IndicatorButton.Listener, OtherSettingsPopup.Listener {
+        IndicatorButton.Listener, OtherSettingsPopup.Listener, Rotatable {
     private static final String TAG = "IndicatorControl";
     public static final int MODE_CAMERA = 0;
     public static final int MODE_VIDEO = 1;
@@ -45,7 +45,7 @@
     protected CameraPicker mCameraPicker;
 
     private PreferenceGroup mPreferenceGroup;
-    private int mDegree = 0;
+    private int mOrientation = 0;
 
     protected int mCurrentMode = MODE_CAMERA;
 
@@ -61,15 +61,13 @@
         super(context, attrs);
     }
 
-    public void setDegree(int degree) {
-        mDegree = degree;
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
         int count = getChildCount();
         for (int i = 0 ; i < count ; ++i) {
             View view = getChildAt(i);
-            if (view instanceof RotateImageView) {
-                ((RotateImageView) view).setDegree(degree);
-            } else if (view instanceof ZoomControl) {
-                ((ZoomControl) view).setDegree(degree);
+            if (view instanceof Rotatable) {
+                ((Rotatable) view).setOrientation(orientation);
             }
         }
     }
diff --git a/src/com/android/camera/ui/IndicatorControlBar.java b/src/com/android/camera/ui/IndicatorControlBar.java
index 6c2151d..8ab61fd 100644
--- a/src/com/android/camera/ui/IndicatorControlBar.java
+++ b/src/com/android/camera/ui/IndicatorControlBar.java
@@ -87,20 +87,19 @@
 
         int count = getChildCount();
         if (count == 0) return;
-        int width = right - left;
+        int height = bottom - top;
 
-        // First indicator will be CameraPicker if exists.
-        if (mCameraPicker != null) {
-            mCameraPicker.layout(0, padding, width, padding + width);
-        }
+        mSecondLevelIcon.layout(0, 0, height, height);
 
         // Layout the zoom control if required.
-        int offset = padding + width; // the padding and the icon height
+        int offset = padding + height; // the padding and the icon height
         if (mZoomControl != null)  {
-            mZoomControl.layout(0, offset, width, bottom - top - offset);
+            mZoomControl.layout(offset, 0, right - left - offset, height);
         }
 
-        mSecondLevelIcon.layout(0, bottom - top - offset, width, bottom - top);
+        if (mCameraPicker != null) {
+            mCameraPicker.layout(right - left - offset, 0, right - left, height);
+        }
     }
 
     @Override
diff --git a/src/com/android/camera/ui/IndicatorControlBarContainer.java b/src/com/android/camera/ui/IndicatorControlBarContainer.java
index 6b60ace..3c907a8 100644
--- a/src/com/android/camera/ui/IndicatorControlBarContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlBarContainer.java
@@ -43,14 +43,14 @@
     public IndicatorControlBarContainer(Context context, AttributeSet attrs) {
         super(context, attrs);
         mFadeIn = AnimationUtils.loadAnimation(
-                context, R.anim.grow_fade_in_from_top);
+                context, R.anim.first_level_fade_in);
         mFadeOut = AnimationUtils.loadAnimation(
-                context, R.anim.shrink_fade_out_from_bottom);
+                context, R.anim.first_level_fade_out);
         mFadeOut.setAnimationListener(mAnimationListener);
         mSecondLevelFadeIn = AnimationUtils.loadAnimation(
-                context, R.anim.grow_fade_in_from_bottom);
+                context, R.anim.second_level_fade_in);
         mSecondLevelFadeOut = AnimationUtils.loadAnimation(
-                context, R.anim.shrink_fade_out_from_top);
+                context, R.anim.second_level_fade_out);
         mSecondLevelFadeOut.setAnimationListener(mAnimationListener);
     }
 
@@ -75,9 +75,9 @@
                 secondLevelKeys, secondLevelOtherSettingKeys);
     }
 
-    public void setDegree(int degree) {
-        mIndicatorControlBar.setDegree(degree);
-        mSecondLevelIndicatorControlBar.setDegree(degree);
+    public void setOrientation(int orientation) {
+        mIndicatorControlBar.setOrientation(orientation);
+        mSecondLevelIndicatorControlBar.setOrientation(orientation);
     }
 
     @Override
diff --git a/src/com/android/camera/ui/IndicatorControlWheelContainer.java b/src/com/android/camera/ui/IndicatorControlWheelContainer.java
index 14539da..29074c2 100644
--- a/src/com/android/camera/ui/IndicatorControlWheelContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlWheelContainer.java
@@ -191,9 +191,9 @@
     }
 
     @Override
-    public void setDegree(int degree) {
-        mIndicatorControlWheel.setDegree(degree);
-        mZoomControlWheel.setDegree(degree);
+    public void setOrientation(int orientation) {
+        mIndicatorControlWheel.setOrientation(orientation);
+        mZoomControlWheel.setOrientation(orientation);
     }
 
     public void startTimeLapseAnimation(int timeLapseInterval, long startTime) {
diff --git a/src/com/android/camera/ui/OneRowGridView.java b/src/com/android/camera/ui/OneRowGridView.java
new file mode 100644
index 0000000..5e37d35
--- /dev/null
+++ b/src/com/android/camera/ui/OneRowGridView.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.camera.ui;
+
+import com.android.camera.R;
+import com.android.camera.Util;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.GridView;
+
+public class OneRowGridView extends GridView {
+    public OneRowGridView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        // Once we know the number of children in this view, we have to set
+        // the correct width and height for containing the icons in one row.
+        int n = getChildCount();
+        if (n == 0) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        } else {
+            setMeasuredDimension((n * getChildAt(0).getMeasuredWidth()),
+                    getMeasuredHeight());
+        }
+    }
+}
diff --git a/src/com/android/camera/ui/RightAlignedHorizontalScrollView.java b/src/com/android/camera/ui/RightAlignedHorizontalScrollView.java
new file mode 100644
index 0000000..cd4c5f5
--- /dev/null
+++ b/src/com/android/camera/ui/RightAlignedHorizontalScrollView.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.camera.ui;
+
+import android.content.Context;
+import android.view.View;
+import android.util.AttributeSet;
+import android.widget.HorizontalScrollView;
+
+public class RightAlignedHorizontalScrollView extends HorizontalScrollView {
+
+    public RightAlignedHorizontalScrollView(Context context) {
+        super(context);
+    }
+
+    public RightAlignedHorizontalScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        if (changed) {
+            // Get the width of the child, i.e. the LinearLayout, and scroll to
+            // the rightmost position.
+            View child = getChildAt(0);
+            if (child != null) scrollTo(child.getWidth(), 0);
+        }
+   }
+}
diff --git a/src/com/android/camera/ui/RotateImageView.java b/src/com/android/camera/ui/RotateImageView.java
index 390d705..f47a26b 100644
--- a/src/com/android/camera/ui/RotateImageView.java
+++ b/src/com/android/camera/ui/RotateImageView.java
@@ -16,8 +16,6 @@
 
 package com.android.camera.ui;
 
-import com.android.camera.ui.Rotatable;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -66,12 +64,8 @@
         return mTargetDegree;
     }
 
-    public void setOrientation(int orientation) {
-        setDegree(orientation);
-    }
-
     // Rotate the view counter-clockwise
-    public void setDegree(int degree) {
+    public void setOrientation(int degree) {
         // make sure in the range of [0, 359]
         degree = degree >= 0 ? degree % 360 : degree % 360 + 360;
         if (degree == mTargetDegree) return;
diff --git a/src/com/android/camera/ui/RotateLayout.java b/src/com/android/camera/ui/RotateLayout.java
index 24815f8..e66e71a 100644
--- a/src/com/android/camera/ui/RotateLayout.java
+++ b/src/com/android/camera/ui/RotateLayout.java
@@ -16,8 +16,6 @@
 
 package com.android.camera.ui;
 
-import com.android.camera.ui.Rotatable;
-
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
index c9037d9..1fb9a80 100644
--- a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
+++ b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java
@@ -39,7 +39,7 @@
     private View mDivider; // the divider line
     private View mIndicatorHighlight; // the side highlight bar
     private View mPopupedIndicator;
-    int mDegree = 0;
+    int mOrientation = 0;
     int mSelectedIndex = -1;
     // There are some views in the ViewGroup before adding the indicator buttons,
     // such as Close icon, divider line and the hightlight bar, we need to
@@ -64,7 +64,7 @@
         setPreferenceGroup(group);
         mNonIndicatorButtonCount = getChildCount();
         addControls(keys, otherSettingKeys);
-        if (mDegree != 0) setDegree(mDegree);
+        if (mOrientation != 0) setOrientation(mOrientation);
     }
 
     public void onClick(View view) {
@@ -73,20 +73,20 @@
                     OnIndicatorEventListener.EVENT_LEAVE_SECOND_LEVEL_INDICATOR_BAR);
     }
 
-    private int getTouchViewIndex(int y, int height) {
+    private int getTouchViewIndex(int x, int width) {
         // If the current touch location is on close icon and above.
-        if (y < mCloseIcon.getBottom()) return indexOfChild(mCloseIcon);
+        if (x > mCloseIcon.getLeft()) return indexOfChild(mCloseIcon);
 
         // Calculate if the touch event is on the indicator buttons.
         int count = getChildCount();
         if (count == mNonIndicatorButtonCount) return -1;
         // The baseline will be the first indicator button's top minus spacing.
         View firstIndicatorButton = getChildAt(mNonIndicatorButtonCount);
-        int baselineY = firstIndicatorButton.getTop() - (ICON_SPACING / 2);
-        if (y < baselineY) return -1;
-        int iconHeight = firstIndicatorButton.getMeasuredHeight();
-        int buttonRange = iconHeight + ICON_SPACING;
-        return (mNonIndicatorButtonCount + (y - baselineY) / buttonRange);
+        int baselineX = firstIndicatorButton.getRight() + (ICON_SPACING / 2);
+        if (x > baselineX) return -1;
+        int iconWidth = firstIndicatorButton.getMeasuredWidth();
+        int buttonRange = iconWidth + ICON_SPACING;
+        return (mNonIndicatorButtonCount + ((baselineX - x) / buttonRange));
     }
 
     @Override
@@ -98,12 +98,12 @@
 
         double x = (double) event.getX();
         double y = (double) event.getY();
-        int height = getHeight();
-        if (height == 0) return false; // the event is sent before onMeasure()
-        if (x > getWidth()) x = getWidth();
-        if (y >= height) y = height - 1;
+        int width = getWidth();
+        if (width == 0) return false; // the event is sent before onMeasure()
+        if (x > width) x = width;
+        if (y >= getHeight()) y = getHeight() - 1;
 
-        int index = getTouchViewIndex((int) y, height);
+        int index = getTouchViewIndex((int) x, width);
         if (index == -1) return true;
         View b = getChildAt(index);
         b.dispatchTouchEvent(event);
@@ -151,9 +151,9 @@
     }
 
     @Override
-    public void setDegree(int degree) {
-        mDegree = degree;
-        super.setDegree(degree);
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
+        super.setOrientation(orientation);
     }
 
     @Override
@@ -163,26 +163,26 @@
         if (count == 0) return;
         int width = right - left;
         int height = bottom - top;
-        int iconHeight = mCloseIcon.getMeasuredHeight();
-        int padding = getPaddingTop();
-
-        // The first icon is close button.
-        int offsetY = padding;
-        mCloseIcon.layout(0, padding, width, (padding + iconHeight));
-
-        // And layout the divider line.
-        offsetY += (iconHeight + padding);
-        mDivider.layout(padding, offsetY,
-                (width - padding), (offsetY + mDivider.getMeasuredHeight()));
+        int iconWidth = mCloseIcon.getMeasuredWidth();
+        int padding = getPaddingLeft();
 
         // Layout from the last icon up.
-        int startY = height - iconHeight - padding;
-        int decrement = iconHeight + ICON_SPACING;
+        int offsetX = padding;
+        int increment = iconWidth + ICON_SPACING;
         for (int i = count - 1; i >= mNonIndicatorButtonCount; --i) {
-            getChildAt(i).layout(0, startY, width, startY + iconHeight);
-            startY -= decrement;
+            getChildAt(i).layout(offsetX, 0, offsetX + iconWidth, height);
+            offsetX += increment;
         }
 
+        // And layout the divider line.
+        offsetX = width - iconWidth - 2 * padding;
+        mDivider.layout(offsetX, padding, (offsetX + mDivider.getMeasuredWidth()),
+                (height - padding));
+
+        offsetX = width - iconWidth - padding;
+        // The first icon is close button.
+        mCloseIcon.layout(offsetX, 0, (offsetX + iconWidth), height);
+
         // Hightlight the selected indicator if exists.
         if (mPopupedIndicator == null) {
             mIndicatorHighlight.setVisibility(View.GONE);
@@ -190,9 +190,9 @@
             mIndicatorHighlight.setVisibility(View.VISIBLE);
             // Keep the top and bottom of the hightlight the same as
             // the 'active' indicator button.
-            mIndicatorHighlight.layout(0, mPopupedIndicator.getTop(),
-                    mIndicatorHighlight.getLayoutParams().width,
-                    mPopupedIndicator.getBottom());
+            mIndicatorHighlight.layout(mPopupedIndicator.getLeft(), 0,
+                    mPopupedIndicator.getRight(),
+                    mIndicatorHighlight.getLayoutParams().height);
         }
    }
 
diff --git a/src/com/android/camera/ui/SharePopup.java b/src/com/android/camera/ui/SharePopup.java
index de78f66..134b7c0 100644
--- a/src/com/android/camera/ui/SharePopup.java
+++ b/src/com/android/camera/ui/SharePopup.java
@@ -23,6 +23,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
@@ -38,7 +39,7 @@
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ImageView;
-import android.widget.ListView;
+import android.widget.GridView;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.SimpleAdapter;
@@ -50,7 +51,7 @@
 
 // A popup window that contains a big thumbnail and a list of apps to share.
 public class SharePopup extends PopupWindow implements View.OnClickListener,
-        View.OnTouchListener, AdapterView.OnItemClickListener {
+        View.OnTouchListener, AdapterView.OnItemClickListener, Rotatable {
     private static final String TAG = "SharePopup";
     private static final String ADAPTER_COLUMN_ICON = "icon";
     private Context mContext;
@@ -65,7 +66,7 @@
     // A view that contains a list of application icons and the share view.
     private View mRootView;
     // The list of the application icons.
-    private ListView mShareList;
+    private GridView mShareList;
     // A rotated view that contains the thumbnail.
     private RotateLayout mThumbnailRotateLayout;
     private RotateLayout mGotoGalleryRotate;
@@ -114,8 +115,7 @@
         // This is required because popup window is full screen.
         sharePopup.setOnTouchListener(this);
         mThumbnailRotateLayout = (RotateLayout) sharePopup.findViewById(R.id.thumbnail_rotate_layout);
-        mShareList = (ListView) sharePopup.findViewById(R.id.share_list);
-        mShareList.setDivider(null);
+        mShareList = (GridView) sharePopup.findViewById(R.id.share_list);
         mThumbnail = (ImageView) sharePopup.findViewById(R.id.thumbnail);
         mThumbnail.setImageBitmap(bitmap);
         mShareView = (ViewGroup) sharePopup.findViewById(R.id.share_view);
@@ -279,10 +279,19 @@
             items.add(map);
             mComponent.add(component);
         }
+
+        // On phone UI, we have to know how many icons in the grid view before
+        // the view is measured.
+        if (((Activity) mContext).getRequestedOrientation()
+                == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            mShareList.setNumColumns(items.size());
+        }
+
         SimpleAdapter listItemAdapter = new MySimpleAdapter(mContext, items,
                 R.layout.share_icon,
                 new String[] {ADAPTER_COLUMN_ICON},
                 new int[] {R.id.icon});
+
         listItemAdapter.setViewBinder(mViewBinder);
         mShareList.setAdapter(listItemAdapter);
         mShareList.setOnItemClickListener(this);
diff --git a/src/com/android/camera/ui/ZoomControl.java b/src/com/android/camera/ui/ZoomControl.java
index 1809d18..f2971cd 100644
--- a/src/com/android/camera/ui/ZoomControl.java
+++ b/src/com/android/camera/ui/ZoomControl.java
@@ -29,7 +29,7 @@
  * A view that contains camera zoom control which could adjust the zoom in/out
  * if the camera supports zooming.
  */
-public abstract class ZoomControl extends RelativeLayout {
+public abstract class ZoomControl extends RelativeLayout implements Rotatable {
     // The states of zoom button.
     public static final int ZOOM_IN = 0;
     public static final int ZOOM_OUT = 1;
@@ -42,7 +42,7 @@
     protected ImageView mZoomOut;
     protected ImageView mZoomSlider;
     protected int mSliderPosition = 0;
-    protected int mDegree;
+    protected int mOrientation;
     private Handler mHandler;
 
     public interface OnZoomChangedListener {
@@ -208,13 +208,13 @@
         return true;
     }
 
-    public void setDegree(int degree) {
-        mDegree = degree;
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
         int count = getChildCount();
         for (int i = 0 ; i < count ; ++i) {
             View view = getChildAt(i);
             if (view instanceof RotateImageView) {
-                ((RotateImageView) view).setDegree(degree);
+                ((RotateImageView) view).setOrientation(orientation);
             }
         }
     }
diff --git a/src/com/android/camera/ui/ZoomControlBar.java b/src/com/android/camera/ui/ZoomControlBar.java
index 08042d4..4e572cf 100644
--- a/src/com/android/camera/ui/ZoomControlBar.java
+++ b/src/com/android/camera/ui/ZoomControlBar.java
@@ -36,9 +36,9 @@
     private View mBar;
     private boolean mStartChanging;
     private int mSliderLength;
-    private int mHeight;
-    private int mIconHeight;
-    private int mTotalIconHeight;
+    private int mWidth;
+    private int mIconWidth;
+    private int mTotalIconWidth;
 
     public ZoomControlBar(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -53,16 +53,16 @@
         mBar.setActivated(activated);
     }
 
-    private int getSliderPosition(int y) {
+    private int getSliderPosition(int x) {
         // Calculate the absolute offset of the slider in the zoom control bar.
         // For left-hand users, as the device is rotated for 180 degree for
         // landscape mode, the zoom-in bottom should be on the top, so the
         // position should be reversed.
         int pos; // the relative position in the zoom slider bar
-        if (mDegree == 180) {
-            pos = y - mTotalIconHeight;
+        if (mOrientation == 90) {
+            pos = mWidth - mTotalIconWidth - x;
         } else {
-            pos = mHeight - mTotalIconHeight - y;
+            pos = x - mTotalIconWidth;
         }
         if (pos < 0) pos = 0;
         if (pos > mSliderLength) pos = mSliderLength;
@@ -71,15 +71,15 @@
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        mHeight = h;
-        mIconHeight = mZoomIn.getMeasuredHeight();
-        mTotalIconHeight = mIconHeight + ICON_SPACING;
-        mSliderLength = mHeight - (2 * mTotalIconHeight);
+        mWidth = w;
+        mIconWidth = mZoomIn.getMeasuredWidth();
+        mTotalIconWidth = mIconWidth + ICON_SPACING;
+        mSliderLength = mWidth  - (2 * mTotalIconWidth);
     }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
-        if (!isEnabled() || (mHeight == 0)) return false;
+        if (!isEnabled() || (mWidth == 0)) return false;
         int action = event.getAction();
 
         switch (action) {
@@ -94,7 +94,7 @@
                 setActivated(true);
                 mStartChanging = false;
             case MotionEvent.ACTION_MOVE:
-                int pos = getSliderPosition((int) event.getY());
+                int pos = getSliderPosition((int) event.getX());
                 if (!mStartChanging) {
                     // Make sure the movement is large enough before we start
                     // changing the zoom.
@@ -114,18 +114,18 @@
     }
 
     @Override
-    public void setDegree(int degree) {
+    public void setOrientation(int orientation) {
         // layout for the left-hand camera control
-        if ((degree == 180) || (mDegree == 180)) requestLayout();
-        super.setDegree(degree);
+        if ((orientation == 90) || (mOrientation == 90)) requestLayout();
+        super.setOrientation(orientation);
     }
 
     @Override
     protected void onLayout(
             boolean changed, int left, int top, int right, int bottom) {
         if (mZoomMax == 0) return;
-        int width = right - left;
-        mBar.layout(0, mTotalIconHeight, width, mHeight - mTotalIconHeight);
+        int height = bottom - top;
+        mBar.layout(mTotalIconWidth, 0, mWidth - mTotalIconWidth, height);
         // For left-hand users, as the device is rotated for 180 degree,
         // the zoom-in button should be on the top.
         int pos; // slider position
@@ -135,18 +135,18 @@
         } else {
             sliderPosition = (int) ((double) mSliderLength * mZoomIndex / mZoomMax);
         }
-        if (mDegree == 180) {
-            mZoomOut.layout(0, 0, width, mIconHeight);
-            mZoomIn.layout(0, mHeight - mIconHeight, width, mHeight);
-            pos = mBar.getTop() + sliderPosition;
+        if (mOrientation == 90) {
+            mZoomIn.layout(0, 0, mIconWidth, height);
+            mZoomOut.layout(mWidth - mIconWidth, 0, mWidth, height);
+            pos = mBar.getRight() - sliderPosition;
         } else {
-            mZoomIn.layout(0, 0, width, mIconHeight);
-            mZoomOut.layout(0, mHeight - mIconHeight, width, mHeight);
-            pos = mBar.getBottom() - sliderPosition;
+            mZoomOut.layout(0, 0, mIconWidth, height);
+            mZoomIn.layout(mWidth - mIconWidth, 0, mWidth, height);
+            pos = mBar.getLeft() + sliderPosition;
         }
-        int sliderHeight = mZoomSlider.getMeasuredHeight();
-        mZoomSlider.layout(0, (pos - sliderHeight / 2),
-                width, (pos + sliderHeight / 2));
+        int sliderWidth = mZoomSlider.getMeasuredWidth();
+        mZoomSlider.layout((pos - sliderWidth / 2), 0,
+                (pos + sliderWidth / 2), height);
     }
 
     @Override