Merge "Import translations. DO NOT MERGE"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6c4c376..88ddb9f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Prente en video\'s"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalery"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Geen foto\'s nie."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Gesnoeide prent gestoor in <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Gesnoeide prent is nie gestoor nie."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Geen albums beskikbaar nie."</string>
     <string name="empty_album" msgid="4542880442593595494">"O prente/video\'s beskikbaar."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ea664ea..6f8a39e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"ምስሎች &amp; ቪዲዮዎች"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"የፎቶ ሥነ ጥበብ ማዕከል"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"ምንም ፎቶዎች የሉም፡፡"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"የተከረከመ ምስል <xliff:g id="FOLDER_NAME">%s</xliff:g> ላይ ተቀምጧል።"</string>
     <string name="crop_not_saved" msgid="3400773981839556">"የተከረከመው ምስል አልተቀመጠም::"</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"ምንም አልበሞች አልተገኙም::"</string>
     <string name="empty_album" msgid="4542880442593595494">"O ምስሎች/ ቪዲዮዎች ማግኘት ይቻላል::"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bed39aa..bb9fed1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"الصور ومقاطع الفيديو"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"معرض الصور"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"ليست هناك أية صور."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"تم حفظ الصورة التي تم اقتصاصها في <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"لم يتم حفظ الصورة التي تم اقتصاصها."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"ليست هناك أية ألبومات متاحة."</string>
     <string name="empty_album" msgid="4542880442593595494">"لا تتوفر أية صور/مقاطع فيديو."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b6924b1..d2b64d3 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Выявы і відэа"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Фотагалерэя"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Фатаграфій няма"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Абрэзаная выява захавана ў тэчцы <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Абрэзаная выява не захавана."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Няма альбомаў."</string>
     <string name="empty_album" msgid="4542880442593595494">"Выяў/вiдэа: 0."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5f7b7b0..bc908a3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Изображения и видеоклипове"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Фотогалерия"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Няма снимки."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Подрязаното изображение е запазено в/ъв „<xliff:g id="FOLDER_NAME">%s</xliff:g>“."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Подрязаното изображение не бе запазено."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Няма налични албуми."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 изображения/видеоклипове са налице."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e8fa4e9..9f36f53 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Imatges i vídeos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galeria de fotos"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Sense fotos."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"S\'ha desat la imatge retallada a <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"La imatge retallada no s\'ha desat."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"No hi ha àlbums disponibles."</string>
     <string name="empty_album" msgid="4542880442593595494">"O imatges/vídeos disponibles."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 732f2e2..dc7efa4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Obrázky a videa"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galerie fotografií"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Žádné fotky."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Ořezaný snímek byl uložen do složky <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Ořezaný snímek není uložen."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Žádné album není k dispozici."</string>
     <string name="empty_album" msgid="4542880442593595494">"Žádné obrázky ani videa nejsou k dispozici."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index abd3284..52ab8eb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Billeder og videoer"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Billedgalleri"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Ingen billeder."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Det beskårne billede er gemt i <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Det beskårne billede blev ikke gemt."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Ingen tilgængelige albummer."</string>
     <string name="empty_album" msgid="4542880442593595494">"O tilgængelige billeder/videoer."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f2dc98e..ed7231c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Bilder und Videos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalerie"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Keine Fotos vorhanden"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Zugeschnittenes Bild gespeichert in <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Zugeschnittenes Bild wurde nicht gespeichert."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Keine Alben verfügbar"</string>
     <string name="empty_album" msgid="4542880442593595494">"Keine Bilder oder Videos vorhanden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4ecd5c3..baf9334 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Εικόνες και βίντεο"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Συλλογή φωτογραφιών"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Δεν υπάρχουν φωτογραφίες."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Η αποκομμένη εικόνα αποθηκεύτηκε στον φάκελο <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Δεν αποθηκεύτηκε η αποκομένη εικόνα."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Δεν υπάρχουν διαθέσιμα λευκώματα."</string>
     <string name="empty_album" msgid="4542880442593595494">"Δεν υπάρχουν διαθέσιμες εικόνες/βίντεο."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fe65c3b..df12bdd 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Images &amp; videos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Photo Gallery"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"No photos."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Cropped image saved to <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Cropped image wasn\'t saved."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"No albums available."</string>
     <string name="empty_album" msgid="4542880442593595494">"O images/videos available."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0523bf4..c02ff8f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Imágenes y vídeos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galería de fotos"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"No hay fotos."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"La imagen recortada se ha guardado en <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"No se ha guardado la imagen recortada."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"No hay álbumes disponibles."</string>
     <string name="empty_album" msgid="4542880442593595494">"No hay imágenes ni vídeos disponibles."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 3d43146..d48fffa 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Kujutised ja videod"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalerii"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Fotod puuduvad."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Kärbitud kujutis salvestati kausta <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Kärbitud kujutist ei salvestatud."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Ühtegi albumit pole saadaval."</string>
     <string name="empty_album" msgid="4542880442593595494">"O kujutist/videot on saadaval."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index be3056a..25489d2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"تصاویر و ویدیوها"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"گالری عکس"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"عکسی موجود نیست."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"تصویر بریده شده در <xliff:g id="FOLDER_NAME">%s</xliff:g> ذخیره شد."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"تصویر برش‌خورده ذخیره نشد."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"آلبومی موجود نیست."</string>
     <string name="empty_album" msgid="4542880442593595494">"O تصویر/ویدیو موجود است."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 16075c4..34554c4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Kuvat ja videot"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Kuvagalleria"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Ei valokuvia."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Rajattu kuva tallennettu kansioon <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Rajattua kuvaa ei tallennettu."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Ei albumeja käytettävissä."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 kuvaa/videota saatavilla."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0e054b6..427038a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Images et vidéos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galerie photos"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Aucune photo"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Image rognée enregistrée dans <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"L\'image rognée n\'a pas été enregistrée."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Aucun album disponible."</string>
     <string name="empty_album" msgid="4542880442593595494">"Aucune image/vidéo disponible."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 675aebd..4156ddd 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"छवियां और वीडियो"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"फ़ोटो गैलरी"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"कोई फ़ोटो नहीं."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"काट-छांट की गई छवि को <xliff:g id="FOLDER_NAME">%s</xliff:g> में सहेजा गया."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"काट-छांट की गई छवि को नहीं सहेजा गया."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"कोई एल्‍बम उपलब्‍ध नहीं."</string>
     <string name="empty_album" msgid="4542880442593595494">"O छवियां/वीडियो उपलब्‍ध."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index df1061d..73e4a75 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -46,7 +46,7 @@
     <string name="wallpaper" msgid="140165383777262070">"Postavljanje pozadinske slike…"</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Pozadinska slika"</string>
     <string name="delete" msgid="2839695998251824487">"Izbriši"</string>
