Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
diff --git a/res/values-bn/filtershow_strings.xml b/res/values-bn/filtershow_strings.xml
index b13645b..12156ba 100644
--- a/res/values-bn/filtershow_strings.xml
+++ b/res/values-bn/filtershow_strings.xml
@@ -103,13 +103,13 @@
     <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"সবজে নীল"</string>
     <string name="editor_chan_sat_blue" msgid="384409736863387895">"নীল"</string>
     <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"ম্যাজেন্টা"</string>
-    <string name="editor_grad_style" msgid="2168414479007745179">"স্টাইল"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"শৈলী"</string>
     <string name="editor_grad_new" msgid="4857265951369377379">"নতুন"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
     <string name="curves_channel_red" msgid="4199710104162111357">"লাল"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"সবুজ"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"নীল"</string>
-    <string name="draw_style" msgid="2036125061987325389">"স্টাইল"</string>
+    <string name="draw_style" msgid="2036125061987325389">"শৈলী"</string>
     <string name="draw_size" msgid="4360005386104151209">"আকার"</string>
     <string name="draw_hue" msgid="4975135843189267133">"রঙ বিন্যাস"</string>
     <string name="draw_saturation" msgid="5394395648014454882">"পরিপৃক্তি"</string>
diff --git a/res/values-bs/filtershow_strings.xml b/res/values-bs/filtershow_strings.xml
index c41962d..b260622 100644
--- a/res/values-bs/filtershow_strings.xml
+++ b/res/values-bs/filtershow_strings.xml
@@ -124,7 +124,7 @@
     <string name="color_border_color" msgid="8765458414425980711">"Boja"</string>
     <string name="color_border_clear" msgid="4418261191091091722">"Obriši"</string>
     <string name="color_pick_select" msgid="734312818059057394">"Izabrati prilagođenu boju"</string>
-    <string name="color_pick_title" msgid="6195567431995308876">"Odabrati boju"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Izabrati boju"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Odabir veličine"</string>
     <string name="draw_size_accept" msgid="6781529716526190028">"UREDU"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
diff --git a/res/values-ca/filtershow_strings.xml b/res/values-ca/filtershow_strings.xml
index 2b621de..517886f 100644
--- a/res/values-ca/filtershow_strings.xml
+++ b/res/values-ca/filtershow_strings.xml
@@ -38,7 +38,7 @@
     <string name="size" msgid="4639404642236356037">"Mida"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Configuració"</string>
-    <string name="unsaved" msgid="8704442449002374375">"Hi ha canvis no desats en aquesta imatge."</string>
+    <string name="unsaved" msgid="8704442449002374375">"Hi ha canvis sense desar en aquesta imatge."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Vols desar abans de sortir?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Desa i surt"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"S\'està processant la imatge en resolució completa..."</string>
diff --git a/res/values-de/filtershow_strings.xml b/res/values-de/filtershow_strings.xml
index ea7f226..4cc1888 100644
--- a/res/values-de/filtershow_strings.xml
+++ b/res/values-de/filtershow_strings.xml
@@ -126,7 +126,7 @@
     <string name="color_pick_select" msgid="734312818059057394">"Benutzerdefinierte Farbe wählen"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Farbe auswählen"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Größe auswählen"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"Ok"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
     <string name="state_panel_result" msgid="318640531123298676">"Ergebnis"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"Bild wird gespeichert..."</string>
diff --git a/res/values-ky/filtershow_strings.xml b/res/values-ky/filtershow_strings.xml
index 69756ec..6f220e4 100644
--- a/res/values-ky/filtershow_strings.xml
+++ b/res/values-ky/filtershow_strings.xml
@@ -31,7 +31,7 @@
     <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>
+    <string name="print_image" msgid="1942989216591621413">"Басуу"</string>
     <string name="export_flattened" msgid="9046192331465915411">"Дайын сүрөттү экспорттоо"</string>
     <string name="select_output_settings" msgid="1268532018080310748">"Экспорттолгон сүрөт - тарыхы жок көчүрмө болот."</string>
     <string name="quality" msgid="179292110309050529">"Сапат"</string>
