Merge "Accelerate PNG image rendering." into gb-ub-photos-arches

commit: 2abc1350cde24e810f6437592f099c149ce19ada [log] [tgz]
author: Pin Ting <pinting@google.com> Thu Oct 04 06:54:47 2012 -0700
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Oct 04 06:54:48 2012 -0700
tree: 5a0d8f953aa125d89ee312ec7cc71249a34a0517
parent: accef756f100d5c27a4d13d6a6bfa5c75714e5bc [diff]
parent: 8c377351cfbc425f7eb6dbe94af0a96d71560a4b [diff]
diff --git a/res/drawable-hdpi/ic_menu_photosphere_active.png b/res/drawable-hdpi/ic_menu_photosphere_active.png
new file mode 100644
index 0000000..c576015
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_photosphere_active.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_menu_photosphere_active.png b/res/drawable-mdpi/ic_menu_photosphere_active.png
new file mode 100644
index 0000000..96e2ac5
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_photosphere_active.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_menu_photosphere_active.png b/res/drawable-xhdpi/ic_menu_photosphere_active.png
new file mode 100644
index 0000000..a77a712
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_photosphere_active.png
Binary files differ

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f844fcd5..b929108 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Bevestig"</string>
     <string name="cancel" msgid="3637516880917356226">"Kanselleer"</string>
     <string name="share" msgid="3619042788254195341">"Deling"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Deel panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Deel as foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Uitgevee"</string>
     <string name="undo" msgid="2930873956446586313">"ONTDOEN"</string>
     <string name="select_all" msgid="3403283025220282175">"Kies almal"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Geen eksterne berging beskikbaar nie"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmstrook"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Rooster"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Snoei tans"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Wag asseblief"</string>
+    <string name="save_into" msgid="6688364520925473396">"Stoor gesnoeide video in"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Kan nie snoei nie: teikenvideo is te kort"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Nie gesnoei nie: dieselfde lengte as oorspronklike"</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b41cf98..4818392 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"አረጋግጥ"</string>
     <string name="cancel" msgid="3637516880917356226">"ይቅር"</string>
     <string name="share" msgid="3619042788254195341">"አጋራ"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"ፓኖራማ አጋራ"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"እንደ ፎቶ አጋራ"</string>
     <string name="deleted" msgid="6795433049119073871">"ጠፍቷል"</string>
     <string name="undo" msgid="2930873956446586313">"ቀልብስ"</string>
     <string name="select_all" msgid="3403283025220282175">"ሁሉንም ምረጥ"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"ምንም ውጫዊ ማከማቻ የለም"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"ድርድር ፊልም"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"ፍርግርግ"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"ማሳጠር"</string>
+    <string name="please_wait" msgid="7296066089146487366">"እባክዎ ይጠብቁ"</string>
+    <string name="save_into" msgid="6688364520925473396">"ያጠረው ቪዲዮ እዚህ ውስጥ ይቀመጥ፦"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ማሳጠር አይቻልም፤ ዒላማው በጣም አጭር ነው"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"አታሳጥር፤ የመጀመሪያው ያህል ተመሳሳይ ርዝመት"</string>
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 811fad8..614dbe9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"تأكيد"</string>
     <string name="cancel" msgid="3637516880917356226">"إلغاء"</string>
     <string name="share" msgid="3619042788254195341">"مشاركة"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"مشاركة بانوراما"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"مشاركة كصورة"</string>
     <string name="deleted" msgid="6795433049119073871">"تم حذفها"</string>
     <string name="undo" msgid="2930873956446586313">"تراجع"</string>
     <string name="select_all" msgid="3403283025220282175">"تحديد الكل"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"لا تتوفر سعة تخزين خارجية"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"شريط الصور"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"شبكة"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"جارٍ الاقتطاع"</string>
+    <string name="please_wait" msgid="7296066089146487366">"الرجاء الانتظار"</string>
+    <string name="save_into" msgid="6688364520925473396">"حفظ الفيديو الذي تم اقتطاعه في"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"لا يمكن الاقتطاع : الفيديو المستهدف قصير جدًا"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"لم يتم الاقتطاع : المدة الزمنية نفسها كالمصدر"</string>
 </resources>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b9487c1..64e2652 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Пацвердзіць"</string>
     <string name="cancel" msgid="3637516880917356226">"Адмяніць"</string>
     <string name="share" msgid="3619042788254195341">"Апублікаваць"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Адправiць панараму"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Адправiць як фота"</string>
     <string name="deleted" msgid="6795433049119073871">"Выдаленая"</string>
     <string name="undo" msgid="2930873956446586313">"ВЯРНУЦЬ"</string>
     <string name="select_all" msgid="3403283025220282175">"Выбраць усё"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Няма даступных знешнiх захавальнiкаў"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Дыяфiльм"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Сетка"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Абрэзка"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Пачакайце"</string>
+    <string name="save_into" msgid="6688364520925473396">"Захаваць абрэзанае відэа ў"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Немагчыма абрэзаць: мэтавае вiдэа занадта кароткае"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Не абрэзана: таго ж памера, што i арыгiнал"</string>
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d6c118f..5619f92 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Потвърждаване"</string>
     <string name="cancel" msgid="3637516880917356226">"Отказ"</string>
     <string name="share" msgid="3619042788254195341">"Споделяне"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Споделяне на панорамата"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Споделяне като снимка"</string>
     <string name="deleted" msgid="6795433049119073871">"Изтрито"</string>
     <string name="undo" msgid="2930873956446586313">"ОТМЯНА"</string>
     <string name="select_all" msgid="3403283025220282175">"Избиране на всички"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2b6b37c..59b7df8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirma"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancel·la"</string>
     <string name="share" msgid="3619042788254195341">"Comparteix"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Comparteix el panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Comparteix com a foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Suprimida"</string>
     <string name="undo" msgid="2930873956446586313">"DESFÉS"</string>
     <string name="select_all" msgid="3403283025220282175">"Selecciona-ho tot"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"No hi ha emmagatzematge extern disponible"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Cel·luloide"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Graella"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"S\'està retallant"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Espera"</string>
