Hello,

Jean-Marc pointed out to me a mistake and a shortcut conflict, I have 2 commits ready fot these. Should this wait for 2.2.1 or may I push to master ?

--
Jean-Pierre

commit 9e5198f4f59a1059b116381bb75070cbcf20bc82
Author: jpc <j...@lyx.org>
Date:   Mon May 23 23:15:10 2016 +0100

    * One more shortcut conflict solved
    * fr.gmo updated

diff --git a/po/fr.gmo b/po/fr.gmo
index 84ebb9e..7f59870 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 3dd65b2..dc434d0 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.chret...@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"

commit f5146e729bb9ef3124056c675e7bdbb1afbc85de
Author: jpc <j...@lyx.org>
Date:   Mon May 23 22:43:39 2016 +0100

    * Edit translation mistakes for icon sizes
    * Resolve a shortcut conflict
    * Provide fr.gmo using msgfmt

diff --git a/po/fr.gmo b/po/fr.gmo
index 869041d..84ebb9e 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 8f235de..3dd65b2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -310,12 +310,15 @@
 # ------------------------------------------------------------------
 # 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
+# ------------------------------------------------------------------
 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-04-22 18:46+0100\n"
+"PO-Revision-Date: 2016-05-23 22:37+0100\n"
 "Last-Translator: Jean-Pierre Chrétien <jeanpierre.chret...@free.fr>\n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
@@ -29621,11 +29624,11 @@ msgstr "Icônes de grande taille"

 #: src/frontends/qt4/GuiView.cpp:361
 msgid "Huge-sized icons"
-msgstr "Icônes de grande taille"
+msgstr "Icônes de taille énorme"

 #: src/frontends/qt4/GuiView.cpp:368
 msgid "Giant-sized icons"
-msgstr "Icônes de très grande taille"
+msgstr "Icônes de taille gigantesque"

 #: src/frontends/qt4/GuiView.cpp:639
 #, c-format
@@ -30140,7 +30143,7 @@ msgstr "Autres suggestions orthographiques"

 #: src/frontends/qt4/Menus.cpp:842
 msgid "Add to personal dictionary|n"
-msgstr "Ajouter au dictionnaire personnel|A"
+msgstr "Ajouter au dictionnaire personnel|j"

 #: src/frontends/qt4/Menus.cpp:844
 msgid "Ignore all|I"

Reply via email to