From 5d9314f134ddd3dc4c853e398ac90ba247fb2e4f Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Mon, 13 Jun 2016 18:42:42 -0400
Subject: Imported Upstream version 3.1.0

---
 Plugins/PdfExport/PdfExport_de.qm    | Bin 23 -> 3953 bytes
 Plugins/PdfExport/PdfExport_de.ts    |   2 +-
 Plugins/PdfExport/PdfExport_es.ts    |   2 +-
 Plugins/PdfExport/PdfExport_fr.ts    |   2 +-
 Plugins/PdfExport/PdfExport_it.qm    | Bin 0 -> 23 bytes
 Plugins/PdfExport/PdfExport_it.ts    |   2 +-
 Plugins/PdfExport/PdfExport_pl.ts    |   2 +-
 Plugins/PdfExport/PdfExport_pt_BR.ts |   2 +-
 Plugins/PdfExport/PdfExport_ru.ts    |   2 +-
 Plugins/PdfExport/PdfExport_sk.ts    |   2 +-
 Plugins/PdfExport/PdfExport_zh_CN.ts |   2 +-
 Plugins/PdfExport/pdfexport.cpp      |   8 ++++----
 12 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 Plugins/PdfExport/PdfExport_it.qm

(limited to 'Plugins/PdfExport')

diff --git a/Plugins/PdfExport/PdfExport_de.qm b/Plugins/PdfExport/PdfExport_de.qm
index 9dad8df..ccab910 100644
Binary files a/Plugins/PdfExport/PdfExport_de.qm and b/Plugins/PdfExport/PdfExport_de.qm differ
diff --git a/Plugins/PdfExport/PdfExport_de.ts b/Plugins/PdfExport/PdfExport_de.ts
index 7498c43..9f95b41 100644
--- a/Plugins/PdfExport/PdfExport_de.ts
+++ b/Plugins/PdfExport/PdfExport_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_es.ts b/Plugins/PdfExport/PdfExport_es.ts
index 745a227..924d991 100644
--- a/Plugins/PdfExport/PdfExport_es.ts
+++ b/Plugins/PdfExport/PdfExport_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<TS version="2.0" language="es_ES">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_fr.ts b/Plugins/PdfExport/PdfExport_fr.ts
index 95de2a9..064c5a1 100644
--- a/Plugins/PdfExport/PdfExport_fr.ts
+++ b/Plugins/PdfExport/PdfExport_fr.ts
@@ -101,7 +101,7 @@
     <message>
         <location filename="pdfexport.cpp" line="246"/>
         <source>Partial index condition</source>
-        <translation>Condition de l&apos;index partiel</translation>
+        <translation>Condition de l&rsquo;index partiel</translation>
     </message>
     <message>
         <location filename="pdfexport.cpp" line="260"/>
diff --git a/Plugins/PdfExport/PdfExport_it.qm b/Plugins/PdfExport/PdfExport_it.qm
new file mode 100644
index 0000000..9dad8df
Binary files /dev/null and b/Plugins/PdfExport/PdfExport_it.qm differ
diff --git a/Plugins/PdfExport/PdfExport_it.ts b/Plugins/PdfExport/PdfExport_it.ts
index 913432b..8288875 100644
--- a/Plugins/PdfExport/PdfExport_it.ts
+++ b/Plugins/PdfExport/PdfExport_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="it_IT">
+<TS version="2.0" language="it_IT">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_pl.ts b/Plugins/PdfExport/PdfExport_pl.ts
index e806995..5ac637d 100644
--- a/Plugins/PdfExport/PdfExport_pl.ts
+++ b/Plugins/PdfExport/PdfExport_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pl_PL">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_pt_BR.ts b/Plugins/PdfExport/PdfExport_pt_BR.ts
index 59df275..76e9fff 100644
--- a/Plugins/PdfExport/PdfExport_pt_BR.ts
+++ b/Plugins/PdfExport/PdfExport_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pt_BR">
+<TS version="2.0" language="pt_BR">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_ru.ts b/Plugins/PdfExport/PdfExport_ru.ts
index 715a6ff..9f14f09 100644
--- a/Plugins/PdfExport/PdfExport_ru.ts
+++ b/Plugins/PdfExport/PdfExport_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_sk.ts b/Plugins/PdfExport/PdfExport_sk.ts
index 6684b8b..9a8f3e2 100644
--- a/Plugins/PdfExport/PdfExport_sk.ts
+++ b/Plugins/PdfExport/PdfExport_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="sk_SK">
+<TS version="2.0" language="sk_SK">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/PdfExport_zh_CN.ts b/Plugins/PdfExport/PdfExport_zh_CN.ts
index b570ede..ec250b9 100644
--- a/Plugins/PdfExport/PdfExport_zh_CN.ts
+++ b/Plugins/PdfExport/PdfExport_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>PdfExport</name>
     <message>
diff --git a/Plugins/PdfExport/pdfexport.cpp b/Plugins/PdfExport/pdfexport.cpp
index cd1ceca..38389a1 100644
--- a/Plugins/PdfExport/pdfexport.cpp
+++ b/Plugins/PdfExport/pdfexport.cpp
@@ -231,14 +231,14 @@ bool PdfExport::exportIndex(const QString& database, const QString& name, const
     exportObjectColumnsHeader(indexColumns);
 
     QString sort;
-    for (SqliteIndexedColumn* idxCol : createIndex->indexedColumns)
+    for (SqliteOrderBy* idxCol : createIndex->indexedColumns)
     {
-        if (idxCol->sortOrder != SqliteSortOrder::null)
-            sort = sqliteSortOrder(idxCol->sortOrder);
+        if (idxCol->order != SqliteSortOrder::null)
+            sort = sqliteSortOrder(idxCol->order);
         else
             sort = "";
 
-        exportObjectRow({idxCol->name, idxCol->collate, sort});
+        exportObjectRow({idxCol->getColumnString(), idxCol->getCollation(), sort});
     }
 
     if (createIndex->where)
-- 
cgit v1.2.3