+    <string name="save_into" msgid="6688364520925473396">"Desa el vídeo retallat a"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"No es pot retallar: el vídeo de destinació és massa curt"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"No s\'ha retallat: mateixa durada que a l\'inici"</string>
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fc791b7..c465a00 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Potvrdit"</string>
     <string name="cancel" msgid="3637516880917356226">"Zrušit"</string>
     <string name="share" msgid="3619042788254195341">"Sdílet"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Sdílet panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Sdílet jako fotku"</string>
     <string name="deleted" msgid="6795433049119073871">"Smazáno"</string>
     <string name="undo" msgid="2930873956446586313">"VRÁTIT ZPĚT"</string>
     <string name="select_all" msgid="3403283025220282175">"Vybrat vše"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index abf98ad..bec9b18 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Bekræft"</string>
     <string name="cancel" msgid="3637516880917356226">"Annuller"</string>
     <string name="share" msgid="3619042788254195341">"Del"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Del panoramabillede"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Del som foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Slettet"</string>
     <string name="undo" msgid="2930873956446586313">"FORTRYD"</string>
     <string name="select_all" msgid="3403283025220282175">"Markér alle"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ab6cac3..034d795 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Bestätigen"</string>
     <string name="cancel" msgid="3637516880917356226">"Abbrechen"</string>
     <string name="share" msgid="3619042788254195341">"Teilen"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Panorama teilen"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Als Foto teilen"</string>
     <string name="deleted" msgid="6795433049119073871">"Gelöscht"</string>
     <string name="undo" msgid="2930873956446586313">"Rückgängig"</string>
     <string name="select_all" msgid="3403283025220282175">"Alle auswählen"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Kein externer Speicher verfügbar"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmstreifen"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Raster"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Wird zugeschnitten"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Bitte warten"</string>
+    <string name="save_into" msgid="6688364520925473396">"Zugeschnittenes Video speichern unter"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Zuschneiden nicht möglich: Ziel-Video zu kurz"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Nicht zugeschnitten: gleiche Länge wie Original"</string>
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 99898b2..29ee32f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Επιβεβαίωση"</string>
     <string name="cancel" msgid="3637516880917356226">"Ακύρωση"</string>
     <string name="share" msgid="3619042788254195341">"Κοινή χρήση"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Κοινή χρήση πανοράματος"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Κοινή χρήση ως φωτογραφίας"</string>
     <string name="deleted" msgid="6795433049119073871">"Διαγράφηκε"</string>
     <string name="undo" msgid="2930873956446586313">"ΑΝΑΙΡΕΣΗ"</string>
     <string name="select_all" msgid="3403283025220282175">"Επιλογή όλων"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Δεν υπάρχει διαθέσιμος εξωτερικός χώρος αποθήκευσης"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Ταινία βίντεο"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Πλέγμα"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Περικοπή"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Περιμένετε"</string>
+    <string name="save_into" msgid="6688364520925473396">"Αποθήκευση βίντεο που έχει περικοπεί σε"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Δεν είναι δυνατή η περικοπή : το βίντεο-στόχος είναι πολύ σύντομο"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Δεν έγινε περικοπή : ίδια διάρκεια με την αρχική"</string>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 27c7309..dacba92 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirm"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancel"</string>
     <string name="share" msgid="3619042788254195341">"Share"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Share panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Share as photo"</string>
     <string name="deleted" msgid="6795433049119073871">"Deleted"</string>
     <string name="undo" msgid="2930873956446586313">"UNDO"</string>
     <string name="select_all" msgid="3403283025220282175">"Select all"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"No external storage available"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmstrip"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Grid"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Trimming"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Please wait"</string>
+    <string name="save_into" msgid="6688364520925473396">"Save trimmed video into"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Cannot trim: target video is too short"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Did not trim: the same length as origin"</string>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ee9b5f1..978ce2f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirmar"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancelar"</string>
     <string name="share" msgid="3619042788254195341">"Compartir"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Compartir panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Compartir como foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Eliminada"</string>
     <string name="undo" msgid="2930873956446586313">"DESHACER"</string>
     <string name="select_all" msgid="3403283025220282175">"Seleccionar todo"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e5b296a..ef34b28 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirmar"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancelar"</string>
     <string name="share" msgid="3619042788254195341">"Compartir"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Compartir panorámica"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Compartir como foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Eliminada"</string>
     <string name="undo" msgid="2930873956446586313">"DESHACER"</string>
     <string name="select_all" msgid="3403283025220282175">"Seleccionar todo"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"No hay almacenamiento externo disponible."</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Película"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Cuadrícula"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Recortando..."</string>
+    <string name="please_wait" msgid="7296066089146487366">"Espera..."</string>
+    <string name="save_into" msgid="6688364520925473396">"Guardar vídeo recortado en"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"No se puede recortar: el vídeo de destino es demasiado corto."</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"No recortar: misma duración que el original"</string>
 </resources>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 78bb4aa..feb9a58 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Kinnitamine"</string>
     <string name="cancel" msgid="3637516880917356226">"Tühista"</string>
     <string name="share" msgid="3619042788254195341">"Jaga"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Panoraami jagamine"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Fotona jagamine"</string>
     <string name="deleted" msgid="6795433049119073871">"Kustutatud"</string>
     <string name="undo" msgid="2930873956446586313">"VÕTA TAGASI"</string>
     <string name="select_all" msgid="3403283025220282175">"Vali kõik"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Ükski välismäluseade ei ole saadaval"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmiriba"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Ruudustik"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Kärpimine"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Palun oodake"</string>
