Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Gallery2 into cm-13.0"

This reverts commit 8a0ab8f559fadc69978246f8f147ee1744770da1, reversing
changes made to 515039d1f04467c7bf7f23ac94a5381a3daaa060.

Change-Id: I913dca0c1e2e725ef4b1c60a88dc62078fffef04

8 files changed, 23 insertions, 23 deletions

diff --git a/res/values-az-rAZ/filtershow_strings.xml b/res/values-az-rAZ/filtershow_strings.xml
index 3f8f22dee..4da012ceb 100644
--- a/res/values-az-rAZ/filtershow_strings.xml
+++ b/res/values-az-rAZ/filtershow_strings.xml
@@ -24,8 +24,8 @@
     <string name="setting_wallpaper" msgid="4679087092300036632">"Divar kağızı ayarlanır"</string>
     <string name="download_failure" msgid="5923323939788582895">"Şəkil endirilə bilmədi. Şəbəkə əlçatmazdır."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
-    <string name="saved" msgid="6678827180814174711">"Yadda saxlanılmış"</string>
     <string name="borders" msgid="2067345080568684614">"Sərhədlər"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Fərdi"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Ləğv edin"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Yenidən edin"</string>
     <string name="show_imagestate_panel" msgid="281932769701043015">"Tətbiq Olunmuş Effektləri Göstər"</string>
@@ -119,7 +119,7 @@
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Sıçratma"</string>
     <string name="draw_clear" msgid="6728155515454921052">"Sil"</string>
-    <string name="color_border_size" msgid="8745307483517793073">"qalınlıq"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Qalınlıq"</string>
     <string name="color_border_corner_size" msgid="7637235159438869979">"Künc Ölçüsü"</string>
     <string name="color_border_color" msgid="8765458414425980711">"Rəng"</string>
     <string name="color_border_clear" msgid="4418261191091091722">"Təmizlə"</string>
diff --git a/res/values-fa/filtershow_strings.xml b/res/values-fa/filtershow_strings.xml
index f730a38af..4d506a2d5 100644
--- a/res/values-fa/filtershow_strings.xml
+++ b/res/values-fa/filtershow_strings.xml
@@ -21,12 +21,12 @@
     <string name="cannot_edit_original" msgid="5890293845882609388">"نسخه اصلی را نمی‌توان ویرایش کرد"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
-    <string name="setting_wallpaper" msgid="4679087092300036632">"تنظیم تصویر زمینه"</string>
+    <string name="setting_wallpaper" msgid="4679087092300036632">"تنظیم کاغذدیواری"</string>
     <string name="download_failure" msgid="5923323939788582895">"دانلود عکس انجام نشد. شبکه در دسترس نیست."</string>
     <string name="original" msgid="3524493791230430897">"اصلی"</string>
     <string name="borders" msgid="2067345080568684614">"حاشیه‌ها"</string>
     <string name="custom_border" msgid="8679893731790931871">"سفارشی"</string>
-    <string name="filtershow_undo" msgid="6781743189243585101">"لغو عمل"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"واگرد"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"انجام مجدد"</string>
     <string name="show_imagestate_panel" msgid="281932769701043015">"نمایش جلوه‌های اعمال شده"</string>
     <string name="hide_imagestate_panel" msgid="7207643485811695257">"پنهان کردن جلوه‌های اعمال شده"</string>
@@ -59,7 +59,7 @@
     <string name="aspect5to7_effect" msgid="5122395569059384741">"۵:۷"</string>
     <string name="aspect7to5_effect" msgid="5780001758108328143">"۷:۵"</string>
     <string name="aspect9to16_effect" msgid="7740468012919660728">"۱۶:۹"</string>
-    <string name="aspectNone_effect" msgid="6263330561046574134">"هیچکدام"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"هیچ‌کدام"</string>
     <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
     <skip />
     <string name="Fixed" msgid="8017376448916924565">"ثابت"</string>
@@ -75,7 +75,7 @@
     <string name="shadow_recovery" msgid="3928572915300287152">"سایه‌ها"</string>
     <string name="highlight_recovery" msgid="8262208470735204243">"هایلایت"</string>
     <string name="curvesRGB" msgid="915010781090477550">"نمودارها"</string>
-    <string name="vignette" msgid="934721068851885390">"محو لبه‌ها"</string>
+    <string name="vignette" msgid="934721068851885390">"حاشیه تاریک"</string>
     <string name="vignette_main" msgid="6046495605390665423">"حاشیه تاریک"</string>
     <string name="vignette_exposure" msgid="6862058227309534094">"نوردهی"</string>
     <string name="vignette_saturation" msgid="1617055207565719771">"اشباع رنگ"</string>
