[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/2.2.x] Shortcut conflicts removed in fr.po
From:       jpc <jpc () lyx ! org>
Date:       2017-09-22 20:32:40
Message-ID: 20170922203240.050E52802B6 () lyx ! lyx ! org
[Download RAW message or body]

commit a2fe1ec8b970b671938b720faa41b554c267c9e3
Author: jpc <jpc@lyx.org>
Date:   Fri Sep 22 22:31:30 2017 +0200

            Shortcut conflicts removed in fr.po
---
 po/fr.gmo |  Bin 505825 -> 505825 bytes
 po/fr.po  |   10 ++++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/po/fr.gmo b/po/fr.gmo
index 2f3aa5c..3e1a49d 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index dfaa19c..66556e1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -326,19 +326,21 @@
 # ------------------------------------------------------------------
 # 1 avril 2017 : dernière mise à jour pour 2.2.3
 # ------------------------------------------------------------------
+# 22 septembre 2017 : résolution de conflits de raccourcis
+# ------------------------------------------------------------------
 msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.2\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
 "POT-Creation-Date: 2017-06-06 16:41-0400\n"
-"PO-Revision-Date: 2017-04-01 10:38+0200\n"
+"PO-Revision-Date: 2017-09-22 22:28+0200\n"
 "Last-Translator: Jean-Pierre Chrétien <jeanpierre.chretien@free.fr>\n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: src/frontends/qt4/ui/AboutUi.ui:33
 msgid "Version"
@@ -17541,11 +17543,11 @@ msgstr "Passage à la ligne (justifié)|j"
 
 #: lib/ui/stdcontext.inc:316
 msgid "Plain Separator|P"
-msgstr "Séparateur ordinaire|P"
+msgstr "Séparateur ordinaire|p"
 
 #: lib/ui/stdcontext.inc:317
 msgid "Paragraph Break|B"
-msgstr "Saut de paragraphe|U"
+msgstr "Saut de paragraphe|u"
 
 #: lib/ui/stdcontext.inc:326 lib/ui/stdmenus.inc:104 lib/ui/stdtoolbars.inc:80
 #: src/Text3.cpp:1358 src/mathed/InsetMathNest.cpp:618

[prev in list] [next in list] [prev in thread] [next in thread]