+    <string name="save_into" msgid="6688364520925473396">"Salvesta kärbitud video asukohta"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Ei saa kärpida: lõppvideo on liiga lühike"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Ei kärbitud. Pikkus on sama kui originaalil"</string>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 28364ae..1a8eb23 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"تأیید"</string>
     <string name="cancel" msgid="3637516880917356226">"لغو"</string>
     <string name="share" msgid="3619042788254195341">"اشتراک‌گذاری"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"اشتراک‌گذاری پانوراما"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"اشتراک‌گذاری به عنوان عکس"</string>
     <string name="deleted" msgid="6795433049119073871">"پاک شد"</string>
     <string name="undo" msgid="2930873956446586313">"واگرد"</string>
     <string name="select_all" msgid="3403283025220282175">"انتخاب همه"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3ba51f4..cfb81b1 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Vahvista"</string>
     <string name="cancel" msgid="3637516880917356226">"Peruuta"</string>
     <string name="share" msgid="3619042788254195341">"Jaa"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Jaa panoraama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Jaa kuvana"</string>
     <string name="deleted" msgid="6795433049119073871">"Poistettu"</string>
     <string name="undo" msgid="2930873956446586313">"KUMOA"</string>
     <string name="select_all" msgid="3403283025220282175">"Valitse kaikki"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Ei ulkoista tallennustilaa"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Videoleike"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Ruudukko"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Leikataan"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Odota"</string>
+    <string name="save_into" msgid="6688364520925473396">"Tallenna leikattu video kohteeseen"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Ei voi leikata: kohdevideo on liian lyhyt"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Ei leikattu: pituus on sama kuin alkuperäisellä videolla"</string>
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e5443ac..8ea8bba 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirmer"</string>
     <string name="cancel" msgid="3637516880917356226">"Annuler"</string>
     <string name="share" msgid="3619042788254195341">"Partager"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Partager la vue panoramique"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Partager en tant que photo"</string>
     <string name="deleted" msgid="6795433049119073871">"Supprimée"</string>
     <string name="undo" msgid="2930873956446586313">"ANNULER"</string>
     <string name="select_all" msgid="3403283025220282175">"Tout sélectionner"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Aucune mémoire de stockage externe disponible."</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Pellicule"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Grille"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Découpe en cours"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Veuillez patienter."</string>
+    <string name="save_into" msgid="6688364520925473396">"Enregistrer la vidéo coupée dans"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Découpe impossible : la vidéo cible est trop courte."</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Échec de la découpe : longueur identique à l\'original."</string>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7b751f1..f24921a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"पुष्टि करें"</string>
     <string name="cancel" msgid="3637516880917356226">"रद्द करें"</string>
     <string name="share" msgid="3619042788254195341">"शेयर करें"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"पैनोरामा को साझा करें"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"फ़ोटो के रूप में साझा करें"</string>
     <string name="deleted" msgid="6795433049119073871">"हटाई गई"</string>
     <string name="undo" msgid="2930873956446586313">"पूर्ववत करें"</string>
     <string name="select_all" msgid="3403283025220282175">"सभी को चुनें"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"कोई बाहरी संग्रहण उपलब्ध नहीं है"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"फ़िल्मस्ट्रिप"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"ग्रिड"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"ट्रिम कर रहा है"</string>
+    <string name="please_wait" msgid="7296066089146487366">"कृपया प्रतीक्षा करें"</string>
+    <string name="save_into" msgid="6688364520925473396">"ट्रिम किया गया वीडियो यहां सहेजें:"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ट्रिम नहीं कर सकते : लक्ष्य वीडियो बहुत छोटा है"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"ट्रिम नहीं किया : अवधि, मूल के बराबर है"</string>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9f39902..7c30955 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Potvrdi"</string>
     <string name="cancel" msgid="3637516880917356226">"Odustani"</string>
     <string name="share" msgid="3619042788254195341">"Podijeli"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Dijeli panoramu"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Dijeli kao fotografiju"</string>
     <string name="deleted" msgid="6795433049119073871">"Izbrisano"</string>
     <string name="undo" msgid="2930873956446586313">"PONIŠTI"</string>
     <string name="select_all" msgid="3403283025220282175">"Odaberi sve"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Nema dostupne vanjske pohrane"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmska vrpca"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Rešetka"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Skraćivanje"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Pričekajte"</string>
+    <string name="save_into" msgid="6688364520925473396">"Spremi skraćeni videozapis ovdje:"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Nije moguće skratiti: ciljani videozapis prekratak je"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Nije skraćeno: duljina je jednaka originalu"</string>
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6a8063a..f56a427 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Megerősítés"</string>
     <string name="cancel" msgid="3637516880917356226">"Mégse"</string>
     <string name="share" msgid="3619042788254195341">"Megosztás"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Panorámakép megosztása"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Megosztás fényképként"</string>
     <string name="deleted" msgid="6795433049119073871">"Törölve"</string>
     <string name="undo" msgid="2930873956446586313">"VISSZAVONÁS"</string>
     <string name="select_all" msgid="3403283025220282175">"Az összes kijelölése"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Nincs elérhető külső tárhely"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmszalag"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Rács"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Vágás"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Kérjük, várjon."</string>
+    <string name="save_into" msgid="6688364520925473396">"Megvágott videó mentése ide:"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Nem lehet megvágni: a célvideó túl rövid."</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Nem lett megvágva: az eredetivel megegyező hossz."</string>
 </resources>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c027528..02974ce 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Konfirmasi"</string>
     <string name="cancel" msgid="3637516880917356226">"Batal"</string>
     <string name="share" msgid="3619042788254195341">"Bagikan"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Bagikan panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Bagikan sebagai foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Dihapus"</string>
     <string name="undo" msgid="2930873956446586313">"URUNGKAN"</string>
     <string name="select_all" msgid="3403283025220282175">"Pilih semua"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3fcd5e0..4eac79c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Conferma"</string>
     <string name="cancel" msgid="3637516880917356226">"Annulla"</string>
     <string name="share" msgid="3619042788254195341">"Condividi"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Condividi panoramica"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Condividi come foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Eliminata"</string>
     <string name="undo" msgid="2930873956446586313">"ANNULLA"</string>
     <string name="select_all" msgid="3403283025220282175">"Seleziona tutti"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Nessun archivio esterno disponibile"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Sequenza"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Griglia"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Taglio in corso"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Attendi"</string>
