auto import from //branches/cupcake_rel/...@140373

35 files changed, 93 insertions, 46 deletions

diff --git a/res/drawable/frame_thumbnail_default.png b/res/drawable/frame_thumbnail_default.png
index 3db932e..a7498db 100644
--- a/res/drawable/frame_thumbnail_default.png
+++ b/res/drawable/frame_thumbnail_default.png
diff --git a/res/drawable/frame_thumbnail_pressed.png b/res/drawable/frame_thumbnail_pressed.png
index b15aea7..ebc6855 100644
--- a/res/drawable/frame_thumbnail_pressed.png
+++ b/res/drawable/frame_thumbnail_pressed.png
diff --git a/res/drawable/frame_thumbnail_selected.png b/res/drawable/frame_thumbnail_selected.png
index 408b14a..429a318 100644
--- a/res/drawable/frame_thumbnail_selected.png
+++ b/res/drawable/frame_thumbnail_selected.png
diff --git a/res/drawable/ic_btn_camera_default_background.png b/res/drawable/ic_btn_camera_default_background.png
index c37a86e..5dac9c1 100644
--- a/res/drawable/ic_btn_camera_default_background.png
+++ b/res/drawable/ic_btn_camera_default_background.png
diff --git a/res/drawable/ic_btn_camera_pressed_background.png b/res/drawable/ic_btn_camera_pressed_background.png
index 8707b8a..ebc6855 100644
--- a/res/drawable/ic_btn_camera_pressed_background.png
+++ b/res/drawable/ic_btn_camera_pressed_background.png
diff --git a/res/drawable/ic_btn_camera_selected_background.png b/res/drawable/ic_btn_camera_selected_background.png
index a6bbdb1..429a318 100644
--- a/res/drawable/ic_btn_camera_selected_background.png
+++ b/res/drawable/ic_btn_camera_selected_background.png
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index c326c04..02d8430 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -36,7 +36,7 @@
         android:focusable="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="50dip"
+        android:layout_marginRight="10dip"
         android:layout_marginTop="10dip"
         android:scaleType="center" />
 
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index f1c746b..bafcd09 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -50,7 +50,7 @@
 		android:focusable="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="50dip"
+        android:layout_marginRight="10dip"
         android:layout_marginTop="10dip"
         android:scaleType="center"/>
 
@@ -81,7 +81,7 @@
 			android:id="@+id/post_picture_panel"
 			android:layout_alignTop="@id/shutter_button"
 			android:layout_toLeftOf="@id/shutter_button"
-            android:layout_marginRight="15dip"
+            android:layout_marginRight="38dip"
 			android:layout_width="wrap_content" 
 			android:layout_height="wrap_content"
 			android:orientation="horizontal">
@@ -123,5 +123,15 @@
 			style="@style/OnscreenActionIcon"
 		/>
 	</LinearLayout>
+    <ImageView
+        android:visibility="visible"
+        android:id="@+id/last_picture_button"
+        android:layout_width="72dip"
+        android:layout_height="72dip"
+        android:clickable="true"
+        android:focusable="false"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="10dip"
+        android:layout_marginTop="10dip" />
 </RelativeLayout>
-
diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml
index 99d76b0..b0d2034 100644
--- a/res/layout/viewimage.xml
+++ b/res/layout/viewimage.xml
@@ -87,7 +87,7 @@
 		android:focusable="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="50dip"
+        android:layout_marginRight="10dip"
         android:layout_marginTop="10dip"
 		android:scaleType="center"/>
 	
@@ -96,7 +96,7 @@
             android:id="@+id/action_icon_panel"
 			android:layout_alignBottom="@id/shutter_button"
 			android:layout_toLeftOf="@id/shutter_button"
-            android:layout_marginRight="15dip"
+            android:layout_marginRight="38dip"
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
             android:orientation="horizontal">
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b0e06c1..4a84d72 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Mazání..."</string>
     <string name="no_way_to_share_image">"Tuto fotografii nelze sdílet."</string>
     <string name="no_way_to_share_video">"Toto video nelze sdílet."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galerie"</string>
     <string name="camera_pick_wallpaper">"Fotografie"</string>
     <string name="camera_setas_wallpaper">"Tapeta"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Pokračovat v přehrávání"</string>
     <string name="resume_playing_restart">"Začít znovu"</string>
     <string name="gadget_title">"Rámeček fotografie"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c166287..5b6cae5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -59,6 +59,7 @@
     <string name="camera_tossing">"Löschvorgang..."</string>
     <string name="no_way_to_share_image">"Dieses Bild kann nicht weitergeleitet werden."</string>
     <string name="no_way_to_share_video">"Dieses Video kann nicht weitergeleitet werden."</string>