@@ -88,7 +88,7 @@
     <string name="rotate" msgid="2796802553793795371">"چرخش"</string>
     <string name="mirror" msgid="5482518108154883096">"معکوس کردن"</string>
     <string name="negative" msgid="6998313764388022201">"نگاتیو"</string>
-    <string name="none" msgid="6633966646410296520">"هیچکدام"</string>
+    <string name="none" msgid="6633966646410296520">"هیچ‌کدام"</string>
     <string name="edge" msgid="7036064886242147551">"لبه‌ها"</string>
     <string name="kmeans" msgid="2080952022674981541">"چندرنگی‌"</string>
     <string name="downsample" msgid="3552938534146980104">"کاهش وضوح"</string>
diff --git a/res/values-gu-rIN/filtershow_strings.xml b/res/values-gu-rIN/filtershow_strings.xml
index 951933d68..1348f59cc 100644
--- a/res/values-gu-rIN/filtershow_strings.xml
+++ b/res/values-gu-rIN/filtershow_strings.xml
@@ -28,7 +28,7 @@
     <string name="custom_border" msgid="8679893731790931871">"કસ્ટમ"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"પૂર્વવત્ કરો"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"ફરી કરો"</string>
-    <string name="show_imagestate_panel" msgid="281932769701043015">"લાગુ પ્રભાવો દર્શાવો"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"લાગુ પ્રભાવો બતાવો"</string>
     <string name="hide_imagestate_panel" msgid="7207643485811695257">"લાગુ પ્રભાવો છુપાવો"</string>
     <string name="export_image" msgid="3202835713172222134">"નિકાસ કરો"</string>
     <string name="print_image" msgid="1942989216591621413">"છાપો"</string>
diff --git a/res/values-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml
index 3c5ebcdb5..0279b9f43 100644
--- a/res/values-iw/filtershow_strings.xml
+++ b/res/values-iw/filtershow_strings.xml
@@ -39,7 +39,7 @@
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"הגדרות"</string>
     <string name="unsaved" msgid="8704442449002374375">"יש בתמונה הזו שינויים שלא נשמרו."</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"האם אתה רוצה לשמור לפני היציאה?"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"האם ברצונך לשמור לפני היציאה?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"שמור וצא"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"מעבד תמונה ברזולוציה מלאה..."</string>
     <string name="exit" msgid="242642957038770113">"צא"</string>
diff --git a/res/values-mr-rIN/filtershow_strings.xml b/res/values-mr-rIN/filtershow_strings.xml
index 6936fe1fc..498b656e3 100644
--- a/res/values-mr-rIN/filtershow_strings.xml
+++ b/res/values-mr-rIN/filtershow_strings.xml
@@ -126,7 +126,7 @@
     <string name="color_pick_select" msgid="734312818059057394">"सानुकूल रंग निवडा"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"रंग निवडा"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"आकार निवडा"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"ठिक आहे"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ठीक आहे"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"मूळ"</string>
     <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"प्रतिमा जतन करीत आहे"</string>
diff --git a/res/values-nl/filtershow_strings.xml b/res/values-nl/filtershow_strings.xml
index a5ef88252..ea03fcc70 100644
--- a/res/values-nl/filtershow_strings.xml
+++ b/res/values-nl/filtershow_strings.xml
@@ -39,18 +39,18 @@
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Instellingen"</string>
     <string name="unsaved" msgid="8704442449002374375">"Er zijn niet-opgeslagen wijzigingen aangebracht in deze afbeelding."</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"Wilt u opslaan voordat u afsluit?"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Wil je opslaan voordat je afsluit?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Opslaan en sluiten"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"Afbeelding met volledige resolutie verwerken..."</string>
     <string name="exit" msgid="242642957038770113">"Sluiten"</string>
     <string name="history" msgid="455767361472692409">"Geschiedenis"</string>
-    <string name="reset" msgid="9013181350779592937">"Opnieuw instellen"</string>
+    <string name="reset" msgid="9013181350779592937">"Resetten"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"Toegepaste effecten"</string>
     <string name="compare_original" msgid="8140838959007796977">"Vergelijken"</string>
     <string name="apply_effect" msgid="1218288221200568947">"Toepassen"</string>
-    <string name="reset_effect" msgid="7712605581024929564">"Opnieuw instellen"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Resetten"</string>
     <string name="aspect" msgid="4025244950820813059">"Beeldverhouding"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
     <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