+    <string name="save_into" msgid="6688364520925473396">"Salva video tagliato in"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Impossibile tagliare: video di destinazione troppo breve"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Non tagliare: lunghezza uguale all\'originale"</string>
 </resources>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ffbb07f..8a055ac 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"אשר"</string>
     <string name="cancel" msgid="3637516880917356226">"ביטול"</string>
     <string name="share" msgid="3619042788254195341">"שיתוף"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"שתף פנורמה"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"שתף כתמונה"</string>
     <string name="deleted" msgid="6795433049119073871">"נמחק"</string>
     <string name="undo" msgid="2930873956446586313">"בטל"</string>
     <string name="select_all" msgid="3403283025220282175">"בחר הכול"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"אחסון חיצוני לא זמין"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"סרט שקופיות"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"רשת"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"קיצור"</string>
+    <string name="please_wait" msgid="7296066089146487366">"המתן"</string>
+    <string name="save_into" msgid="6688364520925473396">"שמור סרטון שקוצר ב-"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"לא ניתן לקצר: סרטון היעד קצר מדי"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"לא בוצע קיצור: האורך זהה למקור"</string>
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b3bed26..0a18b71 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"確認"</string>
     <string name="cancel" msgid="3637516880917356226">"キャンセル"</string>
     <string name="share" msgid="3619042788254195341">"共有"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"パノラマ写真を共有"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"写真として共有"</string>
     <string name="deleted" msgid="6795433049119073871">"削除済み"</string>
     <string name="undo" msgid="2930873956446586313">"元に戻す"</string>
     <string name="select_all" msgid="3403283025220282175">"すべて選択"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 65c333a..d54ef49 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"확인"</string>
     <string name="cancel" msgid="3637516880917356226">"취소"</string>
     <string name="share" msgid="3619042788254195341">"공유"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"파노라마 공유"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"사진으로 공유"</string>
     <string name="deleted" msgid="6795433049119073871">"삭제됨"</string>
     <string name="undo" msgid="2930873956446586313">"실행취소"</string>
     <string name="select_all" msgid="3403283025220282175">"모두 선택"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 88b74d6..9a5c60c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Patvirtinti"</string>
     <string name="cancel" msgid="3637516880917356226">"Atšaukti"</string>
     <string name="share" msgid="3619042788254195341">"Bendrinti"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Bendrinti panoramą"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Bendrinti kaip nuotrauką"</string>
     <string name="deleted" msgid="6795433049119073871">"Ištrinta"</string>
     <string name="undo" msgid="2930873956446586313">"ANULIUOTI"</string>
     <string name="select_all" msgid="3403283025220282175">"Pasirinkti viską"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Nepasiekiama jokia išorinė atmintinė"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Diafilmas"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Tinklelis"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Apkarpymas"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Palaukite"</string>
+    <string name="save_into" msgid="6688364520925473396">"Išsaugoti apkarpytą vaizdo įrašą"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Negalima apkarpyti: tikslinis vaizdo įrašas per trumpas"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Neapkarpyta: tokios pat trukmės kaip originalas"</string>
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 05d18ec..22b858e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Apstiprināt"</string>
     <string name="cancel" msgid="3637516880917356226">"Atcelt"</string>
     <string name="share" msgid="3619042788254195341">"Dalies"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Kopīgot panorāmu"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Kopīgot kā fotoattēlu"</string>
     <string name="deleted" msgid="6795433049119073871">"Dzēsts"</string>
     <string name="undo" msgid="2930873956446586313">"ATSAUKT"</string>
     <string name="select_all" msgid="3403283025220282175">"Atlasīt visu"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Nav ārējās atmiņas"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmas lente"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Režģis"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Notiek apgriešana"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Lūdzu, uzgaidiet!"</string>
+    <string name="save_into" msgid="6688364520925473396">"Saglabāt apgrieztos videoklipus šeit:"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Nevar apgriezt: mērķa videoklips ir pārāk īss."</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Netika apgriezts: ilgums ir tāds pats kā oriģinālajam videoklipam."</string>
 </resources>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8fd0f55..f90cfd1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Sahkan"</string>
     <string name="cancel" msgid="3637516880917356226">"Batal"</string>
     <string name="share" msgid="3619042788254195341">"Kongsi"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Kongsi panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Kongsikan sebagai foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Dipadamkan"</string>
     <string name="undo" msgid="2930873956446586313">"BUAT ASAL"</string>
     <string name="select_all" msgid="3403283025220282175">"Pilih semua"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0ec9518..9272210 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Bekreft"</string>
     <string name="cancel" msgid="3637516880917356226">"Avbryt"</string>
     <string name="share" msgid="3619042788254195341">"Del"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Del panoramabilde"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Del som et bilde"</string>
     <string name="deleted" msgid="6795433049119073871">"Slettet"</string>
     <string name="undo" msgid="2930873956446586313">"ANGRE"</string>
     <string name="select_all" msgid="3403283025220282175">"Velg alle"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d40506a..18f24b2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Bevestigen"</string>
     <string name="cancel" msgid="3637516880917356226">"Annuleren"</string>
     <string name="share" msgid="3619042788254195341">"Delen"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Panorama delen"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Delen als foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Verwijderd"</string>
     <string name="undo" msgid="2930873956446586313">"ONGEDAAN MAKEN"</string>
     <string name="select_all" msgid="3403283025220282175">"Alles selecteren"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Geen externe opslag beschikbaar"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmstrip"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Raster"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Bijsnijden"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Een ogenblik geduld"</string>
