Update upstream source from tag 'upstream/3.2.1+dfsg1'

Update to upstream version '3.2.1+dfsg1'
with Debian dir 5ea0333565de4dc898c062cc0ff4ba1153e2c1e4

9 files changed, 191 insertions, 4 deletions

diff --git a/Plugins/HtmlExport/HtmlExport.pro b/Plugins/HtmlExport/HtmlExport.pro
index 66a68ca..7e84021 100644
--- a/Plugins/HtmlExport/HtmlExport.pro
+++ b/Plugins/HtmlExport/HtmlExport.pro
@@ -29,7 +29,8 @@ FORMS += \
     htmlexport.ui
 
 
-TRANSLATIONS += HtmlExport_de.ts \
+TRANSLATIONS += HtmlExport_ro_RO.ts \
+		HtmlExport_de.ts \
 		HtmlExport_it.ts \
 		HtmlExport_zh_CN.ts \
 		HtmlExport_sk.ts \
@@ -53,3 +54,4 @@ TRANSLATIONS += HtmlExport_de.ts \
 
 
 
+
diff --git a/Plugins/HtmlExport/HtmlExport_ro_RO.qm b/Plugins/HtmlExport/HtmlExport_ro_RO.qm
new file mode 100644
index 0000000..2856eb9
--- /dev/null
+++ b/Plugins/HtmlExport/HtmlExport_ro_RO.qm
diff --git a/Plugins/HtmlExport/HtmlExport_ro_RO.ts b/Plugins/HtmlExport/HtmlExport_ro_RO.ts
new file mode 100644
index 0000000..2860272
--- /dev/null
+++ b/Plugins/HtmlExport/HtmlExport_ro_RO.ts
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ro_RO">
+<context>
+    <name>HtmlExport</name>
+    <message>
+        <location filename="htmlexport.cpp" line="46"/>
+        <source>SQL query results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="78"/>
+        <location filename="htmlexport.cpp" line="155"/>
+        <source>no type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="115"/>
+        <location filename="htmlexport.cpp" line="243"/>
+        <source>Exported table: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="127"/>
+        <location filename="htmlexport.cpp" line="255"/>
+        <source>Table: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="255"/>
+        <source>virtual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="308"/>
+        <source>Exported database: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="324"/>
+        <source>Index: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="330"/>
+        <source>For table:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="337"/>
+        <source>Unique:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="338"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="338"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="344"/>
+        <source>Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="345"/>
+        <source>Collating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="346"/>
+        <source>Sort order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="380"/>
+        <source>Trigger: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="386"/>
+        <source>Activated:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="394"/>
+        <source>Action:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="401"/>
+        <source>On view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="403"/>
+        <source>On table:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="414"/>
+        <source>Activate condition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="421"/>
+        <source>Code executed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="455"/>
+        <source>View: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.cpp" line="480"/>
+        <source>Document generated by SQLiteStudio v%1 on %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HtmlExportConfig</name>
+    <message>
+        <location filename="htmlexport.ui" line="36"/>
+        <source>Maximum number of characters per cell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="43"/>
+        <source>Include data types in first row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="53"/>
+        <source>Column names as first row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="63"/>
+        <source>Row numbers as first column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="73"/>
+        <source>Output format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="79"/>
+        <source>Format document (new lines, indentation)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="92"/>
+        <source>Compress (everything in one line)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="108"/>
+        <source>&lt;p&gt;When enabled, HTML characters such as &amp;lt;, &amp;gt; and &amp;amp; are not escaped in exported values. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &amp;lt; and &amp;gt; characters). Be warned.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="htmlexport.ui" line="111"/>
+        <source>Don&apos;t escape HTML characters</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/HtmlExport/HtmlExport_ru.qm b/Plugins/HtmlExport/HtmlExport_ru.qm
index a595ca1..97efccd 100644
--- a/Plugins/HtmlExport/HtmlExport_ru.qm
+++ b/Plugins/HtmlExport/HtmlExport_ru.qm
diff --git a/Plugins/HtmlExport/HtmlExport_ru.ts b/Plugins/HtmlExport/HtmlExport_ru.ts
index 51ef53c..695ce34 100644
--- a/Plugins/HtmlExport/HtmlExport_ru.ts
+++ b/Plugins/HtmlExport/HtmlExport_ru.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="htmlexport.cpp" line="46"/>
         <source>SQL query results</source>
-        <translation>Реузльтаты запроса SQL</translation>
+        <translation type="unfinished">Результаты запроса SQL</translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="78"/>
diff --git a/Plugins/HtmlExport/htmlexport.h b/Plugins/HtmlExport/htmlexport.h
index 04a379c..93a0bc5 100644
--- a/Plugins/HtmlExport/htmlexport.h
+++ b/Plugins/HtmlExport/htmlexport.h
@@ -57,7 +57,7 @@ class HTMLEXPORTSHARED_EXPORT HtmlExport : public GenericExportPlugin
 
         static QString compressCss(QString css);
 
-        CFG_LOCAL(HtmlExportConfig, cfg)
+        CFG_LOCAL_PERSISTABLE(HtmlExportConfig, cfg)
         bool indent = false;
         int indentDepth = 0;
         QString indentStr;
diff --git a/Plugins/HtmlExport/htmlexport.json b/Plugins/HtmlExport/htmlexport.json
index 2ca4b6d..d6a32b1 100644
--- a/Plugins/HtmlExport/htmlexport.json
+++ b/Plugins/HtmlExport/htmlexport.json
@@ -2,6 +2,6 @@
     "type":         "ExportPlugin",
     "title":        "HTML export",
     "description":  "Provides HTML format for exporting.",
-    "version":      10001,
+    "version":      10002,
     "author":       "SalSoft"
 }
diff --git a/Plugins/HtmlExport/htmlexport.qrc b/Plugins/HtmlExport/htmlexport.qrc
index 0198048..2138f41 100644
--- a/Plugins/HtmlExport/htmlexport.qrc
+++ b/Plugins/HtmlExport/htmlexport.qrc
@@ -6,6 +6,7 @@
         <file>htmlexport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>HtmlExport_ro_RO.qm</file>
         <file>HtmlExport_de.qm</file>
 
 
@@ -19,3 +20,4 @@
 
 
 
+
diff --git a/Plugins/HtmlExport/package.xml b/Plugins/HtmlExport/package.xml
new file mode 100644
index 0000000..5d92263
--- /dev/null
+++ b/Plugins/HtmlExport/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>

+<Package>

+    <DisplayName>HTML Export plugin</DisplayName>

+    <Description>Plugin for exporting into HTML format.</Description>

+    <Version>%VERSION%</Version>

+    <ReleaseDate>%DATE%</ReleaseDate>

+    <Name>pl.com.salsoft.sqlitestudio.plugins.htmlexport</Name>

+    <Dependencies>pl.com.salsoft.sqlitestudio.plugins</Dependencies>

+    <Default>true</Default>

+</Package>
\ No newline at end of file