From: jpc <jpc@lyx.org>
Date: Mon, 23 May 2016 22:15:10 +0000 (+0100)
Subject: * One more shortcut conflict solved
X-Git-Tag: 2.2.0~2
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9e5198f4f59a1059b116381bb75070cbcf20bc82;p=features.git

* One more shortcut conflict solved
* fr.gmo updated
---

diff --git a/po/fr.gmo b/po/fr.gmo
index 84ebb9e526..7f59870d6d 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 3dd65b2a69..dc434d0b29 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -311,14 +311,14 @@
 # 22 avril 2016 : dernière revue avant 2.2.0
 # ------------------------------------------------------------------
 # 23 mai 2016 : correction d'une erreur de traduction (tailles d'icônes)
-#               et d'un conflit de raccourcis
+#               et 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: 2016-04-22 18:34+0100\n"
-"PO-Revision-Date: 2016-05-23 22:37+0100\n"
+"PO-Revision-Date: 2016-05-23 23:13+0100\n"
 "Last-Translator: Jean-Pierre Chrétien <jeanpierre.chretien@free.fr>\n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
@@ -30147,7 +30147,7 @@ msgstr "Ajouter au dictionnaire personnel|j"
 
 #: src/frontends/qt4/Menus.cpp:844
 msgid "Ignore all|I"
-msgstr "Tout ignorer|o"
+msgstr "Tout ignorer|T"
 
 #: src/frontends/qt4/Menus.cpp:852
 msgid "Remove from personal dictionary|r"