+    <string name="save_into" msgid="6688364520925473396">"Bijgesneden video opslaan in"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Kan niet bijsnijden: doelvideo is te kort"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Is niet bijgesneden: dezelfde lengte als de originele video"</string>
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index caba09a..eea8f48 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Potwierdź"</string>
     <string name="cancel" msgid="3637516880917356226">"Anuluj"</string>
     <string name="share" msgid="3619042788254195341">"Udostępnij"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Udostępnij panoramę"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Udostępnij zdjęcie"</string>
     <string name="deleted" msgid="6795433049119073871">"Usunięty"</string>
     <string name="undo" msgid="2930873956446586313">"COFNIJ"</string>
     <string name="select_all" msgid="3403283025220282175">"Zaznacz wszystkie"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Brak pamięci zewnętrznej"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Seria ujęć"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Siatka"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Przycinam"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Poczekaj"</string>
+    <string name="save_into" msgid="6688364520925473396">"Zapisz przycięty film w"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Nie można przyciąć: film docelowy jest za krótki"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Nie przycięto: ta sama długość co pierwotnie"</string>
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3305a2b..853d967 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -39,7 +39,7 @@
     <string name="save_error" msgid="6857408774183654970">"Impossível guardar imagem recortada."</string>
     <string name="crop_label" msgid="521114301871349328">"Recortar imagem"</string>
     <string name="trim_label" msgid="274203231381209979">"Cortar vídeo"</string>
-    <string name="select_image" msgid="7841406150484742140">"Seleccionar fotog."</string>
+    <string name="select_image" msgid="7841406150484742140">"Selecionar fotog."</string>
     <string name="select_video" msgid="4859510992798615076">"Seleccionar vídeo"</string>
     <string name="select_item" msgid="2816923896202086390">"Seleccionar item"</string>
     <string name="select_album" msgid="1557063764849434077">"Selecionar álbum"</string>
@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirmar"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancelar"</string>
     <string name="share" msgid="3619042788254195341">"Partilhar"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Partilhar panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Partilhar como fotografia"</string>
     <string name="deleted" msgid="6795433049119073871">"Eliminada"</string>
     <string name="undo" msgid="2930873956446586313">"ANULAR"</string>
     <string name="select_all" msgid="3403283025220282175">"Selecionar tudo"</string>
@@ -168,7 +166,7 @@
     <string name="slideshow_dream_name" msgid="6915963319933437083">"Apres. de diap."</string>
     <string name="albums" msgid="7320787705180057947">"Álbuns"</string>
     <string name="times" msgid="2023033894889499219">"Vezes"</string>
-    <string name="locations" msgid="6649297994083130305">"localizações"</string>
+    <string name="locations" msgid="6649297994083130305">"Localizações"</string>
     <string name="people" msgid="4114003823747292747">"Pessoas"</string>
     <string name="tags" msgid="5539648765482935955">"Etiquetas"</string>
     <string name="group_by" msgid="4308299657902209357">"Agrupar por"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Nenhum armazenamento externo disponível"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Película de filme"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Grelha"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Recorte"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Aguarde"</string>
+    <string name="save_into" msgid="6688364520925473396">"Guardar vídeo recortado em"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Não é possível recortar: o vídeo de destino é demasiado pequeno"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Não recortar: a mesma duração do original"</string>
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9f6bd4f..2f238d2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirmar"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancelar"</string>
     <string name="share" msgid="3619042788254195341">"Compartilhar"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Compartilhar panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Compartilhar como foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Excluída"</string>
     <string name="undo" msgid="2930873956446586313">"DESFAZER"</string>
     <string name="select_all" msgid="3403283025220282175">"Selecionar tudo"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8f0c7a8..bad5ec6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Confirmaţi"</string>
     <string name="cancel" msgid="3637516880917356226">"Anulaţi"</string>
     <string name="share" msgid="3619042788254195341">"Distribuiţi"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Trimiteți panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Trimiteți fotografia"</string>
     <string name="deleted" msgid="6795433049119073871">"Ştearsă"</string>
     <string name="undo" msgid="2930873956446586313">"ANULAŢI"</string>
     <string name="select_all" msgid="3403283025220282175">"Selectaţi-le pe toate"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5860622..692e602 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Подтвердить"</string>
     <string name="cancel" msgid="3637516880917356226">"Отмена"</string>
     <string name="share" msgid="3619042788254195341">"Отправить"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Отправить панораму"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Отправить фото"</string>
     <string name="deleted" msgid="6795433049119073871">"Удалено"</string>
     <string name="undo" msgid="2930873956446586313">"ОТМЕНИТЬ"</string>
     <string name="select_all" msgid="3403283025220282175">"Выбрать все"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7a29a47..5a405b5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Potvrdiť"</string>
     <string name="cancel" msgid="3637516880917356226">"Zrušiť"</string>
     <string name="share" msgid="3619042788254195341">"Zdieľať"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Zdieľať panorámu"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Zdieľať ako fotografiu"</string>
     <string name="deleted" msgid="6795433049119073871">"Odstránený"</string>
     <string name="undo" msgid="2930873956446586313">"SPÄŤ"</string>
     <string name="select_all" msgid="3403283025220282175">"Vybrať všetko"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 59d624a..ff28137 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Potrdi"</string>
     <string name="cancel" msgid="3637516880917356226">"Prekliči"</string>
     <string name="share" msgid="3619042788254195341">"Skupna raba"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Deli panoramski posnetek z drugimi"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Deli z drugimi kot fotografijo"</string>
     <string name="deleted" msgid="6795433049119073871">"Izbrisano"</string>
     <string name="undo" msgid="2930873956446586313">"RAZVELJAVI"</string>
     <string name="select_all" msgid="3403283025220282175">"Izberi vse"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Na voljo ni nobena zunanja naprava za shranjevanje"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmski trak"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Mreža"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Obrezovanje"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Počakajte"</string>
