Changeset 8e0de7ad07fd…
Parent 7af59a5772d2…
by
Changes to 30 files · Browse files at 8e0de7ad07fd Showing diff from parent 7af59a5772d2 Diff from another changeset...
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
|
|
@@ -7,143 +7,80 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-05-26 13:34-0300\n"
-"PO-Revision-Date: 2011-06-03 19:25+0000\n"
+"POT-Creation-Date: 2011-06-29 15:52-0300\n"
+"PO-Revision-Date: 2011-06-28 20:54+0000\n"
"Last-Translator: André Sintzoff <Unknown>\n"
"Language-Team: French <fr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-06-03 19:52+0000\n"
-"X-Generator: Launchpad (build 13144)\n"
+"X-Launchpad-Export-Date: 2011-06-29 20:01+0000\n"
+"X-Generator: Launchpad (build 13299)\n"
"X-Poedit-Country: FRANCE\n"
"X-Poedit-Language: French\n"
-#: TortoiseHgOverlayServer.py:50
+#: TortoiseHgOverlayServer.py:51
msgid "TortoiseHg Overlay Icon Server"
msgstr ""
-#: TortoiseHgOverlayServer.py:161
+#: TortoiseHgOverlayServer.py:162
msgid "Exit"
msgstr "Quitter"
-#: tortoisehg/hgqt/about.py:34 tortoisehg/hgqt/workbench.py:300
-#: tortoisehg/hgtk/gdialog.py:505
+#: tortoisehg/hgqt/about.py:31 tortoisehg/hgtk/gdialog.py:505
msgid "About"
msgstr "À propos"
-#: tortoisehg/hgqt/about.py:59
+#: tortoisehg/hgqt/about.py:56
msgid "Copyright 2008-2011 Steve Borho and others"
msgstr "Copyright 2008-2011 Steve Borho et d'autres"
-#: tortoisehg/hgqt/about.py:64 tortoisehg/hgtk/about.py:42
+#: tortoisehg/hgqt/about.py:61 tortoisehg/hgtk/about.py:42
msgid "Several icons are courtesy of the TortoiseSVN project"
msgstr ""
"Plusieurs icônes sont fournies gracieusement par le projet TortoiseSVN"
-#: tortoisehg/hgqt/about.py:74
+#: tortoisehg/hgqt/about.py:71
msgid "You can visit our site here"
msgstr "Vous pouvez aller voir notre site ici"
-#: tortoisehg/hgqt/about.py:83
+#: tortoisehg/hgqt/about.py:80
msgid "&License"
msgstr "&Licence"
-#: tortoisehg/hgqt/about.py:89 tortoisehg/hgqt/archive.py:108
+#: tortoisehg/hgqt/about.py:86 tortoisehg/hgqt/archive.py:108
#: tortoisehg/hgqt/hgemail_ui.py:273 tortoisehg/hgqt/hginit.py:58
#: tortoisehg/hgqt/license.py:45 tortoisehg/hgqt/postreview_ui.py:179
#: tortoisehg/hgqt/rename.py:103
msgid "&Close"
msgstr "&Fermer"
-#: tortoisehg/hgqt/about.py:109
+#: tortoisehg/hgqt/about.py:106
#, python-format
msgid "version %s"
msgstr "version %s"
-#: tortoisehg/hgqt/about.py:110
+#: tortoisehg/hgqt/about.py:107
#, python-format
msgid "with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
msgstr "avec Mercurial-%s, Python-%s, PyQt-%s, Qt-%s"
-#: tortoisehg/hgqt/about.py:159 tortoisehg/hgtk/about.py:70
+#: tortoisehg/hgqt/about.py:156 tortoisehg/hgtk/about.py:70
msgid "A new version of TortoiseHg is ready for download!"
msgstr "Une nouvelle version de TortoiseHg est disponible."
-#: tortoisehg/hgqt/annotate.py:112
-msgid "Search in original revision"
-msgstr "Rechercher dans la révision originale"
-
-#: tortoisehg/hgqt/annotate.py:114
-msgid "Search in working revision"
-msgstr "Rechercher dans la révision de travail"
-
-#: tortoisehg/hgqt/annotate.py:116
-msgid "Search in current annotation"
-msgstr "Rechercher dans l'annotation actuelle"
-
-#: tortoisehg/hgqt/annotate.py:117
-msgid "Search in history"
-msgstr "Rechercher dans l'historique"
-
-#: tortoisehg/hgqt/annotate.py:128
-msgid "Annotate originating revision"
-msgstr "Annoter la révision d'origine"
-
-#: tortoisehg/hgqt/annotate.py:129
-msgid "View originating revision"
-msgstr "Voir la révision d'origine"
-
-#: tortoisehg/hgqt/annotate.py:141
-#, python-format
-msgid "Annotate parent revision %d"
-msgstr "Annoter la révision parente %d"
-
-#: tortoisehg/hgqt/annotate.py:143
-#, python-format
-msgid "View parent revision %d"
-msgstr "Voir la révision parente %d"
-
-#: tortoisehg/hgqt/annotate.py:181
-msgid "Unable to annotate"
-msgstr "Impossible d'annoter"
-
-#: tortoisehg/hgqt/annotate.py:182
-#, python-format
-msgid "%s is not found in revision %d"
-msgstr "%s ne se trouve pas dans la révision %d"
-
-#: tortoisehg/hgqt/annotate.py:191 tortoisehg/hgqt/annotate.py:197
-#: tortoisehg/hgqt/fileview.py:534 tortoisehg/hgqt/fileview.py:746
-msgid "File or diffs not displayed: "
-msgstr "Le fichier ou les différences ne sont pas affichées : "
-
-#: tortoisehg/hgqt/annotate.py:198 tortoisehg/hgqt/fileview.py:548
-#: tortoisehg/hgqt/fileview.py:747 tortoisehg/hgtk/chunks.py:73
-msgid "File is larger than the specified max size.\n"
-msgstr "Le fichier est plus grand que la limite maximale spécifiée.\n"
-
-#: tortoisehg/hgqt/annotate.py:204 tortoisehg/hgqt/fileview.py:553
-#: tortoisehg/hgtk/chunks.py:85
-msgid "File is binary.\n"
-msgstr "Le fichier est binaire.\n"
-
-#: tortoisehg/hgqt/annotate.py:396
-#, python-format
-msgid "Annotate %s@%d"
-msgstr "Annoter %s@%d"
-
#: tortoisehg/hgqt/archive.py:20 tortoisehg/hgtk/archive.py:18
msgid "= Working Directory Parent ="
msgstr "= Parent du répertoire de travail ="
-#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:50
-#: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106
-#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:579
-#: tortoisehg/hgqt/tag.py:49 tortoisehg/hgtk/bookmark.py:75
-#: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212
-#: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66
+#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/backout.py:366
+#: tortoisehg/hgqt/bookmark.py:50 tortoisehg/hgqt/csinfo.py:105
+#: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/cslist.py:86
+#: tortoisehg/hgqt/merge.py:446 tortoisehg/hgqt/tag.py:49
+#: tortoisehg/hgtk/bookmark.py:75 tortoisehg/hgtk/csinfo.py:211
+#: tortoisehg/hgtk/csinfo.py:212 tortoisehg/hgtk/cslist.py:142
+#: tortoisehg/hgtk/tagadd.py:66
msgid "Revision:"
msgstr "Révision :"
@@ -152,7 +89,7 @@msgstr "Seulement les fichiers modifiés/créés dans cette révision"
#: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:69
-#: tortoisehg/hgqt/sync.py:1410
+#: tortoisehg/hgqt/sync.py:1443
msgid "Recurse into subrepositories"
msgstr "Parcourir les sous-dépôts"
@@ -161,12 +98,13 @@msgid "Destination path:"
msgstr "Chemin de destination :"
-#: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:58
-#: tortoisehg/hgqt/clone.py:69 tortoisehg/hgqt/hginit.py:37
-#: tortoisehg/hgqt/rename.py:68 tortoisehg/hgqt/rename.py:72
-#: tortoisehg/hgqt/thgimport.py:53 tortoisehg/hgtk/archive.py:69
-#: tortoisehg/hgtk/clone.py:70 tortoisehg/hgtk/hginit.py:55
-#: tortoisehg/hgtk/thgconfig.py:394 tortoisehg/hgtk/thgimport.py:63
+#: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:59
+#: tortoisehg/hgqt/clone.py:70 tortoisehg/hgqt/clone.py:138
+#: tortoisehg/hgqt/hginit.py:37 tortoisehg/hgqt/rename.py:68
+#: tortoisehg/hgqt/rename.py:72 tortoisehg/hgqt/thgimport.py:53
+#: tortoisehg/hgtk/archive.py:69 tortoisehg/hgtk/clone.py:70
+#: tortoisehg/hgtk/hginit.py:55 tortoisehg/hgtk/thgconfig.py:394
+#: tortoisehg/hgtk/thgimport.py:63
msgid "Browse..."
msgstr "Parcourir..."
@@ -199,8 +137,8 @@msgid "Zip archive compressed using deflate"
msgstr "Archive zip compressée utilisant deflate"
-#: tortoisehg/hgqt/archive.py:84 tortoisehg/hgqt/hginit.py:67
-#: tortoisehg/hgqt/rename.py:82
+#: tortoisehg/hgqt/archive.py:84 tortoisehg/hgqt/clone.py:157
+#: tortoisehg/hgqt/hginit.py:67 tortoisehg/hgqt/rename.py:82
msgid "Hg command:"
msgstr "Commande de Hg :"
@@ -216,18 +154,17 @@msgid "&Detail"
msgstr "&Détail"
-#: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/commit.py:513
-#: tortoisehg/hgqt/commit.py:521 tortoisehg/hgqt/commit.py:548
-#: tortoisehg/hgqt/commit.py:561 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:174
-#: tortoisehg/hgqt/merge.py:368 tortoisehg/hgqt/merge.py:402
-#: tortoisehg/hgqt/merge.py:466 tortoisehg/hgqt/rebase.py:231
-#: tortoisehg/hgqt/rebase.py:252 tortoisehg/hgqt/rename.py:108
-#: tortoisehg/hgqt/repotreeitem.py:292 tortoisehg/hgqt/resolve.py:356
-#: tortoisehg/hgqt/settings.py:673 tortoisehg/hgqt/settings.py:771
-#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgqt/wctxactions.py:247
-#: tortoisehg/hgqt/wctxactions.py:302 tortoisehg/hgtk/shellconf.py:28
-#: tortoisehg/hgtk/thgshelve.py:163
+#: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/backout.py:248
+#: tortoisehg/hgqt/commit.py:496 tortoisehg/hgqt/commit.py:504
+#: tortoisehg/hgqt/commit.py:833 tortoisehg/hgqt/commit.py:846
+#: tortoisehg/hgqt/compress.py:150 tortoisehg/hgqt/merge.py:100
+#: tortoisehg/hgqt/merge.py:235 tortoisehg/hgqt/merge.py:311
+#: tortoisehg/hgqt/rebase.py:231 tortoisehg/hgqt/rebase.py:252
+#: tortoisehg/hgqt/rename.py:108 tortoisehg/hgqt/reporegistry.py:604
+#: tortoisehg/hgqt/resolve.py:356 tortoisehg/hgqt/settings.py:768
+#: tortoisehg/hgqt/settings.py:881 tortoisehg/hgqt/wctxactions.py:229
+#: tortoisehg/hgqt/wctxactions.py:242 tortoisehg/hgqt/wctxactions.py:297
+#: tortoisehg/hgtk/shellconf.py:28 tortoisehg/hgtk/thgshelve.py:163
msgid "Cancel"
msgstr "Annuler"
@@ -305,82 +242,193 @@msgid "The destination \"%s\" already exists as a folder!"
msgstr "\"%s\" existe déjà comme répertoire destination."
-#: tortoisehg/hgqt/backout.py:35
-msgid "Target changeset"
-msgstr "Révision cible"
-
-#: tortoisehg/hgqt/backout.py:43 tortoisehg/hgtk/backout.py:52
-msgid "Backout commit message"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:47 tortoisehg/hgtk/backout.py:41
+#: tortoisehg/hgqt/backout.py:28
+#, python-format
+msgid "Backout - %s"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:98
+msgid "Prepare to backout"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:99
+msgid "Verify backout revision and ensure your working directory is clean."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:108 tortoisehg/hgqt/backout.py:120
+msgid "Unable to backout"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:109
+msgid "Backout revision not found"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:113
+msgid "Backing out a parent revision is a single step operation"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:121
+msgid "Cannot backout change on a different branch"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:127
+msgid "Backout revision"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:137
+msgid "Not a head, backout will create a new head!"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:143
+msgid "Current local revision"
+msgstr "Révision locale actuelle"
+
+#: tortoisehg/hgqt/backout.py:150 tortoisehg/hgqt/merge.py:154
+msgid "Working directory status"
+msgstr "État du répertoire du travail"
+
+#: tortoisehg/hgqt/backout.py:158 tortoisehg/hgqt/compress.py:69
+#: tortoisehg/hgqt/merge.py:162 tortoisehg/hgqt/rebase.py:110
+msgid "Checking..."
+msgstr "Vérification en cours..."
+
+#: tortoisehg/hgqt/backout.py:166
+msgid ""
+"Before backout, you must <a href=\"commit\"><b>commit</b></a>, <a "
+"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
+"href=\"discard\"><b>discard</b></a> changes."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:177 tortoisehg/hgqt/merge.py:215
+#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:987
+#: tortoisehg/hgqt/update.py:97
+msgid "Automatically resolve merge conflicts where possible"
+msgstr ""
+"Résoudre automatiquement les conflits de fusion dans la mesure du possible"
+
+#: tortoisehg/hgqt/backout.py:223 tortoisehg/hgqt/merge.py:285
+msgid "<b>Uncommitted local changes are detected</b>"
+msgstr "<b>Changements locaux non commités détectés</b>"
+
+#: tortoisehg/hgqt/backout.py:227 tortoisehg/hgtk/recovery.py:52
+msgid "Clean"
+msgstr "Nettoyer"
+
+#: tortoisehg/hgqt/backout.py:247 tortoisehg/hgqt/compress.py:149
+#: tortoisehg/hgqt/merge.py:234 tortoisehg/hgqt/merge.py:310
+#: tortoisehg/hgqt/rebase.py:230 tortoisehg/hgqt/settings.py:881
+#: tortoisehg/hgqt/update.py:248 tortoisehg/hgtk/thgconfig.py:775
+#: tortoisehg/hgtk/update.py:233
+msgid "&Discard"
+msgstr "Abandonner"
+
+#: tortoisehg/hgqt/backout.py:249 tortoisehg/hgqt/compress.py:151
+#: tortoisehg/hgqt/merge.py:312 tortoisehg/hgqt/rebase.py:232
+msgid "Confirm Discard"
+msgstr "Confirmer l'abandon"
+
+#: tortoisehg/hgqt/backout.py:250 tortoisehg/hgqt/compress.py:152
+#: tortoisehg/hgqt/merge.py:313 tortoisehg/hgqt/rebase.py:233
+msgid "Discard outstanding changes to working directory?"
+msgstr ""
+"Abandonner les changements en suspens dans le répertoire de travail ?"
+
+#: tortoisehg/hgqt/backout.py:275
+msgid "Backing out, then merging..."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:276 tortoisehg/hgqt/merge.py:341
+msgid "All conflicting files will be marked unresolved."
+msgstr "Tous les fichiers en conflit seront marqués non résolus."
+
+#: tortoisehg/hgqt/backout.py:289
+msgid ""
+"Automatically advance to next page when backout and merge are complete."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:318 tortoisehg/hgqt/merge.py:394
+#, python-format
+msgid ""
+"%d files have <b>merge conflicts</b> that must be <a "
+"href=\"resolve\"><b>resolved</b></a>"
+msgstr ""
+"%d fichiers ont des <b>conflits de fusion</b> qui doivent être <a "
+"href=\"resolve\"><b>résolus</b></a>"
+
+#: tortoisehg/hgqt/backout.py:323 tortoisehg/hgqt/merge.py:404
+msgid "No merge conflicts, ready to commit"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:358
+msgid "Commit backout and merge results"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:368 tortoisehg/hgqt/merge.py:448
+#: tortoisehg/hgtk/commit.py:236 tortoisehg/hgtk/history.py:66
+#: tortoisehg/hgtk/history.py:481 tortoisehg/hgtk/history.py:1223
+msgid "Parents"
+msgstr "Parents"
+
+#: tortoisehg/hgqt/backout.py:372 tortoisehg/hgqt/merge.py:452
+#: tortoisehg/hgqt/repomodel.py:586 tortoisehg/hgqt/repomodel.py:588
+#: tortoisehg/hgqt/shelve.py:24 tortoisehg/hgqt/thgimport.py:87
+msgid "Working Directory"
+msgstr "Répertoire de travail"
+
+#: tortoisehg/hgqt/backout.py:412 tortoisehg/hgqt/merge.py:489
+msgid "Working Directory (merged)"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:420 tortoisehg/hgqt/merge.py:497
+msgid "Commit message"
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:444 tortoisehg/hgqt/merge.py:521
+msgid "Skip final confirmation page, close after commit."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:453 tortoisehg/hgqt/backout.py:482
+#: tortoisehg/hgtk/backout.py:41
msgid "Backed out changeset: "
msgstr "Backout sur la révision : "
-#: tortoisehg/hgqt/backout.py:59 tortoisehg/hgqt/clone.py:95
-#: tortoisehg/hgqt/commit.py:221 tortoisehg/hgqt/merge.py:318
-#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:170
-#: tortoisehg/hgqt/rebase.py:57 tortoisehg/hgqt/sync.py:137
-#: tortoisehg/hgqt/tag.py:64 tortoisehg/hgtk/hgemail.py:64
-msgid "Options"
-msgstr "Options"
-
-#: tortoisehg/hgqt/backout.py:66 tortoisehg/hgtk/backout.py:82
+#: tortoisehg/hgqt/backout.py:456 tortoisehg/hgqt/commit.py:715
+#: tortoisehg/hgqt/mq.py:824 tortoisehg/hgtk/backout.py:139
+#: tortoisehg/hgtk/commit.py:580
+msgid "Confirm Discard Message"
+msgstr "Confirmer le message d'abandon"
+
+#: tortoisehg/hgqt/backout.py:457 tortoisehg/hgtk/backout.py:140
+msgid "Discard current backout message?"
+msgstr "Abandonner le message de backout actuel ?"
+
+#: tortoisehg/hgqt/backout.py:466 tortoisehg/hgtk/backout.py:82
msgid "Use English backout message"
msgstr "Utiliser le message de backout en anglais"
-#: tortoisehg/hgqt/backout.py:72 tortoisehg/hgtk/backout.py:90
-msgid "Commit backout before merging with current working parent"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:79 tortoisehg/hgqt/merge.py:335
-#: tortoisehg/hgqt/rebase.py:73 tortoisehg/hgqt/sync.py:959
-#: tortoisehg/hgqt/update.py:97
-msgid "Automatically resolve merge conflicts where possible"
-msgstr ""
-"Résoudre automatiquement les conflits de fusion dans la mesure du possible"
-
-#: tortoisehg/hgqt/backout.py:111
-msgid "&Backout"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:114 tortoisehg/hgqt/clone.py:159
-#: tortoisehg/hgqt/cmdui.py:752 tortoisehg/hgqt/thgimport.py:117
-#: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:138
-msgid "Detail"
-msgstr "Détail"
-
-#: tortoisehg/hgqt/backout.py:126
-#, python-format
-msgid "Backout '%s' - %s"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:145 tortoisehg/hgqt/commit.py:405
-#: tortoisehg/hgqt/mq.py:470 tortoisehg/hgtk/backout.py:139
-#: tortoisehg/hgtk/commit.py:581
-msgid "Confirm Discard Message"
-msgstr "Confirmer le message d'abandon"
-
-#: tortoisehg/hgqt/backout.py:146 tortoisehg/hgtk/backout.py:140
-msgid "Discard current backout message?"
-msgstr "Abandonner le message de backout actuel ?"
-
-#: tortoisehg/hgqt/backout.py:234 tortoisehg/hgqt/commit.py:907
-#: tortoisehg/hgqt/compress.py:122 tortoisehg/hgqt/repowidget.py:233
-msgctxt "action button"
-msgid "Commit"
-msgstr "Commit"
-
-#: tortoisehg/hgqt/backout.py:250
-msgid ""
-"Backout generated merge <b>conflicts</b> that must be <a "
-"href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
-
-#: tortoisehg/hgqt/backout.py:256
-msgid ""
-"You may commit the backed out changes after <a "
-"href=\"status\"><b>verifying</b></a> them"
+#: tortoisehg/hgqt/backout.py:511
+msgid "Backing out and committing..."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:512
+msgid "Please wait while making backout."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:518 tortoisehg/hgqt/merge.py:572
+msgid "Committing..."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:519 tortoisehg/hgqt/merge.py:573
+msgid "Please wait while committing merged files."
+msgstr ""
+
+#: tortoisehg/hgqt/backout.py:544 tortoisehg/hgqt/cmdui.py:307
+#: tortoisehg/hgqt/merge.py:601 tortoisehg/hgtk/p4pending.py:101
+msgid "Finished"
+msgstr "Fini"
+
+#: tortoisehg/hgqt/backout.py:548
+msgid "Backout changeset"
msgstr ""
#: tortoisehg/hgqt/bisect.py:22
@@ -393,7 +441,7 @@msgstr "Révision connue comme bonne :"
#: tortoisehg/hgqt/bisect.py:38 tortoisehg/hgqt/bisect.py:48
-#: tortoisehg/hgqt/repowidget.py:102 tortoisehg/hgtk/history.py:1875
+#: tortoisehg/hgqt/repowidget.py:365 tortoisehg/hgtk/history.py:1875
msgid "Accept"
msgstr "Accepter"
@@ -437,10 +485,10 @@"Tester cette révision et indiquer le résultat (bonne/mauvaise/sauter)."
#: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
-#: tortoisehg/hgqt/commit.py:578 tortoisehg/hgqt/commit.py:835
-#: tortoisehg/hgqt/commit.py:855 tortoisehg/hgqt/hgignore.py:245
-#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:400
-#: tortoisehg/hgqt/wctxactions.py:121
+#: tortoisehg/hgqt/commit.py:863 tortoisehg/hgqt/commit.py:1129
+#: tortoisehg/hgqt/commit.py:1149 tortoisehg/hgqt/hgignore.py:254
+#: tortoisehg/hgqt/hginit.py:179 tortoisehg/hgqt/status.py:445
+#: tortoisehg/hgqt/wctxactions.py:169
#, python-format
msgid "%s (hint: %s)"
msgstr "%s (indice : %s)"
@@ -453,9 +501,9 @@msgid "New Name:"
msgstr "Nouveau nom :"
-#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:548
-#: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:53
-#: tortoisehg/hgqt/wctxactions.py:59
+#: tortoisehg/hgqt/bookmark.py:67 tortoisehg/hgqt/commit.py:833
+#: tortoisehg/hgqt/tag.py:98 tortoisehg/hgqt/wctxactions.py:48
+#: tortoisehg/hgqt/wctxactions.py:54
msgid "&Add"
msgstr "&Ajouter"
@@ -463,7 +511,7 @@msgid "Re&name"
msgstr "Re&nommer"
-#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:561
+#: tortoisehg/hgqt/bookmark.py:69 tortoisehg/hgqt/commit.py:846
#: tortoisehg/hgqt/tag.py:99
msgid "&Remove"
msgstr "Enleve&r"
@@ -518,19 +566,19 @@msgid "%s - branch operation"
msgstr "%s - opération de branche"
-#: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:48
+#: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:47
msgid "Select branch of merge commit"
msgstr "Sélectionner la branche du commit de fusion"
-#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:77
+#: tortoisehg/hgqt/branchop.py:41 tortoisehg/hgtk/commit.py:76
msgid "Changes take effect on next commit"
msgstr "Les changements prendront effet au prochain commit"
-#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:60
+#: tortoisehg/hgqt/branchop.py:46 tortoisehg/hgtk/commit.py:59
msgid "No branch changes"
msgstr "Aucun changement de branche"
-#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:62
+#: tortoisehg/hgqt/branchop.py:47 tortoisehg/hgtk/commit.py:61
msgid "Open a new named branch"
msgstr "Ouvrir une nouvelle branche nommée"
@@ -570,7 +618,7 @@msgstr "Erreur lors de l'écriture du fichier"
#: tortoisehg/hgqt/bugreport.py:123 tortoisehg/hgqt/qqueue.py:342
-#: tortoisehg/hgqt/qreorder.py:225
+#: tortoisehg/hgqt/qreorder.py:228
msgid "TortoiseHg Error"
msgstr "Erreur de TortoiseHg"
@@ -582,158 +630,216 @@"Si vous avez toujours des problèmes, <a href=\"#bugreport\">veuillez remplir "
"un rapport d'erreur</a>."
-#: tortoisehg/hgqt/chunks.py:123
+#: tortoisehg/hgqt/chunks.py:89 tortoisehg/hgqt/grep.py:547
+#: tortoisehg/hgqt/manifestdialog.py:195 tortoisehg/hgqt/revdetails.py:229
+#: tortoisehg/util/menuthg.py:76
+msgid "Visual Diff"
+msgstr "Diff visuel"
+
+#: tortoisehg/hgqt/chunks.py:90 tortoisehg/hgqt/manifestdialog.py:196
+#: tortoisehg/hgqt/revdetails.py:230
+msgid "View file changes in external diff tool"
+msgstr "Voir les changements du fichier dans un outil de diff externe"
+
+#: tortoisehg/hgqt/chunks.py:91 tortoisehg/hgqt/manifestdialog.py:202
+#: tortoisehg/hgqt/revdetails.py:238
+msgid "Edit Local"
+msgstr "Éditer la version locale"
+
+#: tortoisehg/hgqt/chunks.py:92 tortoisehg/hgqt/manifestdialog.py:203
+#: tortoisehg/hgqt/revdetails.py:239
+msgid "Edit current file in working copy"
+msgstr "Éditer le fichier actuel dans le répertoire de travail"
+
+#: tortoisehg/hgqt/chunks.py:93 tortoisehg/hgqt/manifestdialog.py:204
+#: tortoisehg/hgqt/revdetails.py:240
+msgid "Revert to Revision"
+msgstr "Revenir à la révision"
+
+#: tortoisehg/hgqt/chunks.py:94 tortoisehg/hgqt/manifestdialog.py:205
+#: tortoisehg/hgqt/revdetails.py:241
+msgid "Revert file(s) to contents at this revision"
+msgstr "Ramener le(s) fichier(s) au contenu de cette révision"
+
+#: tortoisehg/hgqt/chunks.py:190
msgid "Patch failed to apply"
msgstr "L'application du patch a échoué"
-#: tortoisehg/hgqt/chunks.py:130 tortoisehg/hgqt/mq.py:268
+#: tortoisehg/hgqt/chunks.py:196 tortoisehg/hgqt/mq.py:247
+#: tortoisehg/hgqt/mq.py:752
msgid "Manually resolve rejected chunks?"
msgstr "Résoudre manuellement les morceaux rejetés ?"
-#: tortoisehg/hgqt/chunks.py:132
+#: tortoisehg/hgqt/chunks.py:198
msgid "Edit patched file and rejects?"
msgstr "Éditer le fichier patché et les rejets ?"
-#: tortoisehg/hgqt/chunks.py:166
+#: tortoisehg/hgqt/chunks.py:232
msgid "No deletable chunks"
msgstr "Aucun morceau supprimable"
-#: tortoisehg/hgqt/chunks.py:170
+#: tortoisehg/hgqt/chunks.py:236
msgid "No chunks remain"
msgstr "Aucun morceau restant"
-#: tortoisehg/hgqt/chunks.py:171
+#: tortoisehg/hgqt/chunks.py:237
msgid "Remove all file changes?"
msgstr "Enlever tous les changement du fichier ?"
-#: tortoisehg/hgqt/chunks.py:204
+#: tortoisehg/hgqt/chunks.py:270
msgid "file has been deleted, refresh"
msgstr "le fichier a été supprimé, actualiser"
-#: tortoisehg/hgqt/chunks.py:207
+#: tortoisehg/hgqt/chunks.py:273
msgid "file has been modified, refresh"
msgstr "le fichier a été modifié, actualiser"
-#: tortoisehg/hgqt/chunks.py:241
+#: tortoisehg/hgqt/chunks.py:307
msgid "Unable to merge chunks"
msgstr "Impossible de fusionner les morceaux"
-#: tortoisehg/hgqt/chunks.py:242
+#: tortoisehg/hgqt/chunks.py:308
msgid "Add or remove patches must be merged in the working directory"
msgstr ""
"Les patches d'ajout ou de suppression doivent être fusionnés dans le "
"répertoire de travail"
-#: tortoisehg/hgqt/chunks.py:451 tortoisehg/hgqt/status.py:139
+#: tortoisehg/hgqt/chunks.py:521
msgctxt "files"
msgid "All"
msgstr "Tous"
-#: tortoisehg/hgqt/chunks.py:455 tortoisehg/hgqt/status.py:143
+#: tortoisehg/hgqt/chunks.py:525
msgctxt "files"
msgid "None"
msgstr "Aucun"
-#: tortoisehg/hgqt/chunks.py:511
+#: tortoisehg/hgqt/chunks.py:581
#, python-format
msgid "Chunks selected: %d / %d"
msgstr "Morceaux sélectionnés : %d / %d"
-#: tortoisehg/hgqt/clone.py:61 tortoisehg/hgqt/rename.py:64
+#: tortoisehg/hgqt/clone.py:62 tortoisehg/hgqt/rename.py:64
#: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82
msgid "Source:"
msgstr "Source :"
-#: tortoisehg/hgqt/clone.py:72 tortoisehg/hgqt/rename.py:69
+#: tortoisehg/hgqt/clone.py:73 tortoisehg/hgqt/rename.py:69
#: tortoisehg/hgtk/hginit.py:58
msgid "Destination:"
msgstr "Destination :"
-#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:127
+#: tortoisehg/hgqt/clone.py:96 tortoisehg/hgqt/commit.py:233
+#: tortoisehg/hgqt/merge.py:202 tortoisehg/hgqt/mq.py:624
+#: tortoisehg/hgqt/postreview_ui.py:170 tortoisehg/hgqt/rebase.py:57
+#: tortoisehg/hgqt/sync.py:145 tortoisehg/hgqt/tag.py:64
+#: tortoisehg/hgtk/hgemail.py:64
+msgid "Options"
+msgstr "Options"
+
+#: tortoisehg/hgqt/clone.py:127 tortoisehg/hgtk/clone.py:127
msgid "Clone to revision:"
msgstr "Cloner jusqu'à la révision :"
-#: tortoisehg/hgqt/clone.py:120 tortoisehg/hgtk/clone.py:141
+#: tortoisehg/hgqt/clone.py:130 tortoisehg/hgtk/clone.py:141
msgid "Do not update the new working directory"
msgstr "Ne pas mettre à jour le nouveau répertoire de travail"
-#: tortoisehg/hgqt/clone.py:121 tortoisehg/hgtk/clone.py:142
+#: tortoisehg/hgqt/clone.py:131 tortoisehg/hgtk/clone.py:142
msgid "Use pull protocol to copy metadata"
msgstr "Utiliser le protocole 'pull' pour copier les métadonnées"
-#: tortoisehg/hgqt/clone.py:122 tortoisehg/hgtk/clone.py:143
+#: tortoisehg/hgqt/clone.py:132 tortoisehg/hgtk/clone.py:143
msgid "Use uncompressed transfer"
msgstr "Utiliser le transfert non compressé"
-#: tortoisehg/hgqt/clone.py:123
+#: tortoisehg/hgqt/clone.py:138
msgid "Include patch queue"
msgstr "Inclure la queue de patches"
-#: tortoisehg/hgqt/clone.py:129 tortoisehg/hgtk/clone.py:149
+#: tortoisehg/hgqt/clone.py:141 tortoisehg/hgtk/clone.py:149
#: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
msgid "Use proxy server"
msgstr "Utiliser un serveur proxy"
-#: tortoisehg/hgqt/clone.py:135 tortoisehg/hgqt/sync.py:1426
+#: tortoisehg/hgqt/clone.py:147
+msgid "Do not verify host certificate"
+msgstr ""
+
+#: tortoisehg/hgqt/clone.py:151 tortoisehg/hgqt/sync.py:1459
#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
msgid "Remote command:"
msgstr "Commande distante :"
-#: tortoisehg/hgqt/clone.py:138
+#: tortoisehg/hgqt/clone.py:154
msgid "Start revision:"
msgstr "Révision de début :"
-#: tortoisehg/hgqt/clone.py:156
+#: tortoisehg/hgqt/clone.py:180
msgid "&Clone"
msgstr "&Cloner"
-#: tortoisehg/hgqt/clone.py:169
+#: tortoisehg/hgqt/clone.py:183 tortoisehg/hgqt/cmdui.py:752
+#: tortoisehg/hgqt/thgimport.py:117 tortoisehg/hgqt/thgstrip.py:113
+#: tortoisehg/hgqt/update.py:138
+msgid "Detail"
+msgstr "Détail"
+
+#: tortoisehg/hgqt/clone.py:193
#, python-format
msgid "Clone - %s"
msgstr "Clonage - %s"
-#: tortoisehg/hgqt/clone.py:229 tortoisehg/hgqt/clone.py:257
-#: tortoisehg/hgqt/clone.py:264 tortoisehg/hgqt/clone.py:314
+#: tortoisehg/hgqt/clone.py:320 tortoisehg/hgqt/clone.py:344
+#: tortoisehg/hgqt/clone.py:351 tortoisehg/hgqt/clone.py:376
#: tortoisehg/hgtk/clone.py:37
msgid "TortoiseHg Clone"
msgstr "Clonage TortoiseHg"
-#: tortoisehg/hgqt/clone.py:230
+#: tortoisehg/hgqt/clone.py:321
msgid "Error creating destination folder"
msgstr "Erreur à la création du répertoire destination"
-#: tortoisehg/hgqt/clone.py:231
+#: tortoisehg/hgqt/clone.py:322
msgid "Please specify a different path."
msgstr "Veuillez préciser un chemin différent."
-#: tortoisehg/hgqt/clone.py:258 tortoisehg/hgtk/clone.py:288
+#: tortoisehg/hgqt/clone.py:345 tortoisehg/hgtk/clone.py:288
msgid "Source path is empty"
msgstr "Le chemin source est vide"
-#: tortoisehg/hgqt/clone.py:259
+#: tortoisehg/hgqt/clone.py:346
msgid "Please enter a valid source path."
msgstr "Veuillez préciser un chemin source valide."
-#: tortoisehg/hgqt/clone.py:265 tortoisehg/hgtk/clone.py:294
+#: tortoisehg/hgqt/clone.py:352 tortoisehg/hgtk/clone.py:294
msgid "Source and destination are the same"
msgstr "Source et destination sont les mêmes"
-#: tortoisehg/hgqt/clone.py:266
+#: tortoisehg/hgqt/clone.py:353
msgid "Please specify different paths."
msgstr "Veuillez préciser des chemins différents."
-#: tortoisehg/hgqt/clone.py:315
+#: tortoisehg/hgqt/clone.py:377
msgid "Please enter a new destination path."
msgstr "Veuillez préciser un nouveau chemin destination."
-#: tortoisehg/hgqt/clone.py:335
+#: tortoisehg/hgqt/clone.py:400
msgid "Select source repository"
msgstr "Sélectionner un dépôt d'origine"
-#: tortoisehg/hgqt/clone.py:344
+#: tortoisehg/hgqt/clone.py:410
msgid "Select destination repository"
msgstr "Sélectionner un dépôt de destination"
+#: tortoisehg/hgqt/clone.py:420
+msgid "Select patch folder"
+msgstr "Sélectionner le répertoire de patch"
+
+#: tortoisehg/hgqt/clone.py:428
+msgid "The selected patch folder is not under the source repository."
+msgstr "Le répertoire de patch sélectionné n'est pas dans le dépôt source."
+
#: tortoisehg/hgqt/cmdui.py:227 tortoisehg/hgqt/thread.py:369
#, python-format
msgid "[command returned code %d %%s]"
@@ -764,11 +870,6 @@msgid "Terminated"
msgstr "Terminé"
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:762
-#: tortoisehg/hgtk/p4pending.py:101
-msgid "Finished"
-msgstr "Fini"
-
#: tortoisehg/hgqt/cmdui.py:533
msgid "failed to run command\n"
msgstr "impossible d'exécuter la commande\n"
@@ -791,9 +892,9 @@msgid "TortoiseHg Command Dialog"
msgstr "Dialogue de commande TortoiseHg"
-#: tortoisehg/hgqt/cmdui.py:781 tortoisehg/hgqt/merge.py:65
+#: tortoisehg/hgqt/cmdui.py:781 tortoisehg/hgqt/merge.py:101
#: tortoisehg/hgqt/rebase.py:253 tortoisehg/hgqt/resolve.py:357
-#: tortoisehg/hgqt/settings.py:670 tortoisehg/hgtk/commit.py:323
+#: tortoisehg/hgqt/settings.py:765 tortoisehg/hgtk/commit.py:322
#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
msgid "Confirm Exit"
msgstr "Confirmer la fermeture"
@@ -810,40 +911,50 @@msgid "TortoiseHg"
msgstr "TortoiseHg"
-#: tortoisehg/hgqt/commit.py:81
+#: tortoisehg/hgqt/commit.py:82
msgid "Paste &Filenames"
msgstr "Coller les noms de &fichiers"
-#: tortoisehg/hgqt/commit.py:83
+#: tortoisehg/hgqt/commit.py:84
msgid "App&ly Format"
msgstr "App&liquer le format"
-#: tortoisehg/hgqt/commit.py:84
+#: tortoisehg/hgqt/commit.py:85
msgid "C&onfigure Format"
msgstr "C&onfigurer le format"
-#: tortoisehg/hgqt/commit.py:179
+#: tortoisehg/hgqt/commit.py:196
msgctxt "window title"
msgid "Commit"
msgstr "Commit"
-#: tortoisehg/hgqt/commit.py:207
+#: tortoisehg/hgqt/commit.py:216
msgid "Commit Dialog Toolbar"
msgstr "Barre d'outils du dialogue de commit"
-#: tortoisehg/hgqt/commit.py:211
+#: tortoisehg/hgqt/commit.py:219 tortoisehg/hgqt/commit.py:633
+msgid "Branch: "
+msgstr "Branche : "
+
+#: tortoisehg/hgqt/commit.py:227
msgid "Copy message"
msgstr "Copier un message"
-#: tortoisehg/hgqt/commit.py:213
+#: tortoisehg/hgqt/commit.py:229
msgid "Copy one of the recent commit messages"
msgstr "Copier un des messages récents de commit"
-#: tortoisehg/hgqt/commit.py:217 tortoisehg/hgqt/commit.py:341
-msgid "Branch: "
-msgstr "Branche : "
-
-#: tortoisehg/hgqt/commit.py:223 tortoisehg/hgqt/grep.py:54
+#: tortoisehg/hgqt/commit.py:243 tortoisehg/hgqt/commit.py:581
+#: tortoisehg/hgqt/settings.py:240
+msgid "Issue Tracker"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:244
+#, python-format
+msgid "Failed to load issue tracker '%s': %s"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:254 tortoisehg/hgqt/grep.py:54
#: tortoisehg/hgqt/serve_ui.py:87 tortoisehg/hgtk/datamine.py:54
#: tortoisehg/hgtk/hgcmd.py:46 tortoisehg/hgtk/history.py:448
#: tortoisehg/hgtk/recovery.py:48 tortoisehg/hgtk/serve.py:65
@@ -851,174 +962,220 @@msgid "Stop"
msgstr "Arrêter"
-#: tortoisehg/hgqt/commit.py:343
+#: tortoisehg/hgqt/commit.py:356
+msgid "Commit changes"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:356 tortoisehg/hgtk/commit.py:653
+#: tortoisehg/hgtk/commit.py:950 tortoisehg/hgtk/commit.py:1014
+#: tortoisehg/hgtk/commit.py:1263 tortoisehg/hgtk/gdialog.py:485
+#: tortoisehg/hgtk/history.py:279 tortoisehg/hgtk/merge.py:136
+#: tortoisehg/hgtk/thgconfig.py:89
+msgid "Commit"
+msgstr "Valider"
+
+#: tortoisehg/hgqt/commit.py:357
+msgid "Create a new patch"
+msgstr "Créer un nouveau patch"
+
+#: tortoisehg/hgqt/commit.py:357 tortoisehg/hgqt/mq.py:977
+#: tortoisehg/hgtk/commit.py:657
+msgid "QNew"
+msgstr "QNew"
+
+#: tortoisehg/hgqt/commit.py:358
+msgid "Refresh current patch"
+msgstr "Rafraîchier le patch actuel"
+
+#: tortoisehg/hgqt/commit.py:358 tortoisehg/hgqt/mq.py:607
+#: tortoisehg/hgqt/mq.py:986 tortoisehg/hgtk/commit.py:660
+msgid "QRefresh"
+msgstr "QRefresh"
+
+#: tortoisehg/hgqt/commit.py:489 tortoisehg/hgtk/commit.py:1185
+msgid "Confirm Branch Change"
+msgstr "Confirmer le changement de branche"
+
+#: tortoisehg/hgqt/commit.py:490
+#, python-format
+msgid "Named branch \"%s\" already exists, last used in revision %d\n"
+msgstr ""
+"La branche nommée \"%s\" existe déjà, dernière utilisation à la révision %d\n"
+
+#: tortoisehg/hgqt/commit.py:494
+msgid "Restart &Branch"
+msgstr "Redémarrer la &branche"
+
+#: tortoisehg/hgqt/commit.py:495 tortoisehg/hgqt/commit.py:503
+msgid "&Commit to current branch"
+msgstr "Committer dans la branche actuelle"
+
+#: tortoisehg/hgqt/commit.py:498 tortoisehg/hgtk/commit.py:1194
+msgid "Confirm New Branch"
+msgstr "Confirmer la création de nouvelle branche"
+
+#: tortoisehg/hgqt/commit.py:499
+#, python-format
+msgid "Create new named branch \"%s\" with this commit?\n"
+msgstr "Créer une nouvelle branche \"%s\" avec ce commit ?\n"
+
+#: tortoisehg/hgqt/commit.py:502
+msgid "Create &Branch"
+msgstr "Créer une &branche"
+
+#: tortoisehg/hgqt/commit.py:533
+msgctxt "start progress"
+msgid "MQ Action"
+msgstr "Action MQ"
+
+#: tortoisehg/hgqt/commit.py:635
msgid "Close Branch: "
msgstr "Fermer la branche : "
-#: tortoisehg/hgqt/commit.py:345
+#: tortoisehg/hgqt/commit.py:637
msgid "New Branch: "
msgstr "Nouvelle branche : "
-#: tortoisehg/hgqt/commit.py:367
+#: tortoisehg/hgqt/commit.py:649 tortoisehg/hgqt/revpanel.py:24
+#: tortoisehg/hgqt/update.py:82 tortoisehg/hgtk/changeset.py:581
+#: tortoisehg/hgtk/update.py:90
+msgid "Parent:"
+msgstr "Parent :"
+
+#: tortoisehg/hgqt/commit.py:650
+msgid "Patch name:"
+msgstr "Nom du patch :"
+
+#: tortoisehg/hgqt/commit.py:677
#, python-format
msgid "Rollback commit to revision %d"
msgstr "Défaire le commit et revenir à la révision %d"
-#: tortoisehg/hgqt/commit.py:376
+#: tortoisehg/hgqt/commit.py:686
msgid "Confirm Undo"
msgstr "Confirmer l'annulation"
-#: tortoisehg/hgqt/commit.py:406 tortoisehg/hgqt/mq.py:471
-#: tortoisehg/hgtk/commit.py:582
+#: tortoisehg/hgqt/commit.py:716 tortoisehg/hgqt/mq.py:825
+#: tortoisehg/hgtk/commit.py:581
msgid "Discard current commit message?"
msgstr "Abandonner le message de commit actuel ?"
-#: tortoisehg/hgqt/commit.py:484 tortoisehg/hgtk/commit.py:935
-#: tortoisehg/hgtk/commit.py:1079 tortoisehg/hgtk/commit.py:1098
+#: tortoisehg/hgqt/commit.py:794 tortoisehg/hgtk/commit.py:934
+#: tortoisehg/hgtk/commit.py:1078 tortoisehg/hgtk/commit.py:1097
msgid "Nothing Commited"
msgstr "Rien n'a été committé."
-#: tortoisehg/hgqt/commit.py:485 tortoisehg/hgtk/commit.py:1080
+#: tortoisehg/hgqt/commit.py:795 tortoisehg/hgtk/commit.py:1079
#: tortoisehg/hgtk/tagadd.py:225
msgid "Please enter commit message"
msgstr "Veuillez entrer un message de commit"
-#: tortoisehg/hgqt/commit.py:506 tortoisehg/hgtk/commit.py:1186
-msgid "Confirm Branch Change"
-msgstr "Confirmer le changement de branche"
-
-#: tortoisehg/hgqt/commit.py:507
-#, python-format
-msgid "Named branch \"%s\" already exists, last used in revision %d\n"
-msgstr ""
-"La branche nommée \"%s\" existe déjà, dernière utilisation à la révision %d\n"
-
-#: tortoisehg/hgqt/commit.py:511
-msgid "Restart &Branch"
-msgstr "Redémarrer la &branche"
-
-#: tortoisehg/hgqt/commit.py:512 tortoisehg/hgqt/commit.py:520
-msgid "&Commit to current branch"
-msgstr "Committer dans la branche actuelle"
-
-#: tortoisehg/hgqt/commit.py:515 tortoisehg/hgtk/commit.py:1195
-msgid "Confirm New Branch"
-msgstr "Confirmer la création de nouvelle branche"
-
-#: tortoisehg/hgqt/commit.py:516
-#, python-format
-msgid "Create new named branch \"%s\" with this commit?\n"
-msgstr "Créer une nouvelle branche \"%s\" avec ce commit ?\n"
-
-#: tortoisehg/hgqt/commit.py:519
-msgid "Create &Branch"
-msgstr "Créer une &branche"
-
-#: tortoisehg/hgqt/commit.py:530
+#: tortoisehg/hgqt/commit.py:815
msgid "No files checked"
msgstr "Aucun fichier sélectionné"
-#: tortoisehg/hgqt/commit.py:531
+#: tortoisehg/hgqt/commit.py:816
msgid "No modified files checkmarked for commit"
msgstr "Aucun fichier modifié sélectionné pour commit"
-#: tortoisehg/hgqt/commit.py:546
+#: tortoisehg/hgqt/commit.py:831
msgid "Confirm Add"
msgstr "Confirmer l'ajout"
-#: tortoisehg/hgqt/commit.py:547
+#: tortoisehg/hgqt/commit.py:832
msgid "Add selected untracked files?"
msgstr "Ajouter les fichiers sélectionnés non suivis ?"
-#: tortoisehg/hgqt/commit.py:559
+#: tortoisehg/hgqt/commit.py:844
msgid "Confirm Remove"
msgstr "Confirmer la suppression"
-#: tortoisehg/hgqt/commit.py:560
+#: tortoisehg/hgqt/commit.py:845
msgid "Remove selected deleted files?"
msgstr "Enlever les fichiers sélectionnés supprimés"
-#: tortoisehg/hgqt/commit.py:603
+#: tortoisehg/hgqt/commit.py:886
msgctxt "start progress"
msgid "Commit"
msgstr "Commit"
-#: tortoisehg/hgqt/commit.py:609
-msgctxt "stop progress"
-msgid "Commit"
-msgstr "Commit"
-
-#: tortoisehg/hgqt/commit.py:626
+#: tortoisehg/hgqt/commit.py:920
#, python-format
msgid "%s - commit options"
msgstr "%s - options de commit"
-#: tortoisehg/hgqt/commit.py:633
+#: tortoisehg/hgqt/commit.py:927
msgid "Set username:"
msgstr "Définir un nom d'utilisateur :"
-#: tortoisehg/hgqt/commit.py:660 tortoisehg/hgqt/commit.py:707
-#: tortoisehg/hgqt/commit.py:730
+#: tortoisehg/hgqt/commit.py:954 tortoisehg/hgqt/commit.py:1001
+#: tortoisehg/hgqt/commit.py:1024
msgid "Save in Repo"
msgstr "Enregistrer dans le dépôt"
-#: tortoisehg/hgqt/commit.py:665
+#: tortoisehg/hgqt/commit.py:959
msgid "Save Global"
msgstr "Enregistrer globalement"
-#: tortoisehg/hgqt/commit.py:677
+#: tortoisehg/hgqt/commit.py:971
msgid "Set Date:"
msgstr "Donner une date :"
-#: tortoisehg/hgqt/commit.py:681 tortoisehg/hgtk/history.py:1589
+#: tortoisehg/hgqt/commit.py:975 tortoisehg/hgtk/history.py:1589
#: tortoisehg/hgtk/synch.py:148 tortoisehg/hgtk/update.py:128
msgid "Update"
msgstr "Mettre à jour"
-#: tortoisehg/hgqt/commit.py:700
+#: tortoisehg/hgqt/commit.py:994
msgid "Push After Commit:"
msgstr "Push après commit :"
-#: tortoisehg/hgqt/commit.py:723
+#: tortoisehg/hgqt/commit.py:1017
msgid "Auto Includes:"
msgstr "Inclusion automatique :"
-#: tortoisehg/hgqt/commit.py:762
+#: tortoisehg/hgqt/commit.py:1056
msgid "Unable to save username"
msgstr "Impossible d'enregistrer le nom d'utilisateur"
-#: tortoisehg/hgqt/commit.py:763 tortoisehg/hgqt/commit.py:786
-#: tortoisehg/hgqt/commit.py:809 tortoisehg/hgqt/sync.py:901
-#: tortoisehg/hgqt/sync.py:999 tortoisehg/hgqt/sync.py:1069
-#: tortoisehg/hgqt/sync.py:1233
+#: tortoisehg/hgqt/commit.py:1057 tortoisehg/hgqt/commit.py:1080
+#: tortoisehg/hgqt/commit.py:1103 tortoisehg/hgqt/sync.py:929
+#: tortoisehg/hgqt/sync.py:1027 tortoisehg/hgqt/sync.py:1097
+#: tortoisehg/hgqt/sync.py:1265
msgid "Iniparse must be installed."
msgstr "Iniparse doit être installé."
-#: tortoisehg/hgqt/commit.py:778 tortoisehg/hgqt/commit.py:801
-#: tortoisehg/hgqt/commit.py:824 tortoisehg/hgqt/settings.py:977
-#: tortoisehg/hgqt/sync.py:911 tortoisehg/hgqt/sync.py:1010
-#: tortoisehg/hgqt/sync.py:1087 tortoisehg/hgqt/sync.py:1271
+#: tortoisehg/hgqt/commit.py:1072 tortoisehg/hgqt/commit.py:1095
+#: tortoisehg/hgqt/commit.py:1118 tortoisehg/hgqt/settings.py:1096
+#: tortoisehg/hgqt/sync.py:939 tortoisehg/hgqt/sync.py:1038
+#: tortoisehg/hgqt/sync.py:1115 tortoisehg/hgqt/sync.py:1304
#: tortoisehg/hgtk/thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr "Impossible d'enregistrer le fichier de configuration"
-#: tortoisehg/hgqt/commit.py:785
+#: tortoisehg/hgqt/commit.py:1079
msgid "Unable to save after commit push"
msgstr "Impossible d'enregistrer après le push du commit"
-#: tortoisehg/hgqt/commit.py:808
+#: tortoisehg/hgqt/commit.py:1102
msgid "Unable to save auto include list"
msgstr "Impossible d'enregistrer la liste d'inclusion automatique"
-#: tortoisehg/hgqt/commit.py:839
+#: tortoisehg/hgqt/commit.py:1133
msgid "Invalid date format"
msgstr "Format de date invalide"
-#: tortoisehg/hgqt/commit.py:859
+#: tortoisehg/hgqt/commit.py:1153
msgid "No username configured"
msgstr "Aucun nom d'utilisateur configuré"
-#: tortoisehg/hgqt/commit.py:920
+#: tortoisehg/hgqt/commit.py:1201 tortoisehg/hgqt/compress.py:122
+#: tortoisehg/hgqt/repowidget.py:279
+msgctxt "action button"
+msgid "Commit"
+msgstr "Commit"
+
+#: tortoisehg/hgqt/commit.py:1214
#, python-format
msgid "%s - commit"
msgstr "%s - commit"
@@ -1035,11 +1192,6 @@msgid "Compress"
msgstr "Compresser"
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:269
-#: tortoisehg/hgqt/rebase.py:110
-msgid "Checking..."
-msgstr "Vérification en cours..."
-
#: tortoisehg/hgqt/compress.py:75
#, python-format
msgid "Compress - %s"
@@ -1065,25 +1217,6 @@msgid "Compress is complete, old history untouched"
msgstr "La compression est terminée, l'ancien historique est intact"
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:367
-#: tortoisehg/hgqt/merge.py:401 tortoisehg/hgqt/merge.py:465
-#: tortoisehg/hgqt/rebase.py:230 tortoisehg/hgqt/settings.py:771
-#: tortoisehg/hgqt/update.py:248 tortoisehg/hgtk/thgconfig.py:775
-#: tortoisehg/hgtk/update.py:233
-msgid "&Discard"
-msgstr "Abandonner"
-
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:467
-#: tortoisehg/hgqt/rebase.py:232
-msgid "Confirm Discard"
-msgstr "Confirmer l'abandon"
-
-#: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/merge.py:468
-#: tortoisehg/hgqt/rebase.py:233
-msgid "Discard outstanding changes to working directory?"
-msgstr ""
-"Abandonner les changements en suspens dans le répertoire de travail ?"
-
#: tortoisehg/hgqt/csinfo.py:48 tortoisehg/hgtk/csinfo.py:49
msgid "must be specified repository"
msgstr "doit être le dépot spécifié"
@@ -1138,7 +1271,7 @@msgid "Subversion:"
msgstr "Subversion :"
-#: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:131
+#: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:130
#: tortoisehg/hgtk/cslist.py:384
msgid "No items to display"
msgstr "Aucun article à afficher"
@@ -1147,12 +1280,13 @@msgid "Use compact view"
msgstr "Utiliser la vue compacte"
-#: tortoisehg/hgqt/cslist.py:88 tortoisehg/hgqt/revpanel.py:26
-#: tortoisehg/hgtk/changeset.py:585 tortoisehg/hgtk/cslist.py:143
+#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/revpanel.py:21
+#: tortoisehg/hgqt/revpanel.py:28 tortoisehg/hgtk/changeset.py:585
+#: tortoisehg/hgtk/cslist.py:143
msgid "Patch:"
msgstr "Patch :"
-#: tortoisehg/hgqt/cslist.py:134 tortoisehg/hgtk/cslist.py:409
+#: tortoisehg/hgqt/cslist.py:133 tortoisehg/hgtk/cslist.py:409
#, python-format
msgid "Displaying %(count)d of %(total)d items"
msgstr "Affiche %(count)d sur %(total)d éléments"
@@ -1161,285 +1295,320 @@msgid "Output Log"
msgstr "Historique de sortie"
-#: tortoisehg/hgqt/filedialogs.py:194 tortoisehg/hgqt/workbench.py:304
+#: tortoisehg/hgqt/filedata.py:31
+msgid "File or diffs not displayed: "
+msgstr "Le fichier ou les différences ne sont pas affichées : "
+
+#: tortoisehg/hgqt/filedata.py:45
+#, python-format
+msgid ""
+"File is larger than the specified max size.\n"
+"maxdiff = %s KB"
+msgstr ""
+"Le fichier est plus grand que la taille maximum spécifiée.\n"
+"maxdiff = %s KB"
+
+#: tortoisehg/hgqt/filedata.py:51 tortoisehg/hgtk/chunks.py:85
+msgid "File is binary.\n"
+msgstr "Le fichier est binaire.\n"
+
+#: tortoisehg/hgqt/filedata.py:82 tortoisehg/hgqt/filedata.py:338
+#, python-format
+msgid "exec mode has been <font color='red'>%s</font>"
+msgstr "le mode exec était <font color='red'>%s</font>"
+
+#: tortoisehg/hgqt/filedata.py:83 tortoisehg/hgqt/filedata.py:334
+msgid "set"
+msgstr "défini"
+
+#: tortoisehg/hgqt/filedata.py:83 tortoisehg/hgqt/filedata.py:336
+msgid "unset"
+msgstr "non défini"
+
+#: tortoisehg/hgqt/filedata.py:86 tortoisehg/hgqt/filedata.py:106
+msgid " <i>(is a symlink)</i>"
+msgstr " <i>(est un lien symbolique)</i>"
+
+#: tortoisehg/hgqt/filedata.py:135
+#, python-format
+msgid ""
+"[WARNING] Invalid subrepo revision ID:\n"
+"\t%s\n"
+"\n"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:155
+msgid "Subrepo created and set to initial revision."
+msgstr "Sous-dépôt créé et placé à la première révision"
+
+#: tortoisehg/hgqt/filedata.py:159
+msgid "Subrepo initialized to revision:"
+msgstr "Sous-dépôt initialisé à la révision :"
+
+#: tortoisehg/hgqt/filedata.py:162
+msgid "Subrepo removed from repository."
+msgstr "Sous-dépôt enlevé du dépôt."
+
+#: tortoisehg/hgqt/filedata.py:166
+msgid "Subrepo was not changed."
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:167
+msgid "Subrepo state is:"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:169 tortoisehg/hgqt/filedata.py:179
+#: tortoisehg/hgqt/filedata.py:184 tortoisehg/hgqt/filedata.py:188
+#: tortoisehg/hgqt/filedata.py:194
+#, python-format
+msgid "changeset: %s"
+msgstr "révision : %s"
+
+#: tortoisehg/hgqt/filedata.py:176
+msgid "Revision has changed to:"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:185 tortoisehg/hgqt/hgemail_ui.py:247
+#: tortoisehg/hgtk/hgemail.py:86
+msgid "From:"
+msgstr "De :"
+
+#: tortoisehg/hgqt/filedata.py:189
+msgid "Subrepository not found in the working directory."
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:191 tortoisehg/hgqt/filedata.py:197
+msgid "Further subrepository revision information cannot be retrieved."
+msgstr ""
+"D'autres informations de révision de sous-dépôt ne peuvent pas être "
+"retrouvées."
+
+#: tortoisehg/hgqt/filedata.py:195
+msgid "Subrepository is either damaged or missing some revisions"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:199
+msgid ""
+"You may need to open the missing subrepository and manually\n"
+"pull the missing revisions from its source repository."
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:208
+msgid "Initial revision"
+msgstr "Première révision"
+
+#: tortoisehg/hgqt/filedata.py:228
+msgid "Not a Mercurial subrepo, not previewable"
+msgstr "Pas un dépôt Mercurial, pas présentable"
+
+#: tortoisehg/hgqt/filedata.py:243
+msgid "File Status:"
+msgstr "Statut de fichier :"
+
+#: tortoisehg/hgqt/filedata.py:268
+msgid "(is a changed sub-repository)"
+msgstr "(est un sous-dépôt modifié)"
+
+#: tortoisehg/hgqt/filedata.py:269
+msgid "(is an unchanged sub-repository)"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:270
+msgid "(is a dirty sub-repository)"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:271
+msgid "(is a new sub-repository)"
+msgstr "(est un nouveau sous-dépôt)"
+
+#: tortoisehg/hgqt/filedata.py:272
+msgid "(is a removed sub-repository)"
+msgstr "(est un sous-dépôt enlevé)"
+
+#: tortoisehg/hgqt/filedata.py:273
+msgid "(is a changed and dirty sub-repository)"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:274
+msgid "(is a new and dirty sub-repository)"
+msgstr ""
+
+#: tortoisehg/hgqt/filedata.py:278
+#, python-format
+msgid " <a href=\"subrepo:%s\">open...</a>"
+msgstr " <a href=\"subrepo:%s\">ouvrir...</a>"
+
+#: tortoisehg/hgqt/filedata.py:281
+#, python-format
+msgid "Error previewing subrepo: %s"
+msgstr "Erreur en visualisant le sous-dépôt : %s"
+
+#: tortoisehg/hgqt/filedata.py:288
+#, python-format
+msgid ""
+"File or diffs not displayed: File is larger than the specified max size.\n"
+"maxdiff = %s KB"
+msgstr ""
+"Fichier ou différences non affiché : le fichier est plus grand que la taille "
+"maximum spécifiée.\n"
+"maxdiff = %s KB"
+
+#: tortoisehg/hgqt/filedata.py:303
+msgid " <i>(was deleted)</i>"
+msgstr " <i>(a été supprimé)</i>"
+
+#: tortoisehg/hgqt/filedata.py:305
+msgid " <i>(was added, now missing)</i>"
+msgstr " <i>(a été ajouté, maintenant manquant)</i>"
+
+#: tortoisehg/hgqt/filedata.py:311
+msgid " <i>(is unversioned)</i>"
+msgstr " <i>(n'est pas versionné)</i>"
+
+#: tortoisehg/hgqt/filedata.py:344 tortoisehg/hgqt/filedata.py:354
+msgid " <i>(was added)</i>"
+msgstr " <i>(a été ajouté)</i>"
+
+#: tortoisehg/hgqt/filedata.py:349
+#, python-format
+msgid " <i>(renamed from %s)</i>"
+msgstr " <i>(renommé depuis %s)</i>"
+
+#: tortoisehg/hgqt/filedialogs.py:124
+msgid "File History Log Columns"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:166 tortoisehg/hgqt/workbench.py:342
msgid "Back"
msgstr "Précédent"
-#: tortoisehg/hgqt/filedialogs.py:196 tortoisehg/hgqt/workbench.py:307
+#: tortoisehg/hgqt/filedialogs.py:168 tortoisehg/hgqt/workbench.py:345
msgid "Forward"
msgstr "Suivant"
-#: tortoisehg/hgqt/filedialogs.py:377
+#: tortoisehg/hgqt/filedialogs.py:196 tortoisehg/hgqt/repowidget.py:1092
+#: tortoisehg/hgqt/repowidget.py:1357
+msgid "Visual diff..."
+msgstr "Diff visuel..."
+
+#: tortoisehg/hgqt/filedialogs.py:199 tortoisehg/hgqt/repowidget.py:1094
+msgid "Diff to local..."
+msgstr "Diff avec la version locale..."
+
+#: tortoisehg/hgqt/filedialogs.py:203
+msgid "Visual diff file..."
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:206
+msgid "Diff file to local..."
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:210
+msgid "View at revision..."
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:213
+msgid "Edit local"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:216
+msgid "Revert to revision..."
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:363
+msgid "File Differences Log Columns"
+msgstr ""
+
+#: tortoisehg/hgqt/filedialogs.py:469
msgid "Next diff"
msgstr "Différence suivante"
-#: tortoisehg/hgqt/filedialogs.py:381
+#: tortoisehg/hgqt/filedialogs.py:474
msgid "Previous diff"
msgstr "Différence précédente"
-#: tortoisehg/hgqt/filelistview.py:212 tortoisehg/hgqt/manifestdialog.py:285
-#, python-format
-msgid "Hg file log viewer - %s"
-msgstr "Affichage d'historique Hg de fichier - %s"
-
-#: tortoisehg/hgqt/filelistview.py:226
-msgid "Cannot open subrepository"
-msgstr "Impossible d'ouvrir le sous-dépôt"
-
-#: tortoisehg/hgqt/filelistview.py:227
-msgid "The selected subrepository does not exist in the working directory"
-msgstr "Le sous-dépôt sélectionné n'existe pas dans le répertoire de travail"
-
-#: tortoisehg/hgqt/filelistview.py:241
-msgid "Show All"
-msgstr "Tout afficher"
-
-#: tortoisehg/hgqt/filelistview.py:243
-msgid "Toggle display of all files and the direction they were merged"
-msgstr "Afficher tous les fichiers et la direction de la fusion"
-
-#: tortoisehg/hgqt/filelistview.py:246
-msgid "Other"
-msgstr "Autre"
-
-#: tortoisehg/hgqt/filelistview.py:248
-msgid "Toggle display of diffs to second (other) parent"
-msgstr "Afficher les différences avec le second (autre) parent"
-
-#: tortoisehg/hgqt/filelistview.py:255 tortoisehg/hgqt/manifestdialog.py:197
-msgid "File history"
-msgstr "Historique du fichier"
-
-#: tortoisehg/hgqt/filelistview.py:256 tortoisehg/hgqt/manifestdialog.py:198
-msgid "Show the history of the selected file"
-msgstr "Afficher l'historique du fichier sélectionné"
-
-#: tortoisehg/hgqt/filelistview.py:257 tortoisehg/hgqt/manifestdialog.py:199
-msgid "Compare file revisions"
-msgstr "Comparer les révisions du fichier"
-
-#: tortoisehg/hgqt/filelistview.py:258 tortoisehg/hgqt/manifestdialog.py:200
-msgid "Compare revisions of the selected file"
-msgstr "Comparer les révisions du fichier sélectionné"
-
-#: tortoisehg/hgqt/filelistview.py:259 tortoisehg/hgqt/grep.py:547
-#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/util/menuthg.py:76
-msgid "Visual Diff"
-msgstr "Diff visuel"
-
-#: tortoisehg/hgqt/filelistview.py:260 tortoisehg/hgqt/manifestdialog.py:202
-msgid "View file changes in external diff tool"
-msgstr "Voir les changements du fichier dans un outil de diff externe"
-
-#: tortoisehg/hgqt/filelistview.py:261 tortoisehg/hgqt/manifestdialog.py:203
-msgid "Visual Diff to Local"
-msgstr "Diff visuel avec la version locale"
-
-#: tortoisehg/hgqt/filelistview.py:262 tortoisehg/hgqt/manifestdialog.py:204
-msgid "View changes to current in external diff tool"
-msgstr "Voir les changements avec l'actuel dans un outil de diff externe"
-
-#: tortoisehg/hgqt/filelistview.py:264 tortoisehg/hgqt/manifestdialog.py:206
-msgid "View at Revision"
-msgstr "Voir à la révision"
-
-#: tortoisehg/hgqt/filelistview.py:265 tortoisehg/hgqt/manifestdialog.py:207
-msgid "View file as it appeared at this revision"
-msgstr "Voir le fichier tel qu'il apparaît à cette révision"
-
-#: tortoisehg/hgqt/filelistview.py:266 tortoisehg/hgqt/manifestdialog.py:208
-msgid "Edit Local"
-msgstr "Éditer la version locale"
-
-#: tortoisehg/hgqt/filelistview.py:267 tortoisehg/hgqt/manifestdialog.py:209
-msgid "Edit current file in working copy"
-msgstr "Éditer le fichier actuel dans le répertoire de travail"
-
-#: tortoisehg/hgqt/filelistview.py:268 tortoisehg/hgqt/manifestdialog.py:210
-msgid "Revert to Revision"
-msgstr "Revenir à la révision"
-
-#: tortoisehg/hgqt/filelistview.py:269 tortoisehg/hgqt/manifestdialog.py:211
-msgid "Revert file(s) to contents at this revision"
-msgstr "Ramener le(s) fichier(s) au contenu de cette révision"
-
-#: tortoisehg/hgqt/filelistview.py:271
-msgid "Open subrepository"
-msgstr "Ouvrir le sous-dépôt"
-
-#: tortoisehg/hgqt/filelistview.py:272
-msgid "Open the selected subrepository"
-msgstr "Ouvrir le sous-dépôt sélectionné"
-
-#: tortoisehg/hgqt/filerevmodel.py:41
+#: tortoisehg/hgqt/filerevmodel.py:23
msgctxt "column header"
msgid "Filename"
msgstr "Nom de fichier"
-#: tortoisehg/hgqt/fileview.py:71
+#: tortoisehg/hgqt/fileview.py:58
msgid "Diff Toolbar"
msgstr "Barre d'outil de diff"
-#: tortoisehg/hgqt/fileview.py:143
+#: tortoisehg/hgqt/fileview.py:129
msgid "View change as unified diff output"
msgstr "Voir le changement comme sortie unifiée de diff"
-#: tortoisehg/hgqt/fileview.py:147
+#: tortoisehg/hgqt/fileview.py:134
msgid "View change in context of file"
msgstr "Voir le changement dans le contexte du fichier"
-#: tortoisehg/hgqt/fileview.py:151
-msgid "View change in context, annotate with revision number"
-msgstr ""
-"Voir le changement dans le contexte du fichier, annoter avec le numéro de "
-"révision"
-
-#: tortoisehg/hgqt/fileview.py:164
+#: tortoisehg/hgqt/fileview.py:139
+msgid "annotate with revision numbers"
+msgstr "annoter avec les numéros de révision"
+
+#: tortoisehg/hgqt/fileview.py:152
msgid "Next diff (alt+down)"
msgstr "Différence suivante (alt+bas)"
-#: tortoisehg/hgqt/fileview.py:168
+#: tortoisehg/hgqt/fileview.py:156
msgid "Previous diff (alt+up)"
msgstr "Différence précédente (alt+haut)"
-#: tortoisehg/hgqt/fileview.py:176
+#: tortoisehg/hgqt/fileview.py:165
+msgid "Show changes from first parent"
+msgstr "Afficher les changements depuis le premier parent"
+
+#: tortoisehg/hgqt/fileview.py:169
+msgid "Show changes from second parent"
+msgstr "Afficher les changements depuis le deuxième parent"
+
+#: tortoisehg/hgqt/fileview.py:177
msgid "Toggle display of text search bar"
msgstr "Afficher la barre de recherche"
-#: tortoisehg/hgqt/fileview.py:181
+#: tortoisehg/hgqt/fileview.py:182
msgid "Open shelve tool"
msgstr ""
-#: tortoisehg/hgqt/fileview.py:582 tortoisehg/hgqt/fileview.py:791
-#, python-format
-msgid "exec mode has been <font color='red'>%s</font>"
-msgstr "le mode exec était <font color='red'>%s</font>"
-
-#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:787
-msgid "set"
-msgstr "défini"
-
-#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:789
-msgid "unset"
-msgstr "non défini"
-
-#: tortoisehg/hgqt/fileview.py:586 tortoisehg/hgqt/fileview.py:597
-msgid " <i>(is a symlink)</i>"
-msgstr " <i>(est un lien symbolique)</i>"
-
-#: tortoisehg/hgqt/fileview.py:625
-msgid "Subrepo created and set to initial revision."
-msgstr "Sous-dépôt créé et placé à la première révision"
-
-#: tortoisehg/hgqt/fileview.py:629
-msgid "Subrepo initialized to revision:"
-msgstr "Sous-dépôt initialisé à la révision :"
-
-#: tortoisehg/hgqt/fileview.py:632
-msgid "Subrepo removed from repository."
-msgstr "Sous-dépôt enlevé du dépôt."
-
-#: tortoisehg/hgqt/fileview.py:637
-msgid "Revision has changed to:"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:639 tortoisehg/hgqt/fileview.py:646
-#: tortoisehg/hgqt/fileview.py:650 tortoisehg/hgqt/fileview.py:656
-#, python-format
-msgid "changeset: %s"
-msgstr "révision : %s"
-
-#: tortoisehg/hgqt/fileview.py:647 tortoisehg/hgqt/hgemail_ui.py:247
-#: tortoisehg/hgtk/hgemail.py:86
-msgid "From:"
-msgstr "De :"
-
-#: tortoisehg/hgqt/fileview.py:651
-msgid "Subrepository not found in the working directory."
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:653 tortoisehg/hgqt/fileview.py:659
-msgid "Further subrepository revision information cannot be retrieved."
-msgstr ""
-"D'autres informations de révision de sous-dépôt ne peuvent pas être "
-"retrouvées."
-
-#: tortoisehg/hgqt/fileview.py:657
-msgid "Subrepository is either damaged or missing some revisions"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:661
-msgid ""
-"You may need to open the missing subrepository and manually\n"
-"pull the missing revisions from its source repository."
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:672
-msgid "Initial revision"
-msgstr "Première révision"
-
-#: tortoisehg/hgqt/fileview.py:692
-msgid "Not a Mercurial subrepo, not previewable"
-msgstr "Pas un dépôt Mercurial, pas présentable"
-
-#: tortoisehg/hgqt/fileview.py:707
-msgid "File Status:"
-msgstr "Statut de fichier :"
-
-#: tortoisehg/hgqt/fileview.py:728
-msgid "(is a changed sub-repository)"
-msgstr "(est un sous-dépôt modifié)"
-
-#: tortoisehg/hgqt/fileview.py:729
-msgid "(is a dirty sub-repository)"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:730
-msgid "(is a new sub-repository)"
-msgstr "(est un nouveau sous-dépôt)"
-
-#: tortoisehg/hgqt/fileview.py:731
-msgid "(is a removed sub-repository)"
-msgstr "(est un sous-dépôt enlevé)"
-
-#: tortoisehg/hgqt/fileview.py:732
-msgid "(is a changed and dirty sub-repository)"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:733
-msgid "(is a new and dirty sub-repository)"
-msgstr ""
-
-#: tortoisehg/hgqt/fileview.py:737
-#, python-format
-msgid " <a href=\"subrepo:%s\">open...</a>"
-msgstr " <a href=\"subrepo:%s\">ouvrir...</a>"
-
-#: tortoisehg/hgqt/fileview.py:740
-#, python-format
-msgid "Error previewing subrepo: %s"
-msgstr "Erreur en visualisant le sous-dépôt : %s"
-
-#: tortoisehg/hgqt/fileview.py:760
-msgid " <i>(was deleted)</i>"
-msgstr " <i>(a été supprimé)</i>"
-
-#: tortoisehg/hgqt/fileview.py:762
-msgid " <i>(was added, now missing)</i>"
-msgstr " <i>(a été ajouté, maintenant manquant)</i>"
-
-#: tortoisehg/hgqt/fileview.py:775
-msgid " <i>(is unversioned)</i>"
-msgstr " <i>(n'est pas versionné)</i>"
-
-#: tortoisehg/hgqt/fileview.py:797 tortoisehg/hgqt/fileview.py:807
-msgid " <i>(was added)</i>"
-msgstr " <i>(a été ajouté)</i>"
-
-#: tortoisehg/hgqt/fileview.py:802
-#, python-format
-msgid " <i>(renamed from %s)</i>"
-msgstr " <i>(renommé depuis %s)</i>"
+#: tortoisehg/hgqt/fileview.py:562
+msgid "Search in current file"
+msgstr "Chercher dans le fichier actuel"
+
+#: tortoisehg/hgqt/fileview.py:563 tortoisehg/hgqt/fileview.py:586
+msgid "Search in history"
+msgstr "Rechercher dans l'historique"
+
+#: tortoisehg/hgqt/fileview.py:581
+msgid "Search in original revision"
+msgstr "Rechercher dans la révision originale"
+
+#: tortoisehg/hgqt/fileview.py:583
+msgid "Search in working revision"
+msgstr "Rechercher dans la révision de travail"
+
+#: tortoisehg/hgqt/fileview.py:585
+msgid "Search in current annotation"
+msgstr "Rechercher dans l'annotation actuelle"
+
+#: tortoisehg/hgqt/fileview.py:605
+msgid "Annotate originating revision"
+msgstr "Annoter la révision d'origine"
+
+#: tortoisehg/hgqt/fileview.py:606
+msgid "View originating revision"
+msgstr "Voir la révision d'origine"
+
+#: tortoisehg/hgqt/fileview.py:618
+#, python-format
+msgid "Annotate parent revision %d"
+msgstr "Annoter la révision parente %d"
+
+#: tortoisehg/hgqt/fileview.py:620
+#, python-format
+msgid "View parent revision %d"
+msgstr "Voir la révision parente %d"
#: tortoisehg/hgqt/grep.py:43
msgid "### regular expression search pattern ###"
@@ -1567,22 +1736,22 @@msgid "Annotate file"
msgstr "Annoter le fichier"
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgtk/datamine.py:364
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:364
#: tortoisehg/hgtk/datamine.py:654
msgid "File"
msgstr "Fichier"
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgtk/datamine.py:652
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:652
msgid "Line"
msgstr "Ligne"
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgtk/datamine.py:363
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgtk/datamine.py:363
#: tortoisehg/hgtk/datamine.py:653 tortoisehg/hgtk/logview/treeview.py:441
msgid "Rev"
msgstr "Rev"
-#: tortoisehg/hgqt/grep.py:698 tortoisehg/hgqt/settings.py:451
-#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgqt/settings.py:609
+#: tortoisehg/hgqt/grep.py:702 tortoisehg/hgqt/settings.py:539
+#: tortoisehg/hgqt/settings.py:659 tortoisehg/hgqt/settings.py:704
#: tortoisehg/hgtk/datamine.py:142 tortoisehg/hgtk/datamine.py:655
#: tortoisehg/hgtk/history.py:101 tortoisehg/hgtk/history.py:502
#: tortoisehg/hgtk/history.py:695 tortoisehg/hgtk/logview/treeview.py:512
@@ -1590,7 +1759,7 @@msgid "User"
msgstr "Utilisateur"
-#: tortoisehg/hgqt/grep.py:699
+#: tortoisehg/hgqt/grep.py:703
msgid "Match Text"
msgstr "Correspondance de texte"
@@ -1599,69 +1768,73 @@msgid "Detect Copies/Renames in %s"
msgstr "Détecter les copies/renommages dans %s"
-#: tortoisehg/hgqt/guess.py:59
+#: tortoisehg/hgqt/guess.py:61
msgid "<b>Unrevisioned Files</b>"
msgstr "<b>Fichiers non versionnés</b>"
-#: tortoisehg/hgqt/guess.py:74
+#: tortoisehg/hgqt/guess.py:65 tortoisehg/hgqt/status.py:95
+msgid "Refresh file list"
+msgstr "Actualiser la liste des fichiers"
+
+#: tortoisehg/hgqt/guess.py:83
#, python-format
msgid "Min Similarity: %d%%"
msgstr "Similarité minimum : %d %%"
-#: tortoisehg/hgqt/guess.py:83
+#: tortoisehg/hgqt/guess.py:92
msgid "Only consider deleted files"
msgstr "Examiner uniquement les fichiers supprimés"
-#: tortoisehg/hgqt/guess.py:84
+#: tortoisehg/hgqt/guess.py:93
msgid "Uncheck to consider all revisioned files for copy sources"
msgstr ""
"Décocher pour examiner tous les fichiers versionnés pour les sources de copie"
-#: tortoisehg/hgqt/guess.py:87 tortoisehg/hgtk/guess.py:108
+#: tortoisehg/hgqt/guess.py:96 tortoisehg/hgtk/guess.py:108
msgid "Find Renames"
msgstr "Cherche les changements de noms"
-#: tortoisehg/hgqt/guess.py:88
+#: tortoisehg/hgqt/guess.py:97
msgid "Find copy and/or rename sources"
msgstr "Trouver les sources copiées et/ou renommées"
-#: tortoisehg/hgqt/guess.py:96
+#: tortoisehg/hgqt/guess.py:105
msgid "<b>Candidate Matches</b>"
msgstr "<b>Correspondances candidates</b>"
-#: tortoisehg/hgqt/guess.py:106 tortoisehg/hgqt/guess.py:119
+#: tortoisehg/hgqt/guess.py:115 tortoisehg/hgqt/guess.py:128
msgid "Accept All Matches"
msgstr ""
-#: tortoisehg/hgqt/guess.py:117
+#: tortoisehg/hgqt/guess.py:126
msgid "Accept Selected Matches"
msgstr "Accepter les correspondances sélectionnées"
-#: tortoisehg/hgqt/guess.py:132
+#: tortoisehg/hgqt/guess.py:141
msgid "<b>Differences from Source to Dest</b>"
msgstr "<b>Différences de la source vers la destination</b>"
-#: tortoisehg/hgqt/guess.py:177
+#: tortoisehg/hgqt/guess.py:186
msgid "Search already in progress"
msgstr "Recherche déjà en cours"
-#: tortoisehg/hgqt/guess.py:178
+#: tortoisehg/hgqt/guess.py:187
msgid "Cannot start a new search"
msgstr "Impossible de démarrer une nouvelle recherche"
-#: tortoisehg/hgqt/guess.py:188
+#: tortoisehg/hgqt/guess.py:197
msgid "No files to find"
msgstr ""
-#: tortoisehg/hgqt/guess.py:189
+#: tortoisehg/hgqt/guess.py:198
msgid "There are no files that may have been renamed"
msgstr ""
-#: tortoisehg/hgqt/guess.py:231
+#: tortoisehg/hgqt/guess.py:240
msgid "Multiple sources chosen"
msgstr "Plusieurs sources choisies"
-#: tortoisehg/hgqt/guess.py:232
+#: tortoisehg/hgqt/guess.py:241
#, python-format
msgid ""
"You have multiple renames selected for destination file:\n"
@@ -1670,7 +1843,7 @@"Vous avez plusieurs renommages sélectionnés pour le fichier destination :\n"
"%s. Interruption !"
-#: tortoisehg/hgqt/guess.py:259
+#: tortoisehg/hgqt/guess.py:268
#, python-format
msgid ""
"%s and %s have identical contents\n"
@@ -1679,16 +1852,16 @@"%s et %s ont des contenus identique\n"
"\n"
-#: tortoisehg/hgqt/guess.py:293 tortoisehg/hgtk/datamine.py:656
+#: tortoisehg/hgqt/guess.py:302 tortoisehg/hgtk/datamine.py:656
#: tortoisehg/hgtk/guess.py:145
msgid "Source"
msgstr "Source"
-#: tortoisehg/hgqt/guess.py:293 tortoisehg/hgtk/guess.py:152
+#: tortoisehg/hgqt/guess.py:302 tortoisehg/hgtk/guess.py:152
msgid "Dest"
msgstr "Dest"
-#: tortoisehg/hgqt/guess.py:293
+#: tortoisehg/hgqt/guess.py:302
msgid "% Match"
msgstr "% Corresp"
@@ -1704,7 +1877,7 @@msgid "Failed to open Email dialog"
msgstr "Impossible d'ouvrir le dialogue de courriel"
-#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:457
+#: tortoisehg/hgqt/hgemail_ui.py:244 tortoisehg/hgqt/settings.py:545
#: tortoisehg/hgtk/synch.py:78 tortoisehg/hgtk/thgconfig.py:238
msgid "Email"
msgstr "Courriel"
@@ -1835,7 +2008,7 @@msgid "Changesets"
msgstr "Révisions"
-#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:47
+#: tortoisehg/hgqt/hgemail_ui.py:269 tortoisehg/hgqt/wctxactions.py:43
#: tortoisehg/hgqt/webconf.py:256 tortoisehg/hgqt/webconf_ui.py:79
#: tortoisehg/hgtk/status.py:1243
msgid "Edit"
@@ -1876,7 +2049,7 @@msgstr "Ajouter"
#: tortoisehg/hgqt/hgignore.py:72 tortoisehg/hgqt/resolve.py:128
-#: tortoisehg/hgqt/settings.py:720 tortoisehg/hgtk/hgignore.py:77
+#: tortoisehg/hgqt/settings.py:815 tortoisehg/hgtk/hgignore.py:77
#: tortoisehg/hgtk/thgconfig.py:676
msgid "Edit File"
msgstr "Éditer le fichier"
@@ -1889,31 +2062,35 @@msgid "<b>Untracked Files</b>"
msgstr "<b>Fichiers non suivis</b>"
-#: tortoisehg/hgqt/hgignore.py:104
-msgid "Backspace or Del to remove a row"
-msgstr "Retour arrière ou Suppr pour enlever une ligne"
-
-#: tortoisehg/hgqt/hgignore.py:148
+#: tortoisehg/hgqt/hgignore.py:106
+msgid "Backspace or Del to remove row(s)"
+msgstr ""
+
+#: tortoisehg/hgqt/hgignore.py:150
msgid "Add ignore filter..."
msgstr "Ajouter un filtre de fichier ignoré..."
-#: tortoisehg/hgqt/hgignore.py:160
+#: tortoisehg/hgqt/hgignore.py:167
+msgid "selected files"
+msgstr "fichiers sélectionnés"
+
+#: tortoisehg/hgqt/hgignore.py:168
msgid "Ignore "
msgstr "Ignorer "
-#: tortoisehg/hgqt/hgignore.py:207 tortoisehg/hgtk/hgignore.py:197
+#: tortoisehg/hgqt/hgignore.py:217 tortoisehg/hgtk/hgignore.py:197
msgid "Invalid glob expression"
msgstr "Expression globale invalide"
-#: tortoisehg/hgqt/hgignore.py:217 tortoisehg/hgtk/hgignore.py:213
+#: tortoisehg/hgqt/hgignore.py:227 tortoisehg/hgtk/hgignore.py:213
msgid "Invalid regexp expression"
msgstr "Expression régulière invalide"
-#: tortoisehg/hgqt/hgignore.py:241 tortoisehg/hgqt/hgignore.py:248
+#: tortoisehg/hgqt/hgignore.py:250 tortoisehg/hgqt/hgignore.py:257
msgid "Unable to read repository status"
msgstr "Impossible de lire le statut du dépôt"
-#: tortoisehg/hgqt/hgignore.py:275 tortoisehg/hgtk/hgignore.py:261
+#: tortoisehg/hgqt/hgignore.py:287 tortoisehg/hgtk/hgignore.py:261
msgid "Unable to write .hgignore file"
msgstr "Impossible d'écrire le fichier .hgignore"
@@ -1994,6 +2171,14 @@msgid "<p>But could not run Workbench for it.</p><p>%s</p>"
msgstr ""
+#: tortoisehg/hgqt/hgrcutil.py:28
+msgid "Unable to create a config file"
+msgstr "Impossible de créer un fichier de configuration"
+
+#: tortoisehg/hgqt/hgrcutil.py:29
+msgid "Insufficient access rights."
+msgstr "Droits d'accès insuffisants."
+
#: tortoisehg/hgqt/htmldelegate.py:60
#, python-format
msgid "?? Error: %s ??"
@@ -2003,75 +2188,142 @@msgid "License"
msgstr "Licence"
-#: tortoisehg/hgqt/logcolumns.py:22
-msgid "Workbench Log Columns"
-msgstr ""
-
-#: tortoisehg/hgqt/logcolumns.py:66
+#: tortoisehg/hgqt/logcolumns.py:75
msgid "Drag to change order"
msgstr "Glisser pour changer l'ordre"
-#: tortoisehg/hgqt/manifestdialog.py:61
+#: tortoisehg/hgqt/logcolumns.py:100 tortoisehg/hgqt/settings.py:412
+#: tortoisehg/hgqt/workbench.py:673 tortoisehg/util/menuthg.py:46
+msgid "Workbench"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:56
#, python-format
msgid "Manifest %s@%s"
msgstr ""
-#: tortoisehg/hgqt/manifestdialog.py:180 tortoisehg/hgtk/thgmq.py:862
+#: tortoisehg/hgqt/manifestdialog.py:186 tortoisehg/hgtk/thgmq.py:862
msgid "Status"
msgstr "État"
-#: tortoisehg/hgqt/manifestdialog.py:183 tortoisehg/hgtk/status.py:1251
-msgid "Annotate"
-msgstr "Annoter"
-
-#: tortoisehg/hgqt/merge.py:36
+#: tortoisehg/hgqt/manifestdialog.py:191 tortoisehg/hgqt/revdetails.py:225
+msgid "File history"
+msgstr "Historique du fichier"
+
+#: tortoisehg/hgqt/manifestdialog.py:192 tortoisehg/hgqt/revdetails.py:226
+msgid "Show the history of the selected file"
+msgstr "Afficher l'historique du fichier sélectionné"
+
+#: tortoisehg/hgqt/manifestdialog.py:193 tortoisehg/hgqt/revdetails.py:227
+msgid "Compare file revisions"
+msgstr "Comparer les révisions du fichier"
+
+#: tortoisehg/hgqt/manifestdialog.py:194 tortoisehg/hgqt/revdetails.py:228
+msgid "Compare revisions of the selected file"
+msgstr "Comparer les révisions du fichier sélectionné"
+
+#: tortoisehg/hgqt/manifestdialog.py:197 tortoisehg/hgqt/revdetails.py:231
+msgid "Visual Diff to Local"
+msgstr "Diff visuel avec la version locale"
+
+#: tortoisehg/hgqt/manifestdialog.py:198 tortoisehg/hgqt/revdetails.py:232
+msgid "View changes to current in external diff tool"
+msgstr "Voir les changements avec l'actuel dans un outil de diff externe"
+
+#: tortoisehg/hgqt/manifestdialog.py:200 tortoisehg/hgqt/revdetails.py:234
+msgid "View at Revision"
+msgstr "Voir à la révision"
+
+#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/hgqt/revdetails.py:235
+msgid "View file as it appeared at this revision"
+msgstr "Voir le fichier tel qu'il apparaît à cette révision"
+
+#: tortoisehg/hgqt/manifestdialog.py:207 tortoisehg/hgqt/revdetails.py:243
+msgid "Open subrepository"
+msgstr "Ouvrir le sous-dépôt"
+
+#: tortoisehg/hgqt/manifestdialog.py:208 tortoisehg/hgqt/revdetails.py:244
+#: tortoisehg/hgqt/revdetails.py:247
+msgid "Open the selected subrepository"
+msgstr "Ouvrir le sous-dépôt sélectionné"
+
+#: tortoisehg/hgqt/manifestdialog.py:210 tortoisehg/hgqt/revdetails.py:246
+msgid "Explore subrepository"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:212
+msgid "Open the selected subrepository in a file browser"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:214 tortoisehg/hgqt/revdetails.py:249
+msgid "Open terminal in subrepository"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:216 tortoisehg/hgqt/revdetails.py:251
+msgid "Open a shell terminal in the selected subrepository root"
+msgstr ""
+
+#: tortoisehg/hgqt/manifestdialog.py:288 tortoisehg/hgqt/revdetails.py:388
+#, python-format
+msgid "Hg file log viewer - %s"
+msgstr "Affichage d'historique Hg de fichier - %s"
+
+#: tortoisehg/hgqt/manifestdialog.py:301 tortoisehg/hgqt/revdetails.py:402
+msgid "Cannot open subrepository"
+msgstr "Impossible d'ouvrir le sous-dépôt"
+
+#: tortoisehg/hgqt/manifestdialog.py:302 tortoisehg/hgqt/revdetails.py:403
+msgid "The selected subrepository does not exist on the working directory"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:31
#, python-format
msgid "Merge - %s"
msgstr "Fusion - %s"
-#: tortoisehg/hgqt/merge.py:60
+#: tortoisehg/hgqt/merge.py:96
msgid "Do you want to exit?"
msgstr "Voulez-vous arrêter ?"
-#: tortoisehg/hgqt/merge.py:61
+#: tortoisehg/hgqt/merge.py:97
msgid "To finish merging, you need to commit the working directory."
msgstr "Pour finir la fusion, vous devez committer le répertoire de travail."
-#: tortoisehg/hgqt/merge.py:63 tortoisehg/hgqt/rebase.py:251
+#: tortoisehg/hgqt/merge.py:99 tortoisehg/hgqt/rebase.py:251
msgid "&Exit"
msgstr "&Quitter"
-#: tortoisehg/hgqt/merge.py:230 tortoisehg/hgqt/repomodel.py:544
-#: tortoisehg/hgqt/revpanel.py:156 tortoisehg/hgtk/merge.py:73
+#: tortoisehg/hgqt/merge.py:118
+msgid "Prepare to merge"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:119
+msgid "Verify merge targets and ensure your working directory is clean."
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:128 tortoisehg/hgqt/repomodel.py:592
+#: tortoisehg/hgqt/revpanel.py:158 tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
msgstr "Pas une révision de tête !"
-#: tortoisehg/hgqt/merge.py:237
+#: tortoisehg/hgqt/merge.py:135
msgid "Merge from (other revision)"
msgstr "Fusion depuis (une autre révision)"
-#: tortoisehg/hgqt/merge.py:245 tortoisehg/hgtk/merge.py:47
-#: tortoisehg/hgtk/merge.py:60
+#: tortoisehg/hgqt/merge.py:140 tortoisehg/hgqt/merge.py:648
+#: tortoisehg/hgtk/merge.py:47 tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr "Impossible de fusionner"
-#: tortoisehg/hgqt/merge.py:246
+#: tortoisehg/hgqt/merge.py:141 tortoisehg/hgqt/merge.py:649
msgid "Merge revision not specified or not found"
msgstr "Révision de fusion non spécifiée ou non trouvée"
-#: tortoisehg/hgqt/merge.py:251
+#: tortoisehg/hgqt/merge.py:147
msgid "Merge to (working directory)"
msgstr "Fusion vers (répertoire de travail)"
-#: tortoisehg/hgqt/merge.py:260
-msgid "Working directory status"
-msgstr "État du répertoire du travail"
-
-#: tortoisehg/hgqt/merge.py:276
-msgid "<a href=\"view\">View changes...</a>"
-msgstr "<a href=\"view\">Voir les changements...</a>"
-
-#: tortoisehg/hgqt/merge.py:282
+#: tortoisehg/hgqt/merge.py:170
msgid ""
"The working directory is already <b>merged</b>. <a "
"href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
@@ -2081,39 +2333,30 @@"href=\"skip\"><b>Continuer</b></a> ou <a "
"href=\"discard\"><b>abandonner</b></a> la fusion existante."
-#: tortoisehg/hgqt/merge.py:291
+#: tortoisehg/hgqt/merge.py:179
msgid ""
"Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
"href=\"discard\"><b>discard</b></a> changes."
msgstr ""
-#: tortoisehg/hgqt/merge.py:304
+#: tortoisehg/hgqt/merge.py:191
msgid "Or use:"
msgstr "Ou utiliser :"
-#: tortoisehg/hgqt/merge.py:307
+#: tortoisehg/hgqt/merge.py:194
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr "Forcer une fusion avec les modifications en suspens (-f/--force)"
-#: tortoisehg/hgqt/merge.py:328 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:208 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr ""
-#: tortoisehg/hgqt/merge.py:348 tortoisehg/hgqt/update.py:252
-#: tortoisehg/hgtk/update.py:237
-msgid "&Merge"
-msgstr "&Fusionner"
-
-#: tortoisehg/hgqt/merge.py:352
-msgid "Merge another revision to the working directory"
-msgstr "Fusionner l'autre révision dans le répertoire de travail"
-
-#: tortoisehg/hgqt/merge.py:369 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:236 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
msgstr "Confirmer l'abandon des changements"
-#: tortoisehg/hgqt/merge.py:370 tortoisehg/hgtk/merge.py:216
+#: tortoisehg/hgqt/merge.py:237 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -2125,261 +2368,215 @@"\n"
"Êtes-vous sûr ?"
-#: tortoisehg/hgqt/merge.py:380
-msgid "Merging..."
-msgstr "Fusion en cours..."
-
-#: tortoisehg/hgqt/merge.py:381
-msgid "All conflicting files will be marked unresolved."
-msgstr "Tous les fichiers en conflit seront marqués non résolus."
-
-#: tortoisehg/hgqt/merge.py:398
-msgid "Cancel merge and discard changes?"
-msgstr "Annuler la fusion et abandonner les changements ?"
-
-#: tortoisehg/hgqt/merge.py:400
-msgid "Discard local changes and restart merge?"
-msgstr "Abandonner les changements locaux et redémarrer la fusion ?"
-
-#: tortoisehg/hgqt/merge.py:403
-msgid "Confirm Clean Up"
-msgstr "Confirmer le nettoyage"
-
-#: tortoisehg/hgqt/merge.py:406
-msgid "Canceling merge...\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:407
-msgid "(Please close any running merge tools)\n"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:427
-msgid "Merge failed"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:427
-msgid "Returning to first page"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:483
-msgid "Rename Patch"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:484
-msgid "Input a new patch name:"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:492
-#, python-format
-msgid ""
-"The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "
-"href=\"rename:%(new)s\"><b>Rename</b></a> again?"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:547
-msgid "<b>Uncommitted local changes are detected</b>"
-msgstr "<b>Changements locaux non commités détectés</b>"
-
-#: tortoisehg/hgqt/merge.py:552
+#: tortoisehg/hgqt/merge.py:290
msgctxt "working dir state"
msgid "Clean"
msgstr "Propre"
-#: tortoisehg/hgqt/merge.py:581 tortoisehg/hgtk/commit.py:237
-#: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481
-#: tortoisehg/hgtk/history.py:1223
-msgid "Parents"
-msgstr "Parents"
-
-#: tortoisehg/hgqt/merge.py:585 tortoisehg/hgqt/repomodel.py:538
-#: tortoisehg/hgqt/repomodel.py:540 tortoisehg/hgqt/shelve.py:24
-#: tortoisehg/hgqt/thgimport.py:87
-msgid "Working Directory"
-msgstr "Répertoire de travail"
-
-#: tortoisehg/hgqt/merge.py:623
-msgid "Working Directory (merged)"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:632
-msgid "Commit message"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:642 tortoisehg/hgtk/commit.py:823
-msgid "Merge "
-msgstr "Fusion "
-
-#: tortoisehg/hgqt/merge.py:646
+#: tortoisehg/hgqt/merge.py:340
+msgid "Merging..."
+msgstr "Fusion en cours..."
+
+#: tortoisehg/hgqt/merge.py:354
+msgid "Automatically advance to next page when merge is complete."
+msgstr ""
+"Avancer automatiquement à la page suivante lorsque la fusion est terminée."
+
+#: tortoisehg/hgqt/merge.py:399
+#, python-format
+msgid ""
+"%d files were modified on both branches and must be <a "
+"href=\"resolve\"><b>resolved</b></a>"
+msgstr ""
+"%d fichiers sont modifiés dans les deux branches et doivent être <a "
+"href=\"resolve\"><b>résolus</b></a>"
+
+#: tortoisehg/hgqt/merge.py:438
+msgid "Commit merge results"
+msgstr ""
+
+#: tortoisehg/hgqt/merge.py:539 tortoisehg/hgtk/merge.py:135
+msgid "Merge"
+msgstr "Fusionner"
+
+#: tortoisehg/hgqt/merge.py:543
#, python-format
msgid "Merge with %s"
msgstr "Fusion avec %s"
-#: tortoisehg/hgqt/merge.py:672 tortoisehg/hgqt/workbench.py:244
-msgid "&Commit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:678 tortoisehg/hgqt/qscilib.py:174
-#: tortoisehg/hgtk/merge.py:137
-msgid "Undo"
-msgstr "Annuler"
-
-#: tortoisehg/hgqt/merge.py:688
-msgid "Commit merged files"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:692
-msgid "Committing..."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:693
-msgid "Please wait while committing merged files."
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:718
-msgid ""
-"There were <b>merge conflicts</b> that must be <a "
-"href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:723
-msgid "No merge conflicts, ready to commit"
-msgstr ""
-
-#: tortoisehg/hgqt/merge.py:778
+#: tortoisehg/hgqt/merge.py:606
msgid "Merge changeset"
msgstr "Fusionner la révision"
-#: tortoisehg/hgqt/mq.py:86 tortoisehg/hgtk/thgmq.py:125
+#: tortoisehg/hgqt/mq.py:36
+msgid "### patch name ###"
+msgstr "### nom du patch ###"
+
+#: tortoisehg/hgqt/mq.py:58
+msgid "Patch Name Required"
+msgstr "Nom de patch requis"
+
+#: tortoisehg/hgqt/mq.py:59
+msgid "You must enter a patch name"
+msgstr "Vous devez entrer un nom de patch"
+
+#: tortoisehg/hgqt/mq.py:98 tortoisehg/hgtk/commit.py:226
+#: tortoisehg/hgtk/commit.py:308 tortoisehg/hgtk/history.py:258
+#: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111
+msgid "Patch Queue"
+msgstr "Patch Queue"
+
+#: tortoisehg/hgqt/mq.py:114
+msgctxt "MQ QPush"
+msgid "Push all"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:115 tortoisehg/hgtk/thgmq.py:125
msgid "Apply all patches"
msgstr "Appliquer tous les patches"
-#: tortoisehg/hgqt/mq.py:89
+#: tortoisehg/hgqt/mq.py:117
+msgctxt "MQ QPush"
+msgid "Push"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:118
msgid "Apply one patch"
msgstr "Appliquer un patch"
-#: tortoisehg/hgqt/mq.py:92
+#: tortoisehg/hgqt/mq.py:120
+msgid "Guards"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:121
msgid "Configure guards for selected patch"
msgstr "Configurer les gardes pour le patch sélectionné"
-#: tortoisehg/hgqt/mq.py:95
-msgid "Apply selected patch next (change queue order)"
-msgstr "Appliquer le prochain patch sélectionné (change l'ordre de la queue)"
-
-#: tortoisehg/hgqt/mq.py:98
+#: tortoisehg/hgqt/mq.py:123 tortoisehg/hgqt/mq.py:124
+msgid "Reorder patches"
+msgstr "Réordonner les patches"
+
+#: tortoisehg/hgqt/mq.py:126 tortoisehg/hgqt/qqueue.py:97
+#: tortoisehg/hgqt/qscilib.py:185 tortoisehg/hgqt/shelve.py:68
+#: tortoisehg/hgqt/shelve.py:97
+msgid "Delete"
+msgstr "Supprimer"
+
+#: tortoisehg/hgqt/mq.py:127
msgid "Delete selected patches"
msgstr "Supprimer les patches sélectionnés"
-#: tortoisehg/hgqt/mq.py:101
+#: tortoisehg/hgqt/mq.py:129
+msgid "Pop"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:130
msgid "Unapply one patch"
msgstr "Dé-appliquer un patch"
-#: tortoisehg/hgqt/mq.py:104 tortoisehg/hgtk/thgmq.py:110
+#: tortoisehg/hgqt/mq.py:132
+msgid "Pop all"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:133 tortoisehg/hgtk/thgmq.py:110
msgid "Unapply all patches"
msgstr "Dé-appliquer tous les patches"
-#: tortoisehg/hgqt/mq.py:138
+#: tortoisehg/hgqt/mq.py:134
+msgid "Patch Queue Actions Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:248 tortoisehg/hgqt/mq.py:753
+#, python-format
+msgid "%s had rejected chunks, edit patched file together with rejects?"
+msgstr ""
+"%s a des morceaux rejetés, éditer le fichier patché avec les rejets ?"
+
+#: tortoisehg/hgqt/mq.py:338 tortoisehg/hgqt/mq.py:787
+#: tortoisehg/hgqt/repowidget.py:1289
+msgid ""
+"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
+"them.<br><br>Continue?</p>"
+msgstr ""
+"<p>ATTENTION !<br>Garde ou commentaire trouvé.<br>Organiser les patches les "
+"détruirons.<br><br>Continuer ?</p>"
+
+#: tortoisehg/hgqt/mq.py:359
+msgid "Configure guards"
+msgstr "Configurer les gardes"
+
+#: tortoisehg/hgqt/mq.py:360
+#, python-format
+msgid "Input new guards for %s:"
+msgstr "Entrer de nouvelles gardes pour %s :"
+
+#: tortoisehg/hgqt/mq.py:370
+msgid "Guards must begin with \"+\" or \"-\""
+msgstr "Les gardes doivent commencer par \"+\" ou \"-\""
+
+#: tortoisehg/hgqt/mq.py:512
+msgid "no guards"
+msgstr "aucune garde"
+
+#: tortoisehg/hgqt/mq.py:551 tortoisehg/hgqt/mq.py:1017
+#, python-format
+msgid "Guards: %d/%d"
+msgstr "Gardes : %d/%d"
+
+#: tortoisehg/hgqt/mq.py:613
+msgid "Queues"
+msgstr ""
+
+#: tortoisehg/hgqt/mq.py:652
msgid "New Patch"
msgstr "Nouveau patch"
-#: tortoisehg/hgqt/mq.py:159
-msgid "Manage queues"
-msgstr "Gérer les queues"
-
-#: tortoisehg/hgqt/mq.py:162 tortoisehg/hgqt/mq.py:695
-#: tortoisehg/hgtk/commit.py:661
-msgid "QRefresh"
-msgstr "QRefresh"
-
-#: tortoisehg/hgqt/mq.py:201
-msgid "### patch name ###"
-msgstr "### nom du patch ###"
-
-#: tortoisehg/hgqt/mq.py:207
+#: tortoisehg/hgqt/mq.py:706
msgid "TortoiseHg Patch Queue"
msgstr "Queue de patches TortoiseHg"
-#: tortoisehg/hgqt/mq.py:269
-#, python-format
-msgid "%s had rejected chunks, edit patched file together with rejects?"
-msgstr ""
-"%s a des morceaux rejetés, éditer le fichier patché avec les rejets ?"
-
-#: tortoisehg/hgqt/mq.py:360
-msgid "Configure guards"
-msgstr "Configurer les gardes"
-
-#: tortoisehg/hgqt/mq.py:361
-#, python-format
-msgid "Input new guards for %s:"
-msgstr "Entrer de nouvelles gardes pour %s :"
-
-#: tortoisehg/hgqt/mq.py:371
-msgid "Guards must begin with \"+\" or \"-\""
-msgstr "Les gardes doivent commencer par \"+\" ou \"-\""
-
-#: tortoisehg/hgqt/mq.py:497
-msgid "Patch Name Required"
-msgstr "Nom de patch requis"
-
-#: tortoisehg/hgqt/mq.py:498
-msgid "You must enter a patch name"
-msgstr "Vous devez entrer un nom de patch"
-
-#: tortoisehg/hgqt/mq.py:621
-msgid "no guards"
-msgstr "aucune garde"
-
-#: tortoisehg/hgqt/mq.py:649
+#: tortoisehg/hgqt/mq.py:949
msgid "QCommit"
msgstr ""
-#: tortoisehg/hgqt/mq.py:651
+#: tortoisehg/hgqt/mq.py:951
msgid "Create MQ repo"
msgstr "Créer un dépôt MQ"
-#: tortoisehg/hgqt/mq.py:685 tortoisehg/hgtk/commit.py:658
-msgid "QNew"
-msgstr "QNew"
-
-#: tortoisehg/hgqt/mq.py:782
-#, python-format
-msgid "Guards: %d/%d"
-msgstr "Gardes : %d/%d"
-
-#: tortoisehg/hgqt/mq.py:880
+#: tortoisehg/hgqt/mq.py:1116
msgid "Patch commit messages..."
msgstr "Messages de commit de patch..."
-#: tortoisehg/hgqt/mq.py:900
+#: tortoisehg/hgqt/mq.py:1136
msgid "MQ options"
msgstr "Options MQ"
-#: tortoisehg/hgqt/mq.py:906
+#: tortoisehg/hgqt/mq.py:1142
msgid "Force use of git extended diff format (--git)"
msgstr "Forcer l'utilisation du format de diff étendu git (--git)"
-#: tortoisehg/hgqt/mq.py:910
+#: tortoisehg/hgqt/mq.py:1146
msgid "Force push or pop (--force)"
msgstr "Forcer l'empilement ou le dépilement (--force)"
-#: tortoisehg/hgqt/mq.py:914
+#: tortoisehg/hgqt/mq.py:1150
msgid "Apply patch to its recorded parent (--exact)"
msgstr "Appliquer le patch à son parent enregistré (--exact)"
-#: tortoisehg/hgqt/mq.py:918
+#: tortoisehg/hgqt/mq.py:1154
msgid "Update date field with current date (--currentdate)"
msgstr "Mettre à jour le champ de date avec la date actuelle (--currentdate)"
-#: tortoisehg/hgqt/mq.py:922
+#: tortoisehg/hgqt/mq.py:1158
msgid "Specify an explicit date:"
msgstr "Préciser une date explicite :"
-#: tortoisehg/hgqt/mq.py:925
+#: tortoisehg/hgqt/mq.py:1161
msgid "Update author field with current user (--currentuser)"
msgstr ""
"Mettre à jour le champ auteur avec l'utilisateur actuel (--currentuser)"
-#: tortoisehg/hgqt/mq.py:929
+#: tortoisehg/hgqt/mq.py:1165
msgid "Specify an explicit author:"
msgstr "Préciser un auteur explicite :"
@@ -2400,73 +2597,82 @@msgid "Edit Repository URL"
msgstr "Éditer l'URL du dépôt"
-#: tortoisehg/hgqt/pbranch.py:52
+#: tortoisehg/hgqt/pbranch.py:57
msgid "Patch Branch Toolbar"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:59 tortoisehg/hgtk/thgpbranch.py:100
+#: tortoisehg/hgqt/pbranch.py:64 tortoisehg/hgtk/thgpbranch.py:100
msgid "Merge all pending dependencies"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:65 tortoisehg/hgtk/thgpbranch.py:105
+#: tortoisehg/hgqt/pbranch.py:70 tortoisehg/hgtk/thgpbranch.py:105
msgid "Backout current patch branch"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:71 tortoisehg/hgtk/thgpbranch.py:111
+#: tortoisehg/hgqt/pbranch.py:76 tortoisehg/hgtk/thgpbranch.py:111
msgid "Backport part of a changeset to a dependency"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:77 tortoisehg/hgtk/thgpbranch.py:116
+#: tortoisehg/hgqt/pbranch.py:82 tortoisehg/hgtk/thgpbranch.py:116
msgid "Start a new patch branch"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:83 tortoisehg/hgtk/thgpbranch.py:121
+#: tortoisehg/hgqt/pbranch.py:88 tortoisehg/hgtk/thgpbranch.py:121
msgid "Edit patch dependency graph"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:262
+#: tortoisehg/hgqt/pbranch.py:299
msgid "will be closed"
msgstr "va être fermé"
-#: tortoisehg/hgqt/pbranch.py:264 tortoisehg/hgtk/thgpbranch.py:375
+#: tortoisehg/hgqt/pbranch.py:301 tortoisehg/hgtk/thgpbranch.py:375
#, python-format
msgid "needs merge of %i heads\n"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:267 tortoisehg/hgtk/thgpbranch.py:378
+#: tortoisehg/hgqt/pbranch.py:304 tortoisehg/hgtk/thgpbranch.py:378
#, python-format
msgid "needs merge with %s (through %s)\n"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:270 tortoisehg/hgtk/thgpbranch.py:381
+#: tortoisehg/hgqt/pbranch.py:307 tortoisehg/hgtk/thgpbranch.py:381
#, python-format
msgid "needs merge with %s\n"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:272 tortoisehg/hgtk/thgpbranch.py:383
+#: tortoisehg/hgqt/pbranch.py:309 tortoisehg/hgtk/thgpbranch.py:383
#, python-format
msgid "needs update of diff base to tip of %s\n"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:298 tortoisehg/hgqt/qqueue.py:254
+#: tortoisehg/hgqt/pbranch.py:347 tortoisehg/hgqt/qqueue.py:254
#: tortoisehg/hgqt/qqueue.py:272 tortoisehg/hgqt/thread.py:223
#: tortoisehg/hgqt/thread.py:243 tortoisehg/hgtk/dialog.py:34
msgid "TortoiseHg Prompt"
msgstr "Ligne de commande TortoiseHg"
-#: tortoisehg/hgqt/pbranch.py:299 tortoisehg/hgtk/thgpbranch.py:432
+#: tortoisehg/hgqt/pbranch.py:348 tortoisehg/hgtk/thgpbranch.py:432
msgid "New Patch Name"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:392
+#: tortoisehg/hgqt/pbranch.py:480
msgid "&Goto (update workdir)"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:450
+#: tortoisehg/hgqt/pbranch.py:482 tortoisehg/hgqt/update.py:252
+#: tortoisehg/hgtk/update.py:237
+msgid "&Merge"
+msgstr "&Fusionner"
+
+#: tortoisehg/hgqt/pbranch.py:500
+msgid "No patch branch selected"
+msgstr ""
+
+#: tortoisehg/hgqt/pbranch.py:551
msgid "No editor found"
msgstr ""
-#: tortoisehg/hgqt/pbranch.py:451
+#: tortoisehg/hgqt/pbranch.py:552
msgid ""
"Mercurial was unable to find an editor. Please configure Mercurial to use an "
"editor installed on your system."
@@ -2499,7 +2705,7 @@#: tortoisehg/hgqt/postreview.py:110 tortoisehg/hgqt/postreview.py:126
#: tortoisehg/hgqt/postreview.py:343 tortoisehg/hgqt/postreview.py:366
#: tortoisehg/hgqt/postreview.py:378 tortoisehg/hgqt/postreview_ui.py:163
-#: tortoisehg/hgqt/settings.py:560
+#: tortoisehg/hgqt/settings.py:655
msgid "Review Board"
msgstr "ReviewBoard"
@@ -2508,7 +2714,7 @@msgstr "Mot de passe :"
#: tortoisehg/hgqt/postreview.py:127 tortoisehg/hgqt/postreview.py:379
-#: tortoisehg/hgqt/rename.py:43 tortoisehg/hgtk/commit.py:1108
+#: tortoisehg/hgqt/rename.py:43 tortoisehg/hgtk/commit.py:1107
msgid "Error"
msgstr "Erreur"
@@ -2634,7 +2840,7 @@
#: tortoisehg/hgqt/purge.py:152
msgid "Are you sure you want to delete these files and/or folders?"
-msgstr "Voulez-vous supprimer ces fichiers et/ou ces dossiers ?"
+msgstr "Voulez-vous supprimer ces fichiers et/ou ces répertoires ?"
#: tortoisehg/hgqt/purge.py:159
msgid "Deletion failures"
@@ -2643,11 +2849,11 @@#: tortoisehg/hgqt/purge.py:160
#, python-format
msgid "Unable to delete %d files or folders"
-msgstr "Impossible de supprimer %d fichiers ou dossiers"
+msgstr "Impossible de supprimer %d fichiers ou répertoires"
#: tortoisehg/hgqt/purge.py:198
msgid "Deleting trash folder..."
-msgstr ""
+msgstr "Supprimer le répertoire corbeille..."
#: tortoisehg/hgqt/purge.py:237
#, python-format
@@ -2657,7 +2863,7 @@#: tortoisehg/hgqt/purge.py:247
#, python-format
msgid "Deleted %d files and %d folders"
-msgstr "%d fichiers et %d dossiers supprimés"
+msgstr "%d fichiers et %d répertoires supprimés"
#: tortoisehg/hgqt/qdelete.py:24
#, python-format
@@ -2697,7 +2903,7 @@msgid "Patch queues:"
msgstr "Queues de patch :"
-#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:723
+#: tortoisehg/hgqt/qqueue.py:85 tortoisehg/hgqt/settings.py:818
#: tortoisehg/hgtk/thgconfig.py:680
msgid "Reload"
msgstr "Recharger"
@@ -2707,15 +2913,10 @@msgstr "Activer"
#: tortoisehg/hgqt/qqueue.py:94 tortoisehg/hgqt/rename.py:168
-#: tortoisehg/hgqt/reporegistry.py:98 tortoisehg/hgtk/bookmark.py:49
+#: tortoisehg/hgqt/reporegistry.py:373 tortoisehg/hgtk/bookmark.py:49
msgid "Rename"
msgstr "Renommer"
-#: tortoisehg/hgqt/qqueue.py:97 tortoisehg/hgqt/qscilib.py:185
-#: tortoisehg/hgqt/shelve.py:68 tortoisehg/hgqt/shelve.py:97
-msgid "Delete"
-msgstr "Supprimer"
-
#: tortoisehg/hgqt/qqueue.py:100
msgid "Purge"
msgstr "Vider"
@@ -2768,7 +2969,7 @@"<p>Ceci supprimera aussi les fichiers patch sur le disque !</p><p>Voulez-"
"vous vraiment purger la queue de patch '%s' ?</p>"
-#: tortoisehg/hgqt/qqueue.py:343 tortoisehg/hgqt/qreorder.py:226
+#: tortoisehg/hgqt/qqueue.py:343 tortoisehg/hgqt/qreorder.py:229
msgid "Please enable the MQ extension first."
msgstr "Activer d'abord l'extension MQ."
@@ -2782,32 +2983,32 @@msgid "Rename patch <b>%s</b> to:"
msgstr "Renommer le patch <b>%s</b> en :"
-#: tortoisehg/hgqt/qrename.py:84
+#: tortoisehg/hgqt/qrename.py:90
msgid "Could not rename existing patchfile"
msgstr "Ne peut pas renommer le fichier patch existant"
-#: tortoisehg/hgqt/qrename.py:94
+#: tortoisehg/hgqt/qrename.py:100
msgid "Could not delete existing patchfile"
msgstr "Ne peut pas supprimer le fichier patch existant"
-#: tortoisehg/hgqt/qrename.py:110
+#: tortoisehg/hgqt/qrename.py:116
msgid "QRename - Check patchname"
msgstr "QRename - Vérifier le nom du patch"
-#: tortoisehg/hgqt/qrename.py:119
+#: tortoisehg/hgqt/qrename.py:125
#, python-format
msgid "Patch name <b>%s</b> already exists:"
msgstr "Le nom du patch <b>%s</b> existe déjà :"
-#: tortoisehg/hgqt/qrename.py:124
+#: tortoisehg/hgqt/qrename.py:130
msgid "Add .OLD extension to existing patchfile"
msgstr "Ajouter l'extension .OLD au fichier patch existant"
-#: tortoisehg/hgqt/qrename.py:126
+#: tortoisehg/hgqt/qrename.py:132
msgid "Overwrite existing patchfile"
msgstr "Remplacer le fichier patch existant"
-#: tortoisehg/hgqt/qrename.py:128
+#: tortoisehg/hgqt/qrename.py:134
msgid "Go back and change new patchname"
msgstr "Revenir et changer le nouveau nom de patch"
@@ -2827,6 +3028,10 @@msgid "Rename patch"
msgstr "Renommer un patch"
+#: tortoisehg/hgqt/qscilib.py:174 tortoisehg/hgtk/merge.py:137
+msgid "Undo"
+msgstr "Annuler"
+
#: tortoisehg/hgqt/qscilib.py:176
msgid "Redo"
msgstr "Rétablir"
@@ -2896,19 +3101,37 @@msgid "Unable to read/write config file"
msgstr "Impossible de lire/écrire le fichier de configuration"
-#: tortoisehg/hgqt/qtlib.py:79
-msgid "Unable to create a config file"
-msgstr "Impossible de créer un fichier de configuration"
-
-#: tortoisehg/hgqt/qtlib.py:80
-msgid "Insufficient access rights."
-msgstr "Droits d'accès insuffisants."
-
-#: tortoisehg/hgqt/qtlib.py:810
+#: tortoisehg/hgqt/qtlib.py:118 tortoisehg/hgtk/gdialog.py:682
+#: tortoisehg/hgtk/gtklib.py:406
+msgid "No visual editor configured"
+msgstr "Aucun éditeur graphique spécifié"
+
+#: tortoisehg/hgqt/qtlib.py:119 tortoisehg/hgtk/gdialog.py:683
+#: tortoisehg/hgtk/gtklib.py:407
+msgid "Please configure a visual editor."
+msgstr "Veuillez spécifier un éditeur graphique."
+
+#: tortoisehg/hgqt/qtlib.py:131
+msgid "Editor launch failure"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:148
+msgid "No shell configured"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:149
+msgid "A terminal shell must be configured"
+msgstr "Une console doit être configurée"
+
+#: tortoisehg/hgqt/qtlib.py:804
+msgid "Show Log"
+msgstr ""
+
+#: tortoisehg/hgqt/qtlib.py:955
msgid "Please enter a username"
msgstr "Veuillez entrer un nom d'utilisateur"
-#: tortoisehg/hgqt/qtlib.py:811
+#: tortoisehg/hgqt/qtlib.py:956
msgid "You must identify yourself to Mercurial"
msgstr "Vous devez vous identifier à Mercurial"
@@ -2945,7 +3168,7 @@msgid "Checkmark files to remove"
msgstr "Cocher les fichiers à enlever"
-#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:496
+#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:512
#: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:47
#: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
msgid "Remove"
@@ -2999,7 +3222,7 @@msgstr ""
#: tortoisehg/hgqt/rebase.py:98 tortoisehg/hgqt/rebase.py:265
-#: tortoisehg/hgqt/repowidget.py:1233 tortoisehg/hgqt/repowidget.py:1257
+#: tortoisehg/hgqt/repowidget.py:1397 tortoisehg/hgqt/repowidget.py:1421
#: tortoisehg/hgtk/gdialog.py:863
msgid "Abort"
msgstr "Abandonner"
@@ -3078,8 +3301,8 @@msgid "This appears to be a binary file"
msgstr "Ceci semble être un fichier binaire"
-#: tortoisehg/hgqt/rejects.py:199 tortoisehg/hgtk/commit.py:1352
-#: tortoisehg/hgtk/commit.py:1357
+#: tortoisehg/hgqt/rejects.py:199 tortoisehg/hgtk/commit.py:1351
+#: tortoisehg/hgtk/commit.py:1356
msgid "Warning"
msgstr "Attention"
@@ -3227,223 +3450,346 @@msgstr "Afficher uniquement le graphe de la branche nommée"
#: tortoisehg/hgqt/repofilter.py:209
+msgid "Display only active branches"
+msgstr ""
+
+#: tortoisehg/hgqt/repofilter.py:212
msgid "Display closed branches"
msgstr "Afficher les branches fermées"
-#: tortoisehg/hgqt/repofilter.py:212
+#: tortoisehg/hgqt/repofilter.py:215
msgid "Include all ancestors"
msgstr "Inclure tous les ancêtres"
-#: tortoisehg/hgqt/repomodel.py:39
+#: tortoisehg/hgqt/repomodel.py:42
msgctxt "column header"
msgid "Graph"
msgstr "Graphe"
-#: tortoisehg/hgqt/repomodel.py:40
+#: tortoisehg/hgqt/repomodel.py:43
msgctxt "column header"
msgid "Rev"
msgstr "Rev"
-#: tortoisehg/hgqt/repomodel.py:41
+#: tortoisehg/hgqt/repomodel.py:44
msgctxt "column header"
msgid "Branch"
msgstr "Branche"
-#: tortoisehg/hgqt/repomodel.py:42
+#: tortoisehg/hgqt/repomodel.py:45
msgctxt "column header"
msgid "Description"
msgstr "Description"
-#: tortoisehg/hgqt/repomodel.py:43
+#: tortoisehg/hgqt/repomodel.py:46
msgctxt "column header"
msgid "Author"
msgstr "Auteur"
-#: tortoisehg/hgqt/repomodel.py:44
+#: tortoisehg/hgqt/repomodel.py:47
msgctxt "column header"
msgid "Tags"
msgstr "Étiquettes"
-#: tortoisehg/hgqt/repomodel.py:45
+#: tortoisehg/hgqt/repomodel.py:48
msgctxt "column header"
msgid "Node"
msgstr "Nœud"
-#: tortoisehg/hgqt/repomodel.py:46
+#: tortoisehg/hgqt/repomodel.py:49
msgctxt "column header"
msgid "Age"
msgstr "Âge"
-#: tortoisehg/hgqt/repomodel.py:47
+#: tortoisehg/hgqt/repomodel.py:50
msgctxt "column header"
msgid "Local Time"
msgstr "Heure locale"
-#: tortoisehg/hgqt/repomodel.py:48
+#: tortoisehg/hgqt/repomodel.py:51
msgctxt "column header"
msgid "UTC Time"
msgstr "Heure UTC"
-#: tortoisehg/hgqt/repomodel.py:49
+#: tortoisehg/hgqt/repomodel.py:52
msgctxt "column header"
msgid "Changes"
msgstr "Changements"
-#: tortoisehg/hgqt/repomodel.py:203
+#: tortoisehg/hgqt/repomodel.py:206
#, python-format
msgid "filling (%d)"
msgstr ""
-#: tortoisehg/hgqt/repomodel.py:531
+#: tortoisehg/hgqt/repomodel.py:579
msgid "Mercurial User"
msgstr "Utilisateur Mercurial"
-#: tortoisehg/hgqt/reporegistry.py:92 tortoisehg/hgqt/webconf_ui.py:76
+#: tortoisehg/hgqt/reporegistry.py:177 tortoisehg/hgqt/reporegistry.py:585
+#, python-format
+msgid "Unsupported repository type (%s)"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:178 tortoisehg/hgqt/reporegistry.py:586
+msgid "Cannot open non mercurial repositories or subrepositories"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:220
+msgid "Repository Registry"
+msgstr "Registre des dépôts"
+
+#: tortoisehg/hgqt/reporegistry.py:365
+msgid "Refresh repository list"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:366
+msgid "Refresh the Repository Registry list"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:367 tortoisehg/hgqt/webconf_ui.py:76
msgid "Open"
msgstr "Ouvrir"
-#: tortoisehg/hgqt/reporegistry.py:93
+#: tortoisehg/hgqt/reporegistry.py:368
msgid "Open the repository in a new tab"
msgstr "Ouvrir le dépôt dans un nouvel onglet"
-#: tortoisehg/hgqt/reporegistry.py:94
+#: tortoisehg/hgqt/reporegistry.py:369
msgid "Open All"
msgstr "Tout ouvrir"
-#: tortoisehg/hgqt/reporegistry.py:95
+#: tortoisehg/hgqt/reporegistry.py:370
msgid "Open all repositories in new tabs"
msgstr "Ouvrir tous les dépôts dans de nouveaux onglets"
-#: tortoisehg/hgqt/reporegistry.py:96 tortoisehg/hgqt/reporegistry.py:163
+#: tortoisehg/hgqt/reporegistry.py:371 tortoisehg/hgqt/reporegistry.py:597
msgid "New Group"
msgstr "Nouveau groupe"
-#: tortoisehg/hgqt/reporegistry.py:97
+#: tortoisehg/hgqt/reporegistry.py:372
msgid "Create a new group"
msgstr "Créer un nouveau groupe"
-#: tortoisehg/hgqt/reporegistry.py:99
+#: tortoisehg/hgqt/reporegistry.py:374
msgid "Rename the entry"
msgstr "Renommer l'entrée"
-#: tortoisehg/hgqt/reporegistry.py:100
+#: tortoisehg/hgqt/reporegistry.py:375
msgid "Settings..."
msgstr "Paramètres..."
-#: tortoisehg/hgqt/reporegistry.py:101
+#: tortoisehg/hgqt/reporegistry.py:376
msgid "View the repository's settings"
msgstr "Voir les paramètres du dépôt"
-#: tortoisehg/hgqt/reporegistry.py:102
+#: tortoisehg/hgqt/reporegistry.py:377
msgid "Remove from registry"
msgstr "Enlever du registre"
-#: tortoisehg/hgqt/reporegistry.py:103
+#: tortoisehg/hgqt/reporegistry.py:378
msgid ""
"Remove the node and all its subnodes. Repositories are not deleted from disk."
msgstr ""
"Enlever le nœud et tous ses sous-nœuds. Les dépôts ne sont pas supprimés du "
"disque."
-#: tortoisehg/hgqt/reporegistry.py:106 tortoisehg/util/menuthg.py:25
+#: tortoisehg/hgqt/reporegistry.py:381 tortoisehg/util/menuthg.py:25
msgid "Clone..."
msgstr "Cloner..."
-#: tortoisehg/hgqt/reporegistry.py:107
+#: tortoisehg/hgqt/reporegistry.py:382
msgid "Clone Repository"
msgstr "Cloner le dépôt"
-#: tortoisehg/hgqt/reporegistry.py:108 tortoisehg/hgqt/sync.py:494
-#: tortoisehg/hgqt/workbench.py:292
+#: tortoisehg/hgqt/reporegistry.py:383 tortoisehg/hgqt/sync.py:510
+#: tortoisehg/hgqt/workbench.py:328
msgid "Explore"
msgstr "Explorer"
-#: tortoisehg/hgqt/reporegistry.py:109
-msgid "Open the repository in Windows Explorer"
-msgstr ""
-
-#: tortoisehg/hgqt/reporegistry.py:110 tortoisehg/hgqt/sync.py:495
-#: tortoisehg/hgqt/workbench.py:295
+#: tortoisehg/hgqt/reporegistry.py:384
+msgid "Open the repository in a file browser"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:385 tortoisehg/hgqt/sync.py:511
+#: tortoisehg/hgqt/workbench.py:331
msgid "Terminal"
msgstr "Console"
-#: tortoisehg/hgqt/reporegistry.py:111
-msgid "Open a shell terminal in repository root"
-msgstr "Ouvrir une console à la racine du dépôt"
-
-#: tortoisehg/hgqt/reporegistry.py:112
+#: tortoisehg/hgqt/reporegistry.py:386
+msgid "Open a shell terminal in the repository root"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:387
msgid "Add repository..."
msgstr "Ajouter un dépôt..."
-#: tortoisehg/hgqt/reporegistry.py:113
+#: tortoisehg/hgqt/reporegistry.py:388
msgid "Add a repository to this group"
msgstr "Ajouter un dépôt à ce groupe"
-#: tortoisehg/hgqt/reporegistry.py:223
-msgid "Repository Registry"
-msgstr "Registre des dépôts"
-
-#: tortoisehg/hgqt/repotreeitem.py:236
-#, python-format
-msgid "Local Repository %s"
-msgstr "Dépôt local %s"
-
-#: tortoisehg/hgqt/repotreeitem.py:291 tortoisehg/hgqt/wctxactions.py:302
+#: tortoisehg/hgqt/reporegistry.py:389
+msgid "Add a subrepository..."
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:390
+msgid "Convert an existing repository into a subrepository"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:392 tortoisehg/hgqt/wctxactions.py:44
+msgid "Copy path"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:393
+msgid "Copy the root path of the repository to the clipboard"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:449
+msgid "Select repository directory to add"
+msgstr "Sélectionneer un dépôt à ajouter"
+
+#: tortoisehg/hgqt/reporegistry.py:460 tortoisehg/hgqt/reporegistry.py:508
+#: tortoisehg/hgqt/reporegistry.py:524 tortoisehg/hgqt/reporegistry.py:549
+#: tortoisehg/hgqt/reporegistry.py:555
+msgid "Failed to add repository"
+msgstr "Échec lors de l'ajout du dépôt"
+
+#: tortoisehg/hgqt/reporegistry.py:461 tortoisehg/hgqt/workbench.py:761
+#, python-format
+msgid "%s is not a valid repository"
+msgstr "%s n'est pas un dépôt valide"
+
+#: tortoisehg/hgqt/reporegistry.py:467
+msgid "Select an existing repository to add as a subrepo"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:485
+msgid "Cannot open repository"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:486
+#, python-format
+msgid "The selected repository:<br><br>%s<br><br>cannot be open!"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:491
+msgid "Subrepository already exists"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:492
+#, python-format
+msgid ""
+"The selected repository:<br><br>%s<br><br>is already a subrepository "
+"of:<br><br>%s<br><br>as: \"%s\""
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:509
+#, python-format
+msgid "Cannot open the .hgsub file in:<br><br>%s"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:525
+#, python-format
+msgid "The .hgsub file already contains the line:<br><br>%s"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:540
+msgid "Subrepo added to .hgsub file"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:541
+#, python-format
+msgid ""
+"The selected subrepo:<br><br><i>%s</i><br><br>has been added to the .hgsub "
+"file.<br><br>Remember that in order to finish adding the subrepo<br><i>you "
+"must still commit</i> the .hgsub file changes."
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:550
+#, python-format
+msgid "Cannot update the .hgsub file in:<br><br>%s"
+msgstr ""
+
+#: tortoisehg/hgqt/reporegistry.py:556
+#, python-format
+msgid "\"%s\" is not a valid repository inside \"%s\""
+msgstr "\"%s\" n'est pas un dépôt valide dans \"%s\""
+
+#: tortoisehg/hgqt/reporegistry.py:603 tortoisehg/hgqt/wctxactions.py:297
msgid "&Delete"
msgstr "Supprimer"
-#: tortoisehg/hgqt/repotreeitem.py:294 tortoisehg/hgtk/thgmq.py:372
+#: tortoisehg/hgqt/reporegistry.py:605 tortoisehg/hgtk/thgmq.py:372
#: tortoisehg/hgtk/thgmq.py:376 tortoisehg/hgtk/thgshelve.py:224
msgid "Confirm Delete"
msgstr "Confirmer la suppression"
-#: tortoisehg/hgqt/repotreeitem.py:295
+#: tortoisehg/hgqt/reporegistry.py:606
#, python-format
msgid "Delete Group '%s' and all its entries?"
msgstr "Supprimer le groupe '%s' et toutes ses entrées ?"
-#: tortoisehg/hgqt/repotreeitem.py:311
+#: tortoisehg/hgqt/repotreeitem.py:246
+#, python-format
+msgid "Local Repository %s"
+msgstr "Dépôt local %s"
+
+#: tortoisehg/hgqt/repotreeitem.py:308
+msgid "Unable to update repository name"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreeitem.py:309
+#, python-format
+msgid "An error occurred while updating the repository hgrc file (%s)"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreeitem.py:485
msgid "default"
msgstr "par défaut"
-#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:399
-#: tortoisehg/hgqt/sync.py:208 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/repotreemodel.py:163 tortoisehg/hgqt/resolve.py:399
+#: tortoisehg/hgqt/sync.py:220 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr "Chemin"
-#: tortoisehg/hgqt/repotreemodel.py:209
-msgid "Select repository directory to add"
-msgstr "Sélectionneer un dépôt à ajouter"
-
-#: tortoisehg/hgqt/repotreemodel.py:222
-msgid "Failed to add repository"
-msgstr "Échec lors de l'ajout du dépôt"
-
-#: tortoisehg/hgqt/repotreemodel.py:223 tortoisehg/hgqt/workbench.py:600
-#, python-format
-msgid "%s is not a valid repository"
-msgstr "%s n'est pas un dépôt valide"
-
-#: tortoisehg/hgqt/repoview.py:197
+#: tortoisehg/hgqt/repotreemodel.py:273
+msgid "Could not get subrepository list"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreemodel.py:274
+#, python-format
+msgid ""
+"It was not possible to get the subrepository list for the repository "
+"in:<br><br><i>%s</i>"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreemodel.py:277
+msgid "Could not open some subrepositories"
+msgstr ""
+
+#: tortoisehg/hgqt/repotreemodel.py:278
+#, python-format
+msgid ""
+"It was not possible to fully load the subrepository list for the repository "
+"in:<br><br><i>%s</i><br><br>The following subrepositories may be missing, "
+"broken or on an inconsistent state and cannot be accessed:<br><br><i>%s</i>"
+msgstr ""
+
+#: tortoisehg/hgqt/repoview.py:95
+msgid "Choose log columns..."
+msgstr ""
+
+#: tortoisehg/hgqt/repoview.py:240
#, python-format
msgid "Goto ancestor of %s and %s"
msgstr "Aller à l'ancêtre de %s et %s"
-#: tortoisehg/hgqt/repoview.py:233
+#: tortoisehg/hgqt/repoview.py:276
#, python-format
msgid "Can't find revision '%s'"
msgstr "Impossible de trouver la révision '%s'"
-#: tortoisehg/hgqt/repowidget.py:104
-msgid "Pull incoming changesets into your repository"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:107 tortoisehg/hgtk/history.py:1881
-msgid "Reject"
-msgstr "Rejeter"
-
-#: tortoisehg/hgqt/repowidget.py:108
-msgid "Reject incoming changesets"
+#: tortoisehg/hgqt/repowidget.py:125
+msgid "Workbench Log Columns"
msgstr ""
#: tortoisehg/hgqt/repowidget.py:159
@@ -3451,92 +3797,121 @@msgid "Revision details"
msgstr "Détails de révision"
-#: tortoisehg/hgqt/repowidget.py:163
+#: tortoisehg/hgqt/repowidget.py:164
msgctxt "tab tooltip"
msgid "Commit"
msgstr "Commit"
-#: tortoisehg/hgqt/repowidget.py:167
+#: tortoisehg/hgqt/repowidget.py:169
+msgctxt "tab tooltip"
+msgid "MQ Patch"
+msgstr "Patch MQ"
+
+#: tortoisehg/hgqt/repowidget.py:177
msgctxt "tab tooltip"
msgid "Synchronize"
msgstr "Synchroniser"
-#: tortoisehg/hgqt/repowidget.py:171
+#: tortoisehg/hgqt/repowidget.py:182
msgctxt "tab tooltip"
msgid "Manifest"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:175
+#: tortoisehg/hgqt/repowidget.py:187
msgctxt "tab tooltip"
msgid "Search"
msgstr "Rechercher"
-#: tortoisehg/hgqt/repowidget.py:180
-msgctxt "tab tooltip"
-msgid "Patch Queue"
-msgstr "Queue de patch"
-
-#: tortoisehg/hgqt/repowidget.py:188
+#: tortoisehg/hgqt/repowidget.py:192
msgctxt "tab tooltip"
msgid "Patch Branch"
msgstr "Branche de patch"
-#: tortoisehg/hgqt/repowidget.py:201
+#: tortoisehg/hgqt/repowidget.py:205
#, python-format
msgid "%s <incoming>"
msgstr "%s <entrant>"
-#: tortoisehg/hgqt/repowidget.py:508
+#: tortoisehg/hgqt/repowidget.py:363
+msgid "Found incoming changesets"
+msgstr "Révisions entrantes trouvées"
+
+#: tortoisehg/hgqt/repowidget.py:366
+msgid "Pull incoming changesets into your repository"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:368 tortoisehg/hgtk/history.py:1881
+msgid "Reject"
+msgstr "Rejeter"
+
+#: tortoisehg/hgqt/repowidget.py:369
+msgid "Reject incoming changesets"
+msgstr "Rejeter les révisions entrantes"
+
+#: tortoisehg/hgqt/repowidget.py:457 tortoisehg/hgqt/sync.py:889
+#: tortoisehg/hgtk/history.py:2021
+#, python-format
+msgid "%d outgoing changesets"
+msgstr "%d révisions sortantes"
+
+#: tortoisehg/hgqt/repowidget.py:459 tortoisehg/hgqt/repowidget.py:1081
+#: tortoisehg/hgqt/workbench.py:371 tortoisehg/hgtk/history.py:444
+#: tortoisehg/hgtk/history.py:2069 tortoisehg/hgtk/synch.py:73
+msgid "Push"
+msgstr "Publier"
+
+#: tortoisehg/hgqt/repowidget.py:586
#, python-format
msgid "%s - verify repository"
msgstr "%s - vérifier le dépôt"
-#: tortoisehg/hgqt/repowidget.py:515
+#: tortoisehg/hgqt/repowidget.py:593
#, python-format
msgid "%s - recover repository"
msgstr "%s - récupérer le dépôt"
-#: tortoisehg/hgqt/repowidget.py:531
+#: tortoisehg/hgqt/repowidget.py:609
msgid "No transaction available"
msgstr "Aucune transaction disponible"
-#: tortoisehg/hgqt/repowidget.py:532
+#: tortoisehg/hgqt/repowidget.py:610
msgid "There is no rollback transaction available"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:535 tortoisehg/hgtk/commit.py:1035
+#: tortoisehg/hgqt/repowidget.py:613 tortoisehg/hgtk/commit.py:1034
msgid "Undo last commit?"
msgstr "Défaire le dernier commit ?"
-#: tortoisehg/hgqt/repowidget.py:536
+#: tortoisehg/hgqt/repowidget.py:614
#, python-format
msgid "Undo most recent commit (%d), preserving file changes?"
msgstr ""
"Défaire le commit le plus récent (%d) en gardant les modifications de "
"fichier ?"
-#: tortoisehg/hgqt/repowidget.py:540
+#: tortoisehg/hgqt/repowidget.py:618
msgid "Undo last transaction?"
msgstr "Défaire la dernière transaction ?"
-#: tortoisehg/hgqt/repowidget.py:541
+#: tortoisehg/hgqt/repowidget.py:619
#, python-format
msgid "Rollback to revision %d (undo %s)?"
msgstr "Revenir à la révision %d (défaire %s) ?"
-#: tortoisehg/hgqt/repowidget.py:547 tortoisehg/hgqt/run.py:473
+#: tortoisehg/hgqt/repowidget.py:625 tortoisehg/hgqt/repowidget.py:1186
+#: tortoisehg/hgqt/run.py:489
msgid "Repository Error"
msgstr "Erreur dans le dépôt"
-#: tortoisehg/hgqt/repowidget.py:548
+#: tortoisehg/hgqt/repowidget.py:626
msgid "Unable to determine working copy revision\n"
msgstr "Impossible de déterminer la révision de la copie de travail\n"
-#: tortoisehg/hgqt/repowidget.py:552
+#: tortoisehg/hgqt/repowidget.py:630
msgid "Remove current working revision?"
msgstr "Supprimer la revision de travail actuelle ?"
-#: tortoisehg/hgqt/repowidget.py:553
+#: tortoisehg/hgqt/repowidget.py:631
#, python-format
msgid ""
"Your current working revision (%d) will be removed by this rollback, leaving "
@@ -3544,207 +3919,235 @@" Continue?"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:674
+#: tortoisehg/hgqt/repowidget.py:775
msgid "Repository stripped, incoming preview cleared"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:679
+#: tortoisehg/hgqt/repowidget.py:780
msgid "Repository stripped, revision set cleared"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:795
+#: tortoisehg/hgqt/repowidget.py:905
msgid "Commit tab cannot exit"
msgstr "L'onglet de commit ne peut pas terminer"
-#: tortoisehg/hgqt/repowidget.py:799
+#: tortoisehg/hgqt/repowidget.py:909
msgid "Sync tab cannot exit"
msgstr "L'onglet de synchronisation ne peut pas terminer"
-#: tortoisehg/hgqt/repowidget.py:803
+#: tortoisehg/hgqt/repowidget.py:914
msgid "MQ tab cannot exit"
msgstr "L'onglet MQ ne peut pas terminer"
-#: tortoisehg/hgqt/repowidget.py:807
+#: tortoisehg/hgqt/repowidget.py:918
msgid "Search tab cannot exit"
msgstr "L'onglet de recherche ne peut pas terminer"
-#: tortoisehg/hgqt/repowidget.py:810
+#: tortoisehg/hgqt/repowidget.py:921
msgid "Repository command still running"
msgstr "Une commande est en cours d'exécution"
-#: tortoisehg/hgqt/repowidget.py:968 tortoisehg/util/menuthg.py:58
+#: tortoisehg/hgqt/repowidget.py:1082
+msgid "Push all"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1084
+msgid "Push to here"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1086
+msgid "Push selected branch"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1089 tortoisehg/util/menuthg.py:58
msgid "Update..."
msgstr "Mise à jour..."
-#: tortoisehg/hgqt/repowidget.py:971 tortoisehg/hgqt/repowidget.py:1195
-msgid "Visual diff..."
-msgstr "Diff visuel..."
-
-#: tortoisehg/hgqt/repowidget.py:973
-msgid "Diff to local..."
-msgstr "Diff avec la version locale..."
-
-#: tortoisehg/hgqt/repowidget.py:975
+#: tortoisehg/hgqt/repowidget.py:1096
msgid "Browse at rev..."
msgstr "Parcourir à la révision..."
-#: tortoisehg/hgqt/repowidget.py:978
+#: tortoisehg/hgqt/repowidget.py:1099
msgid "Merge with local..."
msgstr "Fusionner avec la version locale..."
-#: tortoisehg/hgqt/repowidget.py:981
+#: tortoisehg/hgqt/repowidget.py:1102
msgid "Tag..."
msgstr "Étiquette..."
-#: tortoisehg/hgqt/repowidget.py:983
+#: tortoisehg/hgqt/repowidget.py:1104
msgid "Bookmark..."
msgstr "Signet..."
-#: tortoisehg/hgqt/repowidget.py:986 tortoisehg/hgtk/history.py:1290
+#: tortoisehg/hgqt/repowidget.py:1107 tortoisehg/hgtk/history.py:1290
msgid "Backout..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:990 tortoisehg/hgtk/history.py:1293
+#: tortoisehg/hgqt/repowidget.py:1111 tortoisehg/hgtk/history.py:1293
msgid "Export"
msgstr "Exporter"
-#: tortoisehg/hgqt/repowidget.py:991
+#: tortoisehg/hgqt/repowidget.py:1112
msgid "Export patch..."
msgstr "Exporter un patch..."
-#: tortoisehg/hgqt/repowidget.py:993
+#: tortoisehg/hgqt/repowidget.py:1114
msgid "Email patch..."
msgstr "Exporter par courriel..."
-#: tortoisehg/hgqt/repowidget.py:995
+#: tortoisehg/hgqt/repowidget.py:1116
msgid "Archive..."
msgstr "Archiver..."
-#: tortoisehg/hgqt/repowidget.py:997 tortoisehg/hgqt/wctxactions.py:46
+#: tortoisehg/hgqt/repowidget.py:1118
+msgid "Bundle rev to tip..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1120 tortoisehg/hgqt/wctxactions.py:42
msgid "Copy patch"
msgstr "Copier un patch"
-#: tortoisehg/hgqt/repowidget.py:1001
+#: tortoisehg/hgqt/repowidget.py:1124
msgid "Copy hash"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1005
+#: tortoisehg/hgqt/repowidget.py:1128
msgid "Transplant to local"
msgstr "Transplanter vers la version locale"
-#: tortoisehg/hgqt/repowidget.py:1009
+#: tortoisehg/hgqt/repowidget.py:1132
msgid "Modify history"
msgstr "Modifier l'historique"
-#: tortoisehg/hgqt/repowidget.py:1010 tortoisehg/hgqt/repowidget.py:1149
-msgid "QGoto"
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1012
+#: tortoisehg/hgqt/repowidget.py:1133
+msgid "Unapply patch (QGoto parent)"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1135
msgid "Import to MQ"
msgstr "Importer dans MQ"
-#: tortoisehg/hgqt/repowidget.py:1014
+#: tortoisehg/hgqt/repowidget.py:1137
msgid "Finish patch"
msgstr "Finir le patch"
-#: tortoisehg/hgqt/repowidget.py:1017
+#: tortoisehg/hgqt/repowidget.py:1139 tortoisehg/hgqt/repowidget.py:1315
+msgid "Rename patch..."
+msgstr "Renommer le patch..."
+
+#: tortoisehg/hgqt/repowidget.py:1142
msgid "Rebase..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1020
+#: tortoisehg/hgqt/repowidget.py:1145
msgid "Strip..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1023
+#: tortoisehg/hgqt/repowidget.py:1148
msgid "Post to Review Board..."
msgstr "Poster dans Review Board..."
-#: tortoisehg/hgqt/repowidget.py:1078
+#: tortoisehg/hgqt/repowidget.py:1151
+msgid "Remote Update..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1176
+msgid "Write diff file"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1187
+msgid "Unable to write diff file"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1231
msgid "Unable to compress history"
msgstr "Impossible de compresser l'historique"
-#: tortoisehg/hgqt/repowidget.py:1079
+#: tortoisehg/hgqt/repowidget.py:1232
msgid "Selected changeset pair not related"
msgstr "Les révisions sélectionnées ne sont pas liées"
-#: tortoisehg/hgqt/repowidget.py:1087
+#: tortoisehg/hgqt/repowidget.py:1240
msgid "Visual Diff..."
msgstr "Diff visuel..."
-#: tortoisehg/hgqt/repowidget.py:1088 tortoisehg/hgqt/repowidget.py:1170
+#: tortoisehg/hgqt/repowidget.py:1241
+msgid "Export Diff..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1243 tortoisehg/hgqt/repowidget.py:1332
msgid "Export Selected..."
msgstr "Exporter les révisions sélectionnées..."
-#: tortoisehg/hgqt/repowidget.py:1089 tortoisehg/hgqt/repowidget.py:1171
+#: tortoisehg/hgqt/repowidget.py:1244 tortoisehg/hgqt/repowidget.py:1333
msgid "Email Selected..."
msgstr "Envoyer par courriel les révisions sélectionnées..."
-#: tortoisehg/hgqt/repowidget.py:1090
+#: tortoisehg/hgqt/repowidget.py:1246
msgid "Export DAG Range..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1091
+#: tortoisehg/hgqt/repowidget.py:1247
msgid "Email DAG Range..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1092
+#: tortoisehg/hgqt/repowidget.py:1248
+msgid "Bundle DAG Range..."
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1250
msgid "Bisect - Good, Bad..."
msgstr "Bisect - Bon, mauvais..."
-#: tortoisehg/hgqt/repowidget.py:1093
+#: tortoisehg/hgqt/repowidget.py:1251
msgid "Bisect - Bad, Good..."
msgstr "Bisect - Mauvais, bon..."
-#: tortoisehg/hgqt/repowidget.py:1094
+#: tortoisehg/hgqt/repowidget.py:1252
msgid "Compress History..."
msgstr "Compresser l'historique..."
-#: tortoisehg/hgqt/repowidget.py:1103 tortoisehg/hgqt/repowidget.py:1180
+#: tortoisehg/hgqt/repowidget.py:1264 tortoisehg/hgqt/repowidget.py:1342
msgid "Transplant Selected to local"
-msgstr "Transplanter la révision sélectionnée vers la version locale"
-
-#: tortoisehg/hgqt/repowidget.py:1109 tortoisehg/hgqt/repowidget.py:1186
+msgstr "Transplanter les révisions sélectionnées vers la version locale"
+
+#: tortoisehg/hgqt/repowidget.py:1270 tortoisehg/hgqt/repowidget.py:1348
msgid "Post Selected to Review Board..."
msgstr "Poster la révision sélectionnée vers Review Board..."
-#: tortoisehg/hgqt/repowidget.py:1128
-msgid ""
-"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
-"them.<br><br>Continue?</p>"
-msgstr ""
-"<p>ATTENTION !<br>Garde ou commentaire trouvé.<br>Organiser les patches les "
-"détruirons.<br><br>Continuer ?</p>"
-
-#: tortoisehg/hgqt/repowidget.py:1150
+#: tortoisehg/hgqt/repowidget.py:1310
+msgid "Apply patch (QGoto)"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1311
msgid "QPush --move"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1151
+#: tortoisehg/hgqt/repowidget.py:1312
msgid "Fold patches..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1152
+#: tortoisehg/hgqt/repowidget.py:1313
msgid "Delete patches..."
msgstr "Supprimer des patches..."
-#: tortoisehg/hgqt/repowidget.py:1153
+#: tortoisehg/hgqt/repowidget.py:1314
msgid "Reorder patches..."
msgstr "Organiser les patches..."
-#: tortoisehg/hgqt/repowidget.py:1194
+#: tortoisehg/hgqt/repowidget.py:1356
msgid "Pull to here..."
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1207
+#: tortoisehg/hgqt/repowidget.py:1371
msgid "Export patch"
msgstr "Exporter le patch"
-#: tortoisehg/hgqt/repowidget.py:1224
+#: tortoisehg/hgqt/repowidget.py:1388
msgid "Cannot export revision"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1225
+#: tortoisehg/hgqt/repowidget.py:1389
#, python-format
msgid ""
"Cannot export revision %s into the file named:\n"
@@ -3752,20 +4155,20 @@"%s\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1227
+#: tortoisehg/hgqt/repowidget.py:1391
msgid "There is already an existing folder with that same name."
-msgstr ""
-
-#: tortoisehg/hgqt/repowidget.py:1233 tortoisehg/hgqt/repowidget.py:1253
+msgstr "Il y a déjà un répertoire avec le même nom."
+
+#: tortoisehg/hgqt/repowidget.py:1397 tortoisehg/hgqt/repowidget.py:1417
#: tortoisehg/hgtk/thgshelve.py:161
msgid "Replace"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1233 tortoisehg/hgtk/thgshelve.py:162
+#: tortoisehg/hgqt/repowidget.py:1397 tortoisehg/hgtk/thgshelve.py:162
msgid "Append"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1236
+#: tortoisehg/hgqt/repowidget.py:1400
#, python-format
msgid ""
"There are existing patch files for %d revisions (%s) in the selected "
@@ -3773,42 +4176,46 @@"\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1243
+#: tortoisehg/hgqt/repowidget.py:1407
msgid "What do you want to do?\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1244
+#: tortoisehg/hgqt/repowidget.py:1408
msgid "Replace the existing patch files.\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1245
+#: tortoisehg/hgqt/repowidget.py:1409
msgid "Append the changes to the existing patch files.\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1246
+#: tortoisehg/hgqt/repowidget.py:1410
msgid "Abort the export operation.\n"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1248
+#: tortoisehg/hgqt/repowidget.py:1412
msgid "Patch files already exist"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1391
+#: tortoisehg/hgqt/repowidget.py:1534
+msgid "Write bundle"
+msgstr ""
+
+#: tortoisehg/hgqt/repowidget.py:1606
msgid "Cannot import selected revision"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1392
+#: tortoisehg/hgqt/repowidget.py:1607
#, python-format
msgid ""
"The selected revision (rev #%d) cannot be imported because it is not a "
"descendant of qparent (rev #%d)"
msgstr ""
-#: tortoisehg/hgqt/repowidget.py:1464
+#: tortoisehg/hgqt/repowidget.py:1705
msgid "Unable to start"
msgstr "Impossible de démarrer"
-#: tortoisehg/hgqt/repowidget.py:1465
+#: tortoisehg/hgqt/repowidget.py:1706
msgid "Previous command is still running"
msgstr "La commande précédente est toujours en cours d'exécution"
@@ -3949,7 +4356,7 @@msgid "Unresolved conflicts remain. Are you sure?"
msgstr "Conflits non résolus restants. Êtes-vous sûr ?"
-#: tortoisehg/hgqt/resolve.py:355 tortoisehg/hgqt/workbench.py:203
+#: tortoisehg/hgqt/resolve.py:355 tortoisehg/hgqt/workbench.py:219
msgid "E&xit"
msgstr "Quitter"
@@ -3966,54 +4373,78 @@msgid "<default>"
msgstr "<par défaut>"
-#: tortoisehg/hgqt/revdetails.py:90
+#: tortoisehg/hgqt/revdetails.py:95
msgid "File List Toolbar"
msgstr "Barre d'outils de liste de fichiers"
-#: tortoisehg/hgqt/revdetails.py:188
+#: tortoisehg/hgqt/revdetails.py:195
msgid "Update to this revision"
msgstr "Mettre à jour à cette révision"
+#: tortoisehg/hgqt/revdetails.py:198
+msgid "Show All"
+msgstr "Tout afficher"
+
+#: tortoisehg/hgqt/revdetails.py:200
+msgid "Toggle display of all files and the direction they were merged"
+msgstr "Afficher tous les fichiers et la direction de la fusion"
+
+#: tortoisehg/hgqt/revdetails.py:236
+msgid "Save at Revision"
+msgstr ""
+
+#: tortoisehg/hgqt/revdetails.py:237
+msgid "Save file as it appeared at this revision"
+msgstr ""
+
+#: tortoisehg/hgqt/revdetails.py:346 tortoisehg/hgtk/changeset.py:958
+msgid "Save file to"
+msgstr "Enregistrer le fichier sous"
+
+#: tortoisehg/hgqt/revdetails.py:359 tortoisehg/hgtk/changeset.py:969
+msgid "Unable to save file"
+msgstr "Impossible d'enregistrer le fichier"
+
#: tortoisehg/hgqt/revert.py:22
#, python-format
msgid "Revert - %s"
msgstr "Rétablir - %s"
-#: tortoisehg/hgqt/revert.py:32
+#: tortoisehg/hgqt/revert.py:33
#, python-format
msgid "<b>Revert %s to its contents at revision %d?</b>"
msgstr "<b>Rétablir %s au contenu de la révision %d ?</b>"
-#: tortoisehg/hgqt/revert.py:36
+#: tortoisehg/hgqt/revert.py:37
+#, python-format
+msgid "<b>Revert %d files to their contents at revision %d?</b>"
+msgstr ""
+
+#: tortoisehg/hgqt/revert.py:43
msgid "Revert all files to this revision"
msgstr "Rétablir tous les fichiers à cette révision"
-#: tortoisehg/hgqt/revert.py:51 tortoisehg/hgqt/wctxactions.py:244
+#: tortoisehg/hgqt/revert.py:58 tortoisehg/hgqt/wctxactions.py:239
#: tortoisehg/hgtk/statusact.py:146
msgid "Confirm Revert"
msgstr "Confirmer le rétablissement"
-#: tortoisehg/hgqt/revert.py:52
+#: tortoisehg/hgqt/revert.py:59
msgid ""
"Reverting all files will discard changes and leave affected files in a "
"modified state.<br><br>Are you sure you want to use revert?<br><br>(use "
"update to checkout another revision)"
msgstr ""
-#: tortoisehg/hgqt/revpanel.py:20 tortoisehg/hgtk/changeset.py:579
+#: tortoisehg/hgqt/revpanel.py:22 tortoisehg/hgtk/changeset.py:579
msgid "Changeset:"
msgstr "Révision :"
-#: tortoisehg/hgqt/revpanel.py:22 tortoisehg/hgqt/update.py:82
-#: tortoisehg/hgtk/changeset.py:581 tortoisehg/hgtk/update.py:90
-msgid "Parent:"
-msgstr "Parent :"
-
-#: tortoisehg/hgqt/revpanel.py:24 tortoisehg/hgtk/changeset.py:583
+#: tortoisehg/hgqt/revpanel.py:26 tortoisehg/hgtk/changeset.py:583
msgid "Child:"
msgstr "Enfant :"
-#: tortoisehg/hgqt/revpanel.py:161
+#: tortoisehg/hgqt/revpanel.py:163
msgid "Head is closed!"
msgstr ""
@@ -4074,7 +4505,7 @@
#: tortoisehg/hgqt/revset.py:53
msgid "Greatest common ancestor of the two changesets."
-msgstr "Le ancêtre commun le plus récent de deux révisions."
+msgstr "L'ancêtre commun le plus récent de deux révisions."
#: tortoisehg/hgqt/revset.py:58
msgid ""
@@ -4225,11 +4656,18 @@msgid "Parse Error: "
msgstr "Erreur d'analyse : "
-#: tortoisehg/hgqt/revset.py:397
+#: tortoisehg/hgqt/revset.py:399
msgid "Invalid query: "
msgstr "Requête invalide : "
-#: tortoisehg/hgqt/run.py:59 tortoisehg/hgtk/hgtk.py:78
+#: tortoisehg/hgqt/run.py:58 tortoisehg/hgqt/run.py:377
+#, python-format
+msgid ""
+"Error string \"%(arg0)s\" at %(arg1)s<br>Please <a "
+"href=\"#edit:%(arg1)s\">edit</a> your config"
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:76 tortoisehg/hgtk/hgtk.py:78
msgid ""
"\n"
"Caught keyboard interrupt, aborting.\n"
@@ -4237,56 +4675,56 @@"\n"
"Interruption clavier détectée, abandon.\n"
-#: tortoisehg/hgqt/run.py:128 tortoisehg/hgtk/hgtk.py:128
+#: tortoisehg/hgqt/run.py:136 tortoisehg/hgtk/hgtk.py:128
#, python-format
msgid "can not read file \"%s\". Ignored.\n"
msgstr "impossible de lire le fichier \"%s\". Ignoré.\n"
-#: tortoisehg/hgqt/run.py:233
+#: tortoisehg/hgqt/run.py:240
+#, python-format
+msgid ""
+"thg: command '%s' is ambiguous:\n"
+" %s\n"
+msgstr ""
+"thg : la commande '%s' est ambiguë :\n"
+" %s\n"
+
+#: tortoisehg/hgqt/run.py:243
+#, python-format
+msgid "thg: unknown command '%s'\n"
+msgstr "thg : command inconnue '%s'\n"
+
+#: tortoisehg/hgqt/run.py:247
#, python-format
msgid "thg %s: %s\n"
msgstr "thg %s : %s\n"
-#: tortoisehg/hgqt/run.py:236
+#: tortoisehg/hgqt/run.py:250
#, python-format
msgid "thg: %s\n"
msgstr "thg : %s\n"
-#: tortoisehg/hgqt/run.py:239
-#, python-format
-msgid ""
-"thg: command '%s' is ambiguous:\n"
-" %s\n"
-msgstr ""
-"thg : la commande '%s' est ambiguë :\n"
-" %s\n"
-
-#: tortoisehg/hgqt/run.py:242
-#, python-format
-msgid "thg: unknown command '%s'\n"
-msgstr "thg : command inconnue '%s'\n"
-
-#: tortoisehg/hgqt/run.py:245 tortoisehg/hgqt/thread.py:320
+#: tortoisehg/hgqt/run.py:253 tortoisehg/hgqt/thread.py:320
#: tortoisehg/hgqt/thread.py:330 tortoisehg/hgtk/hgtk.py:219
#, python-format
msgid "abort: %s!\n"
msgstr "abandon : %s !\n"
-#: tortoisehg/hgqt/run.py:296 tortoisehg/hgtk/hgtk.py:267
+#: tortoisehg/hgqt/run.py:304 tortoisehg/hgtk/hgtk.py:267
#: tortoisehg/hgtk/hgtk.py:466
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Il n'y a pas de dépôt Mercurial ici (.hg non trouvé)"
-#: tortoisehg/hgqt/run.py:308 tortoisehg/hgtk/hgtk.py:279
+#: tortoisehg/hgqt/run.py:316 tortoisehg/hgtk/hgtk.py:279
msgid "invalid arguments"
msgstr "arguments invalides"
-#: tortoisehg/hgqt/run.py:314 tortoisehg/hgtk/hgtk.py:285
+#: tortoisehg/hgqt/run.py:322 tortoisehg/hgtk/hgtk.py:285
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr "format '%s' de profiling non reconnu - Ignoré\n"
-#: tortoisehg/hgqt/run.py:330 tortoisehg/hgtk/hgtk.py:301
+#: tortoisehg/hgqt/run.py:338 tortoisehg/hgtk/hgtk.py:301
msgid ""
"lsprof not available - install from "
"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
@@ -4294,63 +4732,69 @@"lsprof n'est pas disponible - à installer depuis "
"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
-#: tortoisehg/hgqt/run.py:367
+#: tortoisehg/hgqt/run.py:375 tortoisehg/hgqt/run.py:376
msgid "Try refreshing your repository."
msgstr "Essayer d'actualiser votre dépôt."
-#: tortoisehg/hgqt/run.py:368
-#, python-format
-msgid ""
-"Error string \"%(arg0)s\" at %(arg1)s<br>Please <a "
-"href=\"#edit:%(arg1)s\">edit</a> your config"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:370
-#, python-format
-msgid ""
-"Configuration Error: \"%(arg0)s\", please <a href=\"#fix:%(arg0)s\">fix</a> "
-"your config"
-msgstr ""
-
-#: tortoisehg/hgqt/run.py:428
+#: tortoisehg/hgqt/run.py:379
+#, python-format
+msgid ""
+"Configuration Error: \"%(arg0)s\",<br>Please <a "
+"href=\"#fix:%(arg0)s\">fix</a> your config"
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:381
+#, python-format
+msgid "Operation aborted:<br><br>%(arg0)s."
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:382
+msgid "Repository is locked"
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:437
+msgid "hint:"
+msgstr ""
+
+#: tortoisehg/hgqt/run.py:444
msgid "Keyboard interrupt"
msgstr "Interruption par le clavier"
-#: tortoisehg/hgqt/run.py:429
+#: tortoisehg/hgqt/run.py:445
msgid "Close this application?"
msgstr "Fermer cette application ?"
-#: tortoisehg/hgqt/run.py:703
+#: tortoisehg/hgqt/run.py:724
msgid "annotate requires a single filename\n"
msgstr "annotate demande un seul nom de fichier\n"
-#: tortoisehg/hgqt/run.py:760 tortoisehg/hgtk/hgtk.py:546
+#: tortoisehg/hgqt/run.py:781 tortoisehg/hgtk/hgtk.py:546
msgid "global options:"
msgstr "options globales :"
-#: tortoisehg/hgqt/run.py:762
+#: tortoisehg/hgqt/run.py:783
msgid "use \"thg help\" for the full list of commands"
msgstr "utiliser \"thg help\" pour la liste complète des commandes"
-#: tortoisehg/hgqt/run.py:766
+#: tortoisehg/hgqt/run.py:787
msgid ""
"use \"thg help\" for the full list of commands or \"thg -v\" for details"
msgstr ""
"utiliser \"thg help\" pour la liste complète des commandes ou \"thg -v\" "
"pour des détails"
-#: tortoisehg/hgqt/run.py:769
+#: tortoisehg/hgqt/run.py:790
#, python-format
msgid "use \"thg -v help%s\" to show aliases and global options"
msgstr ""
"utiliser \"thg -v help%s\" pour montrer les alias et les options globales"
-#: tortoisehg/hgqt/run.py:772
+#: tortoisehg/hgqt/run.py:793
#, python-format
msgid "use \"thg -v help %s\" to show global options"
msgstr "utiliser \"thg -v help %s\" pour montrer les options globales"
-#: tortoisehg/hgqt/run.py:784 tortoisehg/hgqt/run.py:893
+#: tortoisehg/hgqt/run.py:805 tortoisehg/hgqt/run.py:914
#: tortoisehg/hgtk/hgtk.py:570 tortoisehg/hgtk/hgtk.py:679
msgid ""
"list of commands:\n"
@@ -4359,7 +4803,7 @@"liste des commandes :\n"
"\n"
-#: tortoisehg/hgqt/run.py:792 tortoisehg/hgtk/hgtk.py:578
+#: tortoisehg/hgqt/run.py:813 tortoisehg/hgtk/hgtk.py:578
#, python-format
msgid ""
"\n"
@@ -4368,24 +4812,24 @@"\n"
"alias : %s\n"
-#: tortoisehg/hgqt/run.py:797 tortoisehg/hgqt/run.py:829
-#: tortoisehg/hgqt/run.py:862 tortoisehg/hgtk/hgtk.py:615
+#: tortoisehg/hgqt/run.py:818 tortoisehg/hgqt/run.py:850
+#: tortoisehg/hgqt/run.py:883 tortoisehg/hgtk/hgtk.py:615
msgid "(no help text available)"
msgstr "(pas d'aide disponible)"
-#: tortoisehg/hgqt/run.py:805 tortoisehg/hgtk/hgtk.py:591
+#: tortoisehg/hgqt/run.py:826 tortoisehg/hgtk/hgtk.py:591
msgid "options:\n"
msgstr "options :\n"
-#: tortoisehg/hgqt/run.py:834 tortoisehg/hgtk/hgtk.py:620
+#: tortoisehg/hgqt/run.py:855 tortoisehg/hgtk/hgtk.py:620
msgid "no commands defined\n"
msgstr "aucune commande définie\n"
-#: tortoisehg/hgqt/run.py:886
+#: tortoisehg/hgqt/run.py:907
msgid "Thg - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr ""
-#: tortoisehg/hgqt/run.py:891 tortoisehg/hgtk/hgtk.py:677
+#: tortoisehg/hgqt/run.py:912 tortoisehg/hgtk/hgtk.py:677
msgid ""
"basic commands:\n"
"\n"
@@ -4393,412 +4837,428 @@"commandes de base :\n"
"\n"
-#: tortoisehg/hgqt/run.py:907 tortoisehg/hgtk/hgtk.py:693
+#: tortoisehg/hgqt/run.py:928 tortoisehg/hgtk/hgtk.py:693
#, python-format
msgid " (default: %s)"
msgstr " (par défaut : %s)"
-#: tortoisehg/hgqt/run.py:924 tortoisehg/hgtk/hgtk.py:710
+#: tortoisehg/hgqt/run.py:945 tortoisehg/hgtk/hgtk.py:710
#, python-format
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr "Interface TortoiseHg (version %s), Mercurial (version %s)\n"
-#: tortoisehg/hgqt/run.py:953 tortoisehg/hgtk/hgtk.py:744
+#: tortoisehg/hgqt/run.py:974 tortoisehg/hgtk/hgtk.py:744
msgid "repository root directory or symbolic path name"
msgstr "répertoire racine du dépôt ou nom de chemin symbolique"
-#: tortoisehg/hgqt/run.py:954 tortoisehg/hgtk/hgtk.py:745
+#: tortoisehg/hgqt/run.py:975 tortoisehg/hgtk/hgtk.py:745
msgid "enable additional output"
msgstr "activer la sortie supplémentaire"
-#: tortoisehg/hgqt/run.py:955 tortoisehg/hgtk/hgtk.py:746
+#: tortoisehg/hgqt/run.py:976 tortoisehg/hgtk/hgtk.py:746
msgid "suppress output"
msgstr "supprimer la sortie"
-#: tortoisehg/hgqt/run.py:956 tortoisehg/hgtk/hgtk.py:747
+#: tortoisehg/hgqt/run.py:977 tortoisehg/hgtk/hgtk.py:747
msgid "display help and exit"
msgstr "afficher l'aide et quitter"
-#: tortoisehg/hgqt/run.py:957 tortoisehg/hgtk/hgtk.py:748
+#: tortoisehg/hgqt/run.py:978 tortoisehg/hgtk/hgtk.py:748
msgid "start debugger"
msgstr "démarrer le débogueur"
-#: tortoisehg/hgqt/run.py:958 tortoisehg/hgtk/hgtk.py:749
+#: tortoisehg/hgqt/run.py:979 tortoisehg/hgtk/hgtk.py:749
msgid "print command execution profile"
msgstr "afficher le profil d'exécution de la commande"
-#: tortoisehg/hgqt/run.py:959 tortoisehg/hgtk/hgtk.py:750
+#: tortoisehg/hgqt/run.py:980 tortoisehg/hgtk/hgtk.py:750
msgid "do not fork GUI process"
msgstr "ne pas diviser le processus graphique"
-#: tortoisehg/hgqt/run.py:960 tortoisehg/hgtk/hgtk.py:751
+#: tortoisehg/hgqt/run.py:981 tortoisehg/hgtk/hgtk.py:751
msgid "always fork GUI process"
msgstr "toujours diviser le processus graphique"
-#: tortoisehg/hgqt/run.py:961 tortoisehg/hgtk/hgtk.py:752
+#: tortoisehg/hgqt/run.py:982 tortoisehg/hgtk/hgtk.py:752
msgid "read file list from file"
msgstr "lire la liste de fichiers depuis le fichier"
-#: tortoisehg/hgqt/run.py:962
+#: tortoisehg/hgqt/run.py:983
msgid "read file list from file encoding utf-8"
msgstr "lire la liste de fichiers depuis le fichier encodé en utf-8"
-#: tortoisehg/hgqt/run.py:966
+#: tortoisehg/hgqt/run.py:987
msgid "thg about"
msgstr "thg about"
-#: tortoisehg/hgqt/run.py:967
+#: tortoisehg/hgqt/run.py:988
msgid "thg add [FILE]..."
msgstr "thg add [FILE]..."
-#: tortoisehg/hgqt/run.py:969
+#: tortoisehg/hgqt/run.py:990
msgid "revision to annotate"
msgstr "révision à annoter"
-#: tortoisehg/hgqt/run.py:970 tortoisehg/hgqt/run.py:1023
+#: tortoisehg/hgqt/run.py:991 tortoisehg/hgqt/run.py:1044
msgid "open to line"
msgstr "ouvrir à la ligne"
-#: tortoisehg/hgqt/run.py:971 tortoisehg/hgqt/run.py:1024
+#: tortoisehg/hgqt/run.py:992 tortoisehg/hgqt/run.py:1045
msgid "initial search pattern"
msgstr "premier motif de recherche"
-#: tortoisehg/hgqt/run.py:972
+#: tortoisehg/hgqt/run.py:993
msgid "thg annotate"
msgstr "thg annotate"
-#: tortoisehg/hgqt/run.py:974
+#: tortoisehg/hgqt/run.py:995
msgid "revision to archive"
msgstr "révision à archiver"
-#: tortoisehg/hgqt/run.py:975
+#: tortoisehg/hgqt/run.py:996
msgid "thg archive"
msgstr "thg archive"
-#: tortoisehg/hgqt/run.py:978
+#: tortoisehg/hgqt/run.py:999
msgid "merge with old dirstate parent after backout"
msgstr ""
-#: tortoisehg/hgqt/run.py:979
+#: tortoisehg/hgqt/run.py:1000
msgid "parent to choose when backing out merge"
msgstr ""
-#: tortoisehg/hgqt/run.py:980
+#: tortoisehg/hgqt/run.py:1001
msgid "revision to backout"
msgstr ""
-#: tortoisehg/hgqt/run.py:981
+#: tortoisehg/hgqt/run.py:1002
msgid "thg backout [OPTION]... [[-r] REV]"
msgstr "thg backout [OPTION]... [[-r] REV]"
-#: tortoisehg/hgqt/run.py:982
+#: tortoisehg/hgqt/run.py:1003
msgid "thg bisect"
msgstr "thg bisect"
-#: tortoisehg/hgqt/run.py:986
+#: tortoisehg/hgqt/run.py:1007
msgid "the clone will include an empty working copy (only a repository)"
msgstr "le clone aura une copie de travail vide (seulement un dépôt)"
-#: tortoisehg/hgqt/run.py:989
+#: tortoisehg/hgqt/run.py:1010
msgid "revision, tag or branch to check out"
msgstr ""
-#: tortoisehg/hgqt/run.py:990
+#: tortoisehg/hgqt/run.py:1011
msgid "include the specified changeset"
msgstr "inclure la révision spécifiée"
-#: tortoisehg/hgqt/run.py:992
+#: tortoisehg/hgqt/run.py:1013
msgid "clone only the specified branch"
msgstr "cloner uniquement la branche spécifiée"
-#: tortoisehg/hgqt/run.py:993
+#: tortoisehg/hgqt/run.py:1014
msgid "use pull protocol to copy metadata"
msgstr "utiliser le protocole 'pull' pour copier les métadonnées"
-#: tortoisehg/hgqt/run.py:995
+#: tortoisehg/hgqt/run.py:1016
msgid "use uncompressed transfer (fast over LAN)"
msgstr "utiliser le transfert non compressé (rapide sur réseau local)"
-#: tortoisehg/hgqt/run.py:996
+#: tortoisehg/hgqt/run.py:1017
msgid "thg clone [OPTION]... SOURCE [DEST]"
msgstr "thg clone [OPTION]... SOURCE [DEST]"
-#: tortoisehg/hgqt/run.py:998 tortoisehg/hgtk/hgtk.py:760
+#: tortoisehg/hgqt/run.py:1019 tortoisehg/hgtk/hgtk.py:760
msgid "record user as committer"
msgstr "enregistrer l'utilisateur comme committeur"
-#: tortoisehg/hgqt/run.py:999 tortoisehg/hgtk/hgtk.py:761
+#: tortoisehg/hgqt/run.py:1020 tortoisehg/hgtk/hgtk.py:761
msgid "record datecode as commit date"
msgstr "utiliser la date indiquée comme date de commit"
-#: tortoisehg/hgqt/run.py:1000
+#: tortoisehg/hgqt/run.py:1021
msgid "thg commit [OPTIONS] [FILE]..."
msgstr "thg commit [OPTIONS] [FILE]..."
-#: tortoisehg/hgqt/run.py:1001
+#: tortoisehg/hgqt/run.py:1022
msgid "thg drag_move SOURCE... DEST"
msgstr ""
-#: tortoisehg/hgqt/run.py:1002
+#: tortoisehg/hgqt/run.py:1023
msgid "thg drag_copy SOURCE... DEST"
msgstr ""
-#: tortoisehg/hgqt/run.py:1004
+#: tortoisehg/hgqt/run.py:1025
msgid "ignore case during search"
msgstr "ignorer la casse durant la recherche"
-#: tortoisehg/hgqt/run.py:1005
+#: tortoisehg/hgqt/run.py:1026
msgid "thg grep"
msgstr "thg grep"
-#: tortoisehg/hgqt/run.py:1006
+#: tortoisehg/hgqt/run.py:1027
msgid "thg guess"
msgstr "thg guess"
-#: tortoisehg/hgqt/run.py:1007
+#: tortoisehg/hgqt/run.py:1028
msgid "thg hgignore [FILE]"
msgstr "thg hgignore [FILE]"
-#: tortoisehg/hgqt/run.py:1009 tortoisehg/hgtk/hgtk.py:826
+#: tortoisehg/hgqt/run.py:1030 tortoisehg/hgtk/hgtk.py:826
msgid "import to the patch queue (MQ)"
msgstr "importer dans la queue de patch (MQ)"
-#: tortoisehg/hgqt/run.py:1010
+#: tortoisehg/hgqt/run.py:1031
msgid "thg import [OPTION] [SOURCE]..."
msgstr "thg import [OPTION] [SOURCE]..."
-#: tortoisehg/hgqt/run.py:1011
+#: tortoisehg/hgqt/run.py:1032
msgid "thg init [DEST]"
msgstr "thg init [DEST]"
-#: tortoisehg/hgqt/run.py:1014
+#: tortoisehg/hgqt/run.py:1035
msgid "a revision to send"
msgstr "une révision à envoyer"
-#: tortoisehg/hgqt/run.py:1015
+#: tortoisehg/hgqt/run.py:1036
msgid "thg email [REVS]"
msgstr "thg email [REVS]"
-#: tortoisehg/hgqt/run.py:1018 tortoisehg/hgtk/hgtk.py:767
+#: tortoisehg/hgqt/run.py:1039 tortoisehg/hgtk/hgtk.py:767
msgid "limit number of changes displayed"
msgstr "limiter le nombre de changements affichés"
-#: tortoisehg/hgqt/run.py:1019
+#: tortoisehg/hgqt/run.py:1040
msgid "thg log [OPTIONS] [FILE]"
msgstr "thg log [OPTIONS] [FILE]"
-#: tortoisehg/hgqt/run.py:1022
+#: tortoisehg/hgqt/run.py:1043
msgid "revision to display"
msgstr "révision à afficher"
-#: tortoisehg/hgqt/run.py:1025
+#: tortoisehg/hgqt/run.py:1046
msgid "thg manifest [-r REV] [FILE]"
msgstr "thg manifest [-r REV] [FILE]"
-#: tortoisehg/hgqt/run.py:1028
+#: tortoisehg/hgqt/run.py:1049
msgid "revision to merge"
msgstr "révision à fusionner"
-#: tortoisehg/hgqt/run.py:1029
+#: tortoisehg/hgqt/run.py:1050
msgid "thg merge [[-r] REV]"
msgstr "thg merge [[-r] REV]"
-#: tortoisehg/hgqt/run.py:1030
+#: tortoisehg/hgqt/run.py:1051
msgid "thg remove [FILE]..."
msgstr "thg remove [FILE]..."
-#: tortoisehg/hgqt/run.py:1031
+#: tortoisehg/hgqt/run.py:1052
msgid "thg mq"
msgstr "thg mq"
-#: tortoisehg/hgqt/run.py:1032
+#: tortoisehg/hgqt/run.py:1053
msgid "thg resolve"
msgstr "thg resolve"
-#: tortoisehg/hgqt/run.py:1033
+#: tortoisehg/hgqt/run.py:1054
msgid "thg revert [FILE]..."
msgstr "thg revert [FILE]..."
-#: tortoisehg/hgqt/run.py:1034
+#: tortoisehg/hgqt/run.py:1055
msgid "thg forget [FILE]..."
msgstr "hg forget [FILE]..."
-#: tortoisehg/hgqt/run.py:1035
+#: tortoisehg/hgqt/run.py:1056
msgid "thg rename SOURCE [DEST]..."
msgstr "thg rename SOURCE [DEST]..."
-#: tortoisehg/hgqt/run.py:1039 tortoisehg/hgtk/hgtk.py:792
+#: tortoisehg/hgqt/run.py:1060 tortoisehg/hgtk/hgtk.py:792
#: tortoisehg/hgtk/serve.py:367
msgid "name of the hgweb config file (serve more than one repository)"
msgstr ""
"nom du fichier de configuration pour hgweb (pour servir plus d'un dépôt)"
-#: tortoisehg/hgqt/run.py:1041 tortoisehg/hgtk/hgtk.py:794
+#: tortoisehg/hgqt/run.py:1062 tortoisehg/hgtk/hgtk.py:794
msgid "name of the hgweb config file (DEPRECATED)"
msgstr "nom du fichier de configuration pour hgweb (obsolète)"
-#: tortoisehg/hgqt/run.py:1042
+#: tortoisehg/hgqt/run.py:1063
msgid "thg serve [--web-conf FILE]"
msgstr "thg serve [--web-conf FILE]"
-#: tortoisehg/hgqt/run.py:1043
+#: tortoisehg/hgqt/run.py:1064
msgid "thg sync"
msgstr "thg sync"
-#: tortoisehg/hgqt/run.py:1045
+#: tortoisehg/hgqt/run.py:1066
msgid "show files without changes"
msgstr "afficher les fichiers sans changements"
-#: tortoisehg/hgqt/run.py:1046
+#: tortoisehg/hgqt/run.py:1067
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: tortoisehg/hgqt/run.py:1047
+#: tortoisehg/hgqt/run.py:1068
msgid "thg status [OPTIONS] [FILE]"
msgstr "thg status [OPTIONS] [FILE]"
-#: tortoisehg/hgqt/run.py:1049 tortoisehg/hgqt/run.py:1080
+#: tortoisehg/hgqt/run.py:1070 tortoisehg/hgqt/run.py:1101
msgid "discard uncommitted changes (no backup)"
msgstr "abandonner les changements non committés (pas de sauvegarde)"
-#: tortoisehg/hgqt/run.py:1050
+#: tortoisehg/hgqt/run.py:1071
msgid "do not back up stripped revisions"
msgstr ""
-#: tortoisehg/hgqt/run.py:1051
+#: tortoisehg/hgqt/run.py:1072
msgid "revision to strip"
msgstr ""
-#: tortoisehg/hgqt/run.py:1052
+#: tortoisehg/hgqt/run.py:1073
msgid "thg strip [-f] [-n] [[-r] REV]"
msgstr "thg strip [-f] [-n] [[-r] REV]"
-#: tortoisehg/hgqt/run.py:1054
+#: tortoisehg/hgqt/run.py:1075
msgid "keep original changesets"
msgstr "garder les révisions d'origine"
-#: tortoisehg/hgqt/run.py:1055
+#: tortoisehg/hgqt/run.py:1076
msgid "keep original branch names"
msgstr "garder les nom de branches originaux"
-#: tortoisehg/hgqt/run.py:1056
+#: tortoisehg/hgqt/run.py:1077
msgid "force detaching of source from its original branch"
msgstr ""
-#: tortoisehg/hgqt/run.py:1059
+#: tortoisehg/hgqt/run.py:1080
msgid "rebase from the specified changeset"
msgstr ""
-#: tortoisehg/hgqt/run.py:1061
+#: tortoisehg/hgqt/run.py:1082
msgid "rebase onto the specified changeset"
msgstr ""
-#: tortoisehg/hgqt/run.py:1062
+#: tortoisehg/hgqt/run.py:1083
msgid "thg rebase -s REV -d REV [--keep] [--detach]"
msgstr "thg rebase -s REV -d REV [--keep] [--detach]"
-#: tortoisehg/hgqt/run.py:1065
+#: tortoisehg/hgqt/run.py:1086
msgid "replace existing tag"
msgstr "remplacer l'étiquette existante"
-#: tortoisehg/hgqt/run.py:1066
+#: tortoisehg/hgqt/run.py:1087
msgid "make the tag local"
msgstr "rendre l'étiquette locale"
-#: tortoisehg/hgqt/run.py:1067
+#: tortoisehg/hgqt/run.py:1088
msgid "revision to tag"
msgstr "révision à étiqueter"
-#: tortoisehg/hgqt/run.py:1068
+#: tortoisehg/hgqt/run.py:1089
msgid "remove a tag"
msgstr "enlever une étiquette"
-#: tortoisehg/hgqt/run.py:1069
+#: tortoisehg/hgqt/run.py:1090
msgid "use <text> as commit message"
msgstr "utiliser <le texte> comme message de commit"
-#: tortoisehg/hgqt/run.py:1070
+#: tortoisehg/hgqt/run.py:1091
msgid "thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]"
msgstr "thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]"
-#: tortoisehg/hgqt/run.py:1071
+#: tortoisehg/hgqt/run.py:1092
msgid "thg shelve"
msgstr "thg shelve"
-#: tortoisehg/hgqt/run.py:1072
+#: tortoisehg/hgqt/run.py:1093
msgid "thg rejects [FILE]"
msgstr "thg rejects [FILE]"
-#: tortoisehg/hgqt/run.py:1073
+#: tortoisehg/hgqt/run.py:1094
msgid "thg test"
msgstr "thg test"
-#: tortoisehg/hgqt/run.py:1074
+#: tortoisehg/hgqt/run.py:1095
msgid "thg help [COMMAND]"
msgstr "thg help [COMMAND]"
-#: tortoisehg/hgqt/run.py:1075
+#: tortoisehg/hgqt/run.py:1096
msgid "thg purge"
msgstr "thg purge"
-#: tortoisehg/hgqt/run.py:1076
+#: tortoisehg/hgqt/run.py:1097
msgid "thg qreorder"
msgstr "thg qreorder"
-#: tortoisehg/hgqt/run.py:1077
+#: tortoisehg/hgqt/run.py:1098
msgid "thg qqueue"
msgstr "thg qqueue"
-#: tortoisehg/hgqt/run.py:1081 tortoisehg/hgtk/hgtk.py:805
+#: tortoisehg/hgqt/run.py:1102 tortoisehg/hgtk/hgtk.py:805
#: tortoisehg/hgtk/hgtk.py:820
msgid "revision to update"
msgstr "révision à mettre à jour"
-#: tortoisehg/hgqt/run.py:1082
+#: tortoisehg/hgqt/run.py:1103
msgid "thg update [-C] [[-r] REV]"
msgstr "thg update [-C] [[-r] REV]"
-#: tortoisehg/hgqt/run.py:1084 tortoisehg/hgqt/run.py:1087
+#: tortoisehg/hgqt/run.py:1105 tortoisehg/hgqt/run.py:1108
#: tortoisehg/hgtk/hgtk.py:779 tortoisehg/hgtk/hgtk.py:782
msgid "field to give initial focus"
msgstr "champ prenant la saisie initiale"
-#: tortoisehg/hgqt/run.py:1085
+#: tortoisehg/hgqt/run.py:1106
msgid "thg userconfig"
msgstr "thg userconfig"
-#: tortoisehg/hgqt/run.py:1088
+#: tortoisehg/hgqt/run.py:1109
msgid "thg repoconfig"
msgstr "thg repoconfig"
-#: tortoisehg/hgqt/run.py:1090 tortoisehg/hgtk/hgtk.py:808
+#: tortoisehg/hgqt/run.py:1111 tortoisehg/hgtk/hgtk.py:808
msgid "changeset to view in diff tool"
msgstr "groupe de modification à voir dans l'outil de différenciation"
-#: tortoisehg/hgqt/run.py:1091 tortoisehg/hgtk/hgtk.py:809
+#: tortoisehg/hgqt/run.py:1112 tortoisehg/hgtk/hgtk.py:809
msgid "revisions to view in diff tool"
msgstr "révisions à afficher dans l'outil de diff"
-#: tortoisehg/hgqt/run.py:1092 tortoisehg/hgtk/hgtk.py:810
+#: tortoisehg/hgqt/run.py:1113 tortoisehg/hgtk/hgtk.py:810
msgid "bundle file to preview"
msgstr "fichier paquet à prévisualiser"
-#: tortoisehg/hgqt/run.py:1093 tortoisehg/hgtk/hgtk.py:811
+#: tortoisehg/hgqt/run.py:1114 tortoisehg/hgtk/hgtk.py:811
msgid "launch visual diff tool"
msgstr "lancer l'outil de diff graphique"
-#: tortoisehg/hgqt/run.py:1095 tortoisehg/hgtk/hgtk.py:813
+#: tortoisehg/hgqt/run.py:1116 tortoisehg/hgtk/hgtk.py:813
msgid "print license"
msgstr "afficher la licence d'utilisation"
-#: tortoisehg/hgqt/run.py:1096
+#: tortoisehg/hgqt/run.py:1117
msgid "thg version [OPTION]"
msgstr "thg version [OPTION]"
-#: tortoisehg/hgqt/run.py:1101
+#: tortoisehg/hgqt/run.py:1122
msgid "thg shellconfig"
msgstr "thg shellconfig"
+#: tortoisehg/hgqt/rupdate.py:57
+msgid "Location:"
+msgstr ""
+
+#: tortoisehg/hgqt/rupdate.py:61
+msgid "Perform a push before updating (-p/--push)"
+msgstr ""
+
+#: tortoisehg/hgqt/rupdate.py:63
+msgid "Allow pushing new branches (--new-branch)"
+msgstr ""
+
+#: tortoisehg/hgqt/rupdate.py:65
+msgid "Force push to remote location (-f/--force)"
+msgstr ""
+
#: tortoisehg/hgqt/serve.py:40
msgid "Log"
msgstr "Journal"
@@ -4833,7 +5293,7 @@msgid "Start"
msgstr "Démarrer"
-#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:662
+#: tortoisehg/hgqt/serve_ui.py:88 tortoisehg/hgqt/settings.py:757
#: tortoisehg/hgtk/gdialog.py:497
msgid "Settings"
msgstr "Paramètres"
@@ -4842,20 +5302,25 @@msgid "<unspecified>"
msgstr "<non défini>"
-#: tortoisehg/hgqt/settings.py:263 tortoisehg/hgtk/thgconfig.py:43
+#: tortoisehg/hgqt/settings.py:241
+#, python-format
+msgid "Failed to load issue tracker: '%s': %s. "
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:349 tortoisehg/hgtk/thgconfig.py:43
msgid "UI Language"
msgstr "Langue de l'interface"
-#: tortoisehg/hgqt/settings.py:265 tortoisehg/hgtk/thgconfig.py:44
+#: tortoisehg/hgqt/settings.py:351 tortoisehg/hgtk/thgconfig.py:44
msgid "Specify your preferred user interface language (restart needed)"
msgstr ""
"Spécifier votre langue préférée pour l'interface (redémarrage nécessaire)"
-#: tortoisehg/hgqt/settings.py:267 tortoisehg/hgtk/thgconfig.py:45
+#: tortoisehg/hgqt/settings.py:353 tortoisehg/hgtk/thgconfig.py:45
msgid "Three-way Merge Tool"
msgstr ""
-#: tortoisehg/hgqt/settings.py:269
+#: tortoisehg/hgqt/settings.py:355
msgid ""
"Graphical merge program for resolving merge conflicts. If left unspecified, "
"Mercurial will use the first applicable tool it finds on your system or use "
@@ -4865,22 +5330,22 @@"manual merging"
msgstr ""
-#: tortoisehg/hgqt/settings.py:275 tortoisehg/hgtk/thgconfig.py:52
+#: tortoisehg/hgqt/settings.py:361 tortoisehg/hgtk/thgconfig.py:52
msgid "Visual Diff Tool"
msgstr ""
-#: tortoisehg/hgqt/settings.py:277 tortoisehg/hgtk/thgconfig.py:53
+#: tortoisehg/hgqt/settings.py:363 tortoisehg/hgtk/thgconfig.py:53
msgid ""
"Specify visual diff tool, as described in the [merge-tools] section of your "
"Mercurial configuration files. If left unspecified, TortoiseHg will use the "
"selected merge tool. Failing that it uses the first applicable tool it finds."
msgstr ""
-#: tortoisehg/hgqt/settings.py:281 tortoisehg/hgtk/thgconfig.py:57
+#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgtk/thgconfig.py:57
msgid "Visual Editor"
msgstr "Éditeur visuel"
-#: tortoisehg/hgqt/settings.py:282
+#: tortoisehg/hgqt/settings.py:368
#, python-format
msgid ""
"Specify the visual editor used to view files. Format:<br>myeditor -flags "
@@ -4888,92 +5353,85 @@"href=\"%s\">OpenAtLine</a>"
msgstr ""
-#: tortoisehg/hgqt/settings.py:286
+#: tortoisehg/hgqt/settings.py:372
msgid "Shell"
msgstr ""
-#: tortoisehg/hgqt/settings.py:287
-msgid "Specify your preferred terminal shell application"
-msgstr "Spécifier votre application console préférée"
-
-#: tortoisehg/hgqt/settings.py:288
+#: tortoisehg/hgqt/settings.py:373
+#, python-format
+msgid ""
+"Specify the command to launch your preferred terminal shell application. If "
+"the value includes the string %(reponame)s, the name of the repository will "
+"be substituted in place of %(reponame)s. (restart needed)<br>Default, "
+"Windows: cmd.exe /K title %(reponame)s<br>Default, OS X: not set<br>Default, "
+"other: xterm -T \"%(reponame)s\""
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:381
msgid "Immediate Operations"
msgstr ""
-#: tortoisehg/hgqt/settings.py:289
+#: tortoisehg/hgqt/settings.py:382
msgid ""
"Space separated list of shell operations you would like to be performed "
"immediately, without user interaction. Commands are \"add remove revert "
"forget\". Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:293
-msgid "Poll Frequency"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:294
-msgid ""
-"The period (in milliseconds) between modification time polling of key "
-"repository files, looking for changes. Values under 100ms are ignored. "
-"Default: 500"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:297 tortoisehg/hgtk/thgconfig.py:63
+#: tortoisehg/hgqt/settings.py:386 tortoisehg/hgtk/thgconfig.py:63
msgid "Tab Width"
msgstr "Largeur des tabulations"
-#: tortoisehg/hgqt/settings.py:298
+#: tortoisehg/hgqt/settings.py:387
msgid ""
"Specify the number of spaces that tabs expand to in various TortoiseHg "
"windows. Default: 0, Not expanded"
msgstr ""
-#: tortoisehg/hgqt/settings.py:301 tortoisehg/hgtk/thgconfig.py:67
+#: tortoisehg/hgqt/settings.py:390
+msgid "Force Repo Tab"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:391
+msgid "Always show repo tabs, even for a single repo. Default: False"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:392 tortoisehg/hgtk/thgconfig.py:67
msgid "Max Diff Size"
msgstr ""
-#: tortoisehg/hgqt/settings.py:302
+#: tortoisehg/hgqt/settings.py:393
msgid ""
"The maximum size file (in KB) that TortoiseHg will show changes for in the "
"changelog, status, and commit windows. A value of zero implies no limit. "
"Default: 1024 (1MB)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:305 tortoisehg/hgtk/thgconfig.py:75
-msgid "Capture stderr"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:306 tortoisehg/hgtk/thgconfig.py:76
-msgid ""
-"Redirect stderr to a buffer which is parsed at the end of the process for "
-"runtime errors. Default: True"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:308
+#: tortoisehg/hgqt/settings.py:396
msgid "Fork GUI"
msgstr ""
-#: tortoisehg/hgqt/settings.py:309
+#: tortoisehg/hgqt/settings.py:397
msgid ""
"When running from the command line, fork a background process to run "
"graphical dialogs. Default: True"
msgstr ""
-#: tortoisehg/hgqt/settings.py:311 tortoisehg/hgtk/thgconfig.py:81
+#: tortoisehg/hgqt/settings.py:399 tortoisehg/hgtk/thgconfig.py:81
msgid "Full Path Title"
msgstr ""
-#: tortoisehg/hgqt/settings.py:312
+#: tortoisehg/hgqt/settings.py:400
msgid ""
"Show a full directory path of the repository in the dialog title instead of "
"just the root directory name. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:314
+#: tortoisehg/hgqt/settings.py:402
msgid "Auto-resolve merges"
msgstr "Résoudre automatiquement les fusions"
-#: tortoisehg/hgqt/settings.py:315
+#: tortoisehg/hgqt/settings.py:403
msgid ""
"Indicates whether TortoiseHg should attempt to automatically resolve changes "
"from both sides to the same file, and only report merge conflicts when this "
@@ -4983,66 +5441,62 @@"to review and resolve changes manually. Default: False."
msgstr ""
-#: tortoisehg/hgqt/settings.py:324 tortoisehg/util/menuthg.py:46
-msgid "Workbench"
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:325 tortoisehg/hgtk/thgconfig.py:130
+#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgtk/thgconfig.py:130
msgid "Author Coloring"
msgstr ""
-#: tortoisehg/hgqt/settings.py:326 tortoisehg/hgtk/thgconfig.py:131
+#: tortoisehg/hgqt/settings.py:414 tortoisehg/hgtk/thgconfig.py:131
msgid ""
"Color changesets by author name. If not enabled, the changes are colored "
"green for merge, red for non-trivial parents, black for normal. Default: "
"False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:330
+#: tortoisehg/hgqt/settings.py:418
msgid "Task Tabs"
msgstr ""
-#: tortoisehg/hgqt/settings.py:332
+#: tortoisehg/hgqt/settings.py:420
msgid ""
"Show tabs along the side of the bottom half of each repo widget allowing one "
"to switch task tabs without using the toolbar. Default: off"
msgstr ""
-#: tortoisehg/hgqt/settings.py:335 tortoisehg/hgtk/thgconfig.py:135
+#: tortoisehg/hgqt/settings.py:423 tortoisehg/hgtk/thgconfig.py:135
msgid "Long Summary"
msgstr ""
-#: tortoisehg/hgqt/settings.py:336 tortoisehg/hgtk/thgconfig.py:136
+#: tortoisehg/hgqt/settings.py:424 tortoisehg/hgtk/thgconfig.py:136
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:339 tortoisehg/hgtk/thgconfig.py:139
+#: tortoisehg/hgqt/settings.py:427 tortoisehg/hgtk/thgconfig.py:139
msgid "Log Batch Size"
msgstr ""
-#: tortoisehg/hgqt/settings.py:340 tortoisehg/hgtk/thgconfig.py:140
+#: tortoisehg/hgqt/settings.py:428 tortoisehg/hgtk/thgconfig.py:140
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: tortoisehg/hgqt/settings.py:343 tortoisehg/hgtk/thgconfig.py:143
+#: tortoisehg/hgqt/settings.py:431 tortoisehg/hgtk/thgconfig.py:143
msgid "Dead Branches"
msgstr "Branches mortes"
-#: tortoisehg/hgqt/settings.py:344 tortoisehg/hgtk/thgconfig.py:144
+#: tortoisehg/hgqt/settings.py:432 tortoisehg/hgtk/thgconfig.py:144
msgid ""
"Comma separated list of branch names that should be ignored when building a "
"list of branch names for a repository. Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:347 tortoisehg/hgtk/thgconfig.py:147
+#: tortoisehg/hgqt/settings.py:435 tortoisehg/hgtk/thgconfig.py:147
msgid "Branch Colors"
msgstr ""
-#: tortoisehg/hgqt/settings.py:348
+#: tortoisehg/hgqt/settings.py:436
msgid ""
"Space separated list of branch names and colors of the form branch:#XXXXXX. "
"Spaces and colons in the branch name must be escaped using a backslash (\\). "
@@ -5051,204 +5505,204 @@"blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:354 tortoisehg/hgtk/thgconfig.py:154
+#: tortoisehg/hgqt/settings.py:442 tortoisehg/hgtk/thgconfig.py:154
msgid "Hide Tags"
msgstr "Cacher les étiquettes"
-#: tortoisehg/hgqt/settings.py:355
+#: tortoisehg/hgqt/settings.py:443
msgid ""
"Space separated list of tags that will not be shown.Useful example: Specify "
"\"qbase qparent qtip\" to hide the standard tags inserted by the Mercurial "
"Queues Extension. Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:359 tortoisehg/hgtk/thgconfig.py:172
+#: tortoisehg/hgqt/settings.py:447 tortoisehg/hgtk/thgconfig.py:172
msgid "After Pull Operation"
msgstr ""
-#: tortoisehg/hgqt/settings.py:361
+#: tortoisehg/hgqt/settings.py:449
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
msgstr ""
-#: tortoisehg/hgqt/settings.py:366
+#: tortoisehg/hgqt/settings.py:454
msgctxt "config item"
msgid "Commit"
msgstr ""
-#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgqt/sync.py:1186
+#: tortoisehg/hgqt/settings.py:455 tortoisehg/hgqt/sync.py:1218
#: tortoisehg/hgtk/thgconfig.py:90
msgid "Username"
msgstr "Nom d'utilisateur"
-#: tortoisehg/hgqt/settings.py:368
-msgid ""
-"Name associated with commits. The common format is<br>\"Full Name "
-"<email@example.com>\""
-msgstr ""
-
-#: tortoisehg/hgqt/settings.py:370 tortoisehg/hgtk/thgconfig.py:92
+#: tortoisehg/hgqt/settings.py:456
+msgid ""
+"Name associated with commits. The common format is:<br>Full Name "
+"<email@example.com>"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:458 tortoisehg/hgtk/thgconfig.py:92
msgid "Summary Line Length"
msgstr ""
-#: tortoisehg/hgqt/settings.py:371
+#: tortoisehg/hgqt/settings.py:459
msgid ""
"Suggested length of commit message lines. A red vertical line will mark this "
"length. CTRL-E will reflow the current paragraph to the specified line "
"length. Default: 80"
msgstr ""
-#: tortoisehg/hgqt/settings.py:374 tortoisehg/hgtk/thgconfig.py:103
+#: tortoisehg/hgqt/settings.py:462 tortoisehg/hgtk/thgconfig.py:103
msgid "Close After Commit"
msgstr ""
-#: tortoisehg/hgqt/settings.py:375
+#: tortoisehg/hgqt/settings.py:463
msgid "Close the commit tool after every successful commit. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:377 tortoisehg/hgtk/thgconfig.py:106
+#: tortoisehg/hgqt/settings.py:465 tortoisehg/hgtk/thgconfig.py:106
msgid "Push After Commit"
msgstr ""
-#: tortoisehg/hgqt/settings.py:379
+#: tortoisehg/hgqt/settings.py:467
msgid ""
"Attempt to push to specified URL or alias after each successful commit. "
"Default: No push"
msgstr ""
-#: tortoisehg/hgqt/settings.py:381 tortoisehg/hgtk/thgconfig.py:109
+#: tortoisehg/hgqt/settings.py:469 tortoisehg/hgtk/thgconfig.py:109
msgid "Auto Commit List"
msgstr ""
-#: tortoisehg/hgqt/settings.py:382 tortoisehg/hgtk/thgconfig.py:110
+#: tortoisehg/hgqt/settings.py:470 tortoisehg/hgtk/thgconfig.py:110
msgid ""
"Comma separated list of files that are automatically included in every "
"commit. Intended for use only as a repository setting. Default: None (leave "
"blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:385 tortoisehg/hgtk/thgconfig.py:113
+#: tortoisehg/hgqt/settings.py:473 tortoisehg/hgtk/thgconfig.py:113
msgid "Auto Exclude List"
msgstr ""
-#: tortoisehg/hgqt/settings.py:386
+#: tortoisehg/hgqt/settings.py:474
msgid ""
"Comma separated list of files that are automatically unchecked when the "
"status, and commit dialogs are opened. Default: None (leave blank)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:389 tortoisehg/hgtk/thgconfig.py:117
+#: tortoisehg/hgqt/settings.py:477 tortoisehg/hgtk/thgconfig.py:117
msgid "English Messages"
msgstr ""
-#: tortoisehg/hgqt/settings.py:390 tortoisehg/hgtk/thgconfig.py:118
+#: tortoisehg/hgqt/settings.py:478 tortoisehg/hgtk/thgconfig.py:118
msgid ""
"Generate English commit messages even if LANGUAGE or LANG environment "
"variables are set to a non-English language. This setting is used by the "
"Merge, Tag and Backout dialogs. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:396 tortoisehg/hgtk/thgconfig.py:179
+#: tortoisehg/hgqt/settings.py:484 tortoisehg/hgtk/thgconfig.py:179
#: tortoisehg/util/menuthg.py:55
msgid "Web Server"
msgstr "Serveur Web"
-#: tortoisehg/hgqt/settings.py:397 tortoisehg/hgtk/thgconfig.py:180
+#: tortoisehg/hgqt/settings.py:485 tortoisehg/hgtk/thgconfig.py:180
#: tortoisehg/hgtk/thgpbranch.py:210
msgid "Name"
msgstr "Nom"
-#: tortoisehg/hgqt/settings.py:398
+#: tortoisehg/hgqt/settings.py:486
msgid ""
"Repository name to use in the web interface, and by TortoiseHg as a "
"shorthand name. Default is the working directory."
msgstr ""
-#: tortoisehg/hgqt/settings.py:400 tortoisehg/hgtk/thgconfig.py:183
+#: tortoisehg/hgqt/settings.py:488 tortoisehg/hgtk/thgconfig.py:183
#: tortoisehg/hgtk/thgconfig.py:745
msgid "Description"
msgstr "Description"
-#: tortoisehg/hgqt/settings.py:401 tortoisehg/hgtk/thgconfig.py:184
+#: tortoisehg/hgqt/settings.py:489 tortoisehg/hgtk/thgconfig.py:184
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: tortoisehg/hgqt/settings.py:403 tortoisehg/hgtk/thgconfig.py:186
+#: tortoisehg/hgqt/settings.py:491 tortoisehg/hgtk/thgconfig.py:186
msgid "Contact"
msgstr ""
-#: tortoisehg/hgqt/settings.py:404 tortoisehg/hgtk/thgconfig.py:187
+#: tortoisehg/hgqt/settings.py:492 tortoisehg/hgtk/thgconfig.py:187
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: tortoisehg/hgqt/settings.py:406 tortoisehg/hgtk/thgconfig.py:189
+#: tortoisehg/hgqt/settings.py:494 tortoisehg/hgtk/thgconfig.py:189
msgid "Style"
msgstr "Style"
-#: tortoisehg/hgqt/settings.py:408 tortoisehg/hgtk/thgconfig.py:191
+#: tortoisehg/hgqt/settings.py:496 tortoisehg/hgtk/thgconfig.py:191
msgid "Which template map style to use"
msgstr ""
-#: tortoisehg/hgqt/settings.py:409 tortoisehg/hgtk/thgconfig.py:192
+#: tortoisehg/hgqt/settings.py:497 tortoisehg/hgtk/thgconfig.py:192
msgid "Archive Formats"
msgstr ""
-#: tortoisehg/hgqt/settings.py:411 tortoisehg/hgtk/thgconfig.py:193
+#: tortoisehg/hgqt/settings.py:499 tortoisehg/hgtk/thgconfig.py:193
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgqt/sync.py:197
+#: tortoisehg/hgqt/settings.py:501 tortoisehg/hgqt/sync.py:210
#: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
msgid "Port"
msgstr ""
-#: tortoisehg/hgqt/settings.py:413 tortoisehg/hgtk/thgconfig.py:195
+#: tortoisehg/hgqt/settings.py:501 tortoisehg/hgtk/thgconfig.py:195
msgid "Port to listen on"
msgstr ""
-#: tortoisehg/hgqt/settings.py:414 tortoisehg/hgtk/thgconfig.py:196
+#: tortoisehg/hgqt/settings.py:502 tortoisehg/hgtk/thgconfig.py:196
msgid "Push Requires SSL"
msgstr ""
-#: tortoisehg/hgqt/settings.py:415 tortoisehg/hgtk/thgconfig.py:197
+#: tortoisehg/hgqt/settings.py:503 tortoisehg/hgtk/thgconfig.py:197
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: tortoisehg/hgqt/settings.py:417 tortoisehg/hgtk/thgconfig.py:199
+#: tortoisehg/hgqt/settings.py:505 tortoisehg/hgtk/thgconfig.py:199
msgid "Stripes"
msgstr ""
-#: tortoisehg/hgqt/settings.py:418 tortoisehg/hgtk/thgconfig.py:200
+#: tortoisehg/hgqt/settings.py:506 tortoisehg/hgtk/thgconfig.py:200
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: tortoisehg/hgqt/settings.py:420 tortoisehg/hgtk/thgconfig.py:202
+#: tortoisehg/hgqt/settings.py:508 tortoisehg/hgtk/thgconfig.py:202
msgid "Max Files"
msgstr ""
-#: tortoisehg/hgqt/settings.py:421
+#: tortoisehg/hgqt/settings.py:509
msgid "Maximum number of files to list per changeset. Default: 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:422 tortoisehg/hgtk/thgconfig.py:204
+#: tortoisehg/hgqt/settings.py:510 tortoisehg/hgtk/thgconfig.py:204
msgid "Max Changes"
msgstr ""
-#: tortoisehg/hgqt/settings.py:423
+#: tortoisehg/hgqt/settings.py:511
msgid "Maximum number of changes to list on the changelog. Default: 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:425 tortoisehg/hgtk/thgconfig.py:206
+#: tortoisehg/hgqt/settings.py:513 tortoisehg/hgtk/thgconfig.py:206
msgid "Allow Push"
msgstr ""
-#: tortoisehg/hgqt/settings.py:426 tortoisehg/hgtk/thgconfig.py:207
+#: tortoisehg/hgqt/settings.py:514 tortoisehg/hgtk/thgconfig.py:207
msgid ""
"Whether to allow pushing to the repository. If empty or not set, push is not "
"allowed. If the special value \"*\", any remote user can push, including "
@@ -5258,11 +5712,11 @@"examined after the deny_push list."
msgstr ""
-#: tortoisehg/hgqt/settings.py:433 tortoisehg/hgtk/thgconfig.py:214
+#: tortoisehg/hgqt/settings.py:521 tortoisehg/hgtk/thgconfig.py:214
msgid "Deny Push"
msgstr ""
-#: tortoisehg/hgqt/settings.py:434 tortoisehg/hgtk/thgconfig.py:215
+#: tortoisehg/hgqt/settings.py:522 tortoisehg/hgtk/thgconfig.py:215
msgid ""
"Whether to deny pushing to the repository. If empty or not set, push is not "
"denied. If the special value \"*\", all remote users are denied push. "
@@ -5271,88 +5725,88 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: tortoisehg/hgqt/settings.py:440 tortoisehg/hgtk/thgconfig.py:221
+#: tortoisehg/hgqt/settings.py:528 tortoisehg/hgtk/thgconfig.py:221
msgid "Encoding"
msgstr ""
-#: tortoisehg/hgqt/settings.py:441 tortoisehg/hgtk/thgconfig.py:222
+#: tortoisehg/hgqt/settings.py:529 tortoisehg/hgtk/thgconfig.py:222
msgid "Character encoding name"
msgstr ""
-#: tortoisehg/hgqt/settings.py:444 tortoisehg/hgtk/thgconfig.py:225
+#: tortoisehg/hgqt/settings.py:532 tortoisehg/hgtk/thgconfig.py:225
msgid "Proxy"
msgstr ""
-#: tortoisehg/hgqt/settings.py:445 tortoisehg/hgtk/thgconfig.py:226
+#: tortoisehg/hgqt/settings.py:533 tortoisehg/hgtk/thgconfig.py:226
#: tortoisehg/hgtk/thgconfig.py:369
msgid "Host"
msgstr ""
-#: tortoisehg/hgqt/settings.py:446 tortoisehg/hgtk/thgconfig.py:227
+#: tortoisehg/hgqt/settings.py:534 tortoisehg/hgtk/thgconfig.py:227
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: tortoisehg/hgqt/settings.py:448 tortoisehg/hgtk/thgconfig.py:229
+#: tortoisehg/hgqt/settings.py:536 tortoisehg/hgtk/thgconfig.py:229
msgid "Bypass List"
msgstr ""
-#: tortoisehg/hgqt/settings.py:449 tortoisehg/hgtk/thgconfig.py:230
+#: tortoisehg/hgqt/settings.py:537 tortoisehg/hgtk/thgconfig.py:230
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: tortoisehg/hgqt/settings.py:452 tortoisehg/hgtk/thgconfig.py:233
+#: tortoisehg/hgqt/settings.py:540 tortoisehg/hgtk/thgconfig.py:233
msgid "Optional. User name to authenticate with at the proxy server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:453 tortoisehg/hgqt/settings.py:566
-#: tortoisehg/hgqt/sync.py:1194 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/settings.py:541 tortoisehg/hgqt/settings.py:661
+#: tortoisehg/hgqt/sync.py:1226 tortoisehg/hgtk/thgconfig.py:234
#: tortoisehg/hgtk/thgconfig.py:370
msgid "Password"
msgstr "Mot de passe"
-#: tortoisehg/hgqt/settings.py:454 tortoisehg/hgtk/thgconfig.py:235
+#: tortoisehg/hgqt/settings.py:542 tortoisehg/hgtk/thgconfig.py:235
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:458 tortoisehg/hgtk/thgconfig.py:239
+#: tortoisehg/hgqt/settings.py:546 tortoisehg/hgtk/thgconfig.py:239
msgid "From"
msgstr "De"
-#: tortoisehg/hgqt/settings.py:459 tortoisehg/hgtk/thgconfig.py:240
+#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:240
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: tortoisehg/hgqt/settings.py:461 tortoisehg/hgtk/thgconfig.py:242
+#: tortoisehg/hgqt/settings.py:549 tortoisehg/hgtk/thgconfig.py:242
msgid "To"
msgstr "À"
-#: tortoisehg/hgqt/settings.py:462 tortoisehg/hgtk/thgconfig.py:243
+#: tortoisehg/hgqt/settings.py:550 tortoisehg/hgtk/thgconfig.py:243
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: tortoisehg/hgqt/settings.py:463 tortoisehg/hgtk/thgconfig.py:244
+#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:244
msgid "Cc"
msgstr ""
-#: tortoisehg/hgqt/settings.py:464 tortoisehg/hgtk/thgconfig.py:245
+#: tortoisehg/hgqt/settings.py:552 tortoisehg/hgtk/thgconfig.py:245
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: tortoisehg/hgqt/settings.py:465 tortoisehg/hgtk/thgconfig.py:246
+#: tortoisehg/hgqt/settings.py:553 tortoisehg/hgtk/thgconfig.py:246
msgid "Bcc"
msgstr ""
-#: tortoisehg/hgqt/settings.py:466 tortoisehg/hgtk/thgconfig.py:247
+#: tortoisehg/hgqt/settings.py:554 tortoisehg/hgtk/thgconfig.py:247
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: tortoisehg/hgqt/settings.py:468 tortoisehg/hgtk/thgconfig.py:249
+#: tortoisehg/hgqt/settings.py:556 tortoisehg/hgtk/thgconfig.py:249
msgid "method"
msgstr ""
-#: tortoisehg/hgqt/settings.py:469 tortoisehg/hgtk/thgconfig.py:250
+#: tortoisehg/hgqt/settings.py:557 tortoisehg/hgtk/thgconfig.py:250
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -5362,82 +5816,82 @@"messages."
msgstr ""
-#: tortoisehg/hgqt/settings.py:475 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:563 tortoisehg/hgtk/thgconfig.py:256
msgid "SMTP Host"
msgstr ""
-#: tortoisehg/hgqt/settings.py:476 tortoisehg/hgtk/thgconfig.py:256
+#: tortoisehg/hgqt/settings.py:564 tortoisehg/hgtk/thgconfig.py:256
msgid "Host name of mail server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:477 tortoisehg/hgtk/thgconfig.py:257
+#: tortoisehg/hgqt/settings.py:565 tortoisehg/hgtk/thgconfig.py:257
msgid "SMTP Port"
msgstr ""
-#: tortoisehg/hgqt/settings.py:478 tortoisehg/hgtk/thgconfig.py:258
+#: tortoisehg/hgqt/settings.py:566 tortoisehg/hgtk/thgconfig.py:258
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: tortoisehg/hgqt/settings.py:480 tortoisehg/hgtk/thgconfig.py:260
+#: tortoisehg/hgqt/settings.py:568 tortoisehg/hgtk/thgconfig.py:260
msgid "SMTP TLS"
msgstr ""
-#: tortoisehg/hgqt/settings.py:481 tortoisehg/hgtk/thgconfig.py:261
+#: tortoisehg/hgqt/settings.py:569 tortoisehg/hgtk/thgconfig.py:261
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:483 tortoisehg/hgtk/thgconfig.py:263
+#: tortoisehg/hgqt/settings.py:571 tortoisehg/hgtk/thgconfig.py:263
msgid "SMTP Username"
msgstr ""
-#: tortoisehg/hgqt/settings.py:484 tortoisehg/hgtk/thgconfig.py:264
+#: tortoisehg/hgqt/settings.py:572 tortoisehg/hgtk/thgconfig.py:264
msgid "Username to authenticate to mail server with"
msgstr ""
-#: tortoisehg/hgqt/settings.py:485 tortoisehg/hgtk/thgconfig.py:265
+#: tortoisehg/hgqt/settings.py:573 tortoisehg/hgtk/thgconfig.py:265
msgid "SMTP Password"
msgstr ""
-#: tortoisehg/hgqt/settings.py:486 tortoisehg/hgtk/thgconfig.py:266
+#: tortoisehg/hgqt/settings.py:574 tortoisehg/hgtk/thgconfig.py:266
msgid "Password to authenticate to mail server with"
msgstr ""
-#: tortoisehg/hgqt/settings.py:487 tortoisehg/hgtk/thgconfig.py:267
+#: tortoisehg/hgqt/settings.py:575 tortoisehg/hgtk/thgconfig.py:267
msgid "Local Hostname"
msgstr ""
-#: tortoisehg/hgqt/settings.py:488 tortoisehg/hgtk/thgconfig.py:268
+#: tortoisehg/hgqt/settings.py:576 tortoisehg/hgtk/thgconfig.py:268
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: tortoisehg/hgqt/settings.py:492 tortoisehg/hgtk/thgconfig.py:272
+#: tortoisehg/hgqt/settings.py:580 tortoisehg/hgtk/thgconfig.py:272
msgid "Diff"
msgstr ""
-#: tortoisehg/hgqt/settings.py:494 tortoisehg/hgtk/thgconfig.py:273
+#: tortoisehg/hgqt/settings.py:582 tortoisehg/hgtk/thgconfig.py:273
msgid "Patch EOL"
msgstr ""
-#: tortoisehg/hgqt/settings.py:496 tortoisehg/hgtk/thgconfig.py:274
+#: tortoisehg/hgqt/settings.py:584 tortoisehg/hgtk/thgconfig.py:274
msgid ""
"Normalize file line endings during and after patch to lf or crlf. Strict "
"does no normalization. Auto does per-file detection, and is the recommended "
"setting. Default: strict"
msgstr ""
-#: tortoisehg/hgqt/settings.py:500 tortoisehg/hgtk/thgconfig.py:278
+#: tortoisehg/hgqt/settings.py:588 tortoisehg/hgtk/thgconfig.py:278
msgid "Git Format"
msgstr ""
-#: tortoisehg/hgqt/settings.py:501 tortoisehg/hgtk/thgconfig.py:279
+#: tortoisehg/hgqt/settings.py:589 tortoisehg/hgtk/thgconfig.py:279
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:503
+#: tortoisehg/hgqt/settings.py:591
msgid "MQ Git Format"
msgstr ""
-#: tortoisehg/hgqt/settings.py:505
+#: tortoisehg/hgqt/settings.py:593
msgid ""
"If set to 'keep', mq will obey the [diff] section configuration while "
"preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq "
@@ -5445,112 +5899,112 @@"possibly losing data in the second case."
msgstr ""
-#: tortoisehg/hgqt/settings.py:509 tortoisehg/hgtk/thgconfig.py:281
+#: tortoisehg/hgqt/settings.py:597 tortoisehg/hgtk/thgconfig.py:281
msgid "No Dates"
msgstr ""
-#: tortoisehg/hgqt/settings.py:510 tortoisehg/hgtk/thgconfig.py:282
+#: tortoisehg/hgqt/settings.py:598 tortoisehg/hgtk/thgconfig.py:282
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:512 tortoisehg/hgtk/thgconfig.py:284
+#: tortoisehg/hgqt/settings.py:600 tortoisehg/hgtk/thgconfig.py:284
msgid "Show Function"
msgstr ""
-#: tortoisehg/hgqt/settings.py:513 tortoisehg/hgtk/thgconfig.py:285
+#: tortoisehg/hgqt/settings.py:601 tortoisehg/hgtk/thgconfig.py:285
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:515 tortoisehg/hgtk/thgconfig.py:287
+#: tortoisehg/hgqt/settings.py:603 tortoisehg/hgtk/thgconfig.py:287
msgid "Ignore White Space"
msgstr ""
-#: tortoisehg/hgqt/settings.py:516 tortoisehg/hgtk/thgconfig.py:288
+#: tortoisehg/hgqt/settings.py:604 tortoisehg/hgtk/thgconfig.py:288
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:518 tortoisehg/hgtk/thgconfig.py:290
+#: tortoisehg/hgqt/settings.py:606 tortoisehg/hgtk/thgconfig.py:290
msgid "Ignore WS Amount"
msgstr ""
-#: tortoisehg/hgqt/settings.py:519 tortoisehg/hgtk/thgconfig.py:291
+#: tortoisehg/hgqt/settings.py:607 tortoisehg/hgtk/thgconfig.py:291
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:521 tortoisehg/hgtk/thgconfig.py:293
+#: tortoisehg/hgqt/settings.py:609 tortoisehg/hgtk/thgconfig.py:293
msgid "Ignore Blank Lines"
msgstr ""
-#: tortoisehg/hgqt/settings.py:522 tortoisehg/hgtk/thgconfig.py:294
+#: tortoisehg/hgqt/settings.py:610 tortoisehg/hgtk/thgconfig.py:294
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: tortoisehg/hgqt/settings.py:526
+#: tortoisehg/hgqt/settings.py:614
msgid "Fonts"
msgstr "Polices"
-#: tortoisehg/hgqt/settings.py:527
+#: tortoisehg/hgqt/settings.py:615
msgid "Message Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:528
+#: tortoisehg/hgqt/settings.py:616
msgid "Font used to display commit messages. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:530
+#: tortoisehg/hgqt/settings.py:618
msgid "Diff Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:531
+#: tortoisehg/hgqt/settings.py:619
msgid "Font used to display text differences. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:533
+#: tortoisehg/hgqt/settings.py:621
msgid "List Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:534
+#: tortoisehg/hgqt/settings.py:622
msgid "Font used to display file lists. Default: sans 9"
msgstr ""
-#: tortoisehg/hgqt/settings.py:536
+#: tortoisehg/hgqt/settings.py:624
msgid "ChangeLog Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:537
+#: tortoisehg/hgqt/settings.py:625
msgid "Font used to display changelog data. Default: monospace 10"
msgstr ""
-#: tortoisehg/hgqt/settings.py:539
+#: tortoisehg/hgqt/settings.py:627
msgid "Output Font"
msgstr ""
-#: tortoisehg/hgqt/settings.py:540
+#: tortoisehg/hgqt/settings.py:628
msgid "Font used to display output messages. Default: sans 8"
msgstr ""
-#: tortoisehg/hgqt/settings.py:544 tortoisehg/hgqt/settings.py:986
+#: tortoisehg/hgqt/settings.py:632 tortoisehg/hgqt/settings.py:1105
#: tortoisehg/hgtk/thgconfig.py:318
msgid "Extensions"
msgstr "Extensions"
-#: tortoisehg/hgqt/settings.py:547 tortoisehg/hgtk/thgconfig.py:321
+#: tortoisehg/hgqt/settings.py:635 tortoisehg/hgtk/thgconfig.py:321
msgid "Issue Tracking"
msgstr ""
-#: tortoisehg/hgqt/settings.py:548 tortoisehg/hgtk/thgconfig.py:323
+#: tortoisehg/hgqt/settings.py:636 tortoisehg/hgtk/thgconfig.py:323
msgid "Issue Regex"
msgstr ""
-#: tortoisehg/hgqt/settings.py:549 tortoisehg/hgtk/thgconfig.py:324
+#: tortoisehg/hgqt/settings.py:637 tortoisehg/hgtk/thgconfig.py:324
msgid "Defines the regex to match when picking up issue numbers."
msgstr ""
-#: tortoisehg/hgqt/settings.py:550 tortoisehg/hgtk/thgconfig.py:325
+#: tortoisehg/hgqt/settings.py:638 tortoisehg/hgtk/thgconfig.py:325
msgid "Issue Link"
msgstr ""
-#: tortoisehg/hgqt/settings.py:551 tortoisehg/hgtk/thgconfig.py:326
+#: tortoisehg/hgqt/settings.py:639 tortoisehg/hgtk/thgconfig.py:326
msgid ""
"Defines the command to run when an issue number is recognized. You may "
"include groups in issue.regex, and corresponding {n} tokens in issue.link "
@@ -5559,117 +6013,135 @@"tokensare found in issue.link, the entire matched string is appended instead."
msgstr ""
-#: tortoisehg/hgqt/settings.py:561
+#: tortoisehg/hgqt/settings.py:646
+msgid "Issue Tracker Plugin"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:648
+msgid ""
+"Configures a COM IBugTraqProvider or IBugTrackProvider2 issue tracking "
+"plugin."
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:650
+msgid "Configure Issue Tracker"
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:651
+msgid "Configure the selected COM Bug Tracker plugin."
+msgstr ""
+
+#: tortoisehg/hgqt/settings.py:656
msgid "Server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:562
+#: tortoisehg/hgqt/settings.py:657
msgid "Path to review board example \"http://demo.reviewboard.org\""
msgstr ""
-#: tortoisehg/hgqt/settings.py:565
+#: tortoisehg/hgqt/settings.py:660
msgid "User name to authenticate with review board"
msgstr ""
-#: tortoisehg/hgqt/settings.py:567
+#: tortoisehg/hgqt/settings.py:662
msgid "Password to authenticate with review board"
msgstr ""
-#: tortoisehg/hgqt/settings.py:568
+#: tortoisehg/hgqt/settings.py:663
msgid "Server Repository ID"
msgstr ""
-#: tortoisehg/hgqt/settings.py:569
+#: tortoisehg/hgqt/settings.py:664
msgid "The default repository id for this repo on the review board server"
msgstr ""
-#: tortoisehg/hgqt/settings.py:570
+#: tortoisehg/hgqt/settings.py:665
msgid "Target Groups"
msgstr ""
-#: tortoisehg/hgqt/settings.py:571
+#: tortoisehg/hgqt/settings.py:666
msgid "A comma separated list of target groups"
msgstr ""
-#: tortoisehg/hgqt/settings.py:572
+#: tortoisehg/hgqt/settings.py:667
msgid "Target People"
msgstr ""
-#: tortoisehg/hgqt/settings.py:573
+#: tortoisehg/hgqt/settings.py:668
msgid "A comma separated list of target people"
msgstr ""
-#: tortoisehg/hgqt/settings.py:585
+#: tortoisehg/hgqt/settings.py:680
msgid "TortoiseHg Settings"
msgstr ""
-#: tortoisehg/hgqt/settings.py:590 tortoisehg/hgtk/thgconfig.py:648
+#: tortoisehg/hgqt/settings.py:685 tortoisehg/hgtk/thgconfig.py:648
msgid "Iniparse package not found"
msgstr ""
-#: tortoisehg/hgqt/settings.py:591 tortoisehg/hgtk/thgconfig.py:649
+#: tortoisehg/hgqt/settings.py:686 tortoisehg/hgtk/thgconfig.py:649
msgid "Can't change settings without iniparse package - view is readonly."
msgstr ""
-#: tortoisehg/hgqt/settings.py:615
+#: tortoisehg/hgqt/settings.py:710
#, python-format
msgid "%s's global settings"
msgstr ""
-#: tortoisehg/hgqt/settings.py:629 tortoisehg/hgtk/thgconfig.py:638
+#: tortoisehg/hgqt/settings.py:724 tortoisehg/hgtk/thgconfig.py:638
msgid "No repository found"
msgstr ""
-#: tortoisehg/hgqt/settings.py:630 tortoisehg/hgtk/thgconfig.py:639
+#: tortoisehg/hgqt/settings.py:725 tortoisehg/hgtk/thgconfig.py:639
msgid "no repo at "
msgstr ""
-#: tortoisehg/hgqt/settings.py:636 tortoisehg/hgtk/thgconfig.py:671
+#: tortoisehg/hgqt/settings.py:731 tortoisehg/hgtk/thgconfig.py:671
#, python-format
msgid "%s repository settings"
msgstr ""
-#: tortoisehg/hgqt/settings.py:663
+#: tortoisehg/hgqt/settings.py:758
msgid ""
"Restart all TortoiseHg applications for the following changes to take effect:"
msgstr ""
-#: tortoisehg/hgqt/settings.py:671
+#: tortoisehg/hgqt/settings.py:766
msgid "Apply changes before exit?"
msgstr ""
-#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgtk/commit.py:325
-#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200
+#: tortoisehg/hgqt/settings.py:767 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgtk/commit.py:1192 tortoisehg/hgtk/commit.py:1199
#: tortoisehg/hgtk/status.py:1320 tortoisehg/hgtk/thgconfig.py:848
#: tortoisehg/hgtk/thgmq.py:369
msgid "&Yes"
msgstr "&Oui"
-#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgtk/thgconfig.py:848
+#: tortoisehg/hgqt/settings.py:767 tortoisehg/hgtk/thgconfig.py:848
msgid "&No (discard changes)"
msgstr ""
-#: tortoisehg/hgqt/settings.py:726
+#: tortoisehg/hgqt/settings.py:821
msgid "Settings File:"
msgstr ""
-#: tortoisehg/hgqt/settings.py:769
+#: tortoisehg/hgqt/settings.py:879
msgid "Confirm Save"
msgstr "Confirmer l'enregistrement"
-#: tortoisehg/hgqt/settings.py:770
+#: tortoisehg/hgqt/settings.py:880
msgid "Save changes before editing?"
msgstr ""
-#: tortoisehg/hgqt/settings.py:771 tortoisehg/hgtk/thgconfig.py:775
+#: tortoisehg/hgqt/settings.py:881 tortoisehg/hgtk/thgconfig.py:775
msgid "&Save"
msgstr "Enregi&strer"
-#: tortoisehg/hgqt/settings.py:829 tortoisehg/hgtk/thgconfig.py:822
+#: tortoisehg/hgqt/settings.py:943 tortoisehg/hgtk/thgconfig.py:822
msgid "Confirm Reload"
msgstr ""
-#: tortoisehg/hgqt/settings.py:830 tortoisehg/hgtk/thgconfig.py:823
+#: tortoisehg/hgqt/settings.py:944 tortoisehg/hgtk/thgconfig.py:823
msgid ""
"Unsaved changes will be lost.\n"
"Do you want to reload?"
@@ -5677,11 +6149,11 @@"Les changements non enregistrés seront perdus.\n"
"Voulez-vous recharger ?"
-#: tortoisehg/hgqt/settings.py:936 tortoisehg/hgtk/thgconfig.py:1550
+#: tortoisehg/hgqt/settings.py:1055 tortoisehg/hgtk/thgconfig.py:1550
msgid "Unable to create a Mercurial.ini file"
msgstr ""
-#: tortoisehg/hgqt/settings.py:937
+#: tortoisehg/hgqt/settings.py:1056
msgid "Insufficient access rights, reverting to read-only mode."
msgstr ""
@@ -5818,8 +6290,8 @@msgid "Refresh Toolbar"
msgstr ""
-#: tortoisehg/hgqt/shelve.py:135 tortoisehg/hgqt/status.py:231
-#: tortoisehg/hgqt/status.py:242 tortoisehg/hgtk/commit.py:241
+#: tortoisehg/hgqt/shelve.py:135 tortoisehg/hgqt/status.py:244
+#: tortoisehg/hgqt/status.py:257 tortoisehg/hgtk/commit.py:240
#: tortoisehg/hgtk/hgignore.py:142 tortoisehg/hgtk/history.py:404
msgid "Refresh"
msgstr "Actualiser"
@@ -5911,428 +6383,428 @@msgid "Patch: %s"
msgstr "Patch : %s"
-#: tortoisehg/hgqt/status.py:96
-msgid "Refresh file list"
-msgstr "Actualiser la liste des fichiers"
-
-#: tortoisehg/hgqt/status.py:101
+#: tortoisehg/hgqt/status.py:100
msgid "### filter text ###"
msgstr ""
-#: tortoisehg/hgqt/status.py:103
+#: tortoisehg/hgqt/status.py:102
msgid "Filter:"
msgstr "Filtre :"
+#: tortoisehg/hgqt/status.py:113
+msgid "Check all files"
+msgstr "Cocher tous les fichiers"
+
#: tortoisehg/hgqt/status.py:114
+msgid "Uncheck all files"
+msgstr "Décocher tous les fichiers"
+
+#: tortoisehg/hgqt/status.py:119
msgid "Status File List Toolbar"
msgstr ""
-#: tortoisehg/hgqt/status.py:133 tortoisehg/hgtk/status.py:330
+#: tortoisehg/hgqt/status.py:141 tortoisehg/hgtk/status.py:330
msgid "Remove filter, show root"
msgstr "Enlever le filtre, afficher la racine"
-#: tortoisehg/hgqt/status.py:140
-msgid "Check all files"
-msgstr "Cocher tous les fichiers"
-
-#: tortoisehg/hgqt/status.py:144
-msgid "Uncheck all files"
-msgstr "Décocher tous les fichiers"
-
-#: tortoisehg/hgqt/status.py:197
+#: tortoisehg/hgqt/status.py:198
#, python-format
msgid "%s - status (selection filtered)"
msgstr ""
-#: tortoisehg/hgqt/status.py:199
+#: tortoisehg/hgqt/status.py:200
#, python-format
msgid "%s - status"
msgstr ""
-#: tortoisehg/hgqt/status.py:231 tortoisehg/hgtk/browse.py:112
+#: tortoisehg/hgqt/status.py:244 tortoisehg/hgtk/browse.py:112
#: tortoisehg/hgtk/quickop.py:106 tortoisehg/hgtk/status.py:95
msgid "status"
msgstr "état"
-#: tortoisehg/hgqt/status.py:257 tortoisehg/hgtk/quickop.py:186
+#: tortoisehg/hgqt/status.py:272 tortoisehg/hgtk/quickop.py:186
msgid "No appropriate files"
msgstr ""
-#: tortoisehg/hgqt/status.py:258 tortoisehg/hgtk/quickop.py:187
+#: tortoisehg/hgqt/status.py:273 tortoisehg/hgtk/quickop.py:187
msgid "No files found for this operation"
msgstr "Aucun fichier trouvé pour cette opération"
-#: tortoisehg/hgqt/status.py:305
+#: tortoisehg/hgqt/status.py:591
+msgid "Stat"
+msgstr "État"
+
+#: tortoisehg/hgqt/status.py:591
+msgid "M"
+msgstr "M"
+
+#: tortoisehg/hgqt/status.py:591 tortoisehg/hgtk/datamine.py:140
+msgid "Filename"
+msgstr "Nom de fichier"
+
+#: tortoisehg/hgqt/status.py:592 tortoisehg/hgtk/thgconfig.py:414
+msgid "Type"
+msgstr "Type"
+
+#: tortoisehg/hgqt/status.py:592
+msgid "Size (KB)"
+msgstr "Taille (ko)"
+
+#: tortoisehg/hgqt/status.py:628
#, python-format
msgid "Checked count: %d"
msgstr "Cochés : %d"
-#: tortoisehg/hgqt/status.py:546
-msgid "Stat"
-msgstr "État"
-
-#: tortoisehg/hgqt/status.py:546
-msgid "M"
-msgstr "M"
-
-#: tortoisehg/hgqt/status.py:546 tortoisehg/hgtk/datamine.py:140
-msgid "Filename"
-msgstr "Nom de fichier"
-
-#: tortoisehg/hgqt/status.py:547 tortoisehg/hgtk/thgconfig.py:414
-msgid "Type"
-msgstr "Type"
-
-#: tortoisehg/hgqt/status.py:547
-msgid "Size (KB)"
-msgstr "Taille (ko)"
-
-#: tortoisehg/hgqt/status.py:730
+#: tortoisehg/hgqt/status.py:777
msgid ", resolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:732
+#: tortoisehg/hgqt/status.py:779
msgid ", unresolved merge"
msgstr ""
-#: tortoisehg/hgqt/status.py:745
+#: tortoisehg/hgqt/status.py:792
#, python-format
msgid "%s is modified"
msgstr "%s est modifié"
-#: tortoisehg/hgqt/status.py:746 tortoisehg/hgtk/quickop.py:163
+#: tortoisehg/hgqt/status.py:793 tortoisehg/hgtk/quickop.py:163
msgid "modified"
msgstr "modifié"
-#: tortoisehg/hgqt/status.py:747
+#: tortoisehg/hgqt/status.py:794
#, python-format
msgid "%s is added"
msgstr "%s est ajouté"
-#: tortoisehg/hgqt/status.py:748 tortoisehg/hgtk/quickop.py:166
+#: tortoisehg/hgqt/status.py:795 tortoisehg/hgtk/quickop.py:166
msgid "added"
msgstr "ajouté"
-#: tortoisehg/hgqt/status.py:749
+#: tortoisehg/hgqt/status.py:796
#, python-format
msgid "%s is removed"
msgstr "%s est enlevé"
-#: tortoisehg/hgqt/status.py:750 tortoisehg/hgtk/quickop.py:169
+#: tortoisehg/hgqt/status.py:797 tortoisehg/hgtk/quickop.py:169
msgid "removed"
msgstr "enlevé"
-#: tortoisehg/hgqt/status.py:751
+#: tortoisehg/hgqt/status.py:798
#, python-format
msgid "%s is not tracked (unknown)"
msgstr "%s n'est pas suivi (inconnu)"
-#: tortoisehg/hgqt/status.py:752 tortoisehg/hgtk/quickop.py:175
+#: tortoisehg/hgqt/status.py:799 tortoisehg/hgtk/quickop.py:175
#: tortoisehg/hgtk/quickop.py:255 tortoisehg/hgtk/serve.py:127
#: tortoisehg/util/version.py:47 tortoisehg/util/version.py:73
msgid "unknown"
msgstr "inconnu"
-#: tortoisehg/hgqt/status.py:753
+#: tortoisehg/hgqt/status.py:800
#, python-format
msgid "%s is missing!"
msgstr "%s est manquant !"
-#: tortoisehg/hgqt/status.py:754
+#: tortoisehg/hgqt/status.py:801
msgid "deleted"
msgstr "supprimé"
-#: tortoisehg/hgqt/status.py:755
+#: tortoisehg/hgqt/status.py:802
#, python-format
msgid "%s is ignored"
msgstr "%s est ignoré"
-#: tortoisehg/hgqt/status.py:756 tortoisehg/hgtk/quickop.py:179
+#: tortoisehg/hgqt/status.py:803 tortoisehg/hgtk/quickop.py:179
#: tortoisehg/hgtk/quickop.py:255
msgid "ignored"
msgstr "ignoré"
-#: tortoisehg/hgqt/status.py:757
+#: tortoisehg/hgqt/status.py:804
#, python-format
msgid "%s is not modified (clean)"
msgstr "%s n'est pas modifié (propre)"
-#: tortoisehg/hgqt/status.py:758 tortoisehg/hgtk/quickop.py:183
+#: tortoisehg/hgqt/status.py:805 tortoisehg/hgtk/quickop.py:183
msgid "clean"
msgstr "propre"
-#: tortoisehg/hgqt/status.py:759
+#: tortoisehg/hgqt/status.py:806
#, python-format
msgid "%s is a dirty subrepo"
msgstr ""
-#: tortoisehg/hgqt/status.py:760
+#: tortoisehg/hgqt/status.py:807
msgid "subrepo"
msgstr ""
-#: tortoisehg/hgqt/sync.py:41
+#: tortoisehg/hgqt/sync.py:39
msgid "Malformed ssh URL"
msgstr "URL SSH malformée"
-#: tortoisehg/hgqt/sync.py:89
+#: tortoisehg/hgqt/sync.py:94
msgid "TortoiseHg Sync"
msgstr ""
-#: tortoisehg/hgqt/sync.py:107
+#: tortoisehg/hgqt/sync.py:112
msgid "Preview incoming changesets from remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:110
+#: tortoisehg/hgqt/sync.py:115
msgid "Pull incoming changesets from remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:113
+#: tortoisehg/hgqt/sync.py:118
msgid "Filter outgoing changesets to remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:116
+#: tortoisehg/hgqt/sync.py:121
msgid "Push outgoing changesets to remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:118
+#: tortoisehg/hgqt/sync.py:123
msgid "Email outgoing changesets for remote repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:123
+#: tortoisehg/hgqt/sync.py:128
msgid "Manage pending perforce changelists"
msgstr ""
-#: tortoisehg/hgqt/sync.py:130
+#: tortoisehg/hgqt/sync.py:134
+msgid "Unbundle"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:138
msgid "Stop current operation"
msgstr "Arrêter l'opération en cours"
-#: tortoisehg/hgqt/sync.py:144 tortoisehg/hgqt/update.py:68
+#: tortoisehg/hgqt/sync.py:152 tortoisehg/hgqt/update.py:68
#: tortoisehg/hgtk/update.py:78
msgid "Target:"
msgstr "Cible :"
-#: tortoisehg/hgqt/sync.py:154
+#: tortoisehg/hgqt/sync.py:162
msgid "<b>Selected Options:</b>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:164
+#: tortoisehg/hgqt/sync.py:172
msgid "<b>Remote Repository:</b>"
msgstr "<b> Dépôt distant :</b>"
#: tortoisehg/hgqt/sync.py:183
+msgid "Path Edit Toolbar"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:192
+msgid "Security"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:193
msgid "Manage HTTPS connection security and user authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:187
+#: tortoisehg/hgqt/sync.py:198
msgid "Hostname"
msgstr ""
-#: tortoisehg/hgqt/sync.py:214
+#: tortoisehg/hgqt/sync.py:226 tortoisehg/hgqt/webconf_ui.py:77
+msgid "Save"
+msgstr "Enregistrer"
+
+#: tortoisehg/hgqt/sync.py:227
msgid "Save current URL under an alias"
msgstr "Enregistrer l'URL actuelle sous un alias"
-#: tortoisehg/hgqt/sync.py:228
+#: tortoisehg/hgqt/sync.py:241
msgid "Paths in Repository Settings:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:243
+#: tortoisehg/hgqt/sync.py:256
msgid "Related Paths:"
msgstr ""
-#: tortoisehg/hgqt/sync.py:277
+#: tortoisehg/hgqt/sync.py:293
#, python-format
msgid "Preview incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:278
+#: tortoisehg/hgqt/sync.py:294
#, python-format
msgid "Pull incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:279
+#: tortoisehg/hgqt/sync.py:295
#, python-format
msgid "Filter outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:280
+#: tortoisehg/hgqt/sync.py:296
#, python-format
msgid "Push outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:287
+#: tortoisehg/hgqt/sync.py:303
#, python-format
msgid "rev: %d (%s)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:292 tortoisehg/hgtk/commit.py:792
+#: tortoisehg/hgqt/sync.py:308 tortoisehg/hgtk/commit.py:791
msgid "branch: "
msgstr "branche : "
-#: tortoisehg/hgqt/sync.py:298
+#: tortoisehg/hgqt/sync.py:314
msgid "bookmark: "
msgstr "signet : "
-#: tortoisehg/hgqt/sync.py:351 tortoisehg/hgtk/synch.py:157
+#: tortoisehg/hgqt/sync.py:367 tortoisehg/hgtk/synch.py:157
msgid "Post Pull: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:522
+#: tortoisehg/hgqt/sync.py:538
msgid "Repository not local"
msgstr "Dépôt non local"
-#: tortoisehg/hgqt/sync.py:523
+#: tortoisehg/hgqt/sync.py:539
msgid "A terminal shell cannot be opened for remote"
msgstr "Une console ne peut pas être ouverte à distance"
-#: tortoisehg/hgqt/sync.py:533
-msgid "Repository not found"
-msgstr "Dépôt non trouvé"
-
-#: tortoisehg/hgqt/sync.py:538 tortoisehg/hgqt/workbench.py:700
-msgid "No shell configured"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:539 tortoisehg/hgqt/workbench.py:701
-msgid "A terminal shell must be configured"
-msgstr "Une console doit être configurée"
-
-#: tortoisehg/hgqt/sync.py:541 tortoisehg/hgqt/sync.py:1305
+#: tortoisehg/hgqt/sync.py:544 tortoisehg/hgqt/sync.py:1338
msgid "Confirm path delete"
msgstr ""
-#: tortoisehg/hgqt/sync.py:542 tortoisehg/hgqt/sync.py:1306
+#: tortoisehg/hgqt/sync.py:545 tortoisehg/hgqt/sync.py:1339
#, python-format
msgid "Delete %s from your repo configuration file?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:622
+#: tortoisehg/hgqt/sync.py:628
msgid "No URL selected"
msgstr "Aucune URL sélectionnée"
-#: tortoisehg/hgqt/sync.py:623
+#: tortoisehg/hgqt/sync.py:629
msgid "An URL must be selected for this operation."
msgstr "Une URL doit être sélectionnée pour cette opération."
-#: tortoisehg/hgqt/sync.py:638
+#: tortoisehg/hgqt/sync.py:644
msgid "Redundant authentication info"
msgstr ""
-#: tortoisehg/hgqt/sync.py:639
+#: tortoisehg/hgqt/sync.py:645
msgid ""
"You have authentication info configured for this host and inside this URL. "
"Remove authentication info from this URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:658 tortoisehg/hgqt/sync.py:664
-#: tortoisehg/hgqt/sync.py:670 tortoisehg/hgqt/sync.py:676
-#: tortoisehg/hgqt/sync.py:683
+#: tortoisehg/hgqt/sync.py:664 tortoisehg/hgqt/sync.py:670
+#: tortoisehg/hgqt/sync.py:676 tortoisehg/hgqt/sync.py:682
+#: tortoisehg/hgqt/sync.py:689
msgid "sync command already running"
msgstr "une commande de synchronisation est déjà en cours d'exécution"
-#: tortoisehg/hgqt/sync.py:701
+#: tortoisehg/hgqt/sync.py:707
#, python-format
msgid "Getting incoming changesets from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:706 tortoisehg/hgqt/sync.py:724
+#: tortoisehg/hgqt/sync.py:712 tortoisehg/hgqt/sync.py:730
#, python-format
msgid "Found incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:709 tortoisehg/hgqt/sync.py:726
+#: tortoisehg/hgqt/sync.py:715 tortoisehg/hgqt/sync.py:732
#, python-format
msgid "No incoming changesets from %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:711 tortoisehg/hgqt/sync.py:728
+#: tortoisehg/hgqt/sync.py:717 tortoisehg/hgqt/sync.py:734
#, python-format
msgid "Incoming from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:738
+#: tortoisehg/hgqt/sync.py:744
#, python-format
msgid "Pull from %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:740
+#: tortoisehg/hgqt/sync.py:746
#, python-format
msgid "Pull from %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:752 tortoisehg/hgqt/update.py:333
+#: tortoisehg/hgqt/sync.py:758 tortoisehg/hgqt/update.py:335
msgid "Merge caused file conflicts"
msgstr ""
-#: tortoisehg/hgqt/sync.py:753 tortoisehg/hgqt/update.py:334
+#: tortoisehg/hgqt/sync.py:759 tortoisehg/hgqt/update.py:336
msgid "File conflicts need to be resolved"
msgstr ""
-#: tortoisehg/hgqt/sync.py:759
+#: tortoisehg/hgqt/sync.py:765
#, python-format
msgid "Pulling from %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:774
+#: tortoisehg/hgqt/sync.py:780
#, python-format
msgid "Finding outgoing changesets to %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:786
+#: tortoisehg/hgqt/sync.py:792
#, python-format
msgid "%d outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:789
+#: tortoisehg/hgqt/sync.py:795
#, python-format
msgid "No outgoing changesets to %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:791
+#: tortoisehg/hgqt/sync.py:797
#, python-format
msgid "Outgoing to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:816 tortoisehg/hgtk/history.py:584
+#: tortoisehg/hgqt/sync.py:822 tortoisehg/hgtk/history.py:584
#, python-format
msgid "%s (submitted)"
msgstr "%s (soumis)"
-#: tortoisehg/hgqt/sync.py:818 tortoisehg/hgtk/history.py:586
+#: tortoisehg/hgqt/sync.py:824 tortoisehg/hgtk/history.py:586
#: tortoisehg/hgtk/history.py:592
#, python-format
msgid "%s (pending)"
msgstr "%s (en attente)"
-#: tortoisehg/hgqt/sync.py:823 tortoisehg/hgtk/history.py:595
+#: tortoisehg/hgqt/sync.py:829 tortoisehg/hgtk/history.py:595
msgid "Unable to parse p4pending output"
msgstr "Incapable de parser la sortie p4pendinng"
-#: tortoisehg/hgqt/sync.py:825 tortoisehg/hgtk/history.py:597
+#: tortoisehg/hgqt/sync.py:831 tortoisehg/hgtk/history.py:597
#, python-format
msgid "%d pending changelists found"
msgstr "%d listes de changement en attente trouvés"
-#: tortoisehg/hgqt/sync.py:827 tortoisehg/hgtk/history.py:599
+#: tortoisehg/hgqt/sync.py:833 tortoisehg/hgtk/history.py:599
msgid "No pending Perforce changelists"
msgstr "Aucune liste de changement Perforce en attente"
-#: tortoisehg/hgqt/sync.py:829 tortoisehg/hgtk/history.py:601
+#: tortoisehg/hgqt/sync.py:835 tortoisehg/hgtk/history.py:601
msgid "Aborted p4pending"
msgstr "Abandon de p4pending"
-#: tortoisehg/hgqt/sync.py:831 tortoisehg/hgtk/history.py:603
+#: tortoisehg/hgqt/sync.py:837 tortoisehg/hgtk/history.py:603
msgid "Unable to determine pending changesets"
msgstr "Impossible de déterminer les ensembles de changement en attente"
-#: tortoisehg/hgqt/sync.py:841
+#: tortoisehg/hgqt/sync.py:847
msgid "Perforce pending..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:848 tortoisehg/hgtk/history.py:2623
+#: tortoisehg/hgqt/sync.py:855 tortoisehg/hgtk/history.py:2623
msgid "Confirm Push to remote Repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:849 tortoisehg/hgtk/history.py:2624
+#: tortoisehg/hgqt/sync.py:856 tortoisehg/hgtk/history.py:2624
#, python-format
msgid ""
"Push to remote repository\n"
@@ -6340,167 +6812,170 @@"?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:852
+#: tortoisehg/hgqt/sync.py:859
#, python-format
msgid "Push to %s aborted"
msgstr ""
-#: tortoisehg/hgqt/sync.py:855
+#: tortoisehg/hgqt/sync.py:863
#, python-format
msgid "Pushing to %s..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:858
+#: tortoisehg/hgqt/sync.py:866
#, python-format
msgid "Push to %s completed"
msgstr ""
-#: tortoisehg/hgqt/sync.py:860
+#: tortoisehg/hgqt/sync.py:868
#, python-format
msgid "Push to %s aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:872
+#: tortoisehg/hgqt/sync.py:885
msgid "Determining outgoing changesets to email..."
msgstr ""
-#: tortoisehg/hgqt/sync.py:876 tortoisehg/hgtk/history.py:2021
-#, python-format
-msgid "%d outgoing changesets"
-msgstr ""
-
-#: tortoisehg/hgqt/sync.py:886 tortoisehg/hgtk/history.py:2025
+#: tortoisehg/hgqt/sync.py:899 tortoisehg/hgtk/history.py:2025
msgid "No outgoing changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:888
+#: tortoisehg/hgqt/sync.py:901
#, python-format
msgid "Outgoing aborted, ret %d"
msgstr ""
-#: tortoisehg/hgqt/sync.py:900
+#: tortoisehg/hgqt/sync.py:908
+msgid "Select bundle file"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:909
+msgid "Bundle files (*.hg)"
+msgstr ""
+
+#: tortoisehg/hgqt/sync.py:928
msgid "Unable to remove URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:922
+#: tortoisehg/hgqt/sync.py:950
msgid "Post Pull Behavior"
msgstr ""
-#: tortoisehg/hgqt/sync.py:926
+#: tortoisehg/hgqt/sync.py:954
msgid "Select post-pull operation for this repository"
msgstr ""
-#: tortoisehg/hgqt/sync.py:929
+#: tortoisehg/hgqt/sync.py:957
msgid "None - simply pull changesets"
msgstr ""
-#: tortoisehg/hgqt/sync.py:930
+#: tortoisehg/hgqt/sync.py:958
msgid "Update - pull, then try to update"
msgstr ""
-#: tortoisehg/hgqt/sync.py:936
+#: tortoisehg/hgqt/sync.py:964
msgid "Fetch - use fetch (auto merge pulled changes)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:938
+#: tortoisehg/hgqt/sync.py:966
msgid "Fetch - use fetch extension (fetch is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:945
+#: tortoisehg/hgqt/sync.py:973
msgid "Rebase - rebase local commits above pulled changes"
msgstr ""
-#: tortoisehg/hgqt/sync.py:947
+#: tortoisehg/hgqt/sync.py:975
msgid "Rebase - use rebase extension (rebase is not active!)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:965
+#: tortoisehg/hgqt/sync.py:993
msgid "<a href=\"config\">Launch settings tool...</a>"
msgstr ""
-#: tortoisehg/hgqt/sync.py:998
+#: tortoisehg/hgqt/sync.py:1026
msgid "Unable to save post pull operation"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1022
+#: tortoisehg/hgqt/sync.py:1050
msgid "Save Path"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1032 tortoisehg/hgqt/sync.py:1349
+#: tortoisehg/hgqt/sync.py:1060 tortoisehg/hgqt/sync.py:1382
#: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
msgid "Alias"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1035 tortoisehg/hgqt/sync.py:1349
+#: tortoisehg/hgqt/sync.py:1063 tortoisehg/hgqt/sync.py:1382
#: tortoisehg/hgtk/thgconfig.py:368
msgid "URL"
msgstr "URL"
-#: tortoisehg/hgqt/sync.py:1044
+#: tortoisehg/hgqt/sync.py:1072
msgid "Remove authentication data from URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1046
+#: tortoisehg/hgqt/sync.py:1074
msgid ""
"User authentication data should be associated with the hostname using the "
"security dialog."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1068
+#: tortoisehg/hgqt/sync.py:1096
msgid "Unable to save an URL"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1079
+#: tortoisehg/hgqt/sync.py:1107
msgid "Confirm URL replace"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1080
+#: tortoisehg/hgqt/sync.py:1108
#, python-format
msgid "%s already exists, replace URL?"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1104
+#: tortoisehg/hgqt/sync.py:1132
msgid "Certificate Query Error"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1117
+#: tortoisehg/hgqt/sync.py:1145
msgid "Security: "
msgstr ""
-#: tortoisehg/hgqt/sync.py:1132
+#: tortoisehg/hgqt/sync.py:1164
#, python-format
msgid "<b>Host:</b> %s"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1134
+#: tortoisehg/hgqt/sync.py:1166
msgid "Secure HTTPS Connection"
msgstr "Connexion HTTPS Securisée"
-#: tortoisehg/hgqt/sync.py:1141
+#: tortoisehg/hgqt/sync.py:1173
msgid "Verify with Certificate Authority certificates (best)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1143
+#: tortoisehg/hgqt/sync.py:1175
msgid "Verify with stored host fingerprint (good)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1145
+#: tortoisehg/hgqt/sync.py:1177
msgid "No host validation, but still encrypted (bad)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1152
+#: tortoisehg/hgqt/sync.py:1184
msgid "### host certificate fingerprint ###"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1156
+#: tortoisehg/hgqt/sync.py:1188
msgid "Query"
msgstr "Requête"
-#: tortoisehg/hgqt/sync.py:1175
+#: tortoisehg/hgqt/sync.py:1207
msgid "User Authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1182
+#: tortoisehg/hgqt/sync.py:1214
msgid ""
"Optional. Username to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
@@ -6508,61 +6983,61 @@"foo.username = $USER."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1191
+#: tortoisehg/hgqt/sync.py:1223
msgid ""
"Optional. Password to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
"it."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1198
+#: tortoisehg/hgqt/sync.py:1230
msgid ""
"Mercurial keyring extension is enabled. Passwords will be stored in a "
"platform-native secure method."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1204
+#: tortoisehg/hgqt/sync.py:1236
msgid ""
"Optional. PEM encoded client certificate key file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1206
+#: tortoisehg/hgqt/sync.py:1238
msgid "User Certificate Key File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1210
+#: tortoisehg/hgqt/sync.py:1242
msgid ""
"Optional. PEM encoded client certificate chain file. Environment variables\n"
"are expanded in the filename."
msgstr ""
-#: tortoisehg/hgqt/sync.py:1212
+#: tortoisehg/hgqt/sync.py:1244
msgid "User Certificate Chain File"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1232
+#: tortoisehg/hgqt/sync.py:1264
msgid "Unable to save authentication"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1393
+#: tortoisehg/hgqt/sync.py:1426
#, python-format
msgid "%s - sync options"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1400
+#: tortoisehg/hgqt/sync.py:1433
msgid "Allow push of a new branch (--new-branch)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1405
+#: tortoisehg/hgqt/sync.py:1438
msgid "Force push or pull (override safety checks, --force)"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1415
+#: tortoisehg/hgqt/sync.py:1448
msgid "Temporarily disable configured HTTP proxy"
msgstr ""
-#: tortoisehg/hgqt/sync.py:1422
+#: tortoisehg/hgqt/sync.py:1455
msgid "Emit debugging output (--debug)"
msgstr ""
@@ -6600,7 +7075,7 @@msgstr ""
#: tortoisehg/hgqt/tag.py:184 tortoisehg/hgtk/bookmark.py:46
-#: tortoisehg/hgtk/commit.py:262 tortoisehg/hgtk/status.py:124
+#: tortoisehg/hgtk/commit.py:261 tortoisehg/hgtk/status.py:124
msgid "Move"
msgstr "Déplacer"
@@ -6609,45 +7084,50 @@msgid "Tag '%s' already exists"
msgstr "L'étiquette '%s' existe déjà"
-#: tortoisehg/hgqt/tag.py:244 tortoisehg/hgqt/tag.py:300
+#: tortoisehg/hgqt/tag.py:244 tortoisehg/hgqt/tag.py:307
msgid "uncommitted merge"
msgstr "fusion non committée"
-#: tortoisehg/hgqt/tag.py:248 tortoisehg/hgqt/tag.py:304
+#: tortoisehg/hgqt/tag.py:248 tortoisehg/hgqt/tag.py:311
msgid "not at a branch head (use force)"
msgstr ""
-#: tortoisehg/hgqt/tag.py:252 tortoisehg/hgtk/tagadd.py:285
+#: tortoisehg/hgqt/tag.py:254
+#, python-format
+msgid "Moved tag %s to changeset %s (from changeset %s)"
+msgstr ""
+
+#: tortoisehg/hgqt/tag.py:259 tortoisehg/hgtk/tagadd.py:285
#, python-format
msgid "Added tag %s for changeset %s"
msgstr "Étiquette %s ajoutée pour la révision %s"
-#: tortoisehg/hgqt/tag.py:259
+#: tortoisehg/hgqt/tag.py:266
#, python-format
msgid "Tag '%s' has been moved"
msgstr "L'étiquette '%s' a été déplacée"
-#: tortoisehg/hgqt/tag.py:261
+#: tortoisehg/hgqt/tag.py:268
#, python-format
msgid "Tag '%s' has been added"
msgstr "L'étiquette '%s' a été ajoutée"
-#: tortoisehg/hgqt/tag.py:292 tortoisehg/hgtk/tagadd.py:303
+#: tortoisehg/hgqt/tag.py:299 tortoisehg/hgtk/tagadd.py:303
#, python-format
msgid "tag '%s' is not a local tag"
msgstr "l'étiquette '%s' n'est pas une étiquette locale"
-#: tortoisehg/hgqt/tag.py:296 tortoisehg/hgtk/tagadd.py:306
+#: tortoisehg/hgqt/tag.py:303 tortoisehg/hgtk/tagadd.py:306
#, python-format
msgid "tag '%s' is not a global tag"
msgstr "l'étiquette '%s' n'est pas une étiquette globale"
-#: tortoisehg/hgqt/tag.py:307 tortoisehg/hgtk/tagadd.py:309
+#: tortoisehg/hgqt/tag.py:314 tortoisehg/hgtk/tagadd.py:309
#, python-format
msgid "Removed tag %s"
msgstr "Étiquette %s enlevée"
-#: tortoisehg/hgqt/tag.py:312
+#: tortoisehg/hgqt/tag.py:319
#, python-format
msgid "Tag '%s' has been removed"
msgstr "l'étiquette '%s' a été enlevée"
@@ -6672,7 +7152,7 @@msgid "Do not strip paths (-p0), required for SVN patches"
msgstr ""
-#: tortoisehg/hgqt/thgimport.py:79 tortoisehg/hgqt/thgstrip.py:51
+#: tortoisehg/hgqt/thgimport.py:79 tortoisehg/hgqt/thgstrip.py:54
#: tortoisehg/hgtk/thgimport.py:105 tortoisehg/hgtk/thgstrip.py:76
msgid "Preview:"
msgstr "Aperçu :"
@@ -6720,60 +7200,60 @@msgid "Nothing to import"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:49 tortoisehg/hgtk/thgstrip.py:51
+#: tortoisehg/hgqt/thgstrip.py:52 tortoisehg/hgtk/thgstrip.py:51
msgid "Strip:"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:80 tortoisehg/hgqt/update.py:88
+#: tortoisehg/hgqt/thgstrip.py:83 tortoisehg/hgqt/update.py:88
#: tortoisehg/hgtk/thgstrip.py:85 tortoisehg/hgtk/update.py:94
msgid "Options:"
msgstr "Options :"
-#: tortoisehg/hgqt/thgstrip.py:85 tortoisehg/hgtk/thgstrip.py:89
+#: tortoisehg/hgqt/thgstrip.py:88 tortoisehg/hgtk/thgstrip.py:89
msgid "Discard local changes, no backup (-f/--force)"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:86 tortoisehg/hgtk/thgstrip.py:114
+#: tortoisehg/hgqt/thgstrip.py:89 tortoisehg/hgtk/thgstrip.py:114
msgid "No backup (-n/--nobackup)"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:107
+#: tortoisehg/hgqt/thgstrip.py:110
msgid "&Strip"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:127 tortoisehg/hgtk/thgstrip.py:36
+#: tortoisehg/hgqt/thgstrip.py:130 tortoisehg/hgtk/thgstrip.py:36
#, python-format
msgid "Strip - %s"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:172
+#: tortoisehg/hgqt/thgstrip.py:175
#, python-format
msgid "<b>%d changesets</b> will be stripped"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:178 tortoisehg/hgtk/thgstrip.py:176
+#: tortoisehg/hgqt/thgstrip.py:181 tortoisehg/hgtk/thgstrip.py:176
msgid "Unknown revision!"
msgstr "Révision inconnue !"
-#: tortoisehg/hgqt/thgstrip.py:202
+#: tortoisehg/hgqt/thgstrip.py:205
msgid "Detected uncommitted local changes."
msgstr "Changements locaux non committés détectés"
-#: tortoisehg/hgqt/thgstrip.py:203
+#: tortoisehg/hgqt/thgstrip.py:206
msgid "Do you want to discard them and continue?"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:204 tortoisehg/hgtk/thgstrip.py:217
+#: tortoisehg/hgqt/thgstrip.py:207 tortoisehg/hgtk/thgstrip.py:217
msgid "&Yes (--force)"
msgstr ""
-#: tortoisehg/hgqt/thgstrip.py:205 tortoisehg/hgtk/commit.py:325
-#: tortoisehg/hgtk/commit.py:1193 tortoisehg/hgtk/commit.py:1200
+#: tortoisehg/hgqt/thgstrip.py:208 tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgtk/commit.py:1192 tortoisehg/hgtk/commit.py:1199
#: tortoisehg/hgtk/thgstrip.py:217
msgid "&No"
msgstr "&Non"
-#: tortoisehg/hgqt/thgstrip.py:206 tortoisehg/hgtk/thgstrip.py:214
+#: tortoisehg/hgqt/thgstrip.py:209 tortoisehg/hgtk/thgstrip.py:214
msgid "Confirm Strip"
msgstr ""
@@ -6934,15 +7414,11 @@msgid "unknown revision!"
msgstr "révision inconnue !"
-#: tortoisehg/hgqt/update.py:246 tortoisehg/hgtk/update.py:231
+#: tortoisehg/hgqt/update.py:246
msgid ""
"Detected uncommitted local changes in working tree.\n"
"Please select to continue:\n"
-"\n"
-msgstr ""
-"Changements locaux non committés détectés dans le répertoire de travail.\n"
-"Sélectionnez pour continuer :\n"
-"\n"
+msgstr ""
#: tortoisehg/hgqt/update.py:249 tortoisehg/hgtk/update.py:234
msgid "Discard - discard local changes, no backup"
@@ -6960,254 +7436,235 @@msgid "Merge - allow to merge with local changes"
msgstr "Fusionner - permettre la fusion avec les changements locaux"
-#: tortoisehg/hgqt/update.py:262 tortoisehg/hgtk/update.py:251
+#: tortoisehg/hgqt/update.py:261 tortoisehg/hgtk/update.py:251
msgid "Confirm Update"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:35 tortoisehg/hgtk/visdiff.py:34
+#: tortoisehg/hgqt/visdiff.py:29 tortoisehg/hgtk/visdiff.py:34
msgid "[non-existant]"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:141 tortoisehg/hgtk/visdiff.py:125
+#: tortoisehg/hgqt/visdiff.py:143 tortoisehg/hgtk/visdiff.py:125
msgid "Tool launch failure"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:142 tortoisehg/hgqt/wctxactions.py:213
-#: tortoisehg/hgtk/visdiff.py:126
+#: tortoisehg/hgqt/visdiff.py:144 tortoisehg/hgtk/visdiff.py:126
#, python-format
msgid "%s : %s"
msgstr "%s : %s"
-#: tortoisehg/hgqt/visdiff.py:149 tortoisehg/hgqt/visdiff.py:221
+#: tortoisehg/hgqt/visdiff.py:151 tortoisehg/hgqt/visdiff.py:223
#: tortoisehg/hgtk/visdiff.py:132 tortoisehg/hgtk/visdiff.py:201
msgid "No diff tool found"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:150 tortoisehg/hgqt/visdiff.py:222
+#: tortoisehg/hgqt/visdiff.py:152 tortoisehg/hgqt/visdiff.py:224
#: tortoisehg/hgtk/visdiff.py:133 tortoisehg/hgtk/visdiff.py:202
msgid "No visual diff tools were detected"
msgstr "Aucun outil de diff visuel détecté"
-#: tortoisehg/hgqt/visdiff.py:155 tortoisehg/hgtk/visdiff.py:138
+#: tortoisehg/hgqt/visdiff.py:157 tortoisehg/hgtk/visdiff.py:138
msgid "[working copy]"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:157 tortoisehg/hgtk/visdiff.py:140
+#: tortoisehg/hgqt/visdiff.py:159 tortoisehg/hgtk/visdiff.py:140
msgid "[original]"
msgstr "[original]"
-#: tortoisehg/hgqt/visdiff.py:196 tortoisehg/hgtk/visdiff.py:177
+#: tortoisehg/hgqt/visdiff.py:198 tortoisehg/hgtk/visdiff.py:177
msgid "Unable to find changeset"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:197 tortoisehg/hgtk/visdiff.py:178
+#: tortoisehg/hgqt/visdiff.py:199 tortoisehg/hgtk/visdiff.py:178
msgid "You likely need to refresh this application"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:214 tortoisehg/hgtk/visdiff.py:195
+#: tortoisehg/hgqt/visdiff.py:216 tortoisehg/hgtk/visdiff.py:195
msgid "No file changes"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:215 tortoisehg/hgtk/visdiff.py:196
+#: tortoisehg/hgqt/visdiff.py:217 tortoisehg/hgtk/visdiff.py:196
msgid "There are no file changes to view"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:350 tortoisehg/hgtk/visdiff.py:326
+#: tortoisehg/hgqt/visdiff.py:352 tortoisehg/hgtk/visdiff.py:326
msgid "cleaning up temp directory\n"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:370 tortoisehg/hgtk/visdiff.py:352
+#: tortoisehg/hgqt/visdiff.py:372 tortoisehg/hgtk/visdiff.py:352
msgid "working changes"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:372
+#: tortoisehg/hgqt/visdiff.py:374
#, python-format
msgid "changeset %d:%s"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:374
+#: tortoisehg/hgqt/visdiff.py:376
#, python-format
msgid "revisions %d:%s to %d:%s"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:376 tortoisehg/hgtk/visdiff.py:357
+#: tortoisehg/hgqt/visdiff.py:378 tortoisehg/hgtk/visdiff.py:357
msgid "Visual Diffs - "
msgstr "Diffs visuels - "
-#: tortoisehg/hgqt/visdiff.py:378 tortoisehg/hgtk/visdiff.py:359
+#: tortoisehg/hgqt/visdiff.py:380 tortoisehg/hgtk/visdiff.py:359
msgid " filtered"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:393 tortoisehg/hgtk/visdiff.py:370
+#: tortoisehg/hgqt/visdiff.py:395 tortoisehg/hgtk/visdiff.py:370
msgid "Temporary files are removed when this dialog is closed"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:411
+#: tortoisehg/hgqt/visdiff.py:413
msgid "Select Tool:"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:435 tortoisehg/hgtk/visdiff.py:424
+#: tortoisehg/hgqt/visdiff.py:437 tortoisehg/hgtk/visdiff.py:424
msgid "Dir diff to p1"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:437 tortoisehg/hgtk/visdiff.py:426
+#: tortoisehg/hgqt/visdiff.py:439 tortoisehg/hgtk/visdiff.py:426
msgid "Dir diff to p2"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:439 tortoisehg/hgtk/visdiff.py:428
+#: tortoisehg/hgqt/visdiff.py:441 tortoisehg/hgtk/visdiff.py:428
msgid "3-way dir diff"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:442 tortoisehg/hgtk/visdiff.py:434
+#: tortoisehg/hgqt/visdiff.py:444 tortoisehg/hgtk/visdiff.py:434
msgid "Directory diff"
msgstr ""
-#: tortoisehg/hgqt/visdiff.py:610 tortoisehg/hgtk/visdiff.py:631
+#: tortoisehg/hgqt/visdiff.py:612 tortoisehg/hgtk/visdiff.py:631
msgid "No repository found here"
msgstr "Pas de dépôt ici"
-#: tortoisehg/hgqt/wctxactions.py:45
+#: tortoisehg/hgqt/wctxactions.py:41
msgid "&Visual Diff"
msgstr "Diff &visuel"
-#: tortoisehg/hgqt/wctxactions.py:48 tortoisehg/hgtk/status.py:1244
+#: tortoisehg/hgqt/wctxactions.py:45 tortoisehg/hgtk/status.py:1244
msgid "View missing"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:50 tortoisehg/hgtk/status.py:1245
-msgid "View other"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:52
-msgid "&Revert"
-msgstr "&Rétablir"
-
-#: tortoisehg/hgqt/wctxactions.py:55 tortoisehg/hgtk/status.py:1250
+#: tortoisehg/hgqt/wctxactions.py:47
+msgid "&Revert..."
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:50 tortoisehg/hgtk/status.py:1250
#: tortoisehg/util/menuthg.py:49
msgid "File History"
msgstr "Historique du fichier"
-#: tortoisehg/hgqt/wctxactions.py:56
+#: tortoisehg/hgqt/wctxactions.py:51
msgid "&Annotate"
msgstr "&Annoter"
-#: tortoisehg/hgqt/wctxactions.py:58
+#: tortoisehg/hgqt/wctxactions.py:53
msgid "&Forget"
msgstr "Oublier"
-#: tortoisehg/hgqt/wctxactions.py:60
+#: tortoisehg/hgqt/wctxactions.py:55
msgid "&Detect Renames..."
msgstr "&Détecter les renommages..."
-#: tortoisehg/hgqt/wctxactions.py:61
-msgid "&Ignore"
-msgstr "&Ignorer"
-
-#: tortoisehg/hgqt/wctxactions.py:62 tortoisehg/hgtk/status.py:1257
+#: tortoisehg/hgqt/wctxactions.py:57
+msgid "&Ignore..."
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:58 tortoisehg/hgtk/status.py:1257
msgid "Remove versioned"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:63
-msgid "&Delete unversioned"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:69
-msgid "Was renamed from"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:77
+#: tortoisehg/hgqt/wctxactions.py:59
+msgid "&Delete unversioned..."
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:61 tortoisehg/hgtk/status.py:1265
+msgid "Mark unresolved"
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:62 tortoisehg/hgtk/status.py:1266
+msgid "Mark resolved"
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:105 tortoisehg/hgtk/status.py:1245
+msgid "View other"
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:109
msgid "&Copy..."
msgstr "&Copier..."
-#: tortoisehg/hgqt/wctxactions.py:78 tortoisehg/hgtk/status.py:1262
+#: tortoisehg/hgqt/wctxactions.py:110 tortoisehg/hgtk/status.py:1262
msgid "Rename..."
msgstr "Renommer..."
-#: tortoisehg/hgqt/wctxactions.py:80 tortoisehg/hgtk/status.py:1265
-msgid "Mark unresolved"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:81 tortoisehg/hgtk/status.py:1266
-msgid "Mark resolved"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:82 tortoisehg/hgtk/status.py:1264
+#: tortoisehg/hgqt/wctxactions.py:116
+msgid "Was renamed from"
+msgstr ""
+
+#: tortoisehg/hgqt/wctxactions.py:126 tortoisehg/hgtk/status.py:1264
msgid "Restart Merge..."
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:85 tortoisehg/hgtk/status.py:1274
+#: tortoisehg/hgqt/wctxactions.py:128 tortoisehg/hgtk/status.py:1274
msgid "Restart merge with"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:108
+#: tortoisehg/hgqt/wctxactions.py:156
msgid " errors"
msgstr " erreurs"
-#: tortoisehg/hgqt/wctxactions.py:111
+#: tortoisehg/hgqt/wctxactions.py:159
msgid " output"
msgstr " sortie"
-#: tortoisehg/hgqt/wctxactions.py:118 tortoisehg/hgqt/wctxactions.py:125
-#: tortoisehg/hgqt/wctxactions.py:128 tortoisehg/hgtk/gdialog.py:582
+#: tortoisehg/hgqt/wctxactions.py:166 tortoisehg/hgqt/wctxactions.py:173
+#: tortoisehg/hgqt/wctxactions.py:176 tortoisehg/hgtk/gdialog.py:582
#: tortoisehg/hgtk/gdialog.py:585
msgid " Aborted"
msgstr " annulé(e)"
-#: tortoisehg/hgqt/wctxactions.py:130
-msgid " not implemented"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:199 tortoisehg/hgtk/gdialog.py:682
-#: tortoisehg/hgtk/gtklib.py:406
-msgid "No visual editor configured"
-msgstr "Aucun éditeur graphique spécifié"
-
-#: tortoisehg/hgqt/wctxactions.py:200 tortoisehg/hgtk/gdialog.py:683
-#: tortoisehg/hgtk/gtklib.py:407
-msgid "Please configure a visual editor."
-msgstr "Veuillez spécifier un éditeur graphique."
-
-#: tortoisehg/hgqt/wctxactions.py:212
-msgid "Editor launch failure"
-msgstr ""
-
-#: tortoisehg/hgqt/wctxactions.py:232 tortoisehg/hgtk/statusact.py:125
+#: tortoisehg/hgqt/wctxactions.py:227 tortoisehg/hgtk/statusact.py:125
msgid "Uncommited merge - please select a parent revision"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:233 tortoisehg/hgtk/statusact.py:126
+#: tortoisehg/hgqt/wctxactions.py:228 tortoisehg/hgtk/statusact.py:126
msgid "Revert files to local or other parent?"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgtk/statusact.py:127
+#: tortoisehg/hgqt/wctxactions.py:229 tortoisehg/hgtk/statusact.py:127
msgid "&Local"
msgstr "&Local"
-#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgtk/statusact.py:127
+#: tortoisehg/hgqt/wctxactions.py:229 tortoisehg/hgtk/statusact.py:127
msgid "&Other"
msgstr "Autre"
-#: tortoisehg/hgqt/wctxactions.py:245
+#: tortoisehg/hgqt/wctxactions.py:240
msgid "Revert local file changes?"
msgstr "Défaire les changements locaux ?"
-#: tortoisehg/hgqt/wctxactions.py:246
+#: tortoisehg/hgqt/wctxactions.py:241
msgid "&Revert with backup"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:246
+#: tortoisehg/hgqt/wctxactions.py:241
msgid "&Discard changes"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:300
+#: tortoisehg/hgqt/wctxactions.py:295
msgid "Confirm Delete Unversioned"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:301
+#: tortoisehg/hgqt/wctxactions.py:296
msgid "Delete the following unversioned files?"
msgstr ""
-#: tortoisehg/hgqt/wctxactions.py:313 tortoisehg/hgtk/statusact.py:40
+#: tortoisehg/hgqt/wctxactions.py:308 tortoisehg/hgtk/statusact.py:40
msgid "Copy file to"
msgstr "Copier le fichier sous"
@@ -7255,249 +7712,296 @@msgid "Config File:"
msgstr ""
-#: tortoisehg/hgqt/webconf_ui.py:77
-msgid "Save"
-msgstr "Enregistrer"
-
-#: tortoisehg/hgqt/workbench.py:45 tortoisehg/hgqt/workbench.py:417
+#: tortoisehg/hgqt/workbench.py:46 tortoisehg/hgqt/workbench.py:548
msgid "TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:70
+#: tortoisehg/hgqt/workbench.py:77
msgid "New Repository..."
msgstr "Nouveau dépôt..."
-#: tortoisehg/hgqt/workbench.py:72 tortoisehg/hgqt/workbench.py:196
+#: tortoisehg/hgqt/workbench.py:79 tortoisehg/hgqt/workbench.py:203
msgid "Clone Repository..."
msgstr "Cloner un dépôt..."
-#: tortoisehg/hgqt/workbench.py:74
+#: tortoisehg/hgqt/workbench.py:81
msgid "Open Repository..."
msgstr "Ouvrir un dépôt..."
-#: tortoisehg/hgqt/workbench.py:107
+#: tortoisehg/hgqt/workbench.py:122
msgid "&File"
msgstr "&Fichier"
-#: tortoisehg/hgqt/workbench.py:108
+#: tortoisehg/hgqt/workbench.py:123
msgid "&View"
msgstr "Affichage"
-#: tortoisehg/hgqt/workbench.py:109
+#: tortoisehg/hgqt/workbench.py:124 tortoisehg/hgqt/workbench.py:355
+msgid "Workbench Toolbars"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:125
msgid "&Repository"
msgstr "Dépôt"
-#: tortoisehg/hgqt/workbench.py:110
+#: tortoisehg/hgqt/workbench.py:126
msgid "&Help"
msgstr "Aide"
-#: tortoisehg/hgqt/workbench.py:112
+#: tortoisehg/hgqt/workbench.py:128
msgid "Edit Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:114
+#: tortoisehg/hgqt/workbench.py:130
msgid "Dock Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:116
+#: tortoisehg/hgqt/workbench.py:132
msgid "Sync Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:118
+#: tortoisehg/hgqt/workbench.py:134
msgid "Task Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:185
+#: tortoisehg/hgqt/workbench.py:201
+msgid "&New Repository..."
+msgstr "&Nouveau dépôt..."
+
+#: tortoisehg/hgqt/workbench.py:207
msgid "&Open Repository..."
msgstr "&Ouvrir un dépôt..."
-#: tortoisehg/hgqt/workbench.py:187
+#: tortoisehg/hgqt/workbench.py:209
msgid "&Close Repository"
msgstr "Fermer un dépôt"
-#: tortoisehg/hgqt/workbench.py:194
-msgid "&New Repository..."
-msgstr "&Nouveau dépôt..."
-
-#: tortoisehg/hgqt/workbench.py:200
+#: tortoisehg/hgqt/workbench.py:216
msgid "&Settings..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:206
+#: tortoisehg/hgqt/workbench.py:222
msgid "Show Repository Registry"
msgstr "Afficher le registre des dépôts"
-#: tortoisehg/hgqt/workbench.py:213
+#: tortoisehg/hgqt/workbench.py:229
+msgid "Show Patch Queue"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:235
+msgid "Show Output &Log"
+msgstr "Afficher le journa&l de sortie"
+
+#: tortoisehg/hgqt/workbench.py:242
+msgid "Repository Registry Options"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:244
msgid "Show Paths"
msgstr "Afficher les chemins"
-#: tortoisehg/hgqt/workbench.py:217
-msgid "Show Output &Log"
-msgstr "Afficher le journa&l de sortie"
-
-#: tortoisehg/hgqt/workbench.py:224
+#: tortoisehg/hgqt/workbench.py:248
+msgid "Show Subrepos on Registry"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:253
+msgid "Show Subrepos for remote repositories"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:258
+msgid "Show Short Paths"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:263
msgid "Choose Log Columns..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:227
+#: tortoisehg/hgqt/workbench.py:266
msgid "Save Open Repositories On Exit"
msgstr "Enregistrer les dépôts ouverts en quittant"
-#: tortoisehg/hgqt/workbench.py:243
+#: tortoisehg/hgqt/workbench.py:279
msgid "Revision &Details"
msgstr "&Détails de révision"
-#: tortoisehg/hgqt/workbench.py:245
+#: tortoisehg/hgqt/workbench.py:280
+msgid "&Commit"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:282
+msgid "MQ Patch"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:283
msgid "S&ynchronize"
msgstr "S&ynchroniser"
-#: tortoisehg/hgqt/workbench.py:246
+#: tortoisehg/hgqt/workbench.py:284
msgid "&Manifest"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:247
+#: tortoisehg/hgqt/workbench.py:285
msgid "&Search"
msgstr "Rechercher"
-#: tortoisehg/hgqt/workbench.py:249
-msgid "Patch &Queue"
-msgstr "&Queue de patch"
-
-#: tortoisehg/hgqt/workbench.py:251
+#: tortoisehg/hgqt/workbench.py:287
msgid "&Patch Branch"
msgstr "Branche de &patch"
-#: tortoisehg/hgqt/workbench.py:254 tortoisehg/hgtk/status.py:1320
+#: tortoisehg/hgqt/workbench.py:290 tortoisehg/hgtk/status.py:1320
msgid "&Refresh"
msgstr "Actualise&r"
-#: tortoisehg/hgqt/workbench.py:257
+#: tortoisehg/hgqt/workbench.py:293
msgid "Refresh current repository"
msgstr "Actualiser le dépôt actuel"
-#: tortoisehg/hgqt/workbench.py:258
+#: tortoisehg/hgqt/workbench.py:294
msgid "Refresh &Task Tab"
msgstr "Actualiser l'onglet de tâche"
-#: tortoisehg/hgqt/workbench.py:261
+#: tortoisehg/hgqt/workbench.py:297
msgid "Refresh only the current task tab"
msgstr "Actualiser uniquement l'onglet de tâche actuel"
-#: tortoisehg/hgqt/workbench.py:263
+#: tortoisehg/hgqt/workbench.py:299
msgid "Load all revisions"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:265
+#: tortoisehg/hgqt/workbench.py:301
msgid "Load all revisions into graph"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:267
+#: tortoisehg/hgqt/workbench.py:303
msgid "Web Server..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:270
+#: tortoisehg/hgqt/workbench.py:306
msgid "Shelve..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:272 tortoisehg/hgtk/history.py:458
+#: tortoisehg/hgqt/workbench.py:308 tortoisehg/hgtk/history.py:458
msgid "Import..."
msgstr "Importer..."
-#: tortoisehg/hgqt/workbench.py:275 tortoisehg/hgtk/recovery.py:68
+#: tortoisehg/hgqt/workbench.py:311 tortoisehg/hgtk/recovery.py:68
msgid "Verify"
msgstr "Vérifier"
-#: tortoisehg/hgqt/workbench.py:277 tortoisehg/hgtk/recovery.py:63
+#: tortoisehg/hgqt/workbench.py:313 tortoisehg/hgtk/recovery.py:63
msgid "Recover"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:280
+#: tortoisehg/hgqt/workbench.py:316
msgid "Resolve..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:283
+#: tortoisehg/hgqt/workbench.py:319
msgid "Rollback/Undo..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:286
+#: tortoisehg/hgqt/workbench.py:322
msgid "Purge..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:289
+#: tortoisehg/hgqt/workbench.py:325
msgid "Bisect..."
msgstr ""
-#: tortoisehg/hgqt/workbench.py:299
+#: tortoisehg/hgqt/workbench.py:335
msgid "Help"
msgstr "Aide"
-#: tortoisehg/hgqt/workbench.py:312
+#: tortoisehg/hgqt/workbench.py:336
+msgid "About Qt"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:337 tortoisehg/util/menuthg.py:73
+msgid "About TortoiseHg"
+msgstr "À propos de TortoiseHg"
+
+#: tortoisehg/hgqt/workbench.py:350
msgid "Filter Toolbar"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:315
+#: tortoisehg/hgqt/workbench.py:353
msgid "Filter graph with revision sets or branches"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:317
-msgid "Workbench Toolbars"
-msgstr ""
-
-#: tortoisehg/hgqt/workbench.py:324 tortoisehg/hgtk/history.py:438
+#: tortoisehg/hgqt/workbench.py:362 tortoisehg/hgtk/history.py:438
#: tortoisehg/hgtk/history.py:1856 tortoisehg/hgtk/synch.py:57
msgid "Incoming"
msgstr "Entrant"
-#: tortoisehg/hgqt/workbench.py:325
+#: tortoisehg/hgqt/workbench.py:363
msgid "Check for incoming changes from selected URL"
msgstr "Chercher les changements entrants de l'URL sélectionnée"
-#: tortoisehg/hgqt/workbench.py:327 tortoisehg/hgtk/history.py:440
+#: tortoisehg/hgqt/workbench.py:365 tortoisehg/hgtk/history.py:440
#: tortoisehg/hgtk/history.py:1986
msgid "Pull"
msgstr "Récupérer"
-#: tortoisehg/hgqt/workbench.py:328
+#: tortoisehg/hgqt/workbench.py:366
msgid "Pull incoming changes from selected URL"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:330 tortoisehg/hgtk/history.py:442
+#: tortoisehg/hgqt/workbench.py:368 tortoisehg/hgtk/history.py:442
#: tortoisehg/hgtk/history.py:2029 tortoisehg/hgtk/synch.py:68
msgid "Outgoing"
msgstr "Sortant"
-#: tortoisehg/hgqt/workbench.py:331
+#: tortoisehg/hgqt/workbench.py:369
msgid "Detect outgoing changes to selected URL"
msgstr "Détecter les changements sortants vers l'URL sélectionnée"
-#: tortoisehg/hgqt/workbench.py:333 tortoisehg/hgtk/history.py:444
-#: tortoisehg/hgtk/history.py:2069 tortoisehg/hgtk/synch.py:73
-msgid "Push"
-msgstr "Publier"
-
-#: tortoisehg/hgqt/workbench.py:334
+#: tortoisehg/hgqt/workbench.py:372
msgid "Push outgoing changes to selected URL"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:419
+#: tortoisehg/hgqt/workbench.py:378 tortoisehg/hgqt/workbench.py:379
+msgid "Close tab"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:380 tortoisehg/hgqt/workbench.py:381
+msgid "Close other tabs"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:382
+msgid "Undo close tab"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:383
+msgid "Reopen last closed tab"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:384
+msgid "Undo close other tabs"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:385
+msgid "Reopen last closed tab group"
+msgstr ""
+
+#: tortoisehg/hgqt/workbench.py:550
#, python-format
msgid "%s - TortoiseHg Workbench - %s"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:422
+#: tortoisehg/hgqt/workbench.py:553
#, python-format
msgid "%s - TortoiseHg Workbench"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:577
+#: tortoisehg/hgqt/workbench.py:737
msgid "Select repository directory to open"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:599
+#: tortoisehg/hgqt/workbench.py:760
msgid "Failed to open repository"
msgstr ""
-#: tortoisehg/hgqt/workbench.py:722
+#: tortoisehg/hgqt/workbench.py:900
#, python-format
msgid "Hg file log viewer [%s] - %s"
msgstr ""
@@ -7575,12 +8079,20 @@msgid "Changeset Description"
msgstr "Description de l'ensemble de modifications"
+#: tortoisehg/hgtk/backout.py:52
+msgid "Backout commit message"
+msgstr ""
+
#: tortoisehg/hgtk/backout.py:78
msgid ""
"Commit message text for new changeset that reverses the effect of the change "
"being backed out."
msgstr ""
+#: tortoisehg/hgtk/backout.py:90
+msgid "Commit backout before merging with current working parent"
+msgstr ""
+
#: tortoisehg/hgtk/backout.py:95
msgid "Backout"
msgstr "Revenir"
@@ -7764,14 +8276,6 @@msgid "Diff to second Parent"
msgstr "Diff par rapport aux deuxième parent"
-#: tortoisehg/hgtk/changeset.py:958
-msgid "Save file to"
-msgstr "Enregistrer le fichier sous"
-
-#: tortoisehg/hgtk/changeset.py:969
-msgid "Unable to save file"
-msgstr "Impossible d'enregistrer le fichier"
-
#: tortoisehg/hgtk/changeset.py:1040
msgid "Confirm revert file to old revision"
msgstr "Confirmer le retour à l'ancienne version"
@@ -7785,6 +8289,10 @@msgid "Enable _Wordwrap"
msgstr "Autoriser la _Césure"
+#: tortoisehg/hgtk/chunks.py:73
+msgid "File is larger than the specified max size.\n"
+msgstr "Le fichier est plus grand que la limite maximale spécifiée.\n"
+
#: tortoisehg/hgtk/chunks.py:74 tortoisehg/hgtk/chunks.py:86
msgid "Hunk selection is disabled for this file.\n"
msgstr "Sélection de morceaux est désactivé pour ce fichier.\n"
@@ -7838,111 +8346,105 @@msgid "Please specify different paths"
msgstr "Veuillez spécifier des chemins différents"
-#: tortoisehg/hgtk/commit.py:38
+#: tortoisehg/hgtk/commit.py:37
msgid "Branch Operations"
msgstr "Opérations de branches"
-#: tortoisehg/hgtk/commit.py:70
+#: tortoisehg/hgtk/commit.py:69
msgid "Close current named branch"
msgstr "Fermer la branche nommée courante"
-#: tortoisehg/hgtk/commit.py:174
+#: tortoisehg/hgtk/commit.py:173
msgid "merging "
msgstr "fusion de "
-#: tortoisehg/hgtk/commit.py:180
+#: tortoisehg/hgtk/commit.py:179
msgid " - qnew"
msgstr " - qnew"
-#: tortoisehg/hgtk/commit.py:183
+#: tortoisehg/hgtk/commit.py:182
msgid " - qrefresh "
msgstr " - qrefresh "
-#: tortoisehg/hgtk/commit.py:184
+#: tortoisehg/hgtk/commit.py:183
msgid " - commit"
msgstr " - valider"
-#: tortoisehg/hgtk/commit.py:227 tortoisehg/hgtk/commit.py:309
-#: tortoisehg/hgtk/history.py:258 tortoisehg/hgtk/history.py:368
-#: tortoisehg/hgtk/thgimport.py:111
-msgid "Patch Queue"
-msgstr "Patch Queue"
-
-#: tortoisehg/hgtk/commit.py:232 tortoisehg/hgtk/history.py:391
+#: tortoisehg/hgtk/commit.py:231 tortoisehg/hgtk/history.py:391
msgid "_View"
msgstr "_Affichage"
-#: tortoisehg/hgtk/commit.py:233 tortoisehg/hgtk/history.py:397
+#: tortoisehg/hgtk/commit.py:232 tortoisehg/hgtk/history.py:397
msgid "Toolbar"
msgstr "Barre d'outils"
-#: tortoisehg/hgtk/commit.py:235
+#: tortoisehg/hgtk/commit.py:234
msgid "Advanced"
msgstr "Avancé"
-#: tortoisehg/hgtk/commit.py:243 tortoisehg/hgtk/history.py:418
+#: tortoisehg/hgtk/commit.py:242 tortoisehg/hgtk/history.py:418
msgid "Ignore Max Diff Size"
msgstr "Ignorer la taille max du diff"
-#: tortoisehg/hgtk/commit.py:245 tortoisehg/hgtk/history.py:420
+#: tortoisehg/hgtk/commit.py:244 tortoisehg/hgtk/history.py:420
msgid "Always Show Output"
msgstr "Toujours montrer le résultat"
-#: tortoisehg/hgtk/commit.py:248
+#: tortoisehg/hgtk/commit.py:247
msgid "_Operations"
msgstr "_Opérations"
-#: tortoisehg/hgtk/commit.py:249 tortoisehg/hgtk/commit.py:303
-#: tortoisehg/hgtk/commit.py:778
+#: tortoisehg/hgtk/commit.py:248 tortoisehg/hgtk/commit.py:302
+#: tortoisehg/hgtk/commit.py:777
msgid "_Commit"
msgstr "_Valider"
-#: tortoisehg/hgtk/commit.py:251 tortoisehg/hgtk/commit.py:301
+#: tortoisehg/hgtk/commit.py:250 tortoisehg/hgtk/commit.py:300
msgid "_Undo"
msgstr "Ann_uler"
-#: tortoisehg/hgtk/commit.py:254 tortoisehg/hgtk/status.py:115
+#: tortoisehg/hgtk/commit.py:253 tortoisehg/hgtk/status.py:115
msgid "_Diff"
msgstr "_Diff"
-#: tortoisehg/hgtk/commit.py:256 tortoisehg/hgtk/status.py:118
+#: tortoisehg/hgtk/commit.py:255 tortoisehg/hgtk/status.py:118
msgid "Re_vert"
msgstr "Re_venir"
-#: tortoisehg/hgtk/commit.py:258 tortoisehg/hgtk/status.py:121
+#: tortoisehg/hgtk/commit.py:257 tortoisehg/hgtk/status.py:121
#: tortoisehg/hgtk/status.py:1248 tortoisehg/hgtk/status.py:1254
#: tortoisehg/hgtk/thgconfig.py:975
msgid "_Add"
msgstr "_Ajouter"
-#: tortoisehg/hgtk/commit.py:260 tortoisehg/hgtk/status.py:127
+#: tortoisehg/hgtk/commit.py:259 tortoisehg/hgtk/status.py:127
#: tortoisehg/hgtk/thgconfig.py:983
msgid "_Remove"
msgstr "Supp_rimer"
-#: tortoisehg/hgtk/commit.py:264 tortoisehg/hgtk/status.py:130
+#: tortoisehg/hgtk/commit.py:263 tortoisehg/hgtk/status.py:130
#: tortoisehg/hgtk/status.py:1253
msgid "_Forget"
msgstr "_Oublier"
-#: tortoisehg/hgtk/commit.py:302
+#: tortoisehg/hgtk/commit.py:301
msgid "undo recent commit"
msgstr "Défaire la dernière validation"
-#: tortoisehg/hgtk/commit.py:304 tortoisehg/hgtk/commit.py:655
+#: tortoisehg/hgtk/commit.py:303 tortoisehg/hgtk/commit.py:654
msgid "commit"
msgstr "Valider"
-#: tortoisehg/hgtk/commit.py:310 tortoisehg/hgtk/history.py:260
+#: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:260
msgid "Show/Hide Patch Queue"
msgstr "Montrer/Cacher la liste des patchs"
-#: tortoisehg/hgtk/commit.py:324
+#: tortoisehg/hgtk/commit.py:323
msgid "Save commit message at exit?"
msgstr "Enregistrer le message de validation lors de la sortie ?"
-#: tortoisehg/hgtk/commit.py:325 tortoisehg/hgtk/commit.py:1193
-#: tortoisehg/hgtk/commit.py:1200 tortoisehg/hgtk/history.py:220
+#: tortoisehg/hgtk/commit.py:324 tortoisehg/hgtk/commit.py:1192
+#: tortoisehg/hgtk/commit.py:1199 tortoisehg/hgtk/history.py:220
#: tortoisehg/hgtk/history.py:2636 tortoisehg/hgtk/status.py:1320
#: tortoisehg/hgtk/statusact.py:127 tortoisehg/hgtk/statusact.py:148
#: tortoisehg/hgtk/thgconfig.py:775 tortoisehg/hgtk/thgconfig.py:849
@@ -7950,115 +8452,112 @@msgid "&Cancel"
msgstr "&Annuler"
-#: tortoisehg/hgtk/commit.py:371
+#: tortoisehg/hgtk/commit.py:370
msgid "Committer:"
msgstr "Valideur"
-#: tortoisehg/hgtk/commit.py:385
+#: tortoisehg/hgtk/commit.py:384
msgid "Auto-includes:"
msgstr "Auto-inclus :"
-#: tortoisehg/hgtk/commit.py:388
+#: tortoisehg/hgtk/commit.py:387
msgid "Push after commit"
msgstr "Pousser après la validation"
-#: tortoisehg/hgtk/commit.py:429
+#: tortoisehg/hgtk/commit.py:428
msgid "Recent commit messages..."
msgstr "Messages récents de validation.."
-#: tortoisehg/hgtk/commit.py:503
+#: tortoisehg/hgtk/commit.py:502
#, python-format
msgid "Parent: %(rev)s"
msgstr "Parent: %(rev)s"
-#: tortoisehg/hgtk/commit.py:511
+#: tortoisehg/hgtk/commit.py:510
msgid "Not at head"
msgstr "Pas à la tête."
-#: tortoisehg/hgtk/commit.py:536 tortoisehg/hgtk/status.py:467
+#: tortoisehg/hgtk/commit.py:535 tortoisehg/hgtk/status.py:467
msgid "Patch Preview"
msgstr "Prévue de la correction"
-#: tortoisehg/hgtk/commit.py:538 tortoisehg/hgtk/status.py:471
+#: tortoisehg/hgtk/commit.py:537 tortoisehg/hgtk/status.py:471
msgid "Commit Preview"
msgstr "Prévisualistaion de la validation"
-#: tortoisehg/hgtk/commit.py:654 tortoisehg/hgtk/commit.py:951
-#: tortoisehg/hgtk/commit.py:1015 tortoisehg/hgtk/commit.py:1264
-#: tortoisehg/hgtk/gdialog.py:485 tortoisehg/hgtk/history.py:279
-#: tortoisehg/hgtk/merge.py:136 tortoisehg/hgtk/thgconfig.py:89
-msgid "Commit"
-msgstr "Valider"
-
-#: tortoisehg/hgtk/commit.py:659
+#: tortoisehg/hgtk/commit.py:658
msgid "create new MQ patch"
msgstr "Créer un nouveau correctif MQ"
-#: tortoisehg/hgtk/commit.py:662
+#: tortoisehg/hgtk/commit.py:661
msgid "refresh top MQ patch"
msgstr "Rafraîchir le correctif MQ au sommet"
-#: tortoisehg/hgtk/commit.py:664
+#: tortoisehg/hgtk/commit.py:663
msgid "_Commit (+1 head)"
msgstr "Valider"
-#: tortoisehg/hgtk/commit.py:664
+#: tortoisehg/hgtk/commit.py:663
msgid "_Commit (-1 head)"
msgstr "_Valider (-1 head)"
-#: tortoisehg/hgtk/commit.py:670
+#: tortoisehg/hgtk/commit.py:669
msgid "commit to merge one head"
msgstr "vailder pour fusionner une tête"
-#: tortoisehg/hgtk/commit.py:673
+#: tortoisehg/hgtk/commit.py:672
msgid "neither parent is a head, commit to add a new head"
msgstr ""
-#: tortoisehg/hgtk/commit.py:678
+#: tortoisehg/hgtk/commit.py:677
msgid "parent is not a head, commit to add a new head"
msgstr "le parent n'est pas une tête, vailder pour ajouter une nouvelle tête"
-#: tortoisehg/hgtk/commit.py:788
+#: tortoisehg/hgtk/commit.py:787
msgid "new branch: "
msgstr "nouvelle branche : "
-#: tortoisehg/hgtk/commit.py:790
+#: tortoisehg/hgtk/commit.py:789
msgid "close branch: "
msgstr "fermer une branche : "
-#: tortoisehg/hgtk/commit.py:859
+#: tortoisehg/hgtk/commit.py:822
+msgid "Merge "
+msgstr "Fusion "
+
+#: tortoisehg/hgtk/commit.py:858
msgid "Patch Contents"
msgstr "contenu du correctif"
-#: tortoisehg/hgtk/commit.py:904
+#: tortoisehg/hgtk/commit.py:903
msgid "Bug Traq"
msgstr ""
-#: tortoisehg/hgtk/commit.py:936
+#: tortoisehg/hgtk/commit.py:935
msgid "No committable files selected"
msgstr "aucun des fichiers sélectionnés n'est validable"
-#: tortoisehg/hgtk/commit.py:952
+#: tortoisehg/hgtk/commit.py:951
msgid "Unable to create "
msgstr "Impossible de créer "
-#: tortoisehg/hgtk/commit.py:1016
+#: tortoisehg/hgtk/commit.py:1015
msgid "Unable to apply patch"
msgstr "Impossible d'effectuer la mise à jour."
-#: tortoisehg/hgtk/commit.py:1029
+#: tortoisehg/hgtk/commit.py:1028
msgid "Commit failed"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1034
+#: tortoisehg/hgtk/commit.py:1033
msgid "Confirm Undo Commit"
msgstr "Confirmer l'annulation de cette validation"
-#: tortoisehg/hgtk/commit.py:1041 tortoisehg/hgtk/commit.py:1056
+#: tortoisehg/hgtk/commit.py:1040 tortoisehg/hgtk/commit.py:1055
msgid "Undo Commit"
msgstr "Défaire la validation"
-#: tortoisehg/hgtk/commit.py:1042
+#: tortoisehg/hgtk/commit.py:1041
msgid ""
"Unable to undo!\n"
"\n"
@@ -8067,34 +8566,34 @@"Impossible d'annuler !\n"
"La version \"tip\" est différente de celle de la dernière validation."
-#: tortoisehg/hgtk/commit.py:1057
+#: tortoisehg/hgtk/commit.py:1056
msgid "Errors during rollback!"
msgstr "Erreur lors du retour en arrière !"
-#: tortoisehg/hgtk/commit.py:1063
+#: tortoisehg/hgtk/commit.py:1062
msgid "Confirm Add/Remove"
msgstr "Confirmer Ajouter/Supprimer"
-#: tortoisehg/hgtk/commit.py:1064
+#: tortoisehg/hgtk/commit.py:1063
msgid "Add/Remove the following files?"
msgstr "Ajouter/Supprimer les fichier suivants ?"
-#: tortoisehg/hgtk/commit.py:1099
+#: tortoisehg/hgtk/commit.py:1098
msgid ""
"No issue link found in the commit message.The commit message should contain "
"an issue link. Configure this in the 'Issue' section in the settings"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1109
+#: tortoisehg/hgtk/commit.py:1108
msgid "Message format configuration error"
msgstr "Erreur de configuration du format de message"
-#: tortoisehg/hgtk/commit.py:1118 tortoisehg/hgtk/commit.py:1126
-#: tortoisehg/hgtk/commit.py:1138
+#: tortoisehg/hgtk/commit.py:1117 tortoisehg/hgtk/commit.py:1125
+#: tortoisehg/hgtk/commit.py:1137
msgid "Confirm Commit"
msgstr "Confirmer la validation"
-#: tortoisehg/hgtk/commit.py:1119
+#: tortoisehg/hgtk/commit.py:1118
#, python-format
msgid ""
"The summary line length of %i is greater than %i.\n"
@@ -8102,7 +8601,7 @@"Ignore format policy and continue commit?"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1127
+#: tortoisehg/hgtk/commit.py:1126
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
@@ -8112,7 +8611,7 @@"\n"
"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
-#: tortoisehg/hgtk/commit.py:1139
+#: tortoisehg/hgtk/commit.py:1138
#, python-format
msgid ""
"The following lines are over the %i-character limit: %s.\n"
@@ -8123,11 +8622,11 @@"\n"
"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
-#: tortoisehg/hgtk/commit.py:1151
+#: tortoisehg/hgtk/commit.py:1150
msgid "Commit: Invalid username"
msgstr "Validation : nom d'utilisateur invalide"
-#: tortoisehg/hgtk/commit.py:1152
+#: tortoisehg/hgtk/commit.py:1151
msgid ""
"Your username has not been configured.\n"
"\n"
@@ -8137,7 +8636,7 @@"\n"
"Veuillez le définir et réessayer."
-#: tortoisehg/hgtk/commit.py:1187
+#: tortoisehg/hgtk/commit.py:1186
#, python-format
msgid ""
"Named branch \"%s\" already exists, last used in revision %d\n"
@@ -8146,7 +8645,7 @@"Cancel - Cancel this commit"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1196
+#: tortoisehg/hgtk/commit.py:1195
#, python-format
msgid ""
"Create new named branch \"%s\" with this commit?\n"
@@ -8155,27 +8654,27 @@"Cancel - Cancel this commit"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1253
+#: tortoisehg/hgtk/commit.py:1252
msgid "Finished committing and pushing"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1255
+#: tortoisehg/hgtk/commit.py:1254
msgid "Finished committing"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1257
+#: tortoisehg/hgtk/commit.py:1256
msgid "Aborted committing"
msgstr "Abandonner la validation"
-#: tortoisehg/hgtk/commit.py:1259
+#: tortoisehg/hgtk/commit.py:1258
msgid "Failed to commit"
msgstr "Échec de la validation"
-#: tortoisehg/hgtk/commit.py:1263
+#: tortoisehg/hgtk/commit.py:1262
msgid "Committing changes..."
msgstr "Validation des changements"
-#: tortoisehg/hgtk/commit.py:1265 tortoisehg/hgtk/history.py:613
+#: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/history.py:613
#: tortoisehg/hgtk/history.py:638 tortoisehg/hgtk/history.py:1775
#: tortoisehg/hgtk/history.py:1857 tortoisehg/hgtk/history.py:1987
#: tortoisehg/hgtk/history.py:2030 tortoisehg/hgtk/history.py:2070
@@ -8185,36 +8684,36 @@msgid "Cannot run now"
msgstr "Ne peut pas fonctionner maintennant"
-#: tortoisehg/hgtk/commit.py:1266
+#: tortoisehg/hgtk/commit.py:1265
msgid "Please try again after the running operation is completed"
msgstr ""
-#: tortoisehg/hgtk/commit.py:1292
+#: tortoisehg/hgtk/commit.py:1291
msgid "Paste _Filenames"
msgstr "Coller Noms de _Fichiers"
-#: tortoisehg/hgtk/commit.py:1293
+#: tortoisehg/hgtk/commit.py:1292
msgid "App_ly Format"
msgstr "App_liquer Format"
-#: tortoisehg/hgtk/commit.py:1294
+#: tortoisehg/hgtk/commit.py:1293
msgid "C_onfigure Format..."
msgstr "C_onfigurer le format"
-#: tortoisehg/hgtk/commit.py:1339
+#: tortoisehg/hgtk/commit.py:1338
msgid "Info Required"
msgstr "Informations Requises"
-#: tortoisehg/hgtk/commit.py:1340
+#: tortoisehg/hgtk/commit.py:1339
msgid "Message format needs to be configured"
msgstr "le format de message doit être configuré"
-#: tortoisehg/hgtk/commit.py:1353
+#: tortoisehg/hgtk/commit.py:1352
#, python-format
msgid "The summary line length of %i is greater than %i"
msgstr "La longueur de la ligne de description de %i est plus grande que %i"
-#: tortoisehg/hgtk/commit.py:1358
+#: tortoisehg/hgtk/commit.py:1357
msgid "The summary line is not followed by a blank line"
msgstr "La ligne de description n'est pas suivie d'une ligne vide."
@@ -9892,10 +10391,6 @@msgid "Use merge tool:"
msgstr ""
-#: tortoisehg/hgtk/merge.py:135
-msgid "Merge"
-msgstr "Fusionner"
-
#: tortoisehg/hgtk/merge.py:165
msgid "Merged successfully"
msgstr ""
@@ -10002,10 +10497,6 @@msgid "Stop the hg operation"
msgstr "Annuler l'opération hg"
-#: tortoisehg/hgtk/recovery.py:52
-msgid "Clean"
-msgstr "Nettoyer"
-
#: tortoisehg/hgtk/recovery.py:54
msgid "Clean checkout, undo all changes"
msgstr "Nettoyer, annule toutes les modifications"
@@ -10438,6 +10929,10 @@msgid "No clean files selected"
msgstr ""
+#: tortoisehg/hgtk/status.py:1251
+msgid "Annotate"
+msgstr "Annoter"
+
#: tortoisehg/hgtk/status.py:1255
msgid "_Guess Rename..."
msgstr ""
@@ -10752,6 +11247,16 @@"dialogs. Default: False (show diffs to right of file list)"
msgstr ""
+#: tortoisehg/hgtk/thgconfig.py:75
+msgid "Capture stderr"
+msgstr ""
+
+#: tortoisehg/hgtk/thgconfig.py:76
+msgid ""
+"Redirect stderr to a buffer which is parsed at the end of the process for "
+"runtime errors. Default: True"
+msgstr ""
+
#: tortoisehg/hgtk/thgconfig.py:78
msgid "Fork hgtk"
msgstr ""
@@ -11465,6 +11970,16 @@msgid "Failed to update"
msgstr ""
+#: tortoisehg/hgtk/update.py:231
+msgid ""
+"Detected uncommitted local changes in working tree.\n"
+"Please select to continue:\n"
+"\n"
+msgstr ""
+"Changements locaux non committés détectés dans le répertoire de travail.\n"
+"Sélectionnez pour continuer :\n"
+"\n"
+
#: tortoisehg/hgtk/update.py:236
msgid "Shelve - launch Shelve tool and continue"
msgstr ""
@@ -11512,80 +12027,80 @@msgid "&Quit"
msgstr "&Quitter"
-#: tortoisehg/util/hglib.py:290
+#: tortoisehg/util/hglib.py:339
msgid "inotify is not supported on this platform"
msgstr "inotify n'est pas supporté sur cette plateforme"
-#: tortoisehg/util/hglib.py:292
+#: tortoisehg/util/hglib.py:341
msgid "eol is incompatible with win32text"
msgstr "eol est incompatible avec win32text"
-#: tortoisehg/util/hglib.py:294
+#: tortoisehg/util/hglib.py:343
msgid "win32text is incompatible with eol"
msgstr "win32text est incompatible avec eol"
-#: tortoisehg/util/hglib.py:296
+#: tortoisehg/util/hglib.py:345
msgid "hgsubversion is incompatible with perfarce"
msgstr "hgsubversion est incompatible avec perfarce"
-#: tortoisehg/util/hglib.py:298
+#: tortoisehg/util/hglib.py:347
msgid "perfarce is incompatible with hgsubversion"
msgstr "perfarce est incompatible avec hgsubversion"
-#: tortoisehg/util/hglib.py:504
+#: tortoisehg/util/hglib.py:538
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d an"
msgstr[1] "%d ans"
-#: tortoisehg/util/hglib.py:505
+#: tortoisehg/util/hglib.py:539
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mois"
msgstr[1] "%d mois"
-#: tortoisehg/util/hglib.py:506
+#: tortoisehg/util/hglib.py:540
#, python-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: tortoisehg/util/hglib.py:507
+#: tortoisehg/util/hglib.py:541
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: tortoisehg/util/hglib.py:508
+#: tortoisehg/util/hglib.py:542
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: tortoisehg/util/hglib.py:509
+#: tortoisehg/util/hglib.py:543
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: tortoisehg/util/hglib.py:510
+#: tortoisehg/util/hglib.py:544
#, python-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d secondes"
-#: tortoisehg/util/hglib.py:520
+#: tortoisehg/util/hglib.py:554
msgid "in the future"
msgstr "dans le futur"
-#: tortoisehg/util/hglib.py:524
+#: tortoisehg/util/hglib.py:558
msgid "now"
msgstr "maintenant"
@@ -11890,10 +12405,6 @@msgid "Configure Explorer extension"
msgstr "Configuration de l'extention de l'Explotateur"
-#: tortoisehg/util/menuthg.py:73
-msgid "About TortoiseHg"
-msgstr "À propos de TortoiseHg"
-
#: tortoisehg/util/menuthg.py:74
msgid "Show About Dialog"
msgstr "À propos..."
@@ -12576,6 +13087,9 @@#~ msgid "user:"
#~ msgstr "utilisateur:"
+#~ msgid "Unable to annotate"
+#~ msgstr "Impossible d'annoter"
+
#~ msgid "Changelog"
#~ msgstr "Historique des changements"
@@ -12686,9 +13200,44 @@#~ msgid "Error: "
#~ msgstr "Erreur: "
+#~ msgid "&Ignore"
+#~ msgstr "&Ignorer"
+
#~ msgid "Resolve"
#~ msgstr "Résoudre"
+#~ msgid "Cancel merge and discard changes?"
+#~ msgstr "Annuler la fusion et abandonner les changements ?"
+
+#, python-format
+#~ msgid "%s is not found in revision %d"
+#~ msgstr "%s ne se trouve pas dans la révision %d"
+
+#~ msgid "Target changeset"
+#~ msgstr "Révision cible"
+
+#~ msgctxt "stop progress"
+#~ msgid "Commit"
+#~ msgstr "Commit"
+
+#, python-format
+#~ msgid "Annotate %s@%d"
+#~ msgstr "Annoter %s@%d"
+
+#~ msgid "The selected subrepository does not exist in the working directory"
+#~ msgstr "Le sous-dépôt sélectionné n'existe pas dans le répertoire de travail"
+
+#~ msgid "Other"
+#~ msgstr "Autre"
+
+#~ msgid "Toggle display of diffs to second (other) parent"
+#~ msgstr "Afficher les différences avec le second (autre) parent"
+
+#~ msgid "View change in context, annotate with revision number"
+#~ msgstr ""
+#~ "Voir le changement dans le contexte du fichier, annoter avec le numéro de "
+#~ "révision"
+
#~ msgid "Subrepository not found in working directory."
#~ msgstr "Sous-dépôt pas trouvé dans le répertoire de travail."
@@ -12706,3 +13255,43 @@
#~ msgid "No rows selected"
#~ msgstr "Aucune rangée sélectionnée"
+
+#~ msgid "<a href=\"view\">View changes...</a>"
+#~ msgstr "<a href=\"view\">Voir les changements...</a>"
+
+#~ msgid "Merge another revision to the working directory"
+#~ msgstr "Fusionner l'autre révision dans le répertoire de travail"
+
+#~ msgid "Confirm Clean Up"
+#~ msgstr "Confirmer le nettoyage"
+
+#~ msgid "Discard local changes and restart merge?"
+#~ msgstr "Abandonner les changements locaux et redémarrer la fusion ?"
+
+#~ msgid "Apply selected patch next (change queue order)"
+#~ msgstr "Appliquer le prochain patch sélectionné (change l'ordre de la queue)"
+
+#~ msgid "Manage queues"
+#~ msgstr "Gérer les queues"
+
+#~ msgid "Open a shell terminal in repository root"
+#~ msgstr "Ouvrir une console à la racine du dépôt"
+
+#~ msgctxt "tab tooltip"
+#~ msgid "Patch Queue"
+#~ msgstr "Queue de patch"
+
+#~ msgid "Repository not found"
+#~ msgstr "Dépôt non trouvé"
+
+#~ msgid "&Revert"
+#~ msgstr "&Rétablir"
+
+#~ msgid "Patch &Queue"
+#~ msgstr "&Queue de patch"
+
+#~ msgid "Backspace or Del to remove a row"
+#~ msgstr "Retour arrière ou Suppr pour enlever une ligne"
+
+#~ msgid "Specify your preferred terminal shell application"
+#~ msgstr "Spécifier votre application console préférée"
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
Loading...