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

1 files changed, 10 insertions, 13 deletions

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>