+    <string name="save_into" msgid="6688364520925473396">"Shrani obrezani videoposnetek v"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Obrezovanje ni mogoče: izvirni videoposnetek je prekratek"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Ni obrezan: ohranjeno je izvirno trajanje"</string>
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c938fa6..ed2c1a9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Потврди"</string>
     <string name="cancel" msgid="3637516880917356226">"Откажи"</string>
     <string name="share" msgid="3619042788254195341">"Дели"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Дели панораму"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Дели као слику"</string>
     <string name="deleted" msgid="6795433049119073871">"Избрисана"</string>
     <string name="undo" msgid="2930873956446586313">"ОПОЗОВИ"</string>
     <string name="select_all" msgid="3403283025220282175">"Изабери све"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Спољна меморија није доступна"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Филмска трака"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Мрежа"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Скраћивање"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Сачекајте"</string>
+    <string name="save_into" msgid="6688364520925473396">"Сачувај скраћени видео у"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Скраћивање није могуће: циљни видео је прекратак"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Не скраћуј: иста дужина као оригинална"</string>
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 66e14a8..e9d215b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Bekräfta"</string>
     <string name="cancel" msgid="3637516880917356226">"Avbryt"</string>
     <string name="share" msgid="3619042788254195341">"Dela"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Dela panoramabild"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Dela som foto"</string>
     <string name="deleted" msgid="6795433049119073871">"Borttagen"</string>
     <string name="undo" msgid="2930873956446586313">"ÅNGRA"</string>
     <string name="select_all" msgid="3403283025220282175">"Markera alla"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Inget externt lagringsutrymme är tillgängligt"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmremsa"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Rutnät"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Beskärning"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Vänta"</string>
+    <string name="save_into" msgid="6688364520925473396">"Spara förkortad video i"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Det gick inte att beskära videon. Målvideon är för kort"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Det gick inte att beskära videon. Den är lika lång som originalet"</string>
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 07ac770..3694cbd 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Thibitisha"</string>
     <string name="cancel" msgid="3637516880917356226">"Ghairi"</string>
     <string name="share" msgid="3619042788254195341">"Shiriki"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Shiriki panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Shiriki kama picha"</string>
     <string name="deleted" msgid="6795433049119073871">"Imefutwa"</string>
     <string name="undo" msgid="2930873956446586313">"TENDUA"</string>
     <string name="select_all" msgid="3403283025220282175">"Chagua zote"</string>
@@ -186,14 +184,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Hakuna hifadhi ya nje inayopatikana"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Utepe wa filamu"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Kiunzi"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Kuchonga"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Tafadhali subiri"</string>
+    <string name="save_into" msgid="6688364520925473396">"Hifadhi video zilizochongwa kwenye"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Haiwezi kuchonga : video iliyolengwa ni fupi sana"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Haikuchonga : urefu sawa kama asili"</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 515b251..e9b1006 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"ยืนยัน"</string>
     <string name="cancel" msgid="3637516880917356226">"ยกเลิก"</string>
     <string name="share" msgid="3619042788254195341">"แบ่งปัน"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"แบ่งปันภาพพาโนรามา"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"แบ่งปันเป็นรูปภาพ"</string>
     <string name="deleted" msgid="6795433049119073871">"ลบแล้ว"</string>
     <string name="undo" msgid="2930873956446586313">"เลิกทำ"</string>
     <string name="select_all" msgid="3403283025220282175">"เลือกทั้งหมด"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"ไม่มีที่จัดเก็บข้อมูลภายนอกที่สามารถใช้ได้"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"ฟิล์มภาพยนตร์"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"ตาราง"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"กำลังตัด"</string>
+    <string name="please_wait" msgid="7296066089146487366">"โปรดรอสักครู่"</string>
+    <string name="save_into" msgid="6688364520925473396">"บันทึกวิดีโอที่ตัดเป็น"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"ไม่สามารถตัด : วิดีโอปลายทางสั้นเกินไป"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"ไม่ได้ตัด : ความยาวเท่ากับต้นฉบับ"</string>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cca83f6..2ffc368 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Kumpirmahin"</string>
     <string name="cancel" msgid="3637516880917356226">"Kanselahin"</string>
     <string name="share" msgid="3619042788254195341">"Ibahagi"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Ibahagi ang panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Ibahagi bilang larawan"</string>
     <string name="deleted" msgid="6795433049119073871">"Tinanggal"</string>
     <string name="undo" msgid="2930873956446586313">"I-UNDO"</string>
     <string name="select_all" msgid="3403283025220282175">"Piliin lahat"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Walang available na panlabas na storage"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Filmstrip"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Grid"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Pag-trim"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Mangyaring maghintay"</string>
+    <string name="save_into" msgid="6688364520925473396">"I-save ang na-trim na video sa"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Hindi ma-trim : masyadong maikli ang target na video"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Hindi na-trim : ang parehong haba gaya ng sa pinagmulan"</string>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8c2be47..3e3ffe5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Onayla"</string>
     <string name="cancel" msgid="3637516880917356226">"İptal"</string>
     <string name="share" msgid="3619042788254195341">"Paylaş"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Panoramayı paylaş"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Fotoğraf olarak paylaş"</string>
     <string name="deleted" msgid="6795433049119073871">"Silindi"</string>
     <string name="undo" msgid="2930873956446586313">"GERİ AL"</string>
     <string name="select_all" msgid="3403283025220282175">"Tümünü seç"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5d4886a..2b2e438 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Підтвердити"</string>
     <string name="cancel" msgid="3637516880917356226">"Скасувати"</string>
     <string name="share" msgid="3619042788254195341">"Надісл."</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Поділитися панорамою"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Поділитися як фотографією"</string>
     <string name="deleted" msgid="6795433049119073871">"Видалено"</string>
     <string name="undo" msgid="2930873956446586313">"ВІДМІНИТИ"</string>
     <string name="select_all" msgid="3403283025220282175">"Вибрати всі"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Доступної зовнішньої пам’яті немає"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"Діафільм"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Сітка"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Обрізання"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Зачекайте"</string>
