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>"

11 files changed, 13 insertions, 11 deletions

diff --git a/Plugins/JsonExport/JsonExport_de.ts b/Plugins/JsonExport/JsonExport_de.ts
index e345feb..15fece3 100644
--- a/Plugins/JsonExport/JsonExport_de.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_es.ts b/Plugins/JsonExport/JsonExport_es.ts
index e93d0ff..38209b9 100644
--- a/Plugins/JsonExport/JsonExport_es.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_fr.ts b/Plugins/JsonExport/JsonExport_fr.ts
index cb53aff..48af099 100644
--- a/Plugins/JsonExport/JsonExport_fr.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_pl.ts b/Plugins/JsonExport/JsonExport_pl.ts
index bdfdf8a..4a28cc2 100644
--- a/Plugins/JsonExport/JsonExport_pl.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_pt_BR.ts b/Plugins/JsonExport/JsonExport_pt_BR.ts
index 53480f6..ba1735d 100644
--- a/Plugins/JsonExport/JsonExport_pt_BR.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_ru.ts b/Plugins/JsonExport/JsonExport_ru.ts
index 5419206..61b24eb 100644
--- a/Plugins/JsonExport/JsonExport_ru.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_sk.qm b/Plugins/JsonExport/JsonExport_sk.qm
index 1776294..c854235 100644
--- a/Plugins/JsonExport/JsonExport_sk.qm
+++ b/Plugins/JsonExport/JsonExport_sk.qm
diff --git a/Plugins/JsonExport/JsonExport_sk.ts b/Plugins/JsonExport/JsonExport_sk.ts
index 6fd3228..caade25 100644
--- a/Plugins/JsonExport/JsonExport_sk.ts
+++ b/Plugins/JsonExport/JsonExport_sk.ts
@@ -6,17 +6,17 @@
     <message>
         <location filename="jsonexport.ui" line="20"/>
         <source>Output format</source>
-        <translation type="unfinished"></translation>
+        <translation>Výstupný formát</translation>
     </message>
     <message>
         <location filename="jsonexport.ui" line="26"/>
         <source>Format document (new lines, indentation)</source>
-        <translation type="unfinished"></translation>
+        <translation>Formátovať dokument (nové riadky, odsadenie)</translation>
     </message>
     <message>
         <location filename="jsonexport.ui" line="42"/>
         <source>Compress (everything in one line)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zhustiť (všetko do jedného riadka)</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/JsonExport/JsonExport_zh_CN.ts b/Plugins/JsonExport/JsonExport_zh_CN.ts
index 2102dc6..be101c4 100644
--- a/Plugins/JsonExport/JsonExport_zh_CN.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/jsonexport.json b/Plugins/JsonExport/jsonexport.json
index c56270c..bdc6396 100644
--- a/Plugins/JsonExport/jsonexport.json
+++ b/Plugins/JsonExport/jsonexport.json
@@ -2,6 +2,6 @@
     "type":         "ExportPlugin",
     "title":        "JSON export",
     "description":  "Provides JSON format for exporting.",
-    "version":      10000,
+    "version":      10001,
     "author":       "SalSoft"
 }
diff --git a/Plugins/JsonExport/jsonexport.qrc b/Plugins/JsonExport/jsonexport.qrc
index 7899199..72cd201 100644
--- a/Plugins/JsonExport/jsonexport.qrc
+++ b/Plugins/JsonExport/jsonexport.qrc
@@ -6,5 +6,7 @@
         <file>JsonExport_pl.qm</file>
         <file>JsonExport_ru.qm</file>
         <file>JsonExport_fr.qm</file>
+        <file>JsonExport_sk.qm</file>
+        <file>JsonExport_zh_CN.qm</file>
     </qresource>
 </RCC>