mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 21:21:32 +00:00
Solve shortcut conflicts in std*.inc and fr.po
This commit is contained in:
jpc
parent
b7f0a90364
commit
8605296ac0
@ -270,7 +270,7 @@ Menuset
|
|||||||
Item "Non-Breaking Negative Thin Space (-1/6 em)|N" "inset-modify space \negthinspace{}"
|
Item "Non-Breaking Negative Thin Space (-1/6 em)|N" "inset-modify space \negthinspace{}"
|
||||||
Item "Non-Breaking Negative Medium Space (-2/9 em)|v" "inset-modify space \negmedspace{}"
|
Item "Non-Breaking Negative Medium Space (-2/9 em)|v" "inset-modify space \negmedspace{}"
|
||||||
Item "Non-Breaking Negative Thick Space (-5/18 em)|h" "inset-modify space \negthickspace{}"
|
Item "Non-Breaking Negative Thick Space (-5/18 em)|h" "inset-modify space \negthickspace{}"
|
||||||
Item "Half Quad Space (1/2 em)|S" "inset-modify space \enskip{}"
|
Item "Half Quad Space (1/2 em)|l" "inset-modify space \enskip{}"
|
||||||
Item "Non-Breaking Half Quad Space (1/2 em)|k" "inset-modify space \enspace{}"
|
Item "Non-Breaking Half Quad Space (1/2 em)|k" "inset-modify space \enspace{}"
|
||||||
Item "Quad Space (1 em)|Q" "inset-modify space \quad{}"
|
Item "Quad Space (1 em)|Q" "inset-modify space \quad{}"
|
||||||
Item "Double Quad Space (2 em)|u" "inset-modify space \qquad{}"
|
Item "Double Quad Space (2 em)|u" "inset-modify space \qquad{}"
|
||||||
@ -278,7 +278,7 @@ Menuset
|
|||||||
Item "Non-Breaking Horizontal Fill|z" "inset-modify space \hspace*{\fill}"
|
Item "Non-Breaking Horizontal Fill|z" "inset-modify space \hspace*{\fill}"
|
||||||
Item "Horizontal Fill (Dots)|D" "inset-modify space \dotfill{}"
|
Item "Horizontal Fill (Dots)|D" "inset-modify space \dotfill{}"
|
||||||
Item "Horizontal Fill (Rule)|R" "inset-modify space \hrulefill{}"
|
Item "Horizontal Fill (Rule)|R" "inset-modify space \hrulefill{}"
|
||||||
Item "Horizontal Fill (Left Arrow)|L" "inset-modify space \leftarrowfill{}"
|
Item "Horizontal Fill (Left Arrow)|w" "inset-modify space \leftarrowfill{}"
|
||||||
Item "Horizontal Fill (Right Arrow)|g" "inset-modify space \rightarrowfill{}"
|
Item "Horizontal Fill (Right Arrow)|g" "inset-modify space \rightarrowfill{}"
|
||||||
Item "Horizontal Fill (Up Brace)|p" "inset-modify space \upbracefill{}"
|
Item "Horizontal Fill (Up Brace)|p" "inset-modify space \upbracefill{}"
|
||||||
Item "Horizontal Fill (Down Brace)|B" "inset-modify space \downbracefill{}"
|
Item "Horizontal Fill (Down Brace)|B" "inset-modify space \downbracefill{}"
|
||||||
|
|||||||
@ -451,8 +451,8 @@ Menuset
|
|||||||
Item "Superscript|S" "script-insert superscript"
|
Item "Superscript|S" "script-insert superscript"
|
||||||
Item "Subscript|u" "script-insert subscript"
|
Item "Subscript|u" "script-insert subscript"
|
||||||
Separator
|
Separator
|
||||||
Item "Normal Space|w" "space-insert normal"
|
Item "Normal Space|e" "space-insert normal"
|
||||||
Item "Non-breaking Normal Space|P" "space-insert protected"
|
Item "Non-breaking Normal Space|p" "space-insert protected"
|
||||||
Item "Non-breaking Thin Space|T" "space-insert thin"
|
Item "Non-breaking Thin Space|T" "space-insert thin"
|
||||||
Item "Horizontal Space...|o" "command-alternatives dialog-show-new-inset space;dialog-show-new-inset mathspace"
|
Item "Horizontal Space...|o" "command-alternatives dialog-show-new-inset space;dialog-show-new-inset mathspace"
|
||||||
Item "Horizontal Line...|L" "dialog-show-new-inset line"
|
Item "Horizontal Line...|L" "dialog-show-new-inset line"
|
||||||
|
|||||||
78
po/fr.po
78
po/fr.po
@ -362,8 +362,8 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: LyX 2.4\n"
|
"Project-Id-Version: LyX 2.4\n"
|
||||||
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
|
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
|
||||||
"POT-Creation-Date: 2022-06-13 09:09+0200\n"
|
"POT-Creation-Date: 2022-06-13 18:39+0200\n"
|
||||||
"PO-Revision-Date: 2022-06-13 09:46+0200\n"
|
"PO-Revision-Date: 2022-06-14 15:37+0200\n"
|
||||||
"Last-Translator: Jean-Pierre Chrétien <jeanpierre.chretien@free.fr>\n"
|
"Last-Translator: Jean-Pierre Chrétien <jeanpierre.chretien@free.fr>\n"
|
||||||
"Language-Team: lyxfr\n"
|
"Language-Team: lyxfr\n"
|
||||||
"Language: fr\n"
|
"Language: fr\n"
|
||||||
@ -3062,7 +3062,7 @@ msgstr "&Paquetage d'accentuation de la syntaxe :"
|
|||||||
#: src/frontends/qt/ui/ListingsUi.ui:14 lib/layouts/numreport.inc:37
|
#: src/frontends/qt/ui/ListingsUi.ui:14 lib/layouts/numreport.inc:37
|
||||||
#: lib/layouts/stdcounters.inc:77 lib/layouts/stdinsets.inc:338
|
#: lib/layouts/stdcounters.inc:77 lib/layouts/stdinsets.inc:338
|
||||||
#: lib/layouts/stdinsets.inc:344 lib/layouts/stdinsets.inc:393
|
#: lib/layouts/stdinsets.inc:344 lib/layouts/stdinsets.inc:393
|
||||||
#: lib/layouts/stdinsets.inc:399 src/insets/InsetCaption.cpp:410
|
#: lib/layouts/stdinsets.inc:399 src/insets/InsetCaption.cpp:423
|
||||||
#: src/insets/InsetListings.cpp:612 src/insets/InsetListings.cpp:613
|
#: src/insets/InsetListings.cpp:612 src/insets/InsetListings.cpp:613
|
||||||
msgid "Listing"
|
msgid "Listing"
|
||||||
msgstr "Listing"
|
msgstr "Listing"
|
||||||
@ -10051,7 +10051,7 @@ msgid "Centered"
|
|||||||
msgstr "Centré"
|
msgstr "Centré"
|
||||||
|
|
||||||
#: lib/layouts/apa.layout:285 lib/layouts/apax.inc:384
|
#: lib/layouts/apa.layout:285 lib/layouts/apax.inc:384
|
||||||
#: lib/layouts/stdinsets.inc:690 src/insets/InsetCaption.cpp:436
|
#: lib/layouts/stdinsets.inc:690 src/insets/InsetCaption.cpp:449
|
||||||
msgid "standard"
|
msgid "standard"
|
||||||
msgstr "standard"
|
msgstr "standard"
|
||||||
|
|
||||||
@ -20248,8 +20248,8 @@ msgid "Vertical Phantom|V"
|
|||||||
msgstr "Fantôme vertical|c"
|
msgstr "Fantôme vertical|c"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:264 lib/ui/stdmenus.inc:454
|
#: lib/ui/stdcontext.inc:264 lib/ui/stdmenus.inc:454
|
||||||
msgid "Normal Space|w"
|
msgid "Normal Space|e"
|
||||||
msgstr "Espace normale|m"
|
msgstr "Espace normale|e"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:265
|
#: lib/ui/stdcontext.inc:265
|
||||||
msgid "Non-Breaking Normal Space|o"
|
msgid "Non-Breaking Normal Space|o"
|
||||||
@ -20281,14 +20281,14 @@ msgstr "Espace moyenne négative insécable (−2/9 em)|v"
|
|||||||
|
|
||||||
#: lib/ui/stdcontext.inc:272
|
#: lib/ui/stdcontext.inc:272
|
||||||
msgid "Non-Breaking Negative Thick Space (-5/18 em)|h"
|
msgid "Non-Breaking Negative Thick Space (-5/18 em)|h"
|
||||||
msgstr "Espace large négative insécable (−5/18 em)a"
|
msgstr "Espace large négative insécable (−5/18 em)|a"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:273
|
#: lib/ui/stdcontext.inc:273
|
||||||
msgid "Half Quad Space (1/2 em)|k"
|
msgid "Half Quad Space (1/2 em)|l"
|
||||||
msgstr "Demi-cadratin (1/2 em)|D"
|
msgstr "Demi-cadratin (1/2 em)|D"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:274
|
#: lib/ui/stdcontext.inc:274
|
||||||
msgid "Non-Breaking Half Quad Space (1/2 em)|E"
|
msgid "Non-Breaking Half Quad Space (1/2 em)|k"
|
||||||
msgstr "Espace insécable demi-cadratin (1/2 em)|r"
|
msgstr "Espace insécable demi-cadratin (1/2 em)|r"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:275
|
#: lib/ui/stdcontext.inc:275
|
||||||
@ -20313,10 +20313,10 @@ msgstr "Ressort horizontal (points)|p"
|
|||||||
|
|
||||||
#: lib/ui/stdcontext.inc:280
|
#: lib/ui/stdcontext.inc:280
|
||||||
msgid "Horizontal Fill (Rule)|R"
|
msgid "Horizontal Fill (Rule)|R"
|
||||||
msgstr "Ressort horizontal (filet)|e"
|
msgstr "Ressort horizontal (filet)|h"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:281
|
#: lib/ui/stdcontext.inc:281
|
||||||
msgid "Horizontal Fill (Left Arrow)|L"
|
msgid "Horizontal Fill (Left Arrow)|w"
|
||||||
msgstr "Ressort horizontal (flèche gauche)|g"
|
msgstr "Ressort horizontal (flèche gauche)|g"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:282
|
#: lib/ui/stdcontext.inc:282
|
||||||
@ -20325,7 +20325,7 @@ msgstr "Ressort horizontal (flèche droite)|è"
|
|||||||
|
|
||||||
#: lib/ui/stdcontext.inc:283
|
#: lib/ui/stdcontext.inc:283
|
||||||
msgid "Horizontal Fill (Up Brace)|p"
|
msgid "Horizontal Fill (Up Brace)|p"
|
||||||
msgstr "Ressort horizontal (accolade vers le haut)|h"
|
msgstr "Ressort horizontal (accolade vers le haut)|v"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:284
|
#: lib/ui/stdcontext.inc:284
|
||||||
msgid "Horizontal Fill (Down Brace)|B"
|
msgid "Horizontal Fill (Down Brace)|B"
|
||||||
@ -20333,7 +20333,7 @@ msgstr "Ressort horizontal (accolade vers le bas)|b"
|
|||||||
|
|
||||||
#: lib/ui/stdcontext.inc:285 lib/ui/stdcontext.inc:303
|
#: lib/ui/stdcontext.inc:285 lib/ui/stdcontext.inc:303
|
||||||
msgid "Custom Length|C"
|
msgid "Custom Length|C"
|
||||||
msgstr "Dimension réglable|a"
|
msgstr "Dimension réglable|s"
|
||||||
|
|
||||||
#: lib/ui/stdcontext.inc:294
|
#: lib/ui/stdcontext.inc:294
|
||||||
msgid "Thin Space|T"
|
msgid "Thin Space|T"
|
||||||
@ -21534,7 +21534,7 @@ msgstr "Guillemet interne|i"
|
|||||||
|
|
||||||
#: lib/ui/stdmenus.inc:418
|
#: lib/ui/stdmenus.inc:418
|
||||||
msgid "Non-Breaking Hyphen|y"
|
msgid "Non-Breaking Hyphen|y"
|
||||||
msgstr "Tiret insécable|i"
|
msgstr "Tiret insécable|r"
|
||||||
|
|
||||||
#: lib/ui/stdmenus.inc:419
|
#: lib/ui/stdmenus.inc:419
|
||||||
msgid "Breakable Slash|a"
|
msgid "Breakable Slash|a"
|
||||||
@ -21625,12 +21625,12 @@ msgid "Subscript|u"
|
|||||||
msgstr "Indice|I"
|
msgstr "Indice|I"
|
||||||
|
|
||||||
#: lib/ui/stdmenus.inc:455
|
#: lib/ui/stdmenus.inc:455
|
||||||
msgid "Non-breaking Normal Space|P"
|
msgid "Non-breaking Normal Space|p"
|
||||||
msgstr "Espace normale insécable|o"
|
msgstr "Espace normale insécable|n"
|
||||||
|
|
||||||
#: lib/ui/stdmenus.inc:456
|
#: lib/ui/stdmenus.inc:456
|
||||||
msgid "Non-breaking Thin Space|T"
|
msgid "Non-breaking Thin Space|T"
|
||||||
msgstr "Espace fine insécable|é"
|
msgstr "Espace fine insécable|f"
|
||||||
|
|
||||||
#: lib/ui/stdmenus.inc:457
|
#: lib/ui/stdmenus.inc:457
|
||||||
msgid "Horizontal Space...|o"
|
msgid "Horizontal Space...|o"
|
||||||
@ -28292,7 +28292,7 @@ msgstr ""
|
|||||||
"original %1$s est en lecture seule. Il faudra sauvegarder le document sous "
|
"original %1$s est en lecture seule. Il faudra sauvegarder le document sous "
|
||||||
"un autre nom."
|
"un autre nom."
|
||||||
|
|
||||||
#: src/Buffer.cpp:5213 src/insets/InsetCaption.cpp:404
|
#: src/Buffer.cpp:5213
|
||||||
msgid "Senseless!!! "
|
msgid "Senseless!!! "
|
||||||
msgstr "Inapproprié !!! "
|
msgstr "Inapproprié !!! "
|
||||||
|
|
||||||
@ -33773,19 +33773,19 @@ msgstr "Temps fixé :"
|
|||||||
msgid "Field Settings"
|
msgid "Field Settings"
|
||||||
msgstr "Paramètres du champ"
|
msgstr "Paramètres du champ"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiKeySymbol.cpp:826
|
#: src/frontends/qt/GuiKeySymbol.cpp:834
|
||||||
msgid "Shift-"
|
msgid "Shift-"
|
||||||
msgstr "Maj-"
|
msgstr "Maj-"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiKeySymbol.cpp:827
|
#: src/frontends/qt/GuiKeySymbol.cpp:835
|
||||||
msgid "Control-"
|
msgid "Control-"
|
||||||
msgstr "Control-"
|
msgstr "Control-"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiKeySymbol.cpp:828
|
#: src/frontends/qt/GuiKeySymbol.cpp:836
|
||||||
msgid "Option-"
|
msgid "Option-"
|
||||||
msgstr "Option-"
|
msgstr "Option-"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiKeySymbol.cpp:829
|
#: src/frontends/qt/GuiKeySymbol.cpp:837
|
||||||
msgid "Command-"
|
msgid "Command-"
|
||||||
msgstr "Command-"
|
msgstr "Command-"
|
||||||
|
|
||||||
@ -35452,27 +35452,27 @@ msgstr "Aperçu de code"
|
|||||||
msgid "%1[[preview format name]] Preview"
|
msgid "%1[[preview format name]] Preview"
|
||||||
msgstr "%1, aperçu"
|
msgstr "%1, aperçu"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiWorkArea.cpp:1527
|
#: src/frontends/qt/GuiWorkArea.cpp:1541
|
||||||
msgid "Close File"
|
msgid "Close File"
|
||||||
msgstr "Fermer le fichier"
|
msgstr "Fermer le fichier"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiWorkArea.cpp:2069
|
#: src/frontends/qt/GuiWorkArea.cpp:2083
|
||||||
msgid "%1 (read only)"
|
msgid "%1 (read only)"
|
||||||
msgstr "%1 (en lecture seule)"
|
msgstr "%1 (en lecture seule)"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiWorkArea.cpp:2077
|
#: src/frontends/qt/GuiWorkArea.cpp:2091
|
||||||
msgid "%1 (modified externally)"
|
msgid "%1 (modified externally)"
|
||||||
msgstr "%1 (modifié par une application externe)"
|
msgstr "%1 (modifié par une application externe)"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiWorkArea.cpp:2100
|
#: src/frontends/qt/GuiWorkArea.cpp:2114
|
||||||
msgid "Hide tab"
|
msgid "Hide tab"
|
||||||
msgstr "Cacher l'onglet"
|
msgstr "Cacher l'onglet"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiWorkArea.cpp:2106
|
#: src/frontends/qt/GuiWorkArea.cpp:2120
|
||||||
msgid "Close tab"
|
msgid "Close tab"
|
||||||
msgstr "Fermer l'onglet"
|
msgstr "Fermer l'onglet"
|
||||||
|
|
||||||
#: src/frontends/qt/GuiWorkArea.cpp:2145
|
#: src/frontends/qt/GuiWorkArea.cpp:2159
|
||||||
msgid "<b>The file %1 changed on disk.</b>"
|
msgid "<b>The file %1 changed on disk.</b>"
|
||||||
msgstr "<b>Le fichier %1 a changé sur le disque.</b>"
|
msgstr "<b>Le fichier %1 a changé sur le disque.</b>"
|
||||||
|
|
||||||
@ -36054,12 +36054,27 @@ msgstr ""
|
|||||||
"L'état de la branche « %1$s » a été changé dans le document maître. Prenez "
|
"L'état de la branche « %1$s » a été changé dans le document maître. Prenez "
|
||||||
"soin de sauvegarder ce document maître."
|
"soin de sauvegarder ce document maître."
|
||||||
|
|
||||||
#: src/insets/InsetCaption.cpp:419
|
#: src/insets/InsetCaption.cpp:333
|
||||||
|
msgid ""
|
||||||
|
"Standard captions are not allowed outside floats. You will get a LaTeX "
|
||||||
|
"error.\n"
|
||||||
|
"For captions outside floats, you can use the 'nonfloat' LaTeX package."
|
||||||
|
msgstr ""
|
||||||
|
"Les légendes usuelles ne sont pas admises hors des flottants. Vous aurez une "
|
||||||
|
"erreur LaTeX.\n"
|
||||||
|
"Pour insérer des légendes hors des flottants, vous pouvez utiliser le "
|
||||||
|
"paquetage LaTeX « nonfloat »."
|
||||||
|
|
||||||
|
#: src/insets/InsetCaption.cpp:416
|
||||||
|
msgid "Orphaned caption:"
|
||||||
|
msgstr "Légende oprpheline"
|
||||||
|
|
||||||
|
#: src/insets/InsetCaption.cpp:432
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Sub-%1$s"
|
msgid "Sub-%1$s"
|
||||||
msgstr "Sous-%1$s"
|
msgstr "Sous-%1$s"
|
||||||
|
|
||||||
#: src/insets/InsetCaption.cpp:443
|
#: src/insets/InsetCaption.cpp:456
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "%1$s %2$s: [[Caption label (ex. Figure 1: )]]"
|
msgid "%1$s %2$s: [[Caption label (ex. Figure 1: )]]"
|
||||||
msgstr "%1$s %2$s :"
|
msgstr "%1$s %2$s :"
|
||||||
@ -38160,6 +38175,9 @@ msgstr ""
|
|||||||
msgid "Unknown user"
|
msgid "Unknown user"
|
||||||
msgstr "Utilisateur inconnu"
|
msgstr "Utilisateur inconnu"
|
||||||
|
|
||||||
|
#~ msgid "Normal Space|w"
|
||||||
|
#~ msgstr "Espace normale|m"
|
||||||
|
|
||||||
#~ msgid "Interword Space|w"
|
#~ msgid "Interword Space|w"
|
||||||
#~ msgstr "Espace entre mots|t"
|
#~ msgstr "Espace entre mots|t"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user