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/ConfigMigration/ConfigMigration_de.ts b/Plugins/ConfigMigration/ConfigMigration_de.ts
index 7179052..ebaf7af 100644
--- a/Plugins/ConfigMigration/ConfigMigration_de.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_es.ts b/Plugins/ConfigMigration/ConfigMigration_es.ts
index f412dc9..3854dd1 100644
--- a/Plugins/ConfigMigration/ConfigMigration_es.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_fr.ts b/Plugins/ConfigMigration/ConfigMigration_fr.ts
index ff23dbb..c0ad4a6 100644
--- a/Plugins/ConfigMigration/ConfigMigration_fr.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_pl.ts b/Plugins/ConfigMigration/ConfigMigration_pl.ts
index 08919fd..f2ef5d8 100644
--- a/Plugins/ConfigMigration/ConfigMigration_pl.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_pt_BR.ts b/Plugins/ConfigMigration/ConfigMigration_pt_BR.ts
index d6cf37b..fb23daf 100644
--- a/Plugins/ConfigMigration/ConfigMigration_pt_BR.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_ru.ts b/Plugins/ConfigMigration/ConfigMigration_ru.ts
index f487465..0337f58 100644
--- a/Plugins/ConfigMigration/ConfigMigration_ru.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_sk.ts b/Plugins/ConfigMigration/ConfigMigration_sk.ts
index 84d3076..ffe6eef 100644
--- a/Plugins/ConfigMigration/ConfigMigration_sk.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/ConfigMigration_zh_CN.ts b/Plugins/ConfigMigration/ConfigMigration_zh_CN.ts
index dedba47..249e493 100644
--- a/Plugins/ConfigMigration/ConfigMigration_zh_CN.ts
+++ b/Plugins/ConfigMigration/ConfigMigration_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>ConfigMigration</name>
     <message>
diff --git a/Plugins/ConfigMigration/configmigration.json b/Plugins/ConfigMigration/configmigration.json
index a8c62d3..a0629c0 100644
--- a/Plugins/ConfigMigration/configmigration.json
+++ b/Plugins/ConfigMigration/configmigration.json
@@ -2,7 +2,7 @@
     "type":        "GeneralPurposePlugin",
     "title":       "Configuration migration",
     "description": "Performs migration from SQLiteStudio 2.1.x configuration to version 3.0.0.",
-    "version":     10002,
+    "version":     10003,
     "author":      "SalSoft",
     "gui":         true
 }
diff --git a/Plugins/ConfigMigration/configmigration.qrc b/Plugins/ConfigMigration/configmigration.qrc
index af137f0..d8c40cd 100644
--- a/Plugins/ConfigMigration/configmigration.qrc
+++ b/Plugins/ConfigMigration/configmigration.qrc
@@ -6,5 +6,7 @@
         <file>ConfigMigration_pl.qm</file>
         <file>ConfigMigration_ru.qm</file>
         <file>ConfigMigration_fr.qm</file>
+        <file>ConfigMigration_sk.qm</file>
+        <file>ConfigMigration_zh_CN.qm</file>
     </qresource>
 </RCC>