We are currently indexing your data, so search results may be incomplete until we finish.
stable Merge with stable
by
Changes to 20 files · Browse files at b398d3431385 Showing diff from parent a673bfbfc502 b66a4e123a0f Diff from another changeset...
-
i18n/tortoisehg/ca.po
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
-
tortoisehg/hgtk/changeset.py
-
tortoisehg/hgtk/csinfo.py
-
tortoisehg/hgtk/history.py
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -7,34 +7,216 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-07-11 05:54+0000\n"
-"PO-Revision-Date: 2009-07-09 22:33+0000\n"
-"Last-Translator: Nicolas Maître <Unknown>\n"
+"POT-Creation-Date: 2009-10-18 08:45+0000\n"
+"PO-Revision-Date: 2009-10-18 09:24+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: 2009-07-23 20:28+0000\n"
+"X-Launchpad-Export-Date: 2009-10-19 07:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: hggtk\about.py:52
+#: thgtaskbar.py:38
+msgid "TortoiseHg RPC server"
+msgstr ""
+
+#: thgtaskbar.py:115
+msgid "Options..."
+msgstr ""
+
+#: thgtaskbar.py:117
+msgid "Exit"
+msgstr "Quitter"
+
+#: tortoisehg\hgtk\about.py:62
msgid "Several icons are courtesy of the TortoiseSVN project"
msgstr ""
"Plusieurs icones sont fournies gracieusement par le projet TortoiseSVN"
-#: hggtk\backout.py:24
-msgid "Backout changeset - "
-msgstr "Revenir sur les changements "
-
-#: hggtk\backout.py:50
+#: tortoisehg\hgtk\about.py:66
+msgid "(version %s)"
+msgstr "(version %s)"
+
+#: tortoisehg\hgtk\about.py:69
+msgid "Copyright 2009 TK Soh and others"
+msgstr "Copyright 2009 TK Soh et les autres"
+
+#: tortoisehg\hgtk\about.py:85
+msgid "with %s"
+msgstr "avec %s"
+
+#: tortoisehg\hgtk\archive.py:20
+msgid "= Working Directory Parent ="
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:37
+msgid "Archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:46
+msgid "Archive - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:71
+msgid "Archive revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:77 tortoisehg\hgtk\clone.py:74
+#: tortoisehg\hgtk\hginit.py:52 tortoisehg\hgtk\thgconfig.py:299
+msgid "Browse..."
+msgstr "Parcourir..."
+
+#: tortoisehg\hgtk\archive.py:80 tortoisehg\hgtk\clone.py:103
+msgid "Destination path:"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:83
+msgid "Directory of files"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:85
+msgid "Archive types:"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:91
+msgid "Uncompressed tar archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:92
+msgid "Tar archive compressed using bzip2"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:93
+msgid "Tar archive compressed using gzip"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:94
+msgid "Uncompressed zip archive"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:95
+msgid "Zip archive compressed using deflate"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:113 tortoisehg\hgtk\backout.py:114
+#: tortoisehg\hgtk\clone.py:165 tortoisehg\hgtk\merge.py:141
+#: tortoisehg\hgtk\quickop.py:176 tortoisehg\hgtk\thgstrip.py:168
+#: tortoisehg\hgtk\update.py:123
+msgid "Abort"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:127 tortoisehg\hgtk\backout.py:141
+#: tortoisehg\hgtk\clone.py:188 tortoisehg\hgtk\merge.py:161
+#: tortoisehg\hgtk\quickop.py:191 tortoisehg\hgtk\thgstrip.py:293
+#: tortoisehg\hgtk\update.py:138
+msgid "Confirm Abort"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:128 tortoisehg\hgtk\backout.py:142
+#: tortoisehg\hgtk\clone.py:189 tortoisehg\hgtk\merge.py:162
+#: tortoisehg\hgtk\quickop.py:192 tortoisehg\hgtk\thgstrip.py:294
+#: tortoisehg\hgtk\update.py:139
+msgid "Do you want to abort?"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:138 tortoisehg\hgtk\backout.py:153
+#: tortoisehg\hgtk\clone.py:199 tortoisehg\hgtk\merge.py:182
+#: tortoisehg\hgtk\quickop.py:201 tortoisehg\hgtk\thgstrip.py:304
+#: tortoisehg\hgtk\update.py:149
+msgid "unexpected response id: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:194
+msgid "Tar archives"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:197
+msgid "Bzip2 tar archives"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:200
+msgid "Gzip tar archives"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:206
+msgid "Compressed zip archives"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:218 tortoisehg\hgtk\clone.py:104
+#: tortoisehg\hgtk\hginit.py:77
+msgid "Select Destination Folder"
+msgstr "Sélectionnez le répertoire de destination"
+
+#: tortoisehg\hgtk\archive.py:224
+msgid "Select Destination File"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:226
+msgid "All Files (*.*)"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:238 tortoisehg\hgtk\backout.py:181
+#: tortoisehg\hgtk\clone.py:223 tortoisehg\hgtk\merge.py:197
+#: tortoisehg\hgtk\quickop.py:213 tortoisehg\hgtk\thgstrip.py:336
+#: tortoisehg\hgtk\update.py:161
+msgid "unknown mode name: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:254 tortoisehg\hgtk\archive.py:260
+#: tortoisehg\hgtk\changeset.py:725 tortoisehg\hgtk\history.py:1710
+#: tortoisehg\hgtk\history.py:1739 tortoisehg\hgtk\thgconfig.py:479
+#: tortoisehg\hgtk\thgconfig.py:829
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:255
+msgid ""
+"The destination \"%s\" already exists!\n"
+"\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: tortoisehg\hgtk\archive.py:261
+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
+msgid "Backout changeset - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:38
+msgid "Backout"
+msgstr "Revenir"
+
+#: tortoisehg\hgtk\backout.py:51
msgid "Backed out changeset: "
msgstr "Revenu sur les changements : "
-#: hggtk\backout.py:56
+#: tortoisehg\hgtk\backout.py:56
+msgid "Changeset Description"
+msgstr "Description de l'ensemble de modifications"
+
+#: tortoisehg\hgtk\backout.py:62
msgid "Backout commit message"
msgstr "Message de retour"
-#: hggtk\backout.py:61
+#: tortoisehg\hgtk\backout.py:85
msgid ""
"Commit message text for new changeset that reverses the effect of the "
"change being backed out."
@@ -42,176 +224,499 @@"Message d'envoi pour les changements qui annulent les effets des changements "
"en cours de retour."
-#: hggtk\backout.py:73 hggtk\bugreport.py:43 hggtk\hgcmd.py:46
-#: hggtk\hginit.py:84 hggtk\merge.py:72 hggtk\taskbarui.py:32
-#: hggtk\update.py:70
+#: tortoisehg\hgtk\backout.py:91
+msgid "Use English backout message"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:97
+msgid "Merge with old dirstate parent after backout"
+msgstr ""
+
+#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:435
+msgid "Confirm Discard Message"
+msgstr "Confirmer le message d'abandon"
+
+#: tortoisehg\hgtk\backout.py:164
+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
+msgid "TortoiseHg Bug Report"
+msgstr "Rapport de bug TortoiseHg"
+
+#: tortoisehg\hgtk\bugreport.py:46
+msgid "Save as.."
+msgstr ""
+
+#: tortoisehg\hgtk\bugreport.py:49 tortoisehg\hgtk\hgcmd.py:50
+#: tortoisehg\hgtk\taskbarui.py:33
msgid "Close"
msgstr "Fermer"
-#: hggtk\backout.py:80
-msgid "Backout"
-msgstr "Revenir"
-
-#: hggtk\bugreport.py:23
-msgid "TortoiseHg Bug Report"
-msgstr "Rapport de bug TortoiseHg"
-
-#: hggtk\changeset.py:151
+#: tortoisehg\hgtk\bugreport.py:58
+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
+msgid "Save error report to"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:33
+msgid "%s changeset "
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:121 tortoisehg\hgtk\changeset.py:147
+msgid "[All Files]"
+msgstr "[Tous les fichiers]"
+
+#: tortoisehg\hgtk\changeset.py:182
+msgid "unknown hunk type: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:241
msgid "changeset:"
msgstr "jeu de révisions:"
-#: hggtk\changeset.py:314 hggtk\datamine.py:118
-msgid "_file history"
-msgstr "historique du _fichier"
-
-#: hggtk\changeset.py:315 hggtk\datamine.py:117
-msgid "_annotate file"
-msgstr "_annoter le fichier"
-
-#: hggtk\changeset.py:377 hggtk\hgignore.py:111
+#: tortoisehg\hgtk\changeset.py:248 tortoisehg\hgtk\changeset.py:327
+#: tortoisehg\hgtk\csinfo.py:116 tortoisehg\hgtk\csinfo.py:117
+msgid "branch:"
+msgstr "branche :"
+
+#: tortoisehg\hgtk\changeset.py:249 tortoisehg\hgtk\changeset.py:330
+#: tortoisehg\hgtk\csinfo.py:115
+msgid "user:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:250 tortoisehg\hgtk\changeset.py:333
+#: tortoisehg\hgtk\csinfo.py:116
+msgid "date:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:281 tortoisehg\hgtk\changeset.py:339
+msgid "parent:"
+msgstr "parent :"
+
+#: tortoisehg\hgtk\changeset.py:284
+msgid "child:"
+msgstr "enfant :"
+
+#: tortoisehg\hgtk\changeset.py:287 tortoisehg\hgtk\csinfo.py:116
+#: tortoisehg\hgtk\csinfo.py:117
+msgid "tags:"
+msgstr "labels :"
+
+#: tortoisehg\hgtk\changeset.py:294 tortoisehg\hgtk\changeset.py:296
+msgid "transplant:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:324
+msgid "patch:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:365
+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:374
+msgid "Repository Error: %s, refresh suggested"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:421
+msgid "[no hunks to display]"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:499 tortoisehg\hgtk\status.py:1504
+msgid "_Visual Diff"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:500
+msgid "Diff to _local"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:502
+msgid "_View at Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:503
+msgid "_Save at Revision..."
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:507
+msgid "_File History"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:508
+msgid "_Annotate File"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:511
+msgid "_Revert File Contents"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:572
+msgid "Stat"
+msgstr "Stats"
+
+#: tortoisehg\hgtk\changeset.py:574 tortoisehg\hgtk\hgignore.py:128
msgid "Files"
msgstr "Fichiers"
-#: hggtk\clone.py:47
-msgid "Source Path:"
-msgstr "Chemin Source :"
-
-#: hggtk\clone.py:65 hggtk\clone.py:101
-msgid "Browse..."
-msgstr "Parcourir..."
-
-#: hggtk\clone.py:84
-msgid "Destination Path:"
-msgstr "Chemin Cible :"
-
-#: hggtk\clone.py:116
-msgid "Clone To Revision:"
-msgstr "Cloner vers version :"
-
-#: hggtk\clone.py:127
-msgid "do not update the new working directory"
-msgstr "ne pas mettre à jour le répertoire de travail"
-
-#: hggtk\clone.py:128
-msgid "use pull protocol to copy metadata"
-msgstr "utiliser le protocole de retrait pour copier les métadatas"
-
-#: hggtk\clone.py:129
-msgid "use uncompressed transfer"
-msgstr "utiliser un transfert sans compression"
-
-#: hggtk\clone.py:130 hggtk\synch.py:150
-msgid "use proxy server"
-msgstr "utiliser un serveur proxy"
-
-#: hggtk\clone.py:143
-msgid "Remote Cmd:"
-msgstr "Cmd à distance :"
-
-#: hggtk\clone.py:232
+#: tortoisehg\hgtk\changeset.py:589
+msgid "Diff to second Parent"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:720
+msgid "Save file to"
+msgstr "Enregistrer le fichier sous"
+
+#: tortoisehg\hgtk\changeset.py:726 tortoisehg\hgtk\history.py:1711
+#: tortoisehg\hgtk\history.py:1740
+msgid ""
+"The file \"%s\" already exists!\n"
+"\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:802
+msgid "Confirm revert file to old revision"
+msgstr "Confirmer le retour à l'ancienne version"
+
+#: tortoisehg\hgtk\changeset.py:803
+msgid "Revert %s to contents at revision %d?"
+msgstr "Faire revenir %s à la version %d ?"
+
+#: tortoisehg\hgtk\changeset.py:815 tortoisehg\hgtk\synch.py:672
+msgid "Toggle _Wordwrap"
+msgstr "Activer/déactiver le retour à la ligne"
+
+#: tortoisehg\hgtk\clone.py:28
+msgid "TortoiseHg Clone"
+msgstr "Clonage TortoiseHg"
+
+#: tortoisehg\hgtk\clone.py:36
+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:68
+msgid "Advanced options"
+msgstr ""
+
+#: 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:228
+#: tortoisehg\hgtk\synch.py:184
+msgid "Use proxy server"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:147 tortoisehg\hgtk\synch.py:205
+msgid "Remote command:"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:276
msgid "Source path is empty"
msgstr "Le chemin source est vide"
-#: hggtk\clone.py:238
-msgid "Source and dest are the same"
-msgstr "Source et cible sont identiques"
-
-#: hggtk\clone.py:239
-msgid "Please specify a different destination"
-msgstr "Spécifiez une destination différente"
-
-#: hggtk\clone.py:284
-msgid "Clone aborted"
-msgstr "Clonage annulé"
-
-#: hggtk\clone.py:287
-msgid "Clone error"
-msgstr "Erreur de clônage"
-
-#: hggtk\commit.py:164
+#: tortoisehg\hgtk\clone.py:277
+msgid "Please enter a valid source path"
+msgstr "Veuillez entrer un chemin origine valide"
+
+#: tortoisehg\hgtk\clone.py:282
+msgid "Source and destination are the same"
+msgstr ""
+
+#: tortoisehg\hgtk\clone.py:283
+msgid "Please specify different paths"
+msgstr ""
+
+#: 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:34
+msgid "Branch Operations"
+msgstr "Opérations de branches"
+
+#: tortoisehg\hgtk\commit.py:39
+msgid "Select branch of merge commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:51
+msgid "Changes take effect on next commit"
+msgstr "Les changements prendront effet au prochain envoi"
+
+#: tortoisehg\hgtk\commit.py:52
+msgid "No branch changes"
+msgstr "Aucun changement de branche"
+
+#: tortoisehg\hgtk\commit.py:54
+msgid "Open a new named branch"
+msgstr "Ouvrir une nouvelle branche spécifiée"
+
+#: tortoisehg\hgtk\commit.py:56
+msgid "Close current named branch"
+msgstr "Fermer la branche spécifiée courante"
+
+#: tortoisehg\hgtk\commit.py:183 tortoisehg\hgtk\history.py:170
+msgid "_View"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:184
+msgid "Advanced"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:186 tortoisehg\hgtk\history.py:680
+#: tortoisehg\hgtk\history.py:993
+msgid "Parents"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:189 tortoisehg\hgtk\hgignore.py:138
+#: tortoisehg\hgtk\history.py:183
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: tortoisehg\hgtk\commit.py:190
+msgid "_Operations"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:191 tortoisehg\hgtk\commit.py:237
+#: tortoisehg\hgtk\commit.py:593
+msgid "_Commit"
+msgstr "_Committer"
+
+#: tortoisehg\hgtk\commit.py:193 tortoisehg\hgtk\commit.py:235
msgid "_Undo"
msgstr "Ann_uler"
-#: hggtk\commit.py:165
+#: tortoisehg\hgtk\commit.py:196 tortoisehg\hgtk\status.py:158
+msgid "_Diff"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:198 tortoisehg\hgtk\status.py:161
+msgid "Re_vert"
+msgstr "Re_venir"
+
+#: tortoisehg\hgtk\commit.py:200 tortoisehg\hgtk\status.py:164
+#: tortoisehg\hgtk\status.py:1514 tortoisehg\hgtk\thgconfig.py:903
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: tortoisehg\hgtk\commit.py:202 tortoisehg\hgtk\status.py:170
+#: tortoisehg\hgtk\thgconfig.py:913
+msgid "_Remove"
+msgstr "_Supprimer"
+
+#: tortoisehg\hgtk\commit.py:204 tortoisehg\hgtk\status.py:167
+msgid "Move"
+msgstr "Déplacer"
+
+#: tortoisehg\hgtk\commit.py:206 tortoisehg\hgtk\status.py:173
+#: tortoisehg\hgtk\status.py:1513
+msgid "_Forget"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:236
msgid "undo recent commit"
msgstr "Annuler"
-#: hggtk\commit.py:166 hggtk\commit.py:374 hggtk\commit.py:383
-#: hggtk\commit.py:391 hggtk\commit.py:392
-msgid "_Commit"
-msgstr "_Committer"
-
-#: hggtk\commit.py:167 hggtk\commit.py:393
+#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:477
msgid "commit"
msgstr "commiter"
-#: hggtk\commit.py:180
+#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\merge.py:168
+#: tortoisehg\hgtk\thgconfig.py:710
+msgid "Confirm Exit"
+msgstr "Confirmer la fermeture"
+
+#: tortoisehg\hgtk\commit.py:251
+msgid "Save commit message at exit?"
+msgstr "Sauvegarder le message de commit lors de la sortie ?"
+
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:962
+#: tortoisehg\hgtk\commit.py:966 tortoisehg\hgtk\history.py:77
+#: tortoisehg\hgtk\status.py:1269 tortoisehg\hgtk\status.py:1288
+#: tortoisehg\hgtk\status.py:1581 tortoisehg\hgtk\thgconfig.py:713
+#: tortoisehg\hgtk\update.py:231
+msgid "&Cancel"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:962
+#: tortoisehg\hgtk\commit.py:966 tortoisehg\hgtk\status.py:1581
+#: tortoisehg\hgtk\thgconfig.py:712
+msgid "&Yes"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:962
+#: tortoisehg\hgtk\commit.py:966 tortoisehg\hgtk\thgstrip.py:362
+msgid "&No"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:294
+msgid "Committer:"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:308
+msgid "Auto-includes:"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:311
+msgid "Push after commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:344
+msgid "Recent commit messages..."
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:389
+msgid "not at head revision"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:411 tortoisehg\hgtk\status.py:479
+msgid "Patch Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:413 tortoisehg\hgtk\status.py:483
+msgid "Commit Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:436
msgid "Discard current commit message?"
msgstr "Oublier le message de commit actuel ?"
-#: hggtk\commit.py:240
-msgid "Recent Commit Messages..."
-msgstr "Messages de commit récents..."
-
-#: hggtk\commit.py:303
-msgid "Save commit message at exit?"
-msgstr "Sauvegarder le message de commit lors de la sortie ?"
-
-#: hggtk\commit.py:344 hggtk\status.py:204
-msgid "Re_vert"
-msgstr "Re_venir"
-
-#: hggtk\commit.py:345 hggtk\status.py:206 hggtk\thgconfig.py:748
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: hggtk\commit.py:346 hggtk\status.py:211 hggtk\thgconfig.py:758
-msgid "_Remove"
-msgstr "_Supprimer"
-
-#: hggtk\commit.py:347 hggtk\status.py:208
-msgid "Move"
-msgstr "Déplacer"
-
-#: hggtk\commit.py:358
-msgid "merge"
-msgstr "fusionner"
-
-#: hggtk\commit.py:376 hggtk\commit.py:377 hggtk\commit.py:384
-#: hggtk\commit.py:385
+#: tortoisehg\hgtk\commit.py:476 tortoisehg\hgtk\commit.py:738
+#: tortoisehg\hgtk\commit.py:788 tortoisehg\hgtk\gdialog.py:452
+#: tortoisehg\hgtk\merge.py:93 tortoisehg\hgtk\thgconfig.py:598
+msgid "Commit"
+msgstr "Envoyer"
+
+#: tortoisehg\hgtk\commit.py:480
msgid "QNew"
msgstr "QNouveau"
-#: hggtk\commit.py:380 hggtk\commit.py:381
+#: tortoisehg\hgtk\commit.py:481
+msgid "create new MQ patch"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:483
msgid "QRefresh"
msgstr "QRafraîchir"
-#: hggtk\commit.py:416 hggtk\commit.py:566
+#: tortoisehg\hgtk\commit.py:484
+msgid "refresh top MQ patch"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:486
+msgid "_Commit (+1 head)"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:486
+msgid "_Commit (-1 head)"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:491
+msgid "parent is not a head, commit to add a new head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:496
+msgid "commit to merge one head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:499
+msgid "no parent is a head, commit to add a new head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:603
+msgid "new branch: "
+msgstr "nouvelle branche : "
+
+#: tortoisehg\hgtk\commit.py:605
+msgid "close branch: "
+msgstr "fermer une branche : "
+
+#: tortoisehg\hgtk\commit.py:607
+msgid "branch: "
+msgstr "branche : "
+
+#: tortoisehg\hgtk\commit.py:626
+msgid "Merge "
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:662
+msgid "Patch Contents"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:720 tortoisehg\hgtk\commit.py:873
msgid "Nothing Commited"
msgstr "Rien n'a été envoyé"
-#: hggtk\commit.py:434 hggtk\commit.py:484 hggtk\merge.py:83
-#: hggtk\thgconfig.py:467
-msgid "Commit"
-msgstr "Envoyer"
-
-#: hggtk\commit.py:435
+#: tortoisehg\hgtk\commit.py:721
+msgid "No committable files selected"
+msgstr "aucun des fichiers sélectionnés n'est envoyable"
+
+#: tortoisehg\hgtk\commit.py:739
msgid "Unable to create "
msgstr "Impossible de créer "
-#: hggtk\commit.py:485
+#: tortoisehg\hgtk\commit.py:789
msgid "Unable to apply patch"
msgstr "Impossible d'effectuer la mise à jour."
-#: hggtk\commit.py:524
+#: tortoisehg\hgtk\commit.py:818
+msgid "Confirm Undo Commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:819
msgid "Undo last commit"
msgstr "Défaire le dernier envoi"
-#: hggtk\commit.py:530 hggtk\commit.py:545
-msgid "Undo commit"
-msgstr "Défaire l'envoi"
-
-#: hggtk\commit.py:531
+#: tortoisehg\hgtk\commit.py:825 tortoisehg\hgtk\commit.py:840
+msgid "Undo Commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:826
msgid ""
"Unable to undo!\n"
"\n"
@@ -221,19 +726,68 @@"\n"
"la version du dessus est différente de celle du dernier envoi."
-#: hggtk\commit.py:546
+#: tortoisehg\hgtk\commit.py:841
msgid "Errors during rollback!"
msgstr "Erreur lors du retour en arrière !"
-#: hggtk\commit.py:567 hggtk\tagadd.py:174
+#: tortoisehg\hgtk\commit.py:854
+msgid "Confirm Add/Remove"
+msgstr "Confiermer Ajouter/Supprimer"
+
+#: tortoisehg\hgtk\commit.py:855
+msgid "Add/Remove the following files?"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:874 tortoisehg\hgtk\tagadd.py:159
msgid "Please enter commit message"
msgstr "Tapez le message d'envoi"
-#: hggtk\commit.py:620
+#: tortoisehg\hgtk\commit.py:882
+msgid "Error"
+msgstr "Erreur"
+
+#: tortoisehg\hgtk\commit.py:883
+msgid "Message format configuration error"
+msgstr "Erreur de configuration du format de message"
+
+#: tortoisehg\hgtk\commit.py:892 tortoisehg\hgtk\commit.py:900
+#: tortoisehg\hgtk\commit.py:912
+msgid "Confirm Commit"
+msgstr "Confirmer l'envoi"
+
+#: tortoisehg\hgtk\commit.py:893
+msgid ""
+"The summary line length of %i is greater than %i.\n"
+"\n"
+"Ignore format policy and continue commit?"
+msgstr ""
+"La longueur de la ligne de compte-rendu de %i est plus longue que %i."
+
+#: tortoisehg\hgtk\commit.py:901
+msgid ""
+"The summary line is not followed by a blank line.\n"
+"\n"
+"Ignore format policy and continue commit?"
+msgstr ""
+"La ligne de compte-rendu n'est pas suivie d'une ligne vide.\n"
+"\n"
+"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
+
+#: tortoisehg\hgtk\commit.py:913
+msgid ""
+"The following lines are over the %i-character limit: %s.\n"
+"\n"
+"Ignore format policy and continue commit?"
+msgstr ""
+"Les lignes suivantes dépassent la limit de %i caractères: %s.\n"
+"\n"
+"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
+
+#: tortoisehg\hgtk\commit.py:925
msgid "Commit: Invalid username"
msgstr "Envoi : nom d'utilisateur invalide"
-#: hggtk\commit.py:621
+#: tortoisehg\hgtk\commit.py:926
msgid ""
"Your username has not been configured.\n"
"\n"
@@ -243,7 +797,11 @@"\n"
"Veuillez le définir et réessayer."
-#: hggtk\commit.py:644
+#: tortoisehg\hgtk\commit.py:959
+msgid "Confirm Override Branch"
+msgstr "Confirmer l'écrasement de branche"
+
+#: tortoisehg\hgtk\commit.py:960
msgid ""
"A branch named \"%s\" already exists,\n"
"override?"
@@ -251,82 +809,164 @@"Une branche appelée \"%s\" existe déjà ,\n"
"la remplacer ?"
-#: hggtk\commit.py:650
+#: tortoisehg\hgtk\commit.py:964
+msgid "Confirm New Branch"
+msgstr "Confirmer la création de nouvelle branche"
+
+#: tortoisehg\hgtk\commit.py:965
msgid "Create new named branch \"%s\"?"
msgstr "Créer une nouvelle branche \"%s\" ?"
-#: hggtk\commit.py:748 hggtk\hgemail.py:307 hggtk\hgemail.py:312
-#: hggtk\hgemail.py:321
-msgid "Info required"
-msgstr "Information requise"
-
-#: hggtk\datamine.py:36
-msgid "DataMining"
-msgstr "Analyse de données"
-
-#: hggtk\datamine.py:45 hggtk\hgcmd.py:42 hggtk\recovery.py:43
-#: hggtk\serve.py:61 hggtk\synch.py:61
+#: tortoisehg\hgtk\commit.py:1040
+msgid "Paste _Filenames"
+msgstr "Coller Noms de _Fichiers"
+
+#: tortoisehg\hgtk\commit.py:1041
+msgid "App_ly Format"
+msgstr "App_liquer Format"
+
+#: tortoisehg\hgtk\commit.py:1042
+msgid "C_onfigure Format"
+msgstr "C_onfigurer Format"
+
+#: tortoisehg\hgtk\commit.py:1068
+msgid "Info Required"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1069
+msgid "Message format needs to be configured"
+msgstr "le format de message doit être configuré"
+
+#: tortoisehg\hgtk\commit.py:1081 tortoisehg\hgtk\commit.py:1086
+msgid "Warning"
+msgstr "Avertissement"
+
+#: tortoisehg\hgtk\commit.py:1082
+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:1087
+msgid "The summary line is not followed by a blank line"
+msgstr "La ligne de description n'est pas suivie d'une ligne vide."
+
+#: tortoisehg\hgtk\csinfo.py:47
+msgid "failed to get repo: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:108
+msgid "unknown 'type': %s"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:110
+msgid "must be specified 'type' in style"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:114
+msgid "rev:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:115
+msgid "summary:"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:47
+msgid "%s - datamine"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:56 tortoisehg\hgtk\hgcmd.py:46
+#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\serve.py:62
+#: tortoisehg\hgtk\synch.py:59
msgid "Stop"
msgstr "Arrêter"
-#: hggtk\datamine.py:47
+#: tortoisehg\hgtk\datamine.py:58
msgid "Stop operation on current tab"
msgstr "Annuler les opérations sur l'onglet courant."
-#: hggtk\datamine.py:49
+#: tortoisehg\hgtk\datamine.py:60
msgid "New Search"
msgstr "Nouvelle recherche"
-#: hggtk\datamine.py:51
+#: tortoisehg\hgtk\datamine.py:62
msgid "Open new search tab"
msgstr "Ouvrir un nouvel onglet de recherche"
-#: hggtk\datamine.py:62 hggtk\thgconfig.py:952
+#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1110
msgid "Invalid path"
msgstr "Chemin non valide"
-#: hggtk\datamine.py:63
+#: tortoisehg\hgtk\datamine.py:74
msgid "Cannot annotate directory: %s"
msgstr "Impossible d'annoter le répertoire : %s"
-#: hggtk\datamine.py:105
+#: tortoisehg\hgtk\datamine.py:128
msgid "Filename"
msgstr "Nom de fichier"
-#: hggtk\datamine.py:108 hggtk\datamine.py:543 hggtk\logview\treeview.py:424
-#: hggtk\thgconfig.py:162 hggtk\thgconfig.py:235
+#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:634
+#: tortoisehg\hgtk\history.py:331 tortoisehg\hgtk\history.py:1030
+#: tortoisehg\hgtk\logview\treeview.py:444 tortoisehg\hgtk\thgconfig.py:192
+#: tortoisehg\hgtk\thgconfig.py:275
msgid "User"
msgstr "Utilisateur"
-#: hggtk\datamine.py:116 hggtk\datamine.py:125 hggtk\history.py:391
+#: tortoisehg\hgtk\datamine.py:139 tortoisehg\hgtk\datamine.py:149
msgid "di_splay change"
msgstr "afficher les changement_s"
-#: hggtk\datamine.py:217
+#: 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
+msgid "No parent file"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:177
+msgid "Unable to annotate"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:301
msgid "Search"
msgstr "Chercher"
-#: hggtk\datamine.py:218 hggtk\hgignore.py:51
+#: tortoisehg\hgtk\datamine.py:302 tortoisehg\hgtk\hgignore.py:61
msgid "Regexp:"
msgstr "Expression régulière :"
-#: hggtk\datamine.py:220
+#: tortoisehg\hgtk\datamine.py:304
msgid "Includes:"
msgstr "Inclus :"
-#: hggtk\datamine.py:222
+#: tortoisehg\hgtk\datamine.py:306
msgid "Excludes:"
msgstr "Exclus :"
-#: hggtk\datamine.py:225
+#: tortoisehg\hgtk\datamine.py:309
msgid "Start this search"
msgstr "Lancer cette recherche"
-#: hggtk\datamine.py:226
+#: tortoisehg\hgtk\datamine.py:310
msgid "Regular expression search pattern"
msgstr "Expression régulière de recherche"
-#: hggtk\datamine.py:227
+#: tortoisehg\hgtk\datamine.py:311
msgid ""
"Comma separated list of inclusion patterns. By default, the entire "
"repository is searched."
@@ -334,7 +974,7 @@"Liste des règles d'inclusion, séparées par des virgules. Par défaut, le "
"dépôt entier est parcouru."
-#: hggtk\datamine.py:230
+#: tortoisehg\hgtk\datamine.py:314
msgid ""
"Comma separated list of exclusion patterns. Exclusion patterns are applied "
"after inclusion patterns."
@@ -342,155 +982,246 @@"Liste des règles d'exclusion, séparées par des virgules. Par défaut, le "
"dépôt entier est parcouru."
-#: hggtk\datamine.py:236
+#: tortoisehg\hgtk\datamine.py:320
msgid "Follow copies and renames"
msgstr "Suivre les copies et les changements de noms"
-#: hggtk\datamine.py:237
+#: tortoisehg\hgtk\datamine.py:321
msgid "Ignore case"
msgstr "Ignorer la casse"
-#: hggtk\datamine.py:238
+#: tortoisehg\hgtk\datamine.py:322
msgid "Show line numbers"
msgstr "Afficher les numéros de ligne"
-#: hggtk\datamine.py:239
+#: tortoisehg\hgtk\datamine.py:323
msgid "Show all matching revisions"
msgstr "Afficher toutes les versions correspondantes"
-#: hggtk\datamine.py:267 hggtk\datamine.py:541 hggtk\logview\treeview.py:373
+#: tortoisehg\hgtk\datamine.py:355 tortoisehg\hgtk\datamine.py:632
+#: tortoisehg\hgtk\logview\treeview.py:395
msgid "Rev"
msgstr "Ver"
-#: hggtk\datamine.py:268 hggtk\datamine.py:542
+#: tortoisehg\hgtk\datamine.py:356 tortoisehg\hgtk\datamine.py:633
msgid "File"
msgstr "Fichier"
-#: hggtk\datamine.py:269
+#: tortoisehg\hgtk\datamine.py:357
msgid "Matches"
msgstr "Correspondances"
-#: hggtk\datamine.py:291
+#: tortoisehg\hgtk\datamine.py:379
msgid "Search %d"
msgstr "Recherche %d"
-#: hggtk\datamine.py:333
+#: tortoisehg\hgtk\datamine.py:422
msgid "No regular expression given"
msgstr "Aucune expression régulière fournie"
-#: hggtk\datamine.py:334
+#: tortoisehg\hgtk\datamine.py:423
msgid "You must provide a search expression"
msgstr "Vous devez fournir une expression régulière"
-#: hggtk\datamine.py:376
+#: tortoisehg\hgtk\datamine.py:429
+msgid "Invalid regular expression"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:430 tortoisehg\hgtk\thgshelve.py:210
+msgid "Error: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:452 tortoisehg\hgtk\history.py:1280
+msgid "Abort: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:464
msgid "Search \"%s\""
msgstr "Recherche \"%s\""
-#: hggtk\datamine.py:491
+#: tortoisehg\hgtk\datamine.py:579
msgid "File is unrevisioned"
msgstr "Le fichier n'est pas suivi"
-#: hggtk\datamine.py:492
+#: tortoisehg\hgtk\datamine.py:580
msgid "Unable to annotate "
msgstr "Impossible d'annoter "
-#: hggtk\datamine.py:512
-msgid "Follow"
-msgstr "Suivre"
-
-#: hggtk\datamine.py:540
+#: tortoisehg\hgtk\datamine.py:631
msgid "Line"
msgstr "Ligne"
-#: hggtk\datamine.py:544 hggtk\guess.py:100
+#: tortoisehg\hgtk\datamine.py:635 tortoisehg\hgtk\guess.py:158
msgid "Source"
msgstr "Source"
-#: hggtk\datamine.py:636
-msgid "Follow Rename:"
-msgstr "Suivre le changement de nom :"
-
-#: hggtk\dialog.py:33
+#: tortoisehg\hgtk\datamine.py:693
+msgid "Loading history..."
+msgstr ""
+
+#: tortoisehg\hgtk\dialog.py:34
msgid "TortoiseHg Prompt"
msgstr "Ligne de commande TortoiseHg"
-#: hggtk\gdialog.py:390
+#: tortoisehg\hgtk\gdialog.py:449
+msgid "_Tools"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:450 tortoisehg\hgtk\thgconfig.py:601
+msgid "Changelog"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:454
+msgid "Datamine"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:456
+msgid "Recovery"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:458
+msgid "Serve"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:460 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:462 tortoisehg\hgtk\history.py:110
+#: tortoisehg\util\menuthg.py:71
+msgid "Synchronize"
+msgstr "Synchroniser"
+
+#: tortoisehg\hgtk\gdialog.py:464
+msgid "Settings"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:467
+msgid "_Help"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:468
+msgid "Contents"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:470 tortoisehg\hgtk\taskbarui.py:31
+msgid "About"
+msgstr "À propos"
+
+#: tortoisehg\hgtk\gdialog.py:567
msgid " Aborted"
msgstr " annulé(e)"
-#: hggtk\gdialog.py:401
+#: tortoisehg\hgtk\gdialog.py:578
msgid " Messages and Errors"
msgstr " Messages et Erreurs"
-#: hggtk\gdialog.py:472
+#: tortoisehg\hgtk\gdialog.py:621
msgid "making snapshot of %d files from rev %s\n"
msgstr "création de l'instantané de %d fichiers depuis la revision %s\n"
-#: hggtk\gdialog.py:505
+#: tortoisehg\hgtk\gdialog.py:656
msgid "edit failed"
msgstr "erreur d'édition"
-#: hggtk\gdialog.py:513 hggtk\thgconfig.py:545
+#: tortoisehg\hgtk\gdialog.py:664 tortoisehg\hgtk\thgconfig.py:684
msgid "No visual editor configured"
msgstr "Aucun éditeur graphique spécifié"
-#: hggtk\gdialog.py:514 hggtk\thgconfig.py:546
+#: tortoisehg\hgtk\gdialog.py:665 tortoisehg\hgtk\thgconfig.py:685
msgid "Please configure a visual editor."
msgstr "Veuillez spécifier un éditeur graphique."
-#: hggtk\gtklib.py:95
-msgid "Running"
-msgstr "En cours"
-
-#: hggtk\gtklib.py:101
-msgid "Done"
-msgstr "Terminé"
-
-#: hggtk\gtklib.py:183
+#: tortoisehg\hgtk\gorev.py:26
+msgid "Select"
+msgstr ""
+
+#: tortoisehg\hgtk\gorev.py:30
+msgid "Select Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\gorev.py:43
+msgid "revision number, changeset ID, branch or tag"
+msgstr ""
+
+#: tortoisehg\hgtk\gorev.py:58
+msgid "Invalid Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\gtklib.py:145
msgid "Save File"
msgstr "Enregistrer le fichier"
-#: hggtk\guess.py:48
-msgid "Detect Copies/Renames in "
-msgstr "Détecte les copies et changements de noms dans "
-
-#: hggtk\guess.py:57
+#: tortoisehg\hgtk\gtklib.py:146
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: tortoisehg\hgtk\gtklib.py:236
+msgid "Select Folder"
+msgstr "Sélectionner le répertoire"
+
+#: tortoisehg\hgtk\gtklib.py:623
+msgid ""
+"Select language for spell checking.\n"
+"\n"
+"Empty is for the default language.\n"
+"When all text is highlited, the dictionary\n"
+"is probably not installed.\n"
+"\n"
+"examples: en, en_GB, en_US"
+msgstr ""
+
+#: tortoisehg\hgtk\gtklib.py:629
+msgid "Lang \"%s\" can not be set.\n"
+msgstr ""
+
+#: tortoisehg\hgtk\gtklib.py:642 tortoisehg\hgtk\thgconfig.py:589
+msgid "Spell Check Language"
+msgstr ""
+
+#: tortoisehg\hgtk\guess.py:53
+msgid "Detect Copies/Renames in %s"
+msgstr ""
+
+#: tortoisehg\hgtk\guess.py:73
msgid "Minimum Simularity Percentage"
msgstr "Pourcentage de similitude minimal"
-#: hggtk\guess.py:77
+#: tortoisehg\hgtk\guess.py:90
+msgid "Unrevisioned Files"
+msgstr "FIchiers non suivis"
+
+#: tortoisehg\hgtk\guess.py:121
msgid "Find Renames"
msgstr "Cherche les changements de noms"
-#: hggtk\guess.py:78
+#: tortoisehg\hgtk\guess.py:124
msgid "Find Copies"
msgstr "Cherche les Copies"
-#: hggtk\guess.py:86
-msgid "Unrevisioned Files"
-msgstr "FIchiers non suivis"
-
-#: hggtk\guess.py:107
+#: tortoisehg\hgtk\guess.py:129
+msgid "Candidate Matches"
+msgstr "Occurences possibles"
+
+#: tortoisehg\hgtk\guess.py:165
msgid "Dest"
msgstr "Cibl"
-#: hggtk\guess.py:125
+#: tortoisehg\hgtk\guess.py:181
msgid "Accept Match"
msgstr "Accepte l'occurence"
-#: hggtk\guess.py:131
-msgid "Candidate Matches"
-msgstr "Occurences possibles"
-
-#: hggtk\guess.py:142
+#: tortoisehg\hgtk\guess.py:186
msgid "Differences from Source to Dest"
msgstr "Différences entre Source et Cible"
-#: hggtk\guess.py:238
+#: tortoisehg\hgtk\guess.py:273
msgid "finding source of "
msgstr "recherche de la source de "
-#: hggtk\guess.py:350
+#: tortoisehg\hgtk\guess.py:372
msgid ""
"== %s and %s have identical contents ==\n"
"\n"
@@ -498,7 +1229,7 @@"== %s et %s ont des contenus identiques ==\n"
"\n"
-#: hggtk\hgcmd.py:154
+#: tortoisehg\hgtk\hgcmd.py:181 tortoisehg\hgtk\hgcmd.py:516
msgid ""
"\n"
"[command interrupted]"
@@ -506,67 +1237,100 @@"\n"
"[commande interrompue]"
-#: hggtk\hgemail.py:37
-msgid "send"
-msgstr "envoyer"
-
-#: hggtk\hgemail.py:39
-msgid "Send email(s)"
-msgstr "Envoyer des emails"
-
-#: hggtk\hgemail.py:40
-msgid "test"
-msgstr "test"
-
-#: hggtk\hgemail.py:42
-msgid "Show email(s) which would be sent"
-msgstr "Affiche l'e-mail(s) Ã envoyer"
-
-#: hggtk\hgemail.py:44
-msgid "configure"
-msgstr "configurer"
-
-#: hggtk\hgemail.py:46
+#: tortoisehg\hgtk\hgcmd.py:267
+msgid "unknown CmdWidget style: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:280
+msgid "Toggle log window"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:313
+msgid "Stop transaction"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:315
+msgid "Close this"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:451 tortoisehg\hgtk\hgcmd.py:468
+msgid "invalid state"
+msgstr ""
+
+#: tortoisehg\hgtk\hgcmd.py:599
+msgid "Command Log"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:38
+msgid "Send"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:40
+msgid "Send emails"
+msgstr ""
+
+#: 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
+#: tortoisehg\hgtk\synch.py:96
+msgid "Configure"
+msgstr "Configurer"
+
+#: tortoisehg\hgtk\hgemail.py:47
msgid "Configure email settings"
msgstr "Configure les réglages d'e-mail"
-#: hggtk\hgemail.py:56
+#: tortoisehg\hgtk\hgemail.py:57
msgid "Email outgoing changes"
msgstr "Envoie par e-mail les changements à faire"
-#: hggtk\hgemail.py:58
-msgid "Email revision(s) "
-msgstr "Envoyer par e-mail les versions "
-
-#: hggtk\hgemail.py:60
+#: 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"
-#: hggtk\hgemail.py:64
+#: tortoisehg\hgtk\hgemail.py:65
msgid "Envelope"
msgstr "Enveloppe"
-#: hggtk\hgemail.py:65 hggtk\taskbarui.py:45
+#: tortoisehg\hgtk\hgemail.py:66 tortoisehg\hgtk\taskbarui.py:47
msgid "Options"
msgstr "Options"
-#: hggtk\hgemail.py:77
+#: tortoisehg\hgtk\hgemail.py:78
msgid "To:"
msgstr "À:"
-#: hggtk\hgemail.py:88
+#: tortoisehg\hgtk\hgemail.py:89
msgid "Cc:"
msgstr "Copie à :"
-#: hggtk\hgemail.py:99
+#: tortoisehg\hgtk\hgemail.py:100
msgid "From:"
msgstr "De:"
-#: hggtk\hgemail.py:121
+#: tortoisehg\hgtk\hgemail.py:109
+msgid "In-Reply-To:"
+msgstr "Réponse à :"
+
+#: tortoisehg\hgtk\hgemail.py:116
+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."
-#: hggtk\hgemail.py:124
+#: tortoisehg\hgtk\hgemail.py:125
msgid ""
"HG patches (as generated by export command) are compatible with most patch "
"programs. They include a header which contains the most important changeset "
@@ -576,11 +1340,11 @@"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."
-#: hggtk\hgemail.py:129
+#: tortoisehg\hgtk\hgemail.py:130
msgid "Use extended (git) patch format"
msgstr "Utiliser le format de mise à jour étendu (git)"
-#: hggtk\hgemail.py:132
+#: tortoisehg\hgtk\hgemail.py:133
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 "
@@ -590,11 +1354,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."
-#: hggtk\hgemail.py:137
+#: 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."
-#: hggtk\hgemail.py:140
+#: tortoisehg\hgtk\hgemail.py:141
msgid ""
"Stripping Mercurial header removes username and parent information. Only "
"useful if recipient is not using Mercurial (and does not like to see the "
@@ -604,12 +1368,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)."
-#: hggtk\hgemail.py:145
+#: tortoisehg\hgtk\hgemail.py:146
msgid "Send single binary bundle, not patches"
msgstr ""
"Envoyer un seul fichier binaire pour tout, pas plusieurs mises à jour."
-#: hggtk\hgemail.py:148
+#: tortoisehg\hgtk\hgemail.py:150
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 "
@@ -619,227 +1383,199 @@"utilisateurs en âmont peuvent retirer depuis ces fichiers. C'est le moyen le "
"plus simples d'envoyer des modifications à des utilisateurs de Mercurial."
-#: hggtk\hgemail.py:155
+#: tortoisehg\hgtk\hgemail.py:156
+msgid ""
+"This feature is only available when sending outgoing changesets. It is not "
+"applicable with revision ranges."
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:162
msgid "attach"
msgstr "joindre"
-#: hggtk\hgemail.py:157
+#: tortoisehg\hgtk\hgemail.py:164
msgid "send patches as attachments"
msgstr "envoyer les mise à jour comme pièces jointes"
-#: hggtk\hgemail.py:158
+#: tortoisehg\hgtk\hgemail.py:165
msgid "inline"
msgstr "en ligne"
-#: hggtk\hgemail.py:160
+#: tortoisehg\hgtk\hgemail.py:167
msgid "send patches as inline attachments"
msgstr "envoyer les mise à jour directement inclues dans le mail"
-#: hggtk\hgemail.py:161
+#: tortoisehg\hgtk\hgemail.py:168
msgid "diffstat"
msgstr "diffstat"
-#: hggtk\hgemail.py:163
+#: tortoisehg\hgtk\hgemail.py:170
msgid "add diffstat output to messages"
msgstr "ajouter les infos diffstats aux messages"
-#: hggtk\hgemail.py:172
+#: tortoisehg\hgtk\hgemail.py:179
msgid "Subject:"
msgstr "Objet:"
-#: hggtk\hgemail.py:184
+#: tortoisehg\hgtk\hgemail.py:193
+msgid "Flags:"
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:205
msgid "Patch Series (Bundle) Description"
msgstr "Description du groupe de mises à jour"
-#: hggtk\hgemail.py:236
-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 "
-"mise à jour."
-
-#: hggtk\hgemail.py:239
+#: tortoisehg\hgtk\hgemail.py:246
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. "
-"When emailing a bundle, these fields make up the message subject and body."
-msgstr ""
-"La description du groupe de mises à jour est envoyée dans un mail de résumé "
-"initial avec l'objet [MAJ 0 of N]. Elle devrait décrire les effets de "
-"l'ensemble des mise à jour. Quand vous envoyez un groupe par e-mail, l'objet "
-"et le texte du mail sont générés par ces champs."
-
-#: hggtk\hgemail.py:308
+"When emailing a bundle, these fields make up the message subject and body. "
+"Flags is a comma separated list of tags which are inserted into the message "
+"header."
+msgstr ""
+
+#: tortoisehg\hgtk\hgemail.py:293 tortoisehg\hgtk\hgemail.py:298
+#: tortoisehg\hgtk\hgemail.py:307
+msgid "Info required"
+msgstr "Information requise"
+
+#: tortoisehg\hgtk\hgemail.py:294
msgid "You must specify a recipient"
msgstr "Vous devez spécifier un destinataire."
-#: hggtk\hgemail.py:313
+#: tortoisehg\hgtk\hgemail.py:299
msgid "You must specify a sender address"
msgstr "Vous devez spécifier une adresse d'expédition"
-#: hggtk\hgemail.py:322
+#: tortoisehg\hgtk\hgemail.py:308
msgid "You must configure SMTP"
msgstr "Vous devez configurer le SMTP"
-#: hggtk\hgignore.py:29
-msgid "Ignore filter for "
-msgstr "Ignorer le filtre pour "
-
-#: hggtk\hgignore.py:36
+#: tortoisehg\hgtk\hgignore.py:35
+msgid "Ignore filter - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\hgignore.py:51 tortoisehg\hgtk\hgignore.py:59
+#: tortoisehg\hgtk\tagadd.py:37
+msgid "Add"
+msgstr "Ajouter"
+
+#: tortoisehg\hgtk\hgignore.py:53
msgid "Glob:"
msgstr "Glob:"
-#: hggtk\hgignore.py:81
+#: tortoisehg\hgtk\hgignore.py:76
+msgid "Apply to:"
+msgstr ""
+
+#: tortoisehg\hgtk\hgignore.py:84
msgid "Filters"
msgstr "Filtres"
-#: hggtk\hgignore.py:88
+#: tortoisehg\hgtk\hgignore.py:100
msgid "Patterns"
msgstr "Règles"
-#: hggtk\hgignore.py:99
+#: tortoisehg\hgtk\hgignore.py:108
msgid "Remove Selected"
msgstr "Supprimer la sélection"
-#: hggtk\hgignore.py:107
+#: tortoisehg\hgtk\hgignore.py:114
msgid "Unknown Files"
msgstr "Fichiers inconnus"
-#: hggtk\hgignore.py:124
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: hggtk\hginit.py:64
+#: tortoisehg\hgtk\hgignore.py:190
+msgid "Invalid glob expression"
+msgstr ""
+
+#: tortoisehg\hgtk\hgignore.py:206
+msgid "Invalid regexp expression"
+msgstr ""
+
+#: tortoisehg\hgtk\hginit.py:22 tortoisehg\util\menuthg.py:42
+msgid "Create a new repository"
+msgstr "Créer un nouveau dépôt"
+
+#: tortoisehg\hgtk\hginit.py:30
+msgid "Create"
+msgstr "Créer"
+
+#: tortoisehg\hgtk\hginit.py:55
+msgid "Destination:"
+msgstr "Destination:"
+
+#: tortoisehg\hgtk\hginit.py:59
msgid "Add special files (.hgignore, ...)"
msgstr "Ajouter les fichiers spéciaux (.hgignore, ...)"
-#: hggtk\hginit.py:66
+#: tortoisehg\hgtk\hginit.py:61
msgid "Make repo compatible with Mercurial 1.0"
msgstr "Créé un dépôt compatible avec Mercurial 1.0"
-#: hggtk\hginit.py:93
-msgid "Create"
-msgstr "Créer"
-
-#: hggtk\hginit.py:121
+#: tortoisehg\hgtk\hginit.py:88
msgid "Destination path is empty"
msgstr "Le chemin cible est vide"
-#: hggtk\hginit.py:122
+#: tortoisehg\hgtk\hginit.py:89
msgid "Please enter the directory path"
msgstr "Veuillez entrer le chemin du répertoire"
-#: hggtk\hginit.py:136
+#: tortoisehg\hgtk\hginit.py:103
msgid "Unable to create new repository"
msgstr "Impossible de créer le nouveau dépôt"
-#: hggtk\hginit.py:140 hggtk\hginit.py:145
+#: tortoisehg\hgtk\hginit.py:107 tortoisehg\hgtk\hginit.py:112
msgid "Error when creating repository"
msgstr "Erreur lors de la création du dépôt"
-#: hggtk\hginit.py:162
+#: tortoisehg\hgtk\hginit.py:129
msgid "New repository created"
msgstr "Nouveau dépôt créé"
-#: hggtk\hginit.py:163
+#: tortoisehg\hgtk\hginit.py:130
msgid "in directory %s"
msgstr "dans le répertoire %s"
-#: hggtk\hgshelve.py:92
-msgid "unknown patch content: %r"
-msgstr "contenu de mise à jour inconnu: %r"
-
-#: hggtk\hgshelve.py:113 hggtk\hgshelve.py:140
-msgid "this modifies a binary file (all or nothing)\n"
-msgstr "ceci modifie un fichier binaire\n"
-
-#: hggtk\hgshelve.py:118 hggtk\hgshelve.py:145
-msgid "this is a binary file\n"
-msgstr "ceci est un fichier binaire\n"
-
-#: hggtk\hgshelve.py:129
-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)"
-
-#: hggtk\hgshelve.py:148
-msgid "%d hunks, %d lines changed\n"
-msgstr "%d morceaux, %d lignes modifiées\n"
-
-#: hggtk\hgshelve.py:294
-msgid "unhandled transition: %s -> %s"
-msgstr "transition non gérée : %s -> %s"
-
-#: hggtk\hgshelve.py:320
-msgid " [Ynsfdaq?] "
-msgstr " [Ynsfdaq?] "
-
-#: hggtk\hgshelve.py:336
-msgid "user quit"
-msgstr "l'utilisateur quitte"
-
-#: hggtk\hgshelve.py:351
-msgid " and "
-msgstr " et "
-
-#: hggtk\hgshelve.py:400
-msgid "backup %r as %r\n"
-msgstr "sauvegarder %r vers %r\n"
-
-#: hggtk\hgshelve.py:437
-msgid "shelve data already exists"
-msgstr "shelve données resistent déja"
-
-#: hggtk\hgshelve.py:502
-msgid "applying patch\n"
-msgstr "application du patch\n"
-
-#: hggtk\hgshelve.py:520 hggtk\hgshelve.py:571
-msgid "restoring %r to %r\n"
-msgstr "restauration de %r vers %r\n"
-
-#: hggtk\hgshelve.py:598
-msgid "hg shelve [OPTION]... [FILE]..."
-msgstr "hg shelve [OPTION]... [FILE]..."
-
-#: hggtk\hgshelve.py:605
-msgid "hg unshelve [OPTION]... [FILE]..."
-msgstr "hg unshelve [OPTION]... [FILE]..."
-
-#: hggtk\hgthread.py:68 hggtk\hgthread.py:80 hggtk\hgthread.py:87
+#: tortoisehg\hgtk\hgthread.py:70 tortoisehg\hgtk\hgthread.py:82
+#: tortoisehg\hgtk\hgthread.py:89
msgid "response expected"
msgstr "réponses attendue"
-#: hggtk\hgthread.py:84
+#: tortoisehg\hgtk\hgthread.py:86
msgid "password: "
msgstr "mot de passe "
-#: hggtk\hgthread.py:159
-msgid "[command returned code %d]\n"
-msgstr "[la commande a renvoyé le code %d]\n"
-
-#: hggtk\hgthread.py:161
-msgid "[command completed successfully]\n"
-msgstr "[commande terminée avec succès]\n"
-
-#: hggtk\hgtk.py:94
+#: tortoisehg\hgtk\hgthread.py:163
+msgid "[command returned code %d "
+msgstr ""
+
+#: tortoisehg\hgtk\hgthread.py:165
+msgid "[command completed successfully "
+msgstr ""
+
+#: tortoisehg\hgtk\hgthread.py:171
+msgid "abort: "
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:61
+msgid ""
+"\n"
+"Caught keyboard interrupt, aborting.\n"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:109
msgid "can not read file \"%s\". Ignored.\n"
msgstr "Impossible de lire le fichier \"%s\". Ignoré.\n"
-#: hggtk\hgtk.py:168 hggtk\hgtk.py:188
-msgid "abort: %s!\n"
-msgstr "annulée: %s !\n"
-
-#: hggtk\hgtk.py:176
+#: tortoisehg\hgtk\hgtk.py:188
msgid "hgtk %s: %s\n"
msgstr "hgtk %s : %s\n"
-#: hggtk\hgtk.py:179
+#: tortoisehg\hgtk\hgtk.py:191
msgid "hgtk: %s\n"
msgstr "hgtk : %s\n"
-#: hggtk\hgtk.py:182
+#: tortoisehg\hgtk\hgtk.py:194
msgid ""
"hgtk: command '%s' is ambiguous:\n"
" %s\n"
@@ -847,47 +1583,55 @@"hgtk : la commande '%s' est ambigüe:\n"
" %s\n"
-#: hggtk\hgtk.py:185
+#: tortoisehg\hgtk\hgtk.py:197
msgid "hgtk: unknown command '%s'\n"
msgstr "hgtk : commande inconnue '%s'\n"
-#: hggtk\hgtk.py:230
+#: tortoisehg\hgtk\hgtk.py:200
+msgid "abort: %s!\n"
+msgstr "annulée: %s !\n"
+
+#: tortoisehg\hgtk\hgtk.py:245 tortoisehg\hgtk\hgtk.py:393
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é)"
-#: hggtk\hgtk.py:240
+#: tortoisehg\hgtk\hgtk.py:255
msgid "invalid arguments"
msgstr "arguments invalides"
-#: hggtk\hgtk.py:320
+#: tortoisehg\hgtk\hgtk.py:333
+msgid "Rename error"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:334
msgid "rename takes one or two path arguments"
msgstr "renommer nécessite un ou deux chemins comme paramètre."
-#: hggtk\hgtk.py:414
+#: tortoisehg\hgtk\hgtk.py:444
msgid "global options:"
msgstr "options globales :"
-#: hggtk\hgtk.py:416
+#: tortoisehg\hgtk\hgtk.py:446
msgid "use \"hgtk help\" for the full list of commands"
msgstr "utiliser \"hgtk help\" pour la liste complète des commandes"
-#: hggtk\hgtk.py:420
+#: tortoisehg\hgtk\hgtk.py:450
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"
-#: hggtk\hgtk.py:423
+#: tortoisehg\hgtk\hgtk.py:453
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"
-#: hggtk\hgtk.py:426
+#: tortoisehg\hgtk\hgtk.py:456
msgid "use \"hgtk -v help %s\" to show global options"
msgstr "utiliser \"hgtk -v help %s\" pour afficher les options globales"
-#: hggtk\hgtk.py:438 hggtk\hgtk.py:540
+#: tortoisehg\hgtk\hgtk.py:468 tortoisehg\hgtk\hgtk.py:570
msgid ""
"list of commands:\n"
"\n"
@@ -895,7 +1639,7 @@"liste des commandes :\n"
"\n"
-#: hggtk\hgtk.py:446
+#: tortoisehg\hgtk\hgtk.py:476
msgid ""
"\n"
"aliases: %s\n"
@@ -903,25 +1647,26 @@"\n"
"alias : %s\n"
-#: hggtk\hgtk.py:451 hggtk\hgtk.py:477 hggtk\hgtk.py:509
+#: tortoisehg\hgtk\hgtk.py:481 tortoisehg\hgtk\hgtk.py:507
+#: tortoisehg\hgtk\hgtk.py:539
msgid "(No help text available)"
msgstr "(pas d'aide disponible)"
-#: hggtk\hgtk.py:459
+#: tortoisehg\hgtk\hgtk.py:489
msgid "options:\n"
msgstr "options :\n"
-#: hggtk\hgtk.py:482
+#: tortoisehg\hgtk\hgtk.py:512
msgid "no commands defined\n"
msgstr "aucune commande définie\n"
-#: hggtk\hgtk.py:533
+#: tortoisehg\hgtk\hgtk.py:563
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"
-#: hggtk\hgtk.py:538
+#: tortoisehg\hgtk\hgtk.py:568
msgid ""
"basic commands:\n"
"\n"
@@ -929,1905 +1674,1766 @@"commandes de base :\n"
"\n"
-#: hggtk\hgtk.py:554
+#: tortoisehg\hgtk\hgtk.py:584
msgid " (default: %s)"
msgstr " (par défaut : %s)"
-#: hggtk\hgtk.py:587
+#: tortoisehg\hgtk\hgtk.py:597
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr "Interface TortoiseHg (version %s), Mercurial (version %s)\n"
-#: hggtk\hgtk.py:616
+#: tortoisehg\hgtk\hgtk.py:631
msgid "repository root directory or symbolic path name"
msgstr "répertoire racine du dépôt ou nom de chemin symbolique"
-#: hggtk\hgtk.py:617
+#: tortoisehg\hgtk\hgtk.py:632
msgid "enable additional output"
msgstr "active l'affichage supplémentaire"
-#: hggtk\hgtk.py:618
+#: tortoisehg\hgtk\hgtk.py:633
+msgid "suppress output"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:634
msgid "display help and exit"
msgstr "affiche l'aide et termine"
-#: hggtk\hgtk.py:621
+#: tortoisehg\hgtk\hgtk.py:635
+msgid "start debugger"
+msgstr "démarrer le débogueur"
+
+#: tortoisehg\hgtk\hgtk.py:636
+msgid "do not fork GUI process"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:637
msgid "read file list from file"
msgstr "lit la liste de fichiers depuis le fichier"
-#: hggtk\hgtk.py:625
+#: tortoisehg\hgtk\hgtk.py:641
msgid "hgtk about"
msgstr "hgtk à propos"
-#: hggtk\hgtk.py:626
+#: tortoisehg\hgtk\hgtk.py:642
msgid "hgtk add [FILE]..."
msgstr "hgtk add [FICHIER]"
-#: hggtk\hgtk.py:627
+#: tortoisehg\hgtk\hgtk.py:643
msgid "hgtk clone SOURCE [DEST]"
msgstr "hgtk clone ORIGINE [CIBLE]"
-#: hggtk\hgtk.py:630
+#: tortoisehg\hgtk\hgtk.py:645
+msgid "record user as committer"
+msgstr "enregistrer l'utilisateur comme expéditeur"
+
+#: tortoisehg\hgtk\hgtk.py:646
msgid "record datecode as commit date"
msgstr "utiliser la date du fichier comme date de livraison"
-#: hggtk\hgtk.py:631
+#: tortoisehg\hgtk\hgtk.py:647
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr "hgtk commit [OPTIONS] [FICHIER]..."
-#: hggtk\hgtk.py:632
+#: tortoisehg\hgtk\hgtk.py:648
msgid "hgtk datamine"
msgstr "hgtk datamine"
-#: hggtk\hgtk.py:633
+#: tortoisehg\hgtk\hgtk.py:649
msgid "hgtk hgignore [FILE]"
msgstr "hgtk hgignore [FICHIER]"
-#: hggtk\hgtk.py:634
+#: tortoisehg\hgtk\hgtk.py:650
msgid "hgtk init [DEST]"
msgstr "hgtk init [CIBLE]"
-#: hggtk\hgtk.py:636
+#: tortoisehg\hgtk\hgtk.py:652
msgid "limit number of changes displayed"
msgstr "limiter le nombre de changements affichés"
-#: hggtk\hgtk.py:637
+#: tortoisehg\hgtk\hgtk.py:653
msgid "hgtk log [OPTIONS] [FILE]"
msgstr "hgtk log [OPTIONS] [FICHIER]"
-#: hggtk\hgtk.py:640
+#: tortoisehg\hgtk\hgtk.py:655
+msgid "revision to merge with"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:656
msgid "hgtk merge"
msgstr "hgtk merge"
-#: hggtk\hgtk.py:641
+#: tortoisehg\hgtk\hgtk.py:657
msgid "hgtk recovery"
msgstr "hgtk recovery"
-#: hggtk\hgtk.py:642
+#: tortoisehg\hgtk\hgtk.py:658
msgid "hgtk shelve"
msgstr "hgtk shelve"
-#: hggtk\hgtk.py:643
+#: tortoisehg\hgtk\hgtk.py:659
msgid "hgtk synch"
msgstr "hgtk synch"
-#: hggtk\hgtk.py:646
+#: tortoisehg\hgtk\hgtk.py:661
+msgid "revisions to compare"
+msgstr "versions à comparer"
+
+#: tortoisehg\hgtk\hgtk.py:662
msgid "hgtk status [FILE]..."
msgstr "hgtk status [FICHIER]..."
-#: hggtk\hgtk.py:647
+#: tortoisehg\hgtk\hgtk.py:664 tortoisehg\hgtk\hgtk.py:667
+msgid "field to give initial focus"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:665
msgid "hgtk userconfig"
msgstr "hgtk userconfig"
-#: hggtk\hgtk.py:648
+#: tortoisehg\hgtk\hgtk.py:668
msgid "hgtk repoconfig"
msgstr "hgtk repoconfig"
-#: hggtk\hgtk.py:649
+#: tortoisehg\hgtk\hgtk.py:669
msgid "hgtk guess"
msgstr "hgtk guess"
-#: hggtk\hgtk.py:650
+#: tortoisehg\hgtk\hgtk.py:670
msgid "hgtk remove [FILE]..."
msgstr "hgtk remove [FICHIER]..."
-#: hggtk\hgtk.py:651
+#: tortoisehg\hgtk\hgtk.py:671
msgid "hgtk rename SOURCE [DEST]"
msgstr "hgtk rename ORIGINE [CIBLE]"
-#: hggtk\hgtk.py:652
+#: tortoisehg\hgtk\hgtk.py:672
msgid "hgtk revert [FILE]..."
msgstr "hgtk revert [FICHIER]..."
-#: hggtk\hgtk.py:655
+#: tortoisehg\hgtk\hgtk.py:673
+msgid "hgtk forget [FILE]..."
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:676
msgid "name of the webdir config file"
msgstr "nom du fichier de configuration web"
-#: hggtk\hgtk.py:656
+#: tortoisehg\hgtk\hgtk.py:677
msgid "hgtk serve [OPTION]..."
msgstr "hgtk serve [OPTION]..."
-#: hggtk\hgtk.py:670
+#: tortoisehg\hgtk\hgtk.py:679
+msgid "wait until the second ticks over"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:680
+msgid "notify the shell for paths given"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:681
+msgid "remove the status cache"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:682
+msgid "show the contents of the status cache (no update)"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:684
+msgid "udpate all repos in current dir"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:685
+msgid "hgtk thgstatus [OPTION]"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:687 tortoisehg\hgtk\hgtk.py:703
+msgid "revision to update"
+msgstr "version à mettre à jour"
+
+#: tortoisehg\hgtk\hgtk.py:690
+msgid "changeset to view in diff tool"
+msgstr "groupe de modification à voir dans l'outil de différenciation"
+
+#: tortoisehg\hgtk\hgtk.py:691
msgid "revisions to view in diff tool"
msgstr "versions a afficher dans l'outil de différenciation"
-#: hggtk\hgtk.py:671
+#: tortoisehg\hgtk\hgtk.py:692
+msgid "bundle file to preview"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:693
+msgid "directly use raw extdiff command"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:694
msgid "launch visual diff tool"
msgstr "lance l'outil de différenciation graphique"
-#: hggtk\hgtk.py:673
+#: tortoisehg\hgtk\hgtk.py:696
msgid "print license"
msgstr "affiche la licence d'utilisation"
-#: hggtk\hgtk.py:674
+#: tortoisehg\hgtk\hgtk.py:697
msgid "hgtk version [OPTION]"
msgstr "hgtk version [OPTION]"
-#: hggtk\hgtk.py:676
+#: tortoisehg\hgtk\hgtk.py:699
msgid "show the command options"
msgstr "affiche les options des commandes"
-#: hggtk\hgtk.py:677
+#: tortoisehg\hgtk\hgtk.py:700
msgid "[-o] CMD"
msgstr "[-o] CMD"
-#: hggtk\hgtk.py:678
+#: tortoisehg\hgtk\hgtk.py:701
msgid "hgtk help [COMMAND]"
msgstr "hgtk help [COMMANDE]"
-#: hggtk\history.py:53 hggtk\status.py:194
+#: tortoisehg\hgtk\histdetails.py:35
+msgid "Log Details"
+msgstr ""
+
+#: tortoisehg\hgtk\histdetails.py:40
+msgid "Columns"
+msgstr ""
+
+#: tortoisehg\hgtk\histdetails.py:87
+msgid "Move Up"
+msgstr ""
+
+#: tortoisehg\hgtk\histdetails.py:90
+msgid "Move Down"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:75
+msgid "Accept Incoming Changes?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:76
+msgid "Pull these incoming changes, or discard?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:77
+msgid "&Accept"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:77
+msgid "&Reject"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:87
+msgid "%s - changelog"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:89
+msgid " (Bundle Preview)"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:105 tortoisehg\hgtk\status.py:177
msgid "Re_fresh"
msgstr "Actualiser (_f)"
-#: hggtk\history.py:55
+#: tortoisehg\hgtk\history.py:107
msgid "Reload revision history"
msgstr "Recharge l'historique des versions"
-#: hggtk\history.py:58
-msgid "_Filter"
-msgstr "_Filtrer"
-
-#: hggtk\history.py:61
-msgid "Filter revisions for display"
-msgstr "Filtre les versions à afficher"
-
-#: hggtk\history.py:64
-msgid "_DataMine"
-msgstr "_DataMine"
-
-#: hggtk\history.py:66
-msgid "Search Repository History"
-msgstr "Cherche dans l'historique du dépôt"
-
-#: hggtk\history.py:71 thgutil\menuthg.py:173
-msgid "Synchronize"
-msgstr "Synchroniser"
-
-#: hggtk\history.py:166
-msgid "Show Rev"
-msgstr "Affiche Ver"
-
-#: hggtk\history.py:172
-msgid "Show ID"
-msgstr "Affiche ID"
-
-#: hggtk\serve.py:305
-msgid "cannot start server: "
-msgstr "ne peut pas démarrer le serveur "
-
-#: hggtk\serve.py:316
-msgid "listening at http://%s%s/%s (%s:%d)\n"
-msgstr "écoute sur http://%s%s/%s (%s:%d)\n"
-
-#: hggtk\serve.py:341
-msgid "name of access log file to write to"
-msgstr "nom du fichier journal des accès à créer"
-
-#: hggtk\serve.py:342
-msgid "run server in background"
-msgstr "démarrer le serveur en tache de fond"
-
-#: hggtk\serve.py:344
-msgid "name of error log file to write to"
-msgstr "nom du fichier journal des erreurs à créer"
-
-#: hggtk\serve.py:345
-msgid "port to use (default: 8000)"
-msgstr "port à utiliser (défaut : 8000)"
-
-#: hggtk\serve.py:346
-msgid "address to use"
-msgstr "adresse à utiliser"
-
-#: hggtk\serve.py:347
-msgid "prefix path to serve from (default: server root)"
-msgstr "chemin de base du serveur (défaut : racine du serveur)"
-
-#: hggtk\serve.py:349
-msgid "name to show in web pages (default: working dir)"
-msgstr "nom à afficher dans les pages web (défaut : working dir)"
-
-#: hggtk\serve.py:350
-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)"
-
-#: hggtk\serve.py:352
-msgid "name of file to write process ID to"
-msgstr "nom du fichier où enregistrer les ID des processus"
-
-#: hggtk\serve.py:353
-msgid "for remote clients"
-msgstr "pour les clients à distance"
-
-#: hggtk\serve.py:354
-msgid "web templates to use"
-msgstr "thème web à utiliser"
-
-#: hggtk\serve.py:355
-msgid "template style to use"
-msgstr "style à utiliser"
-
-#: hggtk\serve.py:356
-msgid "use IPv6 in addition to IPv4"
-msgstr "utiliser l'IPv6 en plus de l'IPv4"
-
-#: hggtk\serve.py:357
-msgid "SSL certificate file"
-msgstr "fichier de certification SSL"
-
-#: hggtk\serve.py:358
-msgid "hg serve [OPTION]..."
-msgstr "hg serve [OPTION]..."
-
-#: hggtk\status.py:207
-msgid "add"
-msgstr "ajouter"
-
-#: hggtk\status.py:488
-msgid "%d selected, %d total"
-msgstr "%d sélectionné(s), %d au total"
-
-#: hggtk\tagadd.py:227
-msgid "a tag named \"%s\" already exists"
-msgstr "une étiquette du nom de \"%s\" existe déjà "
-
-#: hggtk\tagadd.py:233
-msgid "Added tag %s for changeset %s"
-msgstr "Étiquette %s ajoutée pour le jeu de révisions %s"
-
-#: hggtk\tagadd.py:244
-msgid "Removed tag %s"
-msgstr "Étiquette %s enlevée"
-
-#: hggtk\taskbarui.py:30 thgutil\menuthg.py:190 thgutil\menuthg.py:322
-msgid "About"
-msgstr "À propos"
-
-#: thgutil\menuthg.py:168 thgutil\menuthg.py:303
-msgid "Create Clone"
-msgstr "Créer un clone"
-
-#: thgutil\menuthg.py:169
-msgid "Create clone here from source"
-msgstr "Créer un clone ici depuis la source"
-
-#: thgutil\menuthg.py:180
-msgid "Clone a Repository"
-msgstr "Coner un dépôt"
-
-#: thgutil\menuthg.py:181
-msgid "clone a repository"
-msgstr "coner un dépôt"
-
-#: thgutil\menuthg.py:183 thgutil\menuthg.py:307
-msgid "Create Repository Here"
-msgstr "Créer un dépôt ici"
-
-#: thgutil\menuthg.py:184 thgutil\menuthg.py:308
-msgid "create a new repository in this directory"
-msgstr "créer un nouveau dépôt dans ce répertoire"
-
-#: thgutil\menuthg.py:187 thgutil\menuthg.py:314
-msgid "Configure user wide settings"
-msgstr "Configuration globale"
-
-#: thgutil\menuthg.py:190 thgutil\menuthg.py:322
-msgid "About TortoiseHg"
-msgstr "À propos de TortoiseHg"
-
-#: thgutil\menuthg.py:223
-msgid "HG Commit..."
-msgstr "HG Livrer..."
-
-#: thgutil\menuthg.py:224
-msgid "Commit changes in repository"
-msgstr "Livrer les changements dans le dépôt"
-
-#: thgutil\menuthg.py:233
-msgid "View File Status"
-msgstr "Afficher le statut du fichier"
-
-#: thgutil\menuthg.py:234
-msgid "Repository status"
-msgstr "Statut du dépôt"
-
-#: thgutil\menuthg.py:245
-msgid "Visual Diff"
-msgstr "Diff visuel"
-
-#: thgutil\menuthg.py:246
-msgid "View changes using GUI diff tool"
-msgstr "Afficher les changements avec l'interface graphique de diff"
-
-#: thgutil\menuthg.py:259
-msgid "Add Files"
-msgstr "Ajouter fichiers"
-
-#: thgutil\menuthg.py:260
-msgid "Add files to Hg repository"
-msgstr "Ajouter des fichiers dans le dépôt Hg"
-
-#: thgutil\menuthg.py:263
-msgid "Remove Files"
-msgstr "Enlever fichiers"
-
-#: thgutil\menuthg.py:264
-msgid "Remove selected files on the next commit"
-msgstr "Enlever les fichiers sélectionnés à la prochaine livraison"
-
-#: thgutil\menuthg.py:268
-msgid "Revert selected files"
-msgstr "Annuler les changements des fichiers sélectionnés"
-
-#: thgutil\menuthg.py:273
-msgid "Annotate Files"
-msgstr "Annoter fichiers"
-
-#: thgutil\menuthg.py:274
-msgid "show changeset information per file line"
-msgstr "montrer les informations du jeu de révisions par ligne du fichier"
-
-#: thgutil\menuthg.py:280
-msgid "View Changelog"
-msgstr "Afficher le journal"
-
-#: thgutil\menuthg.py:281
-msgid "View revision history"
-msgstr "Afficher l'historique des révisions"
-
-#: thgutil\menuthg.py:292
-msgid "Synchronize..."
-msgstr "Synchroniser..."
-
-#: thgutil\menuthg.py:293
-msgid "Synchronize with remote repository"
-msgstr "Synchroniser avec un dépot distant"
-
-#: thgutil\menuthg.py:295
-msgid "Recovery..."
-msgstr "Récupération..."
-
-#: thgutil\menuthg.py:296
-msgid "General repair and recovery of repository"
-msgstr "Centre de réparation et de récupération du dépôt"
-
-#: thgutil\menuthg.py:298
-msgid "Web Server"
-msgstr "Serveur Web"
-
-#: thgutil\menuthg.py:299
-msgid "start web server for this repository"
-msgstr "Démarrer le serveur web pour ce dépôt"
-
-#: thgutil\menuthg.py:304
-msgid "Clone a repository here"
-msgstr "Cloner un dépôt ici"
-
-#: thgutil\menuthg.py:316
-msgid "Repository Settings"
-msgstr "Paramètres du dépôt"
-
-#: thgutil\menuthg.py:317
-msgid "Configure settings local to this repository"
-msgstr "Configuration de ce dépôt seulement"
-
-#: hggtk\about.py:56
-msgid "(version %s)"
-msgstr ""
-
-#: hggtk\about.py:59
-msgid "Copyright 2009 TK Soh and others"
-msgstr ""
-
-#: hggtk\about.py:75
-msgid "with %s"
-msgstr ""
-
-#: hggtk\backout.py:37
-msgid "Changeset Description"
-msgstr "Description de l'ensemble de modifications"
-
-#: hggtk\backout.py:95 hggtk\merge.py:104
-msgid "rev"
-msgstr ""
-
-#: hggtk\backout.py:96 hggtk\merge.py:105
-msgid "summary"
-msgstr "résumé"
-
-#: hggtk\backout.py:97 hggtk\merge.py:106
-msgid "user"
-msgstr "utilisateur"
-
-#: hggtk\backout.py:98 hggtk\merge.py:107
-msgid "date"
-msgstr "date"
-
-#: hggtk\backout.py:101 hggtk\merge.py:111
-msgid "branch"
-msgstr "branche"
-
-#: hggtk\backout.py:103 hggtk\merge.py:113
-msgid "tags"
-msgstr "tags"
-
-#: hggtk\bugreport.py:48
-msgid ""
-"** Please report this bug to tortoisehg-discuss@lists.sourceforge.net or "
-"http://bitbucket.org/tortoisehg/stable/issues\n"
-msgstr ""
-"**Veuillez reporter ce bug à tortoisehg-discuss@lists.sourceforge.net ou sur "
-"http://bitbucket.org/tortoisehg/stable/issues\n"
-
-#: hggtk\changeset.py:43
-msgid "_Other parent"
-msgstr "_Autre parent"
-
-#: hggtk\changeset.py:44
-msgid "diff other parent"
-msgstr "diff. avec un autre parent"
-
-#: hggtk\changeset.py:108
-msgid "[All Files]"
-msgstr "[Tous les fichiers]"
-
-#: hggtk\changeset.py:153
-msgid "branch:"
-msgstr "branche :"
-
-#: hggtk\changeset.py:154
-msgid "user/date:"
-msgstr "utilisateur/date"
-
-#: hggtk\changeset.py:168
-msgid "parent:"
-msgstr "parent :"
-
-#: hggtk\changeset.py:188
-msgid "child:"
-msgstr "enfant :"
-
-#: hggtk\changeset.py:194
-msgid "tags:"
-msgstr "labels :"
-
-#: hggtk\changeset.py:214
-msgid " %s is larger than the specified max diff size"
-msgstr " %s est plus gros que la taille maximum spécifiée"
-
-#: hggtk\changeset.py:309
-msgid "_visual diff"
-msgstr "diff _graphique"
-
-#: hggtk\changeset.py:310
-msgid "diff to _local"
-msgstr "diff. avec _local"
-
-#: hggtk\changeset.py:311
-msgid "_view at revision"
-msgstr "_voir une version"
-
-#: hggtk\changeset.py:312
-msgid "_save at revision"
-msgstr "_sauver vers une version"
-
-#: hggtk\changeset.py:317
-msgid "_revert file contents"
-msgstr "_revenir sur le fichier original"
-
-#: hggtk\changeset.py:375
-msgid "Stat"
-msgstr "Stats"
-
-#: hggtk\changeset.py:507
-msgid "Save file to"
-msgstr ""
-
-#: hggtk\changeset.py:572
-msgid "Confirm revert file to old revision"
-msgstr "Confirmer le retour à l'ancienne version"
-
-#: hggtk\changeset.py:573
-msgid "Revert %s to contents at revision %d?"
-msgstr "Faire revenir %s à la version %d ?"
-
-#: hggtk\changeset.py:585 hggtk\synch.py:667
-msgid "Toggle _Wordwrap"
-msgstr "Activer/déactiver le retour à la ligne"
-
-#: hggtk\clone.py:25
-msgid "TortoiseHg Clone"
-msgstr "Clonage TortoiseHg"
-
-#: hggtk\clone.py:157 hggtk\thgshelve.py:151
-msgid "Cancel"
-msgstr "Annuler"
-
-#: hggtk\clone.py:165
-msgid "Clone"
-msgstr "Cloner"
-
-#: hggtk\clone.py:178
-msgid "Select Destination Folder"
-msgstr "Sélectionnez le répertoire de destination"
-
-#: hggtk\clone.py:186
-msgid "Select Source Folder"
-msgstr ""
-
-#: hggtk\clone.py:233
-msgid "Please enter a valid source path"
-msgstr "Veuillez entrer un chemin origine valide"
-
-#: hggtk\commit.py:34
-msgid "Branch Operations"
-msgstr "Opérations de branches"
-
-#: hggtk\commit.py:38
-msgid "Changes take effect on next commit"
-msgstr "Les changements prendront effet au prochain envoi"
-
-#: hggtk\commit.py:39
-msgid "No branch changes"
-msgstr "Aucun changement de branche"
-
-#: hggtk\commit.py:41
-msgid "Open a new named branch"
-msgstr "Ouvrir une nouvelle branche spécifiée"
-
-#: hggtk\commit.py:43
-msgid "Close current named branch"
-msgstr "Fermer la branche spécifiée courante"
-
-#: hggtk\commit.py:179
-msgid "Confirm Discard Message"
-msgstr "Confirmer le message d'abandon"
-
-#: hggtk\commit.py:279 hggtk\commit.py:280 hggtk\commit.py:281
-#: hggtk\commit.py:284
-msgid "_commit"
-msgstr "_commiter"
-
-#: hggtk\commit.py:302
-msgid "Confirm Exit"
-msgstr "Confirmer la fermeture"
-
-#: hggtk\commit.py:330
-msgid "new branch: "
-msgstr "nouvelle branche : "
-
-#: hggtk\commit.py:332
-msgid "close branch: "
-msgstr "fermer une branche : "
-
-#: hggtk\commit.py:334
-msgid "branch: "
-msgstr "branche : "
-
-#: hggtk\commit.py:417
-msgid "No committable files selected"
-msgstr "aucun des fichiers sélectionnés n'est envoyable"
-
-#: hggtk\commit.py:523
-msgid "Confirm Undo commit"
-msgstr "Confirmer le retour sur votre envoi"
-
-#: hggtk\commit.py:553
-msgid "Confirm Add/Remove"
-msgstr "Confiermer Ajouter/Supprimer"
-
-#: hggtk\commit.py:554
-msgid "Add/Remove the following files?"
-msgstr ""
-
-#: hggtk\commit.py:575
-msgid "Error"
-msgstr "Erreur"
-
-#: hggtk\commit.py:576
-msgid "Message format configuration error"
-msgstr "Erreur de configuration du format de message"
-
-#: hggtk\commit.py:585 hggtk\commit.py:593 hggtk\commit.py:605
-msgid "Confirm Commit"
-msgstr "Confirmer l'envoi"
-
-#: hggtk\commit.py:586
-msgid ""
-"The summary line length of %i is greater than %i.\n"
-"\n"
-"Ignore format policy and continue commit?"
-msgstr ""
-"La longueur de la ligne de compte-rendu de %i est plus longue que %i."
-
-#: hggtk\commit.py:594
-msgid ""
-"The summary line is not followed by a blank line.\n"
-"\n"
-"Ignore format policy and continue commit?"
-msgstr ""
-"La ligne de compte-rendu n'est pas suivie d'une ligne vide.\n"
-"\n"
-"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
-
-#: hggtk\commit.py:606
-msgid ""
-"The following lines are over the %i-character limit: %s.\n"
-"\n"
-"Ignore format policy and continue commit?"
-msgstr ""
-"Les lignes suivantes dépassent la limit de %i caractères: %s.\n"
-"\n"
-"Voulez-vous ignorer les règles de formattage, et continuer l'envoi ?"
-
-#: hggtk\commit.py:643
-msgid "Confirm Override Branch"
-msgstr "Confirmer l'écrasement de branche"
-
-#: hggtk\commit.py:649
-msgid "Confirm New Branch"
-msgstr "Confirmer la création de nouvelle branche"
-
-#: hggtk\commit.py:720
-msgid "Paste _Filenames"
-msgstr "Coller Noms de _Fichiers"
-
-#: hggtk\commit.py:721
-msgid "App_ly Format"
-msgstr "App_liquer Format"
-
-#: hggtk\commit.py:722
-msgid "C_onfigure Format"
-msgstr "C_onfigurer Format"
-
-#: hggtk\commit.py:749
-msgid "Message format needs to be configured"
-msgstr "le format de message doit être configuré"
-
-#: hggtk\commit.py:761 hggtk\commit.py:766
-msgid "Warning"
-msgstr "Avertissement"
-
-#: hggtk\commit.py:762
-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"
-
-#: hggtk\commit.py:767
-msgid "The summary line is not followed by a blank line"
-msgstr "La ligne de description n'est pas suivie d'une ligne vide."
-
-#: hggtk\datamine.py:124
-msgid "_zoom to change"
-msgstr ""
-
-#: hggtk\datamine.py:126
-msgid "_annotate parent"
-msgstr "_annoter le parent"
-
-#: hggtk\datamine.py:340
-msgid "Invalid regular expression"
-msgstr ""
-
-#: hggtk\datamine.py:341
-msgid "Error: %s"
-msgstr ""
-
-#: hggtk\datamine.py:363
-msgid "Abort: %s"
-msgstr ""
-
-#: hggtk\gdialog.py:412
-msgid "No visual diff configured"
-msgstr "Pas de diff graphique configuré"
-
-#: hggtk\gdialog.py:413
-msgid "Please select a visual diff application."
-msgstr "Veuillez choisir un programme de diff graphique"
-
-#: hggtk\gtklib.py:184
-msgid "All files"
-msgstr "Tous les fichiers"
-
-#: hggtk\gtklib.py:261
-msgid "Select Folder"
-msgstr "Sélectionner le répertoire"
-
-#: hggtk\hgemail.py:108
-msgid "In-Reply-To:"
-msgstr "Réponse à :"
-
-#: hggtk\hgemail.py:115
-msgid "Message identifier to reply to, for threading"
-msgstr "Identifiant du message auquel répondre - pour le filage"
-
-#: hggtk\hgignore.py:42 hggtk\hgignore.py:57 hggtk\tagadd.py:47
-msgid "Add"
-msgstr "Ajouter"
-
-#: hggtk\hgignore.py:178
-msgid "Invalid glob expression"
-msgstr ""
-
-#: hggtk\hgignore.py:194
-msgid "Invalid regexp expression"
-msgstr ""
-
-#: hggtk\hginit.py:39
-msgid "Create a new repository"
-msgstr "Créer un nouveau dépôt"
-
-#: hggtk\hginit.py:46
-msgid "Destination:"
-msgstr "Destination:"
-
-#: hggtk\hgshelve.py:350
-msgid "shelve changes to %s?"
-msgstr "archiver les modifications vers %s ?"
-
-#: hggtk\hgshelve.py:361
-msgid "shelve this change to %r?"
-msgstr "archiver ce changement vers %r ?"
-
-#: hggtk\hgshelve.py:433
-msgid "shelve can only be run interactively"
-msgstr "l'archivage ne peut utilisé qu'interactivement."
-
-#: hggtk\hgshelve.py:468
-msgid "no changes to shelve\n"
-msgstr "aucune modification à archiver\n"
-
-#: hggtk\hgshelve.py:509
-msgid "saving patch to shelve\n"
-msgstr "sauvegarde de patch à archiver\n"
-
-#: hggtk\hgshelve.py:522
-msgid "removing shelve file\n"
-msgstr "suppression du fichier d'archive\n"
-
-#: hggtk\hgshelve.py:531
-msgid "removing backup for %r : %r\n"
-msgstr "suppression de la sauvegarde de %r : %r\n"
-
-#: hggtk\hgshelve.py:556
-msgid "applying shelved patch\n"
-msgstr "application du patch archivé\n"
-
-#: hggtk\hgshelve.py:569
-msgid "restoring backup files\n"
-msgstr "restoration des fichiers de sauvegarde\n"
-
-#: hggtk\hgshelve.py:576
-msgid "removing backup files\n"
-msgstr "suppression des fichiers de sauvegarde\n"
-
-#: hggtk\hgshelve.py:582
-msgid "removing shelved patches\n"
-msgstr "suppression des patchs archivés\n"
-
-#: hggtk\hgshelve.py:584
-msgid "unshelve completed\n"
-msgstr "désarchivage terminé\n"
-
-#: hggtk\hgshelve.py:586
-msgid "nothing to unshelve\n"
-msgstr "rien à archiver\n"
-
-#: hggtk\hgshelve.py:592
-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"
-
-#: hggtk\hgshelve.py:594
-msgid "overwrite existing shelve data"
-msgstr "écraser les données d'archivage existantes"
-
-#: hggtk\hgshelve.py:596
-msgid "append to existing shelve data"
-msgstr "ajouter aux données d'archivage existantes"
-
-#: hggtk\hgshelve.py:601
-msgid "inspect shelved changes only"
-msgstr "inspecter seulement les changements archivés"
-
-#: hggtk\hgshelve.py:603
-msgid "proceed even if patches do not unshelve cleanly"
-msgstr "continuer même si les patches ne se restaurent pas correctement"
-
-#: hggtk\hgthread.py:166
-msgid "abort: "
-msgstr ""
-
-#: hggtk\hgtk.py:319
-msgid "Rename error"
-msgstr ""
-
-#: hggtk\hgtk.py:581
-msgid ""
-"This version of TortoiseHg requires Mercurial version %s.n to %s.n, but "
-"finds %s"
-msgstr ""
-
-#: hggtk\hgtk.py:619
-msgid "start debugger"
-msgstr "démarrer le débogueur"
-
-#: hggtk\hgtk.py:620
-msgid "do not fork GUI process"
-msgstr ""
-
-#: hggtk\hgtk.py:629
-msgid "record user as committer"
-msgstr "enregistrer l'utilisateur comme expéditeur"
-
-#: hggtk\hgtk.py:639 hggtk\hgtk.py:666
-msgid "revision to update"
-msgstr "version à mettre à jour"
-
-#: hggtk\hgtk.py:645
-msgid "revisions to compare"
-msgstr "versions à comparer"
-
-#: hggtk\hgtk.py:658
-msgid "wait until the second ticks over"
-msgstr ""
-
-#: hggtk\hgtk.py:659
-msgid "notify the shell for path(s) given"
-msgstr ""
-
-#: hggtk\hgtk.py:660
-msgid "remove the status cache"
-msgstr ""
-
-#: hggtk\hgtk.py:661
-msgid "show the contents of the status cache (no update)"
-msgstr ""
-
-#: hggtk\hgtk.py:663
-msgid "udpate all repos in current dir"
-msgstr ""
-
-#: hggtk\hgtk.py:664
-msgid "hgtk thgstatus [OPTION]"
-msgstr ""
-
-#: hggtk\hgtk.py:669
-msgid "changeset to view in diff tool"
-msgstr "groupe de modification à voir dans l'outil de différenciation"
-
-#: hggtk\history.py:73
+#: tortoisehg\hgtk\history.py:112
msgid "Launch synchronize tool"
msgstr "Lancer l'outil de synchronisation"
-#: hggtk\history.py:178
-msgid "Show Local Date"
-msgstr ""
-
-#: hggtk\history.py:184
-msgid "Show UTC Date"
-msgstr ""
-
-#: hggtk\history.py:190
-msgid "Show Branch"
-msgstr "Affiche la branche"
-
-#: hggtk\history.py:202
-msgid "Show All Revisions"
-msgstr "Affiche toutes les versions"
-
-#: hggtk\history.py:207
-msgid "Show New Revisions"
-msgstr ""
-
-#: hggtk\history.py:211
-msgid "Show Tagged Revisions"
-msgstr "Affiche les versions choisies"
-
-#: hggtk\history.py:215
-msgid "Show Revision Ancestry"
-msgstr "Affiche les ancêtres de cette version"
-
-#: hggtk\history.py:219
-msgid "Show Working Parents"
-msgstr "Affiche les parents de travail"
-
-#: hggtk\history.py:223
-msgid "Show Head Revisions"
-msgstr "Affiche les versions de tête"
-
-#: hggtk\history.py:227
-msgid "Show Only Merge Revisions"
-msgstr "Affiche uniquement les versions de fusion"
-
-#: hggtk\history.py:231
-msgid "Show Non-Merge Revisions"
-msgstr "Affiche les versions hors fusions"
-
-#: hggtk\history.py:235
-msgid "Custom Filter"
-msgstr "Filtre utilisateur"
-
-#: hggtk\history.py:390
-msgid "visualize change"
-msgstr "affiche les modifications"
-
-#: hggtk\history.py:392
-msgid "diff to local"
-msgstr "différencier avec la copie locale"
-
-#: hggtk\history.py:393
-msgid "_update"
-msgstr "mettre à jo_ur"
-
-#: hggtk\history.py:394 hggtk\history.py:425
-msgid "_merge with"
-msgstr "fusionner avec (_m)"
-
-#: hggtk\history.py:396
-msgid "_copy hash"
-msgstr "copie la hash"
-
-#: hggtk\history.py:397
-msgid "_export patch"
-msgstr "_exporter le patch"
-
-#: hggtk\history.py:398
-msgid "e_mail patch"
-msgstr "envoyer le patch par _mail"
-
-#: hggtk\history.py:399
-msgid "_bundle rev:tip"
-msgstr "joindre rev:tip (_b)"
-
-#: hggtk\history.py:400
-msgid "add/remove _tag"
-msgstr "ajou_te/supprime le label"
-
-#: hggtk\history.py:401
-msgid "backout revision"
-msgstr "revenir sur cette version"
-
-#: hggtk\history.py:402 hggtk\status.py:105 hggtk\status.py:110
-#: hggtk\status.py:129 hggtk\status.py:136 hggtk\status.py:144
-msgid "_revert"
-msgstr "_revenir"
-
-#: hggtk\history.py:407
-msgid "strip revision"
-msgstr "supprimer la révision"
-
-#: hggtk\history.py:418
-msgid "_diff with selected"
-msgstr "_différences avec ce qui est choisi"
-
-#: hggtk\history.py:419
-msgid "visual diff with selected"
-msgstr "_différences graphiques avec ce qui est choisi"
-
-#: hggtk\history.py:421
-msgid "email from here to selected"
-msgstr "e-mailer d'ici à ce qui est choisi"
-
-#: hggtk\history.py:423
-msgid "bundle from here to selected"
-msgstr "grouper d'ici à ce qui est choisi"
-
-#: hggtk\history.py:483
-msgid "show next %d revisions"
-msgstr "affiche les %d versions suivantes"
-
-#: hggtk\history.py:485
-msgid "show all remaining revisions"
-msgstr "affiche toutes les versions suivantes"
-
-#: hggtk\history.py:523
-msgid "Confirm Strip Revision(s)"
-msgstr "Confirmer la suppression de révision(s)"
-
-#: hggtk\history.py:524
-msgid "Remove revision %d and all descendants?"
-msgstr "Supprimer la version %d et tous les descendants ?"
-
-#: hggtk\history.py:550
-msgid "Confirm Revert Revision(s)"
-msgstr "Confirmer le rétablissement de révision(s)"
-
-#: hggtk\history.py:551
+#: tortoisehg\hgtk\history.py:117 tortoisehg\hgtk\history.py:165
+msgid "Patch Queue"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:119
+msgid "Show/Hide Patch Queue"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:161
+msgid "Sync Bar"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:171
+msgid "Load more Revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:173
+msgid "Load all Revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:176
+msgid "Toolbar"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:179
+msgid "Filter Bar"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:185
+msgid "Reset Marks"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:188
+msgid "Choose Details..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:192
+msgid "Color by Branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:195
+msgid "Ignore Max Diff Size"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:199
+msgid "_Navigate"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:200
+msgid "Tip"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:201
+msgid "Working Parent"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:203
+msgid "Revision..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:206
+msgid "_Synchronize"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:207 tortoisehg\hgtk\synch.py:63
+msgid "Incoming"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:209
+msgid "Pull"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:211 tortoisehg\hgtk\synch.py:74
+msgid "Outgoing"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:213 tortoisehg\hgtk\synch.py:79
+msgid "Push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:215
+msgid "Email..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:218
+msgid "Add Bundle..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:221
+msgid "Accept Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:224
+msgid "Reject Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:230
+msgid "Force push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:320 tortoisehg\hgtk\logview\treeview.py:381
+msgid "Graph"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:327
+msgid "Revision Number"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:328
+msgid "Changeset ID"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:329
+msgid "Branch Name"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:330 tortoisehg\hgtk\logview\treeview.py:433
+#: tortoisehg\hgtk\thgmq.py:187
+msgid "Summary"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:332 tortoisehg\hgtk\logview\treeview.py:455
+msgid "Local Date"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:333
+msgid "UTC Date"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:334 tortoisehg\hgtk\logview\treeview.py:479
+msgid "Age"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:335 tortoisehg\hgtk\logview\treeview.py:491
+msgid "Tags"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:384
+msgid "Invalid revision range"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:396
+msgid "Invalid date specification"
+msgstr "Date spécifiée invalide"
+
+#: tortoisehg\hgtk\history.py:630
+msgid "Filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:635
+msgid "%s branch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:636
+msgid "Branch '%s'"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:642
+msgid "file history: "
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:646
+msgid "custom filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:654
+msgid "merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:657
+msgid "only Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:659
+msgid "revision ancestry"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:664
+msgid "Ancestry of %s"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:666
+msgid "tagged revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:674
+msgid "Tagged Revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:676
+msgid "working parents"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:682
+msgid "heads"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:686 tortoisehg\hgtk\history.py:997
+msgid "Heads"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:688
+msgid "no Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:706
+msgid "Visualize Change"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:707
+msgid "Di_splay Change"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:708
+msgid "Diff to local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:710
+msgid "_Copy hash"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:714
+msgid "Pull to here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:721
+msgid "Push to here"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:723
+msgid "_Update..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:724 tortoisehg\hgtk\history.py:808
+msgid "_Merge with..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:727
+msgid "_Export Patch..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:728
+msgid "E_mail Patch..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:729
+msgid "_Bundle rev:tip..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:731
+msgid "Add/Remove _Tag..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:732
+msgid "Backout Revision..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:734 tortoisehg\hgtk\status.py:1509
+msgid "_Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:735
+msgid "_Archive..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:753
+msgid "Transp_lant to local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:758
+msgid "qimport"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:759
+msgid "Strip Revision..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:791
+msgid "_Diff with selected"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:792
+msgid "Visual Diff with selected"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:801
+msgid "Email from here to selected..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:803
+msgid "Bundle from here to selected..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:805
+msgid "Export Patches from here to selected..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:824
+msgid "Transplant Revision range to local"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:829
+msgid "Rebase on top of selected"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:834
+msgid "qimport from here to selected"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:865
+msgid "Load more"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:865
+msgid "load more revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:868
+msgid "Load all"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:868
+msgid "load all revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:910
+msgid "Download and view incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:912
+msgid "Pull incoming changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:914
+msgid "Determine and mark outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:916
+msgid "Push outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:918
+msgid "Email outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:920
+msgid "Configure aliases and after pull behavior"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:922
+msgid "Stop current transaction"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:949
+msgid "After Pull:"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:950 tortoisehg\hgtk\synch.py:155
+msgid "Nothing"
+msgstr "Rien"
+
+#: tortoisehg\hgtk\history.py:950 tortoisehg\hgtk\synch.py:155
+#: tortoisehg\hgtk\update.py:45
+msgid "Update"
+msgstr "Mise à jour"
+
+#: tortoisehg\hgtk\history.py:953 tortoisehg\hgtk\synch.py:158
+msgid "Fetch"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:955 tortoisehg\hgtk\synch.py:160
+msgid "Rebase"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:979
+msgid "All"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:984
+msgid "Tagged"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:988
+msgid "Ancestry"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1001
+msgid "Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1005
+msgid "Hide Merges"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1010 tortoisehg\hgtk\logview\treeview.py:420
+msgid "Branch"
+msgstr "Branche"
+
+#: tortoisehg\hgtk\history.py:1024
+msgid "Custom"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1029
+msgid "File Patterns"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1029
+msgid "Rev Range"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1030
+msgid "Date"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1030
+msgid "Keywords"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1145 tortoisehg\hgtk\history.py:1245
+#: tortoisehg\hgtk\history.py:1266 tortoisehg\hgtk\history.py:1330
+#: tortoisehg\hgtk\history.py:1668
+msgid "No remote path specified"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1146 tortoisehg\hgtk\history.py:1246
+#: tortoisehg\hgtk\history.py:1267 tortoisehg\hgtk\history.py:1331
+#: tortoisehg\hgtk\history.py:1669
+msgid "Please enter or select a remote path"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1176
+msgid "Accept incoming previewed changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1177
+msgid "Accept"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1182
+msgid "Reject incoming previewed changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1183
+msgid "Reject"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1218
+msgid "Bundle Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1222
+msgid "Open Bundle"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1313 tortoisehg\hgtk\synch.py:495
+msgid "No repository selected"
+msgstr "Aucun dépôt sélectionné"
+
+#: tortoisehg\hgtk\history.py:1314 tortoisehg\hgtk\synch.py:496
+msgid "Select a peer repository to compare with"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1485
+msgid "Confirm Revert All Files"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1486
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 ?"
-#: hggtk\history.py:613 hggtk\history.py:693
+#: tortoisehg\hgtk\history.py:1537
+msgid "Save patches to"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1560 tortoisehg\hgtk\history.py:1734
msgid "Write bundle to"
msgstr "Écrire le paquet sous"
-#: hggtk\history.py:662 hggtk\status.py:1045
+#: tortoisehg\hgtk\history.py:1596
+msgid "Confirm Rebase Revision"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1597
+msgid "Rebase revision %d on top of %d?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1705 tortoisehg\hgtk\status.py:1193
msgid "Save patch to"
msgstr "Sauvegarder le patch sous"
-#: hggtk\history.py:669 hggtk\history.py:698 hggtk\thgconfig.py:370
-#: hggtk\thgconfig.py:674
-msgid "Confirm Overwrite"
-msgstr ""
-
-#: hggtk\history.py:670 hggtk\history.py:699
-msgid ""
-"The file \"%s\" already exists!\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: hggtk\logfilter.py:27 hggtk\taskbarui.py:31 hggtk\thgconfig.py:454
-msgid "Apply"
-msgstr "Appliquer"
-
-#: hggtk\logfilter.py:31
-msgid "Log Filter - %s"
-msgstr "Filtre des logs - %s"
-
-#: hggtk\logfilter.py:46 hggtk\logview\treeview.py:399
-msgid "Branch"
-msgstr "Branche"
-
-#: hggtk\logfilter.py:53
-msgid "View revision graph of named branch"
-msgstr ""
-
-#: hggtk\logfilter.py:60
-msgid "Rev Range"
-msgstr ""
-
-#: hggtk\logfilter.py:70
-msgid "View range of revisions"
-msgstr ""
-
-#: hggtk\logfilter.py:78
-msgid "Search Filter"
-msgstr "Rechercher un filtre"
-
-#: hggtk\logfilter.py:82
-msgid "Search repository changelog with criteria"
-msgstr "Rechercher dans les modifications selon ces critères"
-
-#: hggtk\logfilter.py:94
-msgid "File(s):"
-msgstr "Fichier(s)"
-
-#: hggtk\logfilter.py:101
-msgid "Display only changesets affecting these comma separated file paths"
-msgstr ""
-"Afficher seulement les modifications affectée par cette liste de fichiers "
-"séparés par des virgules"
-
-#: hggtk\logfilter.py:110
-msgid "Keyword(s):"
-msgstr "Mot(s)-clef"
-
-#: hggtk\logfilter.py:117
-msgid ""
-"Display only changesets matching these comma separated case insensitive "
-"keywords"
-msgstr ""
-"Afficher seulement les changements correspondants à cette liste de mot(s)-"
-"clef séparé(s) par des virgules"
-
-#: hggtk\logfilter.py:126
-msgid "Help on date formats"
-msgstr "Aide sur les formats de date"
-
-#: hggtk\logfilter.py:128
-msgid "Date:"
-msgstr "Date :"
-
-#: hggtk\logfilter.py:136
-msgid "Display only changesets matching this date specification"
-msgstr ""
-"Afficher seulement les modifications correspondants à la date spécifiée"
-
-#: hggtk\logfilter.py:193
-msgid "Invalid date specification"
-msgstr "Date spécifiée invalide"
-
-#: hggtk\logfilter.py:208
-msgid "Invalid revision range"
-msgstr ""
-
-#: hggtk\logview\treeview.py:358
-msgid "Graph"
-msgstr ""
-
-#: hggtk\logview\treeview.py:386
+#: tortoisehg\hgtk\logview\treeview.py:256
+msgid "%(count)d of %(total)d Revisions"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:363
+msgid "Repository is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\logview\treeview.py:408
msgid "ID"
msgstr ""
-#: hggtk\logview\treeview.py:412
-msgid "Summary"
-msgstr ""
-
-#: hggtk\logview\treeview.py:437
-msgid "Local Date"
-msgstr ""
-
-#: hggtk\logview\treeview.py:450
+#: tortoisehg\hgtk\logview\treeview.py:467
msgid "Universal Date"
msgstr ""
-#: hggtk\merge.py:28
+#: tortoisehg\hgtk\merge.py:44
+msgid "Merging in %s"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:50 tortoisehg\hgtk\merge.py:63
msgid "Unable to merge"
msgstr "Impossible de fusionner"
-#: hggtk\merge.py:29
+#: tortoisehg\hgtk\merge.py:51
msgid "Must supply a target revision"
msgstr "Vous devez fournir un révision destinataire"
-#: hggtk\merge.py:39
-msgid "Merging in "
-msgstr "Fusionner dans "
-
-#: hggtk\merge.py:46
+#: tortoisehg\hgtk\merge.py:64
+msgid "Outstanding uncommitted changes"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:77
+msgid "Not a head revision!"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:81
msgid "Merge target (other)"
msgstr "Destination de fusion (autre)"
-#: hggtk\merge.py:55
+#: tortoisehg\hgtk\merge.py:86
msgid "Current revision (local)"
msgstr "Révision courante (locale)"
-#: hggtk\merge.py:79
+#: tortoisehg\hgtk\merge.py:92
+msgid "Merge"
+msgstr "Fusionner"
+
+#: tortoisehg\hgtk\merge.py:94
msgid "Undo"
msgstr "Annuler"
-#: hggtk\merge.py:87
-msgid "Merge"
-msgstr "Fusionner"
-
-#: hggtk\merge.py:116
-msgid "Not a head revision!"
-msgstr ""
-
-#: hggtk\merge.py:155
+#: tortoisehg\hgtk\merge.py:103
+msgid "Merge tools:"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:169
+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:225
+msgid "Merged successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:227
+msgid "Canceled merging"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:229
+msgid "Failed to merge"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:265
msgid "Confirm undo merge"
msgstr "Confirmer l'annulation de la fusion"
-#: hggtk\merge.py:156
+#: tortoisehg\hgtk\merge.py:266
msgid "Clean checkout of original revision?"
msgstr "Rétablir la révision d'origine"
-#: hggtk\recovery.py:37
-msgid "TortoiseHg Recovery - "
-msgstr "TortoiseHg Recovery - "
-
-#: hggtk\recovery.py:43 hggtk\synch.py:61
+#: tortoisehg\hgtk\merge.py:276
+msgid "Undo successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:278
+msgid "Canceled undo"
+msgstr ""
+
+#: tortoisehg\hgtk\merge.py:280
+msgid "Failed to undo"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:54
+msgid "Select files to "
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:94 tortoisehg\hgtk\status.py:138
+msgid "status"
+msgstr "status"
+
+#: tortoisehg\hgtk\quickop.py:97 tortoisehg\hgtk\status.py:271
+msgid "path"
+msgstr "chemin"
+
+#: tortoisehg\hgtk\quickop.py:110
+msgid "Toggle all selections"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:135
+msgid "modified"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:138
+msgid "added"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:141
+msgid "removed"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:144
+msgid "missing"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:147 tortoisehg\hgtk\quickop.py:230
+#: tortoisehg\hgtk\serve.py:126 tortoisehg\util\shlib.py:26
+#: tortoisehg\util\version.py:15
+msgid "unknown"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:151 tortoisehg\hgtk\quickop.py:230
+msgid "ignored"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:155
+msgid "clean"
+msgstr "nettoyer"
+
+#: tortoisehg\hgtk\quickop.py:158
+msgid "No appropriate files"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:159
+msgid "No files found for this operation"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:236
+msgid "No files selected"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:237
+msgid "No operation to perform"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:258
+msgid "Successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:260 tortoisehg\hgtk\thgmq.py:626
+msgid "Canceled"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:262 tortoisehg\hgtk\thgmq.py:628
+msgid "Failed"
+msgstr ""
+
+#: tortoisehg\hgtk\recovery.py:40
+msgid "%s - recovery"
+msgstr ""
+
+#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\synch.py:59
msgid "Stop the hg operation"
msgstr "Annuler l'opération hg"
-#: hggtk\recovery.py:47
+#: tortoisehg\hgtk\recovery.py:50
msgid "Clean"
msgstr ""
-#: hggtk\recovery.py:49
+#: tortoisehg\hgtk\recovery.py:52
msgid "Clean checkout, undo all changes"
msgstr "Nettoyer, annule toutes les modifications"
-#: hggtk\recovery.py:52
+#: tortoisehg\hgtk\recovery.py:55
msgid "Rollback"
msgstr ""
-#: hggtk\recovery.py:54
+#: tortoisehg\hgtk\recovery.py:57
msgid "Rollback (undo) last transaction to repository (pull, commit, etc)"
msgstr ""
-#: hggtk\recovery.py:58
+#: tortoisehg\hgtk\recovery.py:61
msgid "Recover"
msgstr ""
-#: hggtk\recovery.py:60
+#: tortoisehg\hgtk\recovery.py:63
msgid "Recover from interrupted operation"
msgstr ""
-#: hggtk\recovery.py:63
+#: tortoisehg\hgtk\recovery.py:66
msgid "Verify"
msgstr ""
-#: hggtk\recovery.py:65
+#: tortoisehg\hgtk\recovery.py:68
msgid "Validate repository consistency"
msgstr ""
-#: hggtk\recovery.py:99 hggtk\synch.py:386
+#: tortoisehg\hgtk\recovery.py:102 tortoisehg\hgtk\synch.py:394
msgid "Cannot close now"
msgstr "Ne peut actuellement pas être fermé"
-#: hggtk\recovery.py:100 hggtk\synch.py:387
+#: tortoisehg\hgtk\recovery.py:103 tortoisehg\hgtk\synch.py:395
msgid "command is running"
msgstr "commande en cours"
-#: hggtk\recovery.py:119
+#: tortoisehg\hgtk\recovery.py:122
msgid "Confirm clean repository"
msgstr "Confirmer le nettoyer du dépôt"
-#: hggtk\recovery.py:120
+#: tortoisehg\hgtk\recovery.py:123
msgid "Clean repository '%s' ?"
msgstr ""
-#: hggtk\recovery.py:126
-msgid "Unable to find repo at %s\n"
-msgstr "Impossible de trouver le dépôt à %s\n"
-
-#: hggtk\recovery.py:137
+#: tortoisehg\hgtk\recovery.py:135
msgid "Confirm rollback repository"
msgstr ""
-#: hggtk\recovery.py:138
+#: tortoisehg\hgtk\recovery.py:136
msgid "Rollback repository '%s' ?"
msgstr ""
-#: hggtk\recovery.py:159 hggtk\synch.py:526
+#: tortoisehg\hgtk\recovery.py:157 tortoisehg\hgtk\synch.py:537
msgid "Cannot run now"
msgstr ""
-#: hggtk\recovery.py:160 hggtk\synch.py:527
+#: tortoisehg\hgtk\recovery.py:158 tortoisehg\hgtk\synch.py:538
msgid "Please try again after the previous command is completed"
msgstr ""
-#: hggtk\recovery.py:222 hggtk\synch.py:627
+#: tortoisehg\hgtk\recovery.py:220 tortoisehg\hgtk\synch.py:632
msgid "[command interrupted]"
msgstr ""
-#: hggtk\rename.py:63 hggtk\rename.py:70
+#: tortoisehg\hgtk\rename.py:31
+msgid "Rename "
+msgstr ""
+
+#: tortoisehg\hgtk\rename.py:64 tortoisehg\hgtk\rename.py:71
msgid "rename error"
msgstr ""
-#: hggtk\serve.py:57
+#: tortoisehg\hgtk\serve.py:58
msgid "Start"
msgstr "Démarrer"
-#: hggtk\serve.py:59
+#: tortoisehg\hgtk\serve.py:60
msgid "Start server"
msgstr "Lancer le serveur"
-#: hggtk\serve.py:63
+#: tortoisehg\hgtk\serve.py:64
msgid "Stop server"
msgstr "Arrêter le serveur"
-#: hggtk\serve.py:65
+#: tortoisehg\hgtk\serve.py:66
msgid "Browse"
msgstr "Naviguer"
-#: hggtk\serve.py:67
+#: tortoisehg\hgtk\serve.py:68
msgid "Launch browser to view repository"
msgstr ""
-#: hggtk\serve.py:69 hggtk\synch.py:94
-msgid "Configure"
-msgstr "Configurer"
-
-#: hggtk\serve.py:71
+#: tortoisehg\hgtk\serve.py:72
msgid "Configure web settings"
msgstr "Configurer les paramètres internet"
-#: hggtk\serve.py:90
+#: tortoisehg\hgtk\serve.py:91
msgid "HTTP Port:"
msgstr "Port HTTP :"
-#: hggtk\serve.py:119
-msgid "Serve %s - %s"
-msgstr "Sert %s - %s"
-
-#: hggtk\serve.py:122
-msgid "Serve - "
-msgstr "Sert - "
-
-#: hggtk\serve.py:153
+#: tortoisehg\hgtk\serve.py:127
+msgid "%s - serve"
+msgstr ""
+
+#: tortoisehg\hgtk\serve.py:130
+msgid "%s serve - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\serve.py:133
+msgid " - serve"
+msgstr ""
+
+#: tortoisehg\hgtk\serve.py:164
msgid "Confirm Really Exit?"
msgstr "Réellement confirmer la fermeture ?"
-#: hggtk\serve.py:154
+#: tortoisehg\hgtk\serve.py:165
msgid ""
"Server process is still running\n"
"Exiting will stop the server."
msgstr ""
-#: hggtk\serve.py:217
+#: tortoisehg\hgtk\serve.py:228
msgid "Abort: %s\n"
msgstr ""
-#: hggtk\serve.py:225
+#: tortoisehg\hgtk\serve.py:236
msgid "Invalid port 2048..65535"
msgstr "Port invalide 2034..65535"
-#: hggtk\serve.py:226
+#: tortoisehg\hgtk\serve.py:237
msgid "Defaulting to "
msgstr ""
-#: hggtk\serve.py:343
+#: tortoisehg\hgtk\serve.py:316
+msgid "cannot start server: "
+msgstr "ne peut pas démarrer le serveur "
+
+#: tortoisehg\hgtk\serve.py:327
+msgid "listening at http://%s%s/%s (%s:%d)\n"
+msgstr "écoute sur http://%s%s/%s (%s:%d)\n"
+
+#: tortoisehg\hgtk\serve.py:352
+msgid "name of access log file to write to"
+msgstr "nom du fichier journal des accès à créer"
+
+#: tortoisehg\hgtk\serve.py:353
+msgid "run server in background"
+msgstr "démarrer le serveur en tache de fond"
+
+#: tortoisehg\hgtk\serve.py:354
msgid "used internally by daemon mode"
msgstr ""
-#: hggtk\status.py:102 hggtk\status.py:108 hggtk\status.py:133
-#: hggtk\status.py:141
-msgid "_difference"
-msgstr "_différence"
-
-#: hggtk\status.py:103 hggtk\status.py:134 hggtk\status.py:142
-msgid "edit"
-msgstr "éditer"
-
-#: hggtk\status.py:104 hggtk\status.py:135 hggtk\status.py:143
-msgid "view other"
-msgstr "autres"
-
-#: hggtk\status.py:106 hggtk\status.py:111 hggtk\status.py:123
-#: hggtk\status.py:131 hggtk\status.py:137 hggtk\status.py:145
-msgid "l_og"
-msgstr ""
-
-#: hggtk\status.py:109 hggtk\status.py:113 hggtk\status.py:119
-#: hggtk\status.py:125 hggtk\status.py:128
-msgid "_view"
-msgstr "_vue"
-
-#: hggtk\status.py:114 hggtk\status.py:126
-msgid "_delete"
-msgstr "_supprimer"
-
-#: hggtk\status.py:115
-msgid "_add"
-msgstr "_ajouter"
-
-#: hggtk\status.py:116
-msgid "_guess rename"
-msgstr ""
-
-#: hggtk\status.py:117
-msgid "_ignore"
-msgstr "_ignorer"
-
-#: hggtk\status.py:120 hggtk\status.py:130
-msgid "re_move"
-msgstr ""
-
-#: hggtk\status.py:121
-msgid "re_name"
-msgstr "re_nommer"
-
-#: hggtk\status.py:122
-msgid "_copy"
-msgstr "_copier"
-
-#: hggtk\status.py:138
-msgid "resolve"
-msgstr "résoudre"
-
-#: hggtk\status.py:139
-msgid "mark resolved"
-msgstr "marquer comme résolu"
-
-#: hggtk\status.py:146
-msgid "mark unresolved"
-msgstr "marquer comme non résolu"
-
-#: hggtk\status.py:182
+#: tortoisehg\hgtk\serve.py:355
+msgid "name of error log file to write to"
+msgstr "nom du fichier journal des erreurs à créer"
+
+#: tortoisehg\hgtk\serve.py:356
+msgid "port to use (default: 8000)"
+msgstr "port à utiliser (défaut : 8000)"
+
+#: tortoisehg\hgtk\serve.py:357
+msgid "address to use"
+msgstr "adresse à utiliser"
+
+#: tortoisehg\hgtk\serve.py:358
+msgid "prefix path to serve from (default: server root)"
+msgstr "chemin de base du serveur (défaut : racine du serveur)"
+
+#: tortoisehg\hgtk\serve.py:360
+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:361
+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:363
+msgid "name of file to write process ID to"
+msgstr "nom du fichier où enregistrer les ID des processus"
+
+#: tortoisehg\hgtk\serve.py:364
+msgid "for remote clients"
+msgstr "pour les clients à distance"
+
+#: tortoisehg\hgtk\serve.py:365
+msgid "web templates to use"
+msgstr "thème web à utiliser"
+
+#: tortoisehg\hgtk\serve.py:366
+msgid "template style to use"
+msgstr "style à utiliser"
+
+#: tortoisehg\hgtk\serve.py:367
+msgid "use IPv6 in addition to IPv4"
+msgstr "utiliser l'IPv6 en plus de l'IPv4"
+
+#: tortoisehg\hgtk\serve.py:368
+msgid "SSL certificate file"
+msgstr "fichier de certification SSL"
+
+#: tortoisehg\hgtk\serve.py:369
+msgid "hg serve [OPTION]..."
+msgstr "hg serve [OPTION]..."
+
+#: tortoisehg\hgtk\status.py:138
msgid "filtered status"
msgstr ""
-#: hggtk\status.py:182
-msgid "status"
-msgstr "status"
-
-#: hggtk\status.py:195
+#: tortoisehg\hgtk\status.py:154
+msgid "Save As"
+msgstr "Sauvegarder sous"
+
+#: 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
+msgid "Add checked files"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:169
+msgid "Move checked files to other directory"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:172
+msgid "Remove or delete checked files"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:175
+msgid "Forget checked files on next commit"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:179
msgid "refresh"
msgstr "rafraîchir"
-#: hggtk\status.py:200
-msgid "Save As"
-msgstr "Sauvegarder sous"
-
-#: hggtk\status.py:201
-msgid "Save selected changes"
-msgstr ""
-
-#: hggtk\status.py:205
-msgid "revert"
-msgstr ""
-
-#: hggtk\status.py:210
-msgid "move selected files to other directory"
-msgstr "déplacer les fichiers sélectionnés dans un autre répertoire"
-
-#: hggtk\status.py:212
-msgid "remove"
-msgstr "supprimer"
-
-#: hggtk\status.py:313
+#: tortoisehg\hgtk\status.py:255 tortoisehg\hgtk\thgmq.py:185
msgid "st"
msgstr "ier"
-#: hggtk\status.py:321
+#: tortoisehg\hgtk\status.py:263
msgid "ms"
msgstr "ms"
-#: hggtk\status.py:327
-msgid "path"
-msgstr "chemin"
-
-#: hggtk\status.py:434
+#: tortoisehg\hgtk\status.py:285
+msgid "View"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:303
+msgid "Remove filter, show root"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:329
+msgid "Text Diff"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:382
+msgid "Hunk Selection"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:455
+msgid "%d selected, %d total"
+msgstr "%d sélectionné(s), %d au total"
+
+#: tortoisehg\hgtk\status.py:477
+msgid "Save Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:481
+msgid "Shelf Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:503
+msgid "?: unknown"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:504
msgid "M: modified"
msgstr ""
-#: hggtk\status.py:435
+#: tortoisehg\hgtk\status.py:505
+msgid "I: ignored"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:506
msgid "A: added"
msgstr ""
-#: hggtk\status.py:436
+#: tortoisehg\hgtk\status.py:507
+msgid "C: clean"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:508
msgid "R: removed"
msgstr ""
-#: hggtk\status.py:438
+#: tortoisehg\hgtk\status.py:509
msgid "!: deleted"
msgstr ""
-#: hggtk\status.py:439
-msgid "?: unknown"
-msgstr ""
-
-#: hggtk\status.py:440
-msgid "C: clean"
-msgstr ""
-
-#: hggtk\status.py:441
-msgid "I: ignored"
-msgstr ""
-
-#: hggtk\status.py:767
+#: tortoisehg\hgtk\status.py:800
+msgid "View '%s'"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:845
msgid "Rename file to:"
msgstr "Renommer le fichier sous :"
-#: hggtk\status.py:777
+#: tortoisehg\hgtk\status.py:854
msgid "Copy file to"
msgstr "Copier le fichier sous"
-#: hggtk\status.py:790 hggtk\status.py:1178
+#: tortoisehg\hgtk\status.py:867 tortoisehg\hgtk\status.py:1331
msgid "Nothing Removed"
msgstr "Rien n'a été supprimé"
-#: hggtk\status.py:791
+#: tortoisehg\hgtk\status.py:868
msgid "Remove is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:808
+#: tortoisehg\hgtk\status.py:885
msgid "Move is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:808 hggtk\status.py:1196 hggtk\status.py:1204
+#: tortoisehg\hgtk\status.py:885 tortoisehg\hgtk\status.py:1349
+#: tortoisehg\hgtk\status.py:1357
msgid "Nothing Moved"
msgstr "Rien n'a été déplacé"
-#: hggtk\status.py:826
+#: tortoisehg\hgtk\status.py:903
msgid "Copy is not enabled when multiple revisions are specified."
msgstr ""
-#: hggtk\status.py:826
+#: tortoisehg\hgtk\status.py:903
msgid "Nothing Copied"
msgstr "Rien n'a été copié"
-#: hggtk\status.py:846
+#: tortoisehg\hgtk\status.py:962 tortoisehg\hgtk\status.py:1023
msgid "===== Diff to first parent =====\n"
msgstr ""
-#: hggtk\status.py:855
+#: tortoisehg\hgtk\status.py:967 tortoisehg\hgtk\status.py:1030
msgid ""
"\n"
"===== Diff to second parent =====\n"
msgstr ""
-#: hggtk\status.py:910
+#: tortoisehg\hgtk\status.py:1059
msgid "File is larger than the specified max size.\n"
msgstr ""
-#: hggtk\status.py:911
+#: tortoisehg\hgtk\status.py:1060
msgid "Hunk selection is disabled for this file.\n"
msgstr ""
-#: hggtk\status.py:1081 hggtk\status.py:1102
+#: tortoisehg\hgtk\status.py:1231
+msgid "Nothing Diffed"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1232
+msgid "No diffable files selected"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1240 tortoisehg\hgtk\status.py:1248
msgid "Nothing Reverted"
msgstr ""
-#: hggtk\status.py:1082
+#: tortoisehg\hgtk\status.py:1241
msgid "No revertable files selected"
msgstr ""
-#: hggtk\status.py:1103
+#: tortoisehg\hgtk\status.py:1249
msgid "Revert not allowed when viewing revision range."
msgstr ""
-#: hggtk\status.py:1118 hggtk\status.py:1135
+#: tortoisehg\hgtk\status.py:1267
+msgid "Uncommited merge - please select a parent revision"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1268
+msgid "Revert files to local or other parent?"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1269
+msgid "&Local"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1269
+msgid "&Other"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1284
msgid "Confirm Revert"
msgstr ""
-#: hggtk\status.py:1119
-msgid "Revert files to revision %s?"
-msgstr ""
-
-#: hggtk\status.py:1121
-msgid "Which parent to revert to?"
-msgstr ""
-
-#: hggtk\status.py:1122
-msgid "Revert file(s) to local or other parent?"
-msgstr ""
-
-#: hggtk\status.py:1123
-msgid "&local"
-msgstr ""
-
-#: hggtk\status.py:1123
-msgid "&other"
-msgstr ""
-
-#: hggtk\status.py:1136
-msgid "Revert the following files?"
-msgstr ""
-
-#: hggtk\status.py:1148
+#: tortoisehg\hgtk\status.py:1285
+msgid ""
+"Revert files to revision %s?\n"
+"\n"
+"%s"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1286
+msgid "&Yes (backup changes)"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1287
+msgid "Yes (&discard changes)"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1307
msgid "Nothing Added"
msgstr "Rien n'a été ajouté"
-#: hggtk\status.py:1149
+#: tortoisehg\hgtk\status.py:1308
msgid "No addable files selected"
msgstr ""
-#: hggtk\status.py:1179
+#: tortoisehg\hgtk\status.py:1332
msgid "No removable files selected"
msgstr ""
-#: hggtk\status.py:1187
+#: tortoisehg\hgtk\status.py:1340
msgid "Move files to directory..."
msgstr ""
-#: hggtk\status.py:1197
+#: tortoisehg\hgtk\status.py:1350
msgid "Cannot move outside repo!"
msgstr ""
-#: hggtk\status.py:1204
+#: tortoisehg\hgtk\status.py:1357
msgid ""
"No movable files selected\n"
"\n"
"Note: only clean files can be moved."
msgstr ""
-#: hggtk\status.py:1212
+#: tortoisehg\hgtk\status.py:1366
+msgid "Nothing Forgotten"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1367
+msgid "No clean files selected"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1370
msgid "Confirm Delete Unrevisioned"
msgstr ""
-#: hggtk\status.py:1213
+#: tortoisehg\hgtk\status.py:1371
msgid "Delete the following unrevisioned files?"
msgstr ""
-#: hggtk\status.py:1226
+#: tortoisehg\hgtk\status.py:1384
msgid "Delete Errors"
msgstr "Supprimer les erreurs"
-#: hggtk\synch.py:53
-msgid "TortoiseHg Synchronize - "
-msgstr "TortoiseHG Synchroniz - "
-
-#: hggtk\synch.py:65
-msgid "Incoming"
-msgstr ""
-
-#: hggtk\synch.py:67
+#: tortoisehg\hgtk\status.py:1505
+msgid "Edit"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1506
+msgid "View missing"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1507
+msgid "View other"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1511
+msgid "L_og"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1515
+msgid "_Guess Rename..."
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1516
+msgid "_Ignore"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1517
+msgid "Remove versioned"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1518
+msgid "_Delete unversioned"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1521
+msgid "_Copy..."
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1522
+msgid "Rename..."
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1524
+msgid "Restart Merge..."
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1525
+msgid "Mark unresolved"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1526
+msgid "Mark resolved"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1534
+msgid "Restart merge with"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1578
+msgid "not up to date"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1579
+msgid ""
+"The parents have changed since the last refresh.\n"
+"Continue anyway?"
+msgstr ""
+
+#: tortoisehg\hgtk\status.py:1581
+msgid "&Refresh"
+msgstr ""
+
+#: tortoisehg\hgtk\statusbar.py:44
+msgid "Running"
+msgstr "En cours"
+
+#: tortoisehg\hgtk\synch.py:51
+msgid "%s - synchronize"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:65
msgid "Display changes that can be pulled from selected repository"
msgstr ""
-#: hggtk\synch.py:70
+#: tortoisehg\hgtk\synch.py:68
msgid " Pull "
msgstr ""
-#: hggtk\synch.py:72
+#: tortoisehg\hgtk\synch.py:70
msgid "Pull changes from selected repository"
msgstr ""
-#: hggtk\synch.py:76
-msgid "Outgoing"
-msgstr ""
-
-#: hggtk\synch.py:78
+#: tortoisehg\hgtk\synch.py:76
msgid "Display local changes that will be pushed to selected repository"
msgstr ""
-#: hggtk\synch.py:81
-msgid "Push"
-msgstr ""
-
-#: hggtk\synch.py:83
+#: tortoisehg\hgtk\synch.py:81
msgid "Push local changes to selected repository"
msgstr ""
-#: hggtk\synch.py:86 hggtk\thgconfig.py:483
+#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:614
msgid "Email"
msgstr "Courriel"
-#: hggtk\synch.py:88
+#: tortoisehg\hgtk\synch.py:86
msgid "Email local outgoing changes to one or more recipients"
msgstr ""
-#: hggtk\synch.py:96
+#: tortoisehg\hgtk\synch.py:91
+msgid "Shelve uncommited changes"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:98
msgid "Configure peer repository paths"
msgstr ""
-#: hggtk\synch.py:107
+#: tortoisehg\hgtk\synch.py:113
msgid "Repo:"
msgstr ""
-#: hggtk\synch.py:112
+#: tortoisehg\hgtk\synch.py:118
msgid "Bundle:"
msgstr ""
-#: hggtk\synch.py:156
-msgid "Post pull operation"
-msgstr ""
-
-#: hggtk\synch.py:158
-msgid "Nothing"
-msgstr "Rien"
-
-#: hggtk\synch.py:159 hggtk\update.py:80
-msgid "Update"
-msgstr "Mise à jour"
-
-#: hggtk\synch.py:160
-msgid "Fetch"
-msgstr ""
-
-#: hggtk\synch.py:161
-msgid "Rebase"
-msgstr ""
-
-#: hggtk\synch.py:169
+#: tortoisehg\hgtk\synch.py:164
+msgid "Post Pull: "
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:174
msgid "Advanced Options"
msgstr "Options avancées"
-#: hggtk\synch.py:191
+#: tortoisehg\hgtk\synch.py:181
msgid "Force pull or push"
msgstr ""
-#: hggtk\synch.py:192
+#: tortoisehg\hgtk\synch.py:182
msgid "Run even when remote repository is unrelated."
msgstr ""
-#: hggtk\synch.py:196
-msgid "Target Revision:"
-msgstr "Révision destination :"
-
-#: hggtk\synch.py:200
+#: tortoisehg\hgtk\synch.py:195
+msgid "Target revision:"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:199
msgid "A specific revision up to which you would like to push or pull."
msgstr ""
-#: hggtk\synch.py:204
-msgid "Remote Command:"
-msgstr "Commande distante :"
-
-#: hggtk\synch.py:208
+#: tortoisehg\hgtk\synch.py:209
msgid "Name of hg executable on remote machine."
msgstr ""
-#: hggtk\synch.py:216
+#: tortoisehg\hgtk\synch.py:219
msgid "Incoming/Outgoing"
msgstr ""
-#: hggtk\synch.py:219
-msgid "Show Patches"
-msgstr "Afficher les patches"
-
-#: hggtk\synch.py:220
-msgid "Show Newest First"
-msgstr "Afficher les plus récents en premier"
-
-#: hggtk\synch.py:221
-msgid "Show No Merges"
-msgstr ""
-
-#: hggtk\synch.py:244
-msgid "View pulled revisions"
-msgstr ""
-
-#: hggtk\synch.py:246
+#: tortoisehg\hgtk\synch.py:222
+msgid "Show patches"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:223
+msgid "Show newest first"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:224
+msgid "Show no merges"
+msgstr ""
+
+#: tortoisehg\hgtk\synch.py:268
msgid "Update to branch tip"
msgstr ""
-#: hggtk\synch.py:359
+#: tortoisehg\hgtk\synch.py:367
msgid "unknown sort key '%s'"
msgstr ""
-#: hggtk\synch.py:369
+#: tortoisehg\hgtk\synch.py:377
msgid "Select Repository"
msgstr "Sélectionner le dépôt"
-#: hggtk\synch.py:377
+#: tortoisehg\hgtk\synch.py:384
msgid "Select Bundle"
msgstr "Sélectionner le paquet"
-#: hggtk\synch.py:378
+#: tortoisehg\hgtk\synch.py:386
msgid "Bundle (*.hg)"
msgstr "Paquet (*.hg)"
-#: hggtk\synch.py:379
+#: tortoisehg\hgtk\synch.py:387
msgid "Bundle (*)"
msgstr "Paquet (*)"
-#: hggtk\synch.py:485
-msgid "No repository selected"
-msgstr "Aucun dépôt sélectionné"
-
-#: hggtk\synch.py:486
-msgid "Select a peer repository to compare with"
-msgstr ""
-
-#: hggtk\tagadd.py:25
-msgid "TortoiseHg Tag - %s"
-msgstr "TortoiseHg Tag - %s"
-
-#: hggtk\tagadd.py:49
-msgid "Add tag to selected version"
-msgstr "Ajouter un tag à la version sélectionnée"
-
-#: hggtk\tagadd.py:51
+#: tortoisehg\hgtk\tagadd.py:29
+msgid "Tag - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:42
msgid "Remove"
msgstr "Supprimer"
-#: hggtk\tagadd.py:53
-msgid "Remove tag from repository"
-msgstr "Supprimer le tag du dépôt"
-
-#: hggtk\tagadd.py:66
+#: tortoisehg\hgtk\tagadd.py:59
msgid "Tag:"
msgstr "Tag :"
-#: hggtk\tagadd.py:80
+#: tortoisehg\hgtk\tagadd.py:65
msgid "Revision:"
msgstr "Révision :"
-#: hggtk\tagadd.py:91
+#: tortoisehg\hgtk\tagadd.py:76
msgid "Tag is local"
msgstr "Tag est local"
-#: hggtk\tagadd.py:92
+#: tortoisehg\hgtk\tagadd.py:77
msgid "Replace existing tag"
msgstr "Remplacer le tag existant"
-#: hggtk\tagadd.py:93
-msgid "Use custom commit message"
-msgstr ""
-
-#: hggtk\tagadd.py:100
-msgid "Commit message:"
-msgstr "Message de commit :"
-
-#: hggtk\tagadd.py:168
+#: tortoisehg\hgtk\tagadd.py:78
+msgid "Use English commit message"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:84
+msgid "Use custom commit message:"
+msgstr ""
+
+#: tortoisehg\hgtk\tagadd.py:153
msgid "Tag input is empty"
msgstr ""
-#: hggtk\tagadd.py:169
+#: tortoisehg\hgtk\tagadd.py:154
msgid "Please enter tag name"
msgstr "Entrez le nom du tag"
-#: hggtk\tagadd.py:173
+#: tortoisehg\hgtk\tagadd.py:158
msgid "Custom commit message is empty"
msgstr ""
-#: hggtk\tagadd.py:181 hggtk\tagadd.py:212
+#: tortoisehg\hgtk\tagadd.py:167 tortoisehg\hgtk\tagadd.py:199
msgid "Tagging completed"
msgstr ""
-#: hggtk\tagadd.py:182
+#: tortoisehg\hgtk\tagadd.py:168
msgid "Tag \"%s\" has been added"
msgstr ""
-#: hggtk\tagadd.py:185 hggtk\tagadd.py:188 hggtk\tagadd.py:216
-#: hggtk\tagadd.py:219
+#: tortoisehg\hgtk\tagadd.py:171 tortoisehg\hgtk\tagadd.py:174
+#: tortoisehg\hgtk\tagadd.py:203 tortoisehg\hgtk\tagadd.py:206
msgid "Error in tagging"
msgstr ""
-#: hggtk\tagadd.py:200
+#: tortoisehg\hgtk\tagadd.py:187
msgid "Tag name is empty"
msgstr ""
-#: hggtk\tagadd.py:201
+#: tortoisehg\hgtk\tagadd.py:188
msgid "Please select tag name to remove"
msgstr ""
-#: hggtk\tagadd.py:213
+#: tortoisehg\hgtk\tagadd.py:200
msgid "Tag \"%s\" has been removed"
msgstr ""
-#: hggtk\tagadd.py:235
+#: tortoisehg\hgtk\tagadd.py:214
+msgid "a tag named \"%s\" already exists"
+msgstr "une étiquette du nom de \"%s\" existe déjà "
+
+#: tortoisehg\hgtk\tagadd.py:220
+msgid "Added tag %s for changeset %s"
+msgstr "Étiquette %s ajoutée pour le jeu de révisions %s"
+
+#: tortoisehg\hgtk\tagadd.py:224
msgid "Tag '%s' already exist"
msgstr ""
-#: hggtk\tagadd.py:241
+#: tortoisehg\hgtk\tagadd.py:231
msgid "Tag '%s' does not exist"
msgstr ""
-#: hggtk\taskbarui.py:28
+#: tortoisehg\hgtk\tagadd.py:234
+msgid "Removed tag %s"
+msgstr "Étiquette %s enlevée"
+
+#: tortoisehg\hgtk\taskbarui.py:29
msgid "TortoiseHg Taskbar"
msgstr ""
-#: hggtk\taskbarui.py:49
+#: tortoisehg\hgtk\taskbarui.py:32
+msgid "Apply"
+msgstr "Appliquer"
+
+#: tortoisehg\hgtk\taskbarui.py:52
msgid "Overlays"
msgstr ""
-#: hggtk\taskbarui.py:56
+#: tortoisehg\hgtk\taskbarui.py:59
msgid "Enable overlays"
msgstr ""
-#: hggtk\taskbarui.py:58
+#: tortoisehg\hgtk\taskbarui.py:61
msgid "Local disks only"
msgstr ""
-#: hggtk\taskbarui.py:61
+#: tortoisehg\hgtk\taskbarui.py:65
msgid "Context Menu"
msgstr ""
-#: hggtk\taskbarui.py:67
-msgid "Promote menu items to the top menu"
-msgstr ""
-
-#: hggtk\taskbarui.py:81
-msgid "Promote menu item \"%s\" to top menu"
-msgstr ""
-
-#: hggtk\taskbarui.py:85
+#: tortoisehg\hgtk\taskbarui.py:81
+msgid "Sub menu items:"
+msgstr ""
+
+#: tortoisehg\hgtk\taskbarui.py:100
+msgid "Top menu items:"
+msgstr ""
+
+#: tortoisehg\hgtk\taskbarui.py:122
+msgid "Top ->"
+msgstr ""
+
+#: tortoisehg\hgtk\taskbarui.py:125
+msgid "<- Sub"
+msgstr ""
+
+#: tortoisehg\hgtk\taskbarui.py:130
msgid "Taskbar"
msgstr ""
-#: hggtk\taskbarui.py:92
+#: tortoisehg\hgtk\taskbarui.py:137
msgid "Highlight Icon"
msgstr ""
-#: hggtk\taskbarui.py:95
+#: tortoisehg\hgtk\taskbarui.py:143
msgid "Enable/Disable the overlay icons globally"
msgstr ""
-#: hggtk\taskbarui.py:98
+#: tortoisehg\hgtk\taskbarui.py:146
msgid "Only enable overlays on local disks"
msgstr ""
-#: hggtk\taskbarui.py:102
+#: tortoisehg\hgtk\taskbarui.py:150
msgid "Highlight the taskbar icon during activity"
msgstr ""
-#: hggtk\taskbarui.py:108
+#: tortoisehg\hgtk\taskbarui.py:157
msgid "Event Log"
msgstr ""
-#: hggtk\thgconfig.py:21
+#: tortoisehg\hgtk\thgconfig.py:22
msgid "<unspecified>"
msgstr ""
-#: hggtk\thgconfig.py:27
-msgid "3-way Merge Tool"
-msgstr ""
-
-#: hggtk\thgconfig.py:28
+#: 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 "
@@ -2837,267 +3443,340 @@"manual merging"
msgstr ""
-#: hggtk\thgconfig.py:34
+#: tortoisehg\hgtk\thgconfig.py:35
msgid "Visual Diff Command"
msgstr ""
-#: hggtk\thgconfig.py:35
+#: tortoisehg\hgtk\thgconfig.py:36
msgid "Specify visual diff tool; must be an extdiff command"
msgstr ""
-#: hggtk\thgconfig.py:36
+#: tortoisehg\hgtk\thgconfig.py:37
msgid "Skip Diff Window"
msgstr ""
-#: hggtk\thgconfig.py:37
+#: 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"
msgstr ""
-#: hggtk\thgconfig.py:41
+#: tortoisehg\hgtk\thgconfig.py:42
msgid "Visual Editor"
msgstr ""
-#: hggtk\thgconfig.py:42
+#: tortoisehg\hgtk\thgconfig.py:43
msgid "Specify the visual editor used to view files, etc"
msgstr ""
-#: hggtk\thgconfig.py:43
+#: tortoisehg\hgtk\thgconfig.py:44
msgid "CLI Editor"
msgstr ""
-#: hggtk\thgconfig.py:44
+#: 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 ""
-#: hggtk\thgconfig.py:47
+#: tortoisehg\hgtk\thgconfig.py:48
msgid "Tab Width"
msgstr ""
-#: hggtk\thgconfig.py:48
+#: tortoisehg\hgtk\thgconfig.py:49
msgid ""
"Specify the number of spaces that tabs expand to in various TortoiseHG "
"windows. Default: Not expanded"
msgstr ""
-#: hggtk\thgconfig.py:51
+#: tortoisehg\hgtk\thgconfig.py:52
msgid "Max Diff Size"
msgstr ""
-#: hggtk\thgconfig.py:52
+#: tortoisehg\hgtk\thgconfig.py:53
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 ""
-#: hggtk\thgconfig.py:55
+#: tortoisehg\hgtk\thgconfig.py:56
msgid "Bottom Diffs"
msgstr ""
-#: hggtk\thgconfig.py:56
+#: tortoisehg\hgtk\thgconfig.py:57
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 ""
-#: hggtk\thgconfig.py:59
+#: tortoisehg\hgtk\thgconfig.py:60
msgid "Capture Stderr"
msgstr ""
-#: hggtk\thgconfig.py:60
+#: tortoisehg\hgtk\thgconfig.py:61
msgid ""
"Redirect stderr to a buffer which is parsed at the end of the process for "
"runtime errors. Default: True"
msgstr ""
-#: hggtk\thgconfig.py:62
+#: tortoisehg\hgtk\thgconfig.py:63
msgid "Fork hgtk"
msgstr ""
-#: hggtk\thgconfig.py:63
+#: tortoisehg\hgtk\thgconfig.py:64
msgid ""
"When running hgtk from the command line, fork a background process to run "
"graphical dialogs. Default: True"
msgstr ""
-#: hggtk\thgconfig.py:67
+#: tortoisehg\hgtk\thgconfig.py:66
+msgid "Full path title"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:67
+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:71
msgid "Username"
msgstr ""
-#: hggtk\thgconfig.py:68
+#: tortoisehg\hgtk\thgconfig.py:72
msgid "Name associated with commits"
msgstr ""
-#: hggtk\thgconfig.py:69
+#: tortoisehg\hgtk\thgconfig.py:73
msgid "Summary Line Length"
msgstr ""
-#: hggtk\thgconfig.py:70
+#: tortoisehg\hgtk\thgconfig.py:74
msgid ""
"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 ""
-#: hggtk\thgconfig.py:74
+#: tortoisehg\hgtk\thgconfig.py:78
msgid "Message Line Length"
msgstr ""
-#: hggtk\thgconfig.py:75
+#: tortoisehg\hgtk\thgconfig.py:79
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 ""
-#: hggtk\thgconfig.py:82
+#: tortoisehg\hgtk\thgconfig.py:84
+msgid "Push After Commit"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:85
+msgid ""
+"Attempt to push to default push target after every successful commit. "
+"Default: False"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:87
+msgid "Auto Commit List"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:88
+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
+msgid "Auto Exclude List"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:92
+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
msgid "Author Coloring"
msgstr ""
-#: hggtk\thgconfig.py:83
+#: tortoisehg\hgtk\thgconfig.py:99
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 ""
-#: hggtk\thgconfig.py:87
+#: tortoisehg\hgtk\thgconfig.py:103
msgid "Long Summary"
msgstr ""
-#: hggtk\thgconfig.py:88
+#: tortoisehg\hgtk\thgconfig.py:104
msgid ""
"If true, concatenate multiple lines of changeset summary until they reach 80 "
"characters. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:91
+#: tortoisehg\hgtk\thgconfig.py:107
msgid "Log Batch Size"
msgstr ""
-#: hggtk\thgconfig.py:92
+#: tortoisehg\hgtk\thgconfig.py:108
msgid ""
"The number of revisions to read and display in the changelog viewer in a "
"single batch. Default: 500"
msgstr ""
-#: hggtk\thgconfig.py:95
+#: tortoisehg\hgtk\thgconfig.py:111
msgid "Copy Hash"
msgstr ""
-#: hggtk\thgconfig.py:96
+#: tortoisehg\hgtk\thgconfig.py:112
msgid ""
"Allow the changelog viewer to copy the changeset hash of the currently "
-"selected changeset into the clipboard. Default: False"
-msgstr ""
-
-#: hggtk\thgconfig.py:101
+"selected changeset into the clipboard. DEPRECATED. Default: False"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:115
+msgid "Dead Branches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:116
+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
+msgid "Branch Colors"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:120
+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 (\\). "
+"Likewise some other characters can be escaped in this way, e.g. \\u0040 will "
+"be decoded to the @ character, and \\n to a linefeed. Default: None"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:126
+msgid "Hide Tags"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:127
+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:134
msgid "After pull operation"
msgstr ""
-#: hggtk\thgconfig.py:103
+#: tortoisehg\hgtk\thgconfig.py:136
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 ""
-#: hggtk\thgconfig.py:108
+#: tortoisehg\hgtk\thgconfig.py:141 tortoisehg\hgtk\thgmq.py:186
msgid "Name"
msgstr ""
-#: hggtk\thgconfig.py:109
+#: tortoisehg\hgtk\thgconfig.py:142
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: hggtk\thgconfig.py:111 hggtk\thgconfig.py:782
+#: tortoisehg\hgtk\thgconfig.py:144 tortoisehg\hgtk\thgconfig.py:937
msgid "Description"
msgstr ""
-#: hggtk\thgconfig.py:112
+#: tortoisehg\hgtk\thgconfig.py:145
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: hggtk\thgconfig.py:114
+#: tortoisehg\hgtk\thgconfig.py:147
msgid "Contact"
msgstr ""
-#: hggtk\thgconfig.py:115
+#: tortoisehg\hgtk\thgconfig.py:148
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: hggtk\thgconfig.py:117
+#: tortoisehg\hgtk\thgconfig.py:150
msgid "Style"
msgstr ""
-#: hggtk\thgconfig.py:119
+#: tortoisehg\hgtk\thgconfig.py:152
msgid "Which template map style to use"
msgstr ""
-#: hggtk\thgconfig.py:120
+#: tortoisehg\hgtk\thgconfig.py:153
msgid "Archive Formats"
msgstr ""
-#: hggtk\thgconfig.py:121
+#: tortoisehg\hgtk\thgconfig.py:154
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: hggtk\thgconfig.py:123
+#: tortoisehg\hgtk\thgconfig.py:156
msgid "Port to listen on"
msgstr ""
-#: hggtk\thgconfig.py:123 hggtk\thgconfig.py:233
+#: tortoisehg\hgtk\thgconfig.py:156 tortoisehg\hgtk\thgconfig.py:273
msgid "Port"
msgstr ""
-#: hggtk\thgconfig.py:124
+#: tortoisehg\hgtk\thgconfig.py:157
msgid "Push Requires SSL"
msgstr ""
-#: hggtk\thgconfig.py:125
+#: tortoisehg\hgtk\thgconfig.py:158
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: hggtk\thgconfig.py:127
+#: tortoisehg\hgtk\thgconfig.py:160
msgid "Stripes"
msgstr ""
-#: hggtk\thgconfig.py:128
+#: tortoisehg\hgtk\thgconfig.py:161
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: hggtk\thgconfig.py:130
+#: tortoisehg\hgtk\thgconfig.py:163
msgid "Max Files"
msgstr ""
-#: hggtk\thgconfig.py:131
+#: tortoisehg\hgtk\thgconfig.py:164
msgid "Maximum number of files to list per changeset."
msgstr ""
-#: hggtk\thgconfig.py:132
+#: tortoisehg\hgtk\thgconfig.py:165
msgid "Max Changes"
msgstr ""
-#: hggtk\thgconfig.py:133
+#: tortoisehg\hgtk\thgconfig.py:166
msgid "Maximum number of changes to list on the changelog."
msgstr ""
-#: hggtk\thgconfig.py:134
+#: tortoisehg\hgtk\thgconfig.py:167
msgid "Allow Push"
msgstr ""
-#: hggtk\thgconfig.py:135
+#: tortoisehg\hgtk\thgconfig.py:168
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 "
@@ -3107,11 +3786,11 @@"examined after the deny_push list."
msgstr ""
-#: hggtk\thgconfig.py:142
+#: tortoisehg\hgtk\thgconfig.py:175
msgid "Deny Push"
msgstr ""
-#: hggtk\thgconfig.py:143
+#: tortoisehg\hgtk\thgconfig.py:176
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. "
@@ -3120,81 +3799,81 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: hggtk\thgconfig.py:149
+#: tortoisehg\hgtk\thgconfig.py:182
msgid "Encoding"
msgstr ""
-#: hggtk\thgconfig.py:150
+#: tortoisehg\hgtk\thgconfig.py:183
msgid "Character encoding name"
msgstr ""
-#: hggtk\thgconfig.py:153 hggtk\thgconfig.py:234
+#: tortoisehg\hgtk\thgconfig.py:186 tortoisehg\hgtk\thgconfig.py:274
msgid "Host"
msgstr ""
-#: hggtk\thgconfig.py:154
+#: tortoisehg\hgtk\thgconfig.py:187
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: hggtk\thgconfig.py:156
+#: tortoisehg\hgtk\thgconfig.py:189
msgid "Bypass List"
msgstr ""
-#: hggtk\thgconfig.py:157
+#: tortoisehg\hgtk\thgconfig.py:190
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: hggtk\thgconfig.py:159 hggtk\thgconfig.py:235
+#: tortoisehg\hgtk\thgconfig.py:193
+msgid "Optional. User name to authenticate with at the proxy server"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:195 tortoisehg\hgtk\thgconfig.py:275
msgid "Password"
msgstr ""
-#: hggtk\thgconfig.py:160
+#: tortoisehg\hgtk\thgconfig.py:196
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: hggtk\thgconfig.py:163
-msgid "Optional. User name to authenticate with at the proxy server"
-msgstr ""
-
-#: hggtk\thgconfig.py:167
+#: tortoisehg\hgtk\thgconfig.py:200
msgid "From"
msgstr ""
-#: hggtk\thgconfig.py:168
+#: tortoisehg\hgtk\thgconfig.py:201
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: hggtk\thgconfig.py:169
+#: tortoisehg\hgtk\thgconfig.py:202
msgid "To"
msgstr ""
-#: hggtk\thgconfig.py:170
+#: tortoisehg\hgtk\thgconfig.py:203
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:171
+#: tortoisehg\hgtk\thgconfig.py:204
msgid "Cc"
msgstr ""
-#: hggtk\thgconfig.py:172
+#: tortoisehg\hgtk\thgconfig.py:205
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:174
+#: tortoisehg\hgtk\thgconfig.py:207
msgid "Bcc"
msgstr ""
-#: hggtk\thgconfig.py:175
+#: tortoisehg\hgtk\thgconfig.py:208
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: hggtk\thgconfig.py:177
+#: tortoisehg\hgtk\thgconfig.py:210
msgid "method"
msgstr ""
-#: hggtk\thgconfig.py:178
+#: tortoisehg\hgtk\thgconfig.py:211
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -3204,424 +3883,1467 @@"messages."
msgstr ""
-#: hggtk\thgconfig.py:183
+#: tortoisehg\hgtk\thgconfig.py:216
msgid "Host name of mail server"
msgstr ""
-#: hggtk\thgconfig.py:183
+#: tortoisehg\hgtk\thgconfig.py:216
msgid "SMTP Host"
msgstr ""
-#: hggtk\thgconfig.py:184
+#: tortoisehg\hgtk\thgconfig.py:217
msgid "SMTP Port"
msgstr ""
-#: hggtk\thgconfig.py:185
+#: tortoisehg\hgtk\thgconfig.py:218
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: hggtk\thgconfig.py:187
+#: tortoisehg\hgtk\thgconfig.py:220
msgid "SMTP TLS"
msgstr ""
-#: hggtk\thgconfig.py:188
+#: tortoisehg\hgtk\thgconfig.py:221
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:190
+#: tortoisehg\hgtk\thgconfig.py:223
msgid "SMTP Username"
msgstr ""
-#: hggtk\thgconfig.py:191
+#: tortoisehg\hgtk\thgconfig.py:224
msgid "Username to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:192
+#: tortoisehg\hgtk\thgconfig.py:225
msgid "SMTP Password"
msgstr ""
-#: hggtk\thgconfig.py:193
+#: tortoisehg\hgtk\thgconfig.py:226
msgid "Password to authenticate to mail server with"
msgstr ""
-#: hggtk\thgconfig.py:194
+#: tortoisehg\hgtk\thgconfig.py:227
msgid "Local Hostname"
msgstr ""
-#: hggtk\thgconfig.py:195
+#: tortoisehg\hgtk\thgconfig.py:228
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: hggtk\thgconfig.py:198
+#: tortoisehg\hgtk\thgconfig.py:231
+msgid "Patch EOL"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:232
+msgid ""
+"Normalize file line endings during and after patch to lf or crlf. Strict "
+"does no normalization. Default: strict"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:235
msgid "Git Format"
msgstr ""
-#: hggtk\thgconfig.py:199
+#: tortoisehg\hgtk\thgconfig.py:236
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:201
+#: tortoisehg\hgtk\thgconfig.py:238
msgid "No Dates"
msgstr ""
-#: hggtk\thgconfig.py:202
+#: tortoisehg\hgtk\thgconfig.py:239
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:204
+#: tortoisehg\hgtk\thgconfig.py:241
msgid "Show Function"
msgstr ""
-#: hggtk\thgconfig.py:205
+#: tortoisehg\hgtk\thgconfig.py:242
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:207
+#: tortoisehg\hgtk\thgconfig.py:244
msgid "Ignore White Space"
msgstr ""
-#: hggtk\thgconfig.py:208
+#: tortoisehg\hgtk\thgconfig.py:245
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:210
+#: tortoisehg\hgtk\thgconfig.py:247
msgid "Ignore WS Amount"
msgstr ""
-#: hggtk\thgconfig.py:211
+#: tortoisehg\hgtk\thgconfig.py:248
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:213
+#: tortoisehg\hgtk\thgconfig.py:250
msgid "Ignore Blank Lines"
msgstr ""
-#: hggtk\thgconfig.py:214
+#: tortoisehg\hgtk\thgconfig.py:251
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: hggtk\thgconfig.py:227
+#: tortoisehg\hgtk\thgconfig.py:255
+msgid "http"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:255
+msgid "ssh"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:256
+msgid "https"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:256
+msgid "local"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:265
msgid "Edit remote repository path"
msgstr ""
-#: hggtk\thgconfig.py:233
+#: tortoisehg\hgtk\thgconfig.py:273
msgid "URL"
msgstr ""
-#: hggtk\thgconfig.py:234
+#: tortoisehg\hgtk\thgconfig.py:274
msgid "Folder"
msgstr ""
-#: hggtk\thgconfig.py:236 hggtk\thgconfig.py:735
+#: tortoisehg\hgtk\thgconfig.py:276 tortoisehg\hgtk\thgconfig.py:890
msgid "Alias"
msgstr ""
-#: hggtk\thgconfig.py:371 hggtk\thgconfig.py:675
+#: tortoisehg\hgtk\thgconfig.py:308
+msgid "URL Details"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:319
+msgid "Type"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:449
+msgid "Select Local Folder"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:474
+msgid "Alias name is empty"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:475
+msgid "Please enter alias name"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:480 tortoisehg\hgtk\thgconfig.py:830
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: hggtk\thgconfig.py:425
+#: tortoisehg\hgtk\thgconfig.py:538
msgid "No repository found"
msgstr ""
-#: hggtk\thgconfig.py:426
+#: tortoisehg\hgtk\thgconfig.py:539
msgid "no repo at "
msgstr ""
-#: hggtk\thgconfig.py:434
+#: tortoisehg\hgtk\thgconfig.py:548
+msgid "Iniparse package not found"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:549
+msgid ""
+"Please install iniparse package\n"
+"Settings are only shown, no changing is possible"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:560
msgid "User global settings"
msgstr ""
-#: hggtk\thgconfig.py:436
+#: tortoisehg\hgtk\thgconfig.py:562
msgid "%s repository settings"
msgstr ""
-#: hggtk\thgconfig.py:441
+#: tortoisehg\hgtk\thgconfig.py:567
msgid "Edit File"
msgstr ""
-#: hggtk\thgconfig.py:470
-msgid "Changelog"
-msgstr ""
-
-#: hggtk\thgconfig.py:473
+#: tortoisehg\hgtk\thgconfig.py:590
+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 "Sync"
msgstr ""
-#: hggtk\thgconfig.py:477
+#: tortoisehg\hgtk\thgconfig.py:608
msgid "Web"
msgstr ""
-#: hggtk\thgconfig.py:480
+#: tortoisehg\hgtk\thgconfig.py:611
msgid "Proxy"
msgstr ""
-#: hggtk\thgconfig.py:486
+#: tortoisehg\hgtk\thgconfig.py:617
msgid "Diff"
msgstr ""
-#: hggtk\thgconfig.py:499
+#: tortoisehg\hgtk\thgconfig.py:630
msgid "Unapplied changes"
msgstr ""
-#: hggtk\thgconfig.py:500
+#: tortoisehg\hgtk\thgconfig.py:631
msgid "Lose changes and switch files?."
msgstr ""
-#: hggtk\thgconfig.py:511
+#: tortoisehg\hgtk\thgconfig.py:650
msgid "TortoiseHg Configure Repository - "
msgstr ""
-#: hggtk\thgconfig.py:515
+#: tortoisehg\hgtk\thgconfig.py:654
msgid "TortoiseHg Configure User-Global Settings"
msgstr ""
-#: hggtk\thgconfig.py:559
-msgid "Confirm quit without saving?"
-msgstr ""
-
-#: hggtk\thgconfig.py:560
-msgid "Yes to abandon changes, No to continue"
-msgstr ""
-
-#: hggtk\thgconfig.py:649
+#: tortoisehg\hgtk\thgconfig.py:711
+msgid "Exit after saving changes?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:712
+msgid "&No (discard changes)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:805
msgid "No Repository Found"
msgstr ""
-#: hggtk\thgconfig.py:650
+#: tortoisehg\hgtk\thgconfig.py:806
msgid "Path testing cannot work without a repository"
msgstr ""
-#: hggtk\thgconfig.py:717
+#: tortoisehg\hgtk\thgconfig.py:872
msgid "Remote repository paths"
msgstr ""
-#: hggtk\thgconfig.py:739
+#: tortoisehg\hgtk\thgconfig.py:894
msgid "Repository Path"
msgstr ""
-#: hggtk\thgconfig.py:753
+#: tortoisehg\hgtk\thgconfig.py:908
msgid "_Edit"
msgstr ""
-#: hggtk\thgconfig.py:763
+#: tortoisehg\hgtk\thgconfig.py:918
msgid "_Test"
msgstr ""
-#: hggtk\thgconfig.py:768
+#: tortoisehg\hgtk\thgconfig.py:923
msgid "Set as _default"
msgstr ""
-#: hggtk\thgconfig.py:868
+#: tortoisehg\hgtk\thgconfig.py:1009
msgid "Suggested"
msgstr ""
-#: hggtk\thgconfig.py:878
+#: tortoisehg\hgtk\thgconfig.py:1019
msgid "History"
msgstr ""
-#: hggtk\thgconfig.py:916
+#: tortoisehg\hgtk\thgconfig.py:1057
msgid "# Generated by tortoisehg-config\n"
msgstr ""
-#: hggtk\thgconfig.py:953
+#: tortoisehg\hgtk\thgconfig.py:1111
msgid "Skipped saving path with no alias"
msgstr ""
-#: hggtk\thgconfig.py:983
+#: tortoisehg\hgtk\thgconfig.py:1139
msgid "Unable to write configuration file"
msgstr ""
-#: hggtk\thgshelve.py:71 hggtk\thgshelve.py:133 hggtk\thgshelve.py:139
-#: hggtk\thgshelve.py:147
-msgid "Shelve"
-msgstr ""
-
-#: hggtk\thgshelve.py:72
+#: tortoisehg\hgtk\thgmq.py:95
+msgid "Unapply all patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:100
+msgid "Unapply last patch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:106
+msgid "Apply next patch"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:111
+msgid "Apply all patches"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:184
+msgid "#"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:271
+msgid "%s of %s Patches applied"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:274
+msgid "Patch '%s' applied"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:549
+msgid "_goto"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:551
+msgid "_rename"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:553
+msgid "_finish applied"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:555
+msgid "_delete"
+msgstr "_supprimer"
+
+#: tortoisehg\hgtk\thgmq.py:556
+msgid "delete --keep"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:558
+msgid "f_old"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:560
+msgid "make it _next"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:594
+msgid "Show index"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:595
+msgid "Show status"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:596
+msgid "Show name"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:597
+msgid "Show summary"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:603
+msgid "Enable editable cells"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:606
+msgid "Show 'qparent'"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:624
+msgid "Succeed"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:72
msgid "set aside selected changes"
msgstr ""
-#: hggtk\thgshelve.py:73
+#: tortoisehg\hgtk\thgshelve.py:73
msgid "Unshelve"
msgstr ""
-#: hggtk\thgshelve.py:74
+#: tortoisehg\hgtk\thgshelve.py:74
msgid "restore shelved changes"
msgstr ""
-#: hggtk\thgshelve.py:97 hggtk\thgshelve.py:98 hggtk\thgshelve.py:99
-#: hggtk\thgshelve.py:102
+#: tortoisehg\hgtk\thgshelve.py:96
+msgid "Shelf Contents"
+msgstr ""
+
+#: tortoisehg\hgtk\thgshelve.py:107
msgid "_shelve"
msgstr ""
-#: hggtk\thgshelve.py:134
+#: tortoisehg\hgtk\thgshelve.py:140
msgid "No changes to shelve"
msgstr ""
-#: hggtk\thgshelve.py:140
+#: tortoisehg\hgtk\thgshelve.py:146
msgid "Please select diff chunks to shelve"
msgstr ""
-#: hggtk\thgshelve.py:148
+#: tortoisehg\hgtk\thgshelve.py:154
msgid "<b>Shelve file exists!</b>"
msgstr ""
-#: hggtk\thgshelve.py:149
+#: tortoisehg\hgtk\thgshelve.py:155
msgid "Overwrite"
msgstr ""
-#: hggtk\thgshelve.py:150
+#: tortoisehg\hgtk\thgshelve.py:156
msgid "Append"
msgstr ""
-#: hggtk\update.py:18
-msgid "= Current Branch Tip ="
-msgstr ""
-
-#: hggtk\update.py:37
+#: tortoisehg\hgtk\thgshelve.py:157
+msgid "Cancel"
+msgstr "Annuler"
+
+#: tortoisehg\hgtk\thgshelve.py:209
+msgid "Unshelve Error"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:39
+msgid "Strip"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:48
+msgid "Strip - %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:64
+msgid "Strip:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:79
+msgid "Preview:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:98
+msgid "Show all"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:101
+msgid "Use compact view"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:117
+msgid "Options:"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:121
+msgid "Discard local changes, no backup (-f/--force)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:152
+msgid "Backup all (default)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:153
+msgid "Backup unrelated changesets (-b/--backup)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:155
+msgid "No backup (-n/--nobackup)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:182
+msgid "Unknown revision!"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:184
+msgid "<span weight=\"bold\">%s changesets</span> will be stripped"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:190
+msgid "No changesets to display"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:194
+msgid "Displaying all changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:196
+msgid "Displaying %(count)d of %(total)d changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:359
+msgid "Confirm Strip"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:360
+msgid ""
+"Detected uncommitted local changes.\n"
+"Do you want to discard them and continue?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:362
+msgid "&Yes (--force)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:380
+msgid "Stripped successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:383
+msgid "Canceled stripping"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:385
+msgid "Failed to strip"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:402
+msgid "Saved at: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\thgstrip.py:406
+msgid "Open..."
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:42
msgid "Update - %s"
msgstr ""
-#: hggtk\update.py:44
+#: tortoisehg\hgtk\update.py:58
msgid "Update to:"
msgstr ""
-#: hggtk\update.py:64
-msgid "Overwrite local changes (--clean)"
-msgstr ""
-
-#: hggtk\visdiff.py:61
+#: tortoisehg\hgtk\update.py:61
+msgid "Discard local changes, no backup (-C/--clean)"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:91
+msgid "Target:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:99
+msgid "Parent 1:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:101
+msgid "Parent 2:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:103
+msgid "Parent:"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:181
+msgid "(same as parent)"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:187
+msgid "unknown revision!"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:223
+msgid ""
+"Detected uncommitted local changes in working tree.\n"
+"Please select to continue:\n"
+"\n"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:225
+msgid "&Discard"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:226
+msgid "Discard - discard local changes, no backup"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:227
+msgid "&Shelve"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:228
+msgid "Shelve - launch Shelve tool and continue"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:229
+msgid "&Merge"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:230
+msgid "Merge - allow to merge with local changes"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:243
+msgid "Confirm Update"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:267
+msgid "[canceled by user]\n"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:272
+msgid "invalid dialog result: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:281
+msgid "Updated successfully"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:283
+msgid "Canceled updating"
+msgstr ""
+
+#: tortoisehg\hgtk\update.py:285
+msgid "Failed to update"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:55
msgid "Visual Diffs"
msgstr ""
-#: hggtk\visdiff.py:64
+#: tortoisehg\hgtk\visdiff.py:62
msgid "Temporary files are removed when this dialog is closed"
msgstr ""
-#: hggtk\visdiff.py:82
+#: tortoisehg\hgtk\visdiff.py:80
msgid "Always launch single files"
msgstr ""
-#: hggtk\visdiff.py:108
+#: tortoisehg\hgtk\visdiff.py:107
msgid "No repository"
msgstr ""
-#: hggtk\visdiff.py:109
+#: tortoisehg\hgtk\visdiff.py:108 tortoisehg\hgtk\visdiff.py:300
msgid "No repository found here"
msgstr ""
-#: hggtk\visdiff.py:116
+#: tortoisehg\hgtk\visdiff.py:115
msgid "Select diff tool"
msgstr ""
-#: hggtk\visdiff.py:135
+#: tortoisehg\hgtk\visdiff.py:134
msgid "No visual diff tool"
msgstr ""
-#: hggtk\visdiff.py:136
+#: tortoisehg\hgtk\visdiff.py:135
msgid "No visual diff tool has been configured"
msgstr ""
-#: hggtk\visdiff.py:155
+#: tortoisehg\hgtk\visdiff.py:161
msgid "changeset "
msgstr ""
-#: hggtk\visdiff.py:160
-msgid "revision(s) "
-msgstr ""
-
-#: hggtk\visdiff.py:162
+#: tortoisehg\hgtk\visdiff.py:166
+msgid "revisions "
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:168
msgid "working changes"
msgstr ""
-#: hggtk\visdiff.py:165
+#: tortoisehg\hgtk\visdiff.py:171
msgid "Visual Diffs - "
msgstr ""
-#: hggtk\visdiff.py:173
+#: tortoisehg\hgtk\visdiff.py:179 tortoisehg\hgtk\visdiff.py:325
msgid "No file changes"
msgstr ""
-#: hggtk\visdiff.py:174
+#: tortoisehg\hgtk\visdiff.py:180 tortoisehg\hgtk\visdiff.py:326
msgid "There are no file changes to view"
msgstr ""
-#: hggtk\visdiff.py:213
+#: tortoisehg\hgtk\visdiff.py:227
msgid "Unable to delete temp files"
msgstr ""
-#: hggtk\visdiff.py:214
+#: tortoisehg\hgtk\visdiff.py:228
msgid "Close diff tools and try again, or quit to leak files?"
msgstr ""
-#: hggtk\visdiff.py:215
+#: tortoisehg\hgtk\visdiff.py:229
msgid "&Quit"
msgstr ""
-#: hggtk\visdiff.py:215
+#: tortoisehg\hgtk\visdiff.py:229
msgid "Try &Again"
msgstr ""
-#: hggtk\visdiff.py:253
+#: tortoisehg\hgtk\visdiff.py:267
msgid "Tool launch failure"
msgstr ""
-#: hggtk\visdiff.py:254
+#: tortoisehg\hgtk\visdiff.py:268
msgid "%s : %s"
msgstr ""
-#: thgutil\menuthg.py:174
+#: tortoisehg\hgtk\visdiff.py:307
+msgid "Extdiff command not recognized\n"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:46
+msgid "Unsupported line endings type: %s"
+msgstr ""
+
+#: tortoisehg\util\hgshelve.py:97
+msgid "unknown patch content: %r"
+msgstr "contenu de mise à jour inconnu: %r"
+
+#: tortoisehg\util\hgshelve.py:118 tortoisehg\util\hgshelve.py:145
+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
+msgid "this is a binary file\n"
+msgstr "ceci est un fichier binaire\n"
+
+#: tortoisehg\util\hgshelve.py:134
+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
+msgid "%d hunks, %d lines changed\n"
+msgstr "%d morceaux, %d lignes modifiées\n"
+
+#: tortoisehg\util\hgshelve.py:299
+msgid "unhandled transition: %s -> %s"
+msgstr "transition non gérée : %s -> %s"
+
+#: tortoisehg\util\hgshelve.py:325
+msgid " [Ynsfdaq?] "
+msgstr " [Ynsfdaq?] "
+
+#: tortoisehg\util\hgshelve.py:341
+msgid "user quit"
+msgstr "l'utilisateur quitte"
+
+#: tortoisehg\util\hgshelve.py:355
+msgid "shelve changes to %s?"
+msgstr "archiver les modifications vers %s ?"
+
+#: tortoisehg\util\hgshelve.py:356
+msgid " and "
+msgstr " et "
+
+#: tortoisehg\util\hgshelve.py:366
+msgid "shelve this change to %r?"
+msgstr "archiver ce changement vers %r ?"
+
+#: tortoisehg\util\hgshelve.py:405
+msgid "backup %r as %r\n"
+msgstr "sauvegarder %r vers %r\n"
+
+#: tortoisehg\util\hgshelve.py:438
+msgid "shelve can only be run interactively"
+msgstr "l'archivage ne peut utilisé qu'interactivement."
+
+#: tortoisehg\util\hgshelve.py:442
+msgid "shelve data already exists"
+msgstr "shelve données resistent déja"
+
+#: tortoisehg\util\hgshelve.py:473
+msgid "no changes to shelve\n"
+msgstr "aucune modification à archiver\n"
+
+#: tortoisehg\util\hgshelve.py:507
+msgid "applying patch\n"
+msgstr "application du patch\n"
+
+#: tortoisehg\util\hgshelve.py:514
+msgid "saving patch to shelve\n"
+msgstr "sauvegarde de patch à archiver\n"
+
+#: tortoisehg\util\hgshelve.py:525 tortoisehg\util\hgshelve.py:576
+msgid "restoring %r to %r\n"
+msgstr "restauration de %r vers %r\n"
+
+#: tortoisehg\util\hgshelve.py:527
+msgid "removing shelve file\n"
+msgstr "suppression du fichier d'archive\n"
+
+#: tortoisehg\util\hgshelve.py:536
+msgid "removing backup for %r : %r\n"
+msgstr "suppression de la sauvegarde de %r : %r\n"
+
+#: tortoisehg\util\hgshelve.py:561
+msgid "applying shelved patch\n"
+msgstr "application du patch archivé\n"
+
+#: tortoisehg\util\hgshelve.py:574
+msgid "restoring backup files\n"
+msgstr "restoration des fichiers de sauvegarde\n"
+
+#: tortoisehg\util\hgshelve.py:581
+msgid "removing backup files\n"
+msgstr "suppression des fichiers de sauvegarde\n"
+
+#: tortoisehg\util\hgshelve.py:587
+msgid "removing shelved patches\n"
+msgstr "suppression des patchs archivés\n"
+
+#: tortoisehg\util\hgshelve.py:589
+msgid "unshelve completed\n"
+msgstr "désarchivage terminé\n"
+
+#: tortoisehg\util\hgshelve.py:591
+msgid "nothing to unshelve\n"
+msgstr "rien à archiver\n"
+
+#: tortoisehg\util\hgshelve.py:597
+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
+msgid "overwrite existing shelve data"
+msgstr "écraser les données d'archivage existantes"
+
+#: tortoisehg\util\hgshelve.py:601
+msgid "append to existing shelve data"
+msgstr "ajouter aux données d'archivage existantes"
+
+#: tortoisehg\util\hgshelve.py:603
+msgid "hg shelve [OPTION]... [FILE]..."
+msgstr "hg shelve [OPTION]... [FILE]..."
+
+#: tortoisehg\util\hgshelve.py:606
+msgid "inspect shelved changes only"
+msgstr "inspecter seulement les changements archivés"
+
+#: tortoisehg\util\hgshelve.py:608
+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
+msgid "hg unshelve [OPTION]... [FILE]..."
+msgstr "hg unshelve [OPTION]... [FILE]..."
+
+#: tortoisehg\util\menuthg.py:38
+msgid "Commit..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:39
+msgid "Commit changes in repository"
+msgstr "Livrer les changements dans le dépôt"
+
+#: tortoisehg\util\menuthg.py:41
+msgid "Create Repository Here"
+msgstr "Créer un dépôt ici"
+
+#: tortoisehg\util\menuthg.py:44
+msgid "Clone..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:45
+msgid "Create clone here from source"
+msgstr "Créer un clone ici depuis la source"
+
+#: tortoisehg\util\menuthg.py:47
+msgid "File Status"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:48
+msgid "Repository status & changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:50
+msgid "Shelve Changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:51
+msgid "Shelve or unshelve file changes"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:53
+msgid "Add Files..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:54
+msgid "Add files to version control"
+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:68
+msgid "Repository Explorer"
+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
+msgid "Start web server for this repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:77
+msgid "Update..."
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:78
+msgid "Update working directory"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:80
+msgid "Recovery..."
+msgstr "Récupération..."
+
+#: tortoisehg\util\menuthg.py:81
+msgid "Repair and recovery of repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:83
+msgid "Update Icons"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:84
+msgid "Update icons for this repository"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:86
+msgid "Global Settings"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:87
+msgid "Configure user wide settings"
+msgstr "Configuration globale"
+
+#: tortoisehg\util\menuthg.py:89
+msgid "Repository Settings"
+msgstr "Paramètres du dépôt"
+
+#: tortoisehg\util\menuthg.py:90
+msgid "Configure repository settings"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:92
+msgid "About TortoiseHg"
+msgstr "À propos de TortoiseHg"
+
+#: tortoisehg\util\menuthg.py:93
+msgid "Show About Dialog"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:95
+msgid "Annotate Files"
+msgstr "Annoter fichiers"
+
+#: tortoisehg\util\menuthg.py:96
+msgid "Changeset information per file line"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:98
+msgid "Visual Diff"
+msgstr "Diff visuel"
+
+#: tortoisehg\util\menuthg.py:99
+msgid "View changes using GUI diff tool"
+msgstr "Afficher les changements avec l'interface graphique de diff"
+
+#: tortoisehg\util\menuthg.py:101
+msgid "Edit Ignore Filter"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:102
+msgid "Edit repository ignore filter"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:104
+msgid "Guess Renames"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:105
+msgid "Detect renames and copies"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:107
+msgid "Search History"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:108
+msgid "Search file revisions for patterns"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:110
+msgid "DnD Synchronize"
+msgstr ""
+
+#: tortoisehg\util\menuthg.py:111
msgid "Synchronize with dragged repository"
msgstr ""
-#: thgutil\menuthg.py:186 thgutil\menuthg.py:313
-msgid "Global Settings"
-msgstr ""
-
-#: thgutil\menuthg.py:228
-msgid "Edit Ignore Filter"
-msgstr ""
-
-#: thgutil\menuthg.py:229
-msgid "Edit repository ignore filter"
-msgstr ""
-
-#: thgutil\menuthg.py:238
-msgid "Shelve Changes"
-msgstr ""
-
-#: thgutil\menuthg.py:239
-msgid "Shelve or unshelve repository changes"
-msgstr ""
-
-#: thgutil\menuthg.py:250
-msgid "Guess Renames"
-msgstr ""
-
-#: thgutil\menuthg.py:251
-msgid "Detect renames and copies"
-msgstr ""
-
-#: thgutil\menuthg.py:254
-msgid "Rename File"
-msgstr ""
-
-#: thgutil\menuthg.py:255
-msgid "Rename file or directory"
-msgstr ""
-
-#: thgutil\menuthg.py:267
-msgid "Revert Changes"
-msgstr ""
-
-#: thgutil\menuthg.py:286
-msgid "Search History"
-msgstr ""
-
-#: thgutil\menuthg.py:287
-msgid "Search revisions of files for a text pattern"
-msgstr ""
-
-#: thgutil\shlib.py:26 thgutil\version.py:16
-msgid "unknown"
-msgstr ""
+#~ msgid "Clone a repository here"
+#~ msgstr "Cloner un dépôt ici"
+
+#~ msgid "Configure settings local to this repository"
+#~ msgstr "Configuration de ce dépôt seulement"
+
+#~ msgid "unrecognized response\n"
+#~ msgstr "réponse non reconnue\n"
+
+#~ msgid "repository '%s' is not local"
+#~ msgstr "le dépôt '%s' n'est pas local"
+
+#~ msgid "Clone a Repository"
+#~ msgstr "Coner un dépôt"
+
+#~ msgid "Create Clone"
+#~ msgstr "Créer un clone"
+
+#~ msgid "clone a repository"
+#~ msgstr "coner un dépôt"
+
+#~ msgid "Repository status"
+#~ msgstr "Statut du dépôt"
+
+#~ msgid "View File Status"
+#~ msgstr "Afficher le statut du fichier"
+
+#~ msgid "Remove Files"
+#~ msgstr "Enlever fichiers"
+
+#~ msgid "Add files to Hg repository"
+#~ msgstr "Ajouter des fichiers dans le dépôt Hg"
+
+#~ msgid "Add Files"
+#~ msgstr "Ajouter fichiers"
+
+#~ msgid "create a new repository in this directory"
+#~ msgstr "créer un nouveau dépôt dans ce répertoire"
+
+#~ msgid "Synchronize..."
+#~ msgstr "Synchroniser..."
+
+#~ msgid "View revision history"
+#~ msgstr "Afficher l'historique des révisions"
+
+#~ msgid "start web server for this repository"
+#~ msgstr "Démarrer le serveur web pour ce dépôt"
+
+#~ msgid "HG Commit..."
+#~ msgstr "HG Livrer..."
+
+#~ msgid "Revert selected files"
+#~ msgstr "Annuler les changements des fichiers sélectionnés"
+
+#~ msgid "Remove selected files on the next commit"
+#~ msgstr "Enlever les fichiers sélectionnés à la prochaine livraison"
+
+#~ msgid "View Changelog"
+#~ msgstr "Afficher le journal"
+
+#~ msgid "show changeset information per file line"
+#~ msgstr "montrer les informations du jeu de révisions par ligne du fichier"
+
+#~ msgid "General repair and recovery of repository"
+#~ msgstr "Centre de réparation et de récupération du dépôt"
+
+#~ msgid "extension '%s' overrides commands: %s\n"
+#~ msgstr "l'extension '%s' redéfinit la commande : %s\n"
+
+#~ msgid "Clone To Revision:"
+#~ msgstr "Cloner vers version :"
+
+#~ msgid "use proxy server"
+#~ msgstr "utiliser un serveur proxy"
+
+#~ msgid "Source and dest are the same"
+#~ msgstr "Source et cible sont identiques"
+
+#~ msgid "Please specify a different destination"
+#~ msgstr "Spécifiez une destination différente"
+
+#~ msgid "do not update the new working directory"
+#~ msgstr "ne pas mettre à jour le répertoire de travail"
+
+#~ msgid "Clone aborted"
+#~ msgstr "Clonage annulé"
+
+#~ msgid "Clone error"
+#~ msgstr "Erreur de clônage"
+
+#~ msgid "Destination Path:"
+#~ msgstr "Chemin Cible :"
+
+#~ msgid "Source Path:"
+#~ msgstr "Chemin Source :"
+
+#~ msgid "Remote Cmd:"
+#~ msgstr "Cmd à distance :"
+
+#~ msgid "use pull protocol to copy metadata"
+#~ msgstr "utiliser le protocole de retrait pour copier les métadatas"
+
+#~ msgid "use uncompressed transfer"
+#~ msgstr "utiliser un transfert sans compression"
+
+#~ msgid "Recent Commit Messages..."
+#~ msgstr "Messages de commit récents..."
+
+#~ msgid "Backout changeset - "
+#~ msgstr "Revenir sur les changements "
+
+#~ msgid "Undo commit"
+#~ msgstr "Défaire l'envoi"
+
+#~ msgid "DataMining"
+#~ msgstr "Analyse de données"
+
+#~ msgid "Follow"
+#~ msgstr "Suivre"
+
+#~ msgid "Follow Rename:"
+#~ msgstr "Suivre le changement de nom :"
+
+#~ msgid "Detect Copies/Renames in "
+#~ msgstr "Détecte les copies et changements de noms dans "
+
+#~ msgid "Done"
+#~ msgstr "Terminé"
+
+#~ msgid "Show email(s) which would be sent"
+#~ msgstr "Affiche l'e-mail(s) Ã envoyer"
+
+#~ msgid "configure"
+#~ msgstr "configurer"
+
+#~ msgid "Send email(s)"
+#~ msgstr "Envoyer des emails"
+
+#~ msgid "test"
+#~ msgstr "test"
+
+#~ msgid "send"
+#~ msgstr "envoyer"
+
+#~ msgid "Email revision(s) "
+#~ msgstr "Envoyer par e-mail les versions "
+
+#~ 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 "
+#~ "mise à jour."
+
+#~ 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. "
+#~ "When emailing a bundle, these fields make up the message subject and body."
+#~ msgstr ""
+#~ "La description du groupe de mises à jour est envoyée dans un mail de résumé "
+#~ "initial avec l'objet [MAJ 0 of N]. Elle devrait décrire les effets de "
+#~ "l'ensemble des mise à jour. Quand vous envoyez un groupe par e-mail, l'objet "
+#~ "et le texte du mail sont générés par ces champs."
+
+#~ msgid "Ignore filter for "
+#~ msgstr "Ignorer le filtre pour "
+
+#~ msgid "add"
+#~ msgstr "ajouter"
+
+#~ msgid "[command completed successfully]\n"
+#~ msgstr "[commande terminée avec succès]\n"
+
+#~ msgid "[command returned code %d]\n"
+#~ msgstr "[la commande a renvoyé le code %d]\n"
+
+#~ msgid "Show ID"
+#~ msgstr "Affiche ID"
+
+#~ msgid "_DataMine"
+#~ msgstr "_DataMine"
+
+#~ msgid "Search Repository History"
+#~ msgstr "Cherche dans l'historique du dépôt"
+
+#~ msgid "Show Rev"
+#~ msgstr "Affiche Ver"
+
+#~ msgid "Filter revisions for display"
+#~ msgstr "Filtre les versions à afficher"
+
+#~ msgid "_Filter"
+#~ msgstr "_Filtrer"
+
+#~ msgid "user/date:"
+#~ msgstr "utilisateur/date"
+
+#~ msgid "diff to _local"
+#~ msgstr "diff. avec _local"
+
+#~ msgid "_visual diff"
+#~ msgstr "diff _graphique"
+
+#~ msgid "_view at revision"
+#~ msgstr "_voir une version"
+
+#~ msgid "_revert file contents"
+#~ msgstr "_revenir sur le fichier original"
+
+#~ msgid "_save at revision"
+#~ msgstr "_sauver vers une version"
+
+#~ msgid "diff other parent"
+#~ msgstr "diff. avec un autre parent"
+
+#~ msgid "Show Head Revisions"
+#~ msgstr "Affiche les versions de tête"
+
+#~ msgid "Show Revision Ancestry"
+#~ msgstr "Affiche les ancêtres de cette version"
+
+#~ msgid "Show Branch"
+#~ msgstr "Affiche la branche"
+
+#~ msgid "Show Non-Merge Revisions"
+#~ msgstr "Affiche les versions hors fusions"
+
+#~ msgid "Show Only Merge Revisions"
+#~ msgstr "Affiche uniquement les versions de fusion"
+
+#~ msgid "Show All Revisions"
+#~ msgstr "Affiche toutes les versions"
+
+#~ msgid "Show Tagged Revisions"
+#~ msgstr "Affiche les versions choisies"
+
+#~ msgid "_bundle rev:tip"
+#~ msgstr "joindre rev:tip (_b)"
+
+#~ msgid "e_mail patch"
+#~ msgstr "envoyer le patch par _mail"
+
+#~ msgid "_export patch"
+#~ msgstr "_exporter le patch"
+
+#~ msgid "_merge with"
+#~ msgstr "fusionner avec (_m)"
+
+#~ msgid "_update"
+#~ msgstr "mettre à jo_ur"
+
+#~ msgid "Custom Filter"
+#~ msgstr "Filtre utilisateur"
+
+#~ msgid "diff to local"
+#~ msgstr "différencier avec la copie locale"
+
+#~ msgid "visualize change"
+#~ msgstr "affiche les modifications"
+
+#~ msgid "_copy hash"
+#~ msgstr "copie la hash"
+
+#~ msgid "_revert"
+#~ msgstr "_revenir"
+
+#~ msgid "show all remaining revisions"
+#~ msgstr "affiche toutes les versions suivantes"
+
+#~ msgid "show next %d revisions"
+#~ msgstr "affiche les %d versions suivantes"
+
+#~ msgid "Confirm Undo commit"
+#~ msgstr "Confirmer le retour sur votre envoi"
+
+#~ msgid "Show Working Parents"
+#~ msgstr "Affiche les parents de travail"
+
+#~ msgid "backout revision"
+#~ msgstr "revenir sur cette version"
+
+#~ msgid "add/remove _tag"
+#~ msgstr "ajou_te/supprime le label"
+
+#~ msgid "Remove revision %d and all descendants?"
+#~ msgstr "Supprimer la version %d et tous les descendants ?"
+
+#~ msgid "visual diff with selected"
+#~ msgstr "_différences graphiques avec ce qui est choisi"
+
+#~ msgid "_diff with selected"
+#~ msgstr "_différences avec ce qui est choisi"
+
+#~ msgid "bundle from here to selected"
+#~ msgstr "grouper d'ici à ce qui est choisi"
+
+#~ msgid "email from here to selected"
+#~ msgstr "e-mailer d'ici à ce qui est choisi"
+
+#~ msgid "strip revision"
+#~ msgstr "supprimer la révision"
+
+#~ msgid "_commit"
+#~ msgstr "_commiter"
+
+#~ msgid "Log Filter - %s"
+#~ msgstr "Filtre des logs - %s"
+
+#~ msgid "Confirm Strip Revision(s)"
+#~ msgstr "Confirmer la suppression de révision(s)"
+
+#~ msgid "Confirm Revert Revision(s)"
+#~ msgstr "Confirmer le rétablissement de révision(s)"
+
+#~ msgid "Help on date formats"
+#~ msgstr "Aide sur les formats de date"
+
+#~ msgid "Keyword(s):"
+#~ msgstr "Mot(s)-clef"
+
+#~ msgid ""
+#~ "Display only changesets matching these comma separated case insensitive "
+#~ "keywords"
+#~ msgstr ""
+#~ "Afficher seulement les changements correspondants à cette liste de mot(s)-"
+#~ "clef séparé(s) par des virgules"
+
+#~ msgid "Search repository changelog with criteria"
+#~ msgstr "Rechercher dans les modifications selon ces critères"
+
+#~ msgid "Search Filter"
+#~ msgstr "Rechercher un filtre"
+
+#~ msgid "Display only changesets affecting these comma separated file paths"
+#~ msgstr ""
+#~ "Afficher seulement les modifications affectée par cette liste de fichiers "
+#~ "séparés par des virgules"
+
+#~ msgid "File(s):"
+#~ msgstr "Fichier(s)"
+
+#~ msgid "Date:"
+#~ msgstr "Date :"
+
+#~ msgid "Display only changesets matching this date specification"
+#~ msgstr ""
+#~ "Afficher seulement les modifications correspondants à la date spécifiée"
+
+#~ msgid "Merging in "
+#~ msgstr "Fusionner dans "
+
+#~ msgid "TortoiseHg Recovery - "
+#~ msgstr "TortoiseHg Recovery - "
+
+#~ msgid "Unable to find repo at %s\n"
+#~ msgstr "Impossible de trouver le dépôt à %s\n"
+
+#~ msgid "_difference"
+#~ msgstr "_différence"
+
+#~ msgid "Serve %s - %s"
+#~ msgstr "Sert %s - %s"
+
+#~ msgid "Serve - "
+#~ msgstr "Sert - "
+
+#~ msgid "edit"
+#~ msgstr "éditer"
+
+#~ msgid "view other"
+#~ msgstr "autres"
+
+#~ msgid "_copy"
+#~ msgstr "_copier"
+
+#~ msgid "_ignore"
+#~ msgstr "_ignorer"
+
+#~ msgid "re_name"
+#~ msgstr "re_nommer"
+
+#~ msgid "_view"
+#~ msgstr "_vue"
+
+#~ msgid "_add"
+#~ msgstr "_ajouter"
+
+#~ msgid "resolve"
+#~ msgstr "résoudre"
+
+#~ msgid "mark unresolved"
+#~ msgstr "marquer comme non résolu"
+
+#~ msgid "move selected files to other directory"
+#~ msgstr "déplacer les fichiers sélectionnés dans un autre répertoire"
+
+#~ msgid "remove"
+#~ msgstr "supprimer"
+
+#~ msgid "mark resolved"
+#~ msgstr "marquer comme résolu"
+
+#~ msgid "TortoiseHg Synchronize - "
+#~ msgstr "TortoiseHG Synchroniz - "
+
+#~ msgid "Remote Command:"
+#~ msgstr "Commande distante :"
+
+#~ msgid "Show Newest First"
+#~ msgstr "Afficher les plus récents en premier"
+
+#~ msgid "Target Revision:"
+#~ msgstr "Révision destination :"
+
+#~ msgid "Show Patches"
+#~ msgstr "Afficher les patches"
+
+#~ msgid "Add tag to selected version"
+#~ msgstr "Ajouter un tag à la version sélectionnée"
+
+#~ msgid "TortoiseHg Tag - %s"
+#~ msgstr "TortoiseHg Tag - %s"
+
+#~ msgid "Remove tag from repository"
+#~ msgstr "Supprimer le tag du dépôt"
+
+#~ msgid "Commit message:"
+#~ msgstr "Message de commit :"
+
+#~ msgid "date"
+#~ msgstr "date"
+
+#~ msgid "user"
+#~ msgstr "utilisateur"
+
+#~ msgid "_Other parent"
+#~ msgstr "_Autre parent"
+
+#~ msgid "summary"
+#~ msgstr "résumé"
+
+#~ msgid "tags"
+#~ msgstr "tags"
+
+#~ msgid "branch"
+#~ msgstr "branche"
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
@@ -47,7 +47,7 @@ def prepare_display(self):
self.currow = None
self.graphview = None
- self.glog_parent = NoneY
+ self.glog_parent = None
node0, node1 = cmdutil.revpair(self.repo, self.opts.get('rev'))
self.load_details(self.repo.changelog.rev(node0))
@@ -86,15 +86,14 @@ if not ctx:
return
- if not self.parent_button.parent:
- self.parent_box.pack_start(gtk.HSeparator(), False, False)
- self.parent_box.pack_start(self.parent_button, False, False)
- self.parent_box.show_all()
-
parents = ctx.parents()
title = self.get_title()
if parents:
if len(parents) == 2:
+ if not self.parent_button.parent:
+ self.parent_box.pack_start(gtk.HSeparator(), False, False)
+ self.parent_box.pack_start(self.parent_button, False, False)
+ self.parent_box.show_all()
self.parent_box.show()
if self.diff_other_parent():
title += ':' + str(parents[1].rev())
@@ -397,6 +396,10 @@ return menu
def get_body(self):
+ embedded = bool(self.stbar)
+ use_expander = embedded and self.ui.configbool(
+ 'tortoisehg', 'changeset-expander')
+
self.curfile = ''
if self.repo.ui.configbool('tortoisehg', 'copyhash'):
sel = (os.name == 'nt') and 'CLIPBOARD' or 'PRIMARY'
@@ -405,6 +408,8 @@ self.clipboard = None
self.filemenu = self.file_context_menu()
+ details_frame_parent = gtk.VBox()
+
# changeset frame
details_frame = gtk.Frame()
details_frame.set_shadow_type(gtk.SHADOW_ETCHED_IN)
@@ -525,11 +530,20 @@ self.patchstyle = csinfo.panelstyle(contents=('patch', 'branch',
'user', 'dateage', 'parents'),
selectable=True)
+ if use_expander:
+ self.csetstyle['expander'] = True
+ self.patchstyle['expander'] = True
+
self.summarypanel = csinfo.create(self.repo, custom=custom)
## summary box (summarypanel + separator)
self.summarybox = gtk.VBox()
- details_box.pack_start(self.summarybox, False, False)
+ if use_expander:
+ # don't scroll summarybox
+ details_frame_parent.pack_start(self.summarybox, False, False)
+ else:
+ # scroll summarybox
+ details_box.pack_start(self.summarybox, False, False)
self.summarybox.pack_start(self.summarypanel, False, False)
self.summarybox.pack_start(gtk.HSeparator(), False, False)
@@ -599,10 +613,12 @@
self._hpaned = gtk.HPaned()
self._hpaned.pack1(list_frame, True, True)
- self._hpaned.pack2(details_frame, True, True)
+ self._hpaned.pack2(details_frame_parent, True, True)
self._hpaned.set_position(self._setting_hpos)
- if self.stbar:
+ details_frame_parent.pack_start(details_frame, True, True)
+
+ if embedded:
# embedded by changelog browser
return self._hpaned
else:
@@ -702,9 +718,8 @@ opts = {'change':str(self.currev), 'bundle':self.bfile}
self._do_diff([self.curfile], opts)
- def file_row_act(self, tree, path, column) :
- 'Default action is the first entry in the context menu'
- self.filemenu.get_children()[0].activate()
+ def file_row_act(self, tree, path, column):
+ self.diff_file_rev(None)
return True
def save_file_rev(self, menuitem):
|
||
|
@@ -467,7 +467,7 @@ self.csstyle = style
self.expander = gtk.Expander()
- self.expander.set_expanded(True)
+ self.expander.set_expanded(False)
# layout table for contents
self.table = gtklib.LayoutTable(ypad=1, headopts={'weight': 'bold'})
|
||
|
@@ -1902,8 +1902,7 @@ return True
def tree_row_act(self, tree, path, column) :
- 'Default action is the first entry in the context menu'
- self.tree_context_menu().get_children()[0].activate()
+ self.vdiff_change(None)
return True
def run(ui, *pats, **opts):
|
||
Add a tag
Loading...