New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

17 files changed, 122 insertions, 21 deletions

diff --git a/Plugins/CsvImport/CsvImport.pro b/Plugins/CsvImport/CsvImport.pro
index 1aaa291..ed3eb2c 100644
--- a/Plugins/CsvImport/CsvImport.pro
+++ b/Plugins/CsvImport/CsvImport.pro
@@ -28,7 +28,8 @@ RESOURCES += \
     csvimport.qrc
 
 
-TRANSLATIONS += CsvImport_de.ts \
+TRANSLATIONS += CsvImport_ro_RO.ts \
+		CsvImport_de.ts \
 		CsvImport_it.ts \
 		CsvImport_zh_CN.ts \
 		CsvImport_sk.ts \
@@ -52,3 +53,4 @@ TRANSLATIONS += CsvImport_de.ts \
 
 
 
+
diff --git a/Plugins/CsvImport/CsvImport_de.ts b/Plugins/CsvImport/CsvImport_de.ts
index 81164b8..891bae9 100644
--- a/Plugins/CsvImport/CsvImport_de.ts
+++ b/Plugins/CsvImport/CsvImport_de.ts
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <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 aa25927..2d62a16 100644
--- a/Plugins/CsvImport/CsvImport_es.ts
+++ b/Plugins/CsvImport/CsvImport_es.ts
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_fr.ts b/Plugins/CsvImport/CsvImport_fr.ts
index f30bc54..fdc6108 100644
--- a/Plugins/CsvImport/CsvImport_fr.ts
+++ b/Plugins/CsvImport/CsvImport_fr.ts
@@ -14,7 +14,7 @@
         <translation>Impossible de trouver des données dans le fichier %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <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="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation>Fichiers CSV (*.csv);;Fichiers texte (*.txt);;Tous les fichiers (*)</translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_it.ts b/Plugins/CsvImport/CsvImport_it.ts
index b3f5181..8d6c029 100644
--- a/Plugins/CsvImport/CsvImport_it.ts
+++ b/Plugins/CsvImport/CsvImport_it.ts
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <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 48ad5f3..d53af99 100644
--- a/Plugins/CsvImport/CsvImport_pl.ts
+++ b/Plugins/CsvImport/CsvImport_pl.ts
@@ -14,7 +14,7 @@
         <translation>Nie znaleziono danych w pliku %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <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="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <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 6b639c7..d1e3182 100644
--- a/Plugins/CsvImport/CsvImport_pt_BR.ts
+++ b/Plugins/CsvImport/CsvImport_pt_BR.ts
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_ro_RO.qm b/Plugins/CsvImport/CsvImport_ro_RO.qm
new file mode 100644
index 0000000..2856eb9
--- /dev/null
+++ b/Plugins/CsvImport/CsvImport_ro_RO.qm
diff --git a/Plugins/CsvImport/CsvImport_ro_RO.ts b/Plugins/CsvImport/CsvImport_ro_RO.ts
new file mode 100644
index 0000000..0a33907
--- /dev/null
+++ b/Plugins/CsvImport/CsvImport_ro_RO.ts
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ro_RO">
+<context>
+    <name>CsvImport</name>
+    <message>
+        <location filename="csvimport.cpp" line="30"/>
+        <source>Cannot read file %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="csvimport.cpp" line="62"/>
+        <source>Could not find any data in the file %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="csvimport.cpp" line="167"/>
+        <source>Enter the custom separator character.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="csvimport.cpp" line="190"/>
+        <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>csvImportOptions</name>
+    <message>
+        <location filename="CsvImportOptions.ui" line="24"/>
+        <source>, (comma)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="29"/>
+        <source>; (semicolon)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="34"/>
+        <source>\t (tab)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="39"/>
+        <source>  (whitespace)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="44"/>
+        <source>Custom:</source>
+        <translation type="unfinished"></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>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="55"/>
+        <source>First line represents CSV column names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="65"/>
+        <source>Field separator:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="88"/>
+        <source>NULL values:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CsvImportOptions.ui" line="98"/>
+        <source>If your CSV data contains null values, define how are they represented in the CSV.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/Plugins/CsvImport/CsvImport_ru.ts b/Plugins/CsvImport/CsvImport_ru.ts
index 9847fbd..0f7d633 100644
--- a/Plugins/CsvImport/CsvImport_ru.ts
+++ b/Plugins/CsvImport/CsvImport_ru.ts
@@ -14,7 +14,7 @@
         <translation>Невозможно найти данные в файле %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <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="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <source>CSV files (*.csv);;Text files (*.txt);;All files (*)</source>
         <translation>Файлы CSV (*.csv);;Текстовые файлы (*.txt);;Все файлы (*)</translation>
     </message>