+    <string name="save_into" msgid="6688364520925473396">"Зберегти обрізане відео в"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Неможливо обрізати: цільове відео закоротке"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Не обрізано: оригінальну тривалість збережено"</string>
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2a39039..c68b132 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Xác nhận"</string>
     <string name="cancel" msgid="3637516880917356226">"Hủy"</string>
     <string name="share" msgid="3619042788254195341">"Chia sẻ"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Chia sẻ ảnh toàn cảnh"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Chia sẻ dưới dạng ảnh"</string>
     <string name="deleted" msgid="6795433049119073871">"Đã xóa"</string>
     <string name="undo" msgid="2930873956446586313">"HOÀN TÁC"</string>
     <string name="select_all" msgid="3403283025220282175">"Chọn tất cả"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 918ddcb..e2fde13 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"确认"</string>
     <string name="cancel" msgid="3637516880917356226">"取消"</string>
     <string name="share" msgid="3619042788254195341">"分享"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"分享全景图"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"以照片形式分享"</string>
     <string name="deleted" msgid="6795433049119073871">"已删除"</string>
     <string name="undo" msgid="2930873956446586313">"撤消"</string>
     <string name="select_all" msgid="3403283025220282175">"全选"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"没有可用的外部存储设备"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"胶卷"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"网格"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"正在剪辑"</string>
+    <string name="please_wait" msgid="7296066089146487366">"请稍候"</string>
+    <string name="save_into" msgid="6688364520925473396">"将剪辑的视频保存到"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"无法剪辑：目标视频太短"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"未剪辑：视频长度与原始视频一样"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1932989..179e4af 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"確認"</string>
     <string name="cancel" msgid="3637516880917356226">"取消"</string>
     <string name="share" msgid="3619042788254195341">"分享"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"分享全景"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"以相片形式分享"</string>
     <string name="deleted" msgid="6795433049119073871">"已刪除"</string>
     <string name="undo" msgid="2930873956446586313">"復原"</string>
     <string name="select_all" msgid="3403283025220282175">"全選"</string>
@@ -183,14 +181,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"沒有可用的外部儲存裝置"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"幻燈片"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"格狀"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"修剪中"</string>
+    <string name="please_wait" msgid="7296066089146487366">"請稍候"</string>
+    <string name="save_into" msgid="6688364520925473396">"將已修剪影片儲存為"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"無法修剪：目標影片長度過短"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"尚未修剪：片長不變"</string>
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 355344c..b61adec 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -56,10 +56,8 @@
     <string name="confirm" msgid="8646870096527848520">"Qinisekisa"</string>
     <string name="cancel" msgid="3637516880917356226">"Khansela"</string>
     <string name="share" msgid="3619042788254195341">"Yabelana"</string>
-    <!-- no translation found for share_panorama (2569029972820978718) -->
-    <skip />
-    <!-- no translation found for share_as_photo (8959225188897026149) -->
-    <skip />
+    <string name="share_panorama" msgid="2569029972820978718">"Yaba i-panorama"</string>
+    <string name="share_as_photo" msgid="8959225188897026149">"Yaba njengezithombe"</string>
     <!-- no translation found for deleted (6795433049119073871) -->
     <skip />
     <!-- no translation found for undo (2930873956446586313) -->
@@ -185,14 +183,9 @@
     <string name="no_external_storage" msgid="95726173164068417">"Asikho isilondolozi sangaphandle esikhona"</string>
     <string name="switch_photo_filmstrip" msgid="991949386967109493">"I-Filmstrip"</string>
     <string name="switch_photo_grid" msgid="6533267664294518167">"Igridi"</string>
-    <!-- no translation found for trimming (9122385768369143997) -->
-    <skip />
-    <!-- no translation found for please_wait (7296066089146487366) -->
-    <skip />
-    <!-- no translation found for save_into (6688364520925473396) -->
-    <skip />
-    <!-- no translation found for trim_too_short (751593965620665326) -->
-    <skip />
-    <!-- no translation found for trim_too_long (2657958275279217174) -->
-    <skip />
+    <string name="trimming" msgid="9122385768369143997">"Ukusika"</string>
+    <string name="please_wait" msgid="7296066089146487366">"Sicela ulinde"</string>
+    <string name="save_into" msgid="6688364520925473396">"Londoloza amavidiyo asikiwe ku-"</string>
+    <string name="trim_too_short" msgid="751593965620665326">"Awukwazi ukusika : ividiyo eqondisiwe yifushane kakhulu"</string>
+    <string name="trim_too_long" msgid="2657958275279217174">"Awusikanga : ubude obufanayo njengoboqobo"</string>
 </resources>

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 3c64fa3..c60c3b9 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java

@@ -578,8 +578,9 @@
         }
 
         Intent intent = new Intent(ACTION_NEXTGEN_EDIT);