-    <string name="confirm_action" msgid="1642211585193899041">"Potvrdi brisanje?"</string>
+    <string name="confirm_action" msgid="1642211585193899041">"Potvrditi brisanje?"</string>
     <string name="confirm" msgid="8646870096527848520">"Potvrdi"</string>
     <string name="cancel" msgid="3637516880917356226">"Odustani"</string>
     <string name="share" msgid="3619042788254195341">"Podijeli"</string>
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Slike i videozapisi"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galerija fotografija"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nema fotografija."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Obrezana slika spremljena u mapu <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Obrezana slika nije spremljena."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nema dostupnih albuma."</string>
     <string name="empty_album" msgid="4542880442593595494">"Dostupno je 0 slika/videozapisa."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c2649c4..1fdc39c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Képek és videók"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotógaléria"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nincsenek fényképek."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"A vágott képet a(z) <xliff:g id="FOLDER_NAME">%s</xliff:g> mappába mentettük."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"A vágott kép nincs elmentve."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nincs elérhető album."</string>
     <string name="empty_album" msgid="4542880442593595494">"Nincs elérhető kép/videó."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 161f3e6..b72fb0b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -78,7 +78,7 @@
     <string name="no_such_item" msgid="5315144556325243400">"Tidak dapat menemukan item."</string>
     <string name="edit" msgid="1502273844748580847">"Edit"</string>
     <string name="activity_not_found" msgid="5619154886080878023">"Tak ada apl tersedia untuk menyelesaikan tindakan."</string>
