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, 28 insertions, 23 deletions

diff --git a/Plugins/RegExpImport/RegExpImport.pro b/Plugins/RegExpImport/RegExpImport.pro
index 8ef5298..b72ec67 100644
--- a/Plugins/RegExpImport/RegExpImport.pro
+++ b/Plugins/RegExpImport/RegExpImport.pro
@@ -28,10 +28,10 @@ RESOURCES += \
     regexpimport.qrc
 
 
-TRANSLATIONS += RegExpImport_it.ts \
+TRANSLATIONS += RegExpImport_de.ts \
+		RegExpImport_it.ts \
 		RegExpImport_zh_CN.ts \
 		RegExpImport_sk.ts \
-		RegExpImport_de.ts \
 		RegExpImport_ru.ts \
 		RegExpImport_pt_BR.ts \
 		RegExpImport_fr.ts \
@@ -50,3 +50,5 @@ TRANSLATIONS += RegExpImport_it.ts \
 
 
 
+
+
diff --git a/Plugins/RegExpImport/RegExpImport_de.ts b/Plugins/RegExpImport/RegExpImport_de.ts
index e73d909..2a30835 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.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_es.ts b/Plugins/RegExpImport/RegExpImport_es.ts
index fd5ae74..c58d204 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.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_fr.qm b/Plugins/RegExpImport/RegExpImport_fr.qm
index e0370da..2843e37 100644
--- a/Plugins/RegExpImport/RegExpImport_fr.qm
+++ b/Plugins/RegExpImport/RegExpImport_fr.qm
diff --git a/Plugins/RegExpImport/RegExpImport_fr.ts b/Plugins/RegExpImport/RegExpImport_fr.ts
index dc300ee..b7f0aef 100644
--- a/Plugins/RegExpImport/RegExpImport_fr.ts
+++ b/Plugins/RegExpImport/RegExpImport_fr.ts
@@ -11,7 +11,7 @@
     <message>
         <location filename="regexpimport.cpp" line="53"/>
         <source>Cannot read file %1</source>
-        <translation>Impossible de lire le fichier: %1</translation>
+        <translation>Impossible de lire le fichier : %1</translation>
     </message>
     <message>
         <location filename="regexpimport.cpp" line="161"/>
@@ -21,17 +21,17 @@
     <message>
         <location filename="regexpimport.cpp" line="169"/>
         <source>Invalid pattern: %1</source>
-        <translation>Expression invalide: %1</translation>
+        <translation>Expression invalide : %1</translation>
     </message>
     <message>
         <location filename="regexpimport.cpp" line="189"/>
         <source>Requested capture index %1 is out of range.</source>
-        <translation>Allocation d&rsquo;index %1 hors limites.</translation>
+        <translation>Allocation d’index %1 hors limites.</translation>
     </message>
     <message>
         <location filename="regexpimport.cpp" line="196"/>
         <source>&lt;p&gt;Requested capture group name &apos;%1&apos;, but it&apos;s not defined in the pattern: &lt;pre&gt;%2&lt;/pre&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Requested capture group name &apos;%1&apos;, but it&apos;s not defined in the pattern: &lt;pre&gt;%2&lt;/pre&gt;&lt;/p&gt;</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -49,38 +49,35 @@
     <message>
         <location filename="regexpimport.ui" line="39"/>
         <source>Import only following groups:</source>
-        <translation>Importer seulement les groupes suivant:</translation>
+        <translation>Importer seulement les groupes suivant :</translation>
     </message>
     <message>
         <location filename="regexpimport.ui" line="52"/>
         <source>&lt;p&gt;Enter comma separated list of capture group indexes. The 0 index refers to the entire matched string.&lt;/p&gt;
 &lt;p&gt;If you used named groups in the pattern, you can use names instead of indexes. You can mix indexes and names in this list.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Enter comma separated list of capture group indexes. The 0 index refers to the entire matched string.&lt;/p&gt;
-&lt;p&gt;If you used named groups in the pattern, you can use names instead of indexes. You can mix indexes and names in this list.&lt;/p&gt;</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="regexpimport.ui" line="56"/>
         <source>Example: 1, 3, 4</source>
-        <translation>Exemple: 1, 3, 4</translation>
+        <translation>Exemple : 1, 3, 4</translation>
     </message>
     <message>
         <location filename="regexpimport.ui" line="69"/>
         <source>Pattern:</source>
-        <translation>Modéle:</translation>
+        <translation>Modèle :</translation>
     </message>
     <message>
         <location filename="regexpimport.ui" line="76"/>
         <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&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>
+        <translation></translation>
     </message>
     <message>
         <location filename="regexpimport.ui" line="81"/>
         <source>Example: (\d+)\s+((\d+)\w+)\s+(\w+)</source>
-        <translation>Exemple: (\d+)\s+((\d+)\w+)\s+(\w+)</translation>
+        <translation>Exemple : (\d+)\s+((\d+)\w+)\s+(\w+)</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/RegExpImport/RegExpImport_it.ts b/Plugins/RegExpImport/RegExpImport_it.ts
index d7624a6..00869f1 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.0" language="it_IT">
+<TS version="2.1" language="it_IT">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_pl.ts b/Plugins/RegExpImport/RegExpImport_pl.ts
index a5d567c..d55ed25 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.0" language="pl_PL">
+<TS version="2.1" 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 b861545..0af41e7 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.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_ru.ts b/Plugins/RegExpImport/RegExpImport_ru.ts
index 09ad9a9..edcd7f4 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.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/RegExpImport_sk.ts b/Plugins/RegExpImport/RegExpImport_sk.ts
index 9b34ed7..25068a5 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.0" language="sk_SK">
+<TS version="2.1" 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 97a39d5..c361148 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.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>RegExpImport</name>
     <message>
diff --git a/Plugins/RegExpImport/regexpimport.qrc b/Plugins/RegExpImport/regexpimport.qrc
index 2fb1a4f..ad6ace8 100644
--- a/Plugins/RegExpImport/regexpimport.qrc
+++ b/Plugins/RegExpImport/regexpimport.qrc
@@ -3,6 +3,9 @@
         <file>regexpimport.ui</file>
     </qresource>
     <qresource prefix="/msg">
+        <file>RegExpImport_de.qm</file>
+
+
         <file>RegExpImport_pl.qm</file>
         <file>RegExpImport_ru.qm</file>
         <file>RegExpImport_fr.qm</file>
@@ -10,3 +13,6 @@
         <file>RegExpImport_zh_CN.qm</file>
     </qresource>
 </RCC>
+
+
+