+    <string name="video_play">"Play"</string>
     <string name="camera_gallery_photos_text">"Galerie"</string>
     <string name="camera_pick_wallpaper">"Bilder"</string>
     <string name="camera_setas_wallpaper">"Hintergrund"</string>
@@ -147,9 +148,10 @@
     <string name="resume_playing_resume">"Mit Wiedergabe fortfahren"</string>
     <string name="resume_playing_restart">"Starten"</string>
     <string name="gadget_title">"Bildrahmen"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5225151..d000e7e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Eliminando..."</string>
     <string name="no_way_to_share_image">"Esta imagen no se puede compartir."</string>
     <string name="no_way_to_share_video">"Este vídeo no se puede compartir."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galería"</string>
     <string name="camera_pick_wallpaper">"Imágenes"</string>
     <string name="camera_setas_wallpaper">"Fondo de pantalla"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Reanudar reproducción"</string>
     <string name="resume_playing_restart">"Volver a reproducir"</string>
     <string name="gadget_title">"Picture frame"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f0e6a1f..4908916 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Suppression..."</string>
     <string name="no_way_to_share_image">"Impossible de partager cette image."</string>
     <string name="no_way_to_share_video">"Cette vidéo ne peut pas être partagée."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galerie"</string>
     <string name="camera_pick_wallpaper">"Images"</string>
     <string name="camera_setas_wallpaper">"Arrière-plan"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Reprendre la lecture"</string>
     <string name="resume_playing_restart">"Démarrer"</string>
     <string name="gadget_title">"Cadre d\'image"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3db66bc..e92e78f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Eliminazione..."</string>
     <string name="no_way_to_share_image">"Impossibile condividere la foto."</string>
     <string name="no_way_to_share_video">"Impossibile condividere il video."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galleria"</string>
     <string name="camera_pick_wallpaper">"Foto"</string>
     <string name="camera_setas_wallpaper">"Sfondo"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Riprendi riproduzione"</string>
     <string name="resume_playing_restart">"Ricomincia"</string>
     <string name="gadget_title">"Cornice immagine"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f5e5b1b..290cd6b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"削除中..."</string>
     <string name="no_way_to_share_image">"この写真は共有できません。"</string>
     <string name="no_way_to_share_video">"この動画は共有できません。"</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"ギャラリー"</string>
     <string name="camera_pick_wallpaper">"写真"</string>
     <string name="camera_setas_wallpaper">"壁紙"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"再生を再開"</string>
     <string name="resume_playing_restart">"最初から再生"</string>
     <string name="gadget_title">"写真フレーム"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 304b544..0b653ac 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"삭제 중..."</string>
     <string name="no_way_to_share_image">"공유할 수 없는 사진입니다."</string>
     <string name="no_way_to_share_video">"공유할 수 없는 동영상입니다."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"갤러리"</string>
     <string name="camera_pick_wallpaper">"사진"</string>
     <string name="camera_setas_wallpaper">"배경화면"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"재생 다시 시작"</string>
     <string name="resume_playing_restart">"시작"</string>
     <string name="gadget_title">"사진 프레임"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c268ecb..f15a058 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Sletter…"</string>
     <string name="no_way_to_share_image">"Bildet kan ikke deles."</string>
     <string name="no_way_to_share_video">"Videoen kan ikke deles."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galleri"</string>
     <string name="camera_pick_wallpaper">"Bilder"</string>
     <string name="camera_setas_wallpaper">"Bakgrunnsbilder"</string>
@@ -147,10 +149,10 @@
     <string name="resume_playing_resume">"Fortsett avspilling"</string>
     <string name="resume_playing_restart">"Begynn på nytt"</string>
     <string name="gadget_title">"Bilderamme"</string>