-    <string name="process_caching_requests" msgid="8722939570307386071">"Memproses permintaan menyimpan ke tembolok"</string>
+    <string name="process_caching_requests" msgid="8722939570307386071">"Memproses permintaan menyimpan ke cache"</string>
     <string name="caching_label" msgid="4521059045896269095">"Smpn ke tmbolok"</string>
     <string name="crop_action" msgid="3427470284074377001">"Pangkas"</string>
     <string name="set_as" msgid="3636764710790507868">"Setel sebagai"</string>
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Gambar &amp; video"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galeri Foto"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Tidak ada foto."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Gambar yang dipotong disimpan ke <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Gambar yang dipangkas tidak disimpan."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Tidak ada album yang tersedia."</string>
     <string name="empty_album" msgid="4542880442593595494">"O gambar/video tersedia."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b8f992e..3437b11 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Immagini e video"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galleria fotografica"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nessuna foto."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Immagine ritagliata salvata in <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"L\'immagine ritagliata non è stata salvata."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nessun album disponibile."</string>
     <string name="empty_album" msgid="4542880442593595494">"Nessun video/immagine disponibile."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c4f34da..1462f42 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"תמונות וסרטונים"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"גלריית תמונות"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"אין תמונות."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"התמונה שנחתכה נשמרה ב-<xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"התמונה החתוכה לא נשמרה."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"אין אלבומים זמינים."</string>
     <string name="empty_album" msgid="4542880442593595494">"O תמונות/סרטוני וידאו זמינים."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 33058e0..8b695d6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"画像と動画"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"フォトギャラリー"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"画像がありません。"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"トリミングした画像を<xliff:g id="FOLDER_NAME">%s</xliff:g>に保存しました。"</string>
     <string name="crop_not_saved" msgid="3400773981839556">"トリミングした画像は保存されていません。"</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"使用できるアルバムはありません。"</string>
     <string name="empty_album" msgid="4542880442593595494">"使用できる画像/動画: 0件"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e03d12e..698a4e4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"이미지 및 동영상"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"사진 갤러리"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"사진이 없습니다."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"잘린 이미지가 <xliff:g id="FOLDER_NAME">%s</xliff:g>에 저장되었습니다."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"잘린 이미지가 저장되지 않았습니다."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"사용할 수 있는 앨범이 없습니다."</string>
     <string name="empty_album" msgid="4542880442593595494">"사용할 수 있는 이미지/동영상이 없습니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index da8f10b..343044a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Vaizdai ir vaizdo įrašai"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Nuotraukų galerija"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nėra nuotraukų."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Apkarpytas vaizdas išsaugotas aplanke <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Apkarpytas vaizdas neišsaugotas."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nėra pasiekiamų albumų."</string>
     <string name="empty_album" msgid="4542880442593595494">"Nepasiekiami jokie vaizdai / vaizdo įrašai."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0dce0a5..f3254dd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Attēli un videoklipi"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalerija"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nav fotoattēlu."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Apgrieztais attēls ir saglabāts mapē <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Izgrieztais attēls netika saglabāts."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nav pieejams neviens albums."</string>
     <string name="empty_album" msgid="4542880442593595494">"Nav pieejams neviens attēls/videoklips."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c1b30d2..559ba4c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Bilder og videoer"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalleri"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Ingen bilder."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Det beskårede bildet er lagret i <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Beskåret bilde ble ikke lagret."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Ingen album tilgjengelig."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 bilder/videoer tilgjengelig."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bf000c0..d899138 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Afbeeldingen en video\'s"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalerij"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Geen foto\'s."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Bijgesneden afbeelding is opgeslagen in <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Bijgesneden afbeelding is niet opgeslagen."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Geen albums beschikbaar."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 afbeeldingen/video\'s beschikbaar."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ee9dbcb..f2cf2a7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -46,10 +46,8 @@
     <string name="wallpaper" msgid="140165383777262070">"Ustawianie tapety…"</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Tapeta"</string>
     <string name="delete" msgid="2839695998251824487">"Usuń"</string>
-    <!-- no translation found for confirm_action (1642211585193899041) -->
-    <skip />
-    <!-- no translation found for confirm (8646870096527848520) -->
-    <skip />
+    <string name="confirm_action" msgid="1642211585193899041">"Potwierdzasz usunięcie?"</string>
+    <string name="confirm" msgid="8646870096527848520">"Potwierdź"</string>
     <string name="cancel" msgid="3637516880917356226">"Anuluj"</string>
     <string name="share" msgid="3619042788254195341">"Udostępnij"</string>
     <string name="select_all" msgid="3403283025220282175">"Zaznacz wszystkie"</string>
