Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

10 files changed, 11 insertions, 9 deletions

diff --git a/Plugins/RegExpImport/RegExpImport_de.ts b/Plugins/RegExpImport/RegExpImport_de.ts
index e73d909..2a30835 100644
--- a/Plugins/RegExpImport/RegExpImport_de.ts
+++ b/Plugins/RegExpImport/RegExpImport_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_es.ts b/Plugins/RegExpImport/RegExpImport_es.ts
index fd5ae74..c58d204 100644
--- a/Plugins/RegExpImport/RegExpImport_es.ts
+++ b/Plugins/RegExpImport/RegExpImport_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_fr.ts b/Plugins/RegExpImport/RegExpImport_fr.ts
index 6ab0b2e..5a6e957 100644
--- a/Plugins/RegExpImport/RegExpImport_fr.ts
+++ b/Plugins/RegExpImport/RegExpImport_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_pl.ts b/Plugins/RegExpImport/RegExpImport_pl.ts
index a5d567c..d55ed25 100644
--- a/Plugins/RegExpImport/RegExpImport_pl.ts
+++ b/Plugins/RegExpImport/RegExpImport_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_pt_BR.ts b/Plugins/RegExpImport/RegExpImport_pt_BR.ts
index b861545..0af41e7 100644
--- a/Plugins/RegExpImport/RegExpImport_pt_BR.ts
+++ b/Plugins/RegExpImport/RegExpImport_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_ru.ts b/Plugins/RegExpImport/RegExpImport_ru.ts
index 09ad9a9..edcd7f4 100644
--- a/Plugins/RegExpImport/RegExpImport_ru.ts
+++ b/Plugins/RegExpImport/RegExpImport_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_sk.ts b/Plugins/RegExpImport/RegExpImport_sk.ts
index 9b34ed7..25068a5 100644
--- a/Plugins/RegExpImport/RegExpImport_sk.ts
+++ b/Plugins/RegExpImport/RegExpImport_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_zh_CN.ts b/Plugins/RegExpImport/RegExpImport_zh_CN.ts
index 97a39d5..c361148 100644
--- a/Plugins/RegExpImport/RegExpImport_zh_CN.ts
+++ b/Plugins/RegExpImport/RegExpImport_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/regexpimport.json b/Plugins/RegExpImport/regexpimport.json
index 8a0f746..3e9323e 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":     10000,
+    "version":     10001,
     "author":      "SalSoft"
 }
diff --git a/Plugins/RegExpImport/regexpimport.qrc b/Plugins/RegExpImport/regexpimport.qrc
index e1cb912..2fb1a4f 100644
--- a/Plugins/RegExpImport/regexpimport.qrc
+++ b/Plugins/RegExpImport/regexpimport.qrc
@@ -6,5 +6,7 @@
         <file>RegExpImport_pl.qm</file>
         <file>RegExpImport_ru.qm</file>
         <file>RegExpImport_fr.qm</file>
+        <file>RegExpImport_sk.qm</file>
+        <file>RegExpImport_zh_CN.qm</file>
     </qresource>
 </RCC>