-    <!-- no translation found for video_file_name_format (8555507706353616970) -->
-    <skip />
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c02a861..5cc88eb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Verwijderen..."</string>
     <string name="no_way_to_share_image">"Deze foto kan niet worden gedeeld."</string>
     <string name="no_way_to_share_video">"Deze video kan niet worden gedeeld."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galerij"</string>
     <string name="camera_pick_wallpaper">"Foto\'s"</string>
     <string name="camera_setas_wallpaper">"Achtergrond"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Afspelen hervatten"</string>
     <string name="resume_playing_restart">"Opnieuw starten"</string>
     <string name="gadget_title">"Fotolijstje"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7023e80..ec05944 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Trwa usuwanie…"</string>
     <string name="no_way_to_share_image">"Nie można przesłać tego zdjęcia."</string>
     <string name="no_way_to_share_video">"Nie można przesłać tego filmu."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Galeria"</string>
     <string name="camera_pick_wallpaper">"Zdjęcia"</string>
     <string name="camera_setas_wallpaper">"Tapeta"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Wznów odtwarzanie"</string>
     <string name="resume_playing_restart">"Rozpocznij"</string>
     <string name="gadget_title">"Ramka zdjęcia"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 34cbfd3..92d2f2e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"Идет удаление…"</string>
     <string name="no_way_to_share_image">"Отправить это изображение нельзя."</string>
     <string name="no_way_to_share_video">"Отправить это видео нельзя."</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"Галерея"</string>
     <string name="camera_pick_wallpaper">"Изображения"</string>
     <string name="camera_setas_wallpaper">"Фоновый рисунок"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"Продолжить воспроизведение"</string>
     <string name="resume_playing_restart">"Начать с начала"</string>
     <string name="gadget_title">"Рамка фотографии"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f89c694..e0161d9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"正在删除..."</string>
     <string name="no_way_to_share_image">"无法共享此图片。"</string>
     <string name="no_way_to_share_video">"无法共享此视频。"</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"图片库"</string>
     <string name="camera_pick_wallpaper">"图片"</string>
     <string name="camera_setas_wallpaper">"壁纸"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"重新播放"</string>
     <string name="resume_playing_restart">"重新开始"</string>
     <string name="gadget_title">"相框"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 0583b87..dfbf090 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -15,8 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for pref_camera_videoquality_entries:0 (4921712231611437934) -->
-    <!-- no translation found for pref_camera_videoquality_entries:1 (3206329580124804732) -->
+    <!-- no translation found for pref_camera_videoquality_entries:0 (4155278146225809483) -->
+    <!-- no translation found for pref_camera_videoquality_entries:1 (2439895494739176281) -->
   <string-array name="pref_camera_videoquality_entryvalues">
     <item>"0"</item>
     <item>"1"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c311294..dceb5eb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -59,6 +59,8 @@
     <string name="camera_tossing">"刪除中…"</string>
     <string name="no_way_to_share_image">"此相片無法分享。"</string>
     <string name="no_way_to_share_video">"此影片無法分享。"</string>
+    <!-- no translation found for video_play (5287787282508002895) -->
+    <skip />
     <string name="camera_gallery_photos_text">"圖庫"</string>
     <string name="camera_pick_wallpaper">"相片"</string>
     <string name="camera_setas_wallpaper">"桌布"</string>
@@ -147,9 +149,10 @@
     <string name="resume_playing_resume">"繼續播放"</string>
     <string name="resume_playing_restart">"重新開始"</string>
     <string name="gadget_title">"相框"</string>
-    <string name="video_file_name_format">"\'video\'-yyyy-MM-dd-HH-mm-ss"</string>
     <!-- no translation found for file_info_title (1628963357466012538) -->
     <skip />
     <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
     <skip />
+    <!-- no translation found for too_large_to_attach (8944461117941172986) -->
+    <skip />
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0121bd1..cea087d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -151,7 +151,7 @@
     <!-- Toast after trying to share a video indicating that there are no applications which are capable of so doing. -->
     <string name="no_way_to_share_video">This video cannot be shared.</string>
 
-    <!-- Do not translate -->
+    <!-- Menu item for playing the video. -->
     <string name="video_play">Play</string>
 
     <!-- Button indicating to go to the image gallery -->
@@ -447,7 +447,7 @@
     
     <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat.
          Do not localize -->
-    <string name="video_file_name_format">"'video'-yyyy-MM-dd-HH-mm-ss"</string>
+    <string name="video_file_name_format" translatable="false">"'video'-yyyy-MM-dd-HH-mm-ss"</string>
 
     <!-- Title for the file information dialog -->
     <string name="file_info_title">File info:</string>