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, 21 insertions, 15 deletions

diff --git a/Plugins/CsvExport/CsvExport.pro b/Plugins/CsvExport/CsvExport.pro
index 9e509b2..f846b3e 100644
--- a/Plugins/CsvExport/CsvExport.pro
+++ b/Plugins/CsvExport/CsvExport.pro
@@ -29,10 +29,10 @@ RESOURCES += \
 
 
 
-TRANSLATIONS += CsvExport_it.ts \
+TRANSLATIONS += CsvExport_de.ts \
+		CsvExport_it.ts \
 		CsvExport_zh_CN.ts \
 		CsvExport_sk.ts \
-		CsvExport_de.ts \
 		CsvExport_ru.ts \
 		CsvExport_pt_BR.ts \
 		CsvExport_fr.ts \
@@ -51,3 +51,5 @@ TRANSLATIONS += CsvExport_it.ts \
 
 
 
+
+
diff --git a/Plugins/CsvExport/CsvExport_de.ts b/Plugins/CsvExport/CsvExport_de.ts
index f87bc99..1d07517 100644
--- a/Plugins/CsvExport/CsvExport_de.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_es.ts b/Plugins/CsvExport/CsvExport_es.ts
index de3f0cb..09fd76a 100644
--- a/Plugins/CsvExport/CsvExport_es.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_fr.qm b/Plugins/CsvExport/CsvExport_fr.qm
index e1e6b59..6512538 100644
--- a/Plugins/CsvExport/CsvExport_fr.qm
+++ b/Plugins/CsvExport/CsvExport_fr.qm
diff --git a/Plugins/CsvExport/CsvExport_fr.ts b/Plugins/CsvExport/CsvExport_fr.ts
index 20053a7..4b0f86b 100644
--- a/Plugins/CsvExport/CsvExport_fr.ts
+++ b/Plugins/CsvExport/CsvExport_fr.ts
@@ -1,6 +1,6 @@
 <?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>CsvExport</name>
     <message>
@@ -11,7 +11,7 @@
     <message>
         <location filename="CsvExport.ui" line="30"/>
         <source>Column separator:</source>
-        <translation>Séparateur de colonnes:</translation>
+        <translation>Séparateur de colonnes :</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="41"/>
@@ -26,7 +26,7 @@
     <message>
         <location filename="CsvExport.ui" line="51"/>
         <source>\t (tab)</source>
-        <translation>\t (tab)</translation>
+        <translation>\t (tabulation)</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="56"/>
@@ -36,12 +36,12 @@
     <message>
         <location filename="CsvExport.ui" line="61"/>
         <source>Custom:</source>
-        <translation>personnalisation:</translation>
+        <translation>personnalisation :</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="82"/>
         <source>Export NULL values as:</source>
-        <translation>Exporter la valeur NULL comme:</translation>
+        <translation>Exporter la valeur NULL comme :</translation>
     </message>
     <message>
         <location filename="CsvExport.ui" line="89"/>
diff --git a/Plugins/CsvExport/CsvExport_it.ts b/Plugins/CsvExport/CsvExport_it.ts
index 610f05b..30f4907 100644
--- a/Plugins/CsvExport/CsvExport_it.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_pl.ts b/Plugins/CsvExport/CsvExport_pl.ts
index a925db2..a608049 100644
--- a/Plugins/CsvExport/CsvExport_pl.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_pt_BR.ts b/Plugins/CsvExport/CsvExport_pt_BR.ts
index 8f3f678..0c8b1d9 100644
--- a/Plugins/CsvExport/CsvExport_pt_BR.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_ru.ts b/Plugins/CsvExport/CsvExport_ru.ts
index 230a06f..5cf441b 100644
--- a/Plugins/CsvExport/CsvExport_ru.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_sk.ts b/Plugins/CsvExport/CsvExport_sk.ts
index 54ab016..e283fc3 100644
--- a/Plugins/CsvExport/CsvExport_sk.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/CsvExport_zh_CN.ts b/Plugins/CsvExport/CsvExport_zh_CN.ts
index 6758bf4..6d31621 100644
--- a/Plugins/CsvExport/CsvExport_zh_CN.ts
+++ b/Plugins/CsvExport/CsvExport_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>CsvExport</name>
     <message>
diff --git a/Plugins/CsvExport/csvexport.qrc b/Plugins/CsvExport/csvexport.qrc
index e6660ec..9538c63 100644
--- a/Plugins/CsvExport/csvexport.qrc
+++ b/Plugins/CsvExport/csvexport.qrc
@@ -3,6 +3,8 @@
         <file>CsvExport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+
+        <file>CsvExport_de.qm</file>
         <file>CsvExport_pl.qm</file>
         <file>CsvExport_ru.qm</file>
         <file>CsvExport_fr.qm</file>
@@ -10,3 +12,5 @@
         <file>CsvExport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+