-        intent.setData(mActivity.getDataManager().getContentUri(current.getPath())).setFlags(
-                Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        intent.setDataAndType(current.getContentUri(), current.getMimeType())
+                .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         if (mActivity.getPackageManager()
                 .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() == 0) {
             intent.setAction(Intent.ACTION_EDIT);

diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java
index c19649c..ffcf976 100644
--- a/src/com/android/gallery3d/data/LocalImage.java
+++ b/src/com/android/gallery3d/data/LocalImage.java

@@ -249,6 +249,8 @@
 
         if (usePanoramaViewer()) {
             operation |= SUPPORT_PANORAMA;
+            // disable destructive rotate for lightcycle panorama
+            operation &= ~SUPPORT_ROTATE;
         }
         return operation;
     }

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 100a17b..ac16c13 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java

@@ -1,22 +1,7 @@
 
 package com.android.gallery3d.filtershow.cache;
 
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Vector;
-
-import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.filtershow.FilterShowActivity;
-import com.android.gallery3d.filtershow.HistoryAdapter;
-import com.android.gallery3d.filtershow.imageshow.ImageShow;
-import com.android.gallery3d.filtershow.presets.ImagePreset;
-import com.android.gallery3d.filtershow.tools.SaveCopyTask;
-import com.android.gallery3d.filtershow.tools.ProcessedBitmap;
-import com.android.gallery3d.R;
-
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -29,6 +14,22 @@
 import android.provider.MediaStore;
 import android.util.Log;
 
+import com.android.gallery3d.R;
+import com.android.gallery3d.common.Utils;
+import com.android.gallery3d.filtershow.FilterShowActivity;
+import com.android.gallery3d.filtershow.HistoryAdapter;
+import com.android.gallery3d.filtershow.imageshow.ImageShow;
+import com.android.gallery3d.filtershow.presets.ImagePreset;
+import com.android.gallery3d.filtershow.tools.ProcessedBitmap;
+import com.android.gallery3d.filtershow.tools.SaveCopyTask;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Vector;
+
 public class ImageLoader {
 
     private static final String LOGTAG = "ImageLoader";
@@ -66,6 +67,10 @@
     }
 
     private int getOrientation(Uri uri) {
+        if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
+            return getOrientationFromPath(uri.getPath());
+        }
+
         Cursor cursor = null;
         try {
             cursor = mContext.getContentResolver().query(uri,
@@ -73,17 +78,12 @@
                         MediaStore.Images.ImageColumns.ORIENTATION
                     },
                     null, null, null);
+            return cursor.moveToNext() ? cursor.getInt(0) : -1;
         } catch (SQLiteException e){
-            Utils.closeSilently(cursor);
             return ExifInterface.ORIENTATION_UNDEFINED;
+        } finally {
+            Utils.closeSilently(cursor);
         }
-
-        if (cursor.getCount() != 1) {
-            return -1;
-        }
-
-        cursor.moveToFirst();
-        return cursor.getInt(0);
     }
 
     private int getOrientationFromPath(String path) {

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
index 4e46943..d27dd34 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java

@@ -25,9 +25,8 @@
     @Override
     public ImageFilter clone() throws CloneNotSupportedException {
         ImageFilterGradient filter = (ImageFilterGradient) super.clone();
-        for (int i = 0; i < mColors.length; i++) {
-            filter.addColor(mColors[i], mPositions[i]);
-        }
+        System.arraycopy(mColors, 0, filter.mColors, 0, mColors.length);
+        System.arraycopy(mPositions, 0, filter.mPositions, 0, mPositions.length);
         return filter;
     }
 

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
index fbc4666..c4f0456 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java

@@ -89,12 +89,19 @@
 
     public void setActionUp() {
         mMode = MODES.UP;
+        updatePreset();
     }
 
     public void setNoAction() {
         mMode = MODES.NONE;
     }
 
+    private void updatePreset() {
+        ImagePreset copy = new ImagePreset(getImagePreset());
+        copy.setStraightenRotation(mImageRotation, mImageRotationZoomFactor);
+        setImagePreset(copy);
+    }
+
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getActionMasked()) {
             case (MotionEvent.ACTION_DOWN):
@@ -232,13 +239,6 @@
 
         mImageRotationZoomFactor = (float) (rw / boundsRect.width());
 
-        ImagePreset copy = new ImagePreset(getImagePreset());
-        Log.v(LOGTAG, "creating a new image preset with rotation " + mImageRotation
-                + " and zoom factor: " + mImageRotationZoomFactor);
-
-        copy.setStraightenRotation(mImageRotation, mImageRotationZoomFactor);
-        setImagePreset(copy);
-
         if (mMode == MODES.MOVE) {
             canvas.save();
             canvas.clipPath(path);

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 8c9c6d7..a5a15bf 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java

@@ -941,6 +941,8 @@
         private int mDeltaY;
         // The accumulated scaling change from a scaling gesture.
         private float mAccScale;
+        // If an onFling happened after the last onDown
+        private boolean mHadFling;
 
         @Override
         public boolean onSingleTapUp(float x, float y) {
@@ -1059,6 +1061,7 @@
             } else {
                 flingImages(velocityX, velocityY);
             }
+            mHadFling = true;
             return true;
         }
 
@@ -1212,7 +1215,7 @@
             } else {
                 mDownInScrolling = false;
             }
-
+            mHadFling = false;
             mScrolledAfterDown = false;
             if (mFilmMode) {
                 int xi = (int) (x + 0.5f);
@@ -1256,8 +1259,11 @@
                 mIgnoreUpEvent = false;
                 return;
             }
-
-            snapback();
+            if (!mFilmMode || mHadFling) {
+                snapback();
+            } else {
+                snapToNeighborImage();
+            }
         }
 
         public void setSwipingEnabled(boolean enabled) {
@@ -1531,14 +1537,12 @@
 
     private void snapback() {
         if ((mHolding & ~HOLD_DELETE) != 0) return;
-        if (!snapToNeighborImage()) {
+        if (mFilmMode || !snapToNeighborImage()) {
             mPositionController.snapback();
         }
     }
 
     private boolean snapToNeighborImage() {
-        if (mFilmMode) return false;
-
         Rect r = mPositionController.getPosition(0);
         int viewW = getWidth();
         // Setting the move threshold proportional to the width of the view
commit	2abc1350cde24e810f6437592f099c149ce19ada	[log] [tgz]
author	Pin Ting <pinting@google.com>	Thu Oct 04 06:54:47 2012 -0700
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Oct 04 06:54:48 2012 -0700
tree	5a0d8f953aa125d89ee312ec7cc71249a34a0517
parent	accef756f100d5c27a4d13d6a6bfa5c75714e5bc [diff]
parent	8c377351cfbc425f7eb6dbe94af0a96d71560a4b [diff]