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

12 files changed, 26 insertions, 24 deletions

diff --git a/Plugins/CsvImport/CsvImport_de.ts b/Plugins/CsvImport/CsvImport_de.ts
index 04dc2c3..4ebea97 100644
--- a/Plugins/CsvImport/CsvImport_de.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/CsvImport_es.ts b/Plugins/CsvImport/CsvImport_es.ts
index 6be4b48..14ff9c3 100644
--- a/Plugins/CsvImport/CsvImport_es.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/CsvImport_fr.ts b/Plugins/CsvImport/CsvImport_fr.ts
index 66d7de9..f8854e0 100644
--- a/Plugins/CsvImport/CsvImport_fr.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/CsvImport_pl.ts b/Plugins/CsvImport/CsvImport_pl.ts
index 7b9494f..227b16c 100644
--- a/Plugins/CsvImport/CsvImport_pl.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/CsvImport_pt_BR.ts b/Plugins/CsvImport/CsvImport_pt_BR.ts
index b01222f..063fc09 100644
--- a/Plugins/CsvImport/CsvImport_pt_BR.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/CsvImport_ru.qm b/Plugins/CsvImport/CsvImport_ru.qm
index 0202276..e72533e 100644
--- a/Plugins/CsvImport/CsvImport_ru.qm
+++ b/Plugins/CsvImport/CsvImport_ru.qm
diff --git a/Plugins/CsvImport/CsvImport_ru.ts b/Plugins/CsvImport/CsvImport_ru.ts
index a38f2d1..93ecdba 100644
--- a/Plugins/CsvImport/CsvImport_ru.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
@@ -64,7 +64,7 @@
     <message>
         <location filename="CsvImportOptions.ui" line="55"/>
         <source>First line represents CSV column names</source>
-        <translation type="unfinished"></translation>
+        <translation>Имена столбцов в первой строке</translation>
     </message>
     <message>
         <source>Skip first row of data</source>
diff --git a/Plugins/CsvImport/CsvImport_sk.qm b/Plugins/CsvImport/CsvImport_sk.qm
index 1776294..281fc9a 100644
--- a/Plugins/CsvImport/CsvImport_sk.qm
+++ b/Plugins/CsvImport/CsvImport_sk.qm
diff --git a/Plugins/CsvImport/CsvImport_sk.ts b/Plugins/CsvImport/CsvImport_sk.ts
index c402357..5d915ac 100644
--- a/Plugins/CsvImport/CsvImport_sk.ts
+++ b/Plugins/CsvImport/CsvImport_sk.ts
@@ -6,27 +6,27 @@
     <message>
         <location filename="csvimport.cpp" line="30"/>
         <source>Cannot read file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nemôžem čítať súbor %1</translation>
     </message>
     <message>
         <location filename="csvimport.cpp" line="62"/>
         <source>Could not find any data in the file %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nemôžem nájsť dáta v súbore %1.</translation>
     </message>
     <message>
         <location filename="csvimport.cpp" line="167"/>
         <source>Enter the custom separator character.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadajte vlastný oddeľovač.</translation>
     </message>
     <message>
         <location filename="csvimport.cpp" line="181"/>
         <source>Enter the value that will be interpreted as a NULL.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadajte hodnotu, ktorá bude interpretovaná ako NULL.</translation>
     </message>
     <message>
         <location filename="csvimport.cpp" line="194"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>CSV súbory (*.csv);;Textové súbory (*.txt);;Všetky súbory (*)</translation>
     </message>
 </context>
 <context>
@@ -34,52 +34,52 @@
     <message>
         <location filename="CsvImportOptions.ui" line="24"/>
         <source>, (comma)</source>
-        <translation type="unfinished"></translation>
+        <translation>, (čiarka)</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="29"/>
         <source>; (semicolon)</source>
-        <translation type="unfinished"></translation>
+        <translation>; (bodkočiarka)</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="34"/>
         <source>\t (tab)</source>
-        <translation type="unfinished"></translation>
+        <translation>\t (tabulátor)</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="39"/>
         <source>  (whitespace)</source>
-        <translation type="unfinished"></translation>
+        <translation>  (medzera)</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="44"/>
         <source>Custom:</source>
-        <translation type="unfinished"></translation>
+        <translation>Iný:</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="52"/>
         <source>&lt;p&gt;Enable this if the first data line in your CSV file represents column names. You don&apos;t want column names to be imported into the table as a regular data.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Zaškrtnite túto voľbu ak prvý riadok v CSV súbore obsahuje názvy stĺpcov a nechcete aby boli naimportované do tabuľky&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="55"/>
         <source>First line represents CSV column names</source>
-        <translation type="unfinished"></translation>
+        <translation>Názvy stĺpcov v prvom riadku</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="65"/>
         <source>Field separator:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oddeľovač:</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="85"/>
         <source>NULL values:</source>
-        <translation type="unfinished"></translation>
+        <translation>NULL hodnoty:</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="95"/>
         <source>If your CSV data contains null values, define how are they represented in the CSV.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ak váš CSV súbor obsahuje null hodnoty, zadajte ako sú reprezentované v CSV.</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/CsvImport/CsvImport_zh_CN.ts b/Plugins/CsvImport/CsvImport_zh_CN.ts
index 8248169..c1958e3 100644
--- a/Plugins/CsvImport/CsvImport_zh_CN.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
diff --git a/Plugins/CsvImport/csvimport.json b/Plugins/CsvImport/csvimport.json
index f6280fe..64f8e18 100644
--- a/Plugins/CsvImport/csvimport.json
+++ b/Plugins/CsvImport/csvimport.json
@@ -2,6 +2,6 @@
     "type":        "ImportPlugin",
     "title":       "CSV import",
     "description": "CSV format support for importing data",
-    "version":     10002,
+    "version":     10003,
     "author":      "SalSoft"
 }
diff --git a/Plugins/CsvImport/csvimport.qrc b/Plugins/CsvImport/csvimport.qrc
index b65feb0..e63d26f 100644
--- a/Plugins/CsvImport/csvimport.qrc
+++ b/Plugins/CsvImport/csvimport.qrc
@@ -6,5 +6,7 @@
         <file>CsvImport_pl.qm</file>
         <file>CsvImport_ru.qm</file>
         <file>CsvImport_fr.qm</file>
+        <file>CsvImport_sk.qm</file>
+        <file>CsvImport_zh_CN.qm</file>
     </qresource>
 </RCC>