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/Printing/Printing_de.ts b/Plugins/Printing/Printing_de.ts
index 9ce2cb4..6a165a2 100644
--- a/Plugins/Printing/Printing_de.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_es.ts b/Plugins/Printing/Printing_es.ts
index d76730d..cad9a2f 100644
--- a/Plugins/Printing/Printing_es.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_fr.ts b/Plugins/Printing/Printing_fr.ts
index 9d86ad5..c851a95 100644
--- a/Plugins/Printing/Printing_fr.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_pl.ts b/Plugins/Printing/Printing_pl.ts
index b372ef9..b56a3ce 100644
--- a/Plugins/Printing/Printing_pl.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_pt_BR.ts b/Plugins/Printing/Printing_pt_BR.ts
index c003b38..61016f0 100644
--- a/Plugins/Printing/Printing_pt_BR.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_ru.ts b/Plugins/Printing/Printing_ru.ts
index 6a63c83..642f912 100644
--- a/Plugins/Printing/Printing_ru.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_sk.ts b/Plugins/Printing/Printing_sk.ts
index 4e35c9d..8dce4a8 100644
--- a/Plugins/Printing/Printing_sk.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/Printing_zh_CN.ts b/Plugins/Printing/Printing_zh_CN.ts
index 7c6dcfe..0b1b255 100644
--- a/Plugins/Printing/Printing_zh_CN.ts
+++ b/Plugins/Printing/Printing_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>Printing</name>
     <message>
diff --git a/Plugins/Printing/printing.json b/Plugins/Printing/printing.json
index 101f07b..5313186 100644
--- a/Plugins/Printing/printing.json
+++ b/Plugins/Printing/printing.json
@@ -2,7 +2,7 @@
     "type":         "GeneralPurposePlugin",
     "title":        "Printing",
     "description":  "Provides printing support.",
-    "version":      10001,
+    "version":      10002,
     "author":       "SalSoft",
     "gui":          true,
     "dependencies": "PdfExport"
diff --git a/Plugins/Printing/printing.qrc b/Plugins/Printing/printing.qrc
index dc7f27c..c4be754 100644
--- a/Plugins/Printing/printing.qrc
+++ b/Plugins/Printing/printing.qrc
@@ -6,5 +6,7 @@
         <file>Printing_pl.qm</file>
         <file>Printing_ru.qm</file>
         <file>Printing_fr.qm</file>
+        <file>Printing_sk.qm</file>
+        <file>Printing_zh_CN.qm</file>
     </qresource>
 </RCC>