##// END OF EJS Templates
i18n-fr: translation for the archive command
Cédric Duval -
r9225:a3a22aa6 default
parent child Browse files
Show More
@@ -1,9119 +1,9146 b''
1 # French translations for Mercurial
1 # French translations for Mercurial
2 # Traductions françaises de Mercurial
2 # Traductions françaises de Mercurial
3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
4 #
4 #
5 # Quelques règles :
5 # Quelques règles :
6 # - dans l'aide d'une commande, la première ligne descriptive
6 # - dans l'aide d'une commande, la première ligne descriptive
7 # commence par un verbe au présent sans majuscule
7 # commence par un verbe au présent sans majuscule
8 # - dans l'aide d'une commande, la description des options
8 # - dans l'aide d'une commande, la description des options
9 # utilise un verbe à l'infinitif
9 # utilise un verbe à l'infinitif
10 #
10 #
11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
12 # parfaite. À compléter et à améliorer, particulièrement les
12 # parfaite. À compléter et à améliorer, particulièrement les
13 # termes comportant un point d'interrogation...
13 # termes comportant un point d'interrogation...
14 #
14 #
15 # Dictionnaire de termes courants :
15 # Dictionnaire de termes courants :
16 # - to apply a patch appliquer un patch
16 # - to apply a patch appliquer un patch
17 # - a branch une branche
17 # - a branch une branche
18 # - to check out extraire (terminologie utilisée par svn)
18 # - to check out extraire (terminologie utilisée par svn)
19 # - children des rejetons ? des descendants ?
19 # - children des rejetons ? des descendants ?
20 # - to clone clôner
20 # - to clone clôner
21 # - a conflict un conflit
21 # - a conflict un conflit
22 # - an extension une extension (au sens de module Mercurial)
22 # - an extension une extension (au sens de module Mercurial)
23 # - to fold patches agréger des patchs (replier des patch ?? bof)
23 # - to fold patches agréger des patchs (replier des patch ?? bof)
24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
25 # - a mail un courriel, un courrier électronique
25 # - a mail un courriel, un courrier électronique
26 # - a merge une fusion
26 # - a merge une fusion
27 # - to merge fusionner
27 # - to merge fusionner
28 # - a node un nœud ?
28 # - a node un nœud ?
29 # - a patch queue/stack une pile de patchs (mq)
29 # - a patch queue/stack une pile de patchs (mq)
30 # - à l'utilisation c'est vraiment une _pile_
30 # - à l'utilisation c'est vraiment une _pile_
31 # (on y empile et dépile des patchs)
31 # (on y empile et dépile des patchs)
32 # - l'unique cas où _file_ conviendrait est dans le
32 # - l'unique cas où _file_ conviendrait est dans le
33 # contexte de la commande qfinish
33 # contexte de la commande qfinish
34 # => terme unique de pile pour plus de cohérence
34 # => terme unique de pile pour plus de cohérence
35 # - the patch series la série (complète) de patchs (suite ?)
35 # - the patch series la série (complète) de patchs (suite ?)
36 # - rejects des rejets ? (à propos de l'application d'un
36 # - rejects des rejets ? (à propos de l'application d'un
37 # patch)
37 # patch)
38 # - a repository un dépôt
38 # - a repository un dépôt
39 # - to revert annuler des modifications (ou défaire ?)
39 # - to revert annuler des modifications (ou défaire ?)
40 # - a revision une révision
40 # - a revision une révision
41 # - the topmost patch le dernier patch appliqué
41 # - the topmost patch le dernier patch appliqué
42 # - a tree une arborescence
42 # - a tree une arborescence
43 # - an unrelated repository un dépôt non apparenté
43 # - an unrelated repository un dépôt non apparenté
44 # - unversioned
44 # - unversioned
45 # unmanaged
45 # unmanaged
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
47 # hors révision ?
47 # hors révision ?
48 # - the working directory le répertoire de travail
48 # - the working directory le répertoire de travail
49 #
49 #
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
51 # pour ne pas alourdir inutilement la traduction :
51 # pour ne pas alourdir inutilement la traduction :
52 # - a diff un diff ? (ou également un patch ? synonymes...)
52 # - a diff un diff ? (ou également un patch ? synonymes...)
53 # - a hook un hook
53 # - a hook un hook
54 # - a patch un patch
54 # - a patch un patch
55 # - a tag un tag
55 # - a tag un tag
56 # - to tag taguer
56 # - to tag taguer
57 #
57 #
58 # Termes anglais avec une signification très spécifique, difficile à
58 # Termes anglais avec une signification très spécifique, difficile à
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
60 # - a bundle un \"bundle\"
60 # - a bundle un \"bundle\"
61 # - to bundle créer un \"bundle\" ?
61 # - to bundle créer un \"bundle\" ?
62 # - a changeset un \"changeset\"
62 # - a changeset un \"changeset\"
63 # - a changegroup un \"changegroup\"
63 # - a changegroup un \"changegroup\"
64 # - the tip la révision \"tip\"
64 # - the tip la révision \"tip\"
65 #
65 #
66 # Termes dont le classement / la traduction sont à déterminer :
66 # Termes dont le classement / la traduction sont à déterminer :
67 # - a commit un commit, un \"commit\"
67 # - a commit un commit, un \"commit\"
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
69 # - a guard une \"garde\" ? (une protection ?)
69 # - a guard une \"garde\" ? (une protection ?)
70 # - to guard a patch \"garder\" un patch ?
70 # - to guard a patch \"garder\" un patch ?
71 # - to pull rapatrier des \"changesets\" ? effectuer une
71 # - to pull rapatrier des \"changesets\" ? effectuer une
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
73 # - to push propager ? (utilisé par svn pour commit)
73 # - to push propager ? (utilisé par svn pour commit)
74 # publier ? pousser ?? envoyer ??
74 # publier ? pousser ?? envoyer ??
75 # - the series file (mq) ?
75 # - the series file (mq) ?
76 #
76 #
77 # Notes :
77 # Notes :
78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
82 # de faire le lien avec des termes franglisants parfois utilisés
82 # de faire le lien avec des termes franglisants parfois utilisés
83 # (par ex. fusionner = "merger", etc.) ... ?
83 # (par ex. fusionner = "merger", etc.) ... ?
84 #
84 #
85 msgid ""
85 msgid ""
86 msgstr ""
86 msgstr ""
87 "Project-Id-Version: Mercurial\n"
87 "Project-Id-Version: Mercurial\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
89 "POT-Creation-Date: 2009-07-01 08:41+0200\n"
89 "POT-Creation-Date: 2009-07-01 08:41+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
92 "Language-Team: French\n"
92 "Language-Team: French\n"
93 "MIME-Version: 1.0\n"
93 "MIME-Version: 1.0\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
95 "Content-Transfer-Encoding: 8bit\n"
95 "Content-Transfer-Encoding: 8bit\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
97
97
98 #, python-format
98 #, python-format
99 msgid " (default: %s)"
99 msgid " (default: %s)"
100 msgstr " (défaut: %s)"
100 msgstr " (défaut: %s)"
101
101
102 msgid "OPTIONS"
102 msgid "OPTIONS"
103 msgstr ""
103 msgstr ""
104
104
105 msgid "COMMANDS"
105 msgid "COMMANDS"
106 msgstr ""
106 msgstr ""
107
107
108 msgid " options:\n"
108 msgid " options:\n"
109 msgstr ""
109 msgstr ""
110
110
111 #, python-format
111 #, python-format
112 msgid ""
112 msgid ""
113 " aliases: %s\n"
113 " aliases: %s\n"
114 "\n"
114 "\n"
115 msgstr ""
115 msgstr ""
116
116
117 msgid ""
117 msgid ""
118 "hooks for controlling repository access\n"
118 "hooks for controlling repository access\n"
119 "\n"
119 "\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
121 "of a repository when receiving incoming changesets.\n"
121 "of a repository when receiving incoming changesets.\n"
122 "\n"
122 "\n"
123 "The authorization is matched based on the local user name on the\n"
123 "The authorization is matched based on the local user name on the\n"
124 "system where the hook runs, and not the committer of the original\n"
124 "system where the hook runs, and not the committer of the original\n"
125 "changeset (since the latter is merely informative).\n"
125 "changeset (since the latter is merely informative).\n"
126 "\n"
126 "\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
128 "preventing authenticating users from doing anything other than\n"
128 "preventing authenticating users from doing anything other than\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
130 "interactive shell access, as they can then disable the hook.\n"
130 "interactive shell access, as they can then disable the hook.\n"
131 "Nor is it safe if remote users share an account, because then there\n"
131 "Nor is it safe if remote users share an account, because then there\n"
132 "is no way to distinguish them.\n"
132 "is no way to distinguish them.\n"
133 "\n"
133 "\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
135 "\n"
135 "\n"
136 " [extensions]\n"
136 " [extensions]\n"
137 " hgext.acl =\n"
137 " hgext.acl =\n"
138 "\n"
138 "\n"
139 " [hooks]\n"
139 " [hooks]\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
141 "\n"
141 "\n"
142 " [acl]\n"
142 " [acl]\n"
143 " # Check whether the source of incoming changes is in this list\n"
143 " # Check whether the source of incoming changes is in this list\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
145 " sources = serve\n"
145 " sources = serve\n"
146 "\n"
146 "\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
148 "glob syntax by default), and a comma separated list of users as\n"
148 "glob syntax by default), and a comma separated list of users as\n"
149 "the corresponding value. The deny list is checked before the allow\n"
149 "the corresponding value. The deny list is checked before the allow\n"
150 "list is.\n"
150 "list is.\n"
151 "\n"
151 "\n"
152 " [acl.allow]\n"
152 " [acl.allow]\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
154 " # An empty acl.allow section means no users allowed.\n"
154 " # An empty acl.allow section means no users allowed.\n"
155 " docs/** = doc_writer\n"
155 " docs/** = doc_writer\n"
156 " .hgtags = release_engineer\n"
156 " .hgtags = release_engineer\n"
157 "\n"
157 "\n"
158 " [acl.deny]\n"
158 " [acl.deny]\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
160 " # An empty acl.deny section means all users allowed.\n"
160 " # An empty acl.deny section means all users allowed.\n"
161 " glob pattern = user4, user5\n"
161 " glob pattern = user4, user5\n"
162 " ** = user6\n"
162 " ** = user6\n"
163 msgstr ""
163 msgstr ""
164
164
165 #, python-format
165 #, python-format
166 msgid "acl: %s not enabled\n"
166 msgid "acl: %s not enabled\n"
167 msgstr ""
167 msgstr ""
168
168
169 #, python-format
169 #, python-format
170 msgid "acl: %s enabled, %d entries for user %s\n"
170 msgid "acl: %s enabled, %d entries for user %s\n"
171 msgstr ""
171 msgstr ""
172
172
173 #, python-format
173 #, python-format
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
175 msgstr ""
175 msgstr ""
176
176
177 #, python-format
177 #, python-format
178 msgid "acl: changes have source \"%s\" - skipping\n"
178 msgid "acl: changes have source \"%s\" - skipping\n"
179 msgstr ""
179 msgstr ""
180
180
181 #, python-format
181 #, python-format
182 msgid "acl: user %s denied on %s\n"
182 msgid "acl: user %s denied on %s\n"
183 msgstr ""
183 msgstr ""
184
184
185 #, python-format
185 #, python-format
186 msgid "acl: access denied for changeset %s"
186 msgid "acl: access denied for changeset %s"
187 msgstr ""
187 msgstr ""
188
188
189 #, python-format
189 #, python-format
190 msgid "acl: user %s not allowed on %s\n"
190 msgid "acl: user %s not allowed on %s\n"
191 msgstr ""
191 msgstr ""
192
192
193 #, python-format
193 #, python-format
194 msgid "acl: allowing changeset %s\n"
194 msgid "acl: allowing changeset %s\n"
195 msgstr ""
195 msgstr ""
196
196
197 msgid ""
197 msgid ""
198 "track a line of development with movable markers\n"
198 "track a line of development with movable markers\n"
199 "\n"
199 "\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
201 "points to a changeset identified by its hash. If you commit a\n"
201 "points to a changeset identified by its hash. If you commit a\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
203 "the bookmark shifts to the new changeset.\n"
203 "the bookmark shifts to the new changeset.\n"
204 "\n"
204 "\n"
205 "It is possible to use bookmark names in every revision lookup\n"
205 "It is possible to use bookmark names in every revision lookup\n"
206 "(e.g. hg merge, hg update).\n"
206 "(e.g. hg merge, hg update).\n"
207 "\n"
207 "\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
209 "will all move forward together. It is possible to obtain a more\n"
209 "will all move forward together. It is possible to obtain a more\n"
210 "git-like experience by adding the following configuration option to\n"
210 "git-like experience by adding the following configuration option to\n"
211 "your .hgrc:\n"
211 "your .hgrc:\n"
212 "\n"
212 "\n"
213 " [bookmarks]\n"
213 " [bookmarks]\n"
214 " track.current = True\n"
214 " track.current = True\n"
215 "\n"
215 "\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
217 "using, and only update it. This is similar to git's approach to\n"
217 "using, and only update it. This is similar to git's approach to\n"
218 "branching.\n"
218 "branching.\n"
219 msgstr ""
219 msgstr ""
220
220
221 msgid ""
221 msgid ""
222 "track a line of development with movable markers\n"
222 "track a line of development with movable markers\n"
223 "\n"
223 "\n"
224 " Bookmarks are pointers to certain commits that move when\n"
224 " Bookmarks are pointers to certain commits that move when\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
228 "\n"
228 "\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
230 " directory's parent revision with the given name. If you specify\n"
230 " directory's parent revision with the given name. If you specify\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
232 " the bookmark is assigned to that revision.\n"
232 " the bookmark is assigned to that revision.\n"
233 " "
233 " "
234 msgstr ""
234 msgstr ""
235
235
236 msgid "a bookmark of this name does not exist"
236 msgid "a bookmark of this name does not exist"
237 msgstr ""
237 msgstr ""
238
238
239 msgid "a bookmark of the same name already exists"
239 msgid "a bookmark of the same name already exists"
240 msgstr ""
240 msgstr ""
241
241
242 msgid "new bookmark name required"
242 msgid "new bookmark name required"
243 msgstr ""
243 msgstr ""
244
244
245 msgid "bookmark name required"
245 msgid "bookmark name required"
246 msgstr ""
246 msgstr ""
247
247
248 msgid "bookmark name cannot contain newlines"
248 msgid "bookmark name cannot contain newlines"
249 msgstr ""
249 msgstr ""
250
250
251 msgid "a bookmark cannot have the name of an existing branch"
251 msgid "a bookmark cannot have the name of an existing branch"
252 msgstr ""
252 msgstr ""
253
253
254 msgid "force"
254 msgid "force"
255 msgstr ""
255 msgstr ""
256
256
257 msgid "revision"
257 msgid "revision"
258 msgstr ""
258 msgstr ""
259
259
260 msgid "delete a given bookmark"
260 msgid "delete a given bookmark"
261 msgstr ""
261 msgstr ""
262
262
263 msgid "rename a given bookmark"
263 msgid "rename a given bookmark"
264 msgstr ""
264 msgstr ""
265
265
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
267 msgstr ""
267 msgstr ""
268
268
269 msgid ""
269 msgid ""
270 "hooks for integrating with the Bugzilla bug tracker\n"
270 "hooks for integrating with the Bugzilla bug tracker\n"
271 "\n"
271 "\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
274 "bug status.\n"
274 "bug status.\n"
275 "\n"
275 "\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
277 "installations using MySQL are supported.\n"
277 "installations using MySQL are supported.\n"
278 "\n"
278 "\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
280 "emails. That script changes between Bugzilla versions; the\n"
280 "emails. That script changes between Bugzilla versions; the\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
285 "\n"
285 "\n"
286 "Configuring the extension:\n"
286 "Configuring the extension:\n"
287 "\n"
287 "\n"
288 " [bugzilla]\n"
288 " [bugzilla]\n"
289 "\n"
289 "\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
291 " database.\n"
291 " database.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
294 " password Password to use to access MySQL server.\n"
294 " password Password to use to access MySQL server.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
298 " and '2.16' for versions prior to 2.18.\n"
298 " and '2.16' for versions prior to 2.18.\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
302 " Default '/var/www/html/bugzilla'.\n"
302 " Default '/var/www/html/bugzilla'.\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
304 " notification emails. Substitutes from a map with 3\n"
304 " notification emails. Substitutes from a map with 3\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
308 " %(id)s %(user)s\".\n"
308 " %(id)s %(user)s\".\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
310 " message. Must contain one \"()\" group. The default\n"
310 " message. Must contain one \"()\" group. The default\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
313 " variations thereof. Matching is case insensitive.\n"
313 " variations thereof. Matching is case insensitive.\n"
314 " style The style file to use when formatting comments.\n"
314 " style The style file to use when formatting comments.\n"
315 " template Template to use when formatting comments. Overrides\n"
315 " template Template to use when formatting comments. Overrides\n"
316 " style if specified. In addition to the usual Mercurial\n"
316 " style if specified. In addition to the usual Mercurial\n"
317 " keywords, the extension specifies:\n"
317 " keywords, the extension specifies:\n"
318 " {bug} The Bugzilla bug ID.\n"
318 " {bug} The Bugzilla bug ID.\n"
319 " {root} The full pathname of the Mercurial\n"
319 " {root} The full pathname of the Mercurial\n"
320 " repository.\n"
320 " repository.\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
322 " repository.\n"
322 " repository.\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
324 " repositories.\n"
324 " repositories.\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
327 " strip The number of slashes to strip from the front of {root}\n"
327 " strip The number of slashes to strip from the front of {root}\n"
328 " to produce {webroot}. Default 0.\n"
328 " to produce {webroot}. Default 0.\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
331 " should contain one mapping per line,\n"
331 " should contain one mapping per line,\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
333 " section.\n"
333 " section.\n"
334 "\n"
334 "\n"
335 " [usermap]\n"
335 " [usermap]\n"
336 " Any entries in this section specify mappings of Mercurial\n"
336 " Any entries in this section specify mappings of Mercurial\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
338 " \"committer\"=\"Bugzilla user\"\n"
338 " \"committer\"=\"Bugzilla user\"\n"
339 "\n"
339 "\n"
340 " [web]\n"
340 " [web]\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
342 " from templates as {hgweb}.\n"
342 " from templates as {hgweb}.\n"
343 "\n"
343 "\n"
344 "Activating the extension:\n"
344 "Activating the extension:\n"
345 "\n"
345 "\n"
346 " [extensions]\n"
346 " [extensions]\n"
347 " hgext.bugzilla =\n"
347 " hgext.bugzilla =\n"
348 "\n"
348 "\n"
349 " [hooks]\n"
349 " [hooks]\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
352 "\n"
352 "\n"
353 "Example configuration:\n"
353 "Example configuration:\n"
354 "\n"
354 "\n"
355 "This example configuration is for a collection of Mercurial\n"
355 "This example configuration is for a collection of Mercurial\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
357 "installation in /opt/bugzilla-3.2.\n"
357 "installation in /opt/bugzilla-3.2.\n"
358 "\n"
358 "\n"
359 " [bugzilla]\n"
359 " [bugzilla]\n"
360 " host=localhost\n"
360 " host=localhost\n"
361 " password=XYZZY\n"
361 " password=XYZZY\n"
362 " version=3.0\n"
362 " version=3.0\n"
363 " bzuser=unknown@domain.com\n"
363 " bzuser=unknown@domain.com\n"
364 " bzdir=/opt/bugzilla-3.2\n"
364 " bzdir=/opt/bugzilla-3.2\n"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
367 " strip=5\n"
367 " strip=5\n"
368 "\n"
368 "\n"
369 " [web]\n"
369 " [web]\n"
370 " baseurl=http://dev.domain.com/hg\n"
370 " baseurl=http://dev.domain.com/hg\n"
371 "\n"
371 "\n"
372 " [usermap]\n"
372 " [usermap]\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
374 "\n"
374 "\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
376 "\n"
376 "\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
379 "\n"
379 "\n"
380 " Changeset commit comment. Bug 1234.\n"
380 " Changeset commit comment. Bug 1234.\n"
381 msgstr ""
381 msgstr ""
382
382
383 #, python-format
383 #, python-format
384 msgid "connecting to %s:%s as %s, password %s\n"
384 msgid "connecting to %s:%s as %s, password %s\n"
385 msgstr ""
385 msgstr ""
386
386
387 #, python-format
387 #, python-format
388 msgid "query: %s %s\n"
388 msgid "query: %s %s\n"
389 msgstr ""
389 msgstr ""
390
390
391 #, python-format
391 #, python-format
392 msgid "failed query: %s %s\n"
392 msgid "failed query: %s %s\n"
393 msgstr ""
393 msgstr ""
394
394
395 msgid "unknown database schema"
395 msgid "unknown database schema"
396 msgstr ""
396 msgstr ""
397
397
398 #, python-format
398 #, python-format
399 msgid "bug %d already knows about changeset %s\n"
399 msgid "bug %d already knows about changeset %s\n"
400 msgstr ""
400 msgstr ""
401
401
402 msgid "telling bugzilla to send mail:\n"
402 msgid "telling bugzilla to send mail:\n"
403 msgstr ""
403 msgstr ""
404
404
405 #, python-format
405 #, python-format
406 msgid " bug %s\n"
406 msgid " bug %s\n"
407 msgstr ""
407 msgstr ""
408
408
409 #, python-format
409 #, python-format
410 msgid "running notify command %s\n"
410 msgid "running notify command %s\n"
411 msgstr ""
411 msgstr ""
412
412
413 #, python-format
413 #, python-format
414 msgid "bugzilla notify command %s"
414 msgid "bugzilla notify command %s"
415 msgstr ""
415 msgstr ""
416
416
417 msgid "done\n"
417 msgid "done\n"
418 msgstr "effectué\n"
418 msgstr "effectué\n"
419
419
420 #, python-format
420 #, python-format
421 msgid "looking up user %s\n"
421 msgid "looking up user %s\n"
422 msgstr ""
422 msgstr ""
423
423
424 #, python-format
424 #, python-format
425 msgid "cannot find bugzilla user id for %s"
425 msgid "cannot find bugzilla user id for %s"
426 msgstr ""
426 msgstr ""
427
427
428 #, python-format
428 #, python-format
429 msgid "cannot find bugzilla user id for %s or %s"
429 msgid "cannot find bugzilla user id for %s or %s"
430 msgstr ""
430 msgstr ""
431
431
432 #, python-format
432 #, python-format
433 msgid "bugzilla version %s not supported"
433 msgid "bugzilla version %s not supported"
434 msgstr ""
434 msgstr ""
435
435
436 msgid ""
436 msgid ""
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
438 "details:\n"
438 "details:\n"
439 "\t{desc|tabindent}"
439 "\t{desc|tabindent}"
440 msgstr ""
440 msgstr ""
441
441
442 #, python-format
442 #, python-format
443 msgid "python mysql support not available: %s"
443 msgid "python mysql support not available: %s"
444 msgstr ""
444 msgstr ""
445
445
446 #, python-format
446 #, python-format
447 msgid "hook type %s does not pass a changeset id"
447 msgid "hook type %s does not pass a changeset id"
448 msgstr ""
448 msgstr ""
449
449
450 #, python-format
450 #, python-format
451 msgid "database error: %s"
451 msgid "database error: %s"
452 msgstr ""
452 msgstr ""
453
453
454 msgid "command to display child changesets"
454 msgid "command to display child changesets"
455 msgstr ""
455 msgstr ""
456
456
457 msgid ""
457 msgid ""
458 "show the children of the given or working directory revision\n"
458 "show the children of the given or working directory revision\n"
459 "\n"
459 "\n"
460 " Print the children of the working directory's revisions. If a\n"
460 " Print the children of the working directory's revisions. If a\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
462 " be printed. If a file argument is given, revision in which the\n"
462 " be printed. If a file argument is given, revision in which the\n"
463 " file was last changed (after the working directory revision or the\n"
463 " file was last changed (after the working directory revision or the\n"
464 " argument to --rev if given) is printed.\n"
464 " argument to --rev if given) is printed.\n"
465 " "
465 " "
466 msgstr ""
466 msgstr ""
467
467
468 msgid "show children of the specified revision"
468 msgid "show children of the specified revision"
469 msgstr ""
469 msgstr ""
470
470
471 msgid "hg children [-r REV] [FILE]"
471 msgid "hg children [-r REV] [FILE]"
472 msgstr ""
472 msgstr ""
473
473
474 msgid "command to display statistics about repository history"
474 msgid "command to display statistics about repository history"
475 msgstr ""
475 msgstr ""
476
476
477 #, python-format
477 #, python-format
478 msgid "Revision %d is a merge, ignoring...\n"
478 msgid "Revision %d is a merge, ignoring...\n"
479 msgstr ""
479 msgstr ""
480
480
481 #, python-format
481 #, python-format
482 msgid "generating stats: %d%%"
482 msgid "generating stats: %d%%"
483 msgstr ""
483 msgstr ""
484
484
485 msgid ""
485 msgid ""
486 "histogram of changes to the repository\n"
486 "histogram of changes to the repository\n"
487 "\n"
487 "\n"
488 " This command will display a histogram representing the number\n"
488 " This command will display a histogram representing the number\n"
489 " of changed lines or revisions, grouped according to the given\n"
489 " of changed lines or revisions, grouped according to the given\n"
490 " template. The default template will group changes by author.\n"
490 " template. The default template will group changes by author.\n"
491 " The --dateformat option may be used to group the results by\n"
491 " The --dateformat option may be used to group the results by\n"
492 " date instead.\n"
492 " date instead.\n"
493 "\n"
493 "\n"
494 " Statistics are based on the number of changed lines, or\n"
494 " Statistics are based on the number of changed lines, or\n"
495 " alternatively the number of matching revisions if the\n"
495 " alternatively the number of matching revisions if the\n"
496 " --changesets option is specified.\n"
496 " --changesets option is specified.\n"
497 "\n"
497 "\n"
498 " Examples:\n"
498 " Examples:\n"
499 "\n"
499 "\n"
500 " # display count of changed lines for every committer\n"
500 " # display count of changed lines for every committer\n"
501 " hg churn -t '{author|email}'\n"
501 " hg churn -t '{author|email}'\n"
502 "\n"
502 "\n"
503 " # display daily activity graph\n"
503 " # display daily activity graph\n"
504 " hg churn -f '%H' -s -c\n"
504 " hg churn -f '%H' -s -c\n"
505 "\n"
505 "\n"
506 " # display activity of developers by month\n"
506 " # display activity of developers by month\n"
507 " hg churn -f '%Y-%m' -s -c\n"
507 " hg churn -f '%Y-%m' -s -c\n"
508 "\n"
508 "\n"
509 " # display count of lines changed in every year\n"
509 " # display count of lines changed in every year\n"
510 " hg churn -f '%Y' -s\n"
510 " hg churn -f '%Y' -s\n"
511 "\n"
511 "\n"
512 " It is possible to map alternate email addresses to a main address\n"
512 " It is possible to map alternate email addresses to a main address\n"
513 " by providing a file using the following format:\n"
513 " by providing a file using the following format:\n"
514 "\n"
514 "\n"
515 " <alias email> <actual email>\n"
515 " <alias email> <actual email>\n"
516 "\n"
516 "\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
519 " "
519 " "
520 msgstr ""
520 msgstr ""
521
521
522 #, python-format
522 #, python-format
523 msgid "assuming %i character terminal\n"
523 msgid "assuming %i character terminal\n"
524 msgstr ""
524 msgstr ""
525
525
526 msgid "count rate for the specified revision or range"
526 msgid "count rate for the specified revision or range"
527 msgstr ""
527 msgstr ""
528
528
529 msgid "count rate for revisions matching date spec"
529 msgid "count rate for revisions matching date spec"
530 msgstr ""
530 msgstr ""
531
531
532 msgid "template to group changesets"
532 msgid "template to group changesets"
533 msgstr ""
533 msgstr ""
534
534
535 msgid "strftime-compatible format for grouping by date"
535 msgid "strftime-compatible format for grouping by date"
536 msgstr ""
536 msgstr ""
537
537
538 msgid "count rate by number of changesets"
538 msgid "count rate by number of changesets"
539 msgstr ""
539 msgstr ""
540
540
541 msgid "sort by key (default: sort by count)"
541 msgid "sort by key (default: sort by count)"
542 msgstr ""
542 msgstr ""
543
543
544 msgid "file with email aliases"
544 msgid "file with email aliases"
545 msgstr ""
545 msgstr ""
546
546
547 msgid "show progress"
547 msgid "show progress"
548 msgstr ""
548 msgstr ""
549
549
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
551 msgstr ""
551 msgstr ""
552
552
553 msgid ""
553 msgid ""
554 "colorize output from some commands\n"
554 "colorize output from some commands\n"
555 "\n"
555 "\n"
556 "This extension modifies the status command to add color to its output\n"
556 "This extension modifies the status command to add color to its output\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
560 "whitespace.\n"
560 "whitespace.\n"
561 "\n"
561 "\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
565 "render_text function, which can be used to add effects to any text.\n"
565 "render_text function, which can be used to add effects to any text.\n"
566 "\n"
566 "\n"
567 "Default effects may be overridden from the .hgrc file:\n"
567 "Default effects may be overridden from the .hgrc file:\n"
568 "\n"
568 "\n"
569 "[color]\n"
569 "[color]\n"
570 "status.modified = blue bold underline red_background\n"
570 "status.modified = blue bold underline red_background\n"
571 "status.added = green bold\n"
571 "status.added = green bold\n"
572 "status.removed = red bold blue_background\n"
572 "status.removed = red bold blue_background\n"
573 "status.deleted = cyan bold underline\n"
573 "status.deleted = cyan bold underline\n"
574 "status.unknown = magenta bold underline\n"
574 "status.unknown = magenta bold underline\n"
575 "status.ignored = black bold\n"
575 "status.ignored = black bold\n"
576 "\n"
576 "\n"
577 "# 'none' turns off all effects\n"
577 "# 'none' turns off all effects\n"
578 "status.clean = none\n"
578 "status.clean = none\n"
579 "status.copied = none\n"
579 "status.copied = none\n"
580 "\n"
580 "\n"
581 "qseries.applied = blue bold underline\n"
581 "qseries.applied = blue bold underline\n"
582 "qseries.unapplied = black bold\n"
582 "qseries.unapplied = black bold\n"
583 "qseries.missing = red bold\n"
583 "qseries.missing = red bold\n"
584 "\n"
584 "\n"
585 "diff.diffline = bold\n"
585 "diff.diffline = bold\n"
586 "diff.extended = cyan bold\n"
586 "diff.extended = cyan bold\n"
587 "diff.file_a = red bold\n"
587 "diff.file_a = red bold\n"
588 "diff.file_b = green bold\n"
588 "diff.file_b = green bold\n"
589 "diff.hunk = magenta\n"
589 "diff.hunk = magenta\n"
590 "diff.deleted = red\n"
590 "diff.deleted = red\n"
591 "diff.inserted = green\n"
591 "diff.inserted = green\n"
592 "diff.changed = white\n"
592 "diff.changed = white\n"
593 "diff.trailingwhitespace = bold red_background\n"
593 "diff.trailingwhitespace = bold red_background\n"
594 msgstr ""
594 msgstr ""
595
595
596 msgid "when to colorize (always, auto, or never)"
596 msgid "when to colorize (always, auto, or never)"
597 msgstr ""
597 msgstr ""
598
598
599 msgid "don't colorize output"
599 msgid "don't colorize output"
600 msgstr ""
600 msgstr ""
601
601
602 #, python-format
602 #, python-format
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
604 msgstr ""
604 msgstr ""
605
605
606 msgid "import revisions from foreign VCS repositories into Mercurial"
606 msgid "import revisions from foreign VCS repositories into Mercurial"
607 msgstr ""
607 msgstr ""
608
608
609 msgid ""
609 msgid ""
610 "convert a foreign SCM repository to a Mercurial one.\n"
610 "convert a foreign SCM repository to a Mercurial one.\n"
611 "\n"
611 "\n"
612 " Accepted source formats [identifiers]:\n"
612 " Accepted source formats [identifiers]:\n"
613 " - Mercurial [hg]\n"
613 " - Mercurial [hg]\n"
614 " - CVS [cvs]\n"
614 " - CVS [cvs]\n"
615 " - Darcs [darcs]\n"
615 " - Darcs [darcs]\n"
616 " - git [git]\n"
616 " - git [git]\n"
617 " - Subversion [svn]\n"
617 " - Subversion [svn]\n"
618 " - Monotone [mtn]\n"
618 " - Monotone [mtn]\n"
619 " - GNU Arch [gnuarch]\n"
619 " - GNU Arch [gnuarch]\n"
620 " - Bazaar [bzr]\n"
620 " - Bazaar [bzr]\n"
621 " - Perforce [p4]\n"
621 " - Perforce [p4]\n"
622 "\n"
622 "\n"
623 " Accepted destination formats [identifiers]:\n"
623 " Accepted destination formats [identifiers]:\n"
624 " - Mercurial [hg]\n"
624 " - Mercurial [hg]\n"
625 " - Subversion [svn] (history on branches is not preserved)\n"
625 " - Subversion [svn] (history on branches is not preserved)\n"
626 "\n"
626 "\n"
627 " If no revision is given, all revisions will be converted.\n"
627 " If no revision is given, all revisions will be converted.\n"
628 " Otherwise, convert will only import up to the named revision\n"
628 " Otherwise, convert will only import up to the named revision\n"
629 " (given in a format understood by the source).\n"
629 " (given in a format understood by the source).\n"
630 "\n"
630 "\n"
631 " If no destination directory name is specified, it defaults to the\n"
631 " If no destination directory name is specified, it defaults to the\n"
632 " basename of the source with '-hg' appended. If the destination\n"
632 " basename of the source with '-hg' appended. If the destination\n"
633 " repository doesn't exist, it will be created.\n"
633 " repository doesn't exist, it will be created.\n"
634 "\n"
634 "\n"
635 " By default, all sources except Mercurial will use\n"
635 " By default, all sources except Mercurial will use\n"
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
637 " revision numbers order. Sort modes have the following effects:\n"
637 " revision numbers order. Sort modes have the following effects:\n"
638 " --branchsort: convert from parent to child revision when\n"
638 " --branchsort: convert from parent to child revision when\n"
639 " possible, which means branches are usually converted one after\n"
639 " possible, which means branches are usually converted one after\n"
640 " the other. It generates more compact repositories.\n"
640 " the other. It generates more compact repositories.\n"
641 " --datesort: sort revisions by date. Converted repositories have\n"
641 " --datesort: sort revisions by date. Converted repositories have\n"
642 " good-looking changelogs but are often an order of magnitude\n"
642 " good-looking changelogs but are often an order of magnitude\n"
643 " larger than the same ones generated by --branchsort.\n"
643 " larger than the same ones generated by --branchsort.\n"
644 " --sourcesort: try to preserve source revisions order, only\n"
644 " --sourcesort: try to preserve source revisions order, only\n"
645 " supported by Mercurial sources.\n"
645 " supported by Mercurial sources.\n"
646 "\n"
646 "\n"
647 " If <REVMAP> isn't given, it will be put in a default location\n"
647 " If <REVMAP> isn't given, it will be put in a default location\n"
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
649 " that maps each source commit ID to the destination ID for that\n"
649 " that maps each source commit ID to the destination ID for that\n"
650 " revision, like so:\n"
650 " revision, like so:\n"
651 " <source ID> <destination ID>\n"
651 " <source ID> <destination ID>\n"
652 "\n"
652 "\n"
653 " If the file doesn't exist, it's automatically created. It's\n"
653 " If the file doesn't exist, it's automatically created. It's\n"
654 " updated on each commit copied, so convert-repo can be interrupted\n"
654 " updated on each commit copied, so convert-repo can be interrupted\n"
655 " and can be run repeatedly to copy new commits.\n"
655 " and can be run repeatedly to copy new commits.\n"
656 "\n"
656 "\n"
657 " The [username mapping] file is a simple text file that maps each\n"
657 " The [username mapping] file is a simple text file that maps each\n"
658 " source commit author to a destination commit author. It is handy\n"
658 " source commit author to a destination commit author. It is handy\n"
659 " for source SCMs that use unix logins to identify authors (eg:\n"
659 " for source SCMs that use unix logins to identify authors (eg:\n"
660 " CVS). One line per author mapping and the line format is:\n"
660 " CVS). One line per author mapping and the line format is:\n"
661 " srcauthor=whatever string you want\n"
661 " srcauthor=whatever string you want\n"
662 "\n"
662 "\n"
663 " The filemap is a file that allows filtering and remapping of files\n"
663 " The filemap is a file that allows filtering and remapping of files\n"
664 " and directories. Comment lines start with '#'. Each line can\n"
664 " and directories. Comment lines start with '#'. Each line can\n"
665 " contain one of the following directives:\n"
665 " contain one of the following directives:\n"
666 "\n"
666 "\n"
667 " include path/to/file\n"
667 " include path/to/file\n"
668 "\n"
668 "\n"
669 " exclude path/to/file\n"
669 " exclude path/to/file\n"
670 "\n"
670 "\n"
671 " rename from/file to/file\n"
671 " rename from/file to/file\n"
672 "\n"
672 "\n"
673 " The 'include' directive causes a file, or all files under a\n"
673 " The 'include' directive causes a file, or all files under a\n"
674 " directory, to be included in the destination repository, and the\n"
674 " directory, to be included in the destination repository, and the\n"
675 " exclusion of all other files and directories not explicitly included.\n"
675 " exclusion of all other files and directories not explicitly included.\n"
676 " The 'exclude' directive causes files or directories to be omitted.\n"
676 " The 'exclude' directive causes files or directories to be omitted.\n"
677 " The 'rename' directive renames a file or directory. To rename from\n"
677 " The 'rename' directive renames a file or directory. To rename from\n"
678 " a subdirectory into the root of the repository, use '.' as the\n"
678 " a subdirectory into the root of the repository, use '.' as the\n"
679 " path to rename to.\n"
679 " path to rename to.\n"
680 "\n"
680 "\n"
681 " The splicemap is a file that allows insertion of synthetic\n"
681 " The splicemap is a file that allows insertion of synthetic\n"
682 " history, letting you specify the parents of a revision. This is\n"
682 " history, letting you specify the parents of a revision. This is\n"
683 " useful if you want to e.g. give a Subversion merge two parents, or\n"
683 " useful if you want to e.g. give a Subversion merge two parents, or\n"
684 " graft two disconnected series of history together. Each entry\n"
684 " graft two disconnected series of history together. Each entry\n"
685 " contains a key, followed by a space, followed by one or two\n"
685 " contains a key, followed by a space, followed by one or two\n"
686 " comma-separated values. The key is the revision ID in the source\n"
686 " comma-separated values. The key is the revision ID in the source\n"
687 " revision control system whose parents should be modified (same\n"
687 " revision control system whose parents should be modified (same\n"
688 " format as a key in .hg/shamap). The values are the revision IDs\n"
688 " format as a key in .hg/shamap). The values are the revision IDs\n"
689 " (in either the source or destination revision control system) that\n"
689 " (in either the source or destination revision control system) that\n"
690 " should be used as the new parents for that node.\n"
690 " should be used as the new parents for that node.\n"
691 "\n"
691 "\n"
692 " The branchmap is a file that allows you to rename a branch when it is\n"
692 " The branchmap is a file that allows you to rename a branch when it is\n"
693 " being brought in from whatever external repository. When used in\n"
693 " being brought in from whatever external repository. When used in\n"
694 " conjunction with a splicemap, it allows for a powerful combination\n"
694 " conjunction with a splicemap, it allows for a powerful combination\n"
695 " to help fix even the most badly mismanaged repositories and turn them\n"
695 " to help fix even the most badly mismanaged repositories and turn them\n"
696 " into nicely structured Mercurial repositories. The branchmap contains\n"
696 " into nicely structured Mercurial repositories. The branchmap contains\n"
697 " lines of the form \"original_branch_name new_branch_name\".\n"
697 " lines of the form \"original_branch_name new_branch_name\".\n"
698 " \"original_branch_name\" is the name of the branch in the source\n"
698 " \"original_branch_name\" is the name of the branch in the source\n"
699 " repository, and \"new_branch_name\" is the name of the branch is the\n"
699 " repository, and \"new_branch_name\" is the name of the branch is the\n"
700 " destination repository. This can be used to (for instance) move code\n"
700 " destination repository. This can be used to (for instance) move code\n"
701 " in one repository from \"default\" to a named branch.\n"
701 " in one repository from \"default\" to a named branch.\n"
702 "\n"
702 "\n"
703 " Mercurial Source\n"
703 " Mercurial Source\n"
704 " -----------------\n"
704 " -----------------\n"
705 "\n"
705 "\n"
706 " --config convert.hg.ignoreerrors=False (boolean)\n"
706 " --config convert.hg.ignoreerrors=False (boolean)\n"
707 " ignore integrity errors when reading. Use it to fix Mercurial\n"
707 " ignore integrity errors when reading. Use it to fix Mercurial\n"
708 " repositories with missing revlogs, by converting from and to\n"
708 " repositories with missing revlogs, by converting from and to\n"
709 " Mercurial.\n"
709 " Mercurial.\n"
710 " --config convert.hg.saverev=False (boolean)\n"
710 " --config convert.hg.saverev=False (boolean)\n"
711 " store original revision ID in changeset (forces target IDs to\n"
711 " store original revision ID in changeset (forces target IDs to\n"
712 " change)\n"
712 " change)\n"
713 " --config convert.hg.startrev=0 (hg revision identifier)\n"
713 " --config convert.hg.startrev=0 (hg revision identifier)\n"
714 " convert start revision and its descendants\n"
714 " convert start revision and its descendants\n"
715 "\n"
715 "\n"
716 " CVS Source\n"
716 " CVS Source\n"
717 " ----------\n"
717 " ----------\n"
718 "\n"
718 "\n"
719 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
719 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
720 " to indicate the starting point of what will be converted. Direct\n"
720 " to indicate the starting point of what will be converted. Direct\n"
721 " access to the repository files is not needed, unless of course the\n"
721 " access to the repository files is not needed, unless of course the\n"
722 " repository is :local:. The conversion uses the top level directory\n"
722 " repository is :local:. The conversion uses the top level directory\n"
723 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
723 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
724 " commands to find files to convert. This means that unless a\n"
724 " commands to find files to convert. This means that unless a\n"
725 " filemap is given, all files under the starting directory will be\n"
725 " filemap is given, all files under the starting directory will be\n"
726 " converted, and that any directory reorganization in the CVS\n"
726 " converted, and that any directory reorganization in the CVS\n"
727 " sandbox is ignored.\n"
727 " sandbox is ignored.\n"
728 "\n"
728 "\n"
729 " Because CVS does not have changesets, it is necessary to collect\n"
729 " Because CVS does not have changesets, it is necessary to collect\n"
730 " individual commits to CVS and merge them into changesets. CVS\n"
730 " individual commits to CVS and merge them into changesets. CVS\n"
731 " source uses its internal changeset merging code by default but can\n"
731 " source uses its internal changeset merging code by default but can\n"
732 " be configured to call the external 'cvsps' program by setting:\n"
732 " be configured to call the external 'cvsps' program by setting:\n"
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
734 " This option is deprecated and will be removed in Mercurial 1.4.\n"
734 " This option is deprecated and will be removed in Mercurial 1.4.\n"
735 "\n"
735 "\n"
736 " The options shown are the defaults.\n"
736 " The options shown are the defaults.\n"
737 "\n"
737 "\n"
738 " Internal cvsps is selected by setting\n"
738 " Internal cvsps is selected by setting\n"
739 " --config convert.cvsps=builtin\n"
739 " --config convert.cvsps=builtin\n"
740 " and has a few more configurable options:\n"
740 " and has a few more configurable options:\n"
741 " --config convert.cvsps.cache=True (boolean)\n"
741 " --config convert.cvsps.cache=True (boolean)\n"
742 " Set to False to disable remote log caching, for testing and\n"
742 " Set to False to disable remote log caching, for testing and\n"
743 " debugging purposes.\n"
743 " debugging purposes.\n"
744 " --config convert.cvsps.fuzz=60 (integer)\n"
744 " --config convert.cvsps.fuzz=60 (integer)\n"
745 " Specify the maximum time (in seconds) that is allowed\n"
745 " Specify the maximum time (in seconds) that is allowed\n"
746 " between commits with identical user and log message in a\n"
746 " between commits with identical user and log message in a\n"
747 " single changeset. When very large files were checked in as\n"
747 " single changeset. When very large files were checked in as\n"
748 " part of a changeset then the default may not be long\n"
748 " part of a changeset then the default may not be long\n"
749 " enough.\n"
749 " enough.\n"
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
751 " Specify a regular expression to which commit log messages\n"
751 " Specify a regular expression to which commit log messages\n"
752 " are matched. If a match occurs, then the conversion\n"
752 " are matched. If a match occurs, then the conversion\n"
753 " process will insert a dummy revision merging the branch on\n"
753 " process will insert a dummy revision merging the branch on\n"
754 " which this log message occurs to the branch indicated in\n"
754 " which this log message occurs to the branch indicated in\n"
755 " the regex.\n"
755 " the regex.\n"
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
757 " Specify a regular expression to which commit log messages\n"
757 " Specify a regular expression to which commit log messages\n"
758 " are matched. If a match occurs, then the conversion\n"
758 " are matched. If a match occurs, then the conversion\n"
759 " process will add the most recent revision on the branch\n"
759 " process will add the most recent revision on the branch\n"
760 " indicated in the regex as the second parent of the\n"
760 " indicated in the regex as the second parent of the\n"
761 " changeset.\n"
761 " changeset.\n"
762 "\n"
762 "\n"
763 " The hgext/convert/cvsps wrapper script allows the builtin\n"
763 " The hgext/convert/cvsps wrapper script allows the builtin\n"
764 " changeset merging code to be run without doing a conversion. Its\n"
764 " changeset merging code to be run without doing a conversion. Its\n"
765 " parameters and output are similar to that of cvsps 2.1.\n"
765 " parameters and output are similar to that of cvsps 2.1.\n"
766 "\n"
766 "\n"
767 " Subversion Source\n"
767 " Subversion Source\n"
768 " -----------------\n"
768 " -----------------\n"
769 "\n"
769 "\n"
770 " Subversion source detects classical trunk/branches/tags layouts.\n"
770 " Subversion source detects classical trunk/branches/tags layouts.\n"
771 " By default, the supplied \"svn://repo/path/\" source URL is\n"
771 " By default, the supplied \"svn://repo/path/\" source URL is\n"
772 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
772 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
773 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
773 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
774 " its subdirectories are listed as possible branches. If\n"
774 " its subdirectories are listed as possible branches. If\n"
775 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
775 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
776 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
776 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
777 " can be overridden with following options. Set them to paths\n"
777 " can be overridden with following options. Set them to paths\n"
778 " relative to the source URL, or leave them blank to disable auto\n"
778 " relative to the source URL, or leave them blank to disable auto\n"
779 " detection.\n"
779 " detection.\n"
780 "\n"
780 "\n"
781 " --config convert.svn.branches=branches (directory name)\n"
781 " --config convert.svn.branches=branches (directory name)\n"
782 " specify the directory containing branches\n"
782 " specify the directory containing branches\n"
783 " --config convert.svn.tags=tags (directory name)\n"
783 " --config convert.svn.tags=tags (directory name)\n"
784 " specify the directory containing tags\n"
784 " specify the directory containing tags\n"
785 " --config convert.svn.trunk=trunk (directory name)\n"
785 " --config convert.svn.trunk=trunk (directory name)\n"
786 " specify the name of the trunk branch\n"
786 " specify the name of the trunk branch\n"
787 "\n"
787 "\n"
788 " Source history can be retrieved starting at a specific revision,\n"
788 " Source history can be retrieved starting at a specific revision,\n"
789 " instead of being integrally converted. Only single branch\n"
789 " instead of being integrally converted. Only single branch\n"
790 " conversions are supported.\n"
790 " conversions are supported.\n"
791 "\n"
791 "\n"
792 " --config convert.svn.startrev=0 (svn revision number)\n"
792 " --config convert.svn.startrev=0 (svn revision number)\n"
793 " specify start Subversion revision.\n"
793 " specify start Subversion revision.\n"
794 "\n"
794 "\n"
795 " Perforce Source\n"
795 " Perforce Source\n"
796 " ---------------\n"
796 " ---------------\n"
797 "\n"
797 "\n"
798 " The Perforce (P4) importer can be given a p4 depot path or a\n"
798 " The Perforce (P4) importer can be given a p4 depot path or a\n"
799 " client specification as source. It will convert all files in the\n"
799 " client specification as source. It will convert all files in the\n"
800 " source to a flat Mercurial repository, ignoring labels, branches\n"
800 " source to a flat Mercurial repository, ignoring labels, branches\n"
801 " and integrations. Note that when a depot path is given you then\n"
801 " and integrations. Note that when a depot path is given you then\n"
802 " usually should specify a target directory, because otherwise the\n"
802 " usually should specify a target directory, because otherwise the\n"
803 " target may be named ...-hg.\n"
803 " target may be named ...-hg.\n"
804 "\n"
804 "\n"
805 " It is possible to limit the amount of source history to be\n"
805 " It is possible to limit the amount of source history to be\n"
806 " converted by specifying an initial Perforce revision.\n"
806 " converted by specifying an initial Perforce revision.\n"
807 "\n"
807 "\n"
808 " --config convert.p4.startrev=0 (perforce changelist number)\n"
808 " --config convert.p4.startrev=0 (perforce changelist number)\n"
809 " specify initial Perforce revision.\n"
809 " specify initial Perforce revision.\n"
810 "\n"
810 "\n"
811 "\n"
811 "\n"
812 " Mercurial Destination\n"
812 " Mercurial Destination\n"
813 " ---------------------\n"
813 " ---------------------\n"
814 "\n"
814 "\n"
815 " --config convert.hg.clonebranches=False (boolean)\n"
815 " --config convert.hg.clonebranches=False (boolean)\n"
816 " dispatch source branches in separate clones.\n"
816 " dispatch source branches in separate clones.\n"
817 " --config convert.hg.tagsbranch=default (branch name)\n"
817 " --config convert.hg.tagsbranch=default (branch name)\n"
818 " tag revisions branch name\n"
818 " tag revisions branch name\n"
819 " --config convert.hg.usebranchnames=True (boolean)\n"
819 " --config convert.hg.usebranchnames=True (boolean)\n"
820 " preserve branch names\n"
820 " preserve branch names\n"
821 "\n"
821 "\n"
822 " "
822 " "
823 msgstr ""
823 msgstr ""
824
824
825 msgid ""
825 msgid ""
826 "create changeset information from CVS\n"
826 "create changeset information from CVS\n"
827 "\n"
827 "\n"
828 " This command is intended as a debugging tool for the CVS to\n"
828 " This command is intended as a debugging tool for the CVS to\n"
829 " Mercurial converter, and can be used as a direct replacement for\n"
829 " Mercurial converter, and can be used as a direct replacement for\n"
830 " cvsps.\n"
830 " cvsps.\n"
831 "\n"
831 "\n"
832 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
832 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
833 " named directory) in the CVS repository, and converts the log to a\n"
833 " named directory) in the CVS repository, and converts the log to a\n"
834 " series of changesets based on matching commit log entries and\n"
834 " series of changesets based on matching commit log entries and\n"
835 " dates."
835 " dates."
836 msgstr ""
836 msgstr ""
837
837
838 msgid "username mapping filename"
838 msgid "username mapping filename"
839 msgstr ""
839 msgstr ""
840
840
841 msgid "destination repository type"
841 msgid "destination repository type"
842 msgstr ""
842 msgstr ""
843
843
844 msgid "remap file names using contents of file"
844 msgid "remap file names using contents of file"
845 msgstr ""
845 msgstr ""
846
846
847 msgid "import up to target revision REV"
847 msgid "import up to target revision REV"
848 msgstr ""
848 msgstr ""
849
849
850 msgid "source repository type"
850 msgid "source repository type"
851 msgstr ""
851 msgstr ""
852
852
853 msgid "splice synthesized history into place"
853 msgid "splice synthesized history into place"
854 msgstr ""
854 msgstr ""
855
855
856 msgid "change branch names while converting"
856 msgid "change branch names while converting"
857 msgstr ""
857 msgstr ""
858
858
859 msgid "try to sort changesets by branches"
859 msgid "try to sort changesets by branches"
860 msgstr ""
860 msgstr ""
861
861
862 msgid "try to sort changesets by date"
862 msgid "try to sort changesets by date"
863 msgstr ""
863 msgstr ""
864
864
865 msgid "preserve source changesets order"
865 msgid "preserve source changesets order"
866 msgstr ""
866 msgstr ""
867
867
868 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
868 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
869 msgstr ""
869 msgstr ""
870
870
871 msgid "only return changes on specified branches"
871 msgid "only return changes on specified branches"
872 msgstr ""
872 msgstr ""
873
873
874 msgid "prefix to remove from file names"
874 msgid "prefix to remove from file names"
875 msgstr ""
875 msgstr ""
876
876
877 msgid "only return changes after or between specified tags"
877 msgid "only return changes after or between specified tags"
878 msgstr ""
878 msgstr ""
879
879
880 msgid "update cvs log cache"
880 msgid "update cvs log cache"
881 msgstr ""
881 msgstr ""
882
882
883 msgid "create new cvs log cache"
883 msgid "create new cvs log cache"
884 msgstr ""
884 msgstr ""
885
885
886 msgid "set commit time fuzz in seconds"
886 msgid "set commit time fuzz in seconds"
887 msgstr ""
887 msgstr ""
888
888
889 msgid "specify cvsroot"
889 msgid "specify cvsroot"
890 msgstr ""
890 msgstr ""
891
891
892 msgid "show parent changesets"
892 msgid "show parent changesets"
893 msgstr ""
893 msgstr ""
894
894
895 msgid "show current changeset in ancestor branches"
895 msgid "show current changeset in ancestor branches"
896 msgstr ""
896 msgstr ""
897
897
898 msgid "ignored for compatibility"
898 msgid "ignored for compatibility"
899 msgstr ""
899 msgstr ""
900
900
901 msgid "hg debugcvsps [OPTION]... [PATH]..."
901 msgid "hg debugcvsps [OPTION]... [PATH]..."
902 msgstr ""
902 msgstr ""
903
903
904 msgid ""
904 msgid ""
905 "warning: lightweight checkouts may cause conversion failures, try with a "
905 "warning: lightweight checkouts may cause conversion failures, try with a "
906 "regular branch instead.\n"
906 "regular branch instead.\n"
907 msgstr ""
907 msgstr ""
908
908
909 msgid "bzr source type could not be determined\n"
909 msgid "bzr source type could not be determined\n"
910 msgstr ""
910 msgstr ""
911
911
912 #, python-format
912 #, python-format
913 msgid "%s is not a valid revision in current branch"
913 msgid "%s is not a valid revision in current branch"
914 msgstr ""
914 msgstr ""
915
915
916 #, python-format
916 #, python-format
917 msgid "%s is not available in %s anymore"
917 msgid "%s is not available in %s anymore"
918 msgstr ""
918 msgstr ""
919
919
920 #, python-format
920 #, python-format
921 msgid "%s.%s symlink has no target"
921 msgid "%s.%s symlink has no target"
922 msgstr ""
922 msgstr ""
923
923
924 #, python-format
924 #, python-format
925 msgid "cannot find required \"%s\" tool"
925 msgid "cannot find required \"%s\" tool"
926 msgstr ""
926 msgstr ""
927
927
928 #, python-format
928 #, python-format
929 msgid "running: %s\n"
929 msgid "running: %s\n"
930 msgstr ""
930 msgstr ""
931
931
932 #, python-format
932 #, python-format
933 msgid "%s error:\n"
933 msgid "%s error:\n"
934 msgstr ""
934 msgstr ""
935
935
936 #, python-format
936 #, python-format
937 msgid "syntax error in %s(%d): key/value pair expected"
937 msgid "syntax error in %s(%d): key/value pair expected"
938 msgstr ""
938 msgstr ""
939
939
940 #, python-format
940 #, python-format
941 msgid "could not open map file %r: %s"
941 msgid "could not open map file %r: %s"
942 msgstr ""
942 msgstr ""
943
943
944 #, python-format
944 #, python-format
945 msgid "%s: missing or unsupported repository"
945 msgid "%s: missing or unsupported repository"
946 msgstr ""
946 msgstr ""
947
947
948 #, python-format
948 #, python-format
949 msgid "convert: %s\n"
949 msgid "convert: %s\n"
950 msgstr ""
950 msgstr ""
951
951
952 #, python-format
952 #, python-format
953 msgid "%s: unknown repository type"
953 msgid "%s: unknown repository type"
954 msgstr ""
954 msgstr ""
955
955
956 #, python-format
956 #, python-format
957 msgid "unknown sort mode: %s"
957 msgid "unknown sort mode: %s"
958 msgstr ""
958 msgstr ""
959
959
960 #, python-format
960 #, python-format
961 msgid "cycle detected between %s and %s"
961 msgid "cycle detected between %s and %s"
962 msgstr ""
962 msgstr ""
963
963
964 msgid "not all revisions were sorted"
964 msgid "not all revisions were sorted"
965 msgstr ""
965 msgstr ""
966
966
967 #, python-format
967 #, python-format
968 msgid "Writing author map file %s\n"
968 msgid "Writing author map file %s\n"
969 msgstr ""
969 msgstr ""
970
970
971 #, python-format
971 #, python-format
972 msgid "Ignoring bad line in author map file %s: %s\n"
972 msgid "Ignoring bad line in author map file %s: %s\n"
973 msgstr ""
973 msgstr ""
974
974
975 #, python-format
975 #, python-format
976 msgid "mapping author %s to %s\n"
976 msgid "mapping author %s to %s\n"
977 msgstr ""
977 msgstr ""
978
978
979 #, python-format
979 #, python-format
980 msgid "overriding mapping for author %s, was %s, will be %s\n"
980 msgid "overriding mapping for author %s, was %s, will be %s\n"
981 msgstr ""
981 msgstr ""
982
982
983 #, python-format
983 #, python-format
984 msgid "spliced in %s as parents of %s\n"
984 msgid "spliced in %s as parents of %s\n"
985 msgstr ""
985 msgstr ""
986
986
987 msgid "scanning source...\n"
987 msgid "scanning source...\n"
988 msgstr ""
988 msgstr ""
989
989
990 msgid "sorting...\n"
990 msgid "sorting...\n"
991 msgstr ""
991 msgstr ""
992
992
993 msgid "converting...\n"
993 msgid "converting...\n"
994 msgstr ""
994 msgstr ""
995
995
996 #, python-format
996 #, python-format
997 msgid "source: %s\n"
997 msgid "source: %s\n"
998 msgstr ""
998 msgstr ""
999
999
1000 #, python-format
1000 #, python-format
1001 msgid "assuming destination %s\n"
1001 msgid "assuming destination %s\n"
1002 msgstr ""
1002 msgstr ""
1003
1003
1004 msgid "more than one sort mode specified"
1004 msgid "more than one sort mode specified"
1005 msgstr ""
1005 msgstr ""
1006
1006
1007 msgid "--sourcesort is not supported by this data source"
1007 msgid "--sourcesort is not supported by this data source"
1008 msgstr ""
1008 msgstr ""
1009
1009
1010 msgid ""
1010 msgid ""
1011 "warning: support for external cvsps is deprecated and will be removed in "
1011 "warning: support for external cvsps is deprecated and will be removed in "
1012 "Mercurial 1.4\n"
1012 "Mercurial 1.4\n"
1013 msgstr ""
1013 msgstr ""
1014
1014
1015 #, python-format
1015 #, python-format
1016 msgid "revision %s is not a patchset number or date"
1016 msgid "revision %s is not a patchset number or date"
1017 msgstr ""
1017 msgstr ""
1018
1018
1019 msgid "using builtin cvsps\n"
1019 msgid "using builtin cvsps\n"
1020 msgstr ""
1020 msgstr ""
1021
1021
1022 #, python-format
1022 #, python-format
1023 msgid "connecting to %s\n"
1023 msgid "connecting to %s\n"
1024 msgstr ""
1024 msgstr ""
1025
1025
1026 msgid "CVS pserver authentication failed"
1026 msgid "CVS pserver authentication failed"
1027 msgstr ""
1027 msgstr ""
1028
1028
1029 msgid "server sucks"
1029 msgid "server sucks"
1030 msgstr ""
1030 msgstr ""
1031
1031
1032 #, python-format
1032 #, python-format
1033 msgid "%d bytes missing from remote file"
1033 msgid "%d bytes missing from remote file"
1034 msgstr ""
1034 msgstr ""
1035
1035
1036 #, python-format
1036 #, python-format
1037 msgid "cvs server: %s\n"
1037 msgid "cvs server: %s\n"
1038 msgstr ""
1038 msgstr ""
1039
1039
1040 #, python-format
1040 #, python-format
1041 msgid "unknown CVS response: %s"
1041 msgid "unknown CVS response: %s"
1042 msgstr ""
1042 msgstr ""
1043
1043
1044 msgid "collecting CVS rlog\n"
1044 msgid "collecting CVS rlog\n"
1045 msgstr ""
1045 msgstr ""
1046
1046
1047 #, python-format
1047 #, python-format
1048 msgid "reading cvs log cache %s\n"
1048 msgid "reading cvs log cache %s\n"
1049 msgstr ""
1049 msgstr ""
1050
1050
1051 #, python-format
1051 #, python-format
1052 msgid "cache has %d log entries\n"
1052 msgid "cache has %d log entries\n"
1053 msgstr ""
1053 msgstr ""
1054
1054
1055 #, python-format
1055 #, python-format
1056 msgid "error reading cache: %r\n"
1056 msgid "error reading cache: %r\n"
1057 msgstr ""
1057 msgstr ""
1058
1058
1059 #, python-format
1059 #, python-format
1060 msgid "running %s\n"
1060 msgid "running %s\n"
1061 msgstr ""
1061 msgstr ""
1062
1062
1063 #, python-format
1063 #, python-format
1064 msgid "prefix=%r directory=%r root=%r\n"
1064 msgid "prefix=%r directory=%r root=%r\n"
1065 msgstr ""
1065 msgstr ""
1066
1066
1067 msgid "RCS file must be followed by working file"
1067 msgid "RCS file must be followed by working file"
1068 msgstr ""
1068 msgstr ""
1069
1069
1070 msgid "must have at least some revisions"
1070 msgid "must have at least some revisions"
1071 msgstr ""
1071 msgstr ""
1072
1072
1073 msgid "expected revision number"
1073 msgid "expected revision number"
1074 msgstr ""
1074 msgstr ""
1075
1075
1076 msgid "revision must be followed by date line"
1076 msgid "revision must be followed by date line"
1077 msgstr ""
1077 msgstr ""
1078
1078
1079 #, python-format
1079 #, python-format
1080 msgid "found synthetic revision in %s: %r\n"
1080 msgid "found synthetic revision in %s: %r\n"
1081 msgstr ""
1081 msgstr ""
1082
1082
1083 #, python-format
1083 #, python-format
1084 msgid "writing cvs log cache %s\n"
1084 msgid "writing cvs log cache %s\n"
1085 msgstr ""
1085 msgstr ""
1086
1086
1087 #, python-format
1087 #, python-format
1088 msgid "%d log entries\n"
1088 msgid "%d log entries\n"
1089 msgstr ""
1089 msgstr ""
1090
1090
1091 msgid "creating changesets\n"
1091 msgid "creating changesets\n"
1092 msgstr ""
1092 msgstr ""
1093
1093
1094 msgid "synthetic changeset cannot have multiple parents"
1094 msgid "synthetic changeset cannot have multiple parents"
1095 msgstr ""
1095 msgstr ""
1096
1096
1097 #, python-format
1097 #, python-format
1098 msgid ""
1098 msgid ""
1099 "warning: CVS commit message references non-existent branch %r:\n"
1099 "warning: CVS commit message references non-existent branch %r:\n"
1100 "%s\n"
1100 "%s\n"
1101 msgstr ""
1101 msgstr ""
1102
1102
1103 #, python-format
1103 #, python-format
1104 msgid "%d changeset entries\n"
1104 msgid "%d changeset entries\n"
1105 msgstr ""
1105 msgstr ""
1106
1106
1107 msgid "Python ElementTree module is not available"
1107 msgid "Python ElementTree module is not available"
1108 msgstr ""
1108 msgstr ""
1109
1109
1110 #, python-format
1110 #, python-format
1111 msgid "cleaning up %s\n"
1111 msgid "cleaning up %s\n"
1112 msgstr ""
1112 msgstr ""
1113
1113
1114 msgid "internal calling inconsistency"
1114 msgid "internal calling inconsistency"
1115 msgstr ""
1115 msgstr ""
1116
1116
1117 msgid "errors in filemap"
1117 msgid "errors in filemap"
1118 msgstr ""
1118 msgstr ""
1119
1119
1120 #, python-format
1120 #, python-format
1121 msgid "%s:%d: %r already in %s list\n"
1121 msgid "%s:%d: %r already in %s list\n"
1122 msgstr ""
1122 msgstr ""
1123
1123
1124 #, python-format
1124 #, python-format
1125 msgid "%s:%d: unknown directive %r\n"
1125 msgid "%s:%d: unknown directive %r\n"
1126 msgstr ""
1126 msgstr ""
1127
1127
1128 msgid "source repository doesn't support --filemap"
1128 msgid "source repository doesn't support --filemap"
1129 msgstr ""
1129 msgstr ""
1130
1130
1131 #, python-format
1131 #, python-format
1132 msgid "%s does not look like a GNU Arch repo"
1132 msgid "%s does not look like a GNU Arch repo"
1133 msgstr ""
1133 msgstr ""
1134
1134
1135 msgid "cannot find a GNU Arch tool"
1135 msgid "cannot find a GNU Arch tool"
1136 msgstr ""
1136 msgstr ""
1137
1137
1138 #, python-format
1138 #, python-format
1139 msgid "analyzing tree version %s...\n"
1139 msgid "analyzing tree version %s...\n"
1140 msgstr ""
1140 msgstr ""
1141
1141
1142 #, python-format
1142 #, python-format
1143 msgid ""
1143 msgid ""
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1145 msgstr ""
1145 msgstr ""
1146
1146
1147 #, python-format
1147 #, python-format
1148 msgid "applying revision %s...\n"
1148 msgid "applying revision %s...\n"
1149 msgstr ""
1149 msgstr ""
1150
1150
1151 #, python-format
1151 #, python-format
1152 msgid "computing changeset between %s and %s...\n"
1152 msgid "computing changeset between %s and %s...\n"
1153 msgstr ""
1153 msgstr ""
1154
1154
1155 #, python-format
1155 #, python-format
1156 msgid "obtaining revision %s...\n"
1156 msgid "obtaining revision %s...\n"
1157 msgstr ""
1157 msgstr ""
1158
1158
1159 #, python-format
1159 #, python-format
1160 msgid "analyzing revision %s...\n"
1160 msgid "analyzing revision %s...\n"
1161 msgstr ""
1161 msgstr ""
1162
1162
1163 #, python-format
1163 #, python-format
1164 msgid "could not parse cat-log of %s"
1164 msgid "could not parse cat-log of %s"
1165 msgstr ""
1165 msgstr ""
1166
1166
1167 #, python-format
1167 #, python-format
1168 msgid "%s is not a local Mercurial repo"
1168 msgid "%s is not a local Mercurial repo"
1169 msgstr ""
1169 msgstr ""
1170
1170
1171 #, python-format
1171 #, python-format
1172 msgid "initializing destination %s repository\n"
1172 msgid "initializing destination %s repository\n"
1173 msgstr ""
1173 msgstr ""
1174
1174
1175 msgid "run hg sink pre-conversion action\n"
1175 msgid "run hg sink pre-conversion action\n"
1176 msgstr ""
1176 msgstr ""
1177
1177
1178 msgid "run hg sink post-conversion action\n"
1178 msgid "run hg sink post-conversion action\n"
1179 msgstr ""
1179 msgstr ""
1180
1180
1181 #, python-format
1181 #, python-format
1182 msgid "pulling from %s into %s\n"
1182 msgid "pulling from %s into %s\n"
1183 msgstr ""
1183 msgstr ""
1184
1184
1185 msgid "filtering out empty revision\n"
1185 msgid "filtering out empty revision\n"
1186 msgstr ""
1186 msgstr ""
1187
1187
1188 msgid "updating tags\n"
1188 msgid "updating tags\n"
1189 msgstr ""
1189 msgstr ""
1190
1190
1191 #, python-format
1191 #, python-format
1192 msgid "%s is not a valid start revision"
1192 msgid "%s is not a valid start revision"
1193 msgstr ""
1193 msgstr ""
1194
1194
1195 #, python-format
1195 #, python-format
1196 msgid "ignoring: %s\n"
1196 msgid "ignoring: %s\n"
1197 msgstr ""
1197 msgstr ""
1198
1198
1199 msgid "run hg source pre-conversion action\n"
1199 msgid "run hg source pre-conversion action\n"
1200 msgstr ""
1200 msgstr ""
1201
1201
1202 msgid "run hg source post-conversion action\n"
1202 msgid "run hg source post-conversion action\n"
1203 msgstr ""
1203 msgstr ""
1204
1204
1205 #, python-format
1205 #, python-format
1206 msgid "%s does not look like a monotone repo"
1206 msgid "%s does not look like a monotone repo"
1207 msgstr ""
1207 msgstr ""
1208
1208
1209 #, python-format
1209 #, python-format
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1211 msgstr ""
1211 msgstr ""
1212
1212
1213 msgid "reading p4 views\n"
1213 msgid "reading p4 views\n"
1214 msgstr ""
1214 msgstr ""
1215
1215
1216 msgid "collecting p4 changelists\n"
1216 msgid "collecting p4 changelists\n"
1217 msgstr ""
1217 msgstr ""
1218
1218
1219 msgid "Subversion python bindings could not be loaded"
1219 msgid "Subversion python bindings could not be loaded"
1220 msgstr ""
1220 msgstr ""
1221
1221
1222 #, python-format
1222 #, python-format
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1224 msgstr ""
1224 msgstr ""
1225
1225
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1227 msgstr ""
1227 msgstr ""
1228
1228
1229 #, python-format
1229 #, python-format
1230 msgid "svn: revision %s is not an integer"
1230 msgid "svn: revision %s is not an integer"
1231 msgstr ""
1231 msgstr ""
1232
1232
1233 #, python-format
1233 #, python-format
1234 msgid "svn: start revision %s is not an integer"
1234 msgid "svn: start revision %s is not an integer"
1235 msgstr ""
1235 msgstr ""
1236
1236
1237 #, python-format
1237 #, python-format
1238 msgid "no revision found in module %s"
1238 msgid "no revision found in module %s"
1239 msgstr ""
1239 msgstr ""
1240
1240
1241 #, python-format
1241 #, python-format
1242 msgid "expected %s to be at %r, but not found"
1242 msgid "expected %s to be at %r, but not found"
1243 msgstr ""
1243 msgstr ""
1244
1244
1245 #, python-format
1245 #, python-format
1246 msgid "found %s at %r\n"
1246 msgid "found %s at %r\n"
1247 msgstr ""
1247 msgstr ""
1248
1248
1249 #, python-format
1249 #, python-format
1250 msgid "ignoring empty branch %s\n"
1250 msgid "ignoring empty branch %s\n"
1251 msgstr ""
1251 msgstr ""
1252
1252
1253 #, python-format
1253 #, python-format
1254 msgid "found branch %s at %d\n"
1254 msgid "found branch %s at %d\n"
1255 msgstr ""
1255 msgstr ""
1256
1256
1257 msgid "svn: start revision is not supported with more than one branch"
1257 msgid "svn: start revision is not supported with more than one branch"
1258 msgstr ""
1258 msgstr ""
1259
1259
1260 #, python-format
1260 #, python-format
1261 msgid "svn: no revision found after start revision %d"
1261 msgid "svn: no revision found after start revision %d"
1262 msgstr ""
1262 msgstr ""
1263
1263
1264 #, python-format
1264 #, python-format
1265 msgid "no tags found at revision %d\n"
1265 msgid "no tags found at revision %d\n"
1266 msgstr ""
1266 msgstr ""
1267
1267
1268 #, python-format
1268 #, python-format
1269 msgid "ignoring foreign branch %r\n"
1269 msgid "ignoring foreign branch %r\n"
1270 msgstr ""
1270 msgstr ""
1271
1271
1272 #, python-format
1272 #, python-format
1273 msgid "%s not found up to revision %d"
1273 msgid "%s not found up to revision %d"
1274 msgstr ""
1274 msgstr ""
1275
1275
1276 #, python-format
1276 #, python-format
1277 msgid "branch renamed from %s to %s at %d\n"
1277 msgid "branch renamed from %s to %s at %d\n"
1278 msgstr ""
1278 msgstr ""
1279
1279
1280 #, python-format
1280 #, python-format
1281 msgid "reparent to %s\n"
1281 msgid "reparent to %s\n"
1282 msgstr ""
1282 msgstr ""
1283
1283
1284 #, python-format
1284 #, python-format
1285 msgid "copied to %s from %s@%s\n"
1285 msgid "copied to %s from %s@%s\n"
1286 msgstr ""
1286 msgstr ""
1287
1287
1288 #, python-format
1288 #, python-format
1289 msgid "gone from %s\n"
1289 msgid "gone from %s\n"
1290 msgstr ""
1290 msgstr ""
1291
1291
1292 #, python-format
1292 #, python-format
1293 msgid "entry %s\n"
1293 msgid "entry %s\n"
1294 msgstr ""
1294 msgstr ""
1295
1295
1296 #, python-format
1296 #, python-format
1297 msgid "unknown path in revision %d: %s\n"
1297 msgid "unknown path in revision %d: %s\n"
1298 msgstr ""
1298 msgstr ""
1299
1299
1300 #, python-format
1300 #, python-format
1301 msgid "mark %s came from %s:%d\n"
1301 msgid "mark %s came from %s:%d\n"
1302 msgstr ""
1302 msgstr ""
1303
1303
1304 #, python-format
1304 #, python-format
1305 msgid "parsing revision %d (%d changes)\n"
1305 msgid "parsing revision %d (%d changes)\n"
1306 msgstr ""
1306 msgstr ""
1307
1307
1308 #, python-format
1308 #, python-format
1309 msgid "found parent of branch %s at %d: %s\n"
1309 msgid "found parent of branch %s at %d: %s\n"
1310 msgstr ""
1310 msgstr ""
1311
1311
1312 msgid "no copyfrom path, don't know what to do.\n"
1312 msgid "no copyfrom path, don't know what to do.\n"
1313 msgstr ""
1313 msgstr ""
1314
1314
1315 #, python-format
1315 #, python-format
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1317 msgstr ""
1317 msgstr ""
1318
1318
1319 #, python-format
1319 #, python-format
1320 msgid "revision %d has no entries\n"
1320 msgid "revision %d has no entries\n"
1321 msgstr ""
1321 msgstr ""
1322
1322
1323 #, python-format
1323 #, python-format
1324 msgid "svn: branch has no revision %s"
1324 msgid "svn: branch has no revision %s"
1325 msgstr ""
1325 msgstr ""
1326
1326
1327 #, python-format
1327 #, python-format
1328 msgid "%r is not under %r, ignoring\n"
1328 msgid "%r is not under %r, ignoring\n"
1329 msgstr ""
1329 msgstr ""
1330
1330
1331 #, python-format
1331 #, python-format
1332 msgid "initializing svn repo %r\n"
1332 msgid "initializing svn repo %r\n"
1333 msgstr ""
1333 msgstr ""
1334
1334
1335 #, python-format
1335 #, python-format
1336 msgid "initializing svn wc %r\n"
1336 msgid "initializing svn wc %r\n"
1337 msgstr ""
1337 msgstr ""
1338
1338
1339 msgid "unexpected svn output:\n"
1339 msgid "unexpected svn output:\n"
1340 msgstr ""
1340 msgstr ""
1341
1341
1342 msgid "unable to cope with svn output"
1342 msgid "unable to cope with svn output"
1343 msgstr ""
1343 msgstr ""
1344
1344
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1346 msgstr ""
1346 msgstr ""
1347
1347
1348 msgid ""
1348 msgid ""
1349 "command to allow external programs to compare revisions\n"
1349 "command to allow external programs to compare revisions\n"
1350 "\n"
1350 "\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1353 "programs are called with a configurable set of options and two\n"
1353 "programs are called with a configurable set of options and two\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1355 "files to compare.\n"
1355 "files to compare.\n"
1356 "\n"
1356 "\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1358 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1358 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1359 "\n"
1359 "\n"
1360 " [extdiff]\n"
1360 " [extdiff]\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1362 " cdiff = gdiff -Nprc5\n"
1362 " cdiff = gdiff -Nprc5\n"
1363 " ## or the old way:\n"
1363 " ## or the old way:\n"
1364 " #cmd.cdiff = gdiff\n"
1364 " #cmd.cdiff = gdiff\n"
1365 " #opts.cdiff = -Nprc5\n"
1365 " #opts.cdiff = -Nprc5\n"
1366 "\n"
1366 "\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1368 " vdiff = kdiff3\n"
1368 " vdiff = kdiff3\n"
1369 "\n"
1369 "\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1371 " meld =\n"
1371 " meld =\n"
1372 "\n"
1372 "\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1376 "in\n"
1376 "in\n"
1377 " # your .vimrc\n"
1377 " # your .vimrc\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1379 "\n"
1379 "\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1381 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1381 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1382 "files, so running the external diff program will actually be pretty\n"
1382 "files, so running the external diff program will actually be pretty\n"
1383 "fast (at least faster than having to compare the entire tree).\n"
1383 "fast (at least faster than having to compare the entire tree).\n"
1384 msgstr ""
1384 msgstr ""
1385
1385
1386 #, python-format
1386 #, python-format
1387 msgid "making snapshot of %d files from rev %s\n"
1387 msgid "making snapshot of %d files from rev %s\n"
1388 msgstr ""
1388 msgstr ""
1389
1389
1390 #, python-format
1390 #, python-format
1391 msgid "making snapshot of %d files from working directory\n"
1391 msgid "making snapshot of %d files from working directory\n"
1392 msgstr ""
1392 msgstr ""
1393
1393
1394 msgid "cannot specify --rev and --change at the same time"
1394 msgid "cannot specify --rev and --change at the same time"
1395 msgstr ""
1395 msgstr ""
1396
1396
1397 #, python-format
1397 #, python-format
1398 msgid "running %r in %s\n"
1398 msgid "running %r in %s\n"
1399 msgstr ""
1399 msgstr ""
1400
1400
1401 #, python-format
1401 #, python-format
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1403 msgstr ""
1403 msgstr ""
1404
1404
1405 msgid "cleaning up temp directory\n"
1405 msgid "cleaning up temp directory\n"
1406 msgstr ""
1406 msgstr ""
1407
1407
1408 msgid ""
1408 msgid ""
1409 "use external program to diff repository (or selected files)\n"
1409 "use external program to diff repository (or selected files)\n"
1410 "\n"
1410 "\n"
1411 " Show differences between revisions for the specified files, using\n"
1411 " Show differences between revisions for the specified files, using\n"
1412 " an external program. The default program used is diff, with\n"
1412 " an external program. The default program used is diff, with\n"
1413 " default options \"-Npru\".\n"
1413 " default options \"-Npru\".\n"
1414 "\n"
1414 "\n"
1415 " To select a different program, use the -p/--program option. The\n"
1415 " To select a different program, use the -p/--program option. The\n"
1416 " program will be passed the names of two directories to compare. To\n"
1416 " program will be passed the names of two directories to compare. To\n"
1417 " pass additional options to the program, use -o/--option. These\n"
1417 " pass additional options to the program, use -o/--option. These\n"
1418 " will be passed before the names of the directories to compare.\n"
1418 " will be passed before the names of the directories to compare.\n"
1419 "\n"
1419 "\n"
1420 " When two revision arguments are given, then changes are shown\n"
1420 " When two revision arguments are given, then changes are shown\n"
1421 " between those revisions. If only one revision is specified then\n"
1421 " between those revisions. If only one revision is specified then\n"
1422 " that revision is compared to the working directory, and, when no\n"
1422 " that revision is compared to the working directory, and, when no\n"
1423 " revisions are specified, the working directory files are compared\n"
1423 " revisions are specified, the working directory files are compared\n"
1424 " to its parent."
1424 " to its parent."
1425 msgstr ""
1425 msgstr ""
1426
1426
1427 msgid "comparison program to run"
1427 msgid "comparison program to run"
1428 msgstr ""
1428 msgstr ""
1429
1429
1430 msgid "pass option to comparison program"
1430 msgid "pass option to comparison program"
1431 msgstr ""
1431 msgstr ""
1432
1432
1433 msgid "change made by revision"
1433 msgid "change made by revision"
1434 msgstr ""
1434 msgstr ""
1435
1435
1436 msgid "hg extdiff [OPT]... [FILE]..."
1436 msgid "hg extdiff [OPT]... [FILE]..."
1437 msgstr ""
1437 msgstr ""
1438
1438
1439 #, python-format
1439 #, python-format
1440 msgid "hg %s [OPTION]... [FILE]..."
1440 msgid "hg %s [OPTION]... [FILE]..."
1441 msgstr ""
1441 msgstr ""
1442
1442
1443 msgid "pull, update and merge in one command"
1443 msgid "pull, update and merge in one command"
1444 msgstr ""
1444 msgstr ""
1445
1445
1446 msgid ""
1446 msgid ""
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1448 "\n"
1448 "\n"
1449 " This finds all changes from the repository at the specified path\n"
1449 " This finds all changes from the repository at the specified path\n"
1450 " or URL and adds them to the local repository.\n"
1450 " or URL and adds them to the local repository.\n"
1451 "\n"
1451 "\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1453 " automatically merged, and the result of the merge is committed.\n"
1453 " automatically merged, and the result of the merge is committed.\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1455 " changes.\n"
1455 " changes.\n"
1456 "\n"
1456 "\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1458 " \"authoritative\". The head of the new changes is used as the first\n"
1458 " \"authoritative\". The head of the new changes is used as the first\n"
1459 " parent, with local changes as the second. To switch the merge\n"
1459 " parent, with local changes as the second. To switch the merge\n"
1460 " order, use --switch-parent.\n"
1460 " order, use --switch-parent.\n"
1461 "\n"
1461 "\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1463 " "
1463 " "
1464 msgstr ""
1464 msgstr ""
1465
1465
1466 msgid ""
1466 msgid ""
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1468 msgstr ""
1468 msgstr ""
1469
1469
1470 msgid "outstanding uncommitted merge"
1470 msgid "outstanding uncommitted merge"
1471 msgstr ""
1471 msgstr ""
1472
1472
1473 msgid "outstanding uncommitted changes"
1473 msgid "outstanding uncommitted changes"
1474 msgstr ""
1474 msgstr ""
1475
1475
1476 msgid "working directory is missing some files"
1476 msgid "working directory is missing some files"
1477 msgstr ""
1477 msgstr ""
1478
1478
1479 msgid ""
1479 msgid ""
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1481 msgstr ""
1481 msgstr ""
1482
1482
1483 #, python-format
1483 #, python-format
1484 msgid "pulling from %s\n"
1484 msgid "pulling from %s\n"
1485 msgstr ""
1485 msgstr ""
1486
1486
1487 msgid ""
1487 msgid ""
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1489 "specified."
1489 "specified."
1490 msgstr ""
1490 msgstr ""
1491
1491
1492 #, python-format
1492 #, python-format
1493 msgid ""
1493 msgid ""
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1495 "\" to merge them)\n"
1495 "\" to merge them)\n"
1496 msgstr ""
1496 msgstr ""
1497
1497
1498 #, python-format
1498 #, python-format
1499 msgid "updating to %d:%s\n"
1499 msgid "updating to %d:%s\n"
1500 msgstr ""
1500 msgstr ""
1501
1501
1502 #, python-format
1502 #, python-format
1503 msgid "merging with %d:%s\n"
1503 msgid "merging with %d:%s\n"
1504 msgstr ""
1504 msgstr ""
1505
1505
1506 #, python-format
1506 #, python-format
1507 msgid "Automated merge with %s"
1507 msgid "Automated merge with %s"
1508 msgstr ""
1508 msgstr ""
1509
1509
1510 #, python-format
1510 #, python-format
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1512 msgstr ""
1512 msgstr ""
1513
1513
1514 msgid "a specific revision you would like to pull"
1514 msgid "a specific revision you would like to pull"
1515 msgstr ""
1515 msgstr ""
1516
1516
1517 msgid "edit commit message"
1517 msgid "edit commit message"
1518 msgstr ""
1518 msgstr ""
1519
1519
1520 msgid "edit commit message (DEPRECATED)"
1520 msgid "edit commit message (DEPRECATED)"
1521 msgstr ""
1521 msgstr ""
1522
1522
1523 msgid "switch parents when merging"
1523 msgid "switch parents when merging"
1524 msgstr ""
1524 msgstr ""
1525
1525
1526 msgid "hg fetch [SOURCE]"
1526 msgid "hg fetch [SOURCE]"
1527 msgstr ""
1527 msgstr ""
1528
1528
1529 msgid "commands to sign and verify changesets"
1529 msgid "commands to sign and verify changesets"
1530 msgstr ""
1530 msgstr ""
1531
1531
1532 msgid "error while verifying signature"
1532 msgid "error while verifying signature"
1533 msgstr ""
1533 msgstr ""
1534
1534
1535 #, python-format
1535 #, python-format
1536 msgid "%s Bad signature from \"%s\"\n"
1536 msgid "%s Bad signature from \"%s\"\n"
1537 msgstr ""
1537 msgstr ""
1538
1538
1539 #, python-format
1539 #, python-format
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1541 msgstr ""
1541 msgstr ""
1542
1542
1543 #, python-format
1543 #, python-format
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1545 msgstr ""
1545 msgstr ""
1546
1546
1547 msgid "list signed changesets"
1547 msgid "list signed changesets"
1548 msgstr ""
1548 msgstr ""
1549
1549
1550 #, python-format
1550 #, python-format
1551 msgid "%s:%d node does not exist\n"
1551 msgid "%s:%d node does not exist\n"
1552 msgstr ""
1552 msgstr ""
1553
1553
1554 msgid "verify all the signatures there may be for a particular revision"
1554 msgid "verify all the signatures there may be for a particular revision"
1555 msgstr ""
1555 msgstr ""
1556
1556
1557 #, python-format
1557 #, python-format
1558 msgid "No valid signature for %s\n"
1558 msgid "No valid signature for %s\n"
1559 msgstr ""
1559 msgstr ""
1560
1560
1561 msgid ""
1561 msgid ""
1562 "add a signature for the current or given revision\n"
1562 "add a signature for the current or given revision\n"
1563 "\n"
1563 "\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1565 " or tip if no revision is checked out.\n"
1565 " or tip if no revision is checked out.\n"
1566 "\n"
1566 "\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1568 " "
1568 " "
1569 msgstr ""
1569 msgstr ""
1570
1570
1571 msgid "uncommitted merge - please provide a specific revision"
1571 msgid "uncommitted merge - please provide a specific revision"
1572 msgstr ""
1572 msgstr ""
1573
1573
1574 msgid "Error while signing"
1574 msgid "Error while signing"
1575 msgstr ""
1575 msgstr ""
1576
1576
1577 msgid ""
1577 msgid ""
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1579 "force)"
1579 "force)"
1580 msgstr ""
1580 msgstr ""
1581
1581
1582 #, python-format
1582 #, python-format
1583 msgid "Added signature for changeset %s"
1583 msgid "Added signature for changeset %s"
1584 msgstr ""
1584 msgstr ""
1585
1585
1586 msgid "unknown signature version"
1586 msgid "unknown signature version"
1587 msgstr ""
1587 msgstr ""
1588
1588
1589 msgid "make the signature local"
1589 msgid "make the signature local"
1590 msgstr ""
1590 msgstr ""
1591
1591
1592 msgid "sign even if the sigfile is modified"
1592 msgid "sign even if the sigfile is modified"
1593 msgstr ""
1593 msgstr ""
1594
1594
1595 msgid "do not commit the sigfile after signing"
1595 msgid "do not commit the sigfile after signing"
1596 msgstr ""
1596 msgstr ""
1597
1597
1598 msgid "the key id to sign with"
1598 msgid "the key id to sign with"
1599 msgstr ""
1599 msgstr ""
1600
1600
1601 msgid "commit message"
1601 msgid "commit message"
1602 msgstr ""
1602 msgstr ""
1603
1603
1604 msgid "hg sign [OPTION]... [REVISION]..."
1604 msgid "hg sign [OPTION]... [REVISION]..."
1605 msgstr ""
1605 msgstr ""
1606
1606
1607 msgid "hg sigcheck REVISION"
1607 msgid "hg sigcheck REVISION"
1608 msgstr ""
1608 msgstr ""
1609
1609
1610 msgid "hg sigs"
1610 msgid "hg sigs"
1611 msgstr ""
1611 msgstr ""
1612
1612
1613 msgid ""
1613 msgid ""
1614 "command to view revision graphs from a shell\n"
1614 "command to view revision graphs from a shell\n"
1615 "\n"
1615 "\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1617 "commands. When this options is given, an ASCII representation of the\n"
1617 "commands. When this options is given, an ASCII representation of the\n"
1618 "revision graph is also shown.\n"
1618 "revision graph is also shown.\n"
1619 msgstr ""
1619 msgstr ""
1620
1620
1621 #, python-format
1621 #, python-format
1622 msgid "--graph option is incompatible with --%s"
1622 msgid "--graph option is incompatible with --%s"
1623 msgstr ""
1623 msgstr ""
1624
1624
1625 msgid ""
1625 msgid ""
1626 "show revision history alongside an ASCII revision graph\n"
1626 "show revision history alongside an ASCII revision graph\n"
1627 "\n"
1627 "\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1629 " ASCII characters.\n"
1629 " ASCII characters.\n"
1630 "\n"
1630 "\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1632 " directory.\n"
1632 " directory.\n"
1633 " "
1633 " "
1634 msgstr ""
1634 msgstr ""
1635
1635
1636 #, python-format
1636 #, python-format
1637 msgid "comparing with %s\n"
1637 msgid "comparing with %s\n"
1638 msgstr "comparaison avec %s\n"
1638 msgstr "comparaison avec %s\n"
1639
1639
1640 msgid "no changes found\n"
1640 msgid "no changes found\n"
1641 msgstr "aucun changement trouvé\n"
1641 msgstr "aucun changement trouvé\n"
1642
1642
1643 msgid "show the revision DAG"
1643 msgid "show the revision DAG"
1644 msgstr ""
1644 msgstr ""
1645
1645
1646 msgid "limit number of changes displayed"
1646 msgid "limit number of changes displayed"
1647 msgstr ""
1647 msgstr ""
1648
1648
1649 msgid "show patch"
1649 msgid "show patch"
1650 msgstr ""
1650 msgstr ""
1651
1651
1652 msgid "show the specified revision or range"
1652 msgid "show the specified revision or range"
1653 msgstr ""
1653 msgstr ""
1654
1654
1655 msgid "hg glog [OPTION]... [FILE]"
1655 msgid "hg glog [OPTION]... [FILE]"
1656 msgstr ""
1656 msgstr ""
1657
1657
1658 msgid ""
1658 msgid ""
1659 "hooks for integrating with the CIA.vc notification service\n"
1659 "hooks for integrating with the CIA.vc notification service\n"
1660 "\n"
1660 "\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1662 "To configure it, set the following options in your hgrc:\n"
1662 "To configure it, set the following options in your hgrc:\n"
1663 "\n"
1663 "\n"
1664 "[cia]\n"
1664 "[cia]\n"
1665 "# your registered CIA user name\n"
1665 "# your registered CIA user name\n"
1666 "user = foo\n"
1666 "user = foo\n"
1667 "# the name of the project in CIA\n"
1667 "# the name of the project in CIA\n"
1668 "project = foo\n"
1668 "project = foo\n"
1669 "# the module (subproject) (optional)\n"
1669 "# the module (subproject) (optional)\n"
1670 "#module = foo\n"
1670 "#module = foo\n"
1671 "# Append a diffstat to the log message (optional)\n"
1671 "# Append a diffstat to the log message (optional)\n"
1672 "#diffstat = False\n"
1672 "#diffstat = False\n"
1673 "# Template to use for log messages (optional)\n"
1673 "# Template to use for log messages (optional)\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1675 "# Style to use (optional)\n"
1675 "# Style to use (optional)\n"
1676 "#style = foo\n"
1676 "#style = foo\n"
1677 "# The URL of the CIA notification service (optional)\n"
1677 "# The URL of the CIA notification service (optional)\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1679 "# mailto:cia@cia.vc\n"
1679 "# mailto:cia@cia.vc\n"
1680 "# Make sure to set email.from if you do this.\n"
1680 "# Make sure to set email.from if you do this.\n"
1681 "#url = http://cia.vc/\n"
1681 "#url = http://cia.vc/\n"
1682 "# print message instead of sending it (optional)\n"
1682 "# print message instead of sending it (optional)\n"
1683 "#test = False\n"
1683 "#test = False\n"
1684 "\n"
1684 "\n"
1685 "[hooks]\n"
1685 "[hooks]\n"
1686 "# one of these:\n"
1686 "# one of these:\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1689 "\n"
1689 "\n"
1690 "[web]\n"
1690 "[web]\n"
1691 "# If you want hyperlinks (optional)\n"
1691 "# If you want hyperlinks (optional)\n"
1692 "baseurl = http://server/path/to/repo\n"
1692 "baseurl = http://server/path/to/repo\n"
1693 msgstr ""
1693 msgstr ""
1694
1694
1695 #, python-format
1695 #, python-format
1696 msgid "hgcia: sending update to %s\n"
1696 msgid "hgcia: sending update to %s\n"
1697 msgstr ""
1697 msgstr ""
1698
1698
1699 msgid "email.from must be defined when sending by email"
1699 msgid "email.from must be defined when sending by email"
1700 msgstr ""
1700 msgstr ""
1701
1701
1702 msgid "cia: no user specified"
1702 msgid "cia: no user specified"
1703 msgstr ""
1703 msgstr ""
1704
1704
1705 msgid "cia: no project specified"
1705 msgid "cia: no project specified"
1706 msgstr ""
1706 msgstr ""
1707
1707
1708 msgid ""
1708 msgid ""
1709 "browse the repository in a graphical way\n"
1709 "browse the repository in a graphical way\n"
1710 "\n"
1710 "\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1712 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1712 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1713 "distributed with Mercurial.)\n"
1713 "distributed with Mercurial.)\n"
1714 "\n"
1714 "\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1716 "querying of information, and an extension to Mercurial named hgk.py,\n"
1716 "querying of information, and an extension to Mercurial named hgk.py,\n"
1717 "which provides hooks for hgk to get information. hgk can be found in\n"
1717 "which provides hooks for hgk to get information. hgk can be found in\n"
1718 "the contrib directory, and the extension is shipped in the hgext\n"
1718 "the contrib directory, and the extension is shipped in the hgext\n"
1719 "repository, and needs to be enabled.\n"
1719 "repository, and needs to be enabled.\n"
1720 "\n"
1720 "\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1722 "to work, hgk must be in your search path. Alternately, you can specify\n"
1722 "to work, hgk must be in your search path. Alternately, you can specify\n"
1723 "the path to hgk in your .hgrc file:\n"
1723 "the path to hgk in your .hgrc file:\n"
1724 "\n"
1724 "\n"
1725 " [hgk]\n"
1725 " [hgk]\n"
1726 " path=/location/of/hgk\n"
1726 " path=/location/of/hgk\n"
1727 "\n"
1727 "\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1730 "\n"
1730 "\n"
1731 " [hgk]\n"
1731 " [hgk]\n"
1732 " vdiff=vdiff\n"
1732 " vdiff=vdiff\n"
1733 "\n"
1733 "\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1735 "vdiff on hovered and selected revisions."
1735 "vdiff on hovered and selected revisions."
1736 msgstr ""
1736 msgstr ""
1737
1737
1738 msgid "diff trees from two commits"
1738 msgid "diff trees from two commits"
1739 msgstr ""
1739 msgstr ""
1740
1740
1741 msgid "output common ancestor information"
1741 msgid "output common ancestor information"
1742 msgstr ""
1742 msgstr ""
1743
1743
1744 msgid "cat a specific revision"
1744 msgid "cat a specific revision"
1745 msgstr ""
1745 msgstr ""
1746
1746
1747 msgid "cat-file: type or revision not supplied\n"
1747 msgid "cat-file: type or revision not supplied\n"
1748 msgstr ""
1748 msgstr ""
1749
1749
1750 msgid "aborting hg cat-file only understands commits\n"
1750 msgid "aborting hg cat-file only understands commits\n"
1751 msgstr ""
1751 msgstr ""
1752
1752
1753 msgid "parse given revisions"
1753 msgid "parse given revisions"
1754 msgstr ""
1754 msgstr ""
1755
1755
1756 msgid "print revisions"
1756 msgid "print revisions"
1757 msgstr ""
1757 msgstr ""
1758
1758
1759 msgid "print extension options"
1759 msgid "print extension options"
1760 msgstr ""
1760 msgstr ""
1761
1761
1762 msgid "start interactive history viewer"
1762 msgid "start interactive history viewer"
1763 msgstr ""
1763 msgstr ""
1764
1764
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1766 msgstr ""
1766 msgstr ""
1767
1767
1768 msgid "generate patch"
1768 msgid "generate patch"
1769 msgstr ""
1769 msgstr ""
1770
1770
1771 msgid "recursive"
1771 msgid "recursive"
1772 msgstr ""
1772 msgstr ""
1773
1773
1774 msgid "pretty"
1774 msgid "pretty"
1775 msgstr ""
1775 msgstr ""
1776
1776
1777 msgid "stdin"
1777 msgid "stdin"
1778 msgstr ""
1778 msgstr ""
1779
1779
1780 msgid "detect copies"
1780 msgid "detect copies"
1781 msgstr ""
1781 msgstr ""
1782
1782
1783 msgid "search"
1783 msgid "search"
1784 msgstr ""
1784 msgstr ""
1785
1785
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1787 msgstr ""
1787 msgstr ""
1788
1788
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1790 msgstr ""
1790 msgstr ""
1791
1791
1792 msgid "hg debug-config"
1792 msgid "hg debug-config"
1793 msgstr ""
1793 msgstr ""
1794
1794
1795 msgid "hg debug-merge-base REV REV"
1795 msgid "hg debug-merge-base REV REV"
1796 msgstr ""
1796 msgstr ""
1797
1797
1798 msgid "ignored"
1798 msgid "ignored"
1799 msgstr ""
1799 msgstr ""
1800
1800
1801 msgid "hg debug-rev-parse REV"
1801 msgid "hg debug-rev-parse REV"
1802 msgstr ""
1802 msgstr ""
1803
1803
1804 msgid "header"
1804 msgid "header"
1805 msgstr ""
1805 msgstr ""
1806
1806
1807 msgid "topo-order"
1807 msgid "topo-order"
1808 msgstr ""
1808 msgstr ""
1809
1809
1810 msgid "parents"
1810 msgid "parents"
1811 msgstr ""
1811 msgstr ""
1812
1812
1813 msgid "max-count"
1813 msgid "max-count"
1814 msgstr ""
1814 msgstr ""
1815
1815
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1818
1818
1819 msgid ""
1819 msgid ""
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1821 "\n"
1821 "\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1823 "http://pygments.org/\n"
1823 "http://pygments.org/\n"
1824 "\n"
1824 "\n"
1825 "There is a single configuration option:\n"
1825 "There is a single configuration option:\n"
1826 "\n"
1826 "\n"
1827 "[web]\n"
1827 "[web]\n"
1828 "pygments_style = <style>\n"
1828 "pygments_style = <style>\n"
1829 "\n"
1829 "\n"
1830 "The default is 'colorful'.\n"
1830 "The default is 'colorful'.\n"
1831 msgstr ""
1831 msgstr ""
1832
1832
1833 msgid "accelerate status report using Linux's inotify service"
1833 msgid "accelerate status report using Linux's inotify service"
1834 msgstr ""
1834 msgstr ""
1835
1835
1836 msgid "start an inotify server for this repository"
1836 msgid "start an inotify server for this repository"
1837 msgstr ""
1837 msgstr ""
1838
1838
1839 msgid ""
1839 msgid ""
1840 "debugging information for inotify extension\n"
1840 "debugging information for inotify extension\n"
1841 "\n"
1841 "\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1843 " "
1843 " "
1844 msgstr ""
1844 msgstr ""
1845
1845
1846 msgid "directories being watched:\n"
1846 msgid "directories being watched:\n"
1847 msgstr ""
1847 msgstr ""
1848
1848
1849 msgid "run server in background"
1849 msgid "run server in background"
1850 msgstr ""
1850 msgstr ""
1851
1851
1852 msgid "used internally by daemon mode"
1852 msgid "used internally by daemon mode"
1853 msgstr ""
1853 msgstr ""
1854
1854
1855 msgid "minutes to sit idle before exiting"
1855 msgid "minutes to sit idle before exiting"
1856 msgstr ""
1856 msgstr ""
1857
1857
1858 msgid "name of file to write process ID to"
1858 msgid "name of file to write process ID to"
1859 msgstr ""
1859 msgstr ""
1860
1860
1861 msgid "hg inserve [OPTION]..."
1861 msgid "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1863
1863
1864 msgid "(found dead inotify server socket; removing it)\n"
1864 msgid "(found dead inotify server socket; removing it)\n"
1865 msgstr ""
1865 msgstr ""
1866
1866
1867 msgid "(starting inotify server)\n"
1867 msgid "(starting inotify server)\n"
1868 msgstr ""
1868 msgstr ""
1869
1869
1870 #, python-format
1870 #, python-format
1871 msgid "could not start inotify server: %s\n"
1871 msgid "could not start inotify server: %s\n"
1872 msgstr ""
1872 msgstr ""
1873
1873
1874 #, python-format
1874 #, python-format
1875 msgid "could not talk to new inotify server: %s\n"
1875 msgid "could not talk to new inotify server: %s\n"
1876 msgstr ""
1876 msgstr ""
1877
1877
1878 msgid "(inotify server not running)\n"
1878 msgid "(inotify server not running)\n"
1879 msgstr ""
1879 msgstr ""
1880
1880
1881 #, python-format
1881 #, python-format
1882 msgid "failed to contact inotify server: %s\n"
1882 msgid "failed to contact inotify server: %s\n"
1883 msgstr ""
1883 msgstr ""
1884
1884
1885 msgid "received empty answer from inotify server"
1885 msgid "received empty answer from inotify server"
1886 msgstr ""
1886 msgstr ""
1887
1887
1888 #, python-format
1888 #, python-format
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1890 msgstr ""
1890 msgstr ""
1891
1891
1892 #, python-format
1892 #, python-format
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1894 msgstr ""
1894 msgstr ""
1895
1895
1896 msgid "this system does not seem to support inotify"
1896 msgid "this system does not seem to support inotify"
1897 msgstr ""
1897 msgstr ""
1898
1898
1899 #, python-format
1899 #, python-format
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1901 msgstr ""
1901 msgstr ""
1902
1902
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1904 msgstr ""
1904 msgstr ""
1905
1905
1906 msgid "*** counting directories: "
1906 msgid "*** counting directories: "
1907 msgstr ""
1907 msgstr ""
1908
1908
1909 #, python-format
1909 #, python-format
1910 msgid "found %d\n"
1910 msgid "found %d\n"
1911 msgstr ""
1911 msgstr ""
1912
1912
1913 #, python-format
1913 #, python-format
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1915 msgstr ""
1915 msgstr ""
1916
1916
1917 #, python-format
1917 #, python-format
1918 msgid "*** echo %d > %s\n"
1918 msgid "*** echo %d > %s\n"
1919 msgstr ""
1919 msgstr ""
1920
1920
1921 #, python-format
1921 #, python-format
1922 msgid "cannot watch %s until inotify watch limit is raised"
1922 msgid "cannot watch %s until inotify watch limit is raised"
1923 msgstr ""
1923 msgstr ""
1924
1924
1925 #, python-format
1925 #, python-format
1926 msgid "inotify service not available: %s"
1926 msgid "inotify service not available: %s"
1927 msgstr ""
1927 msgstr ""
1928
1928
1929 #, python-format
1929 #, python-format
1930 msgid "watching %r\n"
1930 msgid "watching %r\n"
1931 msgstr ""
1931 msgstr ""
1932
1932
1933 #, python-format
1933 #, python-format
1934 msgid "watching directories under %r\n"
1934 msgid "watching directories under %r\n"
1935 msgstr ""
1935 msgstr ""
1936
1936
1937 #, python-format
1937 #, python-format
1938 msgid "status: %r dir(%d) -> %s\n"
1938 msgid "status: %r dir(%d) -> %s\n"
1939 msgstr ""
1939 msgstr ""
1940
1940
1941 #, python-format
1941 #, python-format
1942 msgid "status: %r %s -> %s\n"
1942 msgid "status: %r %s -> %s\n"
1943 msgstr ""
1943 msgstr ""
1944
1944
1945 #, python-format
1945 #, python-format
1946 msgid "%s dirstate reload\n"
1946 msgid "%s dirstate reload\n"
1947 msgstr ""
1947 msgstr ""
1948
1948
1949 #, python-format
1949 #, python-format
1950 msgid "%s end dirstate reload\n"
1950 msgid "%s end dirstate reload\n"
1951 msgstr ""
1951 msgstr ""
1952
1952
1953 msgid "rescanning due to .hgignore change\n"
1953 msgid "rescanning due to .hgignore change\n"
1954 msgstr ""
1954 msgstr ""
1955
1955
1956 #, python-format
1956 #, python-format
1957 msgid "%s event: created %s\n"
1957 msgid "%s event: created %s\n"
1958 msgstr ""
1958 msgstr ""
1959
1959
1960 #, python-format
1960 #, python-format
1961 msgid "%s event: deleted %s\n"
1961 msgid "%s event: deleted %s\n"
1962 msgstr ""
1962 msgstr ""
1963
1963
1964 #, python-format
1964 #, python-format
1965 msgid "%s event: modified %s\n"
1965 msgid "%s event: modified %s\n"
1966 msgstr ""
1966 msgstr ""
1967
1967
1968 #, python-format
1968 #, python-format
1969 msgid "filesystem containing %s was unmounted\n"
1969 msgid "filesystem containing %s was unmounted\n"
1970 msgstr ""
1970 msgstr ""
1971
1971
1972 #, python-format
1972 #, python-format
1973 msgid "%s readable: %d bytes\n"
1973 msgid "%s readable: %d bytes\n"
1974 msgstr ""
1974 msgstr ""
1975
1975
1976 #, python-format
1976 #, python-format
1977 msgid "%s below threshold - unhooking\n"
1977 msgid "%s below threshold - unhooking\n"
1978 msgstr ""
1978 msgstr ""
1979
1979
1980 #, python-format
1980 #, python-format
1981 msgid "%s reading %d events\n"
1981 msgid "%s reading %d events\n"
1982 msgstr ""
1982 msgstr ""
1983
1983
1984 #, python-format
1984 #, python-format
1985 msgid "%s hooking back up with %d bytes readable\n"
1985 msgid "%s hooking back up with %d bytes readable\n"
1986 msgstr ""
1986 msgstr ""
1987
1987
1988 #, python-format
1988 #, python-format
1989 msgid "could not start server: %s"
1989 msgid "could not start server: %s"
1990 msgstr ""
1990 msgstr ""
1991
1991
1992 #, python-format
1992 #, python-format
1993 msgid "answering query for %r\n"
1993 msgid "answering query for %r\n"
1994 msgstr ""
1994 msgstr ""
1995
1995
1996 #, python-format
1996 #, python-format
1997 msgid "received query from incompatible client version %d\n"
1997 msgid "received query from incompatible client version %d\n"
1998 msgstr ""
1998 msgstr ""
1999
1999
2000 #, python-format
2000 #, python-format
2001 msgid "unrecognized query type: %s\n"
2001 msgid "unrecognized query type: %s\n"
2002 msgstr ""
2002 msgstr ""
2003
2003
2004 msgid "finished setup\n"
2004 msgid "finished setup\n"
2005 msgstr ""
2005 msgstr ""
2006
2006
2007 msgid ""
2007 msgid ""
2008 "expand expressions into changelog and summaries\n"
2008 "expand expressions into changelog and summaries\n"
2009 "\n"
2009 "\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2011 "which will be automatically expanded into links or any other\n"
2011 "which will be automatically expanded into links or any other\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2013 "\n"
2013 "\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2015 "be used in your hgrc:\n"
2015 "be used in your hgrc:\n"
2016 "\n"
2016 "\n"
2017 " [interhg]\n"
2017 " [interhg]\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2019 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2019 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2020 "i\n"
2020 "i\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2022 msgstr ""
2022 msgstr ""
2023
2023
2024 #, python-format
2024 #, python-format
2025 msgid "interhg: invalid pattern for %s: %s\n"
2025 msgid "interhg: invalid pattern for %s: %s\n"
2026 msgstr ""
2026 msgstr ""
2027
2027
2028 #, python-format
2028 #, python-format
2029 msgid "interhg: invalid regexp for %s: %s\n"
2029 msgid "interhg: invalid regexp for %s: %s\n"
2030 msgstr ""
2030 msgstr ""
2031
2031
2032 msgid ""
2032 msgid ""
2033 "expand keywords in tracked files\n"
2033 "expand keywords in tracked files\n"
2034 "\n"
2034 "\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2036 "tracked text files selected by your configuration.\n"
2036 "tracked text files selected by your configuration.\n"
2037 "\n"
2037 "\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2039 "change history. The mechanism can be regarded as a convenience for the\n"
2039 "change history. The mechanism can be regarded as a convenience for the\n"
2040 "current user or for archive distribution.\n"
2040 "current user or for archive distribution.\n"
2041 "\n"
2041 "\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2043 "hgrc files.\n"
2043 "hgrc files.\n"
2044 "\n"
2044 "\n"
2045 "Example:\n"
2045 "Example:\n"
2046 "\n"
2046 "\n"
2047 " [keyword]\n"
2047 " [keyword]\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2049 " **.py =\n"
2049 " **.py =\n"
2050 " x* = ignore\n"
2050 " x* = ignore\n"
2051 "\n"
2051 "\n"
2052 "Note: the more specific you are in your filename patterns\n"
2052 "Note: the more specific you are in your filename patterns\n"
2053 " the less you lose speed in huge repositories.\n"
2053 " the less you lose speed in huge repositories.\n"
2054 "\n"
2054 "\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2056 "control run \"hg kwdemo\".\n"
2056 "control run \"hg kwdemo\".\n"
2057 "\n"
2057 "\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2059 "\n"
2059 "\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2063 "\n"
2063 "\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2066 "history.\n"
2066 "history.\n"
2067 "\n"
2067 "\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2069 "\"hg kwexpand\".\n"
2069 "\"hg kwexpand\".\n"
2070 "\n"
2070 "\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2072 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2072 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2073 "the files in question to update keyword expansions after all changes\n"
2073 "the files in question to update keyword expansions after all changes\n"
2074 "have been checked in.\n"
2074 "have been checked in.\n"
2075 "\n"
2075 "\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2079 msgstr ""
2079 msgstr ""
2080
2080
2081 #, python-format
2081 #, python-format
2082 msgid "overwriting %s expanding keywords\n"
2082 msgid "overwriting %s expanding keywords\n"
2083 msgstr ""
2083 msgstr ""
2084
2084
2085 #, python-format
2085 #, python-format
2086 msgid "overwriting %s shrinking keywords\n"
2086 msgid "overwriting %s shrinking keywords\n"
2087 msgstr ""
2087 msgstr ""
2088
2088
2089 msgid "[keyword] patterns cannot match"
2089 msgid "[keyword] patterns cannot match"
2090 msgstr ""
2090 msgstr ""
2091
2091
2092 msgid "no [keyword] patterns configured"
2092 msgid "no [keyword] patterns configured"
2093 msgstr ""
2093 msgstr ""
2094
2094
2095 msgid ""
2095 msgid ""
2096 "print [keywordmaps] configuration and an expansion example\n"
2096 "print [keywordmaps] configuration and an expansion example\n"
2097 "\n"
2097 "\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2099 " expansions.\n"
2099 " expansions.\n"
2100 "\n"
2100 "\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2102 " optionally by reading from an additional hgrc file.\n"
2102 " optionally by reading from an additional hgrc file.\n"
2103 "\n"
2103 "\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2105 " "
2105 " "
2106 msgstr ""
2106 msgstr ""
2107
2107
2108 #, python-format
2108 #, python-format
2109 msgid "creating temporary repository at %s\n"
2109 msgid "creating temporary repository at %s\n"
2110 msgstr ""
2110 msgstr ""
2111
2111
2112 #, python-format
2112 #, python-format
2113 msgid ""
2113 msgid ""
2114 "\n"
2114 "\n"
2115 "\tconfig using %s keyword template maps\n"
2115 "\tconfig using %s keyword template maps\n"
2116 msgstr ""
2116 msgstr ""
2117
2117
2118 #, python-format
2118 #, python-format
2119 msgid ""
2119 msgid ""
2120 "\n"
2120 "\n"
2121 "%s keywords written to %s:\n"
2121 "%s keywords written to %s:\n"
2122 msgstr ""
2122 msgstr ""
2123
2123
2124 msgid "unhooked all commit hooks\n"
2124 msgid "unhooked all commit hooks\n"
2125 msgstr ""
2125 msgstr ""
2126
2126
2127 #, python-format
2127 #, python-format
2128 msgid ""
2128 msgid ""
2129 "\n"
2129 "\n"
2130 "\t%s keywords expanded%s\n"
2130 "\t%s keywords expanded%s\n"
2131 msgstr ""
2131 msgstr ""
2132
2132
2133 #, python-format
2133 #, python-format
2134 msgid ""
2134 msgid ""
2135 "\n"
2135 "\n"
2136 "removing temporary repository %s\n"
2136 "removing temporary repository %s\n"
2137 msgstr ""
2137 msgstr ""
2138
2138
2139 msgid ""
2139 msgid ""
2140 "expand keywords in the working directory\n"
2140 "expand keywords in the working directory\n"
2141 "\n"
2141 "\n"
2142 " Run after (re)enabling keyword expansion.\n"
2142 " Run after (re)enabling keyword expansion.\n"
2143 "\n"
2143 "\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2145 " "
2145 " "
2146 msgstr ""
2146 msgstr ""
2147
2147
2148 msgid ""
2148 msgid ""
2149 "show files configured for keyword expansion\n"
2149 "show files configured for keyword expansion\n"
2150 "\n"
2150 "\n"
2151 " List which files in the working directory are matched by the\n"
2151 " List which files in the working directory are matched by the\n"
2152 " [keyword] configuration patterns.\n"
2152 " [keyword] configuration patterns.\n"
2153 "\n"
2153 "\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2155 " execution by including only files that are actual candidates\n"
2155 " execution by including only files that are actual candidates\n"
2156 " for expansion.\n"
2156 " for expansion.\n"
2157 "\n"
2157 "\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2159 " inclusion and exclusion of files.\n"
2159 " inclusion and exclusion of files.\n"
2160 "\n"
2160 "\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2162 "\n"
2162 "\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2164 " of files are:\n"
2164 " of files are:\n"
2165 " K = keyword expansion candidate\n"
2165 " K = keyword expansion candidate\n"
2166 " k = keyword expansion candidate (untracked)\n"
2166 " k = keyword expansion candidate (untracked)\n"
2167 " I = ignored\n"
2167 " I = ignored\n"
2168 " i = ignored (untracked)\n"
2168 " i = ignored (untracked)\n"
2169 " "
2169 " "
2170 msgstr ""
2170 msgstr ""
2171
2171
2172 msgid ""
2172 msgid ""
2173 "revert expanded keywords in the working directory\n"
2173 "revert expanded keywords in the working directory\n"
2174 "\n"
2174 "\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2177 "\n"
2177 "\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2179 " "
2179 " "
2180 msgstr ""
2180 msgstr ""
2181
2181
2182 msgid "show default keyword template maps"
2182 msgid "show default keyword template maps"
2183 msgstr ""
2183 msgstr ""
2184
2184
2185 msgid "read maps from rcfile"
2185 msgid "read maps from rcfile"
2186 msgstr ""
2186 msgstr ""
2187
2187
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2189 msgstr ""
2189 msgstr ""
2190
2190
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2192 msgstr ""
2192 msgstr ""
2193
2193
2194 msgid "show keyword status flags of all files"
2194 msgid "show keyword status flags of all files"
2195 msgstr ""
2195 msgstr ""
2196
2196
2197 msgid "show files excluded from expansion"
2197 msgid "show files excluded from expansion"
2198 msgstr ""
2198 msgstr ""
2199
2199
2200 msgid "additionally show untracked files"
2200 msgid "additionally show untracked files"
2201 msgstr ""
2201 msgstr ""
2202
2202
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2204 msgstr ""
2204 msgstr ""
2205
2205
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2207 msgstr ""
2207 msgstr ""
2208
2208
2209 msgid ""
2209 msgid ""
2210 "manage a stack of patches\n"
2210 "manage a stack of patches\n"
2211 "\n"
2211 "\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2213 "repository. It manages two stacks of patches - all known patches, and\n"
2213 "repository. It manages two stacks of patches - all known patches, and\n"
2214 "applied patches (subset of known patches).\n"
2214 "applied patches (subset of known patches).\n"
2215 "\n"
2215 "\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2218 "\n"
2218 "\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2220 "\n"
2220 "\n"
2221 "prepare repository to work with patches qinit\n"
2221 "prepare repository to work with patches qinit\n"
2222 "create new patch qnew\n"
2222 "create new patch qnew\n"
2223 "import existing patch qimport\n"
2223 "import existing patch qimport\n"
2224 "\n"
2224 "\n"
2225 "print patch series qseries\n"
2225 "print patch series qseries\n"
2226 "print applied patches qapplied\n"
2226 "print applied patches qapplied\n"
2227 "print name of top applied patch qtop\n"
2227 "print name of top applied patch qtop\n"
2228 "\n"
2228 "\n"
2229 "add known patch to applied stack qpush\n"
2229 "add known patch to applied stack qpush\n"
2230 "remove patch from applied stack qpop\n"
2230 "remove patch from applied stack qpop\n"
2231 "refresh contents of top applied patch qrefresh\n"
2231 "refresh contents of top applied patch qrefresh\n"
2232 msgstr ""
2232 msgstr ""
2233 "gestion et utilisation d'une pile de patchs\n"
2233 "gestion et utilisation d'une pile de patchs\n"
2234 "\n"
2234 "\n"
2235 "Cette extension permet de travailler avec une pile de patchs au\n"
2235 "Cette extension permet de travailler avec une pile de patchs au\n"
2236 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
2236 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
2237 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2237 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2238 "qui ont été appliqués.\n"
2238 "qui ont été appliqués.\n"
2239 "\n"
2239 "\n"
2240 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2240 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2241 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
2241 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
2242 "appliqués sont présents à la fois sous forme de fichier et de\n"
2242 "appliqués sont présents à la fois sous forme de fichier et de\n"
2243 "\"changesets\".\n"
2243 "\"changesets\".\n"
2244 "\n"
2244 "\n"
2245 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2245 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2246 "\n"
2246 "\n"
2247 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2247 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2248 "créer un nouveau patch qnew\n"
2248 "créer un nouveau patch qnew\n"
2249 "importer un patch existant qimport\n"
2249 "importer un patch existant qimport\n"
2250 "\n"
2250 "\n"
2251 "afficher la série de patchs complète qseries\n"
2251 "afficher la série de patchs complète qseries\n"
2252 "afficher les patchs appliqués qapplied\n"
2252 "afficher les patchs appliqués qapplied\n"
2253 "afficher le nom du dernier patch appliqué qtop\n"
2253 "afficher le nom du dernier patch appliqué qtop\n"
2254 "\n"
2254 "\n"
2255 "empiler/appliquer un patch référencé sur la pile qpush\n"
2255 "empiler/appliquer un patch référencé sur la pile qpush\n"
2256 "dépiler/ôter un patch de la pile qpop\n"
2256 "dépiler/ôter un patch de la pile qpop\n"
2257 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2257 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2258
2258
2259 #, python-format
2259 #, python-format
2260 msgid "%s appears more than once in %s"
2260 msgid "%s appears more than once in %s"
2261 msgstr "%s apparaît plus d'une fois dans %s"
2261 msgstr "%s apparaît plus d'une fois dans %s"
2262
2262
2263 msgid "guard cannot be an empty string"
2263 msgid "guard cannot be an empty string"
2264 msgstr ""
2264 msgstr ""
2265
2265
2266 #, python-format
2266 #, python-format
2267 msgid "guard %r starts with invalid character: %r"
2267 msgid "guard %r starts with invalid character: %r"
2268 msgstr ""
2268 msgstr ""
2269
2269
2270 #, python-format
2270 #, python-format
2271 msgid "invalid character in guard %r: %r"
2271 msgid "invalid character in guard %r: %r"
2272 msgstr ""
2272 msgstr ""
2273
2273
2274 #, python-format
2274 #, python-format
2275 msgid "active guards: %s\n"
2275 msgid "active guards: %s\n"
2276 msgstr ""
2276 msgstr ""
2277
2277
2278 #, python-format
2278 #, python-format
2279 msgid "guard %r too short"
2279 msgid "guard %r too short"
2280 msgstr ""
2280 msgstr ""
2281
2281
2282 #, python-format
2282 #, python-format
2283 msgid "guard %r starts with invalid char"
2283 msgid "guard %r starts with invalid char"
2284 msgstr ""
2284 msgstr ""
2285
2285
2286 #, python-format
2286 #, python-format
2287 msgid "allowing %s - no guards in effect\n"
2287 msgid "allowing %s - no guards in effect\n"
2288 msgstr ""
2288 msgstr ""
2289
2289
2290 #, python-format
2290 #, python-format
2291 msgid "allowing %s - no matching negative guards\n"
2291 msgid "allowing %s - no matching negative guards\n"
2292 msgstr ""
2292 msgstr ""
2293
2293
2294 #, python-format
2294 #, python-format
2295 msgid "allowing %s - guarded by %r\n"
2295 msgid "allowing %s - guarded by %r\n"
2296 msgstr ""
2296 msgstr ""
2297
2297
2298 #, python-format
2298 #, python-format
2299 msgid "skipping %s - guarded by %r\n"
2299 msgid "skipping %s - guarded by %r\n"
2300 msgstr ""
2300 msgstr ""
2301
2301
2302 #, python-format
2302 #, python-format
2303 msgid "skipping %s - no matching guards\n"
2303 msgid "skipping %s - no matching guards\n"
2304 msgstr ""
2304 msgstr ""
2305
2305
2306 #, python-format
2306 #, python-format
2307 msgid "error removing undo: %s\n"
2307 msgid "error removing undo: %s\n"
2308 msgstr ""
2308 msgstr ""
2309
2309
2310 #, python-format
2310 #, python-format
2311 msgid "apply failed for patch %s"
2311 msgid "apply failed for patch %s"
2312 msgstr "l'application du patch %s a échoué"
2312 msgstr "l'application du patch %s a échoué"
2313
2313
2314 #, python-format
2314 #, python-format
2315 msgid "patch didn't work out, merging %s\n"
2315 msgid "patch didn't work out, merging %s\n"
2316 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2316 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2317
2317
2318 #, python-format
2318 #, python-format
2319 msgid "update returned %d"
2319 msgid "update returned %d"
2320 msgstr ""
2320 msgstr ""
2321
2321
2322 msgid "repo commit failed"
2322 msgid "repo commit failed"
2323 msgstr ""
2323 msgstr ""
2324
2324
2325 #, python-format
2325 #, python-format
2326 msgid "unable to read %s"
2326 msgid "unable to read %s"
2327 msgstr "impossible de lire %s"
2327 msgstr "impossible de lire %s"
2328
2328
2329 #, python-format
2329 #, python-format
2330 msgid "patch %s does not exist\n"
2330 msgid "patch %s does not exist\n"
2331 msgstr "le patch %s n'existe pas\n"
2331 msgstr "le patch %s n'existe pas\n"
2332
2332
2333 #, python-format
2333 #, python-format
2334 msgid "patch %s is not applied\n"
2334 msgid "patch %s is not applied\n"
2335 msgstr "le patch %s n'est pas appliqué\n"
2335 msgstr "le patch %s n'est pas appliqué\n"
2336
2336
2337 msgid "patch failed, unable to continue (try -v)\n"
2337 msgid "patch failed, unable to continue (try -v)\n"
2338 msgstr ""
2338 msgstr ""
2339 "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2339 "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2340
2340
2341 #, python-format
2341 #, python-format
2342 msgid "applying %s\n"
2342 msgid "applying %s\n"
2343 msgstr "application de %s\n"
2343 msgstr "application de %s\n"
2344
2344
2345 #, python-format
2345 #, python-format
2346 msgid "unable to read %s\n"
2346 msgid "unable to read %s\n"
2347 msgstr "impossible de lire %s\n"
2347 msgstr "impossible de lire %s\n"
2348
2348
2349 #, python-format
2349 #, python-format
2350 msgid "imported patch %s\n"
2350 msgid "imported patch %s\n"
2351 msgstr "le patch %s a été importé\n"
2351 msgstr "le patch %s a été importé\n"
2352
2352
2353 #, python-format
2353 #, python-format
2354 msgid ""
2354 msgid ""
2355 "\n"
2355 "\n"
2356 "imported patch %s"
2356 "imported patch %s"
2357 msgstr ""
2357 msgstr ""
2358 "\n"
2358 "\n"
2359 "le patch %s a été importé"
2359 "le patch %s a été importé"
2360
2360
2361 #, python-format
2361 #, python-format
2362 msgid "patch %s is empty\n"
2362 msgid "patch %s is empty\n"
2363 msgstr "le patch %s est vide\n"
2363 msgstr "le patch %s est vide\n"
2364
2364
2365 msgid "patch failed, rejects left in working dir\n"
2365 msgid "patch failed, rejects left in working dir\n"
2366 msgstr ""
2366 msgstr ""
2367
2367
2368 msgid "fuzz found when applying patch, stopping\n"
2368 msgid "fuzz found when applying patch, stopping\n"
2369 msgstr ""
2369 msgstr ""
2370
2370
2371 #, python-format
2371 #, python-format
2372 msgid "revision %d is not managed"
2372 msgid "revision %d is not managed"
2373 msgstr "la révision %d n'est pas gérée"
2373 msgstr "la révision %d n'est pas gérée"
2374
2374
2375 #, python-format
2375 #, python-format
2376 msgid "cannot delete revision %d above applied patches"
2376 msgid "cannot delete revision %d above applied patches"
2377 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2377 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2378
2378
2379 #, python-format
2379 #, python-format
2380 msgid "patch %s finalized without changeset message\n"
2380 msgid "patch %s finalized without changeset message\n"
2381 msgstr ""
2381 msgstr ""
2382
2382
2383 msgid "qdelete requires at least one revision or patch name"
2383 msgid "qdelete requires at least one revision or patch name"
2384 msgstr "qdelete requiert au moins une révision ou le nom d'un patch"
2384 msgstr "qdelete requiert au moins une révision ou le nom d'un patch"
2385
2385
2386 #, python-format
2386 #, python-format
2387 msgid "cannot delete applied patch %s"
2387 msgid "cannot delete applied patch %s"
2388 msgstr "impossible de supprimer le patch appliqué %s"
2388 msgstr "impossible de supprimer le patch appliqué %s"
2389
2389
2390 #, python-format
2390 #, python-format
2391 msgid "patch %s not in series file"
2391 msgid "patch %s not in series file"
2392 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2392 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2393
2393
2394 msgid "no patches applied"
2394 msgid "no patches applied"
2395 msgstr "pas de patchs appliqués"
2395 msgstr "pas de patchs appliqués"
2396
2396
2397 msgid "working directory revision is not qtip"
2397 msgid "working directory revision is not qtip"
2398 msgstr "le répertoire de travail n'est pas à la révision qtip"
2398 msgstr "le répertoire de travail n'est pas à la révision qtip"
2399
2399
2400 msgid "local changes found, refresh first"
2400 msgid "local changes found, refresh first"
2401 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2401 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2402
2402
2403 msgid "local changes found"
2403 msgid "local changes found"
2404 msgstr "modifications locales trouvées"
2404 msgstr "modifications locales trouvées"
2405
2405
2406 #, python-format
2406 #, python-format
2407 msgid "\"%s\" cannot be used as the name of a patch"
2407 msgid "\"%s\" cannot be used as the name of a patch"
2408 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2408 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2409
2409
2410 #, python-format
2410 #, python-format
2411 msgid "patch \"%s\" already exists"
2411 msgid "patch \"%s\" already exists"
2412 msgstr "le patch \"%s\" existe déjà"
2412 msgstr "le patch \"%s\" existe déjà"
2413
2413
2414 #, python-format
2414 #, python-format
2415 msgid "error unlinking %s\n"
2415 msgid "error unlinking %s\n"
2416 msgstr "erreur lors de la suppression de %s\n"
2416 msgstr "erreur lors de la suppression de %s\n"
2417
2417
2418 #, python-format
2418 #, python-format
2419 msgid "patch name \"%s\" is ambiguous:\n"
2419 msgid "patch name \"%s\" is ambiguous:\n"
2420 msgstr "\"%s\" est un nom de patch ambigu :\n"
2420 msgstr "\"%s\" est un nom de patch ambigu :\n"
2421
2421
2422 #, python-format
2422 #, python-format
2423 msgid "patch %s not in series"
2423 msgid "patch %s not in series"
2424 msgstr "le patch %s ne figure pas dans la série"
2424 msgstr "le patch %s ne figure pas dans la série"
2425
2425
2426 #, fuzzy
2426 #, fuzzy
2427 msgid "(working directory not at a head)\n"
2427 msgid "(working directory not at a head)\n"
2428 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2428 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2429
2429
2430 msgid "no patches in series\n"
2430 msgid "no patches in series\n"
2431 msgstr "pas de patchs dans la série\n"
2431 msgstr "pas de patchs dans la série\n"
2432
2432
2433 #, python-format
2433 #, python-format
2434 msgid "cannot push to a previous patch: %s"
2434 msgid "cannot push to a previous patch: %s"
2435 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2435 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2436
2436
2437 #, python-format
2437 #, python-format
2438 msgid "qpush: %s is already at the top\n"
2438 msgid "qpush: %s is already at the top\n"
2439 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2439 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2440
2440
2441 #, python-format
2441 #, python-format
2442 msgid "guarded by %r"
2442 msgid "guarded by %r"
2443 msgstr ""
2443 msgstr ""
2444
2444
2445 msgid "no matching guards"
2445 msgid "no matching guards"
2446 msgstr ""
2446 msgstr ""
2447
2447
2448 #, python-format
2448 #, python-format
2449 msgid "cannot push '%s' - %s\n"
2449 msgid "cannot push '%s' - %s\n"
2450 msgstr "impossible d'empiler '%s' - %s\n"
2450 msgstr "impossible d'empiler '%s' - %s\n"
2451
2451
2452 msgid "all patches are currently applied\n"
2452 msgid "all patches are currently applied\n"
2453 msgstr "tous les patchs sont actuellement appliqués\n"
2453 msgstr "tous les patchs sont actuellement appliqués\n"
2454
2454
2455 msgid "patch series already fully applied\n"
2455 msgid "patch series already fully applied\n"
2456 msgstr "la série de patchs est déjà complètement appliquée\n"
2456 msgstr "la série de patchs est déjà complètement appliquée\n"
2457
2457
2458 msgid "cleaning up working directory..."
2458 msgid "cleaning up working directory..."
2459 msgstr "nettoyage du répertoire de travail..."
2459 msgstr "nettoyage du répertoire de travail..."
2460
2460
2461 #, python-format
2461 #, python-format
2462 msgid "errors during apply, please fix and refresh %s\n"
2462 msgid "errors during apply, please fix and refresh %s\n"
2463 msgstr ""
2463 msgstr ""
2464 "des erreurs se sont produites durant l'application, veuillez corriger puis "
2464 "des erreurs se sont produites durant l'application, veuillez corriger puis "
2465 "rafraîchir %s\n"
2465 "rafraîchir %s\n"
2466
2466
2467 #, python-format
2467 #, python-format
2468 msgid "now at: %s\n"
2468 msgid "now at: %s\n"
2469 msgstr "actuellement à : %s\n"
2469 msgstr "actuellement à : %s\n"
2470
2470
2471 #, python-format
2471 #, python-format
2472 msgid "patch %s is not applied"
2472 msgid "patch %s is not applied"
2473 msgstr "le patch %s n'est pas appliqué"
2473 msgstr "le patch %s n'est pas appliqué"
2474
2474
2475 msgid "no patches applied\n"
2475 msgid "no patches applied\n"
2476 msgstr "aucun patch appliqué\n"
2476 msgstr "aucun patch appliqué\n"
2477
2477
2478 #, python-format
2478 #, python-format
2479 msgid "qpop: %s is already at the top\n"
2479 msgid "qpop: %s is already at the top\n"
2480 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2480 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2481
2481
2482 msgid "qpop: forcing dirstate update\n"
2482 msgid "qpop: forcing dirstate update\n"
2483 msgstr ""
2483 msgstr ""
2484 "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2484 "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2485
2485
2486 #, python-format
2486 #, python-format
2487 msgid "trying to pop unknown node %s"
2487 msgid "trying to pop unknown node %s"
2488 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2488 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2489
2489
2490 msgid "popping would remove a revision not managed by this patch queue"
2490 msgid "popping would remove a revision not managed by this patch queue"
2491 msgstr ""
2491 msgstr ""
2492 "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2492 "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2493
2493
2494 msgid "deletions found between repo revs"
2494 msgid "deletions found between repo revs"
2495 msgstr "suppressions trouvées entre des révisions du dépôt"
2495 msgstr "suppressions trouvées entre des révisions du dépôt"
2496
2496
2497 msgid "patch queue now empty\n"
2497 msgid "patch queue now empty\n"
2498 msgstr "la pile de patchs est maintenant vide\n"
2498 msgstr "la pile de patchs est maintenant vide\n"
2499
2499
2500 msgid "cannot refresh a revision with children"
2500 msgid "cannot refresh a revision with children"
2501 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2501 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2502
2502
2503 # restaurer/récupérer ? pas satisfait...
2503 # restaurer/récupérer ? pas satisfait...
2504 msgid ""
2504 msgid ""
2505 "refresh interrupted while patch was popped! (revert --all, qpush to "
2505 "refresh interrupted while patch was popped! (revert --all, qpush to "
2506 "recover)\n"
2506 "recover)\n"
2507 msgstr ""
2507 msgstr ""
2508 "rafraîchissement interrompu alors qu'un patch était en cours de dépilement "
2508 "rafraîchissement interrompu alors qu'un patch était en cours de dépilement "
2509 "(utiliser revert --all, ou qpush pour restaurer l'état)\n"
2509 "(utiliser revert --all, ou qpush pour restaurer l'état)\n"
2510
2510
2511 msgid "patch queue directory already exists"
2511 msgid "patch queue directory already exists"
2512 msgstr "la pile de patchs existe déjà"
2512 msgstr "la pile de patchs existe déjà"
2513
2513
2514 #, python-format
2514 #, python-format
2515 msgid "patch %s is not in series file"
2515 msgid "patch %s is not in series file"
2516 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2516 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2517
2517
2518 msgid "No saved patch data found\n"
2518 msgid "No saved patch data found\n"
2519 msgstr ""
2519 msgstr ""
2520
2520
2521 #, python-format
2521 #, python-format
2522 msgid "restoring status: %s\n"
2522 msgid "restoring status: %s\n"
2523 msgstr "rétablissement de l'état : %s\n"
2523 msgstr "rétablissement de l'état : %s\n"
2524
2524
2525 msgid "save entry has children, leaving it alone\n"
2525 msgid "save entry has children, leaving it alone\n"
2526 msgstr ""
2526 msgstr ""
2527
2527
2528 #, python-format
2528 #, python-format
2529 msgid "removing save entry %s\n"
2529 msgid "removing save entry %s\n"
2530 msgstr ""
2530 msgstr ""
2531
2531
2532 #, python-format
2532 #, python-format
2533 msgid "saved queue repository parents: %s %s\n"
2533 msgid "saved queue repository parents: %s %s\n"
2534 msgstr ""
2534 msgstr ""
2535
2535
2536 msgid "queue directory updating\n"
2536 msgid "queue directory updating\n"
2537 msgstr "mise à jour du répertoire de patchs\n"
2537 msgstr "mise à jour du répertoire de patchs\n"
2538
2538
2539 msgid "Unable to load queue repository\n"
2539 msgid "Unable to load queue repository\n"
2540 msgstr "Impossible de charger le dépôt de patchs\n"
2540 msgstr "Impossible de charger le dépôt de patchs\n"
2541
2541
2542 msgid "save: no patches applied, exiting\n"
2542 msgid "save: no patches applied, exiting\n"
2543 msgstr ""
2543 msgstr ""
2544
2544
2545 msgid "status is already saved\n"
2545 msgid "status is already saved\n"
2546 msgstr "l'état a déjà été sauvegardé\n"
2546 msgstr "l'état a déjà été sauvegardé\n"
2547
2547
2548 msgid "hg patches saved state"
2548 msgid "hg patches saved state"
2549 msgstr ""
2549 msgstr ""
2550
2550
2551 msgid "repo commit failed\n"
2551 msgid "repo commit failed\n"
2552 msgstr ""
2552 msgstr ""
2553
2553
2554 #, python-format
2554 #, python-format
2555 msgid "patch %s is already in the series file"
2555 msgid "patch %s is already in the series file"
2556 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2556 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2557
2557
2558 msgid "option \"-r\" not valid when importing files"
2558 msgid "option \"-r\" not valid when importing files"
2559 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2559 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2560
2560
2561 msgid "option \"-n\" not valid when importing multiple patches"
2561 msgid "option \"-n\" not valid when importing multiple patches"
2562 msgstr ""
2562 msgstr ""
2563 "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs "
2563 "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs "
2564 "patchs"
2564 "patchs"
2565
2565
2566 # origine/base/racine ?
2566 # origine/base/racine ?
2567 #, python-format
2567 #, python-format
2568 msgid "revision %d is the root of more than one branch"
2568 msgid "revision %d is the root of more than one branch"
2569 msgstr "la révision %d est à l'origine de plus d'une branche"
2569 msgstr "la révision %d est à l'origine de plus d'une branche"
2570
2570
2571 #, python-format
2571 #, python-format
2572 msgid "revision %d is already managed"
2572 msgid "revision %d is already managed"
2573 msgstr "la révision %d est déjà gérée"
2573 msgstr "la révision %d est déjà gérée"
2574
2574
2575 #, python-format
2575 #, python-format
2576 msgid "revision %d is not the parent of the queue"
2576 msgid "revision %d is not the parent of the queue"
2577 msgstr "la révision %d n'est pas parente de la pile"
2577 msgstr "la révision %d n'est pas parente de la pile"
2578
2578
2579 #, python-format
2579 #, python-format
2580 msgid "revision %d has unmanaged children"
2580 msgid "revision %d has unmanaged children"
2581 msgstr "la révision %d possède des révisions filles non gérées"
2581 msgstr "la révision %d possède des révisions filles non gérées"
2582
2582
2583 #, python-format
2583 #, python-format
2584 msgid "cannot import merge revision %d"
2584 msgid "cannot import merge revision %d"
2585 msgstr "impossible d'importer la révision fusionnée %d"
2585 msgstr "impossible d'importer la révision fusionnée %d"
2586
2586
2587 #, python-format
2587 #, python-format
2588 msgid "revision %d is not the parent of %d"
2588 msgid "revision %d is not the parent of %d"
2589 msgstr "%d n'est pas la révision parente de %d"
2589 msgstr "%d n'est pas la révision parente de %d"
2590
2590
2591 msgid "-e is incompatible with import from -"
2591 msgid "-e is incompatible with import from -"
2592 msgstr "-e n'est pas compatible avec l'importation depuis -"
2592 msgstr "-e n'est pas compatible avec l'importation depuis -"
2593
2593
2594 #, python-format
2594 #, python-format
2595 msgid "patch %s does not exist"
2595 msgid "patch %s does not exist"
2596 msgstr "le patch %s n'existe pas"
2596 msgstr "le patch %s n'existe pas"
2597
2597
2598 msgid "need --name to import a patch from -"
2598 msgid "need --name to import a patch from -"
2599 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
2599 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
2600
2600
2601 #, python-format
2601 #, python-format
2602 msgid "adding %s to series file\n"
2602 msgid "adding %s to series file\n"
2603 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2603 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2604
2604
2605 msgid ""
2605 msgid ""
2606 "remove patches from queue\n"
2606 "remove patches from queue\n"
2607 "\n"
2607 "\n"
2608 " The patches must not be applied, and at least one patch is required. "
2608 " The patches must not be applied, and at least one patch is required. "
2609 "With\n"
2609 "With\n"
2610 " -k/--keep, the patch files are preserved in the patch directory.\n"
2610 " -k/--keep, the patch files are preserved in the patch directory.\n"
2611 "\n"
2611 "\n"
2612 " To stop managing a patch and move it into permanent history,\n"
2612 " To stop managing a patch and move it into permanent history,\n"
2613 " use the qfinish command."
2613 " use the qfinish command."
2614
2614
2615 msgstr ""
2615 msgstr ""
2616 "supprime des patchs de la pile\n"
2616 "supprime des patchs de la pile\n"
2617 "\n"
2617 "\n"
2618 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
2618 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
2619 " nécessaire de fournir au moins un patch.\n"
2619 " nécessaire de fournir au moins un patch.\n"
2620 "\n"
2620 "\n"
2621 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
2621 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
2622 " de patchs.\n"
2622 " de patchs.\n"
2623 "\n"
2623 "\n"
2624 " Pour arrêter de gérer un patch et le déplacer de manière\n"
2624 " Pour arrêter de gérer un patch et le déplacer de manière\n"
2625 " permanente vers l'historique du dépôt, utilisez la commande\n"
2625 " permanente vers l'historique du dépôt, utilisez la commande\n"
2626 " qfinish."
2626 " qfinish."
2627
2627
2628 msgid "print the patches already applied"
2628 msgid "print the patches already applied"
2629 msgstr "affiche les patchs déjà appliqués"
2629 msgstr "affiche les patchs déjà appliqués"
2630
2630
2631 msgid "print the patches not yet applied"
2631 msgid "print the patches not yet applied"
2632 msgstr "affiche les patchs non encore appliqués"
2632 msgstr "affiche les patchs non encore appliqués"
2633
2633
2634 msgid ""
2634 msgid ""
2635 "import a patch\n"
2635 "import a patch\n"
2636 "\n"
2636 "\n"
2637 " The patch is inserted into the series after the last applied\n"
2637 " The patch is inserted into the series after the last applied\n"
2638 " patch. If no patches have been applied, qimport prepends the patch\n"
2638 " patch. If no patches have been applied, qimport prepends the patch\n"
2639 " to the series.\n"
2639 " to the series.\n"
2640 "\n"
2640 "\n"
2641 " The patch will have the same name as its source file unless you\n"
2641 " The patch will have the same name as its source file unless you\n"
2642 " give it a new one with -n/--name.\n"
2642 " give it a new one with -n/--name.\n"
2643 "\n"
2643 "\n"
2644 " You can register an existing patch inside the patch directory with\n"
2644 " You can register an existing patch inside the patch directory with\n"
2645 " the -e/--existing flag.\n"
2645 " the -e/--existing flag.\n"
2646 "\n"
2646 "\n"
2647 " With -f/--force, an existing patch of the same name will be\n"
2647 " With -f/--force, an existing patch of the same name will be\n"
2648 " overwritten.\n"
2648 " overwritten.\n"
2649 "\n"
2649 "\n"
2650 " An existing changeset may be placed under mq control with -r/--rev\n"
2650 " An existing changeset may be placed under mq control with -r/--rev\n"
2651 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2651 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2652 " With -g/--git, patches imported with --rev will use the git diff\n"
2652 " With -g/--git, patches imported with --rev will use the git diff\n"
2653 " format. See the diffs help topic for information on why this is\n"
2653 " format. See the diffs help topic for information on why this is\n"
2654 " important for preserving rename/copy information and permission\n"
2654 " important for preserving rename/copy information and permission\n"
2655 " changes.\n"
2655 " changes.\n"
2656 "\n"
2656 "\n"
2657 " To import a patch from standard input, pass - as the patch file.\n"
2657 " To import a patch from standard input, pass - as the patch file.\n"
2658 " When importing from standard input, a patch name must be specified\n"
2658 " When importing from standard input, a patch name must be specified\n"
2659 " using the --name flag.\n"
2659 " using the --name flag.\n"
2660 " "
2660 " "
2661 msgstr ""
2661 msgstr ""
2662 "importe un patch\n"
2662 "importe un patch\n"
2663 "\n"
2663 "\n"
2664 " Le patch est inséré dans la série à la suite du dernier patch\n"
2664 " Le patch est inséré dans la série à la suite du dernier patch\n"
2665 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
2665 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
2666 " ajouté en tête de série.\n"
2666 " ajouté en tête de série.\n"
2667 "\n"
2667 "\n"
2668 " Le patch portera le même nom que le fichier dont il provient,\n"
2668 " Le patch portera le même nom que le fichier dont il provient,\n"
2669 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
2669 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
2670 "\n"
2670 "\n"
2671 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
2671 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
2672 " de patchs à l'aide de l'option -e/--existing.\n"
2672 " de patchs à l'aide de l'option -e/--existing.\n"
2673 "\n"
2673 "\n"
2674 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
2674 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
2675 "\n"
2675 "\n"
2676 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
2676 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
2677 " à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n"
2677 " à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n"
2678 " placera la révision tip sous le contrôle de mq).\n"
2678 " placera la révision tip sous le contrôle de mq).\n"
2679 " Avec -g/--git, les patchs importés à l'aide de --rev seront\n"
2679 " Avec -g/--git, les patchs importés à l'aide de --rev seront\n"
2680 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
2680 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
2681 " l'aide explique l'importance de cette option pour la\n"
2681 " l'aide explique l'importance de cette option pour la\n"
2682 " préservation des informations de copie/renommage et des\n"
2682 " préservation des informations de copie/renommage et des\n"
2683 " modifications de permissions.\n"
2683 " modifications de permissions.\n"
2684 "\n"
2684 "\n"
2685 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
2685 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
2686 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
2686 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
2687 " patch à l'aide de l'option --name.\n"
2687 " patch à l'aide de l'option --name.\n"
2688 " "
2688 " "
2689
2689
2690 msgid ""
2690 msgid ""
2691 "init a new queue repository\n"
2691 "init a new queue repository\n"
2692 "\n"
2692 "\n"
2693 " The queue repository is unversioned by default. If\n"
2693 " The queue repository is unversioned by default. If\n"
2694 " -c/--create-repo is specified, qinit will create a separate nested\n"
2694 " -c/--create-repo is specified, qinit will create a separate nested\n"
2695 " repository for patches (qinit -c may also be run later to convert\n"
2695 " repository for patches (qinit -c may also be run later to convert\n"
2696 " an unversioned patch repository into a versioned one). You can use\n"
2696 " an unversioned patch repository into a versioned one). You can use\n"
2697 " qcommit to commit changes to this queue repository."
2697 " qcommit to commit changes to this queue repository."
2698 msgstr ""
2698 msgstr ""
2699
2699
2700 msgid ""
2700 msgid ""
2701 "clone main and patch repository at same time\n"
2701 "clone main and patch repository at same time\n"
2702 "\n"
2702 "\n"
2703 " If source is local, destination will have no patches applied. If\n"
2703 " If source is local, destination will have no patches applied. If\n"
2704 " source is remote, this command can not check if patches are\n"
2704 " source is remote, this command can not check if patches are\n"
2705 " applied in source, so cannot guarantee that patches are not\n"
2705 " applied in source, so cannot guarantee that patches are not\n"
2706 " applied in destination. If you clone remote repository, be sure\n"
2706 " applied in destination. If you clone remote repository, be sure\n"
2707 " before that it has no patches applied.\n"
2707 " before that it has no patches applied.\n"
2708 "\n"
2708 "\n"
2709 " Source patch repository is looked for in <src>/.hg/patches by\n"
2709 " Source patch repository is looked for in <src>/.hg/patches by\n"
2710 " default. Use -p <url> to change.\n"
2710 " default. Use -p <url> to change.\n"
2711 "\n"
2711 "\n"
2712 " The patch directory must be a nested Mercurial repository, as\n"
2712 " The patch directory must be a nested Mercurial repository, as\n"
2713 " would be created by qinit -c.\n"
2713 " would be created by qinit -c.\n"
2714 " "
2714 " "
2715 msgstr ""
2715 msgstr ""
2716 "clône simultanément le dépôt principal et le dépôt des patchs\n"
2716 "clône simultanément le dépôt principal et le dépôt des patchs\n"
2717 "\n"
2717 "\n"
2718 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
2718 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
2719 " cible. En revanche, si la source est distante, cette commande\n"
2719 " cible. En revanche, si la source est distante, cette commande\n"
2720 " n'est pas en mesure de vérifier si des patchs y ont été\n"
2720 " n'est pas en mesure de vérifier si des patchs y ont été\n"
2721 " empilés, et par conséquent ne peut garantir qu'aucun patch\n"
2721 " empilés, et par conséquent ne peut garantir qu'aucun patch\n"
2722 " ne sera appliqué au dessus de la cible. Autrement dit, si vous\n"
2722 " ne sera appliqué au dessus de la cible. Autrement dit, si vous\n"
2723 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
2723 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
2724 " aucun patch d'appliqué.\n"
2724 " aucun patch d'appliqué.\n"
2725 "\n"
2725 "\n"
2726 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
2726 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
2727 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
2727 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
2728 " un chemin différent.\n"
2728 " un chemin différent.\n"
2729 "\n"
2729 "\n"
2730 " Le répertoire de patchs doit être contenu dans le dépôt\n"
2730 " Le répertoire de patchs doit être contenu dans le dépôt\n"
2731 " principal, tel que créé par qinit -c.\n"
2731 " principal, tel que créé par qinit -c.\n"
2732 " "
2732 " "
2733
2733
2734 msgid "versioned patch repository not found (see qinit -c)"
2734 msgid "versioned patch repository not found (see qinit -c)"
2735 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
2735 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
2736
2736
2737 msgid "cloning main repository\n"
2737 msgid "cloning main repository\n"
2738 msgstr "clônage du dépôt principal\n"
2738 msgstr "clônage du dépôt principal\n"
2739
2739
2740 msgid "cloning patch repository\n"
2740 msgid "cloning patch repository\n"
2741 msgstr "clônage du dépôt des patchs\n"
2741 msgstr "clônage du dépôt des patchs\n"
2742
2742
2743 msgid "stripping applied patches from destination repository\n"
2743 msgid "stripping applied patches from destination repository\n"
2744 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
2744 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
2745
2745
2746 msgid "updating destination repository\n"
2746 msgid "updating destination repository\n"
2747 msgstr "mise à jour du dépôt cible\n"
2747 msgstr "mise à jour du dépôt cible\n"
2748
2748
2749 msgid "commit changes in the queue repository"
2749 msgid "commit changes in the queue repository"
2750 msgstr ""
2750 msgstr ""
2751
2751
2752 msgid "print the entire series file"
2752 msgid "print the entire series file"
2753 msgstr "afficher la liste complète de patchs (fichier \"series\")"
2753 msgstr "afficher la liste complète de patchs (fichier \"series\")"
2754
2754
2755 msgid "print the name of the current patch"
2755 msgid "print the name of the current patch"
2756 msgstr "affiche le nom du dernier patch appliqué"
2756 msgstr "affiche le nom du dernier patch appliqué"
2757
2757
2758 msgid "print the name of the next patch"
2758 msgid "print the name of the next patch"
2759 msgstr "affiche le nom du prochain patch"
2759 msgstr "affiche le nom du prochain patch"
2760
2760
2761 msgid "all patches applied\n"
2761 msgid "all patches applied\n"
2762 msgstr "tous les patchs ont été appliqués\n"
2762 msgstr "tous les patchs ont été appliqués\n"
2763
2763
2764 msgid "print the name of the previous patch"
2764 msgid "print the name of the previous patch"
2765 msgstr "affiche le nom du patch précédent"
2765 msgstr "affiche le nom du patch précédent"
2766
2766
2767 msgid "only one patch applied\n"
2767 msgid "only one patch applied\n"
2768 msgstr "un seul patch d'appliqué\n"
2768 msgstr "un seul patch d'appliqué\n"
2769
2769
2770 msgid ""
2770 msgid ""
2771 "create a new patch\n"
2771 "create a new patch\n"
2772 "\n"
2772 "\n"
2773 " qnew creates a new patch on top of the currently-applied patch (if\n"
2773 " qnew creates a new patch on top of the currently-applied patch (if\n"
2774 " any). It will refuse to run if there are any outstanding changes\n"
2774 " any). It will refuse to run if there are any outstanding changes\n"
2775 " unless -f/--force is specified, in which case the patch will be\n"
2775 " unless -f/--force is specified, in which case the patch will be\n"
2776 " initialized with them. You may also use -I/--include,\n"
2776 " initialized with them. You may also use -I/--include,\n"
2777 " -X/--exclude, and/or a list of files after the patch name to add\n"
2777 " -X/--exclude, and/or a list of files after the patch name to add\n"
2778 " only changes to matching files to the new patch, leaving the rest\n"
2778 " only changes to matching files to the new patch, leaving the rest\n"
2779 " as uncommitted modifications.\n"
2779 " as uncommitted modifications.\n"
2780 "\n"
2780 "\n"
2781 " -u/--user and -d/--date can be used to set the (given) user and\n"
2781 " -u/--user and -d/--date can be used to set the (given) user and\n"
2782 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2782 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2783 " to current user and date to current date.\n"
2783 " to current user and date to current date.\n"
2784 "\n"
2784 "\n"
2785 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2785 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2786 " well as the commit message. If none is specified, the header is\n"
2786 " well as the commit message. If none is specified, the header is\n"
2787 " empty and the commit message is '[mq]: PATCH'.\n"
2787 " empty and the commit message is '[mq]: PATCH'.\n"
2788 "\n"
2788 "\n"
2789 " Use the -g/--git option to keep the patch in the git extended diff\n"
2789 " Use the -g/--git option to keep the patch in the git extended diff\n"
2790 " format. Read the diffs help topic for more information on why this\n"
2790 " format. Read the diffs help topic for more information on why this\n"
2791 " is important for preserving permission changes and copy/rename\n"
2791 " is important for preserving permission changes and copy/rename\n"
2792 " information.\n"
2792 " information.\n"
2793 " "
2793 " "
2794 msgstr ""
2794 msgstr ""
2795 "crée un nouveau patch\n"
2795 "crée un nouveau patch\n"
2796 "\n"
2796 "\n"
2797 " qnew crée un nouveau patch au-dessus du dernier patch\n"
2797 " qnew crée un nouveau patch au-dessus du dernier patch\n"
2798 " actuellement appliqué, le cas échéant. Si le répertoire\n"
2798 " actuellement appliqué, le cas échéant. Si le répertoire\n"
2799 " de travail comporte des modifications non enregistrées,\n"
2799 " de travail comporte des modifications non enregistrées,\n"
2800 " la création du patch sera refusée, à moins d'utiliser\n"
2800 " la création du patch sera refusée, à moins d'utiliser\n"
2801 " -f/--force auquel cas le contenu du nouveau patch sera\n"
2801 " -f/--force auquel cas le contenu du nouveau patch sera\n"
2802 " initialisé avec ces modifications. Il est également\n"
2802 " initialisé avec ces modifications. Il est également\n"
2803 " possible d'utiliser -I/--include, -X/--exclude ou une liste\n"
2803 " possible d'utiliser -I/--include, -X/--exclude ou une liste\n"
2804 " de noms de fichiers après le nom du patch, afin de n'inclure\n"
2804 " de noms de fichiers après le nom du patch, afin de n'inclure\n"
2805 " que les changements des fichiers concernés, et laisser le\n"
2805 " que les changements des fichiers concernés, et laisser le\n"
2806 " reste dans le répertoire de travail en tant que modifications\n"
2806 " reste dans le répertoire de travail en tant que modifications\n"
2807 " non enregistrées.\n"
2807 " non enregistrées.\n"
2808 "\n"
2808 "\n"
2809 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
2809 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
2810 " l'aide de -u/--user et -d/--date respectivement.\n"
2810 " l'aide de -u/--user et -d/--date respectivement.\n"
2811 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
2811 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
2812 " d'utilisateur et la date à leur valeur actuelle.\n"
2812 " d'utilisateur et la date à leur valeur actuelle.\n"
2813 "\n"
2813 "\n"
2814 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
2814 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
2815 " spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n"
2815 " spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n"
2816 " Si aucune de ces options n'est utilisée, l'en-tête restera\n"
2816 " Si aucune de ces options n'est utilisée, l'en-tête restera\n"
2817 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
2817 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
2818 "\n"
2818 "\n"
2819 " Utilisez -g/--git pour garder le patch au format étendu de\n"
2819 " Utilisez -g/--git pour garder le patch au format étendu de\n"
2820 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
2820 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
2821 " de cette option pour la préservation des informations de\n"
2821 " de cette option pour la préservation des informations de\n"
2822 " copie/renommage et des modifications de permissions.\n"
2822 " copie/renommage et des modifications de permissions.\n"
2823 " "
2823 " "
2824
2824
2825 msgid ""
2825 msgid ""
2826 "update the current patch\n"
2826 "update the current patch\n"
2827 "\n"
2827 "\n"
2828 " If any file patterns are provided, the refreshed patch will\n"
2828 " If any file patterns are provided, the refreshed patch will\n"
2829 " contain only the modifications that match those patterns; the\n"
2829 " contain only the modifications that match those patterns; the\n"
2830 " remaining modifications will remain in the working directory.\n"
2830 " remaining modifications will remain in the working directory.\n"
2831 "\n"
2831 "\n"
2832 " If -s/--short is specified, files currently included in the patch\n"
2832 " If -s/--short is specified, files currently included in the patch\n"
2833 " will be refreshed just like matched files and remain in the patch.\n"
2833 " will be refreshed just like matched files and remain in the patch.\n"
2834 "\n"
2834 "\n"
2835 " hg add/remove/copy/rename work as usual, though you might want to\n"
2835 " hg add/remove/copy/rename work as usual, though you might want to\n"
2836 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2836 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2837 " and renames. See the diffs help topic for more information on the\n"
2837 " and renames. See the diffs help topic for more information on the\n"
2838 " git diff format.\n"
2838 " git diff format.\n"
2839 " "
2839 " "
2840 msgstr ""
2840 msgstr ""
2841
2841
2842 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2842 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2843 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
2843 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
2844
2844
2845 msgid ""
2845 msgid ""
2846 "diff of the current patch and subsequent modifications\n"
2846 "diff of the current patch and subsequent modifications\n"
2847 "\n"
2847 "\n"
2848 " Shows a diff which includes the current patch as well as any\n"
2848 " Shows a diff which includes the current patch as well as any\n"
2849 " changes which have been made in the working directory since the\n"
2849 " changes which have been made in the working directory since the\n"
2850 " last refresh (thus showing what the current patch would become\n"
2850 " last refresh (thus showing what the current patch would become\n"
2851 " after a qrefresh).\n"
2851 " after a qrefresh).\n"
2852 "\n"
2852 "\n"
2853 " Use 'hg diff' if you only want to see the changes made since the\n"
2853 " Use 'hg diff' if you only want to see the changes made since the\n"
2854 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2854 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2855 " by the current patch without including changes made since the\n"
2855 " by the current patch without including changes made since the\n"
2856 " qrefresh.\n"
2856 " qrefresh.\n"
2857 " "
2857 " "
2858 msgstr ""
2858 msgstr ""
2859
2859
2860 msgid ""
2860 msgid ""
2861 "fold the named patches into the current patch\n"
2861 "fold the named patches into the current patch\n"
2862 "\n"
2862 "\n"
2863 " Patches must not yet be applied. Each patch will be successively\n"
2863 " Patches must not yet be applied. Each patch will be successively\n"
2864 " applied to the current patch in the order given. If all the\n"
2864 " applied to the current patch in the order given. If all the\n"
2865 " patches apply successfully, the current patch will be refreshed\n"
2865 " patches apply successfully, the current patch will be refreshed\n"
2866 " with the new cumulative patch, and the folded patches will be\n"
2866 " with the new cumulative patch, and the folded patches will be\n"
2867 " deleted. With -k/--keep, the folded patch files will not be\n"
2867 " deleted. With -k/--keep, the folded patch files will not be\n"
2868 " removed afterwards.\n"
2868 " removed afterwards.\n"
2869 "\n"
2869 "\n"
2870 " The header for each folded patch will be concatenated with the\n"
2870 " The header for each folded patch will be concatenated with the\n"
2871 " current patch header, separated by a line of '* * *'."
2871 " current patch header, separated by a line of '* * *'."
2872 msgstr ""
2872 msgstr ""
2873
2873
2874 msgid "qfold requires at least one patch name"
2874 msgid "qfold requires at least one patch name"
2875 msgstr "qfold a besoin au minimum du nom d'un patch"
2875 msgstr "qfold a besoin au minimum du nom d'un patch"
2876
2876
2877 msgid "No patches applied"
2877 msgid "No patches applied"
2878 msgstr "Aucun patch d'appliqué"
2878 msgstr "Aucun patch d'appliqué"
2879
2879
2880 #, python-format
2880 #, python-format
2881 msgid "Skipping already folded patch %s"
2881 msgid "Skipping already folded patch %s"
2882 msgstr ""
2882 msgstr ""
2883
2883
2884 #, python-format
2884 #, python-format
2885 msgid "qfold cannot fold already applied patch %s"
2885 msgid "qfold cannot fold already applied patch %s"
2886 msgstr ""
2886 msgstr ""
2887
2887
2888 #, python-format
2888 #, python-format
2889 msgid "Error folding patch %s"
2889 msgid "Error folding patch %s"
2890 msgstr ""
2890 msgstr ""
2891
2891
2892 msgid "push or pop patches until named patch is at top of stack"
2892 msgid "push or pop patches until named patch is at top of stack"
2893 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
2893 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
2894
2894
2895 msgid ""
2895 msgid ""
2896 "set or print guards for a patch\n"
2896 "set or print guards for a patch\n"
2897 "\n"
2897 "\n"
2898 " Guards control whether a patch can be pushed. A patch with no\n"
2898 " Guards control whether a patch can be pushed. A patch with no\n"
2899 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2899 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2900 " pushed only if the qselect command has activated it. A patch with\n"
2900 " pushed only if the qselect command has activated it. A patch with\n"
2901 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2901 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2902 " has activated it.\n"
2902 " has activated it.\n"
2903 "\n"
2903 "\n"
2904 " With no arguments, print the currently active guards.\n"
2904 " With no arguments, print the currently active guards.\n"
2905 " With arguments, set guards for the named patch.\n"
2905 " With arguments, set guards for the named patch.\n"
2906 " NOTE: Specifying negative guards now requires '--'.\n"
2906 " NOTE: Specifying negative guards now requires '--'.\n"
2907 "\n"
2907 "\n"
2908 " To set guards on another patch:\n"
2908 " To set guards on another patch:\n"
2909 " hg qguard -- other.patch +2.6.17 -stable\n"
2909 " hg qguard -- other.patch +2.6.17 -stable\n"
2910 " "
2910 " "
2911 msgstr ""
2911 msgstr ""
2912
2912
2913 msgid "cannot mix -l/--list with options or arguments"
2913 msgid "cannot mix -l/--list with options or arguments"
2914 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
2914 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
2915
2915
2916 msgid "no patch to work with"
2916 msgid "no patch to work with"
2917 msgstr "aucun patch avec lequel travailler"
2917 msgstr "aucun patch avec lequel travailler"
2918
2918
2919 #, python-format
2919 #, python-format
2920 msgid "no patch named %s"
2920 msgid "no patch named %s"
2921 msgstr "aucun patch du nom de %s"
2921 msgstr "aucun patch du nom de %s"
2922
2922
2923 msgid "print the header of the topmost or specified patch"
2923 msgid "print the header of the topmost or specified patch"
2924 msgstr "affiche l'en-tête du dernier patch appliqué"
2924 msgstr "affiche l'en-tête du dernier patch appliqué"
2925
2925
2926 msgid ""
2926 msgid ""
2927 "push the next patch onto the stack\n"
2927 "push the next patch onto the stack\n"
2928 "\n"
2928 "\n"
2929 " When -f/--force is applied, all local changes in patched files\n"
2929 " When -f/--force is applied, all local changes in patched files\n"
2930 " will be lost.\n"
2930 " will be lost.\n"
2931 " "
2931 " "
2932 msgstr ""
2932 msgstr ""
2933 "applique le patch suivant sur la pile\n"
2933 "applique le patch suivant sur la pile\n"
2934 "\n"
2934 "\n"
2935 " Si -f/--force est utilisé, tout changement local dans les\n"
2935 " Si -f/--force est utilisé, tout changement local dans les\n"
2936 " fichiers concernés par le patch seront perdus.\n"
2936 " fichiers concernés par le patch seront perdus.\n"
2937 " "
2937 " "
2938
2938
2939 msgid "no saved queues found, please use -n\n"
2939 msgid "no saved queues found, please use -n\n"
2940 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
2940 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
2941
2941
2942 #, python-format
2942 #, python-format
2943 msgid "merging with queue at: %s\n"
2943 msgid "merging with queue at: %s\n"
2944 msgstr "fusion avec la pile située à %s\n"
2944 msgstr "fusion avec la pile située à %s\n"
2945
2945
2946 msgid ""
2946 msgid ""
2947 "pop the current patch off the stack\n"
2947 "pop the current patch off the stack\n"
2948 "\n"
2948 "\n"
2949 " By default, pops off the top of the patch stack. If given a patch\n"
2949 " By default, pops off the top of the patch stack. If given a patch\n"
2950 " name, keeps popping off patches until the named patch is at the\n"
2950 " name, keeps popping off patches until the named patch is at the\n"
2951 " top of the stack.\n"
2951 " top of the stack.\n"
2952 " "
2952 " "
2953 msgstr ""
2953 msgstr ""
2954 "dépile le dernier patch appliqué\n"
2954 "dépile le dernier patch appliqué\n"
2955 "\n"
2955 "\n"
2956 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
2956 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
2957 " un nom de patch est fourni, les patchs seront dépilés en\n"
2957 " un nom de patch est fourni, les patchs seront dépilés en\n"
2958 " séquence jusqu'à arriver au patch demandé.\n"
2958 " séquence jusqu'à arriver au patch demandé.\n"
2959 " "
2959 " "
2960
2960
2961 #, python-format
2961 #, python-format
2962 msgid "using patch queue: %s\n"
2962 msgid "using patch queue: %s\n"
2963 msgstr "utilisation de la pile de patchs %s\n"
2963 msgstr "utilisation de la pile de patchs %s\n"
2964
2964
2965 msgid ""
2965 msgid ""
2966 "rename a patch\n"
2966 "rename a patch\n"
2967 "\n"
2967 "\n"
2968 " With one argument, renames the current patch to PATCH1.\n"
2968 " With one argument, renames the current patch to PATCH1.\n"
2969 " With two arguments, renames PATCH1 to PATCH2."
2969 " With two arguments, renames PATCH1 to PATCH2."
2970 msgstr ""
2970 msgstr ""
2971 "renomme un patch\n"
2971 "renomme un patch\n"
2972 "\n"
2972 "\n"
2973 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
2973 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
2974 " Avec deux arguments, PATCH1 devient PATCH2."
2974 " Avec deux arguments, PATCH1 devient PATCH2."
2975
2975
2976 #, python-format
2976 #, python-format
2977 msgid "%s already exists"
2977 msgid "%s already exists"
2978 msgstr "%s existe déjà"
2978 msgstr "%s existe déjà"
2979
2979
2980 #, python-format
2980 #, python-format
2981 msgid "A patch named %s already exists in the series file"
2981 msgid "A patch named %s already exists in the series file"
2982 msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")"
2982 msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")"
2983
2983
2984 msgid "restore the queue state saved by a revision"
2984 msgid "restore the queue state saved by a revision"
2985 msgstr "rétablissement d'un état sauvegardé de la pile"
2985 msgstr "rétablissement d'un état sauvegardé de la pile"
2986
2986
2987 msgid "save current queue state"
2987 msgid "save current queue state"
2988 msgstr "sauvegarde de l'étatt de la pile de patchs"
2988 msgstr "sauvegarde de l'étatt de la pile de patchs"
2989
2989
2990 #, python-format
2990 #, python-format
2991 msgid "destination %s exists and is not a directory"
2991 msgid "destination %s exists and is not a directory"
2992 msgstr "%s: la cible existe et n'est pas un répertoire"
2992 msgstr "%s: la cible existe et n'est pas un répertoire"
2993
2993
2994 #, python-format
2994 #, python-format
2995 msgid "destination %s exists, use -f to force"
2995 msgid "destination %s exists, use -f to force"
2996 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
2996 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
2997
2997
2998 #, python-format
2998 #, python-format
2999 msgid "copy %s to %s\n"
2999 msgid "copy %s to %s\n"
3000 msgstr "copie de %s vers %s\n"
3000 msgstr "copie de %s vers %s\n"
3001
3001
3002 msgid ""
3002 msgid ""
3003 "strip a revision and all its descendants from the repository\n"
3003 "strip a revision and all its descendants from the repository\n"
3004 "\n"
3004 "\n"
3005 " If one of the working directory's parent revisions is stripped, the\n"
3005 " If one of the working directory's parent revisions is stripped, the\n"
3006 " working directory will be updated to the parent of the stripped\n"
3006 " working directory will be updated to the parent of the stripped\n"
3007 " revision.\n"
3007 " revision.\n"
3008 " "
3008 " "
3009 msgstr ""
3009 msgstr ""
3010
3010
3011 msgid ""
3011 msgid ""
3012 "set or print guarded patches to push\n"
3012 "set or print guarded patches to push\n"
3013 "\n"
3013 "\n"
3014 " Use the qguard command to set or print guards on patch, then use\n"
3014 " Use the qguard command to set or print guards on patch, then use\n"
3015 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3015 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3016 " it has no guards or any positive guards match the currently\n"
3016 " it has no guards or any positive guards match the currently\n"
3017 " selected guard, but will not be pushed if any negative guards\n"
3017 " selected guard, but will not be pushed if any negative guards\n"
3018 " match the current guard. For example:\n"
3018 " match the current guard. For example:\n"
3019 "\n"
3019 "\n"
3020 " qguard foo.patch -stable (negative guard)\n"
3020 " qguard foo.patch -stable (negative guard)\n"
3021 " qguard bar.patch +stable (positive guard)\n"
3021 " qguard bar.patch +stable (positive guard)\n"
3022 " qselect stable\n"
3022 " qselect stable\n"
3023 "\n"
3023 "\n"
3024 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3024 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3025 " it has a negative match) but push bar.patch (because it has a\n"
3025 " it has a negative match) but push bar.patch (because it has a\n"
3026 " positive match).\n"
3026 " positive match).\n"
3027 "\n"
3027 "\n"
3028 " With no arguments, prints the currently active guards.\n"
3028 " With no arguments, prints the currently active guards.\n"
3029 " With one argument, sets the active guard.\n"
3029 " With one argument, sets the active guard.\n"
3030 "\n"
3030 "\n"
3031 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3031 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3032 " When no guards are active, patches with positive guards are\n"
3032 " When no guards are active, patches with positive guards are\n"
3033 " skipped and patches with negative guards are pushed.\n"
3033 " skipped and patches with negative guards are pushed.\n"
3034 "\n"
3034 "\n"
3035 " qselect can change the guards on applied patches. It does not pop\n"
3035 " qselect can change the guards on applied patches. It does not pop\n"
3036 " guarded patches by default. Use --pop to pop back to the last\n"
3036 " guarded patches by default. Use --pop to pop back to the last\n"
3037 " applied patch that is not guarded. Use --reapply (which implies\n"
3037 " applied patch that is not guarded. Use --reapply (which implies\n"
3038 " --pop) to push back to the current patch afterwards, but skip\n"
3038 " --pop) to push back to the current patch afterwards, but skip\n"
3039 " guarded patches.\n"
3039 " guarded patches.\n"
3040 "\n"
3040 "\n"
3041 " Use -s/--series to print a list of all guards in the series file\n"
3041 " Use -s/--series to print a list of all guards in the series file\n"
3042 " (no other arguments needed). Use -v for more information."
3042 " (no other arguments needed). Use -v for more information."
3043 msgstr ""
3043 msgstr ""
3044
3044
3045 msgid "guards deactivated\n"
3045 msgid "guards deactivated\n"
3046 msgstr ""
3046 msgstr ""
3047
3047
3048 #, python-format
3048 #, python-format
3049 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3049 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3050 msgstr ""
3050 msgstr ""
3051
3051
3052 #, python-format
3052 #, python-format
3053 msgid "number of guarded, applied patches has changed from %d to %d\n"
3053 msgid "number of guarded, applied patches has changed from %d to %d\n"
3054 msgstr ""
3054 msgstr ""
3055
3055
3056 msgid "guards in series file:\n"
3056 msgid "guards in series file:\n"
3057 msgstr ""
3057 msgstr ""
3058
3058
3059 msgid "no guards in series file\n"
3059 msgid "no guards in series file\n"
3060 msgstr ""
3060 msgstr ""
3061
3061
3062 msgid "active guards:\n"
3062 msgid "active guards:\n"
3063 msgstr ""
3063 msgstr ""
3064
3064
3065 msgid "no active guards\n"
3065 msgid "no active guards\n"
3066 msgstr ""
3066 msgstr ""
3067
3067
3068 msgid "popping guarded patches\n"
3068 msgid "popping guarded patches\n"
3069 msgstr ""
3069 msgstr ""
3070
3070
3071 msgid "reapplying unguarded patches\n"
3071 msgid "reapplying unguarded patches\n"
3072 msgstr ""
3072 msgstr ""
3073
3073
3074 msgid ""
3074 msgid ""
3075 "move applied patches into repository history\n"
3075 "move applied patches into repository history\n"
3076 "\n"
3076 "\n"
3077 " Finishes the specified revisions (corresponding to applied\n"
3077 " Finishes the specified revisions (corresponding to applied\n"
3078 " patches) by moving them out of mq control into regular repository\n"
3078 " patches) by moving them out of mq control into regular repository\n"
3079 " history.\n"
3079 " history.\n"
3080 "\n"
3080 "\n"
3081 " Accepts a revision range or the -a/--applied option. If --applied\n"
3081 " Accepts a revision range or the -a/--applied option. If --applied\n"
3082 " is specified, all applied mq revisions are removed from mq\n"
3082 " is specified, all applied mq revisions are removed from mq\n"
3083 " control. Otherwise, the given revisions must be at the base of the\n"
3083 " control. Otherwise, the given revisions must be at the base of the\n"
3084 " stack of applied patches.\n"
3084 " stack of applied patches.\n"
3085 "\n"
3085 "\n"
3086 " This can be especially useful if your changes have been applied to\n"
3086 " This can be especially useful if your changes have been applied to\n"
3087 " an upstream repository, or if you are about to push your changes\n"
3087 " an upstream repository, or if you are about to push your changes\n"
3088 " to upstream.\n"
3088 " to upstream.\n"
3089 " "
3089 " "
3090 msgstr ""
3090 msgstr ""
3091 "déplacement des patchs vers l'historique du dépôt\n"
3091 "déplacement des patchs vers l'historique du dépôt\n"
3092 "\n"
3092 "\n"
3093 " Achève le développement des révisions spécifiées (qui doivent\n"
3093 " Achève le développement des révisions spécifiées (qui doivent\n"
3094 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3094 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3095 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3095 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3096 " l'historique du dépôt.\n"
3096 " l'historique du dépôt.\n"
3097 "\n"
3097 "\n"
3098 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3098 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3099 " une plage de révisions. Avec --applied, tous les patchs\n"
3099 " une plage de révisions. Avec --applied, tous les patchs\n"
3100 " appliqués seront retirés du contrôle de mq. Autrement, les\n"
3100 " appliqués seront retirés du contrôle de mq. Autrement, les\n"
3101 " révisions fournies doivent être situées à la base de la pile de\n"
3101 " révisions fournies doivent être situées à la base de la pile de\n"
3102 " patchs appliqués.\n"
3102 " patchs appliqués.\n"
3103 "\n"
3103 "\n"
3104 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3104 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3105 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3105 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3106 " "
3106 " "
3107
3107
3108 msgid "no revisions specified"
3108 msgid "no revisions specified"
3109 msgstr "aucune révision spécifiée"
3109 msgstr "aucune révision spécifiée"
3110
3110
3111 msgid "cannot commit over an applied mq patch"
3111 msgid "cannot commit over an applied mq patch"
3112 msgstr ""
3112 msgstr ""
3113
3113
3114 msgid "source has mq patches applied"
3114 msgid "source has mq patches applied"
3115 msgstr ""
3115 msgstr ""
3116
3116
3117 #, python-format
3117 #, python-format
3118 msgid "mq status file refers to unknown node %s\n"
3118 msgid "mq status file refers to unknown node %s\n"
3119 msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n"
3119 msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n"
3120
3120
3121 #, python-format
3121 #, python-format
3122 msgid "Tag %s overrides mq patch of the same name\n"
3122 msgid "Tag %s overrides mq patch of the same name\n"
3123 msgstr ""
3123 msgstr ""
3124
3124
3125 msgid "cannot import over an applied patch"
3125 msgid "cannot import over an applied patch"
3126 msgstr "impossible d'importer au-dessus d'un patch appliqué"
3126 msgstr "impossible d'importer au-dessus d'un patch appliqué"
3127
3127
3128 msgid "print first line of patch header"
3128 msgid "print first line of patch header"
3129 msgstr "affiche la première ligne de l'en-tête d'un patch"
3129 msgstr "affiche la première ligne de l'en-tête d'un patch"
3130
3130
3131 msgid "hg qapplied [-s] [PATCH]"
3131 msgid "hg qapplied [-s] [PATCH]"
3132 msgstr "hg qapplied [-s] [PATCH]"
3132 msgstr "hg qapplied [-s] [PATCH]"
3133
3133
3134 msgid "use pull protocol to copy metadata"
3134 msgid "use pull protocol to copy metadata"
3135 msgstr ""
3135 msgstr ""
3136
3136
3137 msgid "do not update the new working directories"
3137 msgid "do not update the new working directories"
3138 msgstr "ne pas mettre à jour le répertoire de travail"
3138 msgstr "ne pas mettre à jour le répertoire de travail"
3139
3139
3140 msgid "use uncompressed transfer (fast over LAN)"
3140 msgid "use uncompressed transfer (fast over LAN)"
3141 msgstr "transférer sans compression (rapide sur un réseau local)"
3141 msgstr "transférer sans compression (rapide sur un réseau local)"
3142
3142
3143 msgid "location of source patch repository"
3143 msgid "location of source patch repository"
3144 msgstr "emplacement du dépôt de patchs"
3144 msgstr "emplacement du dépôt de patchs"
3145
3145
3146 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3146 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3147 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
3147 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
3148
3148
3149 msgid "hg qcommit [OPTION]... [FILE]..."
3149 msgid "hg qcommit [OPTION]... [FILE]..."
3150 msgstr "hg qcommit [OPTION]... [FICHIER]..."
3150 msgstr "hg qcommit [OPTION]... [FICHIER]..."
3151
3151
3152 msgid "hg qdiff [OPTION]... [FILE]..."
3152 msgid "hg qdiff [OPTION]... [FILE]..."
3153 msgstr "hg qdiff [OPTION]... [FICHIER]..."
3153 msgstr "hg qdiff [OPTION]... [FICHIER]..."
3154
3154
3155 msgid "keep patch file"
3155 msgid "keep patch file"
3156 msgstr "garder le fichier du patch"
3156 msgstr "garder le fichier du patch"
3157
3157
3158 msgid "stop managing a revision (DEPRECATED)"
3158 msgid "stop managing a revision (DEPRECATED)"
3159 msgstr "arrêter de gérer une révision"
3159 msgstr "arrêter de gérer une révision"
3160
3160
3161 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3161 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3162 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3162 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3163
3163
3164 msgid "edit patch header"
3164 msgid "edit patch header"
3165 msgstr "éditer l'en-tête du patch"
3165 msgstr "éditer l'en-tête du patch"
3166
3166
3167 msgid "keep folded patch files"
3167 msgid "keep folded patch files"
3168 msgstr ""
3168 msgstr ""
3169
3169
3170 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3170 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3171 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3171 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3172
3172
3173 msgid "overwrite any local changes"
3173 msgid "overwrite any local changes"
3174 msgstr "écraser tout modification locale"
3174 msgstr "écraser tout modification locale"
3175
3175
3176 msgid "hg qgoto [OPTION]... PATCH"
3176 msgid "hg qgoto [OPTION]... PATCH"
3177 msgstr "hg qgoto [OPTION]... PATCH"
3177 msgstr "hg qgoto [OPTION]... PATCH"
3178
3178
3179 msgid "list all patches and guards"
3179 msgid "list all patches and guards"
3180 msgstr ""
3180 msgstr ""
3181
3181
3182 msgid "drop all guards"
3182 msgid "drop all guards"
3183 msgstr ""
3183 msgstr ""
3184
3184
3185 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3185 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3186 msgstr ""
3186 msgstr ""
3187
3187
3188 msgid "hg qheader [PATCH]"
3188 msgid "hg qheader [PATCH]"
3189 msgstr "hg qheader [PATCH]"
3189 msgstr "hg qheader [PATCH]"
3190
3190
3191 msgid "import file in patch directory"
3191 msgid "import file in patch directory"
3192 msgstr "importer un fichier résidant dans le répertoire de patchs"
3192 msgstr "importer un fichier résidant dans le répertoire de patchs"
3193
3193
3194 msgid "name of patch file"
3194 msgid "name of patch file"
3195 msgstr "nom du fichier de patch"
3195 msgstr "nom du fichier de patch"
3196
3196
3197 msgid "overwrite existing files"
3197 msgid "overwrite existing files"
3198 msgstr "écraser les fichiers existant"
3198 msgstr "écraser les fichiers existant"
3199
3199
3200 msgid "place existing revisions under mq control"
3200 msgid "place existing revisions under mq control"
3201 msgstr "placer des révisions existantes sous le contrôle de mq"
3201 msgstr "placer des révisions existantes sous le contrôle de mq"
3202
3202
3203 msgid "use git extended diff format"
3203 msgid "use git extended diff format"
3204 msgstr "utiliser le format de patch étendu de git"
3204 msgstr "utiliser le format de patch étendu de git"
3205
3205
3206 msgid "qpush after importing"
3206 msgid "qpush after importing"
3207 msgstr "qpush après l'importation"
3207 msgstr "qpush après l'importation"
3208
3208
3209 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3209 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3210 msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..."
3210 msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..."
3211
3211
3212 msgid "create queue repository"
3212 msgid "create queue repository"
3213 msgstr "crée un dépôt de patchs"
3213 msgstr "crée un dépôt de patchs"
3214
3214
3215 msgid "hg qinit [-c]"
3215 msgid "hg qinit [-c]"
3216 msgstr "hg qinit [-c]"
3216 msgstr "hg qinit [-c]"
3217
3217
3218 msgid "import uncommitted changes into patch"
3218 msgid "import uncommitted changes into patch"
3219 msgstr "importer les modifications locales dans le patch"
3219 msgstr "importer les modifications locales dans le patch"
3220
3220
3221 msgid "add \"From: <current user>\" to patch"
3221 msgid "add \"From: <current user>\" to patch"
3222 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3222 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3223
3223
3224 msgid "add \"From: <given user>\" to patch"
3224 msgid "add \"From: <given user>\" to patch"
3225 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3225 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3226
3226
3227 msgid "add \"Date: <current date>\" to patch"
3227 msgid "add \"Date: <current date>\" to patch"
3228 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3228 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3229
3229
3230 msgid "add \"Date: <given date>\" to patch"
3230 msgid "add \"Date: <given date>\" to patch"
3231 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3231 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3232
3232
3233 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3233 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3234 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3234 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3235
3235
3236 msgid "hg qnext [-s]"
3236 msgid "hg qnext [-s]"
3237 msgstr "hg qnext [-s]"
3237 msgstr "hg qnext [-s]"
3238
3238
3239 msgid "hg qprev [-s]"
3239 msgid "hg qprev [-s]"
3240 msgstr "hg qprev [-s]"
3240 msgstr "hg qprev [-s]"
3241
3241
3242 msgid "pop all patches"
3242 msgid "pop all patches"
3243 msgstr "dépiler tous les patchs"
3243 msgstr "dépiler tous les patchs"
3244
3244
3245 msgid "queue name to pop"
3245 msgid "queue name to pop"
3246 msgstr "nom de la pile à dépiler"
3246 msgstr "nom de la pile à dépiler"
3247
3247
3248 msgid "forget any local changes"
3248 msgid "forget any local changes"
3249 msgstr "oublier toute modification locale"
3249 msgstr "oublier toute modification locale"
3250
3250
3251 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3251 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3252 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3252 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3253
3253
3254 msgid "apply if the patch has rejects"
3254 msgid "apply if the patch has rejects"
3255 msgstr ""
3255 msgstr ""
3256
3256
3257 msgid "list patch name in commit text"
3257 msgid "list patch name in commit text"
3258 msgstr ""
3258 msgstr ""
3259
3259
3260 msgid "apply all patches"
3260 msgid "apply all patches"
3261 msgstr "appliquer tous les patchs"
3261 msgstr "appliquer tous les patchs"
3262
3262
3263 msgid "merge from another queue"
3263 msgid "merge from another queue"
3264 msgstr "fusionner avec une autre pile de patchs"
3264 msgstr "fusionner avec une autre pile de patchs"
3265
3265
3266 msgid "merge queue name"
3266 msgid "merge queue name"
3267 msgstr "nom de la pile à fusionner"
3267 msgstr "nom de la pile à fusionner"
3268
3268
3269 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3269 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3270 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3270 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3271
3271
3272 msgid "refresh only files already in the patch and specified files"
3272 msgid "refresh only files already in the patch and specified files"
3273 msgstr ""
3273 msgstr ""
3274 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux "
3274 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux "
3275 "explicitement spécifiés"
3275 "explicitement spécifiés"
3276
3276
3277 msgid "add/update \"From: <current user>\" in patch"
3277 msgid "add/update \"From: <current user>\" in patch"
3278 msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch"
3278 msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch"
3279
3279
3280 msgid "add/update \"From: <given user>\" in patch"
3280 msgid "add/update \"From: <given user>\" in patch"
3281 msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch"
3281 msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch"
3282
3282
3283 msgid "update \"Date: <current date>\" in patch (if present)"
3283 msgid "update \"Date: <current date>\" in patch (if present)"
3284 msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)"
3284 msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)"
3285
3285
3286 msgid "update \"Date: <given date>\" in patch (if present)"
3286 msgid "update \"Date: <given date>\" in patch (if present)"
3287 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3287 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3288
3288
3289 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3289 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3290 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..."
3290 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..."
3291
3291
3292 msgid "hg qrename PATCH1 [PATCH2]"
3292 msgid "hg qrename PATCH1 [PATCH2]"
3293 msgstr "hg qrename PATCH1 [PATCH2]"
3293 msgstr "hg qrename PATCH1 [PATCH2]"
3294
3294
3295 msgid "delete save entry"
3295 msgid "delete save entry"
3296 msgstr ""
3296 msgstr ""
3297
3297
3298 msgid "update queue working directory"
3298 msgid "update queue working directory"
3299 msgstr ""
3299 msgstr ""
3300
3300
3301 msgid "hg qrestore [-d] [-u] REV"
3301 msgid "hg qrestore [-d] [-u] REV"
3302 msgstr ""
3302 msgstr ""
3303
3303
3304 msgid "copy patch directory"
3304 msgid "copy patch directory"
3305 msgstr ""
3305 msgstr ""
3306
3306
3307 msgid "copy directory name"
3307 msgid "copy directory name"
3308 msgstr ""
3308 msgstr ""
3309
3309
3310 msgid "clear queue status file"
3310 msgid "clear queue status file"
3311 msgstr ""
3311 msgstr ""
3312
3312
3313 msgid "force copy"
3313 msgid "force copy"
3314 msgstr ""
3314 msgstr ""
3315
3315
3316 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3316 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3317 msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]"
3317 msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]"
3318
3318
3319 msgid "disable all guards"
3319 msgid "disable all guards"
3320 msgstr ""
3320 msgstr ""
3321
3321
3322 msgid "list all guards in series file"
3322 msgid "list all guards in series file"
3323 msgstr ""
3323 msgstr ""
3324
3324
3325 msgid "pop to before first guarded applied patch"
3325 msgid "pop to before first guarded applied patch"
3326 msgstr ""
3326 msgstr ""
3327
3327
3328 msgid "pop, then reapply patches"
3328 msgid "pop, then reapply patches"
3329 msgstr "dépiler, puis appliquer à nouveau les patchs"
3329 msgstr "dépiler, puis appliquer à nouveau les patchs"
3330
3330
3331 msgid "hg qselect [OPTION]... [GUARD]..."
3331 msgid "hg qselect [OPTION]... [GUARD]..."
3332 msgstr ""
3332 msgstr ""
3333
3333
3334 msgid "print patches not in series"
3334 msgid "print patches not in series"
3335 msgstr "afficher les patchs absents de la série"
3335 msgstr "afficher les patchs absents de la série"
3336
3336
3337 msgid "hg qseries [-ms]"
3337 msgid "hg qseries [-ms]"
3338 msgstr "hg qseries [-ms]"
3338 msgstr "hg qseries [-ms]"
3339
3339
3340 msgid "force removal with local changes"
3340 msgid "force removal with local changes"
3341 msgstr "forcer la suppression malgré les modifications locales"
3341 msgstr "forcer la suppression malgré les modifications locales"
3342
3342
3343 msgid "bundle unrelated changesets"
3343 msgid "bundle unrelated changesets"
3344 msgstr ""
3344 msgstr ""
3345
3345
3346 msgid "no backups"
3346 msgid "no backups"
3347 msgstr ""
3347 msgstr ""
3348
3348
3349 msgid "hg strip [-f] [-b] [-n] REV"
3349 msgid "hg strip [-f] [-b] [-n] REV"
3350 msgstr "hg strip [-f] [-b] [-n] REV"
3350 msgstr "hg strip [-f] [-b] [-n] REV"
3351
3351
3352 msgid "hg qtop [-s]"
3352 msgid "hg qtop [-s]"
3353 msgstr "hg qtop [-s]"
3353 msgstr "hg qtop [-s]"
3354
3354
3355 msgid "hg qunapplied [-s] [PATCH]"
3355 msgid "hg qunapplied [-s] [PATCH]"
3356 msgstr "hg qunapplied [-s] [PATCH]"
3356 msgstr "hg qunapplied [-s] [PATCH]"
3357
3357
3358 msgid "finish all applied changesets"
3358 msgid "finish all applied changesets"
3359 msgstr ""
3359 msgstr ""
3360
3360
3361 msgid "hg qfinish [-a] [REV]..."
3361 msgid "hg qfinish [-a] [REV]..."
3362 msgstr "hg qfinish [-a] [REV]..."
3362 msgstr "hg qfinish [-a] [REV]..."
3363
3363
3364 msgid ""
3364 msgid ""
3365 "hooks for sending email notifications at commit/push time\n"
3365 "hooks for sending email notifications at commit/push time\n"
3366 "\n"
3366 "\n"
3367 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3367 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3368 "messages to stdout, for testing and configuring.\n"
3368 "messages to stdout, for testing and configuring.\n"
3369 "\n"
3369 "\n"
3370 "To use, configure notify extension and enable in hgrc like this:\n"
3370 "To use, configure notify extension and enable in hgrc like this:\n"
3371 "\n"
3371 "\n"
3372 " [extensions]\n"
3372 " [extensions]\n"
3373 " hgext.notify =\n"
3373 " hgext.notify =\n"
3374 "\n"
3374 "\n"
3375 " [hooks]\n"
3375 " [hooks]\n"
3376 " # one email for each incoming changeset\n"
3376 " # one email for each incoming changeset\n"
3377 " incoming.notify = python:hgext.notify.hook\n"
3377 " incoming.notify = python:hgext.notify.hook\n"
3378 " # batch emails when many changesets incoming at one time\n"
3378 " # batch emails when many changesets incoming at one time\n"
3379 " changegroup.notify = python:hgext.notify.hook\n"
3379 " changegroup.notify = python:hgext.notify.hook\n"
3380 "\n"
3380 "\n"
3381 " [notify]\n"
3381 " [notify]\n"
3382 " # config items go in here\n"
3382 " # config items go in here\n"
3383 "\n"
3383 "\n"
3384 " config items:\n"
3384 " config items:\n"
3385 "\n"
3385 "\n"
3386 " REQUIRED:\n"
3386 " REQUIRED:\n"
3387 " config = /path/to/file # file containing subscriptions\n"
3387 " config = /path/to/file # file containing subscriptions\n"
3388 "\n"
3388 "\n"
3389 " OPTIONAL:\n"
3389 " OPTIONAL:\n"
3390 " test = True # print messages to stdout for testing\n"
3390 " test = True # print messages to stdout for testing\n"
3391 " strip = 3 # number of slashes to strip for url paths\n"
3391 " strip = 3 # number of slashes to strip for url paths\n"
3392 " domain = example.com # domain to use if committer missing domain\n"
3392 " domain = example.com # domain to use if committer missing domain\n"
3393 " style = ... # style file to use when formatting email\n"
3393 " style = ... # style file to use when formatting email\n"
3394 " template = ... # template to use when formatting email\n"
3394 " template = ... # template to use when formatting email\n"
3395 " incoming = ... # template to use when run as incoming hook\n"
3395 " incoming = ... # template to use when run as incoming hook\n"
3396 " changegroup = ... # template when run as changegroup hook\n"
3396 " changegroup = ... # template when run as changegroup hook\n"
3397 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3397 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3398 " maxsubject = 67 # truncate subject line longer than this\n"
3398 " maxsubject = 67 # truncate subject line longer than this\n"
3399 " diffstat = True # add a diffstat before the diff content\n"
3399 " diffstat = True # add a diffstat before the diff content\n"
3400 " sources = serve # notify if source of incoming changes in this "
3400 " sources = serve # notify if source of incoming changes in this "
3401 "list\n"
3401 "list\n"
3402 " # (serve == ssh or http, push, pull, bundle)\n"
3402 " # (serve == ssh or http, push, pull, bundle)\n"
3403 " [email]\n"
3403 " [email]\n"
3404 " from = user@host.com # email address to send as if none given\n"
3404 " from = user@host.com # email address to send as if none given\n"
3405 " [web]\n"
3405 " [web]\n"
3406 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3406 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3407 "\n"
3407 "\n"
3408 " notify config file has same format as regular hgrc. it has two\n"
3408 " notify config file has same format as regular hgrc. it has two\n"
3409 " sections so you can express subscriptions in whatever way is handier\n"
3409 " sections so you can express subscriptions in whatever way is handier\n"
3410 " for you.\n"
3410 " for you.\n"
3411 "\n"
3411 "\n"
3412 " [usersubs]\n"
3412 " [usersubs]\n"
3413 " # key is subscriber email, value is \",\"-separated list of glob "
3413 " # key is subscriber email, value is \",\"-separated list of glob "
3414 "patterns\n"
3414 "patterns\n"
3415 " user@host = pattern\n"
3415 " user@host = pattern\n"
3416 "\n"
3416 "\n"
3417 " [reposubs]\n"
3417 " [reposubs]\n"
3418 " # key is glob pattern, value is \",\"-separated list of subscriber "
3418 " # key is glob pattern, value is \",\"-separated list of subscriber "
3419 "emails\n"
3419 "emails\n"
3420 " pattern = user@host\n"
3420 " pattern = user@host\n"
3421 "\n"
3421 "\n"
3422 " glob patterns are matched against path to repository root.\n"
3422 " glob patterns are matched against path to repository root.\n"
3423 "\n"
3423 "\n"
3424 " if you like, you can put notify config file in repository that users\n"
3424 " if you like, you can put notify config file in repository that users\n"
3425 " can push changes to, they can manage their own subscriptions."
3425 " can push changes to, they can manage their own subscriptions."
3426 msgstr ""
3426 msgstr ""
3427
3427
3428 #, python-format
3428 #, python-format
3429 msgid "%s: %d new changesets"
3429 msgid "%s: %d new changesets"
3430 msgstr ""
3430 msgstr ""
3431
3431
3432 #, python-format
3432 #, python-format
3433 msgid "notify: sending %d subscribers %d changes\n"
3433 msgid "notify: sending %d subscribers %d changes\n"
3434 msgstr ""
3434 msgstr ""
3435
3435
3436 #, python-format
3436 #, python-format
3437 msgid ""
3437 msgid ""
3438 "\n"
3438 "\n"
3439 "diffs (truncated from %d to %d lines):\n"
3439 "diffs (truncated from %d to %d lines):\n"
3440 "\n"
3440 "\n"
3441 msgstr ""
3441 msgstr ""
3442
3442
3443 #, python-format
3443 #, python-format
3444 msgid ""
3444 msgid ""
3445 "\n"
3445 "\n"
3446 "diffs (%d lines):\n"
3446 "diffs (%d lines):\n"
3447 "\n"
3447 "\n"
3448 msgstr ""
3448 msgstr ""
3449
3449
3450 #, python-format
3450 #, python-format
3451 msgid "notify: no subscribers to repository %s\n"
3451 msgid "notify: no subscribers to repository %s\n"
3452 msgstr ""
3452 msgstr ""
3453
3453
3454 #, python-format
3454 #, python-format
3455 msgid "notify: changes have source \"%s\" - skipping\n"
3455 msgid "notify: changes have source \"%s\" - skipping\n"
3456 msgstr ""
3456 msgstr ""
3457
3457
3458 msgid ""
3458 msgid ""
3459 "browse command output with an external pager\n"
3459 "browse command output with an external pager\n"
3460 "\n"
3460 "\n"
3461 "To set the pager that should be used, set the application variable:\n"
3461 "To set the pager that should be used, set the application variable:\n"
3462 "\n"
3462 "\n"
3463 " [pager]\n"
3463 " [pager]\n"
3464 " pager = LESS='FSRX' less\n"
3464 " pager = LESS='FSRX' less\n"
3465 "\n"
3465 "\n"
3466 "If no pager is set, the pager extensions uses the environment variable\n"
3466 "If no pager is set, the pager extensions uses the environment variable\n"
3467 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3467 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3468 "\n"
3468 "\n"
3469 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3469 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3470 "setting:\n"
3470 "setting:\n"
3471 "\n"
3471 "\n"
3472 " [pager]\n"
3472 " [pager]\n"
3473 " quiet = True\n"
3473 " quiet = True\n"
3474 "\n"
3474 "\n"
3475 "You can disable the pager for certain commands by adding them to the\n"
3475 "You can disable the pager for certain commands by adding them to the\n"
3476 "pager.ignore list:\n"
3476 "pager.ignore list:\n"
3477 "\n"
3477 "\n"
3478 " [pager]\n"
3478 " [pager]\n"
3479 " ignore = version, help, update\n"
3479 " ignore = version, help, update\n"
3480 "\n"
3480 "\n"
3481 "You can also enable the pager only for certain commands using\n"
3481 "You can also enable the pager only for certain commands using\n"
3482 "pager.attend:\n"
3482 "pager.attend:\n"
3483 "\n"
3483 "\n"
3484 " [pager]\n"
3484 " [pager]\n"
3485 " attend = log\n"
3485 " attend = log\n"
3486 "\n"
3486 "\n"
3487 "If pager.attend is present, pager.ignore will be ignored.\n"
3487 "If pager.attend is present, pager.ignore will be ignored.\n"
3488 "\n"
3488 "\n"
3489 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3489 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3490 "specify them in the global .hgrc\n"
3490 "specify them in the global .hgrc\n"
3491 msgstr ""
3491 msgstr ""
3492
3492
3493 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3493 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3494 # sera capable de replier automatiquement la première ligne d'aide)
3494 # sera capable de replier automatiquement la première ligne d'aide)
3495 msgid ""
3495 msgid ""
3496 "interpret suffixes to refer to ancestor revisions\n"
3496 "interpret suffixes to refer to ancestor revisions\n"
3497 "\n"
3497 "\n"
3498 "This extension allows you to use git-style suffixes to refer to the\n"
3498 "This extension allows you to use git-style suffixes to refer to the\n"
3499 "ancestors of a specific revision.\n"
3499 "ancestors of a specific revision.\n"
3500 "\n"
3500 "\n"
3501 "For example, if you can refer to a revision as \"foo\", then:\n"
3501 "For example, if you can refer to a revision as \"foo\", then:\n"
3502 "\n"
3502 "\n"
3503 "- foo^N = Nth parent of foo\n"
3503 "- foo^N = Nth parent of foo\n"
3504 " foo^0 = foo\n"
3504 " foo^0 = foo\n"
3505 " foo^1 = first parent of foo\n"
3505 " foo^1 = first parent of foo\n"
3506 " foo^2 = second parent of foo\n"
3506 " foo^2 = second parent of foo\n"
3507 " foo^ = foo^1\n"
3507 " foo^ = foo^1\n"
3508 "\n"
3508 "\n"
3509 "- foo~N = Nth first grandparent of foo\n"
3509 "- foo~N = Nth first grandparent of foo\n"
3510 " foo~0 = foo\n"
3510 " foo~0 = foo\n"
3511 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3511 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3512 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3512 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3513 msgstr ""
3513 msgstr ""
3514 "suffixes faisant référence à des révisions antérieures\n"
3514 "suffixes faisant référence à des révisions antérieures\n"
3515 "\n"
3515 "\n"
3516 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3516 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3517 "faire référence aux ancêtres d'une révision donnée.\n"
3517 "faire référence aux ancêtres d'une révision donnée.\n"
3518 "\n"
3518 "\n"
3519 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3519 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3520 "\n"
3520 "\n"
3521 "- foo^N = Nième parent de foo\n"
3521 "- foo^N = Nième parent de foo\n"
3522 " foo^0 = foo\n"
3522 " foo^0 = foo\n"
3523 " foo^1 = premier parent de foo\n"
3523 " foo^1 = premier parent de foo\n"
3524 " foo^2 = second parent de foo\n"
3524 " foo^2 = second parent de foo\n"
3525 " foo^ = foo^1\n"
3525 " foo^ = foo^1\n"
3526 "\n"
3526 "\n"
3527 "- foo~N = Nième premier grand-parent de foo\n"
3527 "- foo~N = Nième premier grand-parent de foo\n"
3528 " foo~0 = foo\n"
3528 " foo~0 = foo\n"
3529 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3529 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3530 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3530 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3531
3531
3532 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3532 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3533 # sera capable de replier automatiquement la première ligne d'aide)
3533 # sera capable de replier automatiquement la première ligne d'aide)
3534 msgid ""
3534 msgid ""
3535 "command to send changesets as (a series of) patch emails\n"
3535 "command to send changesets as (a series of) patch emails\n"
3536 "\n"
3536 "\n"
3537 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3537 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3538 "describes the series as a whole.\n"
3538 "describes the series as a whole.\n"
3539 "\n"
3539 "\n"
3540 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3540 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3541 "first line of the changeset description as the subject text. The\n"
3541 "first line of the changeset description as the subject text. The\n"
3542 "message contains two or three body parts:\n"
3542 "message contains two or three body parts:\n"
3543 "\n"
3543 "\n"
3544 " The changeset description.\n"
3544 " The changeset description.\n"
3545 "\n"
3545 "\n"
3546 " [Optional] The result of running diffstat on the patch.\n"
3546 " [Optional] The result of running diffstat on the patch.\n"
3547 "\n"
3547 "\n"
3548 " The patch itself, as generated by \"hg export\".\n"
3548 " The patch itself, as generated by \"hg export\".\n"
3549 "\n"
3549 "\n"
3550 "Each message refers to the first in the series using the In-Reply-To\n"
3550 "Each message refers to the first in the series using the In-Reply-To\n"
3551 "and References headers, so they will show up as a sequence in threaded\n"
3551 "and References headers, so they will show up as a sequence in threaded\n"
3552 "mail and news readers, and in mail archives.\n"
3552 "mail and news readers, and in mail archives.\n"
3553 "\n"
3553 "\n"
3554 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3554 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3555 "with a diffstat summary and the changeset summary, so you can be sure\n"
3555 "with a diffstat summary and the changeset summary, so you can be sure\n"
3556 "you are sending the right changes.\n"
3556 "you are sending the right changes.\n"
3557 "\n"
3557 "\n"
3558 "To configure other defaults, add a section like this to your hgrc\n"
3558 "To configure other defaults, add a section like this to your hgrc\n"
3559 "file:\n"
3559 "file:\n"
3560 "\n"
3560 "\n"
3561 " [email]\n"
3561 " [email]\n"
3562 " from = My Name <my@email>\n"
3562 " from = My Name <my@email>\n"
3563 " to = recipient1, recipient2, ...\n"
3563 " to = recipient1, recipient2, ...\n"
3564 " cc = cc1, cc2, ...\n"
3564 " cc = cc1, cc2, ...\n"
3565 " bcc = bcc1, bcc2, ...\n"
3565 " bcc = bcc1, bcc2, ...\n"
3566 "\n"
3566 "\n"
3567 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3567 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3568 "as a patchbomb.\n"
3568 "as a patchbomb.\n"
3569 "\n"
3569 "\n"
3570 "To avoid sending patches prematurely, it is a good idea to first run\n"
3570 "To avoid sending patches prematurely, it is a good idea to first run\n"
3571 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3571 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3572 "prompted for an email recipient address, a subject and an introductory\n"
3572 "prompted for an email recipient address, a subject and an introductory\n"
3573 "message describing the patches of your patchbomb. Then when all is\n"
3573 "message describing the patches of your patchbomb. Then when all is\n"
3574 "done, patchbomb messages are displayed. If the PAGER environment\n"
3574 "done, patchbomb messages are displayed. If the PAGER environment\n"
3575 "variable is set, your pager will be fired up once for each patchbomb\n"
3575 "variable is set, your pager will be fired up once for each patchbomb\n"
3576 "message, so you can verify everything is alright.\n"
3576 "message, so you can verify everything is alright.\n"
3577 "\n"
3577 "\n"
3578 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3578 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3579 "patchbomb message in a pager or sending the messages directly, it will\n"
3579 "patchbomb message in a pager or sending the messages directly, it will\n"
3580 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3580 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3581 "can be previewed with any mail user agent which supports UNIX mbox\n"
3581 "can be previewed with any mail user agent which supports UNIX mbox\n"
3582 "files, e.g. with mutt:\n"
3582 "files, e.g. with mutt:\n"
3583 "\n"
3583 "\n"
3584 " % mutt -R -f mbox\n"
3584 " % mutt -R -f mbox\n"
3585 "\n"
3585 "\n"
3586 "When you are previewing the patchbomb messages, you can use `formail'\n"
3586 "When you are previewing the patchbomb messages, you can use `formail'\n"
3587 "(a utility that is commonly installed as part of the procmail\n"
3587 "(a utility that is commonly installed as part of the procmail\n"
3588 "package), to send each message out:\n"
3588 "package), to send each message out:\n"
3589 "\n"
3589 "\n"
3590 " % formail -s sendmail -bm -t < mbox\n"
3590 " % formail -s sendmail -bm -t < mbox\n"
3591 "\n"
3591 "\n"
3592 "That should be all. Now your patchbomb is on its way out.\n"
3592 "That should be all. Now your patchbomb is on its way out.\n"
3593 "\n"
3593 "\n"
3594 "You can also either configure the method option in the email section\n"
3594 "You can also either configure the method option in the email section\n"
3595 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3595 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3596 "that the patchbomb extension can automatically send patchbombs\n"
3596 "that the patchbomb extension can automatically send patchbombs\n"
3597 "directly from the commandline. See the [email] and [smtp] sections in\n"
3597 "directly from the commandline. See the [email] and [smtp] sections in\n"
3598 "hgrc(5) for details."
3598 "hgrc(5) for details."
3599 msgstr ""
3599 msgstr ""
3600 "envoi d'une série de \"changesets\" par courrier électronique\n"
3600 "envoi d'une série de \"changesets\" par courrier électronique\n"
3601 "\n"
3601 "\n"
3602 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3602 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3603 "décrivant dans son ensemble.\n"
3603 "décrivant dans son ensemble.\n"
3604 "\n"
3604 "\n"
3605 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3605 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3606 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3606 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3607 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3607 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3608 "parties :\n"
3608 "parties :\n"
3609 "\n"
3609 "\n"
3610 " La description du \"changeset\".\n"
3610 " La description du \"changeset\".\n"
3611 "\n"
3611 "\n"
3612 " Optionnellement, un résumé des modifications généré par le\n"
3612 " Optionnellement, un résumé des modifications généré par le\n"
3613 " programme diffstat.\n"
3613 " programme diffstat.\n"
3614 "\n"
3614 "\n"
3615 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3615 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3616 "\n"
3616 "\n"
3617 "Chaque message fait référence au premier de la série (à l'aide\n"
3617 "Chaque message fait référence au premier de la série (à l'aide\n"
3618 "des en-têtes de message In-Reply-To et References) de manière à\n"
3618 "des en-têtes de message In-Reply-To et References) de manière à\n"
3619 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3619 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3620 "électronique et de nouvelles, ainsi que dans les archives de\n"
3620 "électronique et de nouvelles, ainsi que dans les archives de\n"
3621 "messagerie.\n"
3621 "messagerie.\n"
3622 "\n"
3622 "\n"
3623 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3623 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3624 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3624 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3625 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3625 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3626 "d'être certain de bien envoyer les bonnes modifications.\n"
3626 "d'être certain de bien envoyer les bonnes modifications.\n"
3627 "\n"
3627 "\n"
3628 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3628 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3629 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3629 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3630 "\n"
3630 "\n"
3631 " [email]\n"
3631 " [email]\n"
3632 " from = Mon Nom <mon@adresse_de_courriel>\n"
3632 " from = Mon Nom <mon@adresse_de_courriel>\n"
3633 " to = destinataire1, destinataire2, ...\n"
3633 " to = destinataire1, destinataire2, ...\n"
3634 " cc = cc1, cc2, ...\n"
3634 " cc = cc1, cc2, ...\n"
3635 " bcc = bcc1, bcc2, ...\n"
3635 " bcc = bcc1, bcc2, ...\n"
3636 "\n"
3636 "\n"
3637 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3637 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3638 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3638 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3639 "\n"
3639 "\n"
3640 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3640 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3641 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3641 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3642 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3642 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3643 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3643 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3644 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3644 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3645 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3645 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3646 "l'affichage chaque message, permettant de vérifier que tout est\n"
3646 "l'affichage chaque message, permettant de vérifier que tout est\n"
3647 "correct.\n"
3647 "correct.\n"
3648 "\n"
3648 "\n"
3649 "L'option -m/--mbox est également très utile : au lieu que les\n"
3649 "L'option -m/--mbox est également très utile : au lieu que les\n"
3650 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3650 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3651 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3651 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3652 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3652 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3653 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3653 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3654 "comme par exemple mutt :\n"
3654 "comme par exemple mutt :\n"
3655 "\n"
3655 "\n"
3656 " % mutt -R -f mbox\n"
3656 " % mutt -R -f mbox\n"
3657 "\n"
3657 "\n"
3658 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3658 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3659 "utilisant formail (un outil généralement installé en même temps que\n"
3659 "utilisant formail (un outil généralement installé en même temps que\n"
3660 "procmail) :\n"
3660 "procmail) :\n"
3661 "\n"
3661 "\n"
3662 " % formail -s sendmail -bm -t < mbox\n"
3662 " % formail -s sendmail -bm -t < mbox\n"
3663 "\n"
3663 "\n"
3664 "Et voilà, vos patchs sont en route vers leur destination.\n"
3664 "Et voilà, vos patchs sont en route vers leur destination.\n"
3665 "\n"
3665 "\n"
3666 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3666 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3667 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3667 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3668 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3668 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3669 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3669 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3670 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3670 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3671 "page de manuel hgrc(5) pour plus de détails."
3671 "page de manuel hgrc(5) pour plus de détails."
3672
3672
3673 msgid "Please enter a valid value.\n"
3673 msgid "Please enter a valid value.\n"
3674 msgstr "Veuillez fournir une valeur valide.\n"
3674 msgstr "Veuillez fournir une valeur valide.\n"
3675
3675
3676 msgid "does the diffstat above look okay? "
3676 msgid "does the diffstat above look okay? "
3677 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3677 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3678
3678
3679 msgid "diffstat rejected"
3679 msgid "diffstat rejected"
3680 msgstr "résumé des modifications rejeté"
3680 msgstr "résumé des modifications rejeté"
3681
3681
3682 msgid ""
3682 msgid ""
3683 "send changesets by email\n"
3683 "send changesets by email\n"
3684 "\n"
3684 "\n"
3685 " By default, diffs are sent in the format generated by hg export,\n"
3685 " By default, diffs are sent in the format generated by hg export,\n"
3686 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3686 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3687 " introduction, which describes the series as a whole.\n"
3687 " introduction, which describes the series as a whole.\n"
3688 "\n"
3688 "\n"
3689 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3689 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3690 " the first line of the changeset description as the subject text.\n"
3690 " the first line of the changeset description as the subject text.\n"
3691 " The message contains two or three parts. First, the changeset\n"
3691 " The message contains two or three parts. First, the changeset\n"
3692 " description. Next, (optionally) if the diffstat program is\n"
3692 " description. Next, (optionally) if the diffstat program is\n"
3693 " installed and -d/--diffstat is used, the result of running\n"
3693 " installed and -d/--diffstat is used, the result of running\n"
3694 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3694 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3695 " \"hg export\".\n"
3695 " \"hg export\".\n"
3696 "\n"
3696 "\n"
3697 " By default the patch is included as text in the email body for\n"
3697 " By default the patch is included as text in the email body for\n"
3698 " easy reviewing. Using the -a/--attach option will instead create\n"
3698 " easy reviewing. Using the -a/--attach option will instead create\n"
3699 " an attachment for the patch. With -i/--inline an inline attachment\n"
3699 " an attachment for the patch. With -i/--inline an inline attachment\n"
3700 " will be created.\n"
3700 " will be created.\n"
3701 "\n"
3701 "\n"
3702 " With -o/--outgoing, emails will be generated for patches not found\n"
3702 " With -o/--outgoing, emails will be generated for patches not found\n"
3703 " in the destination repository (or only those which are ancestors\n"
3703 " in the destination repository (or only those which are ancestors\n"
3704 " of the specified revisions if any are provided)\n"
3704 " of the specified revisions if any are provided)\n"
3705 "\n"
3705 "\n"
3706 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3706 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3707 " single email containing a binary Mercurial bundle as an attachment\n"
3707 " single email containing a binary Mercurial bundle as an attachment\n"
3708 " will be sent.\n"
3708 " will be sent.\n"
3709 "\n"
3709 "\n"
3710 " Examples:\n"
3710 " Examples:\n"
3711 "\n"
3711 "\n"
3712 " hg email -r 3000 # send patch 3000 only\n"
3712 " hg email -r 3000 # send patch 3000 only\n"
3713 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3713 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3714 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3714 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3715 " hg email 3000 # send patch 3000 (deprecated)\n"
3715 " hg email 3000 # send patch 3000 (deprecated)\n"
3716 "\n"
3716 "\n"
3717 " hg email -o # send all patches not in default\n"
3717 " hg email -o # send all patches not in default\n"
3718 " hg email -o DEST # send all patches not in DEST\n"
3718 " hg email -o DEST # send all patches not in DEST\n"
3719 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3719 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3720 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3720 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3721 "\n"
3721 "\n"
3722 " hg email -b # send bundle of all patches not in default\n"
3722 " hg email -b # send bundle of all patches not in default\n"
3723 " hg email -b DEST # send bundle of all patches not in DEST\n"
3723 " hg email -b DEST # send bundle of all patches not in DEST\n"
3724 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3724 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3725 "default\n"
3725 "default\n"
3726 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3726 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3727 "\n"
3727 "\n"
3728 " Before using this command, you will need to enable email in your\n"
3728 " Before using this command, you will need to enable email in your\n"
3729 " hgrc. See the [email] section in hgrc(5) for details.\n"
3729 " hgrc. See the [email] section in hgrc(5) for details.\n"
3730 " "
3730 " "
3731 msgstr ""
3731 msgstr ""
3732 "envoi de \"changesets\" par courrier électronique\n"
3732 "envoi de \"changesets\" par courrier électronique\n"
3733 "\n"
3733 "\n"
3734 " Par défaut, les modifications sont envoyées au format généré par\n"
3734 " Par défaut, les modifications sont envoyées au format généré par\n"
3735 " \"hg export\", une par message. La série débute par un message\n"
3735 " \"hg export\", une par message. La série débute par un message\n"
3736 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3736 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3737 "\n"
3737 "\n"
3738 " Chaque courriel a pour sujet un résumé des modifications\n"
3738 " Chaque courriel a pour sujet un résumé des modifications\n"
3739 " apportées par le patch (pris en première ligne de la description\n"
3739 " apportées par le patch (pris en première ligne de la description\n"
3740 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3740 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3741 " Le message est constitué de deux ou trois parties. D'abord,\n"
3741 " Le message est constitué de deux ou trois parties. D'abord,\n"
3742 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3742 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3743 " un résumé des modifications généré par le programme diffstat si\n"
3743 " un résumé des modifications généré par le programme diffstat si\n"
3744 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3744 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3745 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3745 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3746 "\n"
3746 "\n"
3747 " Par défaut le patch est inclus textuellement dans le corps du\n"
3747 " Par défaut le patch est inclus textuellement dans le corps du\n"
3748 " message afin de faciliter les relectures et commentaires.\n"
3748 " message afin de faciliter les relectures et commentaires.\n"
3749 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3749 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3750 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3750 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3751 " insère celle-ci dans le corps.\n"
3751 " insère celle-ci dans le corps.\n"
3752 "\n"
3752 "\n"
3753 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3753 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3754 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3754 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3755 " ancêtres des révisions spécifiées, le cas échéant).\n"
3755 " ancêtres des révisions spécifiées, le cas échéant).\n"
3756 "\n"
3756 "\n"
3757 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3757 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3758 " même manière que pour --outgoing, mais il seront envoyés via\n"
3758 " même manière que pour --outgoing, mais il seront envoyés via\n"
3759 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3759 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3760 "\n"
3760 "\n"
3761 " Exemples :\n"
3761 " Exemples :\n"
3762 "\n"
3762 "\n"
3763 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3763 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3764 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3764 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3765 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3765 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3766 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3766 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3767 "\n"
3767 "\n"
3768 " hg email -o # envoyer les patchs absents de la\n"
3768 " hg email -o # envoyer les patchs absents de la\n"
3769 " destination par défaut\n"
3769 " destination par défaut\n"
3770 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3770 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3771 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3771 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3772 " de la destination par défaut\n"
3772 " de la destination par défaut\n"
3773 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3773 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3774 " de DEST\n"
3774 " de DEST\n"
3775 "\n"
3775 "\n"
3776 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3776 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3777 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3777 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3778 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3778 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3779 " [email] pour plus de détails.\n"
3779 " [email] pour plus de détails.\n"
3780 " "
3780 " "
3781
3781
3782 msgid "specify at least one changeset with -r or -o"
3782 msgid "specify at least one changeset with -r or -o"
3783 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3783 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3784
3784
3785 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3785 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3786 msgstr ""
3786 msgstr ""
3787 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3787 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3788 "bundle est utilisé"
3788 "bundle est utilisé"
3789
3789
3790 msgid "too many destinations"
3790 msgid "too many destinations"
3791 msgstr "trop de destinations"
3791 msgstr "trop de destinations"
3792
3792
3793 msgid "use only one form to specify the revision"
3793 msgid "use only one form to specify the revision"
3794 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3794 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3795
3795
3796 msgid ""
3796 msgid ""
3797 "\n"
3797 "\n"
3798 "Write the introductory message for the patch series.\n"
3798 "Write the introductory message for the patch series.\n"
3799 "\n"
3799 "\n"
3800 msgstr ""
3800 msgstr ""
3801 "\n"
3801 "\n"
3802 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3802 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3803 "\n"
3803 "\n"
3804
3804
3805 #, python-format
3805 #, python-format
3806 msgid ""
3806 msgid ""
3807 "This patch series consists of %d patches.\n"
3807 "This patch series consists of %d patches.\n"
3808 "\n"
3808 "\n"
3809 msgstr ""
3809 msgstr ""
3810 "Cette série comporte %d patchs.\n"
3810 "Cette série comporte %d patchs.\n"
3811 "\n"
3811 "\n"
3812
3812
3813 # diffstat sur l'ensemble des patchs
3813 # diffstat sur l'ensemble des patchs
3814 msgid "Final summary:\n"
3814 msgid "Final summary:\n"
3815 msgstr "Résumé complet des modifications :\n"
3815 msgstr "Résumé complet des modifications :\n"
3816
3816
3817 # mode --test
3817 # mode --test
3818 msgid "Displaying "
3818 msgid "Displaying "
3819 msgstr "Affichage de "
3819 msgstr "Affichage de "
3820
3820
3821 # mode --mbox
3821 # mode --mbox
3822 msgid "Writing "
3822 msgid "Writing "
3823 msgstr "Écriture de "
3823 msgstr "Écriture de "
3824
3824
3825 # mode d'envoi par défaut
3825 # mode d'envoi par défaut
3826 msgid "Sending "
3826 msgid "Sending "
3827 msgstr "Envoi de "
3827 msgstr "Envoi de "
3828
3828
3829 msgid "send patches as attachments"
3829 msgid "send patches as attachments"
3830 msgstr "envoyer les patchs en tant que pièces jointes"
3830 msgstr "envoyer les patchs en tant que pièces jointes"
3831
3831
3832 msgid "send patches as inline attachments"
3832 msgid "send patches as inline attachments"
3833 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3833 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3834
3834
3835 msgid "email addresses of blind carbon copy recipients"
3835 msgid "email addresses of blind carbon copy recipients"
3836 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3836 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3837
3837
3838 msgid "email addresses of copy recipients"
3838 msgid "email addresses of copy recipients"
3839 msgstr "adresses électroniques des destinataires en copie carbone"
3839 msgstr "adresses électroniques des destinataires en copie carbone"
3840
3840
3841 msgid "add diffstat output to messages"
3841 msgid "add diffstat output to messages"
3842 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3842 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3843
3843
3844 msgid "use the given date as the sending date"
3844 msgid "use the given date as the sending date"
3845 msgstr "utiliser la date fournie comme date d'envoi"
3845 msgstr "utiliser la date fournie comme date d'envoi"
3846
3846
3847 msgid "use the given file as the series description"
3847 msgid "use the given file as the series description"
3848 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3848 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3849
3849
3850 msgid "email address of sender"
3850 msgid "email address of sender"
3851 msgstr "adresse électronique de l'expéditeur"
3851 msgstr "adresse électronique de l'expéditeur"
3852
3852
3853 msgid "print messages that would be sent"
3853 msgid "print messages that would be sent"
3854 msgstr "afficher les messages tels qu'ils seraient envoyés"
3854 msgstr "afficher les messages tels qu'ils seraient envoyés"
3855
3855
3856 msgid "write messages to mbox file instead of sending them"
3856 msgid "write messages to mbox file instead of sending them"
3857 msgstr ""
3857 msgstr ""
3858 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3858 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3859
3859
3860 msgid "subject of first message (intro or single patch)"
3860 msgid "subject of first message (intro or single patch)"
3861 msgstr "sujet du premier message (intro ou patch unique)"
3861 msgstr "sujet du premier message (intro ou patch unique)"
3862
3862
3863 msgid "message identifier to reply to"
3863 msgid "message identifier to reply to"
3864 msgstr "identifiant du message auquel répondre"
3864 msgstr "identifiant du message auquel répondre"
3865
3865
3866 msgid "email addresses of recipients"
3866 msgid "email addresses of recipients"
3867 msgstr "adresses électroniques des destinataires"
3867 msgstr "adresses électroniques des destinataires"
3868
3868
3869 msgid "omit hg patch header"
3869 msgid "omit hg patch header"
3870 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3870 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3871
3871
3872 msgid "send changes not found in the target repository"
3872 msgid "send changes not found in the target repository"
3873 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3873 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3874
3874
3875 msgid "send changes not in target as a binary bundle"
3875 msgid "send changes not in target as a binary bundle"
3876 msgstr ""
3876 msgstr ""
3877 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3877 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3878 "\"bundle\" binaire"
3878 "\"bundle\" binaire"
3879
3879
3880 msgid "name of the bundle attachment file"
3880 msgid "name of the bundle attachment file"
3881 msgstr "nom à donner au fichier \"bundle\" envoyé"
3881 msgstr "nom à donner au fichier \"bundle\" envoyé"
3882
3882
3883 msgid "a revision to send"
3883 msgid "a revision to send"
3884 msgstr "une révision à envoyer"
3884 msgstr "une révision à envoyer"
3885
3885
3886 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3886 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3887 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3887 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3888
3888
3889 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3889 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3890 msgstr ""
3890 msgstr ""
3891 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3891 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3892 "(avec -b/--bundle)"
3892 "(avec -b/--bundle)"
3893
3893
3894 msgid "send an introduction email for a single patch"
3894 msgid "send an introduction email for a single patch"
3895 msgstr "envoyer un courriel d'introduction pour un patch seul"
3895 msgstr "envoyer un courriel d'introduction pour un patch seul"
3896
3896
3897 msgid "hg email [OPTION]... [DEST]..."
3897 msgid "hg email [OPTION]... [DEST]..."
3898 msgstr "hg email [OPTION]... [DEST]..."
3898 msgstr "hg email [OPTION]... [DEST]..."
3899
3899
3900 msgid "command to delete untracked files from the working directory"
3900 msgid "command to delete untracked files from the working directory"
3901 msgstr ""
3901 msgstr ""
3902
3902
3903 msgid ""
3903 msgid ""
3904 "removes files not tracked by Mercurial\n"
3904 "removes files not tracked by Mercurial\n"
3905 "\n"
3905 "\n"
3906 " Delete files not known to Mercurial. This is useful to test local\n"
3906 " Delete files not known to Mercurial. This is useful to test local\n"
3907 " and uncommitted changes in an otherwise-clean source tree.\n"
3907 " and uncommitted changes in an otherwise-clean source tree.\n"
3908 "\n"
3908 "\n"
3909 " This means that purge will delete:\n"
3909 " This means that purge will delete:\n"
3910 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3910 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3911 " - Empty directories: in fact Mercurial ignores directories unless\n"
3911 " - Empty directories: in fact Mercurial ignores directories unless\n"
3912 " they contain files under source control management\n"
3912 " they contain files under source control management\n"
3913 " But it will leave untouched:\n"
3913 " But it will leave untouched:\n"
3914 " - Modified and unmodified tracked files\n"
3914 " - Modified and unmodified tracked files\n"
3915 " - Ignored files (unless --all is specified)\n"
3915 " - Ignored files (unless --all is specified)\n"
3916 " - New files added to the repository (with \"hg add\")\n"
3916 " - New files added to the repository (with \"hg add\")\n"
3917 "\n"
3917 "\n"
3918 " If directories are given on the command line, only files in these\n"
3918 " If directories are given on the command line, only files in these\n"
3919 " directories are considered.\n"
3919 " directories are considered.\n"
3920 "\n"
3920 "\n"
3921 " Be careful with purge, as you could irreversibly delete some files\n"
3921 " Be careful with purge, as you could irreversibly delete some files\n"
3922 " you forgot to add to the repository. If you only want to print the\n"
3922 " you forgot to add to the repository. If you only want to print the\n"
3923 " list of files that this program would delete, use the --print\n"
3923 " list of files that this program would delete, use the --print\n"
3924 " option.\n"
3924 " option.\n"
3925 " "
3925 " "
3926 msgstr ""
3926 msgstr ""
3927 "retire les fichiers non suivis par Mercurial\n"
3927 "retire les fichiers non suivis par Mercurial\n"
3928 "\n"
3928 "\n"
3929 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3929 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3930 " utile pour tester des changements locaux non enregistrés à\n"
3930 " utile pour tester des changements locaux non enregistrés à\n"
3931 " l'intérieur d'une arborescence de sources propre.\n"
3931 " l'intérieur d'une arborescence de sources propre.\n"
3932 "\n"
3932 "\n"
3933 " Ainsi, purge effacera :\n"
3933 " Ainsi, purge effacera :\n"
3934 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3934 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3935 " par un point d'interrogation\n"
3935 " par un point d'interrogation\n"
3936 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3936 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3937 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3937 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3938 " sous son contrôle\n"
3938 " sous son contrôle\n"
3939 " Seront par contre laissés intacts :\n"
3939 " Seront par contre laissés intacts :\n"
3940 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3940 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3941 " ou non\n"
3941 " ou non\n"
3942 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3942 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3943 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3943 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3944 "\n"
3944 "\n"
3945 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
3945 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
3946 " seuls les fichiers qu'ils contiennent seront considérés.\n"
3946 " seuls les fichiers qu'ils contiennent seront considérés.\n"
3947 "\n"
3947 "\n"
3948 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
3948 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
3949 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
3949 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
3950 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
3950 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
3951 " seraient effacés par purge, utilisez l'option --print.\n"
3951 " seraient effacés par purge, utilisez l'option --print.\n"
3952 " "
3952 " "
3953
3953
3954 #, python-format
3954 #, python-format
3955 msgid "%s cannot be removed"
3955 msgid "%s cannot be removed"
3956 msgstr "%s ne peut être supprimé"
3956 msgstr "%s ne peut être supprimé"
3957
3957
3958 #, python-format
3958 #, python-format
3959 msgid "warning: %s\n"
3959 msgid "warning: %s\n"
3960 msgstr "attention: %s\n"
3960 msgstr "attention: %s\n"
3961
3961
3962 #, python-format
3962 #, python-format
3963 msgid "Removing file %s\n"
3963 msgid "Removing file %s\n"
3964 msgstr "Suppression du fichier %s\n"
3964 msgstr "Suppression du fichier %s\n"
3965
3965
3966 #, python-format
3966 #, python-format
3967 msgid "Removing directory %s\n"
3967 msgid "Removing directory %s\n"
3968 msgstr "Suppression du répertoire %s\n"
3968 msgstr "Suppression du répertoire %s\n"
3969
3969
3970 msgid "abort if an error occurs"
3970 msgid "abort if an error occurs"
3971 msgstr "abandonner en cas d'erreur"
3971 msgstr "abandonner en cas d'erreur"
3972
3972
3973 msgid "purge ignored files too"
3973 msgid "purge ignored files too"
3974 msgstr "supprimer également les fichiers ignorés"
3974 msgstr "supprimer également les fichiers ignorés"
3975
3975
3976 msgid "print filenames instead of deleting them"
3976 msgid "print filenames instead of deleting them"
3977 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3977 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3978
3978
3979 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3979 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3980 msgstr ""
3980 msgstr ""
3981 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3981 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3982 "xargs (implique -p/--print)"
3982 "xargs (implique -p/--print)"
3983
3983
3984 msgid "hg purge [OPTION]... [DIR]..."
3984 msgid "hg purge [OPTION]... [DIR]..."
3985 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3985 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3986
3986
3987 msgid ""
3987 msgid ""
3988 "command to move sets of revisions to a different ancestor\n"
3988 "command to move sets of revisions to a different ancestor\n"
3989 "\n"
3989 "\n"
3990 "This extension lets you rebase changesets in an existing Mercurial\n"
3990 "This extension lets you rebase changesets in an existing Mercurial\n"
3991 "repository.\n"
3991 "repository.\n"
3992 "\n"
3992 "\n"
3993 "For more information:\n"
3993 "For more information:\n"
3994 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3994 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3995 msgstr ""
3995 msgstr ""
3996
3996
3997 msgid "first revision, do not change ancestor\n"
3997 msgid "first revision, do not change ancestor\n"
3998 msgstr ""
3998 msgstr ""
3999
3999
4000 msgid ""
4000 msgid ""
4001 "move changeset (and descendants) to a different branch\n"
4001 "move changeset (and descendants) to a different branch\n"
4002 "\n"
4002 "\n"
4003 " Rebase uses repeated merging to graft changesets from one part of\n"
4003 " Rebase uses repeated merging to graft changesets from one part of\n"
4004 " history onto another. This can be useful for linearizing local\n"
4004 " history onto another. This can be useful for linearizing local\n"
4005 " changes relative to a master development tree.\n"
4005 " changes relative to a master development tree.\n"
4006 "\n"
4006 "\n"
4007 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4007 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4008 " continued with --continue/-c or aborted with --abort/-a.\n"
4008 " continued with --continue/-c or aborted with --abort/-a.\n"
4009 " "
4009 " "
4010 msgstr ""
4010 msgstr ""
4011
4011
4012 msgid "cannot use both abort and continue"
4012 msgid "cannot use both abort and continue"
4013 msgstr ""
4013 msgstr ""
4014
4014
4015 msgid "cannot use collapse with continue or abort"
4015 msgid "cannot use collapse with continue or abort"
4016 msgstr ""
4016 msgstr ""
4017
4017
4018 msgid "abort and continue do not allow specifying revisions"
4018 msgid "abort and continue do not allow specifying revisions"
4019 msgstr ""
4019 msgstr ""
4020
4020
4021 msgid "cannot specify both a revision and a base"
4021 msgid "cannot specify both a revision and a base"
4022 msgstr ""
4022 msgstr ""
4023
4023
4024 msgid "nothing to rebase\n"
4024 msgid "nothing to rebase\n"
4025 msgstr ""
4025 msgstr ""
4026
4026
4027 msgid "cannot use both keepbranches and extrafn"
4027 msgid "cannot use both keepbranches and extrafn"
4028 msgstr ""
4028 msgstr ""
4029
4029
4030 msgid "rebase merging completed\n"
4030 msgid "rebase merging completed\n"
4031 msgstr ""
4031 msgstr ""
4032
4032
4033 msgid "warning: new changesets detected on source branch, not stripping\n"
4033 msgid "warning: new changesets detected on source branch, not stripping\n"
4034 msgstr ""
4034 msgstr ""
4035
4035
4036 msgid "rebase completed\n"
4036 msgid "rebase completed\n"
4037 msgstr ""
4037 msgstr ""
4038
4038
4039 #, python-format
4039 #, python-format
4040 msgid "%d revisions have been skipped\n"
4040 msgid "%d revisions have been skipped\n"
4041 msgstr ""
4041 msgstr ""
4042
4042
4043 msgid " set parents\n"
4043 msgid " set parents\n"
4044 msgstr ""
4044 msgstr ""
4045
4045
4046 #, python-format
4046 #, python-format
4047 msgid "rebasing %d:%s\n"
4047 msgid "rebasing %d:%s\n"
4048 msgstr ""
4048 msgstr ""
4049
4049
4050 #, python-format
4050 #, python-format
4051 msgid " future parents are %d and %d\n"
4051 msgid " future parents are %d and %d\n"
4052 msgstr ""
4052 msgstr ""
4053
4053
4054 #, python-format
4054 #, python-format
4055 msgid " update to %d:%s\n"
4055 msgid " update to %d:%s\n"
4056 msgstr ""
4056 msgstr ""
4057
4057
4058 msgid " already in target\n"
4058 msgid " already in target\n"
4059 msgstr ""
4059 msgstr ""
4060
4060
4061 #, python-format
4061 #, python-format
4062 msgid " merge against %d:%s\n"
4062 msgid " merge against %d:%s\n"
4063 msgstr ""
4063 msgstr ""
4064
4064
4065 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4065 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4066 msgstr ""
4066 msgstr ""
4067
4067
4068 msgid "resuming interrupted rebase\n"
4068 msgid "resuming interrupted rebase\n"
4069 msgstr ""
4069 msgstr ""
4070
4070
4071 #, python-format
4071 #, python-format
4072 msgid "no changes, revision %d skipped\n"
4072 msgid "no changes, revision %d skipped\n"
4073 msgstr ""
4073 msgstr ""
4074
4074
4075 #, python-format
4075 #, python-format
4076 msgid "next revision set to %s\n"
4076 msgid "next revision set to %s\n"
4077 msgstr ""
4077 msgstr ""
4078
4078
4079 #, python-format
4079 #, python-format
4080 msgid "cannot use revision %d as base, result would have 3 parents"
4080 msgid "cannot use revision %d as base, result would have 3 parents"
4081 msgstr ""
4081 msgstr ""
4082
4082
4083 #, python-format
4083 #, python-format
4084 msgid "revision %d is an mq patch (%s), finalize it.\n"
4084 msgid "revision %d is an mq patch (%s), finalize it.\n"
4085 msgstr ""
4085 msgstr ""
4086
4086
4087 #, python-format
4087 #, python-format
4088 msgid "import mq patch %d (%s)\n"
4088 msgid "import mq patch %d (%s)\n"
4089 msgstr ""
4089 msgstr ""
4090
4090
4091 msgid "rebase status stored\n"
4091 msgid "rebase status stored\n"
4092 msgstr ""
4092 msgstr ""
4093
4093
4094 msgid "rebase status resumed\n"
4094 msgid "rebase status resumed\n"
4095 msgstr ""
4095 msgstr ""
4096
4096
4097 msgid "no rebase in progress"
4097 msgid "no rebase in progress"
4098 msgstr ""
4098 msgstr ""
4099
4099
4100 msgid "warning: new changesets detected on target branch, not stripping\n"
4100 msgid "warning: new changesets detected on target branch, not stripping\n"
4101 msgstr ""
4101 msgstr ""
4102
4102
4103 msgid "rebase aborted\n"
4103 msgid "rebase aborted\n"
4104 msgstr ""
4104 msgstr ""
4105
4105
4106 msgid "cannot rebase onto an applied mq patch"
4106 msgid "cannot rebase onto an applied mq patch"
4107 msgstr ""
4107 msgstr ""
4108
4108
4109 msgid "cannot rebase an ancestor"
4109 msgid "cannot rebase an ancestor"
4110 msgstr ""
4110 msgstr ""
4111
4111
4112 msgid "cannot rebase a descendant"
4112 msgid "cannot rebase a descendant"
4113 msgstr ""
4113 msgstr ""
4114
4114
4115 msgid "already working on current\n"
4115 msgid "already working on current\n"
4116 msgstr ""
4116 msgstr ""
4117
4117
4118 msgid "already working on the current branch\n"
4118 msgid "already working on the current branch\n"
4119 msgstr ""
4119 msgstr ""
4120
4120
4121 #, python-format
4121 #, python-format
4122 msgid "rebase onto %d starting from %d\n"
4122 msgid "rebase onto %d starting from %d\n"
4123 msgstr ""
4123 msgstr ""
4124
4124
4125 msgid "unable to collapse, there is more than one external parent"
4125 msgid "unable to collapse, there is more than one external parent"
4126 msgstr ""
4126 msgstr ""
4127
4127
4128 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4128 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4129 msgstr ""
4129 msgstr ""
4130
4130
4131 msgid "rebase working directory to branch head"
4131 msgid "rebase working directory to branch head"
4132 msgstr ""
4132 msgstr ""
4133
4133
4134 msgid "rebase from a given revision"
4134 msgid "rebase from a given revision"
4135 msgstr ""
4135 msgstr ""
4136
4136
4137 msgid "rebase from the base of a given revision"
4137 msgid "rebase from the base of a given revision"
4138 msgstr ""
4138 msgstr ""
4139
4139
4140 msgid "rebase onto a given revision"
4140 msgid "rebase onto a given revision"
4141 msgstr ""
4141 msgstr ""
4142
4142
4143 msgid "collapse the rebased revisions"
4143 msgid "collapse the rebased revisions"
4144 msgstr ""
4144 msgstr ""
4145
4145
4146 msgid "keep original revisions"
4146 msgid "keep original revisions"
4147 msgstr ""
4147 msgstr ""
4148
4148
4149 msgid "keep original branches"
4149 msgid "keep original branches"
4150 msgstr ""
4150 msgstr ""
4151
4151
4152 msgid "continue an interrupted rebase"
4152 msgid "continue an interrupted rebase"
4153 msgstr ""
4153 msgstr ""
4154
4154
4155 msgid "abort an interrupted rebase"
4155 msgid "abort an interrupted rebase"
4156 msgstr ""
4156 msgstr ""
4157
4157
4158 msgid ""
4158 msgid ""
4159 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4159 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4160 "| [-c] | [-a]"
4160 "| [-c] | [-a]"
4161 msgstr ""
4161 msgstr ""
4162
4162
4163 msgid "commands to interactively select changes for commit/qrefresh"
4163 msgid "commands to interactively select changes for commit/qrefresh"
4164 msgstr ""
4164 msgstr ""
4165
4165
4166 msgid "this modifies a binary file (all or nothing)\n"
4166 msgid "this modifies a binary file (all or nothing)\n"
4167 msgstr ""
4167 msgstr ""
4168
4168
4169 msgid "this is a binary file\n"
4169 msgid "this is a binary file\n"
4170 msgstr ""
4170 msgstr ""
4171
4171
4172 #, python-format
4172 #, python-format
4173 msgid "%d hunks, %d lines changed\n"
4173 msgid "%d hunks, %d lines changed\n"
4174 msgstr ""
4174 msgstr ""
4175
4175
4176 msgid "[Ynsfdaq?]"
4176 msgid "[Ynsfdaq?]"
4177 msgstr ""
4177 msgstr ""
4178
4178
4179 msgid "&Yes, record this change"
4179 msgid "&Yes, record this change"
4180 msgstr ""
4180 msgstr ""
4181
4181
4182 msgid "&No, skip this change"
4182 msgid "&No, skip this change"
4183 msgstr ""
4183 msgstr ""
4184
4184
4185 msgid "&Skip remaining changes to this file"
4185 msgid "&Skip remaining changes to this file"
4186 msgstr ""
4186 msgstr ""
4187
4187
4188 msgid "Record remaining changes to this &file"
4188 msgid "Record remaining changes to this &file"
4189 msgstr ""
4189 msgstr ""
4190
4190
4191 msgid "&Done, skip remaining changes and files"
4191 msgid "&Done, skip remaining changes and files"
4192 msgstr ""
4192 msgstr ""
4193
4193
4194 msgid "Record &all changes to all remaining files"
4194 msgid "Record &all changes to all remaining files"
4195 msgstr ""
4195 msgstr ""
4196
4196
4197 msgid "&Quit, recording no changes"
4197 msgid "&Quit, recording no changes"
4198 msgstr ""
4198 msgstr ""
4199
4199
4200 msgid "&?"
4200 msgid "&?"
4201 msgstr ""
4201 msgstr ""
4202
4202
4203 msgid "y"
4203 msgid "y"
4204 msgstr ""
4204 msgstr ""
4205
4205
4206 msgid "?"
4206 msgid "?"
4207 msgstr ""
4207 msgstr ""
4208
4208
4209 msgid "y - record this change"
4209 msgid "y - record this change"
4210 msgstr ""
4210 msgstr ""
4211
4211
4212 msgid "s"
4212 msgid "s"
4213 msgstr ""
4213 msgstr ""
4214
4214
4215 msgid "f"
4215 msgid "f"
4216 msgstr ""
4216 msgstr ""
4217
4217
4218 msgid "d"
4218 msgid "d"
4219 msgstr ""
4219 msgstr ""
4220
4220
4221 msgid "a"
4221 msgid "a"
4222 msgstr ""
4222 msgstr ""
4223
4223
4224 msgid "q"
4224 msgid "q"
4225 msgstr ""
4225 msgstr ""
4226
4226
4227 msgid "user quit"
4227 msgid "user quit"
4228 msgstr ""
4228 msgstr ""
4229
4229
4230 #, python-format
4230 #, python-format
4231 msgid "examine changes to %s?"
4231 msgid "examine changes to %s?"
4232 msgstr ""
4232 msgstr ""
4233
4233
4234 msgid " and "
4234 msgid " and "
4235 msgstr ""
4235 msgstr ""
4236
4236
4237 #, python-format
4237 #, python-format
4238 msgid "record this change to %r?"
4238 msgid "record this change to %r?"
4239 msgstr ""
4239 msgstr ""
4240
4240
4241 #, python-format
4241 #, python-format
4242 msgid "record change %d/%d to %r?"
4242 msgid "record change %d/%d to %r?"
4243 msgstr ""
4243 msgstr ""
4244
4244
4245 msgid ""
4245 msgid ""
4246 "interactively select changes to commit\n"
4246 "interactively select changes to commit\n"
4247 "\n"
4247 "\n"
4248 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4248 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4249 " will be candidates for recording.\n"
4249 " will be candidates for recording.\n"
4250 "\n"
4250 "\n"
4251 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4251 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4252 "\n"
4252 "\n"
4253 " You will be prompted for whether to record changes to each\n"
4253 " You will be prompted for whether to record changes to each\n"
4254 " modified file, and for files with multiple changes, for each\n"
4254 " modified file, and for files with multiple changes, for each\n"
4255 " change to use. For each query, the following responses are\n"
4255 " change to use. For each query, the following responses are\n"
4256 " possible:\n"
4256 " possible:\n"
4257 "\n"
4257 "\n"
4258 " y - record this change\n"
4258 " y - record this change\n"
4259 " n - skip this change\n"
4259 " n - skip this change\n"
4260 "\n"
4260 "\n"
4261 " s - skip remaining changes to this file\n"
4261 " s - skip remaining changes to this file\n"
4262 " f - record remaining changes to this file\n"
4262 " f - record remaining changes to this file\n"
4263 "\n"
4263 "\n"
4264 " d - done, skip remaining changes and files\n"
4264 " d - done, skip remaining changes and files\n"
4265 " a - record all changes to all remaining files\n"
4265 " a - record all changes to all remaining files\n"
4266 " q - quit, recording no changes\n"
4266 " q - quit, recording no changes\n"
4267 "\n"
4267 "\n"
4268 " ? - display help"
4268 " ? - display help"
4269 msgstr ""
4269 msgstr ""
4270
4270
4271 msgid "'mq' extension not loaded"
4271 msgid "'mq' extension not loaded"
4272 msgstr ""
4272 msgstr ""
4273
4273
4274 msgid "running non-interactively, use commit instead"
4274 msgid "running non-interactively, use commit instead"
4275 msgstr ""
4275 msgstr ""
4276
4276
4277 msgid "no changes to record\n"
4277 msgid "no changes to record\n"
4278 msgstr ""
4278 msgstr ""
4279
4279
4280 #, python-format
4280 #, python-format
4281 msgid "backup %r as %r\n"
4281 msgid "backup %r as %r\n"
4282 msgstr ""
4282 msgstr ""
4283
4283
4284 msgid "applying patch\n"
4284 msgid "applying patch\n"
4285 msgstr ""
4285 msgstr ""
4286
4286
4287 msgid "patch failed to apply"
4287 msgid "patch failed to apply"
4288 msgstr ""
4288 msgstr ""
4289
4289
4290 #, python-format
4290 #, python-format
4291 msgid "restoring %r to %r\n"
4291 msgid "restoring %r to %r\n"
4292 msgstr ""
4292 msgstr ""
4293
4293
4294 msgid "hg record [OPTION]... [FILE]..."
4294 msgid "hg record [OPTION]... [FILE]..."
4295 msgstr ""
4295 msgstr ""
4296
4296
4297 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4297 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4298 msgstr ""
4298 msgstr ""
4299
4299
4300 msgid "share a common history between several working directories"
4300 msgid "share a common history between several working directories"
4301 msgstr ""
4301 msgstr ""
4302
4302
4303 msgid ""
4303 msgid ""
4304 "create a new shared repository (experimental)\n"
4304 "create a new shared repository (experimental)\n"
4305 "\n"
4305 "\n"
4306 " Initialize a new repository and working directory that shares its\n"
4306 " Initialize a new repository and working directory that shares its\n"
4307 " history with another repository.\n"
4307 " history with another repository.\n"
4308 "\n"
4308 "\n"
4309 " NOTE: actions that change history such as rollback or moving the\n"
4309 " NOTE: actions that change history such as rollback or moving the\n"
4310 " source may confuse sharers.\n"
4310 " source may confuse sharers.\n"
4311 " "
4311 " "
4312 msgstr ""
4312 msgstr ""
4313
4313
4314 msgid "do not create a working copy"
4314 msgid "do not create a working copy"
4315 msgstr ""
4315 msgstr ""
4316
4316
4317 msgid "[-U] SOURCE [DEST]"
4317 msgid "[-U] SOURCE [DEST]"
4318 msgstr ""
4318 msgstr ""
4319
4319
4320 msgid ""
4320 msgid ""
4321 "command to transplant changesets from another branch\n"
4321 "command to transplant changesets from another branch\n"
4322 "\n"
4322 "\n"
4323 "This extension allows you to transplant patches from another branch.\n"
4323 "This extension allows you to transplant patches from another branch.\n"
4324 "\n"
4324 "\n"
4325 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4325 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4326 "map from a changeset hash to its hash in the source repository.\n"
4326 "map from a changeset hash to its hash in the source repository.\n"
4327 msgstr ""
4327 msgstr ""
4328
4328
4329 #, python-format
4329 #, python-format
4330 msgid "skipping already applied revision %s\n"
4330 msgid "skipping already applied revision %s\n"
4331 msgstr ""
4331 msgstr ""
4332
4332
4333 #, python-format
4333 #, python-format
4334 msgid "skipping merge changeset %s:%s\n"
4334 msgid "skipping merge changeset %s:%s\n"
4335 msgstr ""
4335 msgstr ""
4336
4336
4337 #, python-format
4337 #, python-format
4338 msgid "%s merged at %s\n"
4338 msgid "%s merged at %s\n"
4339 msgstr ""
4339 msgstr ""
4340
4340
4341 #, python-format
4341 #, python-format
4342 msgid "%s transplanted to %s\n"
4342 msgid "%s transplanted to %s\n"
4343 msgstr ""
4343 msgstr ""
4344
4344
4345 #, python-format
4345 #, python-format
4346 msgid "filtering %s\n"
4346 msgid "filtering %s\n"
4347 msgstr ""
4347 msgstr ""
4348
4348
4349 msgid "filter failed"
4349 msgid "filter failed"
4350 msgstr ""
4350 msgstr ""
4351
4351
4352 msgid "can only omit patchfile if merging"
4352 msgid "can only omit patchfile if merging"
4353 msgstr ""
4353 msgstr ""
4354
4354
4355 #, python-format
4355 #, python-format
4356 msgid "%s: empty changeset"
4356 msgid "%s: empty changeset"
4357 msgstr ""
4357 msgstr ""
4358
4358
4359 msgid "Fix up the merge and run hg transplant --continue"
4359 msgid "Fix up the merge and run hg transplant --continue"
4360 msgstr ""
4360 msgstr ""
4361
4361
4362 #, python-format
4362 #, python-format
4363 msgid "%s transplanted as %s\n"
4363 msgid "%s transplanted as %s\n"
4364 msgstr ""
4364 msgstr ""
4365
4365
4366 msgid "transplant log file is corrupt"
4366 msgid "transplant log file is corrupt"
4367 msgstr ""
4367 msgstr ""
4368
4368
4369 #, python-format
4369 #, python-format
4370 msgid "working dir not at transplant parent %s"
4370 msgid "working dir not at transplant parent %s"
4371 msgstr ""
4371 msgstr ""
4372
4372
4373 msgid "commit failed"
4373 msgid "commit failed"
4374 msgstr ""
4374 msgstr ""
4375
4375
4376 msgid "apply changeset? [ynmpcq?]:"
4376 msgid "apply changeset? [ynmpcq?]:"
4377 msgstr ""
4377 msgstr ""
4378
4378
4379 msgid ""
4379 msgid ""
4380 "transplant changesets from another branch\n"
4380 "transplant changesets from another branch\n"
4381 "\n"
4381 "\n"
4382 " Selected changesets will be applied on top of the current working\n"
4382 " Selected changesets will be applied on top of the current working\n"
4383 " directory with the log of the original changeset. If --log is\n"
4383 " directory with the log of the original changeset. If --log is\n"
4384 " specified, log messages will have a comment appended of the form:\n"
4384 " specified, log messages will have a comment appended of the form:\n"
4385 "\n"
4385 "\n"
4386 " (transplanted from CHANGESETHASH)\n"
4386 " (transplanted from CHANGESETHASH)\n"
4387 "\n"
4387 "\n"
4388 " You can rewrite the changelog message with the --filter option.\n"
4388 " You can rewrite the changelog message with the --filter option.\n"
4389 " Its argument will be invoked with the current changelog message as\n"
4389 " Its argument will be invoked with the current changelog message as\n"
4390 " $1 and the patch as $2.\n"
4390 " $1 and the patch as $2.\n"
4391 "\n"
4391 "\n"
4392 " If --source/-s is specified, selects changesets from the named\n"
4392 " If --source/-s is specified, selects changesets from the named\n"
4393 " repository. If --branch/-b is specified, selects changesets from\n"
4393 " repository. If --branch/-b is specified, selects changesets from\n"
4394 " the branch holding the named revision, up to that revision. If\n"
4394 " the branch holding the named revision, up to that revision. If\n"
4395 " --all/-a is specified, all changesets on the branch will be\n"
4395 " --all/-a is specified, all changesets on the branch will be\n"
4396 " transplanted, otherwise you will be prompted to select the\n"
4396 " transplanted, otherwise you will be prompted to select the\n"
4397 " changesets you want.\n"
4397 " changesets you want.\n"
4398 "\n"
4398 "\n"
4399 " hg transplant --branch REVISION --all will rebase the selected\n"
4399 " hg transplant --branch REVISION --all will rebase the selected\n"
4400 " branch (up to the named revision) onto your current working\n"
4400 " branch (up to the named revision) onto your current working\n"
4401 " directory.\n"
4401 " directory.\n"
4402 "\n"
4402 "\n"
4403 " You can optionally mark selected transplanted changesets as merge\n"
4403 " You can optionally mark selected transplanted changesets as merge\n"
4404 " changesets. You will not be prompted to transplant any ancestors\n"
4404 " changesets. You will not be prompted to transplant any ancestors\n"
4405 " of a merged transplant, and you can merge descendants of them\n"
4405 " of a merged transplant, and you can merge descendants of them\n"
4406 " normally instead of transplanting them.\n"
4406 " normally instead of transplanting them.\n"
4407 "\n"
4407 "\n"
4408 " If no merges or revisions are provided, hg transplant will start\n"
4408 " If no merges or revisions are provided, hg transplant will start\n"
4409 " an interactive changeset browser.\n"
4409 " an interactive changeset browser.\n"
4410 "\n"
4410 "\n"
4411 " If a changeset application fails, you can fix the merge by hand\n"
4411 " If a changeset application fails, you can fix the merge by hand\n"
4412 " and then resume where you left off by calling hg transplant\n"
4412 " and then resume where you left off by calling hg transplant\n"
4413 " --continue/-c.\n"
4413 " --continue/-c.\n"
4414 " "
4414 " "
4415 msgstr ""
4415 msgstr ""
4416
4416
4417 msgid "--continue is incompatible with branch, all or merge"
4417 msgid "--continue is incompatible with branch, all or merge"
4418 msgstr ""
4418 msgstr ""
4419
4419
4420 msgid "no source URL, branch tag or revision list provided"
4420 msgid "no source URL, branch tag or revision list provided"
4421 msgstr ""
4421 msgstr ""
4422
4422
4423 msgid "--all requires a branch revision"
4423 msgid "--all requires a branch revision"
4424 msgstr ""
4424 msgstr ""
4425
4425
4426 msgid "--all is incompatible with a revision list"
4426 msgid "--all is incompatible with a revision list"
4427 msgstr ""
4427 msgstr ""
4428
4428
4429 msgid "no revision checked out"
4429 msgid "no revision checked out"
4430 msgstr ""
4430 msgstr ""
4431
4431
4432 msgid "outstanding uncommitted merges"
4432 msgid "outstanding uncommitted merges"
4433 msgstr ""
4433 msgstr ""
4434
4434
4435 msgid "outstanding local changes"
4435 msgid "outstanding local changes"
4436 msgstr ""
4436 msgstr ""
4437
4437
4438 msgid "pull patches from REPOSITORY"
4438 msgid "pull patches from REPOSITORY"
4439 msgstr ""
4439 msgstr ""
4440
4440
4441 msgid "pull patches from branch BRANCH"
4441 msgid "pull patches from branch BRANCH"
4442 msgstr ""
4442 msgstr ""
4443
4443
4444 msgid "pull all changesets up to BRANCH"
4444 msgid "pull all changesets up to BRANCH"
4445 msgstr ""
4445 msgstr ""
4446
4446
4447 msgid "skip over REV"
4447 msgid "skip over REV"
4448 msgstr ""
4448 msgstr ""
4449
4449
4450 msgid "merge at REV"
4450 msgid "merge at REV"
4451 msgstr ""
4451 msgstr ""
4452
4452
4453 msgid "append transplant info to log message"
4453 msgid "append transplant info to log message"
4454 msgstr ""
4454 msgstr ""
4455
4455
4456 msgid "continue last transplant session after repair"
4456 msgid "continue last transplant session after repair"
4457 msgstr ""
4457 msgstr ""
4458
4458
4459 msgid "filter changesets through FILTER"
4459 msgid "filter changesets through FILTER"
4460 msgstr ""
4460 msgstr ""
4461
4461
4462 msgid ""
4462 msgid ""
4463 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4463 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4464 msgstr ""
4464 msgstr ""
4465
4465
4466 msgid ""
4466 msgid ""
4467 "allow the use of MBCS paths with problematic encodings\n"
4467 "allow the use of MBCS paths with problematic encodings\n"
4468 "\n"
4468 "\n"
4469 "Some MBCS encodings are not good for some path operations (i.e.\n"
4469 "Some MBCS encodings are not good for some path operations (i.e.\n"
4470 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4470 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4471 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4471 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4472 "This extension can be used to fix the issue with those encodings by\n"
4472 "This extension can be used to fix the issue with those encodings by\n"
4473 "wrapping some functions to convert to Unicode string before path\n"
4473 "wrapping some functions to convert to Unicode string before path\n"
4474 "operation.\n"
4474 "operation.\n"
4475 "\n"
4475 "\n"
4476 "This extension is useful for:\n"
4476 "This extension is useful for:\n"
4477 " * Japanese Windows users using shift_jis encoding.\n"
4477 " * Japanese Windows users using shift_jis encoding.\n"
4478 " * Chinese Windows users using big5 encoding.\n"
4478 " * Chinese Windows users using big5 encoding.\n"
4479 " * All users who use a repository with one of problematic encodings on\n"
4479 " * All users who use a repository with one of problematic encodings on\n"
4480 " case-insensitive file system.\n"
4480 " case-insensitive file system.\n"
4481 "\n"
4481 "\n"
4482 "This extension is not needed for:\n"
4482 "This extension is not needed for:\n"
4483 " * Any user who use only ASCII chars in path.\n"
4483 " * Any user who use only ASCII chars in path.\n"
4484 " * Any user who do not use any of problematic encodings.\n"
4484 " * Any user who do not use any of problematic encodings.\n"
4485 "\n"
4485 "\n"
4486 "Note that there are some limitations on using this extension:\n"
4486 "Note that there are some limitations on using this extension:\n"
4487 " * You should use single encoding in one repository.\n"
4487 " * You should use single encoding in one repository.\n"
4488 " * You should set same encoding for the repository by locale or\n"
4488 " * You should set same encoding for the repository by locale or\n"
4489 " HGENCODING.\n"
4489 " HGENCODING.\n"
4490 "\n"
4490 "\n"
4491 "Path encoding conversion are done between Unicode and\n"
4491 "Path encoding conversion are done between Unicode and\n"
4492 "encoding.encoding which is decided by Mercurial from current locale\n"
4492 "encoding.encoding which is decided by Mercurial from current locale\n"
4493 "setting or HGENCODING.\n"
4493 "setting or HGENCODING.\n"
4494 msgstr ""
4494 msgstr ""
4495
4495
4496 #, python-format
4496 #, python-format
4497 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4497 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4498 msgstr ""
4498 msgstr ""
4499
4499
4500 msgid "[win32mbcs] cannot activate on this platform.\n"
4500 msgid "[win32mbcs] cannot activate on this platform.\n"
4501 msgstr ""
4501 msgstr ""
4502
4502
4503 #, python-format
4503 #, python-format
4504 msgid "[win32mbcs] activated with encoding: %s\n"
4504 msgid "[win32mbcs] activated with encoding: %s\n"
4505 msgstr ""
4505 msgstr ""
4506
4506
4507 msgid ""
4507 msgid ""
4508 "perform automatic newline conversion\n"
4508 "perform automatic newline conversion\n"
4509 "\n"
4509 "\n"
4510 "To perform automatic newline conversion, use:\n"
4510 "To perform automatic newline conversion, use:\n"
4511 "\n"
4511 "\n"
4512 "[extensions]\n"
4512 "[extensions]\n"
4513 "hgext.win32text =\n"
4513 "hgext.win32text =\n"
4514 "[encode]\n"
4514 "[encode]\n"
4515 "** = cleverencode:\n"
4515 "** = cleverencode:\n"
4516 "# or ** = macencode:\n"
4516 "# or ** = macencode:\n"
4517 "\n"
4517 "\n"
4518 "[decode]\n"
4518 "[decode]\n"
4519 "** = cleverdecode:\n"
4519 "** = cleverdecode:\n"
4520 "# or ** = macdecode:\n"
4520 "# or ** = macdecode:\n"
4521 "\n"
4521 "\n"
4522 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4522 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4523 "accident:\n"
4523 "accident:\n"
4524 "\n"
4524 "\n"
4525 "[hooks]\n"
4525 "[hooks]\n"
4526 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4526 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4527 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4527 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4528 "\n"
4528 "\n"
4529 "To do the same check on a server to prevent CRLF/CR from being\n"
4529 "To do the same check on a server to prevent CRLF/CR from being\n"
4530 "pushed or pulled:\n"
4530 "pushed or pulled:\n"
4531 "\n"
4531 "\n"
4532 "[hooks]\n"
4532 "[hooks]\n"
4533 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4533 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4534 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4534 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4535 msgstr ""
4535 msgstr ""
4536
4536
4537 #, python-format
4537 #, python-format
4538 msgid ""
4538 msgid ""
4539 "WARNING: %s already has %s line endings\n"
4539 "WARNING: %s already has %s line endings\n"
4540 "and does not need EOL conversion by the win32text plugin.\n"
4540 "and does not need EOL conversion by the win32text plugin.\n"
4541 "Before your next commit, please reconsider your encode/decode settings in \n"
4541 "Before your next commit, please reconsider your encode/decode settings in \n"
4542 "Mercurial.ini or %s.\n"
4542 "Mercurial.ini or %s.\n"
4543 msgstr ""
4543 msgstr ""
4544
4544
4545 #, python-format
4545 #, python-format
4546 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4546 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4547 msgstr ""
4547 msgstr ""
4548
4548
4549 #, python-format
4549 #, python-format
4550 msgid "in %s: %s\n"
4550 msgid "in %s: %s\n"
4551 msgstr ""
4551 msgstr ""
4552
4552
4553 #, python-format
4553 #, python-format
4554 msgid ""
4554 msgid ""
4555 "\n"
4555 "\n"
4556 "To prevent this mistake in your local repository,\n"
4556 "To prevent this mistake in your local repository,\n"
4557 "add to Mercurial.ini or .hg/hgrc:\n"
4557 "add to Mercurial.ini or .hg/hgrc:\n"
4558 "\n"
4558 "\n"
4559 "[hooks]\n"
4559 "[hooks]\n"
4560 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4560 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4561 "\n"
4561 "\n"
4562 "and also consider adding:\n"
4562 "and also consider adding:\n"
4563 "\n"
4563 "\n"
4564 "[extensions]\n"
4564 "[extensions]\n"
4565 "hgext.win32text =\n"
4565 "hgext.win32text =\n"
4566 "[encode]\n"
4566 "[encode]\n"
4567 "** = %sencode:\n"
4567 "** = %sencode:\n"
4568 "[decode]\n"
4568 "[decode]\n"
4569 "** = %sdecode:\n"
4569 "** = %sdecode:\n"
4570 msgstr ""
4570 msgstr ""
4571
4571
4572 msgid ""
4572 msgid ""
4573 "discover and advertise repositories on the local network\n"
4573 "discover and advertise repositories on the local network\n"
4574 "\n"
4574 "\n"
4575 "Zeroconf enabled repositories will be announced in a network without\n"
4575 "Zeroconf enabled repositories will be announced in a network without\n"
4576 "the need to configure a server or a service. They can be discovered\n"
4576 "the need to configure a server or a service. They can be discovered\n"
4577 "without knowing their actual IP address.\n"
4577 "without knowing their actual IP address.\n"
4578 "\n"
4578 "\n"
4579 "To allow other people to discover your repository using run \"hg serve\"\n"
4579 "To allow other people to discover your repository using run \"hg serve\"\n"
4580 "in your repository.\n"
4580 "in your repository.\n"
4581 "\n"
4581 "\n"
4582 " $ cd test\n"
4582 " $ cd test\n"
4583 " $ hg serve\n"
4583 " $ hg serve\n"
4584 "\n"
4584 "\n"
4585 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4585 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4586 "\n"
4586 "\n"
4587 " $ hg paths\n"
4587 " $ hg paths\n"
4588 " zc-test = http://example.com:8000/test\n"
4588 " zc-test = http://example.com:8000/test\n"
4589 msgstr ""
4589 msgstr ""
4590 "découverte et annonce de dépôts sur le réseau local\n"
4590 "découverte et annonce de dépôts sur le réseau local\n"
4591 "\n"
4591 "\n"
4592 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4592 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4593 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4593 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4594 "particuliers, et ils peuvent être accédés simplement, sans\n"
4594 "particuliers, et ils peuvent être accédés simplement, sans\n"
4595 "connaissance de leur adresse IP.\n"
4595 "connaissance de leur adresse IP.\n"
4596 "\n"
4596 "\n"
4597 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4597 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4598 "lancez-y la commande \"hg serve\" :\n"
4598 "lancez-y la commande \"hg serve\" :\n"
4599 "\n"
4599 "\n"
4600 " $ cd test\n"
4600 " $ cd test\n"
4601 " $ hg serve\n"
4601 " $ hg serve\n"
4602 "\n"
4602 "\n"
4603 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4603 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4604 "la commande \"hg paths\", par exemple :\n"
4604 "la commande \"hg paths\", par exemple :\n"
4605 "\n"
4605 "\n"
4606 " $ hg paths\n"
4606 " $ hg paths\n"
4607 " zc-test = http://example.com:8000/test\n"
4607 " zc-test = http://example.com:8000/test\n"
4608
4608
4609 msgid "archive prefix contains illegal components"
4609 msgid "archive prefix contains illegal components"
4610 msgstr ""
4610 msgstr "le préfixe donné pour l'archive contient des composants non autorisés"
4611
4611
4612 msgid "cannot give prefix when archiving to files"
4612 msgid "cannot give prefix when archiving to files"
4613 msgstr ""
4613 msgstr ""
4614 "impossible de donner un préfixe pour une création d'archive vers un "
4615 "répertoire (de type \"files\")"
4614
4616
4615 #, python-format
4617 #, python-format
4616 msgid "unknown archive type '%s'"
4618 msgid "unknown archive type '%s'"
4617 msgstr ""
4619 msgstr "type d'archive inconnu : '%s'"
4618
4620
4619 msgid "invalid changegroup"
4621 msgid "invalid changegroup"
4620 msgstr ""
4622 msgstr ""
4621
4623
4622 msgid "unknown parent"
4624 msgid "unknown parent"
4623 msgstr ""
4625 msgstr ""
4624
4626
4625 #, python-format
4627 #, python-format
4626 msgid "integrity check failed on %s:%d"
4628 msgid "integrity check failed on %s:%d"
4627 msgstr ""
4629 msgstr ""
4628
4630
4629 #, python-format
4631 #, python-format
4630 msgid "%s: not a Mercurial bundle file"
4632 msgid "%s: not a Mercurial bundle file"
4631 msgstr ""
4633 msgstr ""
4632
4634
4633 #, python-format
4635 #, python-format
4634 msgid "%s: unknown bundle version"
4636 msgid "%s: unknown bundle version"
4635 msgstr ""
4637 msgstr ""
4636
4638
4637 #, python-format
4639 #, python-format
4638 msgid "%s: unknown bundle compression type"
4640 msgid "%s: unknown bundle compression type"
4639 msgstr ""
4641 msgstr ""
4640
4642
4641 msgid "cannot create new bundle repository"
4643 msgid "cannot create new bundle repository"
4642 msgstr ""
4644 msgstr ""
4643
4645
4644 #, python-format
4646 #, python-format
4645 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4647 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4646 msgstr ""
4648 msgstr ""
4647
4649
4648 msgid "empty username"
4650 msgid "empty username"
4649 msgstr ""
4651 msgstr ""
4650
4652
4651 #, python-format
4653 #, python-format
4652 msgid "username %s contains a newline"
4654 msgid "username %s contains a newline"
4653 msgstr ""
4655 msgstr ""
4654
4656
4655 msgid "options --message and --logfile are mutually exclusive"
4657 msgid "options --message and --logfile are mutually exclusive"
4656 msgstr ""
4658 msgstr ""
4657
4659
4658 #, python-format
4660 #, python-format
4659 msgid "can't read commit message '%s': %s"
4661 msgid "can't read commit message '%s': %s"
4660 msgstr ""
4662 msgstr ""
4661
4663
4662 msgid "limit must be a positive integer"
4664 msgid "limit must be a positive integer"
4663 msgstr ""
4665 msgstr ""
4664
4666
4665 msgid "limit must be positive"
4667 msgid "limit must be positive"
4666 msgstr ""
4668 msgstr ""
4667
4669
4668 msgid "too many revisions specified"
4670 msgid "too many revisions specified"
4669 msgstr ""
4671 msgstr ""
4670
4672
4671 #, python-format
4673 #, python-format
4672 msgid "invalid format spec '%%%s' in output filename"
4674 msgid "invalid format spec '%%%s' in output filename"
4673 msgstr ""
4675 msgstr ""
4674
4676
4675 #, python-format
4677 #, python-format
4676 msgid "adding %s\n"
4678 msgid "adding %s\n"
4677 msgstr ""
4679 msgstr ""
4678
4680
4679 #, python-format
4681 #, python-format
4680 msgid "removing %s\n"
4682 msgid "removing %s\n"
4681 msgstr ""
4683 msgstr ""
4682
4684
4683 #, python-format
4685 #, python-format
4684 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4686 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4685 msgstr ""
4687 msgstr ""
4686
4688
4687 #, python-format
4689 #, python-format
4688 msgid "%s: not copying - file is not managed\n"
4690 msgid "%s: not copying - file is not managed\n"
4689 msgstr ""
4691 msgstr ""
4690
4692
4691 #, python-format
4693 #, python-format
4692 msgid "%s: not copying - file has been marked for remove\n"
4694 msgid "%s: not copying - file has been marked for remove\n"
4693 msgstr ""
4695 msgstr ""
4694
4696
4695 #, python-format
4697 #, python-format
4696 msgid "%s: not overwriting - %s collides with %s\n"
4698 msgid "%s: not overwriting - %s collides with %s\n"
4697 msgstr ""
4699 msgstr ""
4698
4700
4699 #, python-format
4701 #, python-format
4700 msgid "%s: not overwriting - file exists\n"
4702 msgid "%s: not overwriting - file exists\n"
4701 msgstr ""
4703 msgstr ""
4702
4704
4703 #, python-format
4705 #, python-format
4704 msgid "%s: deleted in working copy\n"
4706 msgid "%s: deleted in working copy\n"
4705 msgstr ""
4707 msgstr ""
4706
4708
4707 #, python-format
4709 #, python-format
4708 msgid "%s: cannot copy - %s\n"
4710 msgid "%s: cannot copy - %s\n"
4709 msgstr ""
4711 msgstr ""
4710
4712
4711 #, python-format
4713 #, python-format
4712 msgid "moving %s to %s\n"
4714 msgid "moving %s to %s\n"
4713 msgstr ""
4715 msgstr ""
4714
4716
4715 #, python-format
4717 #, python-format
4716 msgid "copying %s to %s\n"
4718 msgid "copying %s to %s\n"
4717 msgstr ""
4719 msgstr ""
4718
4720
4719 #, python-format
4721 #, python-format
4720 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4722 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4721 msgstr ""
4723 msgstr ""
4722
4724
4723 msgid "no source or destination specified"
4725 msgid "no source or destination specified"
4724 msgstr ""
4726 msgstr ""
4725
4727
4726 msgid "no destination specified"
4728 msgid "no destination specified"
4727 msgstr ""
4729 msgstr ""
4728
4730
4729 msgid "with multiple sources, destination must be an existing directory"
4731 msgid "with multiple sources, destination must be an existing directory"
4730 msgstr ""
4732 msgstr ""
4731
4733
4732 #, python-format
4734 #, python-format
4733 msgid "destination %s is not a directory"
4735 msgid "destination %s is not a directory"
4734 msgstr ""
4736 msgstr ""
4735
4737
4736 msgid "no files to copy"
4738 msgid "no files to copy"
4737 msgstr ""
4739 msgstr ""
4738
4740
4739 msgid "(consider using --after)\n"
4741 msgid "(consider using --after)\n"
4740 msgstr ""
4742 msgstr ""
4741
4743
4742 #, python-format
4744 #, python-format
4743 msgid "changeset: %d:%s\n"
4745 msgid "changeset: %d:%s\n"
4744 msgstr ""
4746 msgstr ""
4745
4747
4746 #, python-format
4748 #, python-format
4747 msgid "branch: %s\n"
4749 msgid "branch: %s\n"
4748 msgstr ""
4750 msgstr ""
4749
4751
4750 #, python-format
4752 #, python-format
4751 msgid "tag: %s\n"
4753 msgid "tag: %s\n"
4752 msgstr ""
4754 msgstr ""
4753
4755
4754 #, python-format
4756 #, python-format
4755 msgid "parent: %d:%s\n"
4757 msgid "parent: %d:%s\n"
4756 msgstr ""
4758 msgstr ""
4757
4759
4758 #, python-format
4760 #, python-format
4759 msgid "manifest: %d:%s\n"
4761 msgid "manifest: %d:%s\n"
4760 msgstr ""
4762 msgstr ""
4761
4763
4762 #, python-format
4764 #, python-format
4763 msgid "user: %s\n"
4765 msgid "user: %s\n"
4764 msgstr ""
4766 msgstr ""
4765
4767
4766 #, python-format
4768 #, python-format
4767 msgid "date: %s\n"
4769 msgid "date: %s\n"
4768 msgstr ""
4770 msgstr ""
4769
4771
4770 msgid "files+:"
4772 msgid "files+:"
4771 msgstr ""
4773 msgstr ""
4772
4774
4773 msgid "files-:"
4775 msgid "files-:"
4774 msgstr ""
4776 msgstr ""
4775
4777
4776 msgid "files:"
4778 msgid "files:"
4777 msgstr ""
4779 msgstr ""
4778
4780
4779 #, python-format
4781 #, python-format
4780 msgid "files: %s\n"
4782 msgid "files: %s\n"
4781 msgstr ""
4783 msgstr ""
4782
4784
4783 #, python-format
4785 #, python-format
4784 msgid "copies: %s\n"
4786 msgid "copies: %s\n"
4785 msgstr ""
4787 msgstr ""
4786
4788
4787 #, python-format
4789 #, python-format
4788 msgid "extra: %s=%s\n"
4790 msgid "extra: %s=%s\n"
4789 msgstr ""
4791 msgstr ""
4790
4792
4791 msgid "description:\n"
4793 msgid "description:\n"
4792 msgstr ""
4794 msgstr ""
4793
4795
4794 #, python-format
4796 #, python-format
4795 msgid "summary: %s\n"
4797 msgid "summary: %s\n"
4796 msgstr ""
4798 msgstr ""
4797
4799
4798 #, python-format
4800 #, python-format
4799 msgid "%s: no key named '%s'"
4801 msgid "%s: no key named '%s'"
4800 msgstr ""
4802 msgstr ""
4801
4803
4802 #, python-format
4804 #, python-format
4803 msgid "%s: %s"
4805 msgid "%s: %s"
4804 msgstr ""
4806 msgstr ""
4805
4807
4806 #, python-format
4808 #, python-format
4807 msgid "Found revision %s from %s\n"
4809 msgid "Found revision %s from %s\n"
4808 msgstr ""
4810 msgstr ""
4809
4811
4810 msgid "revision matching date not found"
4812 msgid "revision matching date not found"
4811 msgstr ""
4813 msgstr ""
4812
4814
4813 #, python-format
4815 #, python-format
4814 msgid "cannot follow nonexistent file: \"%s\""
4816 msgid "cannot follow nonexistent file: \"%s\""
4815 msgstr ""
4817 msgstr ""
4816
4818
4817 #, python-format
4819 #, python-format
4818 msgid "%s:%s copy source revision cannot be found!\n"
4820 msgid "%s:%s copy source revision cannot be found!\n"
4819 msgstr ""
4821 msgstr ""
4820
4822
4821 msgid "can only follow copies/renames for explicit filenames"
4823 msgid "can only follow copies/renames for explicit filenames"
4822 msgstr ""
4824 msgstr ""
4823
4825
4824 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4826 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4825 msgstr ""
4827 msgstr ""
4826
4828
4827 msgid "HG: Leave message empty to abort commit."
4829 msgid "HG: Leave message empty to abort commit."
4828 msgstr ""
4830 msgstr ""
4829
4831
4830 #, python-format
4832 #, python-format
4831 msgid "HG: user: %s"
4833 msgid "HG: user: %s"
4832 msgstr ""
4834 msgstr ""
4833
4835
4834 msgid "HG: branch merge"
4836 msgid "HG: branch merge"
4835 msgstr ""
4837 msgstr ""
4836
4838
4837 #, python-format
4839 #, python-format
4838 msgid "HG: branch '%s'"
4840 msgid "HG: branch '%s'"
4839 msgstr ""
4841 msgstr ""
4840
4842
4841 #, python-format
4843 #, python-format
4842 msgid "HG: added %s"
4844 msgid "HG: added %s"
4843 msgstr ""
4845 msgstr ""
4844
4846
4845 #, python-format
4847 #, python-format
4846 msgid "HG: changed %s"
4848 msgid "HG: changed %s"
4847 msgstr ""
4849 msgstr ""
4848
4850
4849 #, python-format
4851 #, python-format
4850 msgid "HG: removed %s"
4852 msgid "HG: removed %s"
4851 msgstr ""
4853 msgstr ""
4852
4854
4853 msgid "HG: no files changed"
4855 msgid "HG: no files changed"
4854 msgstr ""
4856 msgstr ""
4855
4857
4856 msgid "empty commit message"
4858 msgid "empty commit message"
4857 msgstr ""
4859 msgstr ""
4858
4860
4859 msgid ""
4861 msgid ""
4860 "add the specified files on the next commit\n"
4862 "add the specified files on the next commit\n"
4861 "\n"
4863 "\n"
4862 " Schedule files to be version controlled and added to the\n"
4864 " Schedule files to be version controlled and added to the\n"
4863 " repository.\n"
4865 " repository.\n"
4864 "\n"
4866 "\n"
4865 " The files will be added to the repository at the next commit. To\n"
4867 " The files will be added to the repository at the next commit. To\n"
4866 " undo an add before that, see hg forget.\n"
4868 " undo an add before that, see hg forget.\n"
4867 "\n"
4869 "\n"
4868 " If no names are given, add all files to the repository.\n"
4870 " If no names are given, add all files to the repository.\n"
4869 " "
4871 " "
4870 msgstr ""
4872 msgstr ""
4871
4873
4872 msgid ""
4874 msgid ""
4873 "add all new files, delete all missing files\n"
4875 "add all new files, delete all missing files\n"
4874 "\n"
4876 "\n"
4875 " Add all new files and remove all missing files from the\n"
4877 " Add all new files and remove all missing files from the\n"
4876 " repository.\n"
4878 " repository.\n"
4877 "\n"
4879 "\n"
4878 " New files are ignored if they match any of the patterns in\n"
4880 " New files are ignored if they match any of the patterns in\n"
4879 " .hgignore. As with add, these changes take effect at the next\n"
4881 " .hgignore. As with add, these changes take effect at the next\n"
4880 " commit.\n"
4882 " commit.\n"
4881 "\n"
4883 "\n"
4882 " Use the -s/--similarity option to detect renamed files. With a\n"
4884 " Use the -s/--similarity option to detect renamed files. With a\n"
4883 " parameter > 0, this compares every removed file with every added\n"
4885 " parameter > 0, this compares every removed file with every added\n"
4884 " file and records those similar enough as renames. This option\n"
4886 " file and records those similar enough as renames. This option\n"
4885 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4887 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4886 " identical) as its parameter. Detecting renamed files this way can\n"
4888 " identical) as its parameter. Detecting renamed files this way can\n"
4887 " be expensive.\n"
4889 " be expensive.\n"
4888 " "
4890 " "
4889 msgstr ""
4891 msgstr ""
4890
4892
4891 msgid "similarity must be a number"
4893 msgid "similarity must be a number"
4892 msgstr ""
4894 msgstr ""
4893
4895
4894 msgid "similarity must be between 0 and 100"
4896 msgid "similarity must be between 0 and 100"
4895 msgstr ""
4897 msgstr ""
4896
4898
4897 msgid ""
4899 msgid ""
4898 "show changeset information by line for each file\n"
4900 "show changeset information by line for each file\n"
4899 "\n"
4901 "\n"
4900 " List changes in files, showing the revision id responsible for\n"
4902 " List changes in files, showing the revision id responsible for\n"
4901 " each line\n"
4903 " each line\n"
4902 "\n"
4904 "\n"
4903 " This command is useful for discovering when a change was made and\n"
4905 " This command is useful for discovering when a change was made and\n"
4904 " by whom.\n"
4906 " by whom.\n"
4905 "\n"
4907 "\n"
4906 " Without the -a/--text option, annotate will avoid processing files\n"
4908 " Without the -a/--text option, annotate will avoid processing files\n"
4907 " it detects as binary. With -a, annotate will annotate the file\n"
4909 " it detects as binary. With -a, annotate will annotate the file\n"
4908 " anyway, although the results will probably be neither useful\n"
4910 " anyway, although the results will probably be neither useful\n"
4909 " nor desirable.\n"
4911 " nor desirable.\n"
4910 " "
4912 " "
4911 msgstr ""
4913 msgstr ""
4912
4914
4913 msgid "at least one filename or pattern is required"
4915 msgid "at least one filename or pattern is required"
4914 msgstr ""
4916 msgstr ""
4915
4917
4916 msgid "at least one of -n/-c is required for -l"
4918 msgid "at least one of -n/-c is required for -l"
4917 msgstr ""
4919 msgstr ""
4918
4920
4919 #, python-format
4921 #, python-format
4920 msgid "%s: binary file\n"
4922 msgid "%s: binary file\n"
4921 msgstr ""
4923 msgstr ""
4922
4924
4923 msgid ""
4925 msgid ""
4924 "create an unversioned archive of a repository revision\n"
4926 "create an unversioned archive of a repository revision\n"
4925 "\n"
4927 "\n"
4926 " By default, the revision used is the parent of the working\n"
4928 " By default, the revision used is the parent of the working\n"
4927 " directory; use -r/--rev to specify a different revision.\n"
4929 " directory; use -r/--rev to specify a different revision.\n"
4928 "\n"
4930 "\n"
4929 " To specify the type of archive to create, use -t/--type. Valid\n"
4931 " To specify the type of archive to create, use -t/--type. Valid\n"
4930 " types are:\n"
4932 " types are:\n"
4931 "\n"
4933 "\n"
4932 " \"files\" (default): a directory full of files\n"
4934 " \"files\" (default): a directory full of files\n"
4933 " \"tar\": tar archive, uncompressed\n"
4935 " \"tar\": tar archive, uncompressed\n"
4934 " \"tbz2\": tar archive, compressed using bzip2\n"
4936 " \"tbz2\": tar archive, compressed using bzip2\n"
4935 " \"tgz\": tar archive, compressed using gzip\n"
4937 " \"tgz\": tar archive, compressed using gzip\n"
4936 " \"uzip\": zip archive, uncompressed\n"
4938 " \"uzip\": zip archive, uncompressed\n"
4937 " \"zip\": zip archive, compressed using deflate\n"
4939 " \"zip\": zip archive, compressed using deflate\n"
4938 "\n"
4940 "\n"
4939 " The exact name of the destination archive or directory is given\n"
4941 " The exact name of the destination archive or directory is given\n"
4940 " using a format string; see 'hg help export' for details.\n"
4942 " using a format string; see 'hg help export' for details.\n"
4941 "\n"
4943 "\n"
4942 " Each member added to an archive file has a directory prefix\n"
4944 " Each member added to an archive file has a directory prefix\n"
4943 " prepended. Use -p/--prefix to specify a format string for the\n"
4945 " prepended. Use -p/--prefix to specify a format string for the\n"
4944 " prefix. The default is the basename of the archive, with suffixes\n"
4946 " prefix. The default is the basename of the archive, with suffixes\n"
4945 " removed.\n"
4947 " removed.\n"
4946 " "
4948 " "
4947 msgstr ""
4949 msgstr ""
4950 "crée une archive du dépôt à une révision donnée, sans conserver "
4951 "l'historique\n"
4952 "\n"
4953 " Par défaut l'archive est créée à partir de la révision parente\n"
4954 " du répertoire de travail. Une autre révision peut être spécifiée\n"
4955 " à l'aide de -r/--rev.\n"
4956 "\n"
4957 " -t/--type permet de spécifier le type d'archive à créer, parmi :\n"
4958 "\n"
4959 " \"files\" (par défaut) : un répertoire rempli de fichiers\n"
4960 " \"tar\" : une archive tar non compressée\n"
4961 " \"tbz2\" : une archive tar compressée avec bzip2\n"
4962 " \"tgz\" : une archive tar compressée avec gzip\n"
4963 " \"uzip\" : une archive zip non compressée\n"
4964 " \"zip\" : une archive zip compressée avec l'algorithme deflate\n"
4965 "\n"
4966 " Le nom exact de l'archive ou du répertoire de destination est\n"
4967 " donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n"
4968 " pour plus de détails.\n"
4969 "\n"
4970 " Un chemin relatif est ajouté devant chaque membre de l'archive,\n"
4971 " par défaut le nom du fichier d'archive (sans répertoires ni\n"
4972 " suffixes). Un préfixe différent peut être spécifié avec\n"
4973 " -p/--prefix.\n"
4974 " "
4948
4975
4949 msgid "no working directory: please specify a revision"
4976 msgid "no working directory: please specify a revision"
4950 msgstr ""
4977 msgstr "pas de répertoire de travail, veuillez spécifier une révision"
4951
4978
4952 msgid "repository root cannot be destination"
4979 msgid "repository root cannot be destination"
4953 msgstr ""
4980 msgstr "le répertoire racine ne peut servir de destination"
4954
4981
4955 msgid "cannot archive plain files to stdout"
4982 msgid "cannot archive plain files to stdout"
4956 msgstr ""
4983 msgstr "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
4957
4984
4958 msgid ""
4985 msgid ""
4959 "reverse effect of earlier changeset\n"
4986 "reverse effect of earlier changeset\n"
4960 "\n"
4987 "\n"
4961 " Commit the backed out changes as a new changeset. The new\n"
4988 " Commit the backed out changes as a new changeset. The new\n"
4962 " changeset is a child of the backed out changeset.\n"
4989 " changeset is a child of the backed out changeset.\n"
4963 "\n"
4990 "\n"
4964 " If you backout a changeset other than the tip, a new head is\n"
4991 " If you backout a changeset other than the tip, a new head is\n"
4965 " created. This head will be the new tip and you should merge this\n"
4992 " created. This head will be the new tip and you should merge this\n"
4966 " backout changeset with another head.\n"
4993 " backout changeset with another head.\n"
4967 "\n"
4994 "\n"
4968 " The --merge option remembers the parent of the working directory\n"
4995 " The --merge option remembers the parent of the working directory\n"
4969 " before starting the backout, then merges the new head with that\n"
4996 " before starting the backout, then merges the new head with that\n"
4970 " changeset afterwards. This saves you from doing the merge by hand.\n"
4997 " changeset afterwards. This saves you from doing the merge by hand.\n"
4971 " The result of this merge is not committed, as with a normal merge.\n"
4998 " The result of this merge is not committed, as with a normal merge.\n"
4972 "\n"
4999 "\n"
4973 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5000 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4974 " "
5001 " "
4975 msgstr ""
5002 msgstr ""
4976
5003
4977 msgid "please specify just one revision"
5004 msgid "please specify just one revision"
4978 msgstr ""
5005 msgstr ""
4979
5006
4980 msgid "please specify a revision to backout"
5007 msgid "please specify a revision to backout"
4981 msgstr ""
5008 msgstr ""
4982
5009
4983 msgid "cannot backout change on a different branch"
5010 msgid "cannot backout change on a different branch"
4984 msgstr ""
5011 msgstr ""
4985
5012
4986 msgid "cannot backout a change with no parents"
5013 msgid "cannot backout a change with no parents"
4987 msgstr ""
5014 msgstr ""
4988
5015
4989 msgid "cannot backout a merge changeset without --parent"
5016 msgid "cannot backout a merge changeset without --parent"
4990 msgstr ""
5017 msgstr ""
4991
5018
4992 #, python-format
5019 #, python-format
4993 msgid "%s is not a parent of %s"
5020 msgid "%s is not a parent of %s"
4994 msgstr ""
5021 msgstr ""
4995
5022
4996 msgid "cannot use --parent on non-merge changeset"
5023 msgid "cannot use --parent on non-merge changeset"
4997 msgstr ""
5024 msgstr ""
4998
5025
4999 #, python-format
5026 #, python-format
5000 msgid "Backed out changeset %s"
5027 msgid "Backed out changeset %s"
5001 msgstr ""
5028 msgstr ""
5002
5029
5003 #, python-format
5030 #, python-format
5004 msgid "changeset %s backs out changeset %s\n"
5031 msgid "changeset %s backs out changeset %s\n"
5005 msgstr ""
5032 msgstr ""
5006
5033
5007 #, python-format
5034 #, python-format
5008 msgid "merging with changeset %s\n"
5035 msgid "merging with changeset %s\n"
5009 msgstr ""
5036 msgstr ""
5010
5037
5011 msgid "the backout changeset is a new head - do not forget to merge\n"
5038 msgid "the backout changeset is a new head - do not forget to merge\n"
5012 msgstr ""
5039 msgstr ""
5013
5040
5014 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5041 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5015 msgstr ""
5042 msgstr ""
5016
5043
5017 msgid ""
5044 msgid ""
5018 "subdivision search of changesets\n"
5045 "subdivision search of changesets\n"
5019 "\n"
5046 "\n"
5020 " This command helps to find changesets which introduce problems. To\n"
5047 " This command helps to find changesets which introduce problems. To\n"
5021 " use, mark the earliest changeset you know exhibits the problem as\n"
5048 " use, mark the earliest changeset you know exhibits the problem as\n"
5022 " bad, then mark the latest changeset which is free from the problem\n"
5049 " bad, then mark the latest changeset which is free from the problem\n"
5023 " as good. Bisect will update your working directory to a revision\n"
5050 " as good. Bisect will update your working directory to a revision\n"
5024 " for testing (unless the -U/--noupdate option is specified). Once\n"
5051 " for testing (unless the -U/--noupdate option is specified). Once\n"
5025 " you have performed tests, mark the working directory as good or\n"
5052 " you have performed tests, mark the working directory as good or\n"
5026 " bad, and bisect will either update to another candidate changeset\n"
5053 " bad, and bisect will either update to another candidate changeset\n"
5027 " or announce that it has found the bad revision.\n"
5054 " or announce that it has found the bad revision.\n"
5028 "\n"
5055 "\n"
5029 " As a shortcut, you can also use the revision argument to mark a\n"
5056 " As a shortcut, you can also use the revision argument to mark a\n"
5030 " revision as good or bad without checking it out first.\n"
5057 " revision as good or bad without checking it out first.\n"
5031 "\n"
5058 "\n"
5032 " If you supply a command, it will be used for automatic bisection.\n"
5059 " If you supply a command, it will be used for automatic bisection.\n"
5033 " Its exit status will be used to mark revisions as good or bad:\n"
5060 " Its exit status will be used to mark revisions as good or bad:\n"
5034 " status 0 means good, 125 means to skip the revision, 127\n"
5061 " status 0 means good, 125 means to skip the revision, 127\n"
5035 " (command not found) will abort the bisection, and any other\n"
5062 " (command not found) will abort the bisection, and any other\n"
5036 " non-zero exit status means the revision is bad.\n"
5063 " non-zero exit status means the revision is bad.\n"
5037 " "
5064 " "
5038 msgstr ""
5065 msgstr ""
5039 "recherche de \"changesets\" par dichotomie\n"
5066 "recherche de \"changesets\" par dichotomie\n"
5040 "\n"
5067 "\n"
5041 " Cette commande aide à trouver les \"changesets\" étant à\n"
5068 " Cette commande aide à trouver les \"changesets\" étant à\n"
5042 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5069 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5043 " mauvaise la première révision pour laquelle vous avez relevé les\n"
5070 " mauvaise la première révision pour laquelle vous avez relevé les\n"
5044 " symptômes, puis comme bonne la dernière révision connue pour\n"
5071 " symptômes, puis comme bonne la dernière révision connue pour\n"
5045 " être exempte du problème. Bisect va alors mettre à jour votre\n"
5072 " être exempte du problème. Bisect va alors mettre à jour votre\n"
5046 " répertoire de travail à une révision à tester (à moins que\n"
5073 " répertoire de travail à une révision à tester (à moins que\n"
5047 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5074 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5048 " indiquez si le problème était présent ou non. Bisect\n"
5075 " indiquez si le problème était présent ou non. Bisect\n"
5049 " recommencera alors pour une autre révision candidate jusqu'à\n"
5076 " recommencera alors pour une autre révision candidate jusqu'à\n"
5050 " être en mesure d'annoncer la révision fautive.\n"
5077 " être en mesure d'annoncer la révision fautive.\n"
5051 "\n"
5078 "\n"
5052 " Vous pouvez aussi passer une révision en argument lors du\n"
5079 " Vous pouvez aussi passer une révision en argument lors du\n"
5053 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5080 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5054 " répertoire de travail à cette révision.\n"
5081 " répertoire de travail à cette révision.\n"
5055 "\n"
5082 "\n"
5056 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5083 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5057 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5084 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5058 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
5085 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
5059 " faut pas prendre cette révision en compte, 127 (commande\n"
5086 " faut pas prendre cette révision en compte, 127 (commande\n"
5060 " introuvable) cause l'abandon du processus de recherche, et tout\n"
5087 " introuvable) cause l'abandon du processus de recherche, et tout\n"
5061 " autre code de retour non nul désigne une révision affectée par\n"
5088 " autre code de retour non nul désigne une révision affectée par\n"
5062 " le problème.\n"
5089 " le problème.\n"
5063 " "
5090 " "
5064
5091
5065 msgid "The first good revision is:\n"
5092 msgid "The first good revision is:\n"
5066 msgstr "La première révision exempte du problème est :\n"
5093 msgstr "La première révision exempte du problème est :\n"
5067
5094
5068 msgid "The first bad revision is:\n"
5095 msgid "The first bad revision is:\n"
5069 msgstr "La première révision présentant le problème est :\n"
5096 msgstr "La première révision présentant le problème est :\n"
5070
5097
5071 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5098 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5072 msgstr ""
5099 msgstr ""
5073 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5100 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5074 "exempte du problème pourrait être parmi :\n"
5101 "exempte du problème pourrait être parmi :\n"
5075
5102
5076 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5103 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5077 msgstr ""
5104 msgstr ""
5078 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5105 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5079 "présentant le problème pourrait être parmi :\n"
5106 "présentant le problème pourrait être parmi :\n"
5080
5107
5081 msgid "cannot bisect (no known good revisions)"
5108 msgid "cannot bisect (no known good revisions)"
5082 msgstr "dichotomie impossible (pas de bonne révision connue)"
5109 msgstr "dichotomie impossible (pas de bonne révision connue)"
5083
5110
5084 msgid "cannot bisect (no known bad revisions)"
5111 msgid "cannot bisect (no known bad revisions)"
5085 msgstr "dichotomie impossible (pas de mauvaise révision connue)"
5112 msgstr "dichotomie impossible (pas de mauvaise révision connue)"
5086
5113
5087 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5114 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5088 msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n"
5115 msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n"
5089
5116
5090 msgid "incompatible arguments"
5117 msgid "incompatible arguments"
5091 msgstr "arguments incompatibles"
5118 msgstr "arguments incompatibles"
5092
5119
5093 #, python-format
5120 #, python-format
5094 msgid "cannot find executable: %s"
5121 msgid "cannot find executable: %s"
5095 msgstr "exécutable %s introuvable"
5122 msgstr "exécutable %s introuvable"
5096
5123
5097 #, python-format
5124 #, python-format
5098 msgid "failed to execute %s"
5125 msgid "failed to execute %s"
5099 msgstr "impossible d'exécuter %s"
5126 msgstr "impossible d'exécuter %s"
5100
5127
5101 #, python-format
5128 #, python-format
5102 msgid "%s killed"
5129 msgid "%s killed"
5103 msgstr "%s a été tué"
5130 msgstr "%s a été tué"
5104
5131
5105 #, python-format
5132 #, python-format
5106 msgid "Changeset %d:%s: %s\n"
5133 msgid "Changeset %d:%s: %s\n"
5107 msgstr "\"Changeset\" %d:%s: %s\n"
5134 msgstr "\"Changeset\" %d:%s: %s\n"
5108
5135
5109 #, python-format
5136 #, python-format
5110 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5137 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5111 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5138 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5112
5139
5113 msgid ""
5140 msgid ""
5114 "set or show the current branch name\n"
5141 "set or show the current branch name\n"
5115 "\n"
5142 "\n"
5116 " With no argument, show the current branch name. With one argument,\n"
5143 " With no argument, show the current branch name. With one argument,\n"
5117 " set the working directory branch name (the branch will not exist\n"
5144 " set the working directory branch name (the branch will not exist\n"
5118 " in the repository until the next commit). Standard practice\n"
5145 " in the repository until the next commit). Standard practice\n"
5119 " recommends that primary development take place on the 'default'\n"
5146 " recommends that primary development take place on the 'default'\n"
5120 " branch.\n"
5147 " branch.\n"
5121 "\n"
5148 "\n"
5122 " Unless -f/--force is specified, branch will not let you set a\n"
5149 " Unless -f/--force is specified, branch will not let you set a\n"
5123 " branch name that already exists, even if it's inactive.\n"
5150 " branch name that already exists, even if it's inactive.\n"
5124 "\n"
5151 "\n"
5125 " Use -C/--clean to reset the working directory branch to that of\n"
5152 " Use -C/--clean to reset the working directory branch to that of\n"
5126 " the parent of the working directory, negating a previous branch\n"
5153 " the parent of the working directory, negating a previous branch\n"
5127 " change.\n"
5154 " change.\n"
5128 "\n"
5155 "\n"
5129 " Use the command 'hg update' to switch to an existing branch.\n"
5156 " Use the command 'hg update' to switch to an existing branch.\n"
5130 " "
5157 " "
5131 msgstr ""
5158 msgstr ""
5132
5159
5133 #, python-format
5160 #, python-format
5134 msgid "reset working directory to branch %s\n"
5161 msgid "reset working directory to branch %s\n"
5135 msgstr ""
5162 msgstr ""
5136
5163
5137 msgid "a branch of the same name already exists (use --force to override)"
5164 msgid "a branch of the same name already exists (use --force to override)"
5138 msgstr ""
5165 msgstr ""
5139
5166
5140 #, python-format
5167 #, python-format
5141 msgid "marked working directory as branch %s\n"
5168 msgid "marked working directory as branch %s\n"
5142 msgstr ""
5169 msgstr ""
5143
5170
5144 msgid ""
5171 msgid ""
5145 "list repository named branches\n"
5172 "list repository named branches\n"
5146 "\n"
5173 "\n"
5147 " List the repository's named branches, indicating which ones are\n"
5174 " List the repository's named branches, indicating which ones are\n"
5148 " inactive. If -a/--active is specified, only show active branches.\n"
5175 " inactive. If -a/--active is specified, only show active branches.\n"
5149 "\n"
5176 "\n"
5150 " A branch is considered active if it contains repository heads.\n"
5177 " A branch is considered active if it contains repository heads.\n"
5151 "\n"
5178 "\n"
5152 " Use the command 'hg update' to switch to an existing branch.\n"
5179 " Use the command 'hg update' to switch to an existing branch.\n"
5153 " "
5180 " "
5154 msgstr ""
5181 msgstr ""
5155
5182
5156 msgid ""
5183 msgid ""
5157 "create a changegroup file\n"
5184 "create a changegroup file\n"
5158 "\n"
5185 "\n"
5159 " Generate a compressed changegroup file collecting changesets not\n"
5186 " Generate a compressed changegroup file collecting changesets not\n"
5160 " known to be in another repository.\n"
5187 " known to be in another repository.\n"
5161 "\n"
5188 "\n"
5162 " If no destination repository is specified the destination is\n"
5189 " If no destination repository is specified the destination is\n"
5163 " assumed to have all the nodes specified by one or more --base\n"
5190 " assumed to have all the nodes specified by one or more --base\n"
5164 " parameters. To create a bundle containing all changesets, use\n"
5191 " parameters. To create a bundle containing all changesets, use\n"
5165 " -a/--all (or --base null).\n"
5192 " -a/--all (or --base null).\n"
5166 "\n"
5193 "\n"
5167 " You can change compression method with the -t/--type option.\n"
5194 " You can change compression method with the -t/--type option.\n"
5168 " The available compression methods are: none, bzip2, and\n"
5195 " The available compression methods are: none, bzip2, and\n"
5169 " gzip (by default, bundles are compressed using bzip2).\n"
5196 " gzip (by default, bundles are compressed using bzip2).\n"
5170 "\n"
5197 "\n"
5171 " The bundle file can then be transferred using conventional means\n"
5198 " The bundle file can then be transferred using conventional means\n"
5172 " and applied to another repository with the unbundle or pull\n"
5199 " and applied to another repository with the unbundle or pull\n"
5173 " command. This is useful when direct push and pull are not\n"
5200 " command. This is useful when direct push and pull are not\n"
5174 " available or when exporting an entire repository is undesirable.\n"
5201 " available or when exporting an entire repository is undesirable.\n"
5175 "\n"
5202 "\n"
5176 " Applying bundles preserves all changeset contents including\n"
5203 " Applying bundles preserves all changeset contents including\n"
5177 " permissions, copy/rename information, and revision history.\n"
5204 " permissions, copy/rename information, and revision history.\n"
5178 " "
5205 " "
5179 msgstr ""
5206 msgstr ""
5180
5207
5181 msgid "--base is incompatible with specifying a destination"
5208 msgid "--base is incompatible with specifying a destination"
5182 msgstr ""
5209 msgstr ""
5183
5210
5184 msgid "unknown bundle type specified with --type"
5211 msgid "unknown bundle type specified with --type"
5185 msgstr ""
5212 msgstr ""
5186
5213
5187 msgid ""
5214 msgid ""
5188 "output the current or given revision of files\n"
5215 "output the current or given revision of files\n"
5189 "\n"
5216 "\n"
5190 " Print the specified files as they were at the given revision. If\n"
5217 " Print the specified files as they were at the given revision. If\n"
5191 " no revision is given, the parent of the working directory is used,\n"
5218 " no revision is given, the parent of the working directory is used,\n"
5192 " or tip if no revision is checked out.\n"
5219 " or tip if no revision is checked out.\n"
5193 "\n"
5220 "\n"
5194 " Output may be to a file, in which case the name of the file is\n"
5221 " Output may be to a file, in which case the name of the file is\n"
5195 " given using a format string. The formatting rules are the same as\n"
5222 " given using a format string. The formatting rules are the same as\n"
5196 " for the export command, with the following additions:\n"
5223 " for the export command, with the following additions:\n"
5197 "\n"
5224 "\n"
5198 " %s basename of file being printed\n"
5225 " %s basename of file being printed\n"
5199 " %d dirname of file being printed, or '.' if in repository root\n"
5226 " %d dirname of file being printed, or '.' if in repository root\n"
5200 " %p root-relative path name of file being printed\n"
5227 " %p root-relative path name of file being printed\n"
5201 " "
5228 " "
5202 msgstr ""
5229 msgstr ""
5203
5230
5204 msgid ""
5231 msgid ""
5205 "make a copy of an existing repository\n"
5232 "make a copy of an existing repository\n"
5206 "\n"
5233 "\n"
5207 " Create a copy of an existing repository in a new directory.\n"
5234 " Create a copy of an existing repository in a new directory.\n"
5208 "\n"
5235 "\n"
5209 " If no destination directory name is specified, it defaults to the\n"
5236 " If no destination directory name is specified, it defaults to the\n"
5210 " basename of the source.\n"
5237 " basename of the source.\n"
5211 "\n"
5238 "\n"
5212 " The location of the source is added to the new repository's\n"
5239 " The location of the source is added to the new repository's\n"
5213 " .hg/hgrc file, as the default to be used for future pulls.\n"
5240 " .hg/hgrc file, as the default to be used for future pulls.\n"
5214 "\n"
5241 "\n"
5215 " If you use the -r/--rev option to clone up to a specific revision,\n"
5242 " If you use the -r/--rev option to clone up to a specific revision,\n"
5216 " no subsequent revisions (including subsequent tags) will be\n"
5243 " no subsequent revisions (including subsequent tags) will be\n"
5217 " present in the cloned repository. This option implies --pull, even\n"
5244 " present in the cloned repository. This option implies --pull, even\n"
5218 " on local repositories.\n"
5245 " on local repositories.\n"
5219 "\n"
5246 "\n"
5220 " By default, clone will check out the head of the 'default' branch.\n"
5247 " By default, clone will check out the head of the 'default' branch.\n"
5221 " If the -U/--noupdate option is used, the new clone will contain\n"
5248 " If the -U/--noupdate option is used, the new clone will contain\n"
5222 " only a repository (.hg) and no working copy (the working copy\n"
5249 " only a repository (.hg) and no working copy (the working copy\n"
5223 " parent is the null revision).\n"
5250 " parent is the null revision).\n"
5224 "\n"
5251 "\n"
5225 " See 'hg help urls' for valid source format details.\n"
5252 " See 'hg help urls' for valid source format details.\n"
5226 "\n"
5253 "\n"
5227 " It is possible to specify an ssh:// URL as the destination, but no\n"
5254 " It is possible to specify an ssh:// URL as the destination, but no\n"
5228 " .hg/hgrc and working directory will be created on the remote side.\n"
5255 " .hg/hgrc and working directory will be created on the remote side.\n"
5229 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5256 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5230 "\n"
5257 "\n"
5231 " For efficiency, hardlinks are used for cloning whenever the source\n"
5258 " For efficiency, hardlinks are used for cloning whenever the source\n"
5232 " and destination are on the same filesystem (note this applies only\n"
5259 " and destination are on the same filesystem (note this applies only\n"
5233 " to the repository data, not to the checked out files). Some\n"
5260 " to the repository data, not to the checked out files). Some\n"
5234 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5261 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5235 " do not report errors. In these cases, use the --pull option to\n"
5262 " do not report errors. In these cases, use the --pull option to\n"
5236 " avoid hardlinking.\n"
5263 " avoid hardlinking.\n"
5237 "\n"
5264 "\n"
5238 " In some cases, you can clone repositories and checked out files\n"
5265 " In some cases, you can clone repositories and checked out files\n"
5239 " using full hardlinks with\n"
5266 " using full hardlinks with\n"
5240 "\n"
5267 "\n"
5241 " $ cp -al REPO REPOCLONE\n"
5268 " $ cp -al REPO REPOCLONE\n"
5242 "\n"
5269 "\n"
5243 " This is the fastest way to clone, but it is not always safe. The\n"
5270 " This is the fastest way to clone, but it is not always safe. The\n"
5244 " operation is not atomic (making sure REPO is not modified during\n"
5271 " operation is not atomic (making sure REPO is not modified during\n"
5245 " the operation is up to you) and you have to make sure your editor\n"
5272 " the operation is up to you) and you have to make sure your editor\n"
5246 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5273 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5247 " this is not compatible with certain extensions that place their\n"
5274 " this is not compatible with certain extensions that place their\n"
5248 " metadata under the .hg directory, such as mq.\n"
5275 " metadata under the .hg directory, such as mq.\n"
5249 "\n"
5276 "\n"
5250 " "
5277 " "
5251 msgstr ""
5278 msgstr ""
5252
5279
5253 msgid ""
5280 msgid ""
5254 "commit the specified files or all outstanding changes\n"
5281 "commit the specified files or all outstanding changes\n"
5255 "\n"
5282 "\n"
5256 " Commit changes to the given files into the repository. Unlike a\n"
5283 " Commit changes to the given files into the repository. Unlike a\n"
5257 " centralized RCS, this operation is a local operation. See hg push\n"
5284 " centralized RCS, this operation is a local operation. See hg push\n"
5258 " for a way to actively distribute your changes.\n"
5285 " for a way to actively distribute your changes.\n"
5259 "\n"
5286 "\n"
5260 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5287 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5261 " will be committed.\n"
5288 " will be committed.\n"
5262 "\n"
5289 "\n"
5263 " If you are committing the result of a merge, do not provide any\n"
5290 " If you are committing the result of a merge, do not provide any\n"
5264 " filenames or -I/-X filters.\n"
5291 " filenames or -I/-X filters.\n"
5265 "\n"
5292 "\n"
5266 " If no commit message is specified, the configured editor is\n"
5293 " If no commit message is specified, the configured editor is\n"
5267 " started to prompt you for a message.\n"
5294 " started to prompt you for a message.\n"
5268 "\n"
5295 "\n"
5269 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5296 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5270 " "
5297 " "
5271 msgstr ""
5298 msgstr ""
5272
5299
5273 msgid "created new head\n"
5300 msgid "created new head\n"
5274 msgstr ""
5301 msgstr ""
5275
5302
5276 #, python-format
5303 #, python-format
5277 msgid "committed changeset %d:%s\n"
5304 msgid "committed changeset %d:%s\n"
5278 msgstr ""
5305 msgstr ""
5279
5306
5280 msgid ""
5307 msgid ""
5281 "mark files as copied for the next commit\n"
5308 "mark files as copied for the next commit\n"
5282 "\n"
5309 "\n"
5283 " Mark dest as having copies of source files. If dest is a\n"
5310 " Mark dest as having copies of source files. If dest is a\n"
5284 " directory, copies are put in that directory. If dest is a file,\n"
5311 " directory, copies are put in that directory. If dest is a file,\n"
5285 " the source must be a single file.\n"
5312 " the source must be a single file.\n"
5286 "\n"
5313 "\n"
5287 " By default, this command copies the contents of files as they\n"
5314 " By default, this command copies the contents of files as they\n"
5288 " exist in the working directory. If invoked with -A/--after, the\n"
5315 " exist in the working directory. If invoked with -A/--after, the\n"
5289 " operation is recorded, but no copying is performed.\n"
5316 " operation is recorded, but no copying is performed.\n"
5290 "\n"
5317 "\n"
5291 " This command takes effect with the next commit. To undo a copy\n"
5318 " This command takes effect with the next commit. To undo a copy\n"
5292 " before that, see hg revert.\n"
5319 " before that, see hg revert.\n"
5293 " "
5320 " "
5294 msgstr ""
5321 msgstr ""
5295
5322
5296 msgid "find the ancestor revision of two revisions in a given index"
5323 msgid "find the ancestor revision of two revisions in a given index"
5297 msgstr ""
5324 msgstr ""
5298
5325
5299 msgid "There is no Mercurial repository here (.hg not found)"
5326 msgid "There is no Mercurial repository here (.hg not found)"
5300 msgstr ""
5327 msgstr ""
5301
5328
5302 msgid "either two or three arguments required"
5329 msgid "either two or three arguments required"
5303 msgstr ""
5330 msgstr ""
5304
5331
5305 msgid "returns the completion list associated with the given command"
5332 msgid "returns the completion list associated with the given command"
5306 msgstr ""
5333 msgstr ""
5307
5334
5308 msgid "rebuild the dirstate as it would look like for the given revision"
5335 msgid "rebuild the dirstate as it would look like for the given revision"
5309 msgstr ""
5336 msgstr ""
5310
5337
5311 msgid "validate the correctness of the current dirstate"
5338 msgid "validate the correctness of the current dirstate"
5312 msgstr ""
5339 msgstr ""
5313
5340
5314 #, python-format
5341 #, python-format
5315 msgid "%s in state %s, but not in manifest1\n"
5342 msgid "%s in state %s, but not in manifest1\n"
5316 msgstr ""
5343 msgstr ""
5317
5344
5318 #, python-format
5345 #, python-format
5319 msgid "%s in state %s, but also in manifest1\n"
5346 msgid "%s in state %s, but also in manifest1\n"
5320 msgstr ""
5347 msgstr ""
5321
5348
5322 #, python-format
5349 #, python-format
5323 msgid "%s in state %s, but not in either manifest\n"
5350 msgid "%s in state %s, but not in either manifest\n"
5324 msgstr ""
5351 msgstr ""
5325
5352
5326 #, python-format
5353 #, python-format
5327 msgid "%s in manifest1, but listed as state %s"
5354 msgid "%s in manifest1, but listed as state %s"
5328 msgstr ""
5355 msgstr ""
5329
5356
5330 msgid ".hg/dirstate inconsistent with current parent's manifest"
5357 msgid ".hg/dirstate inconsistent with current parent's manifest"
5331 msgstr ""
5358 msgstr ""
5332
5359
5333 msgid ""
5360 msgid ""
5334 "show combined config settings from all hgrc files\n"
5361 "show combined config settings from all hgrc files\n"
5335 "\n"
5362 "\n"
5336 " With no arguments, print names and values of all config items.\n"
5363 " With no arguments, print names and values of all config items.\n"
5337 "\n"
5364 "\n"
5338 " With one argument of the form section.name, print just the value\n"
5365 " With one argument of the form section.name, print just the value\n"
5339 " of that config item.\n"
5366 " of that config item.\n"
5340 "\n"
5367 "\n"
5341 " With multiple arguments, print names and values of all config\n"
5368 " With multiple arguments, print names and values of all config\n"
5342 " items with matching section names.\n"
5369 " items with matching section names.\n"
5343 "\n"
5370 "\n"
5344 " With --debug, the source (filename and line number) is printed\n"
5371 " With --debug, the source (filename and line number) is printed\n"
5345 " for each config item.\n"
5372 " for each config item.\n"
5346 " "
5373 " "
5347 msgstr ""
5374 msgstr ""
5348
5375
5349 msgid "only one config item permitted"
5376 msgid "only one config item permitted"
5350 msgstr ""
5377 msgstr ""
5351
5378
5352 msgid ""
5379 msgid ""
5353 "manually set the parents of the current working directory\n"
5380 "manually set the parents of the current working directory\n"
5354 "\n"
5381 "\n"
5355 " This is useful for writing repository conversion tools, but should\n"
5382 " This is useful for writing repository conversion tools, but should\n"
5356 " be used with care.\n"
5383 " be used with care.\n"
5357 " "
5384 " "
5358 msgstr ""
5385 msgstr ""
5359
5386
5360 msgid "show the contents of the current dirstate"
5387 msgid "show the contents of the current dirstate"
5361 msgstr ""
5388 msgstr ""
5362
5389
5363 #, python-format
5390 #, python-format
5364 msgid "copy: %s -> %s\n"
5391 msgid "copy: %s -> %s\n"
5365 msgstr ""
5392 msgstr ""
5366
5393
5367 msgid "dump the contents of a data file revision"
5394 msgid "dump the contents of a data file revision"
5368 msgstr ""
5395 msgstr ""
5369
5396
5370 #, python-format
5397 #, python-format
5371 msgid "invalid revision identifier %s"
5398 msgid "invalid revision identifier %s"
5372 msgstr ""
5399 msgstr ""
5373
5400
5374 msgid "parse and display a date"
5401 msgid "parse and display a date"
5375 msgstr ""
5402 msgstr ""
5376
5403
5377 msgid "dump the contents of an index file"
5404 msgid "dump the contents of an index file"
5378 msgstr ""
5405 msgstr ""
5379
5406
5380 msgid "dump an index DAG as a graphviz dot file"
5407 msgid "dump an index DAG as a graphviz dot file"
5381 msgstr ""
5408 msgstr ""
5382
5409
5383 msgid "test Mercurial installation"
5410 msgid "test Mercurial installation"
5384 msgstr ""
5411 msgstr ""
5385
5412
5386 #, python-format
5413 #, python-format
5387 msgid "Checking encoding (%s)...\n"
5414 msgid "Checking encoding (%s)...\n"
5388 msgstr ""
5415 msgstr ""
5389
5416
5390 msgid " (check that your locale is properly set)\n"
5417 msgid " (check that your locale is properly set)\n"
5391 msgstr ""
5418 msgstr ""
5392
5419
5393 msgid "Checking extensions...\n"
5420 msgid "Checking extensions...\n"
5394 msgstr ""
5421 msgstr ""
5395
5422
5396 msgid " One or more extensions could not be found"
5423 msgid " One or more extensions could not be found"
5397 msgstr ""
5424 msgstr ""
5398
5425
5399 msgid " (check that you compiled the extensions)\n"
5426 msgid " (check that you compiled the extensions)\n"
5400 msgstr ""
5427 msgstr ""
5401
5428
5402 msgid "Checking templates...\n"
5429 msgid "Checking templates...\n"
5403 msgstr ""
5430 msgstr ""
5404
5431
5405 msgid " (templates seem to have been installed incorrectly)\n"
5432 msgid " (templates seem to have been installed incorrectly)\n"
5406 msgstr ""
5433 msgstr ""
5407
5434
5408 msgid "Checking patch...\n"
5435 msgid "Checking patch...\n"
5409 msgstr ""
5436 msgstr ""
5410
5437
5411 msgid " patch call failed:\n"
5438 msgid " patch call failed:\n"
5412 msgstr ""
5439 msgstr ""
5413
5440
5414 msgid " unexpected patch output!\n"
5441 msgid " unexpected patch output!\n"
5415 msgstr ""
5442 msgstr ""
5416
5443
5417 msgid " patch test failed!\n"
5444 msgid " patch test failed!\n"
5418 msgstr ""
5445 msgstr ""
5419
5446
5420 msgid ""
5447 msgid ""
5421 " (Current patch tool may be incompatible with patch, or misconfigured. "
5448 " (Current patch tool may be incompatible with patch, or misconfigured. "
5422 "Please check your .hgrc file)\n"
5449 "Please check your .hgrc file)\n"
5423 msgstr ""
5450 msgstr ""
5424
5451
5425 msgid ""
5452 msgid ""
5426 " Internal patcher failure, please report this error to http://mercurial."
5453 " Internal patcher failure, please report this error to http://mercurial."
5427 "selenic.com/bts/\n"
5454 "selenic.com/bts/\n"
5428 msgstr ""
5455 msgstr ""
5429
5456
5430 msgid "Checking commit editor...\n"
5457 msgid "Checking commit editor...\n"
5431 msgstr ""
5458 msgstr ""
5432
5459
5433 msgid " No commit editor set and can't find vi in PATH\n"
5460 msgid " No commit editor set and can't find vi in PATH\n"
5434 msgstr ""
5461 msgstr ""
5435
5462
5436 msgid " (specify a commit editor in your .hgrc file)\n"
5463 msgid " (specify a commit editor in your .hgrc file)\n"
5437 msgstr ""
5464 msgstr ""
5438
5465
5439 #, python-format
5466 #, python-format
5440 msgid " Can't find editor '%s' in PATH\n"
5467 msgid " Can't find editor '%s' in PATH\n"
5441 msgstr ""
5468 msgstr ""
5442
5469
5443 msgid "Checking username...\n"
5470 msgid "Checking username...\n"
5444 msgstr ""
5471 msgstr ""
5445
5472
5446 msgid " (specify a username in your .hgrc file)\n"
5473 msgid " (specify a username in your .hgrc file)\n"
5447 msgstr ""
5474 msgstr ""
5448
5475
5449 msgid "No problems detected\n"
5476 msgid "No problems detected\n"
5450 msgstr ""
5477 msgstr ""
5451
5478
5452 #, python-format
5479 #, python-format
5453 msgid "%s problems detected, please check your install!\n"
5480 msgid "%s problems detected, please check your install!\n"
5454 msgstr ""
5481 msgstr ""
5455
5482
5456 msgid "dump rename information"
5483 msgid "dump rename information"
5457 msgstr ""
5484 msgstr ""
5458
5485
5459 #, python-format
5486 #, python-format
5460 msgid "%s renamed from %s:%s\n"
5487 msgid "%s renamed from %s:%s\n"
5461 msgstr ""
5488 msgstr ""
5462
5489
5463 #, python-format
5490 #, python-format
5464 msgid "%s not renamed\n"
5491 msgid "%s not renamed\n"
5465 msgstr ""
5492 msgstr ""
5466
5493
5467 msgid "show how files match on given patterns"
5494 msgid "show how files match on given patterns"
5468 msgstr ""
5495 msgstr ""
5469
5496
5470 msgid ""
5497 msgid ""
5471 "diff repository (or selected files)\n"
5498 "diff repository (or selected files)\n"
5472 "\n"
5499 "\n"
5473 " Show differences between revisions for the specified files.\n"
5500 " Show differences between revisions for the specified files.\n"
5474 "\n"
5501 "\n"
5475 " Differences between files are shown using the unified diff format.\n"
5502 " Differences between files are shown using the unified diff format.\n"
5476 "\n"
5503 "\n"
5477 " NOTE: diff may generate unexpected results for merges, as it will\n"
5504 " NOTE: diff may generate unexpected results for merges, as it will\n"
5478 " default to comparing against the working directory's first parent\n"
5505 " default to comparing against the working directory's first parent\n"
5479 " changeset if no revisions are specified.\n"
5506 " changeset if no revisions are specified.\n"
5480 "\n"
5507 "\n"
5481 " When two revision arguments are given, then changes are shown\n"
5508 " When two revision arguments are given, then changes are shown\n"
5482 " between those revisions. If only one revision is specified then\n"
5509 " between those revisions. If only one revision is specified then\n"
5483 " that revision is compared to the working directory, and, when no\n"
5510 " that revision is compared to the working directory, and, when no\n"
5484 " revisions are specified, the working directory files are compared\n"
5511 " revisions are specified, the working directory files are compared\n"
5485 " to its parent.\n"
5512 " to its parent.\n"
5486 "\n"
5513 "\n"
5487 " Without the -a/--text option, diff will avoid generating diffs of\n"
5514 " Without the -a/--text option, diff will avoid generating diffs of\n"
5488 " files it detects as binary. With -a, diff will generate a diff\n"
5515 " files it detects as binary. With -a, diff will generate a diff\n"
5489 " anyway, probably with undesirable results.\n"
5516 " anyway, probably with undesirable results.\n"
5490 "\n"
5517 "\n"
5491 " Use the -g/--git option to generate diffs in the git extended diff\n"
5518 " Use the -g/--git option to generate diffs in the git extended diff\n"
5492 " format. For more information, read 'hg help diffs'.\n"
5519 " format. For more information, read 'hg help diffs'.\n"
5493 " "
5520 " "
5494 msgstr ""
5521 msgstr ""
5495
5522
5496 msgid ""
5523 msgid ""
5497 "dump the header and diffs for one or more changesets\n"
5524 "dump the header and diffs for one or more changesets\n"
5498 "\n"
5525 "\n"
5499 " Print the changeset header and diffs for one or more revisions.\n"
5526 " Print the changeset header and diffs for one or more revisions.\n"
5500 "\n"
5527 "\n"
5501 " The information shown in the changeset header is: author,\n"
5528 " The information shown in the changeset header is: author,\n"
5502 " changeset hash, parent(s) and commit comment.\n"
5529 " changeset hash, parent(s) and commit comment.\n"
5503 "\n"
5530 "\n"
5504 " NOTE: export may generate unexpected diff output for merge\n"
5531 " NOTE: export may generate unexpected diff output for merge\n"
5505 " changesets, as it will compare the merge changeset against its\n"
5532 " changesets, as it will compare the merge changeset against its\n"
5506 " first parent only.\n"
5533 " first parent only.\n"
5507 "\n"
5534 "\n"
5508 " Output may be to a file, in which case the name of the file is\n"
5535 " Output may be to a file, in which case the name of the file is\n"
5509 " given using a format string. The formatting rules are as follows:\n"
5536 " given using a format string. The formatting rules are as follows:\n"
5510 "\n"
5537 "\n"
5511 " %% literal \"%\" character\n"
5538 " %% literal \"%\" character\n"
5512 " %H changeset hash (40 bytes of hexadecimal)\n"
5539 " %H changeset hash (40 bytes of hexadecimal)\n"
5513 " %N number of patches being generated\n"
5540 " %N number of patches being generated\n"
5514 " %R changeset revision number\n"
5541 " %R changeset revision number\n"
5515 " %b basename of the exporting repository\n"
5542 " %b basename of the exporting repository\n"
5516 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5543 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5517 " %n zero-padded sequence number, starting at 1\n"
5544 " %n zero-padded sequence number, starting at 1\n"
5518 " %r zero-padded changeset revision number\n"
5545 " %r zero-padded changeset revision number\n"
5519 "\n"
5546 "\n"
5520 " Without the -a/--text option, export will avoid generating diffs\n"
5547 " Without the -a/--text option, export will avoid generating diffs\n"
5521 " of files it detects as binary. With -a, export will generate a\n"
5548 " of files it detects as binary. With -a, export will generate a\n"
5522 " diff anyway, probably with undesirable results.\n"
5549 " diff anyway, probably with undesirable results.\n"
5523 "\n"
5550 "\n"
5524 " Use the -g/--git option to generate diffs in the git extended diff\n"
5551 " Use the -g/--git option to generate diffs in the git extended diff\n"
5525 " format. See 'hg help diffs' for more information.\n"
5552 " format. See 'hg help diffs' for more information.\n"
5526 "\n"
5553 "\n"
5527 " With the --switch-parent option, the diff will be against the\n"
5554 " With the --switch-parent option, the diff will be against the\n"
5528 " second parent. It can be useful to review a merge.\n"
5555 " second parent. It can be useful to review a merge.\n"
5529 " "
5556 " "
5530 msgstr ""
5557 msgstr ""
5531
5558
5532 msgid "export requires at least one changeset"
5559 msgid "export requires at least one changeset"
5533 msgstr ""
5560 msgstr ""
5534
5561
5535 msgid "exporting patches:\n"
5562 msgid "exporting patches:\n"
5536 msgstr ""
5563 msgstr ""
5537
5564
5538 msgid "exporting patch:\n"
5565 msgid "exporting patch:\n"
5539 msgstr ""
5566 msgstr ""
5540
5567
5541 msgid ""
5568 msgid ""
5542 "forget the specified files on the next commit\n"
5569 "forget the specified files on the next commit\n"
5543 "\n"
5570 "\n"
5544 " Mark the specified files so they will no longer be tracked\n"
5571 " Mark the specified files so they will no longer be tracked\n"
5545 " after the next commit.\n"
5572 " after the next commit.\n"
5546 "\n"
5573 "\n"
5547 " This only removes files from the current branch, not from the\n"
5574 " This only removes files from the current branch, not from the\n"
5548 " entire project history, and it does not delete them from the\n"
5575 " entire project history, and it does not delete them from the\n"
5549 " working directory.\n"
5576 " working directory.\n"
5550 "\n"
5577 "\n"
5551 " To undo a forget before the next commit, see hg add.\n"
5578 " To undo a forget before the next commit, see hg add.\n"
5552 " "
5579 " "
5553 msgstr ""
5580 msgstr ""
5554
5581
5555 msgid "no files specified"
5582 msgid "no files specified"
5556 msgstr ""
5583 msgstr ""
5557
5584
5558 #, python-format
5585 #, python-format
5559 msgid "not removing %s: file is already untracked\n"
5586 msgid "not removing %s: file is already untracked\n"
5560 msgstr ""
5587 msgstr ""
5561
5588
5562 msgid ""
5589 msgid ""
5563 "search for a pattern in specified files and revisions\n"
5590 "search for a pattern in specified files and revisions\n"
5564 "\n"
5591 "\n"
5565 " Search revisions of files for a regular expression.\n"
5592 " Search revisions of files for a regular expression.\n"
5566 "\n"
5593 "\n"
5567 " This command behaves differently than Unix grep. It only accepts\n"
5594 " This command behaves differently than Unix grep. It only accepts\n"
5568 " Python/Perl regexps. It searches repository history, not the\n"
5595 " Python/Perl regexps. It searches repository history, not the\n"
5569 " working directory. It always prints the revision number in which a\n"
5596 " working directory. It always prints the revision number in which a\n"
5570 " match appears.\n"
5597 " match appears.\n"
5571 "\n"
5598 "\n"
5572 " By default, grep only prints output for the first revision of a\n"
5599 " By default, grep only prints output for the first revision of a\n"
5573 " file in which it finds a match. To get it to print every revision\n"
5600 " file in which it finds a match. To get it to print every revision\n"
5574 " that contains a change in match status (\"-\" for a match that\n"
5601 " that contains a change in match status (\"-\" for a match that\n"
5575 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5602 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5576 " use the --all flag.\n"
5603 " use the --all flag.\n"
5577 " "
5604 " "
5578 msgstr ""
5605 msgstr ""
5579
5606
5580 #, python-format
5607 #, python-format
5581 msgid "grep: invalid match pattern: %s\n"
5608 msgid "grep: invalid match pattern: %s\n"
5582 msgstr ""
5609 msgstr ""
5583
5610
5584 msgid ""
5611 msgid ""
5585 "show current repository heads or show branch heads\n"
5612 "show current repository heads or show branch heads\n"
5586 "\n"
5613 "\n"
5587 " With no arguments, show all repository head changesets.\n"
5614 " With no arguments, show all repository head changesets.\n"
5588 "\n"
5615 "\n"
5589 " Repository \"heads\" are changesets that don't have child\n"
5616 " Repository \"heads\" are changesets that don't have child\n"
5590 " changesets. They are where development generally takes place and\n"
5617 " changesets. They are where development generally takes place and\n"
5591 " are the usual targets for update and merge operations.\n"
5618 " are the usual targets for update and merge operations.\n"
5592 "\n"
5619 "\n"
5593 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5620 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5594 " the named branch associated with that revision. The name of the\n"
5621 " the named branch associated with that revision. The name of the\n"
5595 " branch is called the revision's branch tag.\n"
5622 " branch is called the revision's branch tag.\n"
5596 "\n"
5623 "\n"
5597 " Branch heads are revisions on a given named branch that do not have\n"
5624 " Branch heads are revisions on a given named branch that do not have\n"
5598 " any descendants on the same branch. A branch head could be a true head\n"
5625 " any descendants on the same branch. A branch head could be a true head\n"
5599 " or it could be the last changeset on a branch before a new branch\n"
5626 " or it could be the last changeset on a branch before a new branch\n"
5600 " was created. If none of the branch heads are true heads, the branch\n"
5627 " was created. If none of the branch heads are true heads, the branch\n"
5601 " is considered inactive.\n"
5628 " is considered inactive.\n"
5602 "\n"
5629 "\n"
5603 " If STARTREV is specified only those heads (or branch heads) that\n"
5630 " If STARTREV is specified only those heads (or branch heads) that\n"
5604 " are descendants of STARTREV will be displayed.\n"
5631 " are descendants of STARTREV will be displayed.\n"
5605 " "
5632 " "
5606 msgstr ""
5633 msgstr ""
5607
5634
5608 #, python-format
5635 #, python-format
5609 msgid "no open branch heads on branch %s\n"
5636 msgid "no open branch heads on branch %s\n"
5610 msgstr ""
5637 msgstr ""
5611
5638
5612 #, python-format
5639 #, python-format
5613 msgid "no changes on branch %s containing %s are reachable from %s\n"
5640 msgid "no changes on branch %s containing %s are reachable from %s\n"
5614 msgstr ""
5641 msgstr ""
5615
5642
5616 #, python-format
5643 #, python-format
5617 msgid "no changes on branch %s are reachable from %s\n"
5644 msgid "no changes on branch %s are reachable from %s\n"
5618 msgstr ""
5645 msgstr ""
5619
5646
5620 msgid ""
5647 msgid ""
5621 "show help for a given topic or a help overview\n"
5648 "show help for a given topic or a help overview\n"
5622 "\n"
5649 "\n"
5623 " With no arguments, print a list of commands with short help messages.\n"
5650 " With no arguments, print a list of commands with short help messages.\n"
5624 "\n"
5651 "\n"
5625 " Given a topic, extension, or command name, print help for that\n"
5652 " Given a topic, extension, or command name, print help for that\n"
5626 " topic."
5653 " topic."
5627 msgstr ""
5654 msgstr ""
5628
5655
5629 msgid "global options:"
5656 msgid "global options:"
5630 msgstr "options globales :"
5657 msgstr "options globales :"
5631
5658
5632 msgid "use \"hg help\" for the full list of commands"
5659 msgid "use \"hg help\" for the full list of commands"
5633 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5660 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5634
5661
5635 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5662 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5636 msgstr ""
5663 msgstr ""
5637 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5664 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5638 "plus de détails"
5665 "plus de détails"
5639
5666
5640 # la chaîne passée est préfixée par un espace
5667 # la chaîne passée est préfixée par un espace
5641 #, python-format
5668 #, python-format
5642 msgid "use \"hg -v help%s\" to show aliases and global options"
5669 msgid "use \"hg -v help%s\" to show aliases and global options"
5643 msgstr ""
5670 msgstr ""
5644 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5671 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5645
5672
5646 #, python-format
5673 #, python-format
5647 msgid "use \"hg -v help %s\" to show global options"
5674 msgid "use \"hg -v help %s\" to show global options"
5648 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5675 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5649
5676
5650 msgid ""
5677 msgid ""
5651 "list of commands:\n"
5678 "list of commands:\n"
5652 "\n"
5679 "\n"
5653 msgstr ""
5680 msgstr ""
5654 "liste des commandes :\n"
5681 "liste des commandes :\n"
5655 "\n"
5682 "\n"
5656
5683
5657 #, python-format
5684 #, python-format
5658 msgid ""
5685 msgid ""
5659 "\n"
5686 "\n"
5660 "aliases: %s\n"
5687 "aliases: %s\n"
5661 msgstr ""
5688 msgstr ""
5662 "\n"
5689 "\n"
5663 "alias : %s\n"
5690 "alias : %s\n"
5664
5691
5665 msgid "(no help text available)"
5692 msgid "(no help text available)"
5666 msgstr "(pas d'aide disponible)"
5693 msgstr "(pas d'aide disponible)"
5667
5694
5668 msgid "options:\n"
5695 msgid "options:\n"
5669 msgstr "options :\n"
5696 msgstr "options :\n"
5670
5697
5671 msgid "no commands defined\n"
5698 msgid "no commands defined\n"
5672 msgstr "pas de commandes définies\n"
5699 msgstr "pas de commandes définies\n"
5673
5700
5674 msgid "enabled extensions:"
5701 msgid "enabled extensions:"
5675 msgstr "extensions activées :"
5702 msgstr "extensions activées :"
5676
5703
5677 msgid "no help text available"
5704 msgid "no help text available"
5678 msgstr "pas d'aide disponible"
5705 msgstr "pas d'aide disponible"
5679
5706
5680 #, python-format
5707 #, python-format
5681 msgid "%s extension - %s\n"
5708 msgid "%s extension - %s\n"
5682 msgstr "extension %s - %s\n"
5709 msgstr "extension %s - %s\n"
5683
5710
5684 msgid "Mercurial Distributed SCM\n"
5711 msgid "Mercurial Distributed SCM\n"
5685 msgstr "Mercurial, système de gestion de sources distribué\n"
5712 msgstr "Mercurial, système de gestion de sources distribué\n"
5686
5713
5687 msgid ""
5714 msgid ""
5688 "basic commands:\n"
5715 "basic commands:\n"
5689 "\n"
5716 "\n"
5690 msgstr ""
5717 msgstr ""
5691 "commandes de base :\n"
5718 "commandes de base :\n"
5692 "\n"
5719 "\n"
5693
5720
5694 msgid ""
5721 msgid ""
5695 "\n"
5722 "\n"
5696 "additional help topics:\n"
5723 "additional help topics:\n"
5697 "\n"
5724 "\n"
5698 msgstr ""
5725 msgstr ""
5699 "\n"
5726 "\n"
5700 "sujets d'aide supplémentaires :\n"
5727 "sujets d'aide supplémentaires :\n"
5701 "\n"
5728 "\n"
5702
5729
5703 msgid ""
5730 msgid ""
5704 "identify the working copy or specified revision\n"
5731 "identify the working copy or specified revision\n"
5705 "\n"
5732 "\n"
5706 " With no revision, print a summary of the current state of the\n"
5733 " With no revision, print a summary of the current state of the\n"
5707 " repository.\n"
5734 " repository.\n"
5708 "\n"
5735 "\n"
5709 " Specifying a path to a repository root or Mercurial bundle will\n"
5736 " Specifying a path to a repository root or Mercurial bundle will\n"
5710 " cause lookup to operate on that repository/bundle.\n"
5737 " cause lookup to operate on that repository/bundle.\n"
5711 "\n"
5738 "\n"
5712 " This summary identifies the repository state using one or two\n"
5739 " This summary identifies the repository state using one or two\n"
5713 " parent hash identifiers, followed by a \"+\" if there are\n"
5740 " parent hash identifiers, followed by a \"+\" if there are\n"
5714 " uncommitted changes in the working directory, a list of tags for\n"
5741 " uncommitted changes in the working directory, a list of tags for\n"
5715 " this revision and a branch name for non-default branches.\n"
5742 " this revision and a branch name for non-default branches.\n"
5716 " "
5743 " "
5717 msgstr ""
5744 msgstr ""
5718
5745
5719 msgid ""
5746 msgid ""
5720 "import an ordered set of patches\n"
5747 "import an ordered set of patches\n"
5721 "\n"
5748 "\n"
5722 " Import a list of patches and commit them individually.\n"
5749 " Import a list of patches and commit them individually.\n"
5723 "\n"
5750 "\n"
5724 " If there are outstanding changes in the working directory, import\n"
5751 " If there are outstanding changes in the working directory, import\n"
5725 " will abort unless given the -f/--force flag.\n"
5752 " will abort unless given the -f/--force flag.\n"
5726 "\n"
5753 "\n"
5727 " You can import a patch straight from a mail message. Even patches\n"
5754 " You can import a patch straight from a mail message. Even patches\n"
5728 " as attachments work (to use the body part, it must have type\n"
5755 " as attachments work (to use the body part, it must have type\n"
5729 " text/plain or text/x-patch). From and Subject headers of email\n"
5756 " text/plain or text/x-patch). From and Subject headers of email\n"
5730 " message are used as default committer and commit message. All\n"
5757 " message are used as default committer and commit message. All\n"
5731 " text/plain body parts before first diff are added to commit\n"
5758 " text/plain body parts before first diff are added to commit\n"
5732 " message.\n"
5759 " message.\n"
5733 "\n"
5760 "\n"
5734 " If the imported patch was generated by hg export, user and\n"
5761 " If the imported patch was generated by hg export, user and\n"
5735 " description from patch override values from message headers and\n"
5762 " description from patch override values from message headers and\n"
5736 " body. Values given on command line with -m/--message and -u/--user\n"
5763 " body. Values given on command line with -m/--message and -u/--user\n"
5737 " override these.\n"
5764 " override these.\n"
5738 "\n"
5765 "\n"
5739 " If --exact is specified, import will set the working directory to\n"
5766 " If --exact is specified, import will set the working directory to\n"
5740 " the parent of each patch before applying it, and will abort if the\n"
5767 " the parent of each patch before applying it, and will abort if the\n"
5741 " resulting changeset has a different ID than the one recorded in\n"
5768 " resulting changeset has a different ID than the one recorded in\n"
5742 " the patch. This may happen due to character set problems or other\n"
5769 " the patch. This may happen due to character set problems or other\n"
5743 " deficiencies in the text patch format.\n"
5770 " deficiencies in the text patch format.\n"
5744 "\n"
5771 "\n"
5745 " With -s/--similarity, hg will attempt to discover renames and\n"
5772 " With -s/--similarity, hg will attempt to discover renames and\n"
5746 " copies in the patch in the same way as 'addremove'.\n"
5773 " copies in the patch in the same way as 'addremove'.\n"
5747 "\n"
5774 "\n"
5748 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5775 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5749 " a URL is specified, the patch will be downloaded from it.\n"
5776 " a URL is specified, the patch will be downloaded from it.\n"
5750 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5777 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5751 " "
5778 " "
5752 msgstr ""
5779 msgstr ""
5753
5780
5754 msgid "applying patch from stdin\n"
5781 msgid "applying patch from stdin\n"
5755 msgstr ""
5782 msgstr ""
5756
5783
5757 msgid "no diffs found"
5784 msgid "no diffs found"
5758 msgstr ""
5785 msgstr ""
5759
5786
5760 #, python-format
5787 #, python-format
5761 msgid ""
5788 msgid ""
5762 "message:\n"
5789 "message:\n"
5763 "%s\n"
5790 "%s\n"
5764 msgstr ""
5791 msgstr ""
5765
5792
5766 msgid "not a Mercurial patch"
5793 msgid "not a Mercurial patch"
5767 msgstr ""
5794 msgstr ""
5768
5795
5769 msgid "patch is damaged or loses information"
5796 msgid "patch is damaged or loses information"
5770 msgstr ""
5797 msgstr ""
5771
5798
5772 msgid ""
5799 msgid ""
5773 "show new changesets found in source\n"
5800 "show new changesets found in source\n"
5774 "\n"
5801 "\n"
5775 " Show new changesets found in the specified path/URL or the default\n"
5802 " Show new changesets found in the specified path/URL or the default\n"
5776 " pull location. These are the changesets that would have been pulled\n"
5803 " pull location. These are the changesets that would have been pulled\n"
5777 " if a pull at the time you issued this command.\n"
5804 " if a pull at the time you issued this command.\n"
5778 "\n"
5805 "\n"
5779 " For remote repository, using --bundle avoids downloading the\n"
5806 " For remote repository, using --bundle avoids downloading the\n"
5780 " changesets twice if the incoming is followed by a pull.\n"
5807 " changesets twice if the incoming is followed by a pull.\n"
5781 "\n"
5808 "\n"
5782 " See pull for valid source format details.\n"
5809 " See pull for valid source format details.\n"
5783 " "
5810 " "
5784 msgstr ""
5811 msgstr ""
5785
5812
5786 msgid ""
5813 msgid ""
5787 "create a new repository in the given directory\n"
5814 "create a new repository in the given directory\n"
5788 "\n"
5815 "\n"
5789 " Initialize a new repository in the given directory. If the given\n"
5816 " Initialize a new repository in the given directory. If the given\n"
5790 " directory does not exist, it will be created.\n"
5817 " directory does not exist, it will be created.\n"
5791 "\n"
5818 "\n"
5792 " If no directory is given, the current directory is used.\n"
5819 " If no directory is given, the current directory is used.\n"
5793 "\n"
5820 "\n"
5794 " It is possible to specify an ssh:// URL as the destination.\n"
5821 " It is possible to specify an ssh:// URL as the destination.\n"
5795 " See 'hg help urls' for more information.\n"
5822 " See 'hg help urls' for more information.\n"
5796 " "
5823 " "
5797 msgstr ""
5824 msgstr ""
5798
5825
5799 msgid ""
5826 msgid ""
5800 "locate files matching specific patterns\n"
5827 "locate files matching specific patterns\n"
5801 "\n"
5828 "\n"
5802 " Print files under Mercurial control in the working directory whose\n"
5829 " Print files under Mercurial control in the working directory whose\n"
5803 " names match the given patterns.\n"
5830 " names match the given patterns.\n"
5804 "\n"
5831 "\n"
5805 " By default, this command searches all directories in the working\n"
5832 " By default, this command searches all directories in the working\n"
5806 " directory. To search just the current directory and its\n"
5833 " directory. To search just the current directory and its\n"
5807 " subdirectories, use \"--include .\".\n"
5834 " subdirectories, use \"--include .\".\n"
5808 "\n"
5835 "\n"
5809 " If no patterns are given to match, this command prints the names\n"
5836 " If no patterns are given to match, this command prints the names\n"
5810 " of all files under Mercurial control in the working directory.\n"
5837 " of all files under Mercurial control in the working directory.\n"
5811 "\n"
5838 "\n"
5812 " If you want to feed the output of this command into the \"xargs\"\n"
5839 " If you want to feed the output of this command into the \"xargs\"\n"
5813 " command, use the -0 option to both this command and \"xargs\". This\n"
5840 " command, use the -0 option to both this command and \"xargs\". This\n"
5814 " will avoid the problem of \"xargs\" treating single filenames that\n"
5841 " will avoid the problem of \"xargs\" treating single filenames that\n"
5815 " contain whitespace as multiple filenames.\n"
5842 " contain whitespace as multiple filenames.\n"
5816 " "
5843 " "
5817 msgstr ""
5844 msgstr ""
5818
5845
5819 msgid ""
5846 msgid ""
5820 "show revision history of entire repository or files\n"
5847 "show revision history of entire repository or files\n"
5821 "\n"
5848 "\n"
5822 " Print the revision history of the specified files or the entire\n"
5849 " Print the revision history of the specified files or the entire\n"
5823 " project.\n"
5850 " project.\n"
5824 "\n"
5851 "\n"
5825 " File history is shown without following rename or copy history of\n"
5852 " File history is shown without following rename or copy history of\n"
5826 " files. Use -f/--follow with a filename to follow history across\n"
5853 " files. Use -f/--follow with a filename to follow history across\n"
5827 " renames and copies. --follow without a filename will only show\n"
5854 " renames and copies. --follow without a filename will only show\n"
5828 " ancestors or descendants of the starting revision. --follow-first\n"
5855 " ancestors or descendants of the starting revision. --follow-first\n"
5829 " only follows the first parent of merge revisions.\n"
5856 " only follows the first parent of merge revisions.\n"
5830 "\n"
5857 "\n"
5831 " If no revision range is specified, the default is tip:0 unless\n"
5858 " If no revision range is specified, the default is tip:0 unless\n"
5832 " --follow is set, in which case the working directory parent is\n"
5859 " --follow is set, in which case the working directory parent is\n"
5833 " used as the starting revision.\n"
5860 " used as the starting revision.\n"
5834 "\n"
5861 "\n"
5835 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5862 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5836 "\n"
5863 "\n"
5837 " By default this command prints revision number and changeset id,\n"
5864 " By default this command prints revision number and changeset id,\n"
5838 " tags, non-trivial parents, user, date and time, and a summary for\n"
5865 " tags, non-trivial parents, user, date and time, and a summary for\n"
5839 " each commit. When the -v/--verbose switch is used, the list of\n"
5866 " each commit. When the -v/--verbose switch is used, the list of\n"
5840 " changed files and full commit message are shown.\n"
5867 " changed files and full commit message are shown.\n"
5841 "\n"
5868 "\n"
5842 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5869 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5843 " changesets, as it will only compare the merge changeset against\n"
5870 " changesets, as it will only compare the merge changeset against\n"
5844 " its first parent. Also, only files different from BOTH parents\n"
5871 " its first parent. Also, only files different from BOTH parents\n"
5845 " will appear in files:.\n"
5872 " will appear in files:.\n"
5846 " "
5873 " "
5847 msgstr ""
5874 msgstr ""
5848
5875
5849 msgid ""
5876 msgid ""
5850 "output the current or given revision of the project manifest\n"
5877 "output the current or given revision of the project manifest\n"
5851 "\n"
5878 "\n"
5852 " Print a list of version controlled files for the given revision.\n"
5879 " Print a list of version controlled files for the given revision.\n"
5853 " If no revision is given, the first parent of the working directory\n"
5880 " If no revision is given, the first parent of the working directory\n"
5854 " is used, or the null revision if no revision is checked out.\n"
5881 " is used, or the null revision if no revision is checked out.\n"
5855 "\n"
5882 "\n"
5856 " With -v, print file permissions, symlink and executable bits.\n"
5883 " With -v, print file permissions, symlink and executable bits.\n"
5857 " With --debug, print file revision hashes.\n"
5884 " With --debug, print file revision hashes.\n"
5858 " "
5885 " "
5859 msgstr ""
5886 msgstr ""
5860
5887
5861 msgid ""
5888 msgid ""
5862 "merge working directory with another revision\n"
5889 "merge working directory with another revision\n"
5863 "\n"
5890 "\n"
5864 " The current working directory is updated with all changes made in\n"
5891 " The current working directory is updated with all changes made in\n"
5865 " the requested revision since the last common predecessor revision.\n"
5892 " the requested revision since the last common predecessor revision.\n"
5866 "\n"
5893 "\n"
5867 " Files that changed between either parent are marked as changed for\n"
5894 " Files that changed between either parent are marked as changed for\n"
5868 " the next commit and a commit must be performed before any further\n"
5895 " the next commit and a commit must be performed before any further\n"
5869 " updates to the repository are allowed. The next commit will have\n"
5896 " updates to the repository are allowed. The next commit will have\n"
5870 " two parents.\n"
5897 " two parents.\n"
5871 "\n"
5898 "\n"
5872 " If no revision is specified, the working directory's parent is a\n"
5899 " If no revision is specified, the working directory's parent is a\n"
5873 " head revision, and the current branch contains exactly one other\n"
5900 " head revision, and the current branch contains exactly one other\n"
5874 " head, the other head is merged with by default. Otherwise, an\n"
5901 " head, the other head is merged with by default. Otherwise, an\n"
5875 " explicit revision with which to merge with must be provided.\n"
5902 " explicit revision with which to merge with must be provided.\n"
5876 " "
5903 " "
5877 msgstr ""
5904 msgstr ""
5878
5905
5879 #, python-format
5906 #, python-format
5880 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5907 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5881 msgstr ""
5908 msgstr ""
5882
5909
5883 #, python-format
5910 #, python-format
5884 msgid "branch '%s' has one head - please merge with an explicit rev"
5911 msgid "branch '%s' has one head - please merge with an explicit rev"
5885 msgstr ""
5912 msgstr ""
5886
5913
5887 msgid "there is nothing to merge"
5914 msgid "there is nothing to merge"
5888 msgstr ""
5915 msgstr ""
5889
5916
5890 #, python-format
5917 #, python-format
5891 msgid "%s - use \"hg update\" instead"
5918 msgid "%s - use \"hg update\" instead"
5892 msgstr ""
5919 msgstr ""
5893
5920
5894 msgid ""
5921 msgid ""
5895 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5922 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5896 "rev"
5923 "rev"
5897 msgstr ""
5924 msgstr ""
5898
5925
5899 msgid ""
5926 msgid ""
5900 "show changesets not found in destination\n"
5927 "show changesets not found in destination\n"
5901 "\n"
5928 "\n"
5902 " Show changesets not found in the specified destination repository\n"
5929 " Show changesets not found in the specified destination repository\n"
5903 " or the default push location. These are the changesets that would\n"
5930 " or the default push location. These are the changesets that would\n"
5904 " be pushed if a push was requested.\n"
5931 " be pushed if a push was requested.\n"
5905 "\n"
5932 "\n"
5906 " See pull for valid destination format details.\n"
5933 " See pull for valid destination format details.\n"
5907 " "
5934 " "
5908 msgstr ""
5935 msgstr ""
5909
5936
5910 msgid ""
5937 msgid ""
5911 "show the parents of the working directory or revision\n"
5938 "show the parents of the working directory or revision\n"
5912 "\n"
5939 "\n"
5913 " Print the working directory's parent revisions. If a revision is\n"
5940 " Print the working directory's parent revisions. If a revision is\n"
5914 " given via -r/--rev, the parent of that revision will be printed.\n"
5941 " given via -r/--rev, the parent of that revision will be printed.\n"
5915 " If a file argument is given, the revision in which the file was\n"
5942 " If a file argument is given, the revision in which the file was\n"
5916 " last changed (before the working directory revision or the\n"
5943 " last changed (before the working directory revision or the\n"
5917 " argument to --rev if given) is printed.\n"
5944 " argument to --rev if given) is printed.\n"
5918 " "
5945 " "
5919 msgstr ""
5946 msgstr ""
5920
5947
5921 msgid "can only specify an explicit filename"
5948 msgid "can only specify an explicit filename"
5922 msgstr ""
5949 msgstr ""
5923
5950
5924 #, python-format
5951 #, python-format
5925 msgid "'%s' not found in manifest!"
5952 msgid "'%s' not found in manifest!"
5926 msgstr ""
5953 msgstr ""
5927
5954
5928 msgid ""
5955 msgid ""
5929 "show aliases for remote repositories\n"
5956 "show aliases for remote repositories\n"
5930 "\n"
5957 "\n"
5931 " Show definition of symbolic path name NAME. If no name is given,\n"
5958 " Show definition of symbolic path name NAME. If no name is given,\n"
5932 " show definition of all available names.\n"
5959 " show definition of all available names.\n"
5933 "\n"
5960 "\n"
5934 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5961 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5935 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5962 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5936 "\n"
5963 "\n"
5937 " See 'hg help urls' for more information.\n"
5964 " See 'hg help urls' for more information.\n"
5938 " "
5965 " "
5939 msgstr ""
5966 msgstr ""
5940
5967
5941 msgid "not found!\n"
5968 msgid "not found!\n"
5942 msgstr ""
5969 msgstr ""
5943
5970
5944 msgid "not updating, since new heads added\n"
5971 msgid "not updating, since new heads added\n"
5945 msgstr ""
5972 msgstr ""
5946
5973
5947 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5974 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5948 msgstr ""
5975 msgstr ""
5949
5976
5950 msgid "(run 'hg update' to get a working copy)\n"
5977 msgid "(run 'hg update' to get a working copy)\n"
5951 msgstr ""
5978 msgstr ""
5952
5979
5953 msgid ""
5980 msgid ""
5954 "pull changes from the specified source\n"
5981 "pull changes from the specified source\n"
5955 "\n"
5982 "\n"
5956 " Pull changes from a remote repository to a local one.\n"
5983 " Pull changes from a remote repository to a local one.\n"
5957 "\n"
5984 "\n"
5958 " This finds all changes from the repository at the specified path\n"
5985 " This finds all changes from the repository at the specified path\n"
5959 " or URL and adds them to a local repository (the current one unless\n"
5986 " or URL and adds them to a local repository (the current one unless\n"
5960 " -R is specified). By default, this does not update the copy of the\n"
5987 " -R is specified). By default, this does not update the copy of the\n"
5961 " project in the working directory.\n"
5988 " project in the working directory.\n"
5962 "\n"
5989 "\n"
5963 " Use hg incoming if you want to see what would have been added by a\n"
5990 " Use hg incoming if you want to see what would have been added by a\n"
5964 " pull at the time you issued this command. If you then decide to\n"
5991 " pull at the time you issued this command. If you then decide to\n"
5965 " added those changes to the repository, you should use pull -r X\n"
5992 " added those changes to the repository, you should use pull -r X\n"
5966 " where X is the last changeset listed by hg incoming.\n"
5993 " where X is the last changeset listed by hg incoming.\n"
5967 "\n"
5994 "\n"
5968 " If SOURCE is omitted, the 'default' path will be used.\n"
5995 " If SOURCE is omitted, the 'default' path will be used.\n"
5969 " See 'hg help urls' for more information.\n"
5996 " See 'hg help urls' for more information.\n"
5970 " "
5997 " "
5971 msgstr ""
5998 msgstr ""
5972
5999
5973 msgid ""
6000 msgid ""
5974 "push changes to the specified destination\n"
6001 "push changes to the specified destination\n"
5975 "\n"
6002 "\n"
5976 " Push changes from the local repository to the given destination.\n"
6003 " Push changes from the local repository to the given destination.\n"
5977 "\n"
6004 "\n"
5978 " This is the symmetrical operation for pull. It moves changes from\n"
6005 " This is the symmetrical operation for pull. It moves changes from\n"
5979 " the current repository to a different one. If the destination is\n"
6006 " the current repository to a different one. If the destination is\n"
5980 " local this is identical to a pull in that directory from the\n"
6007 " local this is identical to a pull in that directory from the\n"
5981 " current one.\n"
6008 " current one.\n"
5982 "\n"
6009 "\n"
5983 " By default, push will refuse to run if it detects the result would\n"
6010 " By default, push will refuse to run if it detects the result would\n"
5984 " increase the number of remote heads. This generally indicates the\n"
6011 " increase the number of remote heads. This generally indicates the\n"
5985 " user forgot to pull and merge before pushing.\n"
6012 " user forgot to pull and merge before pushing.\n"
5986 "\n"
6013 "\n"
5987 " If -r/--rev is used, the named revision and all its ancestors will\n"
6014 " If -r/--rev is used, the named revision and all its ancestors will\n"
5988 " be pushed to the remote repository.\n"
6015 " be pushed to the remote repository.\n"
5989 "\n"
6016 "\n"
5990 " Please see 'hg help urls' for important details about ssh://\n"
6017 " Please see 'hg help urls' for important details about ssh://\n"
5991 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6018 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5992 " "
6019 " "
5993 msgstr ""
6020 msgstr ""
5994
6021
5995 #, python-format
6022 #, python-format
5996 msgid "pushing to %s\n"
6023 msgid "pushing to %s\n"
5997 msgstr ""
6024 msgstr ""
5998
6025
5999 msgid ""
6026 msgid ""
6000 "roll back an interrupted transaction\n"
6027 "roll back an interrupted transaction\n"
6001 "\n"
6028 "\n"
6002 " Recover from an interrupted commit or pull.\n"
6029 " Recover from an interrupted commit or pull.\n"
6003 "\n"
6030 "\n"
6004 " This command tries to fix the repository status after an\n"
6031 " This command tries to fix the repository status after an\n"
6005 " interrupted operation. It should only be necessary when Mercurial\n"
6032 " interrupted operation. It should only be necessary when Mercurial\n"
6006 " suggests it.\n"
6033 " suggests it.\n"
6007 " "
6034 " "
6008 msgstr ""
6035 msgstr ""
6009
6036
6010 msgid ""
6037 msgid ""
6011 "remove the specified files on the next commit\n"
6038 "remove the specified files on the next commit\n"
6012 "\n"
6039 "\n"
6013 " Schedule the indicated files for removal from the repository.\n"
6040 " Schedule the indicated files for removal from the repository.\n"
6014 "\n"
6041 "\n"
6015 " This only removes files from the current branch, not from the\n"
6042 " This only removes files from the current branch, not from the\n"
6016 " entire project history. -A/--after can be used to remove only\n"
6043 " entire project history. -A/--after can be used to remove only\n"
6017 " files that have already been deleted, -f/--force can be used to\n"
6044 " files that have already been deleted, -f/--force can be used to\n"
6018 " force deletion, and -Af can be used to remove files from the next\n"
6045 " force deletion, and -Af can be used to remove files from the next\n"
6019 " revision without deleting them from the working directory.\n"
6046 " revision without deleting them from the working directory.\n"
6020 "\n"
6047 "\n"
6021 " The following table details the behavior of remove for different\n"
6048 " The following table details the behavior of remove for different\n"
6022 " file states (columns) and option combinations (rows). The file\n"
6049 " file states (columns) and option combinations (rows). The file\n"
6023 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
6050 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
6024 " (as reported by hg status). The actions are Warn, Remove (from\n"
6051 " (as reported by hg status). The actions are Warn, Remove (from\n"
6025 " branch) and Delete (from disk).\n"
6052 " branch) and Delete (from disk).\n"
6026 "\n"
6053 "\n"
6027 " A C M !\n"
6054 " A C M !\n"
6028 " none W RD W R\n"
6055 " none W RD W R\n"
6029 " -f R RD RD R\n"
6056 " -f R RD RD R\n"
6030 " -A W W W R\n"
6057 " -A W W W R\n"
6031 " -Af R R R R\n"
6058 " -Af R R R R\n"
6032 "\n"
6059 "\n"
6033 " This command schedules the files to be removed at the next commit.\n"
6060 " This command schedules the files to be removed at the next commit.\n"
6034 " To undo a remove before that, see hg revert.\n"
6061 " To undo a remove before that, see hg revert.\n"
6035 " "
6062 " "
6036 msgstr ""
6063 msgstr ""
6037
6064
6038 #, python-format
6065 #, python-format
6039 msgid "not removing %s: file is untracked\n"
6066 msgid "not removing %s: file is untracked\n"
6040 msgstr ""
6067 msgstr ""
6041
6068
6042 #, python-format
6069 #, python-format
6043 msgid "not removing %s: file %s (use -f to force removal)\n"
6070 msgid "not removing %s: file %s (use -f to force removal)\n"
6044 msgstr ""
6071 msgstr ""
6045
6072
6046 msgid "still exists"
6073 msgid "still exists"
6047 msgstr ""
6074 msgstr ""
6048
6075
6049 msgid "is modified"
6076 msgid "is modified"
6050 msgstr ""
6077 msgstr ""
6051
6078
6052 msgid "has been marked for add"
6079 msgid "has been marked for add"
6053 msgstr ""
6080 msgstr ""
6054
6081
6055 msgid ""
6082 msgid ""
6056 "rename files; equivalent of copy + remove\n"
6083 "rename files; equivalent of copy + remove\n"
6057 "\n"
6084 "\n"
6058 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6085 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6059 " is a directory, copies are put in that directory. If dest is a\n"
6086 " is a directory, copies are put in that directory. If dest is a\n"
6060 " file, there can only be one source.\n"
6087 " file, there can only be one source.\n"
6061 "\n"
6088 "\n"
6062 " By default, this command copies the contents of files as they\n"
6089 " By default, this command copies the contents of files as they\n"
6063 " exist in the working directory. If invoked with -A/--after, the\n"
6090 " exist in the working directory. If invoked with -A/--after, the\n"
6064 " operation is recorded, but no copying is performed.\n"
6091 " operation is recorded, but no copying is performed.\n"
6065 "\n"
6092 "\n"
6066 " This command takes effect at the next commit. To undo a rename\n"
6093 " This command takes effect at the next commit. To undo a rename\n"
6067 " before that, see hg revert.\n"
6094 " before that, see hg revert.\n"
6068 " "
6095 " "
6069 msgstr ""
6096 msgstr ""
6070
6097
6071 msgid ""
6098 msgid ""
6072 "retry file merges from a merge or update\n"
6099 "retry file merges from a merge or update\n"
6073 "\n"
6100 "\n"
6074 " This command will cleanly retry unresolved file merges using file\n"
6101 " This command will cleanly retry unresolved file merges using file\n"
6075 " revisions preserved from the last update or merge. To attempt to\n"
6102 " revisions preserved from the last update or merge. To attempt to\n"
6076 " resolve all unresolved files, use the -a/--all switch.\n"
6103 " resolve all unresolved files, use the -a/--all switch.\n"
6077 "\n"
6104 "\n"
6078 " If a conflict is resolved manually, please note that the changes\n"
6105 " If a conflict is resolved manually, please note that the changes\n"
6079 " will be overwritten if the merge is retried with resolve. The\n"
6106 " will be overwritten if the merge is retried with resolve. The\n"
6080 " -m/--mark switch should be used to mark the file as resolved.\n"
6107 " -m/--mark switch should be used to mark the file as resolved.\n"
6081 "\n"
6108 "\n"
6082 " This command also allows listing resolved files and manually\n"
6109 " This command also allows listing resolved files and manually\n"
6083 " indicating whether or not files are resolved. All files must be\n"
6110 " indicating whether or not files are resolved. All files must be\n"
6084 " marked as resolved before a commit is permitted.\n"
6111 " marked as resolved before a commit is permitted.\n"
6085 "\n"
6112 "\n"
6086 " The codes used to show the status of files are:\n"
6113 " The codes used to show the status of files are:\n"
6087 " U = unresolved\n"
6114 " U = unresolved\n"
6088 " R = resolved\n"
6115 " R = resolved\n"
6089 " "
6116 " "
6090 msgstr ""
6117 msgstr ""
6091
6118
6092 msgid "too many options specified"
6119 msgid "too many options specified"
6093 msgstr ""
6120 msgstr ""
6094
6121
6095 msgid "can't specify --all and patterns"
6122 msgid "can't specify --all and patterns"
6096 msgstr ""
6123 msgstr ""
6097
6124
6098 msgid "no files or directories specified; use --all to remerge all files"
6125 msgid "no files or directories specified; use --all to remerge all files"
6099 msgstr ""
6126 msgstr ""
6100
6127
6101 msgid ""
6128 msgid ""
6102 "restore individual files or directories to an earlier state\n"
6129 "restore individual files or directories to an earlier state\n"
6103 "\n"
6130 "\n"
6104 " (Use update -r to check out earlier revisions, revert does not\n"
6131 " (Use update -r to check out earlier revisions, revert does not\n"
6105 " change the working directory parents.)\n"
6132 " change the working directory parents.)\n"
6106 "\n"
6133 "\n"
6107 " With no revision specified, revert the named files or directories\n"
6134 " With no revision specified, revert the named files or directories\n"
6108 " to the contents they had in the parent of the working directory.\n"
6135 " to the contents they had in the parent of the working directory.\n"
6109 " This restores the contents of the affected files to an unmodified\n"
6136 " This restores the contents of the affected files to an unmodified\n"
6110 " state and unschedules adds, removes, copies, and renames. If the\n"
6137 " state and unschedules adds, removes, copies, and renames. If the\n"
6111 " working directory has two parents, you must explicitly specify the\n"
6138 " working directory has two parents, you must explicitly specify the\n"
6112 " revision to revert to.\n"
6139 " revision to revert to.\n"
6113 "\n"
6140 "\n"
6114 " Using the -r/--rev option, revert the given files or directories\n"
6141 " Using the -r/--rev option, revert the given files or directories\n"
6115 " to their contents as of a specific revision. This can be helpful\n"
6142 " to their contents as of a specific revision. This can be helpful\n"
6116 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6143 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6117 " dates' for a list of formats valid for -d/--date.\n"
6144 " dates' for a list of formats valid for -d/--date.\n"
6118 "\n"
6145 "\n"
6119 " Revert modifies the working directory. It does not commit any\n"
6146 " Revert modifies the working directory. It does not commit any\n"
6120 " changes, or change the parent of the working directory. If you\n"
6147 " changes, or change the parent of the working directory. If you\n"
6121 " revert to a revision other than the parent of the working\n"
6148 " revert to a revision other than the parent of the working\n"
6122 " directory, the reverted files will thus appear modified\n"
6149 " directory, the reverted files will thus appear modified\n"
6123 " afterwards.\n"
6150 " afterwards.\n"
6124 "\n"
6151 "\n"
6125 " If a file has been deleted, it is restored. If the executable mode\n"
6152 " If a file has been deleted, it is restored. If the executable mode\n"
6126 " of a file was changed, it is reset.\n"
6153 " of a file was changed, it is reset.\n"
6127 "\n"
6154 "\n"
6128 " If names are given, all files matching the names are reverted.\n"
6155 " If names are given, all files matching the names are reverted.\n"
6129 " If no arguments are given, no files are reverted.\n"
6156 " If no arguments are given, no files are reverted.\n"
6130 "\n"
6157 "\n"
6131 " Modified files are saved with a .orig suffix before reverting.\n"
6158 " Modified files are saved with a .orig suffix before reverting.\n"
6132 " To disable these backups, use --no-backup.\n"
6159 " To disable these backups, use --no-backup.\n"
6133 " "
6160 " "
6134 msgstr ""
6161 msgstr ""
6135
6162
6136 msgid "you can't specify a revision and a date"
6163 msgid "you can't specify a revision and a date"
6137 msgstr ""
6164 msgstr ""
6138
6165
6139 msgid "no files or directories specified; use --all to revert the whole repo"
6166 msgid "no files or directories specified; use --all to revert the whole repo"
6140 msgstr ""
6167 msgstr ""
6141
6168
6142 #, python-format
6169 #, python-format
6143 msgid "forgetting %s\n"
6170 msgid "forgetting %s\n"
6144 msgstr ""
6171 msgstr ""
6145
6172
6146 #, python-format
6173 #, python-format
6147 msgid "reverting %s\n"
6174 msgid "reverting %s\n"
6148 msgstr ""
6175 msgstr ""
6149
6176
6150 #, python-format
6177 #, python-format
6151 msgid "undeleting %s\n"
6178 msgid "undeleting %s\n"
6152 msgstr ""
6179 msgstr ""
6153
6180
6154 #, python-format
6181 #, python-format
6155 msgid "saving current version of %s as %s\n"
6182 msgid "saving current version of %s as %s\n"
6156 msgstr ""
6183 msgstr ""
6157
6184
6158 #, python-format
6185 #, python-format
6159 msgid "file not managed: %s\n"
6186 msgid "file not managed: %s\n"
6160 msgstr ""
6187 msgstr ""
6161
6188
6162 #, python-format
6189 #, python-format
6163 msgid "no changes needed to %s\n"
6190 msgid "no changes needed to %s\n"
6164 msgstr ""
6191 msgstr ""
6165
6192
6166 msgid ""
6193 msgid ""
6167 "roll back the last transaction\n"
6194 "roll back the last transaction\n"
6168 "\n"
6195 "\n"
6169 " This command should be used with care. There is only one level of\n"
6196 " This command should be used with care. There is only one level of\n"
6170 " rollback, and there is no way to undo a rollback. It will also\n"
6197 " rollback, and there is no way to undo a rollback. It will also\n"
6171 " restore the dirstate at the time of the last transaction, losing\n"
6198 " restore the dirstate at the time of the last transaction, losing\n"
6172 " any dirstate changes since that time. This command does not alter\n"
6199 " any dirstate changes since that time. This command does not alter\n"
6173 " the working directory.\n"
6200 " the working directory.\n"
6174 "\n"
6201 "\n"
6175 " Transactions are used to encapsulate the effects of all commands\n"
6202 " Transactions are used to encapsulate the effects of all commands\n"
6176 " that create new changesets or propagate existing changesets into a\n"
6203 " that create new changesets or propagate existing changesets into a\n"
6177 " repository. For example, the following commands are transactional,\n"
6204 " repository. For example, the following commands are transactional,\n"
6178 " and their effects can be rolled back:\n"
6205 " and their effects can be rolled back:\n"
6179 "\n"
6206 "\n"
6180 " commit\n"
6207 " commit\n"
6181 " import\n"
6208 " import\n"
6182 " pull\n"
6209 " pull\n"
6183 " push (with this repository as destination)\n"
6210 " push (with this repository as destination)\n"
6184 " unbundle\n"
6211 " unbundle\n"
6185 "\n"
6212 "\n"
6186 " This command is not intended for use on public repositories. Once\n"
6213 " This command is not intended for use on public repositories. Once\n"
6187 " changes are visible for pull by other users, rolling a transaction\n"
6214 " changes are visible for pull by other users, rolling a transaction\n"
6188 " back locally is ineffective (someone else may already have pulled\n"
6215 " back locally is ineffective (someone else may already have pulled\n"
6189 " the changes). Furthermore, a race is possible with readers of the\n"
6216 " the changes). Furthermore, a race is possible with readers of the\n"
6190 " repository; for example an in-progress pull from the repository\n"
6217 " repository; for example an in-progress pull from the repository\n"
6191 " may fail if a rollback is performed.\n"
6218 " may fail if a rollback is performed.\n"
6192 " "
6219 " "
6193 msgstr ""
6220 msgstr ""
6194
6221
6195 msgid ""
6222 msgid ""
6196 "print the root (top) of the current working directory\n"
6223 "print the root (top) of the current working directory\n"
6197 "\n"
6224 "\n"
6198 " Print the root directory of the current repository.\n"
6225 " Print the root directory of the current repository.\n"
6199 " "
6226 " "
6200 msgstr ""
6227 msgstr ""
6201
6228
6202 msgid ""
6229 msgid ""
6203 "export the repository via HTTP\n"
6230 "export the repository via HTTP\n"
6204 "\n"
6231 "\n"
6205 " Start a local HTTP repository browser and pull server.\n"
6232 " Start a local HTTP repository browser and pull server.\n"
6206 "\n"
6233 "\n"
6207 " By default, the server logs accesses to stdout and errors to\n"
6234 " By default, the server logs accesses to stdout and errors to\n"
6208 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6235 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6209 " files.\n"
6236 " files.\n"
6210 " "
6237 " "
6211 msgstr ""
6238 msgstr ""
6212
6239
6213 #, python-format
6240 #, python-format
6214 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6241 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6215 msgstr ""
6242 msgstr ""
6216
6243
6217 msgid ""
6244 msgid ""
6218 "show changed files in the working directory\n"
6245 "show changed files in the working directory\n"
6219 "\n"
6246 "\n"
6220 " Show status of files in the repository. If names are given, only\n"
6247 " Show status of files in the repository. If names are given, only\n"
6221 " files that match are shown. Files that are clean or ignored or\n"
6248 " files that match are shown. Files that are clean or ignored or\n"
6222 " the source of a copy/move operation, are not listed unless\n"
6249 " the source of a copy/move operation, are not listed unless\n"
6223 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6250 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6224 " Unless options described with \"show only ...\" are given, the\n"
6251 " Unless options described with \"show only ...\" are given, the\n"
6225 " options -mardu are used.\n"
6252 " options -mardu are used.\n"
6226 "\n"
6253 "\n"
6227 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6254 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6228 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6255 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6229 "\n"
6256 "\n"
6230 " NOTE: status may appear to disagree with diff if permissions have\n"
6257 " NOTE: status may appear to disagree with diff if permissions have\n"
6231 " changed or a merge has occurred. The standard diff format does not\n"
6258 " changed or a merge has occurred. The standard diff format does not\n"
6232 " report permission changes and diff only reports changes relative\n"
6259 " report permission changes and diff only reports changes relative\n"
6233 " to one merge parent.\n"
6260 " to one merge parent.\n"
6234 "\n"
6261 "\n"
6235 " If one revision is given, it is used as the base revision.\n"
6262 " If one revision is given, it is used as the base revision.\n"
6236 " If two revisions are given, the differences between them are\n"
6263 " If two revisions are given, the differences between them are\n"
6237 " shown.\n"
6264 " shown.\n"
6238 "\n"
6265 "\n"
6239 " The codes used to show the status of files are:\n"
6266 " The codes used to show the status of files are:\n"
6240 " M = modified\n"
6267 " M = modified\n"
6241 " A = added\n"
6268 " A = added\n"
6242 " R = removed\n"
6269 " R = removed\n"
6243 " C = clean\n"
6270 " C = clean\n"
6244 " ! = missing (deleted by non-hg command, but still tracked)\n"
6271 " ! = missing (deleted by non-hg command, but still tracked)\n"
6245 " ? = not tracked\n"
6272 " ? = not tracked\n"
6246 " I = ignored\n"
6273 " I = ignored\n"
6247 " = origin of the previous file listed as A (added)\n"
6274 " = origin of the previous file listed as A (added)\n"
6248 " "
6275 " "
6249 msgstr ""
6276 msgstr ""
6250
6277
6251 msgid ""
6278 msgid ""
6252 "add one or more tags for the current or given revision\n"
6279 "add one or more tags for the current or given revision\n"
6253 "\n"
6280 "\n"
6254 " Name a particular revision using <name>.\n"
6281 " Name a particular revision using <name>.\n"
6255 "\n"
6282 "\n"
6256 " Tags are used to name particular revisions of the repository and are\n"
6283 " Tags are used to name particular revisions of the repository and are\n"
6257 " very useful to compare different revisions, to go back to significant\n"
6284 " very useful to compare different revisions, to go back to significant\n"
6258 " earlier versions or to mark branch points as releases, etc.\n"
6285 " earlier versions or to mark branch points as releases, etc.\n"
6259 "\n"
6286 "\n"
6260 " If no revision is given, the parent of the working directory is\n"
6287 " If no revision is given, the parent of the working directory is\n"
6261 " used, or tip if no revision is checked out.\n"
6288 " used, or tip if no revision is checked out.\n"
6262 "\n"
6289 "\n"
6263 " To facilitate version control, distribution, and merging of tags,\n"
6290 " To facilitate version control, distribution, and merging of tags,\n"
6264 " they are stored as a file named \".hgtags\" which is managed\n"
6291 " they are stored as a file named \".hgtags\" which is managed\n"
6265 " similarly to other project files and can be hand-edited if\n"
6292 " similarly to other project files and can be hand-edited if\n"
6266 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6293 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6267 " shared among repositories).\n"
6294 " shared among repositories).\n"
6268 "\n"
6295 "\n"
6269 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6296 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6270 " "
6297 " "
6271 msgstr ""
6298 msgstr ""
6272
6299
6273 msgid "tag names must be unique"
6300 msgid "tag names must be unique"
6274 msgstr ""
6301 msgstr ""
6275
6302
6276 #, python-format
6303 #, python-format
6277 msgid "the name '%s' is reserved"
6304 msgid "the name '%s' is reserved"
6278 msgstr ""
6305 msgstr ""
6279
6306
6280 msgid "--rev and --remove are incompatible"
6307 msgid "--rev and --remove are incompatible"
6281 msgstr ""
6308 msgstr ""
6282
6309
6283 #, python-format
6310 #, python-format
6284 msgid "tag '%s' does not exist"
6311 msgid "tag '%s' does not exist"
6285 msgstr ""
6312 msgstr ""
6286
6313
6287 #, python-format
6314 #, python-format
6288 msgid "tag '%s' is not a global tag"
6315 msgid "tag '%s' is not a global tag"
6289 msgstr ""
6316 msgstr ""
6290
6317
6291 #, python-format
6318 #, python-format
6292 msgid "tag '%s' is not a local tag"
6319 msgid "tag '%s' is not a local tag"
6293 msgstr ""
6320 msgstr ""
6294
6321
6295 #, python-format
6322 #, python-format
6296 msgid "Removed tag %s"
6323 msgid "Removed tag %s"
6297 msgstr ""
6324 msgstr ""
6298
6325
6299 #, python-format
6326 #, python-format
6300 msgid "tag '%s' already exists (use -f to force)"
6327 msgid "tag '%s' already exists (use -f to force)"
6301 msgstr ""
6328 msgstr ""
6302
6329
6303 #, python-format
6330 #, python-format
6304 msgid "Added tag %s for changeset %s"
6331 msgid "Added tag %s for changeset %s"
6305 msgstr ""
6332 msgstr ""
6306
6333
6307 msgid ""
6334 msgid ""
6308 "list repository tags\n"
6335 "list repository tags\n"
6309 "\n"
6336 "\n"
6310 " This lists both regular and local tags. When the -v/--verbose\n"
6337 " This lists both regular and local tags. When the -v/--verbose\n"
6311 " switch is used, a third column \"local\" is printed for local tags.\n"
6338 " switch is used, a third column \"local\" is printed for local tags.\n"
6312 " "
6339 " "
6313 msgstr ""
6340 msgstr ""
6314
6341
6315 msgid ""
6342 msgid ""
6316 "show the tip revision\n"
6343 "show the tip revision\n"
6317 "\n"
6344 "\n"
6318 " The tip revision (usually just called the tip) is the changeset\n"
6345 " The tip revision (usually just called the tip) is the changeset\n"
6319 " most recently added to the repository (and therefore the most\n"
6346 " most recently added to the repository (and therefore the most\n"
6320 " recently changed head).\n"
6347 " recently changed head).\n"
6321 "\n"
6348 "\n"
6322 " If you have just made a commit, that commit will be the tip. If\n"
6349 " If you have just made a commit, that commit will be the tip. If\n"
6323 " you have just pulled changes from another repository, the tip of\n"
6350 " you have just pulled changes from another repository, the tip of\n"
6324 " that repository becomes the current tip. The \"tip\" tag is special\n"
6351 " that repository becomes the current tip. The \"tip\" tag is special\n"
6325 " and cannot be renamed or assigned to a different changeset.\n"
6352 " and cannot be renamed or assigned to a different changeset.\n"
6326 " "
6353 " "
6327 msgstr ""
6354 msgstr ""
6328
6355
6329 msgid ""
6356 msgid ""
6330 "apply one or more changegroup files\n"
6357 "apply one or more changegroup files\n"
6331 "\n"
6358 "\n"
6332 " Apply one or more compressed changegroup files generated by the\n"
6359 " Apply one or more compressed changegroup files generated by the\n"
6333 " bundle command.\n"
6360 " bundle command.\n"
6334 " "
6361 " "
6335 msgstr ""
6362 msgstr ""
6336
6363
6337 msgid ""
6364 msgid ""
6338 "update working directory\n"
6365 "update working directory\n"
6339 "\n"
6366 "\n"
6340 " Update the repository's working directory to the specified\n"
6367 " Update the repository's working directory to the specified\n"
6341 " revision, or the tip of the current branch if none is specified.\n"
6368 " revision, or the tip of the current branch if none is specified.\n"
6342 " Use null as the revision to remove the working copy (like 'hg\n"
6369 " Use null as the revision to remove the working copy (like 'hg\n"
6343 " clone -U').\n"
6370 " clone -U').\n"
6344 "\n"
6371 "\n"
6345 " When the working directory contains no uncommitted changes, it\n"
6372 " When the working directory contains no uncommitted changes, it\n"
6346 " will be replaced by the state of the requested revision from the\n"
6373 " will be replaced by the state of the requested revision from the\n"
6347 " repository. When the requested revision is on a different branch,\n"
6374 " repository. When the requested revision is on a different branch,\n"
6348 " the working directory will additionally be switched to that\n"
6375 " the working directory will additionally be switched to that\n"
6349 " branch.\n"
6376 " branch.\n"
6350 "\n"
6377 "\n"
6351 " When there are uncommitted changes, use option -C/--clean to\n"
6378 " When there are uncommitted changes, use option -C/--clean to\n"
6352 " discard them, forcibly replacing the state of the working\n"
6379 " discard them, forcibly replacing the state of the working\n"
6353 " directory with the requested revision. Alternately, use -c/--check\n"
6380 " directory with the requested revision. Alternately, use -c/--check\n"
6354 " to abort.\n"
6381 " to abort.\n"
6355 "\n"
6382 "\n"
6356 " When there are uncommitted changes and option -C/--clean is not\n"
6383 " When there are uncommitted changes and option -C/--clean is not\n"
6357 " used, and the parent revision and requested revision are on the\n"
6384 " used, and the parent revision and requested revision are on the\n"
6358 " same branch, and one of them is an ancestor of the other, then the\n"
6385 " same branch, and one of them is an ancestor of the other, then the\n"
6359 " new working directory will contain the requested revision merged\n"
6386 " new working directory will contain the requested revision merged\n"
6360 " with the uncommitted changes. Otherwise, the update will fail with\n"
6387 " with the uncommitted changes. Otherwise, the update will fail with\n"
6361 " a suggestion to use 'merge' or 'update -C' instead.\n"
6388 " a suggestion to use 'merge' or 'update -C' instead.\n"
6362 "\n"
6389 "\n"
6363 " If you want to update just one file to an older revision, use\n"
6390 " If you want to update just one file to an older revision, use\n"
6364 " revert.\n"
6391 " revert.\n"
6365 "\n"
6392 "\n"
6366 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6393 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6367 " "
6394 " "
6368 msgstr ""
6395 msgstr ""
6369
6396
6370 msgid "uncommitted local changes"
6397 msgid "uncommitted local changes"
6371 msgstr ""
6398 msgstr ""
6372
6399
6373 msgid ""
6400 msgid ""
6374 "verify the integrity of the repository\n"
6401 "verify the integrity of the repository\n"
6375 "\n"
6402 "\n"
6376 " Verify the integrity of the current repository.\n"
6403 " Verify the integrity of the current repository.\n"
6377 "\n"
6404 "\n"
6378 " This will perform an extensive check of the repository's\n"
6405 " This will perform an extensive check of the repository's\n"
6379 " integrity, validating the hashes and checksums of each entry in\n"
6406 " integrity, validating the hashes and checksums of each entry in\n"
6380 " the changelog, manifest, and tracked files, as well as the\n"
6407 " the changelog, manifest, and tracked files, as well as the\n"
6381 " integrity of their crosslinks and indices.\n"
6408 " integrity of their crosslinks and indices.\n"
6382 " "
6409 " "
6383 msgstr ""
6410 msgstr ""
6384
6411
6385 msgid "output version and copyright information"
6412 msgid "output version and copyright information"
6386 msgstr ""
6413 msgstr ""
6387
6414
6388 #, python-format
6415 #, python-format
6389 msgid "Mercurial Distributed SCM (version %s)\n"
6416 msgid "Mercurial Distributed SCM (version %s)\n"
6390 msgstr ""
6417 msgstr ""
6391
6418
6392 msgid ""
6419 msgid ""
6393 "\n"
6420 "\n"
6394 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6421 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6395 "This is free software; see the source for copying conditions. There is NO\n"
6422 "This is free software; see the source for copying conditions. There is NO\n"
6396 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6423 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6397 msgstr ""
6424 msgstr ""
6398
6425
6399 msgid "repository root directory or symbolic path name"
6426 msgid "repository root directory or symbolic path name"
6400 msgstr ""
6427 msgstr ""
6401
6428
6402 msgid "change working directory"
6429 msgid "change working directory"
6403 msgstr ""
6430 msgstr ""
6404
6431
6405 msgid "do not prompt, assume 'yes' for any required answers"
6432 msgid "do not prompt, assume 'yes' for any required answers"
6406 msgstr ""
6433 msgstr ""
6407
6434
6408 msgid "suppress output"
6435 msgid "suppress output"
6409 msgstr ""
6436 msgstr ""
6410
6437
6411 msgid "enable additional output"
6438 msgid "enable additional output"
6412 msgstr ""
6439 msgstr ""
6413
6440
6414 msgid "set/override config option"
6441 msgid "set/override config option"
6415 msgstr ""
6442 msgstr ""
6416
6443
6417 msgid "enable debugging output"
6444 msgid "enable debugging output"
6418 msgstr ""
6445 msgstr ""
6419
6446
6420 msgid "start debugger"
6447 msgid "start debugger"
6421 msgstr ""
6448 msgstr ""
6422
6449
6423 msgid "set the charset encoding"
6450 msgid "set the charset encoding"
6424 msgstr ""
6451 msgstr ""
6425
6452
6426 msgid "set the charset encoding mode"
6453 msgid "set the charset encoding mode"
6427 msgstr ""
6454 msgstr ""
6428
6455
6429 msgid "print traceback on exception"
6456 msgid "print traceback on exception"
6430 msgstr ""
6457 msgstr ""
6431
6458
6432 msgid "time how long the command takes"
6459 msgid "time how long the command takes"
6433 msgstr ""
6460 msgstr ""
6434
6461
6435 msgid "print command execution profile"
6462 msgid "print command execution profile"
6436 msgstr ""
6463 msgstr ""
6437
6464
6438 msgid "output version information and exit"
6465 msgid "output version information and exit"
6439 msgstr ""
6466 msgstr ""
6440
6467
6441 msgid "display help and exit"
6468 msgid "display help and exit"
6442 msgstr ""
6469 msgstr ""
6443
6470
6444 msgid "do not perform actions, just print output"
6471 msgid "do not perform actions, just print output"
6445 msgstr ""
6472 msgstr ""
6446
6473
6447 msgid "specify ssh command to use"
6474 msgid "specify ssh command to use"
6448 msgstr ""
6475 msgstr ""
6449
6476
6450 msgid "specify hg command to run on the remote side"
6477 msgid "specify hg command to run on the remote side"
6451 msgstr ""
6478 msgstr ""
6452
6479
6453 msgid "include names matching the given patterns"
6480 msgid "include names matching the given patterns"
6454 msgstr ""
6481 msgstr ""
6455
6482
6456 msgid "exclude names matching the given patterns"
6483 msgid "exclude names matching the given patterns"
6457 msgstr ""
6484 msgstr ""
6458
6485
6459 msgid "use <text> as commit message"
6486 msgid "use <text> as commit message"
6460 msgstr ""
6487 msgstr ""
6461
6488
6462 msgid "read commit message from <file>"
6489 msgid "read commit message from <file>"
6463 msgstr ""
6490 msgstr ""
6464
6491
6465 msgid "record datecode as commit date"
6492 msgid "record datecode as commit date"
6466 msgstr ""
6493 msgstr ""
6467
6494
6468 msgid "record the specified user as committer"
6495 msgid "record the specified user as committer"
6469 msgstr ""
6496 msgstr ""
6470
6497
6471 msgid "display using template map file"
6498 msgid "display using template map file"
6472 msgstr ""
6499 msgstr ""
6473
6500
6474 msgid "display with template"
6501 msgid "display with template"
6475 msgstr ""
6502 msgstr ""
6476
6503
6477 msgid "do not show merges"
6504 msgid "do not show merges"
6478 msgstr ""
6505 msgstr ""
6479
6506
6480 msgid "treat all files as text"
6507 msgid "treat all files as text"
6481 msgstr ""
6508 msgstr ""
6482
6509
6483 msgid "don't include dates in diff headers"
6510 msgid "don't include dates in diff headers"
6484 msgstr ""
6511 msgstr ""
6485
6512
6486 msgid "show which function each change is in"
6513 msgid "show which function each change is in"
6487 msgstr ""
6514 msgstr ""
6488
6515
6489 msgid "ignore white space when comparing lines"
6516 msgid "ignore white space when comparing lines"
6490 msgstr ""
6517 msgstr ""
6491
6518
6492 msgid "ignore changes in the amount of white space"
6519 msgid "ignore changes in the amount of white space"
6493 msgstr ""
6520 msgstr ""
6494
6521
6495 msgid "ignore changes whose lines are all blank"
6522 msgid "ignore changes whose lines are all blank"
6496 msgstr ""
6523 msgstr ""
6497
6524
6498 msgid "number of lines of context to show"
6525 msgid "number of lines of context to show"
6499 msgstr ""
6526 msgstr ""
6500
6527
6501 msgid "guess renamed files by similarity (0<=s<=100)"
6528 msgid "guess renamed files by similarity (0<=s<=100)"
6502 msgstr ""
6529 msgstr ""
6503
6530
6504 msgid "[OPTION]... [FILE]..."
6531 msgid "[OPTION]... [FILE]..."
6505 msgstr ""
6532 msgstr ""
6506
6533
6507 msgid "annotate the specified revision"
6534 msgid "annotate the specified revision"
6508 msgstr ""
6535 msgstr ""
6509
6536
6510 msgid "follow file copies and renames"
6537 msgid "follow file copies and renames"
6511 msgstr ""
6538 msgstr ""
6512
6539
6513 msgid "list the author (long with -v)"
6540 msgid "list the author (long with -v)"
6514 msgstr ""
6541 msgstr ""
6515
6542
6516 msgid "list the date (short with -q)"
6543 msgid "list the date (short with -q)"
6517 msgstr ""
6544 msgstr ""
6518
6545
6519 msgid "list the revision number (default)"
6546 msgid "list the revision number (default)"
6520 msgstr ""
6547 msgstr ""
6521
6548
6522 msgid "list the changeset"
6549 msgid "list the changeset"
6523 msgstr ""
6550 msgstr ""
6524
6551
6525 msgid "show line number at the first appearance"
6552 msgid "show line number at the first appearance"
6526 msgstr ""
6553 msgstr ""
6527
6554
6528 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6555 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6529 msgstr ""
6556 msgstr ""
6530
6557
6531 msgid "do not pass files through decoders"
6558 msgid "do not pass files through decoders"
6532 msgstr ""
6559 msgstr ""
6533
6560
6534 msgid "directory prefix for files in archive"
6561 msgid "directory prefix for files in archive"
6535 msgstr ""
6562 msgstr "chemin préfixé aux fichiers de l'archive"
6536
6563
6537 msgid "revision to distribute"
6564 msgid "revision to distribute"
6538 msgstr ""
6565 msgstr "révision à distribuer"
6539
6566
6540 msgid "type of distribution to create"
6567 msgid "type of distribution to create"
6541 msgstr ""
6568 msgstr "type de distribution à créer"
6542
6569
6543 msgid "[OPTION]... DEST"
6570 msgid "[OPTION]... DEST"
6544 msgstr ""
6571 msgstr "[OPTION]... DEST"
6545
6572
6546 msgid "merge with old dirstate parent after backout"
6573 msgid "merge with old dirstate parent after backout"
6547 msgstr ""
6574 msgstr ""
6548
6575
6549 msgid "parent to choose when backing out merge"
6576 msgid "parent to choose when backing out merge"
6550 msgstr ""
6577 msgstr ""
6551
6578
6552 msgid "revision to backout"
6579 msgid "revision to backout"
6553 msgstr ""
6580 msgstr ""
6554
6581
6555 msgid "[OPTION]... [-r] REV"
6582 msgid "[OPTION]... [-r] REV"
6556 msgstr ""
6583 msgstr ""
6557
6584
6558 msgid "reset bisect state"
6585 msgid "reset bisect state"
6559 msgstr "réinitialiser l'état de la recherche par dichotomie"
6586 msgstr "réinitialiser l'état de la recherche par dichotomie"
6560
6587
6561 msgid "mark changeset good"
6588 msgid "mark changeset good"
6562 msgstr "marquer la révision comme \"bonne\""
6589 msgstr "marquer la révision comme \"bonne\""
6563
6590
6564 msgid "mark changeset bad"
6591 msgid "mark changeset bad"
6565 msgstr "marquer la révision comme \"mauvaise\""
6592 msgstr "marquer la révision comme \"mauvaise\""
6566
6593
6567 msgid "skip testing changeset"
6594 msgid "skip testing changeset"
6568 msgstr "ne pas considérer la révision"
6595 msgstr "ne pas considérer la révision"
6569
6596
6570 msgid "use command to check changeset state"
6597 msgid "use command to check changeset state"
6571 msgstr "utiliser une commande pour tester l'état des révisions"
6598 msgstr "utiliser une commande pour tester l'état des révisions"
6572
6599
6573 msgid "do not update to target"
6600 msgid "do not update to target"
6574 msgstr "ne pas mettre à jour à la révision cible"
6601 msgstr "ne pas mettre à jour à la révision cible"
6575
6602
6576 msgid "[-gbsr] [-c CMD] [REV]"
6603 msgid "[-gbsr] [-c CMD] [REV]"
6577 msgstr "[-gbsr] [-c CMD] [REV]"
6604 msgstr "[-gbsr] [-c CMD] [REV]"
6578
6605
6579 msgid "set branch name even if it shadows an existing branch"
6606 msgid "set branch name even if it shadows an existing branch"
6580 msgstr ""
6607 msgstr ""
6581
6608
6582 msgid "reset branch name to parent branch name"
6609 msgid "reset branch name to parent branch name"
6583 msgstr ""
6610 msgstr ""
6584
6611
6585 msgid "[-fC] [NAME]"
6612 msgid "[-fC] [NAME]"
6586 msgstr ""
6613 msgstr ""
6587
6614
6588 msgid "show only branches that have unmerged heads"
6615 msgid "show only branches that have unmerged heads"
6589 msgstr ""
6616 msgstr ""
6590
6617
6591 msgid "[-a]"
6618 msgid "[-a]"
6592 msgstr ""
6619 msgstr ""
6593
6620
6594 msgid "run even when remote repository is unrelated"
6621 msgid "run even when remote repository is unrelated"
6595 msgstr ""
6622 msgstr ""
6596
6623
6597 msgid "a changeset up to which you would like to bundle"
6624 msgid "a changeset up to which you would like to bundle"
6598 msgstr ""
6625 msgstr ""
6599
6626
6600 msgid "a base changeset to specify instead of a destination"
6627 msgid "a base changeset to specify instead of a destination"
6601 msgstr ""
6628 msgstr ""
6602
6629
6603 msgid "bundle all changesets in the repository"
6630 msgid "bundle all changesets in the repository"
6604 msgstr ""
6631 msgstr ""
6605
6632
6606 msgid "bundle compression type to use"
6633 msgid "bundle compression type to use"
6607 msgstr ""
6634 msgstr ""
6608
6635
6609 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6636 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6610 msgstr ""
6637 msgstr ""
6611
6638
6612 msgid "print output to file with formatted name"
6639 msgid "print output to file with formatted name"
6613 msgstr ""
6640 msgstr ""
6614
6641
6615 msgid "print the given revision"
6642 msgid "print the given revision"
6616 msgstr ""
6643 msgstr ""
6617
6644
6618 msgid "apply any matching decode filter"
6645 msgid "apply any matching decode filter"
6619 msgstr ""
6646 msgstr ""
6620
6647
6621 msgid "[OPTION]... FILE..."
6648 msgid "[OPTION]... FILE..."
6622 msgstr ""
6649 msgstr ""
6623
6650
6624 msgid "the clone will only contain a repository (no working copy)"
6651 msgid "the clone will only contain a repository (no working copy)"
6625 msgstr ""
6652 msgstr ""
6626
6653
6627 msgid "a changeset you would like to have after cloning"
6654 msgid "a changeset you would like to have after cloning"
6628 msgstr ""
6655 msgstr ""
6629
6656
6630 msgid "[OPTION]... SOURCE [DEST]"
6657 msgid "[OPTION]... SOURCE [DEST]"
6631 msgstr ""
6658 msgstr ""
6632
6659
6633 msgid "mark new/missing files as added/removed before committing"
6660 msgid "mark new/missing files as added/removed before committing"
6634 msgstr ""
6661 msgstr ""
6635
6662
6636 msgid "mark a branch as closed, hiding it from the branch list"
6663 msgid "mark a branch as closed, hiding it from the branch list"
6637 msgstr ""
6664 msgstr ""
6638
6665
6639 msgid "record a copy that has already occurred"
6666 msgid "record a copy that has already occurred"
6640 msgstr ""
6667 msgstr ""
6641
6668
6642 msgid "forcibly copy over an existing managed file"
6669 msgid "forcibly copy over an existing managed file"
6643 msgstr ""
6670 msgstr ""
6644
6671
6645 msgid "[OPTION]... [SOURCE]... DEST"
6672 msgid "[OPTION]... [SOURCE]... DEST"
6646 msgstr ""
6673 msgstr ""
6647
6674
6648 msgid "[INDEX] REV1 REV2"
6675 msgid "[INDEX] REV1 REV2"
6649 msgstr ""
6676 msgstr ""
6650
6677
6651 msgid "[COMMAND]"
6678 msgid "[COMMAND]"
6652 msgstr ""
6679 msgstr ""
6653
6680
6654 msgid "show the command options"
6681 msgid "show the command options"
6655 msgstr ""
6682 msgstr ""
6656
6683
6657 msgid "[-o] CMD"
6684 msgid "[-o] CMD"
6658 msgstr ""
6685 msgstr ""
6659
6686
6660 msgid "try extended date formats"
6687 msgid "try extended date formats"
6661 msgstr ""
6688 msgstr ""
6662
6689
6663 msgid "[-e] DATE [RANGE]"
6690 msgid "[-e] DATE [RANGE]"
6664 msgstr ""
6691 msgstr ""
6665
6692
6666 msgid "FILE REV"
6693 msgid "FILE REV"
6667 msgstr ""
6694 msgstr ""
6668
6695
6669 msgid "[PATH]"
6696 msgid "[PATH]"
6670 msgstr ""
6697 msgstr ""
6671
6698
6672 msgid "FILE"
6699 msgid "FILE"
6673 msgstr ""
6700 msgstr ""
6674
6701
6675 msgid "revision to rebuild to"
6702 msgid "revision to rebuild to"
6676 msgstr ""
6703 msgstr ""
6677
6704
6678 msgid "[-r REV] [REV]"
6705 msgid "[-r REV] [REV]"
6679 msgstr ""
6706 msgstr ""
6680
6707
6681 msgid "revision to debug"
6708 msgid "revision to debug"
6682 msgstr ""
6709 msgstr ""
6683
6710
6684 msgid "[-r REV] FILE"
6711 msgid "[-r REV] FILE"
6685 msgstr ""
6712 msgstr ""
6686
6713
6687 msgid "REV1 [REV2]"
6714 msgid "REV1 [REV2]"
6688 msgstr ""
6715 msgstr ""
6689
6716
6690 msgid "do not display the saved mtime"
6717 msgid "do not display the saved mtime"
6691 msgstr ""
6718 msgstr ""
6692
6719
6693 msgid "[OPTION]..."
6720 msgid "[OPTION]..."
6694 msgstr ""
6721 msgstr ""
6695
6722
6696 msgid "revision to check"
6723 msgid "revision to check"
6697 msgstr ""
6724 msgstr ""
6698
6725
6699 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6726 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6700 msgstr ""
6727 msgstr ""
6701
6728
6702 msgid "diff against the second parent"
6729 msgid "diff against the second parent"
6703 msgstr ""
6730 msgstr ""
6704
6731
6705 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6732 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6706 msgstr ""
6733 msgstr ""
6707
6734
6708 msgid "end fields with NUL"
6735 msgid "end fields with NUL"
6709 msgstr ""
6736 msgstr ""
6710
6737
6711 msgid "print all revisions that match"
6738 msgid "print all revisions that match"
6712 msgstr ""
6739 msgstr ""
6713
6740
6714 msgid "follow changeset history, or file history across copies and renames"
6741 msgid "follow changeset history, or file history across copies and renames"
6715 msgstr ""
6742 msgstr ""
6716
6743
6717 msgid "ignore case when matching"
6744 msgid "ignore case when matching"
6718 msgstr ""
6745 msgstr ""
6719
6746
6720 msgid "print only filenames and revisions that match"
6747 msgid "print only filenames and revisions that match"
6721 msgstr ""
6748 msgstr ""
6722
6749
6723 msgid "print matching line numbers"
6750 msgid "print matching line numbers"
6724 msgstr ""
6751 msgstr ""
6725
6752
6726 msgid "search in given revision range"
6753 msgid "search in given revision range"
6727 msgstr ""
6754 msgstr ""
6728
6755
6729 msgid "[OPTION]... PATTERN [FILE]..."
6756 msgid "[OPTION]... PATTERN [FILE]..."
6730 msgstr ""
6757 msgstr ""
6731
6758
6732 msgid "show only heads which are descendants of REV"
6759 msgid "show only heads which are descendants of REV"
6733 msgstr ""
6760 msgstr ""
6734
6761
6735 msgid "show only the active heads from open branches"
6762 msgid "show only the active heads from open branches"
6736 msgstr ""
6763 msgstr ""
6737
6764
6738 msgid "show normal and closed heads"
6765 msgid "show normal and closed heads"
6739 msgstr ""
6766 msgstr ""
6740
6767
6741 msgid "[-r STARTREV] [REV]..."
6768 msgid "[-r STARTREV] [REV]..."
6742 msgstr ""
6769 msgstr ""
6743
6770
6744 msgid "[TOPIC]"
6771 msgid "[TOPIC]"
6745 msgstr ""
6772 msgstr ""
6746
6773
6747 msgid "identify the specified revision"
6774 msgid "identify the specified revision"
6748 msgstr ""
6775 msgstr ""
6749
6776
6750 msgid "show local revision number"
6777 msgid "show local revision number"
6751 msgstr ""
6778 msgstr ""
6752
6779
6753 msgid "show global revision id"
6780 msgid "show global revision id"
6754 msgstr ""
6781 msgstr ""
6755
6782
6756 msgid "show branch"
6783 msgid "show branch"
6757 msgstr ""
6784 msgstr ""
6758
6785
6759 msgid "show tags"
6786 msgid "show tags"
6760 msgstr ""
6787 msgstr ""
6761
6788
6762 msgid "[-nibt] [-r REV] [SOURCE]"
6789 msgid "[-nibt] [-r REV] [SOURCE]"
6763 msgstr ""
6790 msgstr ""
6764
6791
6765 msgid ""
6792 msgid ""
6766 "directory strip option for patch. This has the same meaning as the "
6793 "directory strip option for patch. This has the same meaning as the "
6767 "corresponding patch option"
6794 "corresponding patch option"
6768 msgstr ""
6795 msgstr ""
6769
6796
6770 msgid "base path"
6797 msgid "base path"
6771 msgstr ""
6798 msgstr ""
6772
6799
6773 msgid "skip check for outstanding uncommitted changes"
6800 msgid "skip check for outstanding uncommitted changes"
6774 msgstr ""
6801 msgstr ""
6775
6802
6776 msgid "don't commit, just update the working directory"
6803 msgid "don't commit, just update the working directory"
6777 msgstr ""
6804 msgstr ""
6778
6805
6779 msgid "apply patch to the nodes from which it was generated"
6806 msgid "apply patch to the nodes from which it was generated"
6780 msgstr ""
6807 msgstr ""
6781
6808
6782 msgid "use any branch information in patch (implied by --exact)"
6809 msgid "use any branch information in patch (implied by --exact)"
6783 msgstr ""
6810 msgstr ""
6784
6811
6785 msgid "[OPTION]... PATCH..."
6812 msgid "[OPTION]... PATCH..."
6786 msgstr ""
6813 msgstr ""
6787
6814
6788 msgid "show newest record first"
6815 msgid "show newest record first"
6789 msgstr ""
6816 msgstr ""
6790
6817
6791 msgid "file to store the bundles into"
6818 msgid "file to store the bundles into"
6792 msgstr ""
6819 msgstr ""
6793
6820
6794 msgid "a specific revision up to which you would like to pull"
6821 msgid "a specific revision up to which you would like to pull"
6795 msgstr ""
6822 msgstr ""
6796
6823
6797 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6824 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6798 msgstr ""
6825 msgstr ""
6799
6826
6800 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6827 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6801 msgstr ""
6828 msgstr ""
6802
6829
6803 msgid "search the repository as it stood at REV"
6830 msgid "search the repository as it stood at REV"
6804 msgstr ""
6831 msgstr ""
6805
6832
6806 msgid "end filenames with NUL, for use with xargs"
6833 msgid "end filenames with NUL, for use with xargs"
6807 msgstr ""
6834 msgstr ""
6808
6835
6809 msgid "print complete paths from the filesystem root"
6836 msgid "print complete paths from the filesystem root"
6810 msgstr ""
6837 msgstr ""
6811
6838
6812 msgid "[OPTION]... [PATTERN]..."
6839 msgid "[OPTION]... [PATTERN]..."
6813 msgstr ""
6840 msgstr ""
6814
6841
6815 msgid "only follow the first parent of merge changesets"
6842 msgid "only follow the first parent of merge changesets"
6816 msgstr ""
6843 msgstr ""
6817
6844
6818 msgid "show revisions matching date spec"
6845 msgid "show revisions matching date spec"
6819 msgstr ""
6846 msgstr ""
6820
6847
6821 msgid "show copied files"
6848 msgid "show copied files"
6822 msgstr ""
6849 msgstr ""
6823
6850
6824 msgid "do case-insensitive search for a keyword"
6851 msgid "do case-insensitive search for a keyword"
6825 msgstr ""
6852 msgstr ""
6826
6853
6827 msgid "include revisions where files were removed"
6854 msgid "include revisions where files were removed"
6828 msgstr ""
6855 msgstr ""
6829
6856
6830 msgid "show only merges"
6857 msgid "show only merges"
6831 msgstr ""
6858 msgstr ""
6832
6859
6833 msgid "revisions committed by user"
6860 msgid "revisions committed by user"
6834 msgstr ""
6861 msgstr ""
6835
6862
6836 msgid "show only changesets within the given named branch"
6863 msgid "show only changesets within the given named branch"
6837 msgstr ""
6864 msgstr ""
6838
6865
6839 msgid "do not display revision or any of its ancestors"
6866 msgid "do not display revision or any of its ancestors"
6840 msgstr ""
6867 msgstr ""
6841
6868
6842 msgid "[OPTION]... [FILE]"
6869 msgid "[OPTION]... [FILE]"
6843 msgstr ""
6870 msgstr ""
6844
6871
6845 msgid "revision to display"
6872 msgid "revision to display"
6846 msgstr ""
6873 msgstr ""
6847
6874
6848 msgid "[-r REV]"
6875 msgid "[-r REV]"
6849 msgstr ""
6876 msgstr ""
6850
6877
6851 msgid "force a merge with outstanding changes"
6878 msgid "force a merge with outstanding changes"
6852 msgstr ""
6879 msgstr ""
6853
6880
6854 msgid "revision to merge"
6881 msgid "revision to merge"
6855 msgstr ""
6882 msgstr ""
6856
6883
6857 msgid "review revisions to merge (no merge is performed)"
6884 msgid "review revisions to merge (no merge is performed)"
6858 msgstr ""
6885 msgstr ""
6859
6886
6860 msgid "[-f] [[-r] REV]"
6887 msgid "[-f] [[-r] REV]"
6861 msgstr ""
6888 msgstr ""
6862
6889
6863 msgid "a specific revision up to which you would like to push"
6890 msgid "a specific revision up to which you would like to push"
6864 msgstr ""
6891 msgstr ""
6865
6892
6866 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6893 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6867 msgstr ""
6894 msgstr ""
6868
6895
6869 msgid "show parents from the specified revision"
6896 msgid "show parents from the specified revision"
6870 msgstr ""
6897 msgstr ""
6871
6898
6872 msgid "[-r REV] [FILE]"
6899 msgid "[-r REV] [FILE]"
6873 msgstr ""
6900 msgstr ""
6874
6901
6875 msgid "[NAME]"
6902 msgid "[NAME]"
6876 msgstr ""
6903 msgstr ""
6877
6904
6878 msgid "update to new tip if changesets were pulled"
6905 msgid "update to new tip if changesets were pulled"
6879 msgstr ""
6906 msgstr ""
6880
6907
6881 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6908 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6882 msgstr ""
6909 msgstr ""
6883
6910
6884 msgid "force push"
6911 msgid "force push"
6885 msgstr ""
6912 msgstr ""
6886
6913
6887 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6914 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6888 msgstr ""
6915 msgstr ""
6889
6916
6890 msgid "record delete for missing files"
6917 msgid "record delete for missing files"
6891 msgstr ""
6918 msgstr ""
6892
6919
6893 msgid "remove (and delete) file even if added or modified"
6920 msgid "remove (and delete) file even if added or modified"
6894 msgstr ""
6921 msgstr ""
6895
6922
6896 msgid "record a rename that has already occurred"
6923 msgid "record a rename that has already occurred"
6897 msgstr ""
6924 msgstr ""
6898
6925
6899 msgid "[OPTION]... SOURCE... DEST"
6926 msgid "[OPTION]... SOURCE... DEST"
6900 msgstr ""
6927 msgstr ""
6901
6928
6902 msgid "remerge all unresolved files"
6929 msgid "remerge all unresolved files"
6903 msgstr ""
6930 msgstr ""
6904
6931
6905 msgid "list state of files needing merge"
6932 msgid "list state of files needing merge"
6906 msgstr ""
6933 msgstr ""
6907
6934
6908 msgid "mark files as resolved"
6935 msgid "mark files as resolved"
6909 msgstr ""
6936 msgstr ""
6910
6937
6911 msgid "unmark files as resolved"
6938 msgid "unmark files as resolved"
6912 msgstr ""
6939 msgstr ""
6913
6940
6914 msgid "revert all changes when no arguments given"
6941 msgid "revert all changes when no arguments given"
6915 msgstr ""
6942 msgstr ""
6916
6943
6917 msgid "tipmost revision matching date"
6944 msgid "tipmost revision matching date"
6918 msgstr ""
6945 msgstr ""
6919
6946
6920 msgid "revision to revert to"
6947 msgid "revision to revert to"
6921 msgstr ""
6948 msgstr ""
6922
6949
6923 msgid "do not save backup copies of files"
6950 msgid "do not save backup copies of files"
6924 msgstr ""
6951 msgstr ""
6925
6952
6926 msgid "[OPTION]... [-r REV] [NAME]..."
6953 msgid "[OPTION]... [-r REV] [NAME]..."
6927 msgstr ""
6954 msgstr ""
6928
6955
6929 msgid "name of access log file to write to"
6956 msgid "name of access log file to write to"
6930 msgstr ""
6957 msgstr ""
6931
6958
6932 msgid "name of error log file to write to"
6959 msgid "name of error log file to write to"
6933 msgstr ""
6960 msgstr ""
6934
6961
6935 msgid "port to listen on (default: 8000)"
6962 msgid "port to listen on (default: 8000)"
6936 msgstr ""
6963 msgstr ""
6937
6964
6938 msgid "address to listen on (default: all interfaces)"
6965 msgid "address to listen on (default: all interfaces)"
6939 msgstr ""
6966 msgstr ""
6940
6967
6941 msgid "prefix path to serve from (default: server root)"
6968 msgid "prefix path to serve from (default: server root)"
6942 msgstr ""
6969 msgstr ""
6943
6970
6944 msgid "name to show in web pages (default: working directory)"
6971 msgid "name to show in web pages (default: working directory)"
6945 msgstr ""
6972 msgstr ""
6946
6973
6947 msgid "name of the webdir config file (serve more than one repository)"
6974 msgid "name of the webdir config file (serve more than one repository)"
6948 msgstr ""
6975 msgstr ""
6949
6976
6950 msgid "for remote clients"
6977 msgid "for remote clients"
6951 msgstr ""
6978 msgstr ""
6952
6979
6953 msgid "web templates to use"
6980 msgid "web templates to use"
6954 msgstr ""
6981 msgstr ""
6955
6982
6956 msgid "template style to use"
6983 msgid "template style to use"
6957 msgstr ""
6984 msgstr ""
6958
6985
6959 msgid "use IPv6 in addition to IPv4"
6986 msgid "use IPv6 in addition to IPv4"
6960 msgstr ""
6987 msgstr ""
6961
6988
6962 msgid "SSL certificate file"
6989 msgid "SSL certificate file"
6963 msgstr ""
6990 msgstr ""
6964
6991
6965 msgid "show untrusted configuration options"
6992 msgid "show untrusted configuration options"
6966 msgstr ""
6993 msgstr ""
6967
6994
6968 msgid "[-u] [NAME]..."
6995 msgid "[-u] [NAME]..."
6969 msgstr ""
6996 msgstr ""
6970
6997
6971 msgid "show status of all files"
6998 msgid "show status of all files"
6972 msgstr ""
6999 msgstr ""
6973
7000
6974 msgid "show only modified files"
7001 msgid "show only modified files"
6975 msgstr ""
7002 msgstr ""
6976
7003
6977 msgid "show only added files"
7004 msgid "show only added files"
6978 msgstr ""
7005 msgstr ""
6979
7006
6980 msgid "show only removed files"
7007 msgid "show only removed files"
6981 msgstr ""
7008 msgstr ""
6982
7009
6983 msgid "show only deleted (but tracked) files"
7010 msgid "show only deleted (but tracked) files"
6984 msgstr ""
7011 msgstr ""
6985
7012
6986 msgid "show only files without changes"
7013 msgid "show only files without changes"
6987 msgstr ""
7014 msgstr ""
6988
7015
6989 msgid "show only unknown (not tracked) files"
7016 msgid "show only unknown (not tracked) files"
6990 msgstr ""
7017 msgstr ""
6991
7018
6992 msgid "show only ignored files"
7019 msgid "show only ignored files"
6993 msgstr ""
7020 msgstr ""
6994
7021
6995 msgid "hide status prefix"
7022 msgid "hide status prefix"
6996 msgstr ""
7023 msgstr ""
6997
7024
6998 msgid "show source of copied files"
7025 msgid "show source of copied files"
6999 msgstr ""
7026 msgstr ""
7000
7027
7001 msgid "show difference from revision"
7028 msgid "show difference from revision"
7002 msgstr ""
7029 msgstr ""
7003
7030
7004 msgid "replace existing tag"
7031 msgid "replace existing tag"
7005 msgstr ""
7032 msgstr ""
7006
7033
7007 msgid "make the tag local"
7034 msgid "make the tag local"
7008 msgstr ""
7035 msgstr ""
7009
7036
7010 msgid "revision to tag"
7037 msgid "revision to tag"
7011 msgstr ""
7038 msgstr ""
7012
7039
7013 msgid "remove a tag"
7040 msgid "remove a tag"
7014 msgstr ""
7041 msgstr ""
7015
7042
7016 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7043 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7017 msgstr ""
7044 msgstr ""
7018
7045
7019 msgid "[-p]"
7046 msgid "[-p]"
7020 msgstr ""
7047 msgstr ""
7021
7048
7022 msgid "update to new tip if changesets were unbundled"
7049 msgid "update to new tip if changesets were unbundled"
7023 msgstr ""
7050 msgstr ""
7024
7051
7025 msgid "[-u] FILE..."
7052 msgid "[-u] FILE..."
7026 msgstr ""
7053 msgstr ""
7027
7054
7028 msgid "overwrite locally modified files (no backup)"
7055 msgid "overwrite locally modified files (no backup)"
7029 msgstr ""
7056 msgstr ""
7030
7057
7031 msgid "check for uncommitted changes"
7058 msgid "check for uncommitted changes"
7032 msgstr ""
7059 msgstr ""
7033
7060
7034 msgid "[-C] [-d DATE] [[-r] REV]"
7061 msgid "[-C] [-d DATE] [[-r] REV]"
7035 msgstr ""
7062 msgstr ""
7036
7063
7037 #, python-format
7064 #, python-format
7038 msgid "config error at %s:%d: '%s'"
7065 msgid "config error at %s:%d: '%s'"
7039 msgstr ""
7066 msgstr ""
7040
7067
7041 msgid "not found in manifest"
7068 msgid "not found in manifest"
7042 msgstr ""
7069 msgstr ""
7043
7070
7044 msgid "branch name not in UTF-8!"
7071 msgid "branch name not in UTF-8!"
7045 msgstr ""
7072 msgstr ""
7046
7073
7047 #, python-format
7074 #, python-format
7048 msgid " searching for copies back to rev %d\n"
7075 msgid " searching for copies back to rev %d\n"
7049 msgstr ""
7076 msgstr ""
7050
7077
7051 #, python-format
7078 #, python-format
7052 msgid ""
7079 msgid ""
7053 " unmatched files in local:\n"
7080 " unmatched files in local:\n"
7054 " %s\n"
7081 " %s\n"
7055 msgstr ""
7082 msgstr ""
7056
7083
7057 #, python-format
7084 #, python-format
7058 msgid ""
7085 msgid ""
7059 " unmatched files in other:\n"
7086 " unmatched files in other:\n"
7060 " %s\n"
7087 " %s\n"
7061 msgstr ""
7088 msgstr ""
7062
7089
7063 msgid " all copies found (* = to merge, ! = divergent):\n"
7090 msgid " all copies found (* = to merge, ! = divergent):\n"
7064 msgstr ""
7091 msgstr ""
7065
7092
7066 msgid " checking for directory renames\n"
7093 msgid " checking for directory renames\n"
7067 msgstr ""
7094 msgstr ""
7068
7095
7069 #, python-format
7096 #, python-format
7070 msgid " dir %s -> %s\n"
7097 msgid " dir %s -> %s\n"
7071 msgstr ""
7098 msgstr ""
7072
7099
7073 #, python-format
7100 #, python-format
7074 msgid " file %s -> %s\n"
7101 msgid " file %s -> %s\n"
7075 msgstr ""
7102 msgstr ""
7076
7103
7077 msgid "working directory state appears damaged!"
7104 msgid "working directory state appears damaged!"
7078 msgstr ""
7105 msgstr ""
7079
7106
7080 #, python-format
7107 #, python-format
7081 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7108 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7082 msgstr ""
7109 msgstr ""
7083
7110
7084 #, python-format
7111 #, python-format
7085 msgid "directory %r already in dirstate"
7112 msgid "directory %r already in dirstate"
7086 msgstr ""
7113 msgstr ""
7087
7114
7088 #, python-format
7115 #, python-format
7089 msgid "file %r in dirstate clashes with %r"
7116 msgid "file %r in dirstate clashes with %r"
7090 msgstr ""
7117 msgstr ""
7091
7118
7092 #, python-format
7119 #, python-format
7093 msgid "not in dirstate: %s\n"
7120 msgid "not in dirstate: %s\n"
7094 msgstr ""
7121 msgstr ""
7095
7122
7096 msgid "unknown"
7123 msgid "unknown"
7097 msgstr ""
7124 msgstr ""
7098
7125
7099 msgid "character device"
7126 msgid "character device"
7100 msgstr ""
7127 msgstr ""
7101
7128
7102 msgid "block device"
7129 msgid "block device"
7103 msgstr ""
7130 msgstr ""
7104
7131
7105 msgid "fifo"
7132 msgid "fifo"
7106 msgstr ""
7133 msgstr ""
7107
7134
7108 msgid "socket"
7135 msgid "socket"
7109 msgstr ""
7136 msgstr ""
7110
7137
7111 msgid "directory"
7138 msgid "directory"
7112 msgstr ""
7139 msgstr ""
7113
7140
7114 #, python-format
7141 #, python-format
7115 msgid "unsupported file type (type is %s)"
7142 msgid "unsupported file type (type is %s)"
7116 msgstr ""
7143 msgstr ""
7117
7144
7118 #, python-format
7145 #, python-format
7119 msgid "abort: %s\n"
7146 msgid "abort: %s\n"
7120 msgstr ""
7147 msgstr ""
7121
7148
7122 #, python-format
7149 #, python-format
7123 msgid ""
7150 msgid ""
7124 "hg: command '%s' is ambiguous:\n"
7151 "hg: command '%s' is ambiguous:\n"
7125 " %s\n"
7152 " %s\n"
7126 msgstr ""
7153 msgstr ""
7127
7154
7128 #, python-format
7155 #, python-format
7129 msgid "hg: %s\n"
7156 msgid "hg: %s\n"
7130 msgstr ""
7157 msgstr ""
7131
7158
7132 #, python-format
7159 #, python-format
7133 msgid "timed out waiting for lock held by %s"
7160 msgid "timed out waiting for lock held by %s"
7134 msgstr ""
7161 msgstr ""
7135
7162
7136 #, python-format
7163 #, python-format
7137 msgid "lock held by %s"
7164 msgid "lock held by %s"
7138 msgstr ""
7165 msgstr ""
7139
7166
7140 #, python-format
7167 #, python-format
7141 msgid "abort: %s: %s\n"
7168 msgid "abort: %s: %s\n"
7142 msgstr ""
7169 msgstr ""
7143
7170
7144 #, python-format
7171 #, python-format
7145 msgid "abort: could not lock %s: %s\n"
7172 msgid "abort: could not lock %s: %s\n"
7146 msgstr ""
7173 msgstr ""
7147
7174
7148 #, python-format
7175 #, python-format
7149 msgid "hg %s: %s\n"
7176 msgid "hg %s: %s\n"
7150 msgstr ""
7177 msgstr ""
7151
7178
7152 #, python-format
7179 #, python-format
7153 msgid "abort: %s!\n"
7180 msgid "abort: %s!\n"
7154 msgstr ""
7181 msgstr ""
7155
7182
7156 #, python-format
7183 #, python-format
7157 msgid "abort: %s"
7184 msgid "abort: %s"
7158 msgstr ""
7185 msgstr ""
7159
7186
7160 msgid " empty string\n"
7187 msgid " empty string\n"
7161 msgstr ""
7188 msgstr ""
7162
7189
7163 msgid "killed!\n"
7190 msgid "killed!\n"
7164 msgstr ""
7191 msgstr ""
7165
7192
7166 #, python-format
7193 #, python-format
7167 msgid "hg: unknown command '%s'\n"
7194 msgid "hg: unknown command '%s'\n"
7168 msgstr ""
7195 msgstr ""
7169
7196
7170 #, python-format
7197 #, python-format
7171 msgid "abort: could not import module %s!\n"
7198 msgid "abort: could not import module %s!\n"
7172 msgstr ""
7199 msgstr ""
7173
7200
7174 msgid "(did you forget to compile extensions?)\n"
7201 msgid "(did you forget to compile extensions?)\n"
7175 msgstr ""
7202 msgstr ""
7176
7203
7177 msgid "(is your Python install correct?)\n"
7204 msgid "(is your Python install correct?)\n"
7178 msgstr ""
7205 msgstr ""
7179
7206
7180 #, python-format
7207 #, python-format
7181 msgid "abort: error: %s\n"
7208 msgid "abort: error: %s\n"
7182 msgstr ""
7209 msgstr ""
7183
7210
7184 msgid "broken pipe\n"
7211 msgid "broken pipe\n"
7185 msgstr ""
7212 msgstr ""
7186
7213
7187 msgid "interrupted!\n"
7214 msgid "interrupted!\n"
7188 msgstr ""
7215 msgstr ""
7189
7216
7190 msgid ""
7217 msgid ""
7191 "\n"
7218 "\n"
7192 "broken pipe\n"
7219 "broken pipe\n"
7193 msgstr ""
7220 msgstr ""
7194
7221
7195 msgid "abort: out of memory\n"
7222 msgid "abort: out of memory\n"
7196 msgstr ""
7223 msgstr ""
7197
7224
7198 msgid "** unknown exception encountered, details follow\n"
7225 msgid "** unknown exception encountered, details follow\n"
7199 msgstr ""
7226 msgstr ""
7200
7227
7201 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7228 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7202 msgstr ""
7229 msgstr ""
7203
7230
7204 msgid "** or mercurial@selenic.com\n"
7231 msgid "** or mercurial@selenic.com\n"
7205 msgstr ""
7232 msgstr ""
7206
7233
7207 #, python-format
7234 #, python-format
7208 msgid "** Mercurial Distributed SCM (version %s)\n"
7235 msgid "** Mercurial Distributed SCM (version %s)\n"
7209 msgstr ""
7236 msgstr ""
7210
7237
7211 #, python-format
7238 #, python-format
7212 msgid "** Extensions loaded: %s\n"
7239 msgid "** Extensions loaded: %s\n"
7213 msgstr ""
7240 msgstr ""
7214
7241
7215 #, python-format
7242 #, python-format
7216 msgid "no definition for alias '%s'\n"
7243 msgid "no definition for alias '%s'\n"
7217 msgstr ""
7244 msgstr ""
7218
7245
7219 #, python-format
7246 #, python-format
7220 msgid "alias '%s' resolves to unknown command '%s'\n"
7247 msgid "alias '%s' resolves to unknown command '%s'\n"
7221 msgstr ""
7248 msgstr ""
7222
7249
7223 #, python-format
7250 #, python-format
7224 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7251 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7225 msgstr ""
7252 msgstr ""
7226
7253
7227 #, python-format
7254 #, python-format
7228 msgid "alias '%s' shadows command\n"
7255 msgid "alias '%s' shadows command\n"
7229 msgstr ""
7256 msgstr ""
7230
7257
7231 #, python-format
7258 #, python-format
7232 msgid "malformed --config option: %s"
7259 msgid "malformed --config option: %s"
7233 msgstr ""
7260 msgstr ""
7234
7261
7235 #, python-format
7262 #, python-format
7236 msgid "extension '%s' overrides commands: %s\n"
7263 msgid "extension '%s' overrides commands: %s\n"
7237 msgstr ""
7264 msgstr ""
7238
7265
7239 msgid "Option --config may not be abbreviated!"
7266 msgid "Option --config may not be abbreviated!"
7240 msgstr ""
7267 msgstr ""
7241
7268
7242 msgid "Option --cwd may not be abbreviated!"
7269 msgid "Option --cwd may not be abbreviated!"
7243 msgstr ""
7270 msgstr ""
7244
7271
7245 msgid ""
7272 msgid ""
7246 "Option -R has to be separated from other options (e.g. not -qR) and --"
7273 "Option -R has to be separated from other options (e.g. not -qR) and --"
7247 "repository may only be abbreviated as --repo!"
7274 "repository may only be abbreviated as --repo!"
7248 msgstr ""
7275 msgstr ""
7249
7276
7250 #, python-format
7277 #, python-format
7251 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7278 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7252 msgstr ""
7279 msgstr ""
7253
7280
7254 #, python-format
7281 #, python-format
7255 msgid "repository '%s' is not local"
7282 msgid "repository '%s' is not local"
7256 msgstr ""
7283 msgstr ""
7257
7284
7258 msgid "invalid arguments"
7285 msgid "invalid arguments"
7259 msgstr ""
7286 msgstr ""
7260
7287
7261 #, python-format
7288 #, python-format
7262 msgid "unrecognized profiling format '%s' - Ignored\n"
7289 msgid "unrecognized profiling format '%s' - Ignored\n"
7263 msgstr ""
7290 msgstr ""
7264
7291
7265 msgid ""
7292 msgid ""
7266 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7293 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7267 "misc/lsprof/"
7294 "misc/lsprof/"
7268 msgstr ""
7295 msgstr ""
7269
7296
7270 #, python-format
7297 #, python-format
7271 msgid "*** failed to import extension %s from %s: %s\n"
7298 msgid "*** failed to import extension %s from %s: %s\n"
7272 msgstr ""
7299 msgstr ""
7273
7300
7274 #, python-format
7301 #, python-format
7275 msgid "*** failed to import extension %s: %s\n"
7302 msgid "*** failed to import extension %s: %s\n"
7276 msgstr ""
7303 msgstr ""
7277
7304
7278 #, python-format
7305 #, python-format
7279 msgid "couldn't find merge tool %s\n"
7306 msgid "couldn't find merge tool %s\n"
7280 msgstr ""
7307 msgstr ""
7281
7308
7282 #, python-format
7309 #, python-format
7283 msgid "tool %s can't handle symlinks\n"
7310 msgid "tool %s can't handle symlinks\n"
7284 msgstr ""
7311 msgstr ""
7285
7312
7286 #, python-format
7313 #, python-format
7287 msgid "tool %s can't handle binary\n"
7314 msgid "tool %s can't handle binary\n"
7288 msgstr ""
7315 msgstr ""
7289
7316
7290 #, python-format
7317 #, python-format
7291 msgid "tool %s requires a GUI\n"
7318 msgid "tool %s requires a GUI\n"
7292 msgstr ""
7319 msgstr ""
7293
7320
7294 #, python-format
7321 #, python-format
7295 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7322 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7296 msgstr ""
7323 msgstr ""
7297
7324
7298 #, python-format
7325 #, python-format
7299 msgid ""
7326 msgid ""
7300 " no tool found to merge %s\n"
7327 " no tool found to merge %s\n"
7301 "keep (l)ocal or take (o)ther?"
7328 "keep (l)ocal or take (o)ther?"
7302 msgstr ""
7329 msgstr ""
7303
7330
7304 msgid "&Local"
7331 msgid "&Local"
7305 msgstr ""
7332 msgstr ""
7306
7333
7307 msgid "&Other"
7334 msgid "&Other"
7308 msgstr ""
7335 msgstr ""
7309
7336
7310 msgid "l"
7337 msgid "l"
7311 msgstr ""
7338 msgstr ""
7312
7339
7313 #, python-format
7340 #, python-format
7314 msgid "merging %s and %s to %s\n"
7341 msgid "merging %s and %s to %s\n"
7315 msgstr ""
7342 msgstr ""
7316
7343
7317 #, python-format
7344 #, python-format
7318 msgid "merging %s\n"
7345 msgid "merging %s\n"
7319 msgstr ""
7346 msgstr ""
7320
7347
7321 #, python-format
7348 #, python-format
7322 msgid "my %s other %s ancestor %s\n"
7349 msgid "my %s other %s ancestor %s\n"
7323 msgstr ""
7350 msgstr ""
7324
7351
7325 msgid " premerge successful\n"
7352 msgid " premerge successful\n"
7326 msgstr ""
7353 msgstr ""
7327
7354
7328 #, python-format
7355 #, python-format
7329 msgid ""
7356 msgid ""
7330 " output file %s appears unchanged\n"
7357 " output file %s appears unchanged\n"
7331 "was merge successful (yn)?"
7358 "was merge successful (yn)?"
7332 msgstr ""
7359 msgstr ""
7333
7360
7334 msgid "&No"
7361 msgid "&No"
7335 msgstr ""
7362 msgstr ""
7336
7363
7337 msgid "&Yes"
7364 msgid "&Yes"
7338 msgstr ""
7365 msgstr ""
7339
7366
7340 msgid "n"
7367 msgid "n"
7341 msgstr ""
7368 msgstr ""
7342
7369
7343 #, python-format
7370 #, python-format
7344 msgid "merging %s failed!\n"
7371 msgid "merging %s failed!\n"
7345 msgstr ""
7372 msgstr ""
7346
7373
7347 #, python-format
7374 #, python-format
7348 msgid "Inconsistent state, %s:%s is good and bad"
7375 msgid "Inconsistent state, %s:%s is good and bad"
7349 msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\""
7376 msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\""
7350
7377
7351 #, python-format
7378 #, python-format
7352 msgid "unknown bisect kind %s"
7379 msgid "unknown bisect kind %s"
7353 msgstr "type inconnu pour dichotomie : %s"
7380 msgstr "type inconnu pour dichotomie : %s"
7354
7381
7355 msgid ""
7382 msgid ""
7356 "\n"
7383 "\n"
7357 " Mercurial has the ability to add new features through the use of\n"
7384 " Mercurial has the ability to add new features through the use of\n"
7358 " extensions. Extensions may add new commands, add options to\n"
7385 " extensions. Extensions may add new commands, add options to\n"
7359 " existing commands, change the default behavior of commands, or\n"
7386 " existing commands, change the default behavior of commands, or\n"
7360 " implement hooks.\n"
7387 " implement hooks.\n"
7361 "\n"
7388 "\n"
7362 " Extensions are not loaded by default for a variety of reasons:\n"
7389 " Extensions are not loaded by default for a variety of reasons:\n"
7363 " they can increase startup overhead; they may be meant for\n"
7390 " they can increase startup overhead; they may be meant for\n"
7364 " advanced usage only; they may provide potentially dangerous\n"
7391 " advanced usage only; they may provide potentially dangerous\n"
7365 " abilities (such as letting you destroy or modify history); they\n"
7392 " abilities (such as letting you destroy or modify history); they\n"
7366 " might not be ready for prime time; or they may alter some\n"
7393 " might not be ready for prime time; or they may alter some\n"
7367 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7394 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7368 " activate extensions as needed.\n"
7395 " activate extensions as needed.\n"
7369 "\n"
7396 "\n"
7370 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7397 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7371 " or in the Python search path, create an entry for it in your\n"
7398 " or in the Python search path, create an entry for it in your\n"
7372 " hgrc, like this:\n"
7399 " hgrc, like this:\n"
7373 "\n"
7400 "\n"
7374 " [extensions]\n"
7401 " [extensions]\n"
7375 " foo =\n"
7402 " foo =\n"
7376 "\n"
7403 "\n"
7377 " You may also specify the full path to an extension:\n"
7404 " You may also specify the full path to an extension:\n"
7378 "\n"
7405 "\n"
7379 " [extensions]\n"
7406 " [extensions]\n"
7380 " myfeature = ~/.hgext/myfeature.py\n"
7407 " myfeature = ~/.hgext/myfeature.py\n"
7381 "\n"
7408 "\n"
7382 " To explicitly disable an extension enabled in an hgrc of broader\n"
7409 " To explicitly disable an extension enabled in an hgrc of broader\n"
7383 " scope, prepend its path with !:\n"
7410 " scope, prepend its path with !:\n"
7384 "\n"
7411 "\n"
7385 " [extensions]\n"
7412 " [extensions]\n"
7386 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7413 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7387 " hgext.bar = !/path/to/extension/bar.py\n"
7414 " hgext.bar = !/path/to/extension/bar.py\n"
7388 " # ditto, but no path was supplied for extension baz\n"
7415 " # ditto, but no path was supplied for extension baz\n"
7389 " hgext.baz = !\n"
7416 " hgext.baz = !\n"
7390 " "
7417 " "
7391 msgstr ""
7418 msgstr ""
7392 "\n"
7419 "\n"
7393 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7420 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7394 " fonctionnalités par le biais d'extensions. Les extensions\n"
7421 " fonctionnalités par le biais d'extensions. Les extensions\n"
7395 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7422 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7396 " comportement de commandes existantes ou leur ajouter des\n"
7423 " comportement de commandes existantes ou leur ajouter des\n"
7397 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7424 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7398 "\n"
7425 "\n"
7399 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7426 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7400 " pour diverses raisons : elles peuvent accroître la latence\n"
7427 " pour diverses raisons : elles peuvent accroître la latence\n"
7401 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7428 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7402 " une utilisation avancée ; elle peuvent fournir des\n"
7429 " une utilisation avancée ; elle peuvent fournir des\n"
7403 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7430 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7404 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7431 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7405 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7432 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7406 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7433 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7407 " comportements habituels de Mercurial.\n"
7434 " comportements habituels de Mercurial.\n"
7408 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7435 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7409 " de ses besoins.\n"
7436 " de ses besoins.\n"
7410 "\n"
7437 "\n"
7411 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7438 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7412 " présente dans le chemin de recherche de Python, déclarez-la\n"
7439 " présente dans le chemin de recherche de Python, déclarez-la\n"
7413 " dans votre fichier de configuration hgrc comme suit :\n"
7440 " dans votre fichier de configuration hgrc comme suit :\n"
7414 "\n"
7441 "\n"
7415 " [extensions]\n"
7442 " [extensions]\n"
7416 " truc =\n"
7443 " truc =\n"
7417 "\n"
7444 "\n"
7418 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7445 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7419 "\n"
7446 "\n"
7420 " [extensions]\n"
7447 " [extensions]\n"
7421 " monbidule = ~/.hgext/monbidule.py\n"
7448 " monbidule = ~/.hgext/monbidule.py\n"
7422 "\n"
7449 "\n"
7423 " Pour forcer la désactivation d'une extension activée par un\n"
7450 " Pour forcer la désactivation d'une extension activée par un\n"
7424 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7451 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7425 "\n"
7452 "\n"
7426 " [extensions]\n"
7453 " [extensions]\n"
7427 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7454 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7428 " hgext.bar = !/vers/machin.py\n"
7455 " hgext.bar = !/vers/machin.py\n"
7429 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7456 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7430 " hgext.chose = !\n"
7457 " hgext.chose = !\n"
7431 " "
7458 " "
7432
7459
7433 msgid "disabled extensions:"
7460 msgid "disabled extensions:"
7434 msgstr "extensions désactivées :"
7461 msgstr "extensions désactivées :"
7435
7462
7436 msgid "Date Formats"
7463 msgid "Date Formats"
7437 msgstr ""
7464 msgstr ""
7438
7465
7439 msgid ""
7466 msgid ""
7440 "\n"
7467 "\n"
7441 " Some commands allow the user to specify a date, e.g.:\n"
7468 " Some commands allow the user to specify a date, e.g.:\n"
7442 " * backout, commit, import, tag: Specify the commit date.\n"
7469 " * backout, commit, import, tag: Specify the commit date.\n"
7443 " * log, revert, update: Select revision(s) by date.\n"
7470 " * log, revert, update: Select revision(s) by date.\n"
7444 "\n"
7471 "\n"
7445 " Many date formats are valid. Here are some examples:\n"
7472 " Many date formats are valid. Here are some examples:\n"
7446 "\n"
7473 "\n"
7447 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7474 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7448 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7475 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7449 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7476 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7450 " \"Dec 6\" (midnight)\n"
7477 " \"Dec 6\" (midnight)\n"
7451 " \"13:18\" (today assumed)\n"
7478 " \"13:18\" (today assumed)\n"
7452 " \"3:39\" (3:39AM assumed)\n"
7479 " \"3:39\" (3:39AM assumed)\n"
7453 " \"3:39pm\" (15:39)\n"
7480 " \"3:39pm\" (15:39)\n"
7454 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7481 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7455 " \"2006-12-6 13:18\"\n"
7482 " \"2006-12-6 13:18\"\n"
7456 " \"2006-12-6\"\n"
7483 " \"2006-12-6\"\n"
7457 " \"12-6\"\n"
7484 " \"12-6\"\n"
7458 " \"12/6\"\n"
7485 " \"12/6\"\n"
7459 " \"12/6/6\" (Dec 6 2006)\n"
7486 " \"12/6/6\" (Dec 6 2006)\n"
7460 "\n"
7487 "\n"
7461 " Lastly, there is Mercurial's internal format:\n"
7488 " Lastly, there is Mercurial's internal format:\n"
7462 "\n"
7489 "\n"
7463 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7490 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7464 "\n"
7491 "\n"
7465 " This is the internal representation format for dates. unixtime is\n"
7492 " This is the internal representation format for dates. unixtime is\n"
7466 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7493 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7467 " offset is the offset of the local timezone, in seconds west of UTC\n"
7494 " offset is the offset of the local timezone, in seconds west of UTC\n"
7468 " (negative if the timezone is east of UTC).\n"
7495 " (negative if the timezone is east of UTC).\n"
7469 "\n"
7496 "\n"
7470 " The log command also accepts date ranges:\n"
7497 " The log command also accepts date ranges:\n"
7471 "\n"
7498 "\n"
7472 " \"<{datetime}\" - at or before a given date/time\n"
7499 " \"<{datetime}\" - at or before a given date/time\n"
7473 " \">{datetime}\" - on or after a given date/time\n"
7500 " \">{datetime}\" - on or after a given date/time\n"
7474 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7501 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7475 " \"-{days}\" - within a given number of days of today\n"
7502 " \"-{days}\" - within a given number of days of today\n"
7476 " "
7503 " "
7477 msgstr ""
7504 msgstr ""
7478
7505
7479 msgid "File Name Patterns"
7506 msgid "File Name Patterns"
7480 msgstr ""
7507 msgstr ""
7481
7508
7482 msgid ""
7509 msgid ""
7483 "\n"
7510 "\n"
7484 " Mercurial accepts several notations for identifying one or more\n"
7511 " Mercurial accepts several notations for identifying one or more\n"
7485 " files at a time.\n"
7512 " files at a time.\n"
7486 "\n"
7513 "\n"
7487 " By default, Mercurial treats filenames as shell-style extended\n"
7514 " By default, Mercurial treats filenames as shell-style extended\n"
7488 " glob patterns.\n"
7515 " glob patterns.\n"
7489 "\n"
7516 "\n"
7490 " Alternate pattern notations must be specified explicitly.\n"
7517 " Alternate pattern notations must be specified explicitly.\n"
7491 "\n"
7518 "\n"
7492 " To use a plain path name without any pattern matching, start it\n"
7519 " To use a plain path name without any pattern matching, start it\n"
7493 " with \"path:\". These path names must completely match starting at\n"
7520 " with \"path:\". These path names must completely match starting at\n"
7494 " the current repository root.\n"
7521 " the current repository root.\n"
7495 "\n"
7522 "\n"
7496 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7523 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7497 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7524 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7498 " match files in the current directory ending with \".c\".\n"
7525 " match files in the current directory ending with \".c\".\n"
7499 "\n"
7526 "\n"
7500 " The supported glob syntax extensions are \"**\" to match any string\n"
7527 " The supported glob syntax extensions are \"**\" to match any string\n"
7501 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7528 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7502 "\n"
7529 "\n"
7503 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7530 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7504 " Regexp pattern matching is anchored at the root of the repository.\n"
7531 " Regexp pattern matching is anchored at the root of the repository.\n"
7505 "\n"
7532 "\n"
7506 " Plain examples:\n"
7533 " Plain examples:\n"
7507 "\n"
7534 "\n"
7508 " path:foo/bar a name bar in a directory named foo in the root of\n"
7535 " path:foo/bar a name bar in a directory named foo in the root of\n"
7509 " the repository\n"
7536 " the repository\n"
7510 " path:path:name a file or directory named \"path:name\"\n"
7537 " path:path:name a file or directory named \"path:name\"\n"
7511 "\n"
7538 "\n"
7512 " Glob examples:\n"
7539 " Glob examples:\n"
7513 "\n"
7540 "\n"
7514 " glob:*.c any name ending in \".c\" in the current directory\n"
7541 " glob:*.c any name ending in \".c\" in the current directory\n"
7515 " *.c any name ending in \".c\" in the current directory\n"
7542 " *.c any name ending in \".c\" in the current directory\n"
7516 " **.c any name ending in \".c\" in any subdirectory of the\n"
7543 " **.c any name ending in \".c\" in any subdirectory of the\n"
7517 " current directory including itself.\n"
7544 " current directory including itself.\n"
7518 " foo/*.c any name ending in \".c\" in the directory foo\n"
7545 " foo/*.c any name ending in \".c\" in the directory foo\n"
7519 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7546 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7520 " including itself.\n"
7547 " including itself.\n"
7521 "\n"
7548 "\n"
7522 " Regexp examples:\n"
7549 " Regexp examples:\n"
7523 "\n"
7550 "\n"
7524 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7551 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7525 "\n"
7552 "\n"
7526 " "
7553 " "
7527 msgstr ""
7554 msgstr ""
7528
7555
7529 msgid "Environment Variables"
7556 msgid "Environment Variables"
7530 msgstr ""
7557 msgstr ""
7531
7558
7532 msgid ""
7559 msgid ""
7533 "\n"
7560 "\n"
7534 "HG::\n"
7561 "HG::\n"
7535 " Path to the 'hg' executable, automatically passed when running\n"
7562 " Path to the 'hg' executable, automatically passed when running\n"
7536 " hooks, extensions or external tools. If unset or empty, this is\n"
7563 " hooks, extensions or external tools. If unset or empty, this is\n"
7537 " the hg executable's name if it's frozen, or an executable named\n"
7564 " the hg executable's name if it's frozen, or an executable named\n"
7538 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7565 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7539 " Windows) is searched.\n"
7566 " Windows) is searched.\n"
7540 "\n"
7567 "\n"
7541 "HGEDITOR::\n"
7568 "HGEDITOR::\n"
7542 " This is the name of the editor to run when committing. See EDITOR.\n"
7569 " This is the name of the editor to run when committing. See EDITOR.\n"
7543 "\n"
7570 "\n"
7544 " (deprecated, use .hgrc)\n"
7571 " (deprecated, use .hgrc)\n"
7545 "\n"
7572 "\n"
7546 "HGENCODING::\n"
7573 "HGENCODING::\n"
7547 " This overrides the default locale setting detected by Mercurial.\n"
7574 " This overrides the default locale setting detected by Mercurial.\n"
7548 " This setting is used to convert data including usernames,\n"
7575 " This setting is used to convert data including usernames,\n"
7549 " changeset descriptions, tag names, and branches. This setting can\n"
7576 " changeset descriptions, tag names, and branches. This setting can\n"
7550 " be overridden with the --encoding command-line option.\n"
7577 " be overridden with the --encoding command-line option.\n"
7551 "\n"
7578 "\n"
7552 "HGENCODINGMODE::\n"
7579 "HGENCODINGMODE::\n"
7553 " This sets Mercurial's behavior for handling unknown characters\n"
7580 " This sets Mercurial's behavior for handling unknown characters\n"
7554 " while transcoding user input. The default is \"strict\", which\n"
7581 " while transcoding user input. The default is \"strict\", which\n"
7555 " causes Mercurial to abort if it can't map a character. Other\n"
7582 " causes Mercurial to abort if it can't map a character. Other\n"
7556 " settings include \"replace\", which replaces unknown characters, and\n"
7583 " settings include \"replace\", which replaces unknown characters, and\n"
7557 " \"ignore\", which drops them. This setting can be overridden with\n"
7584 " \"ignore\", which drops them. This setting can be overridden with\n"
7558 " the --encodingmode command-line option.\n"
7585 " the --encodingmode command-line option.\n"
7559 "\n"
7586 "\n"
7560 "HGMERGE::\n"
7587 "HGMERGE::\n"
7561 " An executable to use for resolving merge conflicts. The program\n"
7588 " An executable to use for resolving merge conflicts. The program\n"
7562 " will be executed with three arguments: local file, remote file,\n"
7589 " will be executed with three arguments: local file, remote file,\n"
7563 " ancestor file.\n"
7590 " ancestor file.\n"
7564 "\n"
7591 "\n"
7565 " (deprecated, use .hgrc)\n"
7592 " (deprecated, use .hgrc)\n"
7566 "\n"
7593 "\n"
7567 "HGRCPATH::\n"
7594 "HGRCPATH::\n"
7568 " A list of files or directories to search for hgrc files. Item\n"
7595 " A list of files or directories to search for hgrc files. Item\n"
7569 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7596 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7570 " platform default search path is used. If empty, only the .hg/hgrc\n"
7597 " platform default search path is used. If empty, only the .hg/hgrc\n"
7571 " from the current repository is read.\n"
7598 " from the current repository is read.\n"
7572 "\n"
7599 "\n"
7573 " For each element in HGRCPATH:\n"
7600 " For each element in HGRCPATH:\n"
7574 " * if it's a directory, all files ending with .rc are added\n"
7601 " * if it's a directory, all files ending with .rc are added\n"
7575 " * otherwise, the file itself will be added\n"
7602 " * otherwise, the file itself will be added\n"
7576 "\n"
7603 "\n"
7577 "HGUSER::\n"
7604 "HGUSER::\n"
7578 " This is the string used as the author of a commit. If not set,\n"
7605 " This is the string used as the author of a commit. If not set,\n"
7579 " available values will be considered in this order:\n"
7606 " available values will be considered in this order:\n"
7580 "\n"
7607 "\n"
7581 " * HGUSER (deprecated)\n"
7608 " * HGUSER (deprecated)\n"
7582 " * hgrc files from the HGRCPATH\n"
7609 " * hgrc files from the HGRCPATH\n"
7583 " * EMAIL\n"
7610 " * EMAIL\n"
7584 " * interactive prompt\n"
7611 " * interactive prompt\n"
7585 " * LOGNAME (with '@hostname' appended)\n"
7612 " * LOGNAME (with '@hostname' appended)\n"
7586 "\n"
7613 "\n"
7587 " (deprecated, use .hgrc)\n"
7614 " (deprecated, use .hgrc)\n"
7588 "\n"
7615 "\n"
7589 "EMAIL::\n"
7616 "EMAIL::\n"
7590 " May be used as the author of a commit; see HGUSER.\n"
7617 " May be used as the author of a commit; see HGUSER.\n"
7591 "\n"
7618 "\n"
7592 "LOGNAME::\n"
7619 "LOGNAME::\n"
7593 " May be used as the author of a commit; see HGUSER.\n"
7620 " May be used as the author of a commit; see HGUSER.\n"
7594 "\n"
7621 "\n"
7595 "VISUAL::\n"
7622 "VISUAL::\n"
7596 " This is the name of the editor to use when committing. See EDITOR.\n"
7623 " This is the name of the editor to use when committing. See EDITOR.\n"
7597 "\n"
7624 "\n"
7598 "EDITOR::\n"
7625 "EDITOR::\n"
7599 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7626 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7600 " user to modify, for example when writing commit messages. The\n"
7627 " user to modify, for example when writing commit messages. The\n"
7601 " editor it uses is determined by looking at the environment\n"
7628 " editor it uses is determined by looking at the environment\n"
7602 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7629 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7603 " non-empty one is chosen. If all of them are empty, the editor\n"
7630 " non-empty one is chosen. If all of them are empty, the editor\n"
7604 " defaults to 'vi'.\n"
7631 " defaults to 'vi'.\n"
7605 "\n"
7632 "\n"
7606 "PYTHONPATH::\n"
7633 "PYTHONPATH::\n"
7607 " This is used by Python to find imported modules and may need to be\n"
7634 " This is used by Python to find imported modules and may need to be\n"
7608 " set appropriately if this Mercurial is not installed system-wide.\n"
7635 " set appropriately if this Mercurial is not installed system-wide.\n"
7609 " "
7636 " "
7610 msgstr ""
7637 msgstr ""
7611
7638
7612 msgid "Specifying Single Revisions"
7639 msgid "Specifying Single Revisions"
7613 msgstr ""
7640 msgstr ""
7614
7641
7615 msgid ""
7642 msgid ""
7616 "\n"
7643 "\n"
7617 " Mercurial supports several ways to specify individual revisions.\n"
7644 " Mercurial supports several ways to specify individual revisions.\n"
7618 "\n"
7645 "\n"
7619 " A plain integer is treated as a revision number. Negative integers\n"
7646 " A plain integer is treated as a revision number. Negative integers\n"
7620 " are treated as topological offsets from the tip, with -1 denoting\n"
7647 " are treated as topological offsets from the tip, with -1 denoting\n"
7621 " the tip. As such, negative numbers are only useful if you've\n"
7648 " the tip. As such, negative numbers are only useful if you've\n"
7622 " memorized your local tree numbers and want to save typing a single\n"
7649 " memorized your local tree numbers and want to save typing a single\n"
7623 " digit. This editor suggests copy and paste.\n"
7650 " digit. This editor suggests copy and paste.\n"
7624 "\n"
7651 "\n"
7625 " A 40-digit hexadecimal string is treated as a unique revision\n"
7652 " A 40-digit hexadecimal string is treated as a unique revision\n"
7626 " identifier.\n"
7653 " identifier.\n"
7627 "\n"
7654 "\n"
7628 " A hexadecimal string less than 40 characters long is treated as a\n"
7655 " A hexadecimal string less than 40 characters long is treated as a\n"
7629 " unique revision identifier, and referred to as a short-form\n"
7656 " unique revision identifier, and referred to as a short-form\n"
7630 " identifier. A short-form identifier is only valid if it is the\n"
7657 " identifier. A short-form identifier is only valid if it is the\n"
7631 " prefix of exactly one full-length identifier.\n"
7658 " prefix of exactly one full-length identifier.\n"
7632 "\n"
7659 "\n"
7633 " Any other string is treated as a tag name, which is a symbolic\n"
7660 " Any other string is treated as a tag name, which is a symbolic\n"
7634 " name associated with a revision identifier. Tag names may not\n"
7661 " name associated with a revision identifier. Tag names may not\n"
7635 " contain the \":\" character.\n"
7662 " contain the \":\" character.\n"
7636 "\n"
7663 "\n"
7637 " The reserved name \"tip\" is a special tag that always identifies\n"
7664 " The reserved name \"tip\" is a special tag that always identifies\n"
7638 " the most recent revision.\n"
7665 " the most recent revision.\n"
7639 "\n"
7666 "\n"
7640 " The reserved name \"null\" indicates the null revision. This is the\n"
7667 " The reserved name \"null\" indicates the null revision. This is the\n"
7641 " revision of an empty repository, and the parent of revision 0.\n"
7668 " revision of an empty repository, and the parent of revision 0.\n"
7642 "\n"
7669 "\n"
7643 " The reserved name \".\" indicates the working directory parent. If\n"
7670 " The reserved name \".\" indicates the working directory parent. If\n"
7644 " no working directory is checked out, it is equivalent to null. If\n"
7671 " no working directory is checked out, it is equivalent to null. If\n"
7645 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7672 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7646 " first parent.\n"
7673 " first parent.\n"
7647 " "
7674 " "
7648 msgstr ""
7675 msgstr ""
7649
7676
7650 msgid "Specifying Multiple Revisions"
7677 msgid "Specifying Multiple Revisions"
7651 msgstr ""
7678 msgstr ""
7652
7679
7653 msgid ""
7680 msgid ""
7654 "\n"
7681 "\n"
7655 " When Mercurial accepts more than one revision, they may be\n"
7682 " When Mercurial accepts more than one revision, they may be\n"
7656 " specified individually, or provided as a topologically continuous\n"
7683 " specified individually, or provided as a topologically continuous\n"
7657 " range, separated by the \":\" character.\n"
7684 " range, separated by the \":\" character.\n"
7658 "\n"
7685 "\n"
7659 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7686 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7660 " are revision identifiers. Both BEGIN and END are optional. If\n"
7687 " are revision identifiers. Both BEGIN and END are optional. If\n"
7661 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7688 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7662 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7689 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7663 " \"all revisions\".\n"
7690 " \"all revisions\".\n"
7664 "\n"
7691 "\n"
7665 " If BEGIN is greater than END, revisions are treated in reverse\n"
7692 " If BEGIN is greater than END, revisions are treated in reverse\n"
7666 " order.\n"
7693 " order.\n"
7667 "\n"
7694 "\n"
7668 " A range acts as a closed interval. This means that a range of 3:5\n"
7695 " A range acts as a closed interval. This means that a range of 3:5\n"
7669 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7696 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7670 " "
7697 " "
7671 msgstr ""
7698 msgstr ""
7672
7699
7673 msgid "Diff Formats"
7700 msgid "Diff Formats"
7674 msgstr ""
7701 msgstr ""
7675
7702
7676 msgid ""
7703 msgid ""
7677 "\n"
7704 "\n"
7678 " Mercurial's default format for showing changes between two\n"
7705 " Mercurial's default format for showing changes between two\n"
7679 " versions of a file is compatible with the unified format of GNU\n"
7706 " versions of a file is compatible with the unified format of GNU\n"
7680 " diff, which can be used by GNU patch and many other standard\n"
7707 " diff, which can be used by GNU patch and many other standard\n"
7681 " tools.\n"
7708 " tools.\n"
7682 "\n"
7709 "\n"
7683 " While this standard format is often enough, it does not encode the\n"
7710 " While this standard format is often enough, it does not encode the\n"
7684 " following information:\n"
7711 " following information:\n"
7685 "\n"
7712 "\n"
7686 " - executable status and other permission bits\n"
7713 " - executable status and other permission bits\n"
7687 " - copy or rename information\n"
7714 " - copy or rename information\n"
7688 " - changes in binary files\n"
7715 " - changes in binary files\n"
7689 " - creation or deletion of empty files\n"
7716 " - creation or deletion of empty files\n"
7690 "\n"
7717 "\n"
7691 " Mercurial also supports the extended diff format from the git VCS\n"
7718 " Mercurial also supports the extended diff format from the git VCS\n"
7692 " which addresses these limitations. The git diff format is not\n"
7719 " which addresses these limitations. The git diff format is not\n"
7693 " produced by default because a few widespread tools still do not\n"
7720 " produced by default because a few widespread tools still do not\n"
7694 " understand this format.\n"
7721 " understand this format.\n"
7695 "\n"
7722 "\n"
7696 " This means that when generating diffs from a Mercurial repository\n"
7723 " This means that when generating diffs from a Mercurial repository\n"
7697 " (e.g. with \"hg export\"), you should be careful about things like\n"
7724 " (e.g. with \"hg export\"), you should be careful about things like\n"
7698 " file copies and renames or other things mentioned above, because\n"
7725 " file copies and renames or other things mentioned above, because\n"
7699 " when applying a standard diff to a different repository, this\n"
7726 " when applying a standard diff to a different repository, this\n"
7700 " extra information is lost. Mercurial's internal operations (like\n"
7727 " extra information is lost. Mercurial's internal operations (like\n"
7701 " push and pull) are not affected by this, because they use an\n"
7728 " push and pull) are not affected by this, because they use an\n"
7702 " internal binary format for communicating changes.\n"
7729 " internal binary format for communicating changes.\n"
7703 "\n"
7730 "\n"
7704 " To make Mercurial produce the git extended diff format, use the\n"
7731 " To make Mercurial produce the git extended diff format, use the\n"
7705 " --git option available for many commands, or set 'git = True' in\n"
7732 " --git option available for many commands, or set 'git = True' in\n"
7706 " the [diff] section of your hgrc. You do not need to set this\n"
7733 " the [diff] section of your hgrc. You do not need to set this\n"
7707 " option when importing diffs in this format or using them in the mq\n"
7734 " option when importing diffs in this format or using them in the mq\n"
7708 " extension.\n"
7735 " extension.\n"
7709 " "
7736 " "
7710 msgstr ""
7737 msgstr ""
7711
7738
7712 msgid "Template Usage"
7739 msgid "Template Usage"
7713 msgstr ""
7740 msgstr ""
7714
7741
7715 msgid ""
7742 msgid ""
7716 "\n"
7743 "\n"
7717 " Mercurial allows you to customize output of commands through\n"
7744 " Mercurial allows you to customize output of commands through\n"
7718 " templates. You can either pass in a template from the command\n"
7745 " templates. You can either pass in a template from the command\n"
7719 " line, via the --template option, or select an existing\n"
7746 " line, via the --template option, or select an existing\n"
7720 " template-style (--style).\n"
7747 " template-style (--style).\n"
7721 "\n"
7748 "\n"
7722 " You can customize output for any \"log-like\" command: log,\n"
7749 " You can customize output for any \"log-like\" command: log,\n"
7723 " outgoing, incoming, tip, parents, heads and glog.\n"
7750 " outgoing, incoming, tip, parents, heads and glog.\n"
7724 "\n"
7751 "\n"
7725 " Three styles are packaged with Mercurial: default (the style used\n"
7752 " Three styles are packaged with Mercurial: default (the style used\n"
7726 " when no explicit preference is passed), compact and changelog.\n"
7753 " when no explicit preference is passed), compact and changelog.\n"
7727 " Usage:\n"
7754 " Usage:\n"
7728 "\n"
7755 "\n"
7729 " $ hg log -r1 --style changelog\n"
7756 " $ hg log -r1 --style changelog\n"
7730 "\n"
7757 "\n"
7731 " A template is a piece of text, with markup to invoke variable\n"
7758 " A template is a piece of text, with markup to invoke variable\n"
7732 " expansion:\n"
7759 " expansion:\n"
7733 "\n"
7760 "\n"
7734 " $ hg log -r1 --template \"{node}\\n\"\n"
7761 " $ hg log -r1 --template \"{node}\\n\"\n"
7735 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7762 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7736 "\n"
7763 "\n"
7737 " Strings in curly braces are called keywords. The availability of\n"
7764 " Strings in curly braces are called keywords. The availability of\n"
7738 " keywords depends on the exact context of the templater. These\n"
7765 " keywords depends on the exact context of the templater. These\n"
7739 " keywords are usually available for templating a log-like command:\n"
7766 " keywords are usually available for templating a log-like command:\n"
7740 "\n"
7767 "\n"
7741 " - author: String. The unmodified author of the changeset.\n"
7768 " - author: String. The unmodified author of the changeset.\n"
7742 " - branches: String. The name of the branch on which the changeset\n"
7769 " - branches: String. The name of the branch on which the changeset\n"
7743 " was committed. Will be empty if the branch name was default.\n"
7770 " was committed. Will be empty if the branch name was default.\n"
7744 " - date: Date information. The date when the changeset was committed.\n"
7771 " - date: Date information. The date when the changeset was committed.\n"
7745 " - desc: String. The text of the changeset description.\n"
7772 " - desc: String. The text of the changeset description.\n"
7746 " - diffstat: String. Statistics of changes with the following\n"
7773 " - diffstat: String. Statistics of changes with the following\n"
7747 " format: \"modified files: +added/-removed lines\"\n"
7774 " format: \"modified files: +added/-removed lines\"\n"
7748 " - files: List of strings. All files modified, added, or removed by\n"
7775 " - files: List of strings. All files modified, added, or removed by\n"
7749 " this changeset.\n"
7776 " this changeset.\n"
7750 " - file_adds: List of strings. Files added by this changeset.\n"
7777 " - file_adds: List of strings. Files added by this changeset.\n"
7751 " - file_mods: List of strings. Files modified by this changeset.\n"
7778 " - file_mods: List of strings. Files modified by this changeset.\n"
7752 " - file_dels: List of strings. Files removed by this changeset.\n"
7779 " - file_dels: List of strings. Files removed by this changeset.\n"
7753 " - node: String. The changeset identification hash, as a\n"
7780 " - node: String. The changeset identification hash, as a\n"
7754 " 40-character hexadecimal string.\n"
7781 " 40-character hexadecimal string.\n"
7755 " - parents: List of strings. The parents of the changeset.\n"
7782 " - parents: List of strings. The parents of the changeset.\n"
7756 " - rev: Integer. The repository-local changeset revision number.\n"
7783 " - rev: Integer. The repository-local changeset revision number.\n"
7757 " - tags: List of strings. Any tags associated with the changeset.\n"
7784 " - tags: List of strings. Any tags associated with the changeset.\n"
7758 "\n"
7785 "\n"
7759 " The \"date\" keyword does not produce human-readable output. If you\n"
7786 " The \"date\" keyword does not produce human-readable output. If you\n"
7760 " want to use a date in your output, you can use a filter to process\n"
7787 " want to use a date in your output, you can use a filter to process\n"
7761 " it. Filters are functions which return a string based on the input\n"
7788 " it. Filters are functions which return a string based on the input\n"
7762 " variable. You can also use a chain of filters to get the desired\n"
7789 " variable. You can also use a chain of filters to get the desired\n"
7763 " output:\n"
7790 " output:\n"
7764 "\n"
7791 "\n"
7765 " $ hg tip --template \"{date|isodate}\\n\"\n"
7792 " $ hg tip --template \"{date|isodate}\\n\"\n"
7766 " 2008-08-21 18:22 +0000\n"
7793 " 2008-08-21 18:22 +0000\n"
7767 "\n"
7794 "\n"
7768 " List of filters:\n"
7795 " List of filters:\n"
7769 "\n"
7796 "\n"
7770 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7797 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7771 " every line except the last.\n"
7798 " every line except the last.\n"
7772 " - age: Date. Returns a human-readable date/time difference between\n"
7799 " - age: Date. Returns a human-readable date/time difference between\n"
7773 " the given date/time and the current date/time.\n"
7800 " the given date/time and the current date/time.\n"
7774 " - basename: Any text. Treats the text as a path, and returns the\n"
7801 " - basename: Any text. Treats the text as a path, and returns the\n"
7775 " last component of the path after splitting by the path\n"
7802 " last component of the path after splitting by the path\n"
7776 " separator (ignoring trailing separators). For example,\n"
7803 " separator (ignoring trailing separators). For example,\n"
7777 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7804 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7778 "\".\n"
7805 "\".\n"
7779 " - stripdir: Treat the text as path and strip a directory level, if\n"
7806 " - stripdir: Treat the text as path and strip a directory level, if\n"
7780 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7807 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7781 " - date: Date. Returns a date in a Unix date format, including\n"
7808 " - date: Date. Returns a date in a Unix date format, including\n"
7782 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7809 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7783 " - domain: Any text. Finds the first string that looks like an\n"
7810 " - domain: Any text. Finds the first string that looks like an\n"
7784 " email address, and extracts just the domain component.\n"
7811 " email address, and extracts just the domain component.\n"
7785 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7812 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7786 " - email: Any text. Extracts the first string that looks like an\n"
7813 " - email: Any text. Extracts the first string that looks like an\n"
7787 " email address. Example: 'User <user@example.com>' becomes\n"
7814 " email address. Example: 'User <user@example.com>' becomes\n"
7788 " 'user@example.com'.\n"
7815 " 'user@example.com'.\n"
7789 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7816 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7790 " \"<\" and \">\" with XML entities.\n"
7817 " \"<\" and \">\" with XML entities.\n"
7791 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7818 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7792 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7819 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7793 " - firstline: Any text. Returns the first line of text.\n"
7820 " - firstline: Any text. Returns the first line of text.\n"
7794 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7821 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7795 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7822 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7796 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7823 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7797 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7824 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7798 " - localdate: Date. Converts a date to local date.\n"
7825 " - localdate: Date. Converts a date to local date.\n"
7799 " - obfuscate: Any text. Returns the input text rendered as a\n"
7826 " - obfuscate: Any text. Returns the input text rendered as a\n"
7800 " sequence of XML entities.\n"
7827 " sequence of XML entities.\n"
7801 " - person: Any text. Returns the text before an email address.\n"
7828 " - person: Any text. Returns the text before an email address.\n"
7802 " - rfc822date: Date. Returns a date using the same format used\n"
7829 " - rfc822date: Date. Returns a date using the same format used\n"
7803 " in email headers.\n"
7830 " in email headers.\n"
7804 " - short: Changeset hash. Returns the short form of a changeset\n"
7831 " - short: Changeset hash. Returns the short form of a changeset\n"
7805 " hash, i.e. a 12-byte hexadecimal string.\n"
7832 " hash, i.e. a 12-byte hexadecimal string.\n"
7806 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7833 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7807 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7834 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7808 " - tabindent: Any text. Returns the text, with every line except\n"
7835 " - tabindent: Any text. Returns the text, with every line except\n"
7809 " the first starting with a tab character.\n"
7836 " the first starting with a tab character.\n"
7810 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7837 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7811 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7838 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7812 " - user: Any text. Returns the user portion of an email address.\n"
7839 " - user: Any text. Returns the user portion of an email address.\n"
7813 " "
7840 " "
7814 msgstr ""
7841 msgstr ""
7815
7842
7816 msgid "URL Paths"
7843 msgid "URL Paths"
7817 msgstr ""
7844 msgstr ""
7818
7845
7819 msgid ""
7846 msgid ""
7820 "\n"
7847 "\n"
7821 " Valid URLs are of the form:\n"
7848 " Valid URLs are of the form:\n"
7822 "\n"
7849 "\n"
7823 " local/filesystem/path (or file://local/filesystem/path)\n"
7850 " local/filesystem/path (or file://local/filesystem/path)\n"
7824 " http://[user[:pass]@]host[:port]/[path]\n"
7851 " http://[user[:pass]@]host[:port]/[path]\n"
7825 " https://[user[:pass]@]host[:port]/[path]\n"
7852 " https://[user[:pass]@]host[:port]/[path]\n"
7826 " ssh://[user[:pass]@]host[:port]/[path]\n"
7853 " ssh://[user[:pass]@]host[:port]/[path]\n"
7827 "\n"
7854 "\n"
7828 " Paths in the local filesystem can either point to Mercurial\n"
7855 " Paths in the local filesystem can either point to Mercurial\n"
7829 " repositories or to bundle files (as created by 'hg bundle' or\n"
7856 " repositories or to bundle files (as created by 'hg bundle' or\n"
7830 " 'hg incoming --bundle').\n"
7857 " 'hg incoming --bundle').\n"
7831 "\n"
7858 "\n"
7832 " An optional identifier after # indicates a particular branch, tag,\n"
7859 " An optional identifier after # indicates a particular branch, tag,\n"
7833 " or changeset to use from the remote repository.\n"
7860 " or changeset to use from the remote repository.\n"
7834 "\n"
7861 "\n"
7835 " Some features, such as pushing to http:// and https:// URLs are\n"
7862 " Some features, such as pushing to http:// and https:// URLs are\n"
7836 " only possible if the feature is explicitly enabled on the remote\n"
7863 " only possible if the feature is explicitly enabled on the remote\n"
7837 " Mercurial server.\n"
7864 " Mercurial server.\n"
7838 "\n"
7865 "\n"
7839 " Some notes about using SSH with Mercurial:\n"
7866 " Some notes about using SSH with Mercurial:\n"
7840 " - SSH requires an accessible shell account on the destination\n"
7867 " - SSH requires an accessible shell account on the destination\n"
7841 " machine and a copy of hg in the remote path or specified with as\n"
7868 " machine and a copy of hg in the remote path or specified with as\n"
7842 " remotecmd.\n"
7869 " remotecmd.\n"
7843 " - path is relative to the remote user's home directory by default.\n"
7870 " - path is relative to the remote user's home directory by default.\n"
7844 " Use an extra slash at the start of a path to specify an absolute "
7871 " Use an extra slash at the start of a path to specify an absolute "
7845 "path:\n"
7872 "path:\n"
7846 " ssh://example.com//tmp/repository\n"
7873 " ssh://example.com//tmp/repository\n"
7847 " - Mercurial doesn't use its own compression via SSH; the right\n"
7874 " - Mercurial doesn't use its own compression via SSH; the right\n"
7848 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7875 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7849 " Host *.mylocalnetwork.example.com\n"
7876 " Host *.mylocalnetwork.example.com\n"
7850 " Compression no\n"
7877 " Compression no\n"
7851 " Host *\n"
7878 " Host *\n"
7852 " Compression yes\n"
7879 " Compression yes\n"
7853 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7880 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7854 " or with the --ssh command line option.\n"
7881 " or with the --ssh command line option.\n"
7855 "\n"
7882 "\n"
7856 " These URLs can all be stored in your hgrc with path aliases under\n"
7883 " These URLs can all be stored in your hgrc with path aliases under\n"
7857 " the [paths] section like so:\n"
7884 " the [paths] section like so:\n"
7858 " [paths]\n"
7885 " [paths]\n"
7859 " alias1 = URL1\n"
7886 " alias1 = URL1\n"
7860 " alias2 = URL2\n"
7887 " alias2 = URL2\n"
7861 " ...\n"
7888 " ...\n"
7862 "\n"
7889 "\n"
7863 " You can then use the alias for any command that uses a URL (for\n"
7890 " You can then use the alias for any command that uses a URL (for\n"
7864 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7891 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7865 "\n"
7892 "\n"
7866 " Two path aliases are special because they are used as defaults\n"
7893 " Two path aliases are special because they are used as defaults\n"
7867 " when you do not provide the URL to a command:\n"
7894 " when you do not provide the URL to a command:\n"
7868 "\n"
7895 "\n"
7869 " default:\n"
7896 " default:\n"
7870 " When you create a repository with hg clone, the clone command\n"
7897 " When you create a repository with hg clone, the clone command\n"
7871 " saves the location of the source repository as the new\n"
7898 " saves the location of the source repository as the new\n"
7872 " repository's 'default' path. This is then used when you omit\n"
7899 " repository's 'default' path. This is then used when you omit\n"
7873 " path from push- and pull-like commands (including incoming and\n"
7900 " path from push- and pull-like commands (including incoming and\n"
7874 " outgoing).\n"
7901 " outgoing).\n"
7875 "\n"
7902 "\n"
7876 " default-push:\n"
7903 " default-push:\n"
7877 " The push command will look for a path named 'default-push', and\n"
7904 " The push command will look for a path named 'default-push', and\n"
7878 " prefer it over 'default' if both are defined.\n"
7905 " prefer it over 'default' if both are defined.\n"
7879 " "
7906 " "
7880 msgstr ""
7907 msgstr ""
7881
7908
7882 msgid "Using additional features"
7909 msgid "Using additional features"
7883 msgstr ""
7910 msgstr ""
7884
7911
7885 msgid "can only share local repositories"
7912 msgid "can only share local repositories"
7886 msgstr ""
7913 msgstr ""
7887
7914
7888 msgid "destination already exists"
7915 msgid "destination already exists"
7889 msgstr ""
7916 msgstr ""
7890
7917
7891 msgid "updating working directory\n"
7918 msgid "updating working directory\n"
7892 msgstr ""
7919 msgstr ""
7893
7920
7894 #, python-format
7921 #, python-format
7895 msgid "destination directory: %s\n"
7922 msgid "destination directory: %s\n"
7896 msgstr ""
7923 msgstr ""
7897
7924
7898 #, python-format
7925 #, python-format
7899 msgid "destination '%s' already exists"
7926 msgid "destination '%s' already exists"
7900 msgstr ""
7927 msgstr ""
7901
7928
7902 #, python-format
7929 #, python-format
7903 msgid "destination '%s' is not empty"
7930 msgid "destination '%s' is not empty"
7904 msgstr ""
7931 msgstr ""
7905
7932
7906 msgid ""
7933 msgid ""
7907 "src repository does not support revision lookup and so doesn't support clone "
7934 "src repository does not support revision lookup and so doesn't support clone "
7908 "by revision"
7935 "by revision"
7909 msgstr ""
7936 msgstr ""
7910
7937
7911 msgid "clone from remote to remote not supported"
7938 msgid "clone from remote to remote not supported"
7912 msgstr ""
7939 msgstr ""
7913
7940
7914 msgid "updated"
7941 msgid "updated"
7915 msgstr ""
7942 msgstr ""
7916
7943
7917 msgid "merged"
7944 msgid "merged"
7918 msgstr ""
7945 msgstr ""
7919
7946
7920 msgid "removed"
7947 msgid "removed"
7921 msgstr ""
7948 msgstr ""
7922
7949
7923 msgid "unresolved"
7950 msgid "unresolved"
7924 msgstr ""
7951 msgstr ""
7925
7952
7926 #, python-format
7953 #, python-format
7927 msgid "%d files %s"
7954 msgid "%d files %s"
7928 msgstr ""
7955 msgstr ""
7929
7956
7930 msgid "use 'hg resolve' to retry unresolved file merges\n"
7957 msgid "use 'hg resolve' to retry unresolved file merges\n"
7931 msgstr ""
7958 msgstr ""
7932
7959
7933 msgid ""
7960 msgid ""
7934 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7961 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7935 "abandon\n"
7962 "abandon\n"
7936 msgstr ""
7963 msgstr ""
7937
7964
7938 msgid "(branch merge, don't forget to commit)\n"
7965 msgid "(branch merge, don't forget to commit)\n"
7939 msgstr ""
7966 msgstr ""
7940
7967
7941 #, python-format
7968 #, python-format
7942 msgid "error reading %s/.hg/hgrc: %s\n"
7969 msgid "error reading %s/.hg/hgrc: %s\n"
7943 msgstr ""
7970 msgstr ""
7944
7971
7945 msgid "SSL support is unavailable"
7972 msgid "SSL support is unavailable"
7946 msgstr ""
7973 msgstr ""
7947
7974
7948 msgid "IPv6 is not available on this system"
7975 msgid "IPv6 is not available on this system"
7949 msgstr ""
7976 msgstr ""
7950
7977
7951 #, python-format
7978 #, python-format
7952 msgid "cannot start server at '%s:%d': %s"
7979 msgid "cannot start server at '%s:%d': %s"
7953 msgstr ""
7980 msgstr ""
7954
7981
7955 #, python-format
7982 #, python-format
7956 msgid "calling hook %s: %s\n"
7983 msgid "calling hook %s: %s\n"
7957 msgstr ""
7984 msgstr ""
7958
7985
7959 #, python-format
7986 #, python-format
7960 msgid "%s hook is invalid (\"%s\" not in a module)"
7987 msgid "%s hook is invalid (\"%s\" not in a module)"
7961 msgstr ""
7988 msgstr ""
7962
7989
7963 #, python-format
7990 #, python-format
7964 msgid "%s hook is invalid (import of \"%s\" failed)"
7991 msgid "%s hook is invalid (import of \"%s\" failed)"
7965 msgstr ""
7992 msgstr ""
7966
7993
7967 #, python-format
7994 #, python-format
7968 msgid "%s hook is invalid (\"%s\" is not defined)"
7995 msgid "%s hook is invalid (\"%s\" is not defined)"
7969 msgstr ""
7996 msgstr ""
7970
7997
7971 #, python-format
7998 #, python-format
7972 msgid "%s hook is invalid (\"%s\" is not callable)"
7999 msgid "%s hook is invalid (\"%s\" is not callable)"
7973 msgstr ""
8000 msgstr ""
7974
8001
7975 #, python-format
8002 #, python-format
7976 msgid "error: %s hook failed: %s\n"
8003 msgid "error: %s hook failed: %s\n"
7977 msgstr ""
8004 msgstr ""
7978
8005
7979 #, python-format
8006 #, python-format
7980 msgid "error: %s hook raised an exception: %s\n"
8007 msgid "error: %s hook raised an exception: %s\n"
7981 msgstr ""
8008 msgstr ""
7982
8009
7983 #, python-format
8010 #, python-format
7984 msgid "%s hook failed"
8011 msgid "%s hook failed"
7985 msgstr ""
8012 msgstr ""
7986
8013
7987 #, python-format
8014 #, python-format
7988 msgid "warning: %s hook failed\n"
8015 msgid "warning: %s hook failed\n"
7989 msgstr ""
8016 msgstr ""
7990
8017
7991 #, python-format
8018 #, python-format
7992 msgid "running hook %s: %s\n"
8019 msgid "running hook %s: %s\n"
7993 msgstr ""
8020 msgstr ""
7994
8021
7995 #, python-format
8022 #, python-format
7996 msgid "%s hook %s"
8023 msgid "%s hook %s"
7997 msgstr ""
8024 msgstr ""
7998
8025
7999 #, python-format
8026 #, python-format
8000 msgid "warning: %s hook %s\n"
8027 msgid "warning: %s hook %s\n"
8001 msgstr ""
8028 msgstr ""
8002
8029
8003 msgid "connection ended unexpectedly"
8030 msgid "connection ended unexpectedly"
8004 msgstr ""
8031 msgstr ""
8005
8032
8006 #, python-format
8033 #, python-format
8007 msgid "unsupported URL component: \"%s\""
8034 msgid "unsupported URL component: \"%s\""
8008 msgstr ""
8035 msgstr ""
8009
8036
8010 #, python-format
8037 #, python-format
8011 msgid "using %s\n"
8038 msgid "using %s\n"
8012 msgstr ""
8039 msgstr ""
8013
8040
8014 #, python-format
8041 #, python-format
8015 msgid "capabilities: %s\n"
8042 msgid "capabilities: %s\n"
8016 msgstr ""
8043 msgstr ""
8017
8044
8018 msgid "operation not supported over http"
8045 msgid "operation not supported over http"
8019 msgstr ""
8046 msgstr ""
8020
8047
8021 #, python-format
8048 #, python-format
8022 msgid "sending %s command\n"
8049 msgid "sending %s command\n"
8023 msgstr ""
8050 msgstr ""
8024
8051
8025 #, python-format
8052 #, python-format
8026 msgid "sending %s bytes\n"
8053 msgid "sending %s bytes\n"
8027 msgstr ""
8054 msgstr ""
8028
8055
8029 msgid "authorization failed"
8056 msgid "authorization failed"
8030 msgstr ""
8057 msgstr ""
8031
8058
8032 #, python-format
8059 #, python-format
8033 msgid "http error while sending %s command\n"
8060 msgid "http error while sending %s command\n"
8034 msgstr ""
8061 msgstr ""
8035
8062
8036 msgid "http error, possibly caused by proxy setting"
8063 msgid "http error, possibly caused by proxy setting"
8037 msgstr ""
8064 msgstr ""
8038
8065
8039 #, python-format
8066 #, python-format
8040 msgid "real URL is %s\n"
8067 msgid "real URL is %s\n"
8041 msgstr ""
8068 msgstr ""
8042
8069
8043 #, python-format
8070 #, python-format
8044 msgid "requested URL: '%s'\n"
8071 msgid "requested URL: '%s'\n"
8045 msgstr ""
8072 msgstr ""
8046
8073
8047 #, python-format
8074 #, python-format
8048 msgid "'%s' does not appear to be an hg repository"
8075 msgid "'%s' does not appear to be an hg repository"
8049 msgstr ""
8076 msgstr ""
8050
8077
8051 #, python-format
8078 #, python-format
8052 msgid "'%s' sent a broken Content-Type header (%s)"
8079 msgid "'%s' sent a broken Content-Type header (%s)"
8053 msgstr ""
8080 msgstr ""
8054
8081
8055 #, python-format
8082 #, python-format
8056 msgid "'%s' uses newer protocol %s"
8083 msgid "'%s' uses newer protocol %s"
8057 msgstr ""
8084 msgstr ""
8058
8085
8059 msgid "look up remote revision"
8086 msgid "look up remote revision"
8060 msgstr ""
8087 msgstr ""
8061
8088
8062 msgid "unexpected response:"
8089 msgid "unexpected response:"
8063 msgstr ""
8090 msgstr ""
8064
8091
8065 msgid "look up remote changes"
8092 msgid "look up remote changes"
8066 msgstr ""
8093 msgstr ""
8067
8094
8068 msgid "push failed (unexpected response):"
8095 msgid "push failed (unexpected response):"
8069 msgstr ""
8096 msgstr ""
8070
8097
8071 #, python-format
8098 #, python-format
8072 msgid "push failed: %s"
8099 msgid "push failed: %s"
8073 msgstr ""
8100 msgstr ""
8074
8101
8075 msgid "Python support for SSL and HTTPS is not installed"
8102 msgid "Python support for SSL and HTTPS is not installed"
8076 msgstr ""
8103 msgstr ""
8077
8104
8078 msgid "cannot create new http repository"
8105 msgid "cannot create new http repository"
8079 msgstr ""
8106 msgstr ""
8080
8107
8081 #, python-format
8108 #, python-format
8082 msgid "%s: ignoring invalid syntax '%s'\n"
8109 msgid "%s: ignoring invalid syntax '%s'\n"
8083 msgstr ""
8110 msgstr ""
8084
8111
8085 #, python-format
8112 #, python-format
8086 msgid "skipping unreadable ignore file '%s': %s\n"
8113 msgid "skipping unreadable ignore file '%s': %s\n"
8087 msgstr ""
8114 msgstr ""
8088
8115
8089 #, python-format
8116 #, python-format
8090 msgid "repository %s not found"
8117 msgid "repository %s not found"
8091 msgstr ""
8118 msgstr ""
8092
8119
8093 #, python-format
8120 #, python-format
8094 msgid "repository %s already exists"
8121 msgid "repository %s already exists"
8095 msgstr ""
8122 msgstr ""
8096
8123
8097 #, python-format
8124 #, python-format
8098 msgid "requirement '%s' not supported"
8125 msgid "requirement '%s' not supported"
8099 msgstr ""
8126 msgstr ""
8100
8127
8101 #, python-format
8128 #, python-format
8102 msgid ".hg/sharedpath points to nonexistent directory %s"
8129 msgid ".hg/sharedpath points to nonexistent directory %s"
8103 msgstr ""
8130 msgstr ""
8104
8131
8105 #, python-format
8132 #, python-format
8106 msgid "%r cannot be used in a tag name"
8133 msgid "%r cannot be used in a tag name"
8107 msgstr ""
8134 msgstr ""
8108
8135
8109 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8136 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8110 msgstr ""
8137 msgstr ""
8111
8138
8112 #, python-format
8139 #, python-format
8113 msgid "%s, line %s: %s\n"
8140 msgid "%s, line %s: %s\n"
8114 msgstr ""
8141 msgstr ""
8115
8142
8116 msgid "cannot parse entry"
8143 msgid "cannot parse entry"
8117 msgstr ""
8144 msgstr ""
8118
8145
8119 #, python-format
8146 #, python-format
8120 msgid "node '%s' is not well formed"
8147 msgid "node '%s' is not well formed"
8121 msgstr ""
8148 msgstr ""
8122
8149
8123 #, python-format
8150 #, python-format
8124 msgid "working directory has unknown parent '%s'!"
8151 msgid "working directory has unknown parent '%s'!"
8125 msgstr ""
8152 msgstr ""
8126
8153
8127 #, python-format
8154 #, python-format
8128 msgid "unknown revision '%s'"
8155 msgid "unknown revision '%s'"
8129 msgstr ""
8156 msgstr ""
8130
8157
8131 #, python-format
8158 #, python-format
8132 msgid "filtering %s through %s\n"
8159 msgid "filtering %s through %s\n"
8133 msgstr ""
8160 msgstr ""
8134
8161
8135 msgid "journal already exists - run hg recover"
8162 msgid "journal already exists - run hg recover"
8136 msgstr ""
8163 msgstr ""
8137
8164
8138 msgid "rolling back interrupted transaction\n"
8165 msgid "rolling back interrupted transaction\n"
8139 msgstr ""
8166 msgstr ""
8140
8167
8141 msgid "no interrupted transaction available\n"
8168 msgid "no interrupted transaction available\n"
8142 msgstr ""
8169 msgstr ""
8143
8170
8144 msgid "rolling back last transaction\n"
8171 msgid "rolling back last transaction\n"
8145 msgstr ""
8172 msgstr ""
8146
8173
8147 #, python-format
8174 #, python-format
8148 msgid "Named branch could not be reset, current branch still is: %s\n"
8175 msgid "Named branch could not be reset, current branch still is: %s\n"
8149 msgstr ""
8176 msgstr ""
8150
8177
8151 msgid "no rollback information available\n"
8178 msgid "no rollback information available\n"
8152 msgstr ""
8179 msgstr ""
8153
8180
8154 #, python-format
8181 #, python-format
8155 msgid "waiting for lock on %s held by %r\n"
8182 msgid "waiting for lock on %s held by %r\n"
8156 msgstr ""
8183 msgstr ""
8157
8184
8158 #, python-format
8185 #, python-format
8159 msgid "repository %s"
8186 msgid "repository %s"
8160 msgstr ""
8187 msgstr ""
8161
8188
8162 #, python-format
8189 #, python-format
8163 msgid "working directory of %s"
8190 msgid "working directory of %s"
8164 msgstr ""
8191 msgstr ""
8165
8192
8166 #, python-format
8193 #, python-format
8167 msgid " %s: searching for copy revision for %s\n"
8194 msgid " %s: searching for copy revision for %s\n"
8168 msgstr ""
8195 msgstr ""
8169
8196
8170 #, python-format
8197 #, python-format
8171 msgid " %s: copy %s:%s\n"
8198 msgid " %s: copy %s:%s\n"
8172 msgstr ""
8199 msgstr ""
8173
8200
8174 msgid "cannot partially commit a merge (do not specify files or patterns)"
8201 msgid "cannot partially commit a merge (do not specify files or patterns)"
8175 msgstr ""
8202 msgstr ""
8176
8203
8177 msgid "file not found!"
8204 msgid "file not found!"
8178 msgstr ""
8205 msgstr ""
8179
8206
8180 msgid "no match under directory!"
8207 msgid "no match under directory!"
8181 msgstr ""
8208 msgstr ""
8182
8209
8183 msgid "file not tracked!"
8210 msgid "file not tracked!"
8184 msgstr ""
8211 msgstr ""
8185
8212
8186 msgid "nothing changed\n"
8213 msgid "nothing changed\n"
8187 msgstr ""
8214 msgstr ""
8188
8215
8189 msgid "unresolved merge conflicts (see hg resolve)"
8216 msgid "unresolved merge conflicts (see hg resolve)"
8190 msgstr ""
8217 msgstr ""
8191
8218
8192 #, python-format
8219 #, python-format
8193 msgid "committing subrepository %s\n"
8220 msgid "committing subrepository %s\n"
8194 msgstr ""
8221 msgstr ""
8195
8222
8196 #, python-format
8223 #, python-format
8197 msgid "trouble committing %s!\n"
8224 msgid "trouble committing %s!\n"
8198 msgstr ""
8225 msgstr ""
8199
8226
8200 #, python-format
8227 #, python-format
8201 msgid "%s does not exist!\n"
8228 msgid "%s does not exist!\n"
8202 msgstr ""
8229 msgstr ""
8203
8230
8204 #, python-format
8231 #, python-format
8205 msgid ""
8232 msgid ""
8206 "%s: files over 10MB may cause memory and performance problems\n"
8233 "%s: files over 10MB may cause memory and performance problems\n"
8207 "(use 'hg revert %s' to unadd the file)\n"
8234 "(use 'hg revert %s' to unadd the file)\n"
8208 msgstr ""
8235 msgstr ""
8209
8236
8210 #, python-format
8237 #, python-format
8211 msgid "%s not added: only files and symlinks supported currently\n"
8238 msgid "%s not added: only files and symlinks supported currently\n"
8212 msgstr ""
8239 msgstr ""
8213
8240
8214 #, python-format
8241 #, python-format
8215 msgid "%s already tracked!\n"
8242 msgid "%s already tracked!\n"
8216 msgstr ""
8243 msgstr ""
8217
8244
8218 #, python-format
8245 #, python-format
8219 msgid "%s not added!\n"
8246 msgid "%s not added!\n"
8220 msgstr ""
8247 msgstr ""
8221
8248
8222 #, python-format
8249 #, python-format
8223 msgid "%s still exists!\n"
8250 msgid "%s still exists!\n"
8224 msgstr ""
8251 msgstr ""
8225
8252
8226 #, python-format
8253 #, python-format
8227 msgid "%s not tracked!\n"
8254 msgid "%s not tracked!\n"
8228 msgstr ""
8255 msgstr ""
8229
8256
8230 #, python-format
8257 #, python-format
8231 msgid "%s not removed!\n"
8258 msgid "%s not removed!\n"
8232 msgstr ""
8259 msgstr ""
8233
8260
8234 #, python-format
8261 #, python-format
8235 msgid "copy failed: %s is not a file or a symbolic link\n"
8262 msgid "copy failed: %s is not a file or a symbolic link\n"
8236 msgstr ""
8263 msgstr ""
8237
8264
8238 msgid "searching for changes\n"
8265 msgid "searching for changes\n"
8239 msgstr ""
8266 msgstr ""
8240
8267
8241 #, python-format
8268 #, python-format
8242 msgid "examining %s:%s\n"
8269 msgid "examining %s:%s\n"
8243 msgstr ""
8270 msgstr ""
8244
8271
8245 msgid "branch already found\n"
8272 msgid "branch already found\n"
8246 msgstr ""
8273 msgstr ""
8247
8274
8248 #, python-format
8275 #, python-format
8249 msgid "found incomplete branch %s:%s\n"
8276 msgid "found incomplete branch %s:%s\n"
8250 msgstr ""
8277 msgstr ""
8251
8278
8252 #, python-format
8279 #, python-format
8253 msgid "found new changeset %s\n"
8280 msgid "found new changeset %s\n"
8254 msgstr ""
8281 msgstr ""
8255
8282
8256 #, python-format
8283 #, python-format
8257 msgid "request %d: %s\n"
8284 msgid "request %d: %s\n"
8258 msgstr ""
8285 msgstr ""
8259
8286
8260 #, python-format
8287 #, python-format
8261 msgid "received %s:%s\n"
8288 msgid "received %s:%s\n"
8262 msgstr ""
8289 msgstr ""
8263
8290
8264 #, python-format
8291 #, python-format
8265 msgid "narrowing %d:%d %s\n"
8292 msgid "narrowing %d:%d %s\n"
8266 msgstr ""
8293 msgstr ""
8267
8294
8268 #, python-format
8295 #, python-format
8269 msgid "found new branch changeset %s\n"
8296 msgid "found new branch changeset %s\n"
8270 msgstr ""
8297 msgstr ""
8271
8298
8272 #, python-format
8299 #, python-format
8273 msgid "narrowed branch search to %s:%s\n"
8300 msgid "narrowed branch search to %s:%s\n"
8274 msgstr ""
8301 msgstr ""
8275
8302
8276 msgid "already have changeset "
8303 msgid "already have changeset "
8277 msgstr ""
8304 msgstr ""
8278
8305
8279 msgid "warning: repository is unrelated\n"
8306 msgid "warning: repository is unrelated\n"
8280 msgstr ""
8307 msgstr ""
8281
8308
8282 msgid "repository is unrelated"
8309 msgid "repository is unrelated"
8283 msgstr ""
8310 msgstr ""
8284
8311
8285 msgid "found new changesets starting at "
8312 msgid "found new changesets starting at "
8286 msgstr ""
8313 msgstr ""
8287
8314
8288 #, python-format
8315 #, python-format
8289 msgid "%d total queries\n"
8316 msgid "%d total queries\n"
8290 msgstr ""
8317 msgstr ""
8291
8318
8292 msgid "common changesets up to "
8319 msgid "common changesets up to "
8293 msgstr ""
8320 msgstr ""
8294
8321
8295 msgid "requesting all changes\n"
8322 msgid "requesting all changes\n"
8296 msgstr ""
8323 msgstr ""
8297
8324
8298 msgid ""
8325 msgid ""
8299 "Partial pull cannot be done because other repository doesn't support "
8326 "Partial pull cannot be done because other repository doesn't support "
8300 "changegroupsubset."
8327 "changegroupsubset."
8301 msgstr ""
8328 msgstr ""
8302
8329
8303 #, python-format
8330 #, python-format
8304 msgid "abort: push creates new remote branch '%s'!\n"
8331 msgid "abort: push creates new remote branch '%s'!\n"
8305 msgstr ""
8332 msgstr ""
8306
8333
8307 msgid "abort: push creates new remote heads!\n"
8334 msgid "abort: push creates new remote heads!\n"
8308 msgstr ""
8335 msgstr ""
8309
8336
8310 msgid "(did you forget to merge? use push -f to force)\n"
8337 msgid "(did you forget to merge? use push -f to force)\n"
8311 msgstr ""
8338 msgstr ""
8312
8339
8313 msgid "note: unsynced remote changes!\n"
8340 msgid "note: unsynced remote changes!\n"
8314 msgstr ""
8341 msgstr ""
8315
8342
8316 #, python-format
8343 #, python-format
8317 msgid "%d changesets found\n"
8344 msgid "%d changesets found\n"
8318 msgstr ""
8345 msgstr ""
8319
8346
8320 msgid "list of changesets:\n"
8347 msgid "list of changesets:\n"
8321 msgstr ""
8348 msgstr ""
8322
8349
8323 #, python-format
8350 #, python-format
8324 msgid "empty or missing revlog for %s"
8351 msgid "empty or missing revlog for %s"
8325 msgstr ""
8352 msgstr ""
8326
8353
8327 #, python-format
8354 #, python-format
8328 msgid "add changeset %s\n"
8355 msgid "add changeset %s\n"
8329 msgstr ""
8356 msgstr ""
8330
8357
8331 msgid "adding changesets\n"
8358 msgid "adding changesets\n"
8332 msgstr ""
8359 msgstr ""
8333
8360
8334 msgid "received changelog group is empty"
8361 msgid "received changelog group is empty"
8335 msgstr ""
8362 msgstr ""
8336
8363
8337 msgid "adding manifests\n"
8364 msgid "adding manifests\n"
8338 msgstr ""
8365 msgstr ""
8339
8366
8340 msgid "adding file changes\n"
8367 msgid "adding file changes\n"
8341 msgstr ""
8368 msgstr ""
8342
8369
8343 #, python-format
8370 #, python-format
8344 msgid "adding %s revisions\n"
8371 msgid "adding %s revisions\n"
8345 msgstr ""
8372 msgstr ""
8346
8373
8347 msgid "received file revlog group is empty"
8374 msgid "received file revlog group is empty"
8348 msgstr ""
8375 msgstr ""
8349
8376
8350 #, python-format
8377 #, python-format
8351 msgid " (%+d heads)"
8378 msgid " (%+d heads)"
8352 msgstr ""
8379 msgstr ""
8353
8380
8354 #, python-format
8381 #, python-format
8355 msgid "added %d changesets with %d changes to %d files%s\n"
8382 msgid "added %d changesets with %d changes to %d files%s\n"
8356 msgstr ""
8383 msgstr ""
8357
8384
8358 msgid "updating the branch cache\n"
8385 msgid "updating the branch cache\n"
8359 msgstr ""
8386 msgstr ""
8360
8387
8361 msgid "Unexpected response from remote server:"
8388 msgid "Unexpected response from remote server:"
8362 msgstr ""
8389 msgstr ""
8363
8390
8364 msgid "operation forbidden by server"
8391 msgid "operation forbidden by server"
8365 msgstr ""
8392 msgstr ""
8366
8393
8367 msgid "locking the remote repository failed"
8394 msgid "locking the remote repository failed"
8368 msgstr ""
8395 msgstr ""
8369
8396
8370 msgid "the server sent an unknown error code"
8397 msgid "the server sent an unknown error code"
8371 msgstr ""
8398 msgstr ""
8372
8399
8373 msgid "streaming all changes\n"
8400 msgid "streaming all changes\n"
8374 msgstr ""
8401 msgstr ""
8375
8402
8376 #, python-format
8403 #, python-format
8377 msgid "%d files to transfer, %s of data\n"
8404 msgid "%d files to transfer, %s of data\n"
8378 msgstr ""
8405 msgstr ""
8379
8406
8380 #, python-format
8407 #, python-format
8381 msgid "adding %s (%s)\n"
8408 msgid "adding %s (%s)\n"
8382 msgstr ""
8409 msgstr ""
8383
8410
8384 #, python-format
8411 #, python-format
8385 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8412 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8386 msgstr ""
8413 msgstr ""
8387
8414
8388 msgid "no [smtp]host in hgrc - cannot send mail"
8415 msgid "no [smtp]host in hgrc - cannot send mail"
8389 msgstr ""
8416 msgstr ""
8390
8417
8391 #, python-format
8418 #, python-format
8392 msgid "sending mail: smtp host %s, port %s\n"
8419 msgid "sending mail: smtp host %s, port %s\n"
8393 msgstr ""
8420 msgstr ""
8394
8421
8395 msgid "can't use TLS: Python SSL support not installed"
8422 msgid "can't use TLS: Python SSL support not installed"
8396 msgstr ""
8423 msgstr ""
8397
8424
8398 msgid "(using tls)\n"
8425 msgid "(using tls)\n"
8399 msgstr ""
8426 msgstr ""
8400
8427
8401 #, python-format
8428 #, python-format
8402 msgid "(authenticating to mail server as %s)\n"
8429 msgid "(authenticating to mail server as %s)\n"
8403 msgstr ""
8430 msgstr ""
8404
8431
8405 #, python-format
8432 #, python-format
8406 msgid "sending mail: %s\n"
8433 msgid "sending mail: %s\n"
8407 msgstr ""
8434 msgstr ""
8408
8435
8409 msgid "smtp specified as email transport, but no smtp host configured"
8436 msgid "smtp specified as email transport, but no smtp host configured"
8410 msgstr ""
8437 msgstr ""
8411
8438
8412 #, python-format
8439 #, python-format
8413 msgid "%r specified as email transport, but not in PATH"
8440 msgid "%r specified as email transport, but not in PATH"
8414 msgstr ""
8441 msgstr ""
8415
8442
8416 #, python-format
8443 #, python-format
8417 msgid "ignoring invalid sendcharset: %s\n"
8444 msgid "ignoring invalid sendcharset: %s\n"
8418 msgstr ""
8445 msgstr ""
8419
8446
8420 #, python-format
8447 #, python-format
8421 msgid "invalid email address: %s"
8448 msgid "invalid email address: %s"
8422 msgstr ""
8449 msgstr ""
8423
8450
8424 #, python-format
8451 #, python-format
8425 msgid "invalid local address: %s"
8452 msgid "invalid local address: %s"
8426 msgstr ""
8453 msgstr ""
8427
8454
8428 #, python-format
8455 #, python-format
8429 msgid "failed to remove %s from manifest"
8456 msgid "failed to remove %s from manifest"
8430 msgstr ""
8457 msgstr ""
8431
8458
8432 #, python-format
8459 #, python-format
8433 msgid "diff context lines count must be an integer, not %r"
8460 msgid "diff context lines count must be an integer, not %r"
8434 msgstr ""
8461 msgstr ""
8435
8462
8436 #, python-format
8463 #, python-format
8437 msgid ""
8464 msgid ""
8438 "untracked file in working directory differs from file in requested revision: "
8465 "untracked file in working directory differs from file in requested revision: "
8439 "'%s'"
8466 "'%s'"
8440 msgstr ""
8467 msgstr ""
8441
8468
8442 #, python-format
8469 #, python-format
8443 msgid "case-folding collision between %s and %s"
8470 msgid "case-folding collision between %s and %s"
8444 msgstr ""
8471 msgstr ""
8445
8472
8446 #, python-format
8473 #, python-format
8447 msgid ""
8474 msgid ""
8448 " conflicting flags for %s\n"
8475 " conflicting flags for %s\n"
8449 "(n)one, e(x)ec or sym(l)ink?"
8476 "(n)one, e(x)ec or sym(l)ink?"
8450 msgstr ""
8477 msgstr ""
8451
8478
8452 msgid "&None"
8479 msgid "&None"
8453 msgstr ""
8480 msgstr ""
8454
8481
8455 msgid "E&xec"
8482 msgid "E&xec"
8456 msgstr ""
8483 msgstr ""
8457
8484
8458 msgid "Sym&link"
8485 msgid "Sym&link"
8459 msgstr ""
8486 msgstr ""
8460
8487
8461 msgid "resolving manifests\n"
8488 msgid "resolving manifests\n"
8462 msgstr ""
8489 msgstr ""
8463
8490
8464 #, python-format
8491 #, python-format
8465 msgid " overwrite %s partial %s\n"
8492 msgid " overwrite %s partial %s\n"
8466 msgstr ""
8493 msgstr ""
8467
8494
8468 #, python-format
8495 #, python-format
8469 msgid " ancestor %s local %s remote %s\n"
8496 msgid " ancestor %s local %s remote %s\n"
8470 msgstr ""
8497 msgstr ""
8471
8498
8472 #, python-format
8499 #, python-format
8473 msgid ""
8500 msgid ""
8474 " local changed %s which remote deleted\n"
8501 " local changed %s which remote deleted\n"
8475 "use (c)hanged version or (d)elete?"
8502 "use (c)hanged version or (d)elete?"
8476 msgstr ""
8503 msgstr ""
8477
8504
8478 msgid "&Changed"
8505 msgid "&Changed"
8479 msgstr ""
8506 msgstr ""
8480
8507
8481 msgid "&Delete"
8508 msgid "&Delete"
8482 msgstr ""
8509 msgstr ""
8483
8510
8484 msgid "c"
8511 msgid "c"
8485 msgstr ""
8512 msgstr ""
8486
8513
8487 #, python-format
8514 #, python-format
8488 msgid ""
8515 msgid ""
8489 "remote changed %s which local deleted\n"
8516 "remote changed %s which local deleted\n"
8490 "use (c)hanged version or leave (d)eleted?"
8517 "use (c)hanged version or leave (d)eleted?"
8491 msgstr ""
8518 msgstr ""
8492
8519
8493 msgid "&Deleted"
8520 msgid "&Deleted"
8494 msgstr ""
8521 msgstr ""
8495
8522
8496 #, python-format
8523 #, python-format
8497 msgid "preserving %s for resolve of %s\n"
8524 msgid "preserving %s for resolve of %s\n"
8498 msgstr ""
8525 msgstr ""
8499
8526
8500 #, python-format
8527 #, python-format
8501 msgid "update failed to remove %s: %s!\n"
8528 msgid "update failed to remove %s: %s!\n"
8502 msgstr ""
8529 msgstr ""
8503
8530
8504 #, python-format
8531 #, python-format
8505 msgid "getting %s\n"
8532 msgid "getting %s\n"
8506 msgstr ""
8533 msgstr ""
8507
8534
8508 #, python-format
8535 #, python-format
8509 msgid "getting %s to %s\n"
8536 msgid "getting %s to %s\n"
8510 msgstr ""
8537 msgstr ""
8511
8538
8512 #, python-format
8539 #, python-format
8513 msgid "warning: detected divergent renames of %s to:\n"
8540 msgid "warning: detected divergent renames of %s to:\n"
8514 msgstr ""
8541 msgstr ""
8515
8542
8516 #, python-format
8543 #, python-format
8517 msgid "branch %s not found"
8544 msgid "branch %s not found"
8518 msgstr ""
8545 msgstr ""
8519
8546
8520 msgid "can't merge with ancestor"
8547 msgid "can't merge with ancestor"
8521 msgstr ""
8548 msgstr ""
8522
8549
8523 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8550 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8524 msgstr ""
8551 msgstr ""
8525
8552
8526 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8553 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8527 msgstr ""
8554 msgstr ""
8528
8555
8529 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8556 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8530 msgstr ""
8557 msgstr ""
8531
8558
8532 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8559 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8533 msgstr ""
8560 msgstr ""
8534
8561
8535 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8562 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8536 msgstr ""
8563 msgstr ""
8537
8564
8538 #, python-format
8565 #, python-format
8539 msgid "cannot create %s: destination already exists"
8566 msgid "cannot create %s: destination already exists"
8540 msgstr ""
8567 msgstr ""
8541
8568
8542 #, python-format
8569 #, python-format
8543 msgid "cannot create %s: unable to create destination directory"
8570 msgid "cannot create %s: unable to create destination directory"
8544 msgstr ""
8571 msgstr ""
8545
8572
8546 #, python-format
8573 #, python-format
8547 msgid "found patch at byte %d\n"
8574 msgid "found patch at byte %d\n"
8548 msgstr ""
8575 msgstr ""
8549
8576
8550 msgid "patch generated by hg export\n"
8577 msgid "patch generated by hg export\n"
8551 msgstr ""
8578 msgstr ""
8552
8579
8553 #, python-format
8580 #, python-format
8554 msgid "unable to find '%s' for patching\n"
8581 msgid "unable to find '%s' for patching\n"
8555 msgstr ""
8582 msgstr ""
8556
8583
8557 #, python-format
8584 #, python-format
8558 msgid "patching file %s\n"
8585 msgid "patching file %s\n"
8559 msgstr ""
8586 msgstr ""
8560
8587
8561 #, python-format
8588 #, python-format
8562 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8589 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8563 msgstr ""
8590 msgstr ""
8564
8591
8565 #, python-format
8592 #, python-format
8566 msgid "bad hunk #%d %s (%d %d %d %d)"
8593 msgid "bad hunk #%d %s (%d %d %d %d)"
8567 msgstr ""
8594 msgstr ""
8568
8595
8569 #, python-format
8596 #, python-format
8570 msgid "file %s already exists\n"
8597 msgid "file %s already exists\n"
8571 msgstr ""
8598 msgstr ""
8572
8599
8573 #, python-format
8600 #, python-format
8574 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8601 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8575 msgstr ""
8602 msgstr ""
8576
8603
8577 #, python-format
8604 #, python-format
8578 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8605 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8579 msgstr ""
8606 msgstr ""
8580
8607
8581 #, python-format
8608 #, python-format
8582 msgid "Hunk #%d FAILED at %d\n"
8609 msgid "Hunk #%d FAILED at %d\n"
8583 msgstr ""
8610 msgstr ""
8584
8611
8585 #, python-format
8612 #, python-format
8586 msgid "bad hunk #%d"
8613 msgid "bad hunk #%d"
8587 msgstr ""
8614 msgstr ""
8588
8615
8589 #, python-format
8616 #, python-format
8590 msgid "bad hunk #%d old text line %d"
8617 msgid "bad hunk #%d old text line %d"
8591 msgstr ""
8618 msgstr ""
8592
8619
8593 msgid "could not extract binary patch"
8620 msgid "could not extract binary patch"
8594 msgstr ""
8621 msgstr ""
8595
8622
8596 #, python-format
8623 #, python-format
8597 msgid "binary patch is %d bytes, not %d"
8624 msgid "binary patch is %d bytes, not %d"
8598 msgstr ""
8625 msgstr ""
8599
8626
8600 #, python-format
8627 #, python-format
8601 msgid "unable to strip away %d dirs from %s"
8628 msgid "unable to strip away %d dirs from %s"
8602 msgstr ""
8629 msgstr ""
8603
8630
8604 msgid "undefined source and destination files"
8631 msgid "undefined source and destination files"
8605 msgstr ""
8632 msgstr ""
8606
8633
8607 #, python-format
8634 #, python-format
8608 msgid "malformed patch %s %s"
8635 msgid "malformed patch %s %s"
8609 msgstr ""
8636 msgstr ""
8610
8637
8611 #, python-format
8638 #, python-format
8612 msgid "unsupported parser state: %s"
8639 msgid "unsupported parser state: %s"
8613 msgstr ""
8640 msgstr ""
8614
8641
8615 #, python-format
8642 #, python-format
8616 msgid "patch command failed: %s"
8643 msgid "patch command failed: %s"
8617 msgstr ""
8644 msgstr ""
8618
8645
8619 #, python-format
8646 #, python-format
8620 msgid "Unsupported line endings type: %s"
8647 msgid "Unsupported line endings type: %s"
8621 msgstr ""
8648 msgstr ""
8622
8649
8623 #, python-format
8650 #, python-format
8624 msgid "no valid hunks found; trying with %r instead\n"
8651 msgid "no valid hunks found; trying with %r instead\n"
8625 msgstr ""
8652 msgstr ""
8626
8653
8627 #, python-format
8654 #, python-format
8628 msgid "exited with status %d"
8655 msgid "exited with status %d"
8629 msgstr ""
8656 msgstr ""
8630
8657
8631 #, python-format
8658 #, python-format
8632 msgid "killed by signal %d"
8659 msgid "killed by signal %d"
8633 msgstr ""
8660 msgstr ""
8634
8661
8635 #, python-format
8662 #, python-format
8636 msgid "stopped by signal %d"
8663 msgid "stopped by signal %d"
8637 msgstr ""
8664 msgstr ""
8638
8665
8639 msgid "invalid exit code"
8666 msgid "invalid exit code"
8640 msgstr ""
8667 msgstr ""
8641
8668
8642 #, python-format
8669 #, python-format
8643 msgid "saving bundle to %s\n"
8670 msgid "saving bundle to %s\n"
8644 msgstr ""
8671 msgstr ""
8645
8672
8646 msgid "adding branch\n"
8673 msgid "adding branch\n"
8647 msgstr ""
8674 msgstr ""
8648
8675
8649 #, python-format
8676 #, python-format
8650 msgid "cannot %s; remote repository does not support the %r capability"
8677 msgid "cannot %s; remote repository does not support the %r capability"
8651 msgstr ""
8678 msgstr ""
8652
8679
8653 #, python-format
8680 #, python-format
8654 msgid "unknown compression type %r"
8681 msgid "unknown compression type %r"
8655 msgstr ""
8682 msgstr ""
8656
8683
8657 #, python-format
8684 #, python-format
8658 msgid "index %s unknown flags %#04x for format v0"
8685 msgid "index %s unknown flags %#04x for format v0"
8659 msgstr ""
8686 msgstr ""
8660
8687
8661 #, python-format
8688 #, python-format
8662 msgid "index %s unknown flags %#04x for revlogng"
8689 msgid "index %s unknown flags %#04x for revlogng"
8663 msgstr ""
8690 msgstr ""
8664
8691
8665 #, python-format
8692 #, python-format
8666 msgid "index %s unknown format %d"
8693 msgid "index %s unknown format %d"
8667 msgstr ""
8694 msgstr ""
8668
8695
8669 #, python-format
8696 #, python-format
8670 msgid "index %s is corrupted"
8697 msgid "index %s is corrupted"
8671 msgstr ""
8698 msgstr ""
8672
8699
8673 msgid "no node"
8700 msgid "no node"
8674 msgstr ""
8701 msgstr ""
8675
8702
8676 msgid "ambiguous identifier"
8703 msgid "ambiguous identifier"
8677 msgstr ""
8704 msgstr ""
8678
8705
8679 msgid "no match found"
8706 msgid "no match found"
8680 msgstr ""
8707 msgstr ""
8681
8708
8682 #, python-format
8709 #, python-format
8683 msgid "incompatible revision flag %x"
8710 msgid "incompatible revision flag %x"
8684 msgstr ""
8711 msgstr ""
8685
8712
8686 #, python-format
8713 #, python-format
8687 msgid "%s not found in the transaction"
8714 msgid "%s not found in the transaction"
8688 msgstr ""
8715 msgstr ""
8689
8716
8690 msgid "unknown base"
8717 msgid "unknown base"
8691 msgstr ""
8718 msgstr ""
8692
8719
8693 msgid "consistency error adding group"
8720 msgid "consistency error adding group"
8694 msgstr ""
8721 msgstr ""
8695
8722
8696 #, python-format
8723 #, python-format
8697 msgid "%s looks like a binary file."
8724 msgid "%s looks like a binary file."
8698 msgstr ""
8725 msgstr ""
8699
8726
8700 msgid "can only specify two labels."
8727 msgid "can only specify two labels."
8701 msgstr ""
8728 msgstr ""
8702
8729
8703 msgid "warning: conflicts during merge.\n"
8730 msgid "warning: conflicts during merge.\n"
8704 msgstr ""
8731 msgstr ""
8705
8732
8706 #, python-format
8733 #, python-format
8707 msgid "couldn't parse location %s"
8734 msgid "couldn't parse location %s"
8708 msgstr ""
8735 msgstr ""
8709
8736
8710 msgid "could not create remote repo"
8737 msgid "could not create remote repo"
8711 msgstr ""
8738 msgstr ""
8712
8739
8713 msgid "remote: "
8740 msgid "remote: "
8714 msgstr ""
8741 msgstr ""
8715
8742
8716 msgid "no suitable response from remote hg"
8743 msgid "no suitable response from remote hg"
8717 msgstr ""
8744 msgstr ""
8718
8745
8719 #, python-format
8746 #, python-format
8720 msgid "push refused: %s"
8747 msgid "push refused: %s"
8721 msgstr ""
8748 msgstr ""
8722
8749
8723 msgid "unsynced changes"
8750 msgid "unsynced changes"
8724 msgstr ""
8751 msgstr ""
8725
8752
8726 msgid "cannot lock static-http repository"
8753 msgid "cannot lock static-http repository"
8727 msgstr ""
8754 msgstr ""
8728
8755
8729 msgid "cannot create new static-http repository"
8756 msgid "cannot create new static-http repository"
8730 msgstr ""
8757 msgstr ""
8731
8758
8732 #, python-format
8759 #, python-format
8733 msgid "invalid entry in fncache, line %s"
8760 msgid "invalid entry in fncache, line %s"
8734 msgstr ""
8761 msgstr ""
8735
8762
8736 msgid "scanning\n"
8763 msgid "scanning\n"
8737 msgstr ""
8764 msgstr ""
8738
8765
8739 #, python-format
8766 #, python-format
8740 msgid "%d files, %d bytes to transfer\n"
8767 msgid "%d files, %d bytes to transfer\n"
8741 msgstr ""
8768 msgstr ""
8742
8769
8743 #, python-format
8770 #, python-format
8744 msgid "sending %s (%d bytes)\n"
8771 msgid "sending %s (%d bytes)\n"
8745 msgstr ""
8772 msgstr ""
8746
8773
8747 #, python-format
8774 #, python-format
8748 msgid ""
8775 msgid ""
8749 " subrepository sources for %s differ\n"
8776 " subrepository sources for %s differ\n"
8750 "use (l)ocal source (%s) or (r)emote source (%s)?"
8777 "use (l)ocal source (%s) or (r)emote source (%s)?"
8751 msgstr ""
8778 msgstr ""
8752
8779
8753 msgid "&Remote"
8780 msgid "&Remote"
8754 msgstr ""
8781 msgstr ""
8755
8782
8756 msgid "r"
8783 msgid "r"
8757 msgstr ""
8784 msgstr ""
8758
8785
8759 #, python-format
8786 #, python-format
8760 msgid ""
8787 msgid ""
8761 " local changed subrepository %s which remote removed\n"
8788 " local changed subrepository %s which remote removed\n"
8762 "use (c)hanged version or (d)elete?"
8789 "use (c)hanged version or (d)elete?"
8763 msgstr ""
8790 msgstr ""
8764
8791
8765 #, python-format
8792 #, python-format
8766 msgid ""
8793 msgid ""
8767 " remote changed subrepository %s which local removed\n"
8794 " remote changed subrepository %s which local removed\n"
8768 "use (c)hanged version or (d)elete?"
8795 "use (c)hanged version or (d)elete?"
8769 msgstr ""
8796 msgstr ""
8770
8797
8771 #, python-format
8798 #, python-format
8772 msgid "removing subrepo %s\n"
8799 msgid "removing subrepo %s\n"
8773 msgstr ""
8800 msgstr ""
8774
8801
8775 #, python-format
8802 #, python-format
8776 msgid "pulling subrepo %s\n"
8803 msgid "pulling subrepo %s\n"
8777 msgstr ""
8804 msgstr ""
8778
8805
8779 #, python-format
8806 #, python-format
8780 msgid "pushing subrepo %s\n"
8807 msgid "pushing subrepo %s\n"
8781 msgstr ""
8808 msgstr ""
8782
8809
8783 msgid "unmatched quotes"
8810 msgid "unmatched quotes"
8784 msgstr ""
8811 msgstr ""
8785
8812
8786 #, python-format
8813 #, python-format
8787 msgid "error expanding '%s%%%s'"
8814 msgid "error expanding '%s%%%s'"
8788 msgstr ""
8815 msgstr ""
8789
8816
8790 #, python-format
8817 #, python-format
8791 msgid "unknown filter '%s'"
8818 msgid "unknown filter '%s'"
8792 msgstr ""
8819 msgstr ""
8793
8820
8794 #, python-format
8821 #, python-format
8795 msgid "style not found: %s"
8822 msgid "style not found: %s"
8796 msgstr ""
8823 msgstr ""
8797
8824
8798 #, python-format
8825 #, python-format
8799 msgid "template file %s: %s"
8826 msgid "template file %s: %s"
8800 msgstr ""
8827 msgstr ""
8801
8828
8802 msgid "cannot use transaction when it is already committed/aborted"
8829 msgid "cannot use transaction when it is already committed/aborted"
8803 msgstr ""
8830 msgstr ""
8804
8831
8805 #, python-format
8832 #, python-format
8806 msgid "failed to truncate %s\n"
8833 msgid "failed to truncate %s\n"
8807 msgstr ""
8834 msgstr ""
8808
8835
8809 msgid "transaction abort!\n"
8836 msgid "transaction abort!\n"
8810 msgstr ""
8837 msgstr ""
8811
8838
8812 msgid "rollback completed\n"
8839 msgid "rollback completed\n"
8813 msgstr ""
8840 msgstr ""
8814
8841
8815 msgid "rollback failed - please run hg recover\n"
8842 msgid "rollback failed - please run hg recover\n"
8816 msgstr ""
8843 msgstr ""
8817
8844
8818 #, python-format
8845 #, python-format
8819 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8846 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8820 msgstr ""
8847 msgstr ""
8821
8848
8822 #, python-format
8849 #, python-format
8823 msgid "Ignored: %s\n"
8850 msgid "Ignored: %s\n"
8824 msgstr ""
8851 msgstr ""
8825
8852
8826 #, python-format
8853 #, python-format
8827 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8854 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8828 msgstr ""
8855 msgstr ""
8829
8856
8830 #, python-format
8857 #, python-format
8831 msgid "%s.%s not a boolean ('%s')"
8858 msgid "%s.%s not a boolean ('%s')"
8832 msgstr ""
8859 msgstr ""
8833
8860
8834 msgid "enter a commit username:"
8861 msgid "enter a commit username:"
8835 msgstr ""
8862 msgstr ""
8836
8863
8837 #, python-format
8864 #, python-format
8838 msgid "No username found, using '%s' instead\n"
8865 msgid "No username found, using '%s' instead\n"
8839 msgstr ""
8866 msgstr ""
8840
8867
8841 msgid "Please specify a username."
8868 msgid "Please specify a username."
8842 msgstr ""
8869 msgstr ""
8843
8870
8844 #, python-format
8871 #, python-format
8845 msgid "username %s contains a newline\n"
8872 msgid "username %s contains a newline\n"
8846 msgstr ""
8873 msgstr ""
8847
8874
8848 msgid "unrecognized response\n"
8875 msgid "unrecognized response\n"
8849 msgstr ""
8876 msgstr ""
8850
8877
8851 msgid "response expected"
8878 msgid "response expected"
8852 msgstr ""
8879 msgstr ""
8853
8880
8854 msgid "password: "
8881 msgid "password: "
8855 msgstr ""
8882 msgstr ""
8856
8883
8857 msgid "edit failed"
8884 msgid "edit failed"
8858 msgstr ""
8885 msgstr ""
8859
8886
8860 msgid "http authorization required"
8887 msgid "http authorization required"
8861 msgstr ""
8888 msgstr ""
8862
8889
8863 msgid "http authorization required\n"
8890 msgid "http authorization required\n"
8864 msgstr ""
8891 msgstr ""
8865
8892
8866 #, python-format
8893 #, python-format
8867 msgid "realm: %s\n"
8894 msgid "realm: %s\n"
8868 msgstr ""
8895 msgstr ""
8869
8896
8870 #, python-format
8897 #, python-format
8871 msgid "user: %s\n"
8898 msgid "user: %s\n"
8872 msgstr ""
8899 msgstr ""
8873
8900
8874 msgid "user:"
8901 msgid "user:"
8875 msgstr ""
8902 msgstr ""
8876
8903
8877 #, python-format
8904 #, python-format
8878 msgid "http auth: user %s, password %s\n"
8905 msgid "http auth: user %s, password %s\n"
8879 msgstr ""
8906 msgstr ""
8880
8907
8881 #, python-format
8908 #, python-format
8882 msgid "proxying through http://%s:%s\n"
8909 msgid "proxying through http://%s:%s\n"
8883 msgstr ""
8910 msgstr ""
8884
8911
8885 #, python-format
8912 #, python-format
8886 msgid "command '%s' failed: %s"
8913 msgid "command '%s' failed: %s"
8887 msgstr ""
8914 msgstr ""
8888
8915
8889 #, python-format
8916 #, python-format
8890 msgid "path contains illegal component: %s"
8917 msgid "path contains illegal component: %s"
8891 msgstr ""
8918 msgstr ""
8892
8919
8893 #, python-format
8920 #, python-format
8894 msgid "path %r is inside repo %r"
8921 msgid "path %r is inside repo %r"
8895 msgstr ""
8922 msgstr ""
8896
8923
8897 #, python-format
8924 #, python-format
8898 msgid "path %r traverses symbolic link %r"
8925 msgid "path %r traverses symbolic link %r"
8899 msgstr ""
8926 msgstr ""
8900
8927
8901 msgid "Hardlinks not supported"
8928 msgid "Hardlinks not supported"
8902 msgstr ""
8929 msgstr ""
8903
8930
8904 #, python-format
8931 #, python-format
8905 msgid "could not symlink to %r: %s"
8932 msgid "could not symlink to %r: %s"
8906 msgstr ""
8933 msgstr ""
8907
8934
8908 #, python-format
8935 #, python-format
8909 msgid "invalid date: %r "
8936 msgid "invalid date: %r "
8910 msgstr ""
8937 msgstr ""
8911
8938
8912 #, python-format
8939 #, python-format
8913 msgid "date exceeds 32 bits: %d"
8940 msgid "date exceeds 32 bits: %d"
8914 msgstr ""
8941 msgstr ""
8915
8942
8916 #, python-format
8943 #, python-format
8917 msgid "impossible time zone offset: %d"
8944 msgid "impossible time zone offset: %d"
8918 msgstr ""
8945 msgstr ""
8919
8946
8920 #, python-format
8947 #, python-format
8921 msgid "invalid day spec: %s"
8948 msgid "invalid day spec: %s"
8922 msgstr ""
8949 msgstr ""
8923
8950
8924 #, python-format
8951 #, python-format
8925 msgid "%.0f GB"
8952 msgid "%.0f GB"
8926 msgstr ""
8953 msgstr ""
8927
8954
8928 #, python-format
8955 #, python-format
8929 msgid "%.1f GB"
8956 msgid "%.1f GB"
8930 msgstr ""
8957 msgstr ""
8931
8958
8932 #, python-format
8959 #, python-format
8933 msgid "%.2f GB"
8960 msgid "%.2f GB"
8934 msgstr ""
8961 msgstr ""
8935
8962
8936 #, python-format
8963 #, python-format
8937 msgid "%.0f MB"
8964 msgid "%.0f MB"
8938 msgstr ""
8965 msgstr ""
8939
8966
8940 #, python-format
8967 #, python-format
8941 msgid "%.1f MB"
8968 msgid "%.1f MB"
8942 msgstr ""
8969 msgstr ""
8943
8970
8944 #, python-format
8971 #, python-format
8945 msgid "%.2f MB"
8972 msgid "%.2f MB"
8946 msgstr ""
8973 msgstr ""
8947
8974
8948 #, python-format
8975 #, python-format
8949 msgid "%.0f KB"
8976 msgid "%.0f KB"
8950 msgstr ""
8977 msgstr ""
8951
8978
8952 #, python-format
8979 #, python-format
8953 msgid "%.1f KB"
8980 msgid "%.1f KB"
8954 msgstr ""
8981 msgstr ""
8955
8982
8956 #, python-format
8983 #, python-format
8957 msgid "%.2f KB"
8984 msgid "%.2f KB"
8958 msgstr ""
8985 msgstr ""
8959
8986
8960 #, python-format
8987 #, python-format
8961 msgid "%.0f bytes"
8988 msgid "%.0f bytes"
8962 msgstr ""
8989 msgstr ""
8963
8990
8964 msgid "cannot verify bundle or remote repos"
8991 msgid "cannot verify bundle or remote repos"
8965 msgstr ""
8992 msgstr ""
8966
8993
8967 msgid "interrupted"
8994 msgid "interrupted"
8968 msgstr ""
8995 msgstr ""
8969
8996
8970 #, python-format
8997 #, python-format
8971 msgid "empty or missing %s"
8998 msgid "empty or missing %s"
8972 msgstr ""
8999 msgstr ""
8973
9000
8974 #, python-format
9001 #, python-format
8975 msgid "data length off by %d bytes"
9002 msgid "data length off by %d bytes"
8976 msgstr ""
9003 msgstr ""
8977
9004
8978 #, python-format
9005 #, python-format
8979 msgid "index contains %d extra bytes"
9006 msgid "index contains %d extra bytes"
8980 msgstr ""
9007 msgstr ""
8981
9008
8982 #, python-format
9009 #, python-format
8983 msgid "warning: `%s' uses revlog format 1"
9010 msgid "warning: `%s' uses revlog format 1"
8984 msgstr ""
9011 msgstr ""
8985
9012
8986 #, python-format
9013 #, python-format
8987 msgid "warning: `%s' uses revlog format 0"
9014 msgid "warning: `%s' uses revlog format 0"
8988 msgstr ""
9015 msgstr ""
8989
9016
8990 #, python-format
9017 #, python-format
8991 msgid "rev %d points to nonexistent changeset %d"
9018 msgid "rev %d points to nonexistent changeset %d"
8992 msgstr ""
9019 msgstr ""
8993
9020
8994 #, python-format
9021 #, python-format
8995 msgid "rev %d points to unexpected changeset %d"
9022 msgid "rev %d points to unexpected changeset %d"
8996 msgstr ""
9023 msgstr ""
8997
9024
8998 #, python-format
9025 #, python-format
8999 msgid " (expected %s)"
9026 msgid " (expected %s)"
9000 msgstr ""
9027 msgstr ""
9001
9028
9002 #, python-format
9029 #, python-format
9003 msgid "unknown parent 1 %s of %s"
9030 msgid "unknown parent 1 %s of %s"
9004 msgstr ""
9031 msgstr ""
9005
9032
9006 #, python-format
9033 #, python-format
9007 msgid "unknown parent 2 %s of %s"
9034 msgid "unknown parent 2 %s of %s"
9008 msgstr ""
9035 msgstr ""
9009
9036
9010 #, python-format
9037 #, python-format
9011 msgid "checking parents of %s"
9038 msgid "checking parents of %s"
9012 msgstr ""
9039 msgstr ""
9013
9040
9014 #, python-format
9041 #, python-format
9015 msgid "duplicate revision %d (%d)"
9042 msgid "duplicate revision %d (%d)"
9016 msgstr ""
9043 msgstr ""
9017
9044
9018 #, python-format
9045 #, python-format
9019 msgid "repository uses revlog format %d\n"
9046 msgid "repository uses revlog format %d\n"
9020 msgstr ""
9047 msgstr ""
9021
9048
9022 msgid "checking changesets\n"
9049 msgid "checking changesets\n"
9023 msgstr ""
9050 msgstr ""
9024
9051
9025 #, python-format
9052 #, python-format
9026 msgid "unpacking changeset %s"
9053 msgid "unpacking changeset %s"
9027 msgstr ""
9054 msgstr ""
9028
9055
9029 msgid "checking manifests\n"
9056 msgid "checking manifests\n"
9030 msgstr ""
9057 msgstr ""
9031
9058
9032 #, python-format
9059 #, python-format
9033 msgid "%s not in changesets"
9060 msgid "%s not in changesets"
9034 msgstr ""
9061 msgstr ""
9035
9062
9036 msgid "file without name in manifest"
9063 msgid "file without name in manifest"
9037 msgstr ""
9064 msgstr ""
9038
9065
9039 #, python-format
9066 #, python-format
9040 msgid "reading manifest delta %s"
9067 msgid "reading manifest delta %s"
9041 msgstr ""
9068 msgstr ""
9042
9069
9043 msgid "crosschecking files in changesets and manifests\n"
9070 msgid "crosschecking files in changesets and manifests\n"
9044 msgstr ""
9071 msgstr ""
9045
9072
9046 #, python-format
9073 #, python-format
9047 msgid "changeset refers to unknown manifest %s"
9074 msgid "changeset refers to unknown manifest %s"
9048 msgstr ""
9075 msgstr ""
9049
9076
9050 msgid "in changeset but not in manifest"
9077 msgid "in changeset but not in manifest"
9051 msgstr ""
9078 msgstr ""
9052
9079
9053 msgid "in manifest but not in changeset"
9080 msgid "in manifest but not in changeset"
9054 msgstr ""
9081 msgstr ""
9055
9082
9056 msgid "checking files\n"
9083 msgid "checking files\n"
9057 msgstr ""
9084 msgstr ""
9058
9085
9059 #, python-format
9086 #, python-format
9060 msgid "cannot decode filename '%s'"
9087 msgid "cannot decode filename '%s'"
9061 msgstr ""
9088 msgstr ""
9062
9089
9063 #, python-format
9090 #, python-format
9064 msgid "broken revlog! (%s)"
9091 msgid "broken revlog! (%s)"
9065 msgstr ""
9092 msgstr ""
9066
9093
9067 msgid "missing revlog!"
9094 msgid "missing revlog!"
9068 msgstr ""
9095 msgstr ""
9069
9096
9070 #, python-format
9097 #, python-format
9071 msgid "%s not in manifests"
9098 msgid "%s not in manifests"
9072 msgstr ""
9099 msgstr ""
9073
9100
9074 #, python-format
9101 #, python-format
9075 msgid "unpacked size is %s, %s expected"
9102 msgid "unpacked size is %s, %s expected"
9076 msgstr ""
9103 msgstr ""
9077
9104
9078 #, python-format
9105 #, python-format
9079 msgid "unpacking %s"
9106 msgid "unpacking %s"
9080 msgstr ""
9107 msgstr ""
9081
9108
9082 #, python-format
9109 #, python-format
9083 msgid "empty or missing copy source revlog %s:%s"
9110 msgid "empty or missing copy source revlog %s:%s"
9084 msgstr ""
9111 msgstr ""
9085
9112
9086 #, python-format
9113 #, python-format
9087 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
9114 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
9088 msgstr ""
9115 msgstr ""
9089
9116
9090 #, python-format
9117 #, python-format
9091 msgid "checking rename of %s"
9118 msgid "checking rename of %s"
9092 msgstr ""
9119 msgstr ""
9093
9120
9094 #, python-format
9121 #, python-format
9095 msgid "%s in manifests not found"
9122 msgid "%s in manifests not found"
9096 msgstr ""
9123 msgstr ""
9097
9124
9098 #, python-format
9125 #, python-format
9099 msgid "warning: orphan revlog '%s'"
9126 msgid "warning: orphan revlog '%s'"
9100 msgstr ""
9127 msgstr ""
9101
9128
9102 #, python-format
9129 #, python-format
9103 msgid "%d files, %d changesets, %d total revisions\n"
9130 msgid "%d files, %d changesets, %d total revisions\n"
9104 msgstr ""
9131 msgstr ""
9105
9132
9106 #, python-format
9133 #, python-format
9107 msgid "%d warnings encountered!\n"
9134 msgid "%d warnings encountered!\n"
9108 msgstr ""
9135 msgstr ""
9109
9136
9110 #, python-format
9137 #, python-format
9111 msgid "%d integrity errors encountered!\n"
9138 msgid "%d integrity errors encountered!\n"
9112 msgstr ""
9139 msgstr ""
9113
9140
9114 #, python-format
9141 #, python-format
9115 msgid "(first damaged changeset appears to be %d)\n"
9142 msgid "(first damaged changeset appears to be %d)\n"
9116 msgstr ""
9143 msgstr ""
9117
9144
9118 msgid "user name not available - set USERNAME environment variable"
9145 msgid "user name not available - set USERNAME environment variable"
9119 msgstr ""
9146 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now