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>"

10 files changed, 10 insertions, 10 deletions

diff --git a/Plugins/RegExpImport/RegExpImport_de.ts b/Plugins/RegExpImport/RegExpImport_de.ts
index 2a30835..e73d909 100644
--- a/Plugins/RegExpImport/RegExpImport_de.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_es.ts b/Plugins/RegExpImport/RegExpImport_es.ts
index c58d204..fd5ae74 100644
--- a/Plugins/RegExpImport/RegExpImport_es.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_fr.ts b/Plugins/RegExpImport/RegExpImport_fr.ts
index 5a6e957..dc300ee 100644
--- a/Plugins/RegExpImport/RegExpImport_fr.ts
+++ b/Plugins/RegExpImport/RegExpImport_fr.ts
@@ -26,7 +26,7 @@
     <message>
         <location filename="regexpimport.cpp" line="189"/>
         <source>Requested capture index %1 is out of range.</source>
-        <translation>Allocation d&apos;index %1 hors limites.</translation>
+        <translation>Allocation d&rsquo;index %1 hors limites.</translation>
     </message>
     <message>
         <location filename="regexpimport.cpp" line="196"/>
@@ -73,7 +73,7 @@
         <source>&lt;p&gt;Use Regular Expression groups to enclose parts of the expression that you want to import. If you want to use a group, that you don&apos;t want to import, then use &quot;import only following groups&quot; option below.
 
 You can use named groups and refer to them in group list below. To name a group use: &lt;pre&gt;(?&amp;lt;myGroupName&amp;gt;\s+\d+\s+)&lt;/pre&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Use Regular Expression groups to enclose parts of the expression that you want to import. If you want to use a group, that you don&apos;t want to import, then use &quot;import only following groups&quot; option below.
+        <translation>&lt;p&gt;Use Regular Expression groups to enclose parts of the expression that you want to import. If you want to use a group, that you don&rsquo;t want to import, then use &quot;import only following groups&quot; option below.
 
 You can use named groups and refer to them in group list below. To name a group use: &lt;pre&gt;(?&amp;lt;myGroupName&amp;gt;\s+\d+\s+)&lt;/pre&gt;&lt;/p&gt;</translation>
     </message>
diff --git a/Plugins/RegExpImport/RegExpImport_it.qm b/Plugins/RegExpImport/RegExpImport_it.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/RegExpImport/RegExpImport_it.qm
diff --git a/Plugins/RegExpImport/RegExpImport_it.ts b/Plugins/RegExpImport/RegExpImport_it.ts
index 00869f1..d7624a6 100644
--- a/Plugins/RegExpImport/RegExpImport_it.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_pl.ts b/Plugins/RegExpImport/RegExpImport_pl.ts
index d55ed25..a5d567c 100644
--- a/Plugins/RegExpImport/RegExpImport_pl.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_pt_BR.ts b/Plugins/RegExpImport/RegExpImport_pt_BR.ts
index 0af41e7..b861545 100644
--- a/Plugins/RegExpImport/RegExpImport_pt_BR.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_ru.ts b/Plugins/RegExpImport/RegExpImport_ru.ts
index edcd7f4..09ad9a9 100644
--- a/Plugins/RegExpImport/RegExpImport_ru.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_sk.ts b/Plugins/RegExpImport/RegExpImport_sk.ts
index 25068a5..9b34ed7 100644
--- a/Plugins/RegExpImport/RegExpImport_sk.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_zh_CN.ts b/Plugins/RegExpImport/RegExpImport_zh_CN.ts
index c361148..97a39d5 100644
--- a/Plugins/RegExpImport/RegExpImport_zh_CN.ts
+++ b/Plugins/RegExpImport/RegExpImport_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>RegExpImport</name>
     <message>