@@ -101,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Obrazy i filmy"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galeria zdjęć"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Brak zdjęć"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Przycięty obraz zapisano w <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Przycięty obraz nie został zapisany."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Brak dostępnych albumów"</string>
     <string name="empty_album" msgid="4542880442593595494">"O dostępnych obrazów/filmów"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 93d2123..54761d7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Imagens e vídeos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galeria de fotografias"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Não existem fotografias."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Imagem recortada guardada em <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"A imagem recortada não foi guardada."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nenhum álbum disponível."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 imagens/vídeos disponíveis."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 072312e..f294f9f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Imagens e vídeos"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galeria de fotos"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nenhuma foto."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"A imagem cortada foi salva em <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"A imagem cortada não foi salva."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nenhum álbum disponível."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 imagens/vídeos disponíveis."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d1e766e..7ec1cf5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Imagini şi videoclipuri"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Galerie foto"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Nicio fotografie."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Imaginea decupată a fost salvată în <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Imaginea decupată nu a fost salvată."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nu există albume disponibile."</string>
     <string name="empty_album" msgid="4542880442593595494">"Nu există imagini/videoclipuri disponibile."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ce16718..47d3ef1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Изображения и видео"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Фотогалерея"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Нет фотографий"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Обрезанное изображение сохранено в папке <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Изображение не сохранено."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Нет доступных альбомов."</string>
     <string name="empty_album" msgid="4542880442593595494">"Нет фото/видео"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2a0b000..f18eae2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Obrázky a videá"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogaléria"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Žiadne fotografie."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Orezaný obrázok bol uložený do priečinka <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Orezaný obrázok nebol uložený."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Nie sú k dispozícii žiadne albumy."</string>
     <string name="empty_album" msgid="4542880442593595494">"Počet obrázkov / videí k dispozícii: 0"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b4913ff..b11bf07 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Slike in videoposnetki"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalerija"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Ni fotografij."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Obrezana slika je shranjena v mapi <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Obrezana slika ni bila shranjena."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Ni albumov."</string>
     <string name="empty_album" msgid="4542880442593595494">"Na voljo 0 slik oz. videoposnetkov."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9fced33..b838818 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Слике и видео снимци"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Фото-галерија"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Нема фотографија."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Опсечена слика је сачувана у директоријуму <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Опсечена слика није сачувана."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Ниједан албум није доступан."</string>
     <string name="empty_album" msgid="4542880442593595494">"Доступно је 0 слика/видео снимака."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2f4c152..f89db3c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Bilder och videor"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotogalleri"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Inga foton."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Den beskurna bilden har sparats i <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Den beskurna bilden sparades inte."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Det finns inga album."</string>
     <string name="empty_album" msgid="4542880442593595494">"Det finns inga bilder/videor."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6dfa5b3..ab6bf69 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"ภาพและวิดีโอ"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"แกลเลอรีรูปภาพ"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"ไม่มีรูปภาพ"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"บันทึกภาพที่ครอบตัดไว้ที่ <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="crop_not_saved" msgid="3400773981839556">"ภาพที่ตัดไม่ได้รับการบันทึก"</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"ไม่มีอัลบั้ม"</string>
     <string name="empty_album" msgid="4542880442593595494">"O ภาพ/วิดีโอ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 008fcb9..90f126a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -46,10 +46,8 @@
     <string name="wallpaper" msgid="140165383777262070">"Itinatakda ang wallpaper…"</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Wallpaper"</string>
     <string name="delete" msgid="2839695998251824487">"Tanggalin"</string>
-    <!-- no translation found for confirm_action (1642211585193899041) -->
-    <skip />
-    <!-- no translation found for confirm (8646870096527848520) -->
-    <skip />
+    <string name="confirm_action" msgid="1642211585193899041">"Kumpirmahin ang pagtanggal?"</string>
+    <string name="confirm" msgid="8646870096527848520">"Kumpirmahin"</string>
     <string name="cancel" msgid="3637516880917356226">"Kanselahin"</string>
     <string name="share" msgid="3619042788254195341">"Ibahagi"</string>
     <string name="select_all" msgid="3403283025220282175">"Piliin lahat"</string>
