by
Changes to 24 files · Browse files at b4f40f6011c7 Showing diff from parent e1c8b3657b31 1fb070779fba Diff from another changeset...
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Peer Sommerlund <peer.sommerlund@gmail.com>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-04-03 19:38+0000\n"
+"PO-Revision-Date: 2010-04-05 13:36+0000\n"
"Last-Translator: peso <peer.sommerlund@gmail.com>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2485,7 +2485,8 @@msgid "%s (submitted)"
msgstr "%s (indsendt)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr ""
@@ -5342,7 +5343,8 @@msgid "F_old"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr ""
|
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,216 +7,177 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-02 01:46+0000\n"
-"PO-Revision-Date: 2010-01-02 02:38+0000\n"
+"POT-Creation-Date: 2010-04-01 05:09+0000\n"
+"PO-Revision-Date: 2010-04-05 13:43+0000\n"
"Last-Translator: peso <peer.sommerlund@gmail.com>\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"
-"X-Launchpad-Export-Date: 2010-01-03 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: thgtaskbar.py:38
-msgid "TortoiseHg RPC server"
-msgstr "Serveur TortoiseHg RPC"
-
-#: thgtaskbar.py:118
-msgid "Options..."
-msgstr "Préférences..."
-
-#: thgtaskbar.py:120
+#: TortoiseHgOverlayServer.py:36
+msgid "TortoiseHg Overlay Icon Server"
+msgstr ""
+
+#: TortoiseHgOverlayServer.py:117
msgid "Exit"
msgstr "Quitter"
-#: tortoisehg\hgtk\about.py:62
+#: tortoisehg\hgtk\about.py:42
msgid "Several icons are courtesy of the TortoiseSVN project"
msgstr ""
"Plusieurs icones sont fournies gracieusement par le projet TortoiseSVN"
-#: tortoisehg\hgtk\about.py:66
+#: tortoisehg\hgtk\about.py:70
+msgid "A new version of TortoiseHg is ready for download!"
+msgstr ""
+
+#: tortoisehg\hgtk\about.py:76
msgid "(version %s)"
msgstr "(version %s)"
-#: tortoisehg\hgtk\about.py:69
-msgid "Copyright 2009 Steve Borho and others"
-msgstr ""
-
-#: tortoisehg\hgtk\about.py:85
+#: tortoisehg\hgtk\about.py:79
+msgid "Copyright 2008-2010 Steve Borho and others"
+msgstr ""
+
+#: tortoisehg\hgtk\about.py:95
msgid "with %s"
msgstr "avec %s"
-#: tortoisehg\hgtk\archive.py:20
+#: tortoisehg\hgtk\archive.py:18
msgid "= Working Directory Parent ="
msgstr ""
-#: tortoisehg\hgtk\archive.py:37
-msgid "Archive"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:46
+#: tortoisehg\hgtk\archive.py:29
msgid "Archive - %s"
msgstr ""
-#: tortoisehg\hgtk\archive.py:71
+#: tortoisehg\hgtk\archive.py:59
msgid "Archive revision:"
msgstr ""
-#: tortoisehg\hgtk\archive.py:77 tortoisehg\hgtk\clone.py:74
-#: tortoisehg\hgtk\hginit.py:51 tortoisehg\hgtk\thgconfig.py:301
+#: tortoisehg\hgtk\archive.py:65 tortoisehg\hgtk\clone.py:70
+#: tortoisehg\hgtk\hginit.py:55 tortoisehg\hgtk\thgconfig.py:324
+#: tortoisehg\hgtk\thgimport.py:63
msgid "Browse..."
msgstr "Parcourir..."
-#: tortoisehg\hgtk\archive.py:80 tortoisehg\hgtk\clone.py:103
+#: tortoisehg\hgtk\archive.py:68 tortoisehg\hgtk\clone.py:106
msgid "Destination path:"
msgstr "Chemin de destination:"
-#: tortoisehg\hgtk\archive.py:83
+#: tortoisehg\hgtk\archive.py:71
msgid "Directory of files"
msgstr "Emplacement des fichiers"
-#: tortoisehg\hgtk\archive.py:85
+#: tortoisehg\hgtk\archive.py:73
msgid "Archive types:"
msgstr "Types d'archives"
-#: tortoisehg\hgtk\archive.py:91
+#: tortoisehg\hgtk\archive.py:79
msgid "Uncompressed tar archive"
msgstr "Archive tar décompressée"
-#: tortoisehg\hgtk\archive.py:92
+#: tortoisehg\hgtk\archive.py:80
msgid "Tar archive compressed using bzip2"
msgstr "Archive tar compressée en utilisant bzip2"
-#: tortoisehg\hgtk\archive.py:93
+#: tortoisehg\hgtk\archive.py:81
msgid "Tar archive compressed using gzip"
msgstr "Archive tar compressée en utilisant gzip"
-#: tortoisehg\hgtk\archive.py:94
+#: tortoisehg\hgtk\archive.py:82
msgid "Uncompressed zip archive"
msgstr "Archive zip décompressée"
-#: tortoisehg\hgtk\archive.py:95
+#: tortoisehg\hgtk\archive.py:83
msgid "Zip archive compressed using deflate"
msgstr "Archive zip compressée utilisant deflate"
-#: tortoisehg\hgtk\archive.py:113 tortoisehg\hgtk\backout.py:114
-#: tortoisehg\hgtk\clone.py:165 tortoisehg\hgtk\merge.py:142
-#: tortoisehg\hgtk\quickop.py:182 tortoisehg\hgtk\thgstrip.py:182
-#: tortoisehg\hgtk\update.py:122
-msgid "Abort"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:127 tortoisehg\hgtk\backout.py:141
-#: tortoisehg\hgtk\clone.py:188 tortoisehg\hgtk\merge.py:162
-#: tortoisehg\hgtk\quickop.py:197 tortoisehg\hgtk\thgstrip.py:307
-#: tortoisehg\hgtk\update.py:137
-msgid "Confirm Abort"
-msgstr "Confirmer l'annulation"
-
-#: tortoisehg\hgtk\archive.py:128 tortoisehg\hgtk\backout.py:142
-#: tortoisehg\hgtk\clone.py:189 tortoisehg\hgtk\merge.py:163
-#: tortoisehg\hgtk\quickop.py:198 tortoisehg\hgtk\thgstrip.py:308
-#: tortoisehg\hgtk\update.py:138
-msgid "Do you want to abort?"
-msgstr "Voulez-vous annuler?"
-
-#: tortoisehg\hgtk\archive.py:138 tortoisehg\hgtk\backout.py:153
-#: tortoisehg\hgtk\clone.py:199 tortoisehg\hgtk\hginit.py:80
-#: tortoisehg\hgtk\merge.py:183 tortoisehg\hgtk\quickop.py:207
-#: tortoisehg\hgtk\tagadd.py:154 tortoisehg\hgtk\thgstrip.py:318
-#: tortoisehg\hgtk\update.py:148
-msgid "unexpected response id: %s"
-msgstr "Id de réponse inatendue:%s"
-
-#: tortoisehg\hgtk\archive.py:194
+#: tortoisehg\hgtk\archive.py:92
+msgid "Archive"
+msgstr "Archive"
+
+#: tortoisehg\hgtk\archive.py:107
+msgid "Archived successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:109
+msgid "Canceled archiving"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:111
+msgid "Failed to archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:167
msgid "Tar archives"
msgstr "Archives tar"
-#: tortoisehg\hgtk\archive.py:197
+#: tortoisehg\hgtk\archive.py:170
msgid "Bzip2 tar archives"
msgstr "Archives tar Bzip2"
-#: tortoisehg\hgtk\archive.py:200
+#: tortoisehg\hgtk\archive.py:173
msgid "Gzip tar archives"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:206
+msgstr "Archives Gzip tar"
+
+#: tortoisehg\hgtk\archive.py:179
msgid "Compressed zip archives"
msgstr ""
-#: tortoisehg\hgtk\archive.py:218 tortoisehg\hgtk\clone.py:104
-#: tortoisehg\hgtk\hginit.py:88
+#: tortoisehg\hgtk\archive.py:191 tortoisehg\hgtk\clone.py:107
+#: tortoisehg\hgtk\hginit.py:92
msgid "Select Destination Folder"
msgstr "Sélectionnez le répertoire de destination"
-#: tortoisehg\hgtk\archive.py:224
+#: tortoisehg\hgtk\archive.py:197
msgid "Select Destination File"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:226
+msgstr "Sélectionnez le fichier de destination"
+
+#: tortoisehg\hgtk\archive.py:199
msgid "All Files (*.*)"
msgstr "Tous les fichiers (*.*)"
-#: tortoisehg\hgtk\archive.py:238 tortoisehg\hgtk\backout.py:181
-#: tortoisehg\hgtk\clone.py:223 tortoisehg\hgtk\merge.py:198
-#: tortoisehg\hgtk\quickop.py:219 tortoisehg\hgtk\thgstrip.py:350
-#: tortoisehg\hgtk\update.py:160
-msgid "unknown mode name: %s"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:254 tortoisehg\hgtk\archive.py:260
-#: tortoisehg\hgtk\gtklib.py:246 tortoisehg\hgtk\thgconfig.py:481
-#: tortoisehg\hgtk\thgconfig.py:832
+#: tortoisehg\hgtk\archive.py:209 tortoisehg\hgtk\archive.py:215
+#: tortoisehg\hgtk\gtklib.py:360 tortoisehg\hgtk\thgconfig.py:504
+#: tortoisehg\hgtk\thgconfig.py:955
msgid "Confirm Overwrite"
msgstr ""
-#: tortoisehg\hgtk\archive.py:255
+#: tortoisehg\hgtk\archive.py:210
msgid ""
"The destination \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: tortoisehg\hgtk\archive.py:261
+#: tortoisehg\hgtk\archive.py:216
msgid ""
"The directory \"%s\" isn't empty!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-#: tortoisehg\hgtk\archive.py:280
-msgid "Archived successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:282
-msgid "Canceled archiving"
-msgstr ""
-
-#: tortoisehg\hgtk\archive.py:284
-msgid "Failed to archive"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:29
+#: tortoisehg\hgtk\backout.py:28
msgid "Backout changeset - %s"
msgstr ""
-#: tortoisehg\hgtk\backout.py:38
-msgid "Backout"
-msgstr "Revenir"
-
-#: tortoisehg\hgtk\backout.py:51
+#: tortoisehg\hgtk\backout.py:41
msgid "Backed out changeset: "
msgstr "Revenu sur les changements : "
-#: tortoisehg\hgtk\backout.py:56
+#: tortoisehg\hgtk\backout.py:46
msgid "Changeset Description"
msgstr "Description de l'ensemble de modifications"
-#: tortoisehg\hgtk\backout.py:62
+#: tortoisehg\hgtk\backout.py:52
msgid "Backout commit message"
msgstr "Message de retour"
-#: tortoisehg\hgtk\backout.py:85
+#: tortoisehg\hgtk\backout.py:76
msgid ""
"Commit message text for new changeset that reverses the effect of the "
"change being backed out."
@@ -224,225 +185,395 @@"Message d'envoi pour les changements qui annulent les effets des changements "
"en cours de retour."
-#: tortoisehg\hgtk\backout.py:91
+#: tortoisehg\hgtk\backout.py:82
msgid "Use English backout message"
msgstr ""
-#: tortoisehg\hgtk\backout.py:97
+#: tortoisehg\hgtk\backout.py:88
msgid "Merge with old dirstate parent after backout"
msgstr ""
-#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:451
+#: tortoisehg\hgtk\backout.py:93
+msgid "Backout"
+msgstr "Revenir"
+
+#: tortoisehg\hgtk\backout.py:112
+msgid "Backed out successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:114
+msgid "Canceled backout"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:116
+msgid "Failed to backout"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:139 tortoisehg\hgtk\commit.py:564
msgid "Confirm Discard Message"
msgstr "Confirmer le message d'abandon"
-#: tortoisehg\hgtk\backout.py:164
+#: tortoisehg\hgtk\backout.py:140
msgid "Discard current backout message?"
msgstr ""
-#: tortoisehg\hgtk\backout.py:205
-msgid "Backed out successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:207
-msgid "Canceled backout"
-msgstr ""
-
-#: tortoisehg\hgtk\backout.py:209
-msgid "Failed to backout"
-msgstr ""
-
-#: tortoisehg\hgtk\bugreport.py:26
+#: tortoisehg\hgtk\bookmark.py:37
+msgid "Bookmark - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:48 tortoisehg\hgtk\hgignore.py:50
+#: tortoisehg\hgtk\hgignore.py:58 tortoisehg\hgtk\quickop.py:19
+#: tortoisehg\hgtk\tagadd.py:39
+msgid "Add"
+msgstr "Ajouter"
+
+#: tortoisehg\hgtk\bookmark.py:49 tortoisehg\hgtk\commit.py:252
+#: tortoisehg\hgtk\status.py:159
+msgid "Move"
+msgstr "Déplacer"
+
+#: tortoisehg\hgtk\bookmark.py:50 tortoisehg\hgtk\quickop.py:22
+#: tortoisehg\hgtk\tagadd.py:40
+msgid "Remove"
+msgstr "Supprimer"
+
+#: tortoisehg\hgtk\bookmark.py:52
+msgid "Rename"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:54
+msgid "Set Current"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:56 tortoisehg\hgtk\bookmark.py:182
+#: tortoisehg\hgtk\merge.py:178
+msgid "unexpected type: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:69
+msgid "Old name:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:71
+msgid "Bookmark:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:83 tortoisehg\hgtk\csinfo.py:198
+#: tortoisehg\hgtk\csinfo.py:199 tortoisehg\hgtk\cslist.py:142
+#: tortoisehg\hgtk\tagadd.py:66
+msgid "Revision:"
+msgstr "Révision :"
+
+#: tortoisehg\hgtk\bookmark.py:86
+msgid "New Name:"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:92
+msgid "Make new/moved bookmark current"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:167 tortoisehg\hgtk\gdialog.py:903
+#: tortoisehg\hgtk\hginit.py:84 tortoisehg\hgtk\tagadd.py:205
+msgid "unexpected response id: %s"
+msgstr "Id de réponse inatendue:%s"
+
+#: tortoisehg\hgtk\bookmark.py:208 tortoisehg\hgtk\bookmark.py:238
+#: tortoisehg\hgtk\bookmark.py:292 tortoisehg\hgtk\bookmark.py:324
+msgid "Bookmark input is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:209 tortoisehg\hgtk\bookmark.py:239
+#: tortoisehg\hgtk\bookmark.py:293 tortoisehg\hgtk\bookmark.py:325
+msgid "Please enter bookmark name"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:216 tortoisehg\hgtk\bookmark.py:246
+#: tortoisehg\hgtk\bookmark.py:274 tortoisehg\hgtk\bookmark.py:306
+#: tortoisehg\hgtk\bookmark.py:332
+msgid "Bookmarking completed"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:217
+msgid "Bookmark \"%s\" has been added"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:224 tortoisehg\hgtk\bookmark.py:227
+#: tortoisehg\hgtk\bookmark.py:254 tortoisehg\hgtk\bookmark.py:257
+#: tortoisehg\hgtk\bookmark.py:278 tortoisehg\hgtk\bookmark.py:281
+#: tortoisehg\hgtk\bookmark.py:311 tortoisehg\hgtk\bookmark.py:314
+#: tortoisehg\hgtk\bookmark.py:337 tortoisehg\hgtk\bookmark.py:340
+msgid "Error in bookmarking"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:247
+msgid "Bookmark \"%s\" has been moved"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:267
+msgid "Bookmark name is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:268
+msgid "Please select bookmark name to remove"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:275
+msgid "Bookmark \"%s\" has been removed"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:298
+msgid "Bookmark new name input is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:299
+msgid "Please enter new bookmark name"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:307
+msgid "Bookmark \"%s\" has been renamed to \"%s\""
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:333
+msgid "Bookmark \"%s\" has been made current"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:346 tortoisehg\hgtk\bookmark.py:373
+msgid "a bookmark named \"%s\" already exists"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:355 tortoisehg\hgtk\bookmark.py:382
+msgid "No bookmark named \"%s\" exists"
+msgstr ""
+
+#: tortoisehg\hgtk\bookmark.py:364
+msgid "Bookmark '%s' does not exist"
+msgstr ""
+
+#: tortoisehg\hgtk\browse.py:112 tortoisehg\hgtk\quickop.py:100
+#: tortoisehg\hgtk\status.py:130
+msgid "status"
+msgstr "status"
+
+#: tortoisehg\hgtk\browse.py:136
+msgid "type"
+msgstr ""
+
+#: tortoisehg\hgtk\browse.py:142 tortoisehg\hgtk\quickop.py:103
+#: tortoisehg\hgtk\status.py:318
+msgid "path"
+msgstr "chemin"
+
+#: tortoisehg\hgtk\browse.py:344 tortoisehg\hgtk\browse.py:346
+msgid "browser"
+msgstr ""
+
+#: tortoisehg\hgtk\bugreport.py:25
msgid "TortoiseHg Bug Report"
msgstr "Rapport de bug TortoiseHg"
-#: tortoisehg\hgtk\bugreport.py:46
+#: tortoisehg\hgtk\bugreport.py:45
msgid "Save as.."
msgstr "Enregistrer sous..."
-#: tortoisehg\hgtk\bugreport.py:49 tortoisehg\hgtk\hgcmd.py:48
+#: tortoisehg\hgtk\bugreport.py:48 tortoisehg\hgtk\hgcmd.py:48
msgid "Close"
msgstr "Fermer"
-#: tortoisehg\hgtk\bugreport.py:58
+#: tortoisehg\hgtk\bugreport.py:57
msgid ""
"** Please report this bug to http://bitbucket.org/tortoisehg/stable/issues "
"or tortoisehg-discuss@lists.sourceforge.net\n"
msgstr ""
-
-#: tortoisehg\hgtk\bugreport.py:74
+"** Merci de rapporter cette anomalie à "
+"http://bitbucket.org/tortoisehg/stable/issues ou tortoisehg-"
+"discuss@lists.sourceforge.net\n"
+
+#: tortoisehg\hgtk\bugreport.py:87
msgid "Save error report to"
msgstr "Sauvegarder le rapport d'erreur vers"
-#: tortoisehg\hgtk\changeset.py:30
+#: tortoisehg\hgtk\changeset.py:43
msgid "%s changeset "
msgstr ""
-#: tortoisehg\hgtk\changeset.py:142 tortoisehg\hgtk\changeset.py:170
+#: tortoisehg\hgtk\changeset.py:168 tortoisehg\hgtk\changeset.py:198
msgid "[All Files]"
msgstr "[Tous les fichiers]"
-#: tortoisehg\hgtk\changeset.py:205
+#: tortoisehg\hgtk\changeset.py:233
msgid "unknown hunk type: %s"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:281
+#: tortoisehg\hgtk\changeset.py:332
msgid " %s is larger than the specified max diff size"
msgstr " %s est plus gros que la taille maximum spécifiée"
-#: tortoisehg\hgtk\changeset.py:290
+#: tortoisehg\hgtk\changeset.py:341
msgid "Repository Error: %s, refresh suggested"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:337
+#: tortoisehg\hgtk\changeset.py:388
msgid "[no hunks to display]"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:398 tortoisehg\hgtk\status.py:1509
+#: tortoisehg\hgtk\changeset.py:443 tortoisehg\hgtk\status.py:1643
msgid "_Visual Diff"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:399
+#: tortoisehg\hgtk\changeset.py:445
msgid "Diff to _local"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:401
+#: tortoisehg\hgtk\changeset.py:447
msgid "_View at Revision"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:402
+#: tortoisehg\hgtk\changeset.py:448
msgid "_Save at Revision..."
msgstr ""
-#: tortoisehg\hgtk\changeset.py:406
+#: tortoisehg\hgtk\changeset.py:451 tortoisehg\hgtk\datamine.py:147
+#: tortoisehg\hgtk\datamine.py:162
msgid "_File History"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:407
+#: tortoisehg\hgtk\changeset.py:452 tortoisehg\hgtk\datamine.py:146
msgid "_Annotate File"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:410
+#: tortoisehg\hgtk\changeset.py:455
msgid "_Revert File Contents"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:498
+#: tortoisehg\hgtk\changeset.py:544
msgid "Changeset:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:500 tortoisehg\hgtk\update.py:102
+#: tortoisehg\hgtk\changeset.py:546 tortoisehg\hgtk\update.py:90
msgid "Parent:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:502
+#: tortoisehg\hgtk\changeset.py:548
msgid "Child:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:504
+#: tortoisehg\hgtk\changeset.py:550 tortoisehg\hgtk\cslist.py:143
msgid "Patch:"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:638
-msgid "Stat"
-msgstr "Stats"
-
-#: tortoisehg\hgtk\changeset.py:640 tortoisehg\hgtk\hgignore.py:128
-msgid "Files"
-msgstr "Fichiers"
-
-#: tortoisehg\hgtk\changeset.py:655
+#: tortoisehg\hgtk\changeset.py:747
msgid "Diff to second Parent"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:762
+#: tortoisehg\hgtk\changeset.py:923
msgid "Save file to"
msgstr "Enregistrer le fichier sous"
-#: tortoisehg\hgtk\changeset.py:836
+#: tortoisehg\hgtk\changeset.py:933
+msgid "Unable to save file"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:1005
msgid "Confirm revert file to old revision"
msgstr "Confirmer le retour à l'ancienne version"
-#: tortoisehg\hgtk\changeset.py:837
+#: tortoisehg\hgtk\changeset.py:1006
msgid "Revert %s to contents at revision %d?"
msgstr "Faire revenir %s à la version %d ?"
-#: tortoisehg\hgtk\changeset.py:849 tortoisehg\hgtk\synch.py:667
-msgid "Toggle _Wordwrap"
-msgstr "Activer/déactiver le retour à la ligne"
-
-#: tortoisehg\hgtk\clone.py:28
+#: tortoisehg\hgtk\changeset.py:1019
+msgid "Enable _Wordwrap"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:37
msgid "TortoiseHg Clone"
msgstr "Clonage TortoiseHg"
-#: tortoisehg\hgtk\clone.py:36
+#: tortoisehg\hgtk\clone.py:75
+msgid "Bundle..."
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:77
+msgid "Select a Mercurial Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:90
+msgid "Source path:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:91
+msgid "Select Source Folder"
+msgstr "Sélectionner le répertoire source"
+
+#: tortoisehg\hgtk\clone.py:117 tortoisehg\hgtk\tagadd.py:69
+msgid "Advanced options"
+msgstr "Options avancées"
+
+#: tortoisehg\hgtk\clone.py:127
+msgid "Clone to revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:135
+msgid "Starting P4 Changelist:"
+msgstr ""
+
+#: 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\hgtk\clone.py:142
+msgid "Use pull protocol to copy metadata"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:143
+msgid "Use uncompressed transfer"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:149 tortoisehg\hgtk\history.py:440
+#: tortoisehg\hgtk\synch.py:183
+msgid "Use proxy server"
+msgstr "Utiliser un serveur proxy"
+
+#: tortoisehg\hgtk\clone.py:159 tortoisehg\hgtk\synch.py:204
+msgid "Remote command:"
+msgstr "Commande distante :"
+
+#: tortoisehg\hgtk\clone.py:165
msgid "Clone"
msgstr "Cloner"
-#: tortoisehg\hgtk\clone.py:87
-msgid "Source path:"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:88
-msgid "Select Source Folder"
-msgstr "Sélectionner le répertoire source"
-
-#: tortoisehg\hgtk\clone.py:114 tortoisehg\hgtk\tagadd.py:66
-msgid "Advanced options"
-msgstr "Options avancées"
-
-#: tortoisehg\hgtk\clone.py:124
-msgid "Clone to revision:"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:129
-msgid "Do not update the new working directory"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:130
-msgid "Use pull protocol to copy metadata"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:131
-msgid "Use uncompressed transfer"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:137 tortoisehg\hgtk\history.py:227
-#: tortoisehg\hgtk\synch.py:183
-msgid "Use proxy server"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:147 tortoisehg\hgtk\synch.py:204
-msgid "Remote command:"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:276
+#: tortoisehg\hgtk\clone.py:191
+msgid "Cloned successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:193 tortoisehg\hgtk\update.py:154
+msgid "Canceled updating"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:195
+msgid "Failed to clone"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:224
+msgid "Mercurial bundles"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:286
msgid "Source path is empty"
msgstr "Le chemin source est vide"
-#: tortoisehg\hgtk\clone.py:277
+#: tortoisehg\hgtk\clone.py:287
msgid "Please enter a valid source path"
msgstr "Veuillez entrer un chemin origine valide"
-#: tortoisehg\hgtk\clone.py:282
+#: tortoisehg\hgtk\clone.py:292
msgid "Source and destination are the same"
msgstr "Source et destination sont les mêmes"
-#: tortoisehg\hgtk\clone.py:283
+#: tortoisehg\hgtk\clone.py:293
msgid "Please specify different paths"
msgstr "Veuillez spécifier des chemins différents"
-#: tortoisehg\hgtk\clone.py:331
-msgid "Cloned successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:333
-msgid "Canceled cloning"
-msgstr ""
-
-#: tortoisehg\hgtk\clone.py:335
-msgid "Failed to clone"
-msgstr ""
-
#: tortoisehg\hgtk\commit.py:33
msgid "Branch Operations"
msgstr "Opérations de branches"
@@ -459,252 +590,271 @@msgid "Open a new named branch"
msgstr "Ouvrir une nouvelle branche spécifiée"
-#: tortoisehg\hgtk\commit.py:61
+#: tortoisehg\hgtk\commit.py:65
msgid "Close current named branch"
msgstr "Fermer la branche spécifiée courante"
-#: tortoisehg\hgtk\commit.py:68
+#: tortoisehg\hgtk\commit.py:72
msgid "Changes take effect on next commit"
msgstr "Les changements prendront effet au prochain envoi"
-#: tortoisehg\hgtk\commit.py:152
+#: tortoisehg\hgtk\commit.py:164
msgid "merging "
msgstr ""
-#: tortoisehg\hgtk\commit.py:158
+#: tortoisehg\hgtk\commit.py:170
msgid " - qnew"
msgstr ""
-#: tortoisehg\hgtk\commit.py:161
+#: tortoisehg\hgtk\commit.py:173
msgid " - qrefresh "
msgstr ""
-#: tortoisehg\hgtk\commit.py:162
+#: tortoisehg\hgtk\commit.py:174
msgid " - commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:193 tortoisehg\hgtk\history.py:165
+#: tortoisehg\hgtk\commit.py:217 tortoisehg\hgtk\commit.py:299
+#: tortoisehg\hgtk\history.py:249 tortoisehg\hgtk\history.py:347
+#: tortoisehg\hgtk\thgimport.py:107
+msgid "Patch Queue"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:222 tortoisehg\hgtk\history.py:364
msgid "_View"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:194
+msgstr "_Affichage"
+
+#: tortoisehg\hgtk\commit.py:223 tortoisehg\hgtk\history.py:370
+msgid "Toolbar"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:225
msgid "Advanced"
msgstr "Avancé"
-#: tortoisehg\hgtk\commit.py:196 tortoisehg\hgtk\history.py:688
-#: tortoisehg\hgtk\history.py:1014
+#: tortoisehg\hgtk\commit.py:227 tortoisehg\hgtk\history.py:65
+#: tortoisehg\hgtk\history.py:452 tortoisehg\hgtk\history.py:1136
msgid "Parents"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:199 tortoisehg\hgtk\hgignore.py:138
-#: tortoisehg\hgtk\history.py:178
+msgstr "Parents"
+
+#: tortoisehg\hgtk\commit.py:231 tortoisehg\hgtk\hgignore.py:142
+#: tortoisehg\hgtk\history.py:377
msgid "Refresh"
msgstr "Rafraîchir"
-#: tortoisehg\hgtk\commit.py:200
+#: tortoisehg\hgtk\commit.py:233 tortoisehg\hgtk\history.py:391
+msgid "Ignore Max Diff Size"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:235 tortoisehg\hgtk\history.py:393
+msgid "Always Show Output"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:238
msgid "_Operations"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:201 tortoisehg\hgtk\commit.py:247
-#: tortoisehg\hgtk\commit.py:612
+msgstr "_Opérations"
+
+#: tortoisehg\hgtk\commit.py:239 tortoisehg\hgtk\commit.py:293
+#: tortoisehg\hgtk\commit.py:753
msgid "_Commit"
msgstr "_Committer"
-#: tortoisehg\hgtk\commit.py:203 tortoisehg\hgtk\commit.py:245
+#: tortoisehg\hgtk\commit.py:241 tortoisehg\hgtk\commit.py:291
msgid "_Undo"
msgstr "Ann_uler"
-#: tortoisehg\hgtk\commit.py:206 tortoisehg\hgtk\status.py:158
+#: tortoisehg\hgtk\commit.py:244 tortoisehg\hgtk\status.py:150
msgid "_Diff"
msgstr ""
-#: tortoisehg\hgtk\commit.py:208 tortoisehg\hgtk\status.py:161
+#: tortoisehg\hgtk\commit.py:246 tortoisehg\hgtk\status.py:153
msgid "Re_vert"
msgstr "Re_venir"
-#: tortoisehg\hgtk\commit.py:210 tortoisehg\hgtk\status.py:164
-#: tortoisehg\hgtk\status.py:1519 tortoisehg\hgtk\thgconfig.py:906
+#: tortoisehg\hgtk\commit.py:248 tortoisehg\hgtk\status.py:156
+#: tortoisehg\hgtk\status.py:1653 tortoisehg\hgtk\thgconfig.py:1043
msgid "_Add"
msgstr "_Ajouter"
-#: tortoisehg\hgtk\commit.py:212 tortoisehg\hgtk\status.py:170
-#: tortoisehg\hgtk\thgconfig.py:916
+#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\status.py:162
+#: tortoisehg\hgtk\thgconfig.py:1053
msgid "_Remove"
msgstr "_Supprimer"
-#: tortoisehg\hgtk\commit.py:214 tortoisehg\hgtk\status.py:167
-msgid "Move"
-msgstr "Déplacer"
-
-#: tortoisehg\hgtk\commit.py:216 tortoisehg\hgtk\status.py:173
-#: tortoisehg\hgtk\status.py:1518
+#: tortoisehg\hgtk\commit.py:254 tortoisehg\hgtk\status.py:165
+#: tortoisehg\hgtk\status.py:1652
msgid "_Forget"
msgstr ""
-#: tortoisehg\hgtk\commit.py:246
+#: tortoisehg\hgtk\commit.py:292
msgid "undo recent commit"
msgstr "Annuler"
-#: tortoisehg\hgtk\commit.py:248 tortoisehg\hgtk\commit.py:496
+#: tortoisehg\hgtk\commit.py:294 tortoisehg\hgtk\commit.py:630
msgid "commit"
msgstr "commiter"
-#: tortoisehg\hgtk\commit.py:260 tortoisehg\hgtk\merge.py:169
-#: tortoisehg\hgtk\thgconfig.py:713
+#: tortoisehg\hgtk\commit.py:300 tortoisehg\hgtk\history.py:251
+msgid "Show/Hide Patch Queue"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:313 tortoisehg\hgtk\merge.py:190
+#: tortoisehg\hgtk\thgconfig.py:822
msgid "Confirm Exit"
msgstr "Confirmer la fermeture"
-#: tortoisehg\hgtk\commit.py:261
+#: tortoisehg\hgtk\commit.py:314
msgid "Save commit message at exit?"
msgstr "Sauvegarder le message de commit lors de la sortie ?"
-#: tortoisehg\hgtk\commit.py:262 tortoisehg\hgtk\commit.py:981
-#: tortoisehg\hgtk\commit.py:985 tortoisehg\hgtk\history.py:77
-#: tortoisehg\hgtk\history.py:1404 tortoisehg\hgtk\status.py:1274
-#: tortoisehg\hgtk\status.py:1293 tortoisehg\hgtk\status.py:1586
-#: tortoisehg\hgtk\thgconfig.py:716 tortoisehg\hgtk\thgmq.py:328
-#: tortoisehg\hgtk\update.py:230
+#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116
+#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\history.py:211
+#: tortoisehg\hgtk\history.py:2514 tortoisehg\hgtk\status.py:1376
+#: tortoisehg\hgtk\status.py:1395 tortoisehg\hgtk\status.py:1719
+#: tortoisehg\hgtk\thgconfig.py:717 tortoisehg\hgtk\thgconfig.py:825
+#: tortoisehg\hgtk\thgmq.py:345 tortoisehg\hgtk\update.py:239
msgid "&Cancel"
msgstr ""
-#: tortoisehg\hgtk\commit.py:262 tortoisehg\hgtk\commit.py:981
-#: tortoisehg\hgtk\commit.py:985 tortoisehg\hgtk\status.py:1586
-#: tortoisehg\hgtk\thgconfig.py:715 tortoisehg\hgtk\thgmq.py:327
+#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116
+#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\status.py:1719
+#: tortoisehg\hgtk\thgconfig.py:824 tortoisehg\hgtk\thgmq.py:345
msgid "&Yes"
msgstr ""
-#: tortoisehg\hgtk\commit.py:262 tortoisehg\hgtk\commit.py:981
-#: tortoisehg\hgtk\commit.py:985 tortoisehg\hgtk\thgstrip.py:377
+#: tortoisehg\hgtk\commit.py:315 tortoisehg\hgtk\commit.py:1116
+#: tortoisehg\hgtk\commit.py:1120 tortoisehg\hgtk\thgstrip.py:217
msgid "&No"
msgstr ""
-#: tortoisehg\hgtk\commit.py:305
+#: tortoisehg\hgtk\commit.py:361
msgid "Committer:"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:319
+msgstr "Commiteur :"
+
+#: tortoisehg\hgtk\commit.py:375
msgid "Auto-includes:"
msgstr ""
-#: tortoisehg\hgtk\commit.py:322
+#: tortoisehg\hgtk\commit.py:378
msgid "Push after commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:356
+#: tortoisehg\hgtk\commit.py:413
msgid "Recent commit messages..."
msgstr ""
-#: tortoisehg\hgtk\commit.py:393
+#: tortoisehg\hgtk\commit.py:486
msgid "Parent: %(rev)s"
msgstr ""
-#: tortoisehg\hgtk\commit.py:402
-msgid "not at head revision"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:426 tortoisehg\hgtk\status.py:480
+#: tortoisehg\hgtk\commit.py:494
+msgid "Not at head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:519 tortoisehg\hgtk\status.py:530
msgid "Patch Preview"
msgstr ""
-#: tortoisehg\hgtk\commit.py:428 tortoisehg\hgtk\status.py:484
+#: tortoisehg\hgtk\commit.py:521 tortoisehg\hgtk\status.py:534
msgid "Commit Preview"
msgstr ""
-#: tortoisehg\hgtk\commit.py:452
+#: tortoisehg\hgtk\commit.py:565
msgid "Discard current commit message?"
msgstr "Oublier le message de commit actuel ?"
-#: tortoisehg\hgtk\commit.py:495 tortoisehg\hgtk\commit.py:757
-#: tortoisehg\hgtk\commit.py:807 tortoisehg\hgtk\gdialog.py:473
-#: tortoisehg\hgtk\merge.py:94 tortoisehg\hgtk\thgconfig.py:601
+#: tortoisehg\hgtk\commit.py:629 tortoisehg\hgtk\commit.py:902
+#: tortoisehg\hgtk\commit.py:953 tortoisehg\hgtk\commit.py:1185
+#: tortoisehg\hgtk\gdialog.py:485 tortoisehg\hgtk\history.py:260
+#: tortoisehg\hgtk\merge.py:130 tortoisehg\hgtk\thgconfig.py:674
msgid "Commit"
msgstr "Envoyer"
-#: tortoisehg\hgtk\commit.py:499
+#: tortoisehg\hgtk\commit.py:633
msgid "QNew"
msgstr "QNouveau"
-#: tortoisehg\hgtk\commit.py:500
+#: tortoisehg\hgtk\commit.py:634
msgid "create new MQ patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:502
+#: tortoisehg\hgtk\commit.py:636
msgid "QRefresh"
msgstr "QRafraîchir"
-#: tortoisehg\hgtk\commit.py:503
+#: tortoisehg\hgtk\commit.py:637
msgid "refresh top MQ patch"
msgstr ""
-#: tortoisehg\hgtk\commit.py:505
+#: tortoisehg\hgtk\commit.py:639
msgid "_Commit (+1 head)"
msgstr ""
-#: tortoisehg\hgtk\commit.py:505
+#: tortoisehg\hgtk\commit.py:639
msgid "_Commit (-1 head)"
msgstr ""
-#: tortoisehg\hgtk\commit.py:510
+#: tortoisehg\hgtk\commit.py:645
+msgid "commit to merge one head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:648
+msgid "neither parent is a head, commit to add a new head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:653
msgid "parent is not a head, commit to add a new head"
msgstr ""
-#: tortoisehg\hgtk\commit.py:515
-msgid "commit to merge one head"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:518
-msgid "no parent is a head, commit to add a new head"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:622
+#: tortoisehg\hgtk\commit.py:763
msgid "new branch: "
msgstr "nouvelle branche : "
-#: tortoisehg\hgtk\commit.py:624
+#: tortoisehg\hgtk\commit.py:765
msgid "close branch: "
msgstr "fermer une branche : "
-#: tortoisehg\hgtk\commit.py:626
+#: tortoisehg\hgtk\commit.py:767
msgid "branch: "
msgstr "branche : "
-#: tortoisehg\hgtk\commit.py:645
+#: tortoisehg\hgtk\commit.py:786
msgid "Merge "
msgstr ""
-#: tortoisehg\hgtk\commit.py:681
+#: tortoisehg\hgtk\commit.py:822
msgid "Patch Contents"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:739 tortoisehg\hgtk\commit.py:892
+msgstr "Contenu de la Rustine"
+
+#: tortoisehg\hgtk\commit.py:886 tortoisehg\hgtk\commit.py:1028
msgid "Nothing Commited"
msgstr "Rien n'a été envoyé"
-#: tortoisehg\hgtk\commit.py:740
+#: tortoisehg\hgtk\commit.py:887
msgid "No committable files selected"
msgstr "aucun des fichiers sélectionnés n'est envoyable"
-#: tortoisehg\hgtk\commit.py:758
+#: tortoisehg\hgtk\commit.py:903
msgid "Unable to create "
msgstr "Impossible de créer "
-#: tortoisehg\hgtk\commit.py:808
+#: tortoisehg\hgtk\commit.py:954
msgid "Unable to apply patch"
msgstr "Impossible d'effectuer la mise à jour."
-#: tortoisehg\hgtk\commit.py:837
+#: tortoisehg\hgtk\commit.py:983
msgid "Confirm Undo Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:838
-msgid "Undo last commit"
-msgstr "Défaire le dernier envoi"
-
-#: tortoisehg\hgtk\commit.py:844 tortoisehg\hgtk\commit.py:859
+#: tortoisehg\hgtk\commit.py:984
+msgid "Undo last commit?"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:990 tortoisehg\hgtk\commit.py:1005
msgid "Undo Commit"
msgstr ""
-#: tortoisehg\hgtk\commit.py:845
+#: tortoisehg\hgtk\commit.py:991
msgid ""
"Unable to undo!\n"
"\n"
@@ -714,36 +864,36 @@"\n"
"la version du dessus est différente de celle du dernier envoi."
-#: tortoisehg\hgtk\commit.py:860
+#: tortoisehg\hgtk\commit.py:1006
msgid "Errors during rollback!"
msgstr "Erreur lors du retour en arrière !"
-#: tortoisehg\hgtk\commit.py:873
+#: tortoisehg\hgtk\commit.py:1012
msgid "Confirm Add/Remove"
msgstr "Confiermer Ajouter/Supprimer"
-#: tortoisehg\hgtk\commit.py:874
+#: tortoisehg\hgtk\commit.py:1013
msgid "Add/Remove the following files?"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:893 tortoisehg\hgtk\tagadd.py:176
+msgstr "Ajouter/Supprimer les fichier suivants ?"
+
+#: tortoisehg\hgtk\commit.py:1029 tortoisehg\hgtk\tagadd.py:227
msgid "Please enter commit message"
msgstr "Tapez le message d'envoi"
-#: tortoisehg\hgtk\commit.py:901
+#: tortoisehg\hgtk\commit.py:1036
msgid "Error"
msgstr "Erreur"
-#: tortoisehg\hgtk\commit.py:902
+#: tortoisehg\hgtk\commit.py:1037
msgid "Message format configuration error"
msgstr "Erreur de configuration du format de message"
-#: tortoisehg\hgtk\commit.py:911 tortoisehg\hgtk\commit.py:919
-#: tortoisehg\hgtk\commit.py:931
+#: tortoisehg\hgtk\commit.py:1046 tortoisehg\hgtk\commit.py:1054
+#: tortoisehg\hgtk\commit.py:1066
msgid "Confirm Commit"
msgstr "Confirmer l'envoi"
-#: tortoisehg\hgtk\commit.py:912
+#: tortoisehg\hgtk\commit.py:1047
msgid ""
"The summary line length of %i is greater than %i.\n"
"\n"
@@ -751,7 +901,7 @@msgstr ""
"La longueur de la ligne de compte-rendu de %i est plus longue que %i."
-#: tortoisehg\hgtk\commit.py:920
+#: tortoisehg\hgtk\commit.py:1055
msgid ""
"The summary line is not followed by a blank line.\n"
"\n"
@@ -761,7 +911,7 @@"\n"
"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
-#: tortoisehg\hgtk\commit.py:932
+#: tortoisehg\hgtk\commit.py:1067
msgid ""
"The following lines are over the %i-character limit: %s.\n"
"\n"
@@ -771,11 +921,11 @@"\n"
"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
-#: tortoisehg\hgtk\commit.py:944
+#: tortoisehg\hgtk\commit.py:1079
msgid "Commit: Invalid username"
msgstr "Envoi : nom d'utilisateur invalide"
-#: tortoisehg\hgtk\commit.py:945
+#: tortoisehg\hgtk\commit.py:1080
msgid ""
"Your username has not been configured.\n"
"\n"
@@ -785,11 +935,11 @@"\n"
"Veuillez le définir et réessayer."
-#: tortoisehg\hgtk\commit.py:978
+#: tortoisehg\hgtk\commit.py:1113
msgid "Confirm Override Branch"
msgstr "Confirmer l'écrasement de branche"
-#: tortoisehg\hgtk\commit.py:979
+#: tortoisehg\hgtk\commit.py:1114
msgid ""
"A branch named \"%s\" already exists,\n"
"override?"
@@ -797,43 +947,82 @@"Une branche appelée \"%s\" existe déjà,\n"
"la remplacer ?"
-#: tortoisehg\hgtk\commit.py:983
+#: tortoisehg\hgtk\commit.py:1118
msgid "Confirm New Branch"
msgstr "Confirmer la création de nouvelle branche"
-#: tortoisehg\hgtk\commit.py:984
+#: tortoisehg\hgtk\commit.py:1119
msgid "Create new named branch \"%s\"?"
msgstr "Créer une nouvelle branche \"%s\" ?"
-#: tortoisehg\hgtk\commit.py:1059
+#: tortoisehg\hgtk\commit.py:1174
+msgid "Finish committing and pushing"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1176
+msgid "Finish committing"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1178
+msgid "Aborted committing"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1180
+msgid "Failed to commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1184
+msgid "Committing changes..."
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1186 tortoisehg\hgtk\history.py:584
+#: tortoisehg\hgtk\history.py:609 tortoisehg\hgtk\history.py:1671
+#: tortoisehg\hgtk\history.py:1750 tortoisehg\hgtk\history.py:1880
+#: tortoisehg\hgtk\history.py:1920 tortoisehg\hgtk\history.py:1958
+#: tortoisehg\hgtk\history.py:2299 tortoisehg\hgtk\history.py:2329
+#: tortoisehg\hgtk\history.py:2554 tortoisehg\hgtk\history.py:2582
+#: tortoisehg\hgtk\recovery.py:161 tortoisehg\hgtk\synch.py:540
+msgid "Cannot run now"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1187 tortoisehg\hgtk\history.py:585
+#: tortoisehg\hgtk\history.py:610 tortoisehg\hgtk\history.py:1672
+#: tortoisehg\hgtk\history.py:1751 tortoisehg\hgtk\history.py:1881
+#: tortoisehg\hgtk\history.py:1921 tortoisehg\hgtk\history.py:1959
+#: tortoisehg\hgtk\history.py:2300 tortoisehg\hgtk\history.py:2330
+#: tortoisehg\hgtk\history.py:2555 tortoisehg\hgtk\history.py:2583
+msgid "Please try again after running operation is completed"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1213
msgid "Paste _Filenames"
msgstr "Coller Noms de _Fichiers"
-#: tortoisehg\hgtk\commit.py:1060
+#: tortoisehg\hgtk\commit.py:1214
msgid "App_ly Format"
msgstr "App_liquer Format"
-#: tortoisehg\hgtk\commit.py:1061
-msgid "C_onfigure Format"
-msgstr "C_onfigurer Format"
-
-#: tortoisehg\hgtk\commit.py:1087
+#: tortoisehg\hgtk\commit.py:1215
+msgid "C_onfigure Format..."
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1260
msgid "Info Required"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:1088
+msgstr "Informations Requises"
+
+#: tortoisehg\hgtk\commit.py:1261
msgid "Message format needs to be configured"
msgstr "le format de message doit être configuré"
-#: tortoisehg\hgtk\commit.py:1100 tortoisehg\hgtk\commit.py:1105
+#: tortoisehg\hgtk\commit.py:1273 tortoisehg\hgtk\commit.py:1278
msgid "Warning"
msgstr "Avertissement"
-#: tortoisehg\hgtk\commit.py:1101
+#: tortoisehg\hgtk\commit.py:1274
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:1106
+#: tortoisehg\hgtk\commit.py:1279
msgid "The summary line is not followed by a blank line"
msgstr "La ligne de description n'est pas suivie d'une ligne vide."
@@ -845,137 +1034,166 @@msgid "must be specified 'type' in style"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:197 tortoisehg\hgtk\csinfo.py:198
-#: tortoisehg\hgtk\tagadd.py:63
-msgid "Revision:"
-msgstr "Révision :"
-
-#: tortoisehg\hgtk\csinfo.py:198
+#: tortoisehg\hgtk\csinfo.py:199
msgid "Summary:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:199
+#: tortoisehg\hgtk\csinfo.py:200
msgid "Age:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:199
-msgid "User:"
-msgstr ""
-
-#: tortoisehg\hgtk\csinfo.py:199 tortoisehg\hgtk\csinfo.py:200
+#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:201
msgid "Date:"
msgstr "Date :"
-#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:201
+#: tortoisehg\hgtk\csinfo.py:200 tortoisehg\hgtk\csinfo.py:205
+msgid "User:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:201 tortoisehg\hgtk\csinfo.py:202
msgid "Branch:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:201 tortoisehg\hgtk\csinfo.py:202
+#: tortoisehg\hgtk\csinfo.py:202 tortoisehg\hgtk\csinfo.py:203
msgid "Tags:"
msgstr ""
-#: tortoisehg\hgtk\csinfo.py:202
+#: tortoisehg\hgtk\csinfo.py:203
msgid "Transplant:"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:47
+#: tortoisehg\hgtk\csinfo.py:204
+msgid "Perforce:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:204
+msgid "Subversion:"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:88
+msgid "Show all"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:91
+msgid "Use compact view"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:384
+msgid "No items to display"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:397
+msgid "Updating..."
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:400
+msgid "Selecting %(sel)d of %(total)d, displaying all items"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:403
+msgid "Selecting %(sel)d, displaying %(count)d of %(total)d items"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:407
+msgid "Displaying all items"
+msgstr ""
+
+#: tortoisehg\hgtk\cslist.py:409
+msgid "Displaying %(count)d of %(total)d items"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:45
msgid "%s - datamine"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:56 tortoisehg\hgtk\hgcmd.py:44
-#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\serve.py:62
-#: tortoisehg\hgtk\synch.py:59
+#: tortoisehg\hgtk\datamine.py:54 tortoisehg\hgtk\hgcmd.py:44
+#: tortoisehg\hgtk\history.py:421 tortoisehg\hgtk\recovery.py:46
+#: tortoisehg\hgtk\serve.py:65 tortoisehg\hgtk\synch.py:59
msgid "Stop"
msgstr "Arrêter"
-#: tortoisehg\hgtk\datamine.py:58
+#: tortoisehg\hgtk\datamine.py:56
msgid "Stop operation on current tab"
msgstr "Annuler les opérations sur l'onglet courant."
-#: tortoisehg\hgtk\datamine.py:60
+#: tortoisehg\hgtk\datamine.py:58
msgid "New Search"
msgstr "Nouvelle recherche"
-#: tortoisehg\hgtk\datamine.py:62
+#: tortoisehg\hgtk\datamine.py:60
msgid "Open new search tab"
msgstr "Ouvrir un nouvel onglet de recherche"
-#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1118
+#: tortoisehg\hgtk\datamine.py:71 tortoisehg\hgtk\rename.py:29
+#: tortoisehg\hgtk\thgconfig.py:1331
msgid "Invalid path"
msgstr "Chemin non valide"
-#: tortoisehg\hgtk\datamine.py:74
+#: tortoisehg\hgtk\datamine.py:72
msgid "Cannot annotate directory: %s"
msgstr "Impossible d'annoter le répertoire : %s"
-#: tortoisehg\hgtk\datamine.py:128
+#: tortoisehg\hgtk\datamine.py:134
msgid "Filename"
msgstr "Nom de fichier"
-#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:639
-#: tortoisehg\hgtk\history.py:311 tortoisehg\hgtk\history.py:1055
-#: tortoisehg\hgtk\logview\treeview.py:453 tortoisehg\hgtk\thgconfig.py:194
-#: tortoisehg\hgtk\thgconfig.py:277
+#: tortoisehg\hgtk\datamine.py:136 tortoisehg\hgtk\datamine.py:654
+#: tortoisehg\hgtk\history.py:100 tortoisehg\hgtk\history.py:473
+#: tortoisehg\hgtk\history.py:666 tortoisehg\hgtk\logview\treeview.py:506
+#: tortoisehg\hgtk\thgconfig.py:191 tortoisehg\hgtk\thgconfig.py:300
msgid "User"
msgstr "Utilisateur"
-#: tortoisehg\hgtk\datamine.py:139 tortoisehg\hgtk\datamine.py:149
-msgid "di_splay change"
-msgstr "afficher les changement_s"
-
-#: tortoisehg\hgtk\datamine.py:140
-msgid "_annotate file"
-msgstr "_annoter le fichier"
-
-#: tortoisehg\hgtk\datamine.py:141 tortoisehg\hgtk\datamine.py:153
-msgid "_file history"
-msgstr "historique du _fichier"
-
-#: tortoisehg\hgtk\datamine.py:142 tortoisehg\hgtk\datamine.py:152
-msgid "_view file at revision"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:148
-msgid "_zoom to change"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:150
-msgid "_annotate parent"
-msgstr "_annoter le parent"
-
-#: tortoisehg\hgtk\datamine.py:176
+#: tortoisehg\hgtk\datamine.py:144 tortoisehg\hgtk\datamine.py:157
+#: tortoisehg\hgtk\history.py:1179
+msgid "Di_splay Change"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:148 tortoisehg\hgtk\datamine.py:161
+msgid "_View File at Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:155
+msgid "_Zoom to Change"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:159
+msgid "_Annotate Parent"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:186
msgid "No parent file"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:177
+#: tortoisehg\hgtk\datamine.py:187
msgid "Unable to annotate"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:306
+msgstr "Impossible d'annoter"
+
+#: tortoisehg\hgtk\datamine.py:316
msgid "Search"
msgstr "Chercher"
-#: tortoisehg\hgtk\datamine.py:307 tortoisehg\hgtk\hgignore.py:61
+#: tortoisehg\hgtk\datamine.py:317 tortoisehg\hgtk\hgignore.py:60
msgid "Regexp:"
msgstr "Expression régulière :"
-#: tortoisehg\hgtk\datamine.py:309
+#: tortoisehg\hgtk\datamine.py:319
msgid "Includes:"
msgstr "Inclus :"
-#: tortoisehg\hgtk\datamine.py:311
+#: tortoisehg\hgtk\datamine.py:321
msgid "Excludes:"
msgstr "Exclus :"
-#: tortoisehg\hgtk\datamine.py:314
+#: tortoisehg\hgtk\datamine.py:324
msgid "Start this search"
msgstr "Lancer cette recherche"
-#: tortoisehg\hgtk\datamine.py:315
+#: tortoisehg\hgtk\datamine.py:325
msgid "Regular expression search pattern"
msgstr "Expression régulière de recherche"
-#: tortoisehg\hgtk\datamine.py:316
+#: tortoisehg\hgtk\datamine.py:326
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
@@ -983,7 +1201,7 @@"Liste des règles d'inclusion, séparées par des virgules. Par défaut, le "
"dépôt entier est parcouru."
-#: tortoisehg\hgtk\datamine.py:319
+#: tortoisehg\hgtk\datamine.py:329
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
@@ -991,198 +1209,223 @@"Liste des règles d'exclusion, séparées par des virgules. Par défaut, le "
"dépôt entier est parcouru."
-#: tortoisehg\hgtk\datamine.py:325
+#: tortoisehg\hgtk\datamine.py:335
msgid "Follow copies and renames"
msgstr "Suivre les copies et les changements de noms"
-#: tortoisehg\hgtk\datamine.py:326
+#: tortoisehg\hgtk\datamine.py:336
msgid "Ignore case"
msgstr "Ignorer la casse"
-#: tortoisehg\hgtk\datamine.py:327
+#: tortoisehg\hgtk\datamine.py:337
msgid "Show line numbers"
msgstr "Afficher les numéros de ligne"
-#: tortoisehg\hgtk\datamine.py:328
+#: tortoisehg\hgtk\datamine.py:338
msgid "Show all matching revisions"
msgstr "Afficher toutes les versions correspondantes"
-#: tortoisehg\hgtk\datamine.py:360 tortoisehg\hgtk\datamine.py:637
-#: tortoisehg\hgtk\logview\treeview.py:404
+#: tortoisehg\hgtk\datamine.py:369 tortoisehg\hgtk\datamine.py:652
+#: tortoisehg\hgtk\logview\treeview.py:435
msgid "Rev"
msgstr "Ver"
-#: tortoisehg\hgtk\datamine.py:361 tortoisehg\hgtk\datamine.py:638
+#: tortoisehg\hgtk\datamine.py:370 tortoisehg\hgtk\datamine.py:653
msgid "File"
msgstr "Fichier"
-#: tortoisehg\hgtk\datamine.py:362
+#: tortoisehg\hgtk\datamine.py:371
msgid "Matches"
msgstr "Correspondances"
-#: tortoisehg\hgtk\datamine.py:384
+#: tortoisehg\hgtk\datamine.py:393
msgid "Search %d"
msgstr "Recherche %d"
-#: tortoisehg\hgtk\datamine.py:427
+#: tortoisehg\hgtk\datamine.py:436
msgid "No regular expression given"
msgstr "Aucune expression régulière fournie"
-#: tortoisehg\hgtk\datamine.py:428
+#: tortoisehg\hgtk\datamine.py:437
msgid "You must provide a search expression"
msgstr "Vous devez fournir une expression régulière"
-#: tortoisehg\hgtk\datamine.py:434
+#: tortoisehg\hgtk\datamine.py:443
msgid "Invalid regular expression"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:435 tortoisehg\hgtk\thgshelve.py:210
+msgstr "Expression régulière invalide"
+
+#: tortoisehg\hgtk\datamine.py:444 tortoisehg\hgtk\thgshelve.py:210
msgid "Error: %s"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:457 tortoisehg\hgtk\datamine.py:756
+msgstr "Erreur : %s"
+
+#: tortoisehg\hgtk\datamine.py:466 tortoisehg\hgtk\datamine.py:771
msgid "Abort: %s"
msgstr ""
-#: tortoisehg\hgtk\datamine.py:469
+#: tortoisehg\hgtk\datamine.py:478
msgid "Search \"%s\""
msgstr "Recherche \"%s\""
-#: tortoisehg\hgtk\datamine.py:584
+#: tortoisehg\hgtk\datamine.py:597
msgid "File is unrevisioned"
msgstr "Le fichier n'est pas suivi"
-#: tortoisehg\hgtk\datamine.py:585
+#: tortoisehg\hgtk\datamine.py:598
msgid "Unable to annotate "
msgstr "Impossible d'annoter "
-#: tortoisehg\hgtk\datamine.py:636
+#: tortoisehg\hgtk\datamine.py:651
msgid "Line"
msgstr "Ligne"
-#: tortoisehg\hgtk\datamine.py:640 tortoisehg\hgtk\guess.py:158
+#: tortoisehg\hgtk\datamine.py:655 tortoisehg\hgtk\guess.py:158
msgid "Source"
msgstr "Source"
-#: tortoisehg\hgtk\datamine.py:698
+#: tortoisehg\hgtk\datamine.py:713
msgid "Loading history..."
-msgstr ""
+msgstr "Chargement de l'historique..."
#: tortoisehg\hgtk\dialog.py:34
msgid "TortoiseHg Prompt"
msgstr "Ligne de commande TortoiseHg"
-#: tortoisehg\hgtk\gdialog.py:470
+#: tortoisehg\hgtk\gdialog.py:482
msgid "_Tools"
-msgstr ""
-
-#: tortoisehg\hgtk\gdialog.py:471 tortoisehg\hgtk\history.py:87
-#: tortoisehg\util\menuthg.py:68
+msgstr "_Outils"
+
+#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\hgtk\history.py:221
+#: tortoisehg\hgtk\thgconfig.py:675 tortoisehg\util\menuthg.py:49
msgid "Repository Explorer"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:475
+#: tortoisehg\hgtk\gdialog.py:487 tortoisehg\hgtk\history.py:263
msgid "Datamine"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:477
+#: tortoisehg\hgtk\gdialog.py:489 tortoisehg\hgtk\history.py:266
msgid "Recovery"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:479
+#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\history.py:269
msgid "Serve"
msgstr ""
-#: tortoisehg\hgtk\gdialog.py:481 tortoisehg\hgtk\synch.py:89
-#: tortoisehg\hgtk\thgshelve.py:71 tortoisehg\hgtk\thgshelve.py:139
-#: tortoisehg\hgtk\thgshelve.py:145 tortoisehg\hgtk\thgshelve.py:153
+#: tortoisehg\hgtk\gdialog.py:493 tortoisehg\hgtk\history.py:272
+#: tortoisehg\hgtk\synch.py:89 tortoisehg\hgtk\thgshelve.py:71
+#: tortoisehg\hgtk\thgshelve.py:139 tortoisehg\hgtk\thgshelve.py:145
+#: tortoisehg\hgtk\thgshelve.py:153
msgid "Shelve"
-msgstr ""
-
-#: tortoisehg\hgtk\gdialog.py:483 tortoisehg\util\menuthg.py:71
+msgstr "Mettre de Côté"
+
+#: tortoisehg\hgtk\gdialog.py:495 tortoisehg\hgtk\thgconfig.py:677
+#: tortoisehg\util\menuthg.py:55
msgid "Synchronize"
msgstr "Synchroniser"
-#: tortoisehg\hgtk\gdialog.py:485
+#: tortoisehg\hgtk\gdialog.py:497
msgid "Settings"
-msgstr ""
-
-#: tortoisehg\hgtk\gdialog.py:488
+msgstr "Paramètres"
+
+#: tortoisehg\hgtk\gdialog.py:500
msgid "_Help"
-msgstr ""
-
-#: tortoisehg\hgtk\gdialog.py:489
+msgstr "_Aide"
+
+#: tortoisehg\hgtk\gdialog.py:501
msgid "Contents"
-msgstr ""
-
-#: tortoisehg\hgtk\gdialog.py:491 tortoisehg\hgtk\taskbarui.py:31
+msgstr "Contenu"
+
+#: tortoisehg\hgtk\gdialog.py:503 tortoisehg\hgtk\thgmq.py:835
+msgid "Index"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:505
msgid "About"
msgstr "À propos"
-#: tortoisehg\hgtk\gdialog.py:592
+#: tortoisehg\hgtk\gdialog.py:582
msgid " Aborted"
msgstr " annulé(e)"
-#: tortoisehg\hgtk\gdialog.py:603
+#: tortoisehg\hgtk\gdialog.py:593
msgid " Messages and Errors"
msgstr " Messages et Erreurs"
-#: tortoisehg\hgtk\gdialog.py:646
+#: tortoisehg\hgtk\gdialog.py:636
msgid "making snapshot of %d files from rev %s\n"
msgstr "création de l'instantané de %d fichiers depuis la revision %s\n"
-#: tortoisehg\hgtk\gdialog.py:681
+#: tortoisehg\hgtk\gdialog.py:670
msgid "edit failed"
msgstr "erreur d'édition"
-#: tortoisehg\hgtk\gdialog.py:689 tortoisehg\hgtk\thgconfig.py:687
+#: tortoisehg\hgtk\gdialog.py:678 tortoisehg\hgtk\gtklib.py:172
msgid "No visual editor configured"
msgstr "Aucun éditeur graphique spécifié"
-#: tortoisehg\hgtk\gdialog.py:690 tortoisehg\hgtk\thgconfig.py:688
+#: tortoisehg\hgtk\gdialog.py:679 tortoisehg\hgtk\gtklib.py:173
msgid "Please configure a visual editor."
msgstr "Veuillez spécifier un éditeur graphique."
-#: tortoisehg\hgtk\gorev.py:26
+#: tortoisehg\hgtk\gdialog.py:809
+msgid "unknown mode name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:849
+msgid "Abort"
+msgstr "Abandonner"
+
+#: tortoisehg\hgtk\gdialog.py:889
+msgid "Confirm Abort"
+msgstr "Confirmer l'annulation"
+
+#: tortoisehg\hgtk\gdialog.py:890
+msgid "Do you want to abort?"
+msgstr "Voulez-vous annuler?"
+
+#: tortoisehg\hgtk\gorev.py:27
msgid "Select"
-msgstr ""
-
-#: tortoisehg\hgtk\gorev.py:30
+msgstr "Sélection"
+
+#: tortoisehg\hgtk\gorev.py:31
msgid "Select Revision"
-msgstr ""
-
-#: tortoisehg\hgtk\gorev.py:43
+msgstr "Sélectionner une révision"
+
+#: tortoisehg\hgtk\gorev.py:44
msgid "revision number, changeset ID, branch or tag"
-msgstr ""
-
-#: tortoisehg\hgtk\gorev.py:58
+msgstr "numéro de révision"
+
+#: tortoisehg\hgtk\gorev.py:59
msgid "Ambiguous Revision"
msgstr ""
-#: tortoisehg\hgtk\gorev.py:62
+#: tortoisehg\hgtk\gorev.py:63
msgid "Invalid Revision"
-msgstr ""
-
-#: tortoisehg\hgtk\gtklib.py:149
+msgstr "Révision invalide"
+
+#: tortoisehg\hgtk\gtklib.py:247
msgid "Save File"
msgstr "Enregistrer le fichier"
-#: tortoisehg\hgtk\gtklib.py:150
+#: tortoisehg\hgtk\gtklib.py:248
msgid "All files"
msgstr "Tous les fichiers"
-#: tortoisehg\hgtk\gtklib.py:247
+#: tortoisehg\hgtk\gtklib.py:361
msgid ""
"The file \"%s\" already exists!\n"
"\n"
"Do you want to overwrite it?"
msgstr ""
-
-#: tortoisehg\hgtk\gtklib.py:258
+"Le fichier \"%s\" existe déjà !\n"
+"\n"
+"Voulez-vous l'écraser ?"
+
+#: tortoisehg\hgtk\gtklib.py:372
msgid "Select Folder"
msgstr "Sélectionner le répertoire"
-#: tortoisehg\hgtk\gtklib.py:645
+#: tortoisehg\hgtk\gtklib.py:861
msgid ""
"Select language for spell checking.\n"
"\n"
@@ -1192,18 +1435,25 @@"\n"
"examples: en, en_GB, en_US"
msgstr ""
-
-#: tortoisehg\hgtk\gtklib.py:651
+"Sélectionner la langue de correction orthographique\n"
+"\n"
+"Blanc correspond à la langue par défaut.\n"
+"Si tout le texte est surligné, le dictionnaire\n"
+"est probablement non installé.\n"
+"\n"
+"exemples : en, en_GB, en_US"
+
+#: tortoisehg\hgtk\gtklib.py:867
msgid "Lang \"%s\" can not be set.\n"
-msgstr ""
-
-#: tortoisehg\hgtk\gtklib.py:664 tortoisehg\hgtk\thgconfig.py:592
+msgstr "La langue \"%s\" ne peut être paramétrée.\n"
+
+#: tortoisehg\hgtk\gtklib.py:880 tortoisehg\hgtk\thgconfig.py:667
msgid "Spell Check Language"
-msgstr ""
+msgstr "Langue de Correction Orthographique"
#: tortoisehg\hgtk\guess.py:53
msgid "Detect Copies/Renames in %s"
-msgstr ""
+msgstr "Détecter les Copies/Renommages dans %s"
#: tortoisehg\hgtk\guess.py:73
msgid "Minimum Simularity Percentage"
@@ -1237,11 +1487,11 @@msgid "Differences from Source to Dest"
msgstr "Différences entre Source et Cible"
-#: tortoisehg\hgtk\guess.py:273
+#: tortoisehg\hgtk\guess.py:274
msgid "finding source of "
msgstr "recherche de la source de "
-#: tortoisehg\hgtk\guess.py:372
+#: tortoisehg\hgtk\guess.py:377
msgid ""
"== %s and %s have identical contents ==\n"
"\n"
@@ -1249,7 +1499,7 @@"== %s et %s ont des contenus identiques ==\n"
"\n"
-#: tortoisehg\hgtk\hgcmd.py:179 tortoisehg\hgtk\hgcmd.py:514
+#: tortoisehg\hgtk\hgcmd.py:186 tortoisehg\hgtk\hgcmd.py:529
msgid ""
"\n"
"[command interrupted]"
@@ -1257,114 +1507,111 @@"\n"
"[commande interrompue]"
-#: tortoisehg\hgtk\hgcmd.py:265
+#: tortoisehg\hgtk\hgcmd.py:278
msgid "unknown CmdWidget style: %s"
-msgstr ""
-
-#: tortoisehg\hgtk\hgcmd.py:278
+msgstr "style CmdWidget inconnu : %s"
+
+#: tortoisehg\hgtk\hgcmd.py:291
msgid "Toggle log window"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:311
+#: tortoisehg\hgtk\hgcmd.py:324
msgid "Stop transaction"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:313
+#: tortoisehg\hgtk\hgcmd.py:326
msgid "Close this"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:449 tortoisehg\hgtk\hgcmd.py:466
+#: tortoisehg\hgtk\hgcmd.py:464 tortoisehg\hgtk\hgcmd.py:481
msgid "invalid state"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:597
+#: tortoisehg\hgtk\hgcmd.py:613
msgid "Command Log"
-msgstr ""
+msgstr "Journal des Commandes"
+
+#: tortoisehg\hgtk\hgemail.py:36
+msgid "Send"
+msgstr "Envoyer"
#: tortoisehg\hgtk\hgemail.py:38
-msgid "Send"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:40
msgid "Send emails"
-msgstr ""
+msgstr "Envoyer des emails"
+
+#: tortoisehg\hgtk\hgemail.py:39
+msgid "Test"
+msgstr "Essai"
#: tortoisehg\hgtk\hgemail.py:41
-msgid "Test"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:43
msgid "Show emails which would be sent"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:45 tortoisehg\hgtk\serve.py:70
+msgstr "Afficher les emails qui seraient envoyés"
+
+#: tortoisehg\hgtk\hgemail.py:43 tortoisehg\hgtk\serve.py:73
#: tortoisehg\hgtk\synch.py:96
msgid "Configure"
msgstr "Configurer"
-#: tortoisehg\hgtk\hgemail.py:47
+#: tortoisehg\hgtk\hgemail.py:45
msgid "Configure email settings"
msgstr "Configure les réglages d'e-mail"
-#: tortoisehg\hgtk\hgemail.py:57
+#: tortoisehg\hgtk\hgemail.py:55
msgid "Email outgoing changes"
msgstr "Envoie par e-mail les changements à faire"
+#: tortoisehg\hgtk\hgemail.py:57
+msgid "Email revisions "
+msgstr ""
+
#: tortoisehg\hgtk\hgemail.py:59
-msgid "Email revisions "
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:61
msgid "Email Mercurial Patches"
msgstr "Envoyer par e-mail des mises à jour de Mercurial"
-#: tortoisehg\hgtk\hgemail.py:65
+#: tortoisehg\hgtk\hgemail.py:63
msgid "Envelope"
msgstr "Enveloppe"
-#: tortoisehg\hgtk\hgemail.py:66 tortoisehg\hgtk\taskbarui.py:49
+#: tortoisehg\hgtk\hgemail.py:64
msgid "Options"
msgstr "Options"
-#: tortoisehg\hgtk\hgemail.py:78
+#: tortoisehg\hgtk\hgemail.py:76
msgid "To:"
msgstr "À:"
-#: tortoisehg\hgtk\hgemail.py:89
+#: tortoisehg\hgtk\hgemail.py:81
msgid "Cc:"
msgstr "Copie à:"
-#: tortoisehg\hgtk\hgemail.py:100
+#: tortoisehg\hgtk\hgemail.py:86
msgid "From:"
msgstr "De:"
-#: tortoisehg\hgtk\hgemail.py:109
+#: tortoisehg\hgtk\hgemail.py:90
msgid "In-Reply-To:"
msgstr "Réponse à :"
-#: tortoisehg\hgtk\hgemail.py:116
+#: tortoisehg\hgtk\hgemail.py:92
msgid "Message identifier to reply to, for threading"
msgstr "Identifiant du message auquel répondre - pour le filage"
-#: tortoisehg\hgtk\hgemail.py:122
-msgid "Send changesets as HG patches"
-msgstr "Envoyer tous les changements sous forme de mise à jour Hg."
-
-#: tortoisehg\hgtk\hgemail.py:125
+#: tortoisehg\hgtk\hgemail.py:99
+msgid "Send changesets as Hg patches"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:102
msgid ""
-"HG patches (as generated by export command) are compatible with most patch "
+"Hg patches (as generated by export command) are compatible with most patch "
"programs. They include a header which contains the most important changeset "
"metadata."
msgstr ""
-"Les mise à jour Hg (générees par la commande d'export) sont compatibles avec "
-"la plupart des programmes de patch. Elles incluent un en-tête qui contient "
-"les méta-informations les plus importantes pour l'ensemble des modifications."
-
-#: tortoisehg\hgtk\hgemail.py:130
+
+#: tortoisehg\hgtk\hgemail.py:107
msgid "Use extended (git) patch format"
msgstr "Utiliser le format de mise à jour étendu (git)"
-#: tortoisehg\hgtk\hgemail.py:133
+#: tortoisehg\hgtk\hgemail.py:110
msgid ""
"Git patches can describe binary files, copies, and permission changes, but "
"recipients may not be able to use them if they are not using git or "
@@ -1374,11 +1621,11 @@"de copies et de droits d'accès, mais les destinataires peuvent ne pas "
"pouvoir les utiliser s'ils n'utilisent pas git ou Mercurial."
-#: tortoisehg\hgtk\hgemail.py:138
-msgid "Plain, do not prepend HG header"
-msgstr "Simple, ne pas ajouter d'en-tête Hg en entrée."
-
-#: tortoisehg\hgtk\hgemail.py:141
+#: tortoisehg\hgtk\hgemail.py:115
+msgid "Plain, do not prepend Hg header"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:118
msgid ""
"Stripping Mercurial header removes username and parent information. Only "
"useful if recipient is not using Mercurial (and does not like to see the "
@@ -1388,12 +1635,12 @@"informations de parentée. Cela n'est utile que si le destinataire n'utilise "
"pas Mercurial (et qu'il n'aime pas voir ces en-têtes)."
-#: tortoisehg\hgtk\hgemail.py:146
+#: tortoisehg\hgtk\hgemail.py:123
msgid "Send single binary bundle, not patches"
msgstr ""
"Envoyer un seul fichier binaire pour tout, pas plusieurs mises à jour."
-#: tortoisehg\hgtk\hgemail.py:150
+#: tortoisehg\hgtk\hgemail.py:127
msgid ""
"Bundles store complete changesets in binary form. Upstream users can pull "
"from them. This is the safest way to send changes to recipient Mercurial "
@@ -1403,49 +1650,49 @@"utilisateurs en âmont peuvent retirer depuis ces fichiers. C'est le moyen le "
"plus simples d'envoyer des modifications à des utilisateurs de Mercurial."
-#: tortoisehg\hgtk\hgemail.py:156
+#: tortoisehg\hgtk\hgemail.py:133
msgid ""
"This feature is only available when sending outgoing changesets. It is not "
"applicable with revision ranges."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:162
+#: tortoisehg\hgtk\hgemail.py:136
msgid "attach"
msgstr "joindre"
-#: tortoisehg\hgtk\hgemail.py:164
+#: tortoisehg\hgtk\hgemail.py:138
msgid "send patches as attachments"
msgstr "envoyer les mise à jour comme pièces jointes"
-#: tortoisehg\hgtk\hgemail.py:165
+#: tortoisehg\hgtk\hgemail.py:139
msgid "inline"
msgstr "en ligne"
-#: tortoisehg\hgtk\hgemail.py:167
+#: tortoisehg\hgtk\hgemail.py:141
msgid "send patches as inline attachments"
msgstr "envoyer les mise à jour directement inclues dans le mail"
-#: tortoisehg\hgtk\hgemail.py:168
+#: tortoisehg\hgtk\hgemail.py:142
msgid "diffstat"
msgstr "diffstat"
-#: tortoisehg\hgtk\hgemail.py:170
+#: tortoisehg\hgtk\hgemail.py:144
msgid "add diffstat output to messages"
msgstr "ajouter les infos diffstats aux messages"
-#: tortoisehg\hgtk\hgemail.py:179
+#: tortoisehg\hgtk\hgemail.py:152
msgid "Subject:"
msgstr "Objet:"
-#: tortoisehg\hgtk\hgemail.py:193
+#: tortoisehg\hgtk\hgemail.py:166
msgid "Flags:"
-msgstr ""
-
-#: tortoisehg\hgtk\hgemail.py:205
+msgstr "Fanions :"
+
+#: tortoisehg\hgtk\hgemail.py:180
msgid "Patch Series (Bundle) Description"
msgstr "Description du groupe de mises à jour"
-#: tortoisehg\hgtk\hgemail.py:246
+#: tortoisehg\hgtk\hgemail.py:231
msgid ""
"Patch series description is sent in initial summary email with [PATCH 0 of "
"N] subject. It should describe the effects of the entire patch series. "
@@ -1454,63 +1701,66 @@"subject prefix."
msgstr ""
-#: tortoisehg\hgtk\hgemail.py:293 tortoisehg\hgtk\hgemail.py:298
-#: tortoisehg\hgtk\hgemail.py:307
+#: tortoisehg\hgtk\hgemail.py:278 tortoisehg\hgtk\hgemail.py:283
+#: tortoisehg\hgtk\hgemail.py:292
msgid "Info required"
msgstr "Information requise"
-#: tortoisehg\hgtk\hgemail.py:294
+#: tortoisehg\hgtk\hgemail.py:279
msgid "You must specify a recipient"
msgstr "Vous devez spécifier un destinataire."
-#: tortoisehg\hgtk\hgemail.py:299
+#: tortoisehg\hgtk\hgemail.py:284
msgid "You must specify a sender address"
msgstr "Vous devez spécifier une adresse d'expédition"
-#: tortoisehg\hgtk\hgemail.py:308
+#: tortoisehg\hgtk\hgemail.py:293
msgid "You must configure SMTP"
msgstr "Vous devez configurer le SMTP"
-#: tortoisehg\hgtk\hgignore.py:35
+#: tortoisehg\hgtk\hgignore.py:34
msgid "Ignore filter - %s"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:51 tortoisehg\hgtk\hgignore.py:59
-#: tortoisehg\hgtk\quickop.py:50 tortoisehg\hgtk\tagadd.py:39
-msgid "Add"
-msgstr "Ajouter"
-
-#: tortoisehg\hgtk\hgignore.py:53
+#: tortoisehg\hgtk\hgignore.py:52
msgid "Glob:"
msgstr "Glob:"
-#: tortoisehg\hgtk\hgignore.py:76
+#: tortoisehg\hgtk\hgignore.py:77 tortoisehg\hgtk\thgconfig.py:606
+msgid "Edit File"
+msgstr ""
+
+#: tortoisehg\hgtk\hgignore.py:79
msgid "Apply to:"
-msgstr ""
-
-#: tortoisehg\hgtk\hgignore.py:84
+msgstr "Appliquer à :"
+
+#: tortoisehg\hgtk\hgignore.py:88
msgid "Filters"
msgstr "Filtres"
-#: tortoisehg\hgtk\hgignore.py:100
+#: tortoisehg\hgtk\hgignore.py:104
msgid "Patterns"
msgstr "Règles"
-#: tortoisehg\hgtk\hgignore.py:108
+#: tortoisehg\hgtk\hgignore.py:112
msgid "Remove Selected"
msgstr "Supprimer la sélection"
-#: tortoisehg\hgtk\hgignore.py:114
+#: tortoisehg\hgtk\hgignore.py:118
msgid "Unknown Files"
msgstr "Fichiers inconnus"
-#: tortoisehg\hgtk\hgignore.py:190
+#: tortoisehg\hgtk\hgignore.py:132
+msgid "Files"
+msgstr "Fichiers"
+
+#: tortoisehg\hgtk\hgignore.py:197
msgid "Invalid glob expression"
msgstr ""
-#: tortoisehg\hgtk\hgignore.py:206
+#: tortoisehg\hgtk\hgignore.py:213
msgid "Invalid regexp expression"
-msgstr ""
+msgstr "Expression regexp invalide"
#: tortoisehg\hgtk\hginit.py:22
msgid "TortoiseHg Init"
@@ -1520,82 +1770,76 @@msgid "Create"
msgstr "Créer"
-#: tortoisehg\hgtk\hginit.py:54
+#: tortoisehg\hgtk\hginit.py:58
msgid "Destination:"
msgstr "Destination:"
-#: tortoisehg\hgtk\hginit.py:58
+#: tortoisehg\hgtk\hginit.py:62
msgid "Add special files (.hgignore, ...)"
msgstr "Ajouter les fichiers spéciaux (.hgignore, ...)"
-#: tortoisehg\hgtk\hginit.py:60
+#: tortoisehg\hgtk\hginit.py:64
msgid "Make repo compatible with Mercurial 1.0"
msgstr "Créé un dépôt compatible avec Mercurial 1.0"
-#: tortoisehg\hgtk\hginit.py:99
+#: tortoisehg\hgtk\hginit.py:103
msgid "Destination path is empty"
msgstr "Le chemin cible est vide"
-#: tortoisehg\hgtk\hginit.py:100
+#: tortoisehg\hgtk\hginit.py:104
msgid "Please enter the directory path"
msgstr "Veuillez entrer le chemin du répertoire"
-#: tortoisehg\hgtk\hginit.py:114
+#: tortoisehg\hgtk\hginit.py:118
msgid "Unable to create new repository"
msgstr "Impossible de créer le nouveau dépôt"
-#: tortoisehg\hgtk\hginit.py:118 tortoisehg\hgtk\hginit.py:123
+#: tortoisehg\hgtk\hginit.py:122 tortoisehg\hgtk\hginit.py:127
msgid "Error when creating repository"
msgstr "Erreur lors de la création du dépôt"
-#: tortoisehg\hgtk\hginit.py:140
-msgid "New repository created"
-msgstr "Nouveau dépôt créé"
-
-#: tortoisehg\hgtk\hginit.py:141
-msgid "in directory %s"
-msgstr "dans le répertoire %s"
-
-#: tortoisehg\hgtk\hgthread.py:70 tortoisehg\hgtk\hgthread.py:82
-#: tortoisehg\hgtk\hgthread.py:89
+#: tortoisehg\hgtk\hgthread.py:71 tortoisehg\hgtk\hgthread.py:83
+#: tortoisehg\hgtk\hgthread.py:90
msgid "response expected"
msgstr "réponses attendue"
-#: tortoisehg\hgtk\hgthread.py:86
+#: tortoisehg\hgtk\hgthread.py:87
msgid "password: "
msgstr "mot de passe "
-#: tortoisehg\hgtk\hgthread.py:163
+#: tortoisehg\hgtk\hgthread.py:164
msgid "[command returned code %d "
-msgstr ""
-
-#: tortoisehg\hgtk\hgthread.py:165
+msgstr "[la commande a retourné le code %d "
+
+#: tortoisehg\hgtk\hgthread.py:166
msgid "[command completed successfully "
-msgstr ""
-
-#: tortoisehg\hgtk\hgthread.py:171
+msgstr "[la commande s'est terminée avec succès "
+
+#: tortoisehg\hgtk\hgthread.py:172
msgid "abort: "
-msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:61
+msgstr "abandon : "
+
+#: tortoisehg\hgtk\hgtk.py:73
msgid ""
"\n"
"Caught keyboard interrupt, aborting.\n"
msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:110
+"\n"
+"Interruption clavier détectée, abandon.\n"
+
+#: tortoisehg\hgtk\hgtk.py:123
msgid "can not read file \"%s\". Ignored.\n"
msgstr "Impossible de lire le fichier \"%s\". Ignoré.\n"
-#: tortoisehg\hgtk\hgtk.py:189
+#: tortoisehg\hgtk\hgtk.py:202
msgid "hgtk %s: %s\n"
msgstr "hgtk %s : %s\n"
-#: tortoisehg\hgtk\hgtk.py:192
+#: tortoisehg\hgtk\hgtk.py:205
msgid "hgtk: %s\n"
msgstr "hgtk : %s\n"
-#: tortoisehg\hgtk\hgtk.py:195
+#: tortoisehg\hgtk\hgtk.py:208
msgid ""
"hgtk: command '%s' is ambiguous:\n"
" %s\n"
@@ -1603,55 +1847,77 @@"hgtk : la commande '%s' est ambigüe:\n"
" %s\n"
-#: tortoisehg\hgtk\hgtk.py:198
+#: tortoisehg\hgtk\hgtk.py:211
msgid "hgtk: unknown command '%s'\n"
msgstr "hgtk : commande inconnue '%s'\n"
-#: tortoisehg\hgtk\hgtk.py:201
+#: tortoisehg\hgtk\hgtk.py:214
msgid "abort: %s!\n"
msgstr "annulée: %s !\n"
-#: tortoisehg\hgtk\hgtk.py:248 tortoisehg\hgtk\hgtk.py:396
+#: tortoisehg\hgtk\hgtk.py:261 tortoisehg\hgtk\hgtk.py:460
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\hgtk\hgtk.py:258
+#: tortoisehg\hgtk\hgtk.py:273
msgid "invalid arguments"
msgstr "arguments invalides"
-#: tortoisehg\hgtk\hgtk.py:336
+#: tortoisehg\hgtk\hgtk.py:279
+msgid "unrecognized profiling format '%s' - Ignored\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:294
+msgid ""
+"lsprof not available - install from "
+"http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:400
msgid "Rename error"
-msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:337
+msgstr "Erreur de renommage"
+
+#: tortoisehg\hgtk\hgtk.py:401
msgid "rename takes one or two path arguments"
msgstr "renommer nécessite un ou deux chemins comme paramètre."
-#: tortoisehg\hgtk\hgtk.py:447
+#: tortoisehg\hgtk\hgtk.py:508
+msgid "mpatch error"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:511
+msgid "mpatch expects *.rej file argument\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:513 tortoisehg\hgtk\hgtk.py:520
+msgid "%s does not exist\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:539
msgid "global options:"
msgstr "options globales :"
-#: tortoisehg\hgtk\hgtk.py:449
+#: tortoisehg\hgtk\hgtk.py:541
msgid "use \"hgtk help\" for the full list of commands"
msgstr "utiliser \"hgtk help\" pour la liste complète des commandes"
-#: tortoisehg\hgtk\hgtk.py:453
+#: tortoisehg\hgtk\hgtk.py:545
msgid ""
"use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
msgstr ""
"utiliser \"hgtk help\" pour la liste complète des commandes ou \"hgtk -v\" "
"pour les détails"
-#: tortoisehg\hgtk\hgtk.py:456
+#: tortoisehg\hgtk\hgtk.py:548
msgid "use \"hgtk -v help%s\" to show aliases and global options"
msgstr ""
"utiliser \"hgtk -v help %s\" pour afficher les alias et les options globales"
-#: tortoisehg\hgtk\hgtk.py:459
+#: tortoisehg\hgtk\hgtk.py:551
msgid "use \"hgtk -v help %s\" to show global options"
msgstr "utiliser \"hgtk -v help %s\" pour afficher les options globales"
-#: tortoisehg\hgtk\hgtk.py:471 tortoisehg\hgtk\hgtk.py:573
+#: tortoisehg\hgtk\hgtk.py:563 tortoisehg\hgtk\hgtk.py:670
msgid ""
"list of commands:\n"
"\n"
@@ -1659,7 +1925,7 @@"liste des commandes :\n"
"\n"
-#: tortoisehg\hgtk\hgtk.py:479
+#: tortoisehg\hgtk\hgtk.py:571
msgid ""
"\n"
"aliases: %s\n"
@@ -1667,26 +1933,29 @@"\n"
"alias : %s\n"
-#: tortoisehg\hgtk\hgtk.py:484 tortoisehg\hgtk\hgtk.py:510
-#: tortoisehg\hgtk\hgtk.py:542
+#: tortoisehg\hgtk\hgtk.py:576 tortoisehg\hgtk\hgtk.py:639
msgid "(No help text available)"
msgstr "(pas d'aide disponible)"
-#: tortoisehg\hgtk\hgtk.py:492
+#: tortoisehg\hgtk\hgtk.py:584
msgid "options:\n"
msgstr "options :\n"
-#: tortoisehg\hgtk\hgtk.py:515
+#: tortoisehg\hgtk\hgtk.py:608
+msgid "(no help text available)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:613
msgid "no commands defined\n"
msgstr "aucune commande définie\n"
-#: tortoisehg\hgtk\hgtk.py:566
+#: tortoisehg\hgtk\hgtk.py:663
msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr ""
"Hgtk - Interface graphique de TortoiseHg pour le gestionnaire de version "
"Mercurial (Hg)\n"
-#: tortoisehg\hgtk\hgtk.py:571
+#: tortoisehg\hgtk\hgtk.py:668
msgid ""
"basic commands:\n"
"\n"
@@ -1694,1022 +1963,1408 @@"commandes de base :\n"
"\n"
-#: tortoisehg\hgtk\hgtk.py:587
+#: tortoisehg\hgtk\hgtk.py:684
msgid " (default: %s)"
msgstr " (par défaut : %s)"
-#: tortoisehg\hgtk\hgtk.py:600
+#: tortoisehg\hgtk\hgtk.py:697
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr "Interface TortoiseHg (version %s), Mercurial (version %s)\n"
-#: tortoisehg\hgtk\hgtk.py:634
+#: tortoisehg\hgtk\hgtk.py:731
msgid "repository root directory or symbolic path name"
msgstr "répertoire racine du dépôt ou nom de chemin symbolique"
-#: tortoisehg\hgtk\hgtk.py:635
+#: tortoisehg\hgtk\hgtk.py:732
msgid "enable additional output"
msgstr "active l'affichage supplémentaire"
-#: tortoisehg\hgtk\hgtk.py:636
+#: tortoisehg\hgtk\hgtk.py:733
msgid "suppress output"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:637
+#: tortoisehg\hgtk\hgtk.py:734
msgid "display help and exit"
msgstr "affiche l'aide et termine"
-#: tortoisehg\hgtk\hgtk.py:638
+#: tortoisehg\hgtk\hgtk.py:735
msgid "start debugger"
msgstr "démarrer le débogueur"
-#: tortoisehg\hgtk\hgtk.py:639
+#: tortoisehg\hgtk\hgtk.py:736
+msgid "print command execution profile"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:737
msgid "do not fork GUI process"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:640
+#: tortoisehg\hgtk\hgtk.py:738
msgid "always fork GUI process"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:641
+#: tortoisehg\hgtk\hgtk.py:739
msgid "read file list from file"
msgstr "lit la liste de fichiers depuis le fichier"
-#: tortoisehg\hgtk\hgtk.py:645
+#: tortoisehg\hgtk\hgtk.py:743
msgid "hgtk about"
msgstr "hgtk à propos"
-#: tortoisehg\hgtk\hgtk.py:646
+#: tortoisehg\hgtk\hgtk.py:744
msgid "hgtk add [FILE]..."
msgstr "hgtk add [FICHIER]"
-#: tortoisehg\hgtk\hgtk.py:647
+#: tortoisehg\hgtk\hgtk.py:745
msgid "hgtk clone SOURCE [DEST]"
msgstr "hgtk clone ORIGINE [CIBLE]"
-#: tortoisehg\hgtk\hgtk.py:649
+#: tortoisehg\hgtk\hgtk.py:747
msgid "record user as committer"
msgstr "enregistrer l'utilisateur comme expéditeur"
-#: tortoisehg\hgtk\hgtk.py:650
+#: tortoisehg\hgtk\hgtk.py:748
msgid "record datecode as commit date"
msgstr "utiliser la date du fichier comme date de livraison"
-#: tortoisehg\hgtk\hgtk.py:651
+#: tortoisehg\hgtk\hgtk.py:749
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr "hgtk commit [OPTIONS] [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:652
+#: tortoisehg\hgtk\hgtk.py:750
msgid "hgtk datamine"
msgstr "hgtk datamine"
-#: tortoisehg\hgtk\hgtk.py:653
+#: tortoisehg\hgtk\hgtk.py:751
msgid "hgtk hgignore [FILE]"
msgstr "hgtk hgignore [FICHIER]"
-#: tortoisehg\hgtk\hgtk.py:654
+#: tortoisehg\hgtk\hgtk.py:752
msgid "hgtk init [DEST]"
msgstr "hgtk init [CIBLE]"
-#: tortoisehg\hgtk\hgtk.py:656
+#: tortoisehg\hgtk\hgtk.py:754
msgid "limit number of changes displayed"
msgstr "limiter le nombre de changements affichés"
-#: tortoisehg\hgtk\hgtk.py:657
+#: tortoisehg\hgtk\hgtk.py:755
msgid "hgtk log [OPTIONS] [FILE]"
msgstr "hgtk log [OPTIONS] [FICHIER]"
-#: tortoisehg\hgtk\hgtk.py:659
+#: tortoisehg\hgtk\hgtk.py:757
msgid "revision to merge with"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:660
+#: tortoisehg\hgtk\hgtk.py:758
msgid "hgtk merge"
msgstr "hgtk merge"
-#: tortoisehg\hgtk\hgtk.py:661
+#: tortoisehg\hgtk\hgtk.py:759
msgid "hgtk recovery"
msgstr "hgtk recovery"
-#: tortoisehg\hgtk\hgtk.py:662
+#: tortoisehg\hgtk\hgtk.py:760
msgid "hgtk shelve"
msgstr "hgtk shelve"
-#: tortoisehg\hgtk\hgtk.py:663
+#: tortoisehg\hgtk\hgtk.py:761
msgid "hgtk synch"
msgstr "hgtk synch"
-#: tortoisehg\hgtk\hgtk.py:665
+#: tortoisehg\hgtk\hgtk.py:763
msgid "revisions to compare"
msgstr "versions à comparer"
-#: tortoisehg\hgtk\hgtk.py:666
+#: tortoisehg\hgtk\hgtk.py:764
msgid "hgtk status [FILE]..."
msgstr "hgtk status [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:668 tortoisehg\hgtk\hgtk.py:671
+#: tortoisehg\hgtk\hgtk.py:766 tortoisehg\hgtk\hgtk.py:769
msgid "field to give initial focus"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:669
+#: tortoisehg\hgtk\hgtk.py:767
msgid "hgtk userconfig"
msgstr "hgtk userconfig"
-#: tortoisehg\hgtk\hgtk.py:672
+#: tortoisehg\hgtk\hgtk.py:770
msgid "hgtk repoconfig"
msgstr "hgtk repoconfig"
-#: tortoisehg\hgtk\hgtk.py:673
+#: tortoisehg\hgtk\hgtk.py:771
msgid "hgtk guess"
msgstr "hgtk guess"
-#: tortoisehg\hgtk\hgtk.py:674
+#: tortoisehg\hgtk\hgtk.py:772
msgid "hgtk remove [FILE]..."
msgstr "hgtk remove [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:675
+#: tortoisehg\hgtk\hgtk.py:773
msgid "hgtk rename SOURCE [DEST]"
msgstr "hgtk rename ORIGINE [CIBLE]"
-#: tortoisehg\hgtk\hgtk.py:676
+#: tortoisehg\hgtk\hgtk.py:774
msgid "hgtk revert [FILE]..."
msgstr "hgtk revert [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:677
+#: tortoisehg\hgtk\hgtk.py:775
msgid "hgtk forget [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:680
+#: tortoisehg\hgtk\hgtk.py:778
msgid "name of the webdir config file"
msgstr "nom du fichier de configuration web"
-#: tortoisehg\hgtk\hgtk.py:681
+#: tortoisehg\hgtk\hgtk.py:779
msgid "hgtk serve [OPTION]..."
msgstr "hgtk serve [OPTION]..."
-#: tortoisehg\hgtk\hgtk.py:683
+#: tortoisehg\hgtk\hgtk.py:781
msgid "wait until the second ticks over"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:684
+#: tortoisehg\hgtk\hgtk.py:782
msgid "notify the shell for paths given"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:685
+#: tortoisehg\hgtk\hgtk.py:783
msgid "remove the status cache"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:686
+#: tortoisehg\hgtk\hgtk.py:784
msgid "show the contents of the status cache (no update)"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:688
+#: tortoisehg\hgtk\hgtk.py:786
msgid "udpate all repos in current dir"
-msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:689
+msgstr "mettre à jour tous les référentiels dans le répertoire courrant"
+
+#: tortoisehg\hgtk\hgtk.py:787
msgid "hgtk thgstatus [OPTION]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:691 tortoisehg\hgtk\hgtk.py:707
+#: tortoisehg\hgtk\hgtk.py:789 tortoisehg\hgtk\hgtk.py:804
msgid "revision to update"
msgstr "version à mettre à jour"
-#: tortoisehg\hgtk\hgtk.py:694
+#: tortoisehg\hgtk\hgtk.py:792
msgid "changeset to view in diff tool"
msgstr "groupe de modification à voir dans l'outil de différenciation"
-#: tortoisehg\hgtk\hgtk.py:695
+#: tortoisehg\hgtk\hgtk.py:793
msgid "revisions to view in diff tool"
msgstr "versions a afficher dans l'outil de différenciation"
-#: tortoisehg\hgtk\hgtk.py:696
+#: tortoisehg\hgtk\hgtk.py:794
msgid "bundle file to preview"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:697
-msgid "directly use raw extdiff command"
-msgstr ""
-
-#: tortoisehg\hgtk\hgtk.py:698
+#: tortoisehg\hgtk\hgtk.py:795
msgid "launch visual diff tool"
msgstr "lance l'outil de différenciation graphique"
-#: tortoisehg\hgtk\hgtk.py:700
+#: tortoisehg\hgtk\hgtk.py:797
msgid "print license"
msgstr "affiche la licence d'utilisation"
-#: tortoisehg\hgtk\hgtk.py:701
+#: tortoisehg\hgtk\hgtk.py:798
msgid "hgtk version [OPTION]"
msgstr "hgtk version [OPTION]"
-#: tortoisehg\hgtk\hgtk.py:703
+#: tortoisehg\hgtk\hgtk.py:800
msgid "show the command options"
msgstr "affiche les options des commandes"
-#: tortoisehg\hgtk\hgtk.py:704
+#: tortoisehg\hgtk\hgtk.py:801
msgid "[-o] CMD"
msgstr "[-o] CMD"
-#: tortoisehg\hgtk\hgtk.py:705
+#: tortoisehg\hgtk\hgtk.py:802
msgid "hgtk help [COMMAND]"
msgstr "hgtk help [COMMANDE]"
+#: tortoisehg\hgtk\hgtk.py:810
+msgid "import to the repository"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:811
+msgid "import to the patch queue (MQ)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:812
+msgid "hgtk import [OPTION] [SOURCE]..."
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:817
+msgid "hgtk shellconfig"
+msgstr ""
+
#: tortoisehg\hgtk\histdetails.py:35
msgid "Log Details"
-msgstr ""
+msgstr "Détails du Journal"
#: tortoisehg\hgtk\histdetails.py:40
msgid "Columns"
-msgstr ""
+msgstr "Colonnes"
#: tortoisehg\hgtk\histdetails.py:87
msgid "Move Up"
-msgstr ""
+msgstr "Déplacer vers le haut"
#: tortoisehg\hgtk\histdetails.py:90
msgid "Move Down"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:71
+msgstr "Déplacer vers le bas"
+
+#: tortoisehg\hgtk\history.py:52 tortoisehg\hgtk\history.py:446
+msgid "All"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:57 tortoisehg\hgtk\history.py:448
+msgid "Tagged"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:61 tortoisehg\hgtk\history.py:450
+msgid "Ancestry"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:69 tortoisehg\hgtk\history.py:454
+#: tortoisehg\hgtk\history.py:1142
+msgid "Heads"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:73 tortoisehg\hgtk\history.py:456
+msgid "Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:77 tortoisehg\hgtk\history.py:478
+msgid "Hide Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:82
+msgid "Branch Filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:93
+msgid "Custom Filter"
+msgstr "Filtre utilisateur"
+
+#: tortoisehg\hgtk\history.py:99
+msgid "Rev Range"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:99 tortoisehg\hgtk\history.py:464
+msgid "File Patterns"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:100 tortoisehg\hgtk\history.py:467
+msgid "Keywords"
+msgstr "Mots-clés"
+
+#: tortoisehg\hgtk\history.py:100 tortoisehg\hgtk\history.py:470
+msgid "Date"
+msgstr "Date"
+
+#: tortoisehg\hgtk\history.py:150
+msgid "Branches..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:205
msgid ""
"New changesets from the preview bundle are still pending.\n"
"\n"
"Accept or reject the new changesets?"
msgstr ""
-#: tortoisehg\hgtk\history.py:74
+#: tortoisehg\hgtk\history.py:208
msgid "Accept new Changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:77
+#: tortoisehg\hgtk\history.py:211
msgid "&Accept"
msgstr ""
-#: tortoisehg\hgtk\history.py:77
+#: tortoisehg\hgtk\history.py:211
msgid "&Reject"
msgstr ""
-#: tortoisehg\hgtk\history.py:89
+#: tortoisehg\hgtk\history.py:223
msgid " (Bundle Preview)"
msgstr ""
-#: tortoisehg\hgtk\history.py:105 tortoisehg\hgtk\status.py:177
+#: tortoisehg\hgtk\history.py:239 tortoisehg\hgtk\status.py:169
msgid "Re_fresh"
msgstr "Actualiser (_f)"
-#: tortoisehg\hgtk\history.py:107
+#: tortoisehg\hgtk\history.py:241 tortoisehg\hgtk\history.py:1444
msgid "Reload revision history"
msgstr "Recharge l'historique des versions"
-#: tortoisehg\hgtk\history.py:111 tortoisehg\hgtk\history.py:160
-msgid "Patch Queue"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:113
-msgid "Show/Hide Patch Queue"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:156
+#: tortoisehg\hgtk\history.py:243
+msgid "Reset _Marks"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:245
+msgid "Reset revision marks"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:262
+msgid "Launch commit tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:265
+msgid "Launch data mining tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:268
+msgid "Launch recovery tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:271
+msgid "Launch web server"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:274
+msgid "Launch shelve tool"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:320
+msgid "Branches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:334 tortoisehg\hgtk\history.py:670
+#: tortoisehg\hgtk\logview\treeview.py:553
+msgid "Tags"
+msgstr "Marqueurs"
+
+#: tortoisehg\hgtk\history.py:342
msgid "Sync Bar"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:166
+msgstr "Barre de Synchronisation"
+
+#: tortoisehg\hgtk\history.py:354
+msgid "_Perforce"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:355
+msgid "Identify"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:357
+msgid "Pending"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:365 tortoisehg\hgtk\history.py:1368
msgid "Load more Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:168
+#: tortoisehg\hgtk\history.py:367 tortoisehg\hgtk\history.py:1371
msgid "Load all Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:171
-msgid "Toolbar"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:174
+#: tortoisehg\hgtk\history.py:373
msgid "Filter Bar"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:180
+msgstr "Barre de Filtre"
+
+#: tortoisehg\hgtk\history.py:379
msgid "Reset Marks"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:183
+msgstr "Réinitialiser les Marqueurs"
+
+#: tortoisehg\hgtk\history.py:382
msgid "Choose Details..."
msgstr ""
-#: tortoisehg\hgtk\history.py:186
+#: tortoisehg\hgtk\history.py:385
msgid "Compact Graph"
msgstr ""
-#: tortoisehg\hgtk\history.py:188
+#: tortoisehg\hgtk\history.py:388
msgid "Color by Branch"
msgstr ""
-#: tortoisehg\hgtk\history.py:191
-msgid "Ignore Max Diff Size"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:195
+#: tortoisehg\hgtk\history.py:398
msgid "_Navigate"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:196
+msgstr "_Naviguer"
+
+#: tortoisehg\hgtk\history.py:399
msgid "Tip"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:198
+msgstr "Conseil"
+
+#: tortoisehg\hgtk\history.py:401
msgid "Working Parent"
msgstr ""
-#: tortoisehg\hgtk\history.py:201
+#: tortoisehg\hgtk\history.py:403
+msgid "Previously Selected"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:406
msgid "Revision..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:205
+msgstr "Révision..."
+
+#: tortoisehg\hgtk\history.py:410
msgid "_Synchronize"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:206 tortoisehg\hgtk\synch.py:63
+msgstr "_Synchroniser"
+
+#: tortoisehg\hgtk\history.py:411 tortoisehg\hgtk\history.py:1749
+#: tortoisehg\hgtk\synch.py:63
msgid "Incoming"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:208
+msgstr "Entrant"
+
+#: tortoisehg\hgtk\history.py:413 tortoisehg\hgtk\history.py:1879
msgid "Pull"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:210 tortoisehg\hgtk\synch.py:74
+msgstr "Récupérer"
+
+#: tortoisehg\hgtk\history.py:415 tortoisehg\hgtk\history.py:1919
+#: tortoisehg\hgtk\synch.py:74
msgid "Outgoing"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:212 tortoisehg\hgtk\synch.py:79
+msgstr "Sortant"
+
+#: tortoisehg\hgtk\history.py:417 tortoisehg\hgtk\history.py:1957
+#: tortoisehg\hgtk\synch.py:79
msgid "Push"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:214
+msgstr "Publier"
+
+#: tortoisehg\hgtk\history.py:419
msgid "Email..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:217
+msgstr "Courrier électronique..."
+
+#: tortoisehg\hgtk\history.py:424
+msgid "Accept Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:427
+msgid "Reject Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:431
+msgid "Import..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:433
msgid "Add Bundle..."
msgstr ""
-#: tortoisehg\hgtk\history.py:220
-msgid "Accept Bundle"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:223
-msgid "Reject Bundle"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:229
+#: tortoisehg\hgtk\history.py:437
+msgid "Configure Paths..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:442
msgid "Force push"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:300 tortoisehg\hgtk\logview\treeview.py:389
+msgstr "Forcer la publication"
+
+#: tortoisehg\hgtk\history.py:445
+msgid "_Filter"
+msgstr "_Filtrer"
+
+#: tortoisehg\hgtk\history.py:458 tortoisehg\hgtk\logview\treeview.py:472
+msgid "Branch"
+msgstr "Branche"
+
+#: tortoisehg\hgtk\history.py:460
+msgid "Custom"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:461
+msgid "Revision Range"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:555
+msgid "%s (submitted)"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
+msgid "%s (pending)"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:560
+msgid "Submitted"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:566
+msgid "Unable to parse p4pending output"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:568
+msgid "%d pending changelists found"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:570
+msgid "No pending Perforce changelists"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:572
+msgid "Aborted p4pending"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:574
+msgid "Unable to determine pending changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:582
+msgid "Finding pending Perforce changelists..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:583
+msgid "Pending Perforce changelists"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:595
+msgid "Perforce changelist %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:600
+msgid "Unable to find rev %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:602
+msgid "Aborted p4identify"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:604
+msgid "Unable to identify Perforce tip"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:607
+msgid "Finding tip Perforce changelist..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:608
+msgid "Identifying Perforce tip"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:653 tortoisehg\hgtk\logview\treeview.py:420
msgid "Graph"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:307
+msgstr "Graphe"
+
+#: tortoisehg\hgtk\history.py:660
msgid "Revision Number"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:308
+msgstr "Numéro de Révision"
+
+#: tortoisehg\hgtk\history.py:661
msgid "Changeset ID"
msgstr ""
-#: tortoisehg\hgtk\history.py:309
+#: tortoisehg\hgtk\history.py:662
+msgid "Revision Number/ID"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:663
msgid "Branch Name"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:310 tortoisehg\hgtk\logview\treeview.py:442
-#: tortoisehg\hgtk\thgmq.py:187
+msgstr "Nom de branche"
+
+#: tortoisehg\hgtk\history.py:664 tortoisehg\hgtk\logview\treeview.py:484
+msgid "Changes"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:665 tortoisehg\hgtk\logview\treeview.py:495
+#: tortoisehg\hgtk\thgmq.py:203 tortoisehg\hgtk\thgmq.py:837
msgid "Summary"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:312 tortoisehg\hgtk\logview\treeview.py:464
+msgstr "Récapitulatif"
+
+#: tortoisehg\hgtk\history.py:667 tortoisehg\hgtk\logview\treeview.py:517
msgid "Local Date"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:313
+msgstr "Date Locale"
+
+#: tortoisehg\hgtk\history.py:668
msgid "UTC Date"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:314 tortoisehg\hgtk\logview\treeview.py:488
+msgstr "Date UTC"
+
+#: tortoisehg\hgtk\history.py:669 tortoisehg\hgtk\logview\treeview.py:541
msgid "Age"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:315 tortoisehg\hgtk\logview\treeview.py:500
-msgid "Tags"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:383
+msgstr "Age"
+
+#: tortoisehg\hgtk\history.py:739
msgid "Invalid revision range"
msgstr ""
-#: tortoisehg\hgtk\history.py:395
+#: tortoisehg\hgtk\history.py:746
msgid "Invalid date specification"
msgstr "Date spécifiée invalide"
-#: tortoisehg\hgtk\history.py:638
+#: tortoisehg\hgtk\history.py:801
+msgid "'%s' filter:"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1084
msgid "Filter"
msgstr ""
-#: tortoisehg\hgtk\history.py:643
+#: tortoisehg\hgtk\history.py:1089
msgid "%s branch"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:644
+msgstr "branche %s"
+
+#: tortoisehg\hgtk\history.py:1090
msgid "Branch '%s'"
msgstr ""
-#: tortoisehg\hgtk\history.py:650
+#: tortoisehg\hgtk\history.py:1096
msgid "file history: "
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:654
-msgid "custom filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:662
+msgstr "historique du fichier : "
+
+#: tortoisehg\hgtk\history.py:1110
msgid "merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:665
+msgstr "fusions"
+
+#: tortoisehg\hgtk\history.py:1113
msgid "only Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:667
+#: tortoisehg\hgtk\history.py:1115
msgid "revision ancestry"
msgstr ""
-#: tortoisehg\hgtk\history.py:672
+#: tortoisehg\hgtk\history.py:1120
msgid "Ancestry of %s"
msgstr ""
-#: tortoisehg\hgtk\history.py:674
+#: tortoisehg\hgtk\history.py:1122
msgid "tagged revisions"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:682
+msgstr "révisions marquées"
+
+#: tortoisehg\hgtk\history.py:1130
msgid "Tagged Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:684
+#: tortoisehg\hgtk\history.py:1132
msgid "working parents"
msgstr ""
-#: tortoisehg\hgtk\history.py:690
+#: tortoisehg\hgtk\history.py:1138
msgid "heads"
msgstr ""
-#: tortoisehg\hgtk\history.py:694 tortoisehg\hgtk\history.py:1018
-msgid "Heads"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:696
+#: tortoisehg\hgtk\history.py:1144
msgid "no Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:714
+#: tortoisehg\hgtk\history.py:1163
+msgid "Current patch: %s, "
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1165
+msgid "%(count)d of %(total)d applied patches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1177
msgid "Visualize Change"
msgstr ""
-#: tortoisehg\hgtk\history.py:715
-msgid "Di_splay Change"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:716
-msgid "Diff to local"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:718
-msgid "_Copy hash"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:722
-msgid "Pull to here"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:729
-msgid "Push to here"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:731
+#: tortoisehg\hgtk\history.py:1180
+msgid "Diff to Local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1182
+msgid "_Copy Hash"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1186
+msgid "Pull to Here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1194
+msgid "Push to Here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1196
msgid "_Update..."
msgstr ""
-#: tortoisehg\hgtk\history.py:732 tortoisehg\hgtk\history.py:817
+#: tortoisehg\hgtk\history.py:1197 tortoisehg\hgtk\history.py:1316
msgid "_Merge with..."
msgstr ""
-#: tortoisehg\hgtk\history.py:735
+#: tortoisehg\hgtk\history.py:1198
+msgid "Backout..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1199 tortoisehg\hgtk\status.py:1648
+msgid "_Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1201
+msgid "Export"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1203
+msgid "Tag"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1222
+msgid "Mercurial Queues"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1227
+msgid "Transp_lant to Local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1231
+msgid "Bisect"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1239
msgid "_Export Patch..."
msgstr ""
-#: tortoisehg\hgtk\history.py:736
+#: tortoisehg\hgtk\history.py:1240
msgid "E_mail Patch..."
msgstr ""
-#: tortoisehg\hgtk\history.py:737
+#: tortoisehg\hgtk\history.py:1241
msgid "_Bundle rev:tip..."
msgstr ""
-#: tortoisehg\hgtk\history.py:739
+#: tortoisehg\hgtk\history.py:1243
+msgid "_Archive..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1248
msgid "Add/Remove _Tag..."
msgstr ""
-#: tortoisehg\hgtk\history.py:740
-msgid "Backout Revision..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:742 tortoisehg\hgtk\status.py:1514
-msgid "_Revert"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:743
-msgid "_Archive..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:761
-msgid "Transp_lant to local"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:766
-msgid "QImport Revision"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:767
+#: tortoisehg\hgtk\history.py:1250
+msgid "Add/Move/Remove B_ookmark..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1251
+msgid "Rename Bookmark..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1254
+msgid "Set Current Bookmark..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1260
+msgid "Import Revision to MQ"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1262
msgid "Strip Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:800
+#: tortoisehg\hgtk\history.py:1285
+msgid "Reset"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1286
+msgid "Mark as Good"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1287
+msgid "Mark as Bad"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1288
+msgid "Skip Testing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1299
msgid "_Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:801
+#: tortoisehg\hgtk\history.py:1300
msgid "Visual Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:810
+#: tortoisehg\hgtk\history.py:1309
msgid "Email from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:812
+#: tortoisehg\hgtk\history.py:1311
msgid "Bundle from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:814
+#: tortoisehg\hgtk\history.py:1313
msgid "Export Patches from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:833
+#: tortoisehg\hgtk\history.py:1331
msgid "Transplant Revision range to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:838
+#: tortoisehg\hgtk\history.py:1336
msgid "Rebase on top of selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:843
-msgid "QImport from here to selected"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:847
+#: tortoisehg\hgtk\history.py:1341
+msgid "Import from here to selected to MQ"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1345
msgid "Select common ancestor revision"
msgstr ""
-#: tortoisehg\hgtk\history.py:878
+#: tortoisehg\hgtk\history.py:1399
msgid "Load more"
msgstr ""
-#: tortoisehg\hgtk\history.py:878
+#: tortoisehg\hgtk\history.py:1399
msgid "load more revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:881
+#: tortoisehg\hgtk\history.py:1402
msgid "Load all"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:881
+msgstr "Tout charger"
+
+#: tortoisehg\hgtk\history.py:1402
msgid "load all revisions"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:923
+msgstr "charger toutes les révisions"
+
+#: tortoisehg\hgtk\history.py:1447
msgid "Download and view incoming changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:925
+#: tortoisehg\hgtk\history.py:1449
msgid "Accept changes from Bundle preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:927
+#: tortoisehg\hgtk\history.py:1452
msgid "Reject changes from Bundle preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:929
+#: tortoisehg\hgtk\history.py:1455
msgid "Pull incoming changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:932
+#: tortoisehg\hgtk\history.py:1457
+msgid "Import patches"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1460
msgid "Determine and mark outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:934
+#: tortoisehg\hgtk\history.py:1462
msgid "Push outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:936
+#: tortoisehg\hgtk\history.py:1464
msgid "Email outgoing changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:959
+msgstr "Envoyer par courrier électronique les changements sortants"
+
+#: tortoisehg\hgtk\history.py:1467
+msgid "Stop current transaction"
+msgstr "Arrêter la transaction courrante"
+
+#: tortoisehg\hgtk\history.py:1499
msgid "After Pull:"
msgstr ""
-#: tortoisehg\hgtk\history.py:960 tortoisehg\hgtk\synch.py:154
+#: tortoisehg\hgtk\history.py:1500 tortoisehg\hgtk\synch.py:154
msgid "Nothing"
msgstr "Rien"
-#: tortoisehg\hgtk\history.py:960 tortoisehg\hgtk\synch.py:154
-#: tortoisehg\hgtk\update.py:44
+#: tortoisehg\hgtk\history.py:1500 tortoisehg\hgtk\synch.py:154
+#: tortoisehg\hgtk\update.py:128
msgid "Update"
msgstr "Mise à jour"
-#: tortoisehg\hgtk\history.py:963 tortoisehg\hgtk\synch.py:157
+#: tortoisehg\hgtk\history.py:1503 tortoisehg\hgtk\synch.py:157
msgid "Fetch"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:965 tortoisehg\hgtk\synch.py:159
+msgstr "Récupérer"
+
+#: tortoisehg\hgtk\history.py:1505 tortoisehg\hgtk\synch.py:159
msgid "Rebase"
msgstr ""
-#: tortoisehg\hgtk\history.py:984
+#: tortoisehg\hgtk\history.py:1524
msgid "Configure aliases and after pull behavior"
msgstr ""
-#: tortoisehg\hgtk\history.py:1000
-msgid "All"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1005
-msgid "Tagged"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1009
-msgid "Ancestry"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1022
-msgid "Merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1026
-msgid "Hide Merges"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1033
-msgid "Branch Filter"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1039
-msgid "Branches..."
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1049
-msgid "Custom Filter"
-msgstr "Filtre utilisateur"
-
-#: tortoisehg\hgtk\history.py:1054
-msgid "File Patterns"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1054
-msgid "Rev Range"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1055
-msgid "Date"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1055
-msgid "Keywords"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1199 tortoisehg\hgtk\history.py:1312
-#: tortoisehg\hgtk\history.py:1334 tortoisehg\hgtk\history.py:1378
-#: tortoisehg\hgtk\history.py:1760
+#: tortoisehg\hgtk\history.py:1669
+msgid "Applying bundle..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1670
+msgid "Applying bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1715 tortoisehg\hgtk\history.py:1854
+#: tortoisehg\hgtk\history.py:1887 tortoisehg\hgtk\history.py:2487
msgid "No remote path specified"
msgstr ""
-#: tortoisehg\hgtk\history.py:1200 tortoisehg\hgtk\history.py:1313
-#: tortoisehg\hgtk\history.py:1335 tortoisehg\hgtk\history.py:1379
-#: tortoisehg\hgtk\history.py:1761
+#: tortoisehg\hgtk\history.py:1716 tortoisehg\hgtk\history.py:1855
+#: tortoisehg\hgtk\history.py:1888 tortoisehg\hgtk\history.py:2488
msgid "Please enter or select a remote path"
msgstr ""
-#: tortoisehg\hgtk\history.py:1235
+#: tortoisehg\hgtk\history.py:1740
+msgid "%d incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1742
+msgid "Aborted incoming"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1744
+msgid "No incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1748
+msgid "Checking incoming changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1767
msgid "Accept incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1236
+#: tortoisehg\hgtk\history.py:1768
msgid "Accept"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1241
+msgstr "Accepter"
+
+#: tortoisehg\hgtk\history.py:1773
msgid "Reject incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1242
+#: tortoisehg\hgtk\history.py:1774
msgid "Reject"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1283
+msgstr "Rejeter"
+
+#: tortoisehg\hgtk\history.py:1816
msgid "Bundle Preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:1288
+#: tortoisehg\hgtk\history.py:1821
+msgid "Failed to preview, a bundle file unrelated to this repository"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1826
+msgid "Failed to preview, not a Mercurial bundle file"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1830
msgid "Open Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:1359
+#: tortoisehg\hgtk\history.py:1868
+msgid "Finished pull with rebase"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1871
+msgid "Finished pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1873
+msgid "No changesets to pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1875 tortoisehg\hgtk\history.py:2577
+msgid "Aborted pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1878
+msgid "Pulling changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1911
msgid "%d outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1365 tortoisehg\hgtk\synch.py:494
+#: tortoisehg\hgtk\history.py:1913
+msgid "Aborted outgoing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1915
+msgid "No outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1918
+msgid "Checking outgoing changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1927 tortoisehg\hgtk\synch.py:495
msgid "No repository selected"
msgstr "Aucun dépôt sélectionné"
-#: tortoisehg\hgtk\history.py:1366 tortoisehg\hgtk\synch.py:495
+#: tortoisehg\hgtk\history.py:1928 tortoisehg\hgtk\synch.py:496
msgid "Select a peer repository to compare with"
msgstr ""
-#: tortoisehg\hgtk\history.py:1387
+#: tortoisehg\hgtk\history.py:1951
+msgid "Finished push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1953 tortoisehg\hgtk\history.py:2549
+msgid "Aborted push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1956
+msgid "Pushing changesets..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2068
+msgid "unknown dnd dest: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2185
+msgid "Confirm Revert All Files"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2186
+msgid ""
+"Revert all files to revision %d?\n"
+"This will overwrite your local changes"
+msgstr "Rétablir tous les fichiers de la révision %d ?"
+
+#: tortoisehg\hgtk\history.py:2236
+msgid "Save patches to"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2272
+msgid "Write bundle to"
+msgstr "Écrire le paquet sous"
+
+#: tortoisehg\hgtk\history.py:2285
+msgid "Bundling from %(base)s to %(rev)s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2287
+msgid "Bundling from %(base)s to tip..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2292
+msgid "Finish bundling"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2294
+msgid "Aborted bundling"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2296
+msgid "Failed to bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2298
+msgid "Bundling"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2321
+msgid "Finish importing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2323
+msgid "Aborted importing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2325 tortoisehg\hgtk\thgimport.py:184
+msgid "Failed to import"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2327
+msgid "Importing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2328
+msgid "Importing to Patch Queue..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2336
+msgid "Confirm Rebase Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2337
+msgid "Rebase revision %d on top of %d?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2496
msgid "Confirm Forced Push to Remote Repository"
msgstr ""
-#: tortoisehg\hgtk\history.py:1388
+#: tortoisehg\hgtk\history.py:2497
msgid ""
"Forced push to remote repository\n"
"%s\n"
"(creating new heads in remote if needed)?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1390 tortoisehg\hgtk\history.py:1400
+#: tortoisehg\hgtk\history.py:2499 tortoisehg\hgtk\history.py:2509
msgid "Forced &Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1392
+#: tortoisehg\hgtk\history.py:2501
msgid "Confirm Push to remote Repository"
msgstr ""
-#: tortoisehg\hgtk\history.py:1393
+#: tortoisehg\hgtk\history.py:2502
msgid ""
"Push to remote repository\n"
"%s\n"
"?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1394
+#: tortoisehg\hgtk\history.py:2503
msgid "&Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1397
+#: tortoisehg\hgtk\history.py:2506
msgid "Confirm Forced Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:1398
+#: tortoisehg\hgtk\history.py:2507
msgid ""
"Forced push to repository\n"
"%s\n"
"(creating new heads if needed)?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1571
-msgid "Confirm Revert All Files"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1572
-msgid ""
-"Revert all files to revision %d?\n"
-"This will overwrite your local changes"
-msgstr "Rétablir tous les fichiers de la révision %d ?"
-
-#: tortoisehg\hgtk\history.py:1625
-msgid "Save patches to"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1648 tortoisehg\hgtk\history.py:1823
-msgid "Write bundle to"
-msgstr "Écrire le paquet sous"
-
-#: tortoisehg\hgtk\history.py:1683
-msgid "Confirm Rebase Revision"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1684
-msgid "Rebase revision %d on top of %d?"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:1802 tortoisehg\hgtk\status.py:1198
+#: tortoisehg\hgtk\history.py:2547
+msgid "Finished push to revision %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2552
+msgid "Pushing changesets to revision %s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2553
+msgid "Push to %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2575
+msgid "Finished pull to revision %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2580
+msgid "Pulling changesets to revision %s..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2581
+msgid "Pull to %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:2594 tortoisehg\hgtk\status.py:1300
msgid "Save patch to"
msgstr "Sauvegarder le patch sous"
-#: tortoisehg\hgtk\logview\treeview.py:258
+#: tortoisehg\hgtk\logview\treeview.py:269
msgid "%(count)d of %(total)d Revisions"
msgstr ""
-#: tortoisehg\hgtk\logview\treeview.py:371
+#: tortoisehg\hgtk\logview\treeview.py:377
+msgid "Changeset not found in current view"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:382
+msgid "Null changeset is not viewable"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:402
msgid "Repository is empty"
-msgstr ""
-
-#: tortoisehg\hgtk\logview\treeview.py:417
+msgstr "Le répertoire est vide"
+
+#: tortoisehg\hgtk\logview\treeview.py:448
msgid "ID"
-msgstr ""
-
-#: tortoisehg\hgtk\logview\treeview.py:429
-msgid "Branch"
-msgstr "Branche"
-
-#: tortoisehg\hgtk\logview\treeview.py:476
+msgstr "ID"
+
+#: tortoisehg\hgtk\logview\treeview.py:460
+msgid "Rev/ID"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:529
msgid "Universal Date"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:44
+msgstr "Date Universelle"
+
+#: tortoisehg\hgtk\merge.py:36
msgid "Merging in %s"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:50 tortoisehg\hgtk\merge.py:63
+msgstr "Fusion dans %s"
+
+#: tortoisehg\hgtk\merge.py:47 tortoisehg\hgtk\merge.py:60
msgid "Unable to merge"
msgstr "Impossible de fusionner"
-#: tortoisehg\hgtk\merge.py:51
+#: tortoisehg\hgtk\merge.py:48
msgid "Must supply a target revision"
msgstr "Vous devez fournir un révision destinataire"
-#: tortoisehg\hgtk\merge.py:64
+#: tortoisehg\hgtk\merge.py:61
msgid "Outstanding uncommitted changes"
msgstr ""
-#: tortoisehg\hgtk\merge.py:76
+#: tortoisehg\hgtk\merge.py:73
msgid "Not a head revision!"
msgstr ""
-#: tortoisehg\hgtk\merge.py:82
+#: tortoisehg\hgtk\merge.py:79
msgid "Merge target (other)"
msgstr "Destination de fusion (autre)"
-#: tortoisehg\hgtk\merge.py:87
+#: tortoisehg\hgtk\merge.py:84
+msgid "Discard all changes from merge target (other) revision"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:89
msgid "Current revision (local)"
msgstr "Révision courante (locale)"
-#: tortoisehg\hgtk\merge.py:93
+#: tortoisehg\hgtk\merge.py:100
+msgid "Merge tools:"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:129
msgid "Merge"
msgstr "Fusionner"
-#: tortoisehg\hgtk\merge.py:95
+#: tortoisehg\hgtk\merge.py:131
msgid "Undo"
msgstr "Annuler"
-#: tortoisehg\hgtk\merge.py:104
-msgid "Merge tools:"
+#: tortoisehg\hgtk\merge.py:159
+msgid "Merged successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:161
+msgid "Canceled merging"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:163
+msgid "Failed to merge"
msgstr ""
#: tortoisehg\hgtk\merge.py:170
+msgid "Undo successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:172
+msgid "Canceled undo"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:174
+msgid "Failed to undo"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:191
msgid ""
"To complete merging, you need to commit merged files in working directory.\n"
"\n"
"Do you want to exit?"
msgstr ""
-#: tortoisehg\hgtk\merge.py:227
-msgid "Merged successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:229
-msgid "Canceled merging"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:231
-msgid "Failed to merge"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:262
+#: tortoisehg\hgtk\merge.py:204
+msgid "Cannot merge"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:205
+msgid "Uncommitted local changes"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:240
msgid "Confirm undo merge"
msgstr "Confirmer l'annulation de la fusion"
-#: tortoisehg\hgtk\merge.py:263
+#: tortoisehg\hgtk\merge.py:241
msgid "Clean checkout of original revision?"
msgstr "Rétablir la révision d'origine"
-#: tortoisehg\hgtk\merge.py:273
-msgid "Undo successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:275
-msgid "Canceled undo"
-msgstr ""
-
-#: tortoisehg\hgtk\merge.py:277
-msgid "Failed to undo"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:50
+#: tortoisehg\hgtk\p4pending.py:30
+msgid "Pending Perforce Changelists - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:43
+msgid "Changelist:"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:66
+msgid "Submit"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:67 tortoisehg\hgtk\quickop.py:21
+msgid "Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:98
+msgid "Finished"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:100 tortoisehg\hgtk\quickop.py:207
+#: tortoisehg\hgtk\thgmq.py:867
+msgid "Canceled"
+msgstr ""
+
+#: tortoisehg\hgtk\p4pending.py:102 tortoisehg\hgtk\quickop.py:209
+#: tortoisehg\hgtk\thgmq.py:869
+msgid "Failed"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:19
msgid "Select files to add"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:51
+#: tortoisehg\hgtk\quickop.py:20
msgid "Forget"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:51
+#: tortoisehg\hgtk\quickop.py:20
msgid "Select files to forget"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:52
-msgid "Revert"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:52
+#: tortoisehg\hgtk\quickop.py:21
msgid "Select files to revert"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:53
+#: tortoisehg\hgtk\quickop.py:22
msgid "Select files to remove"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:53 tortoisehg\hgtk\tagadd.py:40
-msgid "Remove"
-msgstr "Supprimer"
-
-#: tortoisehg\hgtk\quickop.py:100 tortoisehg\hgtk\status.py:138
-msgid "status"
-msgstr "status"
-
-#: tortoisehg\hgtk\quickop.py:103 tortoisehg\hgtk\status.py:271
-msgid "path"
-msgstr "chemin"
-
-#: tortoisehg\hgtk\quickop.py:116
+#: tortoisehg\hgtk\quickop.py:121
msgid "Toggle all selections"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:141
+#: tortoisehg\hgtk\quickop.py:127
+msgid "Do not save backup files (*.orig)"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:148
+msgid "Unable to determine repository status"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:157
msgid "modified"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:144
+msgstr "modifié(es)"
+
+#: tortoisehg\hgtk\quickop.py:160
msgid "added"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:147
+msgstr "ajouté(es)"
+
+#: tortoisehg\hgtk\quickop.py:163
msgid "removed"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:150
+msgstr "supprimé(es)"
+
+#: tortoisehg\hgtk\quickop.py:166
msgid "missing"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:153 tortoisehg\hgtk\quickop.py:236
-#: tortoisehg\hgtk\serve.py:123 tortoisehg\util\shlib.py:26
-#: tortoisehg\util\version.py:15
+msgstr "manquant(es)"
+
+#: tortoisehg\hgtk\quickop.py:169 tortoisehg\hgtk\quickop.py:219
+#: tortoisehg\hgtk\serve.py:127 tortoisehg\util\version.py:47
+#: tortoisehg\util\version.py:73
msgid "unknown"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:157 tortoisehg\hgtk\quickop.py:236
+msgstr "Inconnu(es)"
+
+#: tortoisehg\hgtk\quickop.py:173 tortoisehg\hgtk\quickop.py:219
msgid "ignored"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:161
+msgstr "ignoré(es)"
+
+#: tortoisehg\hgtk\quickop.py:177
msgid "clean"
msgstr "nettoyer"
-#: tortoisehg\hgtk\quickop.py:164
+#: tortoisehg\hgtk\quickop.py:180
msgid "No appropriate files"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:165
+#: tortoisehg\hgtk\quickop.py:181
msgid "No files found for this operation"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:242
+msgstr "Aucun fichier trouvé pour cette opération"
+
+#: tortoisehg\hgtk\quickop.py:205
+msgid "Successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:225
msgid "No files selected"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:243
+msgstr "Aucun fichier sélectionné"
+
+#: tortoisehg\hgtk\quickop.py:226
msgid "No operation to perform"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:264
-msgid "Successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:266 tortoisehg\hgtk\thgmq.py:644
-msgid "Canceled"
-msgstr ""
-
-#: tortoisehg\hgtk\quickop.py:268 tortoisehg\hgtk\thgmq.py:646
-msgid "Failed"
-msgstr ""
+msgstr "Aucune opération à exécuter"
#: tortoisehg\hgtk\recovery.py:40
msgid "%s - recovery"
@@ -2721,7 +3376,7 @@
#: tortoisehg\hgtk\recovery.py:50
msgid "Clean"
-msgstr ""
+msgstr "Nettoyer"
#: tortoisehg\hgtk\recovery.py:52
msgid "Clean checkout, undo all changes"
@@ -2729,7 +3384,7 @@
#: tortoisehg\hgtk\recovery.py:55
msgid "Rollback"
-msgstr ""
+msgstr "Retour à l'état antérieur"
#: tortoisehg\hgtk\recovery.py:57
msgid "Rollback (undo) last transaction to repository (pull, commit, etc)"
@@ -2745,524 +3400,612 @@
#: tortoisehg\hgtk\recovery.py:66
msgid "Verify"
-msgstr ""
+msgstr "Vérifier"
#: tortoisehg\hgtk\recovery.py:68
msgid "Validate repository consistency"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:102 tortoisehg\hgtk\synch.py:393
+msgstr "Valider la cohérence du référentiel"
+
+#: tortoisehg\hgtk\recovery.py:103 tortoisehg\hgtk\synch.py:394
msgid "Cannot close now"
msgstr "Ne peut actuellement pas être fermé"
-#: tortoisehg\hgtk\recovery.py:103 tortoisehg\hgtk\synch.py:394
+#: tortoisehg\hgtk\recovery.py:104 tortoisehg\hgtk\synch.py:395
msgid "command is running"
msgstr "commande en cours"
-#: tortoisehg\hgtk\recovery.py:122
+#: tortoisehg\hgtk\recovery.py:123
msgid "Confirm clean repository"
msgstr "Confirmer le nettoyer du dépôt"
-#: tortoisehg\hgtk\recovery.py:123
+#: tortoisehg\hgtk\recovery.py:124
msgid "Clean repository '%s' ?"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:135
+msgstr "Nettoyer le référentiel '%s' ?"
+
+#: tortoisehg\hgtk\recovery.py:136
msgid "Confirm rollback repository"
msgstr ""
-#: tortoisehg\hgtk\recovery.py:136
+#: tortoisehg\hgtk\recovery.py:137
msgid "Rollback repository '%s' ?"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:157 tortoisehg\hgtk\synch.py:536
-msgid "Cannot run now"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:158 tortoisehg\hgtk\synch.py:537
+msgstr "Retour à l'état antérieur du référentiel '%s' ?"
+
+#: tortoisehg\hgtk\recovery.py:162 tortoisehg\hgtk\synch.py:541
msgid "Please try again after the previous command is completed"
-msgstr ""
-
-#: tortoisehg\hgtk\recovery.py:220 tortoisehg\hgtk\synch.py:627
+msgstr "Merci de réessayer après la fin de la commande précédente"
+
+#: tortoisehg\hgtk\recovery.py:224 tortoisehg\hgtk\synch.py:631
msgid "[command interrupted]"
-msgstr ""
+msgstr "[commande interrompue]"
#: tortoisehg\hgtk\rename.py:38
msgid "Rename "
-msgstr ""
+msgstr "Renommer "
#: tortoisehg\hgtk\rename.py:76 tortoisehg\hgtk\rename.py:83
msgid "rename error"
-msgstr ""
-
-#: tortoisehg\hgtk\serve.py:58
+msgstr "erreur de renommage"
+
+#: tortoisehg\hgtk\serve.py:61
msgid "Start"
msgstr "Démarrer"
-#: tortoisehg\hgtk\serve.py:60
+#: tortoisehg\hgtk\serve.py:63
msgid "Start server"
msgstr "Lancer le serveur"
-#: tortoisehg\hgtk\serve.py:64
+#: tortoisehg\hgtk\serve.py:67
msgid "Stop server"
msgstr "Arrêter le serveur"
-#: tortoisehg\hgtk\serve.py:66
+#: tortoisehg\hgtk\serve.py:69
msgid "Browse"
msgstr "Naviguer"
-#: tortoisehg\hgtk\serve.py:68
+#: tortoisehg\hgtk\serve.py:71
msgid "Launch browser to view repository"
-msgstr ""
-
-#: tortoisehg\hgtk\serve.py:72
+msgstr "Voir le référentiel dans le navigateur"
+
+#: tortoisehg\hgtk\serve.py:75
msgid "Configure web settings"
msgstr "Configurer les paramètres internet"
-#: tortoisehg\hgtk\serve.py:93
+#: tortoisehg\hgtk\serve.py:96
msgid "HTTP Port:"
msgstr "Port HTTP :"
-#: tortoisehg\hgtk\serve.py:124
+#: tortoisehg\hgtk\serve.py:128
msgid "%s - serve"
msgstr ""
-#: tortoisehg\hgtk\serve.py:127
+#: tortoisehg\hgtk\serve.py:131
msgid "%s serve - %s"
msgstr ""
-#: tortoisehg\hgtk\serve.py:130
+#: tortoisehg\hgtk\serve.py:134
msgid " - serve"
msgstr ""
-#: tortoisehg\hgtk\serve.py:161
+#: tortoisehg\hgtk\serve.py:165
msgid "Confirm Really Exit?"
msgstr "Réellement confirmer la fermeture ?"
-#: tortoisehg\hgtk\serve.py:162
+#: tortoisehg\hgtk\serve.py:166
msgid ""
"Server process is still running\n"
"Exiting will stop the server."
msgstr ""
-#: tortoisehg\hgtk\serve.py:225
+#: tortoisehg\hgtk\serve.py:229
msgid "Abort: %s\n"
-msgstr ""
-
-#: tortoisehg\hgtk\serve.py:233
+msgstr "Abandon : %s\n"
+
+#: tortoisehg\hgtk\serve.py:237
msgid "Invalid port 2048..65535"
msgstr "Port invalide 2034..65535"
-#: tortoisehg\hgtk\serve.py:234
+#: tortoisehg\hgtk\serve.py:238
msgid "Defaulting to "
msgstr ""
-#: tortoisehg\hgtk\serve.py:313
+#: tortoisehg\hgtk\serve.py:317
msgid "cannot start server: "
msgstr "ne peut pas démarrer le serveur "
-#: tortoisehg\hgtk\serve.py:324
+#: tortoisehg\hgtk\serve.py:328
msgid "listening at http://%s%s/%s (%s:%d)\n"
msgstr "écoute sur http://%s%s/%s (%s:%d)\n"
-#: tortoisehg\hgtk\serve.py:349
+#: tortoisehg\hgtk\serve.py:353
msgid "name of access log file to write to"
msgstr "nom du fichier journal des accès à créer"
-#: tortoisehg\hgtk\serve.py:350
+#: tortoisehg\hgtk\serve.py:354
msgid "run server in background"
msgstr "démarrer le serveur en tache de fond"
-#: tortoisehg\hgtk\serve.py:351
+#: tortoisehg\hgtk\serve.py:355
msgid "used internally by daemon mode"
msgstr ""
-#: tortoisehg\hgtk\serve.py:352
+#: tortoisehg\hgtk\serve.py:356
msgid "name of error log file to write to"
msgstr "nom du fichier journal des erreurs à créer"
-#: tortoisehg\hgtk\serve.py:353
+#: tortoisehg\hgtk\serve.py:357
msgid "port to use (default: 8000)"
msgstr "port à utiliser (défaut : 8000)"
-#: tortoisehg\hgtk\serve.py:354
+#: tortoisehg\hgtk\serve.py:358
msgid "address to use"
msgstr "adresse à utiliser"
-#: tortoisehg\hgtk\serve.py:355
+#: tortoisehg\hgtk\serve.py:359
msgid "prefix path to serve from (default: server root)"
msgstr "chemin de base du serveur (défaut : racine du serveur)"
-#: tortoisehg\hgtk\serve.py:357
+#: tortoisehg\hgtk\serve.py:361
msgid "name to show in web pages (default: working dir)"
msgstr "nom à afficher dans les pages web (défaut : working dir)"
-#: tortoisehg\hgtk\serve.py:358
+#: tortoisehg\hgtk\serve.py:362
msgid "name of the webdir config file (serve more than one repo)"
msgstr "nom du fichier de config de webdir (servir plusieurs dépôts)"
-#: tortoisehg\hgtk\serve.py:360
+#: tortoisehg\hgtk\serve.py:364
msgid "name of file to write process ID to"
msgstr "nom du fichier où enregistrer les ID des processus"
-#: tortoisehg\hgtk\serve.py:361
+#: tortoisehg\hgtk\serve.py:365
msgid "for remote clients"
msgstr "pour les clients à distance"
-#: tortoisehg\hgtk\serve.py:362
+#: tortoisehg\hgtk\serve.py:366
msgid "web templates to use"
msgstr "thème web à utiliser"
-#: tortoisehg\hgtk\serve.py:363
+#: tortoisehg\hgtk\serve.py:367
msgid "template style to use"
msgstr "style à utiliser"
-#: tortoisehg\hgtk\serve.py:364
+#: tortoisehg\hgtk\serve.py:368
msgid "use IPv6 in addition to IPv4"
msgstr "utiliser l'IPv6 en plus de l'IPv4"
-#: tortoisehg\hgtk\serve.py:365
+#: tortoisehg\hgtk\serve.py:369
msgid "SSL certificate file"
msgstr "fichier de certification SSL"
-#: tortoisehg\hgtk\serve.py:366
+#: tortoisehg\hgtk\serve.py:370
msgid "hg serve [OPTION]..."
msgstr "hg serve [OPTION]..."
-#: tortoisehg\hgtk\status.py:138
+#: tortoisehg\hgtk\shellconf.py:25
+msgid "TortoiseHg Shell Configuration"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:27
+msgid "OK"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:28 tortoisehg\hgtk\thgshelve.py:157
+msgid "Cancel"
+msgstr "Annuler"
+
+#: tortoisehg\hgtk\shellconf.py:29
+msgid "Apply"
+msgstr "Appliquer"
+
+#: tortoisehg\hgtk\shellconf.py:38
+msgid "Overlays"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:45
+msgid "Enable overlays"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:47
+msgid "Local disks only"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:51
+msgid "Context Menu"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:67
+msgid "Sub menu items:"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:86
+msgid "Top menu items:"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:108
+msgid "<- Top"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:111
+msgid "Sub ->"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:116
+msgid "Taskbar"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:123
+msgid "Show Icon"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:125
+msgid "Highlight Icon"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:131
+msgid "Enable/Disable the overlay icons globally"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:134
+msgid "Only enable overlays on local disks"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:138
+msgid "Show the taskbar icon (restart needed)"
+msgstr ""
+
+#: tortoisehg\hgtk\shellconf.py:141
+msgid "Highlight the taskbar icon during activity"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:130
msgid "filtered status"
msgstr ""
-#: tortoisehg\hgtk\status.py:154
+#: tortoisehg\hgtk\status.py:146
msgid "Save As"
msgstr "Sauvegarder sous"
+#: tortoisehg\hgtk\status.py:147
+msgid "Save selected changes"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:152
+msgid "Visual diff checked files"
+msgstr ""
+
#: tortoisehg\hgtk\status.py:155
-msgid "Save selected changes"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:160
-msgid "Visual diff checked files"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:163
msgid "Revert checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:166
+#: tortoisehg\hgtk\status.py:158
msgid "Add checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:169
+#: tortoisehg\hgtk\status.py:161
msgid "Move checked files to other directory"
msgstr ""
-#: tortoisehg\hgtk\status.py:172
+#: tortoisehg\hgtk\status.py:164
msgid "Remove or delete checked files"
msgstr ""
-#: tortoisehg\hgtk\status.py:175
+#: tortoisehg\hgtk\status.py:167
msgid "Forget checked files on next commit"
msgstr ""
-#: tortoisehg\hgtk\status.py:179
+#: tortoisehg\hgtk\status.py:171
msgid "refresh"
msgstr "rafraîchir"
-#: tortoisehg\hgtk\status.py:255 tortoisehg\hgtk\thgmq.py:185
+#: tortoisehg\hgtk\status.py:302 tortoisehg\hgtk\thgmq.py:201
msgid "st"
msgstr "ier"
-#: tortoisehg\hgtk\status.py:263
+#: tortoisehg\hgtk\status.py:310
msgid "ms"
msgstr "ms"
-#: tortoisehg\hgtk\status.py:285
+#: tortoisehg\hgtk\status.py:332
msgid "View"
msgstr ""
-#: tortoisehg\hgtk\status.py:304
+#: tortoisehg\hgtk\status.py:355
msgid "Remove filter, show root"
msgstr ""
-#: tortoisehg\hgtk\status.py:330
+#: tortoisehg\hgtk\status.py:381
msgid "Text Diff"
msgstr ""
-#: tortoisehg\hgtk\status.py:383
+#: tortoisehg\hgtk\status.py:428
msgid "Hunk Selection"
msgstr ""
-#: tortoisehg\hgtk\status.py:456
+#: tortoisehg\hgtk\status.py:506
msgid "%d selected, %d total"
msgstr "%d sélectionné(s), %d au total"
-#: tortoisehg\hgtk\status.py:478
+#: tortoisehg\hgtk\status.py:528
msgid "Save Preview"
msgstr ""
-#: tortoisehg\hgtk\status.py:482
+#: tortoisehg\hgtk\status.py:532
msgid "Shelf Preview"
msgstr ""
-#: tortoisehg\hgtk\status.py:504
+#: tortoisehg\hgtk\status.py:554
msgid "?: unknown"
msgstr ""
-#: tortoisehg\hgtk\status.py:505
+#: tortoisehg\hgtk\status.py:555
msgid "M: modified"
msgstr ""
-#: tortoisehg\hgtk\status.py:506
+#: tortoisehg\hgtk\status.py:556
msgid "I: ignored"
msgstr ""
-#: tortoisehg\hgtk\status.py:507
+#: tortoisehg\hgtk\status.py:557
msgid "A: added"
msgstr ""
-#: tortoisehg\hgtk\status.py:508
+#: tortoisehg\hgtk\status.py:558
msgid "C: clean"
msgstr ""
-#: tortoisehg\hgtk\status.py:509
+#: tortoisehg\hgtk\status.py:559
msgid "R: removed"
msgstr ""
-#: tortoisehg\hgtk\status.py:510
+#: tortoisehg\hgtk\status.py:560
msgid "!: deleted"
msgstr ""
-#: tortoisehg\hgtk\status.py:804
+#: tortoisehg\hgtk\status.py:561
+msgid "S: subrepo"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:882
msgid "View '%s'"
msgstr ""
-#: tortoisehg\hgtk\status.py:849
+#: tortoisehg\hgtk\status.py:928
msgid "Rename file to:"
msgstr "Renommer le fichier sous :"
-#: tortoisehg\hgtk\status.py:858
+#: tortoisehg\hgtk\status.py:938
msgid "Copy file to"
msgstr "Copier le fichier sous"
-#: tortoisehg\hgtk\status.py:871 tortoisehg\hgtk\status.py:1336
+#: tortoisehg\hgtk\status.py:951 tortoisehg\hgtk\status.py:1438
msgid "Nothing Removed"
msgstr "Rien n'a été supprimé"
-#: tortoisehg\hgtk\status.py:872
+#: tortoisehg\hgtk\status.py:952
msgid "Remove is not enabled when multiple revisions are specified."
msgstr ""
-#: tortoisehg\hgtk\status.py:889
+#: tortoisehg\hgtk\status.py:969
msgid "Move is not enabled when multiple revisions are specified."
msgstr ""
-#: tortoisehg\hgtk\status.py:889 tortoisehg\hgtk\status.py:1354
-#: tortoisehg\hgtk\status.py:1362
+#: tortoisehg\hgtk\status.py:969 tortoisehg\hgtk\status.py:1456
+#: tortoisehg\hgtk\status.py:1464
msgid "Nothing Moved"
msgstr "Rien n'a été déplacé"
-#: tortoisehg\hgtk\status.py:907
+#: tortoisehg\hgtk\status.py:987
msgid "Copy is not enabled when multiple revisions are specified."
msgstr ""
-#: tortoisehg\hgtk\status.py:907
+#: tortoisehg\hgtk\status.py:987
msgid "Nothing Copied"
msgstr "Rien n'a été copié"
-#: tortoisehg\hgtk\status.py:967 tortoisehg\hgtk\status.py:1028
-msgid "===== Diff to first parent =====\n"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:972 tortoisehg\hgtk\status.py:1035
+#: tortoisehg\hgtk\status.py:1050 tortoisehg\hgtk\status.py:1124
+msgid "===== Diff to first parent %d:%s =====\n"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1054 tortoisehg\hgtk\status.py:1129
msgid ""
"\n"
-"===== Diff to second parent =====\n"
-msgstr ""
-
-#: tortoisehg\hgtk\status.py:1064
+"===== Diff to second parent %d:%s =====\n"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1160
msgid "File is larger than the specified max size.\n"
msgstr ""
-#: tortoisehg\hgtk\status.py:1065
+#: tortoisehg\hgtk\status.py:1161
msgid "Hunk selection is disabled for this file.\n"
msgstr ""
-#: tortoisehg\hgtk\status.py:1236
+#: tortoisehg\hgtk\status.py:1338
msgid "Nothing Diffed"
msgstr ""
-#: tortoisehg\hgtk\status.py:1237
+#: tortoisehg\hgtk\status.py:1339
msgid "No diffable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1245 tortoisehg\hgtk\status.py:1253
+#: tortoisehg\hgtk\status.py:1347 tortoisehg\hgtk\status.py:1355
msgid "Nothing Reverted"
msgstr ""
-#: tortoisehg\hgtk\status.py:1246
+#: tortoisehg\hgtk\status.py:1348
msgid "No revertable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1254
+#: tortoisehg\hgtk\status.py:1356
msgid "Revert not allowed when viewing revision range."
msgstr ""
-#: tortoisehg\hgtk\status.py:1272
+#: tortoisehg\hgtk\status.py:1374
msgid "Uncommited merge - please select a parent revision"
msgstr ""
-#: tortoisehg\hgtk\status.py:1273
+#: tortoisehg\hgtk\status.py:1375
msgid "Revert files to local or other parent?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1274
+#: tortoisehg\hgtk\status.py:1376
msgid "&Local"
msgstr ""
-#: tortoisehg\hgtk\status.py:1274
+#: tortoisehg\hgtk\status.py:1376
msgid "&Other"
msgstr ""
-#: tortoisehg\hgtk\status.py:1289
+#: tortoisehg\hgtk\status.py:1391
msgid "Confirm Revert"
msgstr ""
-#: tortoisehg\hgtk\status.py:1290
+#: tortoisehg\hgtk\status.py:1392
msgid ""
"Revert files to revision %s?\n"
"\n"
"%s"
msgstr ""
-#: tortoisehg\hgtk\status.py:1291
+#: tortoisehg\hgtk\status.py:1393
msgid "&Yes (backup changes)"
msgstr ""
-#: tortoisehg\hgtk\status.py:1292
+#: tortoisehg\hgtk\status.py:1394
msgid "Yes (&discard changes)"
msgstr ""
-#: tortoisehg\hgtk\status.py:1312
+#: tortoisehg\hgtk\status.py:1414
msgid "Nothing Added"
msgstr "Rien n'a été ajouté"
-#: tortoisehg\hgtk\status.py:1313
+#: tortoisehg\hgtk\status.py:1415
msgid "No addable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1337
+#: tortoisehg\hgtk\status.py:1439
msgid "No removable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1345
+#: tortoisehg\hgtk\status.py:1447
msgid "Move files to directory..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1355
+#: tortoisehg\hgtk\status.py:1457
msgid "Cannot move outside repo!"
msgstr ""
-#: tortoisehg\hgtk\status.py:1362
+#: tortoisehg\hgtk\status.py:1464
msgid ""
"No movable files selected\n"
"\n"
"Note: only clean files can be moved."
msgstr ""
-#: tortoisehg\hgtk\status.py:1371
+#: tortoisehg\hgtk\status.py:1473
msgid "Nothing Forgotten"
msgstr ""
-#: tortoisehg\hgtk\status.py:1372
+#: tortoisehg\hgtk\status.py:1474
msgid "No clean files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1375
+#: tortoisehg\hgtk\status.py:1477
msgid "Confirm Delete Unrevisioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1376
+#: tortoisehg\hgtk\status.py:1478
msgid "Delete the following unrevisioned files?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1389
+#: tortoisehg\hgtk\status.py:1491
msgid "Delete Errors"
msgstr "Supprimer les erreurs"
-#: tortoisehg\hgtk\status.py:1510
+#: tortoisehg\hgtk\status.py:1644
msgid "Edit"
msgstr ""
-#: tortoisehg\hgtk\status.py:1511
+#: tortoisehg\hgtk\status.py:1645
msgid "View missing"
msgstr ""
-#: tortoisehg\hgtk\status.py:1512
+#: tortoisehg\hgtk\status.py:1646
msgid "View other"
msgstr ""
-#: tortoisehg\hgtk\status.py:1516
+#: tortoisehg\hgtk\status.py:1650
msgid "L_og"
msgstr ""
-#: tortoisehg\hgtk\status.py:1520
+#: tortoisehg\hgtk\status.py:1654
msgid "_Guess Rename..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1521
+#: tortoisehg\hgtk\status.py:1655
msgid "_Ignore"
msgstr ""
-#: tortoisehg\hgtk\status.py:1522
+#: tortoisehg\hgtk\status.py:1656
msgid "Remove versioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1523
+#: tortoisehg\hgtk\status.py:1657
msgid "_Delete unversioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1526
+#: tortoisehg\hgtk\status.py:1660
msgid "_Copy..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1527
+#: tortoisehg\hgtk\status.py:1661
msgid "Rename..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1529
+#: tortoisehg\hgtk\status.py:1663
msgid "Restart Merge..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1530
+#: tortoisehg\hgtk\status.py:1664
msgid "Mark unresolved"
msgstr ""
-#: tortoisehg\hgtk\status.py:1531
+#: tortoisehg\hgtk\status.py:1665
msgid "Mark resolved"
msgstr ""
-#: tortoisehg\hgtk\status.py:1539
+#: tortoisehg\hgtk\status.py:1673
msgid "Restart merge with"
msgstr ""
-#: tortoisehg\hgtk\status.py:1583
+#: tortoisehg\hgtk\status.py:1716
msgid "not up to date"
msgstr ""
-#: tortoisehg\hgtk\status.py:1584
+#: tortoisehg\hgtk\status.py:1717
msgid ""
"The parents have changed since the last refresh.\n"
"Continue anyway?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1586
+#: tortoisehg\hgtk\status.py:1719
msgid "&Refresh"
msgstr ""
-#: tortoisehg\hgtk\statusbar.py:45
-msgid "Running"
-msgstr "En cours"
+#: tortoisehg\hgtk\statusbar.py:39
+msgid "Running..."
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:67
+msgid "unknown field name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:94
+msgid "invalid pack direction: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:103
+msgid "invalid alignment value: %s"
+msgstr ""
#: tortoisehg\hgtk\synch.py:51
msgid "%s - synchronize"
@@ -3288,7 +4031,7 @@msgid "Push local changes to selected repository"
msgstr ""
-#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:617
+#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:681
msgid "Email"
msgstr "Courriel"
@@ -3356,30 +4099,34 @@msgid "Show no merges"
msgstr ""
-#: tortoisehg\hgtk\synch.py:267
+#: tortoisehg\hgtk\synch.py:268
msgid "Update to branch tip"
msgstr ""
-#: tortoisehg\hgtk\synch.py:366
+#: tortoisehg\hgtk\synch.py:367
msgid "unknown sort key '%s'"
msgstr ""
-#: tortoisehg\hgtk\synch.py:376
+#: tortoisehg\hgtk\synch.py:377
msgid "Select Repository"
msgstr "Sélectionner le dépôt"
-#: tortoisehg\hgtk\synch.py:383
+#: tortoisehg\hgtk\synch.py:384
msgid "Select Bundle"
msgstr "Sélectionner le paquet"
-#: tortoisehg\hgtk\synch.py:385
+#: tortoisehg\hgtk\synch.py:386
msgid "Bundle (*.hg)"
msgstr "Paquet (*.hg)"
-#: tortoisehg\hgtk\synch.py:386
+#: tortoisehg\hgtk\synch.py:387
msgid "Bundle (*)"
msgstr "Paquet (*)"
+#: tortoisehg\hgtk\synch.py:671
+msgid "Toggle _Wordwrap"
+msgstr "Activer/déactiver le retour à la ligne"
+
#: tortoisehg\hgtk\tagadd.py:31
msgid "Tag - %s"
msgstr ""
@@ -3388,160 +4135,96 @@msgid "Tag:"
msgstr "Tag :"
-#: tortoisehg\hgtk\tagadd.py:74
+#: tortoisehg\hgtk\tagadd.py:77
msgid "Tag is local"
msgstr "Tag est local"
-#: tortoisehg\hgtk\tagadd.py:76
+#: tortoisehg\hgtk\tagadd.py:79
msgid "Replace existing tag"
msgstr "Remplacer le tag existant"
-#: tortoisehg\hgtk\tagadd.py:77
+#: tortoisehg\hgtk\tagadd.py:82
msgid "Use English commit message"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:83
+#: tortoisehg\hgtk\tagadd.py:88
msgid "Use custom commit message:"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:170
+#: tortoisehg\hgtk\tagadd.py:221
msgid "Tag input is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:171
+#: tortoisehg\hgtk\tagadd.py:222
msgid "Please enter tag name"
msgstr "Entrez le nom du tag"
-#: tortoisehg\hgtk\tagadd.py:175
+#: tortoisehg\hgtk\tagadd.py:226
msgid "Custom commit message is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:184 tortoisehg\hgtk\tagadd.py:216
+#: tortoisehg\hgtk\tagadd.py:235 tortoisehg\hgtk\tagadd.py:267
msgid "Tagging completed"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:185
+#: tortoisehg\hgtk\tagadd.py:236
msgid "Tag \"%s\" has been added"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:188 tortoisehg\hgtk\tagadd.py:191
-#: tortoisehg\hgtk\tagadd.py:220 tortoisehg\hgtk\tagadd.py:223
+#: tortoisehg\hgtk\tagadd.py:239 tortoisehg\hgtk\tagadd.py:242
+#: tortoisehg\hgtk\tagadd.py:271 tortoisehg\hgtk\tagadd.py:274
msgid "Error in tagging"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:204
+#: tortoisehg\hgtk\tagadd.py:255
msgid "Tag name is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:205
+#: tortoisehg\hgtk\tagadd.py:256
msgid "Please select tag name to remove"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:217
+#: tortoisehg\hgtk\tagadd.py:268
msgid "Tag \"%s\" has been removed"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:231
+#: tortoisehg\hgtk\tagadd.py:281
msgid "a tag named \"%s\" already exists"
msgstr "une étiquette du nom de \"%s\" existe déjà"
-#: tortoisehg\hgtk\tagadd.py:237
+#: tortoisehg\hgtk\tagadd.py:287
msgid "Added tag %s for changeset %s"
msgstr "Étiquette %s ajoutée pour le jeu de révisions %s"
-#: tortoisehg\hgtk\tagadd.py:241
+#: tortoisehg\hgtk\tagadd.py:291
msgid "Tag '%s' already exist"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:248
-msgid "Tag '%s' does not exist"
-msgstr ""
-
-#: tortoisehg\hgtk\tagadd.py:251
+#: tortoisehg\hgtk\tagadd.py:302
+msgid "tag '%s' does not exist"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:305
+msgid "tag '%s' is not a local tag"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:308
+msgid "tag '%s' is not a global tag"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:311
msgid "Removed tag %s"
msgstr "Étiquette %s enlevée"
-#: tortoisehg\hgtk\taskbarui.py:29
-msgid "TortoiseHg Taskbar"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:32
-msgid "OK"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:33 tortoisehg\hgtk\thgshelve.py:157
-msgid "Cancel"
-msgstr "Annuler"
-
-#: tortoisehg\hgtk\taskbarui.py:34
-msgid "Apply"
-msgstr "Appliquer"
-
-#: tortoisehg\hgtk\taskbarui.py:54
-msgid "Overlays"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:61
-msgid "Enable overlays"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:63
-msgid "Local disks only"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:67
-msgid "Context Menu"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:83
-msgid "Sub menu items:"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:102
-msgid "Top menu items:"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:124
-msgid "Top ->"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:127
-msgid "<- Sub"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:132
-msgid "Taskbar"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:139
-msgid "Highlight Icon"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:145
-msgid "Enable/Disable the overlay icons globally"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:148
-msgid "Only enable overlays on local disks"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:152
-msgid "Highlight the taskbar icon during activity"
-msgstr ""
-
-#: tortoisehg\hgtk\taskbarui.py:159
-msgid "Event Log"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:22
+#: tortoisehg\hgtk\thgconfig.py:21
msgid "<unspecified>"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:27
+msgid "Three-way Merge Tool"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:28
-msgid "Three-way Merge Tool"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:29
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 "
@@ -3551,220 +4234,203 @@"manual merging"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:34
+msgid "Visual Diff Tool"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:35
-msgid "Visual Diff Command"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:36
-msgid "Specify visual diff tool; must be an extdiff command"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:37
-msgid "Skip Diff Window"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:38
msgid ""
-"Bypass the builtin visual diff dialog and directly use your visual diff "
-"tool's directory diff feature. Only enable this feature if you know your "
-"diff tool has a valid extdiff configuration. Default: False"
+"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\hgtk\thgconfig.py:39
+msgid "Visual Editor"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:40
+msgid "Specify the visual editor used to view files, etc"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:41
+msgid "CLI Editor"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:42
-msgid "Visual Editor"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:43
-msgid "Specify the visual editor used to view files, etc"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:44
-msgid "CLI Editor"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:45
msgid ""
"The editor to use during a commit and other instances where Mercurial needs "
-"multiline input from the user. Only used by command line interface commands."
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:48
+"multiline input from the user. Used by command line commands, including "
+"patch import."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:45
msgid "Tab Width"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:46
+msgid ""
+"Specify the number of spaces that tabs expand to in various TortoiseHg "
+"windows. Default: Not expanded"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:49
-msgid ""
-"Specify the number of spaces that tabs expand to in various TortoiseHG "
-"windows. Default: Not expanded"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:52
msgid "Max Diff Size"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:53
+#: tortoisehg\hgtk\thgconfig.py:50
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\hgtk\thgconfig.py:56
+#: tortoisehg\hgtk\thgconfig.py:53
msgid "Bottom Diffs"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:57
+#: tortoisehg\hgtk\thgconfig.py:54
msgid ""
"Show the diff panel below the file list in status, shelve, and commit "
"dialogs. Default: False (show diffs to right of file list)"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:60
-msgid "Capture Stderr"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:61
+#: tortoisehg\hgtk\thgconfig.py:57
+msgid "Capture stderr"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:58
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:63
+#: tortoisehg\hgtk\thgconfig.py:60
msgid "Fork hgtk"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:64
+#: tortoisehg\hgtk\thgconfig.py:61
msgid ""
"When running hgtk from the command line, fork a background process to run "
"graphical dialogs. Default: True"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:66
-msgid "Full path title"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:67
+#: tortoisehg\hgtk\thgconfig.py:63
+msgid "Full Path Title"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:64
msgid ""
"Show a full directory path of the repository in the dialog title instead of "
"just the root directory name. Default: False"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:68
+msgid "Username"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:69
+msgid "Name associated with commits"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:70
+msgid "Summary Line Length"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:71
-msgid "Username"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:72
-msgid "Name associated with commits"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:73
-msgid "Summary Line Length"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:74
msgid ""
-"Maximum length of the commit message summary line. If set, TortoiseHG will "
+"Maximum length of the commit message summary line. If set, TortoiseHg will "
"issue a warning if the summary line is too long or not separated by a blank "
"line. Default: 0 (unenforced)"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:78
+#: tortoisehg\hgtk\thgconfig.py:75
msgid "Message Line Length"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:79
+#: tortoisehg\hgtk\thgconfig.py:76
msgid ""
"Word wrap length of the commit message. If set, the popup menu can be used "
"to format the message and a warning will be issued if any lines are too long "
"at commit. Default: 0 (unenforced)"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:84
+#: tortoisehg\hgtk\thgconfig.py:81
msgid "Push After Commit"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:85
+#: tortoisehg\hgtk\thgconfig.py:82
msgid ""
"Attempt to push to default push target after every successful commit. "
"Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:87
+#: tortoisehg\hgtk\thgconfig.py:84
msgid "Auto Commit List"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:88
+#: tortoisehg\hgtk\thgconfig.py:85
msgid ""
"Comma separated list of files that are automatically included in every "
"commit. Intended for use only as a repository setting. Default: None"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:91
+#: tortoisehg\hgtk\thgconfig.py:88
msgid "Auto Exclude List"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:92
+#: tortoisehg\hgtk\thgconfig.py:89
msgid ""
"Comma separated list of files that are automatically unchecked when the "
"status, commit, and shelve dialogs are opened. Default: None"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:98
+#: tortoisehg\hgtk\thgconfig.py:95
msgid "Author Coloring"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:99
+#: tortoisehg\hgtk\thgconfig.py:96
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\hgtk\thgconfig.py:103
+#: tortoisehg\hgtk\thgconfig.py:100
msgid "Long Summary"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:104
+#: tortoisehg\hgtk\thgconfig.py:101
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:107
+#: tortoisehg\hgtk\thgconfig.py:104
msgid "Log Batch Size"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:108
+#: tortoisehg\hgtk\thgconfig.py:105
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:111
-msgid "Copy Hash"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:112
-msgid ""
-"Allow the changelog viewer to copy the changeset hash of the currently "
-"selected changeset into the clipboard. DEPRECATED. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:115
+#: tortoisehg\hgtk\thgconfig.py:108
msgid "Dead Branches"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:116
+#: tortoisehg\hgtk\thgconfig.py:109
msgid ""
"Comma separated list of branch names that should be ignored when building a "
"list of branch names for a repository. Default: None"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:119
+#: tortoisehg\hgtk\thgconfig.py:112
msgid "Branch Colors"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:120
+#: tortoisehg\hgtk\thgconfig.py:113
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 (\\). "
@@ -3772,127 +4438,137 @@"be decoded to the @ character, and \\n to a linefeed. Default: None"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:126
+#: tortoisehg\hgtk\thgconfig.py:119
msgid "Hide Tags"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:127
+#: tortoisehg\hgtk\thgconfig.py:120
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"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:131
+#: tortoisehg\hgtk\thgconfig.py:124
msgid "Use Expander"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:132
+#: tortoisehg\hgtk\thgconfig.py:125
msgid "Show changeset details with an expander"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:136
-msgid "After pull operation"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:138
+#: tortoisehg\hgtk\thgconfig.py:126
+msgid "Toolbar Style"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:128
+msgid ""
+"Adjust the display of the main toolbar in the Repository Explorer. Values: "
+"small, large, or theme. Default: theme"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:133
+msgid "After Pull Operation"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:135
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\hgtk\thgconfig.py:143 tortoisehg\hgtk\thgmq.py:186
+#: tortoisehg\hgtk\thgconfig.py:140
msgid "Name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:144
+#: tortoisehg\hgtk\thgconfig.py:141
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:146 tortoisehg\hgtk\thgconfig.py:940
+#: tortoisehg\hgtk\thgconfig.py:143 tortoisehg\hgtk\thgconfig.py:690
msgid "Description"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:144
+msgid "Textual description of the repository's purpose or contents."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:146
+msgid "Contact"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:147
-msgid "Textual description of the repository's purpose or contents."
+msgid "Name or email address of the person in charge of the repository."
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:149
-msgid "Contact"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:150
-msgid "Name or email address of the person in charge of the repository."
+msgid "Style"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:151
+msgid "Which template map style to use"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:152
-msgid "Style"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:154
-msgid "Which template map style to use"
+msgid "Archive Formats"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:153
+msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:155
-msgid "Archive Formats"
+msgid "Port to listen on"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:155 tortoisehg\hgtk\thgconfig.py:298
+msgid "Port"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:156
-msgid "Comma separated list of archive formats allowed for downloading"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:158
-msgid "Port to listen on"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:158 tortoisehg\hgtk\thgconfig.py:275
-msgid "Port"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:159
msgid "Push Requires SSL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:160
+#: tortoisehg\hgtk\thgconfig.py:157
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:162
+#: tortoisehg\hgtk\thgconfig.py:159
msgid "Stripes"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:163
+#: tortoisehg\hgtk\thgconfig.py:160
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:162
+msgid "Max Files"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:163
+msgid "Maximum number of files to list per changeset."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:164
+msgid "Max Changes"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:165
-msgid "Max Files"
+msgid "Maximum number of changes to list on the changelog."
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:166
-msgid "Maximum number of files to list per changeset."
+msgid "Allow Push"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:167
-msgid "Max Changes"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:168
-msgid "Maximum number of changes to list on the changelog."
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:169
-msgid "Allow Push"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:170
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 "
@@ -3902,11 +4578,11 @@"examined after the deny_push list."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:177
+#: tortoisehg\hgtk\thgconfig.py:174
msgid "Deny Push"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:178
+#: tortoisehg\hgtk\thgconfig.py:175
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. "
@@ -3915,81 +4591,81 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:184
+#: tortoisehg\hgtk\thgconfig.py:181
msgid "Encoding"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:185
+#: tortoisehg\hgtk\thgconfig.py:182
msgid "Character encoding name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:188 tortoisehg\hgtk\thgconfig.py:276
+#: tortoisehg\hgtk\thgconfig.py:185 tortoisehg\hgtk\thgconfig.py:299
msgid "Host"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:186
+msgid ""
+"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:188
+msgid "Bypass List"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:189
msgid ""
-"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:191
-msgid "Bypass List"
+"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:192
-msgid ""
-"Optional. Comma-separated list of host names that should bypass the proxy"
+msgid "Optional. User name to authenticate with at the proxy server"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:194 tortoisehg\hgtk\thgconfig.py:300
+msgid "Password"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:195
-msgid "Optional. User name to authenticate with at the proxy server"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:197 tortoisehg\hgtk\thgconfig.py:277
-msgid "Password"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:198
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:199
+msgid "From"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:200
+msgid "Email address to use in the \"From\" header and for the SMTP envelope"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:201
+msgid "To"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:202
-msgid "From"
+msgid "Comma-separated list of recipient email addresses"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:203
-msgid "Email address to use in the \"From\" header and for the SMTP envelope"
+msgid "Cc"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:204
-msgid "To"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:205
-msgid "Comma-separated list of recipient email addresses"
+msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:206
-msgid "Cc"
+msgid "Bcc"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:207
-msgid "Comma-separated list of carbon copy recipient email addresses"
+msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:209
-msgid "Bcc"
+msgid "method"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:210
-msgid "Comma-separated list of blind carbon copy recipient email addresses"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:212
-msgid "method"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:213
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -3999,399 +4675,576 @@"messages."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:218
+#: tortoisehg\hgtk\thgconfig.py:215
msgid "Host name of mail server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:218
+#: tortoisehg\hgtk\thgconfig.py:215
msgid "SMTP Host"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:216
+msgid "SMTP Port"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:217
+msgid "Port to connect to on mail server. Default: 25"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:219
-msgid "SMTP Port"
+msgid "SMTP TLS"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:220
-msgid "Port to connect to on mail server. Default: 25"
+msgid "Connect to mail server using TLS. Default: False"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:222
-msgid "SMTP TLS"
+msgid "SMTP Username"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:223
-msgid "Connect to mail server using TLS. Default: False"
+msgid "Username to authenticate to mail server with"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:224
+msgid "SMTP Password"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:225
-msgid "SMTP Username"
+msgid "Password to authenticate to mail server with"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:226
-msgid "Username to authenticate to mail server with"
+msgid "Local Hostname"
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:227
-msgid "SMTP Password"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:228
-msgid "Password to authenticate to mail server with"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:229
-msgid "Local Hostname"
+msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
#: tortoisehg\hgtk\thgconfig.py:230
-msgid "Hostname the sender can use to identify itself to the mail server."
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:233
msgid "Patch EOL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:234
+#: tortoisehg\hgtk\thgconfig.py:231
msgid ""
"Normalize file line endings during and after patch to lf or crlf. Strict "
-"does no normalization. Default: strict"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:237
+"does no normalization. Auto does per-file detection, and is the recommended "
+"setting. Default: strict"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:235
msgid "Git Format"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:236
+msgid "Use git extended diff header format. Default: False"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:238
-msgid "Use git extended diff header format. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:240
msgid "No Dates"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:239
+msgid "Do not include modification dates in diff headers. Default: False"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:241
-msgid "Do not include modification dates in diff headers. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:243
msgid "Show Function"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:242
+msgid "Show which function each change is in. Default: False"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:244
-msgid "Show which function each change is in. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:246
msgid "Ignore White Space"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:245
+msgid "Ignore white space when comparing lines. Default: False"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:247
-msgid "Ignore white space when comparing lines. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:249
msgid "Ignore WS Amount"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:248
+msgid "Ignore changes in the amount of white space. Default: False"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:250
-msgid "Ignore changes in the amount of white space. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:252
msgid "Ignore Blank Lines"
msgstr ""
+#: tortoisehg\hgtk\thgconfig.py:251
+msgid "Ignore changes whose lines are all blank. Default: False"
+msgstr ""
+
#: tortoisehg\hgtk\thgconfig.py:253
-msgid "Ignore changes whose lines are all blank. Default: False"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:257
+msgid "Coloring Style"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:255
+msgid ""
+"Adjust the coloring style of diff lines in the changeset viewer. Default: "
+"foreground"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:259
+msgid "Commit Message"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:260
+msgid ""
+"Font used in changeset viewer and commit log text. Default: monospace 10"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:262
+msgid "Diff Text"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:263
+msgid "Font used for diffs in status and commit tools. Default: monospace 10"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:265
+msgid "File List"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:266
+msgid "Font used in file lists in status and commit tools. Default: sans 9"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:268
+msgid "Command Output"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:269
+msgid "Font used in command output window. Default: monospace 10"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:273
+msgid "Japanese on Windows"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:280
msgid "http"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:257
+#: tortoisehg\hgtk\thgconfig.py:280
msgid "ssh"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:258
+#: tortoisehg\hgtk\thgconfig.py:281
msgid "https"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:258
+#: tortoisehg\hgtk\thgconfig.py:281
msgid "local"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:267
+#: tortoisehg\hgtk\thgconfig.py:290
msgid "Edit remote repository path"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:275
+#: tortoisehg\hgtk\thgconfig.py:298
msgid "URL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:276
+#: tortoisehg\hgtk\thgconfig.py:299
msgid "Folder"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:278 tortoisehg\hgtk\thgconfig.py:893
+#: tortoisehg\hgtk\thgconfig.py:301 tortoisehg\hgtk\thgconfig.py:1022
msgid "Alias"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:310
+#: tortoisehg\hgtk\thgconfig.py:333
msgid "URL Details"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:321
+#: tortoisehg\hgtk\thgconfig.py:344
msgid "Type"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:451
+#: tortoisehg\hgtk\thgconfig.py:474
msgid "Select Local Folder"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:476
+#: tortoisehg\hgtk\thgconfig.py:499
msgid "Alias name is empty"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:477
+#: tortoisehg\hgtk\thgconfig.py:500
msgid "Please enter alias name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:482 tortoisehg\hgtk\thgconfig.py:833
+#: tortoisehg\hgtk\thgconfig.py:505 tortoisehg\hgtk\thgconfig.py:956
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:541
+#: tortoisehg\hgtk\thgconfig.py:568
msgid "No repository found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:542
+#: tortoisehg\hgtk\thgconfig.py:569
msgid "no repo at "
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:551
+#: tortoisehg\hgtk\thgconfig.py:578
msgid "Iniparse package not found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:552
-msgid ""
-"Please install iniparse package\n"
-"Settings are only shown, no changing is possible"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:563
+#: tortoisehg\hgtk\thgconfig.py:579
+msgid "Can't change settings without iniparse package - view is readonly."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:599
msgid "User global settings"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:565
+#: tortoisehg\hgtk\thgconfig.py:601
msgid "%s repository settings"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:570
-msgid "Edit File"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:593
+#: tortoisehg\hgtk\thgconfig.py:610
+msgid "Reload"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:668
msgid ""
"Default language for spell check. System language is used if not specified. "
"Examples: en, en_GB, en_US"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:604
-msgid "Changelog"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:607
-msgid "Sync"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:611
-msgid "Web"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:614
+#: tortoisehg\hgtk\thgconfig.py:679 tortoisehg\util\menuthg.py:58
+msgid "Web Server"
+msgstr "Serveur Web"
+
+#: tortoisehg\hgtk\thgconfig.py:680
msgid "Proxy"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:620
+#: tortoisehg\hgtk\thgconfig.py:682
msgid "Diff"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:633
-msgid "Unapplied changes"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:634
-msgid "Lose changes and switch files?."
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:653
+#: tortoisehg\hgtk\thgconfig.py:683
+msgid "Font"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:715
+msgid "Confirm Switch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:716
+msgid "Switch after saving changes?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:717
+msgid "&Save"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:717 tortoisehg\hgtk\update.py:233
+msgid "&Discard"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:734
msgid "TortoiseHg Configure Repository - "
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:657
+#: tortoisehg\hgtk\thgconfig.py:738
msgid "TortoiseHg Configure User-Global Settings"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:714
+#: tortoisehg\hgtk\thgconfig.py:798
+msgid "Confirm Reload"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:799
+msgid ""
+"Unsaved changes will be lost.\n"
+"Do you want to reload?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:823
msgid "Exit after saving changes?"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:715
+#: tortoisehg\hgtk\thgconfig.py:824
msgid "&No (discard changes)"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:808
+#: tortoisehg\hgtk\thgconfig.py:931
msgid "No Repository Found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:809
+#: tortoisehg\hgtk\thgconfig.py:932
msgid "Path testing cannot work without a repository"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:875
+#: tortoisehg\hgtk\thgconfig.py:1005
msgid "Remote repository paths"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:897
+#: tortoisehg\hgtk\thgconfig.py:1026
msgid "Repository Path"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:911
+#: tortoisehg\hgtk\thgconfig.py:1048
msgid "_Edit"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:921
+#: tortoisehg\hgtk\thgconfig.py:1058
msgid "_Test"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:926
+#: tortoisehg\hgtk\thgconfig.py:1063
msgid "Set as _default"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1012
+#: tortoisehg\hgtk\thgconfig.py:1075
+msgid "Theme default fonts"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1076
+msgid "Preset fonts:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1077
+msgid "Custom fonts:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1085
+msgid " - Select Preset -"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1195
msgid "Suggested"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1022
+#: tortoisehg\hgtk\thgconfig.py:1205
msgid "History"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1062
-msgid "# Generated by tortoisehg-config\n"
-msgstr ""
-
-#: tortoisehg\hgtk\thgconfig.py:1119
+#: tortoisehg\hgtk\thgconfig.py:1263
+msgid "Unable to create a Mercurial.ini file"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1264
+msgid "Insufficient access rights, reverting to read-onlymode."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1286
+msgid "Unable to parse a config file"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1287
+msgid ""
+"%s\n"
+"Reverting to read-only mode."
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:1332
msgid "Skipped saving path with no alias"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1147
+#: tortoisehg\hgtk\thgconfig.py:1360
msgid "Unable to write configuration file"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:95
+#: tortoisehg\hgtk\thgimport.py:44
+msgid "Import - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:76
+msgid "Browse Directory..."
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:78
+msgid "Import from Clipboard"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:82
+msgid "Source:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:101 tortoisehg\hgtk\thgstrip.py:76
+msgid "Preview:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:106
+msgid "Repository"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:160
+msgid "Import"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:180
+msgid "Imported successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:182
+msgid "Canceled importing"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:188
+msgid "Confirm Close"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:189
+msgid "Do you want to close?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:199
+msgid "Select Patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:210
+msgid "Select Directory contains patches:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:277
+msgid "%s patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:279
+msgid "%s will be imported to the"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:281
+msgid "%s will be imported to the repository"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:283
+msgid "Nothing to import"
+msgstr ""
+
+#: tortoisehg\hgtk\thgimport.py:341
+msgid "unexpected destination name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:102
msgid "Unapply all patches"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:100
+#: tortoisehg\hgtk\thgmq.py:107
msgid "Unapply last patch"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:106
+#: tortoisehg\hgtk\thgmq.py:112
msgid "Apply next patch"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:111
+#: tortoisehg\hgtk\thgmq.py:117
msgid "Apply all patches"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:184
+#: tortoisehg\hgtk\thgmq.py:200
msgid "#"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:268
-msgid "%(count)d of %(total)d Patches applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:272
-msgid "Patch '%s' applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:325
+#: tortoisehg\hgtk\thgmq.py:202
+msgid "Patch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:345
+msgid "Yes (&keep)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:348 tortoisehg\hgtk\thgmq.py:352
msgid "Confirm Delete"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:326
-msgid "Do you want to delete?"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:327
-msgid "Yes (&keep)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:409
+#: tortoisehg\hgtk\thgmq.py:349
+msgid "Do you want to delete '%(name)s'?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:353
+msgid "Do you want to delete these patches?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:442 tortoisehg\hgtk\thgmq.py:446
msgid "Confirm Fold"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:410
+#: tortoisehg\hgtk\thgmq.py:443
msgid ""
"Do you want to fold un-applied patch '%(target)s' into current patch "
"'%(qtip)s'?"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:567
-msgid "_goto"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:569
-msgid "_rename"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:571
-msgid "_finish applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:573
-msgid "_delete"
-msgstr "_supprimer"
-
-#: tortoisehg\hgtk\thgmq.py:574
-msgid "delete --keep"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:576
-msgid "f_old"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:578
-msgid "make it _next"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:612
-msgid "Show index"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:613
-msgid "Show status"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:614
-msgid "Show name"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:615
-msgid "Show summary"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:621
+#: tortoisehg\hgtk\thgmq.py:447
+msgid ""
+"Do you want to fold following un-applied patches into the current patch "
+"'%(qtip)s'?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:504
+msgid "invalid reorder operation: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:552
+msgid "series become inconsistent during reorder"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:745
+msgid "Top"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:747
+msgid "Up"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:749
+msgid "Down"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:751
+msgid "Bottom"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:772
+msgid "_Goto"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:774
+msgid "_Rename"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:776
+msgid "_Finish Applied"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:779 tortoisehg\hgtk\thgmq.py:809
+msgid "_Delete"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:781 tortoisehg\hgtk\thgmq.py:812
+msgid "F_old"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
+msgid "Reorder"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:836
+msgid "Status"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:843
msgid "Enable editable cells"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:624
+#: tortoisehg\hgtk\thgmq.py:846
msgid "Show 'qparent'"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:642
+#: tortoisehg\hgtk\thgmq.py:865
msgid "Succeed"
msgstr ""
@@ -4412,7 +5265,7 @@msgstr ""
#: tortoisehg\hgtk\thgshelve.py:107
-msgid "_shelve"
+msgid "_Shelve"
msgstr ""
#: tortoisehg\hgtk\thgshelve.py:140
@@ -4439,604 +5292,689 @@msgid "Unshelve Error"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:39
+#: tortoisehg\hgtk\thgstrip.py:36
+msgid "Strip - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:51
+msgid "Strip:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:85 tortoisehg\hgtk\update.py:94
+msgid "Options:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:89
+msgid "Discard local changes, no backup (-f/--force)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:111
+msgid "Backup all (default)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:112
+msgid "Backup unrelated changesets (-b/--backup)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:114
+msgid "No backup (-n/--nobackup)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:121
msgid "Strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:48
-msgid "Strip - %s"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:64
-msgid "Strip:"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:93
-msgid "Preview:"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:112
-msgid "Show all"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:115
-msgid "Use compact view"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:131
-msgid "Options:"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:135
-msgid "Discard local changes, no backup (-f/--force)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:166
-msgid "Backup all (default)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:167
-msgid "Backup unrelated changesets (-b/--backup)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:169
-msgid "No backup (-n/--nobackup)"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:196
+#: tortoisehg\hgtk\thgstrip.py:140
+msgid "Stripped successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:143
+msgid "Canceled stripping"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:145
+msgid "Failed to strip"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:176
msgid "Unknown revision!"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:198
-msgid "<span weight=\"bold\">%s changesets</span> will be stripped"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:204
-msgid "No changesets to display"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:208
-msgid "Displaying all changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:210
-msgid "Displaying %(count)d of %(total)d changesets"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:374
+#: tortoisehg\hgtk\thgstrip.py:179
+msgid "%s changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:180
+msgid "%s will be stripped"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:214
msgid "Confirm Strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:375
+#: tortoisehg\hgtk\thgstrip.py:215
msgid ""
"Detected uncommitted local changes.\n"
"Do you want to discard them and continue?"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:377
+#: tortoisehg\hgtk\thgstrip.py:217
msgid "&Yes (--force)"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:395
-msgid "Stripped successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:398
-msgid "Canceled stripping"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:400
-msgid "Failed to strip"
-msgstr ""
-
-#: tortoisehg\hgtk\thgstrip.py:419
+#: tortoisehg\hgtk\thgstrip.py:252
msgid "Saved at: %s"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:423
+#: tortoisehg\hgtk\thgstrip.py:256
msgid "Open..."
msgstr ""
-#: tortoisehg\hgtk\update.py:41
+#: tortoisehg\hgtk\update.py:27
msgid "Update - %s"
msgstr ""
-#: tortoisehg\hgtk\update.py:57
+#: tortoisehg\hgtk\update.py:46
msgid "Update to:"
msgstr ""
-#: tortoisehg\hgtk\update.py:60
+#: tortoisehg\hgtk\update.py:78
+msgid "Target:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:86
+msgid "Parent 1:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:88
+msgid "Parent 2:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:98
msgid "Discard local changes, no backup (-C/--clean)"
msgstr ""
-#: tortoisehg\hgtk\update.py:90
-msgid "Target:"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:98
-msgid "Parent 1:"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:100
-msgid "Parent 2:"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:180
+#: tortoisehg\hgtk\update.py:104
+msgid "Always merge (when possible)"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:107
+msgid "Always show log"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:152
+msgid "Updated successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:156
+msgid "Failed to update"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:189
msgid "(same as parent)"
msgstr ""
-#: tortoisehg\hgtk\update.py:186
+#: tortoisehg\hgtk\update.py:196
msgid "unknown revision!"
msgstr ""
-#: tortoisehg\hgtk\update.py:222
+#: tortoisehg\hgtk\update.py:231
msgid ""
"Detected uncommitted local changes in working tree.\n"
"Please select to continue:\n"
"\n"
msgstr ""
-#: tortoisehg\hgtk\update.py:224
-msgid "&Discard"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:225
+#: tortoisehg\hgtk\update.py:234
msgid "Discard - discard local changes, no backup"
msgstr ""
-#: tortoisehg\hgtk\update.py:226
+#: tortoisehg\hgtk\update.py:235
msgid "&Shelve"
msgstr ""
-#: tortoisehg\hgtk\update.py:227
+#: tortoisehg\hgtk\update.py:236
msgid "Shelve - launch Shelve tool and continue"
msgstr ""
-#: tortoisehg\hgtk\update.py:228
+#: tortoisehg\hgtk\update.py:237
msgid "&Merge"
msgstr ""
-#: tortoisehg\hgtk\update.py:229
+#: tortoisehg\hgtk\update.py:238
msgid "Merge - allow to merge with local changes"
msgstr ""
-#: tortoisehg\hgtk\update.py:242
+#: tortoisehg\hgtk\update.py:251
msgid "Confirm Update"
msgstr ""
-#: tortoisehg\hgtk\update.py:268
+#: tortoisehg\hgtk\update.py:280
msgid "[canceled by user]\n"
msgstr ""
-#: tortoisehg\hgtk\update.py:273
+#: tortoisehg\hgtk\update.py:285
msgid "invalid dialog result: %s"
msgstr ""
-#: tortoisehg\hgtk\update.py:282
-msgid "Updated successfully"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:284
-msgid "Canceled updating"
-msgstr ""
-
-#: tortoisehg\hgtk\update.py:286
-msgid "Failed to update"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:60
+#: tortoisehg\hgtk\visdiff.py:34
+msgid "[non-existant]"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:81
+msgid "Tool launch failure"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:82
+msgid "%s : %s"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:88 tortoisehg\hgtk\visdiff.py:156
+msgid "No diff tool found"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:89 tortoisehg\hgtk\visdiff.py:157
+msgid "No visual diff tools were detected"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:94
+msgid "[working copy]"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:95
+msgid "[original]"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:132
+msgid "Unable to find changeset"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:133
+msgid "You likely need to refresh this application"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:150
+msgid "No file changes"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:151
+msgid "There are no file changes to view"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:293
+msgid "cleaning up temp directory\n"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:310
msgid "Visual Diffs"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:68
+#: tortoisehg\hgtk\visdiff.py:315
+msgid "working changes"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:317
+msgid "changeset "
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:319
+msgid "revisions %d to %d"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:320
+msgid "Visual Diffs - "
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:322
+msgid " filtered"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:336
msgid "Temporary files are removed when this dialog is closed"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:86
-msgid "Always launch single files"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:101
-msgid "No repository"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:102 tortoisehg\hgtk\visdiff.py:373
+#: tortoisehg\hgtk\visdiff.py:390
+msgid "Dir diff to p1"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:392
+msgid "Dir diff to p2"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:394
+msgid "3-way dir diff"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:400
+msgid "Directory diff"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:533
+msgid "Unable to delete temp files"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:534
+msgid "Close diff tools and try again, or quit to leak files?"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:535
+msgid "&Quit"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:535
+msgid "Try &Again"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:631
msgid "No repository found here"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:109
-msgid "Select diff tool"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:148
-msgid "No visual diff tool"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:149
-msgid "No visual diff tool has been configured"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:177
-msgid "changeset "
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:183
-msgid "working changes"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:186
-msgid "revisions "
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:193
-msgid "Visual Diffs - "
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:207 tortoisehg\hgtk\visdiff.py:398
-msgid "No file changes"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:208 tortoisehg\hgtk\visdiff.py:399
-msgid "There are no file changes to view"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:277
-msgid "Unable to delete temp files"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:278
-msgid "Close diff tools and try again, or quit to leak files?"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:279
-msgid "&Quit"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:279
-msgid "Try &Again"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:340
-msgid "Tool launch failure"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:341
-msgid "%s : %s"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:380
-msgid "Extdiff command not recognized\n"
-msgstr ""
-
-#: tortoisehg\util\hgshelve.py:46
+#: tortoisehg\util\hgshelve.py:51
msgid "Unsupported line endings type: %s"
msgstr ""
-#: tortoisehg\util\hgshelve.py:97
+#: tortoisehg\util\hgshelve.py:105
msgid "unknown patch content: %r"
msgstr "contenu de mise à jour inconnu: %r"
-#: tortoisehg\util\hgshelve.py:118 tortoisehg\util\hgshelve.py:145
+#: tortoisehg\util\hgshelve.py:126 tortoisehg\util\hgshelve.py:153
msgid "this modifies a binary file (all or nothing)\n"
msgstr "ceci modifie un fichier binaire\n"
-#: tortoisehg\util\hgshelve.py:123 tortoisehg\util\hgshelve.py:150
+#: tortoisehg\util\hgshelve.py:131 tortoisehg\util\hgshelve.py:158
msgid "this is a binary file\n"
msgstr "ceci est un fichier binaire\n"
-#: tortoisehg\util\hgshelve.py:134
+#: tortoisehg\util\hgshelve.py:142
msgid ""
"total: %d hunks (%d changed lines); selected: %d hunks (%d changed lines)"
msgstr ""
"total : %d blocs (%d lignes modifiées); sélectionné : %d blocs (%d lignes "
"modifiées)"
-#: tortoisehg\util\hgshelve.py:153
+#: tortoisehg\util\hgshelve.py:161
msgid "%d hunks, %d lines changed\n"
msgstr "%d morceaux, %d lignes modifiées\n"
-#: tortoisehg\util\hgshelve.py:299
+#: tortoisehg\util\hgshelve.py:307
msgid "unhandled transition: %s -> %s"
msgstr "transition non gérée : %s -> %s"
-#: tortoisehg\util\hgshelve.py:325
+#: tortoisehg\util\hgshelve.py:333
msgid " [Ynsfdaq?] "
msgstr " [Ynsfdaq?] "
-#: tortoisehg\util\hgshelve.py:341
+#: tortoisehg\util\hgshelve.py:349
msgid "user quit"
msgstr "l'utilisateur quitte"
-#: tortoisehg\util\hgshelve.py:355
+#: tortoisehg\util\hgshelve.py:363
msgid "shelve changes to %s?"
msgstr "archiver les modifications vers %s ?"
-#: tortoisehg\util\hgshelve.py:356
+#: tortoisehg\util\hgshelve.py:364
msgid " and "
msgstr " et "
-#: tortoisehg\util\hgshelve.py:366
+#: tortoisehg\util\hgshelve.py:374
msgid "shelve this change to %r?"
msgstr "archiver ce changement vers %r ?"
-#: tortoisehg\util\hgshelve.py:405
+#: tortoisehg\util\hgshelve.py:413
msgid "backup %r as %r\n"
msgstr "sauvegarder %r vers %r\n"
-#: tortoisehg\util\hgshelve.py:438
+#: tortoisehg\util\hgshelve.py:446
msgid "shelve can only be run interactively"
msgstr "l'archivage ne peut utilisé qu'interactivement."
-#: tortoisehg\util\hgshelve.py:442
+#: tortoisehg\util\hgshelve.py:450
msgid "shelve data already exists"
msgstr "shelve données resistent déja"
-#: tortoisehg\util\hgshelve.py:473
+#: tortoisehg\util\hgshelve.py:481
msgid "no changes to shelve\n"
msgstr "aucune modification à archiver\n"
-#: tortoisehg\util\hgshelve.py:507
+#: tortoisehg\util\hgshelve.py:515
msgid "applying patch\n"
msgstr "application du patch\n"
-#: tortoisehg\util\hgshelve.py:514
+#: tortoisehg\util\hgshelve.py:522
msgid "saving patch to shelve\n"
msgstr "sauvegarde de patch à archiver\n"
-#: tortoisehg\util\hgshelve.py:525 tortoisehg\util\hgshelve.py:576
+#: tortoisehg\util\hgshelve.py:533 tortoisehg\util\hgshelve.py:584
msgid "restoring %r to %r\n"
msgstr "restauration de %r vers %r\n"
-#: tortoisehg\util\hgshelve.py:527
+#: tortoisehg\util\hgshelve.py:535
msgid "removing shelve file\n"
msgstr "suppression du fichier d'archive\n"
-#: tortoisehg\util\hgshelve.py:536
+#: tortoisehg\util\hgshelve.py:544
msgid "removing backup for %r : %r\n"
msgstr "suppression de la sauvegarde de %r : %r\n"
-#: tortoisehg\util\hgshelve.py:561
+#: tortoisehg\util\hgshelve.py:569
msgid "applying shelved patch\n"
msgstr "application du patch archivé\n"
-#: tortoisehg\util\hgshelve.py:574
+#: tortoisehg\util\hgshelve.py:582
msgid "restoring backup files\n"
msgstr "restoration des fichiers de sauvegarde\n"
-#: tortoisehg\util\hgshelve.py:581
+#: tortoisehg\util\hgshelve.py:589
msgid "removing backup files\n"
msgstr "suppression des fichiers de sauvegarde\n"
-#: tortoisehg\util\hgshelve.py:587
+#: tortoisehg\util\hgshelve.py:595
msgid "removing shelved patches\n"
msgstr "suppression des patchs archivés\n"
-#: tortoisehg\util\hgshelve.py:589
+#: tortoisehg\util\hgshelve.py:597
msgid "unshelve completed\n"
msgstr "désarchivage terminé\n"
-#: tortoisehg\util\hgshelve.py:591
+#: tortoisehg\util\hgshelve.py:599
msgid "nothing to unshelve\n"
msgstr "rien à archiver\n"
-#: tortoisehg\util\hgshelve.py:597
+#: tortoisehg\util\hgshelve.py:605
msgid "mark new/missing files as added/removed before shelving"
msgstr ""
"marquer les fichiers nouveaux ou manquants comme ajoutés ou supprimés avant "
"l'archivage"
-#: tortoisehg\util\hgshelve.py:599
+#: tortoisehg\util\hgshelve.py:607
msgid "overwrite existing shelve data"
msgstr "écraser les données d'archivage existantes"
-#: tortoisehg\util\hgshelve.py:601
+#: tortoisehg\util\hgshelve.py:609
msgid "append to existing shelve data"
msgstr "ajouter aux données d'archivage existantes"
-#: tortoisehg\util\hgshelve.py:603
+#: tortoisehg\util\hgshelve.py:611
msgid "hg shelve [OPTION]... [FILE]..."
msgstr "hg shelve [OPTION]... [FILE]..."
-#: tortoisehg\util\hgshelve.py:606
+#: tortoisehg\util\hgshelve.py:614
msgid "inspect shelved changes only"
msgstr "inspecter seulement les changements archivés"
-#: tortoisehg\util\hgshelve.py:608
+#: tortoisehg\util\hgshelve.py:616
msgid "proceed even if patches do not unshelve cleanly"
msgstr "continuer même si les patches ne se restaurent pas correctement"
-#: tortoisehg\util\hgshelve.py:610
+#: tortoisehg\util\hgshelve.py:618
msgid "hg unshelve [OPTION]... [FILE]..."
msgstr "hg unshelve [OPTION]... [FILE]..."
-#: tortoisehg\util\menuthg.py:38
+#: tortoisehg\util\menuthg.py:19
msgid "Commit..."
msgstr ""
-#: tortoisehg\util\menuthg.py:39
+#: tortoisehg\util\menuthg.py:20
msgid "Commit changes in repository"
msgstr "Livrer les changements dans le dépôt"
-#: tortoisehg\util\menuthg.py:41
+#: tortoisehg\util\menuthg.py:22
msgid "Create Repository Here"
msgstr "Créer un dépôt ici"
-#: tortoisehg\util\menuthg.py:42
+#: tortoisehg\util\menuthg.py:23
msgid "Create a new repository"
msgstr "Créer un nouveau dépôt"
-#: tortoisehg\util\menuthg.py:44
+#: tortoisehg\util\menuthg.py:25
msgid "Clone..."
msgstr ""
-#: tortoisehg\util\menuthg.py:45
+#: tortoisehg\util\menuthg.py:26
msgid "Create clone here from source"
msgstr "Créer un clone ici depuis la source"
+#: tortoisehg\util\menuthg.py:28
+msgid "File Status"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:29
+msgid "Repository status & changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:31
+msgid "Shelve Changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:32
+msgid "Shelve or unshelve file changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:34
+msgid "Add Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:35
+msgid "Add files to version control"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:37
+msgid "Revert Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:38
+msgid "Revert file changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:40
+msgid "Forget Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:41 tortoisehg\util\menuthg.py:44
+msgid "Remove files from version control"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:43
+msgid "Remove Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:46
+msgid "Rename File"
+msgstr ""
+
#: tortoisehg\util\menuthg.py:47
-msgid "File Status"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:48
-msgid "Repository status & changes"
+msgid "Rename file or directory"
msgstr ""
#: tortoisehg\util\menuthg.py:50
-msgid "Shelve Changes"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:51
-msgid "Shelve or unshelve file changes"
+msgid "View change history in repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:52
+msgid "File History"
msgstr ""
#: tortoisehg\util\menuthg.py:53
-msgid "Add Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:54
-msgid "Add files to version control"
+msgid "View change history of selected files"
msgstr ""
#: tortoisehg\util\menuthg.py:56
-msgid "Revert Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:57
-msgid "Revert file changes"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:59
-msgid "Forget Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:60 tortoisehg\util\menuthg.py:63
-msgid "Remove files from version control"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:62
-msgid "Remove Files..."
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:65
-msgid "Rename File"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:66
-msgid "Rename file or directory"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:69
-msgid "View change history in repository"
-msgstr ""
-
-#: tortoisehg\util\menuthg.py:72
msgid "Synchronize with remote repository"
msgstr "Synchroniser avec un dépot distant"
-#: tortoisehg\util\menuthg.py:74
-msgid "Web Server"
-msgstr "Serveur Web"
-
-#: tortoisehg\util\menuthg.py:75
+#: tortoisehg\util\menuthg.py:59
msgid "Start web server for this repository"
msgstr ""
-#: tortoisehg\util\menuthg.py:77
+#: tortoisehg\util\menuthg.py:61
msgid "Update..."
msgstr ""
-#: tortoisehg\util\menuthg.py:78
+#: tortoisehg\util\menuthg.py:62
msgid "Update working directory"
msgstr ""
-#: tortoisehg\util\menuthg.py:80
+#: tortoisehg\util\menuthg.py:64
msgid "Recovery..."
msgstr "Récupération..."
-#: tortoisehg\util\menuthg.py:81
+#: tortoisehg\util\menuthg.py:65
msgid "Repair and recovery of repository"
msgstr ""
-#: tortoisehg\util\menuthg.py:83
+#: tortoisehg\util\menuthg.py:67
msgid "Update Icons"
msgstr ""
-#: tortoisehg\util\menuthg.py:84
+#: tortoisehg\util\menuthg.py:68
msgid "Update icons for this repository"
msgstr ""
-#: tortoisehg\util\menuthg.py:86
+#: tortoisehg\util\menuthg.py:70
msgid "Global Settings"
msgstr ""
-#: tortoisehg\util\menuthg.py:87
+#: tortoisehg\util\menuthg.py:71
msgid "Configure user wide settings"
msgstr "Configuration globale"
-#: tortoisehg\util\menuthg.py:89
+#: tortoisehg\util\menuthg.py:73
msgid "Repository Settings"
msgstr "Paramètres du dépôt"
-#: tortoisehg\util\menuthg.py:90
+#: tortoisehg\util\menuthg.py:74
msgid "Configure repository settings"
msgstr ""
-#: tortoisehg\util\menuthg.py:92
+#: tortoisehg\util\menuthg.py:76
+msgid "Explorer Extension Settings"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:77
+msgid "Configure Explorer extension"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:79
msgid "About TortoiseHg"
msgstr "À propos de TortoiseHg"
-#: tortoisehg\util\menuthg.py:93
+#: tortoisehg\util\menuthg.py:80
msgid "Show About Dialog"
msgstr ""
-#: tortoisehg\util\menuthg.py:95
+#: tortoisehg\util\menuthg.py:82
msgid "Annotate Files"
msgstr "Annoter fichiers"
-#: tortoisehg\util\menuthg.py:96
+#: tortoisehg\util\menuthg.py:83
msgid "Changeset information per file line"
msgstr ""
-#: tortoisehg\util\menuthg.py:98
+#: tortoisehg\util\menuthg.py:85
msgid "Visual Diff"
msgstr "Diff visuel"
-#: tortoisehg\util\menuthg.py:99
+#: tortoisehg\util\menuthg.py:86
msgid "View changes using GUI diff tool"
msgstr "Afficher les changements avec l'interface graphique de diff"
-#: tortoisehg\util\menuthg.py:101
+#: tortoisehg\util\menuthg.py:88
msgid "Edit Ignore Filter"
msgstr ""
-#: tortoisehg\util\menuthg.py:102
+#: tortoisehg\util\menuthg.py:89
msgid "Edit repository ignore filter"
msgstr ""
-#: tortoisehg\util\menuthg.py:104
+#: tortoisehg\util\menuthg.py:91
msgid "Guess Renames"
msgstr ""
-#: tortoisehg\util\menuthg.py:105
+#: tortoisehg\util\menuthg.py:92
msgid "Detect renames and copies"
msgstr ""
-#: tortoisehg\util\menuthg.py:107
+#: tortoisehg\util\menuthg.py:94
msgid "Search History"
msgstr ""
-#: tortoisehg\util\menuthg.py:108
+#: tortoisehg\util\menuthg.py:95
msgid "Search file revisions for patterns"
msgstr ""
-#: tortoisehg\util\menuthg.py:110
+#: tortoisehg\util\menuthg.py:97
msgid "DnD Synchronize"
msgstr ""
-#: tortoisehg\util\menuthg.py:111
+#: tortoisehg\util\menuthg.py:98
msgid "Synchronize with dragged repository"
msgstr ""
+#: tortoisehg\util\prej.py:143
+msgid "patching file %s\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:190
+msgid "%d out of %d hunk%s FAILED -- saving rejects to file %s\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:226
+msgid "bad hunk #%d %s (%d %d %d %d)"
+msgstr ""
+
+#: tortoisehg\util\prej.py:235
+msgid "file %s already exists\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:287
+msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:294
+msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:299
+msgid "Hunk #%d FAILED at %d\n"
+msgstr ""
+
+#: tortoisehg\util\prej.py:318 tortoisehg\util\prej.py:344
+#: tortoisehg\util\prej.py:376
+msgid "bad hunk #%d"
+msgstr ""
+
+#: tortoisehg\util\prej.py:363 tortoisehg\util\prej.py:405
+msgid "bad hunk #%d old text line %d"
+msgstr ""
+
+#: tortoisehg\util\prej.py:550
+msgid "could not extract binary patch"
+msgstr ""
+
+#: tortoisehg\util\prej.py:566
+msgid "binary patch is %d bytes, not %d"
+msgstr ""
+
+#: tortoisehg\util\prej.py:591
+msgid "unable to strip away %d dirs from %s"
+msgstr ""
+
+#: tortoisehg\util\prej.py:613
+msgid "unable to find %s or %s for patching"
+msgstr ""
+
+#: tortoisehg\util\prej.py:792
+msgid "malformed patch %s %s"
+msgstr ""
+
+#: tortoisehg\util\prej.py:803
+msgid "No valid hunks found"
+msgstr ""
+
+#: tortoisehg\util\version.py:17
+msgid "repository %s not found"
+msgstr ""
+
#~ msgid "Clone a repository here"
#~ msgstr "Cloner un dépôt ici"
@@ -5148,15 +6086,27 @@#~ msgid "Recent Commit Messages..."
#~ msgstr "Messages de commit récents..."
+#~ msgid "Undo last commit"
+#~ msgstr "Défaire le dernier envoi"
+
#~ msgid "Backout changeset - "
#~ msgstr "Revenir sur les changements "
#~ msgid "Undo commit"
#~ msgstr "Défaire l'envoi"
+#~ msgid "_file history"
+#~ msgstr "historique du _fichier"
+
#~ msgid "DataMining"
#~ msgstr "Analyse de données"
+#~ msgid "di_splay change"
+#~ msgstr "afficher les changement_s"
+
+#~ msgid "_annotate file"
+#~ msgstr "_annoter le fichier"
+
#~ msgid "Follow"
#~ msgstr "Suivre"
@@ -5166,6 +6116,9 @@#~ msgid "Detect Copies/Renames in "
#~ msgstr "Détecte les copies et changements de noms dans "
+#~ msgid "Running"
+#~ msgstr "En cours"
+
#~ msgid "Done"
#~ msgstr "Terminé"
@@ -5184,9 +6137,24 @@#~ msgid "send"
#~ msgstr "envoyer"
+#~ msgid "Send changesets as HG patches"
+#~ msgstr "Envoyer tous les changements sous forme de mise à jour Hg."
+
#~ msgid "Email revision(s) "
#~ msgstr "Envoyer par e-mail les versions "
+#~ msgid "Plain, do not prepend HG header"
+#~ msgstr "Simple, ne pas ajouter d'en-tête Hg en entrée."
+
+#~ msgid ""
+#~ "HG patches (as generated by export command) are compatible with most patch "
+#~ "programs. They include a header which contains the most important changeset "
+#~ "metadata."
+#~ msgstr ""
+#~ "Les mise à jour Hg (générees par la commande d'export) sont compatibles avec "
+#~ "la plupart des programmes de patch. Elles incluent un en-tête qui contient "
+#~ "les méta-informations les plus importantes pour l'ensemble des modifications."
+
#~ msgid "The description field is unused when sending a single patch."
#~ msgstr ""
#~ "Le champ de description n'est pas pris en compte lors de l'envoi d'une seule "
@@ -5208,6 +6176,12 @@#~ msgid "add"
#~ msgstr "ajouter"
+#~ msgid "New repository created"
+#~ msgstr "Nouveau dépôt créé"
+
+#~ msgid "in directory %s"
+#~ msgstr "dans le répertoire %s"
+
#~ msgid "[command completed successfully]\n"
#~ msgstr "[commande terminée avec succès]\n"
@@ -5229,9 +6203,6 @@#~ msgid "Filter revisions for display"
#~ msgstr "Filtre les versions à afficher"
-#~ msgid "_Filter"
-#~ msgstr "_Filtrer"
-
#~ msgid "user/date:"
#~ msgstr "utilisateur/date"
@@ -5256,12 +6227,18 @@#~ msgid "parent:"
#~ msgstr "parent :"
+#~ msgid "Stat"
+#~ msgstr "Stats"
+
#~ msgid "_revert file contents"
#~ msgstr "_revenir sur le fichier original"
#~ msgid "_save at revision"
#~ msgstr "_sauver vers une version"
+#~ msgid "C_onfigure Format"
+#~ msgstr "C_onfigurer Format"
+
#~ msgid "diff other parent"
#~ msgstr "diff. avec un autre parent"
@@ -5325,6 +6302,9 @@#~ msgid "Launch synchronize tool"
#~ msgstr "Lancer l'outil de synchronisation"
+#~ msgid "_annotate parent"
+#~ msgstr "_annoter le parent"
+
#~ msgid "Show Working Parents"
#~ msgstr "Affiche les parents de travail"
@@ -5431,6 +6411,9 @@#~ msgid "_view"
#~ msgstr "_vue"
+#~ msgid "_delete"
+#~ msgstr "_supprimer"
+
#~ msgid "_add"
#~ msgstr "_ajouter"
@@ -5496,3 +6479,9 @@
#~ msgid "Copyright 2009 TK Soh and others"
#~ msgstr "Copyright 2009 TK Soh et les autres"
+
+#~ msgid "TortoiseHg RPC server"
+#~ msgstr "Serveur TortoiseHg RPC"
+
+#~ msgid "Options..."
+#~ msgstr "Préférences..."
|
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... |
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-03-31 20:43+0000\n"
+"PO-Revision-Date: 2010-04-05 13:56+0000\n"
"Last-Translator: paolof <gp.fadel@gmail.com>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 06:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2499,7 +2499,8 @@msgid "%s (submitted)"
msgstr "%s (inviato)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (in attesa)"
@@ -5423,7 +5424,8 @@msgid "F_old"
msgstr "C_ollassa"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "Riordina"
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-03-31 16:55+0000\n"
+"PO-Revision-Date: 2010-04-05 11:59+0000\n"
"Last-Translator: Yuki Kodama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 06:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2471,7 +2471,8 @@msgid "%s (submitted)"
msgstr "%s (送信完了)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (保留中)"
@@ -5292,7 +5293,8 @@msgid "F_old"
msgstr "統合(_F)"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "並べ替え"
|
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... |
@@ -8,20 +8,15 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-03-31 20:26+0000\n"
-"Last-Translator: Wagner Bruna <Unknown>\n"
+"PO-Revision-Date: 2010-04-05 13:18+0000\n"
+"Last-Translator: Yuki Kodama <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 06:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: tortoisehg\hgtk\history.py:417 tortoisehg\hgtk\history.py:1957
-#: tortoisehg\hgtk\synch.py:79
-msgid "Push"
-msgstr "Push"
-
#: TortoiseHgOverlayServer.py:36
msgid "TortoiseHg Overlay Icon Server"
msgstr "Servidor de Ícones Sobrepostos do TortoiseHg"
@@ -2442,6 +2437,11 @@msgid "Outgoing"
msgstr "Outgoing"
+#: tortoisehg\hgtk\history.py:417 tortoisehg\hgtk\history.py:1957
+#: tortoisehg\hgtk\synch.py:79
+msgid "Push"
+msgstr "Push"
+
#: tortoisehg\hgtk\history.py:419
msgid "Email..."
msgstr "Email..."
@@ -2490,7 +2490,8 @@msgid "%s (submitted)"
msgstr "%s (enviada)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (pendente)"
@@ -5401,7 +5402,8 @@msgid "F_old"
msgstr "C_ombinar"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "Reordenar"
|
@@ -8,13 +8,13 @@ "Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: Alil Adamov <diagiman@gmail.com>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-04-01 10:26+0000\n"
+"PO-Revision-Date: 2010-04-05 12:09+0000\n"
"Last-Translator: Alil Adamov <diagiman@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-02 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:06+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2496,7 +2496,8 @@msgid "%s (submitted)"
msgstr "%s (предоставлена)"
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr "%s (осталась)"
@@ -5417,7 +5418,8 @@msgid "F_old"
msgstr "Объединить"
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr "Измение порядка"
@@ -6744,6 +6746,9 @@#~ msgid "View Changelog"
#~ msgstr "Показать Журнал Изменений"
+#~ msgid "Undo last commit"
+#~ msgstr "Отменить последнюю фиксацию"
+
#~ msgid "Copyright 2009 TK Soh and others"
#~ msgstr "Copyright 2009 TK Soh и другие"
@@ -6752,3 +6757,10 @@
#~ msgid "Options..."
#~ msgstr "Настройки..."
+
+#~ msgid ""
+#~ "Normalize file line endings during and after patch to lf or crlf. Strict "
+#~ "does no normalization. Default: strict"
+#~ msgstr ""
+#~ "Пребразовывать переносы строк файла при применении и после к lf или crlf. "
+#~ "Strict - без преобразований. По умолчанию: strict"
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: tortoisehg\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: Turkish <tr@li.org>\n"
"POT-Creation-Date: 2010-04-01 05:09+0000\n"
-"PO-Revision-Date: 2010-04-05 03:05+0000\n"
-"Last-Translator: Göksel GÜREN <Unknown>\n"
+"PO-Revision-Date: 2010-04-05 12:18+0000\n"
+"Last-Translator: Turkish <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-06 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: TortoiseHgOverlayServer.py:36
@@ -2417,7 +2417,8 @@msgid "%s (submitted)"
msgstr ""
-#: tortoisehg\hgtk\history.py:557 tortoisehg\hgtk\history.py:563
+#: tortoisehg\hgtk\history.py:557
+#: tortoisehg\hgtk\history.py:563
msgid "%s (pending)"
msgstr ""
@@ -5172,7 +5173,8 @@msgid "F_old"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:784 tortoisehg\hgtk\thgmq.py:816
+#: tortoisehg\hgtk\thgmq.py:784
+#: tortoisehg\hgtk\thgmq.py:816
msgid "Reorder"
msgstr ""
@@ -5914,3 +5916,6 @@#: tortoisehg\util\version.py:17
msgid "repository %s not found"
msgstr ""
+
+#~ msgid "Options..."
+#~ msgstr "Seçenekler..."
|
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... |
@@ -721,6 +721,7 @@ name = self.get_setting_name()
if name:
self.settings = settings.Settings(name)
+ self.load_settings()
# dialog size
defsize = self.get_defsize()
@@ -730,6 +731,9 @@ # signal handler
self.connect('realize', self.realized)
+ # disable entire dialog
+ self.set_sensitive(False)
+
### Overridable Functions ###
def get_title(self, reponame):
@@ -765,6 +769,9 @@ def command_done(self, returncode, useraborted, *args):
pass
+ def before_show(self):
+ pass
+
def before_close(self):
return True
@@ -798,6 +805,16 @@ # add Abort button
self.action_area.add(self.buttons['abort'])
+ # enable entire dialog
+ self.set_sensitive(True)
+
+ # focus on default button if needs
+ name = self.get_default_button()
+ if name:
+ btn = self.buttons.get(name)
+ if btn:
+ btn.grab_focus()
+
def do_switch_to(self, mode, cmd=True):
if mode == MODE_NORMAL:
normal = True
@@ -831,7 +848,7 @@ self.do_switch_to(MODE_WORKING)
self.cmd.execute(cmdline, cmd_done)
- ### Signal Handler ###
+ ### Signal Handlers ###
def realized(self, *args):
# set title
@@ -855,18 +872,11 @@ gtklib.idle_add_single_call(self.destroy)
return
- # focus on default button if needs
- name = self.get_default_button()
- if name:
- btn = self.buttons.get(name)
- if btn:
- btn.grab_focus()
-
# signal handler
self.connect('response', self.dialog_response)
# prepare to show
- self.load_settings()
+ self.before_show()
self.vbox.show_all()
gtklib.idle_add_single_call(self.after_init)
@@ -884,7 +894,7 @@ return # close dialog
# Cancel button or dialog closing by the user
elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT):
- if hasattr(self, 'cmd') and self.cmd.is_alive():
+ if self.cmd.is_alive():
ret = Confirm(_('Confirm Abort'), [], self,
_('Do you want to abort?')).run()
if ret == gtk.RESPONSE_YES:
|
@@ -21,6 +21,9 @@ 'revert': (_('Select files to revert'), _('Revert')),
'remove': (_('Select files to remove'), _('Remove')),}
+DEFAULT_SIZE = (450, 300)
+DEFAULT_POS = (0, 0)
+
class QuickOpDialog(gdialog.GDialog):
""" Dialog for performing quick dirstate operations """
def __init__(self, command, pats):
@@ -46,7 +49,10 @@ return 'hg.ico'
def get_defsize(self):
- return (450, 300)
+ return self.defsize
+
+ def get_setting_name(self):
+ return 'quickop'
def get_body(self, vbox):
os.chdir(self.repo.root)
@@ -208,6 +214,36 @@ else:
self.cmd.set_result(_('Failed'), style='error')
+ def before_show(self):
+ # restore dialog state
+ if self.defmax:
+ self.maximize()
+
+ # restore dialog position
+ screen = self.get_screen()
+ w, h = screen.get_width(), screen.get_height()
+ x, y = self.defpos
+ if x >= 0 and x < w and y >= 0 and y < h:
+ self.move(x, y)
+
+ def load_settings(self):
+ self.defsize = self.settings.get_value('size', DEFAULT_SIZE)
+ self.defpos = self.settings.get_value('pos', DEFAULT_POS)
+ self.defmax = self.settings.get_value('maximize', False)
+
+ def store_settings(self):
+ state = self.window.get_state()
+ ismaximized = bool(state & gtk.gdk.WINDOW_STATE_MAXIMIZED)
+ if ismaximized or state & gtk.gdk.WINDOW_STATE_ICONIFIED:
+ self.settings.set_value('size', DEFAULT_SIZE)
+ self.settings.set_value('pos', DEFAULT_POS)
+ else:
+ rect = self.get_allocation()
+ self.settings.set_value('size', (rect.width, rect.height))
+ self.settings.set_value('pos', self.get_position())
+ self.settings.set_value('maximize', ismaximized)
+ self.settings.write()
+
### End of Overriding Section ###
def operation(self):
|
Loading...