From feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 27 Jul 2018 23:51:12 -0400 Subject: New upstream version 3.2.1+dfsg1 --- Plugins/CsvImport/CsvImport.pro | 4 +- Plugins/CsvImport/CsvImport_de.ts | 4 +- Plugins/CsvImport/CsvImport_es.ts | 4 +- Plugins/CsvImport/CsvImport_fr.ts | 4 +- Plugins/CsvImport/CsvImport_it.ts | 4 +- Plugins/CsvImport/CsvImport_pl.ts | 4 +- Plugins/CsvImport/CsvImport_pt_BR.ts | 4 +- Plugins/CsvImport/CsvImport_ro_RO.qm | Bin 0 -> 30 bytes Plugins/CsvImport/CsvImport_ro_RO.ts | 85 +++++++++++++++++++++++++++++++++++ Plugins/CsvImport/CsvImport_ru.ts | 4 +- Plugins/CsvImport/CsvImport_sk.ts | 4 +- Plugins/CsvImport/CsvImport_zh_CN.ts | 4 +- Plugins/CsvImport/csvimport.cpp | 2 + Plugins/CsvImport/csvimport.h | 2 +- Plugins/CsvImport/csvimport.json | 2 +- Plugins/CsvImport/csvimport.qrc | 2 + Plugins/CsvImport/package.xml | 10 +++++ 17 files changed, 122 insertions(+), 21 deletions(-) create mode 100644 Plugins/CsvImport/CsvImport_ro_RO.qm create mode 100644 Plugins/CsvImport/CsvImport_ro_RO.ts create mode 100644 Plugins/CsvImport/package.xml (limited to 'Plugins/CsvImport') 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 @@ - + Enter the custom separator character. - + CSV files (*.csv);;Text files (*.txt);;All files (*) 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 @@ - + Enter the custom separator character. - + CSV files (*.csv);;Text files (*.txt);;All files (*) 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 @@ Impossible de trouver des données dans le fichier %1. - + Enter the custom separator character. Saisir le caractère séparateur. @@ -23,7 +23,7 @@ Saisir la valeur qui sera interprétée comme NULL. - + CSV files (*.csv);;Text files (*.txt);;All files (*) Fichiers CSV (*.csv);;Fichiers texte (*.txt);;Tous les fichiers (*) 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 @@ - + Enter the custom separator character. - + CSV files (*.csv);;Text files (*.txt);;All files (*) 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 @@ Nie znaleziono danych w pliku %1. - + Enter the custom separator character. Wprowadź własny znak separatora. @@ -23,7 +23,7 @@ Wprowadź wartość, która będzie interpretowana jako NULL. - + CSV files (*.csv);;Text files (*.txt);;All files (*) Pliki CSV (*.csv);;Pliki tekstowe (*.txt);;Wszystkie pliki (*) 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 @@ - + Enter the custom separator character. - + CSV files (*.csv);;Text files (*.txt);;All files (*) diff --git a/Plugins/CsvImport/CsvImport_ro_RO.qm b/Plugins/CsvImport/CsvImport_ro_RO.qm new file mode 100644 index 0000000..2856eb9 Binary files /dev/null and b/Plugins/CsvImport/CsvImport_ro_RO.qm differ 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 @@ + + + + + CsvImport + + + Cannot read file %1 + + + + + Could not find any data in the file %1. + + + + + Enter the custom separator character. + + + + + CSV files (*.csv);;Text files (*.txt);;All files (*) + + + + + csvImportOptions + + + , (comma) + + + + + ; (semicolon) + + + + + \t (tab) + + + + + (whitespace) + + + + + Custom: + + + + + <p>Enable this if the first data line in your CSV file represents column names. You don't want column names to be imported into the table as a regular data.</p> + + + + + First line represents CSV column names + + + + + Field separator: + + + + + If enabled, then text value provided on the right will be interpreted as NULL + + + + + NULL values: + + + + + If your CSV data contains null values, define how are they represented in the CSV. + + + + 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 @@ Невозможно найти данные в файле %1. - + Enter the custom separator character. Введите произвольный символ разделителя. @@ -23,7 +23,7 @@ Введите значение, которое будет интерпретировано как NULL. - + CSV files (*.csv);;Text files (*.txt);;All files (*) Файлы CSV (*.csv);;Текстовые файлы (*.txt);;Все файлы (*) 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 @@ Nemôžem nájsť dáta v súbore %1. - + Enter the custom separator character. Zadajte vlastný oddeľovač. @@ -23,7 +23,7 @@ Zadajte hodnotu, ktorá bude interpretovaná ako NULL. - + CSV files (*.csv);;Text files (*.txt);;All files (*) CSV súbory (*.csv);;Textové súbory (*.txt);;Všetky súbory (*) 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 @@ - + Enter the custom separator character. - + CSV files (*.csv);;Text files (*.txt);;All files (*) 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 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 @@ CsvImportOptions.ui + CsvImport_ro_RO.qm CsvImport_de.qm CsvImport_pl.qm @@ -14,3 +15,4 @@ + 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 @@ + + + CSV Import plugin + Plugin for importing data from CSV format + %VERSION% + %DATE% + pl.com.salsoft.sqlitestudio.plugins.csvimport + pl.com.salsoft.sqlitestudio.plugins + true + \ No newline at end of file -- cgit v1.2.3