diff --git a/Plugins/CsvImport/CsvImport_sk.ts b/Plugins/CsvImport/CsvImport_sk.ts
index 93000c1..f607ab5 100644
--- a/Plugins/CsvImport/CsvImport_sk.ts
+++ b/Plugins/CsvImport/CsvImport_sk.ts
@@ -14,7 +14,7 @@
         <translation>Nemôžem nájsť dáta v súbore %1.</translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <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="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <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 e99a423..9bca9fb 100644
--- a/Plugins/CsvImport/CsvImport_zh_CN.ts
+++ b/Plugins/CsvImport/CsvImport_zh_CN.ts
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="165"/>
+        <location filename="csvimport.cpp" line="167"/>
         <source>Enter the custom separator character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="csvimport.cpp" line="188"/>
+        <location filename="csvimport.cpp" line="190"/>
         <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 e9f8f15..f8edcbc 100644
--- a/Plugins/CsvImport/csvimport.cpp
+++ b/Plugins/CsvImport/csvimport.cpp
@@ -105,6 +105,8 @@ void CsvImport::defineCsvFormat()
             csvFormat.columnSeparator = cfg.CsvImport.CustomSeparator.get();
             break;
     }
+
+    csvFormat.calculateSeparatorMaxLengths();
 }
 
 QList<ImportPlugin::ColumnDefinition> CsvImport::getColumns() const
diff --git a/Plugins/CsvImport/csvimport.h b/Plugins/CsvImport/csvimport.h
index cec803c..3980d86 100644
--- a/Plugins/CsvImport/csvimport.h
+++ b/Plugins/CsvImport/csvimport.h
@@ -49,7 +49,7 @@ class CSVIMPORTSHARED_EXPORT CsvImport : public GenericPlugin, public ImportPlug
         QTextStream* stream = nullptr;
         QStringList columnNames;
         CsvFormat csvFormat;
-        CFG_LOCAL(CsvImportConfig, cfg)
+        CFG_LOCAL_PERSISTABLE(CsvImportConfig, cfg)
 };
 
 #endif // CSVIMPORT_H
diff --git a/Plugins/CsvImport/csvimport.json b/Plugins/CsvImport/csvimport.json
index 05d8b5d..a666d80 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":     10004,
+    "version":     10005,
     "author":      "SalSoft"
 }
diff --git a/Plugins/CsvImport/csvimport.qrc b/Plugins/CsvImport/csvimport.qrc
index 7af6fb4..1c27100 100644
--- a/Plugins/CsvImport/csvimport.qrc
+++ b/Plugins/CsvImport/csvimport.qrc
@@ -3,6 +3,7 @@
         <file>CsvImportOptions.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>CsvImport_ro_RO.qm</file>
 
         <file>CsvImport_de.qm</file>
         <file>CsvImport_pl.qm</file>
@@ -14,3 +15,4 @@
 </RCC>
 
 
+
diff --git a/Plugins/CsvImport/package.xml b/Plugins/CsvImport/package.xml
new file mode 100644
index 0000000..cf8d6f3
--- /dev/null
+++ b/Plugins/CsvImport/package.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>

+<Package>

+    <DisplayName>CSV Import plugin</DisplayName>

+    <Description>Plugin for importing data from CSV format</Description>

+    <Version>%VERSION%</Version>

+    <ReleaseDate>%DATE%</ReleaseDate>

+    <Name>pl.com.salsoft.sqlitestudio.plugins.csvimport</Name>

+    <Dependencies>pl.com.salsoft.sqlitestudio.plugins</Dependencies>

+    <Default>true</Default>

+</Package>
\ No newline at end of file