diff --git a/res/values-mr/filtershow_strings.xml b/res/values-mr/filtershow_strings.xml
index 13ed841..09b5991 100644
--- a/res/values-mr/filtershow_strings.xml
+++ b/res/values-mr/filtershow_strings.xml
@@ -30,16 +30,16 @@
     <string name="filtershow_redo" msgid="4219489910543059747">"पुन्हा करा"</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="export_image" msgid="3202835713172222134">"निर्यात"</string>
     <string name="print_image" msgid="1942989216591621413">"प्रिंट करा"</string>
-    <string name="export_flattened" msgid="9046192331465915411">"सपाट केलेली इमेज एक्सपोर्ट करा"</string>
-    <string name="select_output_settings" msgid="1268532018080310748">"एक्सपोर्ट केलेली इमेज इतिहासाशिवाय एक प्रतिलिपी असेल."</string>
+    <string name="export_flattened" msgid="9046192331465915411">"सपाट केलेली इमेज निर्यात करा"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"निर्यात केलेली इमेज इतिहासाशिवाय एक प्रतिलिपी असेल."</string>
     <string name="quality" msgid="179292110309050529">"गुणवत्ता"</string>
     <string name="size" msgid="4639404642236356037">"आकार"</string>
     <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="unsaved" msgid="8704442449002374375">"या प्रतिमेवर जतन न केलेले बदल आहेत."</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>
@@ -129,7 +129,7 @@
     <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>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"इमेज जतन करत आहे"</string>
     <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रक्रिया करत आहे..."</string>
     <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान प्रीसेट सेव्ह करा"</string>
     <string name="filtershow_manage_preset" msgid="3872896753708921286">"वापरकर्ता प्रीसेट व्यवस्थापित करा"</string>
diff --git a/res/values-ne/filtershow_strings.xml b/res/values-ne/filtershow_strings.xml
index c4d8097..ba40805 100644
--- a/res/values-ne/filtershow_strings.xml
+++ b/res/values-ne/filtershow_strings.xml
@@ -41,7 +41,7 @@
     <string name="unsaved" msgid="8704442449002374375">"यो तस्बिरमा बचत नगरिएका परिवर्तनहरू छन्।"</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="save_and_processing" msgid="6371565035837463194">"पूर्ण रिजोलुसन चित्र प्रसोधन गर्दै"</string>
     <string name="exit" msgid="242642957038770113">"निकास"</string>
     <string name="history" msgid="455767361472692409">"इतिहास"</string>
     <string name="reset" msgid="9013181350779592937">"पुनःसेट गर्नुहोस्"</string>
@@ -126,11 +126,11 @@
     <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>
-    <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रशोधन गरिँदै ..."</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रसोधन गरिँदै ..."</string>
     <string name="filtershow_save_preset" msgid="3933550455577927439">"वर्तमान पूर्वसेट सुरक्षित गर्नुहोस्"</string>
     <string name="filtershow_manage_preset" msgid="3872896753708921286">"प्रयोगकर्ता पूर्वसेटहरू प्रबन्ध गर्नुहोस्"</string>
     <string name="filtershow_new_preset" msgid="8923930134923416617">"नयाँ पूर्वसेट"</string>
diff --git a/res/values-zh-rTW/filtershow_strings.xml b/res/values-zh-rTW/filtershow_strings.xml
index f11b08e..f689a0f 100644
--- a/res/values-zh-rTW/filtershow_strings.xml
+++ b/res/values-zh-rTW/filtershow_strings.xml
@@ -33,7 +33,7 @@
     <string name="export_image" msgid="3202835713172222134">"匯出"</string>
     <string name="print_image" msgid="1942989216591621413">"列印"</string>
     <string name="export_flattened" msgid="9046192331465915411">"匯出壓平合併的圖片"</string>
-    <string name="select_output_settings" msgid="1268532018080310748">"匯出的項目是不含記錄的複製圖片。"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"匯出的項目是不含紀錄的複製圖片。"</string>
     <string name="quality" msgid="179292110309050529">"畫質"</string>
     <string name="size" msgid="4639404642236356037">"大小"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>
@@ -43,7 +43,7 @@
     <string name="save_and_exit" msgid="3628425023766687419">"儲存並結束"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"正在處理完整解析度圖片..."</string>
     <string name="exit" msgid="242642957038770113">"結束"</string>
-    <string name="history" msgid="455767361472692409">"記錄"</string>
+    <string name="history" msgid="455767361472692409">"紀錄"</string>
     <string name="reset" msgid="9013181350779592937">"重設"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />