We are currently indexing your data, so search results may be incomplete until we finish.
stable i18n: download latest translations
Changeset 311f6c1f1a31…
Parent b48cbc6e24ad…
by
Changes to 18 files · Browse files at 311f6c1f1a31 Showing diff from parent b48cbc6e24ad 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/pl.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
|
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,14 +7,14 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-10-18 08:45+0000\n"
+"POT-Creation-Date: 2009-10-27 13:01+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-10-19 07:13+0000\n"
+"X-Launchpad-Export-Date: 2009-10-28 01:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: thgtaskbar.py:38
@@ -63,7 +63,7 @@msgstr ""
#: tortoisehg\hgtk\archive.py:77 tortoisehg\hgtk\clone.py:74
-#: tortoisehg\hgtk\hginit.py:52 tortoisehg\hgtk\thgconfig.py:299
+#: tortoisehg\hgtk\hginit.py:52 tortoisehg\hgtk\thgconfig.py:301
msgid "Browse..."
msgstr "Parcourir..."
@@ -100,29 +100,29 @@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\clone.py:165 tortoisehg\hgtk\merge.py:142
+#: tortoisehg\hgtk\quickop.py:182 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\clone.py:188 tortoisehg\hgtk\merge.py:162
+#: tortoisehg\hgtk\quickop.py:197 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\clone.py:189 tortoisehg\hgtk\merge.py:163
+#: tortoisehg\hgtk\quickop.py:198 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\clone.py:199 tortoisehg\hgtk\merge.py:183
+#: tortoisehg\hgtk\quickop.py:207 tortoisehg\hgtk\thgstrip.py:304
#: tortoisehg\hgtk\update.py:149
msgid "unexpected response id: %s"
msgstr ""
@@ -157,16 +157,15 @@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\clone.py:223 tortoisehg\hgtk\merge.py:198
+#: tortoisehg\hgtk\quickop.py:219 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
+#: tortoisehg\hgtk\gtklib.py:243 tortoisehg\hgtk\thgconfig.py:481
+#: tortoisehg\hgtk\thgconfig.py:831
msgid "Confirm Overwrite"
msgstr ""
@@ -232,7 +231,7 @@msgid "Merge with old dirstate parent after backout"
msgstr ""
-#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:435
+#: tortoisehg\hgtk\backout.py:163 tortoisehg\hgtk\commit.py:437
msgid "Confirm Discard Message"
msgstr "Confirmer le message d'abandon"
@@ -260,7 +259,7 @@msgid "Save as.."
msgstr ""
-#: tortoisehg\hgtk\bugreport.py:49 tortoisehg\hgtk\hgcmd.py:50
+#: tortoisehg\hgtk\bugreport.py:49 tortoisehg\hgtk\hgcmd.py:48
#: tortoisehg\hgtk\taskbarui.py:33
msgid "Close"
msgstr "Fermer"
@@ -275,894 +274,907 @@msgid "Save error report to"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:33
+#: tortoisehg\hgtk\changeset.py:30
msgid "%s changeset "
msgstr ""
-#: tortoisehg\hgtk\changeset.py:121 tortoisehg\hgtk\changeset.py:147
+#: tortoisehg\hgtk\changeset.py:142 tortoisehg\hgtk\changeset.py:168
msgid "[All Files]"
msgstr "[Tous les fichiers]"
-#: tortoisehg\hgtk\changeset.py:182
+#: tortoisehg\hgtk\changeset.py:203
msgid "unknown hunk type: %s"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:241
-msgid "changeset:"
-msgstr "jeu de révisions:"
-
-#: 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
+#: tortoisehg\hgtk\changeset.py:271
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
+#: tortoisehg\hgtk\changeset.py:280
msgid "Repository Error: %s, refresh suggested"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:421
+#: tortoisehg\hgtk\changeset.py:327
msgid "[no hunks to display]"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:499 tortoisehg\hgtk\status.py:1504
+#: tortoisehg\hgtk\changeset.py:388 tortoisehg\hgtk\status.py:1505
msgid "_Visual Diff"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:500
+#: tortoisehg\hgtk\changeset.py:389
msgid "Diff to _local"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:502
+#: tortoisehg\hgtk\changeset.py:391
msgid "_View at Revision"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:503
+#: tortoisehg\hgtk\changeset.py:392
msgid "_Save at Revision..."
msgstr ""
-#: tortoisehg\hgtk\changeset.py:507
+#: tortoisehg\hgtk\changeset.py:396
msgid "_File History"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:508
+#: tortoisehg\hgtk\changeset.py:397
msgid "_Annotate File"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:511
+#: tortoisehg\hgtk\changeset.py:400
msgid "_Revert File Contents"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:572
+#: tortoisehg\hgtk\changeset.py:485
+msgid "Changeset:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:487 tortoisehg\hgtk\update.py:103
+msgid "Parent:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:489
+msgid "Child:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:491
+msgid "Patch:"
+msgstr ""
+
+#: tortoisehg\hgtk\changeset.py:618
msgid "Stat"
msgstr "Stats"
-#: tortoisehg\hgtk\changeset.py:574 tortoisehg\hgtk\hgignore.py:128
+#: tortoisehg\hgtk\changeset.py:620 tortoisehg\hgtk\hgignore.py:128
msgid "Files"
msgstr "Fichiers"
-#: tortoisehg\hgtk\changeset.py:589
+#: tortoisehg\hgtk\changeset.py:635
msgid "Diff to second Parent"
msgstr ""
-#: tortoisehg\hgtk\changeset.py:720
+#: tortoisehg\hgtk\changeset.py:758
msgid "Save file to"
msgstr "Enregistrer le fichier sous"
-#: tortoisehg\hgtk\changeset.py:726 tortoisehg\hgtk\history.py:1711
-#: tortoisehg\hgtk\history.py:1740
+#: tortoisehg\hgtk\changeset.py:832
+msgid "Confirm revert file to old revision"
+msgstr "Confirmer le retour à l'ancienne version"
+
+#: tortoisehg\hgtk\changeset.py:833
+msgid "Revert %s to contents at revision %d?"
+msgstr "Faire revenir %s à la version %d ?"
+
+#: tortoisehg\hgtk\changeset.py:845 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:233
+#: 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"
+
+#: 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:148
+msgid " - qnew"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:151
+msgid " - qrefresh "
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:152
+msgid " - commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:183 tortoisehg\hgtk\history.py:175
+msgid "_View"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:184
+msgid "Advanced"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:186 tortoisehg\hgtk\history.py:691
+#: tortoisehg\hgtk\history.py:1014
+msgid "Parents"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:189 tortoisehg\hgtk\hgignore.py:138
+#: tortoisehg\hgtk\history.py:188
+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:598
+msgid "_Commit"
+msgstr "_Committer"
+
+#: tortoisehg\hgtk\commit.py:193 tortoisehg\hgtk\commit.py:235
+msgid "_Undo"
+msgstr "Ann_uler"
+
+#: 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:1515 tortoisehg\hgtk\thgconfig.py:905
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: tortoisehg\hgtk\commit.py:202 tortoisehg\hgtk\status.py:170
+#: tortoisehg\hgtk\thgconfig.py:915
+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:1514
+msgid "_Forget"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:236
+msgid "undo recent commit"
+msgstr "Annuler"
+
+#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:482
+msgid "commit"
+msgstr "commiter"
+
+#: tortoisehg\hgtk\commit.py:250 tortoisehg\hgtk\merge.py:169
+#: tortoisehg\hgtk\thgconfig.py:712
+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:967
+#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\history.py:81
+#: tortoisehg\hgtk\history.py:1419 tortoisehg\hgtk\status.py:1270
+#: tortoisehg\hgtk\status.py:1289 tortoisehg\hgtk\status.py:1582
+#: tortoisehg\hgtk\thgconfig.py:715 tortoisehg\hgtk\thgmq.py:328
+#: tortoisehg\hgtk\update.py:231
+msgid "&Cancel"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967
+#: tortoisehg\hgtk\commit.py:971 tortoisehg\hgtk\status.py:1582
+#: tortoisehg\hgtk\thgconfig.py:714 tortoisehg\hgtk\thgmq.py:327
+msgid "&Yes"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:252 tortoisehg\hgtk\commit.py:967
+#: tortoisehg\hgtk\commit.py:971 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:345
+msgid "Recent commit messages..."
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:382
+msgid "Parent: %(rev)s"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:391
+msgid "not at head revision"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:413 tortoisehg\hgtk\status.py:480
+msgid "Patch Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:415 tortoisehg\hgtk\status.py:484
+msgid "Commit Preview"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:438
+msgid "Discard current commit message?"
+msgstr "Oublier le message de commit actuel ?"
+
+#: tortoisehg\hgtk\commit.py:481 tortoisehg\hgtk\commit.py:743
+#: tortoisehg\hgtk\commit.py:793 tortoisehg\hgtk\gdialog.py:472
+#: tortoisehg\hgtk\merge.py:94 tortoisehg\hgtk\thgconfig.py:600
+msgid "Commit"
+msgstr "Envoyer"
+
+#: tortoisehg\hgtk\commit.py:485
+msgid "QNew"
+msgstr "QNouveau"
+
+#: tortoisehg\hgtk\commit.py:486
+msgid "create new MQ patch"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:488
+msgid "QRefresh"
+msgstr "QRafraîchir"
+
+#: tortoisehg\hgtk\commit.py:489
+msgid "refresh top MQ patch"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:491
+msgid "_Commit (+1 head)"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:491
+msgid "_Commit (-1 head)"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:496
+msgid "parent is not a head, commit to add a new head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:501
+msgid "commit to merge one head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:504
+msgid "no parent is a head, commit to add a new head"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:608
+msgid "new branch: "
+msgstr "nouvelle branche : "
+
+#: tortoisehg\hgtk\commit.py:610
+msgid "close branch: "
+msgstr "fermer une branche : "
+
+#: tortoisehg\hgtk\commit.py:612
+msgid "branch: "
+msgstr "branche : "
+
+#: tortoisehg\hgtk\commit.py:631
+msgid "Merge "
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:667
+msgid "Patch Contents"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:725 tortoisehg\hgtk\commit.py:878
+msgid "Nothing Commited"
+msgstr "Rien n'a été envoyé"
+
+#: tortoisehg\hgtk\commit.py:726
+msgid "No committable files selected"
+msgstr "aucun des fichiers sélectionnés n'est envoyable"
+
+#: tortoisehg\hgtk\commit.py:744
+msgid "Unable to create "
+msgstr "Impossible de créer "
+
+#: tortoisehg\hgtk\commit.py:794
+msgid "Unable to apply patch"
+msgstr "Impossible d'effectuer la mise à jour."
+
+#: tortoisehg\hgtk\commit.py:823
+msgid "Confirm Undo Commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:824
+msgid "Undo last commit"
+msgstr "Défaire le dernier envoi"
+
+#: tortoisehg\hgtk\commit.py:830 tortoisehg\hgtk\commit.py:845
+msgid "Undo Commit"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:831
+msgid ""
+"Unable to undo!\n"
+"\n"
+"Tip revision differs from last commit."
+msgstr ""
+"Impossible de défaire !\n"
+"\n"
+"la version du dessus est différente de celle du dernier envoi."
+
+#: tortoisehg\hgtk\commit.py:846
+msgid "Errors during rollback!"
+msgstr "Erreur lors du retour en arrière !"
+
+#: tortoisehg\hgtk\commit.py:859
+msgid "Confirm Add/Remove"
+msgstr "Confiermer Ajouter/Supprimer"
+
+#: tortoisehg\hgtk\commit.py:860
+msgid "Add/Remove the following files?"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:879 tortoisehg\hgtk\tagadd.py:167
+msgid "Please enter commit message"
+msgstr "Tapez le message d'envoi"
+
+#: tortoisehg\hgtk\commit.py:887
+msgid "Error"
+msgstr "Erreur"
+
+#: tortoisehg\hgtk\commit.py:888
+msgid "Message format configuration error"
+msgstr "Erreur de configuration du format de message"
+
+#: tortoisehg\hgtk\commit.py:897 tortoisehg\hgtk\commit.py:905
+#: tortoisehg\hgtk\commit.py:917
+msgid "Confirm Commit"
+msgstr "Confirmer l'envoi"
+
+#: tortoisehg\hgtk\commit.py:898
+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:906
+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:918
+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:930
+msgid "Commit: Invalid username"
+msgstr "Envoi : nom d'utilisateur invalide"
+
+#: tortoisehg\hgtk\commit.py:931
+msgid ""
+"Your username has not been configured.\n"
+"\n"
+"Please configure your username and try again"
+msgstr ""
+"votre nom d'utilisateur n'a pas été défini.\n"
+"\n"
+"Veuillez le définir et réessayer."
+
+#: tortoisehg\hgtk\commit.py:964
+msgid "Confirm Override Branch"
+msgstr "Confirmer l'écrasement de branche"
+
+#: tortoisehg\hgtk\commit.py:965
+msgid ""
+"A branch named \"%s\" already exists,\n"
+"override?"
+msgstr ""
+"Une branche appelée \"%s\" existe déjà,\n"
+"la remplacer ?"
+
+#: tortoisehg\hgtk\commit.py:969
+msgid "Confirm New Branch"
+msgstr "Confirmer la création de nouvelle branche"
+
+#: tortoisehg\hgtk\commit.py:970
+msgid "Create new named branch \"%s\"?"
+msgstr "Créer une nouvelle branche \"%s\" ?"
+
+#: tortoisehg\hgtk\commit.py:1045
+msgid "Paste _Filenames"
+msgstr "Coller Noms de _Fichiers"
+
+#: tortoisehg\hgtk\commit.py:1046
+msgid "App_ly Format"
+msgstr "App_liquer Format"
+
+#: tortoisehg\hgtk\commit.py:1047
+msgid "C_onfigure Format"
+msgstr "C_onfigurer Format"
+
+#: tortoisehg\hgtk\commit.py:1073
+msgid "Info Required"
+msgstr ""
+
+#: tortoisehg\hgtk\commit.py:1074
+msgid "Message format needs to be configured"
+msgstr "le format de message doit être configuré"
+
+#: tortoisehg\hgtk\commit.py:1086 tortoisehg\hgtk\commit.py:1091
+msgid "Warning"
+msgstr "Avertissement"
+
+#: tortoisehg\hgtk\commit.py:1087
+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:1092
+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:49
+msgid "must be specified repository"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:86
+msgid "must be specified 'type' in style"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:191 tortoisehg\hgtk\csinfo.py:192
+#: tortoisehg\hgtk\tagadd.py:65
+msgid "Revision:"
+msgstr "Révision :"
+
+#: tortoisehg\hgtk\csinfo.py:192
+msgid "Summary:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:193
+msgid "Age:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:193
+msgid "User:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:193 tortoisehg\hgtk\csinfo.py:194
+msgid "Date:"
+msgstr "Date :"
+
+#: tortoisehg\hgtk\csinfo.py:194 tortoisehg\hgtk\csinfo.py:195
+msgid "Branch:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:195 tortoisehg\hgtk\csinfo.py:196
+msgid "Tags:"
+msgstr ""
+
+#: tortoisehg\hgtk\csinfo.py:196
+msgid "Transplant:"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:47
+msgid "%s - datamine"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:56 tortoisehg\hgtk\hgcmd.py:44
+#: tortoisehg\hgtk\recovery.py:46 tortoisehg\hgtk\serve.py:62
+#: tortoisehg\hgtk\synch.py:59
+msgid "Stop"
+msgstr "Arrêter"
+
+#: tortoisehg\hgtk\datamine.py:58
+msgid "Stop operation on current tab"
+msgstr "Annuler les opérations sur l'onglet courant."
+
+#: tortoisehg\hgtk\datamine.py:60
+msgid "New Search"
+msgstr "Nouvelle recherche"
+
+#: tortoisehg\hgtk\datamine.py:62
+msgid "Open new search tab"
+msgstr "Ouvrir un nouvel onglet de recherche"
+
+#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1112
+msgid "Invalid path"
+msgstr "Chemin non valide"
+
+#: tortoisehg\hgtk\datamine.py:74
+msgid "Cannot annotate directory: %s"
+msgstr "Impossible d'annoter le répertoire : %s"
+
+#: tortoisehg\hgtk\datamine.py:128
+msgid "Filename"
+msgstr "Nom de fichier"
+
+#: tortoisehg\hgtk\datamine.py:131 tortoisehg\hgtk\datamine.py:634
+#: tortoisehg\hgtk\history.py:336 tortoisehg\hgtk\history.py:1057
+#: tortoisehg\hgtk\logview\treeview.py:444 tortoisehg\hgtk\thgconfig.py:194
+#: tortoisehg\hgtk\thgconfig.py:277
+msgid "User"
+msgstr "Utilisateur"
+
+#: tortoisehg\hgtk\datamine.py:139 tortoisehg\hgtk\datamine.py:149
+msgid "di_splay change"
+msgstr "afficher les changement_s"
+
+#: tortoisehg\hgtk\datamine.py:140
+msgid "_annotate file"
+msgstr "_annoter le fichier"
+
+#: tortoisehg\hgtk\datamine.py:141 tortoisehg\hgtk\datamine.py:153
+msgid "_file history"
+msgstr "historique du _fichier"
+
+#: tortoisehg\hgtk\datamine.py:142 tortoisehg\hgtk\datamine.py:152
+msgid "_view file at revision"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:148
+msgid "_zoom to change"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:150
+msgid "_annotate parent"
+msgstr "_annoter le parent"
+
+#: tortoisehg\hgtk\datamine.py:176
+msgid "No parent file"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:177
+msgid "Unable to annotate"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:301
+msgid "Search"
+msgstr "Chercher"
+
+#: tortoisehg\hgtk\datamine.py:302 tortoisehg\hgtk\hgignore.py:61
+msgid "Regexp:"
+msgstr "Expression régulière :"
+
+#: tortoisehg\hgtk\datamine.py:304
+msgid "Includes:"
+msgstr "Inclus :"
+
+#: tortoisehg\hgtk\datamine.py:306
+msgid "Excludes:"
+msgstr "Exclus :"
+
+#: tortoisehg\hgtk\datamine.py:309
+msgid "Start this search"
+msgstr "Lancer cette recherche"
+
+#: tortoisehg\hgtk\datamine.py:310
+msgid "Regular expression search pattern"
+msgstr "Expression régulière de recherche"
+
+#: tortoisehg\hgtk\datamine.py:311
+msgid ""
+"Comma separated list of inclusion patterns. By default, the entire "
+"repository is searched."
+msgstr ""
+"Liste des règles d'inclusion, séparées par des virgules. Par défaut, le "
+"dépôt entier est parcouru."
+
+#: tortoisehg\hgtk\datamine.py:314
+msgid ""
+"Comma separated list of exclusion patterns. Exclusion patterns are applied "
+"after inclusion patterns."
+msgstr ""
+"Liste des règles d'exclusion, séparées par des virgules. Par défaut, le "
+"dépôt entier est parcouru."
+
+#: tortoisehg\hgtk\datamine.py:320
+msgid "Follow copies and renames"
+msgstr "Suivre les copies et les changements de noms"
+
+#: tortoisehg\hgtk\datamine.py:321
+msgid "Ignore case"
+msgstr "Ignorer la casse"
+
+#: tortoisehg\hgtk\datamine.py:322
+msgid "Show line numbers"
+msgstr "Afficher les numéros de ligne"
+
+#: tortoisehg\hgtk\datamine.py:323
+msgid "Show all matching revisions"
+msgstr "Afficher toutes les versions correspondantes"
+
+#: tortoisehg\hgtk\datamine.py:355 tortoisehg\hgtk\datamine.py:632
+#: tortoisehg\hgtk\logview\treeview.py:395
+msgid "Rev"
+msgstr "Ver"
+
+#: tortoisehg\hgtk\datamine.py:356 tortoisehg\hgtk\datamine.py:633
+msgid "File"
+msgstr "Fichier"
+
+#: tortoisehg\hgtk\datamine.py:357
+msgid "Matches"
+msgstr "Correspondances"
+
+#: tortoisehg\hgtk\datamine.py:379
+msgid "Search %d"
+msgstr "Recherche %d"
+
+#: tortoisehg\hgtk\datamine.py:422
+msgid "No regular expression given"
+msgstr "Aucune expression régulière fournie"
+
+#: tortoisehg\hgtk\datamine.py:423
+msgid "You must provide a search expression"
+msgstr "Vous devez fournir une expression régulière"
+
+#: 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:1339
+msgid "Abort: %s"
+msgstr ""
+
+#: tortoisehg\hgtk\datamine.py:464
+msgid "Search \"%s\""
+msgstr "Recherche \"%s\""
+
+#: tortoisehg\hgtk\datamine.py:579
+msgid "File is unrevisioned"
+msgstr "Le fichier n'est pas suivi"
+
+#: tortoisehg\hgtk\datamine.py:580
+msgid "Unable to annotate "
+msgstr "Impossible d'annoter "
+
+#: tortoisehg\hgtk\datamine.py:631
+msgid "Line"
+msgstr "Ligne"
+
+#: tortoisehg\hgtk\datamine.py:635 tortoisehg\hgtk\guess.py:158
+msgid "Source"
+msgstr "Source"
+
+#: tortoisehg\hgtk\datamine.py:693
+msgid "Loading history..."
+msgstr ""
+
+#: tortoisehg\hgtk\dialog.py:34
+msgid "TortoiseHg Prompt"
+msgstr "Ligne de commande TortoiseHg"
+
+#: tortoisehg\hgtk\gdialog.py:469
+msgid "_Tools"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:470 tortoisehg\hgtk\thgconfig.py:603
+msgid "Changelog"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:474
+msgid "Datamine"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:476
+msgid "Recovery"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:478
+msgid "Serve"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:480 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:482 tortoisehg\hgtk\history.py:114
+#: tortoisehg\util\menuthg.py:71
+msgid "Synchronize"
+msgstr "Synchroniser"
+
+#: tortoisehg\hgtk\gdialog.py:484
+msgid "Settings"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:487
+msgid "_Help"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:488
+msgid "Contents"
+msgstr ""
+
+#: tortoisehg\hgtk\gdialog.py:490 tortoisehg\hgtk\taskbarui.py:31
+msgid "About"
+msgstr "À propos"
+
+#: tortoisehg\hgtk\gdialog.py:587
+msgid " Aborted"
+msgstr " annulé(e)"
+
+#: tortoisehg\hgtk\gdialog.py:598
+msgid " Messages and Errors"
+msgstr " Messages et Erreurs"
+
+#: tortoisehg\hgtk\gdialog.py:641
+msgid "making snapshot of %d files from rev %s\n"
+msgstr "création de l'instantané de %d fichiers depuis la revision %s\n"
+
+#: tortoisehg\hgtk\gdialog.py:676
+msgid "edit failed"
+msgstr "erreur d'édition"
+
+#: tortoisehg\hgtk\gdialog.py:684 tortoisehg\hgtk\thgconfig.py:686
+msgid "No visual editor configured"
+msgstr "Aucun éditeur graphique spécifié"
+
+#: tortoisehg\hgtk\gdialog.py:685 tortoisehg\hgtk\thgconfig.py:687
+msgid "Please configure a visual editor."
+msgstr "Veuillez spécifier un éditeur graphique."
+
+#: 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:149
+msgid "Save File"
+msgstr "Enregistrer le fichier"
+
+#: tortoisehg\hgtk\gtklib.py:150
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: tortoisehg\hgtk\gtklib.py:244
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"
-
-#: 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"
-
-#: 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"
-
-#: tortoisehg\hgtk\commit.py:238 tortoisehg\hgtk\commit.py:477
-msgid "commit"
-msgstr "commiter"
-
-#: 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 ?"
-
-#: 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"
-
-#: tortoisehg\hgtk\commit.py:481
-msgid "create new MQ patch"
-msgstr ""
-
-#: tortoisehg\hgtk\commit.py:483
-msgid "QRefresh"
-msgstr "QRafraîchir"
-
-#: 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é"
-
-#: 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 "
-
-#: tortoisehg\hgtk\commit.py:789
-msgid "Unable to apply patch"
-msgstr "Impossible d'effectuer la mise à jour."
-
-#: 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"
-
-#: 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"
-"Tip revision differs from last commit."
-msgstr ""
-"Impossible de défaire !\n"
-"\n"
-"la version du dessus est différente de celle du dernier envoi."
-
-#: tortoisehg\hgtk\commit.py:841
-msgid "Errors during rollback!"
-msgstr "Erreur lors du retour en arrière !"
-
-#: 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"
-
-#: 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"
-
-#: tortoisehg\hgtk\commit.py:926
-msgid ""
-"Your username has not been configured.\n"
-"\n"
-"Please configure your username and try again"
-msgstr ""
-"votre nom d'utilisateur n'a pas été défini.\n"
-"\n"
-"Veuillez le définir et réessayer."
-
-#: 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?"
-msgstr ""
-"Une branche appelée \"%s\" existe déjà,\n"
-"la remplacer ?"
-
-#: 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\" ?"
-
-#: 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"
-
-#: tortoisehg\hgtk\datamine.py:58
-msgid "Stop operation on current tab"
-msgstr "Annuler les opérations sur l'onglet courant."
-
-#: tortoisehg\hgtk\datamine.py:60
-msgid "New Search"
-msgstr "Nouvelle recherche"
-
-#: tortoisehg\hgtk\datamine.py:62
-msgid "Open new search tab"
-msgstr "Ouvrir un nouvel onglet de recherche"
-
-#: tortoisehg\hgtk\datamine.py:73 tortoisehg\hgtk\thgconfig.py:1110
-msgid "Invalid path"
-msgstr "Chemin non valide"
-
-#: tortoisehg\hgtk\datamine.py:74
-msgid "Cannot annotate directory: %s"
-msgstr "Impossible d'annoter le répertoire : %s"
-
-#: tortoisehg\hgtk\datamine.py:128
-msgid "Filename"
-msgstr "Nom de fichier"
-
-#: 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"
-
-#: tortoisehg\hgtk\datamine.py:139 tortoisehg\hgtk\datamine.py:149
-msgid "di_splay change"
-msgstr "afficher les changement_s"
-
-#: tortoisehg\hgtk\datamine.py:140
-msgid "_annotate file"
-msgstr "_annoter le fichier"
-
-#: tortoisehg\hgtk\datamine.py:141 tortoisehg\hgtk\datamine.py:153
-msgid "_file history"
-msgstr "historique du _fichier"
-
-#: tortoisehg\hgtk\datamine.py:142 tortoisehg\hgtk\datamine.py:152
-msgid "_view file at revision"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:148
-msgid "_zoom to change"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:150
-msgid "_annotate parent"
-msgstr "_annoter le parent"
-
-#: tortoisehg\hgtk\datamine.py:176
-msgid "No parent file"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:177
-msgid "Unable to annotate"
-msgstr ""
-
-#: tortoisehg\hgtk\datamine.py:301
-msgid "Search"
-msgstr "Chercher"
-
-#: tortoisehg\hgtk\datamine.py:302 tortoisehg\hgtk\hgignore.py:61
-msgid "Regexp:"
-msgstr "Expression régulière :"
-
-#: tortoisehg\hgtk\datamine.py:304
-msgid "Includes:"
-msgstr "Inclus :"
-
-#: tortoisehg\hgtk\datamine.py:306
-msgid "Excludes:"
-msgstr "Exclus :"
-
-#: tortoisehg\hgtk\datamine.py:309
-msgid "Start this search"
-msgstr "Lancer cette recherche"
-
-#: tortoisehg\hgtk\datamine.py:310
-msgid "Regular expression search pattern"
-msgstr "Expression régulière de recherche"
-
-#: tortoisehg\hgtk\datamine.py:311
-msgid ""
-"Comma separated list of inclusion patterns. By default, the entire "
-"repository is searched."
-msgstr ""
-"Liste des règles d'inclusion, séparées par des virgules. Par défaut, le "
-"dépôt entier est parcouru."
-
-#: tortoisehg\hgtk\datamine.py:314
-msgid ""
-"Comma separated list of exclusion patterns. Exclusion patterns are applied "
-"after inclusion patterns."
-msgstr ""
-"Liste des règles d'exclusion, séparées par des virgules. Par défaut, le "
-"dépôt entier est parcouru."
-
-#: tortoisehg\hgtk\datamine.py:320
-msgid "Follow copies and renames"
-msgstr "Suivre les copies et les changements de noms"
-
-#: tortoisehg\hgtk\datamine.py:321
-msgid "Ignore case"
-msgstr "Ignorer la casse"
-
-#: tortoisehg\hgtk\datamine.py:322
-msgid "Show line numbers"
-msgstr "Afficher les numéros de ligne"
-
-#: tortoisehg\hgtk\datamine.py:323
-msgid "Show all matching revisions"
-msgstr "Afficher toutes les versions correspondantes"
-
-#: tortoisehg\hgtk\datamine.py:355 tortoisehg\hgtk\datamine.py:632
-#: tortoisehg\hgtk\logview\treeview.py:395
-msgid "Rev"
-msgstr "Ver"
-
-#: tortoisehg\hgtk\datamine.py:356 tortoisehg\hgtk\datamine.py:633
-msgid "File"
-msgstr "Fichier"
-
-#: tortoisehg\hgtk\datamine.py:357
-msgid "Matches"
-msgstr "Correspondances"
-
-#: tortoisehg\hgtk\datamine.py:379
-msgid "Search %d"
-msgstr "Recherche %d"
-
-#: tortoisehg\hgtk\datamine.py:422
-msgid "No regular expression given"
-msgstr "Aucune expression régulière fournie"
-
-#: tortoisehg\hgtk\datamine.py:423
-msgid "You must provide a search expression"
-msgstr "Vous devez fournir une expression régulière"
-
-#: 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\""
-
-#: tortoisehg\hgtk\datamine.py:579
-msgid "File is unrevisioned"
-msgstr "Le fichier n'est pas suivi"
-
-#: tortoisehg\hgtk\datamine.py:580
-msgid "Unable to annotate "
-msgstr "Impossible d'annoter "
-
-#: tortoisehg\hgtk\datamine.py:631
-msgid "Line"
-msgstr "Ligne"
-
-#: tortoisehg\hgtk\datamine.py:635 tortoisehg\hgtk\guess.py:158
-msgid "Source"
-msgstr "Source"
-
-#: tortoisehg\hgtk\datamine.py:693
-msgid "Loading history..."
-msgstr ""
-
-#: tortoisehg\hgtk\dialog.py:34
-msgid "TortoiseHg Prompt"
-msgstr "Ligne de commande TortoiseHg"
-
-#: 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)"
-
-#: tortoisehg\hgtk\gdialog.py:578
-msgid " Messages and Errors"
-msgstr " Messages et Erreurs"
-
-#: 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"
-
-#: tortoisehg\hgtk\gdialog.py:656
-msgid "edit failed"
-msgstr "erreur d'édition"
-
-#: tortoisehg\hgtk\gdialog.py:664 tortoisehg\hgtk\thgconfig.py:684
-msgid "No visual editor configured"
-msgstr "Aucun éditeur graphique spécifié"
-
-#: tortoisehg\hgtk\gdialog.py:665 tortoisehg\hgtk\thgconfig.py:685
-msgid "Please configure a visual editor."
-msgstr "Veuillez spécifier un éditeur graphique."
-
-#: 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"
-
-#: tortoisehg\hgtk\gtklib.py:146
-msgid "All files"
-msgstr "Tous les fichiers"
-
-#: tortoisehg\hgtk\gtklib.py:236
+#: tortoisehg\hgtk\gtklib.py:255
msgid "Select Folder"
msgstr "Sélectionner le répertoire"
-#: tortoisehg\hgtk\gtklib.py:623
+#: tortoisehg\hgtk\gtklib.py:642
msgid ""
"Select language for spell checking.\n"
"\n"
@@ -1173,11 +1185,11 @@"examples: en, en_GB, en_US"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:629
+#: tortoisehg\hgtk\gtklib.py:648
msgid "Lang \"%s\" can not be set.\n"
msgstr ""
-#: tortoisehg\hgtk\gtklib.py:642 tortoisehg\hgtk\thgconfig.py:589
+#: tortoisehg\hgtk\gtklib.py:661 tortoisehg\hgtk\thgconfig.py:591
msgid "Spell Check Language"
msgstr ""
@@ -1229,7 +1241,7 @@"== %s et %s ont des contenus identiques ==\n"
"\n"
-#: tortoisehg\hgtk\hgcmd.py:181 tortoisehg\hgtk\hgcmd.py:516
+#: tortoisehg\hgtk\hgcmd.py:179 tortoisehg\hgtk\hgcmd.py:514
msgid ""
"\n"
"[command interrupted]"
@@ -1237,27 +1249,27 @@"\n"
"[commande interrompue]"
-#: tortoisehg\hgtk\hgcmd.py:267
+#: tortoisehg\hgtk\hgcmd.py:265
msgid "unknown CmdWidget style: %s"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:280
+#: tortoisehg\hgtk\hgcmd.py:278
msgid "Toggle log window"
msgstr ""
+#: tortoisehg\hgtk\hgcmd.py:311
+msgid "Stop transaction"
+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
+#: tortoisehg\hgtk\hgcmd.py:449 tortoisehg\hgtk\hgcmd.py:466
msgid "invalid state"
msgstr ""
-#: tortoisehg\hgtk\hgcmd.py:599
+#: tortoisehg\hgtk\hgcmd.py:597
msgid "Command Log"
msgstr ""
@@ -1431,7 +1443,7 @@"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. "
"Flags is a comma separated list of tags which are inserted into the message "
-"header."
+"subject prefix."
msgstr ""
#: tortoisehg\hgtk\hgemail.py:293 tortoisehg\hgtk\hgemail.py:298
@@ -1456,7 +1468,7 @@msgstr ""
#: tortoisehg\hgtk\hgignore.py:51 tortoisehg\hgtk\hgignore.py:59
-#: tortoisehg\hgtk\tagadd.py:37
+#: tortoisehg\hgtk\quickop.py:50 tortoisehg\hgtk\tagadd.py:37
msgid "Add"
msgstr "Ajouter"
@@ -1563,19 +1575,19 @@"Caught keyboard interrupt, aborting.\n"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:109
+#: tortoisehg\hgtk\hgtk.py:110
msgid "can not read file \"%s\". Ignored.\n"
msgstr "Impossible de lire le fichier \"%s\". Ignoré.\n"
-#: tortoisehg\hgtk\hgtk.py:188
+#: tortoisehg\hgtk\hgtk.py:189
msgid "hgtk %s: %s\n"
msgstr "hgtk %s : %s\n"
-#: tortoisehg\hgtk\hgtk.py:191
+#: tortoisehg\hgtk\hgtk.py:192
msgid "hgtk: %s\n"
msgstr "hgtk : %s\n"
-#: tortoisehg\hgtk\hgtk.py:194
+#: tortoisehg\hgtk\hgtk.py:195
msgid ""
"hgtk: command '%s' is ambiguous:\n"
" %s\n"
@@ -1583,55 +1595,55 @@"hgtk : la commande '%s' est ambigüe:\n"
" %s\n"
-#: tortoisehg\hgtk\hgtk.py:197
+#: tortoisehg\hgtk\hgtk.py:198
msgid "hgtk: unknown command '%s'\n"
msgstr "hgtk : commande inconnue '%s'\n"
-#: tortoisehg\hgtk\hgtk.py:200
+#: tortoisehg\hgtk\hgtk.py:201
msgid "abort: %s!\n"
msgstr "annulée: %s !\n"
-#: tortoisehg\hgtk\hgtk.py:245 tortoisehg\hgtk\hgtk.py:393
+#: tortoisehg\hgtk\hgtk.py:256 tortoisehg\hgtk\hgtk.py:404
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Il n'y a pas de dépôt Mercurial ici (.hg non trouvé)"
-#: tortoisehg\hgtk\hgtk.py:255
+#: tortoisehg\hgtk\hgtk.py:266
msgid "invalid arguments"
msgstr "arguments invalides"
-#: tortoisehg\hgtk\hgtk.py:333
+#: tortoisehg\hgtk\hgtk.py:344
msgid "Rename error"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:334
+#: tortoisehg\hgtk\hgtk.py:345
msgid "rename takes one or two path arguments"
msgstr "renommer nécessite un ou deux chemins comme paramètre."
-#: tortoisehg\hgtk\hgtk.py:444
+#: tortoisehg\hgtk\hgtk.py:455
msgid "global options:"
msgstr "options globales :"
-#: tortoisehg\hgtk\hgtk.py:446
+#: tortoisehg\hgtk\hgtk.py:457
msgid "use \"hgtk help\" for the full list of commands"
msgstr "utiliser \"hgtk help\" pour la liste complète des commandes"
-#: tortoisehg\hgtk\hgtk.py:450
+#: tortoisehg\hgtk\hgtk.py:461
msgid ""
"use \"hgtk help\" for the full list of commands or \"hgtk -v\" for details"
msgstr ""
"utiliser \"hgtk help\" pour la liste complète des commandes ou \"hgtk -v\" "
"pour les détails"
-#: tortoisehg\hgtk\hgtk.py:453
+#: tortoisehg\hgtk\hgtk.py:464
msgid "use \"hgtk -v help%s\" to show aliases and global options"
msgstr ""
"utiliser \"hgtk -v help %s\" pour afficher les alias et les options globales"
-#: tortoisehg\hgtk\hgtk.py:456
+#: tortoisehg\hgtk\hgtk.py:467
msgid "use \"hgtk -v help %s\" to show global options"
msgstr "utiliser \"hgtk -v help %s\" pour afficher les options globales"
-#: tortoisehg\hgtk\hgtk.py:468 tortoisehg\hgtk\hgtk.py:570
+#: tortoisehg\hgtk\hgtk.py:479 tortoisehg\hgtk\hgtk.py:581
msgid ""
"list of commands:\n"
"\n"
@@ -1639,7 +1651,7 @@"liste des commandes :\n"
"\n"
-#: tortoisehg\hgtk\hgtk.py:476
+#: tortoisehg\hgtk\hgtk.py:487
msgid ""
"\n"
"aliases: %s\n"
@@ -1647,26 +1659,26 @@"\n"
"alias : %s\n"
-#: tortoisehg\hgtk\hgtk.py:481 tortoisehg\hgtk\hgtk.py:507
-#: tortoisehg\hgtk\hgtk.py:539
+#: tortoisehg\hgtk\hgtk.py:492 tortoisehg\hgtk\hgtk.py:518
+#: tortoisehg\hgtk\hgtk.py:550
msgid "(No help text available)"
msgstr "(pas d'aide disponible)"
-#: tortoisehg\hgtk\hgtk.py:489
+#: tortoisehg\hgtk\hgtk.py:500
msgid "options:\n"
msgstr "options :\n"
-#: tortoisehg\hgtk\hgtk.py:512
+#: tortoisehg\hgtk\hgtk.py:523
msgid "no commands defined\n"
msgstr "aucune commande définie\n"
-#: tortoisehg\hgtk\hgtk.py:563
+#: tortoisehg\hgtk\hgtk.py:574
msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr ""
"Hgtk - Interface graphique de TortoiseHg pour le gestionnaire de version "
"Mercurial (Hg)\n"
-#: tortoisehg\hgtk\hgtk.py:568
+#: tortoisehg\hgtk\hgtk.py:579
msgid ""
"basic commands:\n"
"\n"
@@ -1674,219 +1686,223 @@"commandes de base :\n"
"\n"
-#: tortoisehg\hgtk\hgtk.py:584
+#: tortoisehg\hgtk\hgtk.py:595
msgid " (default: %s)"
msgstr " (par défaut : %s)"
-#: tortoisehg\hgtk\hgtk.py:597
+#: tortoisehg\hgtk\hgtk.py:608
msgid "TortoiseHg Dialogs (version %s), Mercurial (version %s)\n"
msgstr "Interface TortoiseHg (version %s), Mercurial (version %s)\n"
-#: tortoisehg\hgtk\hgtk.py:631
+#: tortoisehg\hgtk\hgtk.py:642
msgid "repository root directory or symbolic path name"
msgstr "répertoire racine du dépôt ou nom de chemin symbolique"
-#: tortoisehg\hgtk\hgtk.py:632
+#: tortoisehg\hgtk\hgtk.py:643
msgid "enable additional output"
msgstr "active l'affichage supplémentaire"
-#: tortoisehg\hgtk\hgtk.py:633
+#: tortoisehg\hgtk\hgtk.py:644
msgid "suppress output"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:634
+#: tortoisehg\hgtk\hgtk.py:645
msgid "display help and exit"
msgstr "affiche l'aide et termine"
-#: tortoisehg\hgtk\hgtk.py:635
+#: tortoisehg\hgtk\hgtk.py:646
msgid "start debugger"
msgstr "démarrer le débogueur"
-#: tortoisehg\hgtk\hgtk.py:636
+#: tortoisehg\hgtk\hgtk.py:647
msgid "do not fork GUI process"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:637
+#: tortoisehg\hgtk\hgtk.py:648
+msgid "always fork GUI process"
+msgstr ""
+
+#: tortoisehg\hgtk\hgtk.py:649
msgid "read file list from file"
msgstr "lit la liste de fichiers depuis le fichier"
-#: tortoisehg\hgtk\hgtk.py:641
+#: tortoisehg\hgtk\hgtk.py:653
msgid "hgtk about"
msgstr "hgtk à propos"
-#: tortoisehg\hgtk\hgtk.py:642
+#: tortoisehg\hgtk\hgtk.py:654
msgid "hgtk add [FILE]..."
msgstr "hgtk add [FICHIER]"
-#: tortoisehg\hgtk\hgtk.py:643
+#: tortoisehg\hgtk\hgtk.py:655
msgid "hgtk clone SOURCE [DEST]"
msgstr "hgtk clone ORIGINE [CIBLE]"
-#: tortoisehg\hgtk\hgtk.py:645
+#: tortoisehg\hgtk\hgtk.py:657
msgid "record user as committer"
msgstr "enregistrer l'utilisateur comme expéditeur"
-#: tortoisehg\hgtk\hgtk.py:646
+#: tortoisehg\hgtk\hgtk.py:658
msgid "record datecode as commit date"
msgstr "utiliser la date du fichier comme date de livraison"
-#: tortoisehg\hgtk\hgtk.py:647
+#: tortoisehg\hgtk\hgtk.py:659
msgid "hgtk commit [OPTIONS] [FILE]..."
msgstr "hgtk commit [OPTIONS] [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:648
+#: tortoisehg\hgtk\hgtk.py:660
msgid "hgtk datamine"
msgstr "hgtk datamine"
-#: tortoisehg\hgtk\hgtk.py:649
+#: tortoisehg\hgtk\hgtk.py:661
msgid "hgtk hgignore [FILE]"
msgstr "hgtk hgignore [FICHIER]"
-#: tortoisehg\hgtk\hgtk.py:650
+#: tortoisehg\hgtk\hgtk.py:662
msgid "hgtk init [DEST]"
msgstr "hgtk init [CIBLE]"
-#: tortoisehg\hgtk\hgtk.py:652
+#: tortoisehg\hgtk\hgtk.py:664
msgid "limit number of changes displayed"
msgstr "limiter le nombre de changements affichés"
-#: tortoisehg\hgtk\hgtk.py:653
+#: tortoisehg\hgtk\hgtk.py:665
msgid "hgtk log [OPTIONS] [FILE]"
msgstr "hgtk log [OPTIONS] [FICHIER]"
-#: tortoisehg\hgtk\hgtk.py:655
+#: tortoisehg\hgtk\hgtk.py:667
msgid "revision to merge with"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:656
+#: tortoisehg\hgtk\hgtk.py:668
msgid "hgtk merge"
msgstr "hgtk merge"
-#: tortoisehg\hgtk\hgtk.py:657
+#: tortoisehg\hgtk\hgtk.py:669
msgid "hgtk recovery"
msgstr "hgtk recovery"
-#: tortoisehg\hgtk\hgtk.py:658
+#: tortoisehg\hgtk\hgtk.py:670
msgid "hgtk shelve"
msgstr "hgtk shelve"
-#: tortoisehg\hgtk\hgtk.py:659
+#: tortoisehg\hgtk\hgtk.py:671
msgid "hgtk synch"
msgstr "hgtk synch"
-#: tortoisehg\hgtk\hgtk.py:661
+#: tortoisehg\hgtk\hgtk.py:673
msgid "revisions to compare"
msgstr "versions à comparer"
-#: tortoisehg\hgtk\hgtk.py:662
+#: tortoisehg\hgtk\hgtk.py:674
msgid "hgtk status [FILE]..."
msgstr "hgtk status [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:664 tortoisehg\hgtk\hgtk.py:667
+#: tortoisehg\hgtk\hgtk.py:676 tortoisehg\hgtk\hgtk.py:679
msgid "field to give initial focus"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:665
+#: tortoisehg\hgtk\hgtk.py:677
msgid "hgtk userconfig"
msgstr "hgtk userconfig"
-#: tortoisehg\hgtk\hgtk.py:668
+#: tortoisehg\hgtk\hgtk.py:680
msgid "hgtk repoconfig"
msgstr "hgtk repoconfig"
-#: tortoisehg\hgtk\hgtk.py:669
+#: tortoisehg\hgtk\hgtk.py:681
msgid "hgtk guess"
msgstr "hgtk guess"
-#: tortoisehg\hgtk\hgtk.py:670
+#: tortoisehg\hgtk\hgtk.py:682
msgid "hgtk remove [FILE]..."
msgstr "hgtk remove [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:671
+#: tortoisehg\hgtk\hgtk.py:683
msgid "hgtk rename SOURCE [DEST]"
msgstr "hgtk rename ORIGINE [CIBLE]"
-#: tortoisehg\hgtk\hgtk.py:672
+#: tortoisehg\hgtk\hgtk.py:684
msgid "hgtk revert [FILE]..."
msgstr "hgtk revert [FICHIER]..."
-#: tortoisehg\hgtk\hgtk.py:673
+#: tortoisehg\hgtk\hgtk.py:685
msgid "hgtk forget [FILE]..."
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:676
+#: tortoisehg\hgtk\hgtk.py:688
msgid "name of the webdir config file"
msgstr "nom du fichier de configuration web"
-#: tortoisehg\hgtk\hgtk.py:677
+#: tortoisehg\hgtk\hgtk.py:689
msgid "hgtk serve [OPTION]..."
msgstr "hgtk serve [OPTION]..."
-#: tortoisehg\hgtk\hgtk.py:679
+#: tortoisehg\hgtk\hgtk.py:691
msgid "wait until the second ticks over"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:680
+#: tortoisehg\hgtk\hgtk.py:692
msgid "notify the shell for paths given"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:681
+#: tortoisehg\hgtk\hgtk.py:693
msgid "remove the status cache"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:682
+#: tortoisehg\hgtk\hgtk.py:694
msgid "show the contents of the status cache (no update)"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:684
+#: tortoisehg\hgtk\hgtk.py:696
msgid "udpate all repos in current dir"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:685
+#: tortoisehg\hgtk\hgtk.py:697
msgid "hgtk thgstatus [OPTION]"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:687 tortoisehg\hgtk\hgtk.py:703
+#: tortoisehg\hgtk\hgtk.py:699 tortoisehg\hgtk\hgtk.py:715
msgid "revision to update"
msgstr "version à mettre à jour"
-#: tortoisehg\hgtk\hgtk.py:690
+#: tortoisehg\hgtk\hgtk.py:702
msgid "changeset to view in diff tool"
msgstr "groupe de modification à voir dans l'outil de différenciation"
-#: tortoisehg\hgtk\hgtk.py:691
+#: tortoisehg\hgtk\hgtk.py:703
msgid "revisions to view in diff tool"
msgstr "versions a afficher dans l'outil de différenciation"
-#: tortoisehg\hgtk\hgtk.py:692
+#: tortoisehg\hgtk\hgtk.py:704
msgid "bundle file to preview"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:693
+#: tortoisehg\hgtk\hgtk.py:705
msgid "directly use raw extdiff command"
msgstr ""
-#: tortoisehg\hgtk\hgtk.py:694
+#: tortoisehg\hgtk\hgtk.py:706
msgid "launch visual diff tool"
msgstr "lance l'outil de différenciation graphique"
-#: tortoisehg\hgtk\hgtk.py:696
+#: tortoisehg\hgtk\hgtk.py:708
msgid "print license"
msgstr "affiche la licence d'utilisation"
-#: tortoisehg\hgtk\hgtk.py:697
+#: tortoisehg\hgtk\hgtk.py:709
msgid "hgtk version [OPTION]"
msgstr "hgtk version [OPTION]"
-#: tortoisehg\hgtk\hgtk.py:699
+#: tortoisehg\hgtk\hgtk.py:711
msgid "show the command options"
msgstr "affiche les options des commandes"
-#: tortoisehg\hgtk\hgtk.py:700
+#: tortoisehg\hgtk\hgtk.py:712
msgid "[-o] CMD"
msgstr "[-o] CMD"
-#: tortoisehg\hgtk\hgtk.py:701
+#: tortoisehg\hgtk\hgtk.py:713
msgid "hgtk help [COMMAND]"
msgstr "hgtk help [COMMANDE]"
@@ -1907,530 +1923,598 @@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 ""
+"New changesets from the preview bundle are still pending.\n"
+"\n"
+"Accept or reject the new changesets?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:78
+msgid "Accept new Changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:81
msgid "&Accept"
msgstr ""
-#: tortoisehg\hgtk\history.py:77
+#: tortoisehg\hgtk\history.py:81
msgid "&Reject"
msgstr ""
-#: tortoisehg\hgtk\history.py:87
+#: tortoisehg\hgtk\history.py:91
msgid "%s - changelog"
msgstr ""
-#: tortoisehg\hgtk\history.py:89
+#: tortoisehg\hgtk\history.py:93
msgid " (Bundle Preview)"
msgstr ""
-#: tortoisehg\hgtk\history.py:105 tortoisehg\hgtk\status.py:177
+#: tortoisehg\hgtk\history.py:109 tortoisehg\hgtk\status.py:177
msgid "Re_fresh"
msgstr "Actualiser (_f)"
-#: tortoisehg\hgtk\history.py:107
+#: tortoisehg\hgtk\history.py:111
msgid "Reload revision history"
msgstr "Recharge l'historique des versions"
-#: tortoisehg\hgtk\history.py:112
+#: tortoisehg\hgtk\history.py:116
msgid "Launch synchronize tool"
msgstr "Lancer l'outil de synchronisation"
-#: tortoisehg\hgtk\history.py:117 tortoisehg\hgtk\history.py:165
+#: tortoisehg\hgtk\history.py:121 tortoisehg\hgtk\history.py:170
msgid "Patch Queue"
msgstr ""
-#: tortoisehg\hgtk\history.py:119
+#: tortoisehg\hgtk\history.py:123
msgid "Show/Hide Patch Queue"
msgstr ""
-#: tortoisehg\hgtk\history.py:161
+#: tortoisehg\hgtk\history.py:166
msgid "Sync Bar"
msgstr ""
-#: tortoisehg\hgtk\history.py:171
+#: tortoisehg\hgtk\history.py:176
msgid "Load more Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:173
+#: tortoisehg\hgtk\history.py:178
msgid "Load all Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:176
+#: tortoisehg\hgtk\history.py:181
msgid "Toolbar"
msgstr ""
-#: tortoisehg\hgtk\history.py:179
+#: tortoisehg\hgtk\history.py:184
msgid "Filter Bar"
msgstr ""
-#: tortoisehg\hgtk\history.py:185
+#: tortoisehg\hgtk\history.py:190
msgid "Reset Marks"
msgstr ""
-#: tortoisehg\hgtk\history.py:188
+#: tortoisehg\hgtk\history.py:193
msgid "Choose Details..."
msgstr ""
-#: tortoisehg\hgtk\history.py:192
+#: tortoisehg\hgtk\history.py:195
+msgid "Compact Graph"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:197
msgid "Color by Branch"
msgstr ""
-#: tortoisehg\hgtk\history.py:195
+#: tortoisehg\hgtk\history.py:200
msgid "Ignore Max Diff Size"
msgstr ""
-#: tortoisehg\hgtk\history.py:199
+#: tortoisehg\hgtk\history.py:204
msgid "_Navigate"
msgstr ""
-#: tortoisehg\hgtk\history.py:200
+#: tortoisehg\hgtk\history.py:205
msgid "Tip"
msgstr ""
-#: tortoisehg\hgtk\history.py:201
+#: tortoisehg\hgtk\history.py:206
msgid "Working Parent"
msgstr ""
-#: tortoisehg\hgtk\history.py:203
+#: tortoisehg\hgtk\history.py:208
msgid "Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:206
+#: tortoisehg\hgtk\history.py:211
msgid "_Synchronize"
msgstr ""
-#: tortoisehg\hgtk\history.py:207 tortoisehg\hgtk\synch.py:63
+#: tortoisehg\hgtk\history.py:212 tortoisehg\hgtk\synch.py:63
msgid "Incoming"
msgstr ""
-#: tortoisehg\hgtk\history.py:209
+#: tortoisehg\hgtk\history.py:214
msgid "Pull"
msgstr ""
-#: tortoisehg\hgtk\history.py:211 tortoisehg\hgtk\synch.py:74
+#: tortoisehg\hgtk\history.py:216 tortoisehg\hgtk\synch.py:74
msgid "Outgoing"
msgstr ""
-#: tortoisehg\hgtk\history.py:213 tortoisehg\hgtk\synch.py:79
+#: tortoisehg\hgtk\history.py:218 tortoisehg\hgtk\synch.py:79
msgid "Push"
msgstr ""
-#: tortoisehg\hgtk\history.py:215
+#: tortoisehg\hgtk\history.py:220
msgid "Email..."
msgstr ""
-#: tortoisehg\hgtk\history.py:218
+#: tortoisehg\hgtk\history.py:223
msgid "Add Bundle..."
msgstr ""
-#: tortoisehg\hgtk\history.py:221
+#: tortoisehg\hgtk\history.py:226
msgid "Accept Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:224
+#: tortoisehg\hgtk\history.py:229
msgid "Reject Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:230
+#: tortoisehg\hgtk\history.py:235
msgid "Force push"
msgstr ""
-#: tortoisehg\hgtk\history.py:320 tortoisehg\hgtk\logview\treeview.py:381
+#: tortoisehg\hgtk\history.py:325 tortoisehg\hgtk\logview\treeview.py:381
msgid "Graph"
msgstr ""
-#: tortoisehg\hgtk\history.py:327
+#: tortoisehg\hgtk\history.py:332
msgid "Revision Number"
msgstr ""
-#: tortoisehg\hgtk\history.py:328
+#: tortoisehg\hgtk\history.py:333
msgid "Changeset ID"
msgstr ""
-#: tortoisehg\hgtk\history.py:329
+#: tortoisehg\hgtk\history.py:334
msgid "Branch Name"
msgstr ""
-#: tortoisehg\hgtk\history.py:330 tortoisehg\hgtk\logview\treeview.py:433
+#: tortoisehg\hgtk\history.py:335 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
+#: tortoisehg\hgtk\history.py:337 tortoisehg\hgtk\logview\treeview.py:455
msgid "Local Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:333
+#: tortoisehg\hgtk\history.py:338
msgid "UTC Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:334 tortoisehg\hgtk\logview\treeview.py:479
+#: tortoisehg\hgtk\history.py:339 tortoisehg\hgtk\logview\treeview.py:479
msgid "Age"
msgstr ""
-#: tortoisehg\hgtk\history.py:335 tortoisehg\hgtk\logview\treeview.py:491
+#: tortoisehg\hgtk\history.py:340 tortoisehg\hgtk\logview\treeview.py:491
msgid "Tags"
msgstr ""
-#: tortoisehg\hgtk\history.py:384
+#: tortoisehg\hgtk\history.py:389
msgid "Invalid revision range"
msgstr ""
-#: tortoisehg\hgtk\history.py:396
+#: tortoisehg\hgtk\history.py:401
msgid "Invalid date specification"
msgstr "Date spécifiée invalide"
-#: tortoisehg\hgtk\history.py:630
+#: tortoisehg\hgtk\history.py:641
msgid "Filter"
msgstr ""
-#: tortoisehg\hgtk\history.py:635
+#: tortoisehg\hgtk\history.py:646
msgid "%s branch"
msgstr ""
-#: tortoisehg\hgtk\history.py:636
+#: tortoisehg\hgtk\history.py:647
msgid "Branch '%s'"
msgstr ""
-#: tortoisehg\hgtk\history.py:642
+#: tortoisehg\hgtk\history.py:653
msgid "file history: "
msgstr ""
-#: tortoisehg\hgtk\history.py:646
+#: tortoisehg\hgtk\history.py:657
msgid "custom filter"
msgstr ""
-#: tortoisehg\hgtk\history.py:654
+#: tortoisehg\hgtk\history.py:665
msgid "merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:657
+#: tortoisehg\hgtk\history.py:668
msgid "only Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:659
+#: tortoisehg\hgtk\history.py:670
msgid "revision ancestry"
msgstr ""
-#: tortoisehg\hgtk\history.py:664
+#: tortoisehg\hgtk\history.py:675
msgid "Ancestry of %s"
msgstr ""
-#: tortoisehg\hgtk\history.py:666
+#: tortoisehg\hgtk\history.py:677
msgid "tagged revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:674
+#: tortoisehg\hgtk\history.py:685
msgid "Tagged Revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:676
+#: tortoisehg\hgtk\history.py:687
msgid "working parents"
msgstr ""
-#: tortoisehg\hgtk\history.py:682
+#: tortoisehg\hgtk\history.py:693
msgid "heads"
msgstr ""
-#: tortoisehg\hgtk\history.py:686 tortoisehg\hgtk\history.py:997
+#: tortoisehg\hgtk\history.py:697 tortoisehg\hgtk\history.py:1018
msgid "Heads"
msgstr ""
-#: tortoisehg\hgtk\history.py:688
+#: tortoisehg\hgtk\history.py:699
msgid "no Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:706
+#: tortoisehg\hgtk\history.py:717
msgid "Visualize Change"
msgstr ""
-#: tortoisehg\hgtk\history.py:707
+#: tortoisehg\hgtk\history.py:718
msgid "Di_splay Change"
msgstr ""
-#: tortoisehg\hgtk\history.py:708
+#: tortoisehg\hgtk\history.py:719
msgid "Diff to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:710
+#: tortoisehg\hgtk\history.py:721
msgid "_Copy hash"
msgstr ""
-#: tortoisehg\hgtk\history.py:714
+#: tortoisehg\hgtk\history.py:725
msgid "Pull to here"
msgstr ""
-#: tortoisehg\hgtk\history.py:721
+#: tortoisehg\hgtk\history.py:732
msgid "Push to here"
msgstr ""
-#: tortoisehg\hgtk\history.py:723
+#: tortoisehg\hgtk\history.py:734
msgid "_Update..."
msgstr ""
-#: tortoisehg\hgtk\history.py:724 tortoisehg\hgtk\history.py:808
+#: tortoisehg\hgtk\history.py:735 tortoisehg\hgtk\history.py:819
msgid "_Merge with..."
msgstr ""
-#: tortoisehg\hgtk\history.py:727
+#: tortoisehg\hgtk\history.py:738
msgid "_Export Patch..."
msgstr ""
-#: tortoisehg\hgtk\history.py:728
+#: tortoisehg\hgtk\history.py:739
msgid "E_mail Patch..."
msgstr ""
-#: tortoisehg\hgtk\history.py:729
+#: tortoisehg\hgtk\history.py:740
msgid "_Bundle rev:tip..."
msgstr ""
-#: tortoisehg\hgtk\history.py:731
+#: tortoisehg\hgtk\history.py:742
msgid "Add/Remove _Tag..."
msgstr ""
-#: tortoisehg\hgtk\history.py:732
+#: tortoisehg\hgtk\history.py:743
msgid "Backout Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:734 tortoisehg\hgtk\status.py:1509
+#: tortoisehg\hgtk\history.py:745 tortoisehg\hgtk\status.py:1510
msgid "_Revert"
msgstr ""
-#: tortoisehg\hgtk\history.py:735
+#: tortoisehg\hgtk\history.py:746
msgid "_Archive..."
msgstr ""
-#: tortoisehg\hgtk\history.py:753
+#: tortoisehg\hgtk\history.py:764
msgid "Transp_lant to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:758
+#: tortoisehg\hgtk\history.py:769
msgid "qimport"
msgstr ""
-#: tortoisehg\hgtk\history.py:759
+#: tortoisehg\hgtk\history.py:770
msgid "Strip Revision..."
msgstr ""
-#: tortoisehg\hgtk\history.py:791
+#: tortoisehg\hgtk\history.py:802
msgid "_Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:792
+#: tortoisehg\hgtk\history.py:803
msgid "Visual Diff with selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:801
+#: tortoisehg\hgtk\history.py:812
msgid "Email from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:803
+#: tortoisehg\hgtk\history.py:814
msgid "Bundle from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:805
+#: tortoisehg\hgtk\history.py:816
msgid "Export Patches from here to selected..."
msgstr ""
-#: tortoisehg\hgtk\history.py:824
+#: tortoisehg\hgtk\history.py:835
msgid "Transplant Revision range to local"
msgstr ""
-#: tortoisehg\hgtk\history.py:829
+#: tortoisehg\hgtk\history.py:840
msgid "Rebase on top of selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:834
+#: tortoisehg\hgtk\history.py:845
msgid "qimport from here to selected"
msgstr ""
-#: tortoisehg\hgtk\history.py:865
+#: tortoisehg\hgtk\history.py:876
msgid "Load more"
msgstr ""
-#: tortoisehg\hgtk\history.py:865
+#: tortoisehg\hgtk\history.py:876
msgid "load more revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:868
+#: tortoisehg\hgtk\history.py:879
msgid "Load all"
msgstr ""
-#: tortoisehg\hgtk\history.py:868
+#: tortoisehg\hgtk\history.py:879
msgid "load all revisions"
msgstr ""
-#: tortoisehg\hgtk\history.py:910
+#: tortoisehg\hgtk\history.py:921
msgid "Download and view incoming changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:912
+#: tortoisehg\hgtk\history.py:923
+msgid "Accept changes from Bundle preview"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:925
+msgid "Reject changes from Bundle preview"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:927
msgid "Pull incoming changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:914
+#: tortoisehg\hgtk\history.py:930
msgid "Determine and mark outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:916
+#: tortoisehg\hgtk\history.py:932
msgid "Push outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:918
+#: tortoisehg\hgtk\history.py:934
msgid "Email outgoing changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:920
-msgid "Configure aliases and after pull behavior"
-msgstr ""
-
-#: tortoisehg\hgtk\history.py:922
+#: tortoisehg\hgtk\history.py:937
msgid "Stop current transaction"
msgstr ""
-#: tortoisehg\hgtk\history.py:949
+#: tortoisehg\hgtk\history.py:960
msgid "After Pull:"
msgstr ""
-#: tortoisehg\hgtk\history.py:950 tortoisehg\hgtk\synch.py:155
+#: tortoisehg\hgtk\history.py:961 tortoisehg\hgtk\synch.py:155
msgid "Nothing"
msgstr "Rien"
-#: tortoisehg\hgtk\history.py:950 tortoisehg\hgtk\synch.py:155
+#: tortoisehg\hgtk\history.py:961 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
+#: tortoisehg\hgtk\history.py:964 tortoisehg\hgtk\synch.py:158
msgid "Fetch"
msgstr ""
-#: tortoisehg\hgtk\history.py:955 tortoisehg\hgtk\synch.py:160
+#: tortoisehg\hgtk\history.py:966 tortoisehg\hgtk\synch.py:160
msgid "Rebase"
msgstr ""
-#: tortoisehg\hgtk\history.py:979
+#: tortoisehg\hgtk\history.py:984
+msgid "Configure aliases and after pull behavior"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1000
msgid "All"
msgstr ""
-#: tortoisehg\hgtk\history.py:984
+#: tortoisehg\hgtk\history.py:1005
msgid "Tagged"
msgstr ""
-#: tortoisehg\hgtk\history.py:988
+#: tortoisehg\hgtk\history.py:1009
msgid "Ancestry"
msgstr ""
-#: tortoisehg\hgtk\history.py:1001
+#: tortoisehg\hgtk\history.py:1022
msgid "Merges"
msgstr ""
-#: tortoisehg\hgtk\history.py:1005
+#: tortoisehg\hgtk\history.py:1026
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
+#: tortoisehg\hgtk\history.py:1033
+msgid "Branch Filter"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1040
+msgid "Branches..."
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1050
+msgid "Custom Filter"
+msgstr "Filtre utilisateur"
+
+#: tortoisehg\hgtk\history.py:1056
msgid "File Patterns"
msgstr ""
-#: tortoisehg\hgtk\history.py:1029
+#: tortoisehg\hgtk\history.py:1056
msgid "Rev Range"
msgstr ""
-#: tortoisehg\hgtk\history.py:1030
+#: tortoisehg\hgtk\history.py:1057
msgid "Date"
msgstr ""
-#: tortoisehg\hgtk\history.py:1030
+#: tortoisehg\hgtk\history.py:1057
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
+#: tortoisehg\hgtk\history.py:1189 tortoisehg\hgtk\history.py:1303
+#: tortoisehg\hgtk\history.py:1325 tortoisehg\hgtk\history.py:1391
+#: tortoisehg\hgtk\history.py:1776
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
+#: tortoisehg\hgtk\history.py:1190 tortoisehg\hgtk\history.py:1304
+#: tortoisehg\hgtk\history.py:1326 tortoisehg\hgtk\history.py:1392
+#: tortoisehg\hgtk\history.py:1777
msgid "Please enter or select a remote path"
msgstr ""
-#: tortoisehg\hgtk\history.py:1176
+#: tortoisehg\hgtk\history.py:1227
msgid "Accept incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1177
+#: tortoisehg\hgtk\history.py:1228
msgid "Accept"
msgstr ""
-#: tortoisehg\hgtk\history.py:1182
+#: tortoisehg\hgtk\history.py:1233
msgid "Reject incoming previewed changesets"
msgstr ""
-#: tortoisehg\hgtk\history.py:1183
+#: tortoisehg\hgtk\history.py:1234
msgid "Reject"
msgstr ""
-#: tortoisehg\hgtk\history.py:1218
+#: tortoisehg\hgtk\history.py:1275
msgid "Bundle Preview"
msgstr ""
-#: tortoisehg\hgtk\history.py:1222
+#: tortoisehg\hgtk\history.py:1280
msgid "Open Bundle"
msgstr ""
-#: tortoisehg\hgtk\history.py:1313 tortoisehg\hgtk\synch.py:495
+#: tortoisehg\hgtk\history.py:1355
+msgid "%d outgoing changesets"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1374 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
+#: tortoisehg\hgtk\history.py:1375 tortoisehg\hgtk\synch.py:496
msgid "Select a peer repository to compare with"
msgstr ""
-#: tortoisehg\hgtk\history.py:1485
+#: tortoisehg\hgtk\history.py:1402
+msgid "Confirm Forced Push to Remote Repository"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1403
+msgid ""
+"Forced push to remote repository\n"
+"%s\n"
+"(creating new heads in remote if needed)?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1405 tortoisehg\hgtk\history.py:1415
+msgid "Forced &Push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1407
+msgid "Confirm Push to remote Repository"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1408
+msgid ""
+"Push to remote repository\n"
+"%s\n"
+"?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1409
+msgid "&Push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1412
+msgid "Confirm Forced Push"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1413
+msgid ""
+"Forced push to repository\n"
+"%s\n"
+"(creating new heads if needed)?"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1423
+msgid "Invalid Remote Repository"
+msgstr ""
+
+#: tortoisehg\hgtk\history.py:1592
msgid "Confirm Revert All Files"
msgstr ""
-#: tortoisehg\hgtk\history.py:1486
+#: tortoisehg\hgtk\history.py:1593
msgid ""
"Revert all files to revision %d?\n"
"This will overwrite your local changes"
msgstr "Rétablir tous les fichiers de la révision %d ?"
-#: tortoisehg\hgtk\history.py:1537
+#: tortoisehg\hgtk\history.py:1644
msgid "Save patches to"
msgstr ""
-#: tortoisehg\hgtk\history.py:1560 tortoisehg\hgtk\history.py:1734
+#: tortoisehg\hgtk\history.py:1667 tortoisehg\hgtk\history.py:1836
msgid "Write bundle to"
msgstr "Écrire le paquet sous"
-#: tortoisehg\hgtk\history.py:1596
+#: tortoisehg\hgtk\history.py:1703
msgid "Confirm Rebase Revision"
msgstr ""
-#: tortoisehg\hgtk\history.py:1597
+#: tortoisehg\hgtk\history.py:1704
msgid "Rebase revision %d on top of %d?"
msgstr ""
-#: tortoisehg\hgtk\history.py:1705 tortoisehg\hgtk\status.py:1193
+#: tortoisehg\hgtk\history.py:1815 tortoisehg\hgtk\status.py:1194
msgid "Save patch to"
msgstr "Sauvegarder le patch sous"
@@ -2446,6 +2530,10 @@msgid "ID"
msgstr ""
+#: tortoisehg\hgtk\logview\treeview.py:420
+msgid "Branch"
+msgstr "Branche"
+
#: tortoisehg\hgtk\logview\treeview.py:467
msgid "Universal Date"
msgstr ""
@@ -2466,140 +2554,164 @@msgid "Outstanding uncommitted changes"
msgstr ""
-#: tortoisehg\hgtk\merge.py:77
+#: tortoisehg\hgtk\merge.py:76
msgid "Not a head revision!"
msgstr ""
-#: tortoisehg\hgtk\merge.py:81
+#: tortoisehg\hgtk\merge.py:82
msgid "Merge target (other)"
msgstr "Destination de fusion (autre)"
-#: tortoisehg\hgtk\merge.py:86
+#: tortoisehg\hgtk\merge.py:87
msgid "Current revision (local)"
msgstr "Révision courante (locale)"
-#: tortoisehg\hgtk\merge.py:92
+#: tortoisehg\hgtk\merge.py:93
msgid "Merge"
msgstr "Fusionner"
-#: tortoisehg\hgtk\merge.py:94
+#: tortoisehg\hgtk\merge.py:95
msgid "Undo"
msgstr "Annuler"
-#: tortoisehg\hgtk\merge.py:103
+#: tortoisehg\hgtk\merge.py:104
msgid "Merge tools:"
msgstr ""
-#: tortoisehg\hgtk\merge.py:169
+#: tortoisehg\hgtk\merge.py:170
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
+#: tortoisehg\hgtk\merge.py:226
msgid "Merged successfully"
msgstr ""
-#: tortoisehg\hgtk\merge.py:227
+#: tortoisehg\hgtk\merge.py:228
msgid "Canceled merging"
msgstr ""
-#: tortoisehg\hgtk\merge.py:229
+#: tortoisehg\hgtk\merge.py:230
msgid "Failed to merge"
msgstr ""
-#: tortoisehg\hgtk\merge.py:265
+#: tortoisehg\hgtk\merge.py:266
msgid "Confirm undo merge"
msgstr "Confirmer l'annulation de la fusion"
-#: tortoisehg\hgtk\merge.py:266
+#: tortoisehg\hgtk\merge.py:267
msgid "Clean checkout of original revision?"
msgstr "Rétablir la révision d'origine"
-#: tortoisehg\hgtk\merge.py:276
+#: tortoisehg\hgtk\merge.py:277
msgid "Undo successfully"
msgstr ""
-#: tortoisehg\hgtk\merge.py:278
+#: tortoisehg\hgtk\merge.py:279
msgid "Canceled undo"
msgstr ""
-#: tortoisehg\hgtk\merge.py:280
+#: tortoisehg\hgtk\merge.py:281
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
+#: tortoisehg\hgtk\quickop.py:50
+msgid "Select files to add"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:51
+msgid "Forget"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:51
+msgid "Select files to forget"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:52
+msgid "Revert"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:52
+msgid "Select files to revert"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:53
+msgid "Select files to remove"
+msgstr ""
+
+#: tortoisehg\hgtk\quickop.py:53 tortoisehg\hgtk\tagadd.py:42
+msgid "Remove"
+msgstr "Supprimer"
+
+#: tortoisehg\hgtk\quickop.py:100 tortoisehg\hgtk\status.py:138
msgid "status"
msgstr "status"
-#: tortoisehg\hgtk\quickop.py:97 tortoisehg\hgtk\status.py:271
+#: tortoisehg\hgtk\quickop.py:103 tortoisehg\hgtk\status.py:271
msgid "path"
msgstr "chemin"
-#: tortoisehg\hgtk\quickop.py:110
+#: tortoisehg\hgtk\quickop.py:116
msgid "Toggle all selections"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:135
+#: tortoisehg\hgtk\quickop.py:141
msgid "modified"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:138
+#: tortoisehg\hgtk\quickop.py:144
msgid "added"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:141
+#: tortoisehg\hgtk\quickop.py:147
msgid "removed"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:144
+#: tortoisehg\hgtk\quickop.py:150
msgid "missing"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:147 tortoisehg\hgtk\quickop.py:230
+#: tortoisehg\hgtk\quickop.py:153 tortoisehg\hgtk\quickop.py:236
#: 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
+#: tortoisehg\hgtk\quickop.py:157 tortoisehg\hgtk\quickop.py:236
msgid "ignored"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:155
+#: tortoisehg\hgtk\quickop.py:161
msgid "clean"
msgstr "nettoyer"
-#: tortoisehg\hgtk\quickop.py:158
+#: tortoisehg\hgtk\quickop.py:164
msgid "No appropriate files"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:159
+#: tortoisehg\hgtk\quickop.py:165
msgid "No files found for this operation"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:236
+#: tortoisehg\hgtk\quickop.py:242
msgid "No files selected"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:237
+#: tortoisehg\hgtk\quickop.py:243
msgid "No operation to perform"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:258
+#: tortoisehg\hgtk\quickop.py:264
msgid "Successfully"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:260 tortoisehg\hgtk\thgmq.py:626
+#: tortoisehg\hgtk\quickop.py:266 tortoisehg\hgtk\thgmq.py:644
msgid "Canceled"
msgstr ""
-#: tortoisehg\hgtk\quickop.py:262 tortoisehg\hgtk\thgmq.py:628
+#: tortoisehg\hgtk\quickop.py:268 tortoisehg\hgtk\thgmq.py:646
msgid "Failed"
msgstr ""
@@ -2873,282 +2985,282 @@msgid "View"
msgstr ""
-#: tortoisehg\hgtk\status.py:303
+#: tortoisehg\hgtk\status.py:304
msgid "Remove filter, show root"
msgstr ""
-#: tortoisehg\hgtk\status.py:329
+#: tortoisehg\hgtk\status.py:330
msgid "Text Diff"
msgstr ""
-#: tortoisehg\hgtk\status.py:382
+#: tortoisehg\hgtk\status.py:383
msgid "Hunk Selection"
msgstr ""
-#: tortoisehg\hgtk\status.py:455
+#: tortoisehg\hgtk\status.py:456
msgid "%d selected, %d total"
msgstr "%d sélectionné(s), %d au total"
-#: tortoisehg\hgtk\status.py:477
+#: tortoisehg\hgtk\status.py:478
msgid "Save Preview"
msgstr ""
-#: tortoisehg\hgtk\status.py:481
+#: tortoisehg\hgtk\status.py:482
msgid "Shelf Preview"
msgstr ""
-#: tortoisehg\hgtk\status.py:503
+#: tortoisehg\hgtk\status.py:504
msgid "?: unknown"
msgstr ""
-#: tortoisehg\hgtk\status.py:504
+#: tortoisehg\hgtk\status.py:505
msgid "M: modified"
msgstr ""
-#: tortoisehg\hgtk\status.py:505
+#: tortoisehg\hgtk\status.py:506
msgid "I: ignored"
msgstr ""
-#: tortoisehg\hgtk\status.py:506
+#: tortoisehg\hgtk\status.py:507
msgid "A: added"
msgstr ""
-#: tortoisehg\hgtk\status.py:507
+#: tortoisehg\hgtk\status.py:508
msgid "C: clean"
msgstr ""
-#: tortoisehg\hgtk\status.py:508
+#: tortoisehg\hgtk\status.py:509
msgid "R: removed"
msgstr ""
-#: tortoisehg\hgtk\status.py:509
+#: tortoisehg\hgtk\status.py:510
msgid "!: deleted"
msgstr ""
-#: tortoisehg\hgtk\status.py:800
+#: tortoisehg\hgtk\status.py:801
msgid "View '%s'"
msgstr ""
-#: tortoisehg\hgtk\status.py:845
+#: tortoisehg\hgtk\status.py:846
msgid "Rename file to:"
msgstr "Renommer le fichier sous :"
-#: tortoisehg\hgtk\status.py:854
+#: tortoisehg\hgtk\status.py:855
msgid "Copy file to"
msgstr "Copier le fichier sous"
-#: tortoisehg\hgtk\status.py:867 tortoisehg\hgtk\status.py:1331
+#: tortoisehg\hgtk\status.py:868 tortoisehg\hgtk\status.py:1332
msgid "Nothing Removed"
msgstr "Rien n'a été supprimé"
-#: tortoisehg\hgtk\status.py:868
+#: tortoisehg\hgtk\status.py:869
msgid "Remove is not enabled when multiple revisions are specified."
msgstr ""
-#: tortoisehg\hgtk\status.py:885
+#: tortoisehg\hgtk\status.py:886
msgid "Move is not enabled when multiple revisions are specified."
msgstr ""
-#: tortoisehg\hgtk\status.py:885 tortoisehg\hgtk\status.py:1349
-#: tortoisehg\hgtk\status.py:1357
+#: tortoisehg\hgtk\status.py:886 tortoisehg\hgtk\status.py:1350
+#: tortoisehg\hgtk\status.py:1358
msgid "Nothing Moved"
msgstr "Rien n'a été déplacé"
-#: tortoisehg\hgtk\status.py:903
+#: tortoisehg\hgtk\status.py:904
msgid "Copy is not enabled when multiple revisions are specified."
msgstr ""
-#: tortoisehg\hgtk\status.py:903
+#: tortoisehg\hgtk\status.py:904
msgid "Nothing Copied"
msgstr "Rien n'a été copié"
-#: tortoisehg\hgtk\status.py:962 tortoisehg\hgtk\status.py:1023
+#: tortoisehg\hgtk\status.py:963 tortoisehg\hgtk\status.py:1024
msgid "===== Diff to first parent =====\n"
msgstr ""
-#: tortoisehg\hgtk\status.py:967 tortoisehg\hgtk\status.py:1030
+#: tortoisehg\hgtk\status.py:968 tortoisehg\hgtk\status.py:1031
msgid ""
"\n"
"===== Diff to second parent =====\n"
msgstr ""
-#: tortoisehg\hgtk\status.py:1059
+#: tortoisehg\hgtk\status.py:1060
msgid "File is larger than the specified max size.\n"
msgstr ""
-#: tortoisehg\hgtk\status.py:1060
+#: tortoisehg\hgtk\status.py:1061
msgid "Hunk selection is disabled for this file.\n"
msgstr ""
-#: tortoisehg\hgtk\status.py:1231
+#: tortoisehg\hgtk\status.py:1232
msgid "Nothing Diffed"
msgstr ""
-#: tortoisehg\hgtk\status.py:1232
+#: tortoisehg\hgtk\status.py:1233
msgid "No diffable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1240 tortoisehg\hgtk\status.py:1248
+#: tortoisehg\hgtk\status.py:1241 tortoisehg\hgtk\status.py:1249
msgid "Nothing Reverted"
msgstr ""
-#: tortoisehg\hgtk\status.py:1241
+#: tortoisehg\hgtk\status.py:1242
msgid "No revertable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1249
+#: tortoisehg\hgtk\status.py:1250
msgid "Revert not allowed when viewing revision range."
msgstr ""
-#: tortoisehg\hgtk\status.py:1267
+#: tortoisehg\hgtk\status.py:1268
msgid "Uncommited merge - please select a parent revision"
msgstr ""
-#: tortoisehg\hgtk\status.py:1268
+#: tortoisehg\hgtk\status.py:1269
msgid "Revert files to local or other parent?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1269
+#: tortoisehg\hgtk\status.py:1270
msgid "&Local"
msgstr ""
-#: tortoisehg\hgtk\status.py:1269
+#: tortoisehg\hgtk\status.py:1270
msgid "&Other"
msgstr ""
-#: tortoisehg\hgtk\status.py:1284
+#: tortoisehg\hgtk\status.py:1285
msgid "Confirm Revert"
msgstr ""
-#: tortoisehg\hgtk\status.py:1285
+#: tortoisehg\hgtk\status.py:1286
msgid ""
"Revert files to revision %s?\n"
"\n"
"%s"
msgstr ""
-#: tortoisehg\hgtk\status.py:1286
+#: tortoisehg\hgtk\status.py:1287
msgid "&Yes (backup changes)"
msgstr ""
-#: tortoisehg\hgtk\status.py:1287
+#: tortoisehg\hgtk\status.py:1288
msgid "Yes (&discard changes)"
msgstr ""
-#: tortoisehg\hgtk\status.py:1307
+#: tortoisehg\hgtk\status.py:1308
msgid "Nothing Added"
msgstr "Rien n'a été ajouté"
-#: tortoisehg\hgtk\status.py:1308
+#: tortoisehg\hgtk\status.py:1309
msgid "No addable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1332
+#: tortoisehg\hgtk\status.py:1333
msgid "No removable files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1340
+#: tortoisehg\hgtk\status.py:1341
msgid "Move files to directory..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1350
+#: tortoisehg\hgtk\status.py:1351
msgid "Cannot move outside repo!"
msgstr ""
-#: tortoisehg\hgtk\status.py:1357
+#: tortoisehg\hgtk\status.py:1358
msgid ""
"No movable files selected\n"
"\n"
"Note: only clean files can be moved."
msgstr ""
-#: tortoisehg\hgtk\status.py:1366
+#: tortoisehg\hgtk\status.py:1367
msgid "Nothing Forgotten"
msgstr ""
-#: tortoisehg\hgtk\status.py:1367
+#: tortoisehg\hgtk\status.py:1368
msgid "No clean files selected"
msgstr ""
-#: tortoisehg\hgtk\status.py:1370
+#: tortoisehg\hgtk\status.py:1371
msgid "Confirm Delete Unrevisioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1371
+#: tortoisehg\hgtk\status.py:1372
msgid "Delete the following unrevisioned files?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1384
+#: tortoisehg\hgtk\status.py:1385
msgid "Delete Errors"
msgstr "Supprimer les erreurs"
-#: tortoisehg\hgtk\status.py:1505
+#: tortoisehg\hgtk\status.py:1506
msgid "Edit"
msgstr ""
-#: tortoisehg\hgtk\status.py:1506
+#: tortoisehg\hgtk\status.py:1507
msgid "View missing"
msgstr ""
-#: tortoisehg\hgtk\status.py:1507
+#: tortoisehg\hgtk\status.py:1508
msgid "View other"
msgstr ""
-#: tortoisehg\hgtk\status.py:1511
+#: tortoisehg\hgtk\status.py:1512
msgid "L_og"
msgstr ""
-#: tortoisehg\hgtk\status.py:1515
+#: tortoisehg\hgtk\status.py:1516
msgid "_Guess Rename..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1516
+#: tortoisehg\hgtk\status.py:1517
msgid "_Ignore"
msgstr ""
-#: tortoisehg\hgtk\status.py:1517
+#: tortoisehg\hgtk\status.py:1518
msgid "Remove versioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1518
+#: tortoisehg\hgtk\status.py:1519
msgid "_Delete unversioned"
msgstr ""
-#: tortoisehg\hgtk\status.py:1521
+#: tortoisehg\hgtk\status.py:1522
msgid "_Copy..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1522
+#: tortoisehg\hgtk\status.py:1523
msgid "Rename..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1524
+#: tortoisehg\hgtk\status.py:1525
msgid "Restart Merge..."
msgstr ""
-#: tortoisehg\hgtk\status.py:1525
+#: tortoisehg\hgtk\status.py:1526
msgid "Mark unresolved"
msgstr ""
-#: tortoisehg\hgtk\status.py:1526
+#: tortoisehg\hgtk\status.py:1527
msgid "Mark resolved"
msgstr ""
-#: tortoisehg\hgtk\status.py:1534
+#: tortoisehg\hgtk\status.py:1535
msgid "Restart merge with"
msgstr ""
-#: tortoisehg\hgtk\status.py:1578
+#: tortoisehg\hgtk\status.py:1579
msgid "not up to date"
msgstr ""
-#: tortoisehg\hgtk\status.py:1579
+#: tortoisehg\hgtk\status.py:1580
msgid ""
"The parents have changed since the last refresh.\n"
"Continue anyway?"
msgstr ""
-#: tortoisehg\hgtk\status.py:1581
+#: tortoisehg\hgtk\status.py:1582
msgid "&Refresh"
msgstr ""
@@ -3180,7 +3292,7 @@msgid "Push local changes to selected repository"
msgstr ""
-#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:614
+#: tortoisehg\hgtk\synch.py:84 tortoisehg\hgtk\thgconfig.py:616
msgid "Email"
msgstr "Courriel"
@@ -3276,88 +3388,80 @@msgid "Tag - %s"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:42
-msgid "Remove"
-msgstr "Supprimer"
-
#: tortoisehg\hgtk\tagadd.py:59
msgid "Tag:"
msgstr "Tag :"
-#: tortoisehg\hgtk\tagadd.py:65
-msgid "Revision:"
-msgstr "Révision :"
-
#: tortoisehg\hgtk\tagadd.py:76
msgid "Tag is local"
msgstr "Tag est local"
-#: tortoisehg\hgtk\tagadd.py:77
+#: tortoisehg\hgtk\tagadd.py:78
msgid "Replace existing tag"
msgstr "Remplacer le tag existant"
-#: tortoisehg\hgtk\tagadd.py:78
+#: tortoisehg\hgtk\tagadd.py:79
msgid "Use English commit message"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:84
+#: tortoisehg\hgtk\tagadd.py:85
msgid "Use custom commit message:"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:153
+#: tortoisehg\hgtk\tagadd.py:161
msgid "Tag input is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:154
+#: tortoisehg\hgtk\tagadd.py:162
msgid "Please enter tag name"
msgstr "Entrez le nom du tag"
-#: tortoisehg\hgtk\tagadd.py:158
+#: tortoisehg\hgtk\tagadd.py:166
msgid "Custom commit message is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:167 tortoisehg\hgtk\tagadd.py:199
+#: tortoisehg\hgtk\tagadd.py:175 tortoisehg\hgtk\tagadd.py:207
msgid "Tagging completed"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:168
+#: tortoisehg\hgtk\tagadd.py:176
msgid "Tag \"%s\" has been added"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:171 tortoisehg\hgtk\tagadd.py:174
-#: tortoisehg\hgtk\tagadd.py:203 tortoisehg\hgtk\tagadd.py:206
+#: tortoisehg\hgtk\tagadd.py:179 tortoisehg\hgtk\tagadd.py:182
+#: tortoisehg\hgtk\tagadd.py:211 tortoisehg\hgtk\tagadd.py:214
msgid "Error in tagging"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:187
+#: tortoisehg\hgtk\tagadd.py:195
msgid "Tag name is empty"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:188
+#: tortoisehg\hgtk\tagadd.py:196
msgid "Please select tag name to remove"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:200
+#: tortoisehg\hgtk\tagadd.py:208
msgid "Tag \"%s\" has been removed"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:214
+#: tortoisehg\hgtk\tagadd.py:222
msgid "a tag named \"%s\" already exists"
msgstr "une étiquette du nom de \"%s\" existe déjà"
-#: tortoisehg\hgtk\tagadd.py:220
+#: tortoisehg\hgtk\tagadd.py:228
msgid "Added tag %s for changeset %s"
msgstr "Étiquette %s ajoutée pour le jeu de révisions %s"
-#: tortoisehg\hgtk\tagadd.py:224
+#: tortoisehg\hgtk\tagadd.py:232
msgid "Tag '%s' already exist"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:231
+#: tortoisehg\hgtk\tagadd.py:239
msgid "Tag '%s' does not exist"
msgstr ""
-#: tortoisehg\hgtk\tagadd.py:234
+#: tortoisehg\hgtk\tagadd.py:242
msgid "Removed tag %s"
msgstr "Étiquette %s enlevée"
@@ -3675,108 +3779,116 @@"Queues Extension. Default: None"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:134
+#: tortoisehg\hgtk\thgconfig.py:131
+msgid "Use Expander"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:132
+msgid "Show changeset details with an expander"
+msgstr ""
+
+#: tortoisehg\hgtk\thgconfig.py:136
msgid "After pull operation"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:136
+#: tortoisehg\hgtk\thgconfig.py:138
msgid ""
"Operation which is performed directly after a successful pull. update "
"equates to pull --update, fetch equates to the fetch extension, rebase "
"equates to pull --rebase. Default: none"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:141 tortoisehg\hgtk\thgmq.py:186
+#: tortoisehg\hgtk\thgconfig.py:143 tortoisehg\hgtk\thgmq.py:186
msgid "Name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:142
+#: tortoisehg\hgtk\thgconfig.py:144
msgid ""
"Repository name to use in the web interface. Default is the working "
"directory."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:144 tortoisehg\hgtk\thgconfig.py:937
+#: tortoisehg\hgtk\thgconfig.py:146 tortoisehg\hgtk\thgconfig.py:939
msgid "Description"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:145
+#: tortoisehg\hgtk\thgconfig.py:147
msgid "Textual description of the repository's purpose or contents."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:147
+#: tortoisehg\hgtk\thgconfig.py:149
msgid "Contact"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:148
+#: tortoisehg\hgtk\thgconfig.py:150
msgid "Name or email address of the person in charge of the repository."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:150
+#: tortoisehg\hgtk\thgconfig.py:152
msgid "Style"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:152
+#: tortoisehg\hgtk\thgconfig.py:154
msgid "Which template map style to use"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:153
+#: tortoisehg\hgtk\thgconfig.py:155
msgid "Archive Formats"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:154
+#: tortoisehg\hgtk\thgconfig.py:156
msgid "Comma separated list of archive formats allowed for downloading"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:156
+#: tortoisehg\hgtk\thgconfig.py:158
msgid "Port to listen on"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:156 tortoisehg\hgtk\thgconfig.py:273
+#: tortoisehg\hgtk\thgconfig.py:158 tortoisehg\hgtk\thgconfig.py:275
msgid "Port"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:157
+#: tortoisehg\hgtk\thgconfig.py:159
msgid "Push Requires SSL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:158
+#: tortoisehg\hgtk\thgconfig.py:160
msgid ""
"Whether to require that inbound pushes be transported over SSL to prevent "
"password sniffing."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:160
+#: tortoisehg\hgtk\thgconfig.py:162
msgid "Stripes"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:161
+#: tortoisehg\hgtk\thgconfig.py:163
msgid ""
"How many lines a \"zebra stripe\" should span in multiline output. Default "
"is 1; set to 0 to disable."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:163
+#: tortoisehg\hgtk\thgconfig.py:165
msgid "Max Files"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:164
+#: tortoisehg\hgtk\thgconfig.py:166
msgid "Maximum number of files to list per changeset."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:165
+#: tortoisehg\hgtk\thgconfig.py:167
msgid "Max Changes"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:166
+#: tortoisehg\hgtk\thgconfig.py:168
msgid "Maximum number of changes to list on the changelog."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:167
+#: tortoisehg\hgtk\thgconfig.py:169
msgid "Allow Push"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:168
+#: tortoisehg\hgtk\thgconfig.py:170
msgid ""
"Whether to allow pushing to the repository. If empty or not set, push is not "
"allowed. If the special value \"*\", any remote user can push, including "
@@ -3786,11 +3898,11 @@"examined after the deny_push list."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:175
+#: tortoisehg\hgtk\thgconfig.py:177
msgid "Deny Push"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:176
+#: tortoisehg\hgtk\thgconfig.py:178
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. "
@@ -3799,81 +3911,81 @@"The contents of the deny_push list are examined before the allow_push list."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:182
+#: tortoisehg\hgtk\thgconfig.py:184
msgid "Encoding"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:183
+#: tortoisehg\hgtk\thgconfig.py:185
msgid "Character encoding name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:186 tortoisehg\hgtk\thgconfig.py:274
+#: tortoisehg\hgtk\thgconfig.py:188 tortoisehg\hgtk\thgconfig.py:276
msgid "Host"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:187
+#: tortoisehg\hgtk\thgconfig.py:189
msgid ""
"Host name and (optional) port of proxy server, for example \"myproxy:8000\""
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:189
+#: tortoisehg\hgtk\thgconfig.py:191
msgid "Bypass List"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:190
+#: tortoisehg\hgtk\thgconfig.py:192
msgid ""
"Optional. Comma-separated list of host names that should bypass the proxy"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:193
+#: tortoisehg\hgtk\thgconfig.py:195
msgid "Optional. User name to authenticate with at the proxy server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:195 tortoisehg\hgtk\thgconfig.py:275
+#: tortoisehg\hgtk\thgconfig.py:197 tortoisehg\hgtk\thgconfig.py:277
msgid "Password"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:196
+#: tortoisehg\hgtk\thgconfig.py:198
msgid "Optional. Password to authenticate with at the proxy server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:200
+#: tortoisehg\hgtk\thgconfig.py:202
msgid "From"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:201
+#: tortoisehg\hgtk\thgconfig.py:203
msgid "Email address to use in the \"From\" header and for the SMTP envelope"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:202
+#: tortoisehg\hgtk\thgconfig.py:204
msgid "To"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:203
+#: tortoisehg\hgtk\thgconfig.py:205
msgid "Comma-separated list of recipient email addresses"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:204
+#: tortoisehg\hgtk\thgconfig.py:206
msgid "Cc"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:205
+#: tortoisehg\hgtk\thgconfig.py:207
msgid "Comma-separated list of carbon copy recipient email addresses"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:207
+#: tortoisehg\hgtk\thgconfig.py:209
msgid "Bcc"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:208
+#: tortoisehg\hgtk\thgconfig.py:210
msgid "Comma-separated list of blind carbon copy recipient email addresses"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:210
+#: tortoisehg\hgtk\thgconfig.py:212
msgid "method"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:211
+#: tortoisehg\hgtk\thgconfig.py:213
msgid ""
"Optional. Method to use to send email messages. If value is \"smtp\" "
"(default), use SMTP (configured below). Otherwise, use as name of program "
@@ -3883,289 +3995,289 @@"messages."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:216
+#: tortoisehg\hgtk\thgconfig.py:218
msgid "Host name of mail server"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:216
+#: tortoisehg\hgtk\thgconfig.py:218
msgid "SMTP Host"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:217
+#: tortoisehg\hgtk\thgconfig.py:219
msgid "SMTP Port"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:218
+#: tortoisehg\hgtk\thgconfig.py:220
msgid "Port to connect to on mail server. Default: 25"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:220
+#: tortoisehg\hgtk\thgconfig.py:222
msgid "SMTP TLS"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:221
+#: tortoisehg\hgtk\thgconfig.py:223
msgid "Connect to mail server using TLS. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:223
+#: tortoisehg\hgtk\thgconfig.py:225
msgid "SMTP Username"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:224
+#: tortoisehg\hgtk\thgconfig.py:226
msgid "Username to authenticate to mail server with"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:225
+#: tortoisehg\hgtk\thgconfig.py:227
msgid "SMTP Password"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:226
+#: tortoisehg\hgtk\thgconfig.py:228
msgid "Password to authenticate to mail server with"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:227
+#: tortoisehg\hgtk\thgconfig.py:229
msgid "Local Hostname"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:228
+#: tortoisehg\hgtk\thgconfig.py:230
msgid "Hostname the sender can use to identify itself to the mail server."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:231
+#: tortoisehg\hgtk\thgconfig.py:233
msgid "Patch EOL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:232
+#: tortoisehg\hgtk\thgconfig.py:234
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
+#: tortoisehg\hgtk\thgconfig.py:237
msgid "Git Format"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:236
+#: tortoisehg\hgtk\thgconfig.py:238
msgid "Use git extended diff header format. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:238
+#: tortoisehg\hgtk\thgconfig.py:240
msgid "No Dates"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:239
+#: tortoisehg\hgtk\thgconfig.py:241
msgid "Do not include modification dates in diff headers. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:241
+#: tortoisehg\hgtk\thgconfig.py:243
msgid "Show Function"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:242
+#: tortoisehg\hgtk\thgconfig.py:244
msgid "Show which function each change is in. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:244
+#: tortoisehg\hgtk\thgconfig.py:246
msgid "Ignore White Space"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:245
+#: tortoisehg\hgtk\thgconfig.py:247
msgid "Ignore white space when comparing lines. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:247
+#: tortoisehg\hgtk\thgconfig.py:249
msgid "Ignore WS Amount"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:248
+#: tortoisehg\hgtk\thgconfig.py:250
msgid "Ignore changes in the amount of white space. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:250
+#: tortoisehg\hgtk\thgconfig.py:252
msgid "Ignore Blank Lines"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:251
+#: tortoisehg\hgtk\thgconfig.py:253
msgid "Ignore changes whose lines are all blank. Default: False"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:255
+#: tortoisehg\hgtk\thgconfig.py:257
msgid "http"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:255
+#: tortoisehg\hgtk\thgconfig.py:257
msgid "ssh"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:256
+#: tortoisehg\hgtk\thgconfig.py:258
msgid "https"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:256
+#: tortoisehg\hgtk\thgconfig.py:258
msgid "local"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:265
+#: tortoisehg\hgtk\thgconfig.py:267
msgid "Edit remote repository path"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:273
+#: tortoisehg\hgtk\thgconfig.py:275
msgid "URL"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:274
+#: tortoisehg\hgtk\thgconfig.py:276
msgid "Folder"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:276 tortoisehg\hgtk\thgconfig.py:890
+#: tortoisehg\hgtk\thgconfig.py:278 tortoisehg\hgtk\thgconfig.py:892
msgid "Alias"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:308
+#: tortoisehg\hgtk\thgconfig.py:310
msgid "URL Details"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:319
+#: tortoisehg\hgtk\thgconfig.py:321
msgid "Type"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:449
+#: tortoisehg\hgtk\thgconfig.py:451
msgid "Select Local Folder"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:474
+#: tortoisehg\hgtk\thgconfig.py:476
msgid "Alias name is empty"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:475
+#: tortoisehg\hgtk\thgconfig.py:477
msgid "Please enter alias name"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:480 tortoisehg\hgtk\thgconfig.py:830
+#: tortoisehg\hgtk\thgconfig.py:482 tortoisehg\hgtk\thgconfig.py:832
msgid "Overwrite existing '%s' path?"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:538
+#: tortoisehg\hgtk\thgconfig.py:540
msgid "No repository found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:539
+#: tortoisehg\hgtk\thgconfig.py:541
msgid "no repo at "
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:548
+#: tortoisehg\hgtk\thgconfig.py:550
msgid "Iniparse package not found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:549
+#: tortoisehg\hgtk\thgconfig.py:551
msgid ""
"Please install iniparse package\n"
"Settings are only shown, no changing is possible"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:560
+#: tortoisehg\hgtk\thgconfig.py:562
msgid "User global settings"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:562
+#: tortoisehg\hgtk\thgconfig.py:564
msgid "%s repository settings"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:567
+#: tortoisehg\hgtk\thgconfig.py:569
msgid "Edit File"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:590
+#: tortoisehg\hgtk\thgconfig.py:592
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
+#: tortoisehg\hgtk\thgconfig.py:606
msgid "Sync"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:608
+#: tortoisehg\hgtk\thgconfig.py:610
msgid "Web"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:611
+#: tortoisehg\hgtk\thgconfig.py:613
msgid "Proxy"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:617
+#: tortoisehg\hgtk\thgconfig.py:619
msgid "Diff"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:630
+#: tortoisehg\hgtk\thgconfig.py:632
msgid "Unapplied changes"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:631
+#: tortoisehg\hgtk\thgconfig.py:633
msgid "Lose changes and switch files?."
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:650
+#: tortoisehg\hgtk\thgconfig.py:652
msgid "TortoiseHg Configure Repository - "
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:654
+#: tortoisehg\hgtk\thgconfig.py:656
msgid "TortoiseHg Configure User-Global Settings"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:711
+#: tortoisehg\hgtk\thgconfig.py:713
msgid "Exit after saving changes?"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:712
+#: tortoisehg\hgtk\thgconfig.py:714
msgid "&No (discard changes)"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:805
+#: tortoisehg\hgtk\thgconfig.py:807
msgid "No Repository Found"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:806
+#: tortoisehg\hgtk\thgconfig.py:808
msgid "Path testing cannot work without a repository"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:872
+#: tortoisehg\hgtk\thgconfig.py:874
msgid "Remote repository paths"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:894
+#: tortoisehg\hgtk\thgconfig.py:896
msgid "Repository Path"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:908
+#: tortoisehg\hgtk\thgconfig.py:910
msgid "_Edit"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:918
+#: tortoisehg\hgtk\thgconfig.py:920
msgid "_Test"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:923
+#: tortoisehg\hgtk\thgconfig.py:925
msgid "Set as _default"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1009
+#: tortoisehg\hgtk\thgconfig.py:1011
msgid "Suggested"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1019
+#: tortoisehg\hgtk\thgconfig.py:1021
msgid "History"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1057
+#: tortoisehg\hgtk\thgconfig.py:1059
msgid "# Generated by tortoisehg-config\n"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1111
+#: tortoisehg\hgtk\thgconfig.py:1113
msgid "Skipped saving path with no alias"
msgstr ""
-#: tortoisehg\hgtk\thgconfig.py:1139
+#: tortoisehg\hgtk\thgconfig.py:1141
msgid "Unable to write configuration file"
msgstr ""
@@ -4189,67 +4301,89 @@msgid "#"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:271
-msgid "%s of %s Patches applied"
-msgstr ""
-
-#: tortoisehg\hgtk\thgmq.py:274
+#: tortoisehg\hgtk\thgmq.py:268
+msgid "%(count)d of %(total)d Patches applied"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:272
msgid "Patch '%s' applied"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:549
+#: tortoisehg\hgtk\thgmq.py:325
+msgid "Confirm Delete"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:326
+msgid "Do you want to delete?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:327
+msgid "Yes (&keep)"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:409
+msgid "Confirm Fold"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:410
+msgid ""
+"Do you want to fold un-applied patch '%(target)s' into current patch "
+"'%(qtip)s'?"
+msgstr ""
+
+#: tortoisehg\hgtk\thgmq.py:567
msgid "_goto"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:551
+#: tortoisehg\hgtk\thgmq.py:569
msgid "_rename"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:553
+#: tortoisehg\hgtk\thgmq.py:571
msgid "_finish applied"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:555
+#: tortoisehg\hgtk\thgmq.py:573
msgid "_delete"
msgstr "_supprimer"
-#: tortoisehg\hgtk\thgmq.py:556
+#: tortoisehg\hgtk\thgmq.py:574
msgid "delete --keep"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:558
+#: tortoisehg\hgtk\thgmq.py:576
msgid "f_old"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:560
+#: tortoisehg\hgtk\thgmq.py:578
msgid "make it _next"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:594
+#: tortoisehg\hgtk\thgmq.py:612
msgid "Show index"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:595
+#: tortoisehg\hgtk\thgmq.py:613
msgid "Show status"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:596
+#: tortoisehg\hgtk\thgmq.py:614
msgid "Show name"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:597
+#: tortoisehg\hgtk\thgmq.py:615
msgid "Show summary"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:603
+#: tortoisehg\hgtk\thgmq.py:621
msgid "Enable editable cells"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:606
+#: tortoisehg\hgtk\thgmq.py:624
msgid "Show 'qparent'"
msgstr ""
-#: tortoisehg\hgtk\thgmq.py:624
+#: tortoisehg\hgtk\thgmq.py:642
msgid "Succeed"
msgstr ""
@@ -4391,11 +4525,11 @@msgid "Failed to strip"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:402
+#: tortoisehg\hgtk\thgstrip.py:404
msgid "Saved at: %s"
msgstr ""
-#: tortoisehg\hgtk\thgstrip.py:406
+#: tortoisehg\hgtk\thgstrip.py:408
msgid "Open..."
msgstr ""
@@ -4423,10 +4557,6 @@msgid "Parent 2:"
msgstr ""
-#: tortoisehg\hgtk\update.py:103
-msgid "Parent:"
-msgstr ""
-
#: tortoisehg\hgtk\update.py:181
msgid "(same as parent)"
msgstr ""
@@ -4490,87 +4620,87 @@msgid "Failed to update"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:55
+#: tortoisehg\hgtk\visdiff.py:60
msgid "Visual Diffs"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:62
+#: tortoisehg\hgtk\visdiff.py:68
msgid "Temporary files are removed when this dialog is closed"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:80
+#: tortoisehg\hgtk\visdiff.py:86
msgid "Always launch single files"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:107
+#: tortoisehg\hgtk\visdiff.py:101
msgid "No repository"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:108 tortoisehg\hgtk\visdiff.py:300
+#: tortoisehg\hgtk\visdiff.py:102 tortoisehg\hgtk\visdiff.py:373
msgid "No repository found here"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:115
+#: tortoisehg\hgtk\visdiff.py:109
msgid "Select diff tool"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:134
+#: tortoisehg\hgtk\visdiff.py:148
msgid "No visual diff tool"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:135
+#: tortoisehg\hgtk\visdiff.py:149
msgid "No visual diff tool has been configured"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:161
+#: tortoisehg\hgtk\visdiff.py:177
msgid "changeset "
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:166
+#: tortoisehg\hgtk\visdiff.py:183
+msgid "working changes"
+msgstr ""
+
+#: tortoisehg\hgtk\visdiff.py:186
msgid "revisions "
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:168
-msgid "working changes"
-msgstr ""
-
-#: tortoisehg\hgtk\visdiff.py:171
+#: tortoisehg\hgtk\visdiff.py:193
msgid "Visual Diffs - "
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:179 tortoisehg\hgtk\visdiff.py:325
+#: tortoisehg\hgtk\visdiff.py:207 tortoisehg\hgtk\visdiff.py:398
msgid "No file changes"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:180 tortoisehg\hgtk\visdiff.py:326
+#: tortoisehg\hgtk\visdiff.py:208 tortoisehg\hgtk\visdiff.py:399
msgid "There are no file changes to view"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:227
+#: tortoisehg\hgtk\visdiff.py:277
msgid "Unable to delete temp files"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:228
+#: tortoisehg\hgtk\visdiff.py:278
msgid "Close diff tools and try again, or quit to leak files?"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:229
+#: tortoisehg\hgtk\visdiff.py:279
msgid "&Quit"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:229
+#: tortoisehg\hgtk\visdiff.py:279
msgid "Try &Again"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:267
+#: tortoisehg\hgtk\visdiff.py:340
msgid "Tool launch failure"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:268
+#: tortoisehg\hgtk\visdiff.py:341
msgid "%s : %s"
msgstr ""
-#: tortoisehg\hgtk\visdiff.py:307
+#: tortoisehg\hgtk\visdiff.py:380
msgid "Extdiff command not recognized\n"
msgstr ""
@@ -4963,6 +5093,9 @@#~ msgid "View Changelog"
#~ msgstr "Afficher le journal"
+#~ msgid "changeset:"
+#~ msgstr "jeu de révisions:"
+
#~ msgid "show changeset information per file line"
#~ msgstr "montrer les informations du jeu de révisions par ligne du fichier"
@@ -5098,6 +5231,9 @@#~ msgid "user/date:"
#~ msgstr "utilisateur/date"
+#~ msgid "branch:"
+#~ msgstr "branche :"
+
#~ msgid "diff to _local"
#~ msgstr "diff. avec _local"
@@ -5107,6 +5243,15 @@#~ msgid "_view at revision"
#~ msgstr "_voir une version"
+#~ msgid "child:"
+#~ msgstr "enfant :"
+
+#~ msgid "tags:"
+#~ msgstr "labels :"
+
+#~ msgid "parent:"
+#~ msgstr "parent :"
+
#~ msgid "_revert file contents"
#~ msgstr "_revenir sur le fichier original"
@@ -5152,9 +5297,6 @@#~ msgid "_update"
#~ msgstr "mettre à jo_ur"
-#~ msgid "Custom Filter"
-#~ msgstr "Filtre utilisateur"
-
#~ msgid "diff to local"
#~ msgstr "différencier avec la copie locale"
@@ -5242,9 +5384,6 @@#~ 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"
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
Add a tag
Loading...