From 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Mon, 13 Jun 2016 18:42:42 -0400 Subject: Imported Upstream version 3.1.0 --- Plugins/HtmlExport/HtmlExport_de.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_es.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_fr.ts | 6 +++--- Plugins/HtmlExport/HtmlExport_it.qm | Bin 0 -> 23 bytes Plugins/HtmlExport/HtmlExport_it.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_pl.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_pt_BR.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_ru.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_sk.ts | 20 ++++++++++---------- Plugins/HtmlExport/HtmlExport_zh_CN.ts | 20 ++++++++++---------- Plugins/HtmlExport/htmlexport.cpp | 11 +++++++---- 11 files changed, 90 insertions(+), 87 deletions(-) create mode 100644 Plugins/HtmlExport/HtmlExport_it.qm (limited to 'Plugins/HtmlExport') diff --git a/Plugins/HtmlExport/HtmlExport_de.ts b/Plugins/HtmlExport/HtmlExport_de.ts index f5463cd..c741e0e 100644 --- a/Plugins/HtmlExport/HtmlExport_de.ts +++ b/Plugins/HtmlExport/HtmlExport_de.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ - + Trigger: %1 - + Activated: - + Action: - + On view: - + On table: - + Activate condition: - + Code executed: - + View: %1 - + Document generated by SQLiteStudio v%1 on %2 diff --git a/Plugins/HtmlExport/HtmlExport_es.ts b/Plugins/HtmlExport/HtmlExport_es.ts index 5f3a331..0a75f4e 100644 --- a/Plugins/HtmlExport/HtmlExport_es.ts +++ b/Plugins/HtmlExport/HtmlExport_es.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ - + Trigger: %1 - + Activated: - + Action: - + On view: - + On table: - + Activate condition: - + Code executed: - + View: %1 - + Document generated by SQLiteStudio v%1 on %2 diff --git a/Plugins/HtmlExport/HtmlExport_fr.ts b/Plugins/HtmlExport/HtmlExport_fr.ts index 594670e..cbc8676 100644 --- a/Plugins/HtmlExport/HtmlExport_fr.ts +++ b/Plugins/HtmlExport/HtmlExport_fr.ts @@ -147,7 +147,7 @@ Output format - Format d'affichage + Format d’affichage @@ -162,12 +162,12 @@ <p>When enabled, HTML characters such as &lt;, &gt; and &amp; are not escaped in exported values. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &lt; and &gt; characters). Be warned.</p> - <p>Lorsqu'il y a des caractères HTML telque &lt;, &gt; et &amp;ils ne sont pas enlevés des valeurs exportées. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &lt; and &gt; characters).Soyez attentif.</p> + <p>Lorsqu’il y a des caractères HTML telque &lt;, &gt; et &amp;ils ne sont pas enlevés des valeurs exportées. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &lt; and &gt; characters).Soyez attentif.</p> Don't escape HTML characters - N'enlevez pas les caractères HTML + N’enlevez pas les caractères HTML diff --git a/Plugins/HtmlExport/HtmlExport_it.qm b/Plugins/HtmlExport/HtmlExport_it.qm new file mode 100644 index 0000000..9dad8df Binary files /dev/null and b/Plugins/HtmlExport/HtmlExport_it.qm differ diff --git a/Plugins/HtmlExport/HtmlExport_it.ts b/Plugins/HtmlExport/HtmlExport_it.ts index 208900c..0aa5cd1 100644 --- a/Plugins/HtmlExport/HtmlExport_it.ts +++ b/Plugins/HtmlExport/HtmlExport_it.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ - + Trigger: %1 - + Activated: - + Action: - + On view: - + On table: - + Activate condition: - + Code executed: - + View: %1 - + Document generated by SQLiteStudio v%1 on %2 diff --git a/Plugins/HtmlExport/HtmlExport_pl.ts b/Plugins/HtmlExport/HtmlExport_pl.ts index 3796e73..030f7b2 100644 --- a/Plugins/HtmlExport/HtmlExport_pl.ts +++ b/Plugins/HtmlExport/HtmlExport_pl.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ Sortowanie - + Trigger: %1 Wyzwalacz: %1 - + Activated: Aktywowany: - + Action: Akcja: - + On view: Na widoku: - + On table: Na tabeli: - + Activate condition: Warunek aktywacji: - + Code executed: Wykonywany kod: - + View: %1 Widok: %1 - + Document generated by SQLiteStudio v%1 on %2 Dokument wygenerowany przez SQLiteStudio v%1 dnia %2 diff --git a/Plugins/HtmlExport/HtmlExport_pt_BR.ts b/Plugins/HtmlExport/HtmlExport_pt_BR.ts index 66a2993..8f6986a 100644 --- a/Plugins/HtmlExport/HtmlExport_pt_BR.ts +++ b/Plugins/HtmlExport/HtmlExport_pt_BR.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ - + Trigger: %1 - + Activated: - + Action: - + On view: - + On table: - + Activate condition: - + Code executed: - + View: %1 - + Document generated by SQLiteStudio v%1 on %2 diff --git a/Plugins/HtmlExport/HtmlExport_ru.ts b/Plugins/HtmlExport/HtmlExport_ru.ts index 9165c02..d3fdcc1 100644 --- a/Plugins/HtmlExport/HtmlExport_ru.ts +++ b/Plugins/HtmlExport/HtmlExport_ru.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ Порядок сортировки - + Trigger: %1 Триггер: %1 - + Activated: Активирован: - + Action: Действие: - + On view: Для представления: - + On table: Для таблицы: - + Activate condition: Условие активации: - + Code executed: Исполненный код: - + View: %1 Представление: %1 - + Document generated by SQLiteStudio v%1 on %2 Документ сгенерирован с помощью SQLiteStudio v%1 в %2 diff --git a/Plugins/HtmlExport/HtmlExport_sk.ts b/Plugins/HtmlExport/HtmlExport_sk.ts index edcf4cc..5fe18e2 100644 --- a/Plugins/HtmlExport/HtmlExport_sk.ts +++ b/Plugins/HtmlExport/HtmlExport_sk.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ - + Trigger: %1 - + Activated: - + Action: - + On view: - + On table: - + Activate condition: - + Code executed: - + View: %1 - + Document generated by SQLiteStudio v%1 on %2 diff --git a/Plugins/HtmlExport/HtmlExport_zh_CN.ts b/Plugins/HtmlExport/HtmlExport_zh_CN.ts index 72750a1..38e9d69 100644 --- a/Plugins/HtmlExport/HtmlExport_zh_CN.ts +++ b/Plugins/HtmlExport/HtmlExport_zh_CN.ts @@ -1,6 +1,6 @@ - + HtmlExport @@ -77,47 +77,47 @@ - + Trigger: %1 - + Activated: - + Action: - + On view: - + On table: - + Activate condition: - + Code executed: - + View: %1 - + Document generated by SQLiteStudio v%1 on %2 diff --git a/Plugins/HtmlExport/htmlexport.cpp b/Plugins/HtmlExport/htmlexport.cpp index 75b3868..86ac13e 100644 --- a/Plugins/HtmlExport/htmlexport.cpp +++ b/Plugins/HtmlExport/htmlexport.cpp @@ -347,13 +347,16 @@ bool HtmlExport::exportIndex(const QString& database, const QString& name, const decrIndent(); writeln(""); - for (SqliteIndexedColumn* idxCol : createIndex->indexedColumns) + QString collate; + for (SqliteOrderBy* idxCol : createIndex->indexedColumns) { + collate = idxCol->getCollation(); + writeln(""); incrIndent(); - writeln(QString("%1").arg(escape(idxCol->name))); - writeln(QString("%1").arg(idxCol->collate.isNull() ? " " : escape(idxCol->collate))); - writeln(QString("%1").arg(idxCol->sortOrder == SqliteSortOrder::null ? " " : sqliteSortOrder(idxCol->sortOrder))); + writeln(QString("%1").arg(escape(idxCol->getColumnString()))); + writeln(QString("%1").arg(collate.isNull() ? " " : escape(collate))); + writeln(QString("%1").arg(idxCol->order == SqliteSortOrder::null ? " " : sqliteSortOrder(idxCol->order))); decrIndent(); writeln(""); } -- cgit v1.2.3