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, 101 insertions, 4 deletions

diff --git a/Plugins/RegExpImport/RegExpImport.pro b/Plugins/RegExpImport/RegExpImport.pro
index b72ec67..c3d1bf8 100644
--- a/Plugins/RegExpImport/RegExpImport.pro
+++ b/Plugins/RegExpImport/RegExpImport.pro
@@ -28,7 +28,8 @@ RESOURCES += \
     regexpimport.qrc
 
 
-TRANSLATIONS += RegExpImport_de.ts \
+TRANSLATIONS += RegExpImport_ro_RO.ts \
+		RegExpImport_de.ts \
 		RegExpImport_it.ts \
 		RegExpImport_zh_CN.ts \
 		RegExpImport_sk.ts \
@@ -52,3 +53,4 @@ TRANSLATIONS += RegExpImport_de.ts \
 
 
 
+
diff --git a/Plugins/RegExpImport/RegExpImport_ro_RO.qm b/Plugins/RegExpImport/RegExpImport_ro_RO.qm
new file mode 100644
index 0000000..2856eb9
--- /dev/null
+++ b/Plugins/RegExpImport/RegExpImport_ro_RO.qm
diff --git a/Plugins/RegExpImport/RegExpImport_ro_RO.ts b/Plugins/RegExpImport/RegExpImport_ro_RO.ts
new file mode 100644
index 0000000..bc6288f
--- /dev/null
+++ b/Plugins/RegExpImport/RegExpImport_ro_RO.ts
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ro_RO">
+<context>
+    <name>RegExpImport</name>
+    <message>
+        <location filename="regexpimport.cpp" line="37"/>
+        <source>Text files (*.txt);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.cpp" line="53"/>
+        <source>Cannot read file %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.cpp" line="161"/>
+        <source>Enter the regular expression pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.cpp" line="169"/>
+        <source>Invalid pattern: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.cpp" line="189"/>
+        <source>Requested capture index %1 is out of range.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.cpp" line="196"/>
+        <source>&lt;p&gt;Requested capture group name &apos;%1&apos;, but it&apos;s not defined in the pattern: &lt;pre&gt;%2&lt;/pre&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RegExpImportConfig</name>
+    <message>
+        <location filename="regexpimport.ui" line="20"/>
+        <source>Capture groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="26"/>
+        <source>Treat all RegExp capture groups as columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="39"/>
+        <source>Import only following groups:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="52"/>
+        <source>&lt;p&gt;Enter comma separated list of capture group indexes. The 0 index refers to the entire matched string.&lt;/p&gt;
+&lt;p&gt;If you used named groups in the pattern, you can use names instead of indexes. You can mix indexes and names in this list.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="56"/>
+        <source>Example: 1, 3, 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="69"/>
+        <source>Pattern:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="76"/>
+        <source>&lt;p&gt;Use Regular Expression groups to enclose parts of the expression that you want to import. If you want to use a group, that you don&apos;t want to import, then use &quot;import only following groups&quot; option below.
+
+You can use named groups and refer to them in group list below. To name a group use: &lt;pre&gt;(?&amp;lt;myGroupName&amp;gt;\s+\d+\s+)&lt;/pre&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="regexpimport.ui" line="81"/>
+        <source>Example: (\d+)\s+((\d+)\w+)\s+(\w+)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/RegExpImport/RegExpImport_ru.qm b/Plugins/RegExpImport/RegExpImport_ru.qm
index 6b9c95d..f44a89e 100644
--- a/Plugins/RegExpImport/RegExpImport_ru.qm
+++ b/Plugins/RegExpImport/RegExpImport_ru.qm
diff --git a/Plugins/RegExpImport/RegExpImport_ru.ts b/Plugins/RegExpImport/RegExpImport_ru.ts
index edcd7f4..d8d4ca8 100644
--- a/Plugins/RegExpImport/RegExpImport_ru.ts
+++ b/Plugins/RegExpImport/RegExpImport_ru.ts
@@ -26,7 +26,7 @@
     <message>
         <location filename="regexpimport.cpp" line="189"/>
         <source>Requested capture index %1 is out of range.</source>
-        <translation>Запрошенный индекс группы вне досягаемости.</translation>
+        <translation>Запрошенный индекс группы %1 вне досягаемости.</translation>
     </message>
     <message>
         <location filename="regexpimport.cpp" line="196"/>
diff --git a/Plugins/RegExpImport/package.xml b/Plugins/RegExpImport/package.xml
new file mode 100644
index 0000000..628dca9
--- /dev/null
+++ b/Plugins/RegExpImport/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>

+<Package>

+    <DisplayName>RegExp Import plugin</DisplayName>

+    <Description>Plugin for importing data from any files using Regular Expressions.</Description>

+    <Version>%VERSION%</Version>

+    <ReleaseDate>%DATE%</ReleaseDate>

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

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

+    <Default>true</Default>

+</Package>
\ No newline at end of file
diff --git a/Plugins/RegExpImport/regexpimport.h b/Plugins/RegExpImport/regexpimport.h
index 3603401..a4e5f66 100644
--- a/Plugins/RegExpImport/regexpimport.h
+++ b/Plugins/RegExpImport/regexpimport.h
@@ -40,7 +40,7 @@ class REGEXPIMPORTSHARED_EXPORT RegExpImport : public GenericPlugin, public Impo
         bool validateOptions();
 
     private:
-        CFG_LOCAL(RegExpImportConfig, cfg)
+        CFG_LOCAL_PERSISTABLE(RegExpImportConfig, cfg)
         QRegularExpression* re = nullptr;
         QList<QVariant> groups;
         QStringList columns;
diff --git a/Plugins/RegExpImport/regexpimport.json b/Plugins/RegExpImport/regexpimport.json
index 3e9323e..ed8085f 100644
--- a/Plugins/RegExpImport/regexpimport.json
+++ b/Plugins/RegExpImport/regexpimport.json
@@ -2,6 +2,6 @@
     "type":        "ImportPlugin",
     "title":       "RegExp import",
     "description": "Importing data from text files using regular expression.",
-    "version":     10001,
+    "version":     10002,
     "author":      "SalSoft"
 }
diff --git a/Plugins/RegExpImport/regexpimport.qrc b/Plugins/RegExpImport/regexpimport.qrc
index ad6ace8..a505f8f 100644
--- a/Plugins/RegExpImport/regexpimport.qrc
+++ b/Plugins/RegExpImport/regexpimport.qrc
@@ -3,6 +3,7 @@
         <file>regexpimport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>RegExpImport_ro_RO.qm</file>
         <file>RegExpImport_de.qm</file>
 
 
@@ -16,3 +17,4 @@
 
 
 
+