diff --git a/res/values-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml
index c7cfb8d8b..6c08d347c 100644
--- a/res/values-ro/filtershow_strings.xml
+++ b/res/values-ro/filtershow_strings.xml
@@ -48,7 +48,7 @@
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"Efecte aplicate"</string>
-    <string name="compare_original" msgid="8140838959007796977">"Comparaţi"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Comparați"</string>
     <string name="apply_effect" msgid="1218288221200568947">"Aplicaţi"</string>
     <string name="reset_effect" msgid="7712605581024929564">"Resetaţi"</string>
     <string name="aspect" msgid="4025244950820813059">"Aspect"</string>
@@ -67,8 +67,8 @@
     <string name="exposure" msgid="6526397045949374905">"Expunere"</string>
     <string name="sharpness" msgid="6463103068318055412">"Claritate"</string>
     <string name="contrast" msgid="2310908487756769019">"Contrast"</string>
-    <string name="vibrance" msgid="3326744578577835915">"Vibranţă"</string>
-    <string name="saturation" msgid="7026791551032438585">"Saturaţie"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Vibranță"</string>
+    <string name="saturation" msgid="7026791551032438585">"Saturație"</string>
     <string name="bwfilter" msgid="8927492494576933793">"Filtru A/N"</string>
     <string name="wbalance" msgid="6346581563387083613">"Culoare auto."</string>
     <string name="hue" msgid="6231252147971086030">"Tonalitate"</string>
@@ -81,7 +81,7 @@
     <string name="vignette_saturation" msgid="1617055207565719771">"Saturație"</string>
     <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
     <string name="vignette_falloff" msgid="690918055030064199">"Atenuare"</string>
-    <string name="redeye" msgid="4508883127049472069">"Ochi roşii"</string>
+    <string name="redeye" msgid="4508883127049472069">"Ochi roșii"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Desenați"</string>
     <string name="straighten" msgid="26025591664983528">"Îndreptare"</string>
     <string name="crop" msgid="5781263790107850771">"Decupare"</string>
@@ -106,7 +106,7 @@
     <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
     <string name="editor_grad_new" msgid="4857265951369377379">"nou"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
-    <string name="curves_channel_red" msgid="4199710104162111357">"Roşu"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Roșu"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Albastru"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
diff --git a/res/values-uz-rUZ/filtershow_strings.xml b/res/values-uz-rUZ/filtershow_strings.xml
index 39f946158..b8c97b8b5 100644
--- a/res/values-uz-rUZ/filtershow_strings.xml
+++ b/res/values-uz-rUZ/filtershow_strings.xml
@@ -25,8 +25,8 @@
     <string name="download_failure" msgid="5923323939788582895">"Rasmni ko‘chirib olishda xatolik yuz berdi. Tarmoq uzilib qoldi."</string>
     <string name="original" msgid="3524493791230430897">"Asl"</string>
     <string name="borders" msgid="2067345080568684614">"Chegaralar"</string>
-    <string name="custom_border" msgid="8679893731790931871">"Boshqa"</string>
-    <string name="filtershow_undo" msgid="6781743189243585101">"Qaytarish"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Maxsus"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Bekor qilish"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Oldinga o‘tkazish"</string>
     <string name="show_imagestate_panel" msgid="281932769701043015">"Foydalanilgan effektlarni ko‘rsatish"</string>
     <string name="hide_imagestate_panel" msgid="7207643485811695257">"Bajarilgan effeklarni yashirish"</string>
@@ -59,7 +59,7 @@
     <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
     <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
     <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
-    <string name="aspectNone_effect" msgid="6263330561046574134">"Hech qaysi"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Qo‘lda"</string>
     <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
     <skip />
     <string name="Fixed" msgid="8017376448916924565">"Tuzatilgan"</string>
@@ -88,7 +88,7 @@
     <string name="rotate" msgid="2796802553793795371">"Burish"</string>
     <string name="mirror" msgid="5482518108154883096">"Oyna"</string>
     <string name="negative" msgid="6998313764388022201">"Negativ"</string>
-    <string name="none" msgid="6633966646410296520">"Hech qaysi"</string>
+    <string name="none" msgid="6633966646410296520">"Asl"</string>
     <string name="edge" msgid="7036064886242147551">"Qirralari"</string>
     <string name="kmeans" msgid="2080952022674981541">"Posterlash"</string>
     <string name="downsample" msgid="3552938534146980104">"Maydalashtirish"</string>
@@ -141,7 +141,7 @@
     <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Gistogramma"</string>
     <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ma’lumotlar"</string>
     <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Tayyor namuna"</string>
-    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versiyasi"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Qo‘shish"</string>
     <string name="filtershow_version_original" msgid="1413894292200912828">"Asl nuxsasi"</string>
     <string name="filtershow_version_current" msgid="6609334422797468952">"Joriy"</string>
     <string name="filtershow_exif_model" msgid="3543206476046267466">"Modeli"</string>