From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Thu, 9 Feb 2017 04:36:04 -0500
Subject: Imported Upstream version 3.1.1+dfsg1

---
 Plugins/CsvImport/CsvImport.pro      |   6 ++++--
 Plugins/CsvImport/CsvImport_de.ts    |   6 +++---
 Plugins/CsvImport/CsvImport_es.ts    |   6 +++---
 Plugins/CsvImport/CsvImport_fr.qm    | Bin 1988 -> 2008 bytes
 Plugins/CsvImport/CsvImport_fr.ts    |  14 +++++++-------
 Plugins/CsvImport/CsvImport_it.ts    |   6 +++---
 Plugins/CsvImport/CsvImport_pl.ts    |   6 +++---
 Plugins/CsvImport/CsvImport_pt_BR.ts |   6 +++---
 Plugins/CsvImport/CsvImport_ru.qm    | Bin 2184 -> 2502 bytes
 Plugins/CsvImport/CsvImport_ru.ts    |   8 ++++----
 Plugins/CsvImport/CsvImport_sk.ts    |   6 +++---
 Plugins/CsvImport/CsvImport_zh_CN.ts |   6 +++---
 Plugins/CsvImport/csvimport.cpp      |   4 +++-
 Plugins/CsvImport/csvimport.qrc      |   4 ++++
 14 files changed, 43 insertions(+), 35 deletions(-)

(limited to 'Plugins/CsvImport')

diff --git a/Plugins/CsvImport/CsvImport.pro b/Plugins/CsvImport/CsvImport.pro
index 7e8dce0..1aaa291 100644
--- a/Plugins/CsvImport/CsvImport.pro
+++ b/Plugins/CsvImport/CsvImport.pro
@@ -28,10 +28,10 @@ RESOURCES += \
     csvimport.qrc
 
 
-TRANSLATIONS += CsvImport_it.ts \
+TRANSLATIONS += CsvImport_de.ts \
+		CsvImport_it.ts \
 		CsvImport_zh_CN.ts \
 		CsvImport_sk.ts \
-		CsvImport_de.ts \
 		CsvImport_ru.ts \
 		CsvImport_pt_BR.ts \
 		CsvImport_fr.ts \
@@ -50,3 +50,5 @@ TRANSLATIONS += CsvImport_it.ts \
 
 
 
+
+
diff --git a/Plugins/CsvImport/CsvImport_de.ts b/Plugins/CsvImport/CsvImport_de.ts
index 6106963..81164b8 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>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_es.ts b/Plugins/CsvImport/CsvImport_es.ts
index 19027fc..aa25927 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>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_fr.qm b/Plugins/CsvImport/CsvImport_fr.qm
index cd941d9..f83fb44 100644
Binary files a/Plugins/CsvImport/CsvImport_fr.qm and b/Plugins/CsvImport/CsvImport_fr.qm differ
diff --git a/Plugins/CsvImport/CsvImport_fr.ts b/Plugins/CsvImport/CsvImport_fr.ts
index 3d160e1..f30bc54 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>
@@ -14,7 +14,7 @@
         <translation>Impossible de trouver des données dans le fichier %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation>Saisir le caractère séparateur.</translation>
     </message>
@@ -23,7 +23,7 @@
         <translation type="obsolete">Saisir la valeur qui sera interprétée comme NULL.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation>Fichiers CSV (*.csv);;Fichiers texte (*.txt);;Tous les fichiers (*)</translation>
     </message>
@@ -43,7 +43,7 @@
     <message>
         <location filename="CsvImportOptions.ui" line="34"/>
         <source>\t (tab)</source>
-        <translation>\t (tab)</translation>
+        <translation>\t (tabulation)</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="39"/>
@@ -53,7 +53,7 @@
     <message>
         <location filename="CsvImportOptions.ui" line="44"/>
         <source>Custom:</source>
-        <translation>Personalisé:</translation>
+        <translation>Personalisé :</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="52"/>
@@ -72,7 +72,7 @@
     <message>
         <location filename="CsvImportOptions.ui" line="65"/>
         <source>Field separator:</source>
-        <translation>Champ séparateur:</translation>
+        <translation>Champ séparateur :</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="85"/>
@@ -82,7 +82,7 @@
     <message>
         <location filename="CsvImportOptions.ui" line="88"/>
         <source>NULL values:</source>
-        <translation>Valeurs NULL:</translation>
+        <translation>Valeurs NULL :</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="98"/>
diff --git a/Plugins/CsvImport/CsvImport_it.ts b/Plugins/CsvImport/CsvImport_it.ts
index 46c1948..b3f5181 100644
--- a/Plugins/CsvImport/CsvImport_it.ts
+++ b/Plugins/CsvImport/CsvImport_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it_IT">
 <context>
     <name>CsvImport</name>
     <message>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_pl.ts b/Plugins/CsvImport/CsvImport_pl.ts