@@ -101,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Mga larawan &amp; video"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Photo Gallery"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Walang mga larawan."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Nai-save ang na-crop na larawan sa <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Hindi nai-save ang na-crop na larawan."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Walang available na mga album."</string>
     <string name="empty_album" msgid="4542880442593595494">"O na larawan/video ang available."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0f10199..e1b734d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Resimler ve videolar"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Fotoğraf Galerisi"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Fotoğraf yok."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Kırpılan resim <xliff:g id="FOLDER_NAME">%s</xliff:g> klasörüne kaydedildi."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Kırpılmış resim kaydedilmedi."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Kullanılabilir albüm yok."</string>
     <string name="empty_album" msgid="4542880442593595494">"Kullanılabilir resim/video yok."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 15ca26c..75805d7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Зображення й відео"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Фотогалерея"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Фотографій немає."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Обрізане зображення збережено в папці <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Обрізане зображення не збережено."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Немає доступних альбомів."</string>
     <string name="empty_album" msgid="4542880442593595494">"Немає доступних зображень або відео."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 07d88c9..0454ea9 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Hình ảnh &amp; video"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Thư viện ảnh"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Không có ảnh."</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Đã lưu hình ảnh được cắt vào <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Hình ảnh được cắt chưa được lưu."</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Không có album nào."</string>
     <string name="empty_album" msgid="4542880442593595494">"O có hình ảnh/video nào."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4aa92ce..c670b65 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"图片和视频"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"照片库"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"无照片。"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"经过裁剪的图片已保存至“<xliff:g id="FOLDER_NAME">%s</xliff:g>”。"</string>
     <string name="crop_not_saved" msgid="3400773981839556">"经过裁剪的图片尚未保存。"</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"没有可用的相册。"</string>
     <string name="empty_album" msgid="4542880442593595494">"没有可用的图片/视频。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 59751a5..91891ea 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"圖片和影片"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"相片庫"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"沒有任何相片。"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"裁剪的圖片已儲存至「<xliff:g id="FOLDER_NAME">%s</xliff:g>」。"</string>
     <string name="crop_not_saved" msgid="3400773981839556">"未儲存裁剪的圖片。"</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"沒有相簿。"</string>
     <string name="empty_album" msgid="4542880442593595494">"O 個可用的圖片/影片。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index fe465b1..bc6977d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -99,8 +99,7 @@
     <string name="show_all" msgid="6963292714584735149">"Izithombe namavidiyo"</string>
     <string name="appwidget_title" msgid="6410561146863700411">"Igalari Yesithombe"</string>
     <string name="appwidget_empty_text" msgid="1228925628357366957">"Azikho izithombe"</string>
-    <!-- no translation found for crop_saved (1595985909779105158) -->
-    <skip />
+    <string name="crop_saved" msgid="1595985909779105158">"Umfanekiso onqampuniwe ulondolozelwe e <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
     <string name="crop_not_saved" msgid="3400773981839556">"Umfanekiso onqampuliwe awulondoloziwe"</string>
     <string name="no_albums_alert" msgid="4111744447491690896">"Awekho ama-albhamu atholalakalayo."</string>
     <string name="empty_album" msgid="4542880442593595494">"O izithombe/amavidiyo okutholakalayo."</string>
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index a0f3449..a052c50 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -185,12 +185,14 @@
                 } else {
                     mSelectionManager.selectAll();
                 }
+                return;
             case R.id.action_crop: {
                 Path path = getSingleSelectedPath();
                 String mimeType = getMimeType(manager.getMediaType(path));
                 Intent intent = new Intent(CropImage.ACTION_CROP)
                         .setDataAndType(manager.getContentUri(path), mimeType);
                 ((Activity) mActivity).startActivity(intent);
+                return;
             }
             case R.id.action_setas: {
                 Path path = getSingleSelectedPath();
@@ -203,6 +205,7 @@
                 Activity activity = (Activity) mActivity;
                 activity.startActivity(Intent.createChooser(
                         intent, activity.getString(R.string.set_as)));
+                return;
             }
             case R.id.action_delete:
                 title = R.string.delete;
@@ -368,4 +371,3 @@
         }
     }
 }
-
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 7f9cd04..b54a685 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -176,12 +176,9 @@
     // This variable prevents us doing snapback until its values goes to 0. This
     // happens if the user gesture is still in progress or we are in a capture
     // animation.
-    // HOLD_TOUCH_DOWN_FROM_CAMERA is an extra flag set together with
-    // HOLD_TOUCH_DOWN if the touch down starts from camera preview.
     private int mHolding;
     private static final int HOLD_TOUCH_DOWN = 1;
