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, 20 insertions, 18 deletions

diff --git a/Plugins/CsvExport/CsvExport_de.ts b/Plugins/CsvExport/CsvExport_de.ts
index f87bc99..1d07517 100644
--- a/Plugins/CsvExport/CsvExport_de.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_es.ts b/Plugins/CsvExport/CsvExport_es.ts
index de3f0cb..09fd76a 100644
--- a/Plugins/CsvExport/CsvExport_es.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_fr.ts b/Plugins/CsvExport/CsvExport_fr.ts
index b36745a..4917c87 100644
--- a/Plugins/CsvExport/CsvExport_fr.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_pl.ts b/Plugins/CsvExport/CsvExport_pl.ts
index a925db2..a608049 100644
--- a/Plugins/CsvExport/CsvExport_pl.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_pt_BR.ts b/Plugins/CsvExport/CsvExport_pt_BR.ts
index 8f3f678..0c8b1d9 100644
--- a/Plugins/CsvExport/CsvExport_pt_BR.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_ru.ts b/Plugins/CsvExport/CsvExport_ru.ts
index 230a06f..5cf441b 100644
--- a/Plugins/CsvExport/CsvExport_ru.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_sk.qm b/Plugins/CsvExport/CsvExport_sk.qm
index 1776294..ea246cd 100644
--- a/Plugins/CsvExport/CsvExport_sk.qm
+++ b/Plugins/CsvExport/CsvExport_sk.qm
diff --git a/Plugins/CsvExport/CsvExport_sk.ts b/Plugins/CsvExport/CsvExport_sk.ts
index 4a85fbd..54ab016 100644
--- a/Plugins/CsvExport/CsvExport_sk.ts
+++ b/Plugins/CsvExport/CsvExport_sk.ts
@@ -6,52 +6,52 @@
     <message>
         <location filename="CsvExport.ui" line="20"/>
         <source>Column names in first row</source>
-        <translation type="unfinished"></translation>
+        <translation>Názvy stĺpcov v prvom riadku</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="30"/>
         <source>Column separator:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oddeľovač stĺpcov:</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="41"/>
         <source>, (comma)</source>
-        <translation type="unfinished"></translation>
+        <translation>, (čiarka)</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="46"/>
         <source>; (semicolon)</source>
-        <translation type="unfinished"></translation>
+        <translation>; (bodkočiarka)</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="51"/>
         <source>\t (tab)</source>
-        <translation type="unfinished"></translation>
+        <translation>\t (tabulátor)</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="56"/>
         <source>  (whitespace)</source>
-        <translation type="unfinished"></translation>
+        <translation>  (medzera)</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="61"/>
         <source>Custom:</source>
-        <translation type="unfinished"></translation>
+        <translation>Iný:</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="82"/>
         <source>Export NULL values as:</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportovať NULL hodnoty ako:</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="89"/>
         <source>Empty string</source>
-        <translation type="unfinished"></translation>
+        <translation>Prázdny reťazec</translation>
     </message>
     <message>
         <location filename="csvexport.cpp" line="42"/>
         <source>Enter the custom separator character.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadajte vlasntý oddeľovač.</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/CsvExport/CsvExport_zh_CN.ts b/Plugins/CsvExport/CsvExport_zh_CN.ts
index c0c8045..e73fe4e 100644
--- a/Plugins/CsvExport/CsvExport_zh_CN.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/csvexport.json b/Plugins/CsvExport/csvexport.json
index d19e750..face150 100644
--- a/Plugins/CsvExport/csvexport.json
+++ b/Plugins/CsvExport/csvexport.json
@@ -2,6 +2,6 @@
     "type":        "ExportPlugin",
     "title":       "CSV export",
     "description": "Provides CSV format for exporting",
-    "version":     10001,
+    "version":     10002,
     "author":      "SalSoft"
 }
diff --git a/Plugins/CsvExport/csvexport.qrc b/Plugins/CsvExport/csvexport.qrc
index 2467458..e6660ec 100644
--- a/Plugins/CsvExport/csvexport.qrc
+++ b/Plugins/CsvExport/csvexport.qrc
@@ -6,5 +6,7 @@
         <file>CsvExport_pl.qm</file>
         <file>CsvExport_ru.qm</file>
         <file>CsvExport_fr.qm</file>
+        <file>CsvExport_sk.qm</file>
+        <file>CsvExport_zh_CN.qm</file>
     </qresource>
 </RCC>