index 376d0d2..48ad5f3 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>
@@ -14,7 +14,7 @@
         <translation>Nie znaleziono danych w pliku %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation>Wprowadź własny znak separatora.</translation>
     </message>
@@ -23,7 +23,7 @@
         <translation type="obsolete">Wprowadź wartość, która będzie interpretowana jako NULL.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation>Pliki CSV (*.csv);;Pliki tekstowe (*.txt);;Wszystkie pliki (*)</translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_pt_BR.ts b/Plugins/CsvImport/CsvImport_pt_BR.ts
index 32276a3..6b639c7 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>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_ru.qm b/Plugins/CsvImport/CsvImport_ru.qm
index 8def441..08fab26 100644
Binary files a/Plugins/CsvImport/CsvImport_ru.qm and b/Plugins/CsvImport/CsvImport_ru.qm differ
diff --git a/Plugins/CsvImport/CsvImport_ru.ts b/Plugins/CsvImport/CsvImport_ru.ts
index 41ab843..9847fbd 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>
@@ -14,7 +14,7 @@
         <translation>Невозможно найти данные в файле %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation>Введите произвольный символ разделителя.</translation>
     </message>
@@ -23,7 +23,7 @@
         <translation type="obsolete">Введите значение, которое будет интерпретировано как NULL.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation>Файлы CSV (*.csv);;Текстовые файлы (*.txt);;Все файлы (*)</translation>
     </message>
@@ -77,7 +77,7 @@
     <message>
         <location filename="CsvImportOptions.ui" line="85"/>
         <source>If enabled, then text value provided on the right will be interpreted as NULL</source>
-        <translation type="unfinished"></translation>
+        <translation>При выборе данной опции указанное в поле справа текстовое значение будет интерпретировано как NULL</translation>
     </message>
     <message>
         <location filename="CsvImportOptions.ui" line="88"/>
diff --git a/Plugins/CsvImport/CsvImport_sk.ts b/Plugins/CsvImport/CsvImport_sk.ts
index 134ed50..93000c1 100644
--- a/Plugins/CsvImport/CsvImport_sk.ts
+++ b/Plugins/CsvImport/CsvImport_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>CsvImport</name>
     <message>
@@ -14,7 +14,7 @@
         <translation>Nemôžem nájsť dáta v súbore %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation>Zadajte vlastný oddeľovač.</translation>
     </message>
@@ -23,7 +23,7 @@
         <translation type="obsolete">Zadajte hodnotu, ktorá bude interpretovaná ako NULL.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation>CSV súbory (*.csv);;Textové súbory (*.txt);;Všetky súbory (*)</translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_zh_CN.ts b/Plugins/CsvImport/CsvImport_zh_CN.ts
index 7a11e6f..e99a423 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>
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="163"/>
+        <location filename="csvimport.cpp" line="165"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="186"/>
+        <location filename="csvimport.cpp" line="188"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/csvimport.cpp b/Plugins/CsvImport/csvimport.cpp
index b1d52ee..e9f8f15 100644
--- a/Plugins/CsvImport/csvimport.cpp
+++ b/Plugins/CsvImport/csvimport.cpp
@@ -83,7 +83,9 @@ bool CsvImport::extractColumns()
 void CsvImport::defineCsvFormat()
 {
     csvFormat = CsvFormat();
-    csvFormat.rowSeparator = '\n';
+    csvFormat.rowSeparators = QStringList({"\r\n", "\n", "\r"});
+    csvFormat.multipleRowSeparators = true;
+    csvFormat.strictRowSeparator = true;
 
     switch (cfg.CsvImport.Separator.get())
     {
diff --git a/Plugins/CsvImport/csvimport.qrc b/Plugins/CsvImport/csvimport.qrc
index e63d26f..7af6fb4 100644
--- a/Plugins/CsvImport/csvimport.qrc
+++ b/Plugins/CsvImport/csvimport.qrc
@@ -3,6 +3,8 @@
         <file>CsvImportOptions.ui</file>
     </qresource>
     <qresource prefix="/msg">
+
+        <file>CsvImport_de.qm</file>
         <file>CsvImport_pl.qm</file>
         <file>CsvImport_ru.qm</file>
         <file>CsvImport_fr.qm</file>
@@ -10,3 +12,5 @@
         <file>CsvImport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
-- 
cgit v1.2.3