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/HtmlExport/HtmlExport.pro      |   6 ++--
 Plugins/HtmlExport/HtmlExport_de.ts    |   2 +-
 Plugins/HtmlExport/HtmlExport_es.ts    |   2 +-
 Plugins/HtmlExport/HtmlExport_fr.qm    | Bin 3884 -> 3886 bytes
 Plugins/HtmlExport/HtmlExport_fr.ts    |  54 ++++++++++++++++-----------------
 Plugins/HtmlExport/HtmlExport_it.ts    |   2 +-
 Plugins/HtmlExport/HtmlExport_pl.ts    |   2 +-
 Plugins/HtmlExport/HtmlExport_pt_BR.ts |   2 +-
 Plugins/HtmlExport/HtmlExport_ru.ts    |   2 +-
 Plugins/HtmlExport/HtmlExport_sk.ts    |   2 +-
 Plugins/HtmlExport/HtmlExport_zh_CN.ts |   2 +-
 Plugins/HtmlExport/htmlexport.qrc      |   6 ++++
 12 files changed, 45 insertions(+), 37 deletions(-)

(limited to 'Plugins/HtmlExport')

diff --git a/Plugins/HtmlExport/HtmlExport.pro b/Plugins/HtmlExport/HtmlExport.pro
index 3ef30d0..66a68ca 100644
--- a/Plugins/HtmlExport/HtmlExport.pro
+++ b/Plugins/HtmlExport/HtmlExport.pro
@@ -29,10 +29,10 @@ FORMS += \
     htmlexport.ui
 
 
-TRANSLATIONS += HtmlExport_it.ts \
+TRANSLATIONS += HtmlExport_de.ts \
+		HtmlExport_it.ts \
 		HtmlExport_zh_CN.ts \
 		HtmlExport_sk.ts \
-		HtmlExport_de.ts \
 		HtmlExport_ru.ts \
 		HtmlExport_pt_BR.ts \
 		HtmlExport_fr.ts \
@@ -51,3 +51,5 @@ TRANSLATIONS += HtmlExport_it.ts \
 
 
 
+
+
diff --git a/Plugins/HtmlExport/HtmlExport_de.ts b/Plugins/HtmlExport/HtmlExport_de.ts
index c741e0e..8e64155 100644
--- a/Plugins/HtmlExport/HtmlExport_de.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_es.ts b/Plugins/HtmlExport/HtmlExport_es.ts
index 0a75f4e..e022d24 100644
--- a/Plugins/HtmlExport/HtmlExport_es.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_fr.qm b/Plugins/HtmlExport/HtmlExport_fr.qm
index 98606eb..7852caa 100644
Binary files a/Plugins/HtmlExport/HtmlExport_fr.qm and b/Plugins/HtmlExport/HtmlExport_fr.qm differ
diff --git a/Plugins/HtmlExport/HtmlExport_fr.ts b/Plugins/HtmlExport/HtmlExport_fr.ts
index cbc8676..06d663f 100644
--- a/Plugins/HtmlExport/HtmlExport_fr.ts
+++ b/Plugins/HtmlExport/HtmlExport_fr.ts
@@ -18,13 +18,13 @@
         <location filename="htmlexport.cpp" line="115"/>
         <location filename="htmlexport.cpp" line="243"/>
         <source>Exported table: %1</source>
-        <translation>Table exportée: %1</translation>
+        <translation>Table exportée : %1</translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="127"/>
         <location filename="htmlexport.cpp" line="255"/>
         <source>Table: %1</source>
-        <translation>Table: %1</translation>
+        <translation>Table : %1</translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="255"/>
@@ -34,22 +34,22 @@
     <message>
         <location filename="htmlexport.cpp" line="308"/>
         <source>Exported database: %1</source>
-        <translation>Base de données exportée: %1</translation>
+        <translation>Base de données exportée : %1</translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="324"/>
         <source>Index: %1</source>
-        <translation>Index: %1</translation>
+        <translation>Index : %1</translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="330"/>
         <source>For table:</source>
-        <translation>Pour la table: </translation>
+        <translation>Pour la table : </translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="337"/>
         <source>Unique:</source>
-        <translation>Unique:</translation>
+        <translation>Unique :</translation>
     </message>
     <message>
         <location filename="htmlexport.cpp" line="338"/>
@@ -77,47 +77,47 @@
         <translation>Ordre de tri</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
-        <translation>Déclencheur: %1</translation>
+        <translation>Déclencheur : %1</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
-        <translation>Activé:</translation>
+        <translation>Activé :</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
-        <translation>Action:</translation>
+        <translation>Action :</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
-        <translation>Sur la vue:</translation>
+        <translation>Sur la vue :</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
-        <translation>Sur la table:</translation>
+        <translation>Sur la table :</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
-        <translation>Activé la condition:</translation>
+        <translation>Activé la condition :</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
-        <translation>Exécuter le code:</translation>
+        <translation>Exécuter le code :</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
-        <translation>Vue: %1</translation>
+        <translation>Vue : %1</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation>Document généré par SQLiteStudio v%1 de %2</translation>
     </message>
@@ -127,7 +127,7 @@
     <message>
         <location filename="htmlexport.ui" line="36"/>
         <source>Maximum number of characters per cell:</source>
-        <translation>Nombre de caractères maximum par cellule:</translation>
+        <translation>Nombre de caractères maximum par cellule :</translation>
     </message>
     <message>
         <location filename="htmlexport.ui" line="43"/>
@@ -147,7 +147,7 @@
     <message>
         <location filename="htmlexport.ui" line="73"/>
         <source>Output format</source>
-        <translation>Format d&rsquo;affichage</translation>
+        <translation>Format d’affichage</translation>
     </message>
     <message>
         <location filename="htmlexport.ui" line="79"/>
@@ -162,12 +162,12 @@
     <message>
         <location filename="htmlexport.ui" line="108"/>
         <source>&lt;p&gt;When enabled, HTML characters such as &amp;lt;, &amp;gt; and &amp;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 &amp;lt; and &amp;gt; characters). Be warned.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Lorsqu&rsquo;il y a des caractères HTML telque &amp;lt;, &amp;gt; et &amp;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 &amp;lt; and &amp;gt; characters).Soyez attentif.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Lorsqu’il y a des caractères HTML tel que &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.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="htmlexport.ui" line="111"/>
         <source>Don&apos;t escape HTML characters</source>
-        <translation>N&rsquo;enlevez pas les caractères HTML</translation>
+        <translation>N’enlevez pas les caractères HTML</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/HtmlExport/HtmlExport_it.ts b/Plugins/HtmlExport/HtmlExport_it.ts
index 0aa5cd1..a451fc3 100644
--- a/Plugins/HtmlExport/HtmlExport_it.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_pl.ts b/Plugins/HtmlExport/HtmlExport_pl.ts
index 030f7b2..3fba2f9 100644
--- a/Plugins/HtmlExport/HtmlExport_pl.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_pt_BR.ts b/Plugins/HtmlExport/HtmlExport_pt_BR.ts
index 8f6986a..560fd85 100644
--- a/Plugins/HtmlExport/HtmlExport_pt_BR.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_ru.ts b/Plugins/HtmlExport/HtmlExport_ru.ts
index d3fdcc1..51ef53c 100644
--- a/Plugins/HtmlExport/HtmlExport_ru.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_sk.ts b/Plugins/HtmlExport/HtmlExport_sk.ts
index 5fe18e2..8d427a7 100644
--- a/Plugins/HtmlExport/HtmlExport_sk.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/HtmlExport_zh_CN.ts b/Plugins/HtmlExport/HtmlExport_zh_CN.ts
index 38e9d69..3ba949c 100644
--- a/Plugins/HtmlExport/HtmlExport_zh_CN.ts
+++ b/Plugins/HtmlExport/HtmlExport_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>HtmlExport</name>
     <message>
diff --git a/Plugins/HtmlExport/htmlexport.qrc b/Plugins/HtmlExport/htmlexport.qrc
index 5c41bc9..0198048 100644
--- a/Plugins/HtmlExport/htmlexport.qrc
+++ b/Plugins/HtmlExport/htmlexport.qrc
@@ -6,6 +6,9 @@
         <file>htmlexport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>HtmlExport_de.qm</file>
+
+
         <file>HtmlExport_pl.qm</file>
         <file>HtmlExport_ru.qm</file>
         <file>HtmlExport_fr.qm</file>
@@ -13,3 +16,6 @@
         <file>HtmlExport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
+
-- 
cgit v1.2.3