Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

12 files changed, 27 insertions, 19 deletions

diff --git a/Plugins/SqlExport/SqlExport.pro b/Plugins/SqlExport/SqlExport.pro
index eb18a7c..9568a11 100644
--- a/Plugins/SqlExport/SqlExport.pro
+++ b/Plugins/SqlExport/SqlExport.pro
@@ -29,10 +29,10 @@ RESOURCES += \
     sqlexport.qrc
 
 
-TRANSLATIONS += SqlExport_it.ts \
+TRANSLATIONS += SqlExport_de.ts \
+		SqlExport_it.ts \
 		SqlExport_zh_CN.ts \
 		SqlExport_sk.ts \
-		SqlExport_de.ts \
 		SqlExport_ru.ts \
 		SqlExport_pt_BR.ts \
 		SqlExport_fr.ts \
@@ -51,3 +51,5 @@ TRANSLATIONS += SqlExport_it.ts \
 
 
 
+
+
diff --git a/Plugins/SqlExport/SqlExport_de.ts b/Plugins/SqlExport/SqlExport_de.ts
index e61f506..5927ee3 100644
--- a/Plugins/SqlExport/SqlExport_de.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_es.ts b/Plugins/SqlExport/SqlExport_es.ts
index a3d552a..4fe864c 100644
--- a/Plugins/SqlExport/SqlExport_es.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_fr.qm b/Plugins/SqlExport/SqlExport_fr.qm
index 5be0b78..a7cdb56 100644
--- a/Plugins/SqlExport/SqlExport_fr.qm
+++ b/Plugins/SqlExport/SqlExport_fr.qm
diff --git a/Plugins/SqlExport/SqlExport_fr.ts b/Plugins/SqlExport/SqlExport_fr.ts
index 279dd99..817590f 100644
--- a/Plugins/SqlExport/SqlExport_fr.ts
+++ b/Plugins/SqlExport/SqlExport_fr.ts
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>SqlExport</name>
     <message>
         <location filename="sqlexport.cpp" line="57"/>
         <source>-- Results of query:</source>
-        <translation>-- Résultats de la requête:</translation>
+        <translation>-- Résultats de la requête :</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="122"/>
         <source>-- Table: %1</source>
-        <translation>-- Table: %1</translation>
+        <translation>-- Table : %1</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="168"/>
         <source>-- Index: %1</source>
-        <translation>-- Indéxe: %1</translation>
+        <translation>-- Index : %1</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="185"/>
         <source>-- Trigger: %1</source>
-        <translation>-- Déclencheur: %1</translation>
+        <translation>-- Déclencheur : %1</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="202"/>
         <source>-- View: %1</source>
-        <translation>-- Vue: %1</translation>
+        <translation>-- Vue : %1</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="216"/>
         <source>-- File generated with SQLiteStudio v%1 on %2</source>
-        <translation>-- Fichier généré par SQLiteStudio v%1sur %2</translation>
+        <translation>-- Fichier généré par SQLiteStudio v%1 sur %2</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="220"/>
         <source>-- Text encoding used: %1</source>
-        <translation>-- Encodage texte utilisé: %1</translation>
+        <translation>-- Encodage texte utilisé : %1</translation>
     </message>
     <message>
         <location filename="sqlexport.cpp" line="276"/>
@@ -72,7 +72,7 @@
     <message>
         <location filename="SqlExportQuery.ui" line="30"/>
         <source>Table name to use for INSERT statements:</source>
-        <translation>Nom de table pour utiliser la déclaration INSERT:</translation>
+        <translation>Nom de table pour utiliser la déclaration INSERT :</translation>
     </message>
     <message>
         <location filename="SqlExportQuery.ui" line="37"/>
diff --git a/Plugins/SqlExport/SqlExport_it.ts b/Plugins/SqlExport/SqlExport_it.ts
index d53b3a2..4178684 100644
--- a/Plugins/SqlExport/SqlExport_it.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_pl.ts b/Plugins/SqlExport/SqlExport_pl.ts
index 5eafc0b..504fe2d 100644
--- a/Plugins/SqlExport/SqlExport_pl.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_pt_BR.ts b/Plugins/SqlExport/SqlExport_pt_BR.ts
index ec49ef0..1941e03 100644
--- a/Plugins/SqlExport/SqlExport_pt_BR.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_ru.ts b/Plugins/SqlExport/SqlExport_ru.ts
index 20f808d..87ccb4b 100644
--- a/Plugins/SqlExport/SqlExport_ru.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_sk.ts b/Plugins/SqlExport/SqlExport_sk.ts
index a10648c..b74dda4 100644
--- a/Plugins/SqlExport/SqlExport_sk.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/SqlExport_zh_CN.ts b/Plugins/SqlExport/SqlExport_zh_CN.ts
index 2b62da0..8ee787a 100644
--- a/Plugins/SqlExport/SqlExport_zh_CN.ts
+++ b/Plugins/SqlExport/SqlExport_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>SqlExport</name>
     <message>
diff --git a/Plugins/SqlExport/sqlexport.qrc b/Plugins/SqlExport/sqlexport.qrc
index ed5da11..81412cb 100644
--- a/Plugins/SqlExport/sqlexport.qrc
+++ b/Plugins/SqlExport/sqlexport.qrc
@@ -4,6 +4,9 @@
         <file>SqlExportCommon.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>SqlExport_de.qm</file>
+
+
         <file>SqlExport_pl.qm</file>
         <file>SqlExport_ru.qm</file>
         <file>SqlExport_fr.qm</file>
@@ -11,3 +14,6 @@
         <file>SqlExport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
+