-    private static final int HOLD_TOUCH_DOWN_FROM_CAMERA = 2;
-    private static final int HOLD_CAPTURE_ANIMATION = 4;
+    private static final int HOLD_CAPTURE_ANIMATION = 2;
 
     public PhotoView(GalleryActivity activity) {
         mTileView = new TileImageView(activity);
@@ -208,13 +205,7 @@
                         PhotoView.this.invalidate();
                     }
                     public boolean isHolding() {
-                        // We want the film mode change happen as soon as
-                        // possible even if the touch is still down.
-                        if ((mHolding & HOLD_TOUCH_DOWN_FROM_CAMERA) != 0) {
-                            return false;
-                        } else {
-                            return mHolding != 0;
-                        }
+                        return mHolding != 0;
                     }
                     public void onPull(int offset, int direction) {
                         mEdgeView.onPull(offset, direction);
@@ -501,15 +492,14 @@
             // page mode, we move _to_ the camera preview from another picture.
 
             // Holdings except touch-down prevent the transitions.
-            if ((mHolding & ~(HOLD_TOUCH_DOWN | HOLD_TOUCH_DOWN_FROM_CAMERA)) != 0) {
-                return;
-            }
+            if ((mHolding & ~HOLD_TOUCH_DOWN) != 0) return;
 
             boolean isCameraCenter = mIsCamera && isCenter;
 
             if (mWasCameraCenter && mIsCamera && !isCenter && !mFilmMode) {
-                setFilmMode(true);
-            } else if (isCameraCenter && mFilmMode) {
+                // Temporary disabled to de-emphasize filmstrip.
+                // setFilmMode(true);
+            } else if (!mWasCameraCenter && isCameraCenter && mFilmMode) {
                 setFilmMode(false);
             } else if (isCameraCenter && !mFilmMode) {
                 // move into camera, lock
@@ -745,7 +735,7 @@
         private boolean mIgnoreUpEvent = false;
         // If we can change mode for this scale gesture.
         private boolean mCanChangeMode;
-        // If we have changed the mode in this scaling gesture.
+        // If we have changed the film mode in this scaling gesture.
         private boolean mModeChanged;
 
         @Override
@@ -805,20 +795,31 @@
 
         @Override
         public boolean onScale(float focusX, float focusY, float scale) {
+            if (mModeChanged) return true;
             if (Float.isNaN(scale) || Float.isInfinite(scale)) return false;
+            if (scale > 0.99f && scale < 1.01f) return false;
             int outOfRange = mPositionController.scaleBy(scale, focusX, focusY);
 
-            // We allow only one mode change in a scaling gesture.
-            if (mCanChangeMode && !mModeChanged) {
+            // If mode changes, we treat this scaling gesture has ended.
+            if (mCanChangeMode) {
                 if ((outOfRange < 0 && !mFilmMode) ||
                         (outOfRange > 0 && mFilmMode)) {
+                    stopExtraScalingIfNeeded();
+
+                    // Removing the touch down flag allows snapback to happen
+                    // for file mode change.
+                    mHolding &= ~HOLD_TOUCH_DOWN;
                     setFilmMode(!mFilmMode);
+
+                    // We need to call onScaleEnd() before setting mModeChanged
+                    // to true.
+                    onScaleEnd();
                     mModeChanged = true;
                     return true;
                 }
            }
 
-            if (outOfRange != 0 && !mModeChanged) {
+            if (outOfRange != 0) {
                 startExtraScalingIfNeeded();
             } else {
                 stopExtraScalingIfNeeded();
@@ -845,20 +846,18 @@
 
         @Override
         public void onScaleEnd() {
+            if (mModeChanged) return;
             mPositionController.endScale();
         }
 
         @Override
         public void onDown() {
             mHolding |= HOLD_TOUCH_DOWN;
-            if (mPictures.get(0).isCamera()) {
-                mHolding |= HOLD_TOUCH_DOWN_FROM_CAMERA;
-            }
         }
 
         @Override
         public void onUp() {
-            mHolding &= ~(HOLD_TOUCH_DOWN | HOLD_TOUCH_DOWN_FROM_CAMERA);
+            mHolding &= ~HOLD_TOUCH_DOWN;
             mEdgeView.onRelease();
 
             if (mIgnoreUpEvent) {
diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java
index ac0d191..03fe65b 100644
--- a/src/com/android/gallery3d/ui/PositionController.java
+++ b/src/com/android/gallery3d/ui/PositionController.java
@@ -1012,7 +1012,8 @@
         float hFactor = 1.0f;
         int viewW, viewH;
 
-        if (!mFilmMode && mConstrained && b == mBoxes.get(0)) {
+        if (!mFilmMode && mConstrained && !mConstrainedFrame.isEmpty()
+                && b == mBoxes.get(0)) {
             viewW = mConstrainedFrame.width();
             viewH = mConstrainedFrame.height();
         } else {