Merge tag 'upstream/3.1.0'

Upstream version 3.1.0

# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

11 files changed, 9 insertions, 9 deletions

diff --git a/Plugins/JsonExport/JsonExport_de.ts b/Plugins/JsonExport/JsonExport_de.ts
index 15fece3..e345feb 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.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_es.ts b/Plugins/JsonExport/JsonExport_es.ts
index 38209b9..e93d0ff 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.1" language="es_ES">
+<TS version="2.0" language="es_ES">
 <context>
     <name>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_fr.ts b/Plugins/JsonExport/JsonExport_fr.ts
index 48af099..c4d48f6 100644
--- a/Plugins/JsonExport/JsonExport_fr.ts
+++ b/Plugins/JsonExport/JsonExport_fr.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="jsonexport.ui" line="20"/>
         <source>Output format</source>
-        <translation>Format d&apos;affichage</translation>
+        <translation>Format d&rsquo;affichage</translation>
     </message>
     <message>
         <location filename="jsonexport.ui" line="26"/>
diff --git a/Plugins/JsonExport/JsonExport_it.qm b/Plugins/JsonExport/JsonExport_it.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/JsonExport/JsonExport_it.qm
diff --git a/Plugins/JsonExport/JsonExport_it.ts b/Plugins/JsonExport/JsonExport_it.ts
index 74b0169..e72d0bd 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.1" language="it_IT">
+<TS version="2.0" language="it_IT">
 <context>
     <name>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_pl.ts b/Plugins/JsonExport/JsonExport_pl.ts
index 4a28cc2..bdfdf8a 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.1" language="pl_PL">
+<TS version="2.0" 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 ba1735d..53480f6 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.1" language="pt_BR">
+<TS version="2.0" language="pt_BR">
 <context>
     <name>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_ru.ts b/Plugins/JsonExport/JsonExport_ru.ts
index 61b24eb..5419206 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.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_sk.ts b/Plugins/JsonExport/JsonExport_sk.ts
index 9049c29..caade25 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.1" language="sk_SK">
+<TS version="2.0" language="sk_SK">
 <context>
     <name>JsonExportConfig</name>
     <message>
diff --git a/Plugins/JsonExport/JsonExport_zh_CN.qm b/Plugins/JsonExport/JsonExport_zh_CN.qm
index be651ee..3d08187 100644
--- a/Plugins/JsonExport/JsonExport_zh_CN.qm
+++ b/Plugins/JsonExport/JsonExport_zh_CN.qm
diff --git a/Plugins/JsonExport/JsonExport_zh_CN.ts b/Plugins/JsonExport/JsonExport_zh_CN.ts
index 82b3b1d..1470a6b 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.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>JsonExportConfig</name>
     <message>