Imported Upstream version 3.1.1+dfsg1upstream/3.1.1+dfsg1

12 files changed, 21 insertions, 13 deletions

diff --git a/Plugins/JsonExport/JsonExport.pro b/Plugins/JsonExport/JsonExport.pro
index 47fcb05..8be51fa 100644
--- a/Plugins/JsonExport/JsonExport.pro
+++ b/Plugins/JsonExport/JsonExport.pro
@@ -28,10 +28,10 @@ RESOURCES += \
     jsonexport.qrc
 
 
-TRANSLATIONS += JsonExport_it.ts \
+TRANSLATIONS += JsonExport_de.ts \
+		JsonExport_it.ts \
 		JsonExport_zh_CN.ts \
 		JsonExport_sk.ts \
-		JsonExport_de.ts \
 		JsonExport_ru.ts \
 		JsonExport_pt_BR.ts \
 		JsonExport_fr.ts \
@@ -50,3 +50,5 @@ TRANSLATIONS += JsonExport_it.ts \
 
 
 
+
+
diff --git a/Plugins/JsonExport/JsonExport_de.ts b/Plugins/JsonExport/JsonExport_de.ts
index e345feb..15fece3 100644
--- a/Plugins/JsonExport/JsonExport_de.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_es.ts b/Plugins/JsonExport/JsonExport_es.ts
index e93d0ff..38209b9 100644
--- a/Plugins/JsonExport/JsonExport_es.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_fr.qm b/Plugins/JsonExport/JsonExport_fr.qm
index 094764b..eb8c8f5 100644
--- a/Plugins/JsonExport/JsonExport_fr.qm
+++ b/Plugins/JsonExport/JsonExport_fr.qm
diff --git a/Plugins/JsonExport/JsonExport_fr.ts b/Plugins/JsonExport/JsonExport_fr.ts
index c4d48f6..171ddf4 100644
--- a/Plugins/JsonExport/JsonExport_fr.ts
+++ b/Plugins/JsonExport/JsonExport_fr.ts
@@ -6,17 +6,17 @@
     <message>
         <location filename="jsonexport.ui" line="20"/>
         <source>Output format</source>
-        <translation>Format d&rsquo;affichage</translation>
+        <translation>Format d’affichage</translation>
     </message>
     <message>
         <location filename="jsonexport.ui" line="26"/>
         <source>Format document (new lines, indentation)</source>
-        <translation>Format document (nouvelle lignes, indentation)</translation>
+        <translation>Format document (nouvelles lignes, indentation)</translation>
     </message>
     <message>
         <location filename="jsonexport.ui" line="42"/>
         <source>Compress (everything in one line)</source>
-        <translation>Condensé(tout sur une ligne)</translation>
+        <translation>Condensé (tout sur une ligne)</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/JsonExport/JsonExport_it.ts b/Plugins/JsonExport/JsonExport_it.ts
index e72d0bd..74b0169 100644
--- a/Plugins/JsonExport/JsonExport_it.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_pl.ts b/Plugins/JsonExport/JsonExport_pl.ts
index bdfdf8a..4a28cc2 100644
--- a/Plugins/JsonExport/JsonExport_pl.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_pt_BR.ts b/Plugins/JsonExport/JsonExport_pt_BR.ts
index 53480f6..ba1735d 100644
--- a/Plugins/JsonExport/JsonExport_pt_BR.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_ru.ts b/Plugins/JsonExport/JsonExport_ru.ts
index 5419206..61b24eb 100644
--- a/Plugins/JsonExport/JsonExport_ru.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_sk.ts b/Plugins/JsonExport/JsonExport_sk.ts
index caade25..9049c29 100644
--- a/Plugins/JsonExport/JsonExport_sk.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_zh_CN.ts b/Plugins/JsonExport/JsonExport_zh_CN.ts
index 1470a6b..82b3b1d 100644
--- a/Plugins/JsonExport/JsonExport_zh_CN.ts
+++ b/Plugins/JsonExport/JsonExport_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>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/jsonexport.qrc b/Plugins/JsonExport/jsonexport.qrc
index 72cd201..2b9c8e8 100644
--- a/Plugins/JsonExport/jsonexport.qrc
+++ b/Plugins/JsonExport/jsonexport.qrc
@@ -3,6 +3,9 @@
         <file>jsonexport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>JsonExport_de.qm</file>
+
+
         <file>JsonExport_pl.qm</file>
         <file>JsonExport_ru.qm</file>
         <file>JsonExport_fr.qm</file>
@@ -10,3 +13,6 @@
         <file>JsonExport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
+