msgstr ""
"Project-Id-Version: LyX 1.6.0\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2008-07-21 23:07+0200\n"
+"POT-Creation-Date: 2008-07-23 00:12+0200\n"
"PO-Revision-Date: 2008-07-11 15:29+0200\n"
"Last-Translator: Jean-Pierre Chrétien <chretien@cert.fr>\n"
"Language-Team: lyxfr\n"
#: src/frontends/qt4/ui/MathMatrixUi.ui:167
#: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:38
#: src/frontends/qt4/ui/ParagraphUi.ui:82 src/frontends/qt4/ui/RefUi.ui:77
-#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:105
+#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:52
#: src/frontends/qt4/ui/SymbolsUi.ui:49
#: src/frontends/qt4/ui/TabularCreateUi.ui:65
#: src/frontends/qt4/ui/VSpaceUi.ui:36 src/frontends/qt4/ui/WrapUi.ui:150
#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:835
#: src/Buffer.cpp:2521 src/Buffer.cpp:2545 src/Buffer.cpp:2580
#: src/LyXFunc.cpp:666 src/LyXFunc.cpp:802 src/LyXFunc.cpp:980
-#: src/LyXVC.cpp:161 src/frontends/qt4/GuiClipboard.cpp:208
+#: src/LyXVC.cpp:179 src/frontends/qt4/GuiClipboard.cpp:208
#: src/frontends/qt4/GuiDocument.cpp:1251
#: src/frontends/qt4/GuiParagraph.cpp:69
#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:1464
#: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
#: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/LabelUi.ui:92
#: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:92
-#: src/frontends/qt4/ui/ShortcutUi.ui:118 src/LyXFunc.cpp:772
+#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/LyXFunc.cpp:772
#: src/buffer_funcs.cpp:104 src/frontends/qt4/ButtonController.cpp:231
msgid "Cancel"
msgstr "Annuler"
#: src/frontends/qt4/ui/PrefConvertersUi.ui:209
#: src/frontends/qt4/ui/PrefShortcutsUi.ui:61
-#: src/frontends/qt4/GuiPrefs.cpp:2255 src/frontends/qt4/GuiPrefs.cpp:2340
+#: src/frontends/qt4/GuiPrefs.cpp:2257 src/frontends/qt4/GuiPrefs.cpp:2320
msgid "Remo&ve"
msgstr "&Enlever"
msgid "Edit shortcut"
msgstr "Modifier raccourci"
-#: src/frontends/qt4/ui/ShortcutUi.ui:31
-msgid ""
-"Type shortcut after clicking on this field. You can reset the content with "
-"the 'Clear' button"
-msgstr ""
-
-#: src/frontends/qt4/ui/ShortcutUi.ui:41
+#: src/frontends/qt4/ui/ShortcutUi.ui:77
msgid "Enter LyX function or command sequence"
msgstr "Saisir la fonction LyX ou la séquence de commandes"
-#: src/frontends/qt4/ui/ShortcutUi.ui:51
+#: src/frontends/qt4/ui/ShortcutUi.ui:87
+msgid "Remove last key from the shortcut sequence"
+msgstr ""
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:90
+#, fuzzy
+msgid "&Delete Key"
+msgstr "Suppri&mer"
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:97
#, fuzzy
msgid "Clear current shortcut"
msgstr "Échec de la création du raccourci"
-#: src/frontends/qt4/ui/ShortcutUi.ui:54 src/frontends/qt4/ui/TabularUi.ui:272
+#: src/frontends/qt4/ui/ShortcutUi.ui:100
+#: src/frontends/qt4/ui/TabularUi.ui:272
msgid "C&lear"
msgstr "&Enlever"
-#: src/frontends/qt4/ui/ShortcutUi.ui:61
+#: src/frontends/qt4/ui/ShortcutUi.ui:107
+msgid "&Shortcut:"
+msgstr "&Raccourci :"
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:117
msgid "&Function:"
msgstr "&Fonction :"
-#: src/frontends/qt4/ui/ShortcutUi.ui:71
-msgid "&Shortcut:"
-msgstr "&Raccourci :"
+#: src/frontends/qt4/ui/ShortcutUi.ui:130
+msgid ""
+"Type shortcut after clicking on this field. You can reset the content with "
+"the 'Clear' button"
+msgstr ""
#: src/frontends/qt4/ui/SpellcheckerUi.ui:35
msgid "Suggestions:"
msgstr "Annuler le dernier enregistrement|A"
#: lib/ui/classic.ui:73 lib/ui/stdmenus.inc:68
-msgid "Show History|H"
+#, fuzzy
+msgid "Show History...|H"
msgstr "Afficher l'historique|H"
#: lib/ui/classic.ui:82 lib/ui/stdmenus.inc:77
"\t-version résumé de la version et de la compilation\n"
"Voir la page man de LyX pour les détails."
-#: src/LyX.cpp:993 src/support/Package.cpp:570
+#: src/LyX.cpp:993 src/support/Package.cpp:554
msgid "No system directory"
msgstr "Pas de répertoire système"
msgid "Revert to saved document?"
msgstr "Revenir à la sauvegarde ?"
-#: src/LyXFunc.cpp:802 src/LyXVC.cpp:161
+#: src/LyXFunc.cpp:802 src/LyXVC.cpp:179
msgid "&Revert"
msgstr "&Revenir à la Sauvegarde"
msgid "Opening help file %1$s..."
msgstr "Ouverture du fichier d'aide %1$s..."
-#: src/LyXFunc.cpp:1273
+#: src/LyXFunc.cpp:1272
#, c-format
msgid "Opening child document %1$s..."
msgstr "Ouverture du sous-document %1$s..."
-#: src/LyXFunc.cpp:1415
+#: src/LyXFunc.cpp:1414
#, c-format
msgid "Document defaults saved in %1$s"
msgstr "Les valeurs par défaut du document ont été enregistrées dans %1$s"
-#: src/LyXFunc.cpp:1418
+#: src/LyXFunc.cpp:1417
msgid "Unable to save document defaults"
msgstr "Impossible d'enregistrer les valeurs par défaut du document"
-#: src/LyXFunc.cpp:1695
+#: src/LyXFunc.cpp:1694
#, c-format
msgid "Document %1$s reloaded."
msgstr "Document %1$s rechargé."
-#: src/LyXFunc.cpp:1697
+#: src/LyXFunc.cpp:1696
#, c-format
msgid "Could not reload document %1$s"
msgstr "Impossible de recherger le document %1$s"
-#: src/LyXFunc.cpp:1734
+#: src/LyXFunc.cpp:1733
msgid "Welcome to LyX!"
msgstr "Bienvenue dans LyX !"
-#: src/LyXFunc.cpp:1755
+#: src/LyXFunc.cpp:1754
msgid "Converting document to new document class..."
msgstr "Conversion du document vers sa nouvelle classe..."
"Spécifie la commande de papier de la visionneuse DVI (laisser vide ou mettre "
"« -paper »)"
-#: src/LyXVC.cpp:91
+#: src/LyXVC.cpp:100
msgid "Document not saved"
msgstr "Le document n'a pas été enregistré"
-#: src/LyXVC.cpp:92
+#: src/LyXVC.cpp:101
msgid "You must save the document before it can be registered."
msgstr ""
"Vous devez enregistrer le document avant de l'inscrire dans le contrôle de "
"version."
-#: src/LyXVC.cpp:118
+#: src/LyXVC.cpp:133
msgid "LyX VC: Initial description"
msgstr "LyX CV : Description initiale"
-#: src/LyXVC.cpp:119
+#: src/LyXVC.cpp:134
msgid "(no initial description)"
msgstr "(pas de description initiale)"
-#: src/LyXVC.cpp:134
+#: src/LyXVC.cpp:149
msgid "LyX VC: Log Message"
msgstr "LyX CV : Message de log"
-#: src/LyXVC.cpp:137
+#: src/LyXVC.cpp:152
msgid "(no log message)"
msgstr "(aucun message de log)"
-#: src/LyXVC.cpp:157
-#, c-format
+#: src/LyXVC.cpp:175
+#, fuzzy, c-format
msgid ""
"Reverting to the stored version of the document %1$s will lose all current "
"changes.\n"
"\n"
-"Do you want to revert to the saved version?"
+"Do you want to revert to the older version?"
msgstr ""
"Revenir à la version enregistrée du document %1$s vous fera perdre toutes "
"les modifications.\n"
"\n"
"Voulez-vous revenir à la version enregistrée ?"
-#: src/LyXVC.cpp:160
+#: src/LyXVC.cpp:178
msgid "Revert to stored version of document?"
msgstr "Revenir à la version enregistrée du document ?"
-#: src/Paragraph.cpp:1494 src/frontends/qt4/GuiParagraph.cpp:246
+#: src/Paragraph.cpp:1505 src/frontends/qt4/GuiParagraph.cpp:246
msgid "Senseless with this layout!"
msgstr "Aucun sens avec ce style !"
-#: src/Paragraph.cpp:1560
+#: src/Paragraph.cpp:1571
msgid "Alignment not permitted"
msgstr "Alignement non autorisé"
-#: src/Paragraph.cpp:1561
+#: src/Paragraph.cpp:1572
msgid ""
"The new layout does not permit the alignment previously used.\n"
"Setting to default."
"précédemment.\n"
"Utilise l'alignement par défaut."
-#: src/Paragraph.cpp:2029 src/frontends/qt4/LaTeXHighlighter.cpp:108
+#: src/Paragraph.cpp:2040 src/frontends/qt4/LaTeXHighlighter.cpp:108
#: src/insets/InsetListings.cpp:182 src/insets/InsetListings.cpp:190
#: src/insets/InsetListings.cpp:214 src/mathed/InsetMathString.cpp:164
msgid "LyX Warning: "
msgstr "Avertissement LyX : "
-#: src/Paragraph.cpp:2030 src/insets/InsetListings.cpp:183
+#: src/Paragraph.cpp:2041 src/insets/InsetListings.cpp:183
#: src/insets/InsetListings.cpp:191 src/mathed/InsetMathString.cpp:165
msgid "uncodable character"
msgstr "caractère incodable"
"\n"
"%1$s."
-#: src/VCBackend.cpp:46
+#: src/VCBackend.cpp:46 src/VCBackend.cpp:468 src/VCBackend.cpp:515
#, fuzzy
msgid "Revision control error."
msgstr "Contrôle de version"
#: src/VCBackend.cpp:47
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Please check you have installed the program called in\n"
+"Some problem occured while running the command:\n"
"'%1$s'."
+msgstr "Une erreur s'est produite lors de l'exécution de %1$s."
+
+#: src/VCBackend.cpp:469
+msgid ""
+"Error when commiting to repository.\n"
+"You have to manually resolve the problem.\n"
+"After pressing OK, LyX will reopen the document."
+msgstr ""
+
+#: src/VCBackend.cpp:516
+#, c-format
+msgid ""
+"Error when updating from repository.\n"
+"You have to manually resolve the conflicts NOW!\n"
+"'%1$s'.\n"
+"\n"
+"After pressing OK, LyX will try to reopen resolved document."
msgstr ""
#: src/VSpace.cpp:472
msgstr "À propos de %1"
#: src/frontends/qt4/GuiApplication.cpp:386
-#: src/frontends/qt4/GuiPrefs.cpp:2473
+#: src/frontends/qt4/GuiPrefs.cpp:2497
msgid "Preferences"
msgstr "Préférences"
msgid "Printer"
msgstr "Imprimante"
-#: src/frontends/qt4/GuiPrefs.cpp:1876 src/frontends/qt4/GuiPrefs.cpp:2512
+#: src/frontends/qt4/GuiPrefs.cpp:1876 src/frontends/qt4/GuiPrefs.cpp:2536
msgid "User interface"
msgstr "Interface utilisateur"
msgid "Shortcut"
msgstr "Raccourci"
-#: src/frontends/qt4/GuiPrefs.cpp:2111
+#: src/frontends/qt4/GuiPrefs.cpp:2113
msgid "Cursor, Mouse and Editing functions"
msgstr "Contrôle du curseur, de la souris et de l'édition"
-#: src/frontends/qt4/GuiPrefs.cpp:2115
+#: src/frontends/qt4/GuiPrefs.cpp:2117
msgid "Mathematical Symbols"
msgstr "Symboles mathématiques"
-#: src/frontends/qt4/GuiPrefs.cpp:2119
+#: src/frontends/qt4/GuiPrefs.cpp:2121
msgid "Document and Window"
msgstr "Document et fenêtre"
-#: src/frontends/qt4/GuiPrefs.cpp:2123
+#: src/frontends/qt4/GuiPrefs.cpp:2125
msgid "Font, Layouts and Textclasses"
msgstr "Polices, formats et classes"
-#: src/frontends/qt4/GuiPrefs.cpp:2127
+#: src/frontends/qt4/GuiPrefs.cpp:2129
msgid "System and Miscellaneous"
msgstr "Système et divers"
-#: src/frontends/qt4/GuiPrefs.cpp:2253 src/frontends/qt4/GuiPrefs.cpp:2320
+#: src/frontends/qt4/GuiPrefs.cpp:2255 src/frontends/qt4/GuiPrefs.cpp:2300
msgid "Res&tore"
msgstr "&Restaurer"
-#: src/frontends/qt4/GuiPrefs.cpp:2388 src/frontends/qt4/GuiPrefs.cpp:2395
-#: src/frontends/qt4/GuiPrefs.cpp:2402 src/frontends/qt4/GuiPrefs.cpp:2414
+#: src/frontends/qt4/GuiPrefs.cpp:2401 src/frontends/qt4/GuiPrefs.cpp:2408
+#: src/frontends/qt4/GuiPrefs.cpp:2415 src/frontends/qt4/GuiPrefs.cpp:2432
msgid "Failed to create shortcut"
msgstr "Échec de la création du raccourci"
-#: src/frontends/qt4/GuiPrefs.cpp:2389
+#: src/frontends/qt4/GuiPrefs.cpp:2402
msgid "Unknown or invalid LyX function"
msgstr "Fonction LyX inconnue ou invalide"
-#: src/frontends/qt4/GuiPrefs.cpp:2396
+#: src/frontends/qt4/GuiPrefs.cpp:2409
msgid "Invalid or empty key sequence"
msgstr "Séqunece de touches invalide ou vide"
-#: src/frontends/qt4/GuiPrefs.cpp:2403
+#: src/frontends/qt4/GuiPrefs.cpp:2416
msgid "Shortcut is already defined"
msgstr "Raccourci déjà défini"
-#: src/frontends/qt4/GuiPrefs.cpp:2415
+#: src/frontends/qt4/GuiPrefs.cpp:2433
msgid "Can not insert shortcut to the list"
msgstr "Échec de l'insertion du raccourci à la liste"
-#: src/frontends/qt4/GuiPrefs.cpp:2440
+#: src/frontends/qt4/GuiPrefs.cpp:2464
msgid "Identity"
msgstr "Identité"
-#: src/frontends/qt4/GuiPrefs.cpp:2629
+#: src/frontends/qt4/GuiPrefs.cpp:2653
msgid "Choose bind file"
msgstr "Choisir un fichier de raccourcis"
-#: src/frontends/qt4/GuiPrefs.cpp:2630
+#: src/frontends/qt4/GuiPrefs.cpp:2654
msgid "LyX bind files (*.bind)"
msgstr "Fichiers de raccourcis LyX (*.bind)"
-#: src/frontends/qt4/GuiPrefs.cpp:2636
+#: src/frontends/qt4/GuiPrefs.cpp:2660
msgid "Choose UI file"
msgstr "Choisir un fichier d'interface"
-#: src/frontends/qt4/GuiPrefs.cpp:2637
+#: src/frontends/qt4/GuiPrefs.cpp:2661
msgid "LyX UI files (*.ui)"
msgstr "Fichiers d'interface LyX (*.ui)"
-#: src/frontends/qt4/GuiPrefs.cpp:2643
+#: src/frontends/qt4/GuiPrefs.cpp:2667
msgid "Choose keyboard map"
msgstr "Choisir une réaffectation clavier"
-#: src/frontends/qt4/GuiPrefs.cpp:2644
+#: src/frontends/qt4/GuiPrefs.cpp:2668
msgid "LyX keyboard maps (*.kmap)"
msgstr "Réaffectations clavier LyX (*.kmap)"
-#: src/frontends/qt4/GuiPrefs.cpp:2650
+#: src/frontends/qt4/GuiPrefs.cpp:2674
msgid "Choose personal dictionary"
msgstr "Choisir un dictionnaire personnel"
-#: src/frontends/qt4/GuiPrefs.cpp:2651
+#: src/frontends/qt4/GuiPrefs.cpp:2675
msgid "*.pws"
msgstr "*.pws"
-#: src/frontends/qt4/GuiPrefs.cpp:2651
+#: src/frontends/qt4/GuiPrefs.cpp:2675
msgid "*.ispell"
msgstr "*.ispell"
msgid "References: "
msgstr " Références : "
-#: src/support/Package.cpp:451
+#: src/support/Package.cpp:435
msgid "LyX binary not found"
msgstr "Binaire de LyX introuvable"
-#: src/support/Package.cpp:452
+#: src/support/Package.cpp:436
#, c-format
msgid ""
"Unable to determine the path to the LyX binary from the command line %1$s"
"N'a pas pu déterminer le chemin vers l'exécutable LyX dans la ligne de "
"commande %1$s"
-#: src/support/Package.cpp:571
-#, c-format
+#: src/support/Package.cpp:555
+#, fuzzy, c-format
msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
-"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
+"LYX_DIR_16x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"N'a pas pu déterminer le répertoire système, après avoir cherché\n"
"\t%1$s\n"
"d'environnement LYX_DIR_15x sur le répertoire système LyX qui contient le "
"fichier 'chkconfig.ltx'."
-#: src/support/Package.cpp:652 src/support/Package.cpp:679
+#: src/support/Package.cpp:638 src/support/Package.cpp:665
msgid "File not found"
msgstr "Fichier introuvable"
-#: src/support/Package.cpp:653
+#: src/support/Package.cpp:639
#, c-format
msgid ""
"Invalid %1$s switch.\n"
"Option %1$s non valable.\n"
"Le répertoire %2$s ne contient pas %3$s."
-#: src/support/Package.cpp:680
+#: src/support/Package.cpp:666
#, c-format
msgid ""
"Invalid %1$s environment variable.\n"
"Variable d'environnement %1$s non valable.\n"
"Le répertoire %2$s ne contient pas %3$s."
-#: src/support/Package.cpp:704
+#: src/support/Package.cpp:690
#, c-format
msgid ""
"Invalid %1$s environment variable.\n"
"Variable d'environnement %1$s non valable.\n"
"%2$s n'est pas un répertoire."
-#: src/support/Package.cpp:706
+#: src/support/Package.cpp:692
msgid "Directory not found"
msgstr "Répertoire introuvable"
projects / lyx.git / blobdiff