##// END OF EJS Templates
i18n-fr: synchronized with 78e54b9f3a62
Cédric Duval -
r9228:2ab9ec0f default
parent child Browse files
Show More
@@ -1,9159 +1,9171 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-18 22:46+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 #, python-format
1030 msgid ""
1031 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1030 msgstr ""
1032 msgstr ""
1031
1033
1032 #, python-format
1034 #, python-format
1033 msgid "%d bytes missing from remote file"
1035 msgid "%d bytes missing from remote file"
1034 msgstr ""
1036 msgstr ""
1035
1037
1036 #, python-format
1038 #, python-format
1037 msgid "cvs server: %s\n"
1039 msgid "cvs server: %s\n"
1038 msgstr ""
1040 msgstr ""
1039
1041
1040 #, python-format
1042 #, python-format
1041 msgid "unknown CVS response: %s"
1043 msgid "unknown CVS response: %s"
1042 msgstr ""
1044 msgstr ""
1043
1045
1044 msgid "collecting CVS rlog\n"
1046 msgid "collecting CVS rlog\n"
1045 msgstr ""
1047 msgstr ""
1046
1048
1047 #, python-format
1049 #, python-format
1048 msgid "reading cvs log cache %s\n"
1050 msgid "reading cvs log cache %s\n"
1049 msgstr ""
1051 msgstr ""
1050
1052
1051 #, python-format
1053 #, python-format
1052 msgid "cache has %d log entries\n"
1054 msgid "cache has %d log entries\n"
1053 msgstr ""
1055 msgstr ""
1054
1056
1055 #, python-format
1057 #, python-format
1056 msgid "error reading cache: %r\n"
1058 msgid "error reading cache: %r\n"
1057 msgstr ""
1059 msgstr ""
1058
1060
1059 #, python-format
1061 #, python-format
1060 msgid "running %s\n"
1062 msgid "running %s\n"
1061 msgstr ""
1063 msgstr ""
1062
1064
1063 #, python-format
1065 #, python-format
1064 msgid "prefix=%r directory=%r root=%r\n"
1066 msgid "prefix=%r directory=%r root=%r\n"
1065 msgstr ""
1067 msgstr ""
1066
1068
1067 msgid "RCS file must be followed by working file"
1069 msgid "RCS file must be followed by working file"
1068 msgstr ""
1070 msgstr ""
1069
1071
1070 msgid "must have at least some revisions"
1072 msgid "must have at least some revisions"
1071 msgstr ""
1073 msgstr ""
1072
1074
1073 msgid "expected revision number"
1075 msgid "expected revision number"
1074 msgstr ""
1076 msgstr ""
1075
1077
1076 msgid "revision must be followed by date line"
1078 msgid "revision must be followed by date line"
1077 msgstr ""
1079 msgstr ""
1078
1080
1079 #, python-format
1081 #, python-format
1080 msgid "found synthetic revision in %s: %r\n"
1082 msgid "found synthetic revision in %s: %r\n"
1081 msgstr ""
1083 msgstr ""
1082
1084
1083 #, python-format
1085 #, python-format
1084 msgid "writing cvs log cache %s\n"
1086 msgid "writing cvs log cache %s\n"
1085 msgstr ""
1087 msgstr ""
1086
1088
1087 #, python-format
1089 #, python-format
1088 msgid "%d log entries\n"
1090 msgid "%d log entries\n"
1089 msgstr ""
1091 msgstr ""
1090
1092
1091 msgid "creating changesets\n"
1093 msgid "creating changesets\n"
1092 msgstr ""
1094 msgstr ""
1093
1095
1094 msgid "synthetic changeset cannot have multiple parents"
1096 msgid "synthetic changeset cannot have multiple parents"
1095 msgstr ""
1097 msgstr ""
1096
1098
1097 #, python-format
1099 #, python-format
1098 msgid ""
1100 msgid ""
1099 "warning: CVS commit message references non-existent branch %r:\n"
1101 "warning: CVS commit message references non-existent branch %r:\n"
1100 "%s\n"
1102 "%s\n"
1101 msgstr ""
1103 msgstr ""
1102
1104
1103 #, python-format
1105 #, python-format
1104 msgid "%d changeset entries\n"
1106 msgid "%d changeset entries\n"
1105 msgstr ""
1107 msgstr ""
1106
1108
1107 msgid "Python ElementTree module is not available"
1109 msgid "Python ElementTree module is not available"
1108 msgstr ""
1110 msgstr ""
1109
1111
1110 #, python-format
1112 #, python-format
1111 msgid "cleaning up %s\n"
1113 msgid "cleaning up %s\n"
1112 msgstr ""
1114 msgstr ""
1113
1115
1114 msgid "internal calling inconsistency"
1116 msgid "internal calling inconsistency"
1115 msgstr ""
1117 msgstr ""
1116
1118
1117 msgid "errors in filemap"
1119 msgid "errors in filemap"
1118 msgstr ""
1120 msgstr ""
1119
1121
1120 #, python-format
1122 #, python-format
1121 msgid "%s:%d: %r already in %s list\n"
1123 msgid "%s:%d: %r already in %s list\n"
1122 msgstr ""
1124 msgstr ""
1123
1125
1124 #, python-format
1126 #, python-format
1125 msgid "%s:%d: unknown directive %r\n"
1127 msgid "%s:%d: unknown directive %r\n"
1126 msgstr ""
1128 msgstr ""
1127
1129
1128 msgid "source repository doesn't support --filemap"
1130 msgid "source repository doesn't support --filemap"
1129 msgstr ""
1131 msgstr ""
1130
1132
1131 #, python-format
1133 #, python-format
1132 msgid "%s does not look like a GNU Arch repo"
1134 msgid "%s does not look like a GNU Arch repo"
1133 msgstr ""
1135 msgstr ""
1134
1136
1135 msgid "cannot find a GNU Arch tool"
1137 msgid "cannot find a GNU Arch tool"
1136 msgstr ""
1138 msgstr ""
1137
1139
1138 #, python-format
1140 #, python-format
1139 msgid "analyzing tree version %s...\n"
1141 msgid "analyzing tree version %s...\n"
1140 msgstr ""
1142 msgstr ""
1141
1143
1142 #, python-format
1144 #, python-format
1143 msgid ""
1145 msgid ""
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1146 "tree analysis stopped because it points to an unregistered archive %s...\n"
1145 msgstr ""
1147 msgstr ""
1146
1148
1147 #, python-format
1149 #, python-format
1148 msgid "applying revision %s...\n"
1150 msgid "applying revision %s...\n"
1149 msgstr ""
1151 msgstr ""
1150
1152
1151 #, python-format
1153 #, python-format
1152 msgid "computing changeset between %s and %s...\n"
1154 msgid "computing changeset between %s and %s...\n"
1153 msgstr ""
1155 msgstr ""
1154
1156
1155 #, python-format
1157 #, python-format
1156 msgid "obtaining revision %s...\n"
1158 msgid "obtaining revision %s...\n"
1157 msgstr ""
1159 msgstr ""
1158
1160
1159 #, python-format
1161 #, python-format
1160 msgid "analyzing revision %s...\n"
1162 msgid "analyzing revision %s...\n"
1161 msgstr ""
1163 msgstr ""
1162
1164
1163 #, python-format
1165 #, python-format
1164 msgid "could not parse cat-log of %s"
1166 msgid "could not parse cat-log of %s"
1165 msgstr ""
1167 msgstr ""
1166
1168
1167 #, python-format
1169 #, python-format
1168 msgid "%s is not a local Mercurial repo"
1170 msgid "%s is not a local Mercurial repo"
1169 msgstr ""
1171 msgstr ""
1170
1172
1171 #, python-format
1173 #, python-format
1172 msgid "initializing destination %s repository\n"
1174 msgid "initializing destination %s repository\n"
1173 msgstr ""
1175 msgstr ""
1174
1176
1175 msgid "run hg sink pre-conversion action\n"
1177 msgid "run hg sink pre-conversion action\n"
1176 msgstr ""
1178 msgstr ""
1177
1179
1178 msgid "run hg sink post-conversion action\n"
1180 msgid "run hg sink post-conversion action\n"
1179 msgstr ""
1181 msgstr ""
1180
1182
1181 #, python-format
1183 #, python-format
1182 msgid "pulling from %s into %s\n"
1184 msgid "pulling from %s into %s\n"
1183 msgstr ""
1185 msgstr ""
1184
1186
1185 msgid "filtering out empty revision\n"
1187 msgid "filtering out empty revision\n"
1186 msgstr ""
1188 msgstr ""
1187
1189
1188 msgid "updating tags\n"
1190 msgid "updating tags\n"
1189 msgstr ""
1191 msgstr ""
1190
1192
1191 #, python-format
1193 #, python-format
1192 msgid "%s is not a valid start revision"
1194 msgid "%s is not a valid start revision"
1193 msgstr ""
1195 msgstr ""
1194
1196
1195 #, python-format
1197 #, python-format
1196 msgid "ignoring: %s\n"
1198 msgid "ignoring: %s\n"
1197 msgstr ""
1199 msgstr ""
1198
1200
1199 msgid "run hg source pre-conversion action\n"
1201 msgid "run hg source pre-conversion action\n"
1200 msgstr ""
1202 msgstr ""
1201
1203
1202 msgid "run hg source post-conversion action\n"
1204 msgid "run hg source post-conversion action\n"
1203 msgstr ""
1205 msgstr ""
1204
1206
1205 #, python-format
1207 #, python-format
1206 msgid "%s does not look like a monotone repo"
1208 msgid "%s does not look like a monotone repo"
1207 msgstr ""
1209 msgstr ""
1208
1210
1209 #, python-format
1211 #, python-format
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1212 msgid "copying file in renamed directory from '%s' to '%s'"
1211 msgstr ""
1213 msgstr ""
1212
1214
1213 msgid "reading p4 views\n"
1215 msgid "reading p4 views\n"
1214 msgstr ""
1216 msgstr ""
1215
1217
1216 msgid "collecting p4 changelists\n"
1218 msgid "collecting p4 changelists\n"
1217 msgstr ""
1219 msgstr ""
1218
1220
1219 msgid "Subversion python bindings could not be loaded"
1221 msgid "Subversion python bindings could not be loaded"
1220 msgstr ""
1222 msgstr ""
1221
1223
1222 #, python-format
1224 #, python-format
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1225 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1224 msgstr ""
1226 msgstr ""
1225
1227
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1228 msgid "Subversion python bindings are too old, 1.4 or later required"
1227 msgstr ""
1229 msgstr ""
1228
1230
1229 #, python-format
1231 #, python-format
1230 msgid "svn: revision %s is not an integer"
1232 msgid "svn: revision %s is not an integer"
1231 msgstr ""
1233 msgstr ""
1232
1234
1233 #, python-format
1235 #, python-format
1234 msgid "svn: start revision %s is not an integer"
1236 msgid "svn: start revision %s is not an integer"
1235 msgstr ""
1237 msgstr ""
1236
1238
1237 #, python-format
1239 #, python-format
1238 msgid "no revision found in module %s"
1240 msgid "no revision found in module %s"
1239 msgstr ""
1241 msgstr ""
1240
1242
1241 #, python-format
1243 #, python-format
1242 msgid "expected %s to be at %r, but not found"
1244 msgid "expected %s to be at %r, but not found"
1243 msgstr ""
1245 msgstr ""
1244
1246
1245 #, python-format
1247 #, python-format
1246 msgid "found %s at %r\n"
1248 msgid "found %s at %r\n"
1247 msgstr ""
1249 msgstr ""
1248
1250
1249 #, python-format
1251 #, python-format
1250 msgid "ignoring empty branch %s\n"
1252 msgid "ignoring empty branch %s\n"
1251 msgstr ""
1253 msgstr ""
1252
1254
1253 #, python-format
1255 #, python-format
1254 msgid "found branch %s at %d\n"
1256 msgid "found branch %s at %d\n"
1255 msgstr ""
1257 msgstr ""
1256
1258
1257 msgid "svn: start revision is not supported with more than one branch"
1259 msgid "svn: start revision is not supported with more than one branch"
1258 msgstr ""
1260 msgstr ""
1259
1261
1260 #, python-format
1262 #, python-format
1261 msgid "svn: no revision found after start revision %d"
1263 msgid "svn: no revision found after start revision %d"
1262 msgstr ""
1264 msgstr ""
1263
1265
1264 #, python-format
1266 #, python-format
1265 msgid "no tags found at revision %d\n"
1267 msgid "no tags found at revision %d\n"
1266 msgstr ""
1268 msgstr ""
1267
1269
1268 #, python-format
1270 #, python-format
1269 msgid "ignoring foreign branch %r\n"
1271 msgid "ignoring foreign branch %r\n"
1270 msgstr ""
1272 msgstr ""
1271
1273
1272 #, python-format
1274 #, python-format
1273 msgid "%s not found up to revision %d"
1275 msgid "%s not found up to revision %d"
1274 msgstr ""
1276 msgstr ""
1275
1277
1276 #, python-format
1278 #, python-format
1277 msgid "branch renamed from %s to %s at %d\n"
1279 msgid "branch renamed from %s to %s at %d\n"
1278 msgstr ""
1280 msgstr ""
1279
1281
1280 #, python-format
1282 #, python-format
1281 msgid "reparent to %s\n"
1283 msgid "reparent to %s\n"
1282 msgstr ""
1284 msgstr ""
1283
1285
1284 #, python-format
1286 #, python-format
1285 msgid "copied to %s from %s@%s\n"
1287 msgid "copied to %s from %s@%s\n"
1286 msgstr ""
1288 msgstr ""
1287
1289
1288 #, python-format
1290 #, python-format
1289 msgid "gone from %s\n"
1291 msgid "gone from %s\n"
1290 msgstr ""
1292 msgstr ""
1291
1293
1292 #, python-format
1294 #, python-format
1293 msgid "entry %s\n"
1295 msgid "entry %s\n"
1294 msgstr ""
1296 msgstr ""
1295
1297
1296 #, python-format
1298 #, python-format
1297 msgid "unknown path in revision %d: %s\n"
1299 msgid "unknown path in revision %d: %s\n"
1298 msgstr ""
1300 msgstr ""
1299
1301
1300 #, python-format
1302 #, python-format
1301 msgid "mark %s came from %s:%d\n"
1303 msgid "mark %s came from %s:%d\n"
1302 msgstr ""
1304 msgstr ""
1303
1305
1304 #, python-format
1306 #, python-format
1305 msgid "parsing revision %d (%d changes)\n"
1307 msgid "parsing revision %d (%d changes)\n"
1306 msgstr ""
1308 msgstr ""
1307
1309
1308 #, python-format
1310 #, python-format
1309 msgid "found parent of branch %s at %d: %s\n"
1311 msgid "found parent of branch %s at %d: %s\n"
1310 msgstr ""
1312 msgstr ""
1311
1313
1312 msgid "no copyfrom path, don't know what to do.\n"
1314 msgid "no copyfrom path, don't know what to do.\n"
1313 msgstr ""
1315 msgstr ""
1314
1316
1315 #, python-format
1317 #, python-format
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1318 msgid "fetching revision log for \"%s\" from %d to %d\n"
1317 msgstr ""
1319 msgstr ""
1318
1320
1319 #, python-format
1321 #, python-format
1320 msgid "revision %d has no entries\n"
1322 msgid "revision %d has no entries\n"
1321 msgstr ""
1323 msgstr ""
1322
1324
1323 #, python-format
1325 #, python-format
1324 msgid "svn: branch has no revision %s"
1326 msgid "svn: branch has no revision %s"
1325 msgstr ""
1327 msgstr ""
1326
1328
1327 #, python-format
1329 #, python-format
1328 msgid "%r is not under %r, ignoring\n"
1330 msgid "%r is not under %r, ignoring\n"
1329 msgstr ""
1331 msgstr ""
1330
1332
1331 #, python-format
1333 #, python-format
1332 msgid "initializing svn repo %r\n"
1334 msgid "initializing svn repo %r\n"
1333 msgstr ""
1335 msgstr ""
1334
1336
1335 #, python-format
1337 #, python-format
1336 msgid "initializing svn wc %r\n"
1338 msgid "initializing svn wc %r\n"
1337 msgstr ""
1339 msgstr ""
1338
1340
1339 msgid "unexpected svn output:\n"
1341 msgid "unexpected svn output:\n"
1340 msgstr ""
1342 msgstr ""
1341
1343
1342 msgid "unable to cope with svn output"
1344 msgid "unable to cope with svn output"
1343 msgstr ""
1345 msgstr ""
1344
1346
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1347 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1346 msgstr ""
1348 msgstr ""
1347
1349
1348 msgid ""
1350 msgid ""
1349 "command to allow external programs to compare revisions\n"
1351 "command to allow external programs to compare revisions\n"
1350 "\n"
1352 "\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1353 "The `extdiff' Mercurial extension allows you to use external programs\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1354 "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"
1355 "programs are called with a configurable set of options and two\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1356 "non-option arguments: paths to directories containing snapshots of\n"
1355 "files to compare.\n"
1357 "files to compare.\n"
1356 "\n"
1358 "\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1359 "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"
1360 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1359 "\n"
1361 "\n"
1360 " [extdiff]\n"
1362 " [extdiff]\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1363 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1362 " cdiff = gdiff -Nprc5\n"
1364 " cdiff = gdiff -Nprc5\n"
1363 " ## or the old way:\n"
1365 " ## or the old way:\n"
1364 " #cmd.cdiff = gdiff\n"
1366 " #cmd.cdiff = gdiff\n"
1365 " #opts.cdiff = -Nprc5\n"
1367 " #opts.cdiff = -Nprc5\n"
1366 "\n"
1368 "\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1369 " # add new command called vdiff, runs kdiff3\n"
1368 " vdiff = kdiff3\n"
1370 " vdiff = kdiff3\n"
1369 "\n"
1371 "\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1372 " # add new command called meld, runs meld (no need to name twice)\n"
1371 " meld =\n"
1373 " meld =\n"
1372 "\n"
1374 "\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1375 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1376 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1377 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1376 "in\n"
1378 "in\n"
1377 " # your .vimrc\n"
1379 " # your .vimrc\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1380 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1379 "\n"
1381 "\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1382 "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"
1383 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1382 "files, so running the external diff program will actually be pretty\n"
1384 "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"
1385 "fast (at least faster than having to compare the entire tree).\n"
1384 msgstr ""
1386 msgstr ""
1385
1387
1386 #, python-format
1388 #, python-format
1387 msgid "making snapshot of %d files from rev %s\n"
1389 msgid "making snapshot of %d files from rev %s\n"
1388 msgstr ""
1390 msgstr ""
1389
1391
1390 #, python-format
1392 #, python-format
1391 msgid "making snapshot of %d files from working directory\n"
1393 msgid "making snapshot of %d files from working directory\n"
1392 msgstr ""
1394 msgstr ""
1393
1395
1394 msgid "cannot specify --rev and --change at the same time"
1396 msgid "cannot specify --rev and --change at the same time"
1395 msgstr ""
1397 msgstr ""
1396
1398
1397 #, python-format
1399 #, python-format
1398 msgid "running %r in %s\n"
1400 msgid "running %r in %s\n"
1399 msgstr ""
1401 msgstr ""
1400
1402
1401 #, python-format
1403 #, python-format
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1404 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1403 msgstr ""
1405 msgstr ""
1404
1406
1405 msgid "cleaning up temp directory\n"
1407 msgid "cleaning up temp directory\n"
1406 msgstr ""
1408 msgstr ""
1407
1409
1408 msgid ""
1410 msgid ""
1409 "use external program to diff repository (or selected files)\n"
1411 "use external program to diff repository (or selected files)\n"
1410 "\n"
1412 "\n"
1411 " Show differences between revisions for the specified files, using\n"
1413 " Show differences between revisions for the specified files, using\n"
1412 " an external program. The default program used is diff, with\n"
1414 " an external program. The default program used is diff, with\n"
1413 " default options \"-Npru\".\n"
1415 " default options \"-Npru\".\n"
1414 "\n"
1416 "\n"
1415 " To select a different program, use the -p/--program option. The\n"
1417 " 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"
1418 " 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"
1419 " pass additional options to the program, use -o/--option. These\n"
1418 " will be passed before the names of the directories to compare.\n"
1420 " will be passed before the names of the directories to compare.\n"
1419 "\n"
1421 "\n"
1420 " When two revision arguments are given, then changes are shown\n"
1422 " When two revision arguments are given, then changes are shown\n"
1421 " between those revisions. If only one revision is specified then\n"
1423 " between those revisions. If only one revision is specified then\n"
1422 " that revision is compared to the working directory, and, when no\n"
1424 " that revision is compared to the working directory, and, when no\n"
1423 " revisions are specified, the working directory files are compared\n"
1425 " revisions are specified, the working directory files are compared\n"
1424 " to its parent."
1426 " to its parent."
1425 msgstr ""
1427 msgstr ""
1426
1428
1427 msgid "comparison program to run"
1429 msgid "comparison program to run"
1428 msgstr ""
1430 msgstr ""
1429
1431
1430 msgid "pass option to comparison program"
1432 msgid "pass option to comparison program"
1431 msgstr ""
1433 msgstr ""
1432
1434
1433 msgid "change made by revision"
1435 msgid "change made by revision"
1434 msgstr ""
1436 msgstr ""
1435
1437
1436 msgid "hg extdiff [OPT]... [FILE]..."
1438 msgid "hg extdiff [OPT]... [FILE]..."
1437 msgstr ""
1439 msgstr ""
1438
1440
1439 #, python-format
1441 #, python-format
1440 msgid "hg %s [OPTION]... [FILE]..."
1442 msgid "hg %s [OPTION]... [FILE]..."
1441 msgstr ""
1443 msgstr ""
1442
1444
1443 msgid "pull, update and merge in one command"
1445 msgid "pull, update and merge in one command"
1444 msgstr ""
1446 msgstr ""
1445
1447
1446 msgid ""
1448 msgid ""
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1449 "pull changes from a remote repository, merge new changes if needed.\n"
1448 "\n"
1450 "\n"
1449 " This finds all changes from the repository at the specified path\n"
1451 " This finds all changes from the repository at the specified path\n"
1450 " or URL and adds them to the local repository.\n"
1452 " or URL and adds them to the local repository.\n"
1451 "\n"
1453 "\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1454 " 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"
1455 " automatically merged, and the result of the merge is committed.\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1456 " Otherwise, the working directory is updated to include the new\n"
1455 " changes.\n"
1457 " changes.\n"
1456 "\n"
1458 "\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1459 " 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"
1460 " \"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"
1461 " parent, with local changes as the second. To switch the merge\n"
1460 " order, use --switch-parent.\n"
1462 " order, use --switch-parent.\n"
1461 "\n"
1463 "\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1464 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1463 " "
1465 " "
1464 msgstr ""
1466 msgstr ""
1465
1467
1466 msgid ""
1468 msgid ""
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1469 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1468 msgstr ""
1470 msgstr ""
1469
1471
1470 msgid "outstanding uncommitted merge"
1472 msgid "outstanding uncommitted merge"
1471 msgstr ""
1473 msgstr ""
1472
1474
1473 msgid "outstanding uncommitted changes"
1475 msgid "outstanding uncommitted changes"
1474 msgstr ""
1476 msgstr ""
1475
1477
1476 msgid "working directory is missing some files"
1478 msgid "working directory is missing some files"
1477 msgstr ""
1479 msgstr ""
1478
1480
1479 msgid ""
1481 msgid ""
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1482 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1481 msgstr ""
1483 msgstr ""
1482
1484
1483 #, python-format
1485 #, python-format
1484 msgid "pulling from %s\n"
1486 msgid "pulling from %s\n"
1485 msgstr ""
1487 msgstr ""
1486
1488
1487 msgid ""
1489 msgid ""
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1490 "Other repository doesn't support revision lookup, so a rev cannot be "
1489 "specified."
1491 "specified."
1490 msgstr ""
1492 msgstr ""
1491
1493
1492 #, python-format
1494 #, python-format
1493 msgid ""
1495 msgid ""
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1496 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1495 "\" to merge them)\n"
1497 "\" to merge them)\n"
1496 msgstr ""
1498 msgstr ""
1497
1499
1498 #, python-format
1500 #, python-format
1499 msgid "updating to %d:%s\n"
1501 msgid "updating to %d:%s\n"
1500 msgstr ""
1502 msgstr ""
1501
1503
1502 #, python-format
1504 #, python-format
1503 msgid "merging with %d:%s\n"
1505 msgid "merging with %d:%s\n"
1504 msgstr ""
1506 msgstr ""
1505
1507
1506 #, python-format
1508 #, python-format
1507 msgid "Automated merge with %s"
1509 msgid "Automated merge with %s"
1508 msgstr ""
1510 msgstr ""
1509
1511
1510 #, python-format
1512 #, python-format
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1513 msgid "new changeset %d:%s merges remote changes with local\n"
1512 msgstr ""
1514 msgstr ""
1513
1515
1514 msgid "a specific revision you would like to pull"
1516 msgid "a specific revision you would like to pull"
1515 msgstr ""
1517 msgstr ""
1516
1518
1517 msgid "edit commit message"
1519 msgid "edit commit message"
1518 msgstr ""
1520 msgstr ""
1519
1521
1520 msgid "edit commit message (DEPRECATED)"
1522 msgid "edit commit message (DEPRECATED)"
1521 msgstr ""
1523 msgstr ""
1522
1524
1523 msgid "switch parents when merging"
1525 msgid "switch parents when merging"
1524 msgstr ""
1526 msgstr ""
1525
1527
1526 msgid "hg fetch [SOURCE]"
1528 msgid "hg fetch [SOURCE]"
1527 msgstr ""
1529 msgstr ""
1528
1530
1529 msgid "commands to sign and verify changesets"
1531 msgid "commands to sign and verify changesets"
1530 msgstr ""
1532 msgstr ""
1531
1533
1532 msgid "error while verifying signature"
1534 msgid "error while verifying signature"
1533 msgstr ""
1535 msgstr ""
1534
1536
1535 #, python-format
1537 #, python-format
1536 msgid "%s Bad signature from \"%s\"\n"
1538 msgid "%s Bad signature from \"%s\"\n"
1537 msgstr ""
1539 msgstr ""
1538
1540
1539 #, python-format
1541 #, python-format
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1542 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1541 msgstr ""
1543 msgstr ""
1542
1544
1543 #, python-format
1545 #, python-format
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1546 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1545 msgstr ""
1547 msgstr ""
1546
1548
1547 msgid "list signed changesets"
1549 msgid "list signed changesets"
1548 msgstr ""
1550 msgstr ""
1549
1551
1550 #, python-format
1552 #, python-format
1551 msgid "%s:%d node does not exist\n"
1553 msgid "%s:%d node does not exist\n"
1552 msgstr ""
1554 msgstr ""
1553
1555
1554 msgid "verify all the signatures there may be for a particular revision"
1556 msgid "verify all the signatures there may be for a particular revision"
1555 msgstr ""
1557 msgstr ""
1556
1558
1557 #, python-format
1559 #, python-format
1558 msgid "No valid signature for %s\n"
1560 msgid "No valid signature for %s\n"
1559 msgstr ""
1561 msgstr ""
1560
1562
1561 msgid ""
1563 msgid ""
1562 "add a signature for the current or given revision\n"
1564 "add a signature for the current or given revision\n"
1563 "\n"
1565 "\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1566 " If no revision is given, the parent of the working directory is used,\n"
1565 " or tip if no revision is checked out.\n"
1567 " or tip if no revision is checked out.\n"
1566 "\n"
1568 "\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1569 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1568 " "
1570 " "
1569 msgstr ""
1571 msgstr ""
1570
1572
1571 msgid "uncommitted merge - please provide a specific revision"
1573 msgid "uncommitted merge - please provide a specific revision"
1572 msgstr ""
1574 msgstr ""
1573
1575
1574 msgid "Error while signing"
1576 msgid "Error while signing"
1575 msgstr ""
1577 msgstr ""
1576
1578
1577 msgid ""
1579 msgid ""
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1580 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1579 "force)"
1581 "force)"
1580 msgstr ""
1582 msgstr ""
1581
1583
1582 #, python-format
1584 #, python-format
1583 msgid "Added signature for changeset %s"
1585 msgid "Added signature for changeset %s"
1584 msgstr ""
1586 msgstr ""
1585
1587
1586 msgid "unknown signature version"
1588 msgid "unknown signature version"
1587 msgstr ""
1589 msgstr ""
1588
1590
1589 msgid "make the signature local"
1591 msgid "make the signature local"
1590 msgstr ""
1592 msgstr ""
1591
1593
1592 msgid "sign even if the sigfile is modified"
1594 msgid "sign even if the sigfile is modified"
1593 msgstr ""
1595 msgstr ""
1594
1596
1595 msgid "do not commit the sigfile after signing"
1597 msgid "do not commit the sigfile after signing"
1596 msgstr ""
1598 msgstr ""
1597
1599
1598 msgid "the key id to sign with"
1600 msgid "the key id to sign with"
1599 msgstr ""
1601 msgstr ""
1600
1602
1601 msgid "commit message"
1603 msgid "commit message"
1602 msgstr ""
1604 msgstr ""
1603
1605
1604 msgid "hg sign [OPTION]... [REVISION]..."
1606 msgid "hg sign [OPTION]... [REVISION]..."
1605 msgstr ""
1607 msgstr ""
1606
1608
1607 msgid "hg sigcheck REVISION"
1609 msgid "hg sigcheck REVISION"
1608 msgstr ""
1610 msgstr ""
1609
1611
1610 msgid "hg sigs"
1612 msgid "hg sigs"
1611 msgstr ""
1613 msgstr ""
1612
1614
1613 msgid ""
1615 msgid ""
1614 "command to view revision graphs from a shell\n"
1616 "command to view revision graphs from a shell\n"
1615 "\n"
1617 "\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1618 "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"
1619 "commands. When this options is given, an ASCII representation of the\n"
1618 "revision graph is also shown.\n"
1620 "revision graph is also shown.\n"
1619 msgstr ""
1621 msgstr ""
1620
1622
1621 #, python-format
1623 #, python-format
1622 msgid "--graph option is incompatible with --%s"
1624 msgid "--graph option is incompatible with --%s"
1623 msgstr ""
1625 msgstr ""
1624
1626
1625 msgid ""
1627 msgid ""
1626 "show revision history alongside an ASCII revision graph\n"
1628 "show revision history alongside an ASCII revision graph\n"
1627 "\n"
1629 "\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1630 " Print a revision history alongside a revision graph drawn with\n"
1629 " ASCII characters.\n"
1631 " ASCII characters.\n"
1630 "\n"
1632 "\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1633 " Nodes printed as an @ character are parents of the working\n"
1632 " directory.\n"
1634 " directory.\n"
1633 " "
1635 " "
1634 msgstr ""
1636 msgstr ""
1635
1637
1636 #, python-format
1638 #, python-format
1637 msgid "comparing with %s\n"
1639 msgid "comparing with %s\n"
1638 msgstr "comparaison avec %s\n"
1640 msgstr "comparaison avec %s\n"
1639
1641
1640 msgid "no changes found\n"
1642 msgid "no changes found\n"
1641 msgstr "aucun changement trouvé\n"
1643 msgstr "aucun changement trouvé\n"
1642
1644
1643 msgid "show the revision DAG"
1645 msgid "show the revision DAG"
1644 msgstr ""
1646 msgstr ""
1645
1647
1646 msgid "limit number of changes displayed"
1648 msgid "limit number of changes displayed"
1647 msgstr ""
1649 msgstr ""
1648
1650
1649 msgid "show patch"
1651 msgid "show patch"
1650 msgstr ""
1652 msgstr ""
1651
1653
1652 msgid "show the specified revision or range"
1654 msgid "show the specified revision or range"
1653 msgstr ""
1655 msgstr ""
1654
1656
1655 msgid "hg glog [OPTION]... [FILE]"
1657 msgid "hg glog [OPTION]... [FILE]"
1656 msgstr ""
1658 msgstr ""
1657
1659
1658 msgid ""
1660 msgid ""
1659 "hooks for integrating with the CIA.vc notification service\n"
1661 "hooks for integrating with the CIA.vc notification service\n"
1660 "\n"
1662 "\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1663 "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"
1664 "To configure it, set the following options in your hgrc:\n"
1663 "\n"
1665 "\n"
1664 "[cia]\n"
1666 "[cia]\n"
1665 "# your registered CIA user name\n"
1667 "# your registered CIA user name\n"
1666 "user = foo\n"
1668 "user = foo\n"
1667 "# the name of the project in CIA\n"
1669 "# the name of the project in CIA\n"
1668 "project = foo\n"
1670 "project = foo\n"
1669 "# the module (subproject) (optional)\n"
1671 "# the module (subproject) (optional)\n"
1670 "#module = foo\n"
1672 "#module = foo\n"
1671 "# Append a diffstat to the log message (optional)\n"
1673 "# Append a diffstat to the log message (optional)\n"
1672 "#diffstat = False\n"
1674 "#diffstat = False\n"
1673 "# Template to use for log messages (optional)\n"
1675 "# Template to use for log messages (optional)\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1676 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1675 "# Style to use (optional)\n"
1677 "# Style to use (optional)\n"
1676 "#style = foo\n"
1678 "#style = foo\n"
1677 "# The URL of the CIA notification service (optional)\n"
1679 "# The URL of the CIA notification service (optional)\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1680 "# You can use mailto: URLs to send by email, eg\n"
1679 "# mailto:cia@cia.vc\n"
1681 "# mailto:cia@cia.vc\n"
1680 "# Make sure to set email.from if you do this.\n"
1682 "# Make sure to set email.from if you do this.\n"
1681 "#url = http://cia.vc/\n"
1683 "#url = http://cia.vc/\n"
1682 "# print message instead of sending it (optional)\n"
1684 "# print message instead of sending it (optional)\n"
1683 "#test = False\n"
1685 "#test = False\n"
1684 "\n"
1686 "\n"
1685 "[hooks]\n"
1687 "[hooks]\n"
1686 "# one of these:\n"
1688 "# one of these:\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1689 "changegroup.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1690 "#incoming.cia = python:hgcia.hook\n"
1689 "\n"
1691 "\n"
1690 "[web]\n"
1692 "[web]\n"
1691 "# If you want hyperlinks (optional)\n"
1693 "# If you want hyperlinks (optional)\n"
1692 "baseurl = http://server/path/to/repo\n"
1694 "baseurl = http://server/path/to/repo\n"
1693 msgstr ""
1695 msgstr ""
1694
1696
1695 #, python-format
1697 #, python-format
1696 msgid "hgcia: sending update to %s\n"
1698 msgid "hgcia: sending update to %s\n"
1697 msgstr ""
1699 msgstr ""
1698
1700
1699 msgid "email.from must be defined when sending by email"
1701 msgid "email.from must be defined when sending by email"
1700 msgstr ""
1702 msgstr ""
1701
1703
1702 msgid "cia: no user specified"
1704 msgid "cia: no user specified"
1703 msgstr ""
1705 msgstr ""
1704
1706
1705 msgid "cia: no project specified"
1707 msgid "cia: no project specified"
1706 msgstr ""
1708 msgstr ""
1707
1709
1708 msgid ""
1710 msgid ""
1709 "browse the repository in a graphical way\n"
1711 "browse the repository in a graphical way\n"
1710 "\n"
1712 "\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1713 "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"
1714 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1713 "distributed with Mercurial.)\n"
1715 "distributed with Mercurial.)\n"
1714 "\n"
1716 "\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1717 "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"
1718 "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"
1719 "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"
1720 "the contrib directory, and the extension is shipped in the hgext\n"
1719 "repository, and needs to be enabled.\n"
1721 "repository, and needs to be enabled.\n"
1720 "\n"
1722 "\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1723 "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"
1724 "to work, hgk must be in your search path. Alternately, you can specify\n"
1723 "the path to hgk in your .hgrc file:\n"
1725 "the path to hgk in your .hgrc file:\n"
1724 "\n"
1726 "\n"
1725 " [hgk]\n"
1727 " [hgk]\n"
1726 " path=/location/of/hgk\n"
1728 " path=/location/of/hgk\n"
1727 "\n"
1729 "\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1730 "hgk can make use of the extdiff extension to visualize revisions.\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1731 "Assuming you had already configured extdiff vdiff command, just add:\n"
1730 "\n"
1732 "\n"
1731 " [hgk]\n"
1733 " [hgk]\n"
1732 " vdiff=vdiff\n"
1734 " vdiff=vdiff\n"
1733 "\n"
1735 "\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1736 "Revisions context menu will now display additional entries to fire\n"
1735 "vdiff on hovered and selected revisions."
1737 "vdiff on hovered and selected revisions."
1736 msgstr ""
1738 msgstr ""
1737
1739
1738 msgid "diff trees from two commits"
1740 msgid "diff trees from two commits"
1739 msgstr ""
1741 msgstr ""
1740
1742
1741 msgid "output common ancestor information"
1743 msgid "output common ancestor information"
1742 msgstr ""
1744 msgstr ""
1743
1745
1744 msgid "cat a specific revision"
1746 msgid "cat a specific revision"
1745 msgstr ""
1747 msgstr ""
1746
1748
1747 msgid "cat-file: type or revision not supplied\n"
1749 msgid "cat-file: type or revision not supplied\n"
1748 msgstr ""
1750 msgstr ""
1749
1751
1750 msgid "aborting hg cat-file only understands commits\n"
1752 msgid "aborting hg cat-file only understands commits\n"
1751 msgstr ""
1753 msgstr ""
1752
1754
1753 msgid "parse given revisions"
1755 msgid "parse given revisions"
1754 msgstr ""
1756 msgstr ""
1755
1757
1756 msgid "print revisions"
1758 msgid "print revisions"
1757 msgstr ""
1759 msgstr ""
1758
1760
1759 msgid "print extension options"
1761 msgid "print extension options"
1760 msgstr ""
1762 msgstr ""
1761
1763
1762 msgid "start interactive history viewer"
1764 msgid "start interactive history viewer"
1763 msgstr ""
1765 msgstr ""
1764
1766
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1767 msgid "hg view [-l LIMIT] [REVRANGE]"
1766 msgstr ""
1768 msgstr ""
1767
1769
1768 msgid "generate patch"
1770 msgid "generate patch"
1769 msgstr ""
1771 msgstr ""
1770
1772
1771 msgid "recursive"
1773 msgid "recursive"
1772 msgstr ""
1774 msgstr ""
1773
1775
1774 msgid "pretty"
1776 msgid "pretty"
1775 msgstr ""
1777 msgstr ""
1776
1778
1777 msgid "stdin"
1779 msgid "stdin"
1778 msgstr ""
1780 msgstr ""
1779
1781
1780 msgid "detect copies"
1782 msgid "detect copies"
1781 msgstr ""
1783 msgstr ""
1782
1784
1783 msgid "search"
1785 msgid "search"
1784 msgstr ""
1786 msgstr ""
1785
1787
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1788 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1787 msgstr ""
1789 msgstr ""
1788
1790
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1791 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1790 msgstr ""
1792 msgstr ""
1791
1793
1792 msgid "hg debug-config"
1794 msgid "hg debug-config"
1793 msgstr ""
1795 msgstr ""
1794
1796
1795 msgid "hg debug-merge-base REV REV"
1797 msgid "hg debug-merge-base REV REV"
1796 msgstr ""
1798 msgstr ""
1797
1799
1798 msgid "ignored"
1800 msgid "ignored"
1799 msgstr ""
1801 msgstr ""
1800
1802
1801 msgid "hg debug-rev-parse REV"
1803 msgid "hg debug-rev-parse REV"
1802 msgstr ""
1804 msgstr ""
1803
1805
1804 msgid "header"
1806 msgid "header"
1805 msgstr ""
1807 msgstr ""
1806
1808
1807 msgid "topo-order"
1809 msgid "topo-order"
1808 msgstr ""
1810 msgstr ""
1809
1811
1810 msgid "parents"
1812 msgid "parents"
1811 msgstr ""
1813 msgstr ""
1812
1814
1813 msgid "max-count"
1815 msgid "max-count"
1814 msgstr ""
1816 msgstr ""
1815
1817
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1818 msgid "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1819 msgstr "hg debug-rev-list [OPTION]... REV..."
1818
1820
1819 msgid ""
1821 msgid ""
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1822 "syntax highlighting for hgweb (requires Pygments)\n"
1821 "\n"
1823 "\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1824 "It depends on the Pygments syntax highlighting library:\n"
1823 "http://pygments.org/\n"
1825 "http://pygments.org/\n"
1824 "\n"
1826 "\n"
1825 "There is a single configuration option:\n"
1827 "There is a single configuration option:\n"
1826 "\n"
1828 "\n"
1827 "[web]\n"
1829 "[web]\n"
1828 "pygments_style = <style>\n"
1830 "pygments_style = <style>\n"
1829 "\n"
1831 "\n"
1830 "The default is 'colorful'.\n"
1832 "The default is 'colorful'.\n"
1831 msgstr ""
1833 msgstr ""
1832
1834
1833 msgid "accelerate status report using Linux's inotify service"
1835 msgid "accelerate status report using Linux's inotify service"
1834 msgstr ""
1836 msgstr ""
1835
1837
1836 msgid "start an inotify server for this repository"
1838 msgid "start an inotify server for this repository"
1837 msgstr ""
1839 msgstr ""
1838
1840
1839 msgid ""
1841 msgid ""
1840 "debugging information for inotify extension\n"
1842 "debugging information for inotify extension\n"
1841 "\n"
1843 "\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1844 " Prints the list of directories being watched by the inotify server.\n"
1843 " "
1845 " "
1844 msgstr ""
1846 msgstr ""
1845
1847
1846 msgid "directories being watched:\n"
1848 msgid "directories being watched:\n"
1847 msgstr ""
1849 msgstr ""
1848
1850
1849 msgid "run server in background"
1851 msgid "run server in background"
1850 msgstr ""
1852 msgstr ""
1851
1853
1852 msgid "used internally by daemon mode"
1854 msgid "used internally by daemon mode"
1853 msgstr ""
1855 msgstr ""
1854
1856
1855 msgid "minutes to sit idle before exiting"
1857 msgid "minutes to sit idle before exiting"
1856 msgstr ""
1858 msgstr ""
1857
1859
1858 msgid "name of file to write process ID to"
1860 msgid "name of file to write process ID to"
1859 msgstr ""
1861 msgstr ""
1860
1862
1861 msgid "hg inserve [OPTION]..."
1863 msgid "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1864 msgstr "hg inserve [OPTION]..."
1863
1865
1864 msgid "(found dead inotify server socket; removing it)\n"
1866 msgid "(found dead inotify server socket; removing it)\n"
1865 msgstr ""
1867 msgstr ""
1866
1868
1867 msgid "(starting inotify server)\n"
1869 msgid "(starting inotify server)\n"
1868 msgstr ""
1870 msgstr ""
1869
1871
1870 #, python-format
1872 #, python-format
1871 msgid "could not start inotify server: %s\n"
1873 msgid "could not start inotify server: %s\n"
1872 msgstr ""
1874 msgstr ""
1873
1875
1874 #, python-format
1876 #, python-format
1875 msgid "could not talk to new inotify server: %s\n"
1877 msgid "could not talk to new inotify server: %s\n"
1876 msgstr ""
1878 msgstr ""
1877
1879
1878 msgid "(inotify server not running)\n"
1880 msgid "(inotify server not running)\n"
1879 msgstr ""
1881 msgstr ""
1880
1882
1881 #, python-format
1883 #, python-format
1882 msgid "failed to contact inotify server: %s\n"
1884 msgid "failed to contact inotify server: %s\n"
1883 msgstr ""
1885 msgstr ""
1884
1886
1885 msgid "received empty answer from inotify server"
1887 msgid "received empty answer from inotify server"
1886 msgstr ""
1888 msgstr ""
1887
1889
1888 #, python-format
1890 #, python-format
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1891 msgid "(inotify: received response from incompatible server version %d)\n"
1890 msgstr ""
1892 msgstr ""
1891
1893
1892 #, python-format
1894 #, python-format
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1895 msgid "(inotify: received '%s' response when expecting '%s')\n"
1894 msgstr ""
1896 msgstr ""
1895
1897
1896 msgid "this system does not seem to support inotify"
1898 msgid "this system does not seem to support inotify"
1897 msgstr ""
1899 msgstr ""
1898
1900
1899 #, python-format
1901 #, python-format
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1902 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1901 msgstr ""
1903 msgstr ""
1902
1904
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1905 msgid "*** this limit is too low to watch every directory in this repository\n"
1904 msgstr ""
1906 msgstr ""
1905
1907
1906 msgid "*** counting directories: "
1908 msgid "*** counting directories: "
1907 msgstr ""
1909 msgstr ""
1908
1910
1909 #, python-format
1911 #, python-format
1910 msgid "found %d\n"
1912 msgid "found %d\n"
1911 msgstr ""
1913 msgstr ""
1912
1914
1913 #, python-format
1915 #, python-format
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1916 msgid "*** to raise the limit from %d to %d (run as root):\n"
1915 msgstr ""
1917 msgstr ""
1916
1918
1917 #, python-format
1919 #, python-format
1918 msgid "*** echo %d > %s\n"
1920 msgid "*** echo %d > %s\n"
1919 msgstr ""
1921 msgstr ""
1920
1922
1921 #, python-format
1923 #, python-format
1922 msgid "cannot watch %s until inotify watch limit is raised"
1924 msgid "cannot watch %s until inotify watch limit is raised"
1923 msgstr ""
1925 msgstr ""
1924
1926
1925 #, python-format
1927 #, python-format
1926 msgid "inotify service not available: %s"
1928 msgid "inotify service not available: %s"
1927 msgstr ""
1929 msgstr ""
1928
1930
1929 #, python-format
1931 #, python-format
1930 msgid "watching %r\n"
1932 msgid "watching %r\n"
1931 msgstr ""
1933 msgstr ""
1932
1934
1933 #, python-format
1935 #, python-format
1934 msgid "watching directories under %r\n"
1936 msgid "watching directories under %r\n"
1935 msgstr ""
1937 msgstr ""
1936
1938
1937 #, python-format
1939 #, python-format
1938 msgid "status: %r dir(%d) -> %s\n"
1940 msgid "status: %r dir(%d) -> %s\n"
1939 msgstr ""
1941 msgstr ""
1940
1942
1941 #, python-format
1943 #, python-format
1942 msgid "status: %r %s -> %s\n"
1944 msgid "status: %r %s -> %s\n"
1943 msgstr ""
1945 msgstr ""
1944
1946
1945 #, python-format
1947 #, python-format
1946 msgid "%s dirstate reload\n"
1948 msgid "%s dirstate reload\n"
1947 msgstr ""
1949 msgstr ""
1948
1950
1949 #, python-format
1951 #, python-format
1950 msgid "%s end dirstate reload\n"
1952 msgid "%s end dirstate reload\n"
1951 msgstr ""
1953 msgstr ""
1952
1954
1953 msgid "rescanning due to .hgignore change\n"
1955 msgid "rescanning due to .hgignore change\n"
1954 msgstr ""
1956 msgstr ""
1955
1957
1956 #, python-format
1958 #, python-format
1957 msgid "%s event: created %s\n"
1959 msgid "%s event: created %s\n"
1958 msgstr ""
1960 msgstr ""
1959
1961
1960 #, python-format
1962 #, python-format
1961 msgid "%s event: deleted %s\n"
1963 msgid "%s event: deleted %s\n"
1962 msgstr ""
1964 msgstr ""
1963
1965
1964 #, python-format
1966 #, python-format
1965 msgid "%s event: modified %s\n"
1967 msgid "%s event: modified %s\n"
1966 msgstr ""
1968 msgstr ""
1967
1969
1968 #, python-format
1970 #, python-format
1969 msgid "filesystem containing %s was unmounted\n"
1971 msgid "filesystem containing %s was unmounted\n"
1970 msgstr ""
1972 msgstr ""
1971
1973
1972 #, python-format
1974 #, python-format
1973 msgid "%s readable: %d bytes\n"
1975 msgid "%s readable: %d bytes\n"
1974 msgstr ""
1976 msgstr ""
1975
1977
1976 #, python-format
1978 #, python-format
1977 msgid "%s below threshold - unhooking\n"
1979 msgid "%s below threshold - unhooking\n"
1978 msgstr ""
1980 msgstr ""
1979
1981
1980 #, python-format
1982 #, python-format
1981 msgid "%s reading %d events\n"
1983 msgid "%s reading %d events\n"
1982 msgstr ""
1984 msgstr ""
1983
1985
1984 #, python-format
1986 #, python-format
1985 msgid "%s hooking back up with %d bytes readable\n"
1987 msgid "%s hooking back up with %d bytes readable\n"
1986 msgstr ""
1988 msgstr ""
1987
1989
1988 #, python-format
1990 #, python-format
1989 msgid "could not start server: %s"
1991 msgid "could not start server: %s"
1990 msgstr ""
1992 msgstr ""
1991
1993
1992 #, python-format
1994 #, python-format
1993 msgid "answering query for %r\n"
1995 msgid "answering query for %r\n"
1994 msgstr ""
1996 msgstr ""
1995
1997
1996 #, python-format
1998 #, python-format
1997 msgid "received query from incompatible client version %d\n"
1999 msgid "received query from incompatible client version %d\n"
1998 msgstr ""
2000 msgstr ""
1999
2001
2000 #, python-format
2002 #, python-format
2001 msgid "unrecognized query type: %s\n"
2003 msgid "unrecognized query type: %s\n"
2002 msgstr ""
2004 msgstr ""
2003
2005
2004 msgid "finished setup\n"
2006 msgid "finished setup\n"
2005 msgstr ""
2007 msgstr ""
2006
2008
2007 msgid ""
2009 msgid ""
2008 "expand expressions into changelog and summaries\n"
2010 "expand expressions into changelog and summaries\n"
2009 "\n"
2011 "\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2012 "This extension allows the use of a special syntax in summaries,\n"
2011 "which will be automatically expanded into links or any other\n"
2013 "which will be automatically expanded into links or any other\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2014 "arbitrary expression, much like InterWiki does.\n"
2013 "\n"
2015 "\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2016 "A few example patterns (link to bug tracking, etc.) that may\n"
2015 "be used in your hgrc:\n"
2017 "be used in your hgrc:\n"
2016 "\n"
2018 "\n"
2017 " [interhg]\n"
2019 " [interhg]\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2020 " 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>!"
2021 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2020 "i\n"
2022 "i\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2023 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2022 msgstr ""
2024 msgstr ""
2023
2025
2024 #, python-format
2026 #, python-format
2025 msgid "interhg: invalid pattern for %s: %s\n"
2027 msgid "interhg: invalid pattern for %s: %s\n"
2026 msgstr ""
2028 msgstr ""
2027
2029
2028 #, python-format
2030 #, python-format
2029 msgid "interhg: invalid regexp for %s: %s\n"
2031 msgid "interhg: invalid regexp for %s: %s\n"
2030 msgstr ""
2032 msgstr ""
2031
2033
2032 msgid ""
2034 msgid ""
2033 "expand keywords in tracked files\n"
2035 "expand keywords in tracked files\n"
2034 "\n"
2036 "\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2037 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2036 "tracked text files selected by your configuration.\n"
2038 "tracked text files selected by your configuration.\n"
2037 "\n"
2039 "\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2040 "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"
2041 "change history. The mechanism can be regarded as a convenience for the\n"
2040 "current user or for archive distribution.\n"
2042 "current user or for archive distribution.\n"
2041 "\n"
2043 "\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2044 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2043 "hgrc files.\n"
2045 "hgrc files.\n"
2044 "\n"
2046 "\n"
2045 "Example:\n"
2047 "Example:\n"
2046 "\n"
2048 "\n"
2047 " [keyword]\n"
2049 " [keyword]\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2050 " # expand keywords in every python file except those matching \"x*\"\n"
2049 " **.py =\n"
2051 " **.py =\n"
2050 " x* = ignore\n"
2052 " x* = ignore\n"
2051 "\n"
2053 "\n"
2052 "Note: the more specific you are in your filename patterns\n"
2054 "Note: the more specific you are in your filename patterns\n"
2053 " the less you lose speed in huge repositories.\n"
2055 " the less you lose speed in huge repositories.\n"
2054 "\n"
2056 "\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2057 "For [keywordmaps] template mapping and expansion demonstration and\n"
2056 "control run \"hg kwdemo\".\n"
2058 "control run \"hg kwdemo\".\n"
2057 "\n"
2059 "\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2060 "An additional date template filter {date|utcdate} is provided.\n"
2059 "\n"
2061 "\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2062 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2063 "replaced with customized keywords and templates. Again, run \"hg\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2064 "kwdemo\" to control the results of your config changes.\n"
2063 "\n"
2065 "\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2066 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2067 "the risk of inadvertently storing expanded keywords in the change\n"
2066 "history.\n"
2068 "history.\n"
2067 "\n"
2069 "\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2070 "To force expansion after enabling it, or a configuration change, run\n"
2069 "\"hg kwexpand\".\n"
2071 "\"hg kwexpand\".\n"
2070 "\n"
2072 "\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2073 "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"
2074 "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"
2075 "the files in question to update keyword expansions after all changes\n"
2074 "have been checked in.\n"
2076 "have been checked in.\n"
2075 "\n"
2077 "\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2078 "Expansions spanning more than one line and incremental expansions,\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2079 "like CVS' $Log$, are not supported. A keyword template map\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2080 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2079 msgstr ""
2081 msgstr ""
2080
2082
2081 #, python-format
2083 #, python-format
2082 msgid "overwriting %s expanding keywords\n"
2084 msgid "overwriting %s expanding keywords\n"
2083 msgstr ""
2085 msgstr ""
2084
2086
2085 #, python-format
2087 #, python-format
2086 msgid "overwriting %s shrinking keywords\n"
2088 msgid "overwriting %s shrinking keywords\n"
2087 msgstr ""
2089 msgstr ""
2088
2090
2089 msgid "[keyword] patterns cannot match"
2091 msgid "[keyword] patterns cannot match"
2090 msgstr ""
2092 msgstr ""
2091
2093
2092 msgid "no [keyword] patterns configured"
2094 msgid "no [keyword] patterns configured"
2093 msgstr ""
2095 msgstr ""
2094
2096
2095 msgid ""
2097 msgid ""
2096 "print [keywordmaps] configuration and an expansion example\n"
2098 "print [keywordmaps] configuration and an expansion example\n"
2097 "\n"
2099 "\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2100 " Show current, custom, or default keyword template maps and their\n"
2099 " expansions.\n"
2101 " expansions.\n"
2100 "\n"
2102 "\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2103 " Extend current configuration by specifying maps as arguments and\n"
2102 " optionally by reading from an additional hgrc file.\n"
2104 " optionally by reading from an additional hgrc file.\n"
2103 "\n"
2105 "\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2106 " Override current keyword template maps with \"default\" option.\n"
2105 " "
2107 " "
2106 msgstr ""
2108 msgstr ""
2107
2109
2108 #, python-format
2110 #, python-format
2109 msgid "creating temporary repository at %s\n"
2111 msgid "creating temporary repository at %s\n"
2110 msgstr ""
2112 msgstr ""
2111
2113
2112 #, python-format
2114 #, python-format
2113 msgid ""
2115 msgid ""
2114 "\n"
2116 "\n"
2115 "\tconfig using %s keyword template maps\n"
2117 "\tconfig using %s keyword template maps\n"
2116 msgstr ""
2118 msgstr ""
2117
2119
2118 #, python-format
2120 #, python-format
2119 msgid ""
2121 msgid ""
2120 "\n"
2122 "\n"
2121 "%s keywords written to %s:\n"
2123 "%s keywords written to %s:\n"
2122 msgstr ""
2124 msgstr ""
2123
2125
2124 msgid "unhooked all commit hooks\n"
2126 msgid "unhooked all commit hooks\n"
2125 msgstr ""
2127 msgstr ""
2126
2128
2127 #, python-format
2129 #, python-format
2128 msgid ""
2130 msgid ""
2129 "\n"
2131 "\n"
2130 "\t%s keywords expanded%s\n"
2132 "\t%s keywords expanded%s\n"
2131 msgstr ""
2133 msgstr ""
2132
2134
2133 #, python-format
2135 #, python-format
2134 msgid ""
2136 msgid ""
2135 "\n"
2137 "\n"
2136 "removing temporary repository %s\n"
2138 "removing temporary repository %s\n"
2137 msgstr ""
2139 msgstr ""
2138
2140
2139 msgid ""
2141 msgid ""
2140 "expand keywords in the working directory\n"
2142 "expand keywords in the working directory\n"
2141 "\n"
2143 "\n"
2142 " Run after (re)enabling keyword expansion.\n"
2144 " Run after (re)enabling keyword expansion.\n"
2143 "\n"
2145 "\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2146 " kwexpand refuses to run if given files contain local changes.\n"
2145 " "
2147 " "
2146 msgstr ""
2148 msgstr ""
2147
2149
2148 msgid ""
2150 msgid ""
2149 "show files configured for keyword expansion\n"
2151 "show files configured for keyword expansion\n"
2150 "\n"
2152 "\n"
2151 " List which files in the working directory are matched by the\n"
2153 " List which files in the working directory are matched by the\n"
2152 " [keyword] configuration patterns.\n"
2154 " [keyword] configuration patterns.\n"
2153 "\n"
2155 "\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2156 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2155 " execution by including only files that are actual candidates\n"
2157 " execution by including only files that are actual candidates\n"
2156 " for expansion.\n"
2158 " for expansion.\n"
2157 "\n"
2159 "\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2160 " See \"hg help keyword\" on how to construct patterns both for\n"
2159 " inclusion and exclusion of files.\n"
2161 " inclusion and exclusion of files.\n"
2160 "\n"
2162 "\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2163 " Use -u/--untracked to list untracked files as well.\n"
2162 "\n"
2164 "\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2165 " With -a/--all and -v/--verbose the codes used to show the status\n"
2164 " of files are:\n"
2166 " of files are:\n"
2165 " K = keyword expansion candidate\n"
2167 " K = keyword expansion candidate\n"
2166 " k = keyword expansion candidate (untracked)\n"
2168 " k = keyword expansion candidate (untracked)\n"
2167 " I = ignored\n"
2169 " I = ignored\n"
2168 " i = ignored (untracked)\n"
2170 " i = ignored (untracked)\n"
2169 " "
2171 " "
2170 msgstr ""
2172 msgstr ""
2171
2173
2172 msgid ""
2174 msgid ""
2173 "revert expanded keywords in the working directory\n"
2175 "revert expanded keywords in the working directory\n"
2174 "\n"
2176 "\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2177 " Run before changing/disabling active keywords or if you experience\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2178 " problems with \"hg import\" or \"hg merge\".\n"
2177 "\n"
2179 "\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2180 " kwshrink refuses to run if given files contain local changes.\n"
2179 " "
2181 " "
2180 msgstr ""
2182 msgstr ""
2181
2183
2182 msgid "show default keyword template maps"
2184 msgid "show default keyword template maps"
2183 msgstr ""
2185 msgstr ""
2184
2186
2185 msgid "read maps from rcfile"
2187 msgid "read maps from rcfile"
2186 msgstr ""
2188 msgstr ""
2187
2189
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2190 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2189 msgstr ""
2191 msgstr ""
2190
2192
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2193 msgid "hg kwexpand [OPTION]... [FILE]..."
2192 msgstr ""
2194 msgstr ""
2193
2195
2194 msgid "show keyword status flags of all files"
2196 msgid "show keyword status flags of all files"
2195 msgstr ""
2197 msgstr ""
2196
2198
2197 msgid "show files excluded from expansion"
2199 msgid "show files excluded from expansion"
2198 msgstr ""
2200 msgstr ""
2199
2201
2200 msgid "additionally show untracked files"
2202 msgid "additionally show untracked files"
2201 msgstr ""
2203 msgstr ""
2202
2204
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2205 msgid "hg kwfiles [OPTION]... [FILE]..."
2204 msgstr ""
2206 msgstr ""
2205
2207
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2208 msgid "hg kwshrink [OPTION]... [FILE]..."
2207 msgstr ""
2209 msgstr ""
2208
2210
2209 msgid ""
2211 msgid ""
2210 "manage a stack of patches\n"
2212 "manage a stack of patches\n"
2211 "\n"
2213 "\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2214 "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"
2215 "repository. It manages two stacks of patches - all known patches, and\n"
2214 "applied patches (subset of known patches).\n"
2216 "applied patches (subset of known patches).\n"
2215 "\n"
2217 "\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2218 "Known patches are represented as patch files in the .hg/patches\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2219 "directory. Applied patches are both patch files and changesets.\n"
2218 "\n"
2220 "\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2221 "Common tasks (use \"hg help command\" for more details):\n"
2220 "\n"
2222 "\n"
2221 "prepare repository to work with patches qinit\n"
2223 "prepare repository to work with patches qinit\n"
2222 "create new patch qnew\n"
2224 "create new patch qnew\n"
2223 "import existing patch qimport\n"
2225 "import existing patch qimport\n"
2224 "\n"
2226 "\n"
2225 "print patch series qseries\n"
2227 "print patch series qseries\n"
2226 "print applied patches qapplied\n"
2228 "print applied patches qapplied\n"
2227 "print name of top applied patch qtop\n"
2229 "print name of top applied patch qtop\n"
2228 "\n"
2230 "\n"
2229 "add known patch to applied stack qpush\n"
2231 "add known patch to applied stack qpush\n"
2230 "remove patch from applied stack qpop\n"
2232 "remove patch from applied stack qpop\n"
2231 "refresh contents of top applied patch qrefresh\n"
2233 "refresh contents of top applied patch qrefresh\n"
2232 msgstr ""
2234 msgstr ""
2233 "gestion et utilisation d'une pile de patchs\n"
2235 "gestion et utilisation d'une pile de patchs\n"
2234 "\n"
2236 "\n"
2235 "Cette extension permet de travailler avec une pile de patchs au\n"
2237 "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"
2238 "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"
2239 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2238 "qui ont été appliqués.\n"
2240 "qui ont été appliqués.\n"
2239 "\n"
2241 "\n"
2240 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2242 "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"
2243 "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"
2244 "appliqués sont présents à la fois sous forme de fichier et de\n"
2243 "\"changesets\".\n"
2245 "\"changesets\".\n"
2244 "\n"
2246 "\n"
2245 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2247 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2246 "\n"
2248 "\n"
2247 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2249 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2248 "créer un nouveau patch qnew\n"
2250 "créer un nouveau patch qnew\n"
2249 "importer un patch existant qimport\n"
2251 "importer un patch existant qimport\n"
2250 "\n"
2252 "\n"
2251 "afficher la série de patchs complète qseries\n"
2253 "afficher la série de patchs complète qseries\n"
2252 "afficher les patchs appliqués qapplied\n"
2254 "afficher les patchs appliqués qapplied\n"
2253 "afficher le nom du dernier patch appliqué qtop\n"
2255 "afficher le nom du dernier patch appliqué qtop\n"
2254 "\n"
2256 "\n"
2255 "empiler/appliquer un patch référencé sur la pile qpush\n"
2257 "empiler/appliquer un patch référencé sur la pile qpush\n"
2256 "dépiler/ôter un patch de la pile qpop\n"
2258 "dépiler/ôter un patch de la pile qpop\n"
2257 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2259 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2258
2260
2259 #, python-format
2261 #, python-format
2260 msgid "%s appears more than once in %s"
2262 msgid "%s appears more than once in %s"
2261 msgstr "%s apparaît plus d'une fois dans %s"
2263 msgstr "%s apparaît plus d'une fois dans %s"
2262
2264
2263 msgid "guard cannot be an empty string"
2265 msgid "guard cannot be an empty string"
2264 msgstr ""
2266 msgstr ""
2265
2267
2266 #, python-format
2268 #, python-format
2267 msgid "guard %r starts with invalid character: %r"
2269 msgid "guard %r starts with invalid character: %r"
2268 msgstr ""
2270 msgstr ""
2269
2271
2270 #, python-format
2272 #, python-format
2271 msgid "invalid character in guard %r: %r"
2273 msgid "invalid character in guard %r: %r"
2272 msgstr ""
2274 msgstr ""
2273
2275
2274 #, python-format
2276 #, python-format
2275 msgid "active guards: %s\n"
2277 msgid "active guards: %s\n"
2276 msgstr ""
2278 msgstr ""
2277
2279
2278 #, python-format
2280 #, python-format
2279 msgid "guard %r too short"
2281 msgid "guard %r too short"
2280 msgstr ""
2282 msgstr ""
2281
2283
2282 #, python-format
2284 #, python-format
2283 msgid "guard %r starts with invalid char"
2285 msgid "guard %r starts with invalid char"
2284 msgstr ""
2286 msgstr ""
2285
2287
2286 #, python-format
2288 #, python-format
2287 msgid "allowing %s - no guards in effect\n"
2289 msgid "allowing %s - no guards in effect\n"
2288 msgstr ""
2290 msgstr ""
2289
2291
2290 #, python-format
2292 #, python-format
2291 msgid "allowing %s - no matching negative guards\n"
2293 msgid "allowing %s - no matching negative guards\n"
2292 msgstr ""
2294 msgstr ""
2293
2295
2294 #, python-format
2296 #, python-format
2295 msgid "allowing %s - guarded by %r\n"
2297 msgid "allowing %s - guarded by %r\n"
2296 msgstr ""
2298 msgstr ""
2297
2299
2298 #, python-format
2300 #, python-format
2299 msgid "skipping %s - guarded by %r\n"
2301 msgid "skipping %s - guarded by %r\n"
2300 msgstr ""
2302 msgstr ""
2301
2303
2302 #, python-format
2304 #, python-format
2303 msgid "skipping %s - no matching guards\n"
2305 msgid "skipping %s - no matching guards\n"
2304 msgstr ""
2306 msgstr ""
2305
2307
2306 #, python-format
2308 #, python-format
2307 msgid "error removing undo: %s\n"
2309 msgid "error removing undo: %s\n"
2308 msgstr ""
2310 msgstr ""
2309
2311
2310 #, python-format
2312 #, python-format
2311 msgid "apply failed for patch %s"
2313 msgid "apply failed for patch %s"
2312 msgstr "l'application du patch %s a échoué"
2314 msgstr "l'application du patch %s a échoué"
2313
2315
2314 #, python-format
2316 #, python-format
2315 msgid "patch didn't work out, merging %s\n"
2317 msgid "patch didn't work out, merging %s\n"
2316 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2318 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2317
2319
2318 #, python-format
2320 #, python-format
2319 msgid "update returned %d"
2321 msgid "update returned %d"
2320 msgstr ""
2322 msgstr ""
2321
2323
2322 msgid "repo commit failed"
2324 msgid "repo commit failed"
2323 msgstr ""
2325 msgstr ""
2324
2326
2325 #, python-format
2327 #, python-format
2326 msgid "unable to read %s"
2328 msgid "unable to read %s"
2327 msgstr "impossible de lire %s"
2329 msgstr "impossible de lire %s"
2328
2330
2329 #, python-format
2331 #, python-format
2330 msgid "patch %s does not exist\n"
2332 msgid "patch %s does not exist\n"
2331 msgstr "le patch %s n'existe pas\n"
2333 msgstr "le patch %s n'existe pas\n"
2332
2334
2333 #, python-format
2335 #, python-format
2334 msgid "patch %s is not applied\n"
2336 msgid "patch %s is not applied\n"
2335 msgstr "le patch %s n'est pas appliqué\n"
2337 msgstr "le patch %s n'est pas appliqué\n"
2336
2338
2337 msgid "patch failed, unable to continue (try -v)\n"
2339 msgid "patch failed, unable to continue (try -v)\n"
2338 msgstr ""
2340 msgstr ""
2339 "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2341 "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2340
2342
2341 #, python-format
2343 #, python-format
2342 msgid "applying %s\n"
2344 msgid "applying %s\n"
2343 msgstr "application de %s\n"
2345 msgstr "application de %s\n"
2344
2346
2345 #, python-format
2347 #, python-format
2346 msgid "unable to read %s\n"
2348 msgid "unable to read %s\n"
2347 msgstr "impossible de lire %s\n"
2349 msgstr "impossible de lire %s\n"
2348
2350
2349 #, python-format
2351 #, python-format
2350 msgid "imported patch %s\n"
2352 msgid "imported patch %s\n"
2351 msgstr "le patch %s a été importé\n"
2353 msgstr "le patch %s a été importé\n"
2352
2354
2353 #, python-format
2355 #, python-format
2354 msgid ""
2356 msgid ""
2355 "\n"
2357 "\n"
2356 "imported patch %s"
2358 "imported patch %s"
2357 msgstr ""
2359 msgstr ""
2358 "\n"
2360 "\n"
2359 "le patch %s a été importé"
2361 "le patch %s a été importé"
2360
2362
2361 #, python-format
2363 #, python-format
2362 msgid "patch %s is empty\n"
2364 msgid "patch %s is empty\n"
2363 msgstr "le patch %s est vide\n"
2365 msgstr "le patch %s est vide\n"
2364
2366
2365 msgid "patch failed, rejects left in working dir\n"
2367 msgid "patch failed, rejects left in working dir\n"
2366 msgstr ""
2368 msgstr ""
2367
2369
2368 msgid "fuzz found when applying patch, stopping\n"
2370 msgid "fuzz found when applying patch, stopping\n"
2369 msgstr ""
2371 msgstr ""
2370
2372
2371 #, python-format
2373 #, python-format
2372 msgid "revision %d is not managed"
2374 msgid "revision %d is not managed"
2373 msgstr "la révision %d n'est pas gérée"
2375 msgstr "la révision %d n'est pas gérée"
2374
2376
2375 #, python-format
2377 #, python-format
2376 msgid "cannot delete revision %d above applied patches"
2378 msgid "cannot delete revision %d above applied patches"
2377 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2379 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2378
2380
2379 #, python-format
2381 #, python-format
2380 msgid "patch %s finalized without changeset message\n"
2382 msgid "patch %s finalized without changeset message\n"
2381 msgstr ""
2383 msgstr ""
2382
2384
2383 msgid "qdelete requires at least one revision or patch name"
2385 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"
2386 msgstr "qdelete requiert au moins une révision ou le nom d'un patch"
2385
2387
2386 #, python-format
2388 #, python-format
2387 msgid "cannot delete applied patch %s"
2389 msgid "cannot delete applied patch %s"
2388 msgstr "impossible de supprimer le patch appliqué %s"
2390 msgstr "impossible de supprimer le patch appliqué %s"
2389
2391
2390 #, python-format
2392 #, python-format
2391 msgid "patch %s not in series file"
2393 msgid "patch %s not in series file"
2392 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2394 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2393
2395
2394 msgid "no patches applied"
2396 msgid "no patches applied"
2395 msgstr "pas de patchs appliqués"
2397 msgstr "pas de patchs appliqués"
2396
2398
2397 msgid "working directory revision is not qtip"
2399 msgid "working directory revision is not qtip"
2398 msgstr "le répertoire de travail n'est pas à la révision qtip"
2400 msgstr "le répertoire de travail n'est pas à la révision qtip"
2399
2401
2400 msgid "local changes found, refresh first"
2402 msgid "local changes found, refresh first"
2401 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2403 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2402
2404
2403 msgid "local changes found"
2405 msgid "local changes found"
2404 msgstr "modifications locales trouvées"
2406 msgstr "modifications locales trouvées"
2405
2407
2406 #, python-format
2408 #, python-format
2407 msgid "\"%s\" cannot be used as the name of a patch"
2409 msgid "\"%s\" cannot be used as the name of a patch"
2408 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2410 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2409
2411
2410 #, python-format
2412 #, python-format
2411 msgid "patch \"%s\" already exists"
2413 msgid "patch \"%s\" already exists"
2412 msgstr "le patch \"%s\" existe déjà"
2414 msgstr "le patch \"%s\" existe déjà"
2413
2415
2414 #, python-format
2416 #, python-format
2415 msgid "error unlinking %s\n"
2417 msgid "error unlinking %s\n"
2416 msgstr "erreur lors de la suppression de %s\n"
2418 msgstr "erreur lors de la suppression de %s\n"
2417
2419
2418 #, python-format
2420 #, python-format
2419 msgid "patch name \"%s\" is ambiguous:\n"
2421 msgid "patch name \"%s\" is ambiguous:\n"
2420 msgstr "\"%s\" est un nom de patch ambigu :\n"
2422 msgstr "\"%s\" est un nom de patch ambigu :\n"
2421
2423
2422 #, python-format
2424 #, python-format
2423 msgid "patch %s not in series"
2425 msgid "patch %s not in series"
2424 msgstr "le patch %s ne figure pas dans la série"
2426 msgstr "le patch %s ne figure pas dans la série"
2425
2427
2426 #, fuzzy
2428 #, fuzzy
2427 msgid "(working directory not at a head)\n"
2429 msgid "(working directory not at a head)\n"
2428 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2430 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2429
2431
2430 msgid "no patches in series\n"
2432 msgid "no patches in series\n"
2431 msgstr "pas de patchs dans la série\n"
2433 msgstr "pas de patchs dans la série\n"
2432
2434
2433 #, python-format
2435 #, python-format
2434 msgid "cannot push to a previous patch: %s"
2436 msgid "cannot push to a previous patch: %s"
2435 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2437 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2436
2438
2437 #, python-format
2439 #, python-format
2438 msgid "qpush: %s is already at the top\n"
2440 msgid "qpush: %s is already at the top\n"
2439 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2441 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2440
2442
2441 #, python-format
2443 #, python-format
2442 msgid "guarded by %r"
2444 msgid "guarded by %r"
2443 msgstr ""
2445 msgstr ""
2444
2446
2445 msgid "no matching guards"
2447 msgid "no matching guards"
2446 msgstr ""
2448 msgstr ""
2447
2449
2448 #, python-format
2450 #, python-format
2449 msgid "cannot push '%s' - %s\n"
2451 msgid "cannot push '%s' - %s\n"
2450 msgstr "impossible d'empiler '%s' - %s\n"
2452 msgstr "impossible d'empiler '%s' - %s\n"
2451
2453
2452 msgid "all patches are currently applied\n"
2454 msgid "all patches are currently applied\n"
2453 msgstr "tous les patchs sont actuellement appliqués\n"
2455 msgstr "tous les patchs sont actuellement appliqués\n"
2454
2456
2455 msgid "patch series already fully applied\n"
2457 msgid "patch series already fully applied\n"
2456 msgstr "la série de patchs est déjà complètement appliquée\n"
2458 msgstr "la série de patchs est déjà complètement appliquée\n"
2457
2459
2458 msgid "cleaning up working directory..."
2460 msgid "cleaning up working directory..."
2459 msgstr "nettoyage du répertoire de travail..."
2461 msgstr "nettoyage du répertoire de travail..."
2460
2462
2461 #, python-format
2463 #, python-format
2462 msgid "errors during apply, please fix and refresh %s\n"
2464 msgid "errors during apply, please fix and refresh %s\n"
2463 msgstr ""
2465 msgstr ""
2464 "des erreurs se sont produites durant l'application, veuillez corriger puis "
2466 "des erreurs se sont produites durant l'application, veuillez corriger puis "
2465 "rafraîchir %s\n"
2467 "rafraîchir %s\n"
2466
2468
2467 #, python-format
2469 #, python-format
2468 msgid "now at: %s\n"
2470 msgid "now at: %s\n"
2469 msgstr "actuellement à : %s\n"
2471 msgstr "actuellement à : %s\n"
2470
2472
2471 #, python-format
2473 #, python-format
2472 msgid "patch %s is not applied"
2474 msgid "patch %s is not applied"
2473 msgstr "le patch %s n'est pas appliqué"
2475 msgstr "le patch %s n'est pas appliqué"
2474
2476
2475 msgid "no patches applied\n"
2477 msgid "no patches applied\n"
2476 msgstr "aucun patch appliqué\n"
2478 msgstr "aucun patch appliqué\n"
2477
2479
2478 #, python-format
2480 #, python-format
2479 msgid "qpop: %s is already at the top\n"
2481 msgid "qpop: %s is already at the top\n"
2480 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2482 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2481
2483
2482 msgid "qpop: forcing dirstate update\n"
2484 msgid "qpop: forcing dirstate update\n"
2483 msgstr ""
2485 msgstr ""
2484 "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2486 "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2485
2487
2486 #, python-format
2488 #, python-format
2487 msgid "trying to pop unknown node %s"
2489 msgid "trying to pop unknown node %s"
2488 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2490 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2489
2491
2490 msgid "popping would remove a revision not managed by this patch queue"
2492 msgid "popping would remove a revision not managed by this patch queue"
2491 msgstr ""
2493 msgstr ""
2492 "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2494 "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2493
2495
2494 msgid "deletions found between repo revs"
2496 msgid "deletions found between repo revs"
2495 msgstr "suppressions trouvées entre des révisions du dépôt"
2497 msgstr "suppressions trouvées entre des révisions du dépôt"
2496
2498
2497 msgid "patch queue now empty\n"
2499 msgid "patch queue now empty\n"
2498 msgstr "la pile de patchs est maintenant vide\n"
2500 msgstr "la pile de patchs est maintenant vide\n"
2499
2501
2500 msgid "cannot refresh a revision with children"
2502 msgid "cannot refresh a revision with children"
2501 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2503 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2502
2504
2503 # restaurer/récupérer ? pas satisfait...
2505 # restaurer/récupérer ? pas satisfait...
2504 msgid ""
2506 msgid ""
2505 "refresh interrupted while patch was popped! (revert --all, qpush to "
2507 "refresh interrupted while patch was popped! (revert --all, qpush to "
2506 "recover)\n"
2508 "recover)\n"
2507 msgstr ""
2509 msgstr ""
2508 "rafraîchissement interrompu alors qu'un patch était en cours de dépilement "
2510 "rafraîchissement interrompu alors qu'un patch était en cours de dépilement "
2509 "(utiliser revert --all, ou qpush pour restaurer l'état)\n"
2511 "(utiliser revert --all, ou qpush pour restaurer l'état)\n"
2510
2512
2511 msgid "patch queue directory already exists"
2513 msgid "patch queue directory already exists"
2512 msgstr "la pile de patchs existe déjà"
2514 msgstr "la pile de patchs existe déjà"
2513
2515
2514 #, python-format
2516 #, python-format
2515 msgid "patch %s is not in series file"
2517 msgid "patch %s is not in series file"
2516 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2518 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2517
2519
2518 msgid "No saved patch data found\n"
2520 msgid "No saved patch data found\n"
2519 msgstr ""
2521 msgstr ""
2520
2522
2521 #, python-format
2523 #, python-format
2522 msgid "restoring status: %s\n"
2524 msgid "restoring status: %s\n"
2523 msgstr "rétablissement de l'état : %s\n"
2525 msgstr "rétablissement de l'état : %s\n"
2524
2526
2525 msgid "save entry has children, leaving it alone\n"
2527 msgid "save entry has children, leaving it alone\n"
2526 msgstr ""
2528 msgstr ""
2527
2529
2528 #, python-format
2530 #, python-format
2529 msgid "removing save entry %s\n"
2531 msgid "removing save entry %s\n"
2530 msgstr ""
2532 msgstr ""
2531
2533
2532 #, python-format
2534 #, python-format
2533 msgid "saved queue repository parents: %s %s\n"
2535 msgid "saved queue repository parents: %s %s\n"
2534 msgstr ""
2536 msgstr ""
2535
2537
2536 msgid "queue directory updating\n"
2538 msgid "queue directory updating\n"
2537 msgstr "mise à jour du répertoire de patchs\n"
2539 msgstr "mise à jour du répertoire de patchs\n"
2538
2540
2539 msgid "Unable to load queue repository\n"
2541 msgid "Unable to load queue repository\n"
2540 msgstr "Impossible de charger le dépôt de patchs\n"
2542 msgstr "Impossible de charger le dépôt de patchs\n"
2541
2543
2542 msgid "save: no patches applied, exiting\n"
2544 msgid "save: no patches applied, exiting\n"
2543 msgstr ""
2545 msgstr ""
2544
2546
2545 msgid "status is already saved\n"
2547 msgid "status is already saved\n"
2546 msgstr "l'état a déjà été sauvegardé\n"
2548 msgstr "l'état a déjà été sauvegardé\n"
2547
2549
2548 msgid "hg patches saved state"
2550 msgid "hg patches saved state"
2549 msgstr ""
2551 msgstr ""
2550
2552
2551 msgid "repo commit failed\n"
2553 msgid "repo commit failed\n"
2552 msgstr ""
2554 msgstr ""
2553
2555
2554 #, python-format
2556 #, python-format
2555 msgid "patch %s is already in the series file"
2557 msgid "patch %s is already in the series file"
2556 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2558 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2557
2559
2558 msgid "option \"-r\" not valid when importing files"
2560 msgid "option \"-r\" not valid when importing files"
2559 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2561 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2560
2562
2561 msgid "option \"-n\" not valid when importing multiple patches"
2563 msgid "option \"-n\" not valid when importing multiple patches"
2562 msgstr ""
2564 msgstr ""
2563 "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs "
2565 "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs "
2564 "patchs"
2566 "patchs"
2565
2567
2566 # origine/base/racine ?
2568 # origine/base/racine ?
2567 #, python-format
2569 #, python-format
2568 msgid "revision %d is the root of more than one branch"
2570 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"
2571 msgstr "la révision %d est à l'origine de plus d'une branche"
2570
2572
2571 #, python-format
2573 #, python-format
2572 msgid "revision %d is already managed"
2574 msgid "revision %d is already managed"
2573 msgstr "la révision %d est déjà gérée"
2575 msgstr "la révision %d est déjà gérée"
2574
2576
2575 #, python-format
2577 #, python-format
2576 msgid "revision %d is not the parent of the queue"
2578 msgid "revision %d is not the parent of the queue"
2577 msgstr "la révision %d n'est pas parente de la pile"
2579 msgstr "la révision %d n'est pas parente de la pile"
2578
2580
2579 #, python-format
2581 #, python-format
2580 msgid "revision %d has unmanaged children"
2582 msgid "revision %d has unmanaged children"
2581 msgstr "la révision %d possède des révisions filles non gérées"
2583 msgstr "la révision %d possède des révisions filles non gérées"
2582
2584
2583 #, python-format
2585 #, python-format
2584 msgid "cannot import merge revision %d"
2586 msgid "cannot import merge revision %d"
2585 msgstr "impossible d'importer la révision fusionnée %d"
2587 msgstr "impossible d'importer la révision fusionnée %d"
2586
2588
2587 #, python-format
2589 #, python-format
2588 msgid "revision %d is not the parent of %d"
2590 msgid "revision %d is not the parent of %d"
2589 msgstr "%d n'est pas la révision parente de %d"
2591 msgstr "%d n'est pas la révision parente de %d"
2590
2592
2591 msgid "-e is incompatible with import from -"
2593 msgid "-e is incompatible with import from -"
2592 msgstr "-e n'est pas compatible avec l'importation depuis -"
2594 msgstr "-e n'est pas compatible avec l'importation depuis -"
2593
2595
2594 #, python-format
2596 #, python-format
2595 msgid "patch %s does not exist"
2597 msgid "patch %s does not exist"
2596 msgstr "le patch %s n'existe pas"
2598 msgstr "le patch %s n'existe pas"
2597
2599
2598 msgid "need --name to import a patch from -"
2600 msgid "need --name to import a patch from -"
2599 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
2601 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
2600
2602
2601 #, python-format
2603 #, python-format
2602 msgid "adding %s to series file\n"
2604 msgid "adding %s to series file\n"
2603 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2605 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2604
2606
2605 msgid ""
2607 msgid ""
2606 "remove patches from queue\n"
2608 "remove patches from queue\n"
2607 "\n"
2609 "\n"
2608 " The patches must not be applied, and at least one patch is required. "
2610 " The patches must not be applied, and at least one patch is required. "
2609 "With\n"
2611 "With\n"
2610 " -k/--keep, the patch files are preserved in the patch directory.\n"
2612 " -k/--keep, the patch files are preserved in the patch directory.\n"
2611 "\n"
2613 "\n"
2612 " To stop managing a patch and move it into permanent history,\n"
2614 " To stop managing a patch and move it into permanent history,\n"
2613 " use the qfinish command."
2615 " use the qfinish command."
2614
2615 msgstr ""
2616 msgstr ""
2616 "supprime des patchs de la pile\n"
2617 "supprime des patchs de la pile\n"
2617 "\n"
2618 "\n"
2618 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
2619 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
2619 " nécessaire de fournir au moins un patch.\n"
2620 " nécessaire de fournir au moins un patch.\n"
2620 "\n"
2621 "\n"
2621 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
2622 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
2622 " de patchs.\n"
2623 " de patchs.\n"
2623 "\n"
2624 "\n"
2624 " Pour arrêter de gérer un patch et le déplacer de manière\n"
2625 " 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"
2626 " permanente vers l'historique du dépôt, utilisez la commande\n"
2626 " qfinish."
2627 " qfinish."
2627
2628
2628 msgid "print the patches already applied"
2629 msgid "print the patches already applied"
2629 msgstr "affiche les patchs déjà appliqués"
2630 msgstr "affiche les patchs déjà appliqués"
2630
2631
2631 msgid "print the patches not yet applied"
2632 msgid "print the patches not yet applied"
2632 msgstr "affiche les patchs non encore appliqués"
2633 msgstr "affiche les patchs non encore appliqués"
2633
2634
2634 msgid ""
2635 msgid ""
2635 "import a patch\n"
2636 "import a patch\n"
2636 "\n"
2637 "\n"
2637 " The patch is inserted into the series after the last applied\n"
2638 " 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"
2639 " patch. If no patches have been applied, qimport prepends the patch\n"
2639 " to the series.\n"
2640 " to the series.\n"
2640 "\n"
2641 "\n"
2641 " The patch will have the same name as its source file unless you\n"
2642 " The patch will have the same name as its source file unless you\n"
2642 " give it a new one with -n/--name.\n"
2643 " give it a new one with -n/--name.\n"
2643 "\n"
2644 "\n"
2644 " You can register an existing patch inside the patch directory with\n"
2645 " You can register an existing patch inside the patch directory with\n"
2645 " the -e/--existing flag.\n"
2646 " the -e/--existing flag.\n"
2646 "\n"
2647 "\n"
2647 " With -f/--force, an existing patch of the same name will be\n"
2648 " With -f/--force, an existing patch of the same name will be\n"
2648 " overwritten.\n"
2649 " overwritten.\n"
2649 "\n"
2650 "\n"
2650 " An existing changeset may be placed under mq control with -r/--rev\n"
2651 " 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"
2652 " (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"
2653 " 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"
2654 " format. See the diffs help topic for information on why this is\n"
2654 " important for preserving rename/copy information and permission\n"
2655 " important for preserving rename/copy information and permission\n"
2655 " changes.\n"
2656 " changes.\n"
2656 "\n"
2657 "\n"
2657 " To import a patch from standard input, pass - as the patch file.\n"
2658 " 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"
2659 " When importing from standard input, a patch name must be specified\n"
2659 " using the --name flag.\n"
2660 " using the --name flag.\n"
2660 " "
2661 " "
2661 msgstr ""
2662 msgstr ""
2662 "importe un patch\n"
2663 "importe un patch\n"
2663 "\n"
2664 "\n"
2664 " Le patch est inséré dans la série à la suite du dernier patch\n"
2665 " 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"
2666 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
2666 " ajouté en tête de série.\n"
2667 " ajouté en tête de série.\n"
2667 "\n"
2668 "\n"
2668 " Le patch portera le même nom que le fichier dont il provient,\n"
2669 " 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"
2670 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
2670 "\n"
2671 "\n"
2671 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
2672 " 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"
2673 " de patchs à l'aide de l'option -e/--existing.\n"
2673 "\n"
2674 "\n"
2674 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
2675 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
2675 "\n"
2676 "\n"
2676 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
2677 " 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"
2678 " à 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"
2679 " 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"
2680 " 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"
2681 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
2681 " l'aide explique l'importance de cette option pour la\n"
2682 " l'aide explique l'importance de cette option pour la\n"
2682 " préservation des informations de copie/renommage et des\n"
2683 " préservation des informations de copie/renommage et des\n"
2683 " modifications de permissions.\n"
2684 " modifications de permissions.\n"
2684 "\n"
2685 "\n"
2685 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
2686 " 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"
2687 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
2687 " patch à l'aide de l'option --name.\n"
2688 " patch à l'aide de l'option --name.\n"
2688 " "
2689 " "
2689
2690
2690 msgid ""
2691 msgid ""
2691 "init a new queue repository\n"
2692 "init a new queue repository\n"
2692 "\n"
2693 "\n"
2693 " The queue repository is unversioned by default. If\n"
2694 " The queue repository is unversioned by default. If\n"
2694 " -c/--create-repo is specified, qinit will create a separate nested\n"
2695 " -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"
2696 " 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"
2697 " an unversioned patch repository into a versioned one). You can use\n"
2697 " qcommit to commit changes to this queue repository."
2698 " qcommit to commit changes to this queue repository."
2698 msgstr ""
2699 msgstr ""
2699
2700
2700 msgid ""
2701 msgid ""
2701 "clone main and patch repository at same time\n"
2702 "clone main and patch repository at same time\n"
2702 "\n"
2703 "\n"
2703 " If source is local, destination will have no patches applied. If\n"
2704 " 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"
2705 " source is remote, this command can not check if patches are\n"
2705 " applied in source, so cannot guarantee that patches are not\n"
2706 " applied in source, so cannot guarantee that patches are not\n"
2706 " applied in destination. If you clone remote repository, be sure\n"
2707 " applied in destination. If you clone remote repository, be sure\n"
2707 " before that it has no patches applied.\n"
2708 " before that it has no patches applied.\n"
2708 "\n"
2709 "\n"
2709 " Source patch repository is looked for in <src>/.hg/patches by\n"
2710 " Source patch repository is looked for in <src>/.hg/patches by\n"
2710 " default. Use -p <url> to change.\n"
2711 " default. Use -p <url> to change.\n"
2711 "\n"
2712 "\n"
2712 " The patch directory must be a nested Mercurial repository, as\n"
2713 " The patch directory must be a nested Mercurial repository, as\n"
2713 " would be created by qinit -c.\n"
2714 " would be created by qinit -c.\n"
2714 " "
2715 " "
2715 msgstr ""
2716 msgstr ""
2716 "clône simultanément le dépôt principal et le dépôt des patchs\n"
2717 "clône simultanément le dépôt principal et le dépôt des patchs\n"
2717 "\n"
2718 "\n"
2718 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
2719 " 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"
2720 " 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"
2721 " 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"
2722 " 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"
2723 " 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"
2724 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
2724 " aucun patch d'appliqué.\n"
2725 " aucun patch d'appliqué.\n"
2725 "\n"
2726 "\n"
2726 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
2727 " 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"
2728 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
2728 " un chemin différent.\n"
2729 " un chemin différent.\n"
2729 "\n"
2730 "\n"
2730 " Le répertoire de patchs doit être contenu dans le dépôt\n"
2731 " Le répertoire de patchs doit être contenu dans le dépôt\n"
2731 " principal, tel que créé par qinit -c.\n"
2732 " principal, tel que créé par qinit -c.\n"
2732 " "
2733 " "
2733
2734
2734 msgid "versioned patch repository not found (see qinit -c)"
2735 msgid "versioned patch repository not found (see qinit -c)"
2735 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
2736 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
2736
2737
2737 msgid "cloning main repository\n"
2738 msgid "cloning main repository\n"
2738 msgstr "clônage du dépôt principal\n"
2739 msgstr "clônage du dépôt principal\n"
2739
2740
2740 msgid "cloning patch repository\n"
2741 msgid "cloning patch repository\n"
2741 msgstr "clônage du dépôt des patchs\n"
2742 msgstr "clônage du dépôt des patchs\n"
2742
2743
2743 msgid "stripping applied patches from destination repository\n"
2744 msgid "stripping applied patches from destination repository\n"
2744 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
2745 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
2745
2746
2746 msgid "updating destination repository\n"
2747 msgid "updating destination repository\n"
2747 msgstr "mise à jour du dépôt cible\n"
2748 msgstr "mise à jour du dépôt cible\n"
2748
2749
2749 msgid "commit changes in the queue repository"
2750 msgid "commit changes in the queue repository"
2750 msgstr ""
2751 msgstr ""
2751
2752
2752 msgid "print the entire series file"
2753 msgid "print the entire series file"
2753 msgstr "afficher la liste complète de patchs (fichier \"series\")"
2754 msgstr "afficher la liste complète de patchs (fichier \"series\")"
2754
2755
2755 msgid "print the name of the current patch"
2756 msgid "print the name of the current patch"
2756 msgstr "affiche le nom du dernier patch appliqué"
2757 msgstr "affiche le nom du dernier patch appliqué"
2757
2758
2758 msgid "print the name of the next patch"
2759 msgid "print the name of the next patch"
2759 msgstr "affiche le nom du prochain patch"
2760 msgstr "affiche le nom du prochain patch"
2760
2761
2761 msgid "all patches applied\n"
2762 msgid "all patches applied\n"
2762 msgstr "tous les patchs ont été appliqués\n"
2763 msgstr "tous les patchs ont été appliqués\n"
2763
2764
2764 msgid "print the name of the previous patch"
2765 msgid "print the name of the previous patch"
2765 msgstr "affiche le nom du patch précédent"
2766 msgstr "affiche le nom du patch précédent"
2766
2767
2767 msgid "only one patch applied\n"
2768 msgid "only one patch applied\n"
2768 msgstr "un seul patch d'appliqué\n"
2769 msgstr "un seul patch d'appliqué\n"
2769
2770
2770 msgid ""
2771 msgid ""
2771 "create a new patch\n"
2772 "create a new patch\n"
2772 "\n"
2773 "\n"
2773 " qnew creates a new patch on top of the currently-applied patch (if\n"
2774 " 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"
2775 " 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"
2776 " unless -f/--force is specified, in which case the patch will be\n"
2776 " initialized with them. You may also use -I/--include,\n"
2777 " 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"
2778 " -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"
2779 " only changes to matching files to the new patch, leaving the rest\n"
2779 " as uncommitted modifications.\n"
2780 " as uncommitted modifications.\n"
2780 "\n"
2781 "\n"
2781 " -u/--user and -d/--date can be used to set the (given) user and\n"
2782 " -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"
2783 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2783 " to current user and date to current date.\n"
2784 " to current user and date to current date.\n"
2784 "\n"
2785 "\n"
2785 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2786 " -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"
2787 " well as the commit message. If none is specified, the header is\n"
2787 " empty and the commit message is '[mq]: PATCH'.\n"
2788 " empty and the commit message is '[mq]: PATCH'.\n"
2788 "\n"
2789 "\n"
2789 " Use the -g/--git option to keep the patch in the git extended diff\n"
2790 " 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"
2791 " format. Read the diffs help topic for more information on why this\n"
2791 " is important for preserving permission changes and copy/rename\n"
2792 " is important for preserving permission changes and copy/rename\n"
2792 " information.\n"
2793 " information.\n"
2793 " "
2794 " "
2794 msgstr ""
2795 msgstr ""
2795 "crée un nouveau patch\n"
2796 "crée un nouveau patch\n"
2796 "\n"
2797 "\n"
2797 " qnew crée un nouveau patch au-dessus du dernier patch\n"
2798 " qnew crée un nouveau patch au-dessus du dernier patch\n"
2798 " actuellement appliqué, le cas échéant. Si le répertoire\n"
2799 " actuellement appliqué, le cas échéant. Si le répertoire\n"
2799 " de travail comporte des modifications non enregistrées,\n"
2800 " de travail comporte des modifications non enregistrées,\n"
2800 " la création du patch sera refusée, à moins d'utiliser\n"
2801 " la création du patch sera refusée, à moins d'utiliser\n"
2801 " -f/--force auquel cas le contenu du nouveau patch sera\n"
2802 " -f/--force auquel cas le contenu du nouveau patch sera\n"
2802 " initialisé avec ces modifications. Il est également\n"
2803 " initialisé avec ces modifications. Il est également\n"
2803 " possible d'utiliser -I/--include, -X/--exclude ou une liste\n"
2804 " 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"
2805 " 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"
2806 " que les changements des fichiers concernés, et laisser le\n"
2806 " reste dans le répertoire de travail en tant que modifications\n"
2807 " reste dans le répertoire de travail en tant que modifications\n"
2807 " non enregistrées.\n"
2808 " non enregistrées.\n"
2808 "\n"
2809 "\n"
2809 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
2810 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
2810 " l'aide de -u/--user et -d/--date respectivement.\n"
2811 " l'aide de -u/--user et -d/--date respectivement.\n"
2811 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
2812 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
2812 " d'utilisateur et la date à leur valeur actuelle.\n"
2813 " d'utilisateur et la date à leur valeur actuelle.\n"
2813 "\n"
2814 "\n"
2814 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
2815 " 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"
2816 " 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"
2817 " 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"
2818 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
2818 "\n"
2819 "\n"
2819 " Utilisez -g/--git pour garder le patch au format étendu de\n"
2820 " Utilisez -g/--git pour garder le patch au format étendu de\n"
2820 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
2821 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
2821 " de cette option pour la préservation des informations de\n"
2822 " de cette option pour la préservation des informations de\n"
2822 " copie/renommage et des modifications de permissions.\n"
2823 " copie/renommage et des modifications de permissions.\n"
2823 " "
2824 " "
2824
2825
2825 msgid ""
2826 msgid ""
2826 "update the current patch\n"
2827 "update the current patch\n"
2827 "\n"
2828 "\n"
2828 " If any file patterns are provided, the refreshed patch will\n"
2829 " If any file patterns are provided, the refreshed patch will\n"
2829 " contain only the modifications that match those patterns; the\n"
2830 " contain only the modifications that match those patterns; the\n"
2830 " remaining modifications will remain in the working directory.\n"
2831 " remaining modifications will remain in the working directory.\n"
2831 "\n"
2832 "\n"
2832 " If -s/--short is specified, files currently included in the patch\n"
2833 " 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"
2834 " will be refreshed just like matched files and remain in the patch.\n"
2834 "\n"
2835 "\n"
2835 " hg add/remove/copy/rename work as usual, though you might want to\n"
2836 " 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"
2837 " 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"
2838 " and renames. See the diffs help topic for more information on the\n"
2838 " git diff format.\n"
2839 " git diff format.\n"
2839 " "
2840 " "
2840 msgstr ""
2841 msgstr ""
2841
2842
2842 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2843 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2843 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
2844 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
2844
2845
2845 msgid ""
2846 msgid ""
2846 "diff of the current patch and subsequent modifications\n"
2847 "diff of the current patch and subsequent modifications\n"
2847 "\n"
2848 "\n"
2848 " Shows a diff which includes the current patch as well as any\n"
2849 " 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"
2850 " changes which have been made in the working directory since the\n"
2850 " last refresh (thus showing what the current patch would become\n"
2851 " last refresh (thus showing what the current patch would become\n"
2851 " after a qrefresh).\n"
2852 " after a qrefresh).\n"
2852 "\n"
2853 "\n"
2853 " Use 'hg diff' if you only want to see the changes made since the\n"
2854 " 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"
2855 " 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"
2856 " by the current patch without including changes made since the\n"
2856 " qrefresh.\n"
2857 " qrefresh.\n"
2857 " "
2858 " "
2858 msgstr ""
2859 msgstr ""
2859
2860
2860 msgid ""
2861 msgid ""
2861 "fold the named patches into the current patch\n"
2862 "fold the named patches into the current patch\n"
2862 "\n"
2863 "\n"
2863 " Patches must not yet be applied. Each patch will be successively\n"
2864 " 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"
2865 " applied to the current patch in the order given. If all the\n"
2865 " patches apply successfully, the current patch will be refreshed\n"
2866 " patches apply successfully, the current patch will be refreshed\n"
2866 " with the new cumulative patch, and the folded patches will be\n"
2867 " 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"
2868 " deleted. With -k/--keep, the folded patch files will not be\n"
2868 " removed afterwards.\n"
2869 " removed afterwards.\n"
2869 "\n"
2870 "\n"
2870 " The header for each folded patch will be concatenated with the\n"
2871 " The header for each folded patch will be concatenated with the\n"
2871 " current patch header, separated by a line of '* * *'."
2872 " current patch header, separated by a line of '* * *'."
2872 msgstr ""
2873 msgstr ""
2873
2874
2874 msgid "qfold requires at least one patch name"
2875 msgid "qfold requires at least one patch name"
2875 msgstr "qfold a besoin au minimum du nom d'un patch"
2876 msgstr "qfold a besoin au minimum du nom d'un patch"
2876
2877
2877 msgid "No patches applied"
2878 msgid "No patches applied"
2878 msgstr "Aucun patch d'appliqué"
2879 msgstr "Aucun patch d'appliqué"
2879
2880
2880 #, python-format
2881 #, python-format
2881 msgid "Skipping already folded patch %s"
2882 msgid "Skipping already folded patch %s"
2882 msgstr ""
2883 msgstr ""
2883
2884
2884 #, python-format
2885 #, python-format
2885 msgid "qfold cannot fold already applied patch %s"
2886 msgid "qfold cannot fold already applied patch %s"
2886 msgstr ""
2887 msgstr ""
2887
2888
2888 #, python-format
2889 #, python-format
2889 msgid "Error folding patch %s"
2890 msgid "Error folding patch %s"
2890 msgstr ""
2891 msgstr ""
2891
2892
2892 msgid "push or pop patches until named patch is at top of stack"
2893 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é"
2894 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
2894
2895
2895 msgid ""
2896 msgid ""
2896 "set or print guards for a patch\n"
2897 "set or print guards for a patch\n"
2897 "\n"
2898 "\n"
2898 " Guards control whether a patch can be pushed. A patch with no\n"
2899 " 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"
2900 " 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"
2901 " 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"
2902 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2902 " has activated it.\n"
2903 " has activated it.\n"
2903 "\n"
2904 "\n"
2904 " With no arguments, print the currently active guards.\n"
2905 " With no arguments, print the currently active guards.\n"
2905 " With arguments, set guards for the named patch.\n"
2906 " With arguments, set guards for the named patch.\n"
2906 " NOTE: Specifying negative guards now requires '--'.\n"
2907 " NOTE: Specifying negative guards now requires '--'.\n"
2907 "\n"
2908 "\n"
2908 " To set guards on another patch:\n"
2909 " To set guards on another patch:\n"
2909 " hg qguard -- other.patch +2.6.17 -stable\n"
2910 " hg qguard -- other.patch +2.6.17 -stable\n"
2910 " "
2911 " "
2911 msgstr ""
2912 msgstr ""
2912
2913
2913 msgid "cannot mix -l/--list with options or arguments"
2914 msgid "cannot mix -l/--list with options or arguments"
2914 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
2915 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
2915
2916
2916 msgid "no patch to work with"
2917 msgid "no patch to work with"
2917 msgstr "aucun patch avec lequel travailler"
2918 msgstr "aucun patch avec lequel travailler"
2918
2919
2919 #, python-format
2920 #, python-format
2920 msgid "no patch named %s"
2921 msgid "no patch named %s"
2921 msgstr "aucun patch du nom de %s"
2922 msgstr "aucun patch du nom de %s"
2922
2923
2923 msgid "print the header of the topmost or specified patch"
2924 msgid "print the header of the topmost or specified patch"
2924 msgstr "affiche l'en-tête du dernier patch appliqué"
2925 msgstr "affiche l'en-tête du dernier patch appliqué"
2925
2926
2926 msgid ""
2927 msgid ""
2927 "push the next patch onto the stack\n"
2928 "push the next patch onto the stack\n"
2928 "\n"
2929 "\n"
2929 " When -f/--force is applied, all local changes in patched files\n"
2930 " When -f/--force is applied, all local changes in patched files\n"
2930 " will be lost.\n"
2931 " will be lost.\n"
2931 " "
2932 " "
2932 msgstr ""
2933 msgstr ""
2933 "applique le patch suivant sur la pile\n"
2934 "applique le patch suivant sur la pile\n"
2934 "\n"
2935 "\n"
2935 " Si -f/--force est utilisé, tout changement local dans les\n"
2936 " Si -f/--force est utilisé, tout changement local dans les\n"
2936 " fichiers concernés par le patch seront perdus.\n"
2937 " fichiers concernés par le patch seront perdus.\n"
2937 " "
2938 " "
2938
2939
2939 msgid "no saved queues found, please use -n\n"
2940 msgid "no saved queues found, please use -n\n"
2940 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
2941 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
2941
2942
2942 #, python-format
2943 #, python-format
2943 msgid "merging with queue at: %s\n"
2944 msgid "merging with queue at: %s\n"
2944 msgstr "fusion avec la pile située à %s\n"
2945 msgstr "fusion avec la pile située à %s\n"
2945
2946
2946 msgid ""
2947 msgid ""
2947 "pop the current patch off the stack\n"
2948 "pop the current patch off the stack\n"
2948 "\n"
2949 "\n"
2949 " By default, pops off the top of the patch stack. If given a patch\n"
2950 " 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"
2951 " name, keeps popping off patches until the named patch is at the\n"
2951 " top of the stack.\n"
2952 " top of the stack.\n"
2952 " "
2953 " "
2953 msgstr ""
2954 msgstr ""
2954 "dépile le dernier patch appliqué\n"
2955 "dépile le dernier patch appliqué\n"
2955 "\n"
2956 "\n"
2956 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
2957 " 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"
2958 " un nom de patch est fourni, les patchs seront dépilés en\n"
2958 " séquence jusqu'à arriver au patch demandé.\n"
2959 " séquence jusqu'à arriver au patch demandé.\n"
2959 " "
2960 " "
2960
2961
2961 #, python-format
2962 #, python-format
2962 msgid "using patch queue: %s\n"
2963 msgid "using patch queue: %s\n"
2963 msgstr "utilisation de la pile de patchs %s\n"
2964 msgstr "utilisation de la pile de patchs %s\n"
2964
2965
2965 msgid ""
2966 msgid ""
2966 "rename a patch\n"
2967 "rename a patch\n"
2967 "\n"
2968 "\n"
2968 " With one argument, renames the current patch to PATCH1.\n"
2969 " With one argument, renames the current patch to PATCH1.\n"
2969 " With two arguments, renames PATCH1 to PATCH2."
2970 " With two arguments, renames PATCH1 to PATCH2."
2970 msgstr ""
2971 msgstr ""
2971 "renomme un patch\n"
2972 "renomme un patch\n"
2972 "\n"
2973 "\n"
2973 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
2974 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
2974 " Avec deux arguments, PATCH1 devient PATCH2."
2975 " Avec deux arguments, PATCH1 devient PATCH2."
2975
2976
2976 #, python-format
2977 #, python-format
2977 msgid "%s already exists"
2978 msgid "%s already exists"
2978 msgstr "%s existe déjà"
2979 msgstr "%s existe déjà"
2979
2980
2980 #, python-format
2981 #, python-format
2981 msgid "A patch named %s already exists in the series file"
2982 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\")"
2983 msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")"
2983
2984
2984 msgid "restore the queue state saved by a revision"
2985 msgid "restore the queue state saved by a revision"
2985 msgstr "rétablissement d'un état sauvegardé de la pile"
2986 msgstr "rétablissement d'un état sauvegardé de la pile"
2986
2987
2987 msgid "save current queue state"
2988 msgid "save current queue state"
2988 msgstr "sauvegarde de l'étatt de la pile de patchs"
2989 msgstr "sauvegarde de l'étatt de la pile de patchs"
2989
2990
2990 #, python-format
2991 #, python-format
2991 msgid "destination %s exists and is not a directory"
2992 msgid "destination %s exists and is not a directory"
2992 msgstr "%s: la cible existe et n'est pas un répertoire"
2993 msgstr "%s: la cible existe et n'est pas un répertoire"
2993
2994
2994 #, python-format
2995 #, python-format
2995 msgid "destination %s exists, use -f to force"
2996 msgid "destination %s exists, use -f to force"
2996 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
2997 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
2997
2998
2998 #, python-format
2999 #, python-format
2999 msgid "copy %s to %s\n"
3000 msgid "copy %s to %s\n"
3000 msgstr "copie de %s vers %s\n"
3001 msgstr "copie de %s vers %s\n"
3001
3002
3002 msgid ""
3003 msgid ""
3003 "strip a revision and all its descendants from the repository\n"
3004 "strip a revision and all its descendants from the repository\n"
3004 "\n"
3005 "\n"
3005 " If one of the working directory's parent revisions is stripped, the\n"
3006 " 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"
3007 " working directory will be updated to the parent of the stripped\n"
3007 " revision.\n"
3008 " revision.\n"
3008 " "
3009 " "
3009 msgstr ""
3010 msgstr ""
3010
3011
3011 msgid ""
3012 msgid ""
3012 "set or print guarded patches to push\n"
3013 "set or print guarded patches to push\n"
3013 "\n"
3014 "\n"
3014 " Use the qguard command to set or print guards on patch, then use\n"
3015 " 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"
3016 " 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"
3017 " 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"
3018 " selected guard, but will not be pushed if any negative guards\n"
3018 " match the current guard. For example:\n"
3019 " match the current guard. For example:\n"
3019 "\n"
3020 "\n"
3020 " qguard foo.patch -stable (negative guard)\n"
3021 " qguard foo.patch -stable (negative guard)\n"
3021 " qguard bar.patch +stable (positive guard)\n"
3022 " qguard bar.patch +stable (positive guard)\n"
3022 " qselect stable\n"
3023 " qselect stable\n"
3023 "\n"
3024 "\n"
3024 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3025 " 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"
3026 " it has a negative match) but push bar.patch (because it has a\n"
3026 " positive match).\n"
3027 " positive match).\n"
3027 "\n"
3028 "\n"
3028 " With no arguments, prints the currently active guards.\n"
3029 " With no arguments, prints the currently active guards.\n"
3029 " With one argument, sets the active guard.\n"
3030 " With one argument, sets the active guard.\n"
3030 "\n"
3031 "\n"
3031 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3032 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3032 " When no guards are active, patches with positive guards are\n"
3033 " When no guards are active, patches with positive guards are\n"
3033 " skipped and patches with negative guards are pushed.\n"
3034 " skipped and patches with negative guards are pushed.\n"
3034 "\n"
3035 "\n"
3035 " qselect can change the guards on applied patches. It does not pop\n"
3036 " 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"
3037 " 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"
3038 " applied patch that is not guarded. Use --reapply (which implies\n"
3038 " --pop) to push back to the current patch afterwards, but skip\n"
3039 " --pop) to push back to the current patch afterwards, but skip\n"
3039 " guarded patches.\n"
3040 " guarded patches.\n"
3040 "\n"
3041 "\n"
3041 " Use -s/--series to print a list of all guards in the series file\n"
3042 " 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."
3043 " (no other arguments needed). Use -v for more information."
3043 msgstr ""
3044 msgstr ""
3044
3045
3045 msgid "guards deactivated\n"
3046 msgid "guards deactivated\n"
3046 msgstr ""
3047 msgstr ""
3047
3048
3048 #, python-format
3049 #, python-format
3049 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3050 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3050 msgstr ""
3051 msgstr ""
3051
3052
3052 #, python-format
3053 #, python-format
3053 msgid "number of guarded, applied patches has changed from %d to %d\n"
3054 msgid "number of guarded, applied patches has changed from %d to %d\n"
3054 msgstr ""
3055 msgstr ""
3055
3056
3056 msgid "guards in series file:\n"
3057 msgid "guards in series file:\n"
3057 msgstr ""
3058 msgstr ""
3058
3059
3059 msgid "no guards in series file\n"
3060 msgid "no guards in series file\n"
3060 msgstr ""
3061 msgstr ""
3061
3062
3062 msgid "active guards:\n"
3063 msgid "active guards:\n"
3063 msgstr ""
3064 msgstr ""
3064
3065
3065 msgid "no active guards\n"
3066 msgid "no active guards\n"
3066 msgstr ""
3067 msgstr ""
3067
3068
3068 msgid "popping guarded patches\n"
3069 msgid "popping guarded patches\n"
3069 msgstr ""
3070 msgstr ""
3070
3071
3071 msgid "reapplying unguarded patches\n"
3072 msgid "reapplying unguarded patches\n"
3072 msgstr ""
3073 msgstr ""
3073
3074
3074 msgid ""
3075 msgid ""
3075 "move applied patches into repository history\n"
3076 "move applied patches into repository history\n"
3076 "\n"
3077 "\n"
3077 " Finishes the specified revisions (corresponding to applied\n"
3078 " Finishes the specified revisions (corresponding to applied\n"
3078 " patches) by moving them out of mq control into regular repository\n"
3079 " patches) by moving them out of mq control into regular repository\n"
3079 " history.\n"
3080 " history.\n"
3080 "\n"
3081 "\n"
3081 " Accepts a revision range or the -a/--applied option. If --applied\n"
3082 " Accepts a revision range or the -a/--applied option. If --applied\n"
3082 " is specified, all applied mq revisions are removed from mq\n"
3083 " 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"
3084 " control. Otherwise, the given revisions must be at the base of the\n"
3084 " stack of applied patches.\n"
3085 " stack of applied patches.\n"
3085 "\n"
3086 "\n"
3086 " This can be especially useful if your changes have been applied to\n"
3087 " 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"
3088 " an upstream repository, or if you are about to push your changes\n"
3088 " to upstream.\n"
3089 " to upstream.\n"
3089 " "
3090 " "
3090 msgstr ""
3091 msgstr ""
3091 "déplacement des patchs vers l'historique du dépôt\n"
3092 "déplacement des patchs vers l'historique du dépôt\n"
3092 "\n"
3093 "\n"
3093 " Achève le développement des révisions spécifiées (qui doivent\n"
3094 " 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"
3095 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3095 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3096 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3096 " l'historique du dépôt.\n"
3097 " l'historique du dépôt.\n"
3097 "\n"
3098 "\n"
3098 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3099 " 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"
3100 " 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"
3101 " 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"
3102 " révisions fournies doivent être situées à la base de la pile de\n"
3102 " patchs appliqués.\n"
3103 " patchs appliqués.\n"
3103 "\n"
3104 "\n"
3104 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3105 " 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"
3106 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3106 " "
3107 " "
3107
3108
3108 msgid "no revisions specified"
3109 msgid "no revisions specified"
3109 msgstr "aucune révision spécifiée"
3110 msgstr "aucune révision spécifiée"
3110
3111
3111 msgid "cannot commit over an applied mq patch"
3112 msgid "cannot commit over an applied mq patch"
3112 msgstr ""
3113 msgstr ""
3113
3114
3114 msgid "source has mq patches applied"
3115 msgid "source has mq patches applied"
3115 msgstr ""
3116 msgstr ""
3116
3117
3117 #, python-format
3118 #, python-format
3118 msgid "mq status file refers to unknown node %s\n"
3119 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"
3120 msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n"
3120
3121
3121 #, python-format
3122 #, python-format
3122 msgid "Tag %s overrides mq patch of the same name\n"
3123 msgid "Tag %s overrides mq patch of the same name\n"
3123 msgstr ""
3124 msgstr ""
3124
3125
3125 msgid "cannot import over an applied patch"
3126 msgid "cannot import over an applied patch"
3126 msgstr "impossible d'importer au-dessus d'un patch appliqué"
3127 msgstr "impossible d'importer au-dessus d'un patch appliqué"
3127
3128
3128 msgid "print first line of patch header"
3129 msgid "print first line of patch header"
3129 msgstr "affiche la première ligne de l'en-tête d'un patch"
3130 msgstr "affiche la première ligne de l'en-tête d'un patch"
3130
3131
3131 msgid "hg qapplied [-s] [PATCH]"
3132 msgid "hg qapplied [-s] [PATCH]"
3132 msgstr "hg qapplied [-s] [PATCH]"
3133 msgstr "hg qapplied [-s] [PATCH]"
3133
3134
3134 msgid "use pull protocol to copy metadata"
3135 msgid "use pull protocol to copy metadata"
3135 msgstr ""
3136 msgstr ""
3136
3137
3137 msgid "do not update the new working directories"
3138 msgid "do not update the new working directories"
3138 msgstr "ne pas mettre à jour le répertoire de travail"
3139 msgstr "ne pas mettre à jour le répertoire de travail"
3139
3140
3140 msgid "use uncompressed transfer (fast over LAN)"
3141 msgid "use uncompressed transfer (fast over LAN)"
3141 msgstr "transférer sans compression (rapide sur un réseau local)"
3142 msgstr "transférer sans compression (rapide sur un réseau local)"
3142
3143
3143 msgid "location of source patch repository"
3144 msgid "location of source patch repository"
3144 msgstr "emplacement du dépôt de patchs"
3145 msgstr "emplacement du dépôt de patchs"
3145
3146
3146 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3147 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3147 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
3148 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
3148
3149
3149 msgid "hg qcommit [OPTION]... [FILE]..."
3150 msgid "hg qcommit [OPTION]... [FILE]..."
3150 msgstr "hg qcommit [OPTION]... [FICHIER]..."
3151 msgstr "hg qcommit [OPTION]... [FICHIER]..."
3151
3152
3152 msgid "hg qdiff [OPTION]... [FILE]..."
3153 msgid "hg qdiff [OPTION]... [FILE]..."
3153 msgstr "hg qdiff [OPTION]... [FICHIER]..."
3154 msgstr "hg qdiff [OPTION]... [FICHIER]..."
3154
3155
3155 msgid "keep patch file"
3156 msgid "keep patch file"
3156 msgstr "garder le fichier du patch"
3157 msgstr "garder le fichier du patch"
3157
3158
3158 msgid "stop managing a revision (DEPRECATED)"
3159 msgid "stop managing a revision (DEPRECATED)"
3159 msgstr "arrêter de gérer une révision"
3160 msgstr "arrêter de gérer une révision"
3160
3161
3161 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3162 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3162 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3163 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3163
3164
3164 msgid "edit patch header"
3165 msgid "edit patch header"
3165 msgstr "éditer l'en-tête du patch"
3166 msgstr "éditer l'en-tête du patch"
3166
3167
3167 msgid "keep folded patch files"
3168 msgid "keep folded patch files"
3168 msgstr ""
3169 msgstr ""
3169
3170
3170 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3171 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3171 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3172 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3172
3173
3173 msgid "overwrite any local changes"
3174 msgid "overwrite any local changes"
3174 msgstr "écraser tout modification locale"
3175 msgstr "écraser tout modification locale"
3175
3176
3176 msgid "hg qgoto [OPTION]... PATCH"
3177 msgid "hg qgoto [OPTION]... PATCH"
3177 msgstr "hg qgoto [OPTION]... PATCH"
3178 msgstr "hg qgoto [OPTION]... PATCH"
3178
3179
3179 msgid "list all patches and guards"
3180 msgid "list all patches and guards"
3180 msgstr ""
3181 msgstr ""
3181
3182
3182 msgid "drop all guards"
3183 msgid "drop all guards"
3183 msgstr ""
3184 msgstr ""
3184
3185
3185 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3186 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3186 msgstr ""
3187 msgstr ""
3187
3188
3188 msgid "hg qheader [PATCH]"
3189 msgid "hg qheader [PATCH]"
3189 msgstr "hg qheader [PATCH]"
3190 msgstr "hg qheader [PATCH]"
3190
3191
3191 msgid "import file in patch directory"
3192 msgid "import file in patch directory"
3192 msgstr "importer un fichier résidant dans le répertoire de patchs"
3193 msgstr "importer un fichier résidant dans le répertoire de patchs"
3193
3194
3194 msgid "name of patch file"
3195 msgid "name of patch file"
3195 msgstr "nom du fichier de patch"
3196 msgstr "nom du fichier de patch"
3196
3197
3197 msgid "overwrite existing files"
3198 msgid "overwrite existing files"
3198 msgstr "écraser les fichiers existant"
3199 msgstr "écraser les fichiers existant"
3199
3200
3200 msgid "place existing revisions under mq control"
3201 msgid "place existing revisions under mq control"
3201 msgstr "placer des révisions existantes sous le contrôle de mq"
3202 msgstr "placer des révisions existantes sous le contrôle de mq"
3202
3203
3203 msgid "use git extended diff format"
3204 msgid "use git extended diff format"
3204 msgstr "utiliser le format de patch étendu de git"
3205 msgstr "utiliser le format de patch étendu de git"
3205
3206
3206 msgid "qpush after importing"
3207 msgid "qpush after importing"
3207 msgstr "qpush après l'importation"
3208 msgstr "qpush après l'importation"
3208
3209
3209 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3210 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..."
3211 msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..."
3211
3212
3212 msgid "create queue repository"
3213 msgid "create queue repository"
3213 msgstr "crée un dépôt de patchs"
3214 msgstr "crée un dépôt de patchs"
3214
3215
3215 msgid "hg qinit [-c]"
3216 msgid "hg qinit [-c]"
3216 msgstr "hg qinit [-c]"
3217 msgstr "hg qinit [-c]"
3217
3218
3218 msgid "import uncommitted changes into patch"
3219 msgid "import uncommitted changes into patch"
3219 msgstr "importer les modifications locales dans le patch"
3220 msgstr "importer les modifications locales dans le patch"
3220
3221
3221 msgid "add \"From: <current user>\" to patch"
3222 msgid "add \"From: <current user>\" to patch"
3222 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3223 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3223
3224
3224 msgid "add \"From: <given user>\" to patch"
3225 msgid "add \"From: <given user>\" to patch"
3225 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3226 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3226
3227
3227 msgid "add \"Date: <current date>\" to patch"
3228 msgid "add \"Date: <current date>\" to patch"
3228 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3229 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3229
3230
3230 msgid "add \"Date: <given date>\" to patch"
3231 msgid "add \"Date: <given date>\" to patch"
3231 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3232 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3232
3233
3233 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3234 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3234 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3235 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3235
3236
3236 msgid "hg qnext [-s]"
3237 msgid "hg qnext [-s]"
3237 msgstr "hg qnext [-s]"
3238 msgstr "hg qnext [-s]"
3238
3239
3239 msgid "hg qprev [-s]"
3240 msgid "hg qprev [-s]"
3240 msgstr "hg qprev [-s]"
3241 msgstr "hg qprev [-s]"
3241
3242
3242 msgid "pop all patches"
3243 msgid "pop all patches"
3243 msgstr "dépiler tous les patchs"
3244 msgstr "dépiler tous les patchs"
3244
3245
3245 msgid "queue name to pop"
3246 msgid "queue name to pop"
3246 msgstr "nom de la pile à dépiler"
3247 msgstr "nom de la pile à dépiler"
3247
3248
3248 msgid "forget any local changes"
3249 msgid "forget any local changes"
3249 msgstr "oublier toute modification locale"
3250 msgstr "oublier toute modification locale"
3250
3251
3251 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3252 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3252 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3253 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3253
3254
3254 msgid "apply if the patch has rejects"
3255 msgid "apply if the patch has rejects"
3255 msgstr ""
3256 msgstr ""
3256
3257
3257 msgid "list patch name in commit text"
3258 msgid "list patch name in commit text"
3258 msgstr ""
3259 msgstr ""
3259
3260
3260 msgid "apply all patches"
3261 msgid "apply all patches"
3261 msgstr "appliquer tous les patchs"
3262 msgstr "appliquer tous les patchs"
3262
3263
3263 msgid "merge from another queue"
3264 msgid "merge from another queue"
3264 msgstr "fusionner avec une autre pile de patchs"
3265 msgstr "fusionner avec une autre pile de patchs"
3265
3266
3266 msgid "merge queue name"
3267 msgid "merge queue name"
3267 msgstr "nom de la pile à fusionner"
3268 msgstr "nom de la pile à fusionner"
3268
3269
3269 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3270 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3270 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3271 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3271
3272
3272 msgid "refresh only files already in the patch and specified files"
3273 msgid "refresh only files already in the patch and specified files"
3273 msgstr ""
3274 msgstr ""
3274 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux "
3275 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux "
3275 "explicitement spécifiés"
3276 "explicitement spécifiés"
3276
3277
3277 msgid "add/update \"From: <current user>\" in patch"
3278 msgid "add/update \"From: <current user>\" in patch"
3278 msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch"
3279 msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch"
3279
3280
3280 msgid "add/update \"From: <given user>\" in patch"
3281 msgid "add/update \"From: <given user>\" in patch"
3281 msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch"
3282 msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch"
3282
3283
3283 msgid "update \"Date: <current date>\" in patch (if present)"
3284 msgid "update \"Date: <current date>\" in patch (if present)"
3284 msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)"
3285 msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)"
3285
3286
3286 msgid "update \"Date: <given date>\" in patch (if present)"
3287 msgid "update \"Date: <given date>\" in patch (if present)"
3287 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3288 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3288
3289
3289 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3290 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]..."
3291 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..."
3291
3292
3292 msgid "hg qrename PATCH1 [PATCH2]"
3293 msgid "hg qrename PATCH1 [PATCH2]"
3293 msgstr "hg qrename PATCH1 [PATCH2]"
3294 msgstr "hg qrename PATCH1 [PATCH2]"
3294
3295
3295 msgid "delete save entry"
3296 msgid "delete save entry"
3296 msgstr ""
3297 msgstr ""
3297
3298
3298 msgid "update queue working directory"
3299 msgid "update queue working directory"
3299 msgstr ""
3300 msgstr ""
3300
3301
3301 msgid "hg qrestore [-d] [-u] REV"
3302 msgid "hg qrestore [-d] [-u] REV"
3302 msgstr ""
3303 msgstr ""
3303
3304
3304 msgid "copy patch directory"
3305 msgid "copy patch directory"
3305 msgstr ""
3306 msgstr ""
3306
3307
3307 msgid "copy directory name"
3308 msgid "copy directory name"
3308 msgstr ""
3309 msgstr ""
3309
3310
3310 msgid "clear queue status file"
3311 msgid "clear queue status file"
3311 msgstr ""
3312 msgstr ""
3312
3313
3313 msgid "force copy"
3314 msgid "force copy"
3314 msgstr ""
3315 msgstr ""
3315
3316
3316 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3317 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]"
3318 msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]"
3318
3319
3319 msgid "disable all guards"
3320 msgid "disable all guards"
3320 msgstr ""
3321 msgstr ""
3321
3322
3322 msgid "list all guards in series file"
3323 msgid "list all guards in series file"
3323 msgstr ""
3324 msgstr ""
3324
3325
3325 msgid "pop to before first guarded applied patch"
3326 msgid "pop to before first guarded applied patch"
3326 msgstr ""
3327 msgstr ""
3327
3328
3328 msgid "pop, then reapply patches"
3329 msgid "pop, then reapply patches"
3329 msgstr "dépiler, puis appliquer à nouveau les patchs"
3330 msgstr "dépiler, puis appliquer à nouveau les patchs"
3330
3331
3331 msgid "hg qselect [OPTION]... [GUARD]..."
3332 msgid "hg qselect [OPTION]... [GUARD]..."
3332 msgstr ""
3333 msgstr ""
3333
3334
3334 msgid "print patches not in series"
3335 msgid "print patches not in series"
3335 msgstr "afficher les patchs absents de la série"
3336 msgstr "afficher les patchs absents de la série"
3336
3337
3337 msgid "hg qseries [-ms]"
3338 msgid "hg qseries [-ms]"
3338 msgstr "hg qseries [-ms]"
3339 msgstr "hg qseries [-ms]"
3339
3340
3340 msgid "force removal with local changes"
3341 msgid "force removal with local changes"
3341 msgstr "forcer la suppression malgré les modifications locales"
3342 msgstr "forcer la suppression malgré les modifications locales"
3342
3343
3343 msgid "bundle unrelated changesets"
3344 msgid "bundle unrelated changesets"
3344 msgstr ""
3345 msgstr ""
3345
3346
3346 msgid "no backups"
3347 msgid "no backups"
3347 msgstr ""
3348 msgstr ""
3348
3349
3349 msgid "hg strip [-f] [-b] [-n] REV"
3350 msgid "hg strip [-f] [-b] [-n] REV"
3350 msgstr "hg strip [-f] [-b] [-n] REV"
3351 msgstr "hg strip [-f] [-b] [-n] REV"
3351
3352
3352 msgid "hg qtop [-s]"
3353 msgid "hg qtop [-s]"
3353 msgstr "hg qtop [-s]"
3354 msgstr "hg qtop [-s]"
3354
3355
3355 msgid "hg qunapplied [-s] [PATCH]"
3356 msgid "hg qunapplied [-s] [PATCH]"
3356 msgstr "hg qunapplied [-s] [PATCH]"
3357 msgstr "hg qunapplied [-s] [PATCH]"
3357
3358
3358 msgid "finish all applied changesets"
3359 msgid "finish all applied changesets"
3359 msgstr ""
3360 msgstr ""
3360
3361
3361 msgid "hg qfinish [-a] [REV]..."
3362 msgid "hg qfinish [-a] [REV]..."
3362 msgstr "hg qfinish [-a] [REV]..."
3363 msgstr "hg qfinish [-a] [REV]..."
3363
3364
3364 msgid ""
3365 msgid ""
3365 "hooks for sending email notifications at commit/push time\n"
3366 "hooks for sending email notifications at commit/push time\n"
3366 "\n"
3367 "\n"
3367 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3368 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3368 "messages to stdout, for testing and configuring.\n"
3369 "messages to stdout, for testing and configuring.\n"
3369 "\n"
3370 "\n"
3370 "To use, configure notify extension and enable in hgrc like this:\n"
3371 "To use, configure notify extension and enable in hgrc like this:\n"
3371 "\n"
3372 "\n"
3372 " [extensions]\n"
3373 " [extensions]\n"
3373 " hgext.notify =\n"
3374 " hgext.notify =\n"
3374 "\n"
3375 "\n"
3375 " [hooks]\n"
3376 " [hooks]\n"
3376 " # one email for each incoming changeset\n"
3377 " # one email for each incoming changeset\n"
3377 " incoming.notify = python:hgext.notify.hook\n"
3378 " incoming.notify = python:hgext.notify.hook\n"
3378 " # batch emails when many changesets incoming at one time\n"
3379 " # batch emails when many changesets incoming at one time\n"
3379 " changegroup.notify = python:hgext.notify.hook\n"
3380 " changegroup.notify = python:hgext.notify.hook\n"
3380 "\n"
3381 "\n"
3381 " [notify]\n"
3382 " [notify]\n"
3382 " # config items go in here\n"
3383 " # config items go in here\n"
3383 "\n"
3384 "\n"
3384 " config items:\n"
3385 " config items:\n"
3385 "\n"
3386 "\n"
3386 " REQUIRED:\n"
3387 " REQUIRED:\n"
3387 " config = /path/to/file # file containing subscriptions\n"
3388 " config = /path/to/file # file containing subscriptions\n"
3388 "\n"
3389 "\n"
3389 " OPTIONAL:\n"
3390 " OPTIONAL:\n"
3390 " test = True # print messages to stdout for testing\n"
3391 " test = True # print messages to stdout for testing\n"
3391 " strip = 3 # number of slashes to strip for url paths\n"
3392 " strip = 3 # number of slashes to strip for url paths\n"
3392 " domain = example.com # domain to use if committer missing domain\n"
3393 " domain = example.com # domain to use if committer missing domain\n"
3393 " style = ... # style file to use when formatting email\n"
3394 " style = ... # style file to use when formatting email\n"
3394 " template = ... # template to use when formatting email\n"
3395 " template = ... # template to use when formatting email\n"
3395 " incoming = ... # template to use when run as incoming hook\n"
3396 " incoming = ... # template to use when run as incoming hook\n"
3396 " changegroup = ... # template when run as changegroup hook\n"
3397 " changegroup = ... # template when run as changegroup hook\n"
3397 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3398 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3398 " maxsubject = 67 # truncate subject line longer than this\n"
3399 " maxsubject = 67 # truncate subject line longer than this\n"
3399 " diffstat = True # add a diffstat before the diff content\n"
3400 " diffstat = True # add a diffstat before the diff content\n"
3400 " sources = serve # notify if source of incoming changes in this "
3401 " sources = serve # notify if source of incoming changes in this "
3401 "list\n"
3402 "list\n"
3402 " # (serve == ssh or http, push, pull, bundle)\n"
3403 " # (serve == ssh or http, push, pull, bundle)\n"
3403 " [email]\n"
3404 " [email]\n"
3404 " from = user@host.com # email address to send as if none given\n"
3405 " from = user@host.com # email address to send as if none given\n"
3405 " [web]\n"
3406 " [web]\n"
3406 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3407 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3407 "\n"
3408 "\n"
3408 " notify config file has same format as regular hgrc. it has two\n"
3409 " 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"
3410 " sections so you can express subscriptions in whatever way is handier\n"
3410 " for you.\n"
3411 " for you.\n"
3411 "\n"
3412 "\n"
3412 " [usersubs]\n"
3413 " [usersubs]\n"
3413 " # key is subscriber email, value is \",\"-separated list of glob "
3414 " # key is subscriber email, value is \",\"-separated list of glob "
3414 "patterns\n"
3415 "patterns\n"
3415 " user@host = pattern\n"
3416 " user@host = pattern\n"
3416 "\n"
3417 "\n"
3417 " [reposubs]\n"
3418 " [reposubs]\n"
3418 " # key is glob pattern, value is \",\"-separated list of subscriber "
3419 " # key is glob pattern, value is \",\"-separated list of subscriber "
3419 "emails\n"
3420 "emails\n"
3420 " pattern = user@host\n"
3421 " pattern = user@host\n"
3421 "\n"
3422 "\n"
3422 " glob patterns are matched against path to repository root.\n"
3423 " glob patterns are matched against path to repository root.\n"
3423 "\n"
3424 "\n"
3424 " if you like, you can put notify config file in repository that users\n"
3425 " 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."
3426 " can push changes to, they can manage their own subscriptions."
3426 msgstr ""
3427 msgstr ""
3427
3428
3428 #, python-format
3429 #, python-format
3429 msgid "%s: %d new changesets"
3430 msgid "%s: %d new changesets"
3430 msgstr ""
3431 msgstr ""
3431
3432
3432 #, python-format
3433 #, python-format
3433 msgid "notify: sending %d subscribers %d changes\n"
3434 msgid "notify: sending %d subscribers %d changes\n"
3434 msgstr ""
3435 msgstr ""
3435
3436
3436 #, python-format
3437 #, python-format
3437 msgid ""
3438 msgid ""
3438 "\n"
3439 "\n"
3439 "diffs (truncated from %d to %d lines):\n"
3440 "diffs (truncated from %d to %d lines):\n"
3440 "\n"
3441 "\n"
3441 msgstr ""
3442 msgstr ""
3442
3443
3443 #, python-format
3444 #, python-format
3444 msgid ""
3445 msgid ""
3445 "\n"
3446 "\n"
3446 "diffs (%d lines):\n"
3447 "diffs (%d lines):\n"
3447 "\n"
3448 "\n"
3448 msgstr ""
3449 msgstr ""
3449
3450
3450 #, python-format
3451 #, python-format
3451 msgid "notify: no subscribers to repository %s\n"
3452 msgid "notify: no subscribers to repository %s\n"
3452 msgstr ""
3453 msgstr ""
3453
3454
3454 #, python-format
3455 #, python-format
3455 msgid "notify: changes have source \"%s\" - skipping\n"
3456 msgid "notify: changes have source \"%s\" - skipping\n"
3456 msgstr ""
3457 msgstr ""
3457
3458
3458 msgid ""
3459 msgid ""
3459 "browse command output with an external pager\n"
3460 "browse command output with an external pager\n"
3460 "\n"
3461 "\n"
3461 "To set the pager that should be used, set the application variable:\n"
3462 "To set the pager that should be used, set the application variable:\n"
3462 "\n"
3463 "\n"
3463 " [pager]\n"
3464 " [pager]\n"
3464 " pager = LESS='FSRX' less\n"
3465 " pager = LESS='FSRX' less\n"
3465 "\n"
3466 "\n"
3466 "If no pager is set, the pager extensions uses the environment variable\n"
3467 "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"
3468 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3468 "\n"
3469 "\n"
3469 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3470 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3470 "setting:\n"
3471 "setting:\n"
3471 "\n"
3472 "\n"
3472 " [pager]\n"
3473 " [pager]\n"
3473 " quiet = True\n"
3474 " quiet = True\n"
3474 "\n"
3475 "\n"
3475 "You can disable the pager for certain commands by adding them to the\n"
3476 "You can disable the pager for certain commands by adding them to the\n"
3476 "pager.ignore list:\n"
3477 "pager.ignore list:\n"
3477 "\n"
3478 "\n"
3478 " [pager]\n"
3479 " [pager]\n"
3479 " ignore = version, help, update\n"
3480 " ignore = version, help, update\n"
3480 "\n"
3481 "\n"
3481 "You can also enable the pager only for certain commands using\n"
3482 "You can also enable the pager only for certain commands using\n"
3482 "pager.attend:\n"
3483 "pager.attend:\n"
3483 "\n"
3484 "\n"
3484 " [pager]\n"
3485 " [pager]\n"
3485 " attend = log\n"
3486 " attend = log\n"
3486 "\n"
3487 "\n"
3487 "If pager.attend is present, pager.ignore will be ignored.\n"
3488 "If pager.attend is present, pager.ignore will be ignored.\n"
3488 "\n"
3489 "\n"
3489 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3490 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3490 "specify them in the global .hgrc\n"
3491 "specify them in the global .hgrc\n"
3491 msgstr ""
3492 msgstr ""
3492
3493
3493 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3494 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3494 # sera capable de replier automatiquement la première ligne d'aide)
3495 # sera capable de replier automatiquement la première ligne d'aide)
3495 msgid ""
3496 msgid ""
3496 "interpret suffixes to refer to ancestor revisions\n"
3497 "interpret suffixes to refer to ancestor revisions\n"
3497 "\n"
3498 "\n"
3498 "This extension allows you to use git-style suffixes to refer to the\n"
3499 "This extension allows you to use git-style suffixes to refer to the\n"
3499 "ancestors of a specific revision.\n"
3500 "ancestors of a specific revision.\n"
3500 "\n"
3501 "\n"
3501 "For example, if you can refer to a revision as \"foo\", then:\n"
3502 "For example, if you can refer to a revision as \"foo\", then:\n"
3502 "\n"
3503 "\n"
3503 "- foo^N = Nth parent of foo\n"
3504 "- foo^N = Nth parent of foo\n"
3504 " foo^0 = foo\n"
3505 " foo^0 = foo\n"
3505 " foo^1 = first parent of foo\n"
3506 " foo^1 = first parent of foo\n"
3506 " foo^2 = second parent of foo\n"
3507 " foo^2 = second parent of foo\n"
3507 " foo^ = foo^1\n"
3508 " foo^ = foo^1\n"
3508 "\n"
3509 "\n"
3509 "- foo~N = Nth first grandparent of foo\n"
3510 "- foo~N = Nth first grandparent of foo\n"
3510 " foo~0 = foo\n"
3511 " foo~0 = foo\n"
3511 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3512 " 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"
3513 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3513 msgstr ""
3514 msgstr ""
3514 "suffixes faisant référence à des révisions antérieures\n"
3515 "suffixes faisant référence à des révisions antérieures\n"
3515 "\n"
3516 "\n"
3516 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3517 "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"
3518 "faire référence aux ancêtres d'une révision donnée.\n"
3518 "\n"
3519 "\n"
3519 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3520 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3520 "\n"
3521 "\n"
3521 "- foo^N = Nième parent de foo\n"
3522 "- foo^N = Nième parent de foo\n"
3522 " foo^0 = foo\n"
3523 " foo^0 = foo\n"
3523 " foo^1 = premier parent de foo\n"
3524 " foo^1 = premier parent de foo\n"
3524 " foo^2 = second parent de foo\n"
3525 " foo^2 = second parent de foo\n"
3525 " foo^ = foo^1\n"
3526 " foo^ = foo^1\n"
3526 "\n"
3527 "\n"
3527 "- foo~N = Nième premier grand-parent de foo\n"
3528 "- foo~N = Nième premier grand-parent de foo\n"
3528 " foo~0 = foo\n"
3529 " foo~0 = foo\n"
3529 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3530 " 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"
3531 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3531
3532
3532 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3533 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3533 # sera capable de replier automatiquement la première ligne d'aide)
3534 # sera capable de replier automatiquement la première ligne d'aide)
3534 msgid ""
3535 msgid ""
3535 "command to send changesets as (a series of) patch emails\n"
3536 "command to send changesets as (a series of) patch emails\n"
3536 "\n"
3537 "\n"
3537 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3538 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3538 "describes the series as a whole.\n"
3539 "describes the series as a whole.\n"
3539 "\n"
3540 "\n"
3540 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3541 "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"
3542 "first line of the changeset description as the subject text. The\n"
3542 "message contains two or three body parts:\n"
3543 "message contains two or three body parts:\n"
3543 "\n"
3544 "\n"
3544 " The changeset description.\n"
3545 " The changeset description.\n"
3545 "\n"
3546 "\n"
3546 " [Optional] The result of running diffstat on the patch.\n"
3547 " [Optional] The result of running diffstat on the patch.\n"
3547 "\n"
3548 "\n"
3548 " The patch itself, as generated by \"hg export\".\n"
3549 " The patch itself, as generated by \"hg export\".\n"
3549 "\n"
3550 "\n"
3550 "Each message refers to the first in the series using the In-Reply-To\n"
3551 "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"
3552 "and References headers, so they will show up as a sequence in threaded\n"
3552 "mail and news readers, and in mail archives.\n"
3553 "mail and news readers, and in mail archives.\n"
3553 "\n"
3554 "\n"
3554 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3555 "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"
3556 "with a diffstat summary and the changeset summary, so you can be sure\n"
3556 "you are sending the right changes.\n"
3557 "you are sending the right changes.\n"
3557 "\n"
3558 "\n"
3558 "To configure other defaults, add a section like this to your hgrc\n"
3559 "To configure other defaults, add a section like this to your hgrc\n"
3559 "file:\n"
3560 "file:\n"
3560 "\n"
3561 "\n"
3561 " [email]\n"
3562 " [email]\n"
3562 " from = My Name <my@email>\n"
3563 " from = My Name <my@email>\n"
3563 " to = recipient1, recipient2, ...\n"
3564 " to = recipient1, recipient2, ...\n"
3564 " cc = cc1, cc2, ...\n"
3565 " cc = cc1, cc2, ...\n"
3565 " bcc = bcc1, bcc2, ...\n"
3566 " bcc = bcc1, bcc2, ...\n"
3566 "\n"
3567 "\n"
3567 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3568 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3568 "as a patchbomb.\n"
3569 "as a patchbomb.\n"
3569 "\n"
3570 "\n"
3570 "To avoid sending patches prematurely, it is a good idea to first run\n"
3571 "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"
3572 "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"
3573 "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"
3574 "message describing the patches of your patchbomb. Then when all is\n"
3574 "done, patchbomb messages are displayed. If the PAGER environment\n"
3575 "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"
3576 "variable is set, your pager will be fired up once for each patchbomb\n"
3576 "message, so you can verify everything is alright.\n"
3577 "message, so you can verify everything is alright.\n"
3577 "\n"
3578 "\n"
3578 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3579 "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"
3580 "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"
3581 "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"
3582 "can be previewed with any mail user agent which supports UNIX mbox\n"
3582 "files, e.g. with mutt:\n"
3583 "files, e.g. with mutt:\n"
3583 "\n"
3584 "\n"
3584 " % mutt -R -f mbox\n"
3585 " % mutt -R -f mbox\n"
3585 "\n"
3586 "\n"
3586 "When you are previewing the patchbomb messages, you can use `formail'\n"
3587 "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"
3588 "(a utility that is commonly installed as part of the procmail\n"
3588 "package), to send each message out:\n"
3589 "package), to send each message out:\n"
3589 "\n"
3590 "\n"
3590 " % formail -s sendmail -bm -t < mbox\n"
3591 " % formail -s sendmail -bm -t < mbox\n"
3591 "\n"
3592 "\n"
3592 "That should be all. Now your patchbomb is on its way out.\n"
3593 "That should be all. Now your patchbomb is on its way out.\n"
3593 "\n"
3594 "\n"
3594 "You can also either configure the method option in the email section\n"
3595 "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"
3596 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3596 "that the patchbomb extension can automatically send patchbombs\n"
3597 "that the patchbomb extension can automatically send patchbombs\n"
3597 "directly from the commandline. See the [email] and [smtp] sections in\n"
3598 "directly from the commandline. See the [email] and [smtp] sections in\n"
3598 "hgrc(5) for details."
3599 "hgrc(5) for details."
3599 msgstr ""
3600 msgstr ""
3600 "envoi d'une série de \"changesets\" par courrier électronique\n"
3601 "envoi d'une série de \"changesets\" par courrier électronique\n"
3601 "\n"
3602 "\n"
3602 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3603 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3603 "décrivant dans son ensemble.\n"
3604 "décrivant dans son ensemble.\n"
3604 "\n"
3605 "\n"
3605 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3606 "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"
3607 "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"
3608 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3608 "parties :\n"
3609 "parties :\n"
3609 "\n"
3610 "\n"
3610 " La description du \"changeset\".\n"
3611 " La description du \"changeset\".\n"
3611 "\n"
3612 "\n"
3612 " Optionnellement, un résumé des modifications généré par le\n"
3613 " Optionnellement, un résumé des modifications généré par le\n"
3613 " programme diffstat.\n"
3614 " programme diffstat.\n"
3614 "\n"
3615 "\n"
3615 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3616 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3616 "\n"
3617 "\n"
3617 "Chaque message fait référence au premier de la série (à l'aide\n"
3618 "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"
3619 "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"
3620 "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"
3621 "électronique et de nouvelles, ainsi que dans les archives de\n"
3621 "messagerie.\n"
3622 "messagerie.\n"
3622 "\n"
3623 "\n"
3623 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3624 "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"
3625 "\"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"
3626 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3626 "d'être certain de bien envoyer les bonnes modifications.\n"
3627 "d'être certain de bien envoyer les bonnes modifications.\n"
3627 "\n"
3628 "\n"
3628 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3629 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3629 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3630 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3630 "\n"
3631 "\n"
3631 " [email]\n"
3632 " [email]\n"
3632 " from = Mon Nom <mon@adresse_de_courriel>\n"
3633 " from = Mon Nom <mon@adresse_de_courriel>\n"
3633 " to = destinataire1, destinataire2, ...\n"
3634 " to = destinataire1, destinataire2, ...\n"
3634 " cc = cc1, cc2, ...\n"
3635 " cc = cc1, cc2, ...\n"
3635 " bcc = bcc1, bcc2, ...\n"
3636 " bcc = bcc1, bcc2, ...\n"
3636 "\n"
3637 "\n"
3637 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3638 "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"
3639 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3639 "\n"
3640 "\n"
3640 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3641 "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"
3642 "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"
3643 "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"
3644 "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"
3645 "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"
3646 "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"
3647 "l'affichage chaque message, permettant de vérifier que tout est\n"
3647 "correct.\n"
3648 "correct.\n"
3648 "\n"
3649 "\n"
3649 "L'option -m/--mbox est également très utile : au lieu que les\n"
3650 "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"
3651 "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"
3652 "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"
3653 "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"
3654 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3654 "comme par exemple mutt :\n"
3655 "comme par exemple mutt :\n"
3655 "\n"
3656 "\n"
3656 " % mutt -R -f mbox\n"
3657 " % mutt -R -f mbox\n"
3657 "\n"
3658 "\n"
3658 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3659 "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"
3660 "utilisant formail (un outil généralement installé en même temps que\n"
3660 "procmail) :\n"
3661 "procmail) :\n"
3661 "\n"
3662 "\n"
3662 " % formail -s sendmail -bm -t < mbox\n"
3663 " % formail -s sendmail -bm -t < mbox\n"
3663 "\n"
3664 "\n"
3664 "Et voilà, vos patchs sont en route vers leur destination.\n"
3665 "Et voilà, vos patchs sont en route vers leur destination.\n"
3665 "\n"
3666 "\n"
3666 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3667 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3667 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3668 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3668 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3669 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3669 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3670 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3670 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3671 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3671 "page de manuel hgrc(5) pour plus de détails."
3672 "page de manuel hgrc(5) pour plus de détails."
3672
3673
3673 msgid "Please enter a valid value.\n"
3674 msgid "Please enter a valid value.\n"
3674 msgstr "Veuillez fournir une valeur valide.\n"
3675 msgstr "Veuillez fournir une valeur valide.\n"
3675
3676
3676 msgid "does the diffstat above look okay? "
3677 msgid "does the diffstat above look okay? "
3677 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3678 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3678
3679
3679 msgid "diffstat rejected"
3680 msgid "diffstat rejected"
3680 msgstr "résumé des modifications rejeté"
3681 msgstr "résumé des modifications rejeté"
3681
3682
3682 msgid ""
3683 msgid ""
3683 "send changesets by email\n"
3684 "send changesets by email\n"
3684 "\n"
3685 "\n"
3685 " By default, diffs are sent in the format generated by hg export,\n"
3686 " 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"
3687 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3687 " introduction, which describes the series as a whole.\n"
3688 " introduction, which describes the series as a whole.\n"
3688 "\n"
3689 "\n"
3689 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3690 " 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"
3691 " the first line of the changeset description as the subject text.\n"
3691 " The message contains two or three parts. First, the changeset\n"
3692 " The message contains two or three parts. First, the changeset\n"
3692 " description. Next, (optionally) if the diffstat program is\n"
3693 " description. Next, (optionally) if the diffstat program is\n"
3693 " installed and -d/--diffstat is used, the result of running\n"
3694 " installed and -d/--diffstat is used, the result of running\n"
3694 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3695 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3695 " \"hg export\".\n"
3696 " \"hg export\".\n"
3696 "\n"
3697 "\n"
3697 " By default the patch is included as text in the email body for\n"
3698 " 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"
3699 " easy reviewing. Using the -a/--attach option will instead create\n"
3699 " an attachment for the patch. With -i/--inline an inline attachment\n"
3700 " an attachment for the patch. With -i/--inline an inline attachment\n"
3700 " will be created.\n"
3701 " will be created.\n"
3701 "\n"
3702 "\n"
3702 " With -o/--outgoing, emails will be generated for patches not found\n"
3703 " With -o/--outgoing, emails will be generated for patches not found\n"
3703 " in the destination repository (or only those which are ancestors\n"
3704 " in the destination repository (or only those which are ancestors\n"
3704 " of the specified revisions if any are provided)\n"
3705 " of the specified revisions if any are provided)\n"
3705 "\n"
3706 "\n"
3706 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3707 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3707 " single email containing a binary Mercurial bundle as an attachment\n"
3708 " single email containing a binary Mercurial bundle as an attachment\n"
3708 " will be sent.\n"
3709 " will be sent.\n"
3709 "\n"
3710 "\n"
3710 " Examples:\n"
3711 " Examples:\n"
3711 "\n"
3712 "\n"
3712 " hg email -r 3000 # send patch 3000 only\n"
3713 " hg email -r 3000 # send patch 3000 only\n"
3713 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3714 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3714 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3715 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3715 " hg email 3000 # send patch 3000 (deprecated)\n"
3716 " hg email 3000 # send patch 3000 (deprecated)\n"
3716 "\n"
3717 "\n"
3717 " hg email -o # send all patches not in default\n"
3718 " hg email -o # send all patches not in default\n"
3718 " hg email -o DEST # send all patches not in DEST\n"
3719 " 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"
3720 " 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"
3721 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3721 "\n"
3722 "\n"
3722 " hg email -b # send bundle of all patches not in default\n"
3723 " 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"
3724 " 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 "
3725 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3725 "default\n"
3726 "default\n"
3726 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3727 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3727 "\n"
3728 "\n"
3728 " Before using this command, you will need to enable email in your\n"
3729 " 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"
3730 " hgrc. See the [email] section in hgrc(5) for details.\n"
3730 " "
3731 " "
3731 msgstr ""
3732 msgstr ""
3732 "envoi de \"changesets\" par courrier électronique\n"
3733 "envoi de \"changesets\" par courrier électronique\n"
3733 "\n"
3734 "\n"
3734 " Par défaut, les modifications sont envoyées au format généré par\n"
3735 " 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"
3736 " \"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"
3737 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3737 "\n"
3738 "\n"
3738 " Chaque courriel a pour sujet un résumé des modifications\n"
3739 " 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"
3740 " 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"
3741 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3741 " Le message est constitué de deux ou trois parties. D'abord,\n"
3742 " Le message est constitué de deux ou trois parties. D'abord,\n"
3742 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3743 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3743 " un résumé des modifications généré par le programme diffstat si\n"
3744 " 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"
3745 " 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"
3746 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3746 "\n"
3747 "\n"
3747 " Par défaut le patch est inclus textuellement dans le corps du\n"
3748 " Par défaut le patch est inclus textuellement dans le corps du\n"
3748 " message afin de faciliter les relectures et commentaires.\n"
3749 " message afin de faciliter les relectures et commentaires.\n"
3749 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3750 " 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"
3751 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3751 " insère celle-ci dans le corps.\n"
3752 " insère celle-ci dans le corps.\n"
3752 "\n"
3753 "\n"
3753 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3754 " 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"
3755 " 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"
3756 " ancêtres des révisions spécifiées, le cas échéant).\n"
3756 "\n"
3757 "\n"
3757 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3758 " 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"
3759 " 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"
3760 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3760 "\n"
3761 "\n"
3761 " Exemples :\n"
3762 " Exemples :\n"
3762 "\n"
3763 "\n"
3763 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3764 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3764 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3765 " 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"
3766 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3766 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3767 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3767 "\n"
3768 "\n"
3768 " hg email -o # envoyer les patchs absents de la\n"
3769 " hg email -o # envoyer les patchs absents de la\n"
3769 " destination par défaut\n"
3770 " destination par défaut\n"
3770 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3771 " 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"
3772 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3772 " de la destination par défaut\n"
3773 " de la destination par défaut\n"
3773 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3774 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3774 " de DEST\n"
3775 " de DEST\n"
3775 "\n"
3776 "\n"
3776 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3777 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3777 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3778 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3778 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3779 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3779 " [email] pour plus de détails.\n"
3780 " [email] pour plus de détails.\n"
3780 " "
3781 " "
3781
3782
3782 msgid "specify at least one changeset with -r or -o"
3783 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"
3784 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3784
3785
3785 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3786 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3786 msgstr ""
3787 msgstr ""
3787 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3788 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3788 "bundle est utilisé"
3789 "bundle est utilisé"
3789
3790
3790 msgid "too many destinations"
3791 msgid "too many destinations"
3791 msgstr "trop de destinations"
3792 msgstr "trop de destinations"
3792
3793
3793 msgid "use only one form to specify the revision"
3794 msgid "use only one form to specify the revision"
3794 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3795 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3795
3796
3796 msgid ""
3797 msgid ""
3797 "\n"
3798 "\n"
3798 "Write the introductory message for the patch series.\n"
3799 "Write the introductory message for the patch series.\n"
3799 "\n"
3800 "\n"
3800 msgstr ""
3801 msgstr ""
3801 "\n"
3802 "\n"
3802 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3803 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3803 "\n"
3804 "\n"
3804
3805
3805 #, python-format
3806 #, python-format
3806 msgid ""
3807 msgid ""
3807 "This patch series consists of %d patches.\n"
3808 "This patch series consists of %d patches.\n"
3808 "\n"
3809 "\n"
3809 msgstr ""
3810 msgstr ""
3810 "Cette série comporte %d patchs.\n"
3811 "Cette série comporte %d patchs.\n"
3811 "\n"
3812 "\n"
3812
3813
3813 # diffstat sur l'ensemble des patchs
3814 # diffstat sur l'ensemble des patchs
3814 msgid "Final summary:\n"
3815 msgid "Final summary:\n"
3815 msgstr "Résumé complet des modifications :\n"
3816 msgstr "Résumé complet des modifications :\n"
3816
3817
3817 # mode --test
3818 # mode --test
3818 msgid "Displaying "
3819 msgid "Displaying "
3819 msgstr "Affichage de "
3820 msgstr "Affichage de "
3820
3821
3821 # mode --mbox
3822 # mode --mbox
3822 msgid "Writing "
3823 msgid "Writing "
3823 msgstr "Écriture de "
3824 msgstr "Écriture de "
3824
3825
3825 # mode d'envoi par défaut
3826 # mode d'envoi par défaut
3826 msgid "Sending "
3827 msgid "Sending "
3827 msgstr "Envoi de "
3828 msgstr "Envoi de "
3828
3829
3829 msgid "send patches as attachments"
3830 msgid "send patches as attachments"
3830 msgstr "envoyer les patchs en tant que pièces jointes"
3831 msgstr "envoyer les patchs en tant que pièces jointes"
3831
3832
3832 msgid "send patches as inline attachments"
3833 msgid "send patches as inline attachments"
3833 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3834 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3834
3835
3835 msgid "email addresses of blind carbon copy recipients"
3836 msgid "email addresses of blind carbon copy recipients"
3836 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3837 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3837
3838
3838 msgid "email addresses of copy recipients"
3839 msgid "email addresses of copy recipients"
3839 msgstr "adresses électroniques des destinataires en copie carbone"
3840 msgstr "adresses électroniques des destinataires en copie carbone"
3840
3841
3841 msgid "add diffstat output to messages"
3842 msgid "add diffstat output to messages"
3842 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3843 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3843
3844
3844 msgid "use the given date as the sending date"
3845 msgid "use the given date as the sending date"
3845 msgstr "utiliser la date fournie comme date d'envoi"
3846 msgstr "utiliser la date fournie comme date d'envoi"
3846
3847
3847 msgid "use the given file as the series description"
3848 msgid "use the given file as the series description"
3848 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3849 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3849
3850
3850 msgid "email address of sender"
3851 msgid "email address of sender"
3851 msgstr "adresse électronique de l'expéditeur"
3852 msgstr "adresse électronique de l'expéditeur"
3852
3853
3853 msgid "print messages that would be sent"
3854 msgid "print messages that would be sent"
3854 msgstr "afficher les messages tels qu'ils seraient envoyés"
3855 msgstr "afficher les messages tels qu'ils seraient envoyés"
3855
3856
3856 msgid "write messages to mbox file instead of sending them"
3857 msgid "write messages to mbox file instead of sending them"
3857 msgstr ""
3858 msgstr ""
3858 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3859 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3859
3860
3860 msgid "subject of first message (intro or single patch)"
3861 msgid "subject of first message (intro or single patch)"
3861 msgstr "sujet du premier message (intro ou patch unique)"
3862 msgstr "sujet du premier message (intro ou patch unique)"
3862
3863
3863 msgid "message identifier to reply to"
3864 msgid "message identifier to reply to"
3864 msgstr "identifiant du message auquel répondre"
3865 msgstr "identifiant du message auquel répondre"
3865
3866
3866 msgid "email addresses of recipients"
3867 msgid "email addresses of recipients"
3867 msgstr "adresses électroniques des destinataires"
3868 msgstr "adresses électroniques des destinataires"
3868
3869
3869 msgid "omit hg patch header"
3870 msgid "omit hg patch header"
3870 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3871 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3871
3872
3872 msgid "send changes not found in the target repository"
3873 msgid "send changes not found in the target repository"
3873 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3874 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3874
3875
3875 msgid "send changes not in target as a binary bundle"
3876 msgid "send changes not in target as a binary bundle"
3876 msgstr ""
3877 msgstr ""
3877 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3878 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3878 "\"bundle\" binaire"
3879 "\"bundle\" binaire"
3879
3880
3880 msgid "name of the bundle attachment file"
3881 msgid "name of the bundle attachment file"
3881 msgstr "nom à donner au fichier \"bundle\" envoyé"
3882 msgstr "nom à donner au fichier \"bundle\" envoyé"
3882
3883
3883 msgid "a revision to send"
3884 msgid "a revision to send"
3884 msgstr "une révision à envoyer"
3885 msgstr "une révision à envoyer"
3885
3886
3886 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3887 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)"
3888 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3888
3889
3889 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3890 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3890 msgstr ""
3891 msgstr ""
3891 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3892 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3892 "(avec -b/--bundle)"
3893 "(avec -b/--bundle)"
3893
3894
3894 msgid "send an introduction email for a single patch"
3895 msgid "send an introduction email for a single patch"
3895 msgstr "envoyer un courriel d'introduction pour un patch seul"
3896 msgstr "envoyer un courriel d'introduction pour un patch seul"
3896
3897
3897 msgid "hg email [OPTION]... [DEST]..."
3898 msgid "hg email [OPTION]... [DEST]..."
3898 msgstr "hg email [OPTION]... [DEST]..."
3899 msgstr "hg email [OPTION]... [DEST]..."
3899
3900
3900 msgid "command to delete untracked files from the working directory"
3901 msgid "command to delete untracked files from the working directory"
3901 msgstr ""
3902 msgstr ""
3902
3903
3903 msgid ""
3904 msgid ""
3904 "removes files not tracked by Mercurial\n"
3905 "removes files not tracked by Mercurial\n"
3905 "\n"
3906 "\n"
3906 " Delete files not known to Mercurial. This is useful to test local\n"
3907 " Delete files not known to Mercurial. This is useful to test local\n"
3907 " and uncommitted changes in an otherwise-clean source tree.\n"
3908 " and uncommitted changes in an otherwise-clean source tree.\n"
3908 "\n"
3909 "\n"
3909 " This means that purge will delete:\n"
3910 " This means that purge will delete:\n"
3910 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3911 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3911 " - Empty directories: in fact Mercurial ignores directories unless\n"
3912 " - Empty directories: in fact Mercurial ignores directories unless\n"
3912 " they contain files under source control management\n"
3913 " they contain files under source control management\n"
3913 " But it will leave untouched:\n"
3914 " But it will leave untouched:\n"
3914 " - Modified and unmodified tracked files\n"
3915 " - Modified and unmodified tracked files\n"
3915 " - Ignored files (unless --all is specified)\n"
3916 " - Ignored files (unless --all is specified)\n"
3916 " - New files added to the repository (with \"hg add\")\n"
3917 " - New files added to the repository (with \"hg add\")\n"
3917 "\n"
3918 "\n"
3918 " If directories are given on the command line, only files in these\n"
3919 " If directories are given on the command line, only files in these\n"
3919 " directories are considered.\n"
3920 " directories are considered.\n"
3920 "\n"
3921 "\n"
3921 " Be careful with purge, as you could irreversibly delete some files\n"
3922 " 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"
3923 " 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"
3924 " list of files that this program would delete, use the --print\n"
3924 " option.\n"
3925 " option.\n"
3925 " "
3926 " "
3926 msgstr ""
3927 msgstr ""
3927 "retire les fichiers non suivis par Mercurial\n"
3928 "retire les fichiers non suivis par Mercurial\n"
3928 "\n"
3929 "\n"
3929 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3930 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3930 " utile pour tester des changements locaux non enregistrés à\n"
3931 " utile pour tester des changements locaux non enregistrés à\n"
3931 " l'intérieur d'une arborescence de sources propre.\n"
3932 " l'intérieur d'une arborescence de sources propre.\n"
3932 "\n"
3933 "\n"
3933 " Ainsi, purge effacera :\n"
3934 " Ainsi, purge effacera :\n"
3934 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3935 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3935 " par un point d'interrogation\n"
3936 " par un point d'interrogation\n"
3936 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3937 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3937 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3938 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3938 " sous son contrôle\n"
3939 " sous son contrôle\n"
3939 " Seront par contre laissés intacts :\n"
3940 " Seront par contre laissés intacts :\n"
3940 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3941 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3941 " ou non\n"
3942 " ou non\n"
3942 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3943 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3943 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3944 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3944 "\n"
3945 "\n"
3945 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
3946 " 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"
3947 " seuls les fichiers qu'ils contiennent seront considérés.\n"
3947 "\n"
3948 "\n"
3948 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
3949 " 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"
3950 " 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"
3951 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
3951 " seraient effacés par purge, utilisez l'option --print.\n"
3952 " seraient effacés par purge, utilisez l'option --print.\n"
3952 " "
3953 " "
3953
3954
3954 #, python-format
3955 #, python-format
3955 msgid "%s cannot be removed"
3956 msgid "%s cannot be removed"
3956 msgstr "%s ne peut être supprimé"
3957 msgstr "%s ne peut être supprimé"
3957
3958
3958 #, python-format
3959 #, python-format
3959 msgid "warning: %s\n"
3960 msgid "warning: %s\n"
3960 msgstr "attention: %s\n"
3961 msgstr "attention: %s\n"
3961
3962
3962 #, python-format
3963 #, python-format
3963 msgid "Removing file %s\n"
3964 msgid "Removing file %s\n"
3964 msgstr "Suppression du fichier %s\n"
3965 msgstr "Suppression du fichier %s\n"
3965
3966
3966 #, python-format
3967 #, python-format
3967 msgid "Removing directory %s\n"
3968 msgid "Removing directory %s\n"
3968 msgstr "Suppression du répertoire %s\n"
3969 msgstr "Suppression du répertoire %s\n"
3969
3970
3970 msgid "abort if an error occurs"
3971 msgid "abort if an error occurs"
3971 msgstr "abandonner en cas d'erreur"
3972 msgstr "abandonner en cas d'erreur"
3972
3973
3973 msgid "purge ignored files too"
3974 msgid "purge ignored files too"
3974 msgstr "supprimer également les fichiers ignorés"
3975 msgstr "supprimer également les fichiers ignorés"
3975
3976
3976 msgid "print filenames instead of deleting them"
3977 msgid "print filenames instead of deleting them"
3977 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3978 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3978
3979
3979 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3980 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3980 msgstr ""
3981 msgstr ""
3981 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3982 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3982 "xargs (implique -p/--print)"
3983 "xargs (implique -p/--print)"
3983
3984
3984 msgid "hg purge [OPTION]... [DIR]..."
3985 msgid "hg purge [OPTION]... [DIR]..."
3985 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3986 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3986
3987
3987 msgid ""
3988 msgid ""
3988 "command to move sets of revisions to a different ancestor\n"
3989 "command to move sets of revisions to a different ancestor\n"
3989 "\n"
3990 "\n"
3990 "This extension lets you rebase changesets in an existing Mercurial\n"
3991 "This extension lets you rebase changesets in an existing Mercurial\n"
3991 "repository.\n"
3992 "repository.\n"
3992 "\n"
3993 "\n"
3993 "For more information:\n"
3994 "For more information:\n"
3994 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3995 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3995 msgstr ""
3996 msgstr ""
3996
3997
3997 msgid "first revision, do not change ancestor\n"
3998 msgid "first revision, do not change ancestor\n"
3998 msgstr ""
3999 msgstr ""
3999
4000
4000 msgid ""
4001 msgid ""
4001 "move changeset (and descendants) to a different branch\n"
4002 "move changeset (and descendants) to a different branch\n"
4002 "\n"
4003 "\n"
4003 " Rebase uses repeated merging to graft changesets from one part of\n"
4004 " Rebase uses repeated merging to graft changesets from one part of\n"
4004 " history onto another. This can be useful for linearizing local\n"
4005 " history onto another. This can be useful for linearizing local\n"
4005 " changes relative to a master development tree.\n"
4006 " changes relative to a master development tree.\n"
4006 "\n"
4007 "\n"
4007 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4008 " 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"
4009 " continued with --continue/-c or aborted with --abort/-a.\n"
4009 " "
4010 " "
4010 msgstr ""
4011 msgstr ""
4011
4012
4012 msgid "cannot use both abort and continue"
4013 msgid "cannot use both abort and continue"
4013 msgstr ""
4014 msgstr ""
4014
4015
4015 msgid "cannot use collapse with continue or abort"
4016 msgid "cannot use collapse with continue or abort"
4016 msgstr ""
4017 msgstr ""
4017
4018
4018 msgid "abort and continue do not allow specifying revisions"
4019 msgid "abort and continue do not allow specifying revisions"
4019 msgstr ""
4020 msgstr ""
4020
4021
4021 msgid "cannot specify both a revision and a base"
4022 msgid "cannot specify both a revision and a base"
4022 msgstr ""
4023 msgstr ""
4023
4024
4024 msgid "nothing to rebase\n"
4025 msgid "nothing to rebase\n"
4025 msgstr ""
4026 msgstr ""
4026
4027
4027 msgid "cannot use both keepbranches and extrafn"
4028 msgid "cannot use both keepbranches and extrafn"
4028 msgstr ""
4029 msgstr ""
4029
4030
4030 msgid "rebase merging completed\n"
4031 msgid "rebase merging completed\n"
4031 msgstr ""
4032 msgstr ""
4032
4033
4033 msgid "warning: new changesets detected on source branch, not stripping\n"
4034 msgid "warning: new changesets detected on source branch, not stripping\n"
4034 msgstr ""
4035 msgstr ""
4035
4036
4036 msgid "rebase completed\n"
4037 msgid "rebase completed\n"
4037 msgstr ""
4038 msgstr ""
4038
4039
4039 #, python-format
4040 #, python-format
4040 msgid "%d revisions have been skipped\n"
4041 msgid "%d revisions have been skipped\n"
4041 msgstr ""
4042 msgstr ""
4042
4043
4043 msgid " set parents\n"
4044 msgid " set parents\n"
4044 msgstr ""
4045 msgstr ""
4045
4046
4046 #, python-format
4047 #, python-format
4047 msgid "rebasing %d:%s\n"
4048 msgid "rebasing %d:%s\n"
4048 msgstr ""
4049 msgstr ""
4049
4050
4050 #, python-format
4051 #, python-format
4051 msgid " future parents are %d and %d\n"
4052 msgid " future parents are %d and %d\n"
4052 msgstr ""
4053 msgstr ""
4053
4054
4054 #, python-format
4055 #, python-format
4055 msgid " update to %d:%s\n"
4056 msgid " update to %d:%s\n"
4056 msgstr ""
4057 msgstr ""
4057
4058
4058 msgid " already in target\n"
4059 msgid " already in target\n"
4059 msgstr ""
4060 msgstr ""
4060
4061
4061 #, python-format
4062 #, python-format
4062 msgid " merge against %d:%s\n"
4063 msgid " merge against %d:%s\n"
4063 msgstr ""
4064 msgstr ""
4064
4065
4065 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4066 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4066 msgstr ""
4067 msgstr ""
4067
4068
4068 msgid "resuming interrupted rebase\n"
4069 msgid "resuming interrupted rebase\n"
4069 msgstr ""
4070 msgstr ""
4070
4071
4071 #, python-format
4072 #, python-format
4072 msgid "no changes, revision %d skipped\n"
4073 msgid "no changes, revision %d skipped\n"
4073 msgstr ""
4074 msgstr ""
4074
4075
4075 #, python-format
4076 #, python-format
4076 msgid "next revision set to %s\n"
4077 msgid "next revision set to %s\n"
4077 msgstr ""
4078 msgstr ""
4078
4079
4079 #, python-format
4080 #, python-format
4080 msgid "cannot use revision %d as base, result would have 3 parents"
4081 msgid "cannot use revision %d as base, result would have 3 parents"
4081 msgstr ""
4082 msgstr ""
4082
4083
4083 #, python-format
4084 #, python-format
4084 msgid "revision %d is an mq patch (%s), finalize it.\n"
4085 msgid "revision %d is an mq patch (%s), finalize it.\n"
4085 msgstr ""
4086 msgstr ""
4086
4087
4087 #, python-format
4088 #, python-format
4088 msgid "import mq patch %d (%s)\n"
4089 msgid "import mq patch %d (%s)\n"
4089 msgstr ""
4090 msgstr ""
4090
4091
4091 msgid "rebase status stored\n"
4092 msgid "rebase status stored\n"
4092 msgstr ""
4093 msgstr ""
4093
4094
4094 msgid "rebase status resumed\n"
4095 msgid "rebase status resumed\n"
4095 msgstr ""
4096 msgstr ""
4096
4097
4097 msgid "no rebase in progress"
4098 msgid "no rebase in progress"
4098 msgstr ""
4099 msgstr ""
4099
4100
4100 msgid "warning: new changesets detected on target branch, not stripping\n"
4101 msgid "warning: new changesets detected on target branch, not stripping\n"
4101 msgstr ""
4102 msgstr ""
4102
4103
4103 msgid "rebase aborted\n"
4104 msgid "rebase aborted\n"
4104 msgstr ""
4105 msgstr ""
4105
4106
4106 msgid "cannot rebase onto an applied mq patch"
4107 msgid "cannot rebase onto an applied mq patch"
4107 msgstr ""
4108 msgstr ""
4108
4109
4109 msgid "cannot rebase an ancestor"
4110 msgid "cannot rebase an ancestor"
4110 msgstr ""
4111 msgstr ""
4111
4112
4112 msgid "cannot rebase a descendant"
4113 msgid "cannot rebase a descendant"
4113 msgstr ""
4114 msgstr ""
4114
4115
4115 msgid "already working on current\n"
4116 msgid "already working on current\n"
4116 msgstr ""
4117 msgstr ""
4117
4118
4118 msgid "already working on the current branch\n"
4119 msgid "already working on the current branch\n"
4119 msgstr ""
4120 msgstr ""
4120
4121
4121 #, python-format
4122 #, python-format
4122 msgid "rebase onto %d starting from %d\n"
4123 msgid "rebase onto %d starting from %d\n"
4123 msgstr ""
4124 msgstr ""
4124
4125
4125 msgid "unable to collapse, there is more than one external parent"
4126 msgid "unable to collapse, there is more than one external parent"
4126 msgstr ""
4127 msgstr ""
4127
4128
4128 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4129 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4129 msgstr ""
4130 msgstr ""
4130
4131
4131 msgid "rebase working directory to branch head"
4132 msgid "rebase working directory to branch head"
4132 msgstr ""
4133 msgstr ""
4133
4134
4134 msgid "rebase from a given revision"
4135 msgid "rebase from a given revision"
4135 msgstr ""
4136 msgstr ""
4136
4137
4137 msgid "rebase from the base of a given revision"
4138 msgid "rebase from the base of a given revision"
4138 msgstr ""
4139 msgstr ""
4139
4140
4140 msgid "rebase onto a given revision"
4141 msgid "rebase onto a given revision"
4141 msgstr ""
4142 msgstr ""
4142
4143
4143 msgid "collapse the rebased revisions"
4144 msgid "collapse the rebased revisions"
4144 msgstr ""
4145 msgstr ""
4145
4146
4146 msgid "keep original revisions"
4147 msgid "keep original revisions"
4147 msgstr ""
4148 msgstr ""
4148
4149
4149 msgid "keep original branches"
4150 msgid "keep original branches"
4150 msgstr ""
4151 msgstr ""
4151
4152
4152 msgid "continue an interrupted rebase"
4153 msgid "continue an interrupted rebase"
4153 msgstr ""
4154 msgstr ""
4154
4155
4155 msgid "abort an interrupted rebase"
4156 msgid "abort an interrupted rebase"
4156 msgstr ""
4157 msgstr ""
4157
4158
4158 msgid ""
4159 msgid ""
4159 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4160 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4160 "| [-c] | [-a]"
4161 "| [-c] | [-a]"
4161 msgstr ""
4162 msgstr ""
4162
4163
4163 msgid "commands to interactively select changes for commit/qrefresh"
4164 msgid "commands to interactively select changes for commit/qrefresh"
4164 msgstr ""
4165 msgstr ""
4165
4166
4166 msgid "this modifies a binary file (all or nothing)\n"
4167 msgid "this modifies a binary file (all or nothing)\n"
4167 msgstr ""
4168 msgstr ""
4168
4169
4169 msgid "this is a binary file\n"
4170 msgid "this is a binary file\n"
4170 msgstr ""
4171 msgstr ""
4171
4172
4172 #, python-format
4173 #, python-format
4173 msgid "%d hunks, %d lines changed\n"
4174 msgid "%d hunks, %d lines changed\n"
4174 msgstr ""
4175 msgstr ""
4175
4176
4176 msgid "[Ynsfdaq?]"
4177 msgid "[Ynsfdaq?]"
4177 msgstr ""
4178 msgstr ""
4178
4179
4179 msgid "&Yes, record this change"
4180 msgid "&Yes, record this change"
4180 msgstr ""
4181 msgstr ""
4181
4182
4182 msgid "&No, skip this change"
4183 msgid "&No, skip this change"
4183 msgstr ""
4184 msgstr ""
4184
4185
4185 msgid "&Skip remaining changes to this file"
4186 msgid "&Skip remaining changes to this file"
4186 msgstr ""
4187 msgstr ""
4187
4188
4188 msgid "Record remaining changes to this &file"
4189 msgid "Record remaining changes to this &file"
4189 msgstr ""
4190 msgstr ""
4190
4191
4191 msgid "&Done, skip remaining changes and files"
4192 msgid "&Done, skip remaining changes and files"
4192 msgstr ""
4193 msgstr ""
4193
4194
4194 msgid "Record &all changes to all remaining files"
4195 msgid "Record &all changes to all remaining files"
4195 msgstr ""
4196 msgstr ""
4196
4197
4197 msgid "&Quit, recording no changes"
4198 msgid "&Quit, recording no changes"
4198 msgstr ""
4199 msgstr ""
4199
4200
4200 msgid "&?"
4201 msgid "&?"
4201 msgstr ""
4202 msgstr ""
4202
4203
4203 msgid "y"
4204 msgid "y"
4204 msgstr ""
4205 msgstr ""
4205
4206
4206 msgid "?"
4207 msgid "?"
4207 msgstr ""
4208 msgstr ""
4208
4209
4209 msgid "y - record this change"
4210 msgid "y - record this change"
4210 msgstr ""
4211 msgstr ""
4211
4212
4212 msgid "s"
4213 msgid "s"
4213 msgstr ""
4214 msgstr ""
4214
4215
4215 msgid "f"
4216 msgid "f"
4216 msgstr ""
4217 msgstr ""
4217
4218
4218 msgid "d"
4219 msgid "d"
4219 msgstr ""
4220 msgstr ""
4220
4221
4221 msgid "a"
4222 msgid "a"
4222 msgstr ""
4223 msgstr ""
4223
4224
4224 msgid "q"
4225 msgid "q"
4225 msgstr ""
4226 msgstr ""
4226
4227
4227 msgid "user quit"
4228 msgid "user quit"
4228 msgstr ""
4229 msgstr ""
4229
4230
4230 #, python-format
4231 #, python-format
4231 msgid "examine changes to %s?"
4232 msgid "examine changes to %s?"
4232 msgstr ""
4233 msgstr ""
4233
4234
4234 msgid " and "
4235 msgid " and "
4235 msgstr ""
4236 msgstr ""
4236
4237
4237 #, python-format
4238 #, python-format
4238 msgid "record this change to %r?"
4239 msgid "record this change to %r?"
4239 msgstr ""
4240 msgstr ""
4240
4241
4241 #, python-format
4242 #, python-format
4242 msgid "record change %d/%d to %r?"
4243 msgid "record change %d/%d to %r?"
4243 msgstr ""
4244 msgstr ""
4244
4245
4245 msgid ""
4246 msgid ""
4246 "interactively select changes to commit\n"
4247 "interactively select changes to commit\n"
4247 "\n"
4248 "\n"
4248 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4249 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4249 " will be candidates for recording.\n"
4250 " will be candidates for recording.\n"
4250 "\n"
4251 "\n"
4251 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4252 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4252 "\n"
4253 "\n"
4253 " You will be prompted for whether to record changes to each\n"
4254 " You will be prompted for whether to record changes to each\n"
4254 " modified file, and for files with multiple changes, for each\n"
4255 " modified file, and for files with multiple changes, for each\n"
4255 " change to use. For each query, the following responses are\n"
4256 " change to use. For each query, the following responses are\n"
4256 " possible:\n"
4257 " possible:\n"
4257 "\n"
4258 "\n"
4258 " y - record this change\n"
4259 " y - record this change\n"
4259 " n - skip this change\n"
4260 " n - skip this change\n"
4260 "\n"
4261 "\n"
4261 " s - skip remaining changes to this file\n"
4262 " s - skip remaining changes to this file\n"
4262 " f - record remaining changes to this file\n"
4263 " f - record remaining changes to this file\n"
4263 "\n"
4264 "\n"
4264 " d - done, skip remaining changes and files\n"
4265 " d - done, skip remaining changes and files\n"
4265 " a - record all changes to all remaining files\n"
4266 " a - record all changes to all remaining files\n"
4266 " q - quit, recording no changes\n"
4267 " q - quit, recording no changes\n"
4267 "\n"
4268 "\n"
4268 " ? - display help"
4269 " ? - display help"
4269 msgstr ""
4270 msgstr ""
4270
4271
4271 msgid "'mq' extension not loaded"
4272 msgid "'mq' extension not loaded"
4272 msgstr ""
4273 msgstr ""
4273
4274
4274 msgid "running non-interactively, use commit instead"
4275 msgid "running non-interactively, use commit instead"
4275 msgstr ""
4276 msgstr ""
4276
4277
4277 msgid "no changes to record\n"
4278 msgid "no changes to record\n"
4278 msgstr ""
4279 msgstr ""
4279
4280
4280 #, python-format
4281 #, python-format
4281 msgid "backup %r as %r\n"
4282 msgid "backup %r as %r\n"
4282 msgstr ""
4283 msgstr ""
4283
4284
4284 msgid "applying patch\n"
4285 msgid "applying patch\n"
4285 msgstr ""
4286 msgstr ""
4286
4287
4287 msgid "patch failed to apply"
4288 msgid "patch failed to apply"
4288 msgstr ""
4289 msgstr ""
4289
4290
4290 #, python-format
4291 #, python-format
4291 msgid "restoring %r to %r\n"
4292 msgid "restoring %r to %r\n"
4292 msgstr ""
4293 msgstr ""
4293
4294
4294 msgid "hg record [OPTION]... [FILE]..."
4295 msgid "hg record [OPTION]... [FILE]..."
4295 msgstr ""
4296 msgstr ""
4296
4297
4297 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4298 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4298 msgstr ""
4299 msgstr ""
4299
4300
4300 msgid "share a common history between several working directories"
4301 msgid "share a common history between several working directories"
4301 msgstr ""
4302 msgstr ""
4302
4303
4303 msgid ""
4304 msgid ""
4304 "create a new shared repository (experimental)\n"
4305 "create a new shared repository (experimental)\n"
4305 "\n"
4306 "\n"
4306 " Initialize a new repository and working directory that shares its\n"
4307 " Initialize a new repository and working directory that shares its\n"
4307 " history with another repository.\n"
4308 " history with another repository.\n"
4308 "\n"
4309 "\n"
4309 " NOTE: actions that change history such as rollback or moving the\n"
4310 " NOTE: actions that change history such as rollback or moving the\n"
4310 " source may confuse sharers.\n"
4311 " source may confuse sharers.\n"
4311 " "
4312 " "
4312 msgstr ""
4313 msgstr ""
4313
4314
4314 msgid "do not create a working copy"
4315 msgid "do not create a working copy"
4315 msgstr ""
4316 msgstr ""
4316
4317
4317 msgid "[-U] SOURCE [DEST]"
4318 msgid "[-U] SOURCE [DEST]"
4318 msgstr ""
4319 msgstr ""
4319
4320
4320 msgid ""
4321 msgid ""
4321 "command to transplant changesets from another branch\n"
4322 "command to transplant changesets from another branch\n"
4322 "\n"
4323 "\n"
4323 "This extension allows you to transplant patches from another branch.\n"
4324 "This extension allows you to transplant patches from another branch.\n"
4324 "\n"
4325 "\n"
4325 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4326 "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"
4327 "map from a changeset hash to its hash in the source repository.\n"
4327 msgstr ""
4328 msgstr ""
4328
4329
4329 #, python-format
4330 #, python-format
4330 msgid "skipping already applied revision %s\n"
4331 msgid "skipping already applied revision %s\n"
4331 msgstr ""
4332 msgstr ""
4332
4333
4333 #, python-format
4334 #, python-format
4334 msgid "skipping merge changeset %s:%s\n"
4335 msgid "skipping merge changeset %s:%s\n"
4335 msgstr ""
4336 msgstr ""
4336
4337
4337 #, python-format
4338 #, python-format
4338 msgid "%s merged at %s\n"
4339 msgid "%s merged at %s\n"
4339 msgstr ""
4340 msgstr ""
4340
4341
4341 #, python-format
4342 #, python-format
4342 msgid "%s transplanted to %s\n"
4343 msgid "%s transplanted to %s\n"
4343 msgstr ""
4344 msgstr ""
4344
4345
4345 #, python-format
4346 #, python-format
4346 msgid "filtering %s\n"
4347 msgid "filtering %s\n"
4347 msgstr ""
4348 msgstr ""
4348
4349
4349 msgid "filter failed"
4350 msgid "filter failed"
4350 msgstr ""
4351 msgstr ""
4351
4352
4352 msgid "can only omit patchfile if merging"
4353 msgid "can only omit patchfile if merging"
4353 msgstr ""
4354 msgstr ""
4354
4355
4355 #, python-format
4356 #, python-format
4356 msgid "%s: empty changeset"
4357 msgid "%s: empty changeset"
4357 msgstr ""
4358 msgstr ""
4358
4359
4359 msgid "Fix up the merge and run hg transplant --continue"
4360 msgid "Fix up the merge and run hg transplant --continue"
4360 msgstr ""
4361 msgstr ""
4361
4362
4362 #, python-format
4363 #, python-format
4363 msgid "%s transplanted as %s\n"
4364 msgid "%s transplanted as %s\n"
4364 msgstr ""
4365 msgstr ""
4365
4366
4366 msgid "transplant log file is corrupt"
4367 msgid "transplant log file is corrupt"
4367 msgstr ""
4368 msgstr ""
4368
4369
4369 #, python-format
4370 #, python-format
4370 msgid "working dir not at transplant parent %s"
4371 msgid "working dir not at transplant parent %s"
4371 msgstr ""
4372 msgstr ""
4372
4373
4373 msgid "commit failed"
4374 msgid "commit failed"
4374 msgstr ""
4375 msgstr ""
4375
4376
4376 msgid "apply changeset? [ynmpcq?]:"
4377 msgid "apply changeset? [ynmpcq?]:"
4377 msgstr ""
4378 msgstr ""
4378
4379
4379 msgid ""
4380 msgid ""
4380 "transplant changesets from another branch\n"
4381 "transplant changesets from another branch\n"
4381 "\n"
4382 "\n"
4382 " Selected changesets will be applied on top of the current working\n"
4383 " 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"
4384 " 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"
4385 " specified, log messages will have a comment appended of the form:\n"
4385 "\n"
4386 "\n"
4386 " (transplanted from CHANGESETHASH)\n"
4387 " (transplanted from CHANGESETHASH)\n"
4387 "\n"
4388 "\n"
4388 " You can rewrite the changelog message with the --filter option.\n"
4389 " You can rewrite the changelog message with the --filter option.\n"
4389 " Its argument will be invoked with the current changelog message as\n"
4390 " Its argument will be invoked with the current changelog message as\n"
4390 " $1 and the patch as $2.\n"
4391 " $1 and the patch as $2.\n"
4391 "\n"
4392 "\n"
4392 " If --source/-s is specified, selects changesets from the named\n"
4393 " If --source/-s is specified, selects changesets from the named\n"
4393 " repository. If --branch/-b is specified, selects changesets from\n"
4394 " repository. If --branch/-b is specified, selects changesets from\n"
4394 " the branch holding the named revision, up to that revision. If\n"
4395 " 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"
4396 " --all/-a is specified, all changesets on the branch will be\n"
4396 " transplanted, otherwise you will be prompted to select the\n"
4397 " transplanted, otherwise you will be prompted to select the\n"
4397 " changesets you want.\n"
4398 " changesets you want.\n"
4398 "\n"
4399 "\n"
4399 " hg transplant --branch REVISION --all will rebase the selected\n"
4400 " hg transplant --branch REVISION --all will rebase the selected\n"
4400 " branch (up to the named revision) onto your current working\n"
4401 " branch (up to the named revision) onto your current working\n"
4401 " directory.\n"
4402 " directory.\n"
4402 "\n"
4403 "\n"
4403 " You can optionally mark selected transplanted changesets as merge\n"
4404 " You can optionally mark selected transplanted changesets as merge\n"
4404 " changesets. You will not be prompted to transplant any ancestors\n"
4405 " changesets. You will not be prompted to transplant any ancestors\n"
4405 " of a merged transplant, and you can merge descendants of them\n"
4406 " of a merged transplant, and you can merge descendants of them\n"
4406 " normally instead of transplanting them.\n"
4407 " normally instead of transplanting them.\n"
4407 "\n"
4408 "\n"
4408 " If no merges or revisions are provided, hg transplant will start\n"
4409 " If no merges or revisions are provided, hg transplant will start\n"
4409 " an interactive changeset browser.\n"
4410 " an interactive changeset browser.\n"
4410 "\n"
4411 "\n"
4411 " If a changeset application fails, you can fix the merge by hand\n"
4412 " 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"
4413 " and then resume where you left off by calling hg transplant\n"
4413 " --continue/-c.\n"
4414 " --continue/-c.\n"
4414 " "
4415 " "
4415 msgstr ""
4416 msgstr ""
4416
4417
4417 msgid "--continue is incompatible with branch, all or merge"
4418 msgid "--continue is incompatible with branch, all or merge"
4418 msgstr ""
4419 msgstr ""
4419
4420
4420 msgid "no source URL, branch tag or revision list provided"
4421 msgid "no source URL, branch tag or revision list provided"
4421 msgstr ""
4422 msgstr ""
4422
4423
4423 msgid "--all requires a branch revision"
4424 msgid "--all requires a branch revision"
4424 msgstr ""
4425 msgstr ""
4425
4426
4426 msgid "--all is incompatible with a revision list"
4427 msgid "--all is incompatible with a revision list"
4427 msgstr ""
4428 msgstr ""
4428
4429
4429 msgid "no revision checked out"
4430 msgid "no revision checked out"
4430 msgstr ""
4431 msgstr ""
4431
4432
4432 msgid "outstanding uncommitted merges"
4433 msgid "outstanding uncommitted merges"
4433 msgstr ""
4434 msgstr ""
4434
4435
4435 msgid "outstanding local changes"
4436 msgid "outstanding local changes"
4436 msgstr ""
4437 msgstr ""
4437
4438
4438 msgid "pull patches from REPOSITORY"
4439 msgid "pull patches from REPOSITORY"
4439 msgstr ""
4440 msgstr ""
4440
4441
4441 msgid "pull patches from branch BRANCH"
4442 msgid "pull patches from branch BRANCH"
4442 msgstr ""
4443 msgstr ""
4443
4444
4444 msgid "pull all changesets up to BRANCH"
4445 msgid "pull all changesets up to BRANCH"
4445 msgstr ""
4446 msgstr ""
4446
4447
4447 msgid "skip over REV"
4448 msgid "skip over REV"
4448 msgstr ""
4449 msgstr ""
4449
4450
4450 msgid "merge at REV"
4451 msgid "merge at REV"
4451 msgstr ""
4452 msgstr ""
4452
4453
4453 msgid "append transplant info to log message"
4454 msgid "append transplant info to log message"
4454 msgstr ""
4455 msgstr ""
4455
4456
4456 msgid "continue last transplant session after repair"
4457 msgid "continue last transplant session after repair"
4457 msgstr ""
4458 msgstr ""
4458
4459
4459 msgid "filter changesets through FILTER"
4460 msgid "filter changesets through FILTER"
4460 msgstr ""
4461 msgstr ""
4461
4462
4462 msgid ""
4463 msgid ""
4463 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4464 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4464 msgstr ""
4465 msgstr ""
4465
4466
4466 msgid ""
4467 msgid ""
4467 "allow the use of MBCS paths with problematic encodings\n"
4468 "allow the use of MBCS paths with problematic encodings\n"
4468 "\n"
4469 "\n"
4469 "Some MBCS encodings are not good for some path operations (i.e.\n"
4470 "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"
4471 "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"
4472 "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"
4473 "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"
4474 "wrapping some functions to convert to Unicode string before path\n"
4474 "operation.\n"
4475 "operation.\n"
4475 "\n"
4476 "\n"
4476 "This extension is useful for:\n"
4477 "This extension is useful for:\n"
4477 " * Japanese Windows users using shift_jis encoding.\n"
4478 " * Japanese Windows users using shift_jis encoding.\n"
4478 " * Chinese Windows users using big5 encoding.\n"
4479 " * Chinese Windows users using big5 encoding.\n"
4479 " * All users who use a repository with one of problematic encodings on\n"
4480 " * All users who use a repository with one of problematic encodings on\n"
4480 " case-insensitive file system.\n"
4481 " case-insensitive file system.\n"
4481 "\n"
4482 "\n"
4482 "This extension is not needed for:\n"
4483 "This extension is not needed for:\n"
4483 " * Any user who use only ASCII chars in path.\n"
4484 " * Any user who use only ASCII chars in path.\n"
4484 " * Any user who do not use any of problematic encodings.\n"
4485 " * Any user who do not use any of problematic encodings.\n"
4485 "\n"
4486 "\n"
4486 "Note that there are some limitations on using this extension:\n"
4487 "Note that there are some limitations on using this extension:\n"
4487 " * You should use single encoding in one repository.\n"
4488 " * You should use single encoding in one repository.\n"
4488 " * You should set same encoding for the repository by locale or\n"
4489 " * You should set same encoding for the repository by locale or\n"
4489 " HGENCODING.\n"
4490 " HGENCODING.\n"
4490 "\n"
4491 "\n"
4491 "Path encoding conversion are done between Unicode and\n"
4492 "Path encoding conversion are done between Unicode and\n"
4492 "encoding.encoding which is decided by Mercurial from current locale\n"
4493 "encoding.encoding which is decided by Mercurial from current locale\n"
4493 "setting or HGENCODING.\n"
4494 "setting or HGENCODING.\n"
4494 msgstr ""
4495 msgstr ""
4495
4496
4496 #, python-format
4497 #, python-format
4497 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4498 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4498 msgstr ""
4499 msgstr ""
4499
4500
4500 msgid "[win32mbcs] cannot activate on this platform.\n"
4501 msgid "[win32mbcs] cannot activate on this platform.\n"
4501 msgstr ""
4502 msgstr ""
4502
4503
4503 #, python-format
4504 #, python-format
4504 msgid "[win32mbcs] activated with encoding: %s\n"
4505 msgid "[win32mbcs] activated with encoding: %s\n"
4505 msgstr ""
4506 msgstr ""
4506
4507
4507 msgid ""
4508 msgid ""
4508 "perform automatic newline conversion\n"
4509 "perform automatic newline conversion\n"
4509 "\n"
4510 "\n"
4510 "To perform automatic newline conversion, use:\n"
4511 "To perform automatic newline conversion, use:\n"
4511 "\n"
4512 "\n"
4512 "[extensions]\n"
4513 "[extensions]\n"
4513 "hgext.win32text =\n"
4514 "hgext.win32text =\n"
4514 "[encode]\n"
4515 "[encode]\n"
4515 "** = cleverencode:\n"
4516 "** = cleverencode:\n"
4516 "# or ** = macencode:\n"
4517 "# or ** = macencode:\n"
4517 "\n"
4518 "\n"
4518 "[decode]\n"
4519 "[decode]\n"
4519 "** = cleverdecode:\n"
4520 "** = cleverdecode:\n"
4520 "# or ** = macdecode:\n"
4521 "# or ** = macdecode:\n"
4521 "\n"
4522 "\n"
4522 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4523 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4523 "accident:\n"
4524 "accident:\n"
4524 "\n"
4525 "\n"
4525 "[hooks]\n"
4526 "[hooks]\n"
4526 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4527 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4527 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4528 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4528 "\n"
4529 "\n"
4529 "To do the same check on a server to prevent CRLF/CR from being\n"
4530 "To do the same check on a server to prevent CRLF/CR from being\n"
4530 "pushed or pulled:\n"
4531 "pushed or pulled:\n"
4531 "\n"
4532 "\n"
4532 "[hooks]\n"
4533 "[hooks]\n"
4533 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4534 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4534 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4535 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4535 msgstr ""
4536 msgstr ""
4536
4537
4537 #, python-format
4538 #, python-format
4538 msgid ""
4539 msgid ""
4539 "WARNING: %s already has %s line endings\n"
4540 "WARNING: %s already has %s line endings\n"
4540 "and does not need EOL conversion by the win32text plugin.\n"
4541 "and does not need EOL conversion by the win32text plugin.\n"
4541 "Before your next commit, please reconsider your encode/decode settings in \n"
4542 "Before your next commit, please reconsider your encode/decode settings in \n"
4542 "Mercurial.ini or %s.\n"
4543 "Mercurial.ini or %s.\n"
4543 msgstr ""
4544 msgstr ""
4544
4545
4545 #, python-format
4546 #, python-format
4546 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4547 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4547 msgstr ""
4548 msgstr ""
4548
4549
4549 #, python-format
4550 #, python-format
4550 msgid "in %s: %s\n"
4551 msgid "in %s: %s\n"
4551 msgstr ""
4552 msgstr ""
4552
4553
4553 #, python-format
4554 #, python-format
4554 msgid ""
4555 msgid ""
4555 "\n"
4556 "\n"
4556 "To prevent this mistake in your local repository,\n"
4557 "To prevent this mistake in your local repository,\n"
4557 "add to Mercurial.ini or .hg/hgrc:\n"
4558 "add to Mercurial.ini or .hg/hgrc:\n"
4558 "\n"
4559 "\n"
4559 "[hooks]\n"
4560 "[hooks]\n"
4560 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4561 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4561 "\n"
4562 "\n"
4562 "and also consider adding:\n"
4563 "and also consider adding:\n"
4563 "\n"
4564 "\n"
4564 "[extensions]\n"
4565 "[extensions]\n"
4565 "hgext.win32text =\n"
4566 "hgext.win32text =\n"
4566 "[encode]\n"
4567 "[encode]\n"
4567 "** = %sencode:\n"
4568 "** = %sencode:\n"
4568 "[decode]\n"
4569 "[decode]\n"
4569 "** = %sdecode:\n"
4570 "** = %sdecode:\n"
4570 msgstr ""
4571 msgstr ""
4571
4572
4572 msgid ""
4573 msgid ""
4573 "discover and advertise repositories on the local network\n"
4574 "discover and advertise repositories on the local network\n"
4574 "\n"
4575 "\n"
4575 "Zeroconf enabled repositories will be announced in a network without\n"
4576 "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"
4577 "the need to configure a server or a service. They can be discovered\n"
4577 "without knowing their actual IP address.\n"
4578 "without knowing their actual IP address.\n"
4578 "\n"
4579 "\n"
4579 "To allow other people to discover your repository using run \"hg serve\"\n"
4580 "To allow other people to discover your repository using run \"hg serve\"\n"
4580 "in your repository.\n"
4581 "in your repository.\n"
4581 "\n"
4582 "\n"
4582 " $ cd test\n"
4583 " $ cd test\n"
4583 " $ hg serve\n"
4584 " $ hg serve\n"
4584 "\n"
4585 "\n"
4585 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4586 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4586 "\n"
4587 "\n"
4587 " $ hg paths\n"
4588 " $ hg paths\n"
4588 " zc-test = http://example.com:8000/test\n"
4589 " zc-test = http://example.com:8000/test\n"
4589 msgstr ""
4590 msgstr ""
4590 "découverte et annonce de dépôts sur le réseau local\n"
4591 "découverte et annonce de dépôts sur le réseau local\n"
4591 "\n"
4592 "\n"
4592 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4593 "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"
4594 "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"
4595 "particuliers, et ils peuvent être accédés simplement, sans\n"
4595 "connaissance de leur adresse IP.\n"
4596 "connaissance de leur adresse IP.\n"
4596 "\n"
4597 "\n"
4597 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4598 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4598 "lancez-y la commande \"hg serve\" :\n"
4599 "lancez-y la commande \"hg serve\" :\n"
4599 "\n"
4600 "\n"
4600 " $ cd test\n"
4601 " $ cd test\n"
4601 " $ hg serve\n"
4602 " $ hg serve\n"
4602 "\n"
4603 "\n"
4603 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4604 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4604 "la commande \"hg paths\", par exemple :\n"
4605 "la commande \"hg paths\", par exemple :\n"
4605 "\n"
4606 "\n"
4606 " $ hg paths\n"
4607 " $ hg paths\n"
4607 " zc-test = http://example.com:8000/test\n"
4608 " zc-test = http://example.com:8000/test\n"
4608
4609
4609 msgid "archive prefix contains illegal components"
4610 msgid "archive prefix contains illegal components"
4610 msgstr "le préfixe donné pour l'archive contient des composants non autorisés"
4611 msgstr "le préfixe donné pour l'archive contient des composants non autorisés"
4611
4612
4612 msgid "cannot give prefix when archiving to files"
4613 msgid "cannot give prefix when archiving to files"
4613 msgstr ""
4614 msgstr ""
4614 "impossible de donner un préfixe pour une création d'archive vers un "
4615 "impossible de donner un préfixe pour une création d'archive vers un "
4615 "répertoire (de type \"files\")"
4616 "répertoire (de type \"files\")"
4616
4617
4617 #, python-format
4618 #, python-format
4618 msgid "unknown archive type '%s'"
4619 msgid "unknown archive type '%s'"
4619 msgstr "type d'archive inconnu : '%s'"
4620 msgstr "type d'archive inconnu : '%s'"
4620
4621
4621 msgid "invalid changegroup"
4622 msgid "invalid changegroup"
4622 msgstr ""
4623 msgstr ""
4623
4624
4624 msgid "unknown parent"
4625 msgid "unknown parent"
4625 msgstr ""
4626 msgstr ""
4626
4627
4627 #, python-format
4628 #, python-format
4628 msgid "integrity check failed on %s:%d"
4629 msgid "integrity check failed on %s:%d"
4629 msgstr ""
4630 msgstr ""
4630
4631
4631 #, python-format
4632 #, python-format
4632 msgid "%s: not a Mercurial bundle file"
4633 msgid "%s: not a Mercurial bundle file"
4633 msgstr ""
4634 msgstr ""
4634
4635
4635 #, python-format
4636 #, python-format
4636 msgid "%s: unknown bundle version"
4637 msgid "%s: unknown bundle version"
4637 msgstr ""
4638 msgstr ""
4638
4639
4639 #, python-format
4640 #, python-format
4640 msgid "%s: unknown bundle compression type"
4641 msgid "%s: unknown bundle compression type"
4641 msgstr ""
4642 msgstr ""
4642
4643
4643 msgid "cannot create new bundle repository"
4644 msgid "cannot create new bundle repository"
4644 msgstr ""
4645 msgstr ""
4645
4646
4646 #, python-format
4647 #, python-format
4647 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4648 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4648 msgstr ""
4649 msgstr ""
4649
4650
4650 msgid "empty username"
4651 msgid "empty username"
4651 msgstr "le nom d'utilisateur est vide"
4652 msgstr "le nom d'utilisateur est vide"
4652
4653
4653 #, python-format
4654 #, python-format
4654 msgid "username %s contains a newline"
4655 msgid "username %s contains a newline"
4655 msgstr "le nom d'utilisateur %s contient un saut de ligne"
4656 msgstr "le nom d'utilisateur %s contient un saut de ligne"
4656
4657
4657 msgid "options --message and --logfile are mutually exclusive"
4658 msgid "options --message and --logfile are mutually exclusive"
4658 msgstr "les options --message et --logfile s'excluent mutuellement"
4659 msgstr "les options --message et --logfile s'excluent mutuellement"
4659
4660
4660 #, python-format
4661 #, python-format
4661 msgid "can't read commit message '%s': %s"
4662 msgid "can't read commit message '%s': %s"
4662 msgstr ""
4663 msgstr ""
4663
4664
4664 msgid "limit must be a positive integer"
4665 msgid "limit must be a positive integer"
4665 msgstr "la limite spécifiée doit être un entier positif"
4666 msgstr "la limite spécifiée doit être un entier positif"
4666
4667
4667 msgid "limit must be positive"
4668 msgid "limit must be positive"
4668 msgstr "la limite doit être positive"
4669 msgstr "la limite doit être positive"
4669
4670
4670 msgid "too many revisions specified"
4671 msgid "too many revisions specified"
4671 msgstr "trop de révisions spécifiées"
4672 msgstr "trop de révisions spécifiées"
4672
4673
4673 #, python-format
4674 #, python-format
4674 msgid "invalid format spec '%%%s' in output filename"
4675 msgid "invalid format spec '%%%s' in output filename"
4675 msgstr ""
4676 msgstr ""
4676 "'%%%s'spécification de format invalide dans le nom du fichier de sortie"
4677 "'%%%s'spécification de format invalide dans le nom du fichier de sortie"
4677
4678
4678 #, python-format
4679 #, python-format
4679 msgid "adding %s\n"
4680 msgid "adding %s\n"
4680 msgstr "ajout de %s\n"
4681 msgstr "ajout de %s\n"
4681
4682
4682 #, python-format
4683 #, python-format
4683 msgid "removing %s\n"
4684 msgid "removing %s\n"
4684 msgstr "suppression de %s\n"
4685 msgstr "suppression de %s\n"
4685
4686
4686 #, python-format
4687 #, python-format
4687 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4688 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4688 msgstr ""
4689 msgstr ""
4689 "suppression de %s plannifiée, en tant que renommage de %s (similaire à %d%"
4690 "suppression de %s plannifiée, en tant que renommage de %s (similaire à %d%"
4690 "%)\n"
4691 "%)\n"
4691
4692
4692 #, python-format
4693 #, python-format
4693 msgid "%s: not copying - file is not managed\n"
4694 msgid "%s: not copying - file is not managed\n"
4694 msgstr "%s: le fichier n'est pas suivi, pas de copie\n"
4695 msgstr "%s: le fichier n'est pas suivi, pas de copie\n"
4695
4696
4696 #, python-format
4697 #, python-format
4697 msgid "%s: not copying - file has been marked for remove\n"
4698 msgid "%s: not copying - file has been marked for remove\n"
4698 msgstr "%s: le fichier a été marqué pour suppression, pas de copie\n"
4699 msgstr "%s: le fichier a été marqué pour suppression, pas de copie\n"
4699
4700
4700 #, python-format
4701 #, python-format
4701 msgid "%s: not overwriting - %s collides with %s\n"
4702 msgid "%s: not overwriting - %s collides with %s\n"
4702 msgstr "%s: %s entre en collision avec %s, pas d'écrasement\n"
4703 msgstr "%s: %s entre en collision avec %s, pas d'écrasement\n"
4703
4704
4704 #, python-format
4705 #, python-format
4705 msgid "%s: not overwriting - file exists\n"
4706 msgid "%s: not overwriting - file exists\n"
4706 msgstr "%s: le fichier existe, pas d'écrasement\n"
4707 msgstr "%s: le fichier existe, pas d'écrasement\n"
4707
4708
4708 #, python-format
4709 #, python-format
4709 msgid "%s: deleted in working copy\n"
4710 msgid "%s: deleted in working copy\n"
4710 msgstr "%s: supprimé dans la copie de travail\n"
4711 msgstr "%s: supprimé dans la copie de travail\n"
4711
4712
4712 #, python-format
4713 #, python-format
4713 msgid "%s: cannot copy - %s\n"
4714 msgid "%s: cannot copy - %s\n"
4714 msgstr "%s: impossible de copier - %s\n"
4715 msgstr "%s: impossible de copier - %s\n"
4715
4716
4716 #, python-format
4717 #, python-format
4717 msgid "moving %s to %s\n"
4718 msgid "moving %s to %s\n"
4718 msgstr "déplacement de %s vers %s\n"
4719 msgstr "déplacement de %s vers %s\n"
4719
4720
4720 #, python-format
4721 #, python-format
4721 msgid "copying %s to %s\n"
4722 msgid "copying %s to %s\n"
4722 msgstr "copie de %s vers %s\n"
4723 msgstr "copie de %s vers %s\n"
4723
4724
4724 #, python-format
4725 #, python-format
4725 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4726 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4726 msgstr ""
4727 msgstr ""
4727
4728
4728 msgid "no source or destination specified"
4729 msgid "no source or destination specified"
4729 msgstr ""
4730 msgstr ""
4730
4731
4731 msgid "no destination specified"
4732 msgid "no destination specified"
4732 msgstr ""
4733 msgstr ""
4733
4734
4734 msgid "with multiple sources, destination must be an existing directory"
4735 msgid "with multiple sources, destination must be an existing directory"
4735 msgstr ""
4736 msgstr ""
4736
4737
4737 #, python-format
4738 #, python-format
4738 msgid "destination %s is not a directory"
4739 msgid "destination %s is not a directory"
4739 msgstr ""
4740 msgstr ""
4740
4741
4741 msgid "no files to copy"
4742 msgid "no files to copy"
4742 msgstr ""
4743 msgstr ""
4743
4744
4744 msgid "(consider using --after)\n"
4745 msgid "(consider using --after)\n"
4745 msgstr ""
4746 msgstr ""
4746
4747
4747 #, python-format
4748 #, python-format
4748 msgid "changeset: %d:%s\n"
4749 msgid "changeset: %d:%s\n"
4749 msgstr ""
4750 msgstr ""
4750
4751
4751 #, python-format
4752 #, python-format
4752 msgid "branch: %s\n"
4753 msgid "branch: %s\n"
4753 msgstr ""
4754 msgstr ""
4754
4755
4755 #, python-format
4756 #, python-format
4756 msgid "tag: %s\n"
4757 msgid "tag: %s\n"
4757 msgstr ""
4758 msgstr ""
4758
4759
4759 #, python-format
4760 #, python-format
4760 msgid "parent: %d:%s\n"
4761 msgid "parent: %d:%s\n"
4761 msgstr ""
4762 msgstr ""
4762
4763
4763 #, python-format
4764 #, python-format
4764 msgid "manifest: %d:%s\n"
4765 msgid "manifest: %d:%s\n"
4765 msgstr ""
4766 msgstr ""
4766
4767
4767 #, python-format
4768 #, python-format
4768 msgid "user: %s\n"
4769 msgid "user: %s\n"
4769 msgstr ""
4770 msgstr ""
4770
4771
4771 #, python-format
4772 #, python-format
4772 msgid "date: %s\n"
4773 msgid "date: %s\n"
4773 msgstr ""
4774 msgstr ""
4774
4775
4775 msgid "files+:"
4776 msgid "files+:"
4776 msgstr ""
4777 msgstr ""
4777
4778
4778 msgid "files-:"
4779 msgid "files-:"
4779 msgstr ""
4780 msgstr ""
4780
4781
4781 msgid "files:"
4782 msgid "files:"
4782 msgstr ""
4783 msgstr ""
4783
4784
4784 #, python-format
4785 #, python-format
4785 msgid "files: %s\n"
4786 msgid "files: %s\n"
4786 msgstr ""
4787 msgstr ""
4787
4788
4788 #, python-format
4789 #, python-format
4789 msgid "copies: %s\n"
4790 msgid "copies: %s\n"
4790 msgstr ""
4791 msgstr ""
4791
4792
4792 #, python-format
4793 #, python-format
4793 msgid "extra: %s=%s\n"
4794 msgid "extra: %s=%s\n"
4794 msgstr ""
4795 msgstr ""
4795
4796
4796 msgid "description:\n"
4797 msgid "description:\n"
4797 msgstr ""
4798 msgstr ""
4798
4799
4799 #, python-format
4800 #, python-format
4800 msgid "summary: %s\n"
4801 msgid "summary: %s\n"
4801 msgstr ""
4802 msgstr ""
4802
4803
4803 #, python-format
4804 #, python-format
4804 msgid "%s: no key named '%s'"
4805 msgid "%s: no key named '%s'"
4805 msgstr ""
4806 msgstr ""
4806
4807
4807 #, python-format
4808 #, python-format
4808 msgid "%s: %s"
4809 msgid "%s: %s"
4809 msgstr ""
4810 msgstr ""
4810
4811
4811 #, python-format
4812 #, python-format
4812 msgid "Found revision %s from %s\n"
4813 msgid "Found revision %s from %s\n"
4813 msgstr ""
4814 msgstr ""
4814
4815
4815 msgid "revision matching date not found"
4816 msgid "revision matching date not found"
4816 msgstr ""
4817 msgstr ""
4817
4818
4818 #, python-format
4819 #, python-format
4819 msgid "cannot follow nonexistent file: \"%s\""
4820 msgid "cannot follow nonexistent file: \"%s\""
4820 msgstr ""
4821 msgstr ""
4821
4822
4822 #, python-format
4823 #, python-format
4823 msgid "%s:%s copy source revision cannot be found!\n"
4824 msgid "%s:%s copy source revision cannot be found!\n"
4824 msgstr ""
4825 msgstr ""
4825
4826
4826 msgid "can only follow copies/renames for explicit filenames"
4827 msgid "can only follow copies/renames for explicit filenames"
4827 msgstr ""
4828 msgstr ""
4828
4829
4829 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4830 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4830 msgstr ""
4831 msgstr ""
4831
4832
4832 msgid "HG: Leave message empty to abort commit."
4833 msgid "HG: Leave message empty to abort commit."
4833 msgstr ""
4834 msgstr ""
4834
4835
4835 #, python-format
4836 #, python-format
4836 msgid "HG: user: %s"
4837 msgid "HG: user: %s"
4837 msgstr ""
4838 msgstr ""
4838
4839
4839 msgid "HG: branch merge"
4840 msgid "HG: branch merge"
4840 msgstr ""
4841 msgstr ""
4841
4842
4842 #, python-format
4843 #, python-format
4843 msgid "HG: branch '%s'"
4844 msgid "HG: branch '%s'"
4844 msgstr ""
4845 msgstr ""
4845
4846
4846 #, python-format
4847 #, python-format
4848 msgid "HG: subrepo %s"
4849 msgstr ""
4850
4851 #, python-format
4847 msgid "HG: added %s"
4852 msgid "HG: added %s"
4848 msgstr ""
4853 msgstr ""
4849
4854
4850 #, python-format
4855 #, python-format
4851 msgid "HG: changed %s"
4856 msgid "HG: changed %s"
4852 msgstr ""
4857 msgstr ""
4853
4858
4854 #, python-format
4859 #, python-format
4855 msgid "HG: removed %s"
4860 msgid "HG: removed %s"
4856 msgstr ""
4861 msgstr ""
4857
4862
4858 msgid "HG: no files changed"
4863 msgid "HG: no files changed"
4859 msgstr ""
4864 msgstr ""
4860
4865
4861 msgid "empty commit message"
4866 msgid "empty commit message"
4862 msgstr ""
4867 msgstr ""
4863
4868
4864 msgid ""
4869 msgid ""
4865 "add the specified files on the next commit\n"
4870 "add the specified files on the next commit\n"
4866 "\n"
4871 "\n"
4867 " Schedule files to be version controlled and added to the\n"
4872 " Schedule files to be version controlled and added to the\n"
4868 " repository.\n"
4873 " repository.\n"
4869 "\n"
4874 "\n"
4870 " The files will be added to the repository at the next commit. To\n"
4875 " The files will be added to the repository at the next commit. To\n"
4871 " undo an add before that, see hg forget.\n"
4876 " undo an add before that, see hg forget.\n"
4872 "\n"
4877 "\n"
4873 " If no names are given, add all files to the repository.\n"
4878 " If no names are given, add all files to the repository.\n"
4874 " "
4879 " "
4875 msgstr ""
4880 msgstr ""
4876
4881
4877 msgid ""
4882 msgid ""
4878 "add all new files, delete all missing files\n"
4883 "add all new files, delete all missing files\n"
4879 "\n"
4884 "\n"
4880 " Add all new files and remove all missing files from the\n"
4885 " Add all new files and remove all missing files from the\n"
4881 " repository.\n"
4886 " repository.\n"
4882 "\n"
4887 "\n"
4883 " New files are ignored if they match any of the patterns in\n"
4888 " New files are ignored if they match any of the patterns in\n"
4884 " .hgignore. As with add, these changes take effect at the next\n"
4889 " .hgignore. As with add, these changes take effect at the next\n"
4885 " commit.\n"
4890 " commit.\n"
4886 "\n"
4891 "\n"
4887 " Use the -s/--similarity option to detect renamed files. With a\n"
4892 " Use the -s/--similarity option to detect renamed files. With a\n"
4888 " parameter > 0, this compares every removed file with every added\n"
4893 " parameter > 0, this compares every removed file with every added\n"
4889 " file and records those similar enough as renames. This option\n"
4894 " file and records those similar enough as renames. This option\n"
4890 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4895 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4891 " identical) as its parameter. Detecting renamed files this way can\n"
4896 " identical) as its parameter. Detecting renamed files this way can\n"
4892 " be expensive.\n"
4897 " be expensive.\n"
4893 " "
4898 " "
4894 msgstr ""
4899 msgstr ""
4895
4900
4896 msgid "similarity must be a number"
4901 msgid "similarity must be a number"
4897 msgstr ""
4902 msgstr ""
4898
4903
4899 msgid "similarity must be between 0 and 100"
4904 msgid "similarity must be between 0 and 100"
4900 msgstr ""
4905 msgstr ""
4901
4906
4902 msgid ""
4907 msgid ""
4903 "show changeset information by line for each file\n"
4908 "show changeset information by line for each file\n"
4904 "\n"
4909 "\n"
4905 " List changes in files, showing the revision id responsible for\n"
4910 " List changes in files, showing the revision id responsible for\n"
4906 " each line\n"
4911 " each line\n"
4907 "\n"
4912 "\n"
4908 " This command is useful for discovering when a change was made and\n"
4913 " This command is useful for discovering when a change was made and\n"
4909 " by whom.\n"
4914 " by whom.\n"
4910 "\n"
4915 "\n"
4911 " Without the -a/--text option, annotate will avoid processing files\n"
4916 " Without the -a/--text option, annotate will avoid processing files\n"
4912 " it detects as binary. With -a, annotate will annotate the file\n"
4917 " it detects as binary. With -a, annotate will annotate the file\n"
4913 " anyway, although the results will probably be neither useful\n"
4918 " anyway, although the results will probably be neither useful\n"
4914 " nor desirable.\n"
4919 " nor desirable.\n"
4915 " "
4920 " "
4916 msgstr ""
4921 msgstr ""
4917
4922
4918 msgid "at least one filename or pattern is required"
4923 msgid "at least one filename or pattern is required"
4919 msgstr ""
4924 msgstr ""
4920
4925
4921 msgid "at least one of -n/-c is required for -l"
4926 msgid "at least one of -n/-c is required for -l"
4922 msgstr ""
4927 msgstr ""
4923
4928
4924 #, python-format
4929 #, python-format
4925 msgid "%s: binary file\n"
4930 msgid "%s: binary file\n"
4926 msgstr ""
4931 msgstr ""
4927
4932
4928 msgid ""
4933 msgid ""
4929 "create an unversioned archive of a repository revision\n"
4934 "create an unversioned archive of a repository revision\n"
4930 "\n"
4935 "\n"
4931 " By default, the revision used is the parent of the working\n"
4936 " By default, the revision used is the parent of the working\n"
4932 " directory; use -r/--rev to specify a different revision.\n"
4937 " directory; use -r/--rev to specify a different revision.\n"
4933 "\n"
4938 "\n"
4934 " To specify the type of archive to create, use -t/--type. Valid\n"
4939 " To specify the type of archive to create, use -t/--type. Valid\n"
4935 " types are:\n"
4940 " types are:\n"
4936 "\n"
4941 "\n"
4937 " \"files\" (default): a directory full of files\n"
4942 " \"files\" (default): a directory full of files\n"
4938 " \"tar\": tar archive, uncompressed\n"
4943 " \"tar\": tar archive, uncompressed\n"
4939 " \"tbz2\": tar archive, compressed using bzip2\n"
4944 " \"tbz2\": tar archive, compressed using bzip2\n"
4940 " \"tgz\": tar archive, compressed using gzip\n"
4945 " \"tgz\": tar archive, compressed using gzip\n"
4941 " \"uzip\": zip archive, uncompressed\n"
4946 " \"uzip\": zip archive, uncompressed\n"
4942 " \"zip\": zip archive, compressed using deflate\n"
4947 " \"zip\": zip archive, compressed using deflate\n"
4943 "\n"
4948 "\n"
4944 " The exact name of the destination archive or directory is given\n"
4949 " The exact name of the destination archive or directory is given\n"
4945 " using a format string; see 'hg help export' for details.\n"
4950 " using a format string; see 'hg help export' for details.\n"
4946 "\n"
4951 "\n"
4947 " Each member added to an archive file has a directory prefix\n"
4952 " Each member added to an archive file has a directory prefix\n"
4948 " prepended. Use -p/--prefix to specify a format string for the\n"
4953 " prepended. Use -p/--prefix to specify a format string for the\n"
4949 " prefix. The default is the basename of the archive, with suffixes\n"
4954 " prefix. The default is the basename of the archive, with suffixes\n"
4950 " removed.\n"
4955 " removed.\n"
4951 " "
4956 " "
4952 msgstr ""
4957 msgstr ""
4953 "crée une archive du dépôt à une révision donnée, sans conserver "
4958 "crée une archive du dépôt à une révision donnée, sans conserver "
4954 "l'historique\n"
4959 "l'historique\n"
4955 "\n"
4960 "\n"
4956 " Par défaut l'archive est créée à partir de la révision parente\n"
4961 " Par défaut l'archive est créée à partir de la révision parente\n"
4957 " du répertoire de travail. Une autre révision peut être spécifiée\n"
4962 " du répertoire de travail. Une autre révision peut être spécifiée\n"
4958 " à l'aide de -r/--rev.\n"
4963 " à l'aide de -r/--rev.\n"
4959 "\n"
4964 "\n"
4960 " -t/--type permet de spécifier le type d'archive à créer, parmi :\n"
4965 " -t/--type permet de spécifier le type d'archive à créer, parmi :\n"
4961 "\n"
4966 "\n"
4962 " \"files\" (par défaut) : un répertoire rempli de fichiers\n"
4967 " \"files\" (par défaut) : un répertoire rempli de fichiers\n"
4963 " \"tar\" : une archive tar non compressée\n"
4968 " \"tar\" : une archive tar non compressée\n"
4964 " \"tbz2\" : une archive tar compressée avec bzip2\n"
4969 " \"tbz2\" : une archive tar compressée avec bzip2\n"
4965 " \"tgz\" : une archive tar compressée avec gzip\n"
4970 " \"tgz\" : une archive tar compressée avec gzip\n"
4966 " \"uzip\" : une archive zip non compressée\n"
4971 " \"uzip\" : une archive zip non compressée\n"
4967 " \"zip\" : une archive zip compressée avec l'algorithme deflate\n"
4972 " \"zip\" : une archive zip compressée avec l'algorithme deflate\n"
4968 "\n"
4973 "\n"
4969 " Le nom exact de l'archive ou du répertoire de destination est\n"
4974 " Le nom exact de l'archive ou du répertoire de destination est\n"
4970 " donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n"
4975 " donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n"
4971 " pour plus de détails.\n"
4976 " pour plus de détails.\n"
4972 "\n"
4977 "\n"
4973 " Un chemin relatif est ajouté devant chaque membre de l'archive,\n"
4978 " Un chemin relatif est ajouté devant chaque membre de l'archive,\n"
4974 " par défaut le nom du fichier d'archive (sans répertoires ni\n"
4979 " par défaut le nom du fichier d'archive (sans répertoires ni\n"
4975 " suffixes). Un préfixe différent peut être spécifié avec\n"
4980 " suffixes). Un préfixe différent peut être spécifié avec\n"
4976 " -p/--prefix.\n"
4981 " -p/--prefix.\n"
4977 " "
4982 " "
4978
4983
4979 msgid "no working directory: please specify a revision"
4984 msgid "no working directory: please specify a revision"
4980 msgstr "pas de répertoire de travail, veuillez spécifier une révision"
4985 msgstr "pas de répertoire de travail, veuillez spécifier une révision"
4981
4986
4982 msgid "repository root cannot be destination"
4987 msgid "repository root cannot be destination"
4983 msgstr "le répertoire racine ne peut servir de destination"
4988 msgstr "le répertoire racine ne peut servir de destination"
4984
4989
4985 msgid "cannot archive plain files to stdout"
4990 msgid "cannot archive plain files to stdout"
4986 msgstr "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
4991 msgstr ""
4992 "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
4987
4993
4988 msgid ""
4994 msgid ""
4989 "reverse effect of earlier changeset\n"
4995 "reverse effect of earlier changeset\n"
4990 "\n"
4996 "\n"
4991 " Commit the backed out changes as a new changeset. The new\n"
4997 " Commit the backed out changes as a new changeset. The new\n"
4992 " changeset is a child of the backed out changeset.\n"
4998 " changeset is a child of the backed out changeset.\n"
4993 "\n"
4999 "\n"
4994 " If you backout a changeset other than the tip, a new head is\n"
5000 " If you backout a changeset other than the tip, a new head is\n"
4995 " created. This head will be the new tip and you should merge this\n"
5001 " created. This head will be the new tip and you should merge this\n"
4996 " backout changeset with another head.\n"
5002 " backout changeset with another head.\n"
4997 "\n"
5003 "\n"
4998 " The --merge option remembers the parent of the working directory\n"
5004 " The --merge option remembers the parent of the working directory\n"
4999 " before starting the backout, then merges the new head with that\n"
5005 " before starting the backout, then merges the new head with that\n"
5000 " changeset afterwards. This saves you from doing the merge by hand.\n"
5006 " changeset afterwards. This saves you from doing the merge by hand.\n"
5001 " The result of this merge is not committed, as with a normal merge.\n"
5007 " The result of this merge is not committed, as with a normal merge.\n"
5002 "\n"
5008 "\n"
5003 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5009 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5004 " "
5010 " "
5005 msgstr ""
5011 msgstr ""
5006
5012
5007 msgid "please specify just one revision"
5013 msgid "please specify just one revision"
5008 msgstr ""
5014 msgstr ""
5009
5015
5010 msgid "please specify a revision to backout"
5016 msgid "please specify a revision to backout"
5011 msgstr ""
5017 msgstr ""
5012
5018
5013 msgid "cannot backout change on a different branch"
5019 msgid "cannot backout change on a different branch"
5014 msgstr ""
5020 msgstr ""
5015
5021
5016 msgid "cannot backout a change with no parents"
5022 msgid "cannot backout a change with no parents"
5017 msgstr ""
5023 msgstr ""
5018
5024
5019 msgid "cannot backout a merge changeset without --parent"
5025 msgid "cannot backout a merge changeset without --parent"
5020 msgstr ""
5026 msgstr ""
5021
5027
5022 #, python-format
5028 #, python-format
5023 msgid "%s is not a parent of %s"
5029 msgid "%s is not a parent of %s"
5024 msgstr ""
5030 msgstr ""
5025
5031
5026 msgid "cannot use --parent on non-merge changeset"
5032 msgid "cannot use --parent on non-merge changeset"
5027 msgstr ""
5033 msgstr ""
5028
5034
5029 #, python-format
5035 #, python-format
5030 msgid "Backed out changeset %s"
5036 msgid "Backed out changeset %s"
5031 msgstr ""
5037 msgstr ""
5032
5038
5033 #, python-format
5039 #, python-format
5034 msgid "changeset %s backs out changeset %s\n"
5040 msgid "changeset %s backs out changeset %s\n"
5035 msgstr ""
5041 msgstr ""
5036
5042
5037 #, python-format
5043 #, python-format
5038 msgid "merging with changeset %s\n"
5044 msgid "merging with changeset %s\n"
5039 msgstr ""
5045 msgstr ""
5040
5046
5041 msgid "the backout changeset is a new head - do not forget to merge\n"
5047 msgid "the backout changeset is a new head - do not forget to merge\n"
5042 msgstr ""
5048 msgstr ""
5043
5049
5044 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5050 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5045 msgstr ""
5051 msgstr ""
5046
5052
5047 msgid ""
5053 msgid ""
5048 "subdivision search of changesets\n"
5054 "subdivision search of changesets\n"
5049 "\n"
5055 "\n"
5050 " This command helps to find changesets which introduce problems. To\n"
5056 " This command helps to find changesets which introduce problems. To\n"
5051 " use, mark the earliest changeset you know exhibits the problem as\n"
5057 " use, mark the earliest changeset you know exhibits the problem as\n"
5052 " bad, then mark the latest changeset which is free from the problem\n"
5058 " bad, then mark the latest changeset which is free from the problem\n"
5053 " as good. Bisect will update your working directory to a revision\n"
5059 " as good. Bisect will update your working directory to a revision\n"
5054 " for testing (unless the -U/--noupdate option is specified). Once\n"
5060 " for testing (unless the -U/--noupdate option is specified). Once\n"
5055 " you have performed tests, mark the working directory as good or\n"
5061 " you have performed tests, mark the working directory as good or\n"
5056 " bad, and bisect will either update to another candidate changeset\n"
5062 " bad, and bisect will either update to another candidate changeset\n"
5057 " or announce that it has found the bad revision.\n"
5063 " or announce that it has found the bad revision.\n"
5058 "\n"
5064 "\n"
5059 " As a shortcut, you can also use the revision argument to mark a\n"
5065 " As a shortcut, you can also use the revision argument to mark a\n"
5060 " revision as good or bad without checking it out first.\n"
5066 " revision as good or bad without checking it out first.\n"
5061 "\n"
5067 "\n"
5062 " If you supply a command, it will be used for automatic bisection.\n"
5068 " If you supply a command, it will be used for automatic bisection.\n"
5063 " Its exit status will be used to mark revisions as good or bad:\n"
5069 " Its exit status will be used to mark revisions as good or bad:\n"
5064 " status 0 means good, 125 means to skip the revision, 127\n"
5070 " status 0 means good, 125 means to skip the revision, 127\n"
5065 " (command not found) will abort the bisection, and any other\n"
5071 " (command not found) will abort the bisection, and any other\n"
5066 " non-zero exit status means the revision is bad.\n"
5072 " non-zero exit status means the revision is bad.\n"
5067 " "
5073 " "
5068 msgstr ""
5074 msgstr ""
5069 "recherche de \"changesets\" par dichotomie\n"
5075 "recherche de \"changesets\" par dichotomie\n"
5070 "\n"
5076 "\n"
5071 " Cette commande aide à trouver les \"changesets\" étant à\n"
5077 " Cette commande aide à trouver les \"changesets\" étant à\n"
5072 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5078 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5073 " mauvaise la première révision pour laquelle vous avez relevé les\n"
5079 " mauvaise la première révision pour laquelle vous avez relevé les\n"
5074 " symptômes, puis comme bonne la dernière révision connue pour\n"
5080 " symptômes, puis comme bonne la dernière révision connue pour\n"
5075 " être exempte du problème. Bisect va alors mettre à jour votre\n"
5081 " être exempte du problème. Bisect va alors mettre à jour votre\n"
5076 " répertoire de travail à une révision à tester (à moins que\n"
5082 " répertoire de travail à une révision à tester (à moins que\n"
5077 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5083 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5078 " indiquez si le problème était présent ou non. Bisect\n"
5084 " indiquez si le problème était présent ou non. Bisect\n"
5079 " recommencera alors pour une autre révision candidate jusqu'à\n"
5085 " recommencera alors pour une autre révision candidate jusqu'à\n"
5080 " être en mesure d'annoncer la révision fautive.\n"
5086 " être en mesure d'annoncer la révision fautive.\n"
5081 "\n"
5087 "\n"
5082 " Vous pouvez aussi passer une révision en argument lors du\n"
5088 " Vous pouvez aussi passer une révision en argument lors du\n"
5083 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5089 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5084 " répertoire de travail à cette révision.\n"
5090 " répertoire de travail à cette révision.\n"
5085 "\n"
5091 "\n"
5086 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5092 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5087 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5093 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5088 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
5094 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
5089 " faut pas prendre cette révision en compte, 127 (commande\n"
5095 " faut pas prendre cette révision en compte, 127 (commande\n"
5090 " introuvable) cause l'abandon du processus de recherche, et tout\n"
5096 " introuvable) cause l'abandon du processus de recherche, et tout\n"
5091 " autre code de retour non nul désigne une révision affectée par\n"
5097 " autre code de retour non nul désigne une révision affectée par\n"
5092 " le problème.\n"
5098 " le problème.\n"
5093 " "
5099 " "
5094
5100
5095 msgid "The first good revision is:\n"
5101 msgid "The first good revision is:\n"
5096 msgstr "La première révision exempte du problème est :\n"
5102 msgstr "La première révision exempte du problème est :\n"
5097
5103
5098 msgid "The first bad revision is:\n"
5104 msgid "The first bad revision is:\n"
5099 msgstr "La première révision présentant le problème est :\n"
5105 msgstr "La première révision présentant le problème est :\n"
5100
5106
5101 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5107 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5102 msgstr ""
5108 msgstr ""
5103 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5109 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5104 "exempte du problème pourrait être parmi :\n"
5110 "exempte du problème pourrait être parmi :\n"
5105
5111
5106 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5112 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5107 msgstr ""
5113 msgstr ""
5108 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5114 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5109 "présentant le problème pourrait être parmi :\n"
5115 "présentant le problème pourrait être parmi :\n"
5110
5116
5111 msgid "cannot bisect (no known good revisions)"
5117 msgid "cannot bisect (no known good revisions)"
5112 msgstr "dichotomie impossible (pas de bonne révision connue)"
5118 msgstr "dichotomie impossible (pas de bonne révision connue)"
5113
5119
5114 msgid "cannot bisect (no known bad revisions)"
5120 msgid "cannot bisect (no known bad revisions)"
5115 msgstr "dichotomie impossible (pas de mauvaise révision connue)"
5121 msgstr "dichotomie impossible (pas de mauvaise révision connue)"
5116
5122
5117 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5123 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5118 msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n"
5124 msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n"
5119
5125
5120 msgid "incompatible arguments"
5126 msgid "incompatible arguments"
5121 msgstr "arguments incompatibles"
5127 msgstr "arguments incompatibles"
5122
5128
5123 #, python-format
5129 #, python-format
5124 msgid "cannot find executable: %s"
5130 msgid "cannot find executable: %s"
5125 msgstr "exécutable %s introuvable"
5131 msgstr "exécutable %s introuvable"
5126
5132
5127 #, python-format
5133 #, python-format
5128 msgid "failed to execute %s"
5134 msgid "failed to execute %s"
5129 msgstr "impossible d'exécuter %s"
5135 msgstr "impossible d'exécuter %s"
5130
5136
5131 #, python-format
5137 #, python-format
5132 msgid "%s killed"
5138 msgid "%s killed"
5133 msgstr "%s a été tué"
5139 msgstr "%s a été tué"
5134
5140
5135 #, python-format
5141 #, python-format
5136 msgid "Changeset %d:%s: %s\n"
5142 msgid "Changeset %d:%s: %s\n"
5137 msgstr "\"Changeset\" %d:%s: %s\n"
5143 msgstr "\"Changeset\" %d:%s: %s\n"
5138
5144
5139 #, python-format
5145 #, python-format
5140 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5146 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5141 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5147 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5142
5148
5143 msgid ""
5149 msgid ""
5144 "set or show the current branch name\n"
5150 "set or show the current branch name\n"
5145 "\n"
5151 "\n"
5146 " With no argument, show the current branch name. With one argument,\n"
5152 " With no argument, show the current branch name. With one argument,\n"
5147 " set the working directory branch name (the branch will not exist\n"
5153 " set the working directory branch name (the branch will not exist\n"
5148 " in the repository until the next commit). Standard practice\n"
5154 " in the repository until the next commit). Standard practice\n"
5149 " recommends that primary development take place on the 'default'\n"
5155 " recommends that primary development take place on the 'default'\n"
5150 " branch.\n"
5156 " branch.\n"
5151 "\n"
5157 "\n"
5152 " Unless -f/--force is specified, branch will not let you set a\n"
5158 " Unless -f/--force is specified, branch will not let you set a\n"
5153 " branch name that already exists, even if it's inactive.\n"
5159 " branch name that already exists, even if it's inactive.\n"
5154 "\n"
5160 "\n"
5155 " Use -C/--clean to reset the working directory branch to that of\n"
5161 " Use -C/--clean to reset the working directory branch to that of\n"
5156 " the parent of the working directory, negating a previous branch\n"
5162 " the parent of the working directory, negating a previous branch\n"
5157 " change.\n"
5163 " change.\n"
5158 "\n"
5164 "\n"
5159 " Use the command 'hg update' to switch to an existing branch.\n"
5165 " Use the command 'hg update' to switch to an existing branch. Use\n"
5166 " 'hg commit --close-branch' to mark this branch as closed.\n"
5160 " "
5167 " "
5161 msgstr ""
5168 msgstr ""
5162
5169
5163 #, python-format
5170 #, python-format
5164 msgid "reset working directory to branch %s\n"
5171 msgid "reset working directory to branch %s\n"
5165 msgstr ""
5172 msgstr ""
5166
5173
5167 msgid "a branch of the same name already exists (use --force to override)"
5174 msgid "a branch of the same name already exists (use --force to override)"
5168 msgstr ""
5175 msgstr ""
5169
5176
5170 #, python-format
5177 #, python-format
5171 msgid "marked working directory as branch %s\n"
5178 msgid "marked working directory as branch %s\n"
5172 msgstr ""
5179 msgstr ""
5173
5180
5174 msgid ""
5181 msgid ""
5175 "list repository named branches\n"
5182 "list repository named branches\n"
5176 "\n"
5183 "\n"
5177 " List the repository's named branches, indicating which ones are\n"
5184 " List the repository's named branches, indicating which ones are\n"
5178 " inactive. If -a/--active is specified, only show active branches.\n"
5185 " inactive. If -c/--closed is specified, also list branches which have\n"
5179 "\n"
5186 " been marked closed (see hg commit --close-branch).\n"
5180 " A branch is considered active if it contains repository heads.\n"
5187 "\n"
5188 " If -a/--active is specified, only show active branches. A branch\n"
5189 " is considered active if it contains repository heads.\n"
5181 "\n"
5190 "\n"
5182 " Use the command 'hg update' to switch to an existing branch.\n"
5191 " Use the command 'hg update' to switch to an existing branch.\n"
5183 " "
5192 " "
5184 msgstr ""
5193 msgstr ""
5185
5194
5186 msgid ""
5195 msgid ""
5187 "create a changegroup file\n"
5196 "create a changegroup file\n"
5188 "\n"
5197 "\n"
5189 " Generate a compressed changegroup file collecting changesets not\n"
5198 " Generate a compressed changegroup file collecting changesets not\n"
5190 " known to be in another repository.\n"
5199 " known to be in another repository.\n"
5191 "\n"
5200 "\n"
5192 " If no destination repository is specified the destination is\n"
5201 " If no destination repository is specified the destination is\n"
5193 " assumed to have all the nodes specified by one or more --base\n"
5202 " assumed to have all the nodes specified by one or more --base\n"
5194 " parameters. To create a bundle containing all changesets, use\n"
5203 " parameters. To create a bundle containing all changesets, use\n"
5195 " -a/--all (or --base null).\n"
5204 " -a/--all (or --base null).\n"
5196 "\n"
5205 "\n"
5197 " You can change compression method with the -t/--type option.\n"
5206 " You can change compression method with the -t/--type option.\n"
5198 " The available compression methods are: none, bzip2, and\n"
5207 " The available compression methods are: none, bzip2, and\n"
5199 " gzip (by default, bundles are compressed using bzip2).\n"
5208 " gzip (by default, bundles are compressed using bzip2).\n"
5200 "\n"
5209 "\n"
5201 " The bundle file can then be transferred using conventional means\n"
5210 " The bundle file can then be transferred using conventional means\n"
5202 " and applied to another repository with the unbundle or pull\n"
5211 " and applied to another repository with the unbundle or pull\n"
5203 " command. This is useful when direct push and pull are not\n"
5212 " command. This is useful when direct push and pull are not\n"
5204 " available or when exporting an entire repository is undesirable.\n"
5213 " available or when exporting an entire repository is undesirable.\n"
5205 "\n"
5214 "\n"
5206 " Applying bundles preserves all changeset contents including\n"
5215 " Applying bundles preserves all changeset contents including\n"
5207 " permissions, copy/rename information, and revision history.\n"
5216 " permissions, copy/rename information, and revision history.\n"
5208 " "
5217 " "
5209 msgstr ""
5218 msgstr ""
5210
5219
5211 msgid "--base is incompatible with specifying a destination"
5220 msgid "--base is incompatible with specifying a destination"
5212 msgstr ""
5221 msgstr ""
5213
5222
5214 msgid "unknown bundle type specified with --type"
5223 msgid "unknown bundle type specified with --type"
5215 msgstr ""
5224 msgstr ""
5216
5225
5217 msgid ""
5226 msgid ""
5218 "output the current or given revision of files\n"
5227 "output the current or given revision of files\n"
5219 "\n"
5228 "\n"
5220 " Print the specified files as they were at the given revision. If\n"
5229 " Print the specified files as they were at the given revision. If\n"
5221 " no revision is given, the parent of the working directory is used,\n"
5230 " no revision is given, the parent of the working directory is used,\n"
5222 " or tip if no revision is checked out.\n"
5231 " or tip if no revision is checked out.\n"
5223 "\n"
5232 "\n"
5224 " Output may be to a file, in which case the name of the file is\n"
5233 " Output may be to a file, in which case the name of the file is\n"
5225 " given using a format string. The formatting rules are the same as\n"
5234 " given using a format string. The formatting rules are the same as\n"
5226 " for the export command, with the following additions:\n"
5235 " for the export command, with the following additions:\n"
5227 "\n"
5236 "\n"
5228 " %s basename of file being printed\n"
5237 " %s basename of file being printed\n"
5229 " %d dirname of file being printed, or '.' if in repository root\n"
5238 " %d dirname of file being printed, or '.' if in repository root\n"
5230 " %p root-relative path name of file being printed\n"
5239 " %p root-relative path name of file being printed\n"
5231 " "
5240 " "
5232 msgstr ""
5241 msgstr ""
5233
5242
5234 msgid ""
5243 msgid ""
5235 "make a copy of an existing repository\n"
5244 "make a copy of an existing repository\n"
5236 "\n"
5245 "\n"
5237 " Create a copy of an existing repository in a new directory.\n"
5246 " Create a copy of an existing repository in a new directory.\n"
5238 "\n"
5247 "\n"
5239 " If no destination directory name is specified, it defaults to the\n"
5248 " If no destination directory name is specified, it defaults to the\n"
5240 " basename of the source.\n"
5249 " basename of the source.\n"
5241 "\n"
5250 "\n"
5242 " The location of the source is added to the new repository's\n"
5251 " The location of the source is added to the new repository's\n"
5243 " .hg/hgrc file, as the default to be used for future pulls.\n"
5252 " .hg/hgrc file, as the default to be used for future pulls.\n"
5244 "\n"
5253 "\n"
5245 " If you use the -r/--rev option to clone up to a specific revision,\n"
5254 " If you use the -r/--rev option to clone up to a specific revision,\n"
5246 " no subsequent revisions (including subsequent tags) will be\n"
5255 " no subsequent revisions (including subsequent tags) will be\n"
5247 " present in the cloned repository. This option implies --pull, even\n"
5256 " present in the cloned repository. This option implies --pull, even\n"
5248 " on local repositories.\n"
5257 " on local repositories.\n"
5249 "\n"
5258 "\n"
5250 " By default, clone will check out the head of the 'default' branch.\n"
5259 " By default, clone will check out the head of the 'default' branch.\n"
5251 " If the -U/--noupdate option is used, the new clone will contain\n"
5260 " If the -U/--noupdate option is used, the new clone will contain\n"
5252 " only a repository (.hg) and no working copy (the working copy\n"
5261 " only a repository (.hg) and no working copy (the working copy\n"
5253 " parent is the null revision).\n"
5262 " parent is the null revision).\n"
5254 "\n"
5263 "\n"
5255 " See 'hg help urls' for valid source format details.\n"
5264 " See 'hg help urls' for valid source format details.\n"
5256 "\n"
5265 "\n"
5257 " It is possible to specify an ssh:// URL as the destination, but no\n"
5266 " It is possible to specify an ssh:// URL as the destination, but no\n"
5258 " .hg/hgrc and working directory will be created on the remote side.\n"
5267 " .hg/hgrc and working directory will be created on the remote side.\n"
5259 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5268 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5260 "\n"
5269 "\n"
5261 " For efficiency, hardlinks are used for cloning whenever the source\n"
5270 " For efficiency, hardlinks are used for cloning whenever the source\n"
5262 " and destination are on the same filesystem (note this applies only\n"
5271 " and destination are on the same filesystem (note this applies only\n"
5263 " to the repository data, not to the checked out files). Some\n"
5272 " to the repository data, not to the checked out files). Some\n"
5264 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5273 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5265 " do not report errors. In these cases, use the --pull option to\n"
5274 " do not report errors. In these cases, use the --pull option to\n"
5266 " avoid hardlinking.\n"
5275 " avoid hardlinking.\n"
5267 "\n"
5276 "\n"
5268 " In some cases, you can clone repositories and checked out files\n"
5277 " In some cases, you can clone repositories and checked out files\n"
5269 " using full hardlinks with\n"
5278 " using full hardlinks with\n"
5270 "\n"
5279 "\n"
5271 " $ cp -al REPO REPOCLONE\n"
5280 " $ cp -al REPO REPOCLONE\n"
5272 "\n"
5281 "\n"
5273 " This is the fastest way to clone, but it is not always safe. The\n"
5282 " This is the fastest way to clone, but it is not always safe. The\n"
5274 " operation is not atomic (making sure REPO is not modified during\n"
5283 " operation is not atomic (making sure REPO is not modified during\n"
5275 " the operation is up to you) and you have to make sure your editor\n"
5284 " the operation is up to you) and you have to make sure your editor\n"
5276 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5285 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5277 " this is not compatible with certain extensions that place their\n"
5286 " this is not compatible with certain extensions that place their\n"
5278 " metadata under the .hg directory, such as mq.\n"
5287 " metadata under the .hg directory, such as mq.\n"
5279 "\n"
5288 "\n"
5280 " "
5289 " "
5281 msgstr ""
5290 msgstr ""
5282
5291
5283 msgid ""
5292 msgid ""
5284 "commit the specified files or all outstanding changes\n"
5293 "commit the specified files or all outstanding changes\n"
5285 "\n"
5294 "\n"
5286 " Commit changes to the given files into the repository. Unlike a\n"
5295 " Commit changes to the given files into the repository. Unlike a\n"
5287 " centralized RCS, this operation is a local operation. See hg push\n"
5296 " centralized RCS, this operation is a local operation. See hg push\n"
5288 " for a way to actively distribute your changes.\n"
5297 " for a way to actively distribute your changes.\n"
5289 "\n"
5298 "\n"
5290 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5299 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5291 " will be committed.\n"
5300 " will be committed.\n"
5292 "\n"
5301 "\n"
5293 " If you are committing the result of a merge, do not provide any\n"
5302 " If you are committing the result of a merge, do not provide any\n"
5294 " filenames or -I/-X filters.\n"
5303 " filenames or -I/-X filters.\n"
5295 "\n"
5304 "\n"
5296 " If no commit message is specified, the configured editor is\n"
5305 " If no commit message is specified, the configured editor is\n"
5297 " started to prompt you for a message.\n"
5306 " started to prompt you for a message.\n"
5298 "\n"
5307 "\n"
5299 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5308 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5300 " "
5309 " "
5301 msgstr ""
5310 msgstr ""
5302
5311
5312 msgid "nothing changed\n"
5313 msgstr ""
5314
5303 msgid "created new head\n"
5315 msgid "created new head\n"
5304 msgstr ""
5316 msgstr ""
5305
5317
5306 #, python-format
5318 #, python-format
5307 msgid "committed changeset %d:%s\n"
5319 msgid "committed changeset %d:%s\n"
5308 msgstr ""
5320 msgstr ""
5309
5321
5310 msgid ""
5322 msgid ""
5311 "mark files as copied for the next commit\n"
5323 "mark files as copied for the next commit\n"
5312 "\n"
5324 "\n"
5313 " Mark dest as having copies of source files. If dest is a\n"
5325 " Mark dest as having copies of source files. If dest is a\n"
5314 " directory, copies are put in that directory. If dest is a file,\n"
5326 " directory, copies are put in that directory. If dest is a file,\n"
5315 " the source must be a single file.\n"
5327 " the source must be a single file.\n"
5316 "\n"
5328 "\n"
5317 " By default, this command copies the contents of files as they\n"
5329 " By default, this command copies the contents of files as they\n"
5318 " exist in the working directory. If invoked with -A/--after, the\n"
5330 " exist in the working directory. If invoked with -A/--after, the\n"
5319 " operation is recorded, but no copying is performed.\n"
5331 " operation is recorded, but no copying is performed.\n"
5320 "\n"
5332 "\n"
5321 " This command takes effect with the next commit. To undo a copy\n"
5333 " This command takes effect with the next commit. To undo a copy\n"
5322 " before that, see hg revert.\n"
5334 " before that, see hg revert.\n"
5323 " "
5335 " "
5324 msgstr ""
5336 msgstr ""
5325
5337
5326 msgid "find the ancestor revision of two revisions in a given index"
5338 msgid "find the ancestor revision of two revisions in a given index"
5327 msgstr ""
5339 msgstr ""
5328
5340
5329 msgid "There is no Mercurial repository here (.hg not found)"
5341 msgid "There is no Mercurial repository here (.hg not found)"
5330 msgstr ""
5342 msgstr ""
5331
5343
5332 msgid "either two or three arguments required"
5344 msgid "either two or three arguments required"
5333 msgstr ""
5345 msgstr ""
5334
5346
5335 msgid "returns the completion list associated with the given command"
5347 msgid "returns the completion list associated with the given command"
5336 msgstr ""
5348 msgstr ""
5337
5349
5338 msgid "rebuild the dirstate as it would look like for the given revision"
5350 msgid "rebuild the dirstate as it would look like for the given revision"
5339 msgstr ""
5351 msgstr ""
5340
5352
5341 msgid "validate the correctness of the current dirstate"
5353 msgid "validate the correctness of the current dirstate"
5342 msgstr ""
5354 msgstr ""
5343
5355
5344 #, python-format
5356 #, python-format
5345 msgid "%s in state %s, but not in manifest1\n"
5357 msgid "%s in state %s, but not in manifest1\n"
5346 msgstr ""
5358 msgstr ""
5347
5359
5348 #, python-format
5360 #, python-format
5349 msgid "%s in state %s, but also in manifest1\n"
5361 msgid "%s in state %s, but also in manifest1\n"
5350 msgstr ""
5362 msgstr ""
5351
5363
5352 #, python-format
5364 #, python-format
5353 msgid "%s in state %s, but not in either manifest\n"
5365 msgid "%s in state %s, but not in either manifest\n"
5354 msgstr ""
5366 msgstr ""
5355
5367
5356 #, python-format
5368 #, python-format
5357 msgid "%s in manifest1, but listed as state %s"
5369 msgid "%s in manifest1, but listed as state %s"
5358 msgstr ""
5370 msgstr ""
5359
5371
5360 msgid ".hg/dirstate inconsistent with current parent's manifest"
5372 msgid ".hg/dirstate inconsistent with current parent's manifest"
5361 msgstr ""
5373 msgstr ""
5362
5374
5363 msgid ""
5375 msgid ""
5364 "show combined config settings from all hgrc files\n"
5376 "show combined config settings from all hgrc files\n"
5365 "\n"
5377 "\n"
5366 " With no arguments, print names and values of all config items.\n"
5378 " With no arguments, print names and values of all config items.\n"
5367 "\n"
5379 "\n"
5368 " With one argument of the form section.name, print just the value\n"
5380 " With one argument of the form section.name, print just the value\n"
5369 " of that config item.\n"
5381 " of that config item.\n"
5370 "\n"
5382 "\n"
5371 " With multiple arguments, print names and values of all config\n"
5383 " With multiple arguments, print names and values of all config\n"
5372 " items with matching section names.\n"
5384 " items with matching section names.\n"
5373 "\n"
5385 "\n"
5374 " With --debug, the source (filename and line number) is printed\n"
5386 " With --debug, the source (filename and line number) is printed\n"
5375 " for each config item.\n"
5387 " for each config item.\n"
5376 " "
5388 " "
5377 msgstr ""
5389 msgstr ""
5378
5390
5379 msgid "only one config item permitted"
5391 msgid "only one config item permitted"
5380 msgstr ""
5392 msgstr ""
5381
5393
5382 msgid ""
5394 msgid ""
5383 "manually set the parents of the current working directory\n"
5395 "manually set the parents of the current working directory\n"
5384 "\n"
5396 "\n"
5385 " This is useful for writing repository conversion tools, but should\n"
5397 " This is useful for writing repository conversion tools, but should\n"
5386 " be used with care.\n"
5398 " be used with care.\n"
5387 " "
5399 " "
5388 msgstr ""
5400 msgstr ""
5389
5401
5390 msgid "show the contents of the current dirstate"
5402 msgid "show the contents of the current dirstate"
5391 msgstr ""
5403 msgstr ""
5392
5404
5393 #, python-format
5405 #, python-format
5394 msgid "copy: %s -> %s\n"
5406 msgid "copy: %s -> %s\n"
5395 msgstr ""
5407 msgstr ""
5396
5408
5397 msgid "dump the contents of a data file revision"
5409 msgid "dump the contents of a data file revision"
5398 msgstr ""
5410 msgstr ""
5399
5411
5400 #, python-format
5412 #, python-format
5401 msgid "invalid revision identifier %s"
5413 msgid "invalid revision identifier %s"
5402 msgstr ""
5414 msgstr ""
5403
5415
5404 msgid "parse and display a date"
5416 msgid "parse and display a date"
5405 msgstr ""
5417 msgstr ""
5406
5418
5407 msgid "dump the contents of an index file"
5419 msgid "dump the contents of an index file"
5408 msgstr ""
5420 msgstr ""
5409
5421
5410 msgid "dump an index DAG as a graphviz dot file"
5422 msgid "dump an index DAG as a graphviz dot file"
5411 msgstr ""
5423 msgstr ""
5412
5424
5413 msgid "test Mercurial installation"
5425 msgid "test Mercurial installation"
5414 msgstr ""
5426 msgstr ""
5415
5427
5416 #, python-format
5428 #, python-format
5417 msgid "Checking encoding (%s)...\n"
5429 msgid "Checking encoding (%s)...\n"
5418 msgstr ""
5430 msgstr ""
5419
5431
5420 msgid " (check that your locale is properly set)\n"
5432 msgid " (check that your locale is properly set)\n"
5421 msgstr ""
5433 msgstr ""
5422
5434
5423 msgid "Checking extensions...\n"
5435 msgid "Checking extensions...\n"
5424 msgstr ""
5436 msgstr ""
5425
5437
5426 msgid " One or more extensions could not be found"
5438 msgid " One or more extensions could not be found"
5427 msgstr ""
5439 msgstr ""
5428
5440
5429 msgid " (check that you compiled the extensions)\n"
5441 msgid " (check that you compiled the extensions)\n"
5430 msgstr ""
5442 msgstr ""
5431
5443
5432 msgid "Checking templates...\n"
5444 msgid "Checking templates...\n"
5433 msgstr ""
5445 msgstr ""
5434
5446
5435 msgid " (templates seem to have been installed incorrectly)\n"
5447 msgid " (templates seem to have been installed incorrectly)\n"
5436 msgstr ""
5448 msgstr ""
5437
5449
5438 msgid "Checking patch...\n"
5450 msgid "Checking patch...\n"
5439 msgstr ""
5451 msgstr ""
5440
5452
5441 msgid " patch call failed:\n"
5453 msgid " patch call failed:\n"
5442 msgstr ""
5454 msgstr ""
5443
5455
5444 msgid " unexpected patch output!\n"
5456 msgid " unexpected patch output!\n"
5445 msgstr ""
5457 msgstr ""
5446
5458
5447 msgid " patch test failed!\n"
5459 msgid " patch test failed!\n"
5448 msgstr ""
5460 msgstr ""
5449
5461
5450 msgid ""
5462 msgid ""
5451 " (Current patch tool may be incompatible with patch, or misconfigured. "
5463 " (Current patch tool may be incompatible with patch, or misconfigured. "
5452 "Please check your .hgrc file)\n"
5464 "Please check your .hgrc file)\n"
5453 msgstr ""
5465 msgstr ""
5454
5466
5455 msgid ""
5467 msgid ""
5456 " Internal patcher failure, please report this error to http://mercurial."
5468 " Internal patcher failure, please report this error to http://mercurial."
5457 "selenic.com/bts/\n"
5469 "selenic.com/bts/\n"
5458 msgstr ""
5470 msgstr ""
5459
5471
5460 msgid "Checking commit editor...\n"
5472 msgid "Checking commit editor...\n"
5461 msgstr ""
5473 msgstr ""
5462
5474
5463 msgid " No commit editor set and can't find vi in PATH\n"
5475 msgid " No commit editor set and can't find vi in PATH\n"
5464 msgstr ""
5476 msgstr ""
5465
5477
5466 msgid " (specify a commit editor in your .hgrc file)\n"
5478 msgid " (specify a commit editor in your .hgrc file)\n"
5467 msgstr ""
5479 msgstr ""
5468
5480
5469 #, python-format
5481 #, python-format
5470 msgid " Can't find editor '%s' in PATH\n"
5482 msgid " Can't find editor '%s' in PATH\n"
5471 msgstr ""
5483 msgstr ""
5472
5484
5473 msgid "Checking username...\n"
5485 msgid "Checking username...\n"
5474 msgstr ""
5486 msgstr ""
5475
5487
5476 msgid " (specify a username in your .hgrc file)\n"
5488 msgid " (specify a username in your .hgrc file)\n"
5477 msgstr ""
5489 msgstr ""
5478
5490
5479 msgid "No problems detected\n"
5491 msgid "No problems detected\n"
5480 msgstr ""
5492 msgstr ""
5481
5493
5482 #, python-format
5494 #, python-format
5483 msgid "%s problems detected, please check your install!\n"
5495 msgid "%s problems detected, please check your install!\n"
5484 msgstr ""
5496 msgstr ""
5485
5497
5486 msgid "dump rename information"
5498 msgid "dump rename information"
5487 msgstr ""
5499 msgstr ""
5488
5500
5489 #, python-format
5501 #, python-format
5490 msgid "%s renamed from %s:%s\n"
5502 msgid "%s renamed from %s:%s\n"
5491 msgstr ""
5503 msgstr ""
5492
5504
5493 #, python-format
5505 #, python-format
5494 msgid "%s not renamed\n"
5506 msgid "%s not renamed\n"
5495 msgstr ""
5507 msgstr ""
5496
5508
5497 msgid "show how files match on given patterns"
5509 msgid "show how files match on given patterns"
5498 msgstr ""
5510 msgstr ""
5499
5511
5500 msgid ""
5512 msgid ""
5501 "diff repository (or selected files)\n"
5513 "diff repository (or selected files)\n"
5502 "\n"
5514 "\n"
5503 " Show differences between revisions for the specified files.\n"
5515 " Show differences between revisions for the specified files.\n"
5504 "\n"
5516 "\n"
5505 " Differences between files are shown using the unified diff format.\n"
5517 " Differences between files are shown using the unified diff format.\n"
5506 "\n"
5518 "\n"
5507 " NOTE: diff may generate unexpected results for merges, as it will\n"
5519 " NOTE: diff may generate unexpected results for merges, as it will\n"
5508 " default to comparing against the working directory's first parent\n"
5520 " default to comparing against the working directory's first parent\n"
5509 " changeset if no revisions are specified.\n"
5521 " changeset if no revisions are specified.\n"
5510 "\n"
5522 "\n"
5511 " When two revision arguments are given, then changes are shown\n"
5523 " When two revision arguments are given, then changes are shown\n"
5512 " between those revisions. If only one revision is specified then\n"
5524 " between those revisions. If only one revision is specified then\n"
5513 " that revision is compared to the working directory, and, when no\n"
5525 " that revision is compared to the working directory, and, when no\n"
5514 " revisions are specified, the working directory files are compared\n"
5526 " revisions are specified, the working directory files are compared\n"
5515 " to its parent.\n"
5527 " to its parent.\n"
5516 "\n"
5528 "\n"
5517 " Without the -a/--text option, diff will avoid generating diffs of\n"
5529 " Without the -a/--text option, diff will avoid generating diffs of\n"
5518 " files it detects as binary. With -a, diff will generate a diff\n"
5530 " files it detects as binary. With -a, diff will generate a diff\n"
5519 " anyway, probably with undesirable results.\n"
5531 " anyway, probably with undesirable results.\n"
5520 "\n"
5532 "\n"
5521 " Use the -g/--git option to generate diffs in the git extended diff\n"
5533 " Use the -g/--git option to generate diffs in the git extended diff\n"
5522 " format. For more information, read 'hg help diffs'.\n"
5534 " format. For more information, read 'hg help diffs'.\n"
5523 " "
5535 " "
5524 msgstr ""
5536 msgstr ""
5525
5537
5526 msgid ""
5538 msgid ""
5527 "dump the header and diffs for one or more changesets\n"
5539 "dump the header and diffs for one or more changesets\n"
5528 "\n"
5540 "\n"
5529 " Print the changeset header and diffs for one or more revisions.\n"
5541 " Print the changeset header and diffs for one or more revisions.\n"
5530 "\n"
5542 "\n"
5531 " The information shown in the changeset header is: author,\n"
5543 " The information shown in the changeset header is: author,\n"
5532 " changeset hash, parent(s) and commit comment.\n"
5544 " changeset hash, parent(s) and commit comment.\n"
5533 "\n"
5545 "\n"
5534 " NOTE: export may generate unexpected diff output for merge\n"
5546 " NOTE: export may generate unexpected diff output for merge\n"
5535 " changesets, as it will compare the merge changeset against its\n"
5547 " changesets, as it will compare the merge changeset against its\n"
5536 " first parent only.\n"
5548 " first parent only.\n"
5537 "\n"
5549 "\n"
5538 " Output may be to a file, in which case the name of the file is\n"
5550 " Output may be to a file, in which case the name of the file is\n"
5539 " given using a format string. The formatting rules are as follows:\n"
5551 " given using a format string. The formatting rules are as follows:\n"
5540 "\n"
5552 "\n"
5541 " %% literal \"%\" character\n"
5553 " %% literal \"%\" character\n"
5542 " %H changeset hash (40 bytes of hexadecimal)\n"
5554 " %H changeset hash (40 bytes of hexadecimal)\n"
5543 " %N number of patches being generated\n"
5555 " %N number of patches being generated\n"
5544 " %R changeset revision number\n"
5556 " %R changeset revision number\n"
5545 " %b basename of the exporting repository\n"
5557 " %b basename of the exporting repository\n"
5546 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5558 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5547 " %n zero-padded sequence number, starting at 1\n"
5559 " %n zero-padded sequence number, starting at 1\n"
5548 " %r zero-padded changeset revision number\n"
5560 " %r zero-padded changeset revision number\n"
5549 "\n"
5561 "\n"
5550 " Without the -a/--text option, export will avoid generating diffs\n"
5562 " Without the -a/--text option, export will avoid generating diffs\n"
5551 " of files it detects as binary. With -a, export will generate a\n"
5563 " of files it detects as binary. With -a, export will generate a\n"
5552 " diff anyway, probably with undesirable results.\n"
5564 " diff anyway, probably with undesirable results.\n"
5553 "\n"
5565 "\n"
5554 " Use the -g/--git option to generate diffs in the git extended diff\n"
5566 " Use the -g/--git option to generate diffs in the git extended diff\n"
5555 " format. See 'hg help diffs' for more information.\n"
5567 " format. See 'hg help diffs' for more information.\n"
5556 "\n"
5568 "\n"
5557 " With the --switch-parent option, the diff will be against the\n"
5569 " With the --switch-parent option, the diff will be against the\n"
5558 " second parent. It can be useful to review a merge.\n"
5570 " second parent. It can be useful to review a merge.\n"
5559 " "
5571 " "
5560 msgstr ""
5572 msgstr ""
5561
5573
5562 msgid "export requires at least one changeset"
5574 msgid "export requires at least one changeset"
5563 msgstr ""
5575 msgstr ""
5564
5576
5565 msgid "exporting patches:\n"
5577 msgid "exporting patches:\n"
5566 msgstr ""
5578 msgstr ""
5567
5579
5568 msgid "exporting patch:\n"
5580 msgid "exporting patch:\n"
5569 msgstr ""
5581 msgstr ""
5570
5582
5571 msgid ""
5583 msgid ""
5572 "forget the specified files on the next commit\n"
5584 "forget the specified files on the next commit\n"
5573 "\n"
5585 "\n"
5574 " Mark the specified files so they will no longer be tracked\n"
5586 " Mark the specified files so they will no longer be tracked\n"
5575 " after the next commit.\n"
5587 " after the next commit.\n"
5576 "\n"
5588 "\n"
5577 " This only removes files from the current branch, not from the\n"
5589 " This only removes files from the current branch, not from the\n"
5578 " entire project history, and it does not delete them from the\n"
5590 " entire project history, and it does not delete them from the\n"
5579 " working directory.\n"
5591 " working directory.\n"
5580 "\n"
5592 "\n"
5581 " To undo a forget before the next commit, see hg add.\n"
5593 " To undo a forget before the next commit, see hg add.\n"
5582 " "
5594 " "
5583 msgstr ""
5595 msgstr ""
5584
5596
5585 msgid "no files specified"
5597 msgid "no files specified"
5586 msgstr ""
5598 msgstr ""
5587
5599
5588 #, python-format
5600 #, python-format
5589 msgid "not removing %s: file is already untracked\n"
5601 msgid "not removing %s: file is already untracked\n"
5590 msgstr ""
5602 msgstr ""
5591
5603
5592 msgid ""
5604 msgid ""
5593 "search for a pattern in specified files and revisions\n"
5605 "search for a pattern in specified files and revisions\n"
5594 "\n"
5606 "\n"
5595 " Search revisions of files for a regular expression.\n"
5607 " Search revisions of files for a regular expression.\n"
5596 "\n"
5608 "\n"
5597 " This command behaves differently than Unix grep. It only accepts\n"
5609 " This command behaves differently than Unix grep. It only accepts\n"
5598 " Python/Perl regexps. It searches repository history, not the\n"
5610 " Python/Perl regexps. It searches repository history, not the\n"
5599 " working directory. It always prints the revision number in which a\n"
5611 " working directory. It always prints the revision number in which a\n"
5600 " match appears.\n"
5612 " match appears.\n"
5601 "\n"
5613 "\n"
5602 " By default, grep only prints output for the first revision of a\n"
5614 " By default, grep only prints output for the first revision of a\n"
5603 " file in which it finds a match. To get it to print every revision\n"
5615 " file in which it finds a match. To get it to print every revision\n"
5604 " that contains a change in match status (\"-\" for a match that\n"
5616 " that contains a change in match status (\"-\" for a match that\n"
5605 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5617 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5606 " use the --all flag.\n"
5618 " use the --all flag.\n"
5607 " "
5619 " "
5608 msgstr ""
5620 msgstr ""
5609
5621
5610 #, python-format
5622 #, python-format
5611 msgid "grep: invalid match pattern: %s\n"
5623 msgid "grep: invalid match pattern: %s\n"
5612 msgstr ""
5624 msgstr ""
5613
5625
5614 msgid ""
5626 msgid ""
5615 "show current repository heads or show branch heads\n"
5627 "show current repository heads or show branch heads\n"
5616 "\n"
5628 "\n"
5617 " With no arguments, show all repository head changesets.\n"
5629 " With no arguments, show all repository head changesets.\n"
5618 "\n"
5630 "\n"
5619 " Repository \"heads\" are changesets that don't have child\n"
5631 " Repository \"heads\" are changesets that don't have child\n"
5620 " changesets. They are where development generally takes place and\n"
5632 " changesets. They are where development generally takes place and\n"
5621 " are the usual targets for update and merge operations.\n"
5633 " are the usual targets for update and merge operations.\n"
5622 "\n"
5634 "\n"
5623 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5635 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5624 " the named branch associated with that revision. The name of the\n"
5636 " the named branch associated with that revision. The name of the\n"
5625 " branch is called the revision's branch tag.\n"
5637 " branch is called the revision's branch tag.\n"
5626 "\n"
5638 "\n"
5627 " Branch heads are revisions on a given named branch that do not have\n"
5639 " Branch heads are revisions on a given named branch that do not have\n"
5628 " any descendants on the same branch. A branch head could be a true head\n"
5640 " any descendants on the same branch. A branch head could be a true head\n"
5629 " or it could be the last changeset on a branch before a new branch\n"
5641 " or it could be the last changeset on a branch before a new branch\n"
5630 " was created. If none of the branch heads are true heads, the branch\n"
5642 " was created. If none of the branch heads are true heads, the branch\n"
5631 " is considered inactive.\n"
5643 " is considered inactive. If -c/--closed is specified, also show branch\n"
5644 " heads marked closed (see hg commit --close-branch).\n"
5632 "\n"
5645 "\n"
5633 " If STARTREV is specified only those heads (or branch heads) that\n"
5646 " If STARTREV is specified only those heads (or branch heads) that\n"
5634 " are descendants of STARTREV will be displayed.\n"
5647 " are descendants of STARTREV will be displayed.\n"
5635 " "
5648 " "
5636 msgstr ""
5649 msgstr ""
5637
5650
5638 #, python-format
5651 #, python-format
5639 msgid "no open branch heads on branch %s\n"
5652 msgid "no open branch heads on branch %s\n"
5640 msgstr ""
5653 msgstr ""
5641
5654
5642 #, python-format
5655 #, python-format
5643 msgid "no changes on branch %s containing %s are reachable from %s\n"
5656 msgid "no changes on branch %s containing %s are reachable from %s\n"
5644 msgstr ""
5657 msgstr ""
5645
5658
5646 #, python-format
5659 #, python-format
5647 msgid "no changes on branch %s are reachable from %s\n"
5660 msgid "no changes on branch %s are reachable from %s\n"
5648 msgstr ""
5661 msgstr ""
5649
5662
5650 msgid ""
5663 msgid ""
5651 "show help for a given topic or a help overview\n"
5664 "show help for a given topic or a help overview\n"
5652 "\n"
5665 "\n"
5653 " With no arguments, print a list of commands with short help messages.\n"
5666 " With no arguments, print a list of commands with short help messages.\n"
5654 "\n"
5667 "\n"
5655 " Given a topic, extension, or command name, print help for that\n"
5668 " Given a topic, extension, or command name, print help for that\n"
5656 " topic."
5669 " topic."
5657 msgstr ""
5670 msgstr ""
5658
5671
5659 msgid "global options:"
5672 msgid "global options:"
5660 msgstr "options globales :"
5673 msgstr "options globales :"
5661
5674
5662 msgid "use \"hg help\" for the full list of commands"
5675 msgid "use \"hg help\" for the full list of commands"
5663 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5676 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5664
5677
5665 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5678 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5666 msgstr ""
5679 msgstr ""
5667 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5680 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5668 "plus de détails"
5681 "plus de détails"
5669
5682
5670 # la chaîne passée est préfixée par un espace
5683 # la chaîne passée est préfixée par un espace
5671 #, python-format
5684 #, python-format
5672 msgid "use \"hg -v help%s\" to show aliases and global options"
5685 msgid "use \"hg -v help%s\" to show aliases and global options"
5673 msgstr ""
5686 msgstr ""
5674 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5687 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5675
5688
5676 #, python-format
5689 #, python-format
5677 msgid "use \"hg -v help %s\" to show global options"
5690 msgid "use \"hg -v help %s\" to show global options"
5678 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5691 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5679
5692
5680 msgid ""
5693 msgid ""
5681 "list of commands:\n"
5694 "list of commands:\n"
5682 "\n"
5695 "\n"
5683 msgstr ""
5696 msgstr ""
5684 "liste des commandes :\n"
5697 "liste des commandes :\n"
5685 "\n"
5698 "\n"
5686
5699
5687 #, python-format
5700 #, python-format
5688 msgid ""
5701 msgid ""
5689 "\n"
5702 "\n"
5690 "aliases: %s\n"
5703 "aliases: %s\n"
5691 msgstr ""
5704 msgstr ""
5692 "\n"
5705 "\n"
5693 "alias : %s\n"
5706 "alias : %s\n"
5694
5707
5695 msgid "(no help text available)"
5708 msgid "(no help text available)"
5696 msgstr "(pas d'aide disponible)"
5709 msgstr "(pas d'aide disponible)"
5697
5710
5698 msgid "options:\n"
5711 msgid "options:\n"
5699 msgstr "options :\n"
5712 msgstr "options :\n"
5700
5713
5701 msgid "no commands defined\n"
5714 msgid "no commands defined\n"
5702 msgstr "pas de commandes définies\n"
5715 msgstr "pas de commandes définies\n"
5703
5716
5704 msgid "enabled extensions:"
5717 msgid "enabled extensions:"
5705 msgstr "extensions activées :"
5718 msgstr "extensions activées :"
5706
5719
5707 msgid "no help text available"
5720 msgid "no help text available"
5708 msgstr "pas d'aide disponible"
5721 msgstr "pas d'aide disponible"
5709
5722
5710 #, python-format
5723 #, python-format
5711 msgid "%s extension - %s\n"
5724 msgid "%s extension - %s\n"
5712 msgstr "extension %s - %s\n"
5725 msgstr "extension %s - %s\n"
5713
5726
5714 msgid "Mercurial Distributed SCM\n"
5727 msgid "Mercurial Distributed SCM\n"
5715 msgstr "Mercurial, système de gestion de sources distribué\n"
5728 msgstr "Mercurial, système de gestion de sources distribué\n"
5716
5729
5717 msgid ""
5730 msgid ""
5718 "basic commands:\n"
5731 "basic commands:\n"
5719 "\n"
5732 "\n"
5720 msgstr ""
5733 msgstr ""
5721 "commandes de base :\n"
5734 "commandes de base :\n"
5722 "\n"
5735 "\n"
5723
5736
5724 msgid ""
5737 msgid ""
5725 "\n"
5738 "\n"
5726 "additional help topics:\n"
5739 "additional help topics:\n"
5727 "\n"
5740 "\n"
5728 msgstr ""
5741 msgstr ""
5729 "\n"
5742 "\n"
5730 "sujets d'aide supplémentaires :\n"
5743 "sujets d'aide supplémentaires :\n"
5731 "\n"
5744 "\n"
5732
5745
5733 msgid ""
5746 msgid ""
5734 "identify the working copy or specified revision\n"
5747 "identify the working copy or specified revision\n"
5735 "\n"
5748 "\n"
5736 " With no revision, print a summary of the current state of the\n"
5749 " With no revision, print a summary of the current state of the\n"
5737 " repository.\n"
5750 " repository.\n"
5738 "\n"
5751 "\n"
5739 " Specifying a path to a repository root or Mercurial bundle will\n"
5752 " Specifying a path to a repository root or Mercurial bundle will\n"
5740 " cause lookup to operate on that repository/bundle.\n"
5753 " cause lookup to operate on that repository/bundle.\n"
5741 "\n"
5754 "\n"
5742 " This summary identifies the repository state using one or two\n"
5755 " This summary identifies the repository state using one or two\n"
5743 " parent hash identifiers, followed by a \"+\" if there are\n"
5756 " parent hash identifiers, followed by a \"+\" if there are\n"
5744 " uncommitted changes in the working directory, a list of tags for\n"
5757 " uncommitted changes in the working directory, a list of tags for\n"
5745 " this revision and a branch name for non-default branches.\n"
5758 " this revision and a branch name for non-default branches.\n"
5746 " "
5759 " "
5747 msgstr ""
5760 msgstr ""
5748
5761
5749 msgid ""
5762 msgid ""
5750 "import an ordered set of patches\n"
5763 "import an ordered set of patches\n"
5751 "\n"
5764 "\n"
5752 " Import a list of patches and commit them individually.\n"
5765 " Import a list of patches and commit them individually.\n"
5753 "\n"
5766 "\n"
5754 " If there are outstanding changes in the working directory, import\n"
5767 " If there are outstanding changes in the working directory, import\n"
5755 " will abort unless given the -f/--force flag.\n"
5768 " will abort unless given the -f/--force flag.\n"
5756 "\n"
5769 "\n"
5757 " You can import a patch straight from a mail message. Even patches\n"
5770 " You can import a patch straight from a mail message. Even patches\n"
5758 " as attachments work (to use the body part, it must have type\n"
5771 " as attachments work (to use the body part, it must have type\n"
5759 " text/plain or text/x-patch). From and Subject headers of email\n"
5772 " text/plain or text/x-patch). From and Subject headers of email\n"
5760 " message are used as default committer and commit message. All\n"
5773 " message are used as default committer and commit message. All\n"
5761 " text/plain body parts before first diff are added to commit\n"
5774 " text/plain body parts before first diff are added to commit\n"
5762 " message.\n"
5775 " message.\n"
5763 "\n"
5776 "\n"
5764 " If the imported patch was generated by hg export, user and\n"
5777 " If the imported patch was generated by hg export, user and\n"
5765 " description from patch override values from message headers and\n"
5778 " description from patch override values from message headers and\n"
5766 " body. Values given on command line with -m/--message and -u/--user\n"
5779 " body. Values given on command line with -m/--message and -u/--user\n"
5767 " override these.\n"
5780 " override these.\n"
5768 "\n"
5781 "\n"
5769 " If --exact is specified, import will set the working directory to\n"
5782 " If --exact is specified, import will set the working directory to\n"
5770 " the parent of each patch before applying it, and will abort if the\n"
5783 " the parent of each patch before applying it, and will abort if the\n"
5771 " resulting changeset has a different ID than the one recorded in\n"
5784 " resulting changeset has a different ID than the one recorded in\n"
5772 " the patch. This may happen due to character set problems or other\n"
5785 " the patch. This may happen due to character set problems or other\n"
5773 " deficiencies in the text patch format.\n"
5786 " deficiencies in the text patch format.\n"
5774 "\n"
5787 "\n"
5775 " With -s/--similarity, hg will attempt to discover renames and\n"
5788 " With -s/--similarity, hg will attempt to discover renames and\n"
5776 " copies in the patch in the same way as 'addremove'.\n"
5789 " copies in the patch in the same way as 'addremove'.\n"
5777 "\n"
5790 "\n"
5778 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5791 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5779 " a URL is specified, the patch will be downloaded from it.\n"
5792 " a URL is specified, the patch will be downloaded from it.\n"
5780 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5793 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5781 " "
5794 " "
5782 msgstr ""
5795 msgstr ""
5783
5796
5784 msgid "applying patch from stdin\n"
5797 msgid "applying patch from stdin\n"
5785 msgstr ""
5798 msgstr ""
5786
5799
5787 msgid "no diffs found"
5800 msgid "no diffs found"
5788 msgstr ""
5801 msgstr ""
5789
5802
5790 #, python-format
5803 #, python-format
5791 msgid ""
5804 msgid ""
5792 "message:\n"
5805 "message:\n"
5793 "%s\n"
5806 "%s\n"
5794 msgstr ""
5807 msgstr ""
5795
5808
5796 msgid "not a Mercurial patch"
5809 msgid "not a Mercurial patch"
5797 msgstr ""
5810 msgstr ""
5798
5811
5799 msgid "patch is damaged or loses information"
5812 msgid "patch is damaged or loses information"
5800 msgstr ""
5813 msgstr ""
5801
5814
5802 msgid ""
5815 msgid ""
5803 "show new changesets found in source\n"
5816 "show new changesets found in source\n"
5804 "\n"
5817 "\n"
5805 " Show new changesets found in the specified path/URL or the default\n"
5818 " Show new changesets found in the specified path/URL or the default\n"
5806 " pull location. These are the changesets that would have been pulled\n"
5819 " pull location. These are the changesets that would have been pulled\n"
5807 " if a pull at the time you issued this command.\n"
5820 " if a pull at the time you issued this command.\n"
5808 "\n"
5821 "\n"
5809 " For remote repository, using --bundle avoids downloading the\n"
5822 " For remote repository, using --bundle avoids downloading the\n"
5810 " changesets twice if the incoming is followed by a pull.\n"
5823 " changesets twice if the incoming is followed by a pull.\n"
5811 "\n"
5824 "\n"
5812 " See pull for valid source format details.\n"
5825 " See pull for valid source format details.\n"
5813 " "
5826 " "
5814 msgstr ""
5827 msgstr ""
5815
5828
5816 msgid ""
5829 msgid ""
5817 "create a new repository in the given directory\n"
5830 "create a new repository in the given directory\n"
5818 "\n"
5831 "\n"
5819 " Initialize a new repository in the given directory. If the given\n"
5832 " Initialize a new repository in the given directory. If the given\n"
5820 " directory does not exist, it will be created.\n"
5833 " directory does not exist, it will be created.\n"
5821 "\n"
5834 "\n"
5822 " If no directory is given, the current directory is used.\n"
5835 " If no directory is given, the current directory is used.\n"
5823 "\n"
5836 "\n"
5824 " It is possible to specify an ssh:// URL as the destination.\n"
5837 " It is possible to specify an ssh:// URL as the destination.\n"
5825 " See 'hg help urls' for more information.\n"
5838 " See 'hg help urls' for more information.\n"
5826 " "
5839 " "
5827 msgstr ""
5840 msgstr ""
5828
5841
5829 msgid ""
5842 msgid ""
5830 "locate files matching specific patterns\n"
5843 "locate files matching specific patterns\n"
5831 "\n"
5844 "\n"
5832 " Print files under Mercurial control in the working directory whose\n"
5845 " Print files under Mercurial control in the working directory whose\n"
5833 " names match the given patterns.\n"
5846 " names match the given patterns.\n"
5834 "\n"
5847 "\n"
5835 " By default, this command searches all directories in the working\n"
5848 " By default, this command searches all directories in the working\n"
5836 " directory. To search just the current directory and its\n"
5849 " directory. To search just the current directory and its\n"
5837 " subdirectories, use \"--include .\".\n"
5850 " subdirectories, use \"--include .\".\n"
5838 "\n"
5851 "\n"
5839 " If no patterns are given to match, this command prints the names\n"
5852 " If no patterns are given to match, this command prints the names\n"
5840 " of all files under Mercurial control in the working directory.\n"
5853 " of all files under Mercurial control in the working directory.\n"
5841 "\n"
5854 "\n"
5842 " If you want to feed the output of this command into the \"xargs\"\n"
5855 " If you want to feed the output of this command into the \"xargs\"\n"
5843 " command, use the -0 option to both this command and \"xargs\". This\n"
5856 " command, use the -0 option to both this command and \"xargs\". This\n"
5844 " will avoid the problem of \"xargs\" treating single filenames that\n"
5857 " will avoid the problem of \"xargs\" treating single filenames that\n"
5845 " contain whitespace as multiple filenames.\n"
5858 " contain whitespace as multiple filenames.\n"
5846 " "
5859 " "
5847 msgstr ""
5860 msgstr ""
5848
5861
5849 msgid ""
5862 msgid ""
5850 "show revision history of entire repository or files\n"
5863 "show revision history of entire repository or files\n"
5851 "\n"
5864 "\n"
5852 " Print the revision history of the specified files or the entire\n"
5865 " Print the revision history of the specified files or the entire\n"
5853 " project.\n"
5866 " project.\n"
5854 "\n"
5867 "\n"
5855 " File history is shown without following rename or copy history of\n"
5868 " File history is shown without following rename or copy history of\n"
5856 " files. Use -f/--follow with a filename to follow history across\n"
5869 " files. Use -f/--follow with a filename to follow history across\n"
5857 " renames and copies. --follow without a filename will only show\n"
5870 " renames and copies. --follow without a filename will only show\n"
5858 " ancestors or descendants of the starting revision. --follow-first\n"
5871 " ancestors or descendants of the starting revision. --follow-first\n"
5859 " only follows the first parent of merge revisions.\n"
5872 " only follows the first parent of merge revisions.\n"
5860 "\n"
5873 "\n"
5861 " If no revision range is specified, the default is tip:0 unless\n"
5874 " If no revision range is specified, the default is tip:0 unless\n"
5862 " --follow is set, in which case the working directory parent is\n"
5875 " --follow is set, in which case the working directory parent is\n"
5863 " used as the starting revision.\n"
5876 " used as the starting revision.\n"
5864 "\n"
5877 "\n"
5865 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5878 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5866 "\n"
5879 "\n"
5867 " By default this command prints revision number and changeset id,\n"
5880 " By default this command prints revision number and changeset id,\n"
5868 " tags, non-trivial parents, user, date and time, and a summary for\n"
5881 " tags, non-trivial parents, user, date and time, and a summary for\n"
5869 " each commit. When the -v/--verbose switch is used, the list of\n"
5882 " each commit. When the -v/--verbose switch is used, the list of\n"
5870 " changed files and full commit message are shown.\n"
5883 " changed files and full commit message are shown.\n"
5871 "\n"
5884 "\n"
5872 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5885 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5873 " changesets, as it will only compare the merge changeset against\n"
5886 " changesets, as it will only compare the merge changeset against\n"
5874 " its first parent. Also, only files different from BOTH parents\n"
5887 " its first parent. Also, only files different from BOTH parents\n"
5875 " will appear in files:.\n"
5888 " will appear in files:.\n"
5876 " "
5889 " "
5877 msgstr ""
5890 msgstr ""
5878
5891
5879 msgid ""
5892 msgid ""
5880 "output the current or given revision of the project manifest\n"
5893 "output the current or given revision of the project manifest\n"
5881 "\n"
5894 "\n"
5882 " Print a list of version controlled files for the given revision.\n"
5895 " Print a list of version controlled files for the given revision.\n"
5883 " If no revision is given, the first parent of the working directory\n"
5896 " If no revision is given, the first parent of the working directory\n"
5884 " is used, or the null revision if no revision is checked out.\n"
5897 " is used, or the null revision if no revision is checked out.\n"
5885 "\n"
5898 "\n"
5886 " With -v, print file permissions, symlink and executable bits.\n"
5899 " With -v, print file permissions, symlink and executable bits.\n"
5887 " With --debug, print file revision hashes.\n"
5900 " With --debug, print file revision hashes.\n"
5888 " "
5901 " "
5889 msgstr ""
5902 msgstr ""
5890
5903
5891 msgid ""
5904 msgid ""
5892 "merge working directory with another revision\n"
5905 "merge working directory with another revision\n"
5893 "\n"
5906 "\n"
5894 " The current working directory is updated with all changes made in\n"
5907 " The current working directory is updated with all changes made in\n"
5895 " the requested revision since the last common predecessor revision.\n"
5908 " the requested revision since the last common predecessor revision.\n"
5896 "\n"
5909 "\n"
5897 " Files that changed between either parent are marked as changed for\n"
5910 " Files that changed between either parent are marked as changed for\n"
5898 " the next commit and a commit must be performed before any further\n"
5911 " the next commit and a commit must be performed before any further\n"
5899 " updates to the repository are allowed. The next commit will have\n"
5912 " updates to the repository are allowed. The next commit will have\n"
5900 " two parents.\n"
5913 " two parents.\n"
5901 "\n"
5914 "\n"
5902 " If no revision is specified, the working directory's parent is a\n"
5915 " If no revision is specified, the working directory's parent is a\n"
5903 " head revision, and the current branch contains exactly one other\n"
5916 " head revision, and the current branch contains exactly one other\n"
5904 " head, the other head is merged with by default. Otherwise, an\n"
5917 " head, the other head is merged with by default. Otherwise, an\n"
5905 " explicit revision with which to merge with must be provided.\n"
5918 " explicit revision with which to merge with must be provided.\n"
5906 " "
5919 " "
5907 msgstr ""
5920 msgstr ""
5908
5921
5909 #, python-format
5922 #, python-format
5910 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5923 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5911 msgstr ""
5924 msgstr ""
5912
5925
5913 #, python-format
5926 #, python-format
5914 msgid "branch '%s' has one head - please merge with an explicit rev"
5927 msgid "branch '%s' has one head - please merge with an explicit rev"
5915 msgstr ""
5928 msgstr ""
5916
5929
5917 msgid "there is nothing to merge"
5930 msgid "there is nothing to merge"
5918 msgstr ""
5931 msgstr ""
5919
5932
5920 #, python-format
5933 #, python-format
5921 msgid "%s - use \"hg update\" instead"
5934 msgid "%s - use \"hg update\" instead"
5922 msgstr ""
5935 msgstr ""
5923
5936
5924 msgid ""
5937 msgid ""
5925 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5938 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5926 "rev"
5939 "rev"
5927 msgstr ""
5940 msgstr ""
5928
5941
5929 msgid ""
5942 msgid ""
5930 "show changesets not found in destination\n"
5943 "show changesets not found in destination\n"
5931 "\n"
5944 "\n"
5932 " Show changesets not found in the specified destination repository\n"
5945 " Show changesets not found in the specified destination repository\n"
5933 " or the default push location. These are the changesets that would\n"
5946 " or the default push location. These are the changesets that would\n"
5934 " be pushed if a push was requested.\n"
5947 " be pushed if a push was requested.\n"
5935 "\n"
5948 "\n"
5936 " See pull for valid destination format details.\n"
5949 " See pull for valid destination format details.\n"
5937 " "
5950 " "
5938 msgstr ""
5951 msgstr ""
5939
5952
5940 msgid ""
5953 msgid ""
5941 "show the parents of the working directory or revision\n"
5954 "show the parents of the working directory or revision\n"
5942 "\n"
5955 "\n"
5943 " Print the working directory's parent revisions. If a revision is\n"
5956 " Print the working directory's parent revisions. If a revision is\n"
5944 " given via -r/--rev, the parent of that revision will be printed.\n"
5957 " given via -r/--rev, the parent of that revision will be printed.\n"
5945 " If a file argument is given, the revision in which the file was\n"
5958 " If a file argument is given, the revision in which the file was\n"
5946 " last changed (before the working directory revision or the\n"
5959 " last changed (before the working directory revision or the\n"
5947 " argument to --rev if given) is printed.\n"
5960 " argument to --rev if given) is printed.\n"
5948 " "
5961 " "
5949 msgstr ""
5962 msgstr ""
5950
5963
5951 msgid "can only specify an explicit filename"
5964 msgid "can only specify an explicit filename"
5952 msgstr ""
5965 msgstr ""
5953
5966
5954 #, python-format
5967 #, python-format
5955 msgid "'%s' not found in manifest!"
5968 msgid "'%s' not found in manifest!"
5956 msgstr ""
5969 msgstr ""
5957
5970
5958 msgid ""
5971 msgid ""
5959 "show aliases for remote repositories\n"
5972 "show aliases for remote repositories\n"
5960 "\n"
5973 "\n"
5961 " Show definition of symbolic path name NAME. If no name is given,\n"
5974 " Show definition of symbolic path name NAME. If no name is given,\n"
5962 " show definition of all available names.\n"
5975 " show definition of all available names.\n"
5963 "\n"
5976 "\n"
5964 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5977 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5965 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5978 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5966 "\n"
5979 "\n"
5967 " See 'hg help urls' for more information.\n"
5980 " See 'hg help urls' for more information.\n"
5968 " "
5981 " "
5969 msgstr ""
5982 msgstr ""
5970
5983
5971 msgid "not found!\n"
5984 msgid "not found!\n"
5972 msgstr ""
5985 msgstr ""
5973
5986
5974 msgid "not updating, since new heads added\n"
5987 msgid "not updating, since new heads added\n"
5975 msgstr ""
5988 msgstr ""
5976
5989
5977 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5990 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5978 msgstr ""
5991 msgstr ""
5979
5992
5980 msgid "(run 'hg update' to get a working copy)\n"
5993 msgid "(run 'hg update' to get a working copy)\n"
5981 msgstr ""
5994 msgstr ""
5982
5995
5983 msgid ""
5996 msgid ""
5984 "pull changes from the specified source\n"
5997 "pull changes from the specified source\n"
5985 "\n"
5998 "\n"
5986 " Pull changes from a remote repository to a local one.\n"
5999 " Pull changes from a remote repository to a local one.\n"
5987 "\n"
6000 "\n"
5988 " This finds all changes from the repository at the specified path\n"
6001 " This finds all changes from the repository at the specified path\n"
5989 " or URL and adds them to a local repository (the current one unless\n"
6002 " or URL and adds them to a local repository (the current one unless\n"
5990 " -R is specified). By default, this does not update the copy of the\n"
6003 " -R is specified). By default, this does not update the copy of the\n"
5991 " project in the working directory.\n"
6004 " project in the working directory.\n"
5992 "\n"
6005 "\n"
5993 " Use hg incoming if you want to see what would have been added by a\n"
6006 " Use hg incoming if you want to see what would have been added by a\n"
5994 " pull at the time you issued this command. If you then decide to\n"
6007 " pull at the time you issued this command. If you then decide to\n"
5995 " added those changes to the repository, you should use pull -r X\n"
6008 " added those changes to the repository, you should use pull -r X\n"
5996 " where X is the last changeset listed by hg incoming.\n"
6009 " where X is the last changeset listed by hg incoming.\n"
5997 "\n"
6010 "\n"
5998 " If SOURCE is omitted, the 'default' path will be used.\n"
6011 " If SOURCE is omitted, the 'default' path will be used.\n"
5999 " See 'hg help urls' for more information.\n"
6012 " See 'hg help urls' for more information.\n"
6000 " "
6013 " "
6001 msgstr ""
6014 msgstr ""
6002
6015
6003 msgid ""
6016 msgid ""
6004 "push changes to the specified destination\n"
6017 "push changes to the specified destination\n"
6005 "\n"
6018 "\n"
6006 " Push changes from the local repository to the given destination.\n"
6019 " Push changes from the local repository to the given destination.\n"
6007 "\n"
6020 "\n"
6008 " This is the symmetrical operation for pull. It moves changes from\n"
6021 " This is the symmetrical operation for pull. It moves changes from\n"
6009 " the current repository to a different one. If the destination is\n"
6022 " the current repository to a different one. If the destination is\n"
6010 " local this is identical to a pull in that directory from the\n"
6023 " local this is identical to a pull in that directory from the\n"
6011 " current one.\n"
6024 " current one.\n"
6012 "\n"
6025 "\n"
6013 " By default, push will refuse to run if it detects the result would\n"
6026 " By default, push will refuse to run if it detects the result would\n"
6014 " increase the number of remote heads. This generally indicates the\n"
6027 " increase the number of remote heads. This generally indicates the\n"
6015 " user forgot to pull and merge before pushing.\n"
6028 " user forgot to pull and merge before pushing.\n"
6016 "\n"
6029 "\n"
6017 " If -r/--rev is used, the named revision and all its ancestors will\n"
6030 " If -r/--rev is used, the named revision and all its ancestors will\n"
6018 " be pushed to the remote repository.\n"
6031 " be pushed to the remote repository.\n"
6019 "\n"
6032 "\n"
6020 " Please see 'hg help urls' for important details about ssh://\n"
6033 " Please see 'hg help urls' for important details about ssh://\n"
6021 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6034 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6022 " "
6035 " "
6023 msgstr ""
6036 msgstr ""
6024
6037
6025 #, python-format
6038 #, python-format
6026 msgid "pushing to %s\n"
6039 msgid "pushing to %s\n"
6027 msgstr ""
6040 msgstr ""
6028
6041
6029 msgid ""
6042 msgid ""
6030 "roll back an interrupted transaction\n"
6043 "roll back an interrupted transaction\n"
6031 "\n"
6044 "\n"
6032 " Recover from an interrupted commit or pull.\n"
6045 " Recover from an interrupted commit or pull.\n"
6033 "\n"
6046 "\n"
6034 " This command tries to fix the repository status after an\n"
6047 " This command tries to fix the repository status after an\n"
6035 " interrupted operation. It should only be necessary when Mercurial\n"
6048 " interrupted operation. It should only be necessary when Mercurial\n"
6036 " suggests it.\n"
6049 " suggests it.\n"
6037 " "
6050 " "
6038 msgstr ""
6051 msgstr ""
6039
6052
6040 msgid ""
6053 msgid ""
6041 "remove the specified files on the next commit\n"
6054 "remove the specified files on the next commit\n"
6042 "\n"
6055 "\n"
6043 " Schedule the indicated files for removal from the repository.\n"
6056 " Schedule the indicated files for removal from the repository.\n"
6044 "\n"
6057 "\n"
6045 " This only removes files from the current branch, not from the\n"
6058 " This only removes files from the current branch, not from the\n"
6046 " entire project history. -A/--after can be used to remove only\n"
6059 " entire project history. -A/--after can be used to remove only\n"
6047 " files that have already been deleted, -f/--force can be used to\n"
6060 " files that have already been deleted, -f/--force can be used to\n"
6048 " force deletion, and -Af can be used to remove files from the next\n"
6061 " force deletion, and -Af can be used to remove files from the next\n"
6049 " revision without deleting them from the working directory.\n"
6062 " revision without deleting them from the working directory.\n"
6050 "\n"
6063 "\n"
6051 " The following table details the behavior of remove for different\n"
6064 " The following table details the behavior of remove for different\n"
6052 " file states (columns) and option combinations (rows). The file\n"
6065 " file states (columns) and option combinations (rows). The file\n"
6053 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
6066 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
6054 " (as reported by hg status). The actions are Warn, Remove (from\n"
6067 " (as reported by hg status). The actions are Warn, Remove (from\n"
6055 " branch) and Delete (from disk).\n"
6068 " branch) and Delete (from disk).\n"
6056 "\n"
6069 "\n"
6057 " A C M !\n"
6070 " A C M !\n"
6058 " none W RD W R\n"
6071 " none W RD W R\n"
6059 " -f R RD RD R\n"
6072 " -f R RD RD R\n"
6060 " -A W W W R\n"
6073 " -A W W W R\n"
6061 " -Af R R R R\n"
6074 " -Af R R R R\n"
6062 "\n"
6075 "\n"
6063 " This command schedules the files to be removed at the next commit.\n"
6076 " This command schedules the files to be removed at the next commit.\n"
6064 " To undo a remove before that, see hg revert.\n"
6077 " To undo a remove before that, see hg revert.\n"
6065 " "
6078 " "
6066 msgstr ""
6079 msgstr ""
6067
6080
6068 #, python-format
6081 #, python-format
6069 msgid "not removing %s: file is untracked\n"
6082 msgid "not removing %s: file is untracked\n"
6070 msgstr ""
6083 msgstr ""
6071
6084
6072 #, python-format
6085 #, python-format
6073 msgid "not removing %s: file %s (use -f to force removal)\n"
6086 msgid "not removing %s: file %s (use -f to force removal)\n"
6074 msgstr ""
6087 msgstr ""
6075
6088
6076 msgid "still exists"
6089 msgid "still exists"
6077 msgstr ""
6090 msgstr ""
6078
6091
6079 msgid "is modified"
6092 msgid "is modified"
6080 msgstr ""
6093 msgstr ""
6081
6094
6082 msgid "has been marked for add"
6095 msgid "has been marked for add"
6083 msgstr ""
6096 msgstr ""
6084
6097
6085 msgid ""
6098 msgid ""
6086 "rename files; equivalent of copy + remove\n"
6099 "rename files; equivalent of copy + remove\n"
6087 "\n"
6100 "\n"
6088 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6101 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6089 " is a directory, copies are put in that directory. If dest is a\n"
6102 " is a directory, copies are put in that directory. If dest is a\n"
6090 " file, there can only be one source.\n"
6103 " file, there can only be one source.\n"
6091 "\n"
6104 "\n"
6092 " By default, this command copies the contents of files as they\n"
6105 " By default, this command copies the contents of files as they\n"
6093 " exist in the working directory. If invoked with -A/--after, the\n"
6106 " exist in the working directory. If invoked with -A/--after, the\n"
6094 " operation is recorded, but no copying is performed.\n"
6107 " operation is recorded, but no copying is performed.\n"
6095 "\n"
6108 "\n"
6096 " This command takes effect at the next commit. To undo a rename\n"
6109 " This command takes effect at the next commit. To undo a rename\n"
6097 " before that, see hg revert.\n"
6110 " before that, see hg revert.\n"
6098 " "
6111 " "
6099 msgstr ""
6112 msgstr ""
6100
6113
6101 msgid ""
6114 msgid ""
6102 "retry file merges from a merge or update\n"
6115 "retry file merges from a merge or update\n"
6103 "\n"
6116 "\n"
6104 " This command will cleanly retry unresolved file merges using file\n"
6117 " This command will cleanly retry unresolved file merges using file\n"
6105 " revisions preserved from the last update or merge. To attempt to\n"
6118 " revisions preserved from the last update or merge. To attempt to\n"
6106 " resolve all unresolved files, use the -a/--all switch.\n"
6119 " resolve all unresolved files, use the -a/--all switch.\n"
6107 "\n"
6120 "\n"
6108 " If a conflict is resolved manually, please note that the changes\n"
6121 " If a conflict is resolved manually, please note that the changes\n"
6109 " will be overwritten if the merge is retried with resolve. The\n"
6122 " will be overwritten if the merge is retried with resolve. The\n"
6110 " -m/--mark switch should be used to mark the file as resolved.\n"
6123 " -m/--mark switch should be used to mark the file as resolved.\n"
6111 "\n"
6124 "\n"
6112 " This command also allows listing resolved files and manually\n"
6125 " This command also allows listing resolved files and manually\n"
6113 " indicating whether or not files are resolved. All files must be\n"
6126 " indicating whether or not files are resolved. All files must be\n"
6114 " marked as resolved before a commit is permitted.\n"
6127 " marked as resolved before a commit is permitted.\n"
6115 "\n"
6128 "\n"
6116 " The codes used to show the status of files are:\n"
6129 " The codes used to show the status of files are:\n"
6117 " U = unresolved\n"
6130 " U = unresolved\n"
6118 " R = resolved\n"
6131 " R = resolved\n"
6119 " "
6132 " "
6120 msgstr ""
6133 msgstr ""
6121
6134
6122 msgid "too many options specified"
6135 msgid "too many options specified"
6123 msgstr ""
6136 msgstr ""
6124
6137
6125 msgid "can't specify --all and patterns"
6138 msgid "can't specify --all and patterns"
6126 msgstr ""
6139 msgstr ""
6127
6140
6128 msgid "no files or directories specified; use --all to remerge all files"
6141 msgid "no files or directories specified; use --all to remerge all files"
6129 msgstr ""
6142 msgstr ""
6130
6143
6131 msgid ""
6144 msgid ""
6132 "restore individual files or directories to an earlier state\n"
6145 "restore individual files or directories to an earlier state\n"
6133 "\n"
6146 "\n"
6134 " (Use update -r to check out earlier revisions, revert does not\n"
6147 " (Use update -r to check out earlier revisions, revert does not\n"
6135 " change the working directory parents.)\n"
6148 " change the working directory parents.)\n"
6136 "\n"
6149 "\n"
6137 " With no revision specified, revert the named files or directories\n"
6150 " With no revision specified, revert the named files or directories\n"
6138 " to the contents they had in the parent of the working directory.\n"
6151 " to the contents they had in the parent of the working directory.\n"
6139 " This restores the contents of the affected files to an unmodified\n"
6152 " This restores the contents of the affected files to an unmodified\n"
6140 " state and unschedules adds, removes, copies, and renames. If the\n"
6153 " state and unschedules adds, removes, copies, and renames. If the\n"
6141 " working directory has two parents, you must explicitly specify the\n"
6154 " working directory has two parents, you must explicitly specify the\n"
6142 " revision to revert to.\n"
6155 " revision to revert to.\n"
6143 "\n"
6156 "\n"
6144 " Using the -r/--rev option, revert the given files or directories\n"
6157 " Using the -r/--rev option, revert the given files or directories\n"
6145 " to their contents as of a specific revision. This can be helpful\n"
6158 " to their contents as of a specific revision. This can be helpful\n"
6146 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6159 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6147 " dates' for a list of formats valid for -d/--date.\n"
6160 " dates' for a list of formats valid for -d/--date.\n"
6148 "\n"
6161 "\n"
6149 " Revert modifies the working directory. It does not commit any\n"
6162 " Revert modifies the working directory. It does not commit any\n"
6150 " changes, or change the parent of the working directory. If you\n"
6163 " changes, or change the parent of the working directory. If you\n"
6151 " revert to a revision other than the parent of the working\n"
6164 " revert to a revision other than the parent of the working\n"
6152 " directory, the reverted files will thus appear modified\n"
6165 " directory, the reverted files will thus appear modified\n"
6153 " afterwards.\n"
6166 " afterwards.\n"
6154 "\n"
6167 "\n"
6155 " If a file has been deleted, it is restored. If the executable mode\n"
6168 " If a file has been deleted, it is restored. If the executable mode\n"
6156 " of a file was changed, it is reset.\n"
6169 " of a file was changed, it is reset.\n"
6157 "\n"
6170 "\n"
6158 " If names are given, all files matching the names are reverted.\n"
6171 " If names are given, all files matching the names are reverted.\n"
6159 " If no arguments are given, no files are reverted.\n"
6172 " If no arguments are given, no files are reverted.\n"
6160 "\n"
6173 "\n"
6161 " Modified files are saved with a .orig suffix before reverting.\n"
6174 " Modified files are saved with a .orig suffix before reverting.\n"
6162 " To disable these backups, use --no-backup.\n"
6175 " To disable these backups, use --no-backup.\n"
6163 " "
6176 " "
6164 msgstr ""
6177 msgstr ""
6165
6178
6166 msgid "you can't specify a revision and a date"
6179 msgid "you can't specify a revision and a date"
6167 msgstr ""
6180 msgstr ""
6168
6181
6169 msgid "no files or directories specified; use --all to revert the whole repo"
6182 msgid "no files or directories specified; use --all to revert the whole repo"
6170 msgstr ""
6183 msgstr ""
6171
6184
6172 #, python-format
6185 #, python-format
6173 msgid "forgetting %s\n"
6186 msgid "forgetting %s\n"
6174 msgstr ""
6187 msgstr ""
6175
6188
6176 #, python-format
6189 #, python-format
6177 msgid "reverting %s\n"
6190 msgid "reverting %s\n"
6178 msgstr ""
6191 msgstr ""
6179
6192
6180 #, python-format
6193 #, python-format
6181 msgid "undeleting %s\n"
6194 msgid "undeleting %s\n"
6182 msgstr ""
6195 msgstr ""
6183
6196
6184 #, python-format
6197 #, python-format
6185 msgid "saving current version of %s as %s\n"
6198 msgid "saving current version of %s as %s\n"
6186 msgstr ""
6199 msgstr ""
6187
6200
6188 #, python-format
6201 #, python-format
6189 msgid "file not managed: %s\n"
6202 msgid "file not managed: %s\n"
6190 msgstr ""
6203 msgstr ""
6191
6204
6192 #, python-format
6205 #, python-format
6193 msgid "no changes needed to %s\n"
6206 msgid "no changes needed to %s\n"
6194 msgstr ""
6207 msgstr ""
6195
6208
6196 msgid ""
6209 msgid ""
6197 "roll back the last transaction\n"
6210 "roll back the last transaction\n"
6198 "\n"
6211 "\n"
6199 " This command should be used with care. There is only one level of\n"
6212 " This command should be used with care. There is only one level of\n"
6200 " rollback, and there is no way to undo a rollback. It will also\n"
6213 " rollback, and there is no way to undo a rollback. It will also\n"
6201 " restore the dirstate at the time of the last transaction, losing\n"
6214 " restore the dirstate at the time of the last transaction, losing\n"
6202 " any dirstate changes since that time. This command does not alter\n"
6215 " any dirstate changes since that time. This command does not alter\n"
6203 " the working directory.\n"
6216 " the working directory.\n"
6204 "\n"
6217 "\n"
6205 " Transactions are used to encapsulate the effects of all commands\n"
6218 " Transactions are used to encapsulate the effects of all commands\n"
6206 " that create new changesets or propagate existing changesets into a\n"
6219 " that create new changesets or propagate existing changesets into a\n"
6207 " repository. For example, the following commands are transactional,\n"
6220 " repository. For example, the following commands are transactional,\n"
6208 " and their effects can be rolled back:\n"
6221 " and their effects can be rolled back:\n"
6209 "\n"
6222 "\n"
6210 " commit\n"
6223 " commit\n"
6211 " import\n"
6224 " import\n"
6212 " pull\n"
6225 " pull\n"
6213 " push (with this repository as destination)\n"
6226 " push (with this repository as destination)\n"
6214 " unbundle\n"
6227 " unbundle\n"
6215 "\n"
6228 "\n"
6216 " This command is not intended for use on public repositories. Once\n"
6229 " This command is not intended for use on public repositories. Once\n"
6217 " changes are visible for pull by other users, rolling a transaction\n"
6230 " changes are visible for pull by other users, rolling a transaction\n"
6218 " back locally is ineffective (someone else may already have pulled\n"
6231 " back locally is ineffective (someone else may already have pulled\n"
6219 " the changes). Furthermore, a race is possible with readers of the\n"
6232 " the changes). Furthermore, a race is possible with readers of the\n"
6220 " repository; for example an in-progress pull from the repository\n"
6233 " repository; for example an in-progress pull from the repository\n"
6221 " may fail if a rollback is performed.\n"
6234 " may fail if a rollback is performed.\n"
6222 " "
6235 " "
6223 msgstr ""
6236 msgstr ""
6224
6237
6225 msgid ""
6238 msgid ""
6226 "print the root (top) of the current working directory\n"
6239 "print the root (top) of the current working directory\n"
6227 "\n"
6240 "\n"
6228 " Print the root directory of the current repository.\n"
6241 " Print the root directory of the current repository.\n"
6229 " "
6242 " "
6230 msgstr ""
6243 msgstr ""
6231
6244
6232 msgid ""
6245 msgid ""
6233 "export the repository via HTTP\n"
6246 "export the repository via HTTP\n"
6234 "\n"
6247 "\n"
6235 " Start a local HTTP repository browser and pull server.\n"
6248 " Start a local HTTP repository browser and pull server.\n"
6236 "\n"
6249 "\n"
6237 " By default, the server logs accesses to stdout and errors to\n"
6250 " By default, the server logs accesses to stdout and errors to\n"
6238 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6251 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6239 " files.\n"
6252 " files.\n"
6240 " "
6253 " "
6241 msgstr ""
6254 msgstr ""
6242
6255
6243 #, python-format
6256 #, python-format
6244 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6257 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6245 msgstr ""
6258 msgstr ""
6246
6259
6247 msgid ""
6260 msgid ""
6248 "show changed files in the working directory\n"
6261 "show changed files in the working directory\n"
6249 "\n"
6262 "\n"
6250 " Show status of files in the repository. If names are given, only\n"
6263 " Show status of files in the repository. If names are given, only\n"
6251 " files that match are shown. Files that are clean or ignored or\n"
6264 " files that match are shown. Files that are clean or ignored or\n"
6252 " the source of a copy/move operation, are not listed unless\n"
6265 " the source of a copy/move operation, are not listed unless\n"
6253 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6266 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6254 " Unless options described with \"show only ...\" are given, the\n"
6267 " Unless options described with \"show only ...\" are given, the\n"
6255 " options -mardu are used.\n"
6268 " options -mardu are used.\n"
6256 "\n"
6269 "\n"
6257 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6270 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6258 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6271 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6259 "\n"
6272 "\n"
6260 " NOTE: status may appear to disagree with diff if permissions have\n"
6273 " NOTE: status may appear to disagree with diff if permissions have\n"
6261 " changed or a merge has occurred. The standard diff format does not\n"
6274 " changed or a merge has occurred. The standard diff format does not\n"
6262 " report permission changes and diff only reports changes relative\n"
6275 " report permission changes and diff only reports changes relative\n"
6263 " to one merge parent.\n"
6276 " to one merge parent.\n"
6264 "\n"
6277 "\n"
6265 " If one revision is given, it is used as the base revision.\n"
6278 " If one revision is given, it is used as the base revision.\n"
6266 " If two revisions are given, the differences between them are\n"
6279 " If two revisions are given, the differences between them are\n"
6267 " shown.\n"
6280 " shown.\n"
6268 "\n"
6281 "\n"
6269 " The codes used to show the status of files are:\n"
6282 " The codes used to show the status of files are:\n"
6270 " M = modified\n"
6283 " M = modified\n"
6271 " A = added\n"
6284 " A = added\n"
6272 " R = removed\n"
6285 " R = removed\n"
6273 " C = clean\n"
6286 " C = clean\n"
6274 " ! = missing (deleted by non-hg command, but still tracked)\n"
6287 " ! = missing (deleted by non-hg command, but still tracked)\n"
6275 " ? = not tracked\n"
6288 " ? = not tracked\n"
6276 " I = ignored\n"
6289 " I = ignored\n"
6277 " = origin of the previous file listed as A (added)\n"
6290 " = origin of the previous file listed as A (added)\n"
6278 " "
6291 " "
6279 msgstr ""
6292 msgstr ""
6280
6293
6281 msgid ""
6294 msgid ""
6282 "add one or more tags for the current or given revision\n"
6295 "add one or more tags for the current or given revision\n"
6283 "\n"
6296 "\n"
6284 " Name a particular revision using <name>.\n"
6297 " Name a particular revision using <name>.\n"
6285 "\n"
6298 "\n"
6286 " Tags are used to name particular revisions of the repository and are\n"
6299 " Tags are used to name particular revisions of the repository and are\n"
6287 " very useful to compare different revisions, to go back to significant\n"
6300 " very useful to compare different revisions, to go back to significant\n"
6288 " earlier versions or to mark branch points as releases, etc.\n"
6301 " earlier versions or to mark branch points as releases, etc.\n"
6289 "\n"
6302 "\n"
6290 " If no revision is given, the parent of the working directory is\n"
6303 " If no revision is given, the parent of the working directory is\n"
6291 " used, or tip if no revision is checked out.\n"
6304 " used, or tip if no revision is checked out.\n"
6292 "\n"
6305 "\n"
6293 " To facilitate version control, distribution, and merging of tags,\n"
6306 " To facilitate version control, distribution, and merging of tags,\n"
6294 " they are stored as a file named \".hgtags\" which is managed\n"
6307 " they are stored as a file named \".hgtags\" which is managed\n"
6295 " similarly to other project files and can be hand-edited if\n"
6308 " similarly to other project files and can be hand-edited if\n"
6296 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6309 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6297 " shared among repositories).\n"
6310 " shared among repositories).\n"
6298 "\n"
6311 "\n"
6299 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6312 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6300 " "
6313 " "
6301 msgstr ""
6314 msgstr ""
6302
6315
6303 msgid "tag names must be unique"
6316 msgid "tag names must be unique"
6304 msgstr ""
6317 msgstr ""
6305
6318
6306 #, python-format
6319 #, python-format
6307 msgid "the name '%s' is reserved"
6320 msgid "the name '%s' is reserved"
6308 msgstr ""
6321 msgstr ""
6309
6322
6310 msgid "--rev and --remove are incompatible"
6323 msgid "--rev and --remove are incompatible"
6311 msgstr ""
6324 msgstr ""
6312
6325
6313 #, python-format
6326 #, python-format
6314 msgid "tag '%s' does not exist"
6327 msgid "tag '%s' does not exist"
6315 msgstr ""
6328 msgstr ""
6316
6329
6317 #, python-format
6330 #, python-format
6318 msgid "tag '%s' is not a global tag"
6331 msgid "tag '%s' is not a global tag"
6319 msgstr ""
6332 msgstr ""
6320
6333
6321 #, python-format
6334 #, python-format
6322 msgid "tag '%s' is not a local tag"
6335 msgid "tag '%s' is not a local tag"
6323 msgstr ""
6336 msgstr ""
6324
6337
6325 #, python-format
6338 #, python-format
6326 msgid "Removed tag %s"
6339 msgid "Removed tag %s"
6327 msgstr ""
6340 msgstr ""
6328
6341
6329 #, python-format
6342 #, python-format
6330 msgid "tag '%s' already exists (use -f to force)"
6343 msgid "tag '%s' already exists (use -f to force)"
6331 msgstr ""
6344 msgstr ""
6332
6345
6333 #, python-format
6346 #, python-format
6334 msgid "Added tag %s for changeset %s"
6347 msgid "Added tag %s for changeset %s"
6335 msgstr ""
6348 msgstr ""
6336
6349
6337 msgid ""
6350 msgid ""
6338 "list repository tags\n"
6351 "list repository tags\n"
6339 "\n"
6352 "\n"
6340 " This lists both regular and local tags. When the -v/--verbose\n"
6353 " This lists both regular and local tags. When the -v/--verbose\n"
6341 " switch is used, a third column \"local\" is printed for local tags.\n"
6354 " switch is used, a third column \"local\" is printed for local tags.\n"
6342 " "
6355 " "
6343 msgstr ""
6356 msgstr ""
6344
6357
6345 msgid ""
6358 msgid ""
6346 "show the tip revision\n"
6359 "show the tip revision\n"
6347 "\n"
6360 "\n"
6348 " The tip revision (usually just called the tip) is the changeset\n"
6361 " The tip revision (usually just called the tip) is the changeset\n"
6349 " most recently added to the repository (and therefore the most\n"
6362 " most recently added to the repository (and therefore the most\n"
6350 " recently changed head).\n"
6363 " recently changed head).\n"
6351 "\n"
6364 "\n"
6352 " If you have just made a commit, that commit will be the tip. If\n"
6365 " If you have just made a commit, that commit will be the tip. If\n"
6353 " you have just pulled changes from another repository, the tip of\n"
6366 " you have just pulled changes from another repository, the tip of\n"
6354 " that repository becomes the current tip. The \"tip\" tag is special\n"
6367 " that repository becomes the current tip. The \"tip\" tag is special\n"
6355 " and cannot be renamed or assigned to a different changeset.\n"
6368 " and cannot be renamed or assigned to a different changeset.\n"
6356 " "
6369 " "
6357 msgstr ""
6370 msgstr ""
6358
6371
6359 msgid ""
6372 msgid ""
6360 "apply one or more changegroup files\n"
6373 "apply one or more changegroup files\n"
6361 "\n"
6374 "\n"
6362 " Apply one or more compressed changegroup files generated by the\n"
6375 " Apply one or more compressed changegroup files generated by the\n"
6363 " bundle command.\n"
6376 " bundle command.\n"
6364 " "
6377 " "
6365 msgstr ""
6378 msgstr ""
6366
6379
6367 msgid ""
6380 msgid ""
6368 "update working directory\n"
6381 "update working directory\n"
6369 "\n"
6382 "\n"
6370 " Update the repository's working directory to the specified\n"
6383 " Update the repository's working directory to the specified\n"
6371 " revision, or the tip of the current branch if none is specified.\n"
6384 " revision, or the tip of the current branch if none is specified.\n"
6372 " Use null as the revision to remove the working copy (like 'hg\n"
6385 " Use null as the revision to remove the working copy (like 'hg\n"
6373 " clone -U').\n"
6386 " clone -U').\n"
6374 "\n"
6387 "\n"
6375 " When the working directory contains no uncommitted changes, it\n"
6388 " When the working directory contains no uncommitted changes, it\n"
6376 " will be replaced by the state of the requested revision from the\n"
6389 " will be replaced by the state of the requested revision from the\n"
6377 " repository. When the requested revision is on a different branch,\n"
6390 " repository. When the requested revision is on a different branch,\n"
6378 " the working directory will additionally be switched to that\n"
6391 " the working directory will additionally be switched to that\n"
6379 " branch.\n"
6392 " branch.\n"
6380 "\n"
6393 "\n"
6381 " When there are uncommitted changes, use option -C/--clean to\n"
6394 " When there are uncommitted changes, use option -C/--clean to\n"
6382 " discard them, forcibly replacing the state of the working\n"
6395 " discard them, forcibly replacing the state of the working\n"
6383 " directory with the requested revision. Alternately, use -c/--check\n"
6396 " directory with the requested revision. Alternately, use -c/--check\n"
6384 " to abort.\n"
6397 " to abort.\n"
6385 "\n"
6398 "\n"
6386 " When there are uncommitted changes and option -C/--clean is not\n"
6399 " When there are uncommitted changes and option -C/--clean is not\n"
6387 " used, and the parent revision and requested revision are on the\n"
6400 " used, and the parent revision and requested revision are on the\n"
6388 " same branch, and one of them is an ancestor of the other, then the\n"
6401 " same branch, and one of them is an ancestor of the other, then the\n"
6389 " new working directory will contain the requested revision merged\n"
6402 " new working directory will contain the requested revision merged\n"
6390 " with the uncommitted changes. Otherwise, the update will fail with\n"
6403 " with the uncommitted changes. Otherwise, the update will fail with\n"
6391 " a suggestion to use 'merge' or 'update -C' instead.\n"
6404 " a suggestion to use 'merge' or 'update -C' instead.\n"
6392 "\n"
6405 "\n"
6393 " If you want to update just one file to an older revision, use\n"
6406 " If you want to update just one file to an older revision, use\n"
6394 " revert.\n"
6407 " revert.\n"
6395 "\n"
6408 "\n"
6396 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6409 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6397 " "
6410 " "
6398 msgstr ""
6411 msgstr ""
6399
6412
6400 msgid "uncommitted local changes"
6413 msgid "uncommitted local changes"
6401 msgstr ""
6414 msgstr ""
6402
6415
6403 msgid ""
6416 msgid ""
6404 "verify the integrity of the repository\n"
6417 "verify the integrity of the repository\n"
6405 "\n"
6418 "\n"
6406 " Verify the integrity of the current repository.\n"
6419 " Verify the integrity of the current repository.\n"
6407 "\n"
6420 "\n"
6408 " This will perform an extensive check of the repository's\n"
6421 " This will perform an extensive check of the repository's\n"
6409 " integrity, validating the hashes and checksums of each entry in\n"
6422 " integrity, validating the hashes and checksums of each entry in\n"
6410 " the changelog, manifest, and tracked files, as well as the\n"
6423 " the changelog, manifest, and tracked files, as well as the\n"
6411 " integrity of their crosslinks and indices.\n"
6424 " integrity of their crosslinks and indices.\n"
6412 " "
6425 " "
6413 msgstr ""
6426 msgstr ""
6414
6427
6415 msgid "output version and copyright information"
6428 msgid "output version and copyright information"
6416 msgstr ""
6429 msgstr ""
6417
6430
6418 #, python-format
6431 #, python-format
6419 msgid "Mercurial Distributed SCM (version %s)\n"
6432 msgid "Mercurial Distributed SCM (version %s)\n"
6420 msgstr ""
6433 msgstr ""
6421
6434
6422 msgid ""
6435 msgid ""
6423 "\n"
6436 "\n"
6424 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6437 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6425 "This is free software; see the source for copying conditions. There is NO\n"
6438 "This is free software; see the source for copying conditions. There is NO\n"
6426 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6439 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6427 msgstr ""
6440 msgstr ""
6428
6441
6429 msgid "repository root directory or symbolic path name"
6442 msgid "repository root directory or symbolic path name"
6430 msgstr ""
6443 msgstr ""
6431
6444
6432 msgid "change working directory"
6445 msgid "change working directory"
6433 msgstr ""
6446 msgstr ""
6434
6447
6435 msgid "do not prompt, assume 'yes' for any required answers"
6448 msgid "do not prompt, assume 'yes' for any required answers"
6436 msgstr ""
6449 msgstr ""
6437
6450
6438 msgid "suppress output"
6451 msgid "suppress output"
6439 msgstr ""
6452 msgstr ""
6440
6453
6441 msgid "enable additional output"
6454 msgid "enable additional output"
6442 msgstr ""
6455 msgstr ""
6443
6456
6444 msgid "set/override config option"
6457 msgid "set/override config option"
6445 msgstr ""
6458 msgstr ""
6446
6459
6447 msgid "enable debugging output"
6460 msgid "enable debugging output"
6448 msgstr ""
6461 msgstr ""
6449
6462
6450 msgid "start debugger"
6463 msgid "start debugger"
6451 msgstr ""
6464 msgstr ""
6452
6465
6453 msgid "set the charset encoding"
6466 msgid "set the charset encoding"
6454 msgstr ""
6467 msgstr ""
6455
6468
6456 msgid "set the charset encoding mode"
6469 msgid "set the charset encoding mode"
6457 msgstr ""
6470 msgstr ""
6458
6471
6459 msgid "print traceback on exception"
6472 msgid "print traceback on exception"
6460 msgstr ""
6473 msgstr ""
6461
6474
6462 msgid "time how long the command takes"
6475 msgid "time how long the command takes"
6463 msgstr ""
6476 msgstr ""
6464
6477
6465 msgid "print command execution profile"
6478 msgid "print command execution profile"
6466 msgstr ""
6479 msgstr ""
6467
6480
6468 msgid "output version information and exit"
6481 msgid "output version information and exit"
6469 msgstr ""
6482 msgstr ""
6470
6483
6471 msgid "display help and exit"
6484 msgid "display help and exit"
6472 msgstr ""
6485 msgstr ""
6473
6486
6474 msgid "do not perform actions, just print output"
6487 msgid "do not perform actions, just print output"
6475 msgstr ""
6488 msgstr ""
6476
6489
6477 msgid "specify ssh command to use"
6490 msgid "specify ssh command to use"
6478 msgstr ""
6491 msgstr ""
6479
6492
6480 msgid "specify hg command to run on the remote side"
6493 msgid "specify hg command to run on the remote side"
6481 msgstr ""
6494 msgstr ""
6482
6495
6483 msgid "include names matching the given patterns"
6496 msgid "include names matching the given patterns"
6484 msgstr ""
6497 msgstr ""
6485
6498
6486 msgid "exclude names matching the given patterns"
6499 msgid "exclude names matching the given patterns"
6487 msgstr ""
6500 msgstr ""
6488
6501
6489 msgid "use <text> as commit message"
6502 msgid "use <text> as commit message"
6490 msgstr ""
6503 msgstr ""
6491
6504
6492 msgid "read commit message from <file>"
6505 msgid "read commit message from <file>"
6493 msgstr ""
6506 msgstr ""
6494
6507
6495 msgid "record datecode as commit date"
6508 msgid "record datecode as commit date"
6496 msgstr ""
6509 msgstr ""
6497
6510
6498 msgid "record the specified user as committer"
6511 msgid "record the specified user as committer"
6499 msgstr ""
6512 msgstr ""
6500
6513
6501 msgid "display using template map file"
6514 msgid "display using template map file"
6502 msgstr ""
6515 msgstr ""
6503
6516
6504 msgid "display with template"
6517 msgid "display with template"
6505 msgstr ""
6518 msgstr ""
6506
6519
6507 msgid "do not show merges"
6520 msgid "do not show merges"
6508 msgstr ""
6521 msgstr ""
6509
6522
6510 msgid "treat all files as text"
6523 msgid "treat all files as text"
6511 msgstr ""
6524 msgstr ""
6512
6525
6513 msgid "don't include dates in diff headers"
6526 msgid "don't include dates in diff headers"
6514 msgstr ""
6527 msgstr ""
6515
6528
6516 msgid "show which function each change is in"
6529 msgid "show which function each change is in"
6517 msgstr ""
6530 msgstr ""
6518
6531
6519 msgid "ignore white space when comparing lines"
6532 msgid "ignore white space when comparing lines"
6520 msgstr ""
6533 msgstr ""
6521
6534
6522 msgid "ignore changes in the amount of white space"
6535 msgid "ignore changes in the amount of white space"
6523 msgstr ""
6536 msgstr ""
6524
6537
6525 msgid "ignore changes whose lines are all blank"
6538 msgid "ignore changes whose lines are all blank"
6526 msgstr ""
6539 msgstr ""
6527
6540
6528 msgid "number of lines of context to show"
6541 msgid "number of lines of context to show"
6529 msgstr ""
6542 msgstr ""
6530
6543
6531 msgid "guess renamed files by similarity (0<=s<=100)"
6544 msgid "guess renamed files by similarity (0<=s<=100)"
6532 msgstr ""
6545 msgstr ""
6533
6546
6534 msgid "[OPTION]... [FILE]..."
6547 msgid "[OPTION]... [FILE]..."
6535 msgstr ""
6548 msgstr ""
6536
6549
6537 msgid "annotate the specified revision"
6550 msgid "annotate the specified revision"
6538 msgstr ""
6551 msgstr ""
6539
6552
6540 msgid "follow file copies and renames"
6553 msgid "follow file copies and renames"
6541 msgstr ""
6554 msgstr ""
6542
6555
6543 msgid "list the author (long with -v)"
6556 msgid "list the author (long with -v)"
6544 msgstr ""
6557 msgstr ""
6545
6558
6546 msgid "list the date (short with -q)"
6559 msgid "list the date (short with -q)"
6547 msgstr ""
6560 msgstr ""
6548
6561
6549 msgid "list the revision number (default)"
6562 msgid "list the revision number (default)"
6550 msgstr ""
6563 msgstr ""
6551
6564
6552 msgid "list the changeset"
6565 msgid "list the changeset"
6553 msgstr ""
6566 msgstr ""
6554
6567
6555 msgid "show line number at the first appearance"
6568 msgid "show line number at the first appearance"
6556 msgstr ""
6569 msgstr ""
6557
6570
6558 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6571 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6559 msgstr ""
6572 msgstr ""
6560
6573
6561 msgid "do not pass files through decoders"
6574 msgid "do not pass files through decoders"
6562 msgstr ""
6575 msgstr ""
6563
6576
6564 msgid "directory prefix for files in archive"
6577 msgid "directory prefix for files in archive"
6565 msgstr "chemin préfixé aux fichiers de l'archive"
6578 msgstr "chemin préfixé aux fichiers de l'archive"
6566
6579
6567 msgid "revision to distribute"
6580 msgid "revision to distribute"
6568 msgstr "révision à distribuer"
6581 msgstr "révision à distribuer"
6569
6582
6570 msgid "type of distribution to create"
6583 msgid "type of distribution to create"
6571 msgstr "type de distribution à créer"
6584 msgstr "type de distribution à créer"
6572
6585
6573 msgid "[OPTION]... DEST"
6586 msgid "[OPTION]... DEST"
6574 msgstr "[OPTION]... DEST"
6587 msgstr "[OPTION]... DEST"
6575
6588
6576 msgid "merge with old dirstate parent after backout"
6589 msgid "merge with old dirstate parent after backout"
6577 msgstr ""
6590 msgstr ""
6578
6591
6579 msgid "parent to choose when backing out merge"
6592 msgid "parent to choose when backing out merge"
6580 msgstr ""
6593 msgstr ""
6581
6594
6582 msgid "revision to backout"
6595 msgid "revision to backout"
6583 msgstr ""
6596 msgstr ""
6584
6597
6585 msgid "[OPTION]... [-r] REV"
6598 msgid "[OPTION]... [-r] REV"
6586 msgstr ""
6599 msgstr ""
6587
6600
6588 msgid "reset bisect state"
6601 msgid "reset bisect state"
6589 msgstr "réinitialiser l'état de la recherche par dichotomie"
6602 msgstr "réinitialiser l'état de la recherche par dichotomie"
6590
6603
6591 msgid "mark changeset good"
6604 msgid "mark changeset good"
6592 msgstr "marquer la révision comme \"bonne\""
6605 msgstr "marquer la révision comme \"bonne\""
6593
6606
6594 msgid "mark changeset bad"
6607 msgid "mark changeset bad"
6595 msgstr "marquer la révision comme \"mauvaise\""
6608 msgstr "marquer la révision comme \"mauvaise\""
6596
6609
6597 msgid "skip testing changeset"
6610 msgid "skip testing changeset"
6598 msgstr "ne pas considérer la révision"
6611 msgstr "ne pas considérer la révision"
6599
6612
6600 msgid "use command to check changeset state"
6613 msgid "use command to check changeset state"
6601 msgstr "utiliser une commande pour tester l'état des révisions"
6614 msgstr "utiliser une commande pour tester l'état des révisions"
6602
6615
6603 msgid "do not update to target"
6616 msgid "do not update to target"
6604 msgstr "ne pas mettre à jour à la révision cible"
6617 msgstr "ne pas mettre à jour à la révision cible"
6605
6618
6606 msgid "[-gbsr] [-c CMD] [REV]"
6619 msgid "[-gbsr] [-c CMD] [REV]"
6607 msgstr "[-gbsr] [-c CMD] [REV]"
6620 msgstr "[-gbsr] [-c CMD] [REV]"
6608
6621
6609 msgid "set branch name even if it shadows an existing branch"
6622 msgid "set branch name even if it shadows an existing branch"
6610 msgstr ""
6623 msgstr ""
6611
6624
6612 msgid "reset branch name to parent branch name"
6625 msgid "reset branch name to parent branch name"
6613 msgstr ""
6626 msgstr ""
6614
6627
6615 msgid "[-fC] [NAME]"
6628 msgid "[-fC] [NAME]"
6616 msgstr ""
6629 msgstr ""
6617
6630
6618 msgid "show only branches that have unmerged heads"
6631 msgid "show only branches that have unmerged heads"
6619 msgstr ""
6632 msgstr ""
6620
6633
6634 msgid "show normal and closed heads"
6635 msgstr ""
6636
6621 msgid "[-a]"
6637 msgid "[-a]"
6622 msgstr ""
6638 msgstr ""
6623
6639
6624 msgid "run even when remote repository is unrelated"
6640 msgid "run even when remote repository is unrelated"
6625 msgstr ""
6641 msgstr ""
6626
6642
6627 msgid "a changeset up to which you would like to bundle"
6643 msgid "a changeset up to which you would like to bundle"
6628 msgstr ""
6644 msgstr ""
6629
6645
6630 msgid "a base changeset to specify instead of a destination"
6646 msgid "a base changeset to specify instead of a destination"
6631 msgstr ""
6647 msgstr ""
6632
6648
6633 msgid "bundle all changesets in the repository"
6649 msgid "bundle all changesets in the repository"
6634 msgstr ""
6650 msgstr ""
6635
6651
6636 msgid "bundle compression type to use"
6652 msgid "bundle compression type to use"
6637 msgstr ""
6653 msgstr ""
6638
6654
6639 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6655 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6640 msgstr ""
6656 msgstr ""
6641
6657
6642 msgid "print output to file with formatted name"
6658 msgid "print output to file with formatted name"
6643 msgstr ""
6659 msgstr ""
6644
6660
6645 msgid "print the given revision"
6661 msgid "print the given revision"
6646 msgstr ""
6662 msgstr ""
6647
6663
6648 msgid "apply any matching decode filter"
6664 msgid "apply any matching decode filter"
6649 msgstr ""
6665 msgstr ""
6650
6666
6651 msgid "[OPTION]... FILE..."
6667 msgid "[OPTION]... FILE..."
6652 msgstr ""
6668 msgstr ""
6653
6669
6654 msgid "the clone will only contain a repository (no working copy)"
6670 msgid "the clone will only contain a repository (no working copy)"
6655 msgstr ""
6671 msgstr ""
6656
6672
6657 msgid "a changeset you would like to have after cloning"
6673 msgid "a changeset you would like to have after cloning"
6658 msgstr ""
6674 msgstr ""
6659
6675
6660 msgid "[OPTION]... SOURCE [DEST]"
6676 msgid "[OPTION]... SOURCE [DEST]"
6661 msgstr ""
6677 msgstr ""
6662
6678
6663 msgid "mark new/missing files as added/removed before committing"
6679 msgid "mark new/missing files as added/removed before committing"
6664 msgstr ""
6680 msgstr ""
6665
6681
6666 msgid "mark a branch as closed, hiding it from the branch list"
6682 msgid "mark a branch as closed, hiding it from the branch list"
6667 msgstr ""
6683 msgstr ""
6668
6684
6669 msgid "record a copy that has already occurred"
6685 msgid "record a copy that has already occurred"
6670 msgstr ""
6686 msgstr ""
6671
6687
6672 msgid "forcibly copy over an existing managed file"
6688 msgid "forcibly copy over an existing managed file"
6673 msgstr ""
6689 msgstr ""
6674
6690
6675 msgid "[OPTION]... [SOURCE]... DEST"
6691 msgid "[OPTION]... [SOURCE]... DEST"
6676 msgstr ""
6692 msgstr ""
6677
6693
6678 msgid "[INDEX] REV1 REV2"
6694 msgid "[INDEX] REV1 REV2"
6679 msgstr ""
6695 msgstr ""
6680
6696
6681 msgid "[COMMAND]"
6697 msgid "[COMMAND]"
6682 msgstr ""
6698 msgstr ""
6683
6699
6684 msgid "show the command options"
6700 msgid "show the command options"
6685 msgstr ""
6701 msgstr ""
6686
6702
6687 msgid "[-o] CMD"
6703 msgid "[-o] CMD"
6688 msgstr ""
6704 msgstr ""
6689
6705
6690 msgid "try extended date formats"
6706 msgid "try extended date formats"
6691 msgstr ""
6707 msgstr ""
6692
6708
6693 msgid "[-e] DATE [RANGE]"
6709 msgid "[-e] DATE [RANGE]"
6694 msgstr ""
6710 msgstr ""
6695
6711
6696 msgid "FILE REV"
6712 msgid "FILE REV"
6697 msgstr ""
6713 msgstr ""
6698
6714
6699 msgid "[PATH]"
6715 msgid "[PATH]"
6700 msgstr ""
6716 msgstr ""
6701
6717
6702 msgid "FILE"
6718 msgid "FILE"
6703 msgstr ""
6719 msgstr ""
6704
6720
6705 msgid "revision to rebuild to"
6721 msgid "revision to rebuild to"
6706 msgstr ""
6722 msgstr ""
6707
6723
6708 msgid "[-r REV] [REV]"
6724 msgid "[-r REV] [REV]"
6709 msgstr ""
6725 msgstr ""
6710
6726
6711 msgid "revision to debug"
6727 msgid "revision to debug"
6712 msgstr ""
6728 msgstr ""
6713
6729
6714 msgid "[-r REV] FILE"
6730 msgid "[-r REV] FILE"
6715 msgstr ""
6731 msgstr ""
6716
6732
6717 msgid "REV1 [REV2]"
6733 msgid "REV1 [REV2]"
6718 msgstr ""
6734 msgstr ""
6719
6735
6720 msgid "do not display the saved mtime"
6736 msgid "do not display the saved mtime"
6721 msgstr ""
6737 msgstr ""
6722
6738
6723 msgid "[OPTION]..."
6739 msgid "[OPTION]..."
6724 msgstr ""
6740 msgstr ""
6725
6741
6726 msgid "revision to check"
6742 msgid "revision to check"
6727 msgstr ""
6743 msgstr ""
6728
6744
6729 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6745 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6730 msgstr ""
6746 msgstr ""
6731
6747
6732 msgid "diff against the second parent"
6748 msgid "diff against the second parent"
6733 msgstr ""
6749 msgstr ""
6734
6750
6735 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6751 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6736 msgstr ""
6752 msgstr ""
6737
6753
6738 msgid "end fields with NUL"
6754 msgid "end fields with NUL"
6739 msgstr ""
6755 msgstr ""
6740
6756
6741 msgid "print all revisions that match"
6757 msgid "print all revisions that match"
6742 msgstr ""
6758 msgstr ""
6743
6759
6744 msgid "follow changeset history, or file history across copies and renames"
6760 msgid "follow changeset history, or file history across copies and renames"
6745 msgstr ""
6761 msgstr ""
6746
6762
6747 msgid "ignore case when matching"
6763 msgid "ignore case when matching"
6748 msgstr ""
6764 msgstr ""
6749
6765
6750 msgid "print only filenames and revisions that match"
6766 msgid "print only filenames and revisions that match"
6751 msgstr ""
6767 msgstr ""
6752
6768
6753 msgid "print matching line numbers"
6769 msgid "print matching line numbers"
6754 msgstr ""
6770 msgstr ""
6755
6771
6756 msgid "search in given revision range"
6772 msgid "search in given revision range"
6757 msgstr ""
6773 msgstr ""
6758
6774
6759 msgid "[OPTION]... PATTERN [FILE]..."
6775 msgid "[OPTION]... PATTERN [FILE]..."
6760 msgstr ""
6776 msgstr ""
6761
6777
6762 msgid "show only heads which are descendants of REV"
6778 msgid "show only heads which are descendants of REV"
6763 msgstr ""
6779 msgstr ""
6764
6780
6765 msgid "show only the active heads from open branches"
6781 msgid "show only the active heads from open branches"
6766 msgstr ""
6782 msgstr ""
6767
6783
6768 msgid "show normal and closed heads"
6769 msgstr ""
6770
6771 msgid "[-r STARTREV] [REV]..."
6784 msgid "[-r STARTREV] [REV]..."
6772 msgstr ""
6785 msgstr ""
6773
6786
6774 msgid "[TOPIC]"
6787 msgid "[TOPIC]"
6775 msgstr ""
6788 msgstr ""
6776
6789
6777 msgid "identify the specified revision"
6790 msgid "identify the specified revision"
6778 msgstr ""
6791 msgstr ""
6779
6792
6780 msgid "show local revision number"
6793 msgid "show local revision number"
6781 msgstr ""
6794 msgstr ""
6782
6795
6783 msgid "show global revision id"
6796 msgid "show global revision id"
6784 msgstr ""
6797 msgstr ""
6785
6798
6786 msgid "show branch"
6799 msgid "show branch"
6787 msgstr ""
6800 msgstr ""
6788
6801
6789 msgid "show tags"
6802 msgid "show tags"
6790 msgstr ""
6803 msgstr ""
6791
6804
6792 msgid "[-nibt] [-r REV] [SOURCE]"
6805 msgid "[-nibt] [-r REV] [SOURCE]"
6793 msgstr ""
6806 msgstr ""
6794
6807
6795 msgid ""
6808 msgid ""
6796 "directory strip option for patch. This has the same meaning as the "
6809 "directory strip option for patch. This has the same meaning as the "
6797 "corresponding patch option"
6810 "corresponding patch option"
6798 msgstr ""
6811 msgstr ""
6799
6812
6800 msgid "base path"
6813 msgid "base path"
6801 msgstr ""
6814 msgstr ""
6802
6815
6803 msgid "skip check for outstanding uncommitted changes"
6816 msgid "skip check for outstanding uncommitted changes"
6804 msgstr ""
6817 msgstr ""
6805
6818
6806 msgid "don't commit, just update the working directory"
6819 msgid "don't commit, just update the working directory"
6807 msgstr ""
6820 msgstr ""
6808
6821
6809 msgid "apply patch to the nodes from which it was generated"
6822 msgid "apply patch to the nodes from which it was generated"
6810 msgstr ""
6823 msgstr ""
6811
6824
6812 msgid "use any branch information in patch (implied by --exact)"
6825 msgid "use any branch information in patch (implied by --exact)"
6813 msgstr ""
6826 msgstr ""
6814
6827
6815 msgid "[OPTION]... PATCH..."
6828 msgid "[OPTION]... PATCH..."
6816 msgstr ""
6829 msgstr ""
6817
6830
6818 msgid "show newest record first"
6831 msgid "show newest record first"
6819 msgstr ""
6832 msgstr ""
6820
6833
6821 msgid "file to store the bundles into"
6834 msgid "file to store the bundles into"
6822 msgstr ""
6835 msgstr ""
6823
6836
6824 msgid "a specific revision up to which you would like to pull"
6837 msgid "a specific revision up to which you would like to pull"
6825 msgstr ""
6838 msgstr ""
6826
6839
6827 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6840 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6828 msgstr ""
6841 msgstr ""
6829
6842
6830 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6843 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6831 msgstr ""
6844 msgstr ""
6832
6845
6833 msgid "search the repository as it stood at REV"
6846 msgid "search the repository as it stood at REV"
6834 msgstr ""
6847 msgstr ""
6835
6848
6836 msgid "end filenames with NUL, for use with xargs"
6849 msgid "end filenames with NUL, for use with xargs"
6837 msgstr ""
6850 msgstr ""
6838
6851
6839 msgid "print complete paths from the filesystem root"
6852 msgid "print complete paths from the filesystem root"
6840 msgstr ""
6853 msgstr ""
6841
6854
6842 msgid "[OPTION]... [PATTERN]..."
6855 msgid "[OPTION]... [PATTERN]..."
6843 msgstr ""
6856 msgstr ""
6844
6857
6845 msgid "only follow the first parent of merge changesets"
6858 msgid "only follow the first parent of merge changesets"
6846 msgstr ""
6859 msgstr ""
6847
6860
6848 msgid "show revisions matching date spec"
6861 msgid "show revisions matching date spec"
6849 msgstr ""
6862 msgstr ""
6850
6863
6851 msgid "show copied files"
6864 msgid "show copied files"
6852 msgstr ""
6865 msgstr ""
6853
6866
6854 msgid "do case-insensitive search for a keyword"
6867 msgid "do case-insensitive search for a keyword"
6855 msgstr ""
6868 msgstr ""
6856
6869
6857 msgid "include revisions where files were removed"
6870 msgid "include revisions where files were removed"
6858 msgstr ""
6871 msgstr ""
6859
6872
6860 msgid "show only merges"
6873 msgid "show only merges"
6861 msgstr ""
6874 msgstr ""
6862
6875
6863 msgid "revisions committed by user"
6876 msgid "revisions committed by user"
6864 msgstr ""
6877 msgstr ""
6865
6878
6866 msgid "show only changesets within the given named branch"
6879 msgid "show only changesets within the given named branch"
6867 msgstr ""
6880 msgstr ""
6868
6881
6869 msgid "do not display revision or any of its ancestors"
6882 msgid "do not display revision or any of its ancestors"
6870 msgstr ""
6883 msgstr ""
6871
6884
6872 msgid "[OPTION]... [FILE]"
6885 msgid "[OPTION]... [FILE]"
6873 msgstr ""
6886 msgstr ""
6874
6887
6875 msgid "revision to display"
6888 msgid "revision to display"
6876 msgstr ""
6889 msgstr ""
6877
6890
6878 msgid "[-r REV]"
6891 msgid "[-r REV]"
6879 msgstr ""
6892 msgstr ""
6880
6893
6881 msgid "force a merge with outstanding changes"
6894 msgid "force a merge with outstanding changes"
6882 msgstr ""
6895 msgstr ""
6883
6896
6884 msgid "revision to merge"
6897 msgid "revision to merge"
6885 msgstr ""
6898 msgstr ""
6886
6899
6887 msgid "review revisions to merge (no merge is performed)"
6900 msgid "review revisions to merge (no merge is performed)"
6888 msgstr ""
6901 msgstr ""
6889
6902
6890 msgid "[-f] [[-r] REV]"
6903 msgid "[-f] [[-r] REV]"
6891 msgstr ""
6904 msgstr ""
6892
6905
6893 msgid "a specific revision up to which you would like to push"
6906 msgid "a specific revision up to which you would like to push"
6894 msgstr ""
6907 msgstr ""
6895
6908
6896 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6909 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6897 msgstr ""
6910 msgstr ""
6898
6911
6899 msgid "show parents from the specified revision"
6912 msgid "show parents from the specified revision"
6900 msgstr ""
6913 msgstr ""
6901
6914
6902 msgid "[-r REV] [FILE]"
6915 msgid "[-r REV] [FILE]"
6903 msgstr ""
6916 msgstr ""
6904
6917
6905 msgid "[NAME]"
6918 msgid "[NAME]"
6906 msgstr ""
6919 msgstr ""
6907
6920
6908 msgid "update to new tip if changesets were pulled"
6921 msgid "update to new tip if changesets were pulled"
6909 msgstr ""
6922 msgstr ""
6910
6923
6911 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6924 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6912 msgstr ""
6925 msgstr ""
6913
6926
6914 msgid "force push"
6927 msgid "force push"
6915 msgstr ""
6928 msgstr ""
6916
6929
6917 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6930 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6918 msgstr ""
6931 msgstr ""
6919
6932
6920 msgid "record delete for missing files"
6933 msgid "record delete for missing files"
6921 msgstr ""
6934 msgstr ""
6922
6935
6923 msgid "remove (and delete) file even if added or modified"
6936 msgid "remove (and delete) file even if added or modified"
6924 msgstr ""
6937 msgstr ""
6925
6938
6926 msgid "record a rename that has already occurred"
6939 msgid "record a rename that has already occurred"
6927 msgstr ""
6940 msgstr ""
6928
6941
6929 msgid "[OPTION]... SOURCE... DEST"
6942 msgid "[OPTION]... SOURCE... DEST"
6930 msgstr ""
6943 msgstr ""
6931
6944
6932 msgid "remerge all unresolved files"
6945 msgid "remerge all unresolved files"
6933 msgstr ""
6946 msgstr ""
6934
6947
6935 msgid "list state of files needing merge"
6948 msgid "list state of files needing merge"
6936 msgstr ""
6949 msgstr ""
6937
6950
6938 msgid "mark files as resolved"
6951 msgid "mark files as resolved"
6939 msgstr ""
6952 msgstr ""
6940
6953
6941 msgid "unmark files as resolved"
6954 msgid "unmark files as resolved"
6942 msgstr ""
6955 msgstr ""
6943
6956
6944 msgid "revert all changes when no arguments given"
6957 msgid "revert all changes when no arguments given"
6945 msgstr ""
6958 msgstr ""
6946
6959
6947 msgid "tipmost revision matching date"
6960 msgid "tipmost revision matching date"
6948 msgstr ""
6961 msgstr ""
6949
6962
6950 msgid "revision to revert to"
6963 msgid "revision to revert to"
6951 msgstr ""
6964 msgstr ""
6952
6965
6953 msgid "do not save backup copies of files"
6966 msgid "do not save backup copies of files"
6954 msgstr ""
6967 msgstr ""
6955
6968
6956 msgid "[OPTION]... [-r REV] [NAME]..."
6969 msgid "[OPTION]... [-r REV] [NAME]..."
6957 msgstr ""
6970 msgstr ""
6958
6971
6959 msgid "name of access log file to write to"
6972 msgid "name of access log file to write to"
6960 msgstr ""
6973 msgstr ""
6961
6974
6962 msgid "name of error log file to write to"
6975 msgid "name of error log file to write to"
6963 msgstr ""
6976 msgstr ""
6964
6977
6965 msgid "port to listen on (default: 8000)"
6978 msgid "port to listen on (default: 8000)"
6966 msgstr ""
6979 msgstr ""
6967
6980
6968 msgid "address to listen on (default: all interfaces)"
6981 msgid "address to listen on (default: all interfaces)"
6969 msgstr ""
6982 msgstr ""
6970
6983
6971 msgid "prefix path to serve from (default: server root)"
6984 msgid "prefix path to serve from (default: server root)"
6972 msgstr ""
6985 msgstr ""
6973
6986
6974 msgid "name to show in web pages (default: working directory)"
6987 msgid "name to show in web pages (default: working directory)"
6975 msgstr ""
6988 msgstr ""
6976
6989
6977 msgid "name of the webdir config file (serve more than one repository)"
6990 msgid "name of the webdir config file (serve more than one repository)"
6978 msgstr ""
6991 msgstr ""
6979
6992
6980 msgid "for remote clients"
6993 msgid "for remote clients"
6981 msgstr ""
6994 msgstr ""
6982
6995
6983 msgid "web templates to use"
6996 msgid "web templates to use"
6984 msgstr ""
6997 msgstr ""
6985
6998
6986 msgid "template style to use"
6999 msgid "template style to use"
6987 msgstr ""
7000 msgstr ""
6988
7001
6989 msgid "use IPv6 in addition to IPv4"
7002 msgid "use IPv6 in addition to IPv4"
6990 msgstr ""
7003 msgstr ""
6991
7004
6992 msgid "SSL certificate file"
7005 msgid "SSL certificate file"
6993 msgstr ""
7006 msgstr ""
6994
7007
6995 msgid "show untrusted configuration options"
7008 msgid "show untrusted configuration options"
6996 msgstr ""
7009 msgstr ""
6997
7010
6998 msgid "[-u] [NAME]..."
7011 msgid "[-u] [NAME]..."
6999 msgstr ""
7012 msgstr ""
7000
7013
7001 msgid "show status of all files"
7014 msgid "show status of all files"
7002 msgstr ""
7015 msgstr ""
7003
7016
7004 msgid "show only modified files"
7017 msgid "show only modified files"
7005 msgstr ""
7018 msgstr ""
7006
7019
7007 msgid "show only added files"
7020 msgid "show only added files"
7008 msgstr ""
7021 msgstr ""
7009
7022
7010 msgid "show only removed files"
7023 msgid "show only removed files"
7011 msgstr ""
7024 msgstr ""
7012
7025
7013 msgid "show only deleted (but tracked) files"
7026 msgid "show only deleted (but tracked) files"
7014 msgstr ""
7027 msgstr ""
7015
7028
7016 msgid "show only files without changes"
7029 msgid "show only files without changes"
7017 msgstr ""
7030 msgstr ""
7018
7031
7019 msgid "show only unknown (not tracked) files"
7032 msgid "show only unknown (not tracked) files"
7020 msgstr ""
7033 msgstr ""
7021
7034
7022 msgid "show only ignored files"
7035 msgid "show only ignored files"
7023 msgstr ""
7036 msgstr ""
7024
7037
7025 msgid "hide status prefix"
7038 msgid "hide status prefix"
7026 msgstr ""
7039 msgstr ""
7027
7040
7028 msgid "show source of copied files"
7041 msgid "show source of copied files"
7029 msgstr ""
7042 msgstr ""
7030
7043
7031 msgid "show difference from revision"
7044 msgid "show difference from revision"
7032 msgstr ""
7045 msgstr ""
7033
7046
7034 msgid "replace existing tag"
7047 msgid "replace existing tag"
7035 msgstr ""
7048 msgstr ""
7036
7049
7037 msgid "make the tag local"
7050 msgid "make the tag local"
7038 msgstr ""
7051 msgstr ""
7039
7052
7040 msgid "revision to tag"
7053 msgid "revision to tag"
7041 msgstr ""
7054 msgstr ""
7042
7055
7043 msgid "remove a tag"
7056 msgid "remove a tag"
7044 msgstr ""
7057 msgstr ""
7045
7058
7046 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7059 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7047 msgstr ""
7060 msgstr ""
7048
7061
7049 msgid "[-p]"
7062 msgid "[-p]"
7050 msgstr ""
7063 msgstr ""
7051
7064
7052 msgid "update to new tip if changesets were unbundled"
7065 msgid "update to new tip if changesets were unbundled"
7053 msgstr ""
7066 msgstr ""
7054
7067
7055 msgid "[-u] FILE..."
7068 msgid "[-u] FILE..."
7056 msgstr ""
7069 msgstr ""
7057
7070
7058 msgid "overwrite locally modified files (no backup)"
7071 msgid "overwrite locally modified files (no backup)"
7059 msgstr ""
7072 msgstr ""
7060
7073
7061 msgid "check for uncommitted changes"
7074 msgid "check for uncommitted changes"
7062 msgstr ""
7075 msgstr ""
7063
7076
7064 msgid "[-C] [-d DATE] [[-r] REV]"
7077 msgid "[-C] [-d DATE] [[-r] REV]"
7065 msgstr ""
7078 msgstr ""
7066
7079
7067 #, python-format
7080 #, python-format
7068 msgid "config error at %s:%d: '%s'"
7081 msgid "config error at %s:%d: '%s'"
7069 msgstr "erreur de configuration à %s:%d : '%s'"
7082 msgstr "erreur de configuration à %s:%d : '%s'"
7070
7083
7071 msgid "not found in manifest"
7084 msgid "not found in manifest"
7072 msgstr ""
7085 msgstr ""
7073
7086
7074 msgid "branch name not in UTF-8!"
7087 msgid "branch name not in UTF-8!"
7075 msgstr "le nom de la branche n'est pas en UTF-8 !"
7088 msgstr "le nom de la branche n'est pas en UTF-8 !"
7076
7089
7077 #, python-format
7090 #, python-format
7078 msgid " searching for copies back to rev %d\n"
7091 msgid " searching for copies back to rev %d\n"
7079 msgstr ""
7092 msgstr ""
7080
7093
7081 #, python-format
7094 #, python-format
7082 msgid ""
7095 msgid ""
7083 " unmatched files in local:\n"
7096 " unmatched files in local:\n"
7084 " %s\n"
7097 " %s\n"
7085 msgstr ""
7098 msgstr ""
7086
7099
7087 #, python-format
7100 #, python-format
7088 msgid ""
7101 msgid ""
7089 " unmatched files in other:\n"
7102 " unmatched files in other:\n"
7090 " %s\n"
7103 " %s\n"
7091 msgstr ""
7104 msgstr ""
7092
7105
7093 msgid " all copies found (* = to merge, ! = divergent):\n"
7106 msgid " all copies found (* = to merge, ! = divergent):\n"
7094 msgstr ""
7107 msgstr ""
7095
7108
7096 msgid " checking for directory renames\n"
7109 msgid " checking for directory renames\n"
7097 msgstr ""
7110 msgstr ""
7098
7111
7099 #, python-format
7112 #, python-format
7100 msgid " dir %s -> %s\n"
7113 msgid " dir %s -> %s\n"
7101 msgstr ""
7114 msgstr ""
7102
7115
7103 #, python-format
7116 #, python-format
7104 msgid " file %s -> %s\n"
7117 msgid " file %s -> %s\n"
7105 msgstr ""
7118 msgstr ""
7106
7119
7107 msgid "working directory state appears damaged!"
7120 msgid "working directory state appears damaged!"
7108 msgstr ""
7121 msgstr ""
7109
7122
7110 #, python-format
7123 #, python-format
7111 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7124 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7112 msgstr ""
7125 msgstr ""
7113
7126
7114 #, python-format
7127 #, python-format
7115 msgid "directory %r already in dirstate"
7128 msgid "directory %r already in dirstate"
7116 msgstr ""
7129 msgstr ""
7117
7130
7118 #, python-format
7131 #, python-format
7119 msgid "file %r in dirstate clashes with %r"
7132 msgid "file %r in dirstate clashes with %r"
7120 msgstr ""
7133 msgstr ""
7121
7134
7122 #, python-format
7135 #, python-format
7123 msgid "not in dirstate: %s\n"
7136 msgid "not in dirstate: %s\n"
7124 msgstr ""
7137 msgstr ""
7125
7138
7126 msgid "unknown"
7139 msgid "unknown"
7127 msgstr ""
7140 msgstr ""
7128
7141
7129 msgid "character device"
7142 msgid "character device"
7130 msgstr ""
7143 msgstr ""
7131
7144
7132 msgid "block device"
7145 msgid "block device"
7133 msgstr ""
7146 msgstr ""
7134
7147
7135 msgid "fifo"
7148 msgid "fifo"
7136 msgstr ""
7149 msgstr ""
7137
7150
7138 msgid "socket"
7151 msgid "socket"
7139 msgstr ""
7152 msgstr ""
7140
7153
7141 msgid "directory"
7154 msgid "directory"
7142 msgstr ""
7155 msgstr ""
7143
7156
7144 #, python-format
7157 #, python-format
7145 msgid "unsupported file type (type is %s)"
7158 msgid "unsupported file type (type is %s)"
7146 msgstr ""
7159 msgstr ""
7147
7160
7148 #, python-format
7161 #, python-format
7149 msgid "abort: %s\n"
7162 msgid "abort: %s\n"
7150 msgstr "abandon : %s\n"
7163 msgstr "abandon : %s\n"
7151
7164
7152 #, python-format
7165 #, python-format
7153 msgid ""
7166 msgid ""
7154 "hg: command '%s' is ambiguous:\n"
7167 "hg: command '%s' is ambiguous:\n"
7155 " %s\n"
7168 " %s\n"
7156 msgstr ""
7169 msgstr ""
7157 "hg: la commande '%s' est ambiguë :\n"
7170 "hg: la commande '%s' est ambiguë :\n"
7158 " %s\n"
7171 " %s\n"
7159
7172
7160 #, python-format
7173 #, python-format
7161 msgid "hg: %s\n"
7174 msgid "hg: %s\n"
7162 msgstr "hg: %s\n"
7175 msgstr "hg: %s\n"
7163
7176
7164 #, python-format
7177 #, python-format
7165 msgid "timed out waiting for lock held by %s"
7178 msgid "timed out waiting for lock held by %s"
7166 msgstr "attendu trop longtemps le verrou détenu par %s"
7179 msgstr "attendu trop longtemps le verrou détenu par %s"
7167
7180
7168 #, python-format
7181 #, python-format
7169 msgid "lock held by %s"
7182 msgid "lock held by %s"
7170 msgstr ""
7183 msgstr ""
7171
7184
7172 #, python-format
7185 #, python-format
7173 msgid "abort: %s: %s\n"
7186 msgid "abort: %s: %s\n"
7174 msgstr "abandon : %s : %s\n"
7187 msgstr "abandon : %s : %s\n"
7175
7188
7176 #, python-format
7189 #, python-format
7177 msgid "abort: could not lock %s: %s\n"
7190 msgid "abort: could not lock %s: %s\n"
7178 msgstr "abandon : impossible de verrouiller %s : %s\n"
7191 msgstr "abandon : impossible de verrouiller %s : %s\n"
7179
7192
7180 #, python-format
7193 #, python-format
7181 msgid "hg %s: %s\n"
7194 msgid "hg %s: %s\n"
7182 msgstr "hg %s: %s\n"
7195 msgstr "hg %s: %s\n"
7183
7196
7184 #, python-format
7197 #, python-format
7185 msgid "abort: %s!\n"
7198 msgid "abort: %s!\n"
7186 msgstr "abandon : %s !\n"
7199 msgstr "abandon : %s !\n"
7187
7200
7188 #, python-format
7201 #, python-format
7189 msgid "abort: %s"
7202 msgid "abort: %s"
7190 msgstr "abandon : %s"
7203 msgstr "abandon : %s"
7191
7204
7192 msgid " empty string\n"
7205 msgid " empty string\n"
7193 msgstr " chaîne vide\n"
7206 msgstr " chaîne vide\n"
7194
7207
7195 msgid "killed!\n"
7208 msgid "killed!\n"
7196 msgstr "tué !\n"
7209 msgstr "tué !\n"
7197
7210
7198 #, python-format
7211 #, python-format
7199 msgid "hg: unknown command '%s'\n"
7212 msgid "hg: unknown command '%s'\n"
7200 msgstr "hg: commande inconnue : '%s'\n"
7213 msgstr "hg: commande inconnue : '%s'\n"
7201
7214
7202 #, python-format
7215 #, python-format
7203 msgid "abort: could not import module %s!\n"
7216 msgid "abort: could not import module %s!\n"
7204 msgstr "abandon : impossible d'importer le module %s !\n"
7217 msgstr "abandon : impossible d'importer le module %s !\n"
7205
7218
7206 msgid "(did you forget to compile extensions?)\n"
7219 msgid "(did you forget to compile extensions?)\n"
7207 msgstr "(avez-vous oublié de compiler les extensions ?)\n"
7220 msgstr "(avez-vous oublié de compiler les extensions ?)\n"
7208
7221
7209 msgid "(is your Python install correct?)\n"
7222 msgid "(is your Python install correct?)\n"
7210 msgstr "(votre installation de Python est-elle correcte ?)\n"
7223 msgstr "(votre installation de Python est-elle correcte ?)\n"
7211
7224
7212 #, python-format
7225 #, python-format
7213 msgid "abort: error: %s\n"
7226 msgid "abort: error: %s\n"
7214 msgstr "abandon : erreur : %s\n"
7227 msgstr "abandon : erreur : %s\n"
7215
7228
7216 # traduction utilisée par la glibc...
7229 # traduction utilisée par la glibc...
7217 msgid "broken pipe\n"
7230 msgid "broken pipe\n"
7218 msgstr "relais brisé (pipe)\n"
7231 msgstr "relais brisé (pipe)\n"
7219
7232
7220 msgid "interrupted!\n"
7233 msgid "interrupted!\n"
7221 msgstr "interrompu !\n"
7234 msgstr "interrompu !\n"
7222
7235
7223 # traduction utilisée par la glibc...
7236 # traduction utilisée par la glibc...
7224 msgid ""
7237 msgid ""
7225 "\n"
7238 "\n"
7226 "broken pipe\n"
7239 "broken pipe\n"
7227 msgstr ""
7240 msgstr ""
7228 "\n"
7241 "\n"
7229 "relais brisé (pipe)\n"
7242 "relais brisé (pipe)\n"
7230
7243
7231 msgid "abort: out of memory\n"
7244 msgid "abort: out of memory\n"
7232 msgstr "abandon : plus de mémoire libre\n"
7245 msgstr "abandon : plus de mémoire libre\n"
7233
7246
7234 msgid "** unknown exception encountered, details follow\n"
7247 msgid "** unknown exception encountered, details follow\n"
7235 msgstr "** exception inconnue rencontrée, détails ci-dessous\n"
7248 msgstr "** exception inconnue rencontrée, détails ci-dessous\n"
7236
7249
7237 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7250 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7238 msgstr ""
7251 msgstr ""
7239 "** veuillez signaler le problème en détails sur http://www.selenic.com/"
7252 "** veuillez signaler le problème en détails sur http://www.selenic.com/"
7240 "mercurial/bts\n"
7253 "mercurial/bts\n"
7241
7254
7242 msgid "** or mercurial@selenic.com\n"
7255 msgid "** or mercurial@selenic.com\n"
7243 msgstr "** ou mercurial@selenic.com\n"
7256 msgstr "** ou mercurial@selenic.com\n"
7244
7257
7245 #, python-format
7258 #, python-format
7246 msgid "** Mercurial Distributed SCM (version %s)\n"
7259 msgid "** Mercurial Distributed SCM (version %s)\n"
7247 msgstr "** Mercurial version %s, système de gestion de sources distribué\n"
7260 msgstr "** Mercurial version %s, système de gestion de sources distribué\n"
7248
7261
7249 #, python-format
7262 #, python-format
7250 msgid "** Extensions loaded: %s\n"
7263 msgid "** Extensions loaded: %s\n"
7251 msgstr "** Extensions chargées : %s\n"
7264 msgstr "** Extensions chargées : %s\n"
7252
7265
7253 #, python-format
7266 #, python-format
7254 msgid "no definition for alias '%s'\n"
7267 msgid "no definition for alias '%s'\n"
7255 msgstr ""
7268 msgstr ""
7256
7269
7257 #, python-format
7270 #, python-format
7258 msgid "alias '%s' resolves to unknown command '%s'\n"
7271 msgid "alias '%s' resolves to unknown command '%s'\n"
7259 msgstr ""
7272 msgstr ""
7260
7273
7261 #, python-format
7274 #, python-format
7262 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7275 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7263 msgstr ""
7276 msgstr ""
7264
7277
7265 #, python-format
7278 #, python-format
7266 msgid "alias '%s' shadows command\n"
7279 msgid "alias '%s' shadows command\n"
7267 msgstr ""
7280 msgstr ""
7268
7281
7269 #, python-format
7282 #, python-format
7270 msgid "malformed --config option: %s"
7283 msgid "malformed --config option: %s"
7271 msgstr "option incorrecte pour --config : %s"
7284 msgstr "option incorrecte pour --config : %s"
7272
7285
7273 #, python-format
7286 #, python-format
7274 msgid "extension '%s' overrides commands: %s\n"
7287 msgid "extension '%s' overrides commands: %s\n"
7275 msgstr "l'extension '%s' redéfinit ces commandes : %s\n"
7288 msgstr "l'extension '%s' redéfinit ces commandes : %s\n"
7276
7289
7277 msgid "Option --config may not be abbreviated!"
7290 msgid "Option --config may not be abbreviated!"
7278 msgstr "L'option --config ne peut être abrégée !"
7291 msgstr "L'option --config ne peut être abrégée !"
7279
7292
7280 msgid "Option --cwd may not be abbreviated!"
7293 msgid "Option --cwd may not be abbreviated!"
7281 msgstr "L'option --cwd ne peut être abrégée !"
7294 msgstr "L'option --cwd ne peut être abrégée !"
7282
7295
7283 msgid ""
7296 msgid ""
7284 "Option -R has to be separated from other options (e.g. not -qR) and --"
7297 "Option -R has to be separated from other options (e.g. not -qR) and --"
7285 "repository may only be abbreviated as --repo!"
7298 "repository may only be abbreviated as --repo!"
7286 msgstr ""
7299 msgstr ""
7287 "L'option -R doit être séparée des autres options (autrement dit -qR est "
7300 "L'option -R doit être séparée des autres options (autrement dit -qR est "
7288 "invalide) et --repository ne peut être abrégé qu'en --repo !"
7301 "invalide) et --repository ne peut être abrégé qu'en --repo !"
7289
7302
7290 #, python-format
7303 #, python-format
7291 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7304 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7292 msgstr ""
7305 msgstr ""
7293
7306
7294 #, python-format
7307 #, python-format
7295 msgid "repository '%s' is not local"
7308 msgid "repository '%s' is not local"
7296 msgstr "le dépôt '%s' n'est pas local"
7309 msgstr "le dépôt '%s' n'est pas local"
7297
7310
7298 msgid "invalid arguments"
7311 msgid "invalid arguments"
7299 msgstr "arguments invalides"
7312 msgstr "arguments invalides"
7300
7313
7301 #, python-format
7314 #, python-format
7302 msgid "unrecognized profiling format '%s' - Ignored\n"
7315 msgid "unrecognized profiling format '%s' - Ignored\n"
7303 msgstr ""
7316 msgstr ""
7304
7317
7305 msgid ""
7318 msgid ""
7306 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7319 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7307 "misc/lsprof/"
7320 "misc/lsprof/"
7308 msgstr ""
7321 msgstr ""
7309
7322
7310 #, python-format
7323 #, python-format
7311 msgid "*** failed to import extension %s from %s: %s\n"
7324 msgid "*** failed to import extension %s from %s: %s\n"
7312 msgstr ""
7325 msgstr ""
7313
7326
7314 #, python-format
7327 #, python-format
7315 msgid "*** failed to import extension %s: %s\n"
7328 msgid "*** failed to import extension %s: %s\n"
7316 msgstr ""
7329 msgstr ""
7317
7330
7318 #, python-format
7331 #, python-format
7319 msgid "couldn't find merge tool %s\n"
7332 msgid "couldn't find merge tool %s\n"
7320 msgstr ""
7333 msgstr ""
7321
7334
7322 #, python-format
7335 #, python-format
7323 msgid "tool %s can't handle symlinks\n"
7336 msgid "tool %s can't handle symlinks\n"
7324 msgstr ""
7337 msgstr ""
7325
7338
7326 #, python-format
7339 #, python-format
7327 msgid "tool %s can't handle binary\n"
7340 msgid "tool %s can't handle binary\n"
7328 msgstr ""
7341 msgstr ""
7329
7342
7330 #, python-format
7343 #, python-format
7331 msgid "tool %s requires a GUI\n"
7344 msgid "tool %s requires a GUI\n"
7332 msgstr ""
7345 msgstr ""
7333
7346
7334 #, python-format
7347 #, python-format
7335 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7348 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7336 msgstr ""
7349 msgstr ""
7337
7350
7338 #, python-format
7351 #, python-format
7339 msgid ""
7352 msgid ""
7340 " no tool found to merge %s\n"
7353 " no tool found to merge %s\n"
7341 "keep (l)ocal or take (o)ther?"
7354 "keep (l)ocal or take (o)ther?"
7342 msgstr ""
7355 msgstr ""
7343
7356
7344 msgid "&Local"
7357 msgid "&Local"
7345 msgstr ""
7358 msgstr ""
7346
7359
7347 msgid "&Other"
7360 msgid "&Other"
7348 msgstr ""
7361 msgstr ""
7349
7362
7350 msgid "l"
7363 msgid "l"
7351 msgstr ""
7364 msgstr ""
7352
7365
7353 #, python-format
7366 #, python-format
7354 msgid "merging %s and %s to %s\n"
7367 msgid "merging %s and %s to %s\n"
7355 msgstr ""
7368 msgstr ""
7356
7369
7357 #, python-format
7370 #, python-format
7358 msgid "merging %s\n"
7371 msgid "merging %s\n"
7359 msgstr ""
7372 msgstr ""
7360
7373
7361 #, python-format
7374 #, python-format
7362 msgid "my %s other %s ancestor %s\n"
7375 msgid "my %s other %s ancestor %s\n"
7363 msgstr ""
7376 msgstr ""
7364
7377
7365 msgid " premerge successful\n"
7378 msgid " premerge successful\n"
7366 msgstr ""
7379 msgstr ""
7367
7380
7368 #, python-format
7381 #, python-format
7369 msgid ""
7382 msgid ""
7370 " output file %s appears unchanged\n"
7383 " output file %s appears unchanged\n"
7371 "was merge successful (yn)?"
7384 "was merge successful (yn)?"
7372 msgstr ""
7385 msgstr ""
7373
7386
7374 msgid "&No"
7387 msgid "&No"
7375 msgstr ""
7388 msgstr ""
7376
7389
7377 msgid "&Yes"
7390 msgid "&Yes"
7378 msgstr ""
7391 msgstr ""
7379
7392
7380 msgid "n"
7393 msgid "n"
7381 msgstr ""
7394 msgstr ""
7382
7395
7383 #, python-format
7396 #, python-format
7384 msgid "merging %s failed!\n"
7397 msgid "merging %s failed!\n"
7385 msgstr ""
7398 msgstr ""
7386
7399
7387 #, python-format
7400 #, python-format
7388 msgid "Inconsistent state, %s:%s is good and bad"
7401 msgid "Inconsistent state, %s:%s is good and bad"
7389 msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\""
7402 msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\""
7390
7403
7391 #, python-format
7404 #, python-format
7392 msgid "unknown bisect kind %s"
7405 msgid "unknown bisect kind %s"
7393 msgstr "type inconnu pour dichotomie : %s"
7406 msgstr "type inconnu pour dichotomie : %s"
7394
7407
7395 msgid ""
7408 msgid ""
7396 "\n"
7409 "\n"
7397 " Mercurial has the ability to add new features through the use of\n"
7410 " Mercurial has the ability to add new features through the use of\n"
7398 " extensions. Extensions may add new commands, add options to\n"
7411 " extensions. Extensions may add new commands, add options to\n"
7399 " existing commands, change the default behavior of commands, or\n"
7412 " existing commands, change the default behavior of commands, or\n"
7400 " implement hooks.\n"
7413 " implement hooks.\n"
7401 "\n"
7414 "\n"
7402 " Extensions are not loaded by default for a variety of reasons:\n"
7415 " Extensions are not loaded by default for a variety of reasons:\n"
7403 " they can increase startup overhead; they may be meant for\n"
7416 " they can increase startup overhead; they may be meant for\n"
7404 " advanced usage only; they may provide potentially dangerous\n"
7417 " advanced usage only; they may provide potentially dangerous\n"
7405 " abilities (such as letting you destroy or modify history); they\n"
7418 " abilities (such as letting you destroy or modify history); they\n"
7406 " might not be ready for prime time; or they may alter some\n"
7419 " might not be ready for prime time; or they may alter some\n"
7407 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7420 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7408 " activate extensions as needed.\n"
7421 " activate extensions as needed.\n"
7409 "\n"
7422 "\n"
7410 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7423 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7411 " or in the Python search path, create an entry for it in your\n"
7424 " or in the Python search path, create an entry for it in your\n"
7412 " hgrc, like this:\n"
7425 " hgrc, like this:\n"
7413 "\n"
7426 "\n"
7414 " [extensions]\n"
7427 " [extensions]\n"
7415 " foo =\n"
7428 " foo =\n"
7416 "\n"
7429 "\n"
7417 " You may also specify the full path to an extension:\n"
7430 " You may also specify the full path to an extension:\n"
7418 "\n"
7431 "\n"
7419 " [extensions]\n"
7432 " [extensions]\n"
7420 " myfeature = ~/.hgext/myfeature.py\n"
7433 " myfeature = ~/.hgext/myfeature.py\n"
7421 "\n"
7434 "\n"
7422 " To explicitly disable an extension enabled in an hgrc of broader\n"
7435 " To explicitly disable an extension enabled in an hgrc of broader\n"
7423 " scope, prepend its path with !:\n"
7436 " scope, prepend its path with !:\n"
7424 "\n"
7437 "\n"
7425 " [extensions]\n"
7438 " [extensions]\n"
7426 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7439 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7427 " hgext.bar = !/path/to/extension/bar.py\n"
7440 " hgext.bar = !/path/to/extension/bar.py\n"
7428 " # ditto, but no path was supplied for extension baz\n"
7441 " # ditto, but no path was supplied for extension baz\n"
7429 " hgext.baz = !\n"
7442 " hgext.baz = !\n"
7430 " "
7443 " "
7431 msgstr ""
7444 msgstr ""
7432 "\n"
7445 "\n"
7433 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7446 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7434 " fonctionnalités par le biais d'extensions. Les extensions\n"
7447 " fonctionnalités par le biais d'extensions. Les extensions\n"
7435 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7448 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7436 " comportement de commandes existantes ou leur ajouter des\n"
7449 " comportement de commandes existantes ou leur ajouter des\n"
7437 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7450 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7438 "\n"
7451 "\n"
7439 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7452 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7440 " pour diverses raisons : elles peuvent accroître la latence\n"
7453 " pour diverses raisons : elles peuvent accroître la latence\n"
7441 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7454 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7442 " une utilisation avancée ; elle peuvent fournir des\n"
7455 " une utilisation avancée ; elle peuvent fournir des\n"
7443 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7456 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7444 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7457 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7445 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7458 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7446 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7459 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7447 " comportements habituels de Mercurial.\n"
7460 " comportements habituels de Mercurial.\n"
7448 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7461 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7449 " de ses besoins.\n"
7462 " de ses besoins.\n"
7450 "\n"
7463 "\n"
7451 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7464 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7452 " présente dans le chemin de recherche de Python, déclarez-la\n"
7465 " présente dans le chemin de recherche de Python, déclarez-la\n"
7453 " dans votre fichier de configuration hgrc comme suit :\n"
7466 " dans votre fichier de configuration hgrc comme suit :\n"
7454 "\n"
7467 "\n"
7455 " [extensions]\n"
7468 " [extensions]\n"
7456 " truc =\n"
7469 " truc =\n"
7457 "\n"
7470 "\n"
7458 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7471 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7459 "\n"
7472 "\n"
7460 " [extensions]\n"
7473 " [extensions]\n"
7461 " monbidule = ~/.hgext/monbidule.py\n"
7474 " monbidule = ~/.hgext/monbidule.py\n"
7462 "\n"
7475 "\n"
7463 " Pour forcer la désactivation d'une extension activée par un\n"
7476 " Pour forcer la désactivation d'une extension activée par un\n"
7464 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7477 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7465 "\n"
7478 "\n"
7466 " [extensions]\n"
7479 " [extensions]\n"
7467 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7480 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7468 " hgext.bar = !/vers/machin.py\n"
7481 " hgext.bar = !/vers/machin.py\n"
7469 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7482 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7470 " hgext.chose = !\n"
7483 " hgext.chose = !\n"
7471 " "
7484 " "
7472
7485
7473 msgid "disabled extensions:"
7486 msgid "disabled extensions:"
7474 msgstr "extensions désactivées :"
7487 msgstr "extensions désactivées :"
7475
7488
7476 msgid "Date Formats"
7489 msgid "Date Formats"
7477 msgstr ""
7490 msgstr ""
7478
7491
7479 msgid ""
7492 msgid ""
7480 "\n"
7493 "\n"
7481 " Some commands allow the user to specify a date, e.g.:\n"
7494 " Some commands allow the user to specify a date, e.g.:\n"
7482 " * backout, commit, import, tag: Specify the commit date.\n"
7495 " * backout, commit, import, tag: Specify the commit date.\n"
7483 " * log, revert, update: Select revision(s) by date.\n"
7496 " * log, revert, update: Select revision(s) by date.\n"
7484 "\n"
7497 "\n"
7485 " Many date formats are valid. Here are some examples:\n"
7498 " Many date formats are valid. Here are some examples:\n"
7486 "\n"
7499 "\n"
7487 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7500 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7488 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7501 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7489 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7502 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7490 " \"Dec 6\" (midnight)\n"
7503 " \"Dec 6\" (midnight)\n"
7491 " \"13:18\" (today assumed)\n"
7504 " \"13:18\" (today assumed)\n"
7492 " \"3:39\" (3:39AM assumed)\n"
7505 " \"3:39\" (3:39AM assumed)\n"
7493 " \"3:39pm\" (15:39)\n"
7506 " \"3:39pm\" (15:39)\n"
7494 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7507 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7495 " \"2006-12-6 13:18\"\n"
7508 " \"2006-12-6 13:18\"\n"
7496 " \"2006-12-6\"\n"
7509 " \"2006-12-6\"\n"
7497 " \"12-6\"\n"
7510 " \"12-6\"\n"
7498 " \"12/6\"\n"
7511 " \"12/6\"\n"
7499 " \"12/6/6\" (Dec 6 2006)\n"
7512 " \"12/6/6\" (Dec 6 2006)\n"
7500 "\n"
7513 "\n"
7501 " Lastly, there is Mercurial's internal format:\n"
7514 " Lastly, there is Mercurial's internal format:\n"
7502 "\n"
7515 "\n"
7503 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7516 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7504 "\n"
7517 "\n"
7505 " This is the internal representation format for dates. unixtime is\n"
7518 " This is the internal representation format for dates. unixtime is\n"
7506 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7519 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7507 " offset is the offset of the local timezone, in seconds west of UTC\n"
7520 " offset is the offset of the local timezone, in seconds west of UTC\n"
7508 " (negative if the timezone is east of UTC).\n"
7521 " (negative if the timezone is east of UTC).\n"
7509 "\n"
7522 "\n"
7510 " The log command also accepts date ranges:\n"
7523 " The log command also accepts date ranges:\n"
7511 "\n"
7524 "\n"
7512 " \"<{datetime}\" - at or before a given date/time\n"
7525 " \"<{datetime}\" - at or before a given date/time\n"
7513 " \">{datetime}\" - on or after a given date/time\n"
7526 " \">{datetime}\" - on or after a given date/time\n"
7514 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7527 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7515 " \"-{days}\" - within a given number of days of today\n"
7528 " \"-{days}\" - within a given number of days of today\n"
7516 " "
7529 " "
7517 msgstr ""
7530 msgstr ""
7518
7531
7519 msgid "File Name Patterns"
7532 msgid "File Name Patterns"
7520 msgstr ""
7533 msgstr ""
7521
7534
7522 msgid ""
7535 msgid ""
7523 "\n"
7536 "\n"
7524 " Mercurial accepts several notations for identifying one or more\n"
7537 " Mercurial accepts several notations for identifying one or more\n"
7525 " files at a time.\n"
7538 " files at a time.\n"
7526 "\n"
7539 "\n"
7527 " By default, Mercurial treats filenames as shell-style extended\n"
7540 " By default, Mercurial treats filenames as shell-style extended\n"
7528 " glob patterns.\n"
7541 " glob patterns.\n"
7529 "\n"
7542 "\n"
7530 " Alternate pattern notations must be specified explicitly.\n"
7543 " Alternate pattern notations must be specified explicitly.\n"
7531 "\n"
7544 "\n"
7532 " To use a plain path name without any pattern matching, start it\n"
7545 " To use a plain path name without any pattern matching, start it\n"
7533 " with \"path:\". These path names must completely match starting at\n"
7546 " with \"path:\". These path names must completely match starting at\n"
7534 " the current repository root.\n"
7547 " the current repository root.\n"
7535 "\n"
7548 "\n"
7536 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7549 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7537 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7550 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7538 " match files in the current directory ending with \".c\".\n"
7551 " match files in the current directory ending with \".c\".\n"
7539 "\n"
7552 "\n"
7540 " The supported glob syntax extensions are \"**\" to match any string\n"
7553 " The supported glob syntax extensions are \"**\" to match any string\n"
7541 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7554 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7542 "\n"
7555 "\n"
7543 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7556 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7544 " Regexp pattern matching is anchored at the root of the repository.\n"
7557 " Regexp pattern matching is anchored at the root of the repository.\n"
7545 "\n"
7558 "\n"
7546 " Plain examples:\n"
7559 " Plain examples:\n"
7547 "\n"
7560 "\n"
7548 " path:foo/bar a name bar in a directory named foo in the root of\n"
7561 " path:foo/bar a name bar in a directory named foo in the root of\n"
7549 " the repository\n"
7562 " the repository\n"
7550 " path:path:name a file or directory named \"path:name\"\n"
7563 " path:path:name a file or directory named \"path:name\"\n"
7551 "\n"
7564 "\n"
7552 " Glob examples:\n"
7565 " Glob examples:\n"
7553 "\n"
7566 "\n"
7554 " glob:*.c any name ending in \".c\" in the current directory\n"
7567 " glob:*.c any name ending in \".c\" in the current directory\n"
7555 " *.c any name ending in \".c\" in the current directory\n"
7568 " *.c any name ending in \".c\" in the current directory\n"
7556 " **.c any name ending in \".c\" in any subdirectory of the\n"
7569 " **.c any name ending in \".c\" in any subdirectory of the\n"
7557 " current directory including itself.\n"
7570 " current directory including itself.\n"
7558 " foo/*.c any name ending in \".c\" in the directory foo\n"
7571 " foo/*.c any name ending in \".c\" in the directory foo\n"
7559 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7572 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7560 " including itself.\n"
7573 " including itself.\n"
7561 "\n"
7574 "\n"
7562 " Regexp examples:\n"
7575 " Regexp examples:\n"
7563 "\n"
7576 "\n"
7564 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7577 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7565 "\n"
7578 "\n"
7566 " "
7579 " "
7567 msgstr ""
7580 msgstr ""
7568
7581
7569 msgid "Environment Variables"
7582 msgid "Environment Variables"
7570 msgstr ""
7583 msgstr ""
7571
7584
7572 msgid ""
7585 msgid ""
7573 "\n"
7586 "\n"
7574 "HG::\n"
7587 "HG::\n"
7575 " Path to the 'hg' executable, automatically passed when running\n"
7588 " Path to the 'hg' executable, automatically passed when running\n"
7576 " hooks, extensions or external tools. If unset or empty, this is\n"
7589 " hooks, extensions or external tools. If unset or empty, this is\n"
7577 " the hg executable's name if it's frozen, or an executable named\n"
7590 " the hg executable's name if it's frozen, or an executable named\n"
7578 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7591 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7579 " Windows) is searched.\n"
7592 " Windows) is searched.\n"
7580 "\n"
7593 "\n"
7581 "HGEDITOR::\n"
7594 "HGEDITOR::\n"
7582 " This is the name of the editor to run when committing. See EDITOR.\n"
7595 " This is the name of the editor to run when committing. See EDITOR.\n"
7583 "\n"
7596 "\n"
7584 " (deprecated, use .hgrc)\n"
7597 " (deprecated, use .hgrc)\n"
7585 "\n"
7598 "\n"
7586 "HGENCODING::\n"
7599 "HGENCODING::\n"
7587 " This overrides the default locale setting detected by Mercurial.\n"
7600 " This overrides the default locale setting detected by Mercurial.\n"
7588 " This setting is used to convert data including usernames,\n"
7601 " This setting is used to convert data including usernames,\n"
7589 " changeset descriptions, tag names, and branches. This setting can\n"
7602 " changeset descriptions, tag names, and branches. This setting can\n"
7590 " be overridden with the --encoding command-line option.\n"
7603 " be overridden with the --encoding command-line option.\n"
7591 "\n"
7604 "\n"
7592 "HGENCODINGMODE::\n"
7605 "HGENCODINGMODE::\n"
7593 " This sets Mercurial's behavior for handling unknown characters\n"
7606 " This sets Mercurial's behavior for handling unknown characters\n"
7594 " while transcoding user input. The default is \"strict\", which\n"
7607 " while transcoding user input. The default is \"strict\", which\n"
7595 " causes Mercurial to abort if it can't map a character. Other\n"
7608 " causes Mercurial to abort if it can't map a character. Other\n"
7596 " settings include \"replace\", which replaces unknown characters, and\n"
7609 " settings include \"replace\", which replaces unknown characters, and\n"
7597 " \"ignore\", which drops them. This setting can be overridden with\n"
7610 " \"ignore\", which drops them. This setting can be overridden with\n"
7598 " the --encodingmode command-line option.\n"
7611 " the --encodingmode command-line option.\n"
7599 "\n"
7612 "\n"
7600 "HGMERGE::\n"
7613 "HGMERGE::\n"
7601 " An executable to use for resolving merge conflicts. The program\n"
7614 " An executable to use for resolving merge conflicts. The program\n"
7602 " will be executed with three arguments: local file, remote file,\n"
7615 " will be executed with three arguments: local file, remote file,\n"
7603 " ancestor file.\n"
7616 " ancestor file.\n"
7604 "\n"
7617 "\n"
7605 " (deprecated, use .hgrc)\n"
7618 " (deprecated, use .hgrc)\n"
7606 "\n"
7619 "\n"
7607 "HGRCPATH::\n"
7620 "HGRCPATH::\n"
7608 " A list of files or directories to search for hgrc files. Item\n"
7621 " A list of files or directories to search for hgrc files. Item\n"
7609 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7622 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7610 " platform default search path is used. If empty, only the .hg/hgrc\n"
7623 " platform default search path is used. If empty, only the .hg/hgrc\n"
7611 " from the current repository is read.\n"
7624 " from the current repository is read.\n"
7612 "\n"
7625 "\n"
7613 " For each element in HGRCPATH:\n"
7626 " For each element in HGRCPATH:\n"
7614 " * if it's a directory, all files ending with .rc are added\n"
7627 " * if it's a directory, all files ending with .rc are added\n"
7615 " * otherwise, the file itself will be added\n"
7628 " * otherwise, the file itself will be added\n"
7616 "\n"
7629 "\n"
7617 "HGUSER::\n"
7630 "HGUSER::\n"
7618 " This is the string used as the author of a commit. If not set,\n"
7631 " This is the string used as the author of a commit. If not set,\n"
7619 " available values will be considered in this order:\n"
7632 " available values will be considered in this order:\n"
7620 "\n"
7633 "\n"
7621 " * HGUSER (deprecated)\n"
7634 " * HGUSER (deprecated)\n"
7622 " * hgrc files from the HGRCPATH\n"
7635 " * hgrc files from the HGRCPATH\n"
7623 " * EMAIL\n"
7636 " * EMAIL\n"
7624 " * interactive prompt\n"
7637 " * interactive prompt\n"
7625 " * LOGNAME (with '@hostname' appended)\n"
7638 " * LOGNAME (with '@hostname' appended)\n"
7626 "\n"
7639 "\n"
7627 " (deprecated, use .hgrc)\n"
7640 " (deprecated, use .hgrc)\n"
7628 "\n"
7641 "\n"
7629 "EMAIL::\n"
7642 "EMAIL::\n"
7630 " May be used as the author of a commit; see HGUSER.\n"
7643 " May be used as the author of a commit; see HGUSER.\n"
7631 "\n"
7644 "\n"
7632 "LOGNAME::\n"
7645 "LOGNAME::\n"
7633 " May be used as the author of a commit; see HGUSER.\n"
7646 " May be used as the author of a commit; see HGUSER.\n"
7634 "\n"
7647 "\n"
7635 "VISUAL::\n"
7648 "VISUAL::\n"
7636 " This is the name of the editor to use when committing. See EDITOR.\n"
7649 " This is the name of the editor to use when committing. See EDITOR.\n"
7637 "\n"
7650 "\n"
7638 "EDITOR::\n"
7651 "EDITOR::\n"
7639 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7652 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7640 " user to modify, for example when writing commit messages. The\n"
7653 " user to modify, for example when writing commit messages. The\n"
7641 " editor it uses is determined by looking at the environment\n"
7654 " editor it uses is determined by looking at the environment\n"
7642 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7655 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7643 " non-empty one is chosen. If all of them are empty, the editor\n"
7656 " non-empty one is chosen. If all of them are empty, the editor\n"
7644 " defaults to 'vi'.\n"
7657 " defaults to 'vi'.\n"
7645 "\n"
7658 "\n"
7646 "PYTHONPATH::\n"
7659 "PYTHONPATH::\n"
7647 " This is used by Python to find imported modules and may need to be\n"
7660 " This is used by Python to find imported modules and may need to be\n"
7648 " set appropriately if this Mercurial is not installed system-wide.\n"
7661 " set appropriately if this Mercurial is not installed system-wide.\n"
7649 " "
7662 " "
7650 msgstr ""
7663 msgstr ""
7651
7664
7652 msgid "Specifying Single Revisions"
7665 msgid "Specifying Single Revisions"
7653 msgstr ""
7666 msgstr ""
7654
7667
7655 msgid ""
7668 msgid ""
7656 "\n"
7669 "\n"
7657 " Mercurial supports several ways to specify individual revisions.\n"
7670 " Mercurial supports several ways to specify individual revisions.\n"
7658 "\n"
7671 "\n"
7659 " A plain integer is treated as a revision number. Negative integers\n"
7672 " A plain integer is treated as a revision number. Negative integers\n"
7660 " are treated as topological offsets from the tip, with -1 denoting\n"
7673 " are treated as topological offsets from the tip, with -1 denoting\n"
7661 " the tip. As such, negative numbers are only useful if you've\n"
7674 " the tip. As such, negative numbers are only useful if you've\n"
7662 " memorized your local tree numbers and want to save typing a single\n"
7675 " memorized your local tree numbers and want to save typing a single\n"
7663 " digit. This editor suggests copy and paste.\n"
7676 " digit. This editor suggests copy and paste.\n"
7664 "\n"
7677 "\n"
7665 " A 40-digit hexadecimal string is treated as a unique revision\n"
7678 " A 40-digit hexadecimal string is treated as a unique revision\n"
7666 " identifier.\n"
7679 " identifier.\n"
7667 "\n"
7680 "\n"
7668 " A hexadecimal string less than 40 characters long is treated as a\n"
7681 " A hexadecimal string less than 40 characters long is treated as a\n"
7669 " unique revision identifier, and referred to as a short-form\n"
7682 " unique revision identifier, and referred to as a short-form\n"
7670 " identifier. A short-form identifier is only valid if it is the\n"
7683 " identifier. A short-form identifier is only valid if it is the\n"
7671 " prefix of exactly one full-length identifier.\n"
7684 " prefix of exactly one full-length identifier.\n"
7672 "\n"
7685 "\n"
7673 " Any other string is treated as a tag name, which is a symbolic\n"
7686 " Any other string is treated as a tag name, which is a symbolic\n"
7674 " name associated with a revision identifier. Tag names may not\n"
7687 " name associated with a revision identifier. Tag names may not\n"
7675 " contain the \":\" character.\n"
7688 " contain the \":\" character.\n"
7676 "\n"
7689 "\n"
7677 " The reserved name \"tip\" is a special tag that always identifies\n"
7690 " The reserved name \"tip\" is a special tag that always identifies\n"
7678 " the most recent revision.\n"
7691 " the most recent revision.\n"
7679 "\n"
7692 "\n"
7680 " The reserved name \"null\" indicates the null revision. This is the\n"
7693 " The reserved name \"null\" indicates the null revision. This is the\n"
7681 " revision of an empty repository, and the parent of revision 0.\n"
7694 " revision of an empty repository, and the parent of revision 0.\n"
7682 "\n"
7695 "\n"
7683 " The reserved name \".\" indicates the working directory parent. If\n"
7696 " The reserved name \".\" indicates the working directory parent. If\n"
7684 " no working directory is checked out, it is equivalent to null. If\n"
7697 " no working directory is checked out, it is equivalent to null. If\n"
7685 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7698 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7686 " first parent.\n"
7699 " first parent.\n"
7687 " "
7700 " "
7688 msgstr ""
7701 msgstr ""
7689
7702
7690 msgid "Specifying Multiple Revisions"
7703 msgid "Specifying Multiple Revisions"
7691 msgstr ""
7704 msgstr ""
7692
7705
7693 msgid ""
7706 msgid ""
7694 "\n"
7707 "\n"
7695 " When Mercurial accepts more than one revision, they may be\n"
7708 " When Mercurial accepts more than one revision, they may be\n"
7696 " specified individually, or provided as a topologically continuous\n"
7709 " specified individually, or provided as a topologically continuous\n"
7697 " range, separated by the \":\" character.\n"
7710 " range, separated by the \":\" character.\n"
7698 "\n"
7711 "\n"
7699 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7712 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7700 " are revision identifiers. Both BEGIN and END are optional. If\n"
7713 " are revision identifiers. Both BEGIN and END are optional. If\n"
7701 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7714 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7702 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7715 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7703 " \"all revisions\".\n"
7716 " \"all revisions\".\n"
7704 "\n"
7717 "\n"
7705 " If BEGIN is greater than END, revisions are treated in reverse\n"
7718 " If BEGIN is greater than END, revisions are treated in reverse\n"
7706 " order.\n"
7719 " order.\n"
7707 "\n"
7720 "\n"
7708 " A range acts as a closed interval. This means that a range of 3:5\n"
7721 " A range acts as a closed interval. This means that a range of 3:5\n"
7709 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7722 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7710 " "
7723 " "
7711 msgstr ""
7724 msgstr ""
7712
7725
7713 msgid "Diff Formats"
7726 msgid "Diff Formats"
7714 msgstr ""
7727 msgstr ""
7715
7728
7716 msgid ""
7729 msgid ""
7717 "\n"
7730 "\n"
7718 " Mercurial's default format for showing changes between two\n"
7731 " Mercurial's default format for showing changes between two\n"
7719 " versions of a file is compatible with the unified format of GNU\n"
7732 " versions of a file is compatible with the unified format of GNU\n"
7720 " diff, which can be used by GNU patch and many other standard\n"
7733 " diff, which can be used by GNU patch and many other standard\n"
7721 " tools.\n"
7734 " tools.\n"
7722 "\n"
7735 "\n"
7723 " While this standard format is often enough, it does not encode the\n"
7736 " While this standard format is often enough, it does not encode the\n"
7724 " following information:\n"
7737 " following information:\n"
7725 "\n"
7738 "\n"
7726 " - executable status and other permission bits\n"
7739 " - executable status and other permission bits\n"
7727 " - copy or rename information\n"
7740 " - copy or rename information\n"
7728 " - changes in binary files\n"
7741 " - changes in binary files\n"
7729 " - creation or deletion of empty files\n"
7742 " - creation or deletion of empty files\n"
7730 "\n"
7743 "\n"
7731 " Mercurial also supports the extended diff format from the git VCS\n"
7744 " Mercurial also supports the extended diff format from the git VCS\n"
7732 " which addresses these limitations. The git diff format is not\n"
7745 " which addresses these limitations. The git diff format is not\n"
7733 " produced by default because a few widespread tools still do not\n"
7746 " produced by default because a few widespread tools still do not\n"
7734 " understand this format.\n"
7747 " understand this format.\n"
7735 "\n"
7748 "\n"
7736 " This means that when generating diffs from a Mercurial repository\n"
7749 " This means that when generating diffs from a Mercurial repository\n"
7737 " (e.g. with \"hg export\"), you should be careful about things like\n"
7750 " (e.g. with \"hg export\"), you should be careful about things like\n"
7738 " file copies and renames or other things mentioned above, because\n"
7751 " file copies and renames or other things mentioned above, because\n"
7739 " when applying a standard diff to a different repository, this\n"
7752 " when applying a standard diff to a different repository, this\n"
7740 " extra information is lost. Mercurial's internal operations (like\n"
7753 " extra information is lost. Mercurial's internal operations (like\n"
7741 " push and pull) are not affected by this, because they use an\n"
7754 " push and pull) are not affected by this, because they use an\n"
7742 " internal binary format for communicating changes.\n"
7755 " internal binary format for communicating changes.\n"
7743 "\n"
7756 "\n"
7744 " To make Mercurial produce the git extended diff format, use the\n"
7757 " To make Mercurial produce the git extended diff format, use the\n"
7745 " --git option available for many commands, or set 'git = True' in\n"
7758 " --git option available for many commands, or set 'git = True' in\n"
7746 " the [diff] section of your hgrc. You do not need to set this\n"
7759 " the [diff] section of your hgrc. You do not need to set this\n"
7747 " option when importing diffs in this format or using them in the mq\n"
7760 " option when importing diffs in this format or using them in the mq\n"
7748 " extension.\n"
7761 " extension.\n"
7749 " "
7762 " "
7750 msgstr ""
7763 msgstr ""
7751
7764
7752 msgid "Template Usage"
7765 msgid "Template Usage"
7753 msgstr ""
7766 msgstr ""
7754
7767
7755 msgid ""
7768 msgid ""
7756 "\n"
7769 "\n"
7757 " Mercurial allows you to customize output of commands through\n"
7770 " Mercurial allows you to customize output of commands through\n"
7758 " templates. You can either pass in a template from the command\n"
7771 " templates. You can either pass in a template from the command\n"
7759 " line, via the --template option, or select an existing\n"
7772 " line, via the --template option, or select an existing\n"
7760 " template-style (--style).\n"
7773 " template-style (--style).\n"
7761 "\n"
7774 "\n"
7762 " You can customize output for any \"log-like\" command: log,\n"
7775 " You can customize output for any \"log-like\" command: log,\n"
7763 " outgoing, incoming, tip, parents, heads and glog.\n"
7776 " outgoing, incoming, tip, parents, heads and glog.\n"
7764 "\n"
7777 "\n"
7765 " Three styles are packaged with Mercurial: default (the style used\n"
7778 " Three styles are packaged with Mercurial: default (the style used\n"
7766 " when no explicit preference is passed), compact and changelog.\n"
7779 " when no explicit preference is passed), compact and changelog.\n"
7767 " Usage:\n"
7780 " Usage:\n"
7768 "\n"
7781 "\n"
7769 " $ hg log -r1 --style changelog\n"
7782 " $ hg log -r1 --style changelog\n"
7770 "\n"
7783 "\n"
7771 " A template is a piece of text, with markup to invoke variable\n"
7784 " A template is a piece of text, with markup to invoke variable\n"
7772 " expansion:\n"
7785 " expansion:\n"
7773 "\n"
7786 "\n"
7774 " $ hg log -r1 --template \"{node}\\n\"\n"
7787 " $ hg log -r1 --template \"{node}\\n\"\n"
7775 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7788 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7776 "\n"
7789 "\n"
7777 " Strings in curly braces are called keywords. The availability of\n"
7790 " Strings in curly braces are called keywords. The availability of\n"
7778 " keywords depends on the exact context of the templater. These\n"
7791 " keywords depends on the exact context of the templater. These\n"
7779 " keywords are usually available for templating a log-like command:\n"
7792 " keywords are usually available for templating a log-like command:\n"
7780 "\n"
7793 "\n"
7781 " - author: String. The unmodified author of the changeset.\n"
7794 " - author: String. The unmodified author of the changeset.\n"
7782 " - branches: String. The name of the branch on which the changeset\n"
7795 " - branches: String. The name of the branch on which the changeset\n"
7783 " was committed. Will be empty if the branch name was default.\n"
7796 " was committed. Will be empty if the branch name was default.\n"
7784 " - date: Date information. The date when the changeset was committed.\n"
7797 " - date: Date information. The date when the changeset was committed.\n"
7785 " - desc: String. The text of the changeset description.\n"
7798 " - desc: String. The text of the changeset description.\n"
7786 " - diffstat: String. Statistics of changes with the following\n"
7799 " - diffstat: String. Statistics of changes with the following\n"
7787 " format: \"modified files: +added/-removed lines\"\n"
7800 " format: \"modified files: +added/-removed lines\"\n"
7788 " - files: List of strings. All files modified, added, or removed by\n"
7801 " - files: List of strings. All files modified, added, or removed by\n"
7789 " this changeset.\n"
7802 " this changeset.\n"
7790 " - file_adds: List of strings. Files added by this changeset.\n"
7803 " - file_adds: List of strings. Files added by this changeset.\n"
7791 " - file_mods: List of strings. Files modified by this changeset.\n"
7804 " - file_mods: List of strings. Files modified by this changeset.\n"
7792 " - file_dels: List of strings. Files removed by this changeset.\n"
7805 " - file_dels: List of strings. Files removed by this changeset.\n"
7793 " - node: String. The changeset identification hash, as a\n"
7806 " - node: String. The changeset identification hash, as a\n"
7794 " 40-character hexadecimal string.\n"
7807 " 40-character hexadecimal string.\n"
7795 " - parents: List of strings. The parents of the changeset.\n"
7808 " - parents: List of strings. The parents of the changeset.\n"
7796 " - rev: Integer. The repository-local changeset revision number.\n"
7809 " - rev: Integer. The repository-local changeset revision number.\n"
7797 " - tags: List of strings. Any tags associated with the changeset.\n"
7810 " - tags: List of strings. Any tags associated with the changeset.\n"
7798 "\n"
7811 "\n"
7799 " The \"date\" keyword does not produce human-readable output. If you\n"
7812 " The \"date\" keyword does not produce human-readable output. If you\n"
7800 " want to use a date in your output, you can use a filter to process\n"
7813 " want to use a date in your output, you can use a filter to process\n"
7801 " it. Filters are functions which return a string based on the input\n"
7814 " it. Filters are functions which return a string based on the input\n"
7802 " variable. You can also use a chain of filters to get the desired\n"
7815 " variable. You can also use a chain of filters to get the desired\n"
7803 " output:\n"
7816 " output:\n"
7804 "\n"
7817 "\n"
7805 " $ hg tip --template \"{date|isodate}\\n\"\n"
7818 " $ hg tip --template \"{date|isodate}\\n\"\n"
7806 " 2008-08-21 18:22 +0000\n"
7819 " 2008-08-21 18:22 +0000\n"
7807 "\n"
7820 "\n"
7808 " List of filters:\n"
7821 " List of filters:\n"
7809 "\n"
7822 "\n"
7810 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7823 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7811 " every line except the last.\n"
7824 " every line except the last.\n"
7812 " - age: Date. Returns a human-readable date/time difference between\n"
7825 " - age: Date. Returns a human-readable date/time difference between\n"
7813 " the given date/time and the current date/time.\n"
7826 " the given date/time and the current date/time.\n"
7814 " - basename: Any text. Treats the text as a path, and returns the\n"
7827 " - basename: Any text. Treats the text as a path, and returns the\n"
7815 " last component of the path after splitting by the path\n"
7828 " last component of the path after splitting by the path\n"
7816 " separator (ignoring trailing separators). For example,\n"
7829 " separator (ignoring trailing separators). For example,\n"
7817 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7830 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7818 "\".\n"
7831 "\".\n"
7819 " - stripdir: Treat the text as path and strip a directory level, if\n"
7832 " - stripdir: Treat the text as path and strip a directory level, if\n"
7820 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7833 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7821 " - date: Date. Returns a date in a Unix date format, including\n"
7834 " - date: Date. Returns a date in a Unix date format, including\n"
7822 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7835 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7823 " - domain: Any text. Finds the first string that looks like an\n"
7836 " - domain: Any text. Finds the first string that looks like an\n"
7824 " email address, and extracts just the domain component.\n"
7837 " email address, and extracts just the domain component.\n"
7825 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7838 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7826 " - email: Any text. Extracts the first string that looks like an\n"
7839 " - email: Any text. Extracts the first string that looks like an\n"
7827 " email address. Example: 'User <user@example.com>' becomes\n"
7840 " email address. Example: 'User <user@example.com>' becomes\n"
7828 " 'user@example.com'.\n"
7841 " 'user@example.com'.\n"
7829 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7842 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7830 " \"<\" and \">\" with XML entities.\n"
7843 " \"<\" and \">\" with XML entities.\n"
7831 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7844 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7832 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7845 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7833 " - firstline: Any text. Returns the first line of text.\n"
7846 " - firstline: Any text. Returns the first line of text.\n"
7834 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7847 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7835 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7848 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7836 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7849 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7837 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7850 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7838 " - localdate: Date. Converts a date to local date.\n"
7851 " - localdate: Date. Converts a date to local date.\n"
7839 " - obfuscate: Any text. Returns the input text rendered as a\n"
7852 " - obfuscate: Any text. Returns the input text rendered as a\n"
7840 " sequence of XML entities.\n"
7853 " sequence of XML entities.\n"
7841 " - person: Any text. Returns the text before an email address.\n"
7854 " - person: Any text. Returns the text before an email address.\n"
7842 " - rfc822date: Date. Returns a date using the same format used\n"
7855 " - rfc822date: Date. Returns a date using the same format used\n"
7843 " in email headers.\n"
7856 " in email headers.\n"
7844 " - short: Changeset hash. Returns the short form of a changeset\n"
7857 " - short: Changeset hash. Returns the short form of a changeset\n"
7845 " hash, i.e. a 12-byte hexadecimal string.\n"
7858 " hash, i.e. a 12-byte hexadecimal string.\n"
7846 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7859 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7847 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7860 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7848 " - tabindent: Any text. Returns the text, with every line except\n"
7861 " - tabindent: Any text. Returns the text, with every line except\n"
7849 " the first starting with a tab character.\n"
7862 " the first starting with a tab character.\n"
7850 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7863 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7851 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7864 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7852 " - user: Any text. Returns the user portion of an email address.\n"
7865 " - user: Any text. Returns the user portion of an email address.\n"
7853 " "
7866 " "
7854 msgstr ""
7867 msgstr ""
7855
7868
7856 msgid "URL Paths"
7869 msgid "URL Paths"
7857 msgstr ""
7870 msgstr ""
7858
7871
7859 msgid ""
7872 msgid ""
7860 "\n"
7873 "\n"
7861 " Valid URLs are of the form:\n"
7874 " Valid URLs are of the form:\n"
7862 "\n"
7875 "\n"
7863 " local/filesystem/path (or file://local/filesystem/path)\n"
7876 " local/filesystem/path[#revision]\n"
7864 " http://[user[:pass]@]host[:port]/[path]\n"
7877 " file://local/filesystem/path[#revision]\n"
7865 " https://[user[:pass]@]host[:port]/[path]\n"
7878 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
7866 " ssh://[user[:pass]@]host[:port]/[path]\n"
7879 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
7880 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
7867 "\n"
7881 "\n"
7868 " Paths in the local filesystem can either point to Mercurial\n"
7882 " Paths in the local filesystem can either point to Mercurial\n"
7869 " repositories or to bundle files (as created by 'hg bundle' or\n"
7883 " repositories or to bundle files (as created by 'hg bundle' or\n"
7870 " 'hg incoming --bundle').\n"
7884 " 'hg incoming --bundle').\n"
7871 "\n"
7885 "\n"
7872 " An optional identifier after # indicates a particular branch, tag,\n"
7886 " An optional identifier after # indicates a particular branch, tag,\n"
7873 " or changeset to use from the remote repository.\n"
7887 " or changeset to use from the remote repository. See also 'hg help\n"
7888 " revisions'.\n"
7874 "\n"
7889 "\n"
7875 " Some features, such as pushing to http:// and https:// URLs are\n"
7890 " Some features, such as pushing to http:// and https:// URLs are\n"
7876 " only possible if the feature is explicitly enabled on the remote\n"
7891 " only possible if the feature is explicitly enabled on the remote\n"
7877 " Mercurial server.\n"
7892 " Mercurial server.\n"
7878 "\n"
7893 "\n"
7879 " Some notes about using SSH with Mercurial:\n"
7894 " Some notes about using SSH with Mercurial:\n"
7880 " - SSH requires an accessible shell account on the destination\n"
7895 " - SSH requires an accessible shell account on the destination\n"
7881 " machine and a copy of hg in the remote path or specified with as\n"
7896 " machine and a copy of hg in the remote path or specified with as\n"
7882 " remotecmd.\n"
7897 " remotecmd.\n"
7883 " - path is relative to the remote user's home directory by default.\n"
7898 " - path is relative to the remote user's home directory by default.\n"
7884 " Use an extra slash at the start of a path to specify an absolute "
7899 " Use an extra slash at the start of a path to specify an absolute "
7885 "path:\n"
7900 "path:\n"
7886 " ssh://example.com//tmp/repository\n"
7901 " ssh://example.com//tmp/repository\n"
7887 " - Mercurial doesn't use its own compression via SSH; the right\n"
7902 " - Mercurial doesn't use its own compression via SSH; the right\n"
7888 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7903 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7889 " Host *.mylocalnetwork.example.com\n"
7904 " Host *.mylocalnetwork.example.com\n"
7890 " Compression no\n"
7905 " Compression no\n"
7891 " Host *\n"
7906 " Host *\n"
7892 " Compression yes\n"
7907 " Compression yes\n"
7893 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7908 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7894 " or with the --ssh command line option.\n"
7909 " or with the --ssh command line option.\n"
7895 "\n"
7910 "\n"
7896 " These URLs can all be stored in your hgrc with path aliases under\n"
7911 " These URLs can all be stored in your hgrc with path aliases under\n"
7897 " the [paths] section like so:\n"
7912 " the [paths] section like so:\n"
7898 " [paths]\n"
7913 " [paths]\n"
7899 " alias1 = URL1\n"
7914 " alias1 = URL1\n"
7900 " alias2 = URL2\n"
7915 " alias2 = URL2\n"
7901 " ...\n"
7916 " ...\n"
7902 "\n"
7917 "\n"
7903 " You can then use the alias for any command that uses a URL (for\n"
7918 " You can then use the alias for any command that uses a URL (for\n"
7904 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7919 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7905 "\n"
7920 "\n"
7906 " Two path aliases are special because they are used as defaults\n"
7921 " Two path aliases are special because they are used as defaults\n"
7907 " when you do not provide the URL to a command:\n"
7922 " when you do not provide the URL to a command:\n"
7908 "\n"
7923 "\n"
7909 " default:\n"
7924 " default:\n"
7910 " When you create a repository with hg clone, the clone command\n"
7925 " When you create a repository with hg clone, the clone command\n"
7911 " saves the location of the source repository as the new\n"
7926 " saves the location of the source repository as the new\n"
7912 " repository's 'default' path. This is then used when you omit\n"
7927 " repository's 'default' path. This is then used when you omit\n"
7913 " path from push- and pull-like commands (including incoming and\n"
7928 " path from push- and pull-like commands (including incoming and\n"
7914 " outgoing).\n"
7929 " outgoing).\n"
7915 "\n"
7930 "\n"
7916 " default-push:\n"
7931 " default-push:\n"
7917 " The push command will look for a path named 'default-push', and\n"
7932 " The push command will look for a path named 'default-push', and\n"
7918 " prefer it over 'default' if both are defined.\n"
7933 " prefer it over 'default' if both are defined.\n"
7919 " "
7934 " "
7920 msgstr ""
7935 msgstr ""
7921
7936
7922 msgid "Using additional features"
7937 msgid "Using additional features"
7923 msgstr ""
7938 msgstr ""
7924
7939
7925 msgid "can only share local repositories"
7940 msgid "can only share local repositories"
7926 msgstr ""
7941 msgstr ""
7927
7942
7928 msgid "destination already exists"
7943 msgid "destination already exists"
7929 msgstr ""
7944 msgstr ""
7930
7945
7931 msgid "updating working directory\n"
7946 msgid "updating working directory\n"
7932 msgstr ""
7947 msgstr ""
7933
7948
7934 #, python-format
7949 #, python-format
7935 msgid "destination directory: %s\n"
7950 msgid "destination directory: %s\n"
7936 msgstr ""
7951 msgstr ""
7937
7952
7938 #, python-format
7953 #, python-format
7939 msgid "destination '%s' already exists"
7954 msgid "destination '%s' already exists"
7940 msgstr ""
7955 msgstr ""
7941
7956
7942 #, python-format
7957 #, python-format
7943 msgid "destination '%s' is not empty"
7958 msgid "destination '%s' is not empty"
7944 msgstr ""
7959 msgstr ""
7945
7960
7946 msgid ""
7961 msgid ""
7947 "src repository does not support revision lookup and so doesn't support clone "
7962 "src repository does not support revision lookup and so doesn't support clone "
7948 "by revision"
7963 "by revision"
7949 msgstr ""
7964 msgstr ""
7950
7965
7951 msgid "clone from remote to remote not supported"
7966 msgid "clone from remote to remote not supported"
7952 msgstr ""
7967 msgstr ""
7953
7968
7954 msgid "updated"
7969 msgid "updated"
7955 msgstr ""
7970 msgstr ""
7956
7971
7957 msgid "merged"
7972 msgid "merged"
7958 msgstr ""
7973 msgstr ""
7959
7974
7960 msgid "removed"
7975 msgid "removed"
7961 msgstr ""
7976 msgstr ""
7962
7977
7963 msgid "unresolved"
7978 msgid "unresolved"
7964 msgstr ""
7979 msgstr ""
7965
7980
7966 #, python-format
7981 #, python-format
7967 msgid "%d files %s"
7982 msgid "%d files %s"
7968 msgstr ""
7983 msgstr ""
7969
7984
7970 msgid "use 'hg resolve' to retry unresolved file merges\n"
7985 msgid "use 'hg resolve' to retry unresolved file merges\n"
7971 msgstr ""
7986 msgstr ""
7972
7987
7973 msgid ""
7988 msgid ""
7974 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7989 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7975 "abandon\n"
7990 "abandon\n"
7976 msgstr ""
7991 msgstr ""
7977
7992
7978 msgid "(branch merge, don't forget to commit)\n"
7993 msgid "(branch merge, don't forget to commit)\n"
7979 msgstr ""
7994 msgstr ""
7980
7995
7981 #, python-format
7996 #, python-format
7982 msgid "error reading %s/.hg/hgrc: %s\n"
7997 msgid "error reading %s/.hg/hgrc: %s\n"
7983 msgstr ""
7998 msgstr ""
7984
7999
7985 msgid "SSL support is unavailable"
8000 msgid "SSL support is unavailable"
7986 msgstr ""
8001 msgstr ""
7987
8002
7988 msgid "IPv6 is not available on this system"
8003 msgid "IPv6 is not available on this system"
7989 msgstr ""
8004 msgstr ""
7990
8005
7991 #, python-format
8006 #, python-format
7992 msgid "cannot start server at '%s:%d': %s"
8007 msgid "cannot start server at '%s:%d': %s"
7993 msgstr ""
8008 msgstr ""
7994
8009
7995 #, python-format
8010 #, python-format
7996 msgid "calling hook %s: %s\n"
8011 msgid "calling hook %s: %s\n"
7997 msgstr ""
8012 msgstr ""
7998
8013
7999 #, python-format
8014 #, python-format
8000 msgid "%s hook is invalid (\"%s\" not in a module)"
8015 msgid "%s hook is invalid (\"%s\" not in a module)"
8001 msgstr ""
8016 msgstr ""
8002
8017
8003 #, python-format
8018 #, python-format
8004 msgid "%s hook is invalid (import of \"%s\" failed)"
8019 msgid "%s hook is invalid (import of \"%s\" failed)"
8005 msgstr ""
8020 msgstr ""
8006
8021
8007 #, python-format
8022 #, python-format
8008 msgid "%s hook is invalid (\"%s\" is not defined)"
8023 msgid "%s hook is invalid (\"%s\" is not defined)"
8009 msgstr ""
8024 msgstr ""
8010
8025
8011 #, python-format
8026 #, python-format
8012 msgid "%s hook is invalid (\"%s\" is not callable)"
8027 msgid "%s hook is invalid (\"%s\" is not callable)"
8013 msgstr ""
8028 msgstr ""
8014
8029
8015 #, python-format
8030 #, python-format
8016 msgid "error: %s hook failed: %s\n"
8031 msgid "error: %s hook failed: %s\n"
8017 msgstr ""
8032 msgstr ""
8018
8033
8019 #, python-format
8034 #, python-format
8020 msgid "error: %s hook raised an exception: %s\n"
8035 msgid "error: %s hook raised an exception: %s\n"
8021 msgstr ""
8036 msgstr ""
8022
8037
8023 #, python-format
8038 #, python-format
8024 msgid "%s hook failed"
8039 msgid "%s hook failed"
8025 msgstr ""
8040 msgstr ""
8026
8041
8027 #, python-format
8042 #, python-format
8028 msgid "warning: %s hook failed\n"
8043 msgid "warning: %s hook failed\n"
8029 msgstr ""
8044 msgstr ""
8030
8045
8031 #, python-format
8046 #, python-format
8032 msgid "running hook %s: %s\n"
8047 msgid "running hook %s: %s\n"
8033 msgstr ""
8048 msgstr ""
8034
8049
8035 #, python-format
8050 #, python-format
8036 msgid "%s hook %s"
8051 msgid "%s hook %s"
8037 msgstr ""
8052 msgstr ""
8038
8053
8039 #, python-format
8054 #, python-format
8040 msgid "warning: %s hook %s\n"
8055 msgid "warning: %s hook %s\n"
8041 msgstr ""
8056 msgstr ""
8042
8057
8043 msgid "connection ended unexpectedly"
8058 msgid "connection ended unexpectedly"
8044 msgstr ""
8059 msgstr ""
8045
8060
8046 #, python-format
8061 #, python-format
8047 msgid "unsupported URL component: \"%s\""
8062 msgid "unsupported URL component: \"%s\""
8048 msgstr ""
8063 msgstr ""
8049
8064
8050 #, python-format
8065 #, python-format
8051 msgid "using %s\n"
8066 msgid "using %s\n"
8052 msgstr ""
8067 msgstr ""
8053
8068
8054 #, python-format
8069 #, python-format
8055 msgid "capabilities: %s\n"
8070 msgid "capabilities: %s\n"
8056 msgstr ""
8071 msgstr ""
8057
8072
8058 msgid "operation not supported over http"
8073 msgid "operation not supported over http"
8059 msgstr ""
8074 msgstr ""
8060
8075
8061 #, python-format
8076 #, python-format
8062 msgid "sending %s command\n"
8077 msgid "sending %s command\n"
8063 msgstr ""
8078 msgstr ""
8064
8079
8065 #, python-format
8080 #, python-format
8066 msgid "sending %s bytes\n"
8081 msgid "sending %s bytes\n"
8067 msgstr ""
8082 msgstr ""
8068
8083
8069 msgid "authorization failed"
8084 msgid "authorization failed"
8070 msgstr ""
8085 msgstr ""
8071
8086
8072 #, python-format
8087 #, python-format
8073 msgid "http error while sending %s command\n"
8088 msgid "http error while sending %s command\n"
8074 msgstr ""
8089 msgstr ""
8075
8090
8076 msgid "http error, possibly caused by proxy setting"
8091 msgid "http error, possibly caused by proxy setting"
8077 msgstr ""
8092 msgstr ""
8078
8093
8079 #, python-format
8094 #, python-format
8080 msgid "real URL is %s\n"
8095 msgid "real URL is %s\n"
8081 msgstr ""
8096 msgstr ""
8082
8097
8083 #, python-format
8098 #, python-format
8084 msgid "requested URL: '%s'\n"
8099 msgid "requested URL: '%s'\n"
8085 msgstr ""
8100 msgstr ""
8086
8101
8087 #, python-format
8102 #, python-format
8088 msgid "'%s' does not appear to be an hg repository"
8103 msgid "'%s' does not appear to be an hg repository"
8089 msgstr ""
8104 msgstr ""
8090
8105
8091 #, python-format
8106 #, python-format
8092 msgid "'%s' sent a broken Content-Type header (%s)"
8107 msgid "'%s' sent a broken Content-Type header (%s)"
8093 msgstr ""
8108 msgstr ""
8094
8109
8095 #, python-format
8110 #, python-format
8096 msgid "'%s' uses newer protocol %s"
8111 msgid "'%s' uses newer protocol %s"
8097 msgstr ""
8112 msgstr ""
8098
8113
8099 msgid "look up remote revision"
8114 msgid "look up remote revision"
8100 msgstr ""
8115 msgstr ""
8101
8116
8102 msgid "unexpected response:"
8117 msgid "unexpected response:"
8103 msgstr ""
8118 msgstr ""
8104
8119
8105 msgid "look up remote changes"
8120 msgid "look up remote changes"
8106 msgstr ""
8121 msgstr ""
8107
8122
8108 msgid "push failed (unexpected response):"
8123 msgid "push failed (unexpected response):"
8109 msgstr ""
8124 msgstr ""
8110
8125
8111 #, python-format
8126 #, python-format
8112 msgid "push failed: %s"
8127 msgid "push failed: %s"
8113 msgstr ""
8128 msgstr ""
8114
8129
8115 msgid "Python support for SSL and HTTPS is not installed"
8130 msgid "Python support for SSL and HTTPS is not installed"
8116 msgstr ""
8131 msgstr ""
8117
8132
8118 msgid "cannot create new http repository"
8133 msgid "cannot create new http repository"
8119 msgstr ""
8134 msgstr ""
8120
8135
8121 #, python-format
8136 #, python-format
8122 msgid "%s: ignoring invalid syntax '%s'\n"
8137 msgid "%s: ignoring invalid syntax '%s'\n"
8123 msgstr ""
8138 msgstr ""
8124
8139
8125 #, python-format
8140 #, python-format
8126 msgid "skipping unreadable ignore file '%s': %s\n"
8141 msgid "skipping unreadable ignore file '%s': %s\n"
8127 msgstr ""
8142 msgstr ""
8128
8143
8129 #, python-format
8144 #, python-format
8130 msgid "repository %s not found"
8145 msgid "repository %s not found"
8131 msgstr ""
8146 msgstr ""
8132
8147
8133 #, python-format
8148 #, python-format
8134 msgid "repository %s already exists"
8149 msgid "repository %s already exists"
8135 msgstr ""
8150 msgstr ""
8136
8151
8137 #, python-format
8152 #, python-format
8138 msgid "requirement '%s' not supported"
8153 msgid "requirement '%s' not supported"
8139 msgstr ""
8154 msgstr ""
8140
8155
8141 #, python-format
8156 #, python-format
8142 msgid ".hg/sharedpath points to nonexistent directory %s"
8157 msgid ".hg/sharedpath points to nonexistent directory %s"
8143 msgstr ""
8158 msgstr ""
8144
8159
8145 #, python-format
8160 #, python-format
8146 msgid "%r cannot be used in a tag name"
8161 msgid "%r cannot be used in a tag name"
8147 msgstr ""
8162 msgstr ""
8148
8163
8149 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8164 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8150 msgstr ""
8165 msgstr ""
8151
8166
8152 #, python-format
8167 #, python-format
8153 msgid "%s, line %s: %s\n"
8168 msgid "%s, line %s: %s\n"
8154 msgstr ""
8169 msgstr ""
8155
8170
8156 msgid "cannot parse entry"
8171 msgid "cannot parse entry"
8157 msgstr ""
8172 msgstr ""
8158
8173
8159 #, python-format
8174 #, python-format
8160 msgid "node '%s' is not well formed"
8175 msgid "node '%s' is not well formed"
8161 msgstr ""
8176 msgstr ""
8162
8177
8163 #, python-format
8178 #, python-format
8164 msgid "working directory has unknown parent '%s'!"
8179 msgid "working directory has unknown parent '%s'!"
8165 msgstr ""
8180 msgstr ""
8166
8181
8167 #, python-format
8182 #, python-format
8168 msgid "unknown revision '%s'"
8183 msgid "unknown revision '%s'"
8169 msgstr ""
8184 msgstr ""
8170
8185
8171 #, python-format
8186 #, python-format
8172 msgid "filtering %s through %s\n"
8187 msgid "filtering %s through %s\n"
8173 msgstr ""
8188 msgstr ""
8174
8189
8175 msgid "journal already exists - run hg recover"
8190 msgid "journal already exists - run hg recover"
8176 msgstr ""
8191 msgstr ""
8177
8192
8178 msgid "rolling back interrupted transaction\n"
8193 msgid "rolling back interrupted transaction\n"
8179 msgstr ""
8194 msgstr ""
8180
8195
8181 msgid "no interrupted transaction available\n"
8196 msgid "no interrupted transaction available\n"
8182 msgstr ""
8197 msgstr ""
8183
8198
8184 msgid "rolling back last transaction\n"
8199 msgid "rolling back last transaction\n"
8185 msgstr ""
8200 msgstr ""
8186
8201
8187 #, python-format
8202 #, python-format
8188 msgid "Named branch could not be reset, current branch still is: %s\n"
8203 msgid "Named branch could not be reset, current branch still is: %s\n"
8189 msgstr ""
8204 msgstr ""
8190
8205
8191 msgid "no rollback information available\n"
8206 msgid "no rollback information available\n"
8192 msgstr ""
8207 msgstr ""
8193
8208
8194 #, python-format
8209 #, python-format
8195 msgid "waiting for lock on %s held by %r\n"
8210 msgid "waiting for lock on %s held by %r\n"
8196 msgstr ""
8211 msgstr ""
8197
8212
8198 #, python-format
8213 #, python-format
8199 msgid "repository %s"
8214 msgid "repository %s"
8200 msgstr ""
8215 msgstr ""
8201
8216
8202 #, python-format
8217 #, python-format
8203 msgid "working directory of %s"
8218 msgid "working directory of %s"
8204 msgstr ""
8219 msgstr ""
8205
8220
8206 #, python-format
8221 #, python-format
8207 msgid " %s: searching for copy revision for %s\n"
8222 msgid " %s: searching for copy revision for %s\n"
8208 msgstr ""
8223 msgstr ""
8209
8224
8210 #, python-format
8225 #, python-format
8211 msgid " %s: copy %s:%s\n"
8226 msgid " %s: copy %s:%s\n"
8212 msgstr ""
8227 msgstr ""
8213
8228
8214 msgid "cannot partially commit a merge (do not specify files or patterns)"
8229 msgid "cannot partially commit a merge (do not specify files or patterns)"
8215 msgstr ""
8230 msgstr ""
8216
8231
8217 msgid "file not found!"
8232 msgid "file not found!"
8218 msgstr ""
8233 msgstr ""
8219
8234
8220 msgid "no match under directory!"
8235 msgid "no match under directory!"
8221 msgstr ""
8236 msgstr ""
8222
8237
8223 msgid "file not tracked!"
8238 msgid "file not tracked!"
8224 msgstr ""
8239 msgstr ""
8225
8240
8226 msgid "nothing changed\n"
8227 msgstr ""
8228
8229 msgid "unresolved merge conflicts (see hg resolve)"
8241 msgid "unresolved merge conflicts (see hg resolve)"
8230 msgstr ""
8242 msgstr ""
8231
8243
8232 #, python-format
8244 #, python-format
8233 msgid "committing subrepository %s\n"
8245 msgid "committing subrepository %s\n"
8234 msgstr ""
8246 msgstr ""
8235
8247
8236 #, python-format
8248 #, python-format
8237 msgid "trouble committing %s!\n"
8249 msgid "trouble committing %s!\n"
8238 msgstr ""
8250 msgstr ""
8239
8251
8240 #, python-format
8252 #, python-format
8241 msgid "%s does not exist!\n"
8253 msgid "%s does not exist!\n"
8242 msgstr ""
8254 msgstr ""
8243
8255
8244 #, python-format
8256 #, python-format
8245 msgid ""
8257 msgid ""
8246 "%s: files over 10MB may cause memory and performance problems\n"
8258 "%s: files over 10MB may cause memory and performance problems\n"
8247 "(use 'hg revert %s' to unadd the file)\n"
8259 "(use 'hg revert %s' to unadd the file)\n"
8248 msgstr ""
8260 msgstr ""
8249
8261
8250 #, python-format
8262 #, python-format
8251 msgid "%s not added: only files and symlinks supported currently\n"
8263 msgid "%s not added: only files and symlinks supported currently\n"
8252 msgstr ""
8264 msgstr ""
8253
8265
8254 #, python-format
8266 #, python-format
8255 msgid "%s already tracked!\n"
8267 msgid "%s already tracked!\n"
8256 msgstr ""
8268 msgstr ""
8257
8269
8258 #, python-format
8270 #, python-format
8259 msgid "%s not added!\n"
8271 msgid "%s not added!\n"
8260 msgstr ""
8272 msgstr ""
8261
8273
8262 #, python-format
8274 #, python-format
8263 msgid "%s still exists!\n"
8275 msgid "%s still exists!\n"
8264 msgstr ""
8276 msgstr ""
8265
8277
8266 #, python-format
8278 #, python-format
8267 msgid "%s not tracked!\n"
8279 msgid "%s not tracked!\n"
8268 msgstr ""
8280 msgstr ""
8269
8281
8270 #, python-format
8282 #, python-format
8271 msgid "%s not removed!\n"
8283 msgid "%s not removed!\n"
8272 msgstr ""
8284 msgstr ""
8273
8285
8274 #, python-format
8286 #, python-format
8275 msgid "copy failed: %s is not a file or a symbolic link\n"
8287 msgid "copy failed: %s is not a file or a symbolic link\n"
8276 msgstr ""
8288 msgstr ""
8277
8289
8278 msgid "searching for changes\n"
8290 msgid "searching for changes\n"
8279 msgstr ""
8291 msgstr ""
8280
8292
8281 #, python-format
8293 #, python-format
8282 msgid "examining %s:%s\n"
8294 msgid "examining %s:%s\n"
8283 msgstr ""
8295 msgstr ""
8284
8296
8285 msgid "branch already found\n"
8297 msgid "branch already found\n"
8286 msgstr ""
8298 msgstr ""
8287
8299
8288 #, python-format
8300 #, python-format
8289 msgid "found incomplete branch %s:%s\n"
8301 msgid "found incomplete branch %s:%s\n"
8290 msgstr ""
8302 msgstr ""
8291
8303
8292 #, python-format
8304 #, python-format
8293 msgid "found new changeset %s\n"
8305 msgid "found new changeset %s\n"
8294 msgstr ""
8306 msgstr ""
8295
8307
8296 #, python-format
8308 #, python-format
8297 msgid "request %d: %s\n"
8309 msgid "request %d: %s\n"
8298 msgstr ""
8310 msgstr ""
8299
8311
8300 #, python-format
8312 #, python-format
8301 msgid "received %s:%s\n"
8313 msgid "received %s:%s\n"
8302 msgstr ""
8314 msgstr ""
8303
8315
8304 #, python-format
8316 #, python-format
8305 msgid "narrowing %d:%d %s\n"
8317 msgid "narrowing %d:%d %s\n"
8306 msgstr ""
8318 msgstr ""
8307
8319
8308 #, python-format
8320 #, python-format
8309 msgid "found new branch changeset %s\n"
8321 msgid "found new branch changeset %s\n"
8310 msgstr ""
8322 msgstr ""
8311
8323
8312 #, python-format
8324 #, python-format
8313 msgid "narrowed branch search to %s:%s\n"
8325 msgid "narrowed branch search to %s:%s\n"
8314 msgstr ""
8326 msgstr ""
8315
8327
8316 msgid "already have changeset "
8328 msgid "already have changeset "
8317 msgstr ""
8329 msgstr ""
8318
8330
8319 msgid "warning: repository is unrelated\n"
8331 msgid "warning: repository is unrelated\n"
8320 msgstr ""
8332 msgstr ""
8321
8333
8322 msgid "repository is unrelated"
8334 msgid "repository is unrelated"
8323 msgstr ""
8335 msgstr ""
8324
8336
8325 msgid "found new changesets starting at "
8337 msgid "found new changesets starting at "
8326 msgstr ""
8338 msgstr ""
8327
8339
8328 #, python-format
8340 #, python-format
8329 msgid "%d total queries\n"
8341 msgid "%d total queries\n"
8330 msgstr ""
8342 msgstr ""
8331
8343
8332 msgid "common changesets up to "
8344 msgid "common changesets up to "
8333 msgstr ""
8345 msgstr ""
8334
8346
8335 msgid "requesting all changes\n"
8347 msgid "requesting all changes\n"
8336 msgstr ""
8348 msgstr ""
8337
8349
8338 msgid ""
8350 msgid ""
8339 "Partial pull cannot be done because other repository doesn't support "
8351 "Partial pull cannot be done because other repository doesn't support "
8340 "changegroupsubset."
8352 "changegroupsubset."
8341 msgstr ""
8353 msgstr ""
8342
8354
8343 #, python-format
8355 #, python-format
8344 msgid "abort: push creates new remote branch '%s'!\n"
8356 msgid "abort: push creates new remote branch '%s'!\n"
8345 msgstr ""
8357 msgstr ""
8346
8358
8347 msgid "abort: push creates new remote heads!\n"
8359 msgid "abort: push creates new remote heads!\n"
8348 msgstr ""
8360 msgstr ""
8349
8361
8350 msgid "(did you forget to merge? use push -f to force)\n"
8362 msgid "(did you forget to merge? use push -f to force)\n"
8351 msgstr ""
8363 msgstr ""
8352
8364
8353 msgid "note: unsynced remote changes!\n"
8365 msgid "note: unsynced remote changes!\n"
8354 msgstr ""
8366 msgstr ""
8355
8367
8356 #, python-format
8368 #, python-format
8357 msgid "%d changesets found\n"
8369 msgid "%d changesets found\n"
8358 msgstr ""
8370 msgstr ""
8359
8371
8360 msgid "list of changesets:\n"
8372 msgid "list of changesets:\n"
8361 msgstr ""
8373 msgstr ""
8362
8374
8363 #, python-format
8375 #, python-format
8364 msgid "empty or missing revlog for %s"
8376 msgid "empty or missing revlog for %s"
8365 msgstr ""
8377 msgstr ""
8366
8378
8367 #, python-format
8379 #, python-format
8368 msgid "add changeset %s\n"
8380 msgid "add changeset %s\n"
8369 msgstr ""
8381 msgstr ""
8370
8382
8371 msgid "adding changesets\n"
8383 msgid "adding changesets\n"
8372 msgstr ""
8384 msgstr ""
8373
8385
8374 msgid "received changelog group is empty"
8386 msgid "received changelog group is empty"
8375 msgstr ""
8387 msgstr ""
8376
8388
8377 msgid "adding manifests\n"
8389 msgid "adding manifests\n"
8378 msgstr ""
8390 msgstr ""
8379
8391
8380 msgid "adding file changes\n"
8392 msgid "adding file changes\n"
8381 msgstr ""
8393 msgstr ""
8382
8394
8383 #, python-format
8395 #, python-format
8384 msgid "adding %s revisions\n"
8396 msgid "adding %s revisions\n"
8385 msgstr ""
8397 msgstr ""
8386
8398
8387 msgid "received file revlog group is empty"
8399 msgid "received file revlog group is empty"
8388 msgstr ""
8400 msgstr ""
8389
8401
8390 #, python-format
8402 #, python-format
8391 msgid " (%+d heads)"
8403 msgid " (%+d heads)"
8392 msgstr ""
8404 msgstr ""
8393
8405
8394 #, python-format
8406 #, python-format
8395 msgid "added %d changesets with %d changes to %d files%s\n"
8407 msgid "added %d changesets with %d changes to %d files%s\n"
8396 msgstr ""
8408 msgstr ""
8397
8409
8398 msgid "updating the branch cache\n"
8410 msgid "updating the branch cache\n"
8399 msgstr ""
8411 msgstr ""
8400
8412
8401 msgid "Unexpected response from remote server:"
8413 msgid "Unexpected response from remote server:"
8402 msgstr ""
8414 msgstr ""
8403
8415
8404 msgid "operation forbidden by server"
8416 msgid "operation forbidden by server"
8405 msgstr ""
8417 msgstr ""
8406
8418
8407 msgid "locking the remote repository failed"
8419 msgid "locking the remote repository failed"
8408 msgstr ""
8420 msgstr ""
8409
8421
8410 msgid "the server sent an unknown error code"
8422 msgid "the server sent an unknown error code"
8411 msgstr ""
8423 msgstr ""
8412
8424
8413 msgid "streaming all changes\n"
8425 msgid "streaming all changes\n"
8414 msgstr ""
8426 msgstr ""
8415
8427
8416 #, python-format
8428 #, python-format
8417 msgid "%d files to transfer, %s of data\n"
8429 msgid "%d files to transfer, %s of data\n"
8418 msgstr ""
8430 msgstr ""
8419
8431
8420 #, python-format
8432 #, python-format
8421 msgid "adding %s (%s)\n"
8433 msgid "adding %s (%s)\n"
8422 msgstr ""
8434 msgstr ""
8423
8435
8424 #, python-format
8436 #, python-format
8425 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8437 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8426 msgstr ""
8438 msgstr ""
8427
8439
8428 msgid "no [smtp]host in hgrc - cannot send mail"
8440 msgid "no [smtp]host in hgrc - cannot send mail"
8429 msgstr ""
8441 msgstr ""
8430
8442
8431 #, python-format
8443 #, python-format
8432 msgid "sending mail: smtp host %s, port %s\n"
8444 msgid "sending mail: smtp host %s, port %s\n"
8433 msgstr ""
8445 msgstr ""
8434
8446
8435 msgid "can't use TLS: Python SSL support not installed"
8447 msgid "can't use TLS: Python SSL support not installed"
8436 msgstr ""
8448 msgstr ""
8437
8449
8438 msgid "(using tls)\n"
8450 msgid "(using tls)\n"
8439 msgstr ""
8451 msgstr ""
8440
8452
8441 #, python-format
8453 #, python-format
8442 msgid "(authenticating to mail server as %s)\n"
8454 msgid "(authenticating to mail server as %s)\n"
8443 msgstr ""
8455 msgstr ""
8444
8456
8445 #, python-format
8457 #, python-format
8446 msgid "sending mail: %s\n"
8458 msgid "sending mail: %s\n"
8447 msgstr ""
8459 msgstr ""
8448
8460
8449 msgid "smtp specified as email transport, but no smtp host configured"
8461 msgid "smtp specified as email transport, but no smtp host configured"
8450 msgstr ""
8462 msgstr ""
8451
8463
8452 #, python-format
8464 #, python-format
8453 msgid "%r specified as email transport, but not in PATH"
8465 msgid "%r specified as email transport, but not in PATH"
8454 msgstr ""
8466 msgstr ""
8455
8467
8456 #, python-format
8468 #, python-format
8457 msgid "ignoring invalid sendcharset: %s\n"
8469 msgid "ignoring invalid sendcharset: %s\n"
8458 msgstr ""
8470 msgstr ""
8459
8471
8460 #, python-format
8472 #, python-format
8461 msgid "invalid email address: %s"
8473 msgid "invalid email address: %s"
8462 msgstr ""
8474 msgstr ""
8463
8475
8464 #, python-format
8476 #, python-format
8465 msgid "invalid local address: %s"
8477 msgid "invalid local address: %s"
8466 msgstr ""
8478 msgstr ""
8467
8479
8468 #, python-format
8480 #, python-format
8469 msgid "failed to remove %s from manifest"
8481 msgid "failed to remove %s from manifest"
8470 msgstr ""
8482 msgstr ""
8471
8483
8472 #, python-format
8484 #, python-format
8473 msgid "diff context lines count must be an integer, not %r"
8485 msgid "diff context lines count must be an integer, not %r"
8474 msgstr ""
8486 msgstr ""
8475
8487
8476 #, python-format
8488 #, python-format
8477 msgid ""
8489 msgid ""
8478 "untracked file in working directory differs from file in requested revision: "
8490 "untracked file in working directory differs from file in requested revision: "
8479 "'%s'"
8491 "'%s'"
8480 msgstr ""
8492 msgstr ""
8481
8493
8482 #, python-format
8494 #, python-format
8483 msgid "case-folding collision between %s and %s"
8495 msgid "case-folding collision between %s and %s"
8484 msgstr ""
8496 msgstr ""
8485
8497
8486 #, python-format
8498 #, python-format
8487 msgid ""
8499 msgid ""
8488 " conflicting flags for %s\n"
8500 " conflicting flags for %s\n"
8489 "(n)one, e(x)ec or sym(l)ink?"
8501 "(n)one, e(x)ec or sym(l)ink?"
8490 msgstr ""
8502 msgstr ""
8491
8503
8492 msgid "&None"
8504 msgid "&None"
8493 msgstr ""
8505 msgstr ""
8494
8506
8495 msgid "E&xec"
8507 msgid "E&xec"
8496 msgstr ""
8508 msgstr ""
8497
8509
8498 msgid "Sym&link"
8510 msgid "Sym&link"
8499 msgstr ""
8511 msgstr ""
8500
8512
8501 msgid "resolving manifests\n"
8513 msgid "resolving manifests\n"
8502 msgstr ""
8514 msgstr ""
8503
8515
8504 #, python-format
8516 #, python-format
8505 msgid " overwrite %s partial %s\n"
8517 msgid " overwrite %s partial %s\n"
8506 msgstr ""
8518 msgstr ""
8507
8519
8508 #, python-format
8520 #, python-format
8509 msgid " ancestor %s local %s remote %s\n"
8521 msgid " ancestor %s local %s remote %s\n"
8510 msgstr ""
8522 msgstr ""
8511
8523
8512 #, python-format
8524 #, python-format
8513 msgid ""
8525 msgid ""
8514 " local changed %s which remote deleted\n"
8526 " local changed %s which remote deleted\n"
8515 "use (c)hanged version or (d)elete?"
8527 "use (c)hanged version or (d)elete?"
8516 msgstr ""
8528 msgstr ""
8517
8529
8518 msgid "&Changed"
8530 msgid "&Changed"
8519 msgstr ""
8531 msgstr ""
8520
8532
8521 msgid "&Delete"
8533 msgid "&Delete"
8522 msgstr ""
8534 msgstr ""
8523
8535
8524 msgid "c"
8536 msgid "c"
8525 msgstr ""
8537 msgstr ""
8526
8538
8527 #, python-format
8539 #, python-format
8528 msgid ""
8540 msgid ""
8529 "remote changed %s which local deleted\n"
8541 "remote changed %s which local deleted\n"
8530 "use (c)hanged version or leave (d)eleted?"
8542 "use (c)hanged version or leave (d)eleted?"
8531 msgstr ""
8543 msgstr ""
8532
8544
8533 msgid "&Deleted"
8545 msgid "&Deleted"
8534 msgstr ""
8546 msgstr ""
8535
8547
8536 #, python-format
8548 #, python-format
8537 msgid "preserving %s for resolve of %s\n"
8549 msgid "preserving %s for resolve of %s\n"
8538 msgstr ""
8550 msgstr ""
8539
8551
8540 #, python-format
8552 #, python-format
8541 msgid "update failed to remove %s: %s!\n"
8553 msgid "update failed to remove %s: %s!\n"
8542 msgstr ""
8554 msgstr ""
8543
8555
8544 #, python-format
8556 #, python-format
8545 msgid "getting %s\n"
8557 msgid "getting %s\n"
8546 msgstr ""
8558 msgstr ""
8547
8559
8548 #, python-format
8560 #, python-format
8549 msgid "getting %s to %s\n"
8561 msgid "getting %s to %s\n"
8550 msgstr ""
8562 msgstr ""
8551
8563
8552 #, python-format
8564 #, python-format
8553 msgid "warning: detected divergent renames of %s to:\n"
8565 msgid "warning: detected divergent renames of %s to:\n"
8554 msgstr ""
8566 msgstr ""
8555
8567
8556 #, python-format
8568 #, python-format
8557 msgid "branch %s not found"
8569 msgid "branch %s not found"
8558 msgstr ""
8570 msgstr ""
8559
8571
8560 msgid "can't merge with ancestor"
8572 msgid "can't merge with ancestor"
8561 msgstr ""
8573 msgstr ""
8562
8574
8563 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8575 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8564 msgstr ""
8576 msgstr ""
8565
8577
8566 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8578 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8567 msgstr ""
8579 msgstr ""
8568
8580
8569 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8581 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8570 msgstr ""
8582 msgstr ""
8571
8583
8572 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8584 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8573 msgstr ""
8585 msgstr ""
8574
8586
8575 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8587 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8576 msgstr ""
8588 msgstr ""
8577
8589
8578 #, python-format
8590 #, python-format
8579 msgid "cannot create %s: destination already exists"
8591 msgid "cannot create %s: destination already exists"
8580 msgstr ""
8592 msgstr ""
8581
8593
8582 #, python-format
8594 #, python-format
8583 msgid "cannot create %s: unable to create destination directory"
8595 msgid "cannot create %s: unable to create destination directory"
8584 msgstr ""
8596 msgstr ""
8585
8597
8586 #, python-format
8598 #, python-format
8587 msgid "found patch at byte %d\n"
8599 msgid "found patch at byte %d\n"
8588 msgstr ""
8600 msgstr ""
8589
8601
8590 msgid "patch generated by hg export\n"
8602 msgid "patch generated by hg export\n"
8591 msgstr ""
8603 msgstr ""
8592
8604
8593 #, python-format
8605 #, python-format
8594 msgid "unable to find '%s' for patching\n"
8606 msgid "unable to find '%s' for patching\n"
8595 msgstr ""
8607 msgstr ""
8596
8608
8597 #, python-format
8609 #, python-format
8598 msgid "patching file %s\n"
8610 msgid "patching file %s\n"
8599 msgstr ""
8611 msgstr ""
8600
8612
8601 #, python-format
8613 #, python-format
8602 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8614 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8603 msgstr ""
8615 msgstr ""
8604
8616
8605 #, python-format
8617 #, python-format
8606 msgid "bad hunk #%d %s (%d %d %d %d)"
8618 msgid "bad hunk #%d %s (%d %d %d %d)"
8607 msgstr ""
8619 msgstr ""
8608
8620
8609 #, python-format
8621 #, python-format
8610 msgid "file %s already exists\n"
8622 msgid "file %s already exists\n"
8611 msgstr ""
8623 msgstr ""
8612
8624
8613 #, python-format
8625 #, python-format
8614 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8626 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8615 msgstr ""
8627 msgstr ""
8616
8628
8617 #, python-format
8629 #, python-format
8618 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8630 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8619 msgstr ""
8631 msgstr ""
8620
8632
8621 #, python-format
8633 #, python-format
8622 msgid "Hunk #%d FAILED at %d\n"
8634 msgid "Hunk #%d FAILED at %d\n"
8623 msgstr ""
8635 msgstr ""
8624
8636
8625 #, python-format
8637 #, python-format
8626 msgid "bad hunk #%d"
8638 msgid "bad hunk #%d"
8627 msgstr ""
8639 msgstr ""
8628
8640
8629 #, python-format
8641 #, python-format
8630 msgid "bad hunk #%d old text line %d"
8642 msgid "bad hunk #%d old text line %d"
8631 msgstr ""
8643 msgstr ""
8632
8644
8633 msgid "could not extract binary patch"
8645 msgid "could not extract binary patch"
8634 msgstr ""
8646 msgstr ""
8635
8647
8636 #, python-format
8648 #, python-format
8637 msgid "binary patch is %d bytes, not %d"
8649 msgid "binary patch is %d bytes, not %d"
8638 msgstr ""
8650 msgstr ""
8639
8651
8640 #, python-format
8652 #, python-format
8641 msgid "unable to strip away %d dirs from %s"
8653 msgid "unable to strip away %d dirs from %s"
8642 msgstr ""
8654 msgstr ""
8643
8655
8644 msgid "undefined source and destination files"
8656 msgid "undefined source and destination files"
8645 msgstr ""
8657 msgstr ""
8646
8658
8647 #, python-format
8659 #, python-format
8648 msgid "malformed patch %s %s"
8660 msgid "malformed patch %s %s"
8649 msgstr ""
8661 msgstr ""
8650
8662
8651 #, python-format
8663 #, python-format
8652 msgid "unsupported parser state: %s"
8664 msgid "unsupported parser state: %s"
8653 msgstr ""
8665 msgstr ""
8654
8666
8655 #, python-format
8667 #, python-format
8656 msgid "patch command failed: %s"
8668 msgid "patch command failed: %s"
8657 msgstr ""
8669 msgstr ""
8658
8670
8659 #, python-format
8671 #, python-format
8660 msgid "Unsupported line endings type: %s"
8672 msgid "Unsupported line endings type: %s"
8661 msgstr ""
8673 msgstr ""
8662
8674
8663 #, python-format
8675 #, python-format
8664 msgid "no valid hunks found; trying with %r instead\n"
8676 msgid "no valid hunks found; trying with %r instead\n"
8665 msgstr ""
8677 msgstr ""
8666
8678
8667 #, python-format
8679 #, python-format
8668 msgid "exited with status %d"
8680 msgid "exited with status %d"
8669 msgstr ""
8681 msgstr ""
8670
8682
8671 #, python-format
8683 #, python-format
8672 msgid "killed by signal %d"
8684 msgid "killed by signal %d"
8673 msgstr ""
8685 msgstr ""
8674
8686
8675 #, python-format
8687 #, python-format
8676 msgid "stopped by signal %d"
8688 msgid "stopped by signal %d"
8677 msgstr ""
8689 msgstr ""
8678
8690
8679 msgid "invalid exit code"
8691 msgid "invalid exit code"
8680 msgstr ""
8692 msgstr ""
8681
8693
8682 #, python-format
8694 #, python-format
8683 msgid "saving bundle to %s\n"
8695 msgid "saving bundle to %s\n"
8684 msgstr ""
8696 msgstr ""
8685
8697
8686 msgid "adding branch\n"
8698 msgid "adding branch\n"
8687 msgstr ""
8699 msgstr ""
8688
8700
8689 #, python-format
8701 #, python-format
8690 msgid "cannot %s; remote repository does not support the %r capability"
8702 msgid "cannot %s; remote repository does not support the %r capability"
8691 msgstr ""
8703 msgstr ""
8692
8704
8693 #, python-format
8705 #, python-format
8694 msgid "unknown compression type %r"
8706 msgid "unknown compression type %r"
8695 msgstr ""
8707 msgstr ""
8696
8708
8697 #, python-format
8709 #, python-format
8698 msgid "index %s unknown flags %#04x for format v0"
8710 msgid "index %s unknown flags %#04x for format v0"
8699 msgstr ""
8711 msgstr ""
8700
8712
8701 #, python-format
8713 #, python-format
8702 msgid "index %s unknown flags %#04x for revlogng"
8714 msgid "index %s unknown flags %#04x for revlogng"
8703 msgstr ""
8715 msgstr ""
8704
8716
8705 #, python-format
8717 #, python-format
8706 msgid "index %s unknown format %d"
8718 msgid "index %s unknown format %d"
8707 msgstr ""
8719 msgstr ""
8708
8720
8709 #, python-format
8721 #, python-format
8710 msgid "index %s is corrupted"
8722 msgid "index %s is corrupted"
8711 msgstr ""
8723 msgstr ""
8712
8724
8713 msgid "no node"
8725 msgid "no node"
8714 msgstr ""
8726 msgstr ""
8715
8727
8716 msgid "ambiguous identifier"
8728 msgid "ambiguous identifier"
8717 msgstr ""
8729 msgstr ""
8718
8730
8719 msgid "no match found"
8731 msgid "no match found"
8720 msgstr ""
8732 msgstr ""
8721
8733
8722 #, python-format
8734 #, python-format
8723 msgid "incompatible revision flag %x"
8735 msgid "incompatible revision flag %x"
8724 msgstr ""
8736 msgstr ""
8725
8737
8726 #, python-format
8738 #, python-format
8727 msgid "%s not found in the transaction"
8739 msgid "%s not found in the transaction"
8728 msgstr ""
8740 msgstr ""
8729
8741
8730 msgid "unknown base"
8742 msgid "unknown base"
8731 msgstr ""
8743 msgstr ""
8732
8744
8733 msgid "consistency error adding group"
8745 msgid "consistency error adding group"
8734 msgstr ""
8746 msgstr ""
8735
8747
8736 #, python-format
8748 #, python-format
8737 msgid "%s looks like a binary file."
8749 msgid "%s looks like a binary file."
8738 msgstr ""
8750 msgstr ""
8739
8751
8740 msgid "can only specify two labels."
8752 msgid "can only specify two labels."
8741 msgstr ""
8753 msgstr ""
8742
8754
8743 msgid "warning: conflicts during merge.\n"
8755 msgid "warning: conflicts during merge.\n"
8744 msgstr ""
8756 msgstr ""
8745
8757
8746 #, python-format
8758 #, python-format
8747 msgid "couldn't parse location %s"
8759 msgid "couldn't parse location %s"
8748 msgstr ""
8760 msgstr ""
8749
8761
8750 msgid "could not create remote repo"
8762 msgid "could not create remote repo"
8751 msgstr ""
8763 msgstr ""
8752
8764
8753 msgid "remote: "
8765 msgid "remote: "
8754 msgstr ""
8766 msgstr ""
8755
8767
8756 msgid "no suitable response from remote hg"
8768 msgid "no suitable response from remote hg"
8757 msgstr ""
8769 msgstr ""
8758
8770
8759 #, python-format
8771 #, python-format
8760 msgid "push refused: %s"
8772 msgid "push refused: %s"
8761 msgstr ""
8773 msgstr ""
8762
8774
8763 msgid "unsynced changes"
8775 msgid "unsynced changes"
8764 msgstr ""
8776 msgstr ""
8765
8777
8766 msgid "cannot lock static-http repository"
8778 msgid "cannot lock static-http repository"
8767 msgstr ""
8779 msgstr ""
8768
8780
8769 msgid "cannot create new static-http repository"
8781 msgid "cannot create new static-http repository"
8770 msgstr ""
8782 msgstr ""
8771
8783
8772 #, python-format
8784 #, python-format
8773 msgid "invalid entry in fncache, line %s"
8785 msgid "invalid entry in fncache, line %s"
8774 msgstr ""
8786 msgstr ""
8775
8787
8776 msgid "scanning\n"
8788 msgid "scanning\n"
8777 msgstr ""
8789 msgstr ""
8778
8790
8779 #, python-format
8791 #, python-format
8780 msgid "%d files, %d bytes to transfer\n"
8792 msgid "%d files, %d bytes to transfer\n"
8781 msgstr ""
8793 msgstr ""
8782
8794
8783 #, python-format
8795 #, python-format
8784 msgid "sending %s (%d bytes)\n"
8796 msgid "sending %s (%d bytes)\n"
8785 msgstr ""
8797 msgstr ""
8786
8798
8787 #, python-format
8799 #, python-format
8788 msgid ""
8800 msgid ""
8789 " subrepository sources for %s differ\n"
8801 " subrepository sources for %s differ\n"
8790 "use (l)ocal source (%s) or (r)emote source (%s)?"
8802 "use (l)ocal source (%s) or (r)emote source (%s)?"
8791 msgstr ""
8803 msgstr ""
8792
8804
8793 msgid "&Remote"
8805 msgid "&Remote"
8794 msgstr ""
8806 msgstr ""
8795
8807
8796 msgid "r"
8808 msgid "r"
8797 msgstr ""
8809 msgstr ""
8798
8810
8799 #, python-format
8811 #, python-format
8800 msgid ""
8812 msgid ""
8801 " local changed subrepository %s which remote removed\n"
8813 " local changed subrepository %s which remote removed\n"
8802 "use (c)hanged version or (d)elete?"
8814 "use (c)hanged version or (d)elete?"
8803 msgstr ""
8815 msgstr ""
8804
8816
8805 #, python-format
8817 #, python-format
8806 msgid ""
8818 msgid ""
8807 " remote changed subrepository %s which local removed\n"
8819 " remote changed subrepository %s which local removed\n"
8808 "use (c)hanged version or (d)elete?"
8820 "use (c)hanged version or (d)elete?"
8809 msgstr ""
8821 msgstr ""
8810
8822
8811 #, python-format
8823 #, python-format
8812 msgid "removing subrepo %s\n"
8824 msgid "removing subrepo %s\n"
8813 msgstr ""
8825 msgstr ""
8814
8826
8815 #, python-format
8827 #, python-format
8816 msgid "pulling subrepo %s\n"
8828 msgid "pulling subrepo %s\n"
8817 msgstr ""
8829 msgstr ""
8818
8830
8819 #, python-format
8831 #, python-format
8820 msgid "pushing subrepo %s\n"
8832 msgid "pushing subrepo %s\n"
8821 msgstr ""
8833 msgstr ""
8822
8834
8823 msgid "unmatched quotes"
8835 msgid "unmatched quotes"
8824 msgstr ""
8836 msgstr ""
8825
8837
8826 #, python-format
8838 #, python-format
8827 msgid "error expanding '%s%%%s'"
8839 msgid "error expanding '%s%%%s'"
8828 msgstr ""
8840 msgstr ""
8829
8841
8830 #, python-format
8842 #, python-format
8831 msgid "unknown filter '%s'"
8843 msgid "unknown filter '%s'"
8832 msgstr ""
8844 msgstr ""
8833
8845
8834 #, python-format
8846 #, python-format
8835 msgid "style not found: %s"
8847 msgid "style not found: %s"
8836 msgstr ""
8848 msgstr ""
8837
8849
8838 #, python-format
8850 #, python-format
8839 msgid "template file %s: %s"
8851 msgid "template file %s: %s"
8840 msgstr ""
8852 msgstr ""
8841
8853
8842 msgid "cannot use transaction when it is already committed/aborted"
8854 msgid "cannot use transaction when it is already committed/aborted"
8843 msgstr ""
8855 msgstr ""
8844
8856
8845 #, python-format
8857 #, python-format
8846 msgid "failed to truncate %s\n"
8858 msgid "failed to truncate %s\n"
8847 msgstr ""
8859 msgstr ""
8848
8860
8849 msgid "transaction abort!\n"
8861 msgid "transaction abort!\n"
8850 msgstr ""
8862 msgstr ""
8851
8863
8852 msgid "rollback completed\n"
8864 msgid "rollback completed\n"
8853 msgstr ""
8865 msgstr ""
8854
8866
8855 msgid "rollback failed - please run hg recover\n"
8867 msgid "rollback failed - please run hg recover\n"
8856 msgstr ""
8868 msgstr ""
8857
8869
8858 #, python-format
8870 #, python-format
8859 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8871 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8860 msgstr ""
8872 msgstr ""
8861
8873
8862 #, python-format
8874 #, python-format
8863 msgid "Ignored: %s\n"
8875 msgid "Ignored: %s\n"
8864 msgstr ""
8876 msgstr ""
8865
8877
8866 #, python-format
8878 #, python-format
8867 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8879 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8868 msgstr ""
8880 msgstr ""
8869
8881
8870 #, python-format
8882 #, python-format
8871 msgid "%s.%s not a boolean ('%s')"
8883 msgid "%s.%s not a boolean ('%s')"
8872 msgstr ""
8884 msgstr ""
8873
8885
8874 msgid "enter a commit username:"
8886 msgid "enter a commit username:"
8875 msgstr ""
8887 msgstr ""
8876
8888
8877 #, python-format
8889 #, python-format
8878 msgid "No username found, using '%s' instead\n"
8890 msgid "No username found, using '%s' instead\n"
8879 msgstr ""
8891 msgstr ""
8880
8892
8881 msgid "Please specify a username."
8893 msgid "Please specify a username."
8882 msgstr ""
8894 msgstr ""
8883
8895
8884 #, python-format
8896 #, python-format
8885 msgid "username %s contains a newline\n"
8897 msgid "username %s contains a newline\n"
8886 msgstr ""
8898 msgstr ""
8887
8899
8888 msgid "unrecognized response\n"
8900 msgid "unrecognized response\n"
8889 msgstr ""
8901 msgstr ""
8890
8902
8891 msgid "response expected"
8903 msgid "response expected"
8892 msgstr ""
8904 msgstr ""
8893
8905
8894 msgid "password: "
8906 msgid "password: "
8895 msgstr ""
8907 msgstr ""
8896
8908
8897 msgid "edit failed"
8909 msgid "edit failed"
8898 msgstr ""
8910 msgstr ""
8899
8911
8900 msgid "http authorization required"
8912 msgid "http authorization required"
8901 msgstr ""
8913 msgstr ""
8902
8914
8903 msgid "http authorization required\n"
8915 msgid "http authorization required\n"
8904 msgstr ""
8916 msgstr ""
8905
8917
8906 #, python-format
8918 #, python-format
8907 msgid "realm: %s\n"
8919 msgid "realm: %s\n"
8908 msgstr ""
8920 msgstr ""
8909
8921
8910 #, python-format
8922 #, python-format
8911 msgid "user: %s\n"
8923 msgid "user: %s\n"
8912 msgstr ""
8924 msgstr ""
8913
8925
8914 msgid "user:"
8926 msgid "user:"
8915 msgstr ""
8927 msgstr ""
8916
8928
8917 #, python-format
8929 #, python-format
8918 msgid "http auth: user %s, password %s\n"
8930 msgid "http auth: user %s, password %s\n"
8919 msgstr ""
8931 msgstr ""
8920
8932
8921 #, python-format
8933 #, python-format
8922 msgid "proxying through http://%s:%s\n"
8934 msgid "proxying through http://%s:%s\n"
8923 msgstr ""
8935 msgstr ""
8924
8936
8925 #, python-format
8937 #, python-format
8926 msgid "command '%s' failed: %s"
8938 msgid "command '%s' failed: %s"
8927 msgstr ""
8939 msgstr ""
8928
8940
8929 #, python-format
8941 #, python-format
8930 msgid "path contains illegal component: %s"
8942 msgid "path contains illegal component: %s"
8931 msgstr ""
8943 msgstr ""
8932
8944
8933 #, python-format
8945 #, python-format
8934 msgid "path %r is inside repo %r"
8946 msgid "path %r is inside repo %r"
8935 msgstr ""
8947 msgstr ""
8936
8948
8937 #, python-format
8949 #, python-format
8938 msgid "path %r traverses symbolic link %r"
8950 msgid "path %r traverses symbolic link %r"
8939 msgstr ""
8951 msgstr ""
8940
8952
8941 msgid "Hardlinks not supported"
8953 msgid "Hardlinks not supported"
8942 msgstr ""
8954 msgstr ""
8943
8955
8944 #, python-format
8956 #, python-format
8945 msgid "could not symlink to %r: %s"
8957 msgid "could not symlink to %r: %s"
8946 msgstr ""
8958 msgstr ""
8947
8959
8948 #, python-format
8960 #, python-format
8949 msgid "invalid date: %r "
8961 msgid "invalid date: %r "
8950 msgstr ""
8962 msgstr ""
8951
8963
8952 #, python-format
8964 #, python-format
8953 msgid "date exceeds 32 bits: %d"
8965 msgid "date exceeds 32 bits: %d"
8954 msgstr ""
8966 msgstr ""
8955
8967
8956 #, python-format
8968 #, python-format
8957 msgid "impossible time zone offset: %d"
8969 msgid "impossible time zone offset: %d"
8958 msgstr ""
8970 msgstr ""
8959
8971
8960 #, python-format
8972 #, python-format
8961 msgid "invalid day spec: %s"
8973 msgid "invalid day spec: %s"
8962 msgstr ""
8974 msgstr ""
8963
8975
8964 #, python-format
8976 #, python-format
8965 msgid "%.0f GB"
8977 msgid "%.0f GB"
8966 msgstr ""
8978 msgstr ""
8967
8979
8968 #, python-format
8980 #, python-format
8969 msgid "%.1f GB"
8981 msgid "%.1f GB"
8970 msgstr ""
8982 msgstr ""
8971
8983
8972 #, python-format
8984 #, python-format
8973 msgid "%.2f GB"
8985 msgid "%.2f GB"
8974 msgstr ""
8986 msgstr ""
8975
8987
8976 #, python-format
8988 #, python-format
8977 msgid "%.0f MB"
8989 msgid "%.0f MB"
8978 msgstr ""
8990 msgstr ""
8979
8991
8980 #, python-format
8992 #, python-format
8981 msgid "%.1f MB"
8993 msgid "%.1f MB"
8982 msgstr ""
8994 msgstr ""
8983
8995
8984 #, python-format
8996 #, python-format
8985 msgid "%.2f MB"
8997 msgid "%.2f MB"
8986 msgstr ""
8998 msgstr ""
8987
8999
8988 #, python-format
9000 #, python-format
8989 msgid "%.0f KB"
9001 msgid "%.0f KB"
8990 msgstr ""
9002 msgstr ""
8991
9003
8992 #, python-format
9004 #, python-format
8993 msgid "%.1f KB"
9005 msgid "%.1f KB"
8994 msgstr ""
9006 msgstr ""
8995
9007
8996 #, python-format
9008 #, python-format
8997 msgid "%.2f KB"
9009 msgid "%.2f KB"
8998 msgstr ""
9010 msgstr ""
8999
9011
9000 #, python-format
9012 #, python-format
9001 msgid "%.0f bytes"
9013 msgid "%.0f bytes"
9002 msgstr ""
9014 msgstr ""
9003
9015
9004 msgid "cannot verify bundle or remote repos"
9016 msgid "cannot verify bundle or remote repos"
9005 msgstr ""
9017 msgstr ""
9006
9018
9007 msgid "interrupted"
9019 msgid "interrupted"
9008 msgstr ""
9020 msgstr ""
9009
9021
9010 #, python-format
9022 #, python-format
9011 msgid "empty or missing %s"
9023 msgid "empty or missing %s"
9012 msgstr ""
9024 msgstr ""
9013
9025
9014 #, python-format
9026 #, python-format
9015 msgid "data length off by %d bytes"
9027 msgid "data length off by %d bytes"
9016 msgstr ""
9028 msgstr ""
9017
9029
9018 #, python-format
9030 #, python-format
9019 msgid "index contains %d extra bytes"
9031 msgid "index contains %d extra bytes"
9020 msgstr ""
9032 msgstr ""
9021
9033
9022 #, python-format
9034 #, python-format
9023 msgid "warning: `%s' uses revlog format 1"
9035 msgid "warning: `%s' uses revlog format 1"
9024 msgstr ""
9036 msgstr ""
9025
9037
9026 #, python-format
9038 #, python-format
9027 msgid "warning: `%s' uses revlog format 0"
9039 msgid "warning: `%s' uses revlog format 0"
9028 msgstr ""
9040 msgstr ""
9029
9041
9030 #, python-format
9042 #, python-format
9031 msgid "rev %d points to nonexistent changeset %d"
9043 msgid "rev %d points to nonexistent changeset %d"
9032 msgstr ""
9044 msgstr ""
9033
9045
9034 #, python-format
9046 #, python-format
9035 msgid "rev %d points to unexpected changeset %d"
9047 msgid "rev %d points to unexpected changeset %d"
9036 msgstr ""
9048 msgstr ""
9037
9049
9038 #, python-format
9050 #, python-format
9039 msgid " (expected %s)"
9051 msgid " (expected %s)"
9040 msgstr ""
9052 msgstr ""
9041
9053
9042 #, python-format
9054 #, python-format
9043 msgid "unknown parent 1 %s of %s"
9055 msgid "unknown parent 1 %s of %s"
9044 msgstr ""
9056 msgstr ""
9045
9057
9046 #, python-format
9058 #, python-format
9047 msgid "unknown parent 2 %s of %s"
9059 msgid "unknown parent 2 %s of %s"
9048 msgstr ""
9060 msgstr ""
9049
9061
9050 #, python-format
9062 #, python-format
9051 msgid "checking parents of %s"
9063 msgid "checking parents of %s"
9052 msgstr ""
9064 msgstr ""
9053
9065
9054 #, python-format
9066 #, python-format
9055 msgid "duplicate revision %d (%d)"
9067 msgid "duplicate revision %d (%d)"
9056 msgstr ""
9068 msgstr ""
9057
9069
9058 #, python-format
9070 #, python-format
9059 msgid "repository uses revlog format %d\n"
9071 msgid "repository uses revlog format %d\n"
9060 msgstr ""
9072 msgstr ""
9061
9073
9062 msgid "checking changesets\n"
9074 msgid "checking changesets\n"
9063 msgstr ""
9075 msgstr ""
9064
9076
9065 #, python-format
9077 #, python-format
9066 msgid "unpacking changeset %s"
9078 msgid "unpacking changeset %s"
9067 msgstr ""
9079 msgstr ""
9068
9080
9069 msgid "checking manifests\n"
9081 msgid "checking manifests\n"
9070 msgstr ""
9082 msgstr ""
9071
9083
9072 #, python-format
9084 #, python-format
9073 msgid "%s not in changesets"
9085 msgid "%s not in changesets"
9074 msgstr ""
9086 msgstr ""
9075
9087
9076 msgid "file without name in manifest"
9088 msgid "file without name in manifest"
9077 msgstr ""
9089 msgstr ""
9078
9090
9079 #, python-format
9091 #, python-format
9080 msgid "reading manifest delta %s"
9092 msgid "reading manifest delta %s"
9081 msgstr ""
9093 msgstr ""
9082
9094
9083 msgid "crosschecking files in changesets and manifests\n"
9095 msgid "crosschecking files in changesets and manifests\n"
9084 msgstr ""
9096 msgstr ""
9085
9097
9086 #, python-format
9098 #, python-format
9087 msgid "changeset refers to unknown manifest %s"
9099 msgid "changeset refers to unknown manifest %s"
9088 msgstr ""
9100 msgstr ""
9089
9101
9090 msgid "in changeset but not in manifest"
9102 msgid "in changeset but not in manifest"
9091 msgstr ""
9103 msgstr ""
9092
9104
9093 msgid "in manifest but not in changeset"
9105 msgid "in manifest but not in changeset"
9094 msgstr ""
9106 msgstr ""
9095
9107
9096 msgid "checking files\n"
9108 msgid "checking files\n"
9097 msgstr ""
9109 msgstr ""
9098
9110
9099 #, python-format
9111 #, python-format
9100 msgid "cannot decode filename '%s'"
9112 msgid "cannot decode filename '%s'"
9101 msgstr ""
9113 msgstr ""
9102
9114
9103 #, python-format
9115 #, python-format
9104 msgid "broken revlog! (%s)"
9116 msgid "broken revlog! (%s)"
9105 msgstr ""
9117 msgstr ""
9106
9118
9107 msgid "missing revlog!"
9119 msgid "missing revlog!"
9108 msgstr ""
9120 msgstr ""
9109
9121
9110 #, python-format
9122 #, python-format
9111 msgid "%s not in manifests"
9123 msgid "%s not in manifests"
9112 msgstr ""
9124 msgstr ""
9113
9125
9114 #, python-format
9126 #, python-format
9115 msgid "unpacked size is %s, %s expected"
9127 msgid "unpacked size is %s, %s expected"
9116 msgstr ""
9128 msgstr ""
9117
9129
9118 #, python-format
9130 #, python-format
9119 msgid "unpacking %s"
9131 msgid "unpacking %s"
9120 msgstr ""
9132 msgstr ""
9121
9133
9122 #, python-format
9134 #, python-format
9123 msgid "empty or missing copy source revlog %s:%s"
9135 msgid "empty or missing copy source revlog %s:%s"
9124 msgstr ""
9136 msgstr ""
9125
9137
9126 #, python-format
9138 #, python-format
9127 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
9139 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
9128 msgstr ""
9140 msgstr ""
9129
9141
9130 #, python-format
9142 #, python-format
9131 msgid "checking rename of %s"
9143 msgid "checking rename of %s"
9132 msgstr ""
9144 msgstr ""
9133
9145
9134 #, python-format
9146 #, python-format
9135 msgid "%s in manifests not found"
9147 msgid "%s in manifests not found"
9136 msgstr ""
9148 msgstr ""
9137
9149
9138 #, python-format
9150 #, python-format
9139 msgid "warning: orphan revlog '%s'"
9151 msgid "warning: orphan revlog '%s'"
9140 msgstr ""
9152 msgstr ""
9141
9153
9142 #, python-format
9154 #, python-format
9143 msgid "%d files, %d changesets, %d total revisions\n"
9155 msgid "%d files, %d changesets, %d total revisions\n"
9144 msgstr ""
9156 msgstr ""
9145
9157
9146 #, python-format
9158 #, python-format
9147 msgid "%d warnings encountered!\n"
9159 msgid "%d warnings encountered!\n"
9148 msgstr ""
9160 msgstr ""
9149
9161
9150 #, python-format
9162 #, python-format
9151 msgid "%d integrity errors encountered!\n"
9163 msgid "%d integrity errors encountered!\n"
9152 msgstr ""
9164 msgstr ""
9153
9165
9154 #, python-format
9166 #, python-format
9155 msgid "(first damaged changeset appears to be %d)\n"
9167 msgid "(first damaged changeset appears to be %d)\n"
9156 msgstr ""
9168 msgstr ""
9157
9169
9158 msgid "user name not available - set USERNAME environment variable"
9170 msgid "user name not available - set USERNAME environment variable"
9159 msgstr ""
9171 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now