Re: Minor last minute edits in fr.po
Le 24/05/2016 16:03, Richard Heck a écrit : On 05/24/2016 04:02 AM, Jean-Pierre Chrétien wrote: Richard, one shortcut conflict resolution should be backported to 2.1.5. Okay to push ? Yes, that's fine. Done -- Jean-Pierre
Re: Minor last minute edits in fr.po
On 05/24/2016 04:02 AM, Jean-Pierre Chrétien wrote: > Le 23/05/2016 23:22, Jean-Pierre Chrétien a écrit : >> 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 ? >> > > Richard, one shortcut conflict resolution should be backported to 2.1.5. > Okay to push ? Yes, that's fine. rh
Re: Minor last minute edits in fr.po
Le 23/05/2016 23:22, Jean-Pierre Chrétien a écrit : 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 ? Richard, one shortcut conflict resolution should be backported to 2.1.5. Okay to push ? -- Jean-Pierre commit 975f8ab1cb1c0c92925a1c4a8192e62a147afd9d Author: jpc Date: Tue May 24 08:57:54 2016 +0100 * Backporting one shortcut conflict solution from master * fr.gmo update diff --git a/po/fr.gmo b/po/fr.gmo index d1bf65b..457182b 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 19bf97e..b4d92a6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -322,14 +322,17 @@ # 24 mars 2016 : revue des raccourcis clavier de la fenêtre de citation #suite à une revue similaire pour 2.2 # Mise à jour du numéro de projet : lyx-2.1.5 -# au leiu de 1.6.0 +# au lieu de 1.6.0 +# -- +# 24 mai 2016 : importation d'une résolution de conflit de raccourci +# de la dernière mise à jour pour 2.2.0 # -- msgid "" msgstr "" "Project-Id-Version: LyX 2.1.5\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" "POT-Creation-Date: 2016-03-24 14:06+\n" -"PO-Revision-Date: 2016-03-24 14:49-\n" +"PO-Revision-Date: 2016-05-24 08:57+0100\n" "Last-Translator: Jean-Pierre Chrétien \n" "Language-Team: lyxfr\n" "Language: fr\n" @@ -29040,7 +29043,7 @@ msgstr "Autres suggestions orthographiques" #: src/frontends/qt4/Menus.cpp:844 msgid "Add to personal dictionary|n" -msgstr "Ajouter au dictionnaire personnel|A" +msgstr "Ajouter au dictionnaire personnel|j" #: src/frontends/qt4/Menus.cpp:846 msgid "Ignore all|I"
Re: Minor last minute edits in fr.po
On Mon, May 23, 2016 at 11:59:04PM +0100, Jean-Pierre Chrétien wrote: > Le 23/05/2016 22:54, Scott Kostyshak a écrit : > > On Mon, May 23, 2016 at 11:22:02PM +0100, Jean-Pierre Chrétien wrote: > > > 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 > > > ? > > > > Go ahead. Thanks for the fixes. > > Done Thanks, Scott > > -- > Jean-Pierre > > signature.asc Description: PGP signature
Re: Minor last minute edits in fr.po
Le 23/05/2016 22:54, Scott Kostyshak a écrit : On Mon, May 23, 2016 at 11:22:02PM +0100, Jean-Pierre Chrétien wrote: 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 ? Go ahead. Thanks for the fixes. Done -- Jean-Pierre
Re: Minor last minute edits in fr.po
On Mon, May 23, 2016 at 11:22:02PM +0100, Jean-Pierre Chrétien wrote: > 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 > ? Go ahead. Thanks for the fixes. Scott > > -- > Jean-Pierre > > commit 9e5198f4f59a1059b116381bb75070cbcf20bc82 > Author: jpc > 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 \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 > 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 \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" signature.asc Description: PGP signature
Minor last minute edits in fr.po
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 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 \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 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 \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"
