##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

i18n-fr: translation of part of the mq extension
Cédric Duval -
r9006:901cdaa2 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,8933 +1,9090 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 06:55+0200\n"
89 "POT-Creation-Date: 2009-07-01 08:41+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
92 "Language-Team: French\n"
92 "Language-Team: French\n"
93 "MIME-Version: 1.0\n"
93 "MIME-Version: 1.0\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
95 "Content-Transfer-Encoding: 8bit\n"
95 "Content-Transfer-Encoding: 8bit\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
97
97
98 #, python-format
98 #, python-format
99 msgid " (default: %s)"
99 msgid " (default: %s)"
100 msgstr " (défaut: %s)"
100 msgstr " (défaut: %s)"
101
101
102 msgid "OPTIONS"
102 msgid "OPTIONS"
103 msgstr ""
103 msgstr ""
104
104
105 msgid "COMMANDS"
105 msgid "COMMANDS"
106 msgstr ""
106 msgstr ""
107
107
108 msgid " options:\n"
108 msgid " options:\n"
109 msgstr ""
109 msgstr ""
110
110
111 #, python-format
111 #, python-format
112 msgid ""
112 msgid ""
113 " aliases: %s\n"
113 " aliases: %s\n"
114 "\n"
114 "\n"
115 msgstr ""
115 msgstr ""
116
116
117 msgid ""
117 msgid ""
118 "hooks for controlling repository access\n"
118 "hooks for controlling repository access\n"
119 "\n"
119 "\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
121 "of a repository when receiving incoming changesets.\n"
121 "of a repository when receiving incoming changesets.\n"
122 "\n"
122 "\n"
123 "The authorization is matched based on the local user name on the\n"
123 "The authorization is matched based on the local user name on the\n"
124 "system where the hook runs, and not the committer of the original\n"
124 "system where the hook runs, and not the committer of the original\n"
125 "changeset (since the latter is merely informative).\n"
125 "changeset (since the latter is merely informative).\n"
126 "\n"
126 "\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
128 "preventing authenticating users from doing anything other than\n"
128 "preventing authenticating users from doing anything other than\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
130 "interactive shell access, as they can then disable the hook.\n"
130 "interactive shell access, as they can then disable the hook.\n"
131 "Nor is it safe if remote users share an account, because then there\n"
131 "Nor is it safe if remote users share an account, because then there\n"
132 "is no way to distinguish them.\n"
132 "is no way to distinguish them.\n"
133 "\n"
133 "\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
135 "\n"
135 "\n"
136 " [extensions]\n"
136 " [extensions]\n"
137 " hgext.acl =\n"
137 " hgext.acl =\n"
138 "\n"
138 "\n"
139 " [hooks]\n"
139 " [hooks]\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
141 "\n"
141 "\n"
142 " [acl]\n"
142 " [acl]\n"
143 " # Check whether the source of incoming changes is in this list\n"
143 " # Check whether the source of incoming changes is in this list\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
145 " sources = serve\n"
145 " sources = serve\n"
146 "\n"
146 "\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
148 "glob syntax by default), and a comma separated list of users as\n"
148 "glob syntax by default), and a comma separated list of users as\n"
149 "the corresponding value. The deny list is checked before the allow\n"
149 "the corresponding value. The deny list is checked before the allow\n"
150 "list is.\n"
150 "list is.\n"
151 "\n"
151 "\n"
152 " [acl.allow]\n"
152 " [acl.allow]\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
154 " # An empty acl.allow section means no users allowed.\n"
154 " # An empty acl.allow section means no users allowed.\n"
155 " docs/** = doc_writer\n"
155 " docs/** = doc_writer\n"
156 " .hgtags = release_engineer\n"
156 " .hgtags = release_engineer\n"
157 "\n"
157 "\n"
158 " [acl.deny]\n"
158 " [acl.deny]\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
160 " # An empty acl.deny section means all users allowed.\n"
160 " # An empty acl.deny section means all users allowed.\n"
161 " glob pattern = user4, user5\n"
161 " glob pattern = user4, user5\n"
162 " ** = user6\n"
162 " ** = user6\n"
163 msgstr ""
163 msgstr ""
164
164
165 #, python-format
165 #, python-format
166 msgid "acl: %s not enabled\n"
166 msgid "acl: %s not enabled\n"
167 msgstr ""
167 msgstr ""
168
168
169 #, python-format
169 #, python-format
170 msgid "acl: %s enabled, %d entries for user %s\n"
170 msgid "acl: %s enabled, %d entries for user %s\n"
171 msgstr ""
171 msgstr ""
172
172
173 #, python-format
173 #, python-format
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
175 msgstr ""
175 msgstr ""
176
176
177 #, python-format
177 #, python-format
178 msgid "acl: changes have source \"%s\" - skipping\n"
178 msgid "acl: changes have source \"%s\" - skipping\n"
179 msgstr ""
179 msgstr ""
180
180
181 #, python-format
181 #, python-format
182 msgid "acl: user %s denied on %s\n"
182 msgid "acl: user %s denied on %s\n"
183 msgstr ""
183 msgstr ""
184
184
185 #, python-format
185 #, python-format
186 msgid "acl: access denied for changeset %s"
186 msgid "acl: access denied for changeset %s"
187 msgstr ""
187 msgstr ""
188
188
189 #, python-format
189 #, python-format
190 msgid "acl: user %s not allowed on %s\n"
190 msgid "acl: user %s not allowed on %s\n"
191 msgstr ""
191 msgstr ""
192
192
193 #, python-format
193 #, python-format
194 msgid "acl: allowing changeset %s\n"
194 msgid "acl: allowing changeset %s\n"
195 msgstr ""
195 msgstr ""
196
196
197 msgid ""
197 msgid ""
198 "track a line of development with movable markers\n"
198 "track a line of development with movable markers\n"
199 "\n"
199 "\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
201 "points to a changeset identified by its hash. If you commit a\n"
201 "points to a changeset identified by its hash. If you commit a\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
203 "the bookmark shifts to the new changeset.\n"
203 "the bookmark shifts to the new changeset.\n"
204 "\n"
204 "\n"
205 "It is possible to use bookmark names in every revision lookup\n"
205 "It is possible to use bookmark names in every revision lookup\n"
206 "(e.g. hg merge, hg update).\n"
206 "(e.g. hg merge, hg update).\n"
207 "\n"
207 "\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
209 "will all move forward together. It is possible to obtain a more\n"
209 "will all move forward together. It is possible to obtain a more\n"
210 "git-like experience by adding the following configuration option to\n"
210 "git-like experience by adding the following configuration option to\n"
211 "your .hgrc:\n"
211 "your .hgrc:\n"
212 "\n"
212 "\n"
213 " [bookmarks]\n"
213 " [bookmarks]\n"
214 " track.current = True\n"
214 " track.current = True\n"
215 "\n"
215 "\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
217 "using, and only update it. This is similar to git's approach to\n"
217 "using, and only update it. This is similar to git's approach to\n"
218 "branching.\n"
218 "branching.\n"
219 msgstr ""
219 msgstr ""
220
220
221 msgid ""
221 msgid ""
222 "track a line of development with movable markers\n"
222 "track a line of development with movable markers\n"
223 "\n"
223 "\n"
224 " Bookmarks are pointers to certain commits that move when\n"
224 " Bookmarks are pointers to certain commits that move when\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
228 "\n"
228 "\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
230 " directory's parent revision with the given name. If you specify\n"
230 " directory's parent revision with the given name. If you specify\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
232 " the bookmark is assigned to that revision.\n"
232 " the bookmark is assigned to that revision.\n"
233 " "
233 " "
234 msgstr ""
234 msgstr ""
235
235
236 msgid "a bookmark of this name does not exist"
236 msgid "a bookmark of this name does not exist"
237 msgstr ""
237 msgstr ""
238
238
239 msgid "a bookmark of the same name already exists"
239 msgid "a bookmark of the same name already exists"
240 msgstr ""
240 msgstr ""
241
241
242 msgid "new bookmark name required"
242 msgid "new bookmark name required"
243 msgstr ""
243 msgstr ""
244
244
245 msgid "bookmark name required"
245 msgid "bookmark name required"
246 msgstr ""
246 msgstr ""
247
247
248 msgid "bookmark name cannot contain newlines"
248 msgid "bookmark name cannot contain newlines"
249 msgstr ""
249 msgstr ""
250
250
251 msgid "a bookmark cannot have the name of an existing branch"
251 msgid "a bookmark cannot have the name of an existing branch"
252 msgstr ""
252 msgstr ""
253
253
254 msgid "force"
254 msgid "force"
255 msgstr ""
255 msgstr ""
256
256
257 msgid "revision"
257 msgid "revision"
258 msgstr ""
258 msgstr ""
259
259
260 msgid "delete a given bookmark"
260 msgid "delete a given bookmark"
261 msgstr ""
261 msgstr ""
262
262
263 msgid "rename a given bookmark"
263 msgid "rename a given bookmark"
264 msgstr ""
264 msgstr ""
265
265
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
267 msgstr ""
267 msgstr ""
268
268
269 msgid ""
269 msgid ""
270 "hooks for integrating with the Bugzilla bug tracker\n"
270 "hooks for integrating with the Bugzilla bug tracker\n"
271 "\n"
271 "\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
274 "bug status.\n"
274 "bug status.\n"
275 "\n"
275 "\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
277 "installations using MySQL are supported.\n"
277 "installations using MySQL are supported.\n"
278 "\n"
278 "\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
280 "emails. That script changes between Bugzilla versions; the\n"
280 "emails. That script changes between Bugzilla versions; the\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
285 "\n"
285 "\n"
286 "Configuring the extension:\n"
286 "Configuring the extension:\n"
287 "\n"
287 "\n"
288 " [bugzilla]\n"
288 " [bugzilla]\n"
289 "\n"
289 "\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
291 " database.\n"
291 " database.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
294 " password Password to use to access MySQL server.\n"
294 " password Password to use to access MySQL server.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
298 " and '2.16' for versions prior to 2.18.\n"
298 " and '2.16' for versions prior to 2.18.\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
302 " Default '/var/www/html/bugzilla'.\n"
302 " Default '/var/www/html/bugzilla'.\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
304 " notification emails. Substitutes from a map with 3\n"
304 " notification emails. Substitutes from a map with 3\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
308 " %(id)s %(user)s\".\n"
308 " %(id)s %(user)s\".\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
310 " message. Must contain one \"()\" group. The default\n"
310 " message. Must contain one \"()\" group. The default\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
313 " variations thereof. Matching is case insensitive.\n"
313 " variations thereof. Matching is case insensitive.\n"
314 " style The style file to use when formatting comments.\n"
314 " style The style file to use when formatting comments.\n"
315 " template Template to use when formatting comments. Overrides\n"
315 " template Template to use when formatting comments. Overrides\n"
316 " style if specified. In addition to the usual Mercurial\n"
316 " style if specified. In addition to the usual Mercurial\n"
317 " keywords, the extension specifies:\n"
317 " keywords, the extension specifies:\n"
318 " {bug} The Bugzilla bug ID.\n"
318 " {bug} The Bugzilla bug ID.\n"
319 " {root} The full pathname of the Mercurial\n"
319 " {root} The full pathname of the Mercurial\n"
320 " repository.\n"
320 " repository.\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
322 " repository.\n"
322 " repository.\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
324 " repositories.\n"
324 " repositories.\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
327 " strip The number of slashes to strip from the front of {root}\n"
327 " strip The number of slashes to strip from the front of {root}\n"
328 " to produce {webroot}. Default 0.\n"
328 " to produce {webroot}. Default 0.\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
331 " should contain one mapping per line,\n"
331 " should contain one mapping per line,\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
333 " section.\n"
333 " section.\n"
334 "\n"
334 "\n"
335 " [usermap]\n"
335 " [usermap]\n"
336 " Any entries in this section specify mappings of Mercurial\n"
336 " Any entries in this section specify mappings of Mercurial\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
338 " \"committer\"=\"Bugzilla user\"\n"
338 " \"committer\"=\"Bugzilla user\"\n"
339 "\n"
339 "\n"
340 " [web]\n"
340 " [web]\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
342 " from templates as {hgweb}.\n"
342 " from templates as {hgweb}.\n"
343 "\n"
343 "\n"
344 "Activating the extension:\n"
344 "Activating the extension:\n"
345 "\n"
345 "\n"
346 " [extensions]\n"
346 " [extensions]\n"
347 " hgext.bugzilla =\n"
347 " hgext.bugzilla =\n"
348 "\n"
348 "\n"
349 " [hooks]\n"
349 " [hooks]\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
352 "\n"
352 "\n"
353 "Example configuration:\n"
353 "Example configuration:\n"
354 "\n"
354 "\n"
355 "This example configuration is for a collection of Mercurial\n"
355 "This example configuration is for a collection of Mercurial\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
357 "installation in /opt/bugzilla-3.2.\n"
357 "installation in /opt/bugzilla-3.2.\n"
358 "\n"
358 "\n"
359 " [bugzilla]\n"
359 " [bugzilla]\n"
360 " host=localhost\n"
360 " host=localhost\n"
361 " password=XYZZY\n"
361 " password=XYZZY\n"
362 " version=3.0\n"
362 " version=3.0\n"
363 " bzuser=unknown@domain.com\n"
363 " bzuser=unknown@domain.com\n"
364 " bzdir=/opt/bugzilla-3.2\n"
364 " bzdir=/opt/bugzilla-3.2\n"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
367 " strip=5\n"
367 " strip=5\n"
368 "\n"
368 "\n"
369 " [web]\n"
369 " [web]\n"
370 " baseurl=http://dev.domain.com/hg\n"
370 " baseurl=http://dev.domain.com/hg\n"
371 "\n"
371 "\n"
372 " [usermap]\n"
372 " [usermap]\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
374 "\n"
374 "\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
376 "\n"
376 "\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
379 "\n"
379 "\n"
380 " Changeset commit comment. Bug 1234.\n"
380 " Changeset commit comment. Bug 1234.\n"
381 msgstr ""
381 msgstr ""
382
382
383 #, python-format
383 #, python-format
384 msgid "connecting to %s:%s as %s, password %s\n"
384 msgid "connecting to %s:%s as %s, password %s\n"
385 msgstr ""
385 msgstr ""
386
386
387 #, python-format
387 #, python-format
388 msgid "query: %s %s\n"
388 msgid "query: %s %s\n"
389 msgstr ""
389 msgstr ""
390
390
391 #, python-format
391 #, python-format
392 msgid "failed query: %s %s\n"
392 msgid "failed query: %s %s\n"
393 msgstr ""
393 msgstr ""
394
394
395 msgid "unknown database schema"
395 msgid "unknown database schema"
396 msgstr ""
396 msgstr ""
397
397
398 #, python-format
398 #, python-format
399 msgid "bug %d already knows about changeset %s\n"
399 msgid "bug %d already knows about changeset %s\n"
400 msgstr ""
400 msgstr ""
401
401
402 msgid "telling bugzilla to send mail:\n"
402 msgid "telling bugzilla to send mail:\n"
403 msgstr ""
403 msgstr ""
404
404
405 #, python-format
405 #, python-format
406 msgid " bug %s\n"
406 msgid " bug %s\n"
407 msgstr ""
407 msgstr ""
408
408
409 #, python-format
409 #, python-format
410 msgid "running notify command %s\n"
410 msgid "running notify command %s\n"
411 msgstr ""
411 msgstr ""
412
412
413 #, python-format
413 #, python-format
414 msgid "bugzilla notify command %s"
414 msgid "bugzilla notify command %s"
415 msgstr ""
415 msgstr ""
416
416
417 msgid "done\n"
417 msgid "done\n"
418 msgstr ""
418 msgstr "effectué\n"
419
419
420 #, python-format
420 #, python-format
421 msgid "looking up user %s\n"
421 msgid "looking up user %s\n"
422 msgstr ""
422 msgstr ""
423
423
424 #, python-format
424 #, python-format
425 msgid "cannot find bugzilla user id for %s"
425 msgid "cannot find bugzilla user id for %s"
426 msgstr ""
426 msgstr ""
427
427
428 #, python-format
428 #, python-format
429 msgid "cannot find bugzilla user id for %s or %s"
429 msgid "cannot find bugzilla user id for %s or %s"
430 msgstr ""
430 msgstr ""
431
431
432 #, python-format
432 #, python-format
433 msgid "bugzilla version %s not supported"
433 msgid "bugzilla version %s not supported"
434 msgstr ""
434 msgstr ""
435
435
436 msgid ""
436 msgid ""
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
438 "details:\n"
438 "details:\n"
439 "\t{desc|tabindent}"
439 "\t{desc|tabindent}"
440 msgstr ""
440 msgstr ""
441
441
442 #, python-format
442 #, python-format
443 msgid "python mysql support not available: %s"
443 msgid "python mysql support not available: %s"
444 msgstr ""
444 msgstr ""
445
445
446 #, python-format
446 #, python-format
447 msgid "hook type %s does not pass a changeset id"
447 msgid "hook type %s does not pass a changeset id"
448 msgstr ""
448 msgstr ""
449
449
450 #, python-format
450 #, python-format
451 msgid "database error: %s"
451 msgid "database error: %s"
452 msgstr ""
452 msgstr ""
453
453
454 msgid "command to display child changesets"
454 msgid "command to display child changesets"
455 msgstr ""
455 msgstr ""
456
456
457 msgid ""
457 msgid ""
458 "show the children of the given or working directory revision\n"
458 "show the children of the given or working directory revision\n"
459 "\n"
459 "\n"
460 " Print the children of the working directory's revisions. If a\n"
460 " Print the children of the working directory's revisions. If a\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
462 " be printed. If a file argument is given, revision in which the\n"
462 " be printed. If a file argument is given, revision in which the\n"
463 " file was last changed (after the working directory revision or the\n"
463 " file was last changed (after the working directory revision or the\n"
464 " argument to --rev if given) is printed.\n"
464 " argument to --rev if given) is printed.\n"
465 " "
465 " "
466 msgstr ""
466 msgstr ""
467
467
468 msgid "show children of the specified revision"
468 msgid "show children of the specified revision"
469 msgstr ""
469 msgstr ""
470
470
471 msgid "hg children [-r REV] [FILE]"
471 msgid "hg children [-r REV] [FILE]"
472 msgstr ""
472 msgstr ""
473
473
474 msgid "command to display statistics about repository history"
474 msgid "command to display statistics about repository history"
475 msgstr ""
475 msgstr ""
476
476
477 #, python-format
477 #, python-format
478 msgid "Revision %d is a merge, ignoring...\n"
478 msgid "Revision %d is a merge, ignoring...\n"
479 msgstr ""
479 msgstr ""
480
480
481 #, python-format
481 #, python-format
482 msgid "generating stats: %d%%"
482 msgid "generating stats: %d%%"
483 msgstr ""
483 msgstr ""
484
484
485 msgid ""
485 msgid ""
486 "histogram of changes to the repository\n"
486 "histogram of changes to the repository\n"
487 "\n"
487 "\n"
488 " This command will display a histogram representing the number\n"
488 " This command will display a histogram representing the number\n"
489 " of changed lines or revisions, grouped according to the given\n"
489 " of changed lines or revisions, grouped according to the given\n"
490 " template. The default template will group changes by author.\n"
490 " template. The default template will group changes by author.\n"
491 " The --dateformat option may be used to group the results by\n"
491 " The --dateformat option may be used to group the results by\n"
492 " date instead.\n"
492 " date instead.\n"
493 "\n"
493 "\n"
494 " Statistics are based on the number of changed lines, or\n"
494 " Statistics are based on the number of changed lines, or\n"
495 " alternatively the number of matching revisions if the\n"
495 " alternatively the number of matching revisions if the\n"
496 " --changesets option is specified.\n"
496 " --changesets option is specified.\n"
497 "\n"
497 "\n"
498 " Examples:\n"
498 " Examples:\n"
499 "\n"
499 "\n"
500 " # display count of changed lines for every committer\n"
500 " # display count of changed lines for every committer\n"
501 " hg churn -t '{author|email}'\n"
501 " hg churn -t '{author|email}'\n"
502 "\n"
502 "\n"
503 " # display daily activity graph\n"
503 " # display daily activity graph\n"
504 " hg churn -f '%H' -s -c\n"
504 " hg churn -f '%H' -s -c\n"
505 "\n"
505 "\n"
506 " # display activity of developers by month\n"
506 " # display activity of developers by month\n"
507 " hg churn -f '%Y-%m' -s -c\n"
507 " hg churn -f '%Y-%m' -s -c\n"
508 "\n"
508 "\n"
509 " # display count of lines changed in every year\n"
509 " # display count of lines changed in every year\n"
510 " hg churn -f '%Y' -s\n"
510 " hg churn -f '%Y' -s\n"
511 "\n"
511 "\n"
512 " It is possible to map alternate email addresses to a main address\n"
512 " It is possible to map alternate email addresses to a main address\n"
513 " by providing a file using the following format:\n"
513 " by providing a file using the following format:\n"
514 "\n"
514 "\n"
515 " <alias email> <actual email>\n"
515 " <alias email> <actual email>\n"
516 "\n"
516 "\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
519 " "
519 " "
520 msgstr ""
520 msgstr ""
521
521
522 #, python-format
522 #, python-format
523 msgid "assuming %i character terminal\n"
523 msgid "assuming %i character terminal\n"
524 msgstr ""
524 msgstr ""
525
525
526 msgid "count rate for the specified revision or range"
526 msgid "count rate for the specified revision or range"
527 msgstr ""
527 msgstr ""
528
528
529 msgid "count rate for revisions matching date spec"
529 msgid "count rate for revisions matching date spec"
530 msgstr ""
530 msgstr ""
531
531
532 msgid "template to group changesets"
532 msgid "template to group changesets"
533 msgstr ""
533 msgstr ""
534
534
535 msgid "strftime-compatible format for grouping by date"
535 msgid "strftime-compatible format for grouping by date"
536 msgstr ""
536 msgstr ""
537
537
538 msgid "count rate by number of changesets"
538 msgid "count rate by number of changesets"
539 msgstr ""
539 msgstr ""
540
540
541 msgid "sort by key (default: sort by count)"
541 msgid "sort by key (default: sort by count)"
542 msgstr ""
542 msgstr ""
543
543
544 msgid "file with email aliases"
544 msgid "file with email aliases"
545 msgstr ""
545 msgstr ""
546
546
547 msgid "show progress"
547 msgid "show progress"
548 msgstr ""
548 msgstr ""
549
549
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
551 msgstr ""
551 msgstr ""
552
552
553 msgid ""
553 msgid ""
554 "colorize output from some commands\n"
554 "colorize output from some commands\n"
555 "\n"
555 "\n"
556 "This extension modifies the status command to add color to its output\n"
556 "This extension modifies the status command to add color to its output\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
560 "whitespace.\n"
560 "whitespace.\n"
561 "\n"
561 "\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
565 "render_text function, which can be used to add effects to any text.\n"
565 "render_text function, which can be used to add effects to any text.\n"
566 "\n"
566 "\n"
567 "Default effects may be overridden from the .hgrc file:\n"
567 "Default effects may be overridden from the .hgrc file:\n"
568 "\n"
568 "\n"
569 "[color]\n"
569 "[color]\n"
570 "status.modified = blue bold underline red_background\n"
570 "status.modified = blue bold underline red_background\n"
571 "status.added = green bold\n"
571 "status.added = green bold\n"
572 "status.removed = red bold blue_background\n"
572 "status.removed = red bold blue_background\n"
573 "status.deleted = cyan bold underline\n"
573 "status.deleted = cyan bold underline\n"
574 "status.unknown = magenta bold underline\n"
574 "status.unknown = magenta bold underline\n"
575 "status.ignored = black bold\n"
575 "status.ignored = black bold\n"
576 "\n"
576 "\n"
577 "# 'none' turns off all effects\n"
577 "# 'none' turns off all effects\n"
578 "status.clean = none\n"
578 "status.clean = none\n"
579 "status.copied = none\n"
579 "status.copied = none\n"
580 "\n"
580 "\n"
581 "qseries.applied = blue bold underline\n"
581 "qseries.applied = blue bold underline\n"
582 "qseries.unapplied = black bold\n"
582 "qseries.unapplied = black bold\n"
583 "qseries.missing = red bold\n"
583 "qseries.missing = red bold\n"
584 "\n"
584 "\n"
585 "diff.diffline = bold\n"
585 "diff.diffline = bold\n"
586 "diff.extended = cyan bold\n"
586 "diff.extended = cyan bold\n"
587 "diff.file_a = red bold\n"
587 "diff.file_a = red bold\n"
588 "diff.file_b = green bold\n"
588 "diff.file_b = green bold\n"
589 "diff.hunk = magenta\n"
589 "diff.hunk = magenta\n"
590 "diff.deleted = red\n"
590 "diff.deleted = red\n"
591 "diff.inserted = green\n"
591 "diff.inserted = green\n"
592 "diff.changed = white\n"
592 "diff.changed = white\n"
593 "diff.trailingwhitespace = bold red_background\n"
593 "diff.trailingwhitespace = bold red_background\n"
594 msgstr ""
594 msgstr ""
595
595
596 msgid "when to colorize (always, auto, or never)"
596 msgid "when to colorize (always, auto, or never)"
597 msgstr ""
597 msgstr ""
598
598
599 msgid "don't colorize output"
599 msgid "don't colorize output"
600 msgstr ""
600 msgstr ""
601
601
602 #, python-format
602 #, python-format
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
604 msgstr ""
604 msgstr ""
605
605
606 msgid "import revisions from foreign VCS repositories into Mercurial"
606 msgid "import revisions from foreign VCS repositories into Mercurial"
607 msgstr ""
607 msgstr ""
608
608
609 msgid ""
609 msgid ""
610 "convert a foreign SCM repository to a Mercurial one.\n"
610 "convert a foreign SCM repository to a Mercurial one.\n"
611 "\n"
611 "\n"
612 " Accepted source formats [identifiers]:\n"
612 " Accepted source formats [identifiers]:\n"
613 " - Mercurial [hg]\n"
613 " - Mercurial [hg]\n"
614 " - CVS [cvs]\n"
614 " - CVS [cvs]\n"
615 " - Darcs [darcs]\n"
615 " - Darcs [darcs]\n"
616 " - git [git]\n"
616 " - git [git]\n"
617 " - Subversion [svn]\n"
617 " - Subversion [svn]\n"
618 " - Monotone [mtn]\n"
618 " - Monotone [mtn]\n"
619 " - GNU Arch [gnuarch]\n"
619 " - GNU Arch [gnuarch]\n"
620 " - Bazaar [bzr]\n"
620 " - Bazaar [bzr]\n"
621 " - Perforce [p4]\n"
621 " - Perforce [p4]\n"
622 "\n"
622 "\n"
623 " Accepted destination formats [identifiers]:\n"
623 " Accepted destination formats [identifiers]:\n"
624 " - Mercurial [hg]\n"
624 " - Mercurial [hg]\n"
625 " - Subversion [svn] (history on branches is not preserved)\n"
625 " - Subversion [svn] (history on branches is not preserved)\n"
626 "\n"
626 "\n"
627 " If no revision is given, all revisions will be converted.\n"
627 " If no revision is given, all revisions will be converted.\n"
628 " Otherwise, convert will only import up to the named revision\n"
628 " Otherwise, convert will only import up to the named revision\n"
629 " (given in a format understood by the source).\n"
629 " (given in a format understood by the source).\n"
630 "\n"
630 "\n"
631 " If no destination directory name is specified, it defaults to the\n"
631 " If no destination directory name is specified, it defaults to the\n"
632 " basename of the source with '-hg' appended. If the destination\n"
632 " basename of the source with '-hg' appended. If the destination\n"
633 " repository doesn't exist, it will be created.\n"
633 " repository doesn't exist, it will be created.\n"
634 "\n"
634 "\n"
635 " By default, all sources except Mercurial will use\n"
635 " By default, all sources except Mercurial will use\n"
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
637 " revision numbers order. Sort modes have the following effects:\n"
637 " revision numbers order. Sort modes have the following effects:\n"
638 " --branchsort: convert from parent to child revision when\n"
638 " --branchsort: convert from parent to child revision when\n"
639 " possible, which means branches are usually converted one after\n"
639 " possible, which means branches are usually converted one after\n"
640 " the other. It generates more compact repositories.\n"
640 " the other. It generates more compact repositories.\n"
641 " --datesort: sort revisions by date. Converted repositories have\n"
641 " --datesort: sort revisions by date. Converted repositories have\n"
642 " good-looking changelogs but are often an order of magnitude\n"
642 " good-looking changelogs but are often an order of magnitude\n"
643 " larger than the same ones generated by --branchsort.\n"
643 " larger than the same ones generated by --branchsort.\n"
644 " --sourcesort: try to preserve source revisions order, only\n"
644 " --sourcesort: try to preserve source revisions order, only\n"
645 " supported by Mercurial sources.\n"
645 " supported by Mercurial sources.\n"
646 "\n"
646 "\n"
647 " If <REVMAP> isn't given, it will be put in a default location\n"
647 " If <REVMAP> isn't given, it will be put in a default location\n"
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
649 " that maps each source commit ID to the destination ID for that\n"
649 " that maps each source commit ID to the destination ID for that\n"
650 " revision, like so:\n"
650 " revision, like so:\n"
651 " <source ID> <destination ID>\n"
651 " <source ID> <destination ID>\n"
652 "\n"
652 "\n"
653 " If the file doesn't exist, it's automatically created. It's\n"
653 " If the file doesn't exist, it's automatically created. It's\n"
654 " updated on each commit copied, so convert-repo can be interrupted\n"
654 " updated on each commit copied, so convert-repo can be interrupted\n"
655 " and can be run repeatedly to copy new commits.\n"
655 " and can be run repeatedly to copy new commits.\n"
656 "\n"
656 "\n"
657 " The [username mapping] file is a simple text file that maps each\n"
657 " The [username mapping] file is a simple text file that maps each\n"
658 " source commit author to a destination commit author. It is handy\n"
658 " source commit author to a destination commit author. It is handy\n"
659 " for source SCMs that use unix logins to identify authors (eg:\n"
659 " for source SCMs that use unix logins to identify authors (eg:\n"
660 " CVS). One line per author mapping and the line format is:\n"
660 " CVS). One line per author mapping and the line format is:\n"
661 " srcauthor=whatever string you want\n"
661 " srcauthor=whatever string you want\n"
662 "\n"
662 "\n"
663 " The filemap is a file that allows filtering and remapping of files\n"
663 " The filemap is a file that allows filtering and remapping of files\n"
664 " and directories. Comment lines start with '#'. Each line can\n"
664 " and directories. Comment lines start with '#'. Each line can\n"
665 " contain one of the following directives:\n"
665 " contain one of the following directives:\n"
666 "\n"
666 "\n"
667 " include path/to/file\n"
667 " include path/to/file\n"
668 "\n"
668 "\n"
669 " exclude path/to/file\n"
669 " exclude path/to/file\n"
670 "\n"
670 "\n"
671 " rename from/file to/file\n"
671 " rename from/file to/file\n"
672 "\n"
672 "\n"
673 " The 'include' directive causes a file, or all files under a\n"
673 " The 'include' directive causes a file, or all files under a\n"
674 " directory, to be included in the destination repository, and the\n"
674 " directory, to be included in the destination repository, and the\n"
675 " exclusion of all other files and directories not explicitly included.\n"
675 " exclusion of all other files and directories not explicitly included.\n"
676 " The 'exclude' directive causes files or directories to be omitted.\n"
676 " The 'exclude' directive causes files or directories to be omitted.\n"
677 " The 'rename' directive renames a file or directory. To rename from\n"
677 " The 'rename' directive renames a file or directory. To rename from\n"
678 " a subdirectory into the root of the repository, use '.' as the\n"
678 " a subdirectory into the root of the repository, use '.' as the\n"
679 " path to rename to.\n"
679 " path to rename to.\n"
680 "\n"
680 "\n"
681 " The splicemap is a file that allows insertion of synthetic\n"
681 " The splicemap is a file that allows insertion of synthetic\n"
682 " history, letting you specify the parents of a revision. This is\n"
682 " history, letting you specify the parents of a revision. This is\n"
683 " useful if you want to e.g. give a Subversion merge two parents, or\n"
683 " useful if you want to e.g. give a Subversion merge two parents, or\n"
684 " graft two disconnected series of history together. Each entry\n"
684 " graft two disconnected series of history together. Each entry\n"
685 " contains a key, followed by a space, followed by one or two\n"
685 " contains a key, followed by a space, followed by one or two\n"
686 " comma-separated values. The key is the revision ID in the source\n"
686 " comma-separated values. The key is the revision ID in the source\n"
687 " revision control system whose parents should be modified (same\n"
687 " revision control system whose parents should be modified (same\n"
688 " format as a key in .hg/shamap). The values are the revision IDs\n"
688 " format as a key in .hg/shamap). The values are the revision IDs\n"
689 " (in either the source or destination revision control system) that\n"
689 " (in either the source or destination revision control system) that\n"
690 " should be used as the new parents for that node.\n"
690 " should be used as the new parents for that node.\n"
691 "\n"
691 "\n"
692 " The branchmap is a file that allows you to rename a branch when it is\n"
692 " The branchmap is a file that allows you to rename a branch when it is\n"
693 " being brought in from whatever external repository. When used in\n"
693 " being brought in from whatever external repository. When used in\n"
694 " conjunction with a splicemap, it allows for a powerful combination\n"
694 " conjunction with a splicemap, it allows for a powerful combination\n"
695 " to help fix even the most badly mismanaged repositories and turn them\n"
695 " to help fix even the most badly mismanaged repositories and turn them\n"
696 " into nicely structured Mercurial repositories. The branchmap contains\n"
696 " into nicely structured Mercurial repositories. The branchmap contains\n"
697 " lines of the form \"original_branch_name new_branch_name\".\n"
697 " lines of the form \"original_branch_name new_branch_name\".\n"
698 " \"original_branch_name\" is the name of the branch in the source\n"
698 " \"original_branch_name\" is the name of the branch in the source\n"
699 " repository, and \"new_branch_name\" is the name of the branch is the\n"
699 " repository, and \"new_branch_name\" is the name of the branch is the\n"
700 " destination repository. This can be used to (for instance) move code\n"
700 " destination repository. This can be used to (for instance) move code\n"
701 " in one repository from \"default\" to a named branch.\n"
701 " in one repository from \"default\" to a named branch.\n"
702 "\n"
702 "\n"
703 " Mercurial Source\n"
703 " Mercurial Source\n"
704 " -----------------\n"
704 " -----------------\n"
705 "\n"
705 "\n"
706 " --config convert.hg.ignoreerrors=False (boolean)\n"
706 " --config convert.hg.ignoreerrors=False (boolean)\n"
707 " ignore integrity errors when reading. Use it to fix Mercurial\n"
707 " ignore integrity errors when reading. Use it to fix Mercurial\n"
708 " repositories with missing revlogs, by converting from and to\n"
708 " repositories with missing revlogs, by converting from and to\n"
709 " Mercurial.\n"
709 " Mercurial.\n"
710 " --config convert.hg.saverev=False (boolean)\n"
710 " --config convert.hg.saverev=False (boolean)\n"
711 " store original revision ID in changeset (forces target IDs to\n"
711 " store original revision ID in changeset (forces target IDs to\n"
712 " change)\n"
712 " change)\n"
713 " --config convert.hg.startrev=0 (hg revision identifier)\n"
713 " --config convert.hg.startrev=0 (hg revision identifier)\n"
714 " convert start revision and its descendants\n"
714 " convert start revision and its descendants\n"
715 "\n"
715 "\n"
716 " CVS Source\n"
716 " CVS Source\n"
717 " ----------\n"
717 " ----------\n"
718 "\n"
718 "\n"
719 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
719 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
720 " to indicate the starting point of what will be converted. Direct\n"
720 " to indicate the starting point of what will be converted. Direct\n"
721 " access to the repository files is not needed, unless of course the\n"
721 " access to the repository files is not needed, unless of course the\n"
722 " repository is :local:. The conversion uses the top level directory\n"
722 " repository is :local:. The conversion uses the top level directory\n"
723 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
723 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
724 " commands to find files to convert. This means that unless a\n"
724 " commands to find files to convert. This means that unless a\n"
725 " filemap is given, all files under the starting directory will be\n"
725 " filemap is given, all files under the starting directory will be\n"
726 " converted, and that any directory reorganization in the CVS\n"
726 " converted, and that any directory reorganization in the CVS\n"
727 " sandbox is ignored.\n"
727 " sandbox is ignored.\n"
728 "\n"
728 "\n"
729 " Because CVS does not have changesets, it is necessary to collect\n"
729 " Because CVS does not have changesets, it is necessary to collect\n"
730 " individual commits to CVS and merge them into changesets. CVS\n"
730 " individual commits to CVS and merge them into changesets. CVS\n"
731 " source uses its internal changeset merging code by default but can\n"
731 " source uses its internal changeset merging code by default but can\n"
732 " be configured to call the external 'cvsps' program by setting:\n"
732 " be configured to call the external 'cvsps' program by setting:\n"
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
734 " This option is deprecated and will be removed in Mercurial 1.4.\n"
734 " This option is deprecated and will be removed in Mercurial 1.4.\n"
735 "\n"
735 "\n"
736 " The options shown are the defaults.\n"
736 " The options shown are the defaults.\n"
737 "\n"
737 "\n"
738 " Internal cvsps is selected by setting\n"
738 " Internal cvsps is selected by setting\n"
739 " --config convert.cvsps=builtin\n"
739 " --config convert.cvsps=builtin\n"
740 " and has a few more configurable options:\n"
740 " and has a few more configurable options:\n"
741 " --config convert.cvsps.cache=True (boolean)\n"
741 " --config convert.cvsps.cache=True (boolean)\n"
742 " Set to False to disable remote log caching, for testing and\n"
742 " Set to False to disable remote log caching, for testing and\n"
743 " debugging purposes.\n"
743 " debugging purposes.\n"
744 " --config convert.cvsps.fuzz=60 (integer)\n"
744 " --config convert.cvsps.fuzz=60 (integer)\n"
745 " Specify the maximum time (in seconds) that is allowed\n"
745 " Specify the maximum time (in seconds) that is allowed\n"
746 " between commits with identical user and log message in a\n"
746 " between commits with identical user and log message in a\n"
747 " single changeset. When very large files were checked in as\n"
747 " single changeset. When very large files were checked in as\n"
748 " part of a changeset then the default may not be long\n"
748 " part of a changeset then the default may not be long\n"
749 " enough.\n"
749 " enough.\n"
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
751 " Specify a regular expression to which commit log messages\n"
751 " Specify a regular expression to which commit log messages\n"
752 " are matched. If a match occurs, then the conversion\n"
752 " are matched. If a match occurs, then the conversion\n"
753 " process will insert a dummy revision merging the branch on\n"
753 " process will insert a dummy revision merging the branch on\n"
754 " which this log message occurs to the branch indicated in\n"
754 " which this log message occurs to the branch indicated in\n"
755 " the regex.\n"
755 " the regex.\n"
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
757 " Specify a regular expression to which commit log messages\n"
757 " Specify a regular expression to which commit log messages\n"
758 " are matched. If a match occurs, then the conversion\n"
758 " are matched. If a match occurs, then the conversion\n"
759 " process will add the most recent revision on the branch\n"
759 " process will add the most recent revision on the branch\n"
760 " indicated in the regex as the second parent of the\n"
760 " indicated in the regex as the second parent of the\n"
761 " changeset.\n"
761 " changeset.\n"
762 "\n"
762 "\n"
763 " The hgext/convert/cvsps wrapper script allows the builtin\n"
763 " The hgext/convert/cvsps wrapper script allows the builtin\n"
764 " changeset merging code to be run without doing a conversion. Its\n"
764 " changeset merging code to be run without doing a conversion. Its\n"
765 " parameters and output are similar to that of cvsps 2.1.\n"
765 " parameters and output are similar to that of cvsps 2.1.\n"
766 "\n"
766 "\n"
767 " Subversion Source\n"
767 " Subversion Source\n"
768 " -----------------\n"
768 " -----------------\n"
769 "\n"
769 "\n"
770 " Subversion source detects classical trunk/branches/tags layouts.\n"
770 " Subversion source detects classical trunk/branches/tags layouts.\n"
771 " By default, the supplied \"svn://repo/path/\" source URL is\n"
771 " By default, the supplied \"svn://repo/path/\" source URL is\n"
772 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
772 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
773 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
773 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
774 " its subdirectories are listed as possible branches. If\n"
774 " its subdirectories are listed as possible branches. If\n"
775 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
775 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
776 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
776 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
777 " can be overridden with following options. Set them to paths\n"
777 " can be overridden with following options. Set them to paths\n"
778 " relative to the source URL, or leave them blank to disable auto\n"
778 " relative to the source URL, or leave them blank to disable auto\n"
779 " detection.\n"
779 " detection.\n"
780 "\n"
780 "\n"
781 " --config convert.svn.branches=branches (directory name)\n"
781 " --config convert.svn.branches=branches (directory name)\n"
782 " specify the directory containing branches\n"
782 " specify the directory containing branches\n"
783 " --config convert.svn.tags=tags (directory name)\n"
783 " --config convert.svn.tags=tags (directory name)\n"
784 " specify the directory containing tags\n"
784 " specify the directory containing tags\n"
785 " --config convert.svn.trunk=trunk (directory name)\n"
785 " --config convert.svn.trunk=trunk (directory name)\n"
786 " specify the name of the trunk branch\n"
786 " specify the name of the trunk branch\n"
787 "\n"
787 "\n"
788 " Source history can be retrieved starting at a specific revision,\n"
788 " Source history can be retrieved starting at a specific revision,\n"
789 " instead of being integrally converted. Only single branch\n"
789 " instead of being integrally converted. Only single branch\n"
790 " conversions are supported.\n"
790 " conversions are supported.\n"
791 "\n"
791 "\n"
792 " --config convert.svn.startrev=0 (svn revision number)\n"
792 " --config convert.svn.startrev=0 (svn revision number)\n"
793 " specify start Subversion revision.\n"
793 " specify start Subversion revision.\n"
794 "\n"
794 "\n"
795 " Perforce Source\n"
795 " Perforce Source\n"
796 " ---------------\n"
796 " ---------------\n"
797 "\n"
797 "\n"
798 " The Perforce (P4) importer can be given a p4 depot path or a\n"
798 " The Perforce (P4) importer can be given a p4 depot path or a\n"
799 " client specification as source. It will convert all files in the\n"
799 " client specification as source. It will convert all files in the\n"
800 " source to a flat Mercurial repository, ignoring labels, branches\n"
800 " source to a flat Mercurial repository, ignoring labels, branches\n"
801 " and integrations. Note that when a depot path is given you then\n"
801 " and integrations. Note that when a depot path is given you then\n"
802 " usually should specify a target directory, because otherwise the\n"
802 " usually should specify a target directory, because otherwise the\n"
803 " target may be named ...-hg.\n"
803 " target may be named ...-hg.\n"
804 "\n"
804 "\n"
805 " It is possible to limit the amount of source history to be\n"
805 " It is possible to limit the amount of source history to be\n"
806 " converted by specifying an initial Perforce revision.\n"
806 " converted by specifying an initial Perforce revision.\n"
807 "\n"
807 "\n"
808 " --config convert.p4.startrev=0 (perforce changelist number)\n"
808 " --config convert.p4.startrev=0 (perforce changelist number)\n"
809 " specify initial Perforce revision.\n"
809 " specify initial Perforce revision.\n"
810 "\n"
810 "\n"
811 "\n"
811 "\n"
812 " Mercurial Destination\n"
812 " Mercurial Destination\n"
813 " ---------------------\n"
813 " ---------------------\n"
814 "\n"
814 "\n"
815 " --config convert.hg.clonebranches=False (boolean)\n"
815 " --config convert.hg.clonebranches=False (boolean)\n"
816 " dispatch source branches in separate clones.\n"
816 " dispatch source branches in separate clones.\n"
817 " --config convert.hg.tagsbranch=default (branch name)\n"
817 " --config convert.hg.tagsbranch=default (branch name)\n"
818 " tag revisions branch name\n"
818 " tag revisions branch name\n"
819 " --config convert.hg.usebranchnames=True (boolean)\n"
819 " --config convert.hg.usebranchnames=True (boolean)\n"
820 " preserve branch names\n"
820 " preserve branch names\n"
821 "\n"
821 "\n"
822 " "
822 " "
823 msgstr ""
823 msgstr ""
824
824
825 msgid ""
825 msgid ""
826 "create changeset information from CVS\n"
826 "create changeset information from CVS\n"
827 "\n"
827 "\n"
828 " This command is intended as a debugging tool for the CVS to\n"
828 " This command is intended as a debugging tool for the CVS to\n"
829 " Mercurial converter, and can be used as a direct replacement for\n"
829 " Mercurial converter, and can be used as a direct replacement for\n"
830 " cvsps.\n"
830 " cvsps.\n"
831 "\n"
831 "\n"
832 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
832 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
833 " named directory) in the CVS repository, and converts the log to a\n"
833 " named directory) in the CVS repository, and converts the log to a\n"
834 " series of changesets based on matching commit log entries and\n"
834 " series of changesets based on matching commit log entries and\n"
835 " dates."
835 " dates."
836 msgstr ""
836 msgstr ""
837
837
838 msgid "username mapping filename"
838 msgid "username mapping filename"
839 msgstr ""
839 msgstr ""
840
840
841 msgid "destination repository type"
841 msgid "destination repository type"
842 msgstr ""
842 msgstr ""
843
843
844 msgid "remap file names using contents of file"
844 msgid "remap file names using contents of file"
845 msgstr ""
845 msgstr ""
846
846
847 msgid "import up to target revision REV"
847 msgid "import up to target revision REV"
848 msgstr ""
848 msgstr ""
849
849
850 msgid "source repository type"
850 msgid "source repository type"
851 msgstr ""
851 msgstr ""
852
852
853 msgid "splice synthesized history into place"
853 msgid "splice synthesized history into place"
854 msgstr ""
854 msgstr ""
855
855
856 msgid "change branch names while converting"
856 msgid "change branch names while converting"
857 msgstr ""
857 msgstr ""
858
858
859 msgid "try to sort changesets by branches"
859 msgid "try to sort changesets by branches"
860 msgstr ""
860 msgstr ""
861
861
862 msgid "try to sort changesets by date"
862 msgid "try to sort changesets by date"
863 msgstr ""
863 msgstr ""
864
864
865 msgid "preserve source changesets order"
865 msgid "preserve source changesets order"
866 msgstr ""
866 msgstr ""
867
867
868 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
868 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
869 msgstr ""
869 msgstr ""
870
870
871 msgid "only return changes on specified branches"
871 msgid "only return changes on specified branches"
872 msgstr ""
872 msgstr ""
873
873
874 msgid "prefix to remove from file names"
874 msgid "prefix to remove from file names"
875 msgstr ""
875 msgstr ""
876
876
877 msgid "only return changes after or between specified tags"
877 msgid "only return changes after or between specified tags"
878 msgstr ""
878 msgstr ""
879
879
880 msgid "update cvs log cache"
880 msgid "update cvs log cache"
881 msgstr ""
881 msgstr ""
882
882
883 msgid "create new cvs log cache"
883 msgid "create new cvs log cache"
884 msgstr ""
884 msgstr ""
885
885
886 msgid "set commit time fuzz in seconds"
886 msgid "set commit time fuzz in seconds"
887 msgstr ""
887 msgstr ""
888
888
889 msgid "specify cvsroot"
889 msgid "specify cvsroot"
890 msgstr ""
890 msgstr ""
891
891
892 msgid "show parent changesets"
892 msgid "show parent changesets"
893 msgstr ""
893 msgstr ""
894
894
895 msgid "show current changeset in ancestor branches"
895 msgid "show current changeset in ancestor branches"
896 msgstr ""
896 msgstr ""
897
897
898 msgid "ignored for compatibility"
898 msgid "ignored for compatibility"
899 msgstr ""
899 msgstr ""
900
900
901 msgid "hg debugcvsps [OPTION]... [PATH]..."
901 msgid "hg debugcvsps [OPTION]... [PATH]..."
902 msgstr ""
902 msgstr ""
903
903
904 msgid ""
904 msgid ""
905 "warning: lightweight checkouts may cause conversion failures, try with a "
905 "warning: lightweight checkouts may cause conversion failures, try with a "
906 "regular branch instead.\n"
906 "regular branch instead.\n"
907 msgstr ""
907 msgstr ""
908
908
909 msgid "bzr source type could not be determined\n"
909 msgid "bzr source type could not be determined\n"
910 msgstr ""
910 msgstr ""
911
911
912 #, python-format
912 #, python-format
913 msgid "%s is not a valid revision in current branch"
913 msgid "%s is not a valid revision in current branch"
914 msgstr ""
914 msgstr ""
915
915
916 #, python-format
916 #, python-format
917 msgid "%s is not available in %s anymore"
917 msgid "%s is not available in %s anymore"
918 msgstr ""
918 msgstr ""
919
919
920 #, python-format
920 #, python-format
921 msgid "%s.%s symlink has no target"
921 msgid "%s.%s symlink has no target"
922 msgstr ""
922 msgstr ""
923
923
924 #, python-format
924 #, python-format
925 msgid "cannot find required \"%s\" tool"
925 msgid "cannot find required \"%s\" tool"
926 msgstr ""
926 msgstr ""
927
927
928 #, python-format
928 #, python-format
929 msgid "running: %s\n"
929 msgid "running: %s\n"
930 msgstr ""
930 msgstr ""
931
931
932 #, python-format
932 #, python-format
933 msgid "%s error:\n"
933 msgid "%s error:\n"
934 msgstr ""
934 msgstr ""
935
935
936 #, python-format
936 #, python-format
937 msgid "syntax error in %s(%d): key/value pair expected"
937 msgid "syntax error in %s(%d): key/value pair expected"
938 msgstr ""
938 msgstr ""
939
939
940 #, python-format
940 #, python-format
941 msgid "could not open map file %r: %s"
941 msgid "could not open map file %r: %s"
942 msgstr ""
942 msgstr ""
943
943
944 #, python-format
944 #, python-format
945 msgid "%s: missing or unsupported repository"
945 msgid "%s: missing or unsupported repository"
946 msgstr ""
946 msgstr ""
947
947
948 #, python-format
948 #, python-format
949 msgid "convert: %s\n"
949 msgid "convert: %s\n"
950 msgstr ""
950 msgstr ""
951
951
952 #, python-format
952 #, python-format
953 msgid "%s: unknown repository type"
953 msgid "%s: unknown repository type"
954 msgstr ""
954 msgstr ""
955
955
956 #, python-format
956 #, python-format
957 msgid "unknown sort mode: %s"
957 msgid "unknown sort mode: %s"
958 msgstr ""
958 msgstr ""
959
959
960 #, python-format
960 #, python-format
961 msgid "cycle detected between %s and %s"
961 msgid "cycle detected between %s and %s"
962 msgstr ""
962 msgstr ""
963
963
964 msgid "not all revisions were sorted"
964 msgid "not all revisions were sorted"
965 msgstr ""
965 msgstr ""
966
966
967 #, python-format
967 #, python-format
968 msgid "Writing author map file %s\n"
968 msgid "Writing author map file %s\n"
969 msgstr ""
969 msgstr ""
970
970
971 #, python-format
971 #, python-format
972 msgid "Ignoring bad line in author map file %s: %s\n"
972 msgid "Ignoring bad line in author map file %s: %s\n"
973 msgstr ""
973 msgstr ""
974
974
975 #, python-format
975 #, python-format
976 msgid "mapping author %s to %s\n"
976 msgid "mapping author %s to %s\n"
977 msgstr ""
977 msgstr ""
978
978
979 #, python-format
979 #, python-format
980 msgid "overriding mapping for author %s, was %s, will be %s\n"
980 msgid "overriding mapping for author %s, was %s, will be %s\n"
981 msgstr ""
981 msgstr ""
982
982
983 #, python-format
983 #, python-format
984 msgid "spliced in %s as parents of %s\n"
984 msgid "spliced in %s as parents of %s\n"
985 msgstr ""
985 msgstr ""
986
986
987 msgid "scanning source...\n"
987 msgid "scanning source...\n"
988 msgstr ""
988 msgstr ""
989
989
990 msgid "sorting...\n"
990 msgid "sorting...\n"
991 msgstr ""
991 msgstr ""
992
992
993 msgid "converting...\n"
993 msgid "converting...\n"
994 msgstr ""
994 msgstr ""
995
995
996 #, python-format
996 #, python-format
997 msgid "source: %s\n"
997 msgid "source: %s\n"
998 msgstr ""
998 msgstr ""
999
999
1000 #, python-format
1000 #, python-format
1001 msgid "assuming destination %s\n"
1001 msgid "assuming destination %s\n"
1002 msgstr ""
1002 msgstr ""
1003
1003
1004 msgid "more than one sort mode specified"
1004 msgid "more than one sort mode specified"
1005 msgstr ""
1005 msgstr ""
1006
1006
1007 msgid "--sourcesort is not supported by this data source"
1007 msgid "--sourcesort is not supported by this data source"
1008 msgstr ""
1008 msgstr ""
1009
1009
1010 msgid ""
1010 msgid ""
1011 "warning: support for external cvsps is deprecated and will be removed in "
1011 "warning: support for external cvsps is deprecated and will be removed in "
1012 "Mercurial 1.4\n"
1012 "Mercurial 1.4\n"
1013 msgstr ""
1013 msgstr ""
1014
1014
1015 #, python-format
1015 #, python-format
1016 msgid "revision %s is not a patchset number or date"
1016 msgid "revision %s is not a patchset number or date"
1017 msgstr ""
1017 msgstr ""
1018
1018
1019 msgid "using builtin cvsps\n"
1019 msgid "using builtin cvsps\n"
1020 msgstr ""
1020 msgstr ""
1021
1021
1022 #, python-format
1022 #, python-format
1023 msgid "connecting to %s\n"
1023 msgid "connecting to %s\n"
1024 msgstr ""
1024 msgstr ""
1025
1025
1026 msgid "CVS pserver authentication failed"
1026 msgid "CVS pserver authentication failed"
1027 msgstr ""
1027 msgstr ""
1028
1028
1029 msgid "server sucks"
1029 msgid "server sucks"
1030 msgstr ""
1030 msgstr ""
1031
1031
1032 #, python-format
1032 #, python-format
1033 msgid "%d bytes missing from remote file"
1033 msgid "%d bytes missing from remote file"
1034 msgstr ""
1034 msgstr ""
1035
1035
1036 #, python-format
1036 #, python-format
1037 msgid "cvs server: %s\n"
1037 msgid "cvs server: %s\n"
1038 msgstr ""
1038 msgstr ""
1039
1039
1040 #, python-format
1040 #, python-format
1041 msgid "unknown CVS response: %s"
1041 msgid "unknown CVS response: %s"
1042 msgstr ""
1042 msgstr ""
1043
1043
1044 msgid "collecting CVS rlog\n"
1044 msgid "collecting CVS rlog\n"
1045 msgstr ""
1045 msgstr ""
1046
1046
1047 #, python-format
1047 #, python-format
1048 msgid "reading cvs log cache %s\n"
1048 msgid "reading cvs log cache %s\n"
1049 msgstr ""
1049 msgstr ""
1050
1050
1051 #, python-format
1051 #, python-format
1052 msgid "cache has %d log entries\n"
1052 msgid "cache has %d log entries\n"
1053 msgstr ""
1053 msgstr ""
1054
1054
1055 #, python-format
1055 #, python-format
1056 msgid "error reading cache: %r\n"
1056 msgid "error reading cache: %r\n"
1057 msgstr ""
1057 msgstr ""
1058
1058
1059 #, python-format
1059 #, python-format
1060 msgid "running %s\n"
1060 msgid "running %s\n"
1061 msgstr ""
1061 msgstr ""
1062
1062
1063 #, python-format
1063 #, python-format
1064 msgid "prefix=%r directory=%r root=%r\n"
1064 msgid "prefix=%r directory=%r root=%r\n"
1065 msgstr ""
1065 msgstr ""
1066
1066
1067 msgid "RCS file must be followed by working file"
1067 msgid "RCS file must be followed by working file"
1068 msgstr ""
1068 msgstr ""
1069
1069
1070 msgid "must have at least some revisions"
1070 msgid "must have at least some revisions"
1071 msgstr ""
1071 msgstr ""
1072
1072
1073 msgid "expected revision number"
1073 msgid "expected revision number"
1074 msgstr ""
1074 msgstr ""
1075
1075
1076 msgid "revision must be followed by date line"
1076 msgid "revision must be followed by date line"
1077 msgstr ""
1077 msgstr ""
1078
1078
1079 #, python-format
1079 #, python-format
1080 msgid "found synthetic revision in %s: %r\n"
1080 msgid "found synthetic revision in %s: %r\n"
1081 msgstr ""
1081 msgstr ""
1082
1082
1083 #, python-format
1083 #, python-format
1084 msgid "writing cvs log cache %s\n"
1084 msgid "writing cvs log cache %s\n"
1085 msgstr ""
1085 msgstr ""
1086
1086
1087 #, python-format
1087 #, python-format
1088 msgid "%d log entries\n"
1088 msgid "%d log entries\n"
1089 msgstr ""
1089 msgstr ""
1090
1090
1091 msgid "creating changesets\n"
1091 msgid "creating changesets\n"
1092 msgstr ""
1092 msgstr ""
1093
1093
1094 msgid "synthetic changeset cannot have multiple parents"
1094 msgid "synthetic changeset cannot have multiple parents"
1095 msgstr ""
1095 msgstr ""
1096
1096
1097 #, python-format
1097 #, python-format
1098 msgid ""
1098 msgid ""
1099 "warning: CVS commit message references non-existent branch %r:\n"
1099 "warning: CVS commit message references non-existent branch %r:\n"
1100 "%s\n"
1100 "%s\n"
1101 msgstr ""
1101 msgstr ""
1102
1102
1103 #, python-format
1103 #, python-format
1104 msgid "%d changeset entries\n"
1104 msgid "%d changeset entries\n"
1105 msgstr ""
1105 msgstr ""
1106
1106
1107 msgid "Python ElementTree module is not available"
1107 msgid "Python ElementTree module is not available"
1108 msgstr ""
1108 msgstr ""
1109
1109
1110 #, python-format
1110 #, python-format
1111 msgid "cleaning up %s\n"
1111 msgid "cleaning up %s\n"
1112 msgstr ""
1112 msgstr ""
1113
1113
1114 msgid "internal calling inconsistency"
1114 msgid "internal calling inconsistency"
1115 msgstr ""
1115 msgstr ""
1116
1116
1117 msgid "errors in filemap"
1117 msgid "errors in filemap"
1118 msgstr ""
1118 msgstr ""
1119
1119
1120 #, python-format
1120 #, python-format
1121 msgid "%s:%d: %r already in %s list\n"
1121 msgid "%s:%d: %r already in %s list\n"
1122 msgstr ""
1122 msgstr ""
1123
1123
1124 #, python-format
1124 #, python-format
1125 msgid "%s:%d: unknown directive %r\n"
1125 msgid "%s:%d: unknown directive %r\n"
1126 msgstr ""
1126 msgstr ""
1127
1127
1128 msgid "source repository doesn't support --filemap"
1128 msgid "source repository doesn't support --filemap"
1129 msgstr ""
1129 msgstr ""
1130
1130
1131 #, python-format
1131 #, python-format
1132 msgid "%s does not look like a GNU Arch repo"
1132 msgid "%s does not look like a GNU Arch repo"
1133 msgstr ""
1133 msgstr ""
1134
1134
1135 msgid "cannot find a GNU Arch tool"
1135 msgid "cannot find a GNU Arch tool"
1136 msgstr ""
1136 msgstr ""
1137
1137
1138 #, python-format
1138 #, python-format
1139 msgid "analyzing tree version %s...\n"
1139 msgid "analyzing tree version %s...\n"
1140 msgstr ""
1140 msgstr ""
1141
1141
1142 #, python-format
1142 #, python-format
1143 msgid ""
1143 msgid ""
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1145 msgstr ""
1145 msgstr ""
1146
1146
1147 #, python-format
1147 #, python-format
1148 msgid "applying revision %s...\n"
1148 msgid "applying revision %s...\n"
1149 msgstr ""
1149 msgstr ""
1150
1150
1151 #, python-format
1151 #, python-format
1152 msgid "computing changeset between %s and %s...\n"
1152 msgid "computing changeset between %s and %s...\n"
1153 msgstr ""
1153 msgstr ""
1154
1154
1155 #, python-format
1155 #, python-format
1156 msgid "obtaining revision %s...\n"
1156 msgid "obtaining revision %s...\n"
1157 msgstr ""
1157 msgstr ""
1158
1158
1159 #, python-format
1159 #, python-format
1160 msgid "analyzing revision %s...\n"
1160 msgid "analyzing revision %s...\n"
1161 msgstr ""
1161 msgstr ""
1162
1162
1163 #, python-format
1163 #, python-format
1164 msgid "could not parse cat-log of %s"
1164 msgid "could not parse cat-log of %s"
1165 msgstr ""
1165 msgstr ""
1166
1166
1167 #, python-format
1167 #, python-format
1168 msgid "%s is not a local Mercurial repo"
1168 msgid "%s is not a local Mercurial repo"
1169 msgstr ""
1169 msgstr ""
1170
1170
1171 #, python-format
1171 #, python-format
1172 msgid "initializing destination %s repository\n"
1172 msgid "initializing destination %s repository\n"
1173 msgstr ""
1173 msgstr ""
1174
1174
1175 msgid "run hg sink pre-conversion action\n"
1175 msgid "run hg sink pre-conversion action\n"
1176 msgstr ""
1176 msgstr ""
1177
1177
1178 msgid "run hg sink post-conversion action\n"
1178 msgid "run hg sink post-conversion action\n"
1179 msgstr ""
1179 msgstr ""
1180
1180
1181 #, python-format
1181 #, python-format
1182 msgid "pulling from %s into %s\n"
1182 msgid "pulling from %s into %s\n"
1183 msgstr ""
1183 msgstr ""
1184
1184
1185 msgid "filtering out empty revision\n"
1185 msgid "filtering out empty revision\n"
1186 msgstr ""
1186 msgstr ""
1187
1187
1188 msgid "updating tags\n"
1188 msgid "updating tags\n"
1189 msgstr ""
1189 msgstr ""
1190
1190
1191 #, python-format
1191 #, python-format
1192 msgid "%s is not a valid start revision"
1192 msgid "%s is not a valid start revision"
1193 msgstr ""
1193 msgstr ""
1194
1194
1195 #, python-format
1195 #, python-format
1196 msgid "ignoring: %s\n"
1196 msgid "ignoring: %s\n"
1197 msgstr ""
1197 msgstr ""
1198
1198
1199 msgid "run hg source pre-conversion action\n"
1199 msgid "run hg source pre-conversion action\n"
1200 msgstr ""
1200 msgstr ""
1201
1201
1202 msgid "run hg source post-conversion action\n"
1202 msgid "run hg source post-conversion action\n"
1203 msgstr ""
1203 msgstr ""
1204
1204
1205 #, python-format
1205 #, python-format
1206 msgid "%s does not look like a monotone repo"
1206 msgid "%s does not look like a monotone repo"
1207 msgstr ""
1207 msgstr ""
1208
1208
1209 #, python-format
1209 #, python-format
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1211 msgstr ""
1211 msgstr ""
1212
1212
1213 msgid "reading p4 views\n"
1213 msgid "reading p4 views\n"
1214 msgstr ""
1214 msgstr ""
1215
1215
1216 msgid "collecting p4 changelists\n"
1216 msgid "collecting p4 changelists\n"
1217 msgstr ""
1217 msgstr ""
1218
1218
1219 msgid "Subversion python bindings could not be loaded"
1219 msgid "Subversion python bindings could not be loaded"
1220 msgstr ""
1220 msgstr ""
1221
1221
1222 #, python-format
1222 #, python-format
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1224 msgstr ""
1224 msgstr ""
1225
1225
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1227 msgstr ""
1227 msgstr ""
1228
1228
1229 #, python-format
1229 #, python-format
1230 msgid "svn: revision %s is not an integer"
1230 msgid "svn: revision %s is not an integer"
1231 msgstr ""
1231 msgstr ""
1232
1232
1233 #, python-format
1233 #, python-format
1234 msgid "svn: start revision %s is not an integer"
1234 msgid "svn: start revision %s is not an integer"
1235 msgstr ""
1235 msgstr ""
1236
1236
1237 #, python-format
1237 #, python-format
1238 msgid "no revision found in module %s"
1238 msgid "no revision found in module %s"
1239 msgstr ""
1239 msgstr ""
1240
1240
1241 #, python-format
1241 #, python-format
1242 msgid "expected %s to be at %r, but not found"
1242 msgid "expected %s to be at %r, but not found"
1243 msgstr ""
1243 msgstr ""
1244
1244
1245 #, python-format
1245 #, python-format
1246 msgid "found %s at %r\n"
1246 msgid "found %s at %r\n"
1247 msgstr ""
1247 msgstr ""
1248
1248
1249 #, python-format
1249 #, python-format
1250 msgid "ignoring empty branch %s\n"
1250 msgid "ignoring empty branch %s\n"
1251 msgstr ""
1251 msgstr ""
1252
1252
1253 #, python-format
1253 #, python-format
1254 msgid "found branch %s at %d\n"
1254 msgid "found branch %s at %d\n"
1255 msgstr ""
1255 msgstr ""
1256
1256
1257 msgid "svn: start revision is not supported with more than one branch"
1257 msgid "svn: start revision is not supported with more than one branch"
1258 msgstr ""
1258 msgstr ""
1259
1259
1260 #, python-format
1260 #, python-format
1261 msgid "svn: no revision found after start revision %d"
1261 msgid "svn: no revision found after start revision %d"
1262 msgstr ""
1262 msgstr ""
1263
1263
1264 #, python-format
1264 #, python-format
1265 msgid "no tags found at revision %d\n"
1265 msgid "no tags found at revision %d\n"
1266 msgstr ""
1266 msgstr ""
1267
1267
1268 #, python-format
1268 #, python-format
1269 msgid "ignoring foreign branch %r\n"
1269 msgid "ignoring foreign branch %r\n"
1270 msgstr ""
1270 msgstr ""
1271
1271
1272 #, python-format
1272 #, python-format
1273 msgid "%s not found up to revision %d"
1273 msgid "%s not found up to revision %d"
1274 msgstr ""
1274 msgstr ""
1275
1275
1276 #, python-format
1276 #, python-format
1277 msgid "branch renamed from %s to %s at %d\n"
1277 msgid "branch renamed from %s to %s at %d\n"
1278 msgstr ""
1278 msgstr ""
1279
1279
1280 #, python-format
1280 #, python-format
1281 msgid "reparent to %s\n"
1281 msgid "reparent to %s\n"
1282 msgstr ""
1282 msgstr ""
1283
1283
1284 #, python-format
1284 #, python-format
1285 msgid "copied to %s from %s@%s\n"
1285 msgid "copied to %s from %s@%s\n"
1286 msgstr ""
1286 msgstr ""
1287
1287
1288 #, python-format
1288 #, python-format
1289 msgid "gone from %s\n"
1289 msgid "gone from %s\n"
1290 msgstr ""
1290 msgstr ""
1291
1291
1292 #, python-format
1292 #, python-format
1293 msgid "entry %s\n"
1293 msgid "entry %s\n"
1294 msgstr ""
1294 msgstr ""
1295
1295
1296 #, python-format
1296 #, python-format
1297 msgid "unknown path in revision %d: %s\n"
1297 msgid "unknown path in revision %d: %s\n"
1298 msgstr ""
1298 msgstr ""
1299
1299
1300 #, python-format
1300 #, python-format
1301 msgid "mark %s came from %s:%d\n"
1301 msgid "mark %s came from %s:%d\n"
1302 msgstr ""
1302 msgstr ""
1303
1303
1304 #, python-format
1304 #, python-format
1305 msgid "parsing revision %d (%d changes)\n"
1305 msgid "parsing revision %d (%d changes)\n"
1306 msgstr ""
1306 msgstr ""
1307
1307
1308 #, python-format
1308 #, python-format
1309 msgid "found parent of branch %s at %d: %s\n"
1309 msgid "found parent of branch %s at %d: %s\n"
1310 msgstr ""
1310 msgstr ""
1311
1311
1312 msgid "no copyfrom path, don't know what to do.\n"
1312 msgid "no copyfrom path, don't know what to do.\n"
1313 msgstr ""
1313 msgstr ""
1314
1314
1315 #, python-format
1315 #, python-format
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1317 msgstr ""
1317 msgstr ""
1318
1318
1319 #, python-format
1319 #, python-format
1320 msgid "revision %d has no entries\n"
1320 msgid "revision %d has no entries\n"
1321 msgstr ""
1321 msgstr ""
1322
1322
1323 #, python-format
1323 #, python-format
1324 msgid "svn: branch has no revision %s"
1324 msgid "svn: branch has no revision %s"
1325 msgstr ""
1325 msgstr ""
1326
1326
1327 #, python-format
1327 #, python-format
1328 msgid "%r is not under %r, ignoring\n"
1328 msgid "%r is not under %r, ignoring\n"
1329 msgstr ""
1329 msgstr ""
1330
1330
1331 #, python-format
1331 #, python-format
1332 msgid "initializing svn repo %r\n"
1332 msgid "initializing svn repo %r\n"
1333 msgstr ""
1333 msgstr ""
1334
1334
1335 #, python-format
1335 #, python-format
1336 msgid "initializing svn wc %r\n"
1336 msgid "initializing svn wc %r\n"
1337 msgstr ""
1337 msgstr ""
1338
1338
1339 msgid "unexpected svn output:\n"
1339 msgid "unexpected svn output:\n"
1340 msgstr ""
1340 msgstr ""
1341
1341
1342 msgid "unable to cope with svn output"
1342 msgid "unable to cope with svn output"
1343 msgstr ""
1343 msgstr ""
1344
1344
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1346 msgstr ""
1346 msgstr ""
1347
1347
1348 msgid ""
1348 msgid ""
1349 "command to allow external programs to compare revisions\n"
1349 "command to allow external programs to compare revisions\n"
1350 "\n"
1350 "\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1353 "programs are called with a configurable set of options and two\n"
1353 "programs are called with a configurable set of options and two\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1355 "files to compare.\n"
1355 "files to compare.\n"
1356 "\n"
1356 "\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1358 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1358 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1359 "\n"
1359 "\n"
1360 " [extdiff]\n"
1360 " [extdiff]\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1362 " cdiff = gdiff -Nprc5\n"
1362 " cdiff = gdiff -Nprc5\n"
1363 " ## or the old way:\n"
1363 " ## or the old way:\n"
1364 " #cmd.cdiff = gdiff\n"
1364 " #cmd.cdiff = gdiff\n"
1365 " #opts.cdiff = -Nprc5\n"
1365 " #opts.cdiff = -Nprc5\n"
1366 "\n"
1366 "\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1368 " vdiff = kdiff3\n"
1368 " vdiff = kdiff3\n"
1369 "\n"
1369 "\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1371 " meld =\n"
1371 " meld =\n"
1372 "\n"
1372 "\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1376 "in\n"
1376 "in\n"
1377 " # your .vimrc\n"
1377 " # your .vimrc\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1379 "\n"
1379 "\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1381 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1381 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1382 "files, so running the external diff program will actually be pretty\n"
1382 "files, so running the external diff program will actually be pretty\n"
1383 "fast (at least faster than having to compare the entire tree).\n"
1383 "fast (at least faster than having to compare the entire tree).\n"
1384 msgstr ""
1384 msgstr ""
1385
1385
1386 #, python-format
1386 #, python-format
1387 msgid "making snapshot of %d files from rev %s\n"
1387 msgid "making snapshot of %d files from rev %s\n"
1388 msgstr ""
1388 msgstr ""
1389
1389
1390 #, python-format
1390 #, python-format
1391 msgid "making snapshot of %d files from working directory\n"
1391 msgid "making snapshot of %d files from working directory\n"
1392 msgstr ""
1392 msgstr ""
1393
1393
1394 msgid "cannot specify --rev and --change at the same time"
1394 msgid "cannot specify --rev and --change at the same time"
1395 msgstr ""
1395 msgstr ""
1396
1396
1397 #, python-format
1397 #, python-format
1398 msgid "running %r in %s\n"
1398 msgid "running %r in %s\n"
1399 msgstr ""
1399 msgstr ""
1400
1400
1401 #, python-format
1401 #, python-format
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1403 msgstr ""
1403 msgstr ""
1404
1404
1405 msgid "cleaning up temp directory\n"
1405 msgid "cleaning up temp directory\n"
1406 msgstr ""
1406 msgstr ""
1407
1407
1408 msgid ""
1408 msgid ""
1409 "use external program to diff repository (or selected files)\n"
1409 "use external program to diff repository (or selected files)\n"
1410 "\n"
1410 "\n"
1411 " Show differences between revisions for the specified files, using\n"
1411 " Show differences between revisions for the specified files, using\n"
1412 " an external program. The default program used is diff, with\n"
1412 " an external program. The default program used is diff, with\n"
1413 " default options \"-Npru\".\n"
1413 " default options \"-Npru\".\n"
1414 "\n"
1414 "\n"
1415 " To select a different program, use the -p/--program option. The\n"
1415 " To select a different program, use the -p/--program option. The\n"
1416 " program will be passed the names of two directories to compare. To\n"
1416 " program will be passed the names of two directories to compare. To\n"
1417 " pass additional options to the program, use -o/--option. These\n"
1417 " pass additional options to the program, use -o/--option. These\n"
1418 " will be passed before the names of the directories to compare.\n"
1418 " will be passed before the names of the directories to compare.\n"
1419 "\n"
1419 "\n"
1420 " When two revision arguments are given, then changes are shown\n"
1420 " When two revision arguments are given, then changes are shown\n"
1421 " between those revisions. If only one revision is specified then\n"
1421 " between those revisions. If only one revision is specified then\n"
1422 " that revision is compared to the working directory, and, when no\n"
1422 " that revision is compared to the working directory, and, when no\n"
1423 " revisions are specified, the working directory files are compared\n"
1423 " revisions are specified, the working directory files are compared\n"
1424 " to its parent."
1424 " to its parent."
1425 msgstr ""
1425 msgstr ""
1426
1426
1427 msgid "comparison program to run"
1427 msgid "comparison program to run"
1428 msgstr ""
1428 msgstr ""
1429
1429
1430 msgid "pass option to comparison program"
1430 msgid "pass option to comparison program"
1431 msgstr ""
1431 msgstr ""
1432
1432
1433 msgid "change made by revision"
1433 msgid "change made by revision"
1434 msgstr ""
1434 msgstr ""
1435
1435
1436 msgid "hg extdiff [OPT]... [FILE]..."
1436 msgid "hg extdiff [OPT]... [FILE]..."
1437 msgstr ""
1437 msgstr ""
1438
1438
1439 #, python-format
1439 #, python-format
1440 msgid "hg %s [OPTION]... [FILE]..."
1440 msgid "hg %s [OPTION]... [FILE]..."
1441 msgstr ""
1441 msgstr ""
1442
1442
1443 msgid "pull, update and merge in one command"
1443 msgid "pull, update and merge in one command"
1444 msgstr ""
1444 msgstr ""
1445
1445
1446 msgid ""
1446 msgid ""
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1448 "\n"
1448 "\n"
1449 " This finds all changes from the repository at the specified path\n"
1449 " This finds all changes from the repository at the specified path\n"
1450 " or URL and adds them to the local repository.\n"
1450 " or URL and adds them to the local repository.\n"
1451 "\n"
1451 "\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1453 " automatically merged, and the result of the merge is committed.\n"
1453 " automatically merged, and the result of the merge is committed.\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1455 " changes.\n"
1455 " changes.\n"
1456 "\n"
1456 "\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1458 " \"authoritative\". The head of the new changes is used as the first\n"
1458 " \"authoritative\". The head of the new changes is used as the first\n"
1459 " parent, with local changes as the second. To switch the merge\n"
1459 " parent, with local changes as the second. To switch the merge\n"
1460 " order, use --switch-parent.\n"
1460 " order, use --switch-parent.\n"
1461 "\n"
1461 "\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1463 " "
1463 " "
1464 msgstr ""
1464 msgstr ""
1465
1465
1466 msgid ""
1466 msgid ""
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1468 msgstr ""
1468 msgstr ""
1469
1469
1470 msgid "outstanding uncommitted merge"
1470 msgid "outstanding uncommitted merge"
1471 msgstr ""
1471 msgstr ""
1472
1472
1473 msgid "outstanding uncommitted changes"
1473 msgid "outstanding uncommitted changes"
1474 msgstr ""
1474 msgstr ""
1475
1475
1476 msgid "working directory is missing some files"
1476 msgid "working directory is missing some files"
1477 msgstr ""
1477 msgstr ""
1478
1478
1479 msgid ""
1479 msgid ""
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1481 msgstr ""
1481 msgstr ""
1482
1482
1483 #, python-format
1483 #, python-format
1484 msgid "pulling from %s\n"
1484 msgid "pulling from %s\n"
1485 msgstr ""
1485 msgstr ""
1486
1486
1487 msgid ""
1487 msgid ""
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1489 "specified."
1489 "specified."
1490 msgstr ""
1490 msgstr ""
1491
1491
1492 #, python-format
1492 #, python-format
1493 msgid ""
1493 msgid ""
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1495 "\" to merge them)\n"
1495 "\" to merge them)\n"
1496 msgstr ""
1496 msgstr ""
1497
1497
1498 #, python-format
1498 #, python-format
1499 msgid "updating to %d:%s\n"
1499 msgid "updating to %d:%s\n"
1500 msgstr ""
1500 msgstr ""
1501
1501
1502 #, python-format
1502 #, python-format
1503 msgid "merging with %d:%s\n"
1503 msgid "merging with %d:%s\n"
1504 msgstr ""
1504 msgstr ""
1505
1505
1506 #, python-format
1506 #, python-format
1507 msgid "Automated merge with %s"
1507 msgid "Automated merge with %s"
1508 msgstr ""
1508 msgstr ""
1509
1509
1510 #, python-format
1510 #, python-format
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1512 msgstr ""
1512 msgstr ""
1513
1513
1514 msgid "a specific revision you would like to pull"
1514 msgid "a specific revision you would like to pull"
1515 msgstr ""
1515 msgstr ""
1516
1516
1517 msgid "edit commit message"
1517 msgid "edit commit message"
1518 msgstr ""
1518 msgstr ""
1519
1519
1520 msgid "edit commit message (DEPRECATED)"
1520 msgid "edit commit message (DEPRECATED)"
1521 msgstr ""
1521 msgstr ""
1522
1522
1523 msgid "switch parents when merging"
1523 msgid "switch parents when merging"
1524 msgstr ""
1524 msgstr ""
1525
1525
1526 msgid "hg fetch [SOURCE]"
1526 msgid "hg fetch [SOURCE]"
1527 msgstr ""
1527 msgstr ""
1528
1528
1529 msgid "commands to sign and verify changesets"
1529 msgid "commands to sign and verify changesets"
1530 msgstr ""
1530 msgstr ""
1531
1531
1532 msgid "error while verifying signature"
1532 msgid "error while verifying signature"
1533 msgstr ""
1533 msgstr ""
1534
1534
1535 #, python-format
1535 #, python-format
1536 msgid "%s Bad signature from \"%s\"\n"
1536 msgid "%s Bad signature from \"%s\"\n"
1537 msgstr ""
1537 msgstr ""
1538
1538
1539 #, python-format
1539 #, python-format
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1541 msgstr ""
1541 msgstr ""
1542
1542
1543 #, python-format
1543 #, python-format
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1545 msgstr ""
1545 msgstr ""
1546
1546
1547 msgid "list signed changesets"
1547 msgid "list signed changesets"
1548 msgstr ""
1548 msgstr ""
1549
1549
1550 #, python-format
1550 #, python-format
1551 msgid "%s:%d node does not exist\n"
1551 msgid "%s:%d node does not exist\n"
1552 msgstr ""
1552 msgstr ""
1553
1553
1554 msgid "verify all the signatures there may be for a particular revision"
1554 msgid "verify all the signatures there may be for a particular revision"
1555 msgstr ""
1555 msgstr ""
1556
1556
1557 #, python-format
1557 #, python-format
1558 msgid "No valid signature for %s\n"
1558 msgid "No valid signature for %s\n"
1559 msgstr ""
1559 msgstr ""
1560
1560
1561 msgid ""
1561 msgid ""
1562 "add a signature for the current or given revision\n"
1562 "add a signature for the current or given revision\n"
1563 "\n"
1563 "\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1565 " or tip if no revision is checked out.\n"
1565 " or tip if no revision is checked out.\n"
1566 "\n"
1566 "\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1568 " "
1568 " "
1569 msgstr ""
1569 msgstr ""
1570
1570
1571 msgid "uncommitted merge - please provide a specific revision"
1571 msgid "uncommitted merge - please provide a specific revision"
1572 msgstr ""
1572 msgstr ""
1573
1573
1574 msgid "Error while signing"
1574 msgid "Error while signing"
1575 msgstr ""
1575 msgstr ""
1576
1576
1577 msgid ""
1577 msgid ""
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1579 "force)"
1579 "force)"
1580 msgstr ""
1580 msgstr ""
1581
1581
1582 #, python-format
1582 #, python-format
1583 msgid "Added signature for changeset %s"
1583 msgid "Added signature for changeset %s"
1584 msgstr ""
1584 msgstr ""
1585
1585
1586 msgid "unknown signature version"
1586 msgid "unknown signature version"
1587 msgstr ""
1587 msgstr ""
1588
1588
1589 msgid "make the signature local"
1589 msgid "make the signature local"
1590 msgstr ""
1590 msgstr ""
1591
1591
1592 msgid "sign even if the sigfile is modified"
1592 msgid "sign even if the sigfile is modified"
1593 msgstr ""
1593 msgstr ""
1594
1594
1595 msgid "do not commit the sigfile after signing"
1595 msgid "do not commit the sigfile after signing"
1596 msgstr ""
1596 msgstr ""
1597
1597
1598 msgid "the key id to sign with"
1598 msgid "the key id to sign with"
1599 msgstr ""
1599 msgstr ""
1600
1600
1601 msgid "commit message"
1601 msgid "commit message"
1602 msgstr ""
1602 msgstr ""
1603
1603
1604 msgid "hg sign [OPTION]... [REVISION]..."
1604 msgid "hg sign [OPTION]... [REVISION]..."
1605 msgstr ""
1605 msgstr ""
1606
1606
1607 msgid "hg sigcheck REVISION"
1607 msgid "hg sigcheck REVISION"
1608 msgstr ""
1608 msgstr ""
1609
1609
1610 msgid "hg sigs"
1610 msgid "hg sigs"
1611 msgstr ""
1611 msgstr ""
1612
1612
1613 msgid ""
1613 msgid ""
1614 "command to view revision graphs from a shell\n"
1614 "command to view revision graphs from a shell\n"
1615 "\n"
1615 "\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1617 "commands. When this options is given, an ASCII representation of the\n"
1617 "commands. When this options is given, an ASCII representation of the\n"
1618 "revision graph is also shown.\n"
1618 "revision graph is also shown.\n"
1619 msgstr ""
1619 msgstr ""
1620
1620
1621 #, python-format
1621 #, python-format
1622 msgid "--graph option is incompatible with --%s"
1622 msgid "--graph option is incompatible with --%s"
1623 msgstr ""
1623 msgstr ""
1624
1624
1625 msgid ""
1625 msgid ""
1626 "show revision history alongside an ASCII revision graph\n"
1626 "show revision history alongside an ASCII revision graph\n"
1627 "\n"
1627 "\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1629 " ASCII characters.\n"
1629 " ASCII characters.\n"
1630 "\n"
1630 "\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1632 " directory.\n"
1632 " directory.\n"
1633 " "
1633 " "
1634 msgstr ""
1634 msgstr ""
1635
1635
1636 #, python-format
1636 #, python-format
1637 msgid "comparing with %s\n"
1637 msgid "comparing with %s\n"
1638 msgstr "comparaison avec %s\n"
1638 msgstr "comparaison avec %s\n"
1639
1639
1640 msgid "no changes found\n"
1640 msgid "no changes found\n"
1641 msgstr "aucun changement trouvé\n"
1641 msgstr "aucun changement trouvé\n"
1642
1642
1643 msgid "show the revision DAG"
1643 msgid "show the revision DAG"
1644 msgstr ""
1644 msgstr ""
1645
1645
1646 msgid "limit number of changes displayed"
1646 msgid "limit number of changes displayed"
1647 msgstr ""
1647 msgstr ""
1648
1648
1649 msgid "show patch"
1649 msgid "show patch"
1650 msgstr ""
1650 msgstr ""
1651
1651
1652 msgid "show the specified revision or range"
1652 msgid "show the specified revision or range"
1653 msgstr ""
1653 msgstr ""
1654
1654
1655 msgid "hg glog [OPTION]... [FILE]"
1655 msgid "hg glog [OPTION]... [FILE]"
1656 msgstr ""
1656 msgstr ""
1657
1657
1658 msgid ""
1658 msgid ""
1659 "hooks for integrating with the CIA.vc notification service\n"
1659 "hooks for integrating with the CIA.vc notification service\n"
1660 "\n"
1660 "\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1662 "To configure it, set the following options in your hgrc:\n"
1662 "To configure it, set the following options in your hgrc:\n"
1663 "\n"
1663 "\n"
1664 "[cia]\n"
1664 "[cia]\n"
1665 "# your registered CIA user name\n"
1665 "# your registered CIA user name\n"
1666 "user = foo\n"
1666 "user = foo\n"
1667 "# the name of the project in CIA\n"
1667 "# the name of the project in CIA\n"
1668 "project = foo\n"
1668 "project = foo\n"
1669 "# the module (subproject) (optional)\n"
1669 "# the module (subproject) (optional)\n"
1670 "#module = foo\n"
1670 "#module = foo\n"
1671 "# Append a diffstat to the log message (optional)\n"
1671 "# Append a diffstat to the log message (optional)\n"
1672 "#diffstat = False\n"
1672 "#diffstat = False\n"
1673 "# Template to use for log messages (optional)\n"
1673 "# Template to use for log messages (optional)\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1675 "# Style to use (optional)\n"
1675 "# Style to use (optional)\n"
1676 "#style = foo\n"
1676 "#style = foo\n"
1677 "# The URL of the CIA notification service (optional)\n"
1677 "# The URL of the CIA notification service (optional)\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1679 "# mailto:cia@cia.vc\n"
1679 "# mailto:cia@cia.vc\n"
1680 "# Make sure to set email.from if you do this.\n"
1680 "# Make sure to set email.from if you do this.\n"
1681 "#url = http://cia.vc/\n"
1681 "#url = http://cia.vc/\n"
1682 "# print message instead of sending it (optional)\n"
1682 "# print message instead of sending it (optional)\n"
1683 "#test = False\n"
1683 "#test = False\n"
1684 "\n"
1684 "\n"
1685 "[hooks]\n"
1685 "[hooks]\n"
1686 "# one of these:\n"
1686 "# one of these:\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1689 "\n"
1689 "\n"
1690 "[web]\n"
1690 "[web]\n"
1691 "# If you want hyperlinks (optional)\n"
1691 "# If you want hyperlinks (optional)\n"
1692 "baseurl = http://server/path/to/repo\n"
1692 "baseurl = http://server/path/to/repo\n"
1693 msgstr ""
1693 msgstr ""
1694
1694
1695 #, python-format
1695 #, python-format
1696 msgid "hgcia: sending update to %s\n"
1696 msgid "hgcia: sending update to %s\n"
1697 msgstr ""
1697 msgstr ""
1698
1698
1699 msgid "email.from must be defined when sending by email"
1699 msgid "email.from must be defined when sending by email"
1700 msgstr ""
1700 msgstr ""
1701
1701
1702 msgid "cia: no user specified"
1702 msgid "cia: no user specified"
1703 msgstr ""
1703 msgstr ""
1704
1704
1705 msgid "cia: no project specified"
1705 msgid "cia: no project specified"
1706 msgstr ""
1706 msgstr ""
1707
1707
1708 msgid ""
1708 msgid ""
1709 "browse the repository in a graphical way\n"
1709 "browse the repository in a graphical way\n"
1710 "\n"
1710 "\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1712 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1712 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1713 "distributed with Mercurial.)\n"
1713 "distributed with Mercurial.)\n"
1714 "\n"
1714 "\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1716 "querying of information, and an extension to Mercurial named hgk.py,\n"
1716 "querying of information, and an extension to Mercurial named hgk.py,\n"
1717 "which provides hooks for hgk to get information. hgk can be found in\n"
1717 "which provides hooks for hgk to get information. hgk can be found in\n"
1718 "the contrib directory, and the extension is shipped in the hgext\n"
1718 "the contrib directory, and the extension is shipped in the hgext\n"
1719 "repository, and needs to be enabled.\n"
1719 "repository, and needs to be enabled.\n"
1720 "\n"
1720 "\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1722 "to work, hgk must be in your search path. Alternately, you can specify\n"
1722 "to work, hgk must be in your search path. Alternately, you can specify\n"
1723 "the path to hgk in your .hgrc file:\n"
1723 "the path to hgk in your .hgrc file:\n"
1724 "\n"
1724 "\n"
1725 " [hgk]\n"
1725 " [hgk]\n"
1726 " path=/location/of/hgk\n"
1726 " path=/location/of/hgk\n"
1727 "\n"
1727 "\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1730 "\n"
1730 "\n"
1731 " [hgk]\n"
1731 " [hgk]\n"
1732 " vdiff=vdiff\n"
1732 " vdiff=vdiff\n"
1733 "\n"
1733 "\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1735 "vdiff on hovered and selected revisions."
1735 "vdiff on hovered and selected revisions."
1736 msgstr ""
1736 msgstr ""
1737
1737
1738 msgid "diff trees from two commits"
1738 msgid "diff trees from two commits"
1739 msgstr ""
1739 msgstr ""
1740
1740
1741 msgid "output common ancestor information"
1741 msgid "output common ancestor information"
1742 msgstr ""
1742 msgstr ""
1743
1743
1744 msgid "cat a specific revision"
1744 msgid "cat a specific revision"
1745 msgstr ""
1745 msgstr ""
1746
1746
1747 msgid "cat-file: type or revision not supplied\n"
1747 msgid "cat-file: type or revision not supplied\n"
1748 msgstr ""
1748 msgstr ""
1749
1749
1750 msgid "aborting hg cat-file only understands commits\n"
1750 msgid "aborting hg cat-file only understands commits\n"
1751 msgstr ""
1751 msgstr ""
1752
1752
1753 msgid "parse given revisions"
1753 msgid "parse given revisions"
1754 msgstr ""
1754 msgstr ""
1755
1755
1756 msgid "print revisions"
1756 msgid "print revisions"
1757 msgstr ""
1757 msgstr ""
1758
1758
1759 msgid "print extension options"
1759 msgid "print extension options"
1760 msgstr ""
1760 msgstr ""
1761
1761
1762 msgid "start interactive history viewer"
1762 msgid "start interactive history viewer"
1763 msgstr ""
1763 msgstr ""
1764
1764
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1766 msgstr ""
1766 msgstr ""
1767
1767
1768 msgid "generate patch"
1768 msgid "generate patch"
1769 msgstr ""
1769 msgstr ""
1770
1770
1771 msgid "recursive"
1771 msgid "recursive"
1772 msgstr ""
1772 msgstr ""
1773
1773
1774 msgid "pretty"
1774 msgid "pretty"
1775 msgstr ""
1775 msgstr ""
1776
1776
1777 msgid "stdin"
1777 msgid "stdin"
1778 msgstr ""
1778 msgstr ""
1779
1779
1780 msgid "detect copies"
1780 msgid "detect copies"
1781 msgstr ""
1781 msgstr ""
1782
1782
1783 msgid "search"
1783 msgid "search"
1784 msgstr ""
1784 msgstr ""
1785
1785
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1787 msgstr ""
1787 msgstr ""
1788
1788
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1790 msgstr ""
1790 msgstr ""
1791
1791
1792 msgid "hg debug-config"
1792 msgid "hg debug-config"
1793 msgstr ""
1793 msgstr ""
1794
1794
1795 msgid "hg debug-merge-base REV REV"
1795 msgid "hg debug-merge-base REV REV"
1796 msgstr ""
1796 msgstr ""
1797
1797
1798 msgid "ignored"
1798 msgid "ignored"
1799 msgstr ""
1799 msgstr ""
1800
1800
1801 msgid "hg debug-rev-parse REV"
1801 msgid "hg debug-rev-parse REV"
1802 msgstr ""
1802 msgstr ""
1803
1803
1804 msgid "header"
1804 msgid "header"
1805 msgstr ""
1805 msgstr ""
1806
1806
1807 msgid "topo-order"
1807 msgid "topo-order"
1808 msgstr ""
1808 msgstr ""
1809
1809
1810 msgid "parents"
1810 msgid "parents"
1811 msgstr ""
1811 msgstr ""
1812
1812
1813 msgid "max-count"
1813 msgid "max-count"
1814 msgstr ""
1814 msgstr ""
1815
1815
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1818
1818
1819 msgid ""
1819 msgid ""
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1821 "\n"
1821 "\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1823 "http://pygments.org/\n"
1823 "http://pygments.org/\n"
1824 "\n"
1824 "\n"
1825 "There is a single configuration option:\n"
1825 "There is a single configuration option:\n"
1826 "\n"
1826 "\n"
1827 "[web]\n"
1827 "[web]\n"
1828 "pygments_style = <style>\n"
1828 "pygments_style = <style>\n"
1829 "\n"
1829 "\n"
1830 "The default is 'colorful'.\n"
1830 "The default is 'colorful'.\n"
1831 msgstr ""
1831 msgstr ""
1832
1832
1833 msgid "accelerate status report using Linux's inotify service"
1833 msgid "accelerate status report using Linux's inotify service"
1834 msgstr ""
1834 msgstr ""
1835
1835
1836 msgid "start an inotify server for this repository"
1836 msgid "start an inotify server for this repository"
1837 msgstr ""
1837 msgstr ""
1838
1838
1839 msgid ""
1839 msgid ""
1840 "debugging information for inotify extension\n"
1840 "debugging information for inotify extension\n"
1841 "\n"
1841 "\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1843 " "
1843 " "
1844 msgstr ""
1844 msgstr ""
1845
1845
1846 msgid "directories being watched:\n"
1846 msgid "directories being watched:\n"
1847 msgstr ""
1847 msgstr ""
1848
1848
1849 msgid "run server in background"
1849 msgid "run server in background"
1850 msgstr ""
1850 msgstr ""
1851
1851
1852 msgid "used internally by daemon mode"
1852 msgid "used internally by daemon mode"
1853 msgstr ""
1853 msgstr ""
1854
1854
1855 msgid "minutes to sit idle before exiting"
1855 msgid "minutes to sit idle before exiting"
1856 msgstr ""
1856 msgstr ""
1857
1857
1858 msgid "name of file to write process ID to"
1858 msgid "name of file to write process ID to"
1859 msgstr ""
1859 msgstr ""
1860
1860
1861 msgid "hg inserve [OPTION]..."
1861 msgid "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1863
1863
1864 msgid "(found dead inotify server socket; removing it)\n"
1864 msgid "(found dead inotify server socket; removing it)\n"
1865 msgstr ""
1865 msgstr ""
1866
1866
1867 msgid "(starting inotify server)\n"
1867 msgid "(starting inotify server)\n"
1868 msgstr ""
1868 msgstr ""
1869
1869
1870 #, python-format
1870 #, python-format
1871 msgid "could not start inotify server: %s\n"
1871 msgid "could not start inotify server: %s\n"
1872 msgstr ""
1872 msgstr ""
1873
1873
1874 #, python-format
1874 #, python-format
1875 msgid "could not talk to new inotify server: %s\n"
1875 msgid "could not talk to new inotify server: %s\n"
1876 msgstr ""
1876 msgstr ""
1877
1877
1878 msgid "(inotify server not running)\n"
1878 msgid "(inotify server not running)\n"
1879 msgstr ""
1879 msgstr ""
1880
1880
1881 #, python-format
1881 #, python-format
1882 msgid "failed to contact inotify server: %s\n"
1882 msgid "failed to contact inotify server: %s\n"
1883 msgstr ""
1883 msgstr ""
1884
1884
1885 msgid "received empty answer from inotify server"
1885 msgid "received empty answer from inotify server"
1886 msgstr ""
1886 msgstr ""
1887
1887
1888 #, python-format
1888 #, python-format
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1890 msgstr ""
1890 msgstr ""
1891
1891
1892 #, python-format
1892 #, python-format
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1894 msgstr ""
1894 msgstr ""
1895
1895
1896 msgid "this system does not seem to support inotify"
1896 msgid "this system does not seem to support inotify"
1897 msgstr ""
1897 msgstr ""
1898
1898
1899 #, python-format
1899 #, python-format
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1901 msgstr ""
1901 msgstr ""
1902
1902
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1904 msgstr ""
1904 msgstr ""
1905
1905
1906 msgid "*** counting directories: "
1906 msgid "*** counting directories: "
1907 msgstr ""
1907 msgstr ""
1908
1908
1909 #, python-format
1909 #, python-format
1910 msgid "found %d\n"
1910 msgid "found %d\n"
1911 msgstr ""
1911 msgstr ""
1912
1912
1913 #, python-format
1913 #, python-format
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1915 msgstr ""
1915 msgstr ""
1916
1916
1917 #, python-format
1917 #, python-format
1918 msgid "*** echo %d > %s\n"
1918 msgid "*** echo %d > %s\n"
1919 msgstr ""
1919 msgstr ""
1920
1920
1921 #, python-format
1921 #, python-format
1922 msgid "cannot watch %s until inotify watch limit is raised"
1922 msgid "cannot watch %s until inotify watch limit is raised"
1923 msgstr ""
1923 msgstr ""
1924
1924
1925 #, python-format
1925 #, python-format
1926 msgid "inotify service not available: %s"
1926 msgid "inotify service not available: %s"
1927 msgstr ""
1927 msgstr ""
1928
1928
1929 #, python-format
1929 #, python-format
1930 msgid "watching %r\n"
1930 msgid "watching %r\n"
1931 msgstr ""
1931 msgstr ""
1932
1932
1933 #, python-format
1933 #, python-format
1934 msgid "watching directories under %r\n"
1934 msgid "watching directories under %r\n"
1935 msgstr ""
1935 msgstr ""
1936
1936
1937 #, python-format
1937 #, python-format
1938 msgid "status: %r dir(%d) -> %s\n"
1938 msgid "status: %r dir(%d) -> %s\n"
1939 msgstr ""
1939 msgstr ""
1940
1940
1941 #, python-format
1941 #, python-format
1942 msgid "status: %r %s -> %s\n"
1942 msgid "status: %r %s -> %s\n"
1943 msgstr ""
1943 msgstr ""
1944
1944
1945 #, python-format
1945 #, python-format
1946 msgid "%s dirstate reload\n"
1946 msgid "%s dirstate reload\n"
1947 msgstr ""
1947 msgstr ""
1948
1948
1949 #, python-format
1949 #, python-format
1950 msgid "%s end dirstate reload\n"
1950 msgid "%s end dirstate reload\n"
1951 msgstr ""
1951 msgstr ""
1952
1952
1953 msgid "rescanning due to .hgignore change\n"
1953 msgid "rescanning due to .hgignore change\n"
1954 msgstr ""
1954 msgstr ""
1955
1955
1956 #, python-format
1956 #, python-format
1957 msgid "%s event: created %s\n"
1957 msgid "%s event: created %s\n"
1958 msgstr ""
1958 msgstr ""
1959
1959
1960 #, python-format
1960 #, python-format
1961 msgid "%s event: deleted %s\n"
1961 msgid "%s event: deleted %s\n"
1962 msgstr ""
1962 msgstr ""
1963
1963
1964 #, python-format
1964 #, python-format
1965 msgid "%s event: modified %s\n"
1965 msgid "%s event: modified %s\n"
1966 msgstr ""
1966 msgstr ""
1967
1967
1968 #, python-format
1968 #, python-format
1969 msgid "filesystem containing %s was unmounted\n"
1969 msgid "filesystem containing %s was unmounted\n"
1970 msgstr ""
1970 msgstr ""
1971
1971
1972 #, python-format
1972 #, python-format
1973 msgid "%s readable: %d bytes\n"
1973 msgid "%s readable: %d bytes\n"
1974 msgstr ""
1974 msgstr ""
1975
1975
1976 #, python-format
1976 #, python-format
1977 msgid "%s below threshold - unhooking\n"
1977 msgid "%s below threshold - unhooking\n"
1978 msgstr ""
1978 msgstr ""
1979
1979
1980 #, python-format
1980 #, python-format
1981 msgid "%s reading %d events\n"
1981 msgid "%s reading %d events\n"
1982 msgstr ""
1982 msgstr ""
1983
1983
1984 #, python-format
1984 #, python-format
1985 msgid "%s hooking back up with %d bytes readable\n"
1985 msgid "%s hooking back up with %d bytes readable\n"
1986 msgstr ""
1986 msgstr ""
1987
1987
1988 #, python-format
1988 #, python-format
1989 msgid "could not start server: %s"
1989 msgid "could not start server: %s"
1990 msgstr ""
1990 msgstr ""
1991
1991
1992 #, python-format
1992 #, python-format
1993 msgid "answering query for %r\n"
1993 msgid "answering query for %r\n"
1994 msgstr ""
1994 msgstr ""
1995
1995
1996 #, python-format
1996 #, python-format
1997 msgid "received query from incompatible client version %d\n"
1997 msgid "received query from incompatible client version %d\n"
1998 msgstr ""
1998 msgstr ""
1999
1999
2000 #, python-format
2000 #, python-format
2001 msgid "unrecognized query type: %s\n"
2001 msgid "unrecognized query type: %s\n"
2002 msgstr ""
2002 msgstr ""
2003
2003
2004 msgid "finished setup\n"
2004 msgid "finished setup\n"
2005 msgstr ""
2005 msgstr ""
2006
2006
2007 msgid ""
2007 msgid ""
2008 "expand expressions into changelog and summaries\n"
2008 "expand expressions into changelog and summaries\n"
2009 "\n"
2009 "\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2011 "which will be automatically expanded into links or any other\n"
2011 "which will be automatically expanded into links or any other\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2013 "\n"
2013 "\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2015 "be used in your hgrc:\n"
2015 "be used in your hgrc:\n"
2016 "\n"
2016 "\n"
2017 " [interhg]\n"
2017 " [interhg]\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2019 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2019 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2020 "i\n"
2020 "i\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2022 msgstr ""
2022 msgstr ""
2023
2023
2024 #, python-format
2024 #, python-format
2025 msgid "interhg: invalid pattern for %s: %s\n"
2025 msgid "interhg: invalid pattern for %s: %s\n"
2026 msgstr ""
2026 msgstr ""
2027
2027
2028 #, python-format
2028 #, python-format
2029 msgid "interhg: invalid regexp for %s: %s\n"
2029 msgid "interhg: invalid regexp for %s: %s\n"
2030 msgstr ""
2030 msgstr ""
2031
2031
2032 msgid ""
2032 msgid ""
2033 "expand keywords in tracked files\n"
2033 "expand keywords in tracked files\n"
2034 "\n"
2034 "\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2036 "tracked text files selected by your configuration.\n"
2036 "tracked text files selected by your configuration.\n"
2037 "\n"
2037 "\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2039 "change history. The mechanism can be regarded as a convenience for the\n"
2039 "change history. The mechanism can be regarded as a convenience for the\n"
2040 "current user or for archive distribution.\n"
2040 "current user or for archive distribution.\n"
2041 "\n"
2041 "\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2043 "hgrc files.\n"
2043 "hgrc files.\n"
2044 "\n"
2044 "\n"
2045 "Example:\n"
2045 "Example:\n"
2046 "\n"
2046 "\n"
2047 " [keyword]\n"
2047 " [keyword]\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2049 " **.py =\n"
2049 " **.py =\n"
2050 " x* = ignore\n"
2050 " x* = ignore\n"
2051 "\n"
2051 "\n"
2052 "Note: the more specific you are in your filename patterns\n"
2052 "Note: the more specific you are in your filename patterns\n"
2053 " the less you lose speed in huge repositories.\n"
2053 " the less you lose speed in huge repositories.\n"
2054 "\n"
2054 "\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2056 "control run \"hg kwdemo\".\n"
2056 "control run \"hg kwdemo\".\n"
2057 "\n"
2057 "\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2059 "\n"
2059 "\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2063 "\n"
2063 "\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2066 "history.\n"
2066 "history.\n"
2067 "\n"
2067 "\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2069 "\"hg kwexpand\".\n"
2069 "\"hg kwexpand\".\n"
2070 "\n"
2070 "\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2072 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2072 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2073 "the files in question to update keyword expansions after all changes\n"
2073 "the files in question to update keyword expansions after all changes\n"
2074 "have been checked in.\n"
2074 "have been checked in.\n"
2075 "\n"
2075 "\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2079 msgstr ""
2079 msgstr ""
2080
2080
2081 #, python-format
2081 #, python-format
2082 msgid "overwriting %s expanding keywords\n"
2082 msgid "overwriting %s expanding keywords\n"
2083 msgstr ""
2083 msgstr ""
2084
2084
2085 #, python-format
2085 #, python-format
2086 msgid "overwriting %s shrinking keywords\n"
2086 msgid "overwriting %s shrinking keywords\n"
2087 msgstr ""
2087 msgstr ""
2088
2088
2089 msgid "[keyword] patterns cannot match"
2089 msgid "[keyword] patterns cannot match"
2090 msgstr ""
2090 msgstr ""
2091
2091
2092 msgid "no [keyword] patterns configured"
2092 msgid "no [keyword] patterns configured"
2093 msgstr ""
2093 msgstr ""
2094
2094
2095 msgid ""
2095 msgid ""
2096 "print [keywordmaps] configuration and an expansion example\n"
2096 "print [keywordmaps] configuration and an expansion example\n"
2097 "\n"
2097 "\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2099 " expansions.\n"
2099 " expansions.\n"
2100 "\n"
2100 "\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2102 " optionally by reading from an additional hgrc file.\n"
2102 " optionally by reading from an additional hgrc file.\n"
2103 "\n"
2103 "\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2105 " "
2105 " "
2106 msgstr ""
2106 msgstr ""
2107
2107
2108 #, python-format
2108 #, python-format
2109 msgid "creating temporary repository at %s\n"
2109 msgid "creating temporary repository at %s\n"
2110 msgstr ""
2110 msgstr ""
2111
2111
2112 #, python-format
2112 #, python-format
2113 msgid ""
2113 msgid ""
2114 "\n"
2114 "\n"
2115 "\tconfig using %s keyword template maps\n"
2115 "\tconfig using %s keyword template maps\n"
2116 msgstr ""
2116 msgstr ""
2117
2117
2118 #, python-format
2118 #, python-format
2119 msgid ""
2119 msgid ""
2120 "\n"
2120 "\n"
2121 "%s keywords written to %s:\n"
2121 "%s keywords written to %s:\n"
2122 msgstr ""
2122 msgstr ""
2123
2123
2124 msgid "unhooked all commit hooks\n"
2124 msgid "unhooked all commit hooks\n"
2125 msgstr ""
2125 msgstr ""
2126
2126
2127 #, python-format
2127 #, python-format
2128 msgid ""
2128 msgid ""
2129 "\n"
2129 "\n"
2130 "\t%s keywords expanded%s\n"
2130 "\t%s keywords expanded%s\n"
2131 msgstr ""
2131 msgstr ""
2132
2132
2133 #, python-format
2133 #, python-format
2134 msgid ""
2134 msgid ""
2135 "\n"
2135 "\n"
2136 "removing temporary repository %s\n"
2136 "removing temporary repository %s\n"
2137 msgstr ""
2137 msgstr ""
2138
2138
2139 msgid ""
2139 msgid ""
2140 "expand keywords in the working directory\n"
2140 "expand keywords in the working directory\n"
2141 "\n"
2141 "\n"
2142 " Run after (re)enabling keyword expansion.\n"
2142 " Run after (re)enabling keyword expansion.\n"
2143 "\n"
2143 "\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2145 " "
2145 " "
2146 msgstr ""
2146 msgstr ""
2147
2147
2148 msgid ""
2148 msgid ""
2149 "show files configured for keyword expansion\n"
2149 "show files configured for keyword expansion\n"
2150 "\n"
2150 "\n"
2151 " List which files in the working directory are matched by the\n"
2151 " List which files in the working directory are matched by the\n"
2152 " [keyword] configuration patterns.\n"
2152 " [keyword] configuration patterns.\n"
2153 "\n"
2153 "\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2155 " execution by including only files that are actual candidates\n"
2155 " execution by including only files that are actual candidates\n"
2156 " for expansion.\n"
2156 " for expansion.\n"
2157 "\n"
2157 "\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2159 " inclusion and exclusion of files.\n"
2159 " inclusion and exclusion of files.\n"
2160 "\n"
2160 "\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2162 "\n"
2162 "\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2164 " of files are:\n"
2164 " of files are:\n"
2165 " K = keyword expansion candidate\n"
2165 " K = keyword expansion candidate\n"
2166 " k = keyword expansion candidate (untracked)\n"
2166 " k = keyword expansion candidate (untracked)\n"
2167 " I = ignored\n"
2167 " I = ignored\n"
2168 " i = ignored (untracked)\n"
2168 " i = ignored (untracked)\n"
2169 " "
2169 " "
2170 msgstr ""
2170 msgstr ""
2171
2171
2172 msgid ""
2172 msgid ""
2173 "revert expanded keywords in the working directory\n"
2173 "revert expanded keywords in the working directory\n"
2174 "\n"
2174 "\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2177 "\n"
2177 "\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2179 " "
2179 " "
2180 msgstr ""
2180 msgstr ""
2181
2181
2182 msgid "show default keyword template maps"
2182 msgid "show default keyword template maps"
2183 msgstr ""
2183 msgstr ""
2184
2184
2185 msgid "read maps from rcfile"
2185 msgid "read maps from rcfile"
2186 msgstr ""
2186 msgstr ""
2187
2187
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2189 msgstr ""
2189 msgstr ""
2190
2190
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2192 msgstr ""
2192 msgstr ""
2193
2193
2194 msgid "show keyword status flags of all files"
2194 msgid "show keyword status flags of all files"
2195 msgstr ""
2195 msgstr ""
2196
2196
2197 msgid "show files excluded from expansion"
2197 msgid "show files excluded from expansion"
2198 msgstr ""
2198 msgstr ""
2199
2199
2200 msgid "additionally show untracked files"
2200 msgid "additionally show untracked files"
2201 msgstr ""
2201 msgstr ""
2202
2202
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2204 msgstr ""
2204 msgstr ""
2205
2205
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2207 msgstr ""
2207 msgstr ""
2208
2208
2209 msgid ""
2209 msgid ""
2210 "manage a stack of patches\n"
2210 "manage a stack of patches\n"
2211 "\n"
2211 "\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2213 "repository. It manages two stacks of patches - all known patches, and\n"
2213 "repository. It manages two stacks of patches - all known patches, and\n"
2214 "applied patches (subset of known patches).\n"
2214 "applied patches (subset of known patches).\n"
2215 "\n"
2215 "\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2218 "\n"
2218 "\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2220 "\n"
2220 "\n"
2221 "prepare repository to work with patches qinit\n"
2221 "prepare repository to work with patches qinit\n"
2222 "create new patch qnew\n"
2222 "create new patch qnew\n"
2223 "import existing patch qimport\n"
2223 "import existing patch qimport\n"
2224 "\n"
2224 "\n"
2225 "print patch series qseries\n"
2225 "print patch series qseries\n"
2226 "print applied patches qapplied\n"
2226 "print applied patches qapplied\n"
2227 "print name of top applied patch qtop\n"
2227 "print name of top applied patch qtop\n"
2228 "\n"
2228 "\n"
2229 "add known patch to applied stack qpush\n"
2229 "add known patch to applied stack qpush\n"
2230 "remove patch from applied stack qpop\n"
2230 "remove patch from applied stack qpop\n"
2231 "refresh contents of top applied patch qrefresh\n"
2231 "refresh contents of top applied patch qrefresh\n"
2232 msgstr ""
2232 msgstr ""
2233 "gestion et utilisation d'une pile de patchs\n"
2234 "\n"
2235 "Cette extension permet de travailler avec une pile de patchs au\n"
2236 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
2237 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2238 "qui ont été appliqués.\n"
2239 "\n"
2240 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2241 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
2242 "appliqués sont présents à la fois sous forme de fichier et de\n"
2243 "\"changesets\".\n"
2244 "\n"
2245 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2246 "\n"
2247 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2248 "créer un nouveau patch qnew\n"
2249 "importer un patch existant qimport\n"
2250 "\n"
2251 "afficher la série de patchs complète qseries\n"
2252 "afficher les patchs appliqués qapplied\n"
2253 "afficher le nom du dernier patch appliqué qtop\n"
2254 "\n"
2255 "empiler/appliquer un patch référencé sur la pile qpush\n"
2256 "dépiler/ôter un patch de la pile qpop\n"
2257 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2233
2258
2234 #, python-format
2259 #, python-format
2235 msgid "%s appears more than once in %s"
2260 msgid "%s appears more than once in %s"
2236 msgstr ""
2261 msgstr "%s apparaît plus d'une fois dans %s"
2237
2262
2238 msgid "guard cannot be an empty string"
2263 msgid "guard cannot be an empty string"
2239 msgstr ""
2264 msgstr ""
2240
2265
2241 #, python-format
2266 #, python-format
2242 msgid "guard %r starts with invalid character: %r"
2267 msgid "guard %r starts with invalid character: %r"
2243 msgstr ""
2268 msgstr ""
2244
2269
2245 #, python-format
2270 #, python-format
2246 msgid "invalid character in guard %r: %r"
2271 msgid "invalid character in guard %r: %r"
2247 msgstr ""
2272 msgstr ""
2248
2273
2249 #, python-format
2274 #, python-format
2250 msgid "active guards: %s\n"
2275 msgid "active guards: %s\n"
2251 msgstr ""
2276 msgstr ""
2252
2277
2253 #, python-format
2278 #, python-format
2254 msgid "guard %r too short"
2279 msgid "guard %r too short"
2255 msgstr ""
2280 msgstr ""
2256
2281
2257 #, python-format
2282 #, python-format
2258 msgid "guard %r starts with invalid char"
2283 msgid "guard %r starts with invalid char"
2259 msgstr ""
2284 msgstr ""
2260
2285
2261 #, python-format
2286 #, python-format
2262 msgid "allowing %s - no guards in effect\n"
2287 msgid "allowing %s - no guards in effect\n"
2263 msgstr ""
2288 msgstr ""
2264
2289
2265 #, python-format
2290 #, python-format
2266 msgid "allowing %s - no matching negative guards\n"
2291 msgid "allowing %s - no matching negative guards\n"
2267 msgstr ""
2292 msgstr ""
2268
2293
2269 #, python-format
2294 #, python-format
2270 msgid "allowing %s - guarded by %r\n"
2295 msgid "allowing %s - guarded by %r\n"
2271 msgstr ""
2296 msgstr ""
2272
2297
2273 #, python-format
2298 #, python-format
2274 msgid "skipping %s - guarded by %r\n"
2299 msgid "skipping %s - guarded by %r\n"
2275 msgstr ""
2300 msgstr ""
2276
2301
2277 #, python-format
2302 #, python-format
2278 msgid "skipping %s - no matching guards\n"
2303 msgid "skipping %s - no matching guards\n"
2279 msgstr ""
2304 msgstr ""
2280
2305
2281 #, python-format
2306 #, python-format
2282 msgid "error removing undo: %s\n"
2307 msgid "error removing undo: %s\n"
2283 msgstr ""
2308 msgstr ""
2284
2309
2285 #, python-format
2310 #, python-format
2286 msgid "apply failed for patch %s"
2311 msgid "apply failed for patch %s"
2287 msgstr ""
2312 msgstr "l'application du patch %s a échoué"
2288
2313
2289 #, python-format
2314 #, python-format
2290 msgid "patch didn't work out, merging %s\n"
2315 msgid "patch didn't work out, merging %s\n"
2291 msgstr ""
2316 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2292
2317
2293 #, python-format
2318 #, python-format
2294 msgid "update returned %d"
2319 msgid "update returned %d"
2295 msgstr ""
2320 msgstr ""
2296
2321
2297 msgid "repo commit failed"
2322 msgid "repo commit failed"
2298 msgstr ""
2323 msgstr ""
2299
2324
2300 #, python-format
2325 #, python-format
2301 msgid "unable to read %s"
2326 msgid "unable to read %s"
2302 msgstr ""
2327 msgstr "impossible de lire %s"
2303
2328
2304 #, python-format
2329 #, python-format
2305 msgid "patch %s does not exist\n"
2330 msgid "patch %s does not exist\n"
2306 msgstr ""
2331 msgstr "le patch %s n'existe pas\n"
2307
2332
2308 #, python-format
2333 #, python-format
2309 msgid "patch %s is not applied\n"
2334 msgid "patch %s is not applied\n"
2310 msgstr ""
2335 msgstr "le patch %s n'est pas appliqué\n"
2311
2336
2312 msgid "patch failed, unable to continue (try -v)\n"
2337 msgid "patch failed, unable to continue (try -v)\n"
2313 msgstr ""
2338 msgstr ""
2339 "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2314
2340
2315 #, python-format
2341 #, python-format
2316 msgid "applying %s\n"
2342 msgid "applying %s\n"
2317 msgstr ""
2343 msgstr "application de %s\n"
2318
2344
2319 #, python-format
2345 #, python-format
2320 msgid "unable to read %s\n"
2346 msgid "unable to read %s\n"
2321 msgstr ""
2347 msgstr "impossible de lire %s\n"
2322
2348
2323 #, python-format
2349 #, python-format
2324 msgid "imported patch %s\n"
2350 msgid "imported patch %s\n"
2325 msgstr ""
2351 msgstr "le patch %s a été importé\n"
2326
2352
2327 #, python-format
2353 #, python-format
2328 msgid ""
2354 msgid ""
2329 "\n"
2355 "\n"
2330 "imported patch %s"
2356 "imported patch %s"
2331 msgstr ""
2357 msgstr ""
2358 "\n"
2359 "le patch %s a été importé"
2332
2360
2333 #, python-format
2361 #, python-format
2334 msgid "patch %s is empty\n"
2362 msgid "patch %s is empty\n"
2335 msgstr ""
2363 msgstr "le patch %s est vide\n"
2336
2364
2337 msgid "patch failed, rejects left in working dir\n"
2365 msgid "patch failed, rejects left in working dir\n"
2338 msgstr ""
2366 msgstr ""
2339
2367
2340 msgid "fuzz found when applying patch, stopping\n"
2368 msgid "fuzz found when applying patch, stopping\n"
2341 msgstr ""
2369 msgstr ""
2342
2370
2343 #, python-format
2371 #, python-format
2344 msgid "revision %d is not managed"
2372 msgid "revision %d is not managed"
2345 msgstr ""
2373 msgstr "la révision %d n'est pas gérée"
2346
2374
2347 #, python-format
2375 #, python-format
2348 msgid "cannot delete revision %d above applied patches"
2376 msgid "cannot delete revision %d above applied patches"
2349 msgstr ""
2377 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2350
2378
2351 #, python-format
2379 #, python-format
2352 msgid "patch %s finalized without changeset message\n"
2380 msgid "patch %s finalized without changeset message\n"
2353 msgstr ""
2381 msgstr ""
2354
2382
2355 msgid "qdelete requires at least one revision or patch name"
2383 msgid "qdelete requires at least one revision or patch name"
2356 msgstr ""
2384 msgstr "qdelete requiert au moins une révision ou le nom d'un patch"
2357
2385
2358 #, python-format
2386 #, python-format
2359 msgid "cannot delete applied patch %s"
2387 msgid "cannot delete applied patch %s"
2360 msgstr ""
2388 msgstr "impossible de supprimer le patch appliqué %s"
2361
2389
2362 #, python-format
2390 #, python-format
2363 msgid "patch %s not in series file"
2391 msgid "patch %s not in series file"
2364 msgstr ""
2392 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2365
2393
2366 msgid "no patches applied"
2394 msgid "no patches applied"
2367 msgstr ""
2395 msgstr "pas de patchs appliqués"
2368
2396
2369 msgid "working directory revision is not qtip"
2397 msgid "working directory revision is not qtip"
2370 msgstr ""
2398 msgstr "le répertoire de travail n'est pas à la révision qtip"
2371
2399
2372 msgid "local changes found, refresh first"
2400 msgid "local changes found, refresh first"
2373 msgstr ""
2401 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2374
2402
2375 msgid "local changes found"
2403 msgid "local changes found"
2376 msgstr ""
2404 msgstr "modifications locales trouvées"
2377
2405
2378 #, python-format
2406 #, python-format
2379 msgid "\"%s\" cannot be used as the name of a patch"
2407 msgid "\"%s\" cannot be used as the name of a patch"
2380 msgstr ""
2408 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2381
2409
2382 #, python-format
2410 #, python-format
2383 msgid "patch \"%s\" already exists"
2411 msgid "patch \"%s\" already exists"
2384 msgstr ""
2412 msgstr "le patch \"%s\" existe déjà"
2385
2413
2386 #, python-format
2414 #, python-format
2387 msgid "error unlinking %s\n"
2415 msgid "error unlinking %s\n"
2388 msgstr ""
2416 msgstr "erreur lors de la suppression de %s\n"
2389
2417
2390 #, python-format
2418 #, python-format
2391 msgid "patch name \"%s\" is ambiguous:\n"
2419 msgid "patch name \"%s\" is ambiguous:\n"
2392 msgstr ""
2420 msgstr "\"%s\" est un nom de patch ambigu :\n"
2393
2421
2394 #, python-format
2422 #, python-format
2395 msgid "patch %s not in series"
2423 msgid "patch %s not in series"
2396 msgstr ""
2424 msgstr "le patch %s ne figure pas dans la série"
2397
2425
2426 #, fuzzy
2398 msgid "(working directory not at a head)\n"
2427 msgid "(working directory not at a head)\n"
2399 msgstr ""
2428 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2400
2429
2401 msgid "no patches in series\n"
2430 msgid "no patches in series\n"
2402 msgstr ""
2431 msgstr "pas de patchs dans la série\n"
2403
2432
2404 #, python-format
2433 #, python-format
2405 msgid "cannot push to a previous patch: %s"
2434 msgid "cannot push to a previous patch: %s"
2406 msgstr ""
2435 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2407
2436
2408 #, python-format
2437 #, python-format
2409 msgid "qpush: %s is already at the top\n"
2438 msgid "qpush: %s is already at the top\n"
2410 msgstr ""
2439 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2411
2440
2412 #, python-format
2441 #, python-format
2413 msgid "guarded by %r"
2442 msgid "guarded by %r"
2414 msgstr ""
2443 msgstr ""
2415
2444
2416 msgid "no matching guards"
2445 msgid "no matching guards"
2417 msgstr ""
2446 msgstr ""
2418
2447
2419 #, python-format
2448 #, python-format
2420 msgid "cannot push '%s' - %s\n"
2449 msgid "cannot push '%s' - %s\n"
2421 msgstr ""
2450 msgstr "impossible d'empiler '%s' - %s\n"
2422
2451
2423 msgid "all patches are currently applied\n"
2452 msgid "all patches are currently applied\n"
2424 msgstr ""
2453 msgstr "tous les patchs sont actuellement appliqués\n"
2425
2454
2426 msgid "patch series already fully applied\n"
2455 msgid "patch series already fully applied\n"
2427 msgstr ""
2456 msgstr "la série de patchs est déjà complètement appliquée\n"
2428
2457
2429 msgid "cleaning up working directory..."
2458 msgid "cleaning up working directory..."
2430 msgstr ""
2459 msgstr "nettoyage du répertoire de travail..."
2431
2460
2432 #, python-format
2461 #, python-format
2433 msgid "errors during apply, please fix and refresh %s\n"
2462 msgid "errors during apply, please fix and refresh %s\n"
2434 msgstr ""
2463 msgstr ""
2464 "des erreurs se sont produites durant l'application, veuillez corriger puis "
2465 "rafraîchir %s\n"
2435
2466
2436 #, python-format
2467 #, python-format
2437 msgid "now at: %s\n"
2468 msgid "now at: %s\n"
2438 msgstr ""
2469 msgstr "actuellement à : %s\n"
2439
2470
2440 #, python-format
2471 #, python-format
2441 msgid "patch %s is not applied"
2472 msgid "patch %s is not applied"
2442 msgstr ""
2473 msgstr "le patch %s n'est pas appliqué"
2443
2474
2444 msgid "no patches applied\n"
2475 msgid "no patches applied\n"
2445 msgstr ""
2476 msgstr "aucun patch appliqué\n"
2446
2477
2447 #, python-format
2478 #, python-format
2448 msgid "qpop: %s is already at the top\n"
2479 msgid "qpop: %s is already at the top\n"
2449 msgstr ""
2480 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2450
2481
2451 msgid "qpop: forcing dirstate update\n"
2482 msgid "qpop: forcing dirstate update\n"
2452 msgstr ""
2483 msgstr ""
2484 "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2453
2485
2454 #, python-format
2486 #, python-format
2455 msgid "trying to pop unknown node %s"
2487 msgid "trying to pop unknown node %s"
2456 msgstr ""
2488 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2457
2489
2458 msgid "popping would remove a revision not managed by this patch queue"
2490 msgid "popping would remove a revision not managed by this patch queue"
2459 msgstr ""
2491 msgstr ""
2492 "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2460
2493
2461 msgid "deletions found between repo revs"
2494 msgid "deletions found between repo revs"
2462 msgstr ""
2495 msgstr "suppressions trouvées entre des révisions du dépôt"
2463
2496
2464 msgid "patch queue now empty\n"
2497 msgid "patch queue now empty\n"
2465 msgstr ""
2498 msgstr "la pile de patchs est maintenant vide\n"
2466
2499
2467 msgid "cannot refresh a revision with children"
2500 msgid "cannot refresh a revision with children"
2468 msgstr ""
2501 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2469
2502
2503 # restaurer/récupérer ? pas satisfait...
2470 msgid ""
2504 msgid ""
2471 "refresh interrupted while patch was popped! (revert --all, qpush to "
2505 "refresh interrupted while patch was popped! (revert --all, qpush to "
2472 "recover)\n"
2506 "recover)\n"
2473 msgstr ""
2507 msgstr ""
2508 "rafraîchissement interrompu alors qu'un patch était en cours de dépilement "
2509 "(utiliser revert --all, ou qpush pour restaurer l'état)\n"
2474
2510
2475 msgid "patch queue directory already exists"
2511 msgid "patch queue directory already exists"
2476 msgstr ""
2512 msgstr "la pile de patchs existe déjà"
2477
2513
2478 #, python-format
2514 #, python-format
2479 msgid "patch %s is not in series file"
2515 msgid "patch %s is not in series file"
2480 msgstr ""
2516 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2481
2517
2482 msgid "No saved patch data found\n"
2518 msgid "No saved patch data found\n"
2483 msgstr ""
2519 msgstr ""
2484
2520
2485 #, python-format
2521 #, python-format
2486 msgid "restoring status: %s\n"
2522 msgid "restoring status: %s\n"
2487 msgstr ""
2523 msgstr "rétablissement de l'état : %s\n"
2488
2524
2489 msgid "save entry has children, leaving it alone\n"
2525 msgid "save entry has children, leaving it alone\n"
2490 msgstr ""
2526 msgstr ""
2491
2527
2492 #, python-format
2528 #, python-format
2493 msgid "removing save entry %s\n"
2529 msgid "removing save entry %s\n"
2494 msgstr ""
2530 msgstr ""
2495
2531
2496 #, python-format
2532 #, python-format
2497 msgid "saved queue repository parents: %s %s\n"
2533 msgid "saved queue repository parents: %s %s\n"
2498 msgstr ""
2534 msgstr ""
2499
2535
2500 msgid "queue directory updating\n"
2536 msgid "queue directory updating\n"
2501 msgstr ""
2537 msgstr "mise à jour du répertoire de patchs\n"
2502
2538
2503 msgid "Unable to load queue repository\n"
2539 msgid "Unable to load queue repository\n"
2504 msgstr ""
2540 msgstr "Impossible de charger le dépôt de patchs\n"
2505
2541
2506 msgid "save: no patches applied, exiting\n"
2542 msgid "save: no patches applied, exiting\n"
2507 msgstr ""
2543 msgstr ""
2508
2544
2509 msgid "status is already saved\n"
2545 msgid "status is already saved\n"
2510 msgstr ""
2546 msgstr "l'état a déjà été sauvegardé\n"
2511
2547
2512 msgid "hg patches saved state"
2548 msgid "hg patches saved state"
2513 msgstr ""
2549 msgstr ""
2514
2550
2515 msgid "repo commit failed\n"
2551 msgid "repo commit failed\n"
2516 msgstr ""
2552 msgstr ""
2517
2553
2518 #, python-format
2554 #, python-format
2519 msgid "patch %s is already in the series file"
2555 msgid "patch %s is already in the series file"
2520 msgstr ""
2556 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2521
2557
2522 msgid "option \"-r\" not valid when importing files"
2558 msgid "option \"-r\" not valid when importing files"
2523 msgstr ""
2559 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2524
2560
2525 msgid "option \"-n\" not valid when importing multiple patches"
2561 msgid "option \"-n\" not valid when importing multiple patches"
2526 msgstr ""
2562 msgstr ""
2527
2563 "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs "
2564 "patchs"
2565
2566 # origine/base/racine ?
2528 #, python-format
2567 #, python-format
2529 msgid "revision %d is the root of more than one branch"
2568 msgid "revision %d is the root of more than one branch"
2530 msgstr ""
2569 msgstr "la révision %d est à l'origine de plus d'une branche"
2531
2570
2532 #, python-format
2571 #, python-format
2533 msgid "revision %d is already managed"
2572 msgid "revision %d is already managed"
2534 msgstr ""
2573 msgstr "la révision %d est déjà gérée"
2535
2574
2536 #, python-format
2575 #, python-format
2537 msgid "revision %d is not the parent of the queue"
2576 msgid "revision %d is not the parent of the queue"
2538 msgstr ""
2577 msgstr "la révision %d n'est pas parente de la pile"
2539
2578
2540 #, python-format
2579 #, python-format
2541 msgid "revision %d has unmanaged children"
2580 msgid "revision %d has unmanaged children"
2542 msgstr ""
2581 msgstr "la révision %d possède des révisions filles non gérées"
2543
2582
2544 #, python-format
2583 #, python-format
2545 msgid "cannot import merge revision %d"
2584 msgid "cannot import merge revision %d"
2546 msgstr ""
2585 msgstr "impossible d'importer la révision fusionnée %d"
2547
2586
2548 #, python-format
2587 #, python-format
2549 msgid "revision %d is not the parent of %d"
2588 msgid "revision %d is not the parent of %d"
2550 msgstr ""
2589 msgstr "%d n'est pas la révision parente de %d"
2551
2590
2552 msgid "-e is incompatible with import from -"
2591 msgid "-e is incompatible with import from -"
2553 msgstr ""
2592 msgstr "-e n'est pas compatible avec l'importation depuis -"
2554
2593
2555 #, python-format
2594 #, python-format
2556 msgid "patch %s does not exist"
2595 msgid "patch %s does not exist"
2557 msgstr ""
2596 msgstr "le patch %s n'existe pas"
2558
2597
2559 msgid "need --name to import a patch from -"
2598 msgid "need --name to import a patch from -"
2560 msgstr ""
2599 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
2561
2600
2562 #, python-format
2601 #, python-format
2563 msgid "adding %s to series file\n"
2602 msgid "adding %s to series file\n"
2564 msgstr ""
2603 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2565
2604
2566 msgid ""
2605 msgid ""
2567 "remove patches from queue\n"
2606 "remove patches from queue\n"
2568 "\n"
2607 "\n"
2569 " The patches must not be applied, and at least one patch is required. "
2608 " The patches must not be applied, and at least one patch is required. "
2570 "With\n"
2609 "With\n"
2571 " -k/--keep, the patch files are preserved in the patch directory.\n"
2610 " -k/--keep, the patch files are preserved in the patch directory.\n"
2572 "\n"
2611 "\n"
2573 " To stop managing a patch and move it into permanent history,\n"
2612 " To stop managing a patch and move it into permanent history,\n"
2574 " use the qfinish command."
2613 " use the qfinish command."
2575 msgstr ""
2614
2615 msgstr ""
2616 "supprime des patchs de la pile\n"
2617 "\n"
2618 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
2619 " nécessaire de fournir au moins un patch.\n"
2620 "\n"
2621 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
2622 " de patchs.\n"
2623 "\n"
2624 " Pour arrêter de gérer un patch et le déplacer de manière\n"
2625 " permanente vers l'historique du dépôt, utilisez la commande\n"
2626 " qfinish."
2576
2627
2577 msgid "print the patches already applied"
2628 msgid "print the patches already applied"
2578 msgstr ""
2629 msgstr "affiche les patchs déjà appliqués"
2579
2630
2580 msgid "print the patches not yet applied"
2631 msgid "print the patches not yet applied"
2581 msgstr ""
2632 msgstr "affiche les patchs non encore appliqués"
2582
2633
2583 msgid ""
2634 msgid ""
2584 "import a patch\n"
2635 "import a patch\n"
2585 "\n"
2636 "\n"
2586 " The patch is inserted into the series after the last applied\n"
2637 " The patch is inserted into the series after the last applied\n"
2587 " patch. If no patches have been applied, qimport prepends the patch\n"
2638 " patch. If no patches have been applied, qimport prepends the patch\n"
2588 " to the series.\n"
2639 " to the series.\n"
2589 "\n"
2640 "\n"
2590 " The patch will have the same name as its source file unless you\n"
2641 " The patch will have the same name as its source file unless you\n"
2591 " give it a new one with -n/--name.\n"
2642 " give it a new one with -n/--name.\n"
2592 "\n"
2643 "\n"
2593 " You can register an existing patch inside the patch directory with\n"
2644 " You can register an existing patch inside the patch directory with\n"
2594 " the -e/--existing flag.\n"
2645 " the -e/--existing flag.\n"
2595 "\n"
2646 "\n"
2596 " With -f/--force, an existing patch of the same name will be\n"
2647 " With -f/--force, an existing patch of the same name will be\n"
2597 " overwritten.\n"
2648 " overwritten.\n"
2598 "\n"
2649 "\n"
2599 " An existing changeset may be placed under mq control with -r/--rev\n"
2650 " An existing changeset may be placed under mq control with -r/--rev\n"
2600 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2651 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2601 " With -g/--git, patches imported with --rev will use the git diff\n"
2652 " With -g/--git, patches imported with --rev will use the git diff\n"
2602 " format. See the diffs help topic for information on why this is\n"
2653 " format. See the diffs help topic for information on why this is\n"
2603 " important for preserving rename/copy information and permission\n"
2654 " important for preserving rename/copy information and permission\n"
2604 " changes.\n"
2655 " changes.\n"
2605 "\n"
2656 "\n"
2606 " To import a patch from standard input, pass - as the patch file.\n"
2657 " To import a patch from standard input, pass - as the patch file.\n"
2607 " When importing from standard input, a patch name must be specified\n"
2658 " When importing from standard input, a patch name must be specified\n"
2608 " using the --name flag.\n"
2659 " using the --name flag.\n"
2609 " "
2660 " "
2610 msgstr ""
2661 msgstr ""
2662 "importe un patch\n"
2663 "\n"
2664 " Le patch est inséré dans la série à la suite du dernier patch\n"
2665 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
2666 " ajouté en tête de série.\n"
2667 "\n"
2668 " Le patch portera le même nom que le fichier dont il provient,\n"
2669 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
2670 "\n"
2671 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
2672 " de patchs à l'aide de l'option -e/--existing.\n"
2673 "\n"
2674 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
2675 "\n"
2676 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
2677 " à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n"
2678 " placera la révision tip sous le contrôle de mq).\n"
2679 " Avec -g/--git, les patchs importés à l'aide de --rev seront\n"
2680 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
2681 " l'aide explique l'importance de cette option pour la\n"
2682 " préservation des informations de copie/renommage et des\n"
2683 " modifications de permissions.\n"
2684 "\n"
2685 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
2686 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
2687 " patch à l'aide de l'option --name.\n"
2688 " "
2611
2689
2612 msgid ""
2690 msgid ""
2613 "init a new queue repository\n"
2691 "init a new queue repository\n"
2614 "\n"
2692 "\n"
2615 " The queue repository is unversioned by default. If\n"
2693 " The queue repository is unversioned by default. If\n"
2616 " -c/--create-repo is specified, qinit will create a separate nested\n"
2694 " -c/--create-repo is specified, qinit will create a separate nested\n"
2617 " repository for patches (qinit -c may also be run later to convert\n"
2695 " repository for patches (qinit -c may also be run later to convert\n"
2618 " an unversioned patch repository into a versioned one). You can use\n"
2696 " an unversioned patch repository into a versioned one). You can use\n"
2619 " qcommit to commit changes to this queue repository."
2697 " qcommit to commit changes to this queue repository."
2620 msgstr ""
2698 msgstr ""
2621
2699
2622 msgid ""
2700 msgid ""
2623 "clone main and patch repository at same time\n"
2701 "clone main and patch repository at same time\n"
2624 "\n"
2702 "\n"
2625 " If source is local, destination will have no patches applied. If\n"
2703 " If source is local, destination will have no patches applied. If\n"
2626 " source is remote, this command can not check if patches are\n"
2704 " source is remote, this command can not check if patches are\n"
2627 " applied in source, so cannot guarantee that patches are not\n"
2705 " applied in source, so cannot guarantee that patches are not\n"
2628 " applied in destination. If you clone remote repository, be sure\n"
2706 " applied in destination. If you clone remote repository, be sure\n"
2629 " before that it has no patches applied.\n"
2707 " before that it has no patches applied.\n"
2630 "\n"
2708 "\n"
2631 " Source patch repository is looked for in <src>/.hg/patches by\n"
2709 " Source patch repository is looked for in <src>/.hg/patches by\n"
2632 " default. Use -p <url> to change.\n"
2710 " default. Use -p <url> to change.\n"
2633 "\n"
2711 "\n"
2634 " The patch directory must be a nested Mercurial repository, as\n"
2712 " The patch directory must be a nested Mercurial repository, as\n"
2635 " would be created by qinit -c.\n"
2713 " would be created by qinit -c.\n"
2636 " "
2714 " "
2637 msgstr ""
2715 msgstr ""
2716 "clône simultanément le dépôt principal et le dépôt des patchs\n"
2717 "\n"
2718 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
2719 " cible. En revanche, si la source est distante, cette commande\n"
2720 " n'est pas en mesure de vérifier si des patchs y ont été\n"
2721 " empilés, et par conséquent ne peut garantir qu'aucun patch\n"
2722 " ne sera appliqué au dessus de la cible. Autrement dit, si vous\n"
2723 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
2724 " aucun patch d'appliqué.\n"
2725 "\n"
2726 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
2727 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
2728 " un chemin différent.\n"
2729 "\n"
2730 " Le répertoire de patchs doit être contenu dans le dépôt\n"
2731 " principal, tel que créé par qinit -c.\n"
2732 " "
2638
2733
2639 msgid "versioned patch repository not found (see qinit -c)"
2734 msgid "versioned patch repository not found (see qinit -c)"
2640 msgstr ""
2735 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
2641
2736
2642 msgid "cloning main repository\n"
2737 msgid "cloning main repository\n"
2643 msgstr ""
2738 msgstr "clônage du dépôt principal\n"
2644
2739
2645 msgid "cloning patch repository\n"
2740 msgid "cloning patch repository\n"
2646 msgstr ""
2741 msgstr "clônage du dépôt des patchs\n"
2647
2742
2648 msgid "stripping applied patches from destination repository\n"
2743 msgid "stripping applied patches from destination repository\n"
2649 msgstr ""
2744 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
2650
2745
2651 msgid "updating destination repository\n"
2746 msgid "updating destination repository\n"
2652 msgstr ""
2747 msgstr "mise à jour du dépôt cible\n"
2653
2748
2654 msgid "commit changes in the queue repository"
2749 msgid "commit changes in the queue repository"
2655 msgstr ""
2750 msgstr ""
2656
2751
2657 msgid "print the entire series file"
2752 msgid "print the entire series file"
2658 msgstr ""
2753 msgstr "afficher la liste complète de patchs (fichier \"series\")"
2659
2754
2660 msgid "print the name of the current patch"
2755 msgid "print the name of the current patch"
2661 msgstr ""
2756 msgstr "affiche le nom du dernier patch appliqué"
2662
2757
2663 msgid "print the name of the next patch"
2758 msgid "print the name of the next patch"
2664 msgstr ""
2759 msgstr "affiche le nom du prochain patch"
2665
2760
2666 msgid "all patches applied\n"
2761 msgid "all patches applied\n"
2667 msgstr ""
2762 msgstr "tous les patchs ont été appliqués\n"
2668
2763
2669 msgid "print the name of the previous patch"
2764 msgid "print the name of the previous patch"
2670 msgstr ""
2765 msgstr "affiche le nom du patch précédent"
2671
2766
2672 msgid "only one patch applied\n"
2767 msgid "only one patch applied\n"
2673 msgstr ""
2768 msgstr "un seul patch d'appliqué\n"
2674
2769
2675 msgid ""
2770 msgid ""
2676 "create a new patch\n"
2771 "create a new patch\n"
2677 "\n"
2772 "\n"
2678 " qnew creates a new patch on top of the currently-applied patch (if\n"
2773 " qnew creates a new patch on top of the currently-applied patch (if\n"
2679 " any). It will refuse to run if there are any outstanding changes\n"
2774 " any). It will refuse to run if there are any outstanding changes\n"
2680 " unless -f/--force is specified, in which case the patch will be\n"
2775 " unless -f/--force is specified, in which case the patch will be\n"
2681 " initialized with them. You may also use -I/--include,\n"
2776 " initialized with them. You may also use -I/--include,\n"
2682 " -X/--exclude, and/or a list of files after the patch name to add\n"
2777 " -X/--exclude, and/or a list of files after the patch name to add\n"
2683 " only changes to matching files to the new patch, leaving the rest\n"
2778 " only changes to matching files to the new patch, leaving the rest\n"
2684 " as uncommitted modifications.\n"
2779 " as uncommitted modifications.\n"
2685 "\n"
2780 "\n"
2686 " -u/--user and -d/--date can be used to set the (given) user and\n"
2781 " -u/--user and -d/--date can be used to set the (given) user and\n"
2687 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2782 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2688 " to current user and date to current date.\n"
2783 " to current user and date to current date.\n"
2689 "\n"
2784 "\n"
2690 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2785 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2691 " well as the commit message. If none is specified, the header is\n"
2786 " well as the commit message. If none is specified, the header is\n"
2692 " empty and the commit message is '[mq]: PATCH'.\n"
2787 " empty and the commit message is '[mq]: PATCH'.\n"
2693 "\n"
2788 "\n"
2694 " Use the -g/--git option to keep the patch in the git extended diff\n"
2789 " Use the -g/--git option to keep the patch in the git extended diff\n"
2695 " format. Read the diffs help topic for more information on why this\n"
2790 " format. Read the diffs help topic for more information on why this\n"
2696 " is important for preserving permission changes and copy/rename\n"
2791 " is important for preserving permission changes and copy/rename\n"
2697 " information.\n"
2792 " information.\n"
2698 " "
2793 " "
2699 msgstr ""
2794 msgstr ""
2795 "crée un nouveau patch\n"
2796 "\n"
2797 " qnew crée un nouveau patch au-dessus du dernier patch\n"
2798 " actuellement appliqué, le cas échéant. Si le répertoire\n"
2799 " de travail comporte des modifications non enregistrées,\n"
2800 " la création du patch sera refusée, à moins d'utiliser\n"
2801 " -f/--force auquel cas le contenu du nouveau patch sera\n"
2802 " initialisé avec ces modifications. Il est également\n"
2803 " possible d'utiliser -I/--include, -X/--exclude ou une liste\n"
2804 " de noms de fichiers après le nom du patch, afin de n'inclure\n"
2805 " que les changements des fichiers concernés, et laisser le\n"
2806 " reste dans le répertoire de travail en tant que modifications\n"
2807 " non enregistrées.\n"
2808 "\n"
2809 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
2810 " l'aide de -u/--user et -d/--date respectivement.\n"
2811 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
2812 " d'utilisateur et la date à leur valeur actuelle.\n"
2813 "\n"
2814 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
2815 " spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n"
2816 " Si aucune de ces options n'est utilisée, l'en-tête restera\n"
2817 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
2818 "\n"
2819 " Utilisez -g/--git pour garder le patch au format étendu de\n"
2820 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
2821 " de cette option pour la préservation des informations de\n"
2822 " copie/renommage et des modifications de permissions.\n"
2823 " "
2700
2824
2701 msgid ""
2825 msgid ""
2702 "update the current patch\n"
2826 "update the current patch\n"
2703 "\n"
2827 "\n"
2704 " If any file patterns are provided, the refreshed patch will\n"
2828 " If any file patterns are provided, the refreshed patch will\n"
2705 " contain only the modifications that match those patterns; the\n"
2829 " contain only the modifications that match those patterns; the\n"
2706 " remaining modifications will remain in the working directory.\n"
2830 " remaining modifications will remain in the working directory.\n"
2707 "\n"
2831 "\n"
2708 " If -s/--short is specified, files currently included in the patch\n"
2832 " If -s/--short is specified, files currently included in the patch\n"
2709 " will be refreshed just like matched files and remain in the patch.\n"
2833 " will be refreshed just like matched files and remain in the patch.\n"
2710 "\n"
2834 "\n"
2711 " hg add/remove/copy/rename work as usual, though you might want to\n"
2835 " hg add/remove/copy/rename work as usual, though you might want to\n"
2712 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2836 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2713 " and renames. See the diffs help topic for more information on the\n"
2837 " and renames. See the diffs help topic for more information on the\n"
2714 " git diff format.\n"
2838 " git diff format.\n"
2715 " "
2839 " "
2716 msgstr ""
2840 msgstr ""
2717
2841
2718 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2842 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2719 msgstr ""
2843 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
2720
2844
2721 msgid ""
2845 msgid ""
2722 "diff of the current patch and subsequent modifications\n"
2846 "diff of the current patch and subsequent modifications\n"
2723 "\n"
2847 "\n"
2724 " Shows a diff which includes the current patch as well as any\n"
2848 " Shows a diff which includes the current patch as well as any\n"
2725 " changes which have been made in the working directory since the\n"
2849 " changes which have been made in the working directory since the\n"
2726 " last refresh (thus showing what the current patch would become\n"
2850 " last refresh (thus showing what the current patch would become\n"
2727 " after a qrefresh).\n"
2851 " after a qrefresh).\n"
2728 "\n"
2852 "\n"
2729 " Use 'hg diff' if you only want to see the changes made since the\n"
2853 " Use 'hg diff' if you only want to see the changes made since the\n"
2730 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2854 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2731 " by the current patch without including changes made since the\n"
2855 " by the current patch without including changes made since the\n"
2732 " qrefresh.\n"
2856 " qrefresh.\n"
2733 " "
2857 " "
2734 msgstr ""
2858 msgstr ""
2735
2859
2736 msgid ""
2860 msgid ""
2737 "fold the named patches into the current patch\n"
2861 "fold the named patches into the current patch\n"
2738 "\n"
2862 "\n"
2739 " Patches must not yet be applied. Each patch will be successively\n"
2863 " Patches must not yet be applied. Each patch will be successively\n"
2740 " applied to the current patch in the order given. If all the\n"
2864 " applied to the current patch in the order given. If all the\n"
2741 " patches apply successfully, the current patch will be refreshed\n"
2865 " patches apply successfully, the current patch will be refreshed\n"
2742 " with the new cumulative patch, and the folded patches will be\n"
2866 " with the new cumulative patch, and the folded patches will be\n"
2743 " deleted. With -k/--keep, the folded patch files will not be\n"
2867 " deleted. With -k/--keep, the folded patch files will not be\n"
2744 " removed afterwards.\n"
2868 " removed afterwards.\n"
2745 "\n"
2869 "\n"
2746 " The header for each folded patch will be concatenated with the\n"
2870 " The header for each folded patch will be concatenated with the\n"
2747 " current patch header, separated by a line of '* * *'."
2871 " current patch header, separated by a line of '* * *'."
2748 msgstr ""
2872 msgstr ""
2749
2873
2750 msgid "qfold requires at least one patch name"
2874 msgid "qfold requires at least one patch name"
2751 msgstr ""
2875 msgstr "qfold a besoin au minimum du nom d'un patch"
2752
2876
2753 msgid "No patches applied"
2877 msgid "No patches applied"
2754 msgstr ""
2878 msgstr "Aucun patch d'appliqué"
2755
2879
2756 #, python-format
2880 #, python-format
2757 msgid "Skipping already folded patch %s"
2881 msgid "Skipping already folded patch %s"
2758 msgstr ""
2882 msgstr ""
2759
2883
2760 #, python-format
2884 #, python-format
2761 msgid "qfold cannot fold already applied patch %s"
2885 msgid "qfold cannot fold already applied patch %s"
2762 msgstr ""
2886 msgstr ""
2763
2887
2764 #, python-format
2888 #, python-format
2765 msgid "Error folding patch %s"
2889 msgid "Error folding patch %s"
2766 msgstr ""
2890 msgstr ""
2767
2891
2768 msgid "push or pop patches until named patch is at top of stack"
2892 msgid "push or pop patches until named patch is at top of stack"
2769 msgstr ""
2893 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
2770
2894
2771 msgid ""
2895 msgid ""
2772 "set or print guards for a patch\n"
2896 "set or print guards for a patch\n"
2773 "\n"
2897 "\n"
2774 " Guards control whether a patch can be pushed. A patch with no\n"
2898 " Guards control whether a patch can be pushed. A patch with no\n"
2775 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2899 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2776 " pushed only if the qselect command has activated it. A patch with\n"
2900 " pushed only if the qselect command has activated it. A patch with\n"
2777 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2901 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2778 " has activated it.\n"
2902 " has activated it.\n"
2779 "\n"
2903 "\n"
2780 " With no arguments, print the currently active guards.\n"
2904 " With no arguments, print the currently active guards.\n"
2781 " With arguments, set guards for the named patch.\n"
2905 " With arguments, set guards for the named patch.\n"
2782 " NOTE: Specifying negative guards now requires '--'.\n"
2906 " NOTE: Specifying negative guards now requires '--'.\n"
2783 "\n"
2907 "\n"
2784 " To set guards on another patch:\n"
2908 " To set guards on another patch:\n"
2785 " hg qguard -- other.patch +2.6.17 -stable\n"
2909 " hg qguard -- other.patch +2.6.17 -stable\n"
2786 " "
2910 " "
2787 msgstr ""
2911 msgstr ""
2788
2912
2789 msgid "cannot mix -l/--list with options or arguments"
2913 msgid "cannot mix -l/--list with options or arguments"
2790 msgstr ""
2914 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
2791
2915
2792 msgid "no patch to work with"
2916 msgid "no patch to work with"
2793 msgstr ""
2917 msgstr "aucun patch avec lequel travailler"
2794
2918
2795 #, python-format
2919 #, python-format
2796 msgid "no patch named %s"
2920 msgid "no patch named %s"
2797 msgstr ""
2921 msgstr "aucun patch du nom de %s"
2798
2922
2799 msgid "print the header of the topmost or specified patch"
2923 msgid "print the header of the topmost or specified patch"
2800 msgstr ""
2924 msgstr "affiche l'en-tête du dernier patch appliqué"
2801
2925
2802 msgid ""
2926 msgid ""
2803 "push the next patch onto the stack\n"
2927 "push the next patch onto the stack\n"
2804 "\n"
2928 "\n"
2805 " When -f/--force is applied, all local changes in patched files\n"
2929 " When -f/--force is applied, all local changes in patched files\n"
2806 " will be lost.\n"
2930 " will be lost.\n"
2807 " "
2931 " "
2808 msgstr ""
2932 msgstr ""
2933 "applique le patch suivant sur la pile\n"
2934 "\n"
2935 " Si -f/--force est utilisé, tout changement local dans les\n"
2936 " fichiers concernés par le patch seront perdus.\n"
2937 " "
2809
2938
2810 msgid "no saved queues found, please use -n\n"
2939 msgid "no saved queues found, please use -n\n"
2811 msgstr ""
2940 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
2812
2941
2813 #, python-format
2942 #, python-format
2814 msgid "merging with queue at: %s\n"
2943 msgid "merging with queue at: %s\n"
2815 msgstr ""
2944 msgstr "fusion avec la pile située à %s\n"
2816
2945
2817 msgid ""
2946 msgid ""
2818 "pop the current patch off the stack\n"
2947 "pop the current patch off the stack\n"
2819 "\n"
2948 "\n"
2820 " By default, pops off the top of the patch stack. If given a patch\n"
2949 " By default, pops off the top of the patch stack. If given a patch\n"
2821 " name, keeps popping off patches until the named patch is at the\n"
2950 " name, keeps popping off patches until the named patch is at the\n"
2822 " top of the stack.\n"
2951 " top of the stack.\n"
2823 " "
2952 " "
2824 msgstr ""
2953 msgstr ""
2954 "dépile le dernier patch appliqué\n"
2955 "\n"
2956 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
2957 " un nom de patch est fourni, les patchs seront dépilés en\n"
2958 " séquence jusqu'à arriver au patch demandé.\n"
2959 " "
2825
2960
2826 #, python-format
2961 #, python-format
2827 msgid "using patch queue: %s\n"
2962 msgid "using patch queue: %s\n"
2828 msgstr ""
2963 msgstr "utilisation de la pile de patchs %s\n"
2829
2964
2830 msgid ""
2965 msgid ""
2831 "rename a patch\n"
2966 "rename a patch\n"
2832 "\n"
2967 "\n"
2833 " With one argument, renames the current patch to PATCH1.\n"
2968 " With one argument, renames the current patch to PATCH1.\n"
2834 " With two arguments, renames PATCH1 to PATCH2."
2969 " With two arguments, renames PATCH1 to PATCH2."
2835 msgstr ""
2970 msgstr ""
2971 "renomme un patch\n"
2972 "\n"
2973 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
2974 " Avec deux arguments, PATCH1 devient PATCH2."
2836
2975
2837 #, python-format
2976 #, python-format
2838 msgid "%s already exists"
2977 msgid "%s already exists"
2839 msgstr ""
2978 msgstr "%s existe déjà"
2840
2979
2841 #, python-format
2980 #, python-format
2842 msgid "A patch named %s already exists in the series file"
2981 msgid "A patch named %s already exists in the series file"
2843 msgstr ""
2982 msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")"
2844
2983
2845 msgid "restore the queue state saved by a revision"
2984 msgid "restore the queue state saved by a revision"
2846 msgstr ""
2985 msgstr "rétablissement d'un état sauvegardé de la pile"
2847
2986
2848 msgid "save current queue state"
2987 msgid "save current queue state"
2849 msgstr ""
2988 msgstr "sauvegarde de l'étatt de la pile de patchs"
2850
2989
2851 #, python-format
2990 #, python-format
2852 msgid "destination %s exists and is not a directory"
2991 msgid "destination %s exists and is not a directory"
2853 msgstr ""
2992 msgstr "%s: la cible existe et n'est pas un répertoire"
2854
2993
2855 #, python-format
2994 #, python-format
2856 msgid "destination %s exists, use -f to force"
2995 msgid "destination %s exists, use -f to force"
2857 msgstr ""
2996 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
2858
2997
2859 #, python-format
2998 #, python-format
2860 msgid "copy %s to %s\n"
2999 msgid "copy %s to %s\n"
2861 msgstr ""
3000 msgstr "copie de %s vers %s\n"
2862
3001
2863 msgid ""
3002 msgid ""
2864 "strip a revision and all its descendants from the repository\n"
3003 "strip a revision and all its descendants from the repository\n"
2865 "\n"
3004 "\n"
2866 " If one of the working directory's parent revisions is stripped, the\n"
3005 " If one of the working directory's parent revisions is stripped, the\n"
2867 " working directory will be updated to the parent of the stripped\n"
3006 " working directory will be updated to the parent of the stripped\n"
2868 " revision.\n"
3007 " revision.\n"
2869 " "
3008 " "
2870 msgstr ""
3009 msgstr ""
2871
3010
2872 msgid ""
3011 msgid ""
2873 "set or print guarded patches to push\n"
3012 "set or print guarded patches to push\n"
2874 "\n"
3013 "\n"
2875 " Use the qguard command to set or print guards on patch, then use\n"
3014 " Use the qguard command to set or print guards on patch, then use\n"
2876 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3015 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2877 " it has no guards or any positive guards match the currently\n"
3016 " it has no guards or any positive guards match the currently\n"
2878 " selected guard, but will not be pushed if any negative guards\n"
3017 " selected guard, but will not be pushed if any negative guards\n"
2879 " match the current guard. For example:\n"
3018 " match the current guard. For example:\n"
2880 "\n"
3019 "\n"
2881 " qguard foo.patch -stable (negative guard)\n"
3020 " qguard foo.patch -stable (negative guard)\n"
2882 " qguard bar.patch +stable (positive guard)\n"
3021 " qguard bar.patch +stable (positive guard)\n"
2883 " qselect stable\n"
3022 " qselect stable\n"
2884 "\n"
3023 "\n"
2885 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3024 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2886 " it has a negative match) but push bar.patch (because it has a\n"
3025 " it has a negative match) but push bar.patch (because it has a\n"
2887 " positive match).\n"
3026 " positive match).\n"
2888 "\n"
3027 "\n"
2889 " With no arguments, prints the currently active guards.\n"
3028 " With no arguments, prints the currently active guards.\n"
2890 " With one argument, sets the active guard.\n"
3029 " With one argument, sets the active guard.\n"
2891 "\n"
3030 "\n"
2892 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3031 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2893 " When no guards are active, patches with positive guards are\n"
3032 " When no guards are active, patches with positive guards are\n"
2894 " skipped and patches with negative guards are pushed.\n"
3033 " skipped and patches with negative guards are pushed.\n"
2895 "\n"
3034 "\n"
2896 " qselect can change the guards on applied patches. It does not pop\n"
3035 " qselect can change the guards on applied patches. It does not pop\n"
2897 " guarded patches by default. Use --pop to pop back to the last\n"
3036 " guarded patches by default. Use --pop to pop back to the last\n"
2898 " applied patch that is not guarded. Use --reapply (which implies\n"
3037 " applied patch that is not guarded. Use --reapply (which implies\n"
2899 " --pop) to push back to the current patch afterwards, but skip\n"
3038 " --pop) to push back to the current patch afterwards, but skip\n"
2900 " guarded patches.\n"
3039 " guarded patches.\n"
2901 "\n"
3040 "\n"
2902 " Use -s/--series to print a list of all guards in the series file\n"
3041 " Use -s/--series to print a list of all guards in the series file\n"
2903 " (no other arguments needed). Use -v for more information."
3042 " (no other arguments needed). Use -v for more information."
2904 msgstr ""
3043 msgstr ""
2905
3044
2906 msgid "guards deactivated\n"
3045 msgid "guards deactivated\n"
2907 msgstr ""
3046 msgstr ""
2908
3047
2909 #, python-format
3048 #, python-format
2910 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3049 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
2911 msgstr ""
3050 msgstr ""
2912
3051
2913 #, python-format
3052 #, python-format
2914 msgid "number of guarded, applied patches has changed from %d to %d\n"
3053 msgid "number of guarded, applied patches has changed from %d to %d\n"
2915 msgstr ""
3054 msgstr ""
2916
3055
2917 msgid "guards in series file:\n"
3056 msgid "guards in series file:\n"
2918 msgstr ""
3057 msgstr ""
2919
3058
2920 msgid "no guards in series file\n"
3059 msgid "no guards in series file\n"
2921 msgstr ""
3060 msgstr ""
2922
3061
2923 msgid "active guards:\n"
3062 msgid "active guards:\n"
2924 msgstr ""
3063 msgstr ""
2925
3064
2926 msgid "no active guards\n"
3065 msgid "no active guards\n"
2927 msgstr ""
3066 msgstr ""
2928
3067
2929 msgid "popping guarded patches\n"
3068 msgid "popping guarded patches\n"
2930 msgstr ""
3069 msgstr ""
2931
3070
2932 msgid "reapplying unguarded patches\n"
3071 msgid "reapplying unguarded patches\n"
2933 msgstr ""
3072 msgstr ""
2934
3073
2935 msgid ""
3074 msgid ""
2936 "move applied patches into repository history\n"
3075 "move applied patches into repository history\n"
2937 "\n"
3076 "\n"
2938 " Finishes the specified revisions (corresponding to applied\n"
3077 " Finishes the specified revisions (corresponding to applied\n"
2939 " patches) by moving them out of mq control into regular repository\n"
3078 " patches) by moving them out of mq control into regular repository\n"
2940 " history.\n"
3079 " history.\n"
2941 "\n"
3080 "\n"
2942 " Accepts a revision range or the -a/--applied option. If --applied\n"
3081 " Accepts a revision range or the -a/--applied option. If --applied\n"
2943 " is specified, all applied mq revisions are removed from mq\n"
3082 " is specified, all applied mq revisions are removed from mq\n"
2944 " control. Otherwise, the given revisions must be at the base of the\n"
3083 " control. Otherwise, the given revisions must be at the base of the\n"
2945 " stack of applied patches.\n"
3084 " stack of applied patches.\n"
2946 "\n"
3085 "\n"
2947 " This can be especially useful if your changes have been applied to\n"
3086 " This can be especially useful if your changes have been applied to\n"
2948 " an upstream repository, or if you are about to push your changes\n"
3087 " an upstream repository, or if you are about to push your changes\n"
2949 " to upstream.\n"
3088 " to upstream.\n"
2950 " "
3089 " "
2951 msgstr ""
3090 msgstr ""
3091 "déplacement des patchs vers l'historique du dépôt\n"
3092 "\n"
3093 " Achève le développement des révisions spécifiées (qui doivent\n"
3094 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3095 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3096 " l'historique du dépôt.\n"
3097 "\n"
3098 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3099 " une plage de révisions. Avec --applied, tous les patchs\n"
3100 " appliqués seront retirés du contrôle de mq. Autrement, les\n"
3101 " révisions fournies doivent être situées à la base de la pile de\n"
3102 " patchs appliqués.\n"
3103 "\n"
3104 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3105 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3106 " "
2952
3107
2953 msgid "no revisions specified"
3108 msgid "no revisions specified"
2954 msgstr ""
3109 msgstr "aucune révision spécifiée"
2955
3110
2956 msgid "cannot commit over an applied mq patch"
3111 msgid "cannot commit over an applied mq patch"
2957 msgstr ""
3112 msgstr ""
2958
3113
2959 msgid "source has mq patches applied"
3114 msgid "source has mq patches applied"
2960 msgstr ""
3115 msgstr ""
2961
3116
2962 #, python-format
3117 #, python-format
2963 msgid "mq status file refers to unknown node %s\n"
3118 msgid "mq status file refers to unknown node %s\n"
2964 msgstr ""
3119 msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n"
2965
3120
2966 #, python-format
3121 #, python-format
2967 msgid "Tag %s overrides mq patch of the same name\n"
3122 msgid "Tag %s overrides mq patch of the same name\n"
2968 msgstr ""
3123 msgstr ""
2969
3124
2970 msgid "cannot import over an applied patch"
3125 msgid "cannot import over an applied patch"
2971 msgstr ""
3126 msgstr "impossible d'importer au-dessus d'un patch appliqué"
2972
3127
2973 msgid "print first line of patch header"
3128 msgid "print first line of patch header"
2974 msgstr ""
3129 msgstr "affiche la première ligne de l'en-tête d'un patch"
2975
3130
2976 msgid "hg qapplied [-s] [PATCH]"
3131 msgid "hg qapplied [-s] [PATCH]"
2977 msgstr ""
3132 msgstr "hg qapplied [-s] [PATCH]"
2978
3133
2979 msgid "use pull protocol to copy metadata"
3134 msgid "use pull protocol to copy metadata"
2980 msgstr ""
3135 msgstr ""
2981
3136
2982 msgid "do not update the new working directories"
3137 msgid "do not update the new working directories"
2983 msgstr ""
3138 msgstr "ne pas mettre à jour le répertoire de travail"
2984
3139
2985 msgid "use uncompressed transfer (fast over LAN)"
3140 msgid "use uncompressed transfer (fast over LAN)"
2986 msgstr ""
3141 msgstr "transférer sans compression (rapide sur un réseau local)"
2987
3142
2988 msgid "location of source patch repository"
3143 msgid "location of source patch repository"
2989 msgstr ""
3144 msgstr "emplacement du dépôt de patchs"
2990
3145
2991 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3146 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2992 msgstr ""
3147 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
2993
3148
2994 msgid "hg qcommit [OPTION]... [FILE]..."
3149 msgid "hg qcommit [OPTION]... [FILE]..."
2995 msgstr ""
3150 msgstr "hg qcommit [OPTION]... [FICHIER]..."
2996
3151
2997 msgid "hg qdiff [OPTION]... [FILE]..."
3152 msgid "hg qdiff [OPTION]... [FILE]..."
2998 msgstr ""
3153 msgstr "hg qdiff [OPTION]... [FICHIER]..."
2999
3154
3000 msgid "keep patch file"
3155 msgid "keep patch file"
3001 msgstr ""
3156 msgstr "garder le fichier du patch"
3002
3157
3003 msgid "stop managing a revision (DEPRECATED)"
3158 msgid "stop managing a revision (DEPRECATED)"
3004 msgstr ""
3159 msgstr "arrêter de gérer une révision"
3005
3160
3006 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3161 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3007 msgstr ""
3162 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3008
3163
3009 msgid "edit patch header"
3164 msgid "edit patch header"
3010 msgstr ""
3165 msgstr "éditer l'en-tête du patch"
3011
3166
3012 msgid "keep folded patch files"
3167 msgid "keep folded patch files"
3013 msgstr ""
3168 msgstr ""
3014
3169
3015 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3170 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3016 msgstr ""
3171 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3017
3172
3018 msgid "overwrite any local changes"
3173 msgid "overwrite any local changes"
3019 msgstr ""
3174 msgstr "écraser tout modification locale"
3020
3175
3021 msgid "hg qgoto [OPTION]... PATCH"
3176 msgid "hg qgoto [OPTION]... PATCH"
3022 msgstr ""
3177 msgstr "hg qgoto [OPTION]... PATCH"
3023
3178
3024 msgid "list all patches and guards"
3179 msgid "list all patches and guards"
3025 msgstr ""
3180 msgstr ""
3026
3181
3027 msgid "drop all guards"
3182 msgid "drop all guards"
3028 msgstr ""
3183 msgstr ""
3029
3184
3030 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3185 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3031 msgstr ""
3186 msgstr ""
3032
3187
3033 msgid "hg qheader [PATCH]"
3188 msgid "hg qheader [PATCH]"
3034 msgstr ""
3189 msgstr "hg qheader [PATCH]"
3035
3190
3036 msgid "import file in patch directory"
3191 msgid "import file in patch directory"
3037 msgstr ""
3192 msgstr "importer un fichier résidant dans le répertoire de patchs"
3038
3193
3039 msgid "name of patch file"
3194 msgid "name of patch file"
3040 msgstr ""
3195 msgstr "nom du fichier de patch"
3041
3196
3042 msgid "overwrite existing files"
3197 msgid "overwrite existing files"
3043 msgstr ""
3198 msgstr "écraser les fichiers existant"
3044
3199
3045 msgid "place existing revisions under mq control"
3200 msgid "place existing revisions under mq control"
3046 msgstr ""
3201 msgstr "placer des révisions existantes sous le contrôle de mq"
3047
3202
3048 msgid "use git extended diff format"
3203 msgid "use git extended diff format"
3049 msgstr "utiliser le format de patch étendu de git"
3204 msgstr "utiliser le format de patch étendu de git"
3050
3205
3051 msgid "qpush after importing"
3206 msgid "qpush after importing"
3052 msgstr ""
3207 msgstr "qpush après l'importation"
3053
3208
3054 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3209 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3055 msgstr ""
3210 msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..."
3056
3211
3057 msgid "create queue repository"
3212 msgid "create queue repository"
3058 msgstr ""
3213 msgstr "crée un dépôt de patchs"
3059
3214
3060 msgid "hg qinit [-c]"
3215 msgid "hg qinit [-c]"
3061 msgstr ""
3216 msgstr "hg qinit [-c]"
3062
3217
3063 msgid "import uncommitted changes into patch"
3218 msgid "import uncommitted changes into patch"
3064 msgstr ""
3219 msgstr "importer les modifications locales dans le patch"
3065
3220
3066 msgid "add \"From: <current user>\" to patch"
3221 msgid "add \"From: <current user>\" to patch"
3067 msgstr ""
3222 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3068
3223
3069 msgid "add \"From: <given user>\" to patch"
3224 msgid "add \"From: <given user>\" to patch"
3070 msgstr ""
3225 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3071
3226
3072 msgid "add \"Date: <current date>\" to patch"
3227 msgid "add \"Date: <current date>\" to patch"
3073 msgstr ""
3228 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3074
3229
3075 msgid "add \"Date: <given date>\" to patch"
3230 msgid "add \"Date: <given date>\" to patch"
3076 msgstr ""
3231 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3077
3232
3078 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3233 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3079 msgstr ""
3234 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3080
3235
3081 msgid "hg qnext [-s]"
3236 msgid "hg qnext [-s]"
3082 msgstr ""
3237 msgstr "hg qnext [-s]"
3083
3238
3084 msgid "hg qprev [-s]"
3239 msgid "hg qprev [-s]"
3085 msgstr ""
3240 msgstr "hg qprev [-s]"
3086
3241
3087 msgid "pop all patches"
3242 msgid "pop all patches"
3088 msgstr ""
3243 msgstr "dépiler tous les patchs"
3089
3244
3090 msgid "queue name to pop"
3245 msgid "queue name to pop"
3091 msgstr ""
3246 msgstr "nom de la pile à dépiler"
3092
3247
3093 msgid "forget any local changes"
3248 msgid "forget any local changes"
3094 msgstr ""
3249 msgstr "oublier toute modification locale"
3095
3250
3096 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3251 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3097 msgstr ""
3252 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3098
3253
3099 msgid "apply if the patch has rejects"
3254 msgid "apply if the patch has rejects"
3100 msgstr ""
3255 msgstr ""
3101
3256
3102 msgid "list patch name in commit text"
3257 msgid "list patch name in commit text"
3103 msgstr ""
3258 msgstr ""
3104
3259
3105 msgid "apply all patches"
3260 msgid "apply all patches"
3106 msgstr ""
3261 msgstr "appliquer tous les patchs"
3107
3262
3108 msgid "merge from another queue"
3263 msgid "merge from another queue"
3109 msgstr ""
3264 msgstr "fusionner avec une autre pile de patchs"
3110
3265
3111 msgid "merge queue name"
3266 msgid "merge queue name"
3112 msgstr ""
3267 msgstr "nom de la pile à fusionner"
3113
3268
3114 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3269 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3115 msgstr ""
3270 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3116
3271
3117 msgid "refresh only files already in the patch and specified files"
3272 msgid "refresh only files already in the patch and specified files"
3118 msgstr ""
3273 msgstr ""
3274 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux "
3275 "explicitement spécifiés"
3119
3276
3120 msgid "add/update \"From: <current user>\" in patch"
3277 msgid "add/update \"From: <current user>\" in patch"
3121 msgstr ""
3278 msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch"
3122
3279
3123 msgid "add/update \"From: <given user>\" in patch"
3280 msgid "add/update \"From: <given user>\" in patch"
3124 msgstr ""
3281 msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch"
3125
3282
3126 msgid "update \"Date: <current date>\" in patch (if present)"
3283 msgid "update \"Date: <current date>\" in patch (if present)"
3127 msgstr ""
3284 msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)"
3128
3285
3129 msgid "update \"Date: <given date>\" in patch (if present)"
3286 msgid "update \"Date: <given date>\" in patch (if present)"
3130 msgstr ""
3287 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3131
3288
3132 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3289 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3133 msgstr ""
3290 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..."
3134
3291
3135 msgid "hg qrename PATCH1 [PATCH2]"
3292 msgid "hg qrename PATCH1 [PATCH2]"
3136 msgstr ""
3293 msgstr "hg qrename PATCH1 [PATCH2]"
3137
3294
3138 msgid "delete save entry"
3295 msgid "delete save entry"
3139 msgstr ""
3296 msgstr ""
3140
3297
3141 msgid "update queue working directory"
3298 msgid "update queue working directory"
3142 msgstr ""
3299 msgstr ""
3143
3300
3144 msgid "hg qrestore [-d] [-u] REV"
3301 msgid "hg qrestore [-d] [-u] REV"
3145 msgstr ""
3302 msgstr ""
3146
3303
3147 msgid "copy patch directory"
3304 msgid "copy patch directory"
3148 msgstr ""
3305 msgstr ""
3149
3306
3150 msgid "copy directory name"
3307 msgid "copy directory name"
3151 msgstr ""
3308 msgstr ""
3152
3309
3153 msgid "clear queue status file"
3310 msgid "clear queue status file"
3154 msgstr ""
3311 msgstr ""
3155
3312
3156 msgid "force copy"
3313 msgid "force copy"
3157 msgstr ""
3314 msgstr ""
3158
3315
3159 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3316 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3160 msgstr ""
3317 msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]"
3161
3318
3162 msgid "disable all guards"
3319 msgid "disable all guards"
3163 msgstr ""
3320 msgstr ""
3164
3321
3165 msgid "list all guards in series file"
3322 msgid "list all guards in series file"
3166 msgstr ""
3323 msgstr ""
3167
3324
3168 msgid "pop to before first guarded applied patch"
3325 msgid "pop to before first guarded applied patch"
3169 msgstr ""
3326 msgstr ""
3170
3327
3171 msgid "pop, then reapply patches"
3328 msgid "pop, then reapply patches"
3172 msgstr ""
3329 msgstr "dépiler, puis appliquer à nouveau les patchs"
3173
3330
3174 msgid "hg qselect [OPTION]... [GUARD]..."
3331 msgid "hg qselect [OPTION]... [GUARD]..."
3175 msgstr ""
3332 msgstr ""
3176
3333
3177 msgid "print patches not in series"
3334 msgid "print patches not in series"
3178 msgstr ""
3335 msgstr "afficher les patchs absents de la série"
3179
3336
3180 msgid "hg qseries [-ms]"
3337 msgid "hg qseries [-ms]"
3181 msgstr ""
3338 msgstr "hg qseries [-ms]"
3182
3339
3183 msgid "force removal with local changes"
3340 msgid "force removal with local changes"
3184 msgstr ""
3341 msgstr "forcer la suppression malgré les modifications locales"
3185
3342
3186 msgid "bundle unrelated changesets"
3343 msgid "bundle unrelated changesets"
3187 msgstr ""
3344 msgstr ""
3188
3345
3189 msgid "no backups"
3346 msgid "no backups"
3190 msgstr ""
3347 msgstr ""
3191
3348
3192 msgid "hg strip [-f] [-b] [-n] REV"
3349 msgid "hg strip [-f] [-b] [-n] REV"
3193 msgstr ""
3350 msgstr "hg strip [-f] [-b] [-n] REV"
3194
3351
3195 msgid "hg qtop [-s]"
3352 msgid "hg qtop [-s]"
3196 msgstr ""
3353 msgstr "hg qtop [-s]"
3197
3354
3198 msgid "hg qunapplied [-s] [PATCH]"
3355 msgid "hg qunapplied [-s] [PATCH]"
3199 msgstr ""
3356 msgstr "hg qunapplied [-s] [PATCH]"
3200
3357
3201 msgid "finish all applied changesets"
3358 msgid "finish all applied changesets"
3202 msgstr ""
3359 msgstr ""
3203
3360
3204 msgid "hg qfinish [-a] [REV]..."
3361 msgid "hg qfinish [-a] [REV]..."
3205 msgstr ""
3362 msgstr "hg qfinish [-a] [REV]..."
3206
3363
3207 msgid ""
3364 msgid ""
3208 "hooks for sending email notifications at commit/push time\n"
3365 "hooks for sending email notifications at commit/push time\n"
3209 "\n"
3366 "\n"
3210 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3367 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3211 "messages to stdout, for testing and configuring.\n"
3368 "messages to stdout, for testing and configuring.\n"
3212 "\n"
3369 "\n"
3213 "To use, configure notify extension and enable in hgrc like this:\n"
3370 "To use, configure notify extension and enable in hgrc like this:\n"
3214 "\n"
3371 "\n"
3215 " [extensions]\n"
3372 " [extensions]\n"
3216 " hgext.notify =\n"
3373 " hgext.notify =\n"
3217 "\n"
3374 "\n"
3218 " [hooks]\n"
3375 " [hooks]\n"
3219 " # one email for each incoming changeset\n"
3376 " # one email for each incoming changeset\n"
3220 " incoming.notify = python:hgext.notify.hook\n"
3377 " incoming.notify = python:hgext.notify.hook\n"
3221 " # batch emails when many changesets incoming at one time\n"
3378 " # batch emails when many changesets incoming at one time\n"
3222 " changegroup.notify = python:hgext.notify.hook\n"
3379 " changegroup.notify = python:hgext.notify.hook\n"
3223 "\n"
3380 "\n"
3224 " [notify]\n"
3381 " [notify]\n"
3225 " # config items go in here\n"
3382 " # config items go in here\n"
3226 "\n"
3383 "\n"
3227 " config items:\n"
3384 " config items:\n"
3228 "\n"
3385 "\n"
3229 " REQUIRED:\n"
3386 " REQUIRED:\n"
3230 " config = /path/to/file # file containing subscriptions\n"
3387 " config = /path/to/file # file containing subscriptions\n"
3231 "\n"
3388 "\n"
3232 " OPTIONAL:\n"
3389 " OPTIONAL:\n"
3233 " test = True # print messages to stdout for testing\n"
3390 " test = True # print messages to stdout for testing\n"
3234 " strip = 3 # number of slashes to strip for url paths\n"
3391 " strip = 3 # number of slashes to strip for url paths\n"
3235 " domain = example.com # domain to use if committer missing domain\n"
3392 " domain = example.com # domain to use if committer missing domain\n"
3236 " style = ... # style file to use when formatting email\n"
3393 " style = ... # style file to use when formatting email\n"
3237 " template = ... # template to use when formatting email\n"
3394 " template = ... # template to use when formatting email\n"
3238 " incoming = ... # template to use when run as incoming hook\n"
3395 " incoming = ... # template to use when run as incoming hook\n"
3239 " changegroup = ... # template when run as changegroup hook\n"
3396 " changegroup = ... # template when run as changegroup hook\n"
3240 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3397 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3241 " maxsubject = 67 # truncate subject line longer than this\n"
3398 " maxsubject = 67 # truncate subject line longer than this\n"
3242 " diffstat = True # add a diffstat before the diff content\n"
3399 " diffstat = True # add a diffstat before the diff content\n"
3243 " sources = serve # notify if source of incoming changes in this "
3400 " sources = serve # notify if source of incoming changes in this "
3244 "list\n"
3401 "list\n"
3245 " # (serve == ssh or http, push, pull, bundle)\n"
3402 " # (serve == ssh or http, push, pull, bundle)\n"
3246 " [email]\n"
3403 " [email]\n"
3247 " from = user@host.com # email address to send as if none given\n"
3404 " from = user@host.com # email address to send as if none given\n"
3248 " [web]\n"
3405 " [web]\n"
3249 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3406 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3250 "\n"
3407 "\n"
3251 " notify config file has same format as regular hgrc. it has two\n"
3408 " notify config file has same format as regular hgrc. it has two\n"
3252 " sections so you can express subscriptions in whatever way is handier\n"
3409 " sections so you can express subscriptions in whatever way is handier\n"
3253 " for you.\n"
3410 " for you.\n"
3254 "\n"
3411 "\n"
3255 " [usersubs]\n"
3412 " [usersubs]\n"
3256 " # key is subscriber email, value is \",\"-separated list of glob "
3413 " # key is subscriber email, value is \",\"-separated list of glob "
3257 "patterns\n"
3414 "patterns\n"
3258 " user@host = pattern\n"
3415 " user@host = pattern\n"
3259 "\n"
3416 "\n"
3260 " [reposubs]\n"
3417 " [reposubs]\n"
3261 " # key is glob pattern, value is \",\"-separated list of subscriber "
3418 " # key is glob pattern, value is \",\"-separated list of subscriber "
3262 "emails\n"
3419 "emails\n"
3263 " pattern = user@host\n"
3420 " pattern = user@host\n"
3264 "\n"
3421 "\n"
3265 " glob patterns are matched against path to repository root.\n"
3422 " glob patterns are matched against path to repository root.\n"
3266 "\n"
3423 "\n"
3267 " if you like, you can put notify config file in repository that users\n"
3424 " if you like, you can put notify config file in repository that users\n"
3268 " can push changes to, they can manage their own subscriptions."
3425 " can push changes to, they can manage their own subscriptions."
3269 msgstr ""
3426 msgstr ""
3270
3427
3271 #, python-format
3428 #, python-format
3272 msgid "%s: %d new changesets"
3429 msgid "%s: %d new changesets"
3273 msgstr ""
3430 msgstr ""
3274
3431
3275 #, python-format
3432 #, python-format
3276 msgid "notify: sending %d subscribers %d changes\n"
3433 msgid "notify: sending %d subscribers %d changes\n"
3277 msgstr ""
3434 msgstr ""
3278
3435
3279 #, python-format
3436 #, python-format
3280 msgid ""
3437 msgid ""
3281 "\n"
3438 "\n"
3282 "diffs (truncated from %d to %d lines):\n"
3439 "diffs (truncated from %d to %d lines):\n"
3283 "\n"
3440 "\n"
3284 msgstr ""
3441 msgstr ""
3285
3442
3286 #, python-format
3443 #, python-format
3287 msgid ""
3444 msgid ""
3288 "\n"
3445 "\n"
3289 "diffs (%d lines):\n"
3446 "diffs (%d lines):\n"
3290 "\n"
3447 "\n"
3291 msgstr ""
3448 msgstr ""
3292
3449
3293 #, python-format
3450 #, python-format
3294 msgid "notify: no subscribers to repository %s\n"
3451 msgid "notify: no subscribers to repository %s\n"
3295 msgstr ""
3452 msgstr ""
3296
3453
3297 #, python-format
3454 #, python-format
3298 msgid "notify: changes have source \"%s\" - skipping\n"
3455 msgid "notify: changes have source \"%s\" - skipping\n"
3299 msgstr ""
3456 msgstr ""
3300
3457
3301 msgid ""
3458 msgid ""
3302 "browse command output with an external pager\n"
3459 "browse command output with an external pager\n"
3303 "\n"
3460 "\n"
3304 "To set the pager that should be used, set the application variable:\n"
3461 "To set the pager that should be used, set the application variable:\n"
3305 "\n"
3462 "\n"
3306 " [pager]\n"
3463 " [pager]\n"
3307 " pager = LESS='FSRX' less\n"
3464 " pager = LESS='FSRX' less\n"
3308 "\n"
3465 "\n"
3309 "If no pager is set, the pager extensions uses the environment variable\n"
3466 "If no pager is set, the pager extensions uses the environment variable\n"
3310 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3467 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3311 "\n"
3468 "\n"
3312 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3469 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3313 "setting:\n"
3470 "setting:\n"
3314 "\n"
3471 "\n"
3315 " [pager]\n"
3472 " [pager]\n"
3316 " quiet = True\n"
3473 " quiet = True\n"
3317 "\n"
3474 "\n"
3318 "You can disable the pager for certain commands by adding them to the\n"
3475 "You can disable the pager for certain commands by adding them to the\n"
3319 "pager.ignore list:\n"
3476 "pager.ignore list:\n"
3320 "\n"
3477 "\n"
3321 " [pager]\n"
3478 " [pager]\n"
3322 " ignore = version, help, update\n"
3479 " ignore = version, help, update\n"
3323 "\n"
3480 "\n"
3324 "You can also enable the pager only for certain commands using\n"
3481 "You can also enable the pager only for certain commands using\n"
3325 "pager.attend:\n"
3482 "pager.attend:\n"
3326 "\n"
3483 "\n"
3327 " [pager]\n"
3484 " [pager]\n"
3328 " attend = log\n"
3485 " attend = log\n"
3329 "\n"
3486 "\n"
3330 "If pager.attend is present, pager.ignore will be ignored.\n"
3487 "If pager.attend is present, pager.ignore will be ignored.\n"
3331 "\n"
3488 "\n"
3332 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3489 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3333 "specify them in the global .hgrc\n"
3490 "specify them in the global .hgrc\n"
3334 msgstr ""
3491 msgstr ""
3335
3492
3336 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3493 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3337 # sera capable de replier automatiquement la première ligne d'aide)
3494 # sera capable de replier automatiquement la première ligne d'aide)
3338 msgid ""
3495 msgid ""
3339 "interpret suffixes to refer to ancestor revisions\n"
3496 "interpret suffixes to refer to ancestor revisions\n"
3340 "\n"
3497 "\n"
3341 "This extension allows you to use git-style suffixes to refer to the\n"
3498 "This extension allows you to use git-style suffixes to refer to the\n"
3342 "ancestors of a specific revision.\n"
3499 "ancestors of a specific revision.\n"
3343 "\n"
3500 "\n"
3344 "For example, if you can refer to a revision as \"foo\", then:\n"
3501 "For example, if you can refer to a revision as \"foo\", then:\n"
3345 "\n"
3502 "\n"
3346 "- foo^N = Nth parent of foo\n"
3503 "- foo^N = Nth parent of foo\n"
3347 " foo^0 = foo\n"
3504 " foo^0 = foo\n"
3348 " foo^1 = first parent of foo\n"
3505 " foo^1 = first parent of foo\n"
3349 " foo^2 = second parent of foo\n"
3506 " foo^2 = second parent of foo\n"
3350 " foo^ = foo^1\n"
3507 " foo^ = foo^1\n"
3351 "\n"
3508 "\n"
3352 "- foo~N = Nth first grandparent of foo\n"
3509 "- foo~N = Nth first grandparent of foo\n"
3353 " foo~0 = foo\n"
3510 " foo~0 = foo\n"
3354 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3511 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3355 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3512 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3356 msgstr ""
3513 msgstr ""
3357 "suffixes faisant référence à des révisions antérieures\n"
3514 "suffixes faisant référence à des révisions antérieures\n"
3358 "\n"
3515 "\n"
3359 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3516 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3360 "faire référence aux ancêtres d'une révision donnée.\n"
3517 "faire référence aux ancêtres d'une révision donnée.\n"
3361 "\n"
3518 "\n"
3362 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3519 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3363 "\n"
3520 "\n"
3364 "- foo^N = Nième parent de foo\n"
3521 "- foo^N = Nième parent de foo\n"
3365 " foo^0 = foo\n"
3522 " foo^0 = foo\n"
3366 " foo^1 = premier parent de foo\n"
3523 " foo^1 = premier parent de foo\n"
3367 " foo^2 = second parent de foo\n"
3524 " foo^2 = second parent de foo\n"
3368 " foo^ = foo^1\n"
3525 " foo^ = foo^1\n"
3369 "\n"
3526 "\n"
3370 "- foo~N = Nième premier grand-parent de foo\n"
3527 "- foo~N = Nième premier grand-parent de foo\n"
3371 " foo~0 = foo\n"
3528 " foo~0 = foo\n"
3372 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3529 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3373 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3530 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3374
3531
3375 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3532 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3376 # sera capable de replier automatiquement la première ligne d'aide)
3533 # sera capable de replier automatiquement la première ligne d'aide)
3377 msgid ""
3534 msgid ""
3378 "command to send changesets as (a series of) patch emails\n"
3535 "command to send changesets as (a series of) patch emails\n"
3379 "\n"
3536 "\n"
3380 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3537 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3381 "describes the series as a whole.\n"
3538 "describes the series as a whole.\n"
3382 "\n"
3539 "\n"
3383 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3540 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3384 "first line of the changeset description as the subject text. The\n"
3541 "first line of the changeset description as the subject text. The\n"
3385 "message contains two or three body parts:\n"
3542 "message contains two or three body parts:\n"
3386 "\n"
3543 "\n"
3387 " The changeset description.\n"
3544 " The changeset description.\n"
3388 "\n"
3545 "\n"
3389 " [Optional] The result of running diffstat on the patch.\n"
3546 " [Optional] The result of running diffstat on the patch.\n"
3390 "\n"
3547 "\n"
3391 " The patch itself, as generated by \"hg export\".\n"
3548 " The patch itself, as generated by \"hg export\".\n"
3392 "\n"
3549 "\n"
3393 "Each message refers to the first in the series using the In-Reply-To\n"
3550 "Each message refers to the first in the series using the In-Reply-To\n"
3394 "and References headers, so they will show up as a sequence in threaded\n"
3551 "and References headers, so they will show up as a sequence in threaded\n"
3395 "mail and news readers, and in mail archives.\n"
3552 "mail and news readers, and in mail archives.\n"
3396 "\n"
3553 "\n"
3397 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3554 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3398 "with a diffstat summary and the changeset summary, so you can be sure\n"
3555 "with a diffstat summary and the changeset summary, so you can be sure\n"
3399 "you are sending the right changes.\n"
3556 "you are sending the right changes.\n"
3400 "\n"
3557 "\n"
3401 "To configure other defaults, add a section like this to your hgrc\n"
3558 "To configure other defaults, add a section like this to your hgrc\n"
3402 "file:\n"
3559 "file:\n"
3403 "\n"
3560 "\n"
3404 " [email]\n"
3561 " [email]\n"
3405 " from = My Name <my@email>\n"
3562 " from = My Name <my@email>\n"
3406 " to = recipient1, recipient2, ...\n"
3563 " to = recipient1, recipient2, ...\n"
3407 " cc = cc1, cc2, ...\n"
3564 " cc = cc1, cc2, ...\n"
3408 " bcc = bcc1, bcc2, ...\n"
3565 " bcc = bcc1, bcc2, ...\n"
3409 "\n"
3566 "\n"
3410 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3567 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3411 "as a patchbomb.\n"
3568 "as a patchbomb.\n"
3412 "\n"
3569 "\n"
3413 "To avoid sending patches prematurely, it is a good idea to first run\n"
3570 "To avoid sending patches prematurely, it is a good idea to first run\n"
3414 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3571 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3415 "prompted for an email recipient address, a subject and an introductory\n"
3572 "prompted for an email recipient address, a subject and an introductory\n"
3416 "message describing the patches of your patchbomb. Then when all is\n"
3573 "message describing the patches of your patchbomb. Then when all is\n"
3417 "done, patchbomb messages are displayed. If the PAGER environment\n"
3574 "done, patchbomb messages are displayed. If the PAGER environment\n"
3418 "variable is set, your pager will be fired up once for each patchbomb\n"
3575 "variable is set, your pager will be fired up once for each patchbomb\n"
3419 "message, so you can verify everything is alright.\n"
3576 "message, so you can verify everything is alright.\n"
3420 "\n"
3577 "\n"
3421 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3578 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3422 "patchbomb message in a pager or sending the messages directly, it will\n"
3579 "patchbomb message in a pager or sending the messages directly, it will\n"
3423 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3580 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3424 "can be previewed with any mail user agent which supports UNIX mbox\n"
3581 "can be previewed with any mail user agent which supports UNIX mbox\n"
3425 "files, e.g. with mutt:\n"
3582 "files, e.g. with mutt:\n"
3426 "\n"
3583 "\n"
3427 " % mutt -R -f mbox\n"
3584 " % mutt -R -f mbox\n"
3428 "\n"
3585 "\n"
3429 "When you are previewing the patchbomb messages, you can use `formail'\n"
3586 "When you are previewing the patchbomb messages, you can use `formail'\n"
3430 "(a utility that is commonly installed as part of the procmail\n"
3587 "(a utility that is commonly installed as part of the procmail\n"
3431 "package), to send each message out:\n"
3588 "package), to send each message out:\n"
3432 "\n"
3589 "\n"
3433 " % formail -s sendmail -bm -t < mbox\n"
3590 " % formail -s sendmail -bm -t < mbox\n"
3434 "\n"
3591 "\n"
3435 "That should be all. Now your patchbomb is on its way out.\n"
3592 "That should be all. Now your patchbomb is on its way out.\n"
3436 "\n"
3593 "\n"
3437 "You can also either configure the method option in the email section\n"
3594 "You can also either configure the method option in the email section\n"
3438 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3595 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3439 "that the patchbomb extension can automatically send patchbombs\n"
3596 "that the patchbomb extension can automatically send patchbombs\n"
3440 "directly from the commandline. See the [email] and [smtp] sections in\n"
3597 "directly from the commandline. See the [email] and [smtp] sections in\n"
3441 "hgrc(5) for details."
3598 "hgrc(5) for details."
3442 msgstr ""
3599 msgstr ""
3443 "envoi d'une série de \"changesets\" par courrier électronique\n"
3600 "envoi d'une série de \"changesets\" par courrier électronique\n"
3444 "\n"
3601 "\n"
3445 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3602 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3446 "décrivant dans son ensemble.\n"
3603 "décrivant dans son ensemble.\n"
3447 "\n"
3604 "\n"
3448 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3605 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3449 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3606 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3450 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3607 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3451 "parties :\n"
3608 "parties :\n"
3452 "\n"
3609 "\n"
3453 " La description du \"changeset\".\n"
3610 " La description du \"changeset\".\n"
3454 "\n"
3611 "\n"
3455 " Optionnellement, un résumé des modifications généré par le\n"
3612 " Optionnellement, un résumé des modifications généré par le\n"
3456 " programme diffstat.\n"
3613 " programme diffstat.\n"
3457 "\n"
3614 "\n"
3458 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3615 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3459 "\n"
3616 "\n"
3460 "Chaque message fait référence au premier de la série (à l'aide\n"
3617 "Chaque message fait référence au premier de la série (à l'aide\n"
3461 "des en-têtes de message In-Reply-To et References) de manière à\n"
3618 "des en-têtes de message In-Reply-To et References) de manière à\n"
3462 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3619 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3463 "électronique et de nouvelles, ainsi que dans les archives de\n"
3620 "électronique et de nouvelles, ainsi que dans les archives de\n"
3464 "messagerie.\n"
3621 "messagerie.\n"
3465 "\n"
3622 "\n"
3466 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3623 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3467 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3624 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3468 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3625 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3469 "d'être certain de bien envoyer les bonnes modifications.\n"
3626 "d'être certain de bien envoyer les bonnes modifications.\n"
3470 "\n"
3627 "\n"
3471 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3628 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3472 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3629 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3473 "\n"
3630 "\n"
3474 " [email]\n"
3631 " [email]\n"
3475 " from = Mon Nom <mon@adresse_de_courriel>\n"
3632 " from = Mon Nom <mon@adresse_de_courriel>\n"
3476 " to = destinataire1, destinataire2, ...\n"
3633 " to = destinataire1, destinataire2, ...\n"
3477 " cc = cc1, cc2, ...\n"
3634 " cc = cc1, cc2, ...\n"
3478 " bcc = bcc1, bcc2, ...\n"
3635 " bcc = bcc1, bcc2, ...\n"
3479 "\n"
3636 "\n"
3480 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3637 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3481 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3638 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3482 "\n"
3639 "\n"
3483 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3640 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3484 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3641 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3485 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3642 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3486 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3643 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3487 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3644 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3488 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3645 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3489 "l'affichage chaque message, permettant de vérifier que tout est\n"
3646 "l'affichage chaque message, permettant de vérifier que tout est\n"
3490 "correct.\n"
3647 "correct.\n"
3491 "\n"
3648 "\n"
3492 "L'option -m/--mbox est également très utile : au lieu que les\n"
3649 "L'option -m/--mbox est également très utile : au lieu que les\n"
3493 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3650 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3494 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3651 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3495 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3652 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3496 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3653 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3497 "comme par exemple mutt :\n"
3654 "comme par exemple mutt :\n"
3498 "\n"
3655 "\n"
3499 " % mutt -R -f mbox\n"
3656 " % mutt -R -f mbox\n"
3500 "\n"
3657 "\n"
3501 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3658 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3502 "utilisant formail (un outil généralement installé en même temps que\n"
3659 "utilisant formail (un outil généralement installé en même temps que\n"
3503 "procmail) :\n"
3660 "procmail) :\n"
3504 "\n"
3661 "\n"
3505 " % formail -s sendmail -bm -t < mbox\n"
3662 " % formail -s sendmail -bm -t < mbox\n"
3506 "\n"
3663 "\n"
3507 "Et voilà, vos patchs sont en route vers leur destination.\n"
3664 "Et voilà, vos patchs sont en route vers leur destination.\n"
3508 "\n"
3665 "\n"
3509 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3666 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3510 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3667 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3511 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3668 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3512 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3669 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3513 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3670 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3514 "page de manuel hgrc(5) pour plus de détails."
3671 "page de manuel hgrc(5) pour plus de détails."
3515
3672
3516 msgid "Please enter a valid value.\n"
3673 msgid "Please enter a valid value.\n"
3517 msgstr "Veuillez fournir une valeur valide.\n"
3674 msgstr "Veuillez fournir une valeur valide.\n"
3518
3675
3519 msgid "does the diffstat above look okay? "
3676 msgid "does the diffstat above look okay? "
3520 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3677 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3521
3678
3522 msgid "diffstat rejected"
3679 msgid "diffstat rejected"
3523 msgstr "résumé des modifications rejeté"
3680 msgstr "résumé des modifications rejeté"
3524
3681
3525 msgid ""
3682 msgid ""
3526 "send changesets by email\n"
3683 "send changesets by email\n"
3527 "\n"
3684 "\n"
3528 " By default, diffs are sent in the format generated by hg export,\n"
3685 " By default, diffs are sent in the format generated by hg export,\n"
3529 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3686 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3530 " introduction, which describes the series as a whole.\n"
3687 " introduction, which describes the series as a whole.\n"
3531 "\n"
3688 "\n"
3532 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3689 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3533 " the first line of the changeset description as the subject text.\n"
3690 " the first line of the changeset description as the subject text.\n"
3534 " The message contains two or three parts. First, the changeset\n"
3691 " The message contains two or three parts. First, the changeset\n"
3535 " description. Next, (optionally) if the diffstat program is\n"
3692 " description. Next, (optionally) if the diffstat program is\n"
3536 " installed and -d/--diffstat is used, the result of running\n"
3693 " installed and -d/--diffstat is used, the result of running\n"
3537 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3694 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3538 " \"hg export\".\n"
3695 " \"hg export\".\n"
3539 "\n"
3696 "\n"
3540 " By default the patch is included as text in the email body for\n"
3697 " By default the patch is included as text in the email body for\n"
3541 " easy reviewing. Using the -a/--attach option will instead create\n"
3698 " easy reviewing. Using the -a/--attach option will instead create\n"
3542 " an attachment for the patch. With -i/--inline an inline attachment\n"
3699 " an attachment for the patch. With -i/--inline an inline attachment\n"
3543 " will be created.\n"
3700 " will be created.\n"
3544 "\n"
3701 "\n"
3545 " With -o/--outgoing, emails will be generated for patches not found\n"
3702 " With -o/--outgoing, emails will be generated for patches not found\n"
3546 " in the destination repository (or only those which are ancestors\n"
3703 " in the destination repository (or only those which are ancestors\n"
3547 " of the specified revisions if any are provided)\n"
3704 " of the specified revisions if any are provided)\n"
3548 "\n"
3705 "\n"
3549 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3706 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3550 " single email containing a binary Mercurial bundle as an attachment\n"
3707 " single email containing a binary Mercurial bundle as an attachment\n"
3551 " will be sent.\n"
3708 " will be sent.\n"
3552 "\n"
3709 "\n"
3553 " Examples:\n"
3710 " Examples:\n"
3554 "\n"
3711 "\n"
3555 " hg email -r 3000 # send patch 3000 only\n"
3712 " hg email -r 3000 # send patch 3000 only\n"
3556 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3713 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3557 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3714 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3558 " hg email 3000 # send patch 3000 (deprecated)\n"
3715 " hg email 3000 # send patch 3000 (deprecated)\n"
3559 "\n"
3716 "\n"
3560 " hg email -o # send all patches not in default\n"
3717 " hg email -o # send all patches not in default\n"
3561 " hg email -o DEST # send all patches not in DEST\n"
3718 " hg email -o DEST # send all patches not in DEST\n"
3562 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3719 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3563 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3720 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3564 "\n"
3721 "\n"
3565 " hg email -b # send bundle of all patches not in default\n"
3722 " hg email -b # send bundle of all patches not in default\n"
3566 " hg email -b DEST # send bundle of all patches not in DEST\n"
3723 " hg email -b DEST # send bundle of all patches not in DEST\n"
3567 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3724 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3568 "default\n"
3725 "default\n"
3569 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3726 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3570 "\n"
3727 "\n"
3571 " Before using this command, you will need to enable email in your\n"
3728 " Before using this command, you will need to enable email in your\n"
3572 " hgrc. See the [email] section in hgrc(5) for details.\n"
3729 " hgrc. See the [email] section in hgrc(5) for details.\n"
3573 " "
3730 " "
3574 msgstr ""
3731 msgstr ""
3575 "envoi de \"changesets\" par courrier électronique\n"
3732 "envoi de \"changesets\" par courrier électronique\n"
3576 "\n"
3733 "\n"
3577 " Par défaut, les modifications sont envoyées au format généré par\n"
3734 " Par défaut, les modifications sont envoyées au format généré par\n"
3578 " \"hg export\", une par message. La série débute par un message\n"
3735 " \"hg export\", une par message. La série débute par un message\n"
3579 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3736 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3580 "\n"
3737 "\n"
3581 " Chaque courriel a pour sujet un résumé des modifications\n"
3738 " Chaque courriel a pour sujet un résumé des modifications\n"
3582 " apportées par le patch (pris en première ligne de la description\n"
3739 " apportées par le patch (pris en première ligne de la description\n"
3583 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3740 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3584 " Le message est constitué de deux ou trois parties. D'abord,\n"
3741 " Le message est constitué de deux ou trois parties. D'abord,\n"
3585 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3742 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3586 " un résumé des modifications généré par le programme diffstat si\n"
3743 " un résumé des modifications généré par le programme diffstat si\n"
3587 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3744 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3588 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3745 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3589 "\n"
3746 "\n"
3590 " Par défaut le patch est inclus textuellement dans le corps du\n"
3747 " Par défaut le patch est inclus textuellement dans le corps du\n"
3591 " message afin de faciliter les relectures et commentaires.\n"
3748 " message afin de faciliter les relectures et commentaires.\n"
3592 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3749 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3593 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3750 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3594 " insère celle-ci dans le corps.\n"
3751 " insère celle-ci dans le corps.\n"
3595 "\n"
3752 "\n"
3596 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3753 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3597 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3754 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3598 " ancêtres des révisions spécifiées, le cas échéant).\n"
3755 " ancêtres des révisions spécifiées, le cas échéant).\n"
3599 "\n"
3756 "\n"
3600 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3757 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3601 " même manière que pour --outgoing, mais il seront envoyés via\n"
3758 " même manière que pour --outgoing, mais il seront envoyés via\n"
3602 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3759 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3603 "\n"
3760 "\n"
3604 " Exemples :\n"
3761 " Exemples :\n"
3605 "\n"
3762 "\n"
3606 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3763 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3607 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3764 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3608 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3765 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3609 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3766 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3610 "\n"
3767 "\n"
3611 " hg email -o # envoyer les patchs absents de la\n"
3768 " hg email -o # envoyer les patchs absents de la\n"
3612 " destination par défaut\n"
3769 " destination par défaut\n"
3613 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3770 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3614 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3771 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3615 " de la destination par défaut\n"
3772 " de la destination par défaut\n"
3616 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3773 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3617 " de DEST\n"
3774 " de DEST\n"
3618 "\n"
3775 "\n"
3619 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3776 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3620 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3777 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3621 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3778 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3622 " [email] pour plus de détails.\n"
3779 " [email] pour plus de détails.\n"
3623 " "
3780 " "
3624
3781
3625 msgid "specify at least one changeset with -r or -o"
3782 msgid "specify at least one changeset with -r or -o"
3626 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3783 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3627
3784
3628 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3785 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3629 msgstr ""
3786 msgstr ""
3630 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3787 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3631 "bundle est utilisé"
3788 "bundle est utilisé"
3632
3789
3633 msgid "too many destinations"
3790 msgid "too many destinations"
3634 msgstr "trop de destinations"
3791 msgstr "trop de destinations"
3635
3792
3636 msgid "use only one form to specify the revision"
3793 msgid "use only one form to specify the revision"
3637 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3794 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3638
3795
3639 msgid ""
3796 msgid ""
3640 "\n"
3797 "\n"
3641 "Write the introductory message for the patch series.\n"
3798 "Write the introductory message for the patch series.\n"
3642 "\n"
3799 "\n"
3643 msgstr ""
3800 msgstr ""
3644 "\n"
3801 "\n"
3645 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3802 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3646 "\n"
3803 "\n"
3647
3804
3648 #, python-format
3805 #, python-format
3649 msgid ""
3806 msgid ""
3650 "This patch series consists of %d patches.\n"
3807 "This patch series consists of %d patches.\n"
3651 "\n"
3808 "\n"
3652 msgstr ""
3809 msgstr ""
3653 "Cette série comporte %d patchs.\n"
3810 "Cette série comporte %d patchs.\n"
3654 "\n"
3811 "\n"
3655
3812
3656 # diffstat sur l'ensemble des patchs
3813 # diffstat sur l'ensemble des patchs
3657 msgid "Final summary:\n"
3814 msgid "Final summary:\n"
3658 msgstr "Résumé complet des modifications :\n"
3815 msgstr "Résumé complet des modifications :\n"
3659
3816
3660 # mode --test
3817 # mode --test
3661 msgid "Displaying "
3818 msgid "Displaying "
3662 msgstr "Affichage de "
3819 msgstr "Affichage de "
3663
3820
3664 # mode --mbox
3821 # mode --mbox
3665 msgid "Writing "
3822 msgid "Writing "
3666 msgstr "Écriture de "
3823 msgstr "Écriture de "
3667
3824
3668 # mode d'envoi par défaut
3825 # mode d'envoi par défaut
3669 msgid "Sending "
3826 msgid "Sending "
3670 msgstr "Envoi de "
3827 msgstr "Envoi de "
3671
3828
3672 msgid "send patches as attachments"
3829 msgid "send patches as attachments"
3673 msgstr "envoyer les patchs en tant que pièces jointes"
3830 msgstr "envoyer les patchs en tant que pièces jointes"
3674
3831
3675 msgid "send patches as inline attachments"
3832 msgid "send patches as inline attachments"
3676 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3833 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3677
3834
3678 msgid "email addresses of blind carbon copy recipients"
3835 msgid "email addresses of blind carbon copy recipients"
3679 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3836 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3680
3837
3681 msgid "email addresses of copy recipients"
3838 msgid "email addresses of copy recipients"
3682 msgstr "adresses électroniques des destinataires en copie carbone"
3839 msgstr "adresses électroniques des destinataires en copie carbone"
3683
3840
3684 msgid "add diffstat output to messages"
3841 msgid "add diffstat output to messages"
3685 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3842 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3686
3843
3687 msgid "use the given date as the sending date"
3844 msgid "use the given date as the sending date"
3688 msgstr "utiliser la date fournie comme date d'envoi"
3845 msgstr "utiliser la date fournie comme date d'envoi"
3689
3846
3690 msgid "use the given file as the series description"
3847 msgid "use the given file as the series description"
3691 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3848 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3692
3849
3693 msgid "email address of sender"
3850 msgid "email address of sender"
3694 msgstr "adresse électronique de l'expéditeur"
3851 msgstr "adresse électronique de l'expéditeur"
3695
3852
3696 msgid "print messages that would be sent"
3853 msgid "print messages that would be sent"
3697 msgstr "afficher les messages tels qu'ils seraient envoyés"
3854 msgstr "afficher les messages tels qu'ils seraient envoyés"
3698
3855
3699 msgid "write messages to mbox file instead of sending them"
3856 msgid "write messages to mbox file instead of sending them"
3700 msgstr ""
3857 msgstr ""
3701 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3858 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3702
3859
3703 msgid "subject of first message (intro or single patch)"
3860 msgid "subject of first message (intro or single patch)"
3704 msgstr "sujet du premier message (intro ou patch unique)"
3861 msgstr "sujet du premier message (intro ou patch unique)"
3705
3862
3706 msgid "message identifier to reply to"
3863 msgid "message identifier to reply to"
3707 msgstr "identifiant du message auquel répondre"
3864 msgstr "identifiant du message auquel répondre"
3708
3865
3709 msgid "email addresses of recipients"
3866 msgid "email addresses of recipients"
3710 msgstr "adresses électroniques des destinataires"
3867 msgstr "adresses électroniques des destinataires"
3711
3868
3712 msgid "omit hg patch header"
3869 msgid "omit hg patch header"
3713 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3870 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3714
3871
3715 msgid "send changes not found in the target repository"
3872 msgid "send changes not found in the target repository"
3716 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3873 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3717
3874
3718 msgid "send changes not in target as a binary bundle"
3875 msgid "send changes not in target as a binary bundle"
3719 msgstr ""
3876 msgstr ""
3720 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3877 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3721 "\"bundle\" binaire"
3878 "\"bundle\" binaire"
3722
3879
3723 msgid "name of the bundle attachment file"
3880 msgid "name of the bundle attachment file"
3724 msgstr "nom à donner au fichier \"bundle\" envoyé"
3881 msgstr "nom à donner au fichier \"bundle\" envoyé"
3725
3882
3726 msgid "a revision to send"
3883 msgid "a revision to send"
3727 msgstr "une révision à envoyer"
3884 msgstr "une révision à envoyer"
3728
3885
3729 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3886 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3730 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3887 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3731
3888
3732 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3889 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3733 msgstr ""
3890 msgstr ""
3734 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3891 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3735 "(avec -b/--bundle)"
3892 "(avec -b/--bundle)"
3736
3893
3737 msgid "send an introduction email for a single patch"
3894 msgid "send an introduction email for a single patch"
3738 msgstr "envoyer un courriel d'introduction pour un patch seul"
3895 msgstr "envoyer un courriel d'introduction pour un patch seul"
3739
3896
3740 msgid "hg email [OPTION]... [DEST]..."
3897 msgid "hg email [OPTION]... [DEST]..."
3741 msgstr "hg email [OPTION]... [DEST]..."
3898 msgstr "hg email [OPTION]... [DEST]..."
3742
3899
3743 msgid "command to delete untracked files from the working directory"
3900 msgid "command to delete untracked files from the working directory"
3744 msgstr ""
3901 msgstr ""
3745
3902
3746 msgid ""
3903 msgid ""
3747 "removes files not tracked by Mercurial\n"
3904 "removes files not tracked by Mercurial\n"
3748 "\n"
3905 "\n"
3749 " Delete files not known to Mercurial. This is useful to test local\n"
3906 " Delete files not known to Mercurial. This is useful to test local\n"
3750 " and uncommitted changes in an otherwise-clean source tree.\n"
3907 " and uncommitted changes in an otherwise-clean source tree.\n"
3751 "\n"
3908 "\n"
3752 " This means that purge will delete:\n"
3909 " This means that purge will delete:\n"
3753 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3910 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3754 " - Empty directories: in fact Mercurial ignores directories unless\n"
3911 " - Empty directories: in fact Mercurial ignores directories unless\n"
3755 " they contain files under source control management\n"
3912 " they contain files under source control management\n"
3756 " But it will leave untouched:\n"
3913 " But it will leave untouched:\n"
3757 " - Modified and unmodified tracked files\n"
3914 " - Modified and unmodified tracked files\n"
3758 " - Ignored files (unless --all is specified)\n"
3915 " - Ignored files (unless --all is specified)\n"
3759 " - New files added to the repository (with \"hg add\")\n"
3916 " - New files added to the repository (with \"hg add\")\n"
3760 "\n"
3917 "\n"
3761 " If directories are given on the command line, only files in these\n"
3918 " If directories are given on the command line, only files in these\n"
3762 " directories are considered.\n"
3919 " directories are considered.\n"
3763 "\n"
3920 "\n"
3764 " Be careful with purge, as you could irreversibly delete some files\n"
3921 " Be careful with purge, as you could irreversibly delete some files\n"
3765 " you forgot to add to the repository. If you only want to print the\n"
3922 " you forgot to add to the repository. If you only want to print the\n"
3766 " list of files that this program would delete, use the --print\n"
3923 " list of files that this program would delete, use the --print\n"
3767 " option.\n"
3924 " option.\n"
3768 " "
3925 " "
3769 msgstr ""
3926 msgstr ""
3770 "retire les fichiers non suivis par Mercurial\n"
3927 "retire les fichiers non suivis par Mercurial\n"
3771 "\n"
3928 "\n"
3772 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3929 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3773 " utile pour tester des changements locaux non enregistrés à\n"
3930 " utile pour tester des changements locaux non enregistrés à\n"
3774 " l'intérieur d'une arborescence de sources propre.\n"
3931 " l'intérieur d'une arborescence de sources propre.\n"
3775 "\n"
3932 "\n"
3776 " Ainsi, purge effacera :\n"
3933 " Ainsi, purge effacera :\n"
3777 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3934 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3778 " par un point d'interrogation\n"
3935 " par un point d'interrogation\n"
3779 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3936 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3780 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3937 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3781 " sous son contrôle\n"
3938 " sous son contrôle\n"
3782 " Seront par contre laissés intacts :\n"
3939 " Seront par contre laissés intacts :\n"
3783 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3940 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3784 " ou non\n"
3941 " ou non\n"
3785 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3942 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3786 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3943 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3787 "\n"
3944 "\n"
3788 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
3945 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
3789 " seuls les fichiers qu'ils contiennent seront considérés.\n"
3946 " seuls les fichiers qu'ils contiennent seront considérés.\n"
3790 "\n"
3947 "\n"
3791 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
3948 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
3792 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
3949 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
3793 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
3950 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
3794 " seraient effacés par purge, utilisez l'option --print.\n"
3951 " seraient effacés par purge, utilisez l'option --print.\n"
3795 " "
3952 " "
3796
3953
3797 #, python-format
3954 #, python-format
3798 msgid "%s cannot be removed"
3955 msgid "%s cannot be removed"
3799 msgstr "%s ne peut être supprimé"
3956 msgstr "%s ne peut être supprimé"
3800
3957
3801 #, python-format
3958 #, python-format
3802 msgid "warning: %s\n"
3959 msgid "warning: %s\n"
3803 msgstr "attention: %s\n"
3960 msgstr "attention: %s\n"
3804
3961
3805 #, python-format
3962 #, python-format
3806 msgid "Removing file %s\n"
3963 msgid "Removing file %s\n"
3807 msgstr "Suppression du fichier %s\n"
3964 msgstr "Suppression du fichier %s\n"
3808
3965
3809 #, python-format
3966 #, python-format
3810 msgid "Removing directory %s\n"
3967 msgid "Removing directory %s\n"
3811 msgstr "Suppression du répertoire %s\n"
3968 msgstr "Suppression du répertoire %s\n"
3812
3969
3813 msgid "abort if an error occurs"
3970 msgid "abort if an error occurs"
3814 msgstr "abandonner en cas d'erreur"
3971 msgstr "abandonner en cas d'erreur"
3815
3972
3816 msgid "purge ignored files too"
3973 msgid "purge ignored files too"
3817 msgstr "supprimer également les fichiers ignorés"
3974 msgstr "supprimer également les fichiers ignorés"
3818
3975
3819 msgid "print filenames instead of deleting them"
3976 msgid "print filenames instead of deleting them"
3820 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3977 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3821
3978
3822 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3979 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3823 msgstr ""
3980 msgstr ""
3824 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3981 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3825 "xargs (implique -p/--print)"
3982 "xargs (implique -p/--print)"
3826
3983
3827 msgid "hg purge [OPTION]... [DIR]..."
3984 msgid "hg purge [OPTION]... [DIR]..."
3828 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3985 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3829
3986
3830 msgid ""
3987 msgid ""
3831 "command to move sets of revisions to a different ancestor\n"
3988 "command to move sets of revisions to a different ancestor\n"
3832 "\n"
3989 "\n"
3833 "This extension lets you rebase changesets in an existing Mercurial\n"
3990 "This extension lets you rebase changesets in an existing Mercurial\n"
3834 "repository.\n"
3991 "repository.\n"
3835 "\n"
3992 "\n"
3836 "For more information:\n"
3993 "For more information:\n"
3837 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3994 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3838 msgstr ""
3995 msgstr ""
3839
3996
3840 msgid "first revision, do not change ancestor\n"
3997 msgid "first revision, do not change ancestor\n"
3841 msgstr ""
3998 msgstr ""
3842
3999
3843 msgid ""
4000 msgid ""
3844 "move changeset (and descendants) to a different branch\n"
4001 "move changeset (and descendants) to a different branch\n"
3845 "\n"
4002 "\n"
3846 " Rebase uses repeated merging to graft changesets from one part of\n"
4003 " Rebase uses repeated merging to graft changesets from one part of\n"
3847 " history onto another. This can be useful for linearizing local\n"
4004 " history onto another. This can be useful for linearizing local\n"
3848 " changes relative to a master development tree.\n"
4005 " changes relative to a master development tree.\n"
3849 "\n"
4006 "\n"
3850 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4007 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3851 " continued with --continue/-c or aborted with --abort/-a.\n"
4008 " continued with --continue/-c or aborted with --abort/-a.\n"
3852 " "
4009 " "
3853 msgstr ""
4010 msgstr ""
3854
4011
3855 msgid "cannot use both abort and continue"
4012 msgid "cannot use both abort and continue"
3856 msgstr ""
4013 msgstr ""
3857
4014
3858 msgid "cannot use collapse with continue or abort"
4015 msgid "cannot use collapse with continue or abort"
3859 msgstr ""
4016 msgstr ""
3860
4017
3861 msgid "abort and continue do not allow specifying revisions"
4018 msgid "abort and continue do not allow specifying revisions"
3862 msgstr ""
4019 msgstr ""
3863
4020
3864 msgid "cannot specify both a revision and a base"
4021 msgid "cannot specify both a revision and a base"
3865 msgstr ""
4022 msgstr ""
3866
4023
3867 msgid "nothing to rebase\n"
4024 msgid "nothing to rebase\n"
3868 msgstr ""
4025 msgstr ""
3869
4026
3870 msgid "cannot use both keepbranches and extrafn"
4027 msgid "cannot use both keepbranches and extrafn"
3871 msgstr ""
4028 msgstr ""
3872
4029
3873 msgid "rebase merging completed\n"
4030 msgid "rebase merging completed\n"
3874 msgstr ""
4031 msgstr ""
3875
4032
3876 msgid "warning: new changesets detected on source branch, not stripping\n"
4033 msgid "warning: new changesets detected on source branch, not stripping\n"
3877 msgstr ""
4034 msgstr ""
3878
4035
3879 msgid "rebase completed\n"
4036 msgid "rebase completed\n"
3880 msgstr ""
4037 msgstr ""
3881
4038
3882 #, python-format
4039 #, python-format
3883 msgid "%d revisions have been skipped\n"
4040 msgid "%d revisions have been skipped\n"
3884 msgstr ""
4041 msgstr ""
3885
4042
3886 msgid " set parents\n"
4043 msgid " set parents\n"
3887 msgstr ""
4044 msgstr ""
3888
4045
3889 #, python-format
4046 #, python-format
3890 msgid "rebasing %d:%s\n"
4047 msgid "rebasing %d:%s\n"
3891 msgstr ""
4048 msgstr ""
3892
4049
3893 #, python-format
4050 #, python-format
3894 msgid " future parents are %d and %d\n"
4051 msgid " future parents are %d and %d\n"
3895 msgstr ""
4052 msgstr ""
3896
4053
3897 #, python-format
4054 #, python-format
3898 msgid " update to %d:%s\n"
4055 msgid " update to %d:%s\n"
3899 msgstr ""
4056 msgstr ""
3900
4057
3901 msgid " already in target\n"
4058 msgid " already in target\n"
3902 msgstr ""
4059 msgstr ""
3903
4060
3904 #, python-format
4061 #, python-format
3905 msgid " merge against %d:%s\n"
4062 msgid " merge against %d:%s\n"
3906 msgstr ""
4063 msgstr ""
3907
4064
3908 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4065 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3909 msgstr ""
4066 msgstr ""
3910
4067
3911 msgid "resuming interrupted rebase\n"
4068 msgid "resuming interrupted rebase\n"
3912 msgstr ""
4069 msgstr ""
3913
4070
3914 #, python-format
4071 #, python-format
3915 msgid "no changes, revision %d skipped\n"
4072 msgid "no changes, revision %d skipped\n"
3916 msgstr ""
4073 msgstr ""
3917
4074
3918 #, python-format
4075 #, python-format
3919 msgid "next revision set to %s\n"
4076 msgid "next revision set to %s\n"
3920 msgstr ""
4077 msgstr ""
3921
4078
3922 #, python-format
4079 #, python-format
3923 msgid "cannot use revision %d as base, result would have 3 parents"
4080 msgid "cannot use revision %d as base, result would have 3 parents"
3924 msgstr ""
4081 msgstr ""
3925
4082
3926 #, python-format
4083 #, python-format
3927 msgid "revision %d is an mq patch (%s), finalize it.\n"
4084 msgid "revision %d is an mq patch (%s), finalize it.\n"
3928 msgstr ""
4085 msgstr ""
3929
4086
3930 #, python-format
4087 #, python-format
3931 msgid "import mq patch %d (%s)\n"
4088 msgid "import mq patch %d (%s)\n"
3932 msgstr ""
4089 msgstr ""
3933
4090
3934 msgid "rebase status stored\n"
4091 msgid "rebase status stored\n"
3935 msgstr ""
4092 msgstr ""
3936
4093
3937 msgid "rebase status resumed\n"
4094 msgid "rebase status resumed\n"
3938 msgstr ""
4095 msgstr ""
3939
4096
3940 msgid "no rebase in progress"
4097 msgid "no rebase in progress"
3941 msgstr ""
4098 msgstr ""
3942
4099
3943 msgid "warning: new changesets detected on target branch, not stripping\n"
4100 msgid "warning: new changesets detected on target branch, not stripping\n"
3944 msgstr ""
4101 msgstr ""
3945
4102
3946 msgid "rebase aborted\n"
4103 msgid "rebase aborted\n"
3947 msgstr ""
4104 msgstr ""
3948
4105
3949 msgid "cannot rebase onto an applied mq patch"
4106 msgid "cannot rebase onto an applied mq patch"
3950 msgstr ""
4107 msgstr ""
3951
4108
3952 msgid "cannot rebase an ancestor"
4109 msgid "cannot rebase an ancestor"
3953 msgstr ""
4110 msgstr ""
3954
4111
3955 msgid "cannot rebase a descendant"
4112 msgid "cannot rebase a descendant"
3956 msgstr ""
4113 msgstr ""
3957
4114
3958 msgid "already working on current\n"
4115 msgid "already working on current\n"
3959 msgstr ""
4116 msgstr ""
3960
4117
3961 msgid "already working on the current branch\n"
4118 msgid "already working on the current branch\n"
3962 msgstr ""
4119 msgstr ""
3963
4120
3964 #, python-format
4121 #, python-format
3965 msgid "rebase onto %d starting from %d\n"
4122 msgid "rebase onto %d starting from %d\n"
3966 msgstr ""
4123 msgstr ""
3967
4124
3968 msgid "unable to collapse, there is more than one external parent"
4125 msgid "unable to collapse, there is more than one external parent"
3969 msgstr ""
4126 msgstr ""
3970
4127
3971 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4128 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3972 msgstr ""
4129 msgstr ""
3973
4130
3974 msgid "rebase working directory to branch head"
4131 msgid "rebase working directory to branch head"
3975 msgstr ""
4132 msgstr ""
3976
4133
3977 msgid "rebase from a given revision"
4134 msgid "rebase from a given revision"
3978 msgstr ""
4135 msgstr ""
3979
4136
3980 msgid "rebase from the base of a given revision"
4137 msgid "rebase from the base of a given revision"
3981 msgstr ""
4138 msgstr ""
3982
4139
3983 msgid "rebase onto a given revision"
4140 msgid "rebase onto a given revision"
3984 msgstr ""
4141 msgstr ""
3985
4142
3986 msgid "collapse the rebased revisions"
4143 msgid "collapse the rebased revisions"
3987 msgstr ""
4144 msgstr ""
3988
4145
3989 msgid "keep original revisions"
4146 msgid "keep original revisions"
3990 msgstr ""
4147 msgstr ""
3991
4148
3992 msgid "keep original branches"
4149 msgid "keep original branches"
3993 msgstr ""
4150 msgstr ""
3994
4151
3995 msgid "continue an interrupted rebase"
4152 msgid "continue an interrupted rebase"
3996 msgstr ""
4153 msgstr ""
3997
4154
3998 msgid "abort an interrupted rebase"
4155 msgid "abort an interrupted rebase"
3999 msgstr ""
4156 msgstr ""
4000
4157
4001 msgid ""
4158 msgid ""
4002 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4159 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4003 "| [-c] | [-a]"
4160 "| [-c] | [-a]"
4004 msgstr ""
4161 msgstr ""
4005
4162
4006 msgid "commands to interactively select changes for commit/qrefresh"
4163 msgid "commands to interactively select changes for commit/qrefresh"
4007 msgstr ""
4164 msgstr ""
4008
4165
4009 msgid "this modifies a binary file (all or nothing)\n"
4166 msgid "this modifies a binary file (all or nothing)\n"
4010 msgstr ""
4167 msgstr ""
4011
4168
4012 msgid "this is a binary file\n"
4169 msgid "this is a binary file\n"
4013 msgstr ""
4170 msgstr ""
4014
4171
4015 #, python-format
4172 #, python-format
4016 msgid "%d hunks, %d lines changed\n"
4173 msgid "%d hunks, %d lines changed\n"
4017 msgstr ""
4174 msgstr ""
4018
4175
4019 msgid "[Ynsfdaq?]"
4176 msgid "[Ynsfdaq?]"
4020 msgstr ""
4177 msgstr ""
4021
4178
4022 msgid "&Yes, record this change"
4179 msgid "&Yes, record this change"
4023 msgstr ""
4180 msgstr ""
4024
4181
4025 msgid "&No, skip this change"
4182 msgid "&No, skip this change"
4026 msgstr ""
4183 msgstr ""
4027
4184
4028 msgid "&Skip remaining changes to this file"
4185 msgid "&Skip remaining changes to this file"
4029 msgstr ""
4186 msgstr ""
4030
4187
4031 msgid "Record remaining changes to this &file"
4188 msgid "Record remaining changes to this &file"
4032 msgstr ""
4189 msgstr ""
4033
4190
4034 msgid "&Done, skip remaining changes and files"
4191 msgid "&Done, skip remaining changes and files"
4035 msgstr ""
4192 msgstr ""
4036
4193
4037 msgid "Record &all changes to all remaining files"
4194 msgid "Record &all changes to all remaining files"
4038 msgstr ""
4195 msgstr ""
4039
4196
4040 msgid "&Quit, recording no changes"
4197 msgid "&Quit, recording no changes"
4041 msgstr ""
4198 msgstr ""
4042
4199
4043 msgid "&?"
4200 msgid "&?"
4044 msgstr ""
4201 msgstr ""
4045
4202
4046 msgid "y"
4203 msgid "y"
4047 msgstr ""
4204 msgstr ""
4048
4205
4049 msgid "?"
4206 msgid "?"
4050 msgstr ""
4207 msgstr ""
4051
4208
4052 msgid "y - record this change"
4209 msgid "y - record this change"
4053 msgstr ""
4210 msgstr ""
4054
4211
4055 msgid "s"
4212 msgid "s"
4056 msgstr ""
4213 msgstr ""
4057
4214
4058 msgid "f"
4215 msgid "f"
4059 msgstr ""
4216 msgstr ""
4060
4217
4061 msgid "d"
4218 msgid "d"
4062 msgstr ""
4219 msgstr ""
4063
4220
4064 msgid "a"
4221 msgid "a"
4065 msgstr ""
4222 msgstr ""
4066
4223
4067 msgid "q"
4224 msgid "q"
4068 msgstr ""
4225 msgstr ""
4069
4226
4070 msgid "user quit"
4227 msgid "user quit"
4071 msgstr ""
4228 msgstr ""
4072
4229
4073 #, python-format
4230 #, python-format
4074 msgid "examine changes to %s?"
4231 msgid "examine changes to %s?"
4075 msgstr ""
4232 msgstr ""
4076
4233
4077 msgid " and "
4234 msgid " and "
4078 msgstr ""
4235 msgstr ""
4079
4236
4080 #, python-format
4237 #, python-format
4081 msgid "record this change to %r?"
4238 msgid "record this change to %r?"
4082 msgstr ""
4239 msgstr ""
4083
4240
4084 #, python-format
4241 #, python-format
4085 msgid "record change %d/%d to %r?"
4242 msgid "record change %d/%d to %r?"
4086 msgstr ""
4243 msgstr ""
4087
4244
4088 msgid ""
4245 msgid ""
4089 "interactively select changes to commit\n"
4246 "interactively select changes to commit\n"
4090 "\n"
4247 "\n"
4091 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4248 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4092 " will be candidates for recording.\n"
4249 " will be candidates for recording.\n"
4093 "\n"
4250 "\n"
4094 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4251 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4095 "\n"
4252 "\n"
4096 " You will be prompted for whether to record changes to each\n"
4253 " You will be prompted for whether to record changes to each\n"
4097 " modified file, and for files with multiple changes, for each\n"
4254 " modified file, and for files with multiple changes, for each\n"
4098 " change to use. For each query, the following responses are\n"
4255 " change to use. For each query, the following responses are\n"
4099 " possible:\n"
4256 " possible:\n"
4100 "\n"
4257 "\n"
4101 " y - record this change\n"
4258 " y - record this change\n"
4102 " n - skip this change\n"
4259 " n - skip this change\n"
4103 "\n"
4260 "\n"
4104 " s - skip remaining changes to this file\n"
4261 " s - skip remaining changes to this file\n"
4105 " f - record remaining changes to this file\n"
4262 " f - record remaining changes to this file\n"
4106 "\n"
4263 "\n"
4107 " d - done, skip remaining changes and files\n"
4264 " d - done, skip remaining changes and files\n"
4108 " a - record all changes to all remaining files\n"
4265 " a - record all changes to all remaining files\n"
4109 " q - quit, recording no changes\n"
4266 " q - quit, recording no changes\n"
4110 "\n"
4267 "\n"
4111 " ? - display help"
4268 " ? - display help"
4112 msgstr ""
4269 msgstr ""
4113
4270
4114 msgid "'mq' extension not loaded"
4271 msgid "'mq' extension not loaded"
4115 msgstr ""
4272 msgstr ""
4116
4273
4117 msgid "running non-interactively, use commit instead"
4274 msgid "running non-interactively, use commit instead"
4118 msgstr ""
4275 msgstr ""
4119
4276
4120 msgid "no changes to record\n"
4277 msgid "no changes to record\n"
4121 msgstr ""
4278 msgstr ""
4122
4279
4123 #, python-format
4280 #, python-format
4124 msgid "backup %r as %r\n"
4281 msgid "backup %r as %r\n"
4125 msgstr ""
4282 msgstr ""
4126
4283
4127 msgid "applying patch\n"
4284 msgid "applying patch\n"
4128 msgstr ""
4285 msgstr ""
4129
4286
4130 msgid "patch failed to apply"
4287 msgid "patch failed to apply"
4131 msgstr ""
4288 msgstr ""
4132
4289
4133 #, python-format
4290 #, python-format
4134 msgid "restoring %r to %r\n"
4291 msgid "restoring %r to %r\n"
4135 msgstr ""
4292 msgstr ""
4136
4293
4137 msgid "hg record [OPTION]... [FILE]..."
4294 msgid "hg record [OPTION]... [FILE]..."
4138 msgstr ""
4295 msgstr ""
4139
4296
4140 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4297 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4141 msgstr ""
4298 msgstr ""
4142
4299
4143 msgid "share a common history between several working directories"
4300 msgid "share a common history between several working directories"
4144 msgstr ""
4301 msgstr ""
4145
4302
4146 msgid ""
4303 msgid ""
4147 "create a new shared repository (experimental)\n"
4304 "create a new shared repository (experimental)\n"
4148 "\n"
4305 "\n"
4149 " Initialize a new repository and working directory that shares its\n"
4306 " Initialize a new repository and working directory that shares its\n"
4150 " history with another repository.\n"
4307 " history with another repository.\n"
4151 "\n"
4308 "\n"
4152 " NOTE: actions that change history such as rollback or moving the\n"
4309 " NOTE: actions that change history such as rollback or moving the\n"
4153 " source may confuse sharers.\n"
4310 " source may confuse sharers.\n"
4154 " "
4311 " "
4155 msgstr ""
4312 msgstr ""
4156
4313
4157 msgid "do not create a working copy"
4314 msgid "do not create a working copy"
4158 msgstr ""
4315 msgstr ""
4159
4316
4160 msgid "[-U] SOURCE [DEST]"
4317 msgid "[-U] SOURCE [DEST]"
4161 msgstr ""
4318 msgstr ""
4162
4319
4163 msgid ""
4320 msgid ""
4164 "command to transplant changesets from another branch\n"
4321 "command to transplant changesets from another branch\n"
4165 "\n"
4322 "\n"
4166 "This extension allows you to transplant patches from another branch.\n"
4323 "This extension allows you to transplant patches from another branch.\n"
4167 "\n"
4324 "\n"
4168 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4325 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4169 "map from a changeset hash to its hash in the source repository.\n"
4326 "map from a changeset hash to its hash in the source repository.\n"
4170 msgstr ""
4327 msgstr ""
4171
4328
4172 #, python-format
4329 #, python-format
4173 msgid "skipping already applied revision %s\n"
4330 msgid "skipping already applied revision %s\n"
4174 msgstr ""
4331 msgstr ""
4175
4332
4176 #, python-format
4333 #, python-format
4177 msgid "skipping merge changeset %s:%s\n"
4334 msgid "skipping merge changeset %s:%s\n"
4178 msgstr ""
4335 msgstr ""
4179
4336
4180 #, python-format
4337 #, python-format
4181 msgid "%s merged at %s\n"
4338 msgid "%s merged at %s\n"
4182 msgstr ""
4339 msgstr ""
4183
4340
4184 #, python-format
4341 #, python-format
4185 msgid "%s transplanted to %s\n"
4342 msgid "%s transplanted to %s\n"
4186 msgstr ""
4343 msgstr ""
4187
4344
4188 #, python-format
4345 #, python-format
4189 msgid "filtering %s\n"
4346 msgid "filtering %s\n"
4190 msgstr ""
4347 msgstr ""
4191
4348
4192 msgid "filter failed"
4349 msgid "filter failed"
4193 msgstr ""
4350 msgstr ""
4194
4351
4195 msgid "can only omit patchfile if merging"
4352 msgid "can only omit patchfile if merging"
4196 msgstr ""
4353 msgstr ""
4197
4354
4198 #, python-format
4355 #, python-format
4199 msgid "%s: empty changeset"
4356 msgid "%s: empty changeset"
4200 msgstr ""
4357 msgstr ""
4201
4358
4202 msgid "Fix up the merge and run hg transplant --continue"
4359 msgid "Fix up the merge and run hg transplant --continue"
4203 msgstr ""
4360 msgstr ""
4204
4361
4205 #, python-format
4362 #, python-format
4206 msgid "%s transplanted as %s\n"
4363 msgid "%s transplanted as %s\n"
4207 msgstr ""
4364 msgstr ""
4208
4365
4209 msgid "transplant log file is corrupt"
4366 msgid "transplant log file is corrupt"
4210 msgstr ""
4367 msgstr ""
4211
4368
4212 #, python-format
4369 #, python-format
4213 msgid "working dir not at transplant parent %s"
4370 msgid "working dir not at transplant parent %s"
4214 msgstr ""
4371 msgstr ""
4215
4372
4216 msgid "commit failed"
4373 msgid "commit failed"
4217 msgstr ""
4374 msgstr ""
4218
4375
4219 msgid "apply changeset? [ynmpcq?]:"
4376 msgid "apply changeset? [ynmpcq?]:"
4220 msgstr ""
4377 msgstr ""
4221
4378
4222 msgid ""
4379 msgid ""
4223 "transplant changesets from another branch\n"
4380 "transplant changesets from another branch\n"
4224 "\n"
4381 "\n"
4225 " Selected changesets will be applied on top of the current working\n"
4382 " Selected changesets will be applied on top of the current working\n"
4226 " directory with the log of the original changeset. If --log is\n"
4383 " directory with the log of the original changeset. If --log is\n"
4227 " specified, log messages will have a comment appended of the form:\n"
4384 " specified, log messages will have a comment appended of the form:\n"
4228 "\n"
4385 "\n"
4229 " (transplanted from CHANGESETHASH)\n"
4386 " (transplanted from CHANGESETHASH)\n"
4230 "\n"
4387 "\n"
4231 " You can rewrite the changelog message with the --filter option.\n"
4388 " You can rewrite the changelog message with the --filter option.\n"
4232 " Its argument will be invoked with the current changelog message as\n"
4389 " Its argument will be invoked with the current changelog message as\n"
4233 " $1 and the patch as $2.\n"
4390 " $1 and the patch as $2.\n"
4234 "\n"
4391 "\n"
4235 " If --source/-s is specified, selects changesets from the named\n"
4392 " If --source/-s is specified, selects changesets from the named\n"
4236 " repository. If --branch/-b is specified, selects changesets from\n"
4393 " repository. If --branch/-b is specified, selects changesets from\n"
4237 " the branch holding the named revision, up to that revision. If\n"
4394 " the branch holding the named revision, up to that revision. If\n"
4238 " --all/-a is specified, all changesets on the branch will be\n"
4395 " --all/-a is specified, all changesets on the branch will be\n"
4239 " transplanted, otherwise you will be prompted to select the\n"
4396 " transplanted, otherwise you will be prompted to select the\n"
4240 " changesets you want.\n"
4397 " changesets you want.\n"
4241 "\n"
4398 "\n"
4242 " hg transplant --branch REVISION --all will rebase the selected\n"
4399 " hg transplant --branch REVISION --all will rebase the selected\n"
4243 " branch (up to the named revision) onto your current working\n"
4400 " branch (up to the named revision) onto your current working\n"
4244 " directory.\n"
4401 " directory.\n"
4245 "\n"
4402 "\n"
4246 " You can optionally mark selected transplanted changesets as merge\n"
4403 " You can optionally mark selected transplanted changesets as merge\n"
4247 " changesets. You will not be prompted to transplant any ancestors\n"
4404 " changesets. You will not be prompted to transplant any ancestors\n"
4248 " of a merged transplant, and you can merge descendants of them\n"
4405 " of a merged transplant, and you can merge descendants of them\n"
4249 " normally instead of transplanting them.\n"
4406 " normally instead of transplanting them.\n"
4250 "\n"
4407 "\n"
4251 " If no merges or revisions are provided, hg transplant will start\n"
4408 " If no merges or revisions are provided, hg transplant will start\n"
4252 " an interactive changeset browser.\n"
4409 " an interactive changeset browser.\n"
4253 "\n"
4410 "\n"
4254 " If a changeset application fails, you can fix the merge by hand\n"
4411 " If a changeset application fails, you can fix the merge by hand\n"
4255 " and then resume where you left off by calling hg transplant\n"
4412 " and then resume where you left off by calling hg transplant\n"
4256 " --continue/-c.\n"
4413 " --continue/-c.\n"
4257 " "
4414 " "
4258 msgstr ""
4415 msgstr ""
4259
4416
4260 msgid "--continue is incompatible with branch, all or merge"
4417 msgid "--continue is incompatible with branch, all or merge"
4261 msgstr ""
4418 msgstr ""
4262
4419
4263 msgid "no source URL, branch tag or revision list provided"
4420 msgid "no source URL, branch tag or revision list provided"
4264 msgstr ""
4421 msgstr ""
4265
4422
4266 msgid "--all requires a branch revision"
4423 msgid "--all requires a branch revision"
4267 msgstr ""
4424 msgstr ""
4268
4425
4269 msgid "--all is incompatible with a revision list"
4426 msgid "--all is incompatible with a revision list"
4270 msgstr ""
4427 msgstr ""
4271
4428
4272 msgid "no revision checked out"
4429 msgid "no revision checked out"
4273 msgstr ""
4430 msgstr ""
4274
4431
4275 msgid "outstanding uncommitted merges"
4432 msgid "outstanding uncommitted merges"
4276 msgstr ""
4433 msgstr ""
4277
4434
4278 msgid "outstanding local changes"
4435 msgid "outstanding local changes"
4279 msgstr ""
4436 msgstr ""
4280
4437
4281 msgid "pull patches from REPOSITORY"
4438 msgid "pull patches from REPOSITORY"
4282 msgstr ""
4439 msgstr ""
4283
4440
4284 msgid "pull patches from branch BRANCH"
4441 msgid "pull patches from branch BRANCH"
4285 msgstr ""
4442 msgstr ""
4286
4443
4287 msgid "pull all changesets up to BRANCH"
4444 msgid "pull all changesets up to BRANCH"
4288 msgstr ""
4445 msgstr ""
4289
4446
4290 msgid "skip over REV"
4447 msgid "skip over REV"
4291 msgstr ""
4448 msgstr ""
4292
4449
4293 msgid "merge at REV"
4450 msgid "merge at REV"
4294 msgstr ""
4451 msgstr ""
4295
4452
4296 msgid "append transplant info to log message"
4453 msgid "append transplant info to log message"
4297 msgstr ""
4454 msgstr ""
4298
4455
4299 msgid "continue last transplant session after repair"
4456 msgid "continue last transplant session after repair"
4300 msgstr ""
4457 msgstr ""
4301
4458
4302 msgid "filter changesets through FILTER"
4459 msgid "filter changesets through FILTER"
4303 msgstr ""
4460 msgstr ""
4304
4461
4305 msgid ""
4462 msgid ""
4306 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4463 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4307 msgstr ""
4464 msgstr ""
4308
4465
4309 msgid ""
4466 msgid ""
4310 "allow the use of MBCS paths with problematic encodings\n"
4467 "allow the use of MBCS paths with problematic encodings\n"
4311 "\n"
4468 "\n"
4312 "Some MBCS encodings are not good for some path operations (i.e.\n"
4469 "Some MBCS encodings are not good for some path operations (i.e.\n"
4313 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4470 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4314 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4471 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4315 "This extension can be used to fix the issue with those encodings by\n"
4472 "This extension can be used to fix the issue with those encodings by\n"
4316 "wrapping some functions to convert to Unicode string before path\n"
4473 "wrapping some functions to convert to Unicode string before path\n"
4317 "operation.\n"
4474 "operation.\n"
4318 "\n"
4475 "\n"
4319 "This extension is useful for:\n"
4476 "This extension is useful for:\n"
4320 " * Japanese Windows users using shift_jis encoding.\n"
4477 " * Japanese Windows users using shift_jis encoding.\n"
4321 " * Chinese Windows users using big5 encoding.\n"
4478 " * Chinese Windows users using big5 encoding.\n"
4322 " * All users who use a repository with one of problematic encodings on\n"
4479 " * All users who use a repository with one of problematic encodings on\n"
4323 " case-insensitive file system.\n"
4480 " case-insensitive file system.\n"
4324 "\n"
4481 "\n"
4325 "This extension is not needed for:\n"
4482 "This extension is not needed for:\n"
4326 " * Any user who use only ASCII chars in path.\n"
4483 " * Any user who use only ASCII chars in path.\n"
4327 " * Any user who do not use any of problematic encodings.\n"
4484 " * Any user who do not use any of problematic encodings.\n"
4328 "\n"
4485 "\n"
4329 "Note that there are some limitations on using this extension:\n"
4486 "Note that there are some limitations on using this extension:\n"
4330 " * You should use single encoding in one repository.\n"
4487 " * You should use single encoding in one repository.\n"
4331 " * You should set same encoding for the repository by locale or\n"
4488 " * You should set same encoding for the repository by locale or\n"
4332 " HGENCODING.\n"
4489 " HGENCODING.\n"
4333 "\n"
4490 "\n"
4334 "Path encoding conversion are done between Unicode and\n"
4491 "Path encoding conversion are done between Unicode and\n"
4335 "encoding.encoding which is decided by Mercurial from current locale\n"
4492 "encoding.encoding which is decided by Mercurial from current locale\n"
4336 "setting or HGENCODING.\n"
4493 "setting or HGENCODING.\n"
4337 msgstr ""
4494 msgstr ""
4338
4495
4339 #, python-format
4496 #, python-format
4340 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4497 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4341 msgstr ""
4498 msgstr ""
4342
4499
4343 msgid "[win32mbcs] cannot activate on this platform.\n"
4500 msgid "[win32mbcs] cannot activate on this platform.\n"
4344 msgstr ""
4501 msgstr ""
4345
4502
4346 #, python-format
4503 #, python-format
4347 msgid "[win32mbcs] activated with encoding: %s\n"
4504 msgid "[win32mbcs] activated with encoding: %s\n"
4348 msgstr ""
4505 msgstr ""
4349
4506
4350 msgid ""
4507 msgid ""
4351 "perform automatic newline conversion\n"
4508 "perform automatic newline conversion\n"
4352 "\n"
4509 "\n"
4353 "To perform automatic newline conversion, use:\n"
4510 "To perform automatic newline conversion, use:\n"
4354 "\n"
4511 "\n"
4355 "[extensions]\n"
4512 "[extensions]\n"
4356 "hgext.win32text =\n"
4513 "hgext.win32text =\n"
4357 "[encode]\n"
4514 "[encode]\n"
4358 "** = cleverencode:\n"
4515 "** = cleverencode:\n"
4359 "# or ** = macencode:\n"
4516 "# or ** = macencode:\n"
4360 "\n"
4517 "\n"
4361 "[decode]\n"
4518 "[decode]\n"
4362 "** = cleverdecode:\n"
4519 "** = cleverdecode:\n"
4363 "# or ** = macdecode:\n"
4520 "# or ** = macdecode:\n"
4364 "\n"
4521 "\n"
4365 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4522 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4366 "accident:\n"
4523 "accident:\n"
4367 "\n"
4524 "\n"
4368 "[hooks]\n"
4525 "[hooks]\n"
4369 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4526 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4370 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4527 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4371 "\n"
4528 "\n"
4372 "To do the same check on a server to prevent CRLF/CR from being\n"
4529 "To do the same check on a server to prevent CRLF/CR from being\n"
4373 "pushed or pulled:\n"
4530 "pushed or pulled:\n"
4374 "\n"
4531 "\n"
4375 "[hooks]\n"
4532 "[hooks]\n"
4376 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4533 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4377 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4534 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4378 msgstr ""
4535 msgstr ""
4379
4536
4380 #, python-format
4537 #, python-format
4381 msgid ""
4538 msgid ""
4382 "WARNING: %s already has %s line endings\n"
4539 "WARNING: %s already has %s line endings\n"
4383 "and does not need EOL conversion by the win32text plugin.\n"
4540 "and does not need EOL conversion by the win32text plugin.\n"
4384 "Before your next commit, please reconsider your encode/decode settings in \n"
4541 "Before your next commit, please reconsider your encode/decode settings in \n"
4385 "Mercurial.ini or %s.\n"
4542 "Mercurial.ini or %s.\n"
4386 msgstr ""
4543 msgstr ""
4387
4544
4388 #, python-format
4545 #, python-format
4389 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4546 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4390 msgstr ""
4547 msgstr ""
4391
4548
4392 #, python-format
4549 #, python-format
4393 msgid "in %s: %s\n"
4550 msgid "in %s: %s\n"
4394 msgstr ""
4551 msgstr ""
4395
4552
4396 #, python-format
4553 #, python-format
4397 msgid ""
4554 msgid ""
4398 "\n"
4555 "\n"
4399 "To prevent this mistake in your local repository,\n"
4556 "To prevent this mistake in your local repository,\n"
4400 "add to Mercurial.ini or .hg/hgrc:\n"
4557 "add to Mercurial.ini or .hg/hgrc:\n"
4401 "\n"
4558 "\n"
4402 "[hooks]\n"
4559 "[hooks]\n"
4403 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4560 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4404 "\n"
4561 "\n"
4405 "and also consider adding:\n"
4562 "and also consider adding:\n"
4406 "\n"
4563 "\n"
4407 "[extensions]\n"
4564 "[extensions]\n"
4408 "hgext.win32text =\n"
4565 "hgext.win32text =\n"
4409 "[encode]\n"
4566 "[encode]\n"
4410 "** = %sencode:\n"
4567 "** = %sencode:\n"
4411 "[decode]\n"
4568 "[decode]\n"
4412 "** = %sdecode:\n"
4569 "** = %sdecode:\n"
4413 msgstr ""
4570 msgstr ""
4414
4571
4415 msgid ""
4572 msgid ""
4416 "discover and advertise repositories on the local network\n"
4573 "discover and advertise repositories on the local network\n"
4417 "\n"
4574 "\n"
4418 "Zeroconf enabled repositories will be announced in a network without\n"
4575 "Zeroconf enabled repositories will be announced in a network without\n"
4419 "the need to configure a server or a service. They can be discovered\n"
4576 "the need to configure a server or a service. They can be discovered\n"
4420 "without knowing their actual IP address.\n"
4577 "without knowing their actual IP address.\n"
4421 "\n"
4578 "\n"
4422 "To allow other people to discover your repository using run \"hg serve\"\n"
4579 "To allow other people to discover your repository using run \"hg serve\"\n"
4423 "in your repository.\n"
4580 "in your repository.\n"
4424 "\n"
4581 "\n"
4425 " $ cd test\n"
4582 " $ cd test\n"
4426 " $ hg serve\n"
4583 " $ hg serve\n"
4427 "\n"
4584 "\n"
4428 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4585 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4429 "\n"
4586 "\n"
4430 " $ hg paths\n"
4587 " $ hg paths\n"
4431 " zc-test = http://example.com:8000/test\n"
4588 " zc-test = http://example.com:8000/test\n"
4432 msgstr ""
4589 msgstr ""
4433 "découverte et annonce de dépôts sur le réseau local\n"
4590 "découverte et annonce de dépôts sur le réseau local\n"
4434 "\n"
4591 "\n"
4435 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4592 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4436 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4593 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4437 "particuliers, et ils peuvent être accédés simplement, sans\n"
4594 "particuliers, et ils peuvent être accédés simplement, sans\n"
4438 "connaissance de leur adresse IP.\n"
4595 "connaissance de leur adresse IP.\n"
4439 "\n"
4596 "\n"
4440 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4597 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4441 "lancez-y la commande \"hg serve\" :\n"
4598 "lancez-y la commande \"hg serve\" :\n"
4442 "\n"
4599 "\n"
4443 " $ cd test\n"
4600 " $ cd test\n"
4444 " $ hg serve\n"
4601 " $ hg serve\n"
4445 "\n"
4602 "\n"
4446 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4603 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4447 "la commande \"hg paths\", par exemple :\n"
4604 "la commande \"hg paths\", par exemple :\n"
4448 "\n"
4605 "\n"
4449 " $ hg paths\n"
4606 " $ hg paths\n"
4450 " zc-test = http://example.com:8000/test\n"
4607 " zc-test = http://example.com:8000/test\n"
4451
4608
4452 msgid "archive prefix contains illegal components"
4609 msgid "archive prefix contains illegal components"
4453 msgstr ""
4610 msgstr ""
4454
4611
4455 msgid "cannot give prefix when archiving to files"
4612 msgid "cannot give prefix when archiving to files"
4456 msgstr ""
4613 msgstr ""
4457
4614
4458 #, python-format
4615 #, python-format
4459 msgid "unknown archive type '%s'"
4616 msgid "unknown archive type '%s'"
4460 msgstr ""
4617 msgstr ""
4461
4618
4462 msgid "invalid changegroup"
4619 msgid "invalid changegroup"
4463 msgstr ""
4620 msgstr ""
4464
4621
4465 msgid "unknown parent"
4622 msgid "unknown parent"
4466 msgstr ""
4623 msgstr ""
4467
4624
4468 #, python-format
4625 #, python-format
4469 msgid "integrity check failed on %s:%d"
4626 msgid "integrity check failed on %s:%d"
4470 msgstr ""
4627 msgstr ""
4471
4628
4472 #, python-format
4629 #, python-format
4473 msgid "%s: not a Mercurial bundle file"
4630 msgid "%s: not a Mercurial bundle file"
4474 msgstr ""
4631 msgstr ""
4475
4632
4476 #, python-format
4633 #, python-format
4477 msgid "%s: unknown bundle version"
4634 msgid "%s: unknown bundle version"
4478 msgstr ""
4635 msgstr ""
4479
4636
4480 #, python-format
4637 #, python-format
4481 msgid "%s: unknown bundle compression type"
4638 msgid "%s: unknown bundle compression type"
4482 msgstr ""
4639 msgstr ""
4483
4640
4484 msgid "cannot create new bundle repository"
4641 msgid "cannot create new bundle repository"
4485 msgstr ""
4642 msgstr ""
4486
4643
4487 #, python-format
4644 #, python-format
4488 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4645 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4489 msgstr ""
4646 msgstr ""
4490
4647
4491 msgid "empty username"
4648 msgid "empty username"
4492 msgstr ""
4649 msgstr ""
4493
4650
4494 #, python-format
4651 #, python-format
4495 msgid "username %s contains a newline"
4652 msgid "username %s contains a newline"
4496 msgstr ""
4653 msgstr ""
4497
4654
4498 msgid "options --message and --logfile are mutually exclusive"
4655 msgid "options --message and --logfile are mutually exclusive"
4499 msgstr ""
4656 msgstr ""
4500
4657
4501 #, python-format
4658 #, python-format
4502 msgid "can't read commit message '%s': %s"
4659 msgid "can't read commit message '%s': %s"
4503 msgstr ""
4660 msgstr ""
4504
4661
4505 msgid "limit must be a positive integer"
4662 msgid "limit must be a positive integer"
4506 msgstr ""
4663 msgstr ""
4507
4664
4508 msgid "limit must be positive"
4665 msgid "limit must be positive"
4509 msgstr ""
4666 msgstr ""
4510
4667
4511 msgid "too many revisions specified"
4668 msgid "too many revisions specified"
4512 msgstr ""
4669 msgstr ""
4513
4670
4514 #, python-format
4671 #, python-format
4515 msgid "invalid format spec '%%%s' in output filename"
4672 msgid "invalid format spec '%%%s' in output filename"
4516 msgstr ""
4673 msgstr ""
4517
4674
4518 #, python-format
4675 #, python-format
4519 msgid "adding %s\n"
4676 msgid "adding %s\n"
4520 msgstr ""
4677 msgstr ""
4521
4678
4522 #, python-format
4679 #, python-format
4523 msgid "removing %s\n"
4680 msgid "removing %s\n"
4524 msgstr ""
4681 msgstr ""
4525
4682
4526 #, python-format
4683 #, python-format
4527 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4684 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4528 msgstr ""
4685 msgstr ""
4529
4686
4530 #, python-format
4687 #, python-format
4531 msgid "%s: not copying - file is not managed\n"
4688 msgid "%s: not copying - file is not managed\n"
4532 msgstr ""
4689 msgstr ""
4533
4690
4534 #, python-format
4691 #, python-format
4535 msgid "%s: not copying - file has been marked for remove\n"
4692 msgid "%s: not copying - file has been marked for remove\n"
4536 msgstr ""
4693 msgstr ""
4537
4694
4538 #, python-format
4695 #, python-format
4539 msgid "%s: not overwriting - %s collides with %s\n"
4696 msgid "%s: not overwriting - %s collides with %s\n"
4540 msgstr ""
4697 msgstr ""
4541
4698
4542 #, python-format
4699 #, python-format
4543 msgid "%s: not overwriting - file exists\n"
4700 msgid "%s: not overwriting - file exists\n"
4544 msgstr ""
4701 msgstr ""
4545
4702
4546 #, python-format
4703 #, python-format
4547 msgid "%s: deleted in working copy\n"
4704 msgid "%s: deleted in working copy\n"
4548 msgstr ""
4705 msgstr ""
4549
4706
4550 #, python-format
4707 #, python-format
4551 msgid "%s: cannot copy - %s\n"
4708 msgid "%s: cannot copy - %s\n"
4552 msgstr ""
4709 msgstr ""
4553
4710
4554 #, python-format
4711 #, python-format
4555 msgid "moving %s to %s\n"
4712 msgid "moving %s to %s\n"
4556 msgstr ""
4713 msgstr ""
4557
4714
4558 #, python-format
4715 #, python-format
4559 msgid "copying %s to %s\n"
4716 msgid "copying %s to %s\n"
4560 msgstr ""
4717 msgstr ""
4561
4718
4562 #, python-format
4719 #, python-format
4563 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4720 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4564 msgstr ""
4721 msgstr ""
4565
4722
4566 msgid "no source or destination specified"
4723 msgid "no source or destination specified"
4567 msgstr ""
4724 msgstr ""
4568
4725
4569 msgid "no destination specified"
4726 msgid "no destination specified"
4570 msgstr ""
4727 msgstr ""
4571
4728
4572 msgid "with multiple sources, destination must be an existing directory"
4729 msgid "with multiple sources, destination must be an existing directory"
4573 msgstr ""
4730 msgstr ""
4574
4731
4575 #, python-format
4732 #, python-format
4576 msgid "destination %s is not a directory"
4733 msgid "destination %s is not a directory"
4577 msgstr ""
4734 msgstr ""
4578
4735
4579 msgid "no files to copy"
4736 msgid "no files to copy"
4580 msgstr ""
4737 msgstr ""
4581
4738
4582 msgid "(consider using --after)\n"
4739 msgid "(consider using --after)\n"
4583 msgstr ""
4740 msgstr ""
4584
4741
4585 #, python-format
4742 #, python-format
4586 msgid "changeset: %d:%s\n"
4743 msgid "changeset: %d:%s\n"
4587 msgstr ""
4744 msgstr ""
4588
4745
4589 #, python-format
4746 #, python-format
4590 msgid "branch: %s\n"
4747 msgid "branch: %s\n"
4591 msgstr ""
4748 msgstr ""
4592
4749
4593 #, python-format
4750 #, python-format
4594 msgid "tag: %s\n"
4751 msgid "tag: %s\n"
4595 msgstr ""
4752 msgstr ""
4596
4753
4597 #, python-format
4754 #, python-format
4598 msgid "parent: %d:%s\n"
4755 msgid "parent: %d:%s\n"
4599 msgstr ""
4756 msgstr ""
4600
4757
4601 #, python-format
4758 #, python-format
4602 msgid "manifest: %d:%s\n"
4759 msgid "manifest: %d:%s\n"
4603 msgstr ""
4760 msgstr ""
4604
4761
4605 #, python-format
4762 #, python-format
4606 msgid "user: %s\n"
4763 msgid "user: %s\n"
4607 msgstr ""
4764 msgstr ""
4608
4765
4609 #, python-format
4766 #, python-format
4610 msgid "date: %s\n"
4767 msgid "date: %s\n"
4611 msgstr ""
4768 msgstr ""
4612
4769
4613 msgid "files+:"
4770 msgid "files+:"
4614 msgstr ""
4771 msgstr ""
4615
4772
4616 msgid "files-:"
4773 msgid "files-:"
4617 msgstr ""
4774 msgstr ""
4618
4775
4619 msgid "files:"
4776 msgid "files:"
4620 msgstr ""
4777 msgstr ""
4621
4778
4622 #, python-format
4779 #, python-format
4623 msgid "files: %s\n"
4780 msgid "files: %s\n"
4624 msgstr ""
4781 msgstr ""
4625
4782
4626 #, python-format
4783 #, python-format
4627 msgid "copies: %s\n"
4784 msgid "copies: %s\n"
4628 msgstr ""
4785 msgstr ""
4629
4786
4630 #, python-format
4787 #, python-format
4631 msgid "extra: %s=%s\n"
4788 msgid "extra: %s=%s\n"
4632 msgstr ""
4789 msgstr ""
4633
4790
4634 msgid "description:\n"
4791 msgid "description:\n"
4635 msgstr ""
4792 msgstr ""
4636
4793
4637 #, python-format
4794 #, python-format
4638 msgid "summary: %s\n"
4795 msgid "summary: %s\n"
4639 msgstr ""
4796 msgstr ""
4640
4797
4641 #, python-format
4798 #, python-format
4642 msgid "%s: no key named '%s'"
4799 msgid "%s: no key named '%s'"
4643 msgstr ""
4800 msgstr ""
4644
4801
4645 #, python-format
4802 #, python-format
4646 msgid "%s: %s"
4803 msgid "%s: %s"
4647 msgstr ""
4804 msgstr ""
4648
4805
4649 #, python-format
4806 #, python-format
4650 msgid "Found revision %s from %s\n"
4807 msgid "Found revision %s from %s\n"
4651 msgstr ""
4808 msgstr ""
4652
4809
4653 msgid "revision matching date not found"
4810 msgid "revision matching date not found"
4654 msgstr ""
4811 msgstr ""
4655
4812
4656 #, python-format
4813 #, python-format
4657 msgid "cannot follow nonexistent file: \"%s\""
4814 msgid "cannot follow nonexistent file: \"%s\""
4658 msgstr ""
4815 msgstr ""
4659
4816
4660 #, python-format
4817 #, python-format
4661 msgid "%s:%s copy source revision cannot be found!\n"
4818 msgid "%s:%s copy source revision cannot be found!\n"
4662 msgstr ""
4819 msgstr ""
4663
4820
4664 msgid "can only follow copies/renames for explicit filenames"
4821 msgid "can only follow copies/renames for explicit filenames"
4665 msgstr ""
4822 msgstr ""
4666
4823
4667 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4824 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4668 msgstr ""
4825 msgstr ""
4669
4826
4670 msgid "HG: Leave message empty to abort commit."
4827 msgid "HG: Leave message empty to abort commit."
4671 msgstr ""
4828 msgstr ""
4672
4829
4673 #, python-format
4830 #, python-format
4674 msgid "HG: user: %s"
4831 msgid "HG: user: %s"
4675 msgstr ""
4832 msgstr ""
4676
4833
4677 msgid "HG: branch merge"
4834 msgid "HG: branch merge"
4678 msgstr ""
4835 msgstr ""
4679
4836
4680 #, python-format
4837 #, python-format
4681 msgid "HG: branch '%s'"
4838 msgid "HG: branch '%s'"
4682 msgstr ""
4839 msgstr ""
4683
4840
4684 #, python-format
4841 #, python-format
4685 msgid "HG: added %s"
4842 msgid "HG: added %s"
4686 msgstr ""
4843 msgstr ""
4687
4844
4688 #, python-format
4845 #, python-format
4689 msgid "HG: changed %s"
4846 msgid "HG: changed %s"
4690 msgstr ""
4847 msgstr ""
4691
4848
4692 #, python-format
4849 #, python-format
4693 msgid "HG: removed %s"
4850 msgid "HG: removed %s"
4694 msgstr ""
4851 msgstr ""
4695
4852
4696 msgid "HG: no files changed"
4853 msgid "HG: no files changed"
4697 msgstr ""
4854 msgstr ""
4698
4855
4699 msgid "empty commit message"
4856 msgid "empty commit message"
4700 msgstr ""
4857 msgstr ""
4701
4858
4702 msgid ""
4859 msgid ""
4703 "add the specified files on the next commit\n"
4860 "add the specified files on the next commit\n"
4704 "\n"
4861 "\n"
4705 " Schedule files to be version controlled and added to the\n"
4862 " Schedule files to be version controlled and added to the\n"
4706 " repository.\n"
4863 " repository.\n"
4707 "\n"
4864 "\n"
4708 " The files will be added to the repository at the next commit. To\n"
4865 " The files will be added to the repository at the next commit. To\n"
4709 " undo an add before that, see hg forget.\n"
4866 " undo an add before that, see hg forget.\n"
4710 "\n"
4867 "\n"
4711 " If no names are given, add all files to the repository.\n"
4868 " If no names are given, add all files to the repository.\n"
4712 " "
4869 " "
4713 msgstr ""
4870 msgstr ""
4714
4871
4715 msgid ""
4872 msgid ""
4716 "add all new files, delete all missing files\n"
4873 "add all new files, delete all missing files\n"
4717 "\n"
4874 "\n"
4718 " Add all new files and remove all missing files from the\n"
4875 " Add all new files and remove all missing files from the\n"
4719 " repository.\n"
4876 " repository.\n"
4720 "\n"
4877 "\n"
4721 " New files are ignored if they match any of the patterns in\n"
4878 " New files are ignored if they match any of the patterns in\n"
4722 " .hgignore. As with add, these changes take effect at the next\n"
4879 " .hgignore. As with add, these changes take effect at the next\n"
4723 " commit.\n"
4880 " commit.\n"
4724 "\n"
4881 "\n"
4725 " Use the -s/--similarity option to detect renamed files. With a\n"
4882 " Use the -s/--similarity option to detect renamed files. With a\n"
4726 " parameter > 0, this compares every removed file with every added\n"
4883 " parameter > 0, this compares every removed file with every added\n"
4727 " file and records those similar enough as renames. This option\n"
4884 " file and records those similar enough as renames. This option\n"
4728 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4885 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4729 " identical) as its parameter. Detecting renamed files this way can\n"
4886 " identical) as its parameter. Detecting renamed files this way can\n"
4730 " be expensive.\n"
4887 " be expensive.\n"
4731 " "
4888 " "
4732 msgstr ""
4889 msgstr ""
4733
4890
4734 msgid "similarity must be a number"
4891 msgid "similarity must be a number"
4735 msgstr ""
4892 msgstr ""
4736
4893
4737 msgid "similarity must be between 0 and 100"
4894 msgid "similarity must be between 0 and 100"
4738 msgstr ""
4895 msgstr ""
4739
4896
4740 msgid ""
4897 msgid ""
4741 "show changeset information by line for each file\n"
4898 "show changeset information by line for each file\n"
4742 "\n"
4899 "\n"
4743 " List changes in files, showing the revision id responsible for\n"
4900 " List changes in files, showing the revision id responsible for\n"
4744 " each line\n"
4901 " each line\n"
4745 "\n"
4902 "\n"
4746 " This command is useful for discovering when a change was made and\n"
4903 " This command is useful for discovering when a change was made and\n"
4747 " by whom.\n"
4904 " by whom.\n"
4748 "\n"
4905 "\n"
4749 " Without the -a/--text option, annotate will avoid processing files\n"
4906 " Without the -a/--text option, annotate will avoid processing files\n"
4750 " it detects as binary. With -a, annotate will annotate the file\n"
4907 " it detects as binary. With -a, annotate will annotate the file\n"
4751 " anyway, although the results will probably be neither useful\n"
4908 " anyway, although the results will probably be neither useful\n"
4752 " nor desirable.\n"
4909 " nor desirable.\n"
4753 " "
4910 " "
4754 msgstr ""
4911 msgstr ""
4755
4912
4756 msgid "at least one filename or pattern is required"
4913 msgid "at least one filename or pattern is required"
4757 msgstr ""
4914 msgstr ""
4758
4915
4759 msgid "at least one of -n/-c is required for -l"
4916 msgid "at least one of -n/-c is required for -l"
4760 msgstr ""
4917 msgstr ""
4761
4918
4762 #, python-format
4919 #, python-format
4763 msgid "%s: binary file\n"
4920 msgid "%s: binary file\n"
4764 msgstr ""
4921 msgstr ""
4765
4922
4766 msgid ""
4923 msgid ""
4767 "create an unversioned archive of a repository revision\n"
4924 "create an unversioned archive of a repository revision\n"
4768 "\n"
4925 "\n"
4769 " By default, the revision used is the parent of the working\n"
4926 " By default, the revision used is the parent of the working\n"
4770 " directory; use -r/--rev to specify a different revision.\n"
4927 " directory; use -r/--rev to specify a different revision.\n"
4771 "\n"
4928 "\n"
4772 " To specify the type of archive to create, use -t/--type. Valid\n"
4929 " To specify the type of archive to create, use -t/--type. Valid\n"
4773 " types are:\n"
4930 " types are:\n"
4774 "\n"
4931 "\n"
4775 " \"files\" (default): a directory full of files\n"
4932 " \"files\" (default): a directory full of files\n"
4776 " \"tar\": tar archive, uncompressed\n"
4933 " \"tar\": tar archive, uncompressed\n"
4777 " \"tbz2\": tar archive, compressed using bzip2\n"
4934 " \"tbz2\": tar archive, compressed using bzip2\n"
4778 " \"tgz\": tar archive, compressed using gzip\n"
4935 " \"tgz\": tar archive, compressed using gzip\n"
4779 " \"uzip\": zip archive, uncompressed\n"
4936 " \"uzip\": zip archive, uncompressed\n"
4780 " \"zip\": zip archive, compressed using deflate\n"
4937 " \"zip\": zip archive, compressed using deflate\n"
4781 "\n"
4938 "\n"
4782 " The exact name of the destination archive or directory is given\n"
4939 " The exact name of the destination archive or directory is given\n"
4783 " using a format string; see 'hg help export' for details.\n"
4940 " using a format string; see 'hg help export' for details.\n"
4784 "\n"
4941 "\n"
4785 " Each member added to an archive file has a directory prefix\n"
4942 " Each member added to an archive file has a directory prefix\n"
4786 " prepended. Use -p/--prefix to specify a format string for the\n"
4943 " prepended. Use -p/--prefix to specify a format string for the\n"
4787 " prefix. The default is the basename of the archive, with suffixes\n"
4944 " prefix. The default is the basename of the archive, with suffixes\n"
4788 " removed.\n"
4945 " removed.\n"
4789 " "
4946 " "
4790 msgstr ""
4947 msgstr ""
4791
4948
4792 msgid "no working directory: please specify a revision"
4949 msgid "no working directory: please specify a revision"
4793 msgstr ""
4950 msgstr ""
4794
4951
4795 msgid "repository root cannot be destination"
4952 msgid "repository root cannot be destination"
4796 msgstr ""
4953 msgstr ""
4797
4954
4798 msgid "cannot archive plain files to stdout"
4955 msgid "cannot archive plain files to stdout"
4799 msgstr ""
4956 msgstr ""
4800
4957
4801 msgid ""
4958 msgid ""
4802 "reverse effect of earlier changeset\n"
4959 "reverse effect of earlier changeset\n"
4803 "\n"
4960 "\n"
4804 " Commit the backed out changes as a new changeset. The new\n"
4961 " Commit the backed out changes as a new changeset. The new\n"
4805 " changeset is a child of the backed out changeset.\n"
4962 " changeset is a child of the backed out changeset.\n"
4806 "\n"
4963 "\n"
4807 " If you backout a changeset other than the tip, a new head is\n"
4964 " If you backout a changeset other than the tip, a new head is\n"
4808 " created. This head will be the new tip and you should merge this\n"
4965 " created. This head will be the new tip and you should merge this\n"
4809 " backout changeset with another head.\n"
4966 " backout changeset with another head.\n"
4810 "\n"
4967 "\n"
4811 " The --merge option remembers the parent of the working directory\n"
4968 " The --merge option remembers the parent of the working directory\n"
4812 " before starting the backout, then merges the new head with that\n"
4969 " before starting the backout, then merges the new head with that\n"
4813 " changeset afterwards. This saves you from doing the merge by hand.\n"
4970 " changeset afterwards. This saves you from doing the merge by hand.\n"
4814 " The result of this merge is not committed, as with a normal merge.\n"
4971 " The result of this merge is not committed, as with a normal merge.\n"
4815 "\n"
4972 "\n"
4816 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4973 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4817 " "
4974 " "
4818 msgstr ""
4975 msgstr ""
4819
4976
4820 msgid "please specify just one revision"
4977 msgid "please specify just one revision"
4821 msgstr ""
4978 msgstr ""
4822
4979
4823 msgid "please specify a revision to backout"
4980 msgid "please specify a revision to backout"
4824 msgstr ""
4981 msgstr ""
4825
4982
4826 msgid "cannot backout change on a different branch"
4983 msgid "cannot backout change on a different branch"
4827 msgstr ""
4984 msgstr ""
4828
4985
4829 msgid "cannot backout a change with no parents"
4986 msgid "cannot backout a change with no parents"
4830 msgstr ""
4987 msgstr ""
4831
4988
4832 msgid "cannot backout a merge changeset without --parent"
4989 msgid "cannot backout a merge changeset without --parent"
4833 msgstr ""
4990 msgstr ""
4834
4991
4835 #, python-format
4992 #, python-format
4836 msgid "%s is not a parent of %s"
4993 msgid "%s is not a parent of %s"
4837 msgstr ""
4994 msgstr ""
4838
4995
4839 msgid "cannot use --parent on non-merge changeset"
4996 msgid "cannot use --parent on non-merge changeset"
4840 msgstr ""
4997 msgstr ""
4841
4998
4842 #, python-format
4999 #, python-format
4843 msgid "Backed out changeset %s"
5000 msgid "Backed out changeset %s"
4844 msgstr ""
5001 msgstr ""
4845
5002
4846 #, python-format
5003 #, python-format
4847 msgid "changeset %s backs out changeset %s\n"
5004 msgid "changeset %s backs out changeset %s\n"
4848 msgstr ""
5005 msgstr ""
4849
5006
4850 #, python-format
5007 #, python-format
4851 msgid "merging with changeset %s\n"
5008 msgid "merging with changeset %s\n"
4852 msgstr ""
5009 msgstr ""
4853
5010
4854 msgid "the backout changeset is a new head - do not forget to merge\n"
5011 msgid "the backout changeset is a new head - do not forget to merge\n"
4855 msgstr ""
5012 msgstr ""
4856
5013
4857 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5014 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4858 msgstr ""
5015 msgstr ""
4859
5016
4860 msgid ""
5017 msgid ""
4861 "subdivision search of changesets\n"
5018 "subdivision search of changesets\n"
4862 "\n"
5019 "\n"
4863 " This command helps to find changesets which introduce problems. To\n"
5020 " This command helps to find changesets which introduce problems. To\n"
4864 " use, mark the earliest changeset you know exhibits the problem as\n"
5021 " use, mark the earliest changeset you know exhibits the problem as\n"
4865 " bad, then mark the latest changeset which is free from the problem\n"
5022 " bad, then mark the latest changeset which is free from the problem\n"
4866 " as good. Bisect will update your working directory to a revision\n"
5023 " as good. Bisect will update your working directory to a revision\n"
4867 " for testing (unless the -U/--noupdate option is specified). Once\n"
5024 " for testing (unless the -U/--noupdate option is specified). Once\n"
4868 " you have performed tests, mark the working directory as good or\n"
5025 " you have performed tests, mark the working directory as good or\n"
4869 " bad, and bisect will either update to another candidate changeset\n"
5026 " bad, and bisect will either update to another candidate changeset\n"
4870 " or announce that it has found the bad revision.\n"
5027 " or announce that it has found the bad revision.\n"
4871 "\n"
5028 "\n"
4872 " As a shortcut, you can also use the revision argument to mark a\n"
5029 " As a shortcut, you can also use the revision argument to mark a\n"
4873 " revision as good or bad without checking it out first.\n"
5030 " revision as good or bad without checking it out first.\n"
4874 "\n"
5031 "\n"
4875 " If you supply a command, it will be used for automatic bisection.\n"
5032 " If you supply a command, it will be used for automatic bisection.\n"
4876 " Its exit status will be used to mark revisions as good or bad:\n"
5033 " Its exit status will be used to mark revisions as good or bad:\n"
4877 " status 0 means good, 125 means to skip the revision, 127\n"
5034 " status 0 means good, 125 means to skip the revision, 127\n"
4878 " (command not found) will abort the bisection, and any other\n"
5035 " (command not found) will abort the bisection, and any other\n"
4879 " non-zero exit status means the revision is bad.\n"
5036 " non-zero exit status means the revision is bad.\n"
4880 " "
5037 " "
4881 msgstr ""
5038 msgstr ""
4882
5039
4883 msgid "The first good revision is:\n"
5040 msgid "The first good revision is:\n"
4884 msgstr ""
5041 msgstr ""
4885
5042
4886 msgid "The first bad revision is:\n"
5043 msgid "The first bad revision is:\n"
4887 msgstr ""
5044 msgstr ""
4888
5045
4889 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5046 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4890 msgstr ""
5047 msgstr ""
4891
5048
4892 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5049 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4893 msgstr ""
5050 msgstr ""
4894
5051
4895 msgid "cannot bisect (no known good revisions)"
5052 msgid "cannot bisect (no known good revisions)"
4896 msgstr ""
5053 msgstr ""
4897
5054
4898 msgid "cannot bisect (no known bad revisions)"
5055 msgid "cannot bisect (no known bad revisions)"
4899 msgstr ""
5056 msgstr ""
4900
5057
4901 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5058 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4902 msgstr ""
5059 msgstr ""
4903
5060
4904 msgid "incompatible arguments"
5061 msgid "incompatible arguments"
4905 msgstr ""
5062 msgstr ""
4906
5063
4907 #, python-format
5064 #, python-format
4908 msgid "cannot find executable: %s"
5065 msgid "cannot find executable: %s"
4909 msgstr ""
5066 msgstr ""
4910
5067
4911 #, python-format
5068 #, python-format
4912 msgid "failed to execute %s"
5069 msgid "failed to execute %s"
4913 msgstr ""
5070 msgstr ""
4914
5071
4915 #, python-format
5072 #, python-format
4916 msgid "%s killed"
5073 msgid "%s killed"
4917 msgstr ""
5074 msgstr ""
4918
5075
4919 #, python-format
5076 #, python-format
4920 msgid "Changeset %d:%s: %s\n"
5077 msgid "Changeset %d:%s: %s\n"
4921 msgstr ""
5078 msgstr ""
4922
5079
4923 #, python-format
5080 #, python-format
4924 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5081 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4925 msgstr ""
5082 msgstr ""
4926
5083
4927 msgid ""
5084 msgid ""
4928 "set or show the current branch name\n"
5085 "set or show the current branch name\n"
4929 "\n"
5086 "\n"
4930 " With no argument, show the current branch name. With one argument,\n"
5087 " With no argument, show the current branch name. With one argument,\n"
4931 " set the working directory branch name (the branch will not exist\n"
5088 " set the working directory branch name (the branch will not exist\n"
4932 " in the repository until the next commit). Standard practice\n"
5089 " in the repository until the next commit). Standard practice\n"
4933 " recommends that primary development take place on the 'default'\n"
5090 " recommends that primary development take place on the 'default'\n"
4934 " branch.\n"
5091 " branch.\n"
4935 "\n"
5092 "\n"
4936 " Unless -f/--force is specified, branch will not let you set a\n"
5093 " Unless -f/--force is specified, branch will not let you set a\n"
4937 " branch name that already exists, even if it's inactive.\n"
5094 " branch name that already exists, even if it's inactive.\n"
4938 "\n"
5095 "\n"
4939 " Use -C/--clean to reset the working directory branch to that of\n"
5096 " Use -C/--clean to reset the working directory branch to that of\n"
4940 " the parent of the working directory, negating a previous branch\n"
5097 " the parent of the working directory, negating a previous branch\n"
4941 " change.\n"
5098 " change.\n"
4942 "\n"
5099 "\n"
4943 " Use the command 'hg update' to switch to an existing branch.\n"
5100 " Use the command 'hg update' to switch to an existing branch.\n"
4944 " "
5101 " "
4945 msgstr ""
5102 msgstr ""
4946
5103
4947 #, python-format
5104 #, python-format
4948 msgid "reset working directory to branch %s\n"
5105 msgid "reset working directory to branch %s\n"
4949 msgstr ""
5106 msgstr ""
4950
5107
4951 msgid "a branch of the same name already exists (use --force to override)"
5108 msgid "a branch of the same name already exists (use --force to override)"
4952 msgstr ""
5109 msgstr ""
4953
5110
4954 #, python-format
5111 #, python-format
4955 msgid "marked working directory as branch %s\n"
5112 msgid "marked working directory as branch %s\n"
4956 msgstr ""
5113 msgstr ""
4957
5114
4958 msgid ""
5115 msgid ""
4959 "list repository named branches\n"
5116 "list repository named branches\n"
4960 "\n"
5117 "\n"
4961 " List the repository's named branches, indicating which ones are\n"
5118 " List the repository's named branches, indicating which ones are\n"
4962 " inactive. If -a/--active is specified, only show active branches.\n"
5119 " inactive. If -a/--active is specified, only show active branches.\n"
4963 "\n"
5120 "\n"
4964 " A branch is considered active if it contains repository heads.\n"
5121 " A branch is considered active if it contains repository heads.\n"
4965 "\n"
5122 "\n"
4966 " Use the command 'hg update' to switch to an existing branch.\n"
5123 " Use the command 'hg update' to switch to an existing branch.\n"
4967 " "
5124 " "
4968 msgstr ""
5125 msgstr ""
4969
5126
4970 msgid ""
5127 msgid ""
4971 "create a changegroup file\n"
5128 "create a changegroup file\n"
4972 "\n"
5129 "\n"
4973 " Generate a compressed changegroup file collecting changesets not\n"
5130 " Generate a compressed changegroup file collecting changesets not\n"
4974 " known to be in another repository.\n"
5131 " known to be in another repository.\n"
4975 "\n"
5132 "\n"
4976 " If no destination repository is specified the destination is\n"
5133 " If no destination repository is specified the destination is\n"
4977 " assumed to have all the nodes specified by one or more --base\n"
5134 " assumed to have all the nodes specified by one or more --base\n"
4978 " parameters. To create a bundle containing all changesets, use\n"
5135 " parameters. To create a bundle containing all changesets, use\n"
4979 " -a/--all (or --base null).\n"
5136 " -a/--all (or --base null).\n"
4980 "\n"
5137 "\n"
4981 " You can change compression method with the -t/--type option.\n"
5138 " You can change compression method with the -t/--type option.\n"
4982 " The available compression methods are: none, bzip2, and\n"
5139 " The available compression methods are: none, bzip2, and\n"
4983 " gzip (by default, bundles are compressed using bzip2).\n"
5140 " gzip (by default, bundles are compressed using bzip2).\n"
4984 "\n"
5141 "\n"
4985 " The bundle file can then be transferred using conventional means\n"
5142 " The bundle file can then be transferred using conventional means\n"
4986 " and applied to another repository with the unbundle or pull\n"
5143 " and applied to another repository with the unbundle or pull\n"
4987 " command. This is useful when direct push and pull are not\n"
5144 " command. This is useful when direct push and pull are not\n"
4988 " available or when exporting an entire repository is undesirable.\n"
5145 " available or when exporting an entire repository is undesirable.\n"
4989 "\n"
5146 "\n"
4990 " Applying bundles preserves all changeset contents including\n"
5147 " Applying bundles preserves all changeset contents including\n"
4991 " permissions, copy/rename information, and revision history.\n"
5148 " permissions, copy/rename information, and revision history.\n"
4992 " "
5149 " "
4993 msgstr ""
5150 msgstr ""
4994
5151
4995 msgid "--base is incompatible with specifying a destination"
5152 msgid "--base is incompatible with specifying a destination"
4996 msgstr ""
5153 msgstr ""
4997
5154
4998 msgid "unknown bundle type specified with --type"
5155 msgid "unknown bundle type specified with --type"
4999 msgstr ""
5156 msgstr ""
5000
5157
5001 msgid ""
5158 msgid ""
5002 "output the current or given revision of files\n"
5159 "output the current or given revision of files\n"
5003 "\n"
5160 "\n"
5004 " Print the specified files as they were at the given revision. If\n"
5161 " Print the specified files as they were at the given revision. If\n"
5005 " no revision is given, the parent of the working directory is used,\n"
5162 " no revision is given, the parent of the working directory is used,\n"
5006 " or tip if no revision is checked out.\n"
5163 " or tip if no revision is checked out.\n"
5007 "\n"
5164 "\n"
5008 " Output may be to a file, in which case the name of the file is\n"
5165 " Output may be to a file, in which case the name of the file is\n"
5009 " given using a format string. The formatting rules are the same as\n"
5166 " given using a format string. The formatting rules are the same as\n"
5010 " for the export command, with the following additions:\n"
5167 " for the export command, with the following additions:\n"
5011 "\n"
5168 "\n"
5012 " %s basename of file being printed\n"
5169 " %s basename of file being printed\n"
5013 " %d dirname of file being printed, or '.' if in repository root\n"
5170 " %d dirname of file being printed, or '.' if in repository root\n"
5014 " %p root-relative path name of file being printed\n"
5171 " %p root-relative path name of file being printed\n"
5015 " "
5172 " "
5016 msgstr ""
5173 msgstr ""
5017
5174
5018 msgid ""
5175 msgid ""
5019 "make a copy of an existing repository\n"
5176 "make a copy of an existing repository\n"
5020 "\n"
5177 "\n"
5021 " Create a copy of an existing repository in a new directory.\n"
5178 " Create a copy of an existing repository in a new directory.\n"
5022 "\n"
5179 "\n"
5023 " If no destination directory name is specified, it defaults to the\n"
5180 " If no destination directory name is specified, it defaults to the\n"
5024 " basename of the source.\n"
5181 " basename of the source.\n"
5025 "\n"
5182 "\n"
5026 " The location of the source is added to the new repository's\n"
5183 " The location of the source is added to the new repository's\n"
5027 " .hg/hgrc file, as the default to be used for future pulls.\n"
5184 " .hg/hgrc file, as the default to be used for future pulls.\n"
5028 "\n"
5185 "\n"
5029 " If you use the -r/--rev option to clone up to a specific revision,\n"
5186 " If you use the -r/--rev option to clone up to a specific revision,\n"
5030 " no subsequent revisions (including subsequent tags) will be\n"
5187 " no subsequent revisions (including subsequent tags) will be\n"
5031 " present in the cloned repository. This option implies --pull, even\n"
5188 " present in the cloned repository. This option implies --pull, even\n"
5032 " on local repositories.\n"
5189 " on local repositories.\n"
5033 "\n"
5190 "\n"
5034 " By default, clone will check out the head of the 'default' branch.\n"
5191 " By default, clone will check out the head of the 'default' branch.\n"
5035 " If the -U/--noupdate option is used, the new clone will contain\n"
5192 " If the -U/--noupdate option is used, the new clone will contain\n"
5036 " only a repository (.hg) and no working copy (the working copy\n"
5193 " only a repository (.hg) and no working copy (the working copy\n"
5037 " parent is the null revision).\n"
5194 " parent is the null revision).\n"
5038 "\n"
5195 "\n"
5039 " See 'hg help urls' for valid source format details.\n"
5196 " See 'hg help urls' for valid source format details.\n"
5040 "\n"
5197 "\n"
5041 " It is possible to specify an ssh:// URL as the destination, but no\n"
5198 " It is possible to specify an ssh:// URL as the destination, but no\n"
5042 " .hg/hgrc and working directory will be created on the remote side.\n"
5199 " .hg/hgrc and working directory will be created on the remote side.\n"
5043 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5200 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5044 "\n"
5201 "\n"
5045 " For efficiency, hardlinks are used for cloning whenever the source\n"
5202 " For efficiency, hardlinks are used for cloning whenever the source\n"
5046 " and destination are on the same filesystem (note this applies only\n"
5203 " and destination are on the same filesystem (note this applies only\n"
5047 " to the repository data, not to the checked out files). Some\n"
5204 " to the repository data, not to the checked out files). Some\n"
5048 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5205 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5049 " do not report errors. In these cases, use the --pull option to\n"
5206 " do not report errors. In these cases, use the --pull option to\n"
5050 " avoid hardlinking.\n"
5207 " avoid hardlinking.\n"
5051 "\n"
5208 "\n"
5052 " In some cases, you can clone repositories and checked out files\n"
5209 " In some cases, you can clone repositories and checked out files\n"
5053 " using full hardlinks with\n"
5210 " using full hardlinks with\n"
5054 "\n"
5211 "\n"
5055 " $ cp -al REPO REPOCLONE\n"
5212 " $ cp -al REPO REPOCLONE\n"
5056 "\n"
5213 "\n"
5057 " This is the fastest way to clone, but it is not always safe. The\n"
5214 " This is the fastest way to clone, but it is not always safe. The\n"
5058 " operation is not atomic (making sure REPO is not modified during\n"
5215 " operation is not atomic (making sure REPO is not modified during\n"
5059 " the operation is up to you) and you have to make sure your editor\n"
5216 " the operation is up to you) and you have to make sure your editor\n"
5060 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5217 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5061 " this is not compatible with certain extensions that place their\n"
5218 " this is not compatible with certain extensions that place their\n"
5062 " metadata under the .hg directory, such as mq.\n"
5219 " metadata under the .hg directory, such as mq.\n"
5063 "\n"
5220 "\n"
5064 " "
5221 " "
5065 msgstr ""
5222 msgstr ""
5066
5223
5067 msgid ""
5224 msgid ""
5068 "commit the specified files or all outstanding changes\n"
5225 "commit the specified files or all outstanding changes\n"
5069 "\n"
5226 "\n"
5070 " Commit changes to the given files into the repository. Unlike a\n"
5227 " Commit changes to the given files into the repository. Unlike a\n"
5071 " centralized RCS, this operation is a local operation. See hg push\n"
5228 " centralized RCS, this operation is a local operation. See hg push\n"
5072 " for a way to actively distribute your changes.\n"
5229 " for a way to actively distribute your changes.\n"
5073 "\n"
5230 "\n"
5074 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5231 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5075 " will be committed.\n"
5232 " will be committed.\n"
5076 "\n"
5233 "\n"
5077 " If you are committing the result of a merge, do not provide any\n"
5234 " If you are committing the result of a merge, do not provide any\n"
5078 " filenames or -I/-X filters.\n"
5235 " filenames or -I/-X filters.\n"
5079 "\n"
5236 "\n"
5080 " If no commit message is specified, the configured editor is\n"
5237 " If no commit message is specified, the configured editor is\n"
5081 " started to prompt you for a message.\n"
5238 " started to prompt you for a message.\n"
5082 "\n"
5239 "\n"
5083 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5240 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5084 " "
5241 " "
5085 msgstr ""
5242 msgstr ""
5086
5243
5087 msgid "created new head\n"
5244 msgid "created new head\n"
5088 msgstr ""
5245 msgstr ""
5089
5246
5090 #, python-format
5247 #, python-format
5091 msgid "committed changeset %d:%s\n"
5248 msgid "committed changeset %d:%s\n"
5092 msgstr ""
5249 msgstr ""
5093
5250
5094 msgid ""
5251 msgid ""
5095 "mark files as copied for the next commit\n"
5252 "mark files as copied for the next commit\n"
5096 "\n"
5253 "\n"
5097 " Mark dest as having copies of source files. If dest is a\n"
5254 " Mark dest as having copies of source files. If dest is a\n"
5098 " directory, copies are put in that directory. If dest is a file,\n"
5255 " directory, copies are put in that directory. If dest is a file,\n"
5099 " the source must be a single file.\n"
5256 " the source must be a single file.\n"
5100 "\n"
5257 "\n"
5101 " By default, this command copies the contents of files as they\n"
5258 " By default, this command copies the contents of files as they\n"
5102 " exist in the working directory. If invoked with -A/--after, the\n"
5259 " exist in the working directory. If invoked with -A/--after, the\n"
5103 " operation is recorded, but no copying is performed.\n"
5260 " operation is recorded, but no copying is performed.\n"
5104 "\n"
5261 "\n"
5105 " This command takes effect with the next commit. To undo a copy\n"
5262 " This command takes effect with the next commit. To undo a copy\n"
5106 " before that, see hg revert.\n"
5263 " before that, see hg revert.\n"
5107 " "
5264 " "
5108 msgstr ""
5265 msgstr ""
5109
5266
5110 msgid "find the ancestor revision of two revisions in a given index"
5267 msgid "find the ancestor revision of two revisions in a given index"
5111 msgstr ""
5268 msgstr ""
5112
5269
5113 msgid "There is no Mercurial repository here (.hg not found)"
5270 msgid "There is no Mercurial repository here (.hg not found)"
5114 msgstr ""
5271 msgstr ""
5115
5272
5116 msgid "either two or three arguments required"
5273 msgid "either two or three arguments required"
5117 msgstr ""
5274 msgstr ""
5118
5275
5119 msgid "returns the completion list associated with the given command"
5276 msgid "returns the completion list associated with the given command"
5120 msgstr ""
5277 msgstr ""
5121
5278
5122 msgid "rebuild the dirstate as it would look like for the given revision"
5279 msgid "rebuild the dirstate as it would look like for the given revision"
5123 msgstr ""
5280 msgstr ""
5124
5281
5125 msgid "validate the correctness of the current dirstate"
5282 msgid "validate the correctness of the current dirstate"
5126 msgstr ""
5283 msgstr ""
5127
5284
5128 #, python-format
5285 #, python-format
5129 msgid "%s in state %s, but not in manifest1\n"
5286 msgid "%s in state %s, but not in manifest1\n"
5130 msgstr ""
5287 msgstr ""
5131
5288
5132 #, python-format
5289 #, python-format
5133 msgid "%s in state %s, but also in manifest1\n"
5290 msgid "%s in state %s, but also in manifest1\n"
5134 msgstr ""
5291 msgstr ""
5135
5292
5136 #, python-format
5293 #, python-format
5137 msgid "%s in state %s, but not in either manifest\n"
5294 msgid "%s in state %s, but not in either manifest\n"
5138 msgstr ""
5295 msgstr ""
5139
5296
5140 #, python-format
5297 #, python-format
5141 msgid "%s in manifest1, but listed as state %s"
5298 msgid "%s in manifest1, but listed as state %s"
5142 msgstr ""
5299 msgstr ""
5143
5300
5144 msgid ".hg/dirstate inconsistent with current parent's manifest"
5301 msgid ".hg/dirstate inconsistent with current parent's manifest"
5145 msgstr ""
5302 msgstr ""
5146
5303
5147 msgid ""
5304 msgid ""
5148 "show combined config settings from all hgrc files\n"
5305 "show combined config settings from all hgrc files\n"
5149 "\n"
5306 "\n"
5150 " With no arguments, print names and values of all config items.\n"
5307 " With no arguments, print names and values of all config items.\n"
5151 "\n"
5308 "\n"
5152 " With one argument of the form section.name, print just the value\n"
5309 " With one argument of the form section.name, print just the value\n"
5153 " of that config item.\n"
5310 " of that config item.\n"
5154 "\n"
5311 "\n"
5155 " With multiple arguments, print names and values of all config\n"
5312 " With multiple arguments, print names and values of all config\n"
5156 " items with matching section names.\n"
5313 " items with matching section names.\n"
5157 "\n"
5314 "\n"
5158 " With --debug, the source (filename and line number) is printed\n"
5315 " With --debug, the source (filename and line number) is printed\n"
5159 " for each config item.\n"
5316 " for each config item.\n"
5160 " "
5317 " "
5161 msgstr ""
5318 msgstr ""
5162
5319
5163 msgid "only one config item permitted"
5320 msgid "only one config item permitted"
5164 msgstr ""
5321 msgstr ""
5165
5322
5166 msgid ""
5323 msgid ""
5167 "manually set the parents of the current working directory\n"
5324 "manually set the parents of the current working directory\n"
5168 "\n"
5325 "\n"
5169 " This is useful for writing repository conversion tools, but should\n"
5326 " This is useful for writing repository conversion tools, but should\n"
5170 " be used with care.\n"
5327 " be used with care.\n"
5171 " "
5328 " "
5172 msgstr ""
5329 msgstr ""
5173
5330
5174 msgid "show the contents of the current dirstate"
5331 msgid "show the contents of the current dirstate"
5175 msgstr ""
5332 msgstr ""
5176
5333
5177 #, python-format
5334 #, python-format
5178 msgid "copy: %s -> %s\n"
5335 msgid "copy: %s -> %s\n"
5179 msgstr ""
5336 msgstr ""
5180
5337
5181 msgid "dump the contents of a data file revision"
5338 msgid "dump the contents of a data file revision"
5182 msgstr ""
5339 msgstr ""
5183
5340
5184 #, python-format
5341 #, python-format
5185 msgid "invalid revision identifier %s"
5342 msgid "invalid revision identifier %s"
5186 msgstr ""
5343 msgstr ""
5187
5344
5188 msgid "parse and display a date"
5345 msgid "parse and display a date"
5189 msgstr ""
5346 msgstr ""
5190
5347
5191 msgid "dump the contents of an index file"
5348 msgid "dump the contents of an index file"
5192 msgstr ""
5349 msgstr ""
5193
5350
5194 msgid "dump an index DAG as a graphviz dot file"
5351 msgid "dump an index DAG as a graphviz dot file"
5195 msgstr ""
5352 msgstr ""
5196
5353
5197 msgid "test Mercurial installation"
5354 msgid "test Mercurial installation"
5198 msgstr ""
5355 msgstr ""
5199
5356
5200 #, python-format
5357 #, python-format
5201 msgid "Checking encoding (%s)...\n"
5358 msgid "Checking encoding (%s)...\n"
5202 msgstr ""
5359 msgstr ""
5203
5360
5204 msgid " (check that your locale is properly set)\n"
5361 msgid " (check that your locale is properly set)\n"
5205 msgstr ""
5362 msgstr ""
5206
5363
5207 msgid "Checking extensions...\n"
5364 msgid "Checking extensions...\n"
5208 msgstr ""
5365 msgstr ""
5209
5366
5210 msgid " One or more extensions could not be found"
5367 msgid " One or more extensions could not be found"
5211 msgstr ""
5368 msgstr ""
5212
5369
5213 msgid " (check that you compiled the extensions)\n"
5370 msgid " (check that you compiled the extensions)\n"
5214 msgstr ""
5371 msgstr ""
5215
5372
5216 msgid "Checking templates...\n"
5373 msgid "Checking templates...\n"
5217 msgstr ""
5374 msgstr ""
5218
5375
5219 msgid " (templates seem to have been installed incorrectly)\n"
5376 msgid " (templates seem to have been installed incorrectly)\n"
5220 msgstr ""
5377 msgstr ""
5221
5378
5222 msgid "Checking patch...\n"
5379 msgid "Checking patch...\n"
5223 msgstr ""
5380 msgstr ""
5224
5381
5225 msgid " patch call failed:\n"
5382 msgid " patch call failed:\n"
5226 msgstr ""
5383 msgstr ""
5227
5384
5228 msgid " unexpected patch output!\n"
5385 msgid " unexpected patch output!\n"
5229 msgstr ""
5386 msgstr ""
5230
5387
5231 msgid " patch test failed!\n"
5388 msgid " patch test failed!\n"
5232 msgstr ""
5389 msgstr ""
5233
5390
5234 msgid ""
5391 msgid ""
5235 " (Current patch tool may be incompatible with patch, or misconfigured. "
5392 " (Current patch tool may be incompatible with patch, or misconfigured. "
5236 "Please check your .hgrc file)\n"
5393 "Please check your .hgrc file)\n"
5237 msgstr ""
5394 msgstr ""
5238
5395
5239 msgid ""
5396 msgid ""
5240 " Internal patcher failure, please report this error to http://mercurial."
5397 " Internal patcher failure, please report this error to http://mercurial."
5241 "selenic.com/bts/\n"
5398 "selenic.com/bts/\n"
5242 msgstr ""
5399 msgstr ""
5243
5400
5244 msgid "Checking commit editor...\n"
5401 msgid "Checking commit editor...\n"
5245 msgstr ""
5402 msgstr ""
5246
5403
5247 msgid " No commit editor set and can't find vi in PATH\n"
5404 msgid " No commit editor set and can't find vi in PATH\n"
5248 msgstr ""
5405 msgstr ""
5249
5406
5250 msgid " (specify a commit editor in your .hgrc file)\n"
5407 msgid " (specify a commit editor in your .hgrc file)\n"
5251 msgstr ""
5408 msgstr ""
5252
5409
5253 #, python-format
5410 #, python-format
5254 msgid " Can't find editor '%s' in PATH\n"
5411 msgid " Can't find editor '%s' in PATH\n"
5255 msgstr ""
5412 msgstr ""
5256
5413
5257 msgid "Checking username...\n"
5414 msgid "Checking username...\n"
5258 msgstr ""
5415 msgstr ""
5259
5416
5260 msgid " (specify a username in your .hgrc file)\n"
5417 msgid " (specify a username in your .hgrc file)\n"
5261 msgstr ""
5418 msgstr ""
5262
5419
5263 msgid "No problems detected\n"
5420 msgid "No problems detected\n"
5264 msgstr ""
5421 msgstr ""
5265
5422
5266 #, python-format
5423 #, python-format
5267 msgid "%s problems detected, please check your install!\n"
5424 msgid "%s problems detected, please check your install!\n"
5268 msgstr ""
5425 msgstr ""
5269
5426
5270 msgid "dump rename information"
5427 msgid "dump rename information"
5271 msgstr ""
5428 msgstr ""
5272
5429
5273 #, python-format
5430 #, python-format
5274 msgid "%s renamed from %s:%s\n"
5431 msgid "%s renamed from %s:%s\n"
5275 msgstr ""
5432 msgstr ""
5276
5433
5277 #, python-format
5434 #, python-format
5278 msgid "%s not renamed\n"
5435 msgid "%s not renamed\n"
5279 msgstr ""
5436 msgstr ""
5280
5437
5281 msgid "show how files match on given patterns"
5438 msgid "show how files match on given patterns"
5282 msgstr ""
5439 msgstr ""
5283
5440
5284 msgid ""
5441 msgid ""
5285 "diff repository (or selected files)\n"
5442 "diff repository (or selected files)\n"
5286 "\n"
5443 "\n"
5287 " Show differences between revisions for the specified files.\n"
5444 " Show differences between revisions for the specified files.\n"
5288 "\n"
5445 "\n"
5289 " Differences between files are shown using the unified diff format.\n"
5446 " Differences between files are shown using the unified diff format.\n"
5290 "\n"
5447 "\n"
5291 " NOTE: diff may generate unexpected results for merges, as it will\n"
5448 " NOTE: diff may generate unexpected results for merges, as it will\n"
5292 " default to comparing against the working directory's first parent\n"
5449 " default to comparing against the working directory's first parent\n"
5293 " changeset if no revisions are specified.\n"
5450 " changeset if no revisions are specified.\n"
5294 "\n"
5451 "\n"
5295 " When two revision arguments are given, then changes are shown\n"
5452 " When two revision arguments are given, then changes are shown\n"
5296 " between those revisions. If only one revision is specified then\n"
5453 " between those revisions. If only one revision is specified then\n"
5297 " that revision is compared to the working directory, and, when no\n"
5454 " that revision is compared to the working directory, and, when no\n"
5298 " revisions are specified, the working directory files are compared\n"
5455 " revisions are specified, the working directory files are compared\n"
5299 " to its parent.\n"
5456 " to its parent.\n"
5300 "\n"
5457 "\n"
5301 " Without the -a/--text option, diff will avoid generating diffs of\n"
5458 " Without the -a/--text option, diff will avoid generating diffs of\n"
5302 " files it detects as binary. With -a, diff will generate a diff\n"
5459 " files it detects as binary. With -a, diff will generate a diff\n"
5303 " anyway, probably with undesirable results.\n"
5460 " anyway, probably with undesirable results.\n"
5304 "\n"
5461 "\n"
5305 " Use the -g/--git option to generate diffs in the git extended diff\n"
5462 " Use the -g/--git option to generate diffs in the git extended diff\n"
5306 " format. For more information, read 'hg help diffs'.\n"
5463 " format. For more information, read 'hg help diffs'.\n"
5307 " "
5464 " "
5308 msgstr ""
5465 msgstr ""
5309
5466
5310 msgid ""
5467 msgid ""
5311 "dump the header and diffs for one or more changesets\n"
5468 "dump the header and diffs for one or more changesets\n"
5312 "\n"
5469 "\n"
5313 " Print the changeset header and diffs for one or more revisions.\n"
5470 " Print the changeset header and diffs for one or more revisions.\n"
5314 "\n"
5471 "\n"
5315 " The information shown in the changeset header is: author,\n"
5472 " The information shown in the changeset header is: author,\n"
5316 " changeset hash, parent(s) and commit comment.\n"
5473 " changeset hash, parent(s) and commit comment.\n"
5317 "\n"
5474 "\n"
5318 " NOTE: export may generate unexpected diff output for merge\n"
5475 " NOTE: export may generate unexpected diff output for merge\n"
5319 " changesets, as it will compare the merge changeset against its\n"
5476 " changesets, as it will compare the merge changeset against its\n"
5320 " first parent only.\n"
5477 " first parent only.\n"
5321 "\n"
5478 "\n"
5322 " Output may be to a file, in which case the name of the file is\n"
5479 " Output may be to a file, in which case the name of the file is\n"
5323 " given using a format string. The formatting rules are as follows:\n"
5480 " given using a format string. The formatting rules are as follows:\n"
5324 "\n"
5481 "\n"
5325 " %% literal \"%\" character\n"
5482 " %% literal \"%\" character\n"
5326 " %H changeset hash (40 bytes of hexadecimal)\n"
5483 " %H changeset hash (40 bytes of hexadecimal)\n"
5327 " %N number of patches being generated\n"
5484 " %N number of patches being generated\n"
5328 " %R changeset revision number\n"
5485 " %R changeset revision number\n"
5329 " %b basename of the exporting repository\n"
5486 " %b basename of the exporting repository\n"
5330 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5487 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5331 " %n zero-padded sequence number, starting at 1\n"
5488 " %n zero-padded sequence number, starting at 1\n"
5332 " %r zero-padded changeset revision number\n"
5489 " %r zero-padded changeset revision number\n"
5333 "\n"
5490 "\n"
5334 " Without the -a/--text option, export will avoid generating diffs\n"
5491 " Without the -a/--text option, export will avoid generating diffs\n"
5335 " of files it detects as binary. With -a, export will generate a\n"
5492 " of files it detects as binary. With -a, export will generate a\n"
5336 " diff anyway, probably with undesirable results.\n"
5493 " diff anyway, probably with undesirable results.\n"
5337 "\n"
5494 "\n"
5338 " Use the -g/--git option to generate diffs in the git extended diff\n"
5495 " Use the -g/--git option to generate diffs in the git extended diff\n"
5339 " format. See 'hg help diffs' for more information.\n"
5496 " format. See 'hg help diffs' for more information.\n"
5340 "\n"
5497 "\n"
5341 " With the --switch-parent option, the diff will be against the\n"
5498 " With the --switch-parent option, the diff will be against the\n"
5342 " second parent. It can be useful to review a merge.\n"
5499 " second parent. It can be useful to review a merge.\n"
5343 " "
5500 " "
5344 msgstr ""
5501 msgstr ""
5345
5502
5346 msgid "export requires at least one changeset"
5503 msgid "export requires at least one changeset"
5347 msgstr ""
5504 msgstr ""
5348
5505
5349 msgid "exporting patches:\n"
5506 msgid "exporting patches:\n"
5350 msgstr ""
5507 msgstr ""
5351
5508
5352 msgid "exporting patch:\n"
5509 msgid "exporting patch:\n"
5353 msgstr ""
5510 msgstr ""
5354
5511
5355 msgid ""
5512 msgid ""
5356 "forget the specified files on the next commit\n"
5513 "forget the specified files on the next commit\n"
5357 "\n"
5514 "\n"
5358 " Mark the specified files so they will no longer be tracked\n"
5515 " Mark the specified files so they will no longer be tracked\n"
5359 " after the next commit.\n"
5516 " after the next commit.\n"
5360 "\n"
5517 "\n"
5361 " This only removes files from the current branch, not from the\n"
5518 " This only removes files from the current branch, not from the\n"
5362 " entire project history, and it does not delete them from the\n"
5519 " entire project history, and it does not delete them from the\n"
5363 " working directory.\n"
5520 " working directory.\n"
5364 "\n"
5521 "\n"
5365 " To undo a forget before the next commit, see hg add.\n"
5522 " To undo a forget before the next commit, see hg add.\n"
5366 " "
5523 " "
5367 msgstr ""
5524 msgstr ""
5368
5525
5369 msgid "no files specified"
5526 msgid "no files specified"
5370 msgstr ""
5527 msgstr ""
5371
5528
5372 #, python-format
5529 #, python-format
5373 msgid "not removing %s: file is already untracked\n"
5530 msgid "not removing %s: file is already untracked\n"
5374 msgstr ""
5531 msgstr ""
5375
5532
5376 msgid ""
5533 msgid ""
5377 "search for a pattern in specified files and revisions\n"
5534 "search for a pattern in specified files and revisions\n"
5378 "\n"
5535 "\n"
5379 " Search revisions of files for a regular expression.\n"
5536 " Search revisions of files for a regular expression.\n"
5380 "\n"
5537 "\n"
5381 " This command behaves differently than Unix grep. It only accepts\n"
5538 " This command behaves differently than Unix grep. It only accepts\n"
5382 " Python/Perl regexps. It searches repository history, not the\n"
5539 " Python/Perl regexps. It searches repository history, not the\n"
5383 " working directory. It always prints the revision number in which a\n"
5540 " working directory. It always prints the revision number in which a\n"
5384 " match appears.\n"
5541 " match appears.\n"
5385 "\n"
5542 "\n"
5386 " By default, grep only prints output for the first revision of a\n"
5543 " By default, grep only prints output for the first revision of a\n"
5387 " file in which it finds a match. To get it to print every revision\n"
5544 " file in which it finds a match. To get it to print every revision\n"
5388 " that contains a change in match status (\"-\" for a match that\n"
5545 " that contains a change in match status (\"-\" for a match that\n"
5389 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5546 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5390 " use the --all flag.\n"
5547 " use the --all flag.\n"
5391 " "
5548 " "
5392 msgstr ""
5549 msgstr ""
5393
5550
5394 #, python-format
5551 #, python-format
5395 msgid "grep: invalid match pattern: %s\n"
5552 msgid "grep: invalid match pattern: %s\n"
5396 msgstr ""
5553 msgstr ""
5397
5554
5398 msgid ""
5555 msgid ""
5399 "show current repository heads or show branch heads\n"
5556 "show current repository heads or show branch heads\n"
5400 "\n"
5557 "\n"
5401 " With no arguments, show all repository head changesets.\n"
5558 " With no arguments, show all repository head changesets.\n"
5402 "\n"
5559 "\n"
5403 " Repository \"heads\" are changesets that don't have child\n"
5560 " Repository \"heads\" are changesets that don't have child\n"
5404 " changesets. They are where development generally takes place and\n"
5561 " changesets. They are where development generally takes place and\n"
5405 " are the usual targets for update and merge operations.\n"
5562 " are the usual targets for update and merge operations.\n"
5406 "\n"
5563 "\n"
5407 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5564 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5408 " the named branch associated with that revision. The name of the\n"
5565 " the named branch associated with that revision. The name of the\n"
5409 " branch is called the revision's branch tag.\n"
5566 " branch is called the revision's branch tag.\n"
5410 "\n"
5567 "\n"
5411 " Branch heads are revisions on a given named branch that do not have\n"
5568 " Branch heads are revisions on a given named branch that do not have\n"
5412 " any descendants on the same branch. A branch head could be a true head\n"
5569 " any descendants on the same branch. A branch head could be a true head\n"
5413 " or it could be the last changeset on a branch before a new branch\n"
5570 " or it could be the last changeset on a branch before a new branch\n"
5414 " was created. If none of the branch heads are true heads, the branch\n"
5571 " was created. If none of the branch heads are true heads, the branch\n"
5415 " is considered inactive.\n"
5572 " is considered inactive.\n"
5416 "\n"
5573 "\n"
5417 " If STARTREV is specified only those heads (or branch heads) that\n"
5574 " If STARTREV is specified only those heads (or branch heads) that\n"
5418 " are descendants of STARTREV will be displayed.\n"
5575 " are descendants of STARTREV will be displayed.\n"
5419 " "
5576 " "
5420 msgstr ""
5577 msgstr ""
5421
5578
5422 #, python-format
5579 #, python-format
5423 msgid "no open branch heads on branch %s\n"
5580 msgid "no open branch heads on branch %s\n"
5424 msgstr ""
5581 msgstr ""
5425
5582
5426 #, python-format
5583 #, python-format
5427 msgid "no changes on branch %s containing %s are reachable from %s\n"
5584 msgid "no changes on branch %s containing %s are reachable from %s\n"
5428 msgstr ""
5585 msgstr ""
5429
5586
5430 #, python-format
5587 #, python-format
5431 msgid "no changes on branch %s are reachable from %s\n"
5588 msgid "no changes on branch %s are reachable from %s\n"
5432 msgstr ""
5589 msgstr ""
5433
5590
5434 msgid ""
5591 msgid ""
5435 "show help for a given topic or a help overview\n"
5592 "show help for a given topic or a help overview\n"
5436 "\n"
5593 "\n"
5437 " With no arguments, print a list of commands with short help messages.\n"
5594 " With no arguments, print a list of commands with short help messages.\n"
5438 "\n"
5595 "\n"
5439 " Given a topic, extension, or command name, print help for that\n"
5596 " Given a topic, extension, or command name, print help for that\n"
5440 " topic."
5597 " topic."
5441 msgstr ""
5598 msgstr ""
5442
5599
5443 msgid "global options:"
5600 msgid "global options:"
5444 msgstr "options globales :"
5601 msgstr "options globales :"
5445
5602
5446 msgid "use \"hg help\" for the full list of commands"
5603 msgid "use \"hg help\" for the full list of commands"
5447 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5604 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5448
5605
5449 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5606 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5450 msgstr ""
5607 msgstr ""
5451 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5608 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5452 "plus de détails"
5609 "plus de détails"
5453
5610
5454 # la chaîne passée est préfixée par un espace
5611 # la chaîne passée est préfixée par un espace
5455 #, python-format
5612 #, python-format
5456 msgid "use \"hg -v help%s\" to show aliases and global options"
5613 msgid "use \"hg -v help%s\" to show aliases and global options"
5457 msgstr ""
5614 msgstr ""
5458 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5615 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5459
5616
5460 #, python-format
5617 #, python-format
5461 msgid "use \"hg -v help %s\" to show global options"
5618 msgid "use \"hg -v help %s\" to show global options"
5462 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5619 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5463
5620
5464 msgid ""
5621 msgid ""
5465 "list of commands:\n"
5622 "list of commands:\n"
5466 "\n"
5623 "\n"
5467 msgstr ""
5624 msgstr ""
5468 "liste des commandes :\n"
5625 "liste des commandes :\n"
5469 "\n"
5626 "\n"
5470
5627
5471 #, python-format
5628 #, python-format
5472 msgid ""
5629 msgid ""
5473 "\n"
5630 "\n"
5474 "aliases: %s\n"
5631 "aliases: %s\n"
5475 msgstr ""
5632 msgstr ""
5476 "\n"
5633 "\n"
5477 "alias : %s\n"
5634 "alias : %s\n"
5478
5635
5479 msgid "(no help text available)"
5636 msgid "(no help text available)"
5480 msgstr "(pas d'aide disponible)"
5637 msgstr "(pas d'aide disponible)"
5481
5638
5482 msgid "options:\n"
5639 msgid "options:\n"
5483 msgstr "options :\n"
5640 msgstr "options :\n"
5484
5641
5485 msgid "no commands defined\n"
5642 msgid "no commands defined\n"
5486 msgstr "pas de commandes définies\n"
5643 msgstr "pas de commandes définies\n"
5487
5644
5488 msgid "enabled extensions:"
5645 msgid "enabled extensions:"
5489 msgstr "extensions activées :"
5646 msgstr "extensions activées :"
5490
5647
5491 msgid "no help text available"
5648 msgid "no help text available"
5492 msgstr "pas d'aide disponible"
5649 msgstr "pas d'aide disponible"
5493
5650
5494 #, python-format
5651 #, python-format
5495 msgid "%s extension - %s\n"
5652 msgid "%s extension - %s\n"
5496 msgstr "extension %s - %s\n"
5653 msgstr "extension %s - %s\n"
5497
5654
5498 msgid "Mercurial Distributed SCM\n"
5655 msgid "Mercurial Distributed SCM\n"
5499 msgstr "Mercurial, système de gestion de sources distribué\n"
5656 msgstr "Mercurial, système de gestion de sources distribué\n"
5500
5657
5501 msgid ""
5658 msgid ""
5502 "basic commands:\n"
5659 "basic commands:\n"
5503 "\n"
5660 "\n"
5504 msgstr ""
5661 msgstr ""
5505 "commandes de base :\n"
5662 "commandes de base :\n"
5506 "\n"
5663 "\n"
5507
5664
5508 msgid ""
5665 msgid ""
5509 "\n"
5666 "\n"
5510 "additional help topics:\n"
5667 "additional help topics:\n"
5511 "\n"
5668 "\n"
5512 msgstr ""
5669 msgstr ""
5513 "\n"
5670 "\n"
5514 "sujets d'aide supplémentaires :\n"
5671 "sujets d'aide supplémentaires :\n"
5515 "\n"
5672 "\n"
5516
5673
5517 msgid ""
5674 msgid ""
5518 "identify the working copy or specified revision\n"
5675 "identify the working copy or specified revision\n"
5519 "\n"
5676 "\n"
5520 " With no revision, print a summary of the current state of the\n"
5677 " With no revision, print a summary of the current state of the\n"
5521 " repository.\n"
5678 " repository.\n"
5522 "\n"
5679 "\n"
5523 " Specifying a path to a repository root or Mercurial bundle will\n"
5680 " Specifying a path to a repository root or Mercurial bundle will\n"
5524 " cause lookup to operate on that repository/bundle.\n"
5681 " cause lookup to operate on that repository/bundle.\n"
5525 "\n"
5682 "\n"
5526 " This summary identifies the repository state using one or two\n"
5683 " This summary identifies the repository state using one or two\n"
5527 " parent hash identifiers, followed by a \"+\" if there are\n"
5684 " parent hash identifiers, followed by a \"+\" if there are\n"
5528 " uncommitted changes in the working directory, a list of tags for\n"
5685 " uncommitted changes in the working directory, a list of tags for\n"
5529 " this revision and a branch name for non-default branches.\n"
5686 " this revision and a branch name for non-default branches.\n"
5530 " "
5687 " "
5531 msgstr ""
5688 msgstr ""
5532
5689
5533 msgid ""
5690 msgid ""
5534 "import an ordered set of patches\n"
5691 "import an ordered set of patches\n"
5535 "\n"
5692 "\n"
5536 " Import a list of patches and commit them individually.\n"
5693 " Import a list of patches and commit them individually.\n"
5537 "\n"
5694 "\n"
5538 " If there are outstanding changes in the working directory, import\n"
5695 " If there are outstanding changes in the working directory, import\n"
5539 " will abort unless given the -f/--force flag.\n"
5696 " will abort unless given the -f/--force flag.\n"
5540 "\n"
5697 "\n"
5541 " You can import a patch straight from a mail message. Even patches\n"
5698 " You can import a patch straight from a mail message. Even patches\n"
5542 " as attachments work (to use the body part, it must have type\n"
5699 " as attachments work (to use the body part, it must have type\n"
5543 " text/plain or text/x-patch). From and Subject headers of email\n"
5700 " text/plain or text/x-patch). From and Subject headers of email\n"
5544 " message are used as default committer and commit message. All\n"
5701 " message are used as default committer and commit message. All\n"
5545 " text/plain body parts before first diff are added to commit\n"
5702 " text/plain body parts before first diff are added to commit\n"
5546 " message.\n"
5703 " message.\n"
5547 "\n"
5704 "\n"
5548 " If the imported patch was generated by hg export, user and\n"
5705 " If the imported patch was generated by hg export, user and\n"
5549 " description from patch override values from message headers and\n"
5706 " description from patch override values from message headers and\n"
5550 " body. Values given on command line with -m/--message and -u/--user\n"
5707 " body. Values given on command line with -m/--message and -u/--user\n"
5551 " override these.\n"
5708 " override these.\n"
5552 "\n"
5709 "\n"
5553 " If --exact is specified, import will set the working directory to\n"
5710 " If --exact is specified, import will set the working directory to\n"
5554 " the parent of each patch before applying it, and will abort if the\n"
5711 " the parent of each patch before applying it, and will abort if the\n"
5555 " resulting changeset has a different ID than the one recorded in\n"
5712 " resulting changeset has a different ID than the one recorded in\n"
5556 " the patch. This may happen due to character set problems or other\n"
5713 " the patch. This may happen due to character set problems or other\n"
5557 " deficiencies in the text patch format.\n"
5714 " deficiencies in the text patch format.\n"
5558 "\n"
5715 "\n"
5559 " With -s/--similarity, hg will attempt to discover renames and\n"
5716 " With -s/--similarity, hg will attempt to discover renames and\n"
5560 " copies in the patch in the same way as 'addremove'.\n"
5717 " copies in the patch in the same way as 'addremove'.\n"
5561 "\n"
5718 "\n"
5562 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5719 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5563 " a URL is specified, the patch will be downloaded from it.\n"
5720 " a URL is specified, the patch will be downloaded from it.\n"
5564 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5721 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5565 " "
5722 " "
5566 msgstr ""
5723 msgstr ""
5567
5724
5568 msgid "applying patch from stdin\n"
5725 msgid "applying patch from stdin\n"
5569 msgstr ""
5726 msgstr ""
5570
5727
5571 msgid "no diffs found"
5728 msgid "no diffs found"
5572 msgstr ""
5729 msgstr ""
5573
5730
5574 #, python-format
5731 #, python-format
5575 msgid ""
5732 msgid ""
5576 "message:\n"
5733 "message:\n"
5577 "%s\n"
5734 "%s\n"
5578 msgstr ""
5735 msgstr ""
5579
5736
5580 msgid "not a Mercurial patch"
5737 msgid "not a Mercurial patch"
5581 msgstr ""
5738 msgstr ""
5582
5739
5583 msgid "patch is damaged or loses information"
5740 msgid "patch is damaged or loses information"
5584 msgstr ""
5741 msgstr ""
5585
5742
5586 msgid ""
5743 msgid ""
5587 "show new changesets found in source\n"
5744 "show new changesets found in source\n"
5588 "\n"
5745 "\n"
5589 " Show new changesets found in the specified path/URL or the default\n"
5746 " Show new changesets found in the specified path/URL or the default\n"
5590 " pull location. These are the changesets that would have been pulled\n"
5747 " pull location. These are the changesets that would have been pulled\n"
5591 " if a pull at the time you issued this command.\n"
5748 " if a pull at the time you issued this command.\n"
5592 "\n"
5749 "\n"
5593 " For remote repository, using --bundle avoids downloading the\n"
5750 " For remote repository, using --bundle avoids downloading the\n"
5594 " changesets twice if the incoming is followed by a pull.\n"
5751 " changesets twice if the incoming is followed by a pull.\n"
5595 "\n"
5752 "\n"
5596 " See pull for valid source format details.\n"
5753 " See pull for valid source format details.\n"
5597 " "
5754 " "
5598 msgstr ""
5755 msgstr ""
5599
5756
5600 msgid ""
5757 msgid ""
5601 "create a new repository in the given directory\n"
5758 "create a new repository in the given directory\n"
5602 "\n"
5759 "\n"
5603 " Initialize a new repository in the given directory. If the given\n"
5760 " Initialize a new repository in the given directory. If the given\n"
5604 " directory does not exist, it will be created.\n"
5761 " directory does not exist, it will be created.\n"
5605 "\n"
5762 "\n"
5606 " If no directory is given, the current directory is used.\n"
5763 " If no directory is given, the current directory is used.\n"
5607 "\n"
5764 "\n"
5608 " It is possible to specify an ssh:// URL as the destination.\n"
5765 " It is possible to specify an ssh:// URL as the destination.\n"
5609 " See 'hg help urls' for more information.\n"
5766 " See 'hg help urls' for more information.\n"
5610 " "
5767 " "
5611 msgstr ""
5768 msgstr ""
5612
5769
5613 msgid ""
5770 msgid ""
5614 "locate files matching specific patterns\n"
5771 "locate files matching specific patterns\n"
5615 "\n"
5772 "\n"
5616 " Print files under Mercurial control in the working directory whose\n"
5773 " Print files under Mercurial control in the working directory whose\n"
5617 " names match the given patterns.\n"
5774 " names match the given patterns.\n"
5618 "\n"
5775 "\n"
5619 " By default, this command searches all directories in the working\n"
5776 " By default, this command searches all directories in the working\n"
5620 " directory. To search just the current directory and its\n"
5777 " directory. To search just the current directory and its\n"
5621 " subdirectories, use \"--include .\".\n"
5778 " subdirectories, use \"--include .\".\n"
5622 "\n"
5779 "\n"
5623 " If no patterns are given to match, this command prints the names\n"
5780 " If no patterns are given to match, this command prints the names\n"
5624 " of all files under Mercurial control in the working directory.\n"
5781 " of all files under Mercurial control in the working directory.\n"
5625 "\n"
5782 "\n"
5626 " If you want to feed the output of this command into the \"xargs\"\n"
5783 " If you want to feed the output of this command into the \"xargs\"\n"
5627 " command, use the -0 option to both this command and \"xargs\". This\n"
5784 " command, use the -0 option to both this command and \"xargs\". This\n"
5628 " will avoid the problem of \"xargs\" treating single filenames that\n"
5785 " will avoid the problem of \"xargs\" treating single filenames that\n"
5629 " contain whitespace as multiple filenames.\n"
5786 " contain whitespace as multiple filenames.\n"
5630 " "
5787 " "
5631 msgstr ""
5788 msgstr ""
5632
5789
5633 msgid ""
5790 msgid ""
5634 "show revision history of entire repository or files\n"
5791 "show revision history of entire repository or files\n"
5635 "\n"
5792 "\n"
5636 " Print the revision history of the specified files or the entire\n"
5793 " Print the revision history of the specified files or the entire\n"
5637 " project.\n"
5794 " project.\n"
5638 "\n"
5795 "\n"
5639 " File history is shown without following rename or copy history of\n"
5796 " File history is shown without following rename or copy history of\n"
5640 " files. Use -f/--follow with a filename to follow history across\n"
5797 " files. Use -f/--follow with a filename to follow history across\n"
5641 " renames and copies. --follow without a filename will only show\n"
5798 " renames and copies. --follow without a filename will only show\n"
5642 " ancestors or descendants of the starting revision. --follow-first\n"
5799 " ancestors or descendants of the starting revision. --follow-first\n"
5643 " only follows the first parent of merge revisions.\n"
5800 " only follows the first parent of merge revisions.\n"
5644 "\n"
5801 "\n"
5645 " If no revision range is specified, the default is tip:0 unless\n"
5802 " If no revision range is specified, the default is tip:0 unless\n"
5646 " --follow is set, in which case the working directory parent is\n"
5803 " --follow is set, in which case the working directory parent is\n"
5647 " used as the starting revision.\n"
5804 " used as the starting revision.\n"
5648 "\n"
5805 "\n"
5649 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5806 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5650 "\n"
5807 "\n"
5651 " By default this command prints revision number and changeset id,\n"
5808 " By default this command prints revision number and changeset id,\n"
5652 " tags, non-trivial parents, user, date and time, and a summary for\n"
5809 " tags, non-trivial parents, user, date and time, and a summary for\n"
5653 " each commit. When the -v/--verbose switch is used, the list of\n"
5810 " each commit. When the -v/--verbose switch is used, the list of\n"
5654 " changed files and full commit message are shown.\n"
5811 " changed files and full commit message are shown.\n"
5655 "\n"
5812 "\n"
5656 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5813 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5657 " changesets, as it will only compare the merge changeset against\n"
5814 " changesets, as it will only compare the merge changeset against\n"
5658 " its first parent. Also, only files different from BOTH parents\n"
5815 " its first parent. Also, only files different from BOTH parents\n"
5659 " will appear in files:.\n"
5816 " will appear in files:.\n"
5660 " "
5817 " "
5661 msgstr ""
5818 msgstr ""
5662
5819
5663 msgid ""
5820 msgid ""
5664 "output the current or given revision of the project manifest\n"
5821 "output the current or given revision of the project manifest\n"
5665 "\n"
5822 "\n"
5666 " Print a list of version controlled files for the given revision.\n"
5823 " Print a list of version controlled files for the given revision.\n"
5667 " If no revision is given, the first parent of the working directory\n"
5824 " If no revision is given, the first parent of the working directory\n"
5668 " is used, or the null revision if no revision is checked out.\n"
5825 " is used, or the null revision if no revision is checked out.\n"
5669 "\n"
5826 "\n"
5670 " With -v, print file permissions, symlink and executable bits.\n"
5827 " With -v, print file permissions, symlink and executable bits.\n"
5671 " With --debug, print file revision hashes.\n"
5828 " With --debug, print file revision hashes.\n"
5672 " "
5829 " "
5673 msgstr ""
5830 msgstr ""
5674
5831
5675 msgid ""
5832 msgid ""
5676 "merge working directory with another revision\n"
5833 "merge working directory with another revision\n"
5677 "\n"
5834 "\n"
5678 " The current working directory is updated with all changes made in\n"
5835 " The current working directory is updated with all changes made in\n"
5679 " the requested revision since the last common predecessor revision.\n"
5836 " the requested revision since the last common predecessor revision.\n"
5680 "\n"
5837 "\n"
5681 " Files that changed between either parent are marked as changed for\n"
5838 " Files that changed between either parent are marked as changed for\n"
5682 " the next commit and a commit must be performed before any further\n"
5839 " the next commit and a commit must be performed before any further\n"
5683 " updates to the repository are allowed. The next commit will have\n"
5840 " updates to the repository are allowed. The next commit will have\n"
5684 " two parents.\n"
5841 " two parents.\n"
5685 "\n"
5842 "\n"
5686 " If no revision is specified, the working directory's parent is a\n"
5843 " If no revision is specified, the working directory's parent is a\n"
5687 " head revision, and the current branch contains exactly one other\n"
5844 " head revision, and the current branch contains exactly one other\n"
5688 " head, the other head is merged with by default. Otherwise, an\n"
5845 " head, the other head is merged with by default. Otherwise, an\n"
5689 " explicit revision with which to merge with must be provided.\n"
5846 " explicit revision with which to merge with must be provided.\n"
5690 " "
5847 " "
5691 msgstr ""
5848 msgstr ""
5692
5849
5693 #, python-format
5850 #, python-format
5694 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5851 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5695 msgstr ""
5852 msgstr ""
5696
5853
5697 #, python-format
5854 #, python-format
5698 msgid "branch '%s' has one head - please merge with an explicit rev"
5855 msgid "branch '%s' has one head - please merge with an explicit rev"
5699 msgstr ""
5856 msgstr ""
5700
5857
5701 msgid "there is nothing to merge"
5858 msgid "there is nothing to merge"
5702 msgstr ""
5859 msgstr ""
5703
5860
5704 #, python-format
5861 #, python-format
5705 msgid "%s - use \"hg update\" instead"
5862 msgid "%s - use \"hg update\" instead"
5706 msgstr ""
5863 msgstr ""
5707
5864
5708 msgid ""
5865 msgid ""
5709 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5866 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5710 "rev"
5867 "rev"
5711 msgstr ""
5868 msgstr ""
5712
5869
5713 msgid ""
5870 msgid ""
5714 "show changesets not found in destination\n"
5871 "show changesets not found in destination\n"
5715 "\n"
5872 "\n"
5716 " Show changesets not found in the specified destination repository\n"
5873 " Show changesets not found in the specified destination repository\n"
5717 " or the default push location. These are the changesets that would\n"
5874 " or the default push location. These are the changesets that would\n"
5718 " be pushed if a push was requested.\n"
5875 " be pushed if a push was requested.\n"
5719 "\n"
5876 "\n"
5720 " See pull for valid destination format details.\n"
5877 " See pull for valid destination format details.\n"
5721 " "
5878 " "
5722 msgstr ""
5879 msgstr ""
5723
5880
5724 msgid ""
5881 msgid ""
5725 "show the parents of the working directory or revision\n"
5882 "show the parents of the working directory or revision\n"
5726 "\n"
5883 "\n"
5727 " Print the working directory's parent revisions. If a revision is\n"
5884 " Print the working directory's parent revisions. If a revision is\n"
5728 " given via -r/--rev, the parent of that revision will be printed.\n"
5885 " given via -r/--rev, the parent of that revision will be printed.\n"
5729 " If a file argument is given, the revision in which the file was\n"
5886 " If a file argument is given, the revision in which the file was\n"
5730 " last changed (before the working directory revision or the\n"
5887 " last changed (before the working directory revision or the\n"
5731 " argument to --rev if given) is printed.\n"
5888 " argument to --rev if given) is printed.\n"
5732 " "
5889 " "
5733 msgstr ""
5890 msgstr ""
5734
5891
5735 msgid "can only specify an explicit filename"
5892 msgid "can only specify an explicit filename"
5736 msgstr ""
5893 msgstr ""
5737
5894
5738 #, python-format
5895 #, python-format
5739 msgid "'%s' not found in manifest!"
5896 msgid "'%s' not found in manifest!"
5740 msgstr ""
5897 msgstr ""
5741
5898
5742 msgid ""
5899 msgid ""
5743 "show aliases for remote repositories\n"
5900 "show aliases for remote repositories\n"
5744 "\n"
5901 "\n"
5745 " Show definition of symbolic path name NAME. If no name is given,\n"
5902 " Show definition of symbolic path name NAME. If no name is given,\n"
5746 " show definition of all available names.\n"
5903 " show definition of all available names.\n"
5747 "\n"
5904 "\n"
5748 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5905 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5749 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5906 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5750 "\n"
5907 "\n"
5751 " See 'hg help urls' for more information.\n"
5908 " See 'hg help urls' for more information.\n"
5752 " "
5909 " "
5753 msgstr ""
5910 msgstr ""
5754
5911
5755 msgid "not found!\n"
5912 msgid "not found!\n"
5756 msgstr ""
5913 msgstr ""
5757
5914
5758 msgid "not updating, since new heads added\n"
5915 msgid "not updating, since new heads added\n"
5759 msgstr ""
5916 msgstr ""
5760
5917
5761 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5918 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5762 msgstr ""
5919 msgstr ""
5763
5920
5764 msgid "(run 'hg update' to get a working copy)\n"
5921 msgid "(run 'hg update' to get a working copy)\n"
5765 msgstr ""
5922 msgstr ""
5766
5923
5767 msgid ""
5924 msgid ""
5768 "pull changes from the specified source\n"
5925 "pull changes from the specified source\n"
5769 "\n"
5926 "\n"
5770 " Pull changes from a remote repository to a local one.\n"
5927 " Pull changes from a remote repository to a local one.\n"
5771 "\n"
5928 "\n"
5772 " This finds all changes from the repository at the specified path\n"
5929 " This finds all changes from the repository at the specified path\n"
5773 " or URL and adds them to a local repository (the current one unless\n"
5930 " or URL and adds them to a local repository (the current one unless\n"
5774 " -R is specified). By default, this does not update the copy of the\n"
5931 " -R is specified). By default, this does not update the copy of the\n"
5775 " project in the working directory.\n"
5932 " project in the working directory.\n"
5776 "\n"
5933 "\n"
5777 " Use hg incoming if you want to see what would have been added by a\n"
5934 " Use hg incoming if you want to see what would have been added by a\n"
5778 " pull at the time you issued this command. If you then decide to\n"
5935 " pull at the time you issued this command. If you then decide to\n"
5779 " added those changes to the repository, you should use pull -r X\n"
5936 " added those changes to the repository, you should use pull -r X\n"
5780 " where X is the last changeset listed by hg incoming.\n"
5937 " where X is the last changeset listed by hg incoming.\n"
5781 "\n"
5938 "\n"
5782 " If SOURCE is omitted, the 'default' path will be used.\n"
5939 " If SOURCE is omitted, the 'default' path will be used.\n"
5783 " See 'hg help urls' for more information.\n"
5940 " See 'hg help urls' for more information.\n"
5784 " "
5941 " "
5785 msgstr ""
5942 msgstr ""
5786
5943
5787 msgid ""
5944 msgid ""
5788 "push changes to the specified destination\n"
5945 "push changes to the specified destination\n"
5789 "\n"
5946 "\n"
5790 " Push changes from the local repository to the given destination.\n"
5947 " Push changes from the local repository to the given destination.\n"
5791 "\n"
5948 "\n"
5792 " This is the symmetrical operation for pull. It moves changes from\n"
5949 " This is the symmetrical operation for pull. It moves changes from\n"
5793 " the current repository to a different one. If the destination is\n"
5950 " the current repository to a different one. If the destination is\n"
5794 " local this is identical to a pull in that directory from the\n"
5951 " local this is identical to a pull in that directory from the\n"
5795 " current one.\n"
5952 " current one.\n"
5796 "\n"
5953 "\n"
5797 " By default, push will refuse to run if it detects the result would\n"
5954 " By default, push will refuse to run if it detects the result would\n"
5798 " increase the number of remote heads. This generally indicates the\n"
5955 " increase the number of remote heads. This generally indicates the\n"
5799 " user forgot to pull and merge before pushing.\n"
5956 " user forgot to pull and merge before pushing.\n"
5800 "\n"
5957 "\n"
5801 " If -r/--rev is used, the named revision and all its ancestors will\n"
5958 " If -r/--rev is used, the named revision and all its ancestors will\n"
5802 " be pushed to the remote repository.\n"
5959 " be pushed to the remote repository.\n"
5803 "\n"
5960 "\n"
5804 " Please see 'hg help urls' for important details about ssh://\n"
5961 " Please see 'hg help urls' for important details about ssh://\n"
5805 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5962 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5806 " "
5963 " "
5807 msgstr ""
5964 msgstr ""
5808
5965
5809 #, python-format
5966 #, python-format
5810 msgid "pushing to %s\n"
5967 msgid "pushing to %s\n"
5811 msgstr ""
5968 msgstr ""
5812
5969
5813 msgid ""
5970 msgid ""
5814 "roll back an interrupted transaction\n"
5971 "roll back an interrupted transaction\n"
5815 "\n"
5972 "\n"
5816 " Recover from an interrupted commit or pull.\n"
5973 " Recover from an interrupted commit or pull.\n"
5817 "\n"
5974 "\n"
5818 " This command tries to fix the repository status after an\n"
5975 " This command tries to fix the repository status after an\n"
5819 " interrupted operation. It should only be necessary when Mercurial\n"
5976 " interrupted operation. It should only be necessary when Mercurial\n"
5820 " suggests it.\n"
5977 " suggests it.\n"
5821 " "
5978 " "
5822 msgstr ""
5979 msgstr ""
5823
5980
5824 msgid ""
5981 msgid ""
5825 "remove the specified files on the next commit\n"
5982 "remove the specified files on the next commit\n"
5826 "\n"
5983 "\n"
5827 " Schedule the indicated files for removal from the repository.\n"
5984 " Schedule the indicated files for removal from the repository.\n"
5828 "\n"
5985 "\n"
5829 " This only removes files from the current branch, not from the\n"
5986 " This only removes files from the current branch, not from the\n"
5830 " entire project history. -A/--after can be used to remove only\n"
5987 " entire project history. -A/--after can be used to remove only\n"
5831 " files that have already been deleted, -f/--force can be used to\n"
5988 " files that have already been deleted, -f/--force can be used to\n"
5832 " force deletion, and -Af can be used to remove files from the next\n"
5989 " force deletion, and -Af can be used to remove files from the next\n"
5833 " revision without deleting them from the working directory.\n"
5990 " revision without deleting them from the working directory.\n"
5834 "\n"
5991 "\n"
5835 " The following table details the behavior of remove for different\n"
5992 " The following table details the behavior of remove for different\n"
5836 " file states (columns) and option combinations (rows). The file\n"
5993 " file states (columns) and option combinations (rows). The file\n"
5837 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5994 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5838 " (as reported by hg status). The actions are Warn, Remove (from\n"
5995 " (as reported by hg status). The actions are Warn, Remove (from\n"
5839 " branch) and Delete (from disk).\n"
5996 " branch) and Delete (from disk).\n"
5840 "\n"
5997 "\n"
5841 " A C M !\n"
5998 " A C M !\n"
5842 " none W RD W R\n"
5999 " none W RD W R\n"
5843 " -f R RD RD R\n"
6000 " -f R RD RD R\n"
5844 " -A W W W R\n"
6001 " -A W W W R\n"
5845 " -Af R R R R\n"
6002 " -Af R R R R\n"
5846 "\n"
6003 "\n"
5847 " This command schedules the files to be removed at the next commit.\n"
6004 " This command schedules the files to be removed at the next commit.\n"
5848 " To undo a remove before that, see hg revert.\n"
6005 " To undo a remove before that, see hg revert.\n"
5849 " "
6006 " "
5850 msgstr ""
6007 msgstr ""
5851
6008
5852 #, python-format
6009 #, python-format
5853 msgid "not removing %s: file is untracked\n"
6010 msgid "not removing %s: file is untracked\n"
5854 msgstr ""
6011 msgstr ""
5855
6012
5856 #, python-format
6013 #, python-format
5857 msgid "not removing %s: file %s (use -f to force removal)\n"
6014 msgid "not removing %s: file %s (use -f to force removal)\n"
5858 msgstr ""
6015 msgstr ""
5859
6016
5860 msgid "still exists"
6017 msgid "still exists"
5861 msgstr ""
6018 msgstr ""
5862
6019
5863 msgid "is modified"
6020 msgid "is modified"
5864 msgstr ""
6021 msgstr ""
5865
6022
5866 msgid "has been marked for add"
6023 msgid "has been marked for add"
5867 msgstr ""
6024 msgstr ""
5868
6025
5869 msgid ""
6026 msgid ""
5870 "rename files; equivalent of copy + remove\n"
6027 "rename files; equivalent of copy + remove\n"
5871 "\n"
6028 "\n"
5872 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6029 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5873 " is a directory, copies are put in that directory. If dest is a\n"
6030 " is a directory, copies are put in that directory. If dest is a\n"
5874 " file, there can only be one source.\n"
6031 " file, there can only be one source.\n"
5875 "\n"
6032 "\n"
5876 " By default, this command copies the contents of files as they\n"
6033 " By default, this command copies the contents of files as they\n"
5877 " exist in the working directory. If invoked with -A/--after, the\n"
6034 " exist in the working directory. If invoked with -A/--after, the\n"
5878 " operation is recorded, but no copying is performed.\n"
6035 " operation is recorded, but no copying is performed.\n"
5879 "\n"
6036 "\n"
5880 " This command takes effect at the next commit. To undo a rename\n"
6037 " This command takes effect at the next commit. To undo a rename\n"
5881 " before that, see hg revert.\n"
6038 " before that, see hg revert.\n"
5882 " "
6039 " "
5883 msgstr ""
6040 msgstr ""
5884
6041
5885 msgid ""
6042 msgid ""
5886 "retry file merges from a merge or update\n"
6043 "retry file merges from a merge or update\n"
5887 "\n"
6044 "\n"
5888 " This command will cleanly retry unresolved file merges using file\n"
6045 " This command will cleanly retry unresolved file merges using file\n"
5889 " revisions preserved from the last update or merge. To attempt to\n"
6046 " revisions preserved from the last update or merge. To attempt to\n"
5890 " resolve all unresolved files, use the -a/--all switch.\n"
6047 " resolve all unresolved files, use the -a/--all switch.\n"
5891 "\n"
6048 "\n"
5892 " If a conflict is resolved manually, please note that the changes\n"
6049 " If a conflict is resolved manually, please note that the changes\n"
5893 " will be overwritten if the merge is retried with resolve. The\n"
6050 " will be overwritten if the merge is retried with resolve. The\n"
5894 " -m/--mark switch should be used to mark the file as resolved.\n"
6051 " -m/--mark switch should be used to mark the file as resolved.\n"
5895 "\n"
6052 "\n"
5896 " This command also allows listing resolved files and manually\n"
6053 " This command also allows listing resolved files and manually\n"
5897 " indicating whether or not files are resolved. All files must be\n"
6054 " indicating whether or not files are resolved. All files must be\n"
5898 " marked as resolved before a commit is permitted.\n"
6055 " marked as resolved before a commit is permitted.\n"
5899 "\n"
6056 "\n"
5900 " The codes used to show the status of files are:\n"
6057 " The codes used to show the status of files are:\n"
5901 " U = unresolved\n"
6058 " U = unresolved\n"
5902 " R = resolved\n"
6059 " R = resolved\n"
5903 " "
6060 " "
5904 msgstr ""
6061 msgstr ""
5905
6062
5906 msgid "too many options specified"
6063 msgid "too many options specified"
5907 msgstr ""
6064 msgstr ""
5908
6065
5909 msgid "can't specify --all and patterns"
6066 msgid "can't specify --all and patterns"
5910 msgstr ""
6067 msgstr ""
5911
6068
5912 msgid "no files or directories specified; use --all to remerge all files"
6069 msgid "no files or directories specified; use --all to remerge all files"
5913 msgstr ""
6070 msgstr ""
5914
6071
5915 msgid ""
6072 msgid ""
5916 "restore individual files or directories to an earlier state\n"
6073 "restore individual files or directories to an earlier state\n"
5917 "\n"
6074 "\n"
5918 " (Use update -r to check out earlier revisions, revert does not\n"
6075 " (Use update -r to check out earlier revisions, revert does not\n"
5919 " change the working directory parents.)\n"
6076 " change the working directory parents.)\n"
5920 "\n"
6077 "\n"
5921 " With no revision specified, revert the named files or directories\n"
6078 " With no revision specified, revert the named files or directories\n"
5922 " to the contents they had in the parent of the working directory.\n"
6079 " to the contents they had in the parent of the working directory.\n"
5923 " This restores the contents of the affected files to an unmodified\n"
6080 " This restores the contents of the affected files to an unmodified\n"
5924 " state and unschedules adds, removes, copies, and renames. If the\n"
6081 " state and unschedules adds, removes, copies, and renames. If the\n"
5925 " working directory has two parents, you must explicitly specify the\n"
6082 " working directory has two parents, you must explicitly specify the\n"
5926 " revision to revert to.\n"
6083 " revision to revert to.\n"
5927 "\n"
6084 "\n"
5928 " Using the -r/--rev option, revert the given files or directories\n"
6085 " Using the -r/--rev option, revert the given files or directories\n"
5929 " to their contents as of a specific revision. This can be helpful\n"
6086 " to their contents as of a specific revision. This can be helpful\n"
5930 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6087 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5931 " dates' for a list of formats valid for -d/--date.\n"
6088 " dates' for a list of formats valid for -d/--date.\n"
5932 "\n"
6089 "\n"
5933 " Revert modifies the working directory. It does not commit any\n"
6090 " Revert modifies the working directory. It does not commit any\n"
5934 " changes, or change the parent of the working directory. If you\n"
6091 " changes, or change the parent of the working directory. If you\n"
5935 " revert to a revision other than the parent of the working\n"
6092 " revert to a revision other than the parent of the working\n"
5936 " directory, the reverted files will thus appear modified\n"
6093 " directory, the reverted files will thus appear modified\n"
5937 " afterwards.\n"
6094 " afterwards.\n"
5938 "\n"
6095 "\n"
5939 " If a file has been deleted, it is restored. If the executable mode\n"
6096 " If a file has been deleted, it is restored. If the executable mode\n"
5940 " of a file was changed, it is reset.\n"
6097 " of a file was changed, it is reset.\n"
5941 "\n"
6098 "\n"
5942 " If names are given, all files matching the names are reverted.\n"
6099 " If names are given, all files matching the names are reverted.\n"
5943 " If no arguments are given, no files are reverted.\n"
6100 " If no arguments are given, no files are reverted.\n"
5944 "\n"
6101 "\n"
5945 " Modified files are saved with a .orig suffix before reverting.\n"
6102 " Modified files are saved with a .orig suffix before reverting.\n"
5946 " To disable these backups, use --no-backup.\n"
6103 " To disable these backups, use --no-backup.\n"
5947 " "
6104 " "
5948 msgstr ""
6105 msgstr ""
5949
6106
5950 msgid "you can't specify a revision and a date"
6107 msgid "you can't specify a revision and a date"
5951 msgstr ""
6108 msgstr ""
5952
6109
5953 msgid "no files or directories specified; use --all to revert the whole repo"
6110 msgid "no files or directories specified; use --all to revert the whole repo"
5954 msgstr ""
6111 msgstr ""
5955
6112
5956 #, python-format
6113 #, python-format
5957 msgid "forgetting %s\n"
6114 msgid "forgetting %s\n"
5958 msgstr ""
6115 msgstr ""
5959
6116
5960 #, python-format
6117 #, python-format
5961 msgid "reverting %s\n"
6118 msgid "reverting %s\n"
5962 msgstr ""
6119 msgstr ""
5963
6120
5964 #, python-format
6121 #, python-format
5965 msgid "undeleting %s\n"
6122 msgid "undeleting %s\n"
5966 msgstr ""
6123 msgstr ""
5967
6124
5968 #, python-format
6125 #, python-format
5969 msgid "saving current version of %s as %s\n"
6126 msgid "saving current version of %s as %s\n"
5970 msgstr ""
6127 msgstr ""
5971
6128
5972 #, python-format
6129 #, python-format
5973 msgid "file not managed: %s\n"
6130 msgid "file not managed: %s\n"
5974 msgstr ""
6131 msgstr ""
5975
6132
5976 #, python-format
6133 #, python-format
5977 msgid "no changes needed to %s\n"
6134 msgid "no changes needed to %s\n"
5978 msgstr ""
6135 msgstr ""
5979
6136
5980 msgid ""
6137 msgid ""
5981 "roll back the last transaction\n"
6138 "roll back the last transaction\n"
5982 "\n"
6139 "\n"
5983 " This command should be used with care. There is only one level of\n"
6140 " This command should be used with care. There is only one level of\n"
5984 " rollback, and there is no way to undo a rollback. It will also\n"
6141 " rollback, and there is no way to undo a rollback. It will also\n"
5985 " restore the dirstate at the time of the last transaction, losing\n"
6142 " restore the dirstate at the time of the last transaction, losing\n"
5986 " any dirstate changes since that time. This command does not alter\n"
6143 " any dirstate changes since that time. This command does not alter\n"
5987 " the working directory.\n"
6144 " the working directory.\n"
5988 "\n"
6145 "\n"
5989 " Transactions are used to encapsulate the effects of all commands\n"
6146 " Transactions are used to encapsulate the effects of all commands\n"
5990 " that create new changesets or propagate existing changesets into a\n"
6147 " that create new changesets or propagate existing changesets into a\n"
5991 " repository. For example, the following commands are transactional,\n"
6148 " repository. For example, the following commands are transactional,\n"
5992 " and their effects can be rolled back:\n"
6149 " and their effects can be rolled back:\n"
5993 "\n"
6150 "\n"
5994 " commit\n"
6151 " commit\n"
5995 " import\n"
6152 " import\n"
5996 " pull\n"
6153 " pull\n"
5997 " push (with this repository as destination)\n"
6154 " push (with this repository as destination)\n"
5998 " unbundle\n"
6155 " unbundle\n"
5999 "\n"
6156 "\n"
6000 " This command is not intended for use on public repositories. Once\n"
6157 " This command is not intended for use on public repositories. Once\n"
6001 " changes are visible for pull by other users, rolling a transaction\n"
6158 " changes are visible for pull by other users, rolling a transaction\n"
6002 " back locally is ineffective (someone else may already have pulled\n"
6159 " back locally is ineffective (someone else may already have pulled\n"
6003 " the changes). Furthermore, a race is possible with readers of the\n"
6160 " the changes). Furthermore, a race is possible with readers of the\n"
6004 " repository; for example an in-progress pull from the repository\n"
6161 " repository; for example an in-progress pull from the repository\n"
6005 " may fail if a rollback is performed.\n"
6162 " may fail if a rollback is performed.\n"
6006 " "
6163 " "
6007 msgstr ""
6164 msgstr ""
6008
6165
6009 msgid ""
6166 msgid ""
6010 "print the root (top) of the current working directory\n"
6167 "print the root (top) of the current working directory\n"
6011 "\n"
6168 "\n"
6012 " Print the root directory of the current repository.\n"
6169 " Print the root directory of the current repository.\n"
6013 " "
6170 " "
6014 msgstr ""
6171 msgstr ""
6015
6172
6016 msgid ""
6173 msgid ""
6017 "export the repository via HTTP\n"
6174 "export the repository via HTTP\n"
6018 "\n"
6175 "\n"
6019 " Start a local HTTP repository browser and pull server.\n"
6176 " Start a local HTTP repository browser and pull server.\n"
6020 "\n"
6177 "\n"
6021 " By default, the server logs accesses to stdout and errors to\n"
6178 " By default, the server logs accesses to stdout and errors to\n"
6022 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6179 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6023 " files.\n"
6180 " files.\n"
6024 " "
6181 " "
6025 msgstr ""
6182 msgstr ""
6026
6183
6027 #, python-format
6184 #, python-format
6028 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6185 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6029 msgstr ""
6186 msgstr ""
6030
6187
6031 msgid ""
6188 msgid ""
6032 "show changed files in the working directory\n"
6189 "show changed files in the working directory\n"
6033 "\n"
6190 "\n"
6034 " Show status of files in the repository. If names are given, only\n"
6191 " Show status of files in the repository. If names are given, only\n"
6035 " files that match are shown. Files that are clean or ignored or\n"
6192 " files that match are shown. Files that are clean or ignored or\n"
6036 " the source of a copy/move operation, are not listed unless\n"
6193 " the source of a copy/move operation, are not listed unless\n"
6037 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6194 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6038 " Unless options described with \"show only ...\" are given, the\n"
6195 " Unless options described with \"show only ...\" are given, the\n"
6039 " options -mardu are used.\n"
6196 " options -mardu are used.\n"
6040 "\n"
6197 "\n"
6041 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6198 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6042 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6199 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6043 "\n"
6200 "\n"
6044 " NOTE: status may appear to disagree with diff if permissions have\n"
6201 " NOTE: status may appear to disagree with diff if permissions have\n"
6045 " changed or a merge has occurred. The standard diff format does not\n"
6202 " changed or a merge has occurred. The standard diff format does not\n"
6046 " report permission changes and diff only reports changes relative\n"
6203 " report permission changes and diff only reports changes relative\n"
6047 " to one merge parent.\n"
6204 " to one merge parent.\n"
6048 "\n"
6205 "\n"
6049 " If one revision is given, it is used as the base revision.\n"
6206 " If one revision is given, it is used as the base revision.\n"
6050 " If two revisions are given, the differences between them are\n"
6207 " If two revisions are given, the differences between them are\n"
6051 " shown.\n"
6208 " shown.\n"
6052 "\n"
6209 "\n"
6053 " The codes used to show the status of files are:\n"
6210 " The codes used to show the status of files are:\n"
6054 " M = modified\n"
6211 " M = modified\n"
6055 " A = added\n"
6212 " A = added\n"
6056 " R = removed\n"
6213 " R = removed\n"
6057 " C = clean\n"
6214 " C = clean\n"
6058 " ! = missing (deleted by non-hg command, but still tracked)\n"
6215 " ! = missing (deleted by non-hg command, but still tracked)\n"
6059 " ? = not tracked\n"
6216 " ? = not tracked\n"
6060 " I = ignored\n"
6217 " I = ignored\n"
6061 " = origin of the previous file listed as A (added)\n"
6218 " = origin of the previous file listed as A (added)\n"
6062 " "
6219 " "
6063 msgstr ""
6220 msgstr ""
6064
6221
6065 msgid ""
6222 msgid ""
6066 "add one or more tags for the current or given revision\n"
6223 "add one or more tags for the current or given revision\n"
6067 "\n"
6224 "\n"
6068 " Name a particular revision using <name>.\n"
6225 " Name a particular revision using <name>.\n"
6069 "\n"
6226 "\n"
6070 " Tags are used to name particular revisions of the repository and are\n"
6227 " Tags are used to name particular revisions of the repository and are\n"
6071 " very useful to compare different revisions, to go back to significant\n"
6228 " very useful to compare different revisions, to go back to significant\n"
6072 " earlier versions or to mark branch points as releases, etc.\n"
6229 " earlier versions or to mark branch points as releases, etc.\n"
6073 "\n"
6230 "\n"
6074 " If no revision is given, the parent of the working directory is\n"
6231 " If no revision is given, the parent of the working directory is\n"
6075 " used, or tip if no revision is checked out.\n"
6232 " used, or tip if no revision is checked out.\n"
6076 "\n"
6233 "\n"
6077 " To facilitate version control, distribution, and merging of tags,\n"
6234 " To facilitate version control, distribution, and merging of tags,\n"
6078 " they are stored as a file named \".hgtags\" which is managed\n"
6235 " they are stored as a file named \".hgtags\" which is managed\n"
6079 " similarly to other project files and can be hand-edited if\n"
6236 " similarly to other project files and can be hand-edited if\n"
6080 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6237 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6081 " shared among repositories).\n"
6238 " shared among repositories).\n"
6082 "\n"
6239 "\n"
6083 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6240 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6084 " "
6241 " "
6085 msgstr ""
6242 msgstr ""
6086
6243
6087 msgid "tag names must be unique"
6244 msgid "tag names must be unique"
6088 msgstr ""
6245 msgstr ""
6089
6246
6090 #, python-format
6247 #, python-format
6091 msgid "the name '%s' is reserved"
6248 msgid "the name '%s' is reserved"
6092 msgstr ""
6249 msgstr ""
6093
6250
6094 msgid "--rev and --remove are incompatible"
6251 msgid "--rev and --remove are incompatible"
6095 msgstr ""
6252 msgstr ""
6096
6253
6097 #, python-format
6254 #, python-format
6098 msgid "tag '%s' does not exist"
6255 msgid "tag '%s' does not exist"
6099 msgstr ""
6256 msgstr ""
6100
6257
6101 #, python-format
6258 #, python-format
6102 msgid "tag '%s' is not a global tag"
6259 msgid "tag '%s' is not a global tag"
6103 msgstr ""
6260 msgstr ""
6104
6261
6105 #, python-format
6262 #, python-format
6106 msgid "tag '%s' is not a local tag"
6263 msgid "tag '%s' is not a local tag"
6107 msgstr ""
6264 msgstr ""
6108
6265
6109 #, python-format
6266 #, python-format
6110 msgid "Removed tag %s"
6267 msgid "Removed tag %s"
6111 msgstr ""
6268 msgstr ""
6112
6269
6113 #, python-format
6270 #, python-format
6114 msgid "tag '%s' already exists (use -f to force)"
6271 msgid "tag '%s' already exists (use -f to force)"
6115 msgstr ""
6272 msgstr ""
6116
6273
6117 #, python-format
6274 #, python-format
6118 msgid "Added tag %s for changeset %s"
6275 msgid "Added tag %s for changeset %s"
6119 msgstr ""
6276 msgstr ""
6120
6277
6121 msgid ""
6278 msgid ""
6122 "list repository tags\n"
6279 "list repository tags\n"
6123 "\n"
6280 "\n"
6124 " This lists both regular and local tags. When the -v/--verbose\n"
6281 " This lists both regular and local tags. When the -v/--verbose\n"
6125 " switch is used, a third column \"local\" is printed for local tags.\n"
6282 " switch is used, a third column \"local\" is printed for local tags.\n"
6126 " "
6283 " "
6127 msgstr ""
6284 msgstr ""
6128
6285
6129 msgid ""
6286 msgid ""
6130 "show the tip revision\n"
6287 "show the tip revision\n"
6131 "\n"
6288 "\n"
6132 " The tip revision (usually just called the tip) is the changeset\n"
6289 " The tip revision (usually just called the tip) is the changeset\n"
6133 " most recently added to the repository (and therefore the most\n"
6290 " most recently added to the repository (and therefore the most\n"
6134 " recently changed head).\n"
6291 " recently changed head).\n"
6135 "\n"
6292 "\n"
6136 " If you have just made a commit, that commit will be the tip. If\n"
6293 " If you have just made a commit, that commit will be the tip. If\n"
6137 " you have just pulled changes from another repository, the tip of\n"
6294 " you have just pulled changes from another repository, the tip of\n"
6138 " that repository becomes the current tip. The \"tip\" tag is special\n"
6295 " that repository becomes the current tip. The \"tip\" tag is special\n"
6139 " and cannot be renamed or assigned to a different changeset.\n"
6296 " and cannot be renamed or assigned to a different changeset.\n"
6140 " "
6297 " "
6141 msgstr ""
6298 msgstr ""
6142
6299
6143 msgid ""
6300 msgid ""
6144 "apply one or more changegroup files\n"
6301 "apply one or more changegroup files\n"
6145 "\n"
6302 "\n"
6146 " Apply one or more compressed changegroup files generated by the\n"
6303 " Apply one or more compressed changegroup files generated by the\n"
6147 " bundle command.\n"
6304 " bundle command.\n"
6148 " "
6305 " "
6149 msgstr ""
6306 msgstr ""
6150
6307
6151 msgid ""
6308 msgid ""
6152 "update working directory\n"
6309 "update working directory\n"
6153 "\n"
6310 "\n"
6154 " Update the repository's working directory to the specified\n"
6311 " Update the repository's working directory to the specified\n"
6155 " revision, or the tip of the current branch if none is specified.\n"
6312 " revision, or the tip of the current branch if none is specified.\n"
6156 " Use null as the revision to remove the working copy (like 'hg\n"
6313 " Use null as the revision to remove the working copy (like 'hg\n"
6157 " clone -U').\n"
6314 " clone -U').\n"
6158 "\n"
6315 "\n"
6159 " When the working directory contains no uncommitted changes, it\n"
6316 " When the working directory contains no uncommitted changes, it\n"
6160 " will be replaced by the state of the requested revision from the\n"
6317 " will be replaced by the state of the requested revision from the\n"
6161 " repository. When the requested revision is on a different branch,\n"
6318 " repository. When the requested revision is on a different branch,\n"
6162 " the working directory will additionally be switched to that\n"
6319 " the working directory will additionally be switched to that\n"
6163 " branch.\n"
6320 " branch.\n"
6164 "\n"
6321 "\n"
6165 " When there are uncommitted changes, use option -C/--clean to\n"
6322 " When there are uncommitted changes, use option -C/--clean to\n"
6166 " discard them, forcibly replacing the state of the working\n"
6323 " discard them, forcibly replacing the state of the working\n"
6167 " directory with the requested revision. Alternately, use -c/--check\n"
6324 " directory with the requested revision. Alternately, use -c/--check\n"
6168 " to abort.\n"
6325 " to abort.\n"
6169 "\n"
6326 "\n"
6170 " When there are uncommitted changes and option -C/--clean is not\n"
6327 " When there are uncommitted changes and option -C/--clean is not\n"
6171 " used, and the parent revision and requested revision are on the\n"
6328 " used, and the parent revision and requested revision are on the\n"
6172 " same branch, and one of them is an ancestor of the other, then the\n"
6329 " same branch, and one of them is an ancestor of the other, then the\n"
6173 " new working directory will contain the requested revision merged\n"
6330 " new working directory will contain the requested revision merged\n"
6174 " with the uncommitted changes. Otherwise, the update will fail with\n"
6331 " with the uncommitted changes. Otherwise, the update will fail with\n"
6175 " a suggestion to use 'merge' or 'update -C' instead.\n"
6332 " a suggestion to use 'merge' or 'update -C' instead.\n"
6176 "\n"
6333 "\n"
6177 " If you want to update just one file to an older revision, use\n"
6334 " If you want to update just one file to an older revision, use\n"
6178 " revert.\n"
6335 " revert.\n"
6179 "\n"
6336 "\n"
6180 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6337 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6181 " "
6338 " "
6182 msgstr ""
6339 msgstr ""
6183
6340
6184 msgid "uncommitted local changes"
6341 msgid "uncommitted local changes"
6185 msgstr ""
6342 msgstr ""
6186
6343
6187 msgid ""
6344 msgid ""
6188 "verify the integrity of the repository\n"
6345 "verify the integrity of the repository\n"
6189 "\n"
6346 "\n"
6190 " Verify the integrity of the current repository.\n"
6347 " Verify the integrity of the current repository.\n"
6191 "\n"
6348 "\n"
6192 " This will perform an extensive check of the repository's\n"
6349 " This will perform an extensive check of the repository's\n"
6193 " integrity, validating the hashes and checksums of each entry in\n"
6350 " integrity, validating the hashes and checksums of each entry in\n"
6194 " the changelog, manifest, and tracked files, as well as the\n"
6351 " the changelog, manifest, and tracked files, as well as the\n"
6195 " integrity of their crosslinks and indices.\n"
6352 " integrity of their crosslinks and indices.\n"
6196 " "
6353 " "
6197 msgstr ""
6354 msgstr ""
6198
6355
6199 msgid "output version and copyright information"
6356 msgid "output version and copyright information"
6200 msgstr ""
6357 msgstr ""
6201
6358
6202 #, python-format
6359 #, python-format
6203 msgid "Mercurial Distributed SCM (version %s)\n"
6360 msgid "Mercurial Distributed SCM (version %s)\n"
6204 msgstr ""
6361 msgstr ""
6205
6362
6206 msgid ""
6363 msgid ""
6207 "\n"
6364 "\n"
6208 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6365 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6209 "This is free software; see the source for copying conditions. There is NO\n"
6366 "This is free software; see the source for copying conditions. There is NO\n"
6210 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6367 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6211 msgstr ""
6368 msgstr ""
6212
6369
6213 msgid "repository root directory or symbolic path name"
6370 msgid "repository root directory or symbolic path name"
6214 msgstr ""
6371 msgstr ""
6215
6372
6216 msgid "change working directory"
6373 msgid "change working directory"
6217 msgstr ""
6374 msgstr ""
6218
6375
6219 msgid "do not prompt, assume 'yes' for any required answers"
6376 msgid "do not prompt, assume 'yes' for any required answers"
6220 msgstr ""
6377 msgstr ""
6221
6378
6222 msgid "suppress output"
6379 msgid "suppress output"
6223 msgstr ""
6380 msgstr ""
6224
6381
6225 msgid "enable additional output"
6382 msgid "enable additional output"
6226 msgstr ""
6383 msgstr ""
6227
6384
6228 msgid "set/override config option"
6385 msgid "set/override config option"
6229 msgstr ""
6386 msgstr ""
6230
6387
6231 msgid "enable debugging output"
6388 msgid "enable debugging output"
6232 msgstr ""
6389 msgstr ""
6233
6390
6234 msgid "start debugger"
6391 msgid "start debugger"
6235 msgstr ""
6392 msgstr ""
6236
6393
6237 msgid "set the charset encoding"
6394 msgid "set the charset encoding"
6238 msgstr ""
6395 msgstr ""
6239
6396
6240 msgid "set the charset encoding mode"
6397 msgid "set the charset encoding mode"
6241 msgstr ""
6398 msgstr ""
6242
6399
6243 msgid "print traceback on exception"
6400 msgid "print traceback on exception"
6244 msgstr ""
6401 msgstr ""
6245
6402
6246 msgid "time how long the command takes"
6403 msgid "time how long the command takes"
6247 msgstr ""
6404 msgstr ""
6248
6405
6249 msgid "print command execution profile"
6406 msgid "print command execution profile"
6250 msgstr ""
6407 msgstr ""
6251
6408
6252 msgid "output version information and exit"
6409 msgid "output version information and exit"
6253 msgstr ""
6410 msgstr ""
6254
6411
6255 msgid "display help and exit"
6412 msgid "display help and exit"
6256 msgstr ""
6413 msgstr ""
6257
6414
6258 msgid "do not perform actions, just print output"
6415 msgid "do not perform actions, just print output"
6259 msgstr ""
6416 msgstr ""
6260
6417
6261 msgid "specify ssh command to use"
6418 msgid "specify ssh command to use"
6262 msgstr ""
6419 msgstr ""
6263
6420
6264 msgid "specify hg command to run on the remote side"
6421 msgid "specify hg command to run on the remote side"
6265 msgstr ""
6422 msgstr ""
6266
6423
6267 msgid "include names matching the given patterns"
6424 msgid "include names matching the given patterns"
6268 msgstr ""
6425 msgstr ""
6269
6426
6270 msgid "exclude names matching the given patterns"
6427 msgid "exclude names matching the given patterns"
6271 msgstr ""
6428 msgstr ""
6272
6429
6273 msgid "use <text> as commit message"
6430 msgid "use <text> as commit message"
6274 msgstr ""
6431 msgstr ""
6275
6432
6276 msgid "read commit message from <file>"
6433 msgid "read commit message from <file>"
6277 msgstr ""
6434 msgstr ""
6278
6435
6279 msgid "record datecode as commit date"
6436 msgid "record datecode as commit date"
6280 msgstr ""
6437 msgstr ""
6281
6438
6282 msgid "record the specified user as committer"
6439 msgid "record the specified user as committer"
6283 msgstr ""
6440 msgstr ""
6284
6441
6285 msgid "display using template map file"
6442 msgid "display using template map file"
6286 msgstr ""
6443 msgstr ""
6287
6444
6288 msgid "display with template"
6445 msgid "display with template"
6289 msgstr ""
6446 msgstr ""
6290
6447
6291 msgid "do not show merges"
6448 msgid "do not show merges"
6292 msgstr ""
6449 msgstr ""
6293
6450
6294 msgid "treat all files as text"
6451 msgid "treat all files as text"
6295 msgstr ""
6452 msgstr ""
6296
6453
6297 msgid "don't include dates in diff headers"
6454 msgid "don't include dates in diff headers"
6298 msgstr ""
6455 msgstr ""
6299
6456
6300 msgid "show which function each change is in"
6457 msgid "show which function each change is in"
6301 msgstr ""
6458 msgstr ""
6302
6459
6303 msgid "ignore white space when comparing lines"
6460 msgid "ignore white space when comparing lines"
6304 msgstr ""
6461 msgstr ""
6305
6462
6306 msgid "ignore changes in the amount of white space"
6463 msgid "ignore changes in the amount of white space"
6307 msgstr ""
6464 msgstr ""
6308
6465
6309 msgid "ignore changes whose lines are all blank"
6466 msgid "ignore changes whose lines are all blank"
6310 msgstr ""
6467 msgstr ""
6311
6468
6312 msgid "number of lines of context to show"
6469 msgid "number of lines of context to show"
6313 msgstr ""
6470 msgstr ""
6314
6471
6315 msgid "guess renamed files by similarity (0<=s<=100)"
6472 msgid "guess renamed files by similarity (0<=s<=100)"
6316 msgstr ""
6473 msgstr ""
6317
6474
6318 msgid "[OPTION]... [FILE]..."
6475 msgid "[OPTION]... [FILE]..."
6319 msgstr ""
6476 msgstr ""
6320
6477
6321 msgid "annotate the specified revision"
6478 msgid "annotate the specified revision"
6322 msgstr ""
6479 msgstr ""
6323
6480
6324 msgid "follow file copies and renames"
6481 msgid "follow file copies and renames"
6325 msgstr ""
6482 msgstr ""
6326
6483
6327 msgid "list the author (long with -v)"
6484 msgid "list the author (long with -v)"
6328 msgstr ""
6485 msgstr ""
6329
6486
6330 msgid "list the date (short with -q)"
6487 msgid "list the date (short with -q)"
6331 msgstr ""
6488 msgstr ""
6332
6489
6333 msgid "list the revision number (default)"
6490 msgid "list the revision number (default)"
6334 msgstr ""
6491 msgstr ""
6335
6492
6336 msgid "list the changeset"
6493 msgid "list the changeset"
6337 msgstr ""
6494 msgstr ""
6338
6495
6339 msgid "show line number at the first appearance"
6496 msgid "show line number at the first appearance"
6340 msgstr ""
6497 msgstr ""
6341
6498
6342 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6499 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6343 msgstr ""
6500 msgstr ""
6344
6501
6345 msgid "do not pass files through decoders"
6502 msgid "do not pass files through decoders"
6346 msgstr ""
6503 msgstr ""
6347
6504
6348 msgid "directory prefix for files in archive"
6505 msgid "directory prefix for files in archive"
6349 msgstr ""
6506 msgstr ""
6350
6507
6351 msgid "revision to distribute"
6508 msgid "revision to distribute"
6352 msgstr ""
6509 msgstr ""
6353
6510
6354 msgid "type of distribution to create"
6511 msgid "type of distribution to create"
6355 msgstr ""
6512 msgstr ""
6356
6513
6357 msgid "[OPTION]... DEST"
6514 msgid "[OPTION]... DEST"
6358 msgstr ""
6515 msgstr ""
6359
6516
6360 msgid "merge with old dirstate parent after backout"
6517 msgid "merge with old dirstate parent after backout"
6361 msgstr ""
6518 msgstr ""
6362
6519
6363 msgid "parent to choose when backing out merge"
6520 msgid "parent to choose when backing out merge"
6364 msgstr ""
6521 msgstr ""
6365
6522
6366 msgid "revision to backout"
6523 msgid "revision to backout"
6367 msgstr ""
6524 msgstr ""
6368
6525
6369 msgid "[OPTION]... [-r] REV"
6526 msgid "[OPTION]... [-r] REV"
6370 msgstr ""
6527 msgstr ""
6371
6528
6372 msgid "reset bisect state"
6529 msgid "reset bisect state"
6373 msgstr ""
6530 msgstr ""
6374
6531
6375 msgid "mark changeset good"
6532 msgid "mark changeset good"
6376 msgstr ""
6533 msgstr ""
6377
6534
6378 msgid "mark changeset bad"
6535 msgid "mark changeset bad"
6379 msgstr ""
6536 msgstr ""
6380
6537
6381 msgid "skip testing changeset"
6538 msgid "skip testing changeset"
6382 msgstr ""
6539 msgstr ""
6383
6540
6384 msgid "use command to check changeset state"
6541 msgid "use command to check changeset state"
6385 msgstr ""
6542 msgstr ""
6386
6543
6387 msgid "do not update to target"
6544 msgid "do not update to target"
6388 msgstr ""
6545 msgstr ""
6389
6546
6390 msgid "[-gbsr] [-c CMD] [REV]"
6547 msgid "[-gbsr] [-c CMD] [REV]"
6391 msgstr ""
6548 msgstr ""
6392
6549
6393 msgid "set branch name even if it shadows an existing branch"
6550 msgid "set branch name even if it shadows an existing branch"
6394 msgstr ""
6551 msgstr ""
6395
6552
6396 msgid "reset branch name to parent branch name"
6553 msgid "reset branch name to parent branch name"
6397 msgstr ""
6554 msgstr ""
6398
6555
6399 msgid "[-fC] [NAME]"
6556 msgid "[-fC] [NAME]"
6400 msgstr ""
6557 msgstr ""
6401
6558
6402 msgid "show only branches that have unmerged heads"
6559 msgid "show only branches that have unmerged heads"
6403 msgstr ""
6560 msgstr ""
6404
6561
6405 msgid "[-a]"
6562 msgid "[-a]"
6406 msgstr ""
6563 msgstr ""
6407
6564
6408 msgid "run even when remote repository is unrelated"
6565 msgid "run even when remote repository is unrelated"
6409 msgstr ""
6566 msgstr ""
6410
6567
6411 msgid "a changeset up to which you would like to bundle"
6568 msgid "a changeset up to which you would like to bundle"
6412 msgstr ""
6569 msgstr ""
6413
6570
6414 msgid "a base changeset to specify instead of a destination"
6571 msgid "a base changeset to specify instead of a destination"
6415 msgstr ""
6572 msgstr ""
6416
6573
6417 msgid "bundle all changesets in the repository"
6574 msgid "bundle all changesets in the repository"
6418 msgstr ""
6575 msgstr ""
6419
6576
6420 msgid "bundle compression type to use"
6577 msgid "bundle compression type to use"
6421 msgstr ""
6578 msgstr ""
6422
6579
6423 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6580 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6424 msgstr ""
6581 msgstr ""
6425
6582
6426 msgid "print output to file with formatted name"
6583 msgid "print output to file with formatted name"
6427 msgstr ""
6584 msgstr ""
6428
6585
6429 msgid "print the given revision"
6586 msgid "print the given revision"
6430 msgstr ""
6587 msgstr ""
6431
6588
6432 msgid "apply any matching decode filter"
6589 msgid "apply any matching decode filter"
6433 msgstr ""
6590 msgstr ""
6434
6591
6435 msgid "[OPTION]... FILE..."
6592 msgid "[OPTION]... FILE..."
6436 msgstr ""
6593 msgstr ""
6437
6594
6438 msgid "the clone will only contain a repository (no working copy)"
6595 msgid "the clone will only contain a repository (no working copy)"
6439 msgstr ""
6596 msgstr ""
6440
6597
6441 msgid "a changeset you would like to have after cloning"
6598 msgid "a changeset you would like to have after cloning"
6442 msgstr ""
6599 msgstr ""
6443
6600
6444 msgid "[OPTION]... SOURCE [DEST]"
6601 msgid "[OPTION]... SOURCE [DEST]"
6445 msgstr ""
6602 msgstr ""
6446
6603
6447 msgid "mark new/missing files as added/removed before committing"
6604 msgid "mark new/missing files as added/removed before committing"
6448 msgstr ""
6605 msgstr ""
6449
6606
6450 msgid "mark a branch as closed, hiding it from the branch list"
6607 msgid "mark a branch as closed, hiding it from the branch list"
6451 msgstr ""
6608 msgstr ""
6452
6609
6453 msgid "record a copy that has already occurred"
6610 msgid "record a copy that has already occurred"
6454 msgstr ""
6611 msgstr ""
6455
6612
6456 msgid "forcibly copy over an existing managed file"
6613 msgid "forcibly copy over an existing managed file"
6457 msgstr ""
6614 msgstr ""
6458
6615
6459 msgid "[OPTION]... [SOURCE]... DEST"
6616 msgid "[OPTION]... [SOURCE]... DEST"
6460 msgstr ""
6617 msgstr ""
6461
6618
6462 msgid "[INDEX] REV1 REV2"
6619 msgid "[INDEX] REV1 REV2"
6463 msgstr ""
6620 msgstr ""
6464
6621
6465 msgid "[COMMAND]"
6622 msgid "[COMMAND]"
6466 msgstr ""
6623 msgstr ""
6467
6624
6468 msgid "show the command options"
6625 msgid "show the command options"
6469 msgstr ""
6626 msgstr ""
6470
6627
6471 msgid "[-o] CMD"
6628 msgid "[-o] CMD"
6472 msgstr ""
6629 msgstr ""
6473
6630
6474 msgid "try extended date formats"
6631 msgid "try extended date formats"
6475 msgstr ""
6632 msgstr ""
6476
6633
6477 msgid "[-e] DATE [RANGE]"
6634 msgid "[-e] DATE [RANGE]"
6478 msgstr ""
6635 msgstr ""
6479
6636
6480 msgid "FILE REV"
6637 msgid "FILE REV"
6481 msgstr ""
6638 msgstr ""
6482
6639
6483 msgid "[PATH]"
6640 msgid "[PATH]"
6484 msgstr ""
6641 msgstr ""
6485
6642
6486 msgid "FILE"
6643 msgid "FILE"
6487 msgstr ""
6644 msgstr ""
6488
6645
6489 msgid "revision to rebuild to"
6646 msgid "revision to rebuild to"
6490 msgstr ""
6647 msgstr ""
6491
6648
6492 msgid "[-r REV] [REV]"
6649 msgid "[-r REV] [REV]"
6493 msgstr ""
6650 msgstr ""
6494
6651
6495 msgid "revision to debug"
6652 msgid "revision to debug"
6496 msgstr ""
6653 msgstr ""
6497
6654
6498 msgid "[-r REV] FILE"
6655 msgid "[-r REV] FILE"
6499 msgstr ""
6656 msgstr ""
6500
6657
6501 msgid "REV1 [REV2]"
6658 msgid "REV1 [REV2]"
6502 msgstr ""
6659 msgstr ""
6503
6660
6504 msgid "do not display the saved mtime"
6661 msgid "do not display the saved mtime"
6505 msgstr ""
6662 msgstr ""
6506
6663
6507 msgid "[OPTION]..."
6664 msgid "[OPTION]..."
6508 msgstr ""
6665 msgstr ""
6509
6666
6510 msgid "revision to check"
6667 msgid "revision to check"
6511 msgstr ""
6668 msgstr ""
6512
6669
6513 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6670 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6514 msgstr ""
6671 msgstr ""
6515
6672
6516 msgid "diff against the second parent"
6673 msgid "diff against the second parent"
6517 msgstr ""
6674 msgstr ""
6518
6675
6519 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6676 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6520 msgstr ""
6677 msgstr ""
6521
6678
6522 msgid "end fields with NUL"
6679 msgid "end fields with NUL"
6523 msgstr ""
6680 msgstr ""
6524
6681
6525 msgid "print all revisions that match"
6682 msgid "print all revisions that match"
6526 msgstr ""
6683 msgstr ""
6527
6684
6528 msgid "follow changeset history, or file history across copies and renames"
6685 msgid "follow changeset history, or file history across copies and renames"
6529 msgstr ""
6686 msgstr ""
6530
6687
6531 msgid "ignore case when matching"
6688 msgid "ignore case when matching"
6532 msgstr ""
6689 msgstr ""
6533
6690
6534 msgid "print only filenames and revisions that match"
6691 msgid "print only filenames and revisions that match"
6535 msgstr ""
6692 msgstr ""
6536
6693
6537 msgid "print matching line numbers"
6694 msgid "print matching line numbers"
6538 msgstr ""
6695 msgstr ""
6539
6696
6540 msgid "search in given revision range"
6697 msgid "search in given revision range"
6541 msgstr ""
6698 msgstr ""
6542
6699
6543 msgid "[OPTION]... PATTERN [FILE]..."
6700 msgid "[OPTION]... PATTERN [FILE]..."
6544 msgstr ""
6701 msgstr ""
6545
6702
6546 msgid "show only heads which are descendants of REV"
6703 msgid "show only heads which are descendants of REV"
6547 msgstr ""
6704 msgstr ""
6548
6705
6549 msgid "show only the active heads from open branches"
6706 msgid "show only the active heads from open branches"
6550 msgstr ""
6707 msgstr ""
6551
6708
6552 msgid "show normal and closed heads"
6709 msgid "show normal and closed heads"
6553 msgstr ""
6710 msgstr ""
6554
6711
6555 msgid "[-r STARTREV] [REV]..."
6712 msgid "[-r STARTREV] [REV]..."
6556 msgstr ""
6713 msgstr ""
6557
6714
6558 msgid "[TOPIC]"
6715 msgid "[TOPIC]"
6559 msgstr ""
6716 msgstr ""
6560
6717
6561 msgid "identify the specified revision"
6718 msgid "identify the specified revision"
6562 msgstr ""
6719 msgstr ""
6563
6720
6564 msgid "show local revision number"
6721 msgid "show local revision number"
6565 msgstr ""
6722 msgstr ""
6566
6723
6567 msgid "show global revision id"
6724 msgid "show global revision id"
6568 msgstr ""
6725 msgstr ""
6569
6726
6570 msgid "show branch"
6727 msgid "show branch"
6571 msgstr ""
6728 msgstr ""
6572
6729
6573 msgid "show tags"
6730 msgid "show tags"
6574 msgstr ""
6731 msgstr ""
6575
6732
6576 msgid "[-nibt] [-r REV] [SOURCE]"
6733 msgid "[-nibt] [-r REV] [SOURCE]"
6577 msgstr ""
6734 msgstr ""
6578
6735
6579 msgid ""
6736 msgid ""
6580 "directory strip option for patch. This has the same meaning as the "
6737 "directory strip option for patch. This has the same meaning as the "
6581 "corresponding patch option"
6738 "corresponding patch option"
6582 msgstr ""
6739 msgstr ""
6583
6740
6584 msgid "base path"
6741 msgid "base path"
6585 msgstr ""
6742 msgstr ""
6586
6743
6587 msgid "skip check for outstanding uncommitted changes"
6744 msgid "skip check for outstanding uncommitted changes"
6588 msgstr ""
6745 msgstr ""
6589
6746
6590 msgid "don't commit, just update the working directory"
6747 msgid "don't commit, just update the working directory"
6591 msgstr ""
6748 msgstr ""
6592
6749
6593 msgid "apply patch to the nodes from which it was generated"
6750 msgid "apply patch to the nodes from which it was generated"
6594 msgstr ""
6751 msgstr ""
6595
6752
6596 msgid "use any branch information in patch (implied by --exact)"
6753 msgid "use any branch information in patch (implied by --exact)"
6597 msgstr ""
6754 msgstr ""
6598
6755
6599 msgid "[OPTION]... PATCH..."
6756 msgid "[OPTION]... PATCH..."
6600 msgstr ""
6757 msgstr ""
6601
6758
6602 msgid "show newest record first"
6759 msgid "show newest record first"
6603 msgstr ""
6760 msgstr ""
6604
6761
6605 msgid "file to store the bundles into"
6762 msgid "file to store the bundles into"
6606 msgstr ""
6763 msgstr ""
6607
6764
6608 msgid "a specific revision up to which you would like to pull"
6765 msgid "a specific revision up to which you would like to pull"
6609 msgstr ""
6766 msgstr ""
6610
6767
6611 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6768 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6612 msgstr ""
6769 msgstr ""
6613
6770
6614 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6771 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6615 msgstr ""
6772 msgstr ""
6616
6773
6617 msgid "search the repository as it stood at REV"
6774 msgid "search the repository as it stood at REV"
6618 msgstr ""
6775 msgstr ""
6619
6776
6620 msgid "end filenames with NUL, for use with xargs"
6777 msgid "end filenames with NUL, for use with xargs"
6621 msgstr ""
6778 msgstr ""
6622
6779
6623 msgid "print complete paths from the filesystem root"
6780 msgid "print complete paths from the filesystem root"
6624 msgstr ""
6781 msgstr ""
6625
6782
6626 msgid "[OPTION]... [PATTERN]..."
6783 msgid "[OPTION]... [PATTERN]..."
6627 msgstr ""
6784 msgstr ""
6628
6785
6629 msgid "only follow the first parent of merge changesets"
6786 msgid "only follow the first parent of merge changesets"
6630 msgstr ""
6787 msgstr ""
6631
6788
6632 msgid "show revisions matching date spec"
6789 msgid "show revisions matching date spec"
6633 msgstr ""
6790 msgstr ""
6634
6791
6635 msgid "show copied files"
6792 msgid "show copied files"
6636 msgstr ""
6793 msgstr ""
6637
6794
6638 msgid "do case-insensitive search for a keyword"
6795 msgid "do case-insensitive search for a keyword"
6639 msgstr ""
6796 msgstr ""
6640
6797
6641 msgid "include revisions where files were removed"
6798 msgid "include revisions where files were removed"
6642 msgstr ""
6799 msgstr ""
6643
6800
6644 msgid "show only merges"
6801 msgid "show only merges"
6645 msgstr ""
6802 msgstr ""
6646
6803
6647 msgid "revisions committed by user"
6804 msgid "revisions committed by user"
6648 msgstr ""
6805 msgstr ""
6649
6806
6650 msgid "show only changesets within the given named branch"
6807 msgid "show only changesets within the given named branch"
6651 msgstr ""
6808 msgstr ""
6652
6809
6653 msgid "do not display revision or any of its ancestors"
6810 msgid "do not display revision or any of its ancestors"
6654 msgstr ""
6811 msgstr ""
6655
6812
6656 msgid "[OPTION]... [FILE]"
6813 msgid "[OPTION]... [FILE]"
6657 msgstr ""
6814 msgstr ""
6658
6815
6659 msgid "revision to display"
6816 msgid "revision to display"
6660 msgstr ""
6817 msgstr ""
6661
6818
6662 msgid "[-r REV]"
6819 msgid "[-r REV]"
6663 msgstr ""
6820 msgstr ""
6664
6821
6665 msgid "force a merge with outstanding changes"
6822 msgid "force a merge with outstanding changes"
6666 msgstr ""
6823 msgstr ""
6667
6824
6668 msgid "revision to merge"
6825 msgid "revision to merge"
6669 msgstr ""
6826 msgstr ""
6670
6827
6671 msgid "review revisions to merge (no merge is performed)"
6828 msgid "review revisions to merge (no merge is performed)"
6672 msgstr ""
6829 msgstr ""
6673
6830
6674 msgid "[-f] [[-r] REV]"
6831 msgid "[-f] [[-r] REV]"
6675 msgstr ""
6832 msgstr ""
6676
6833
6677 msgid "a specific revision up to which you would like to push"
6834 msgid "a specific revision up to which you would like to push"
6678 msgstr ""
6835 msgstr ""
6679
6836
6680 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6837 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6681 msgstr ""
6838 msgstr ""
6682
6839
6683 msgid "show parents from the specified revision"
6840 msgid "show parents from the specified revision"
6684 msgstr ""
6841 msgstr ""
6685
6842
6686 msgid "[-r REV] [FILE]"
6843 msgid "[-r REV] [FILE]"
6687 msgstr ""
6844 msgstr ""
6688
6845
6689 msgid "[NAME]"
6846 msgid "[NAME]"
6690 msgstr ""
6847 msgstr ""
6691
6848
6692 msgid "update to new tip if changesets were pulled"
6849 msgid "update to new tip if changesets were pulled"
6693 msgstr ""
6850 msgstr ""
6694
6851
6695 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6852 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6696 msgstr ""
6853 msgstr ""
6697
6854
6698 msgid "force push"
6855 msgid "force push"
6699 msgstr ""
6856 msgstr ""
6700
6857
6701 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6858 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6702 msgstr ""
6859 msgstr ""
6703
6860
6704 msgid "record delete for missing files"
6861 msgid "record delete for missing files"
6705 msgstr ""
6862 msgstr ""
6706
6863
6707 msgid "remove (and delete) file even if added or modified"
6864 msgid "remove (and delete) file even if added or modified"
6708 msgstr ""
6865 msgstr ""
6709
6866
6710 msgid "record a rename that has already occurred"
6867 msgid "record a rename that has already occurred"
6711 msgstr ""
6868 msgstr ""
6712
6869
6713 msgid "[OPTION]... SOURCE... DEST"
6870 msgid "[OPTION]... SOURCE... DEST"
6714 msgstr ""
6871 msgstr ""
6715
6872
6716 msgid "remerge all unresolved files"
6873 msgid "remerge all unresolved files"
6717 msgstr ""
6874 msgstr ""
6718
6875
6719 msgid "list state of files needing merge"
6876 msgid "list state of files needing merge"
6720 msgstr ""
6877 msgstr ""
6721
6878
6722 msgid "mark files as resolved"
6879 msgid "mark files as resolved"
6723 msgstr ""
6880 msgstr ""
6724
6881
6725 msgid "unmark files as resolved"
6882 msgid "unmark files as resolved"
6726 msgstr ""
6883 msgstr ""
6727
6884
6728 msgid "revert all changes when no arguments given"
6885 msgid "revert all changes when no arguments given"
6729 msgstr ""
6886 msgstr ""
6730
6887
6731 msgid "tipmost revision matching date"
6888 msgid "tipmost revision matching date"
6732 msgstr ""
6889 msgstr ""
6733
6890
6734 msgid "revision to revert to"
6891 msgid "revision to revert to"
6735 msgstr ""
6892 msgstr ""
6736
6893
6737 msgid "do not save backup copies of files"
6894 msgid "do not save backup copies of files"
6738 msgstr ""
6895 msgstr ""
6739
6896
6740 msgid "[OPTION]... [-r REV] [NAME]..."
6897 msgid "[OPTION]... [-r REV] [NAME]..."
6741 msgstr ""
6898 msgstr ""
6742
6899
6743 msgid "name of access log file to write to"
6900 msgid "name of access log file to write to"
6744 msgstr ""
6901 msgstr ""
6745
6902
6746 msgid "name of error log file to write to"
6903 msgid "name of error log file to write to"
6747 msgstr ""
6904 msgstr ""
6748
6905
6749 msgid "port to listen on (default: 8000)"
6906 msgid "port to listen on (default: 8000)"
6750 msgstr ""
6907 msgstr ""
6751
6908
6752 msgid "address to listen on (default: all interfaces)"
6909 msgid "address to listen on (default: all interfaces)"
6753 msgstr ""
6910 msgstr ""
6754
6911
6755 msgid "prefix path to serve from (default: server root)"
6912 msgid "prefix path to serve from (default: server root)"
6756 msgstr ""
6913 msgstr ""
6757
6914
6758 msgid "name to show in web pages (default: working directory)"
6915 msgid "name to show in web pages (default: working directory)"
6759 msgstr ""
6916 msgstr ""
6760
6917
6761 msgid "name of the webdir config file (serve more than one repository)"
6918 msgid "name of the webdir config file (serve more than one repository)"
6762 msgstr ""
6919 msgstr ""
6763
6920
6764 msgid "for remote clients"
6921 msgid "for remote clients"
6765 msgstr ""
6922 msgstr ""
6766
6923
6767 msgid "web templates to use"
6924 msgid "web templates to use"
6768 msgstr ""
6925 msgstr ""
6769
6926
6770 msgid "template style to use"
6927 msgid "template style to use"
6771 msgstr ""
6928 msgstr ""
6772
6929
6773 msgid "use IPv6 in addition to IPv4"
6930 msgid "use IPv6 in addition to IPv4"
6774 msgstr ""
6931 msgstr ""
6775
6932
6776 msgid "SSL certificate file"
6933 msgid "SSL certificate file"
6777 msgstr ""
6934 msgstr ""
6778
6935
6779 msgid "show untrusted configuration options"
6936 msgid "show untrusted configuration options"
6780 msgstr ""
6937 msgstr ""
6781
6938
6782 msgid "[-u] [NAME]..."
6939 msgid "[-u] [NAME]..."
6783 msgstr ""
6940 msgstr ""
6784
6941
6785 msgid "show status of all files"
6942 msgid "show status of all files"
6786 msgstr ""
6943 msgstr ""
6787
6944
6788 msgid "show only modified files"
6945 msgid "show only modified files"
6789 msgstr ""
6946 msgstr ""
6790
6947
6791 msgid "show only added files"
6948 msgid "show only added files"
6792 msgstr ""
6949 msgstr ""
6793
6950
6794 msgid "show only removed files"
6951 msgid "show only removed files"
6795 msgstr ""
6952 msgstr ""
6796
6953
6797 msgid "show only deleted (but tracked) files"
6954 msgid "show only deleted (but tracked) files"
6798 msgstr ""
6955 msgstr ""
6799
6956
6800 msgid "show only files without changes"
6957 msgid "show only files without changes"
6801 msgstr ""
6958 msgstr ""
6802
6959
6803 msgid "show only unknown (not tracked) files"
6960 msgid "show only unknown (not tracked) files"
6804 msgstr ""
6961 msgstr ""
6805
6962
6806 msgid "show only ignored files"
6963 msgid "show only ignored files"
6807 msgstr ""
6964 msgstr ""
6808
6965
6809 msgid "hide status prefix"
6966 msgid "hide status prefix"
6810 msgstr ""
6967 msgstr ""
6811
6968
6812 msgid "show source of copied files"
6969 msgid "show source of copied files"
6813 msgstr ""
6970 msgstr ""
6814
6971
6815 msgid "show difference from revision"
6972 msgid "show difference from revision"
6816 msgstr ""
6973 msgstr ""
6817
6974
6818 msgid "replace existing tag"
6975 msgid "replace existing tag"
6819 msgstr ""
6976 msgstr ""
6820
6977
6821 msgid "make the tag local"
6978 msgid "make the tag local"
6822 msgstr ""
6979 msgstr ""
6823
6980
6824 msgid "revision to tag"
6981 msgid "revision to tag"
6825 msgstr ""
6982 msgstr ""
6826
6983
6827 msgid "remove a tag"
6984 msgid "remove a tag"
6828 msgstr ""
6985 msgstr ""
6829
6986
6830 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6987 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6831 msgstr ""
6988 msgstr ""
6832
6989
6833 msgid "[-p]"
6990 msgid "[-p]"
6834 msgstr ""
6991 msgstr ""
6835
6992
6836 msgid "update to new tip if changesets were unbundled"
6993 msgid "update to new tip if changesets were unbundled"
6837 msgstr ""
6994 msgstr ""
6838
6995
6839 msgid "[-u] FILE..."
6996 msgid "[-u] FILE..."
6840 msgstr ""
6997 msgstr ""
6841
6998
6842 msgid "overwrite locally modified files (no backup)"
6999 msgid "overwrite locally modified files (no backup)"
6843 msgstr ""
7000 msgstr ""
6844
7001
6845 msgid "check for uncommitted changes"
7002 msgid "check for uncommitted changes"
6846 msgstr ""
7003 msgstr ""
6847
7004
6848 msgid "[-C] [-d DATE] [[-r] REV]"
7005 msgid "[-C] [-d DATE] [[-r] REV]"
6849 msgstr ""
7006 msgstr ""
6850
7007
6851 #, python-format
7008 #, python-format
6852 msgid "config error at %s:%d: '%s'"
7009 msgid "config error at %s:%d: '%s'"
6853 msgstr ""
7010 msgstr ""
6854
7011
6855 msgid "not found in manifest"
7012 msgid "not found in manifest"
6856 msgstr ""
7013 msgstr ""
6857
7014
6858 msgid "branch name not in UTF-8!"
7015 msgid "branch name not in UTF-8!"
6859 msgstr ""
7016 msgstr ""
6860
7017
6861 #, python-format
7018 #, python-format
6862 msgid " searching for copies back to rev %d\n"
7019 msgid " searching for copies back to rev %d\n"
6863 msgstr ""
7020 msgstr ""
6864
7021
6865 #, python-format
7022 #, python-format
6866 msgid ""
7023 msgid ""
6867 " unmatched files in local:\n"
7024 " unmatched files in local:\n"
6868 " %s\n"
7025 " %s\n"
6869 msgstr ""
7026 msgstr ""
6870
7027
6871 #, python-format
7028 #, python-format
6872 msgid ""
7029 msgid ""
6873 " unmatched files in other:\n"
7030 " unmatched files in other:\n"
6874 " %s\n"
7031 " %s\n"
6875 msgstr ""
7032 msgstr ""
6876
7033
6877 msgid " all copies found (* = to merge, ! = divergent):\n"
7034 msgid " all copies found (* = to merge, ! = divergent):\n"
6878 msgstr ""
7035 msgstr ""
6879
7036
6880 msgid " checking for directory renames\n"
7037 msgid " checking for directory renames\n"
6881 msgstr ""
7038 msgstr ""
6882
7039
6883 #, python-format
7040 #, python-format
6884 msgid " dir %s -> %s\n"
7041 msgid " dir %s -> %s\n"
6885 msgstr ""
7042 msgstr ""
6886
7043
6887 #, python-format
7044 #, python-format
6888 msgid " file %s -> %s\n"
7045 msgid " file %s -> %s\n"
6889 msgstr ""
7046 msgstr ""
6890
7047
6891 msgid "working directory state appears damaged!"
7048 msgid "working directory state appears damaged!"
6892 msgstr ""
7049 msgstr ""
6893
7050
6894 #, python-format
7051 #, python-format
6895 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7052 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6896 msgstr ""
7053 msgstr ""
6897
7054
6898 #, python-format
7055 #, python-format
6899 msgid "directory %r already in dirstate"
7056 msgid "directory %r already in dirstate"
6900 msgstr ""
7057 msgstr ""
6901
7058
6902 #, python-format
7059 #, python-format
6903 msgid "file %r in dirstate clashes with %r"
7060 msgid "file %r in dirstate clashes with %r"
6904 msgstr ""
7061 msgstr ""
6905
7062
6906 #, python-format
7063 #, python-format
6907 msgid "not in dirstate: %s\n"
7064 msgid "not in dirstate: %s\n"
6908 msgstr ""
7065 msgstr ""
6909
7066
6910 msgid "unknown"
7067 msgid "unknown"
6911 msgstr ""
7068 msgstr ""
6912
7069
6913 msgid "character device"
7070 msgid "character device"
6914 msgstr ""
7071 msgstr ""
6915
7072
6916 msgid "block device"
7073 msgid "block device"
6917 msgstr ""
7074 msgstr ""
6918
7075
6919 msgid "fifo"
7076 msgid "fifo"
6920 msgstr ""
7077 msgstr ""
6921
7078
6922 msgid "socket"
7079 msgid "socket"
6923 msgstr ""
7080 msgstr ""
6924
7081
6925 msgid "directory"
7082 msgid "directory"
6926 msgstr ""
7083 msgstr ""
6927
7084
6928 #, python-format
7085 #, python-format
6929 msgid "unsupported file type (type is %s)"
7086 msgid "unsupported file type (type is %s)"
6930 msgstr ""
7087 msgstr ""
6931
7088
6932 #, python-format
7089 #, python-format
6933 msgid "abort: %s\n"
7090 msgid "abort: %s\n"
6934 msgstr ""
7091 msgstr ""
6935
7092
6936 #, python-format
7093 #, python-format
6937 msgid ""
7094 msgid ""
6938 "hg: command '%s' is ambiguous:\n"
7095 "hg: command '%s' is ambiguous:\n"
6939 " %s\n"
7096 " %s\n"
6940 msgstr ""
7097 msgstr ""
6941
7098
6942 #, python-format
7099 #, python-format
6943 msgid "hg: %s\n"
7100 msgid "hg: %s\n"
6944 msgstr ""
7101 msgstr ""
6945
7102
6946 #, python-format
7103 #, python-format
6947 msgid "timed out waiting for lock held by %s"
7104 msgid "timed out waiting for lock held by %s"
6948 msgstr ""
7105 msgstr ""
6949
7106
6950 #, python-format
7107 #, python-format
6951 msgid "lock held by %s"
7108 msgid "lock held by %s"
6952 msgstr ""
7109 msgstr ""
6953
7110
6954 #, python-format
7111 #, python-format
6955 msgid "abort: %s: %s\n"
7112 msgid "abort: %s: %s\n"
6956 msgstr ""
7113 msgstr ""
6957
7114
6958 #, python-format
7115 #, python-format
6959 msgid "abort: could not lock %s: %s\n"
7116 msgid "abort: could not lock %s: %s\n"
6960 msgstr ""
7117 msgstr ""
6961
7118
6962 #, python-format
7119 #, python-format
6963 msgid "hg %s: %s\n"
7120 msgid "hg %s: %s\n"
6964 msgstr ""
7121 msgstr ""
6965
7122
6966 #, python-format
7123 #, python-format
6967 msgid "abort: %s!\n"
7124 msgid "abort: %s!\n"
6968 msgstr ""
7125 msgstr ""
6969
7126
6970 #, python-format
7127 #, python-format
6971 msgid "abort: %s"
7128 msgid "abort: %s"
6972 msgstr ""
7129 msgstr ""
6973
7130
6974 msgid " empty string\n"
7131 msgid " empty string\n"
6975 msgstr ""
7132 msgstr ""
6976
7133
6977 msgid "killed!\n"
7134 msgid "killed!\n"
6978 msgstr ""
7135 msgstr ""
6979
7136
6980 #, python-format
7137 #, python-format
6981 msgid "hg: unknown command '%s'\n"
7138 msgid "hg: unknown command '%s'\n"
6982 msgstr ""
7139 msgstr ""
6983
7140
6984 #, python-format
7141 #, python-format
6985 msgid "abort: could not import module %s!\n"
7142 msgid "abort: could not import module %s!\n"
6986 msgstr ""
7143 msgstr ""
6987
7144
6988 msgid "(did you forget to compile extensions?)\n"
7145 msgid "(did you forget to compile extensions?)\n"
6989 msgstr ""
7146 msgstr ""
6990
7147
6991 msgid "(is your Python install correct?)\n"
7148 msgid "(is your Python install correct?)\n"
6992 msgstr ""
7149 msgstr ""
6993
7150
6994 #, python-format
7151 #, python-format
6995 msgid "abort: error: %s\n"
7152 msgid "abort: error: %s\n"
6996 msgstr ""
7153 msgstr ""
6997
7154
6998 msgid "broken pipe\n"
7155 msgid "broken pipe\n"
6999 msgstr ""
7156 msgstr ""
7000
7157
7001 msgid "interrupted!\n"
7158 msgid "interrupted!\n"
7002 msgstr ""
7159 msgstr ""
7003
7160
7004 msgid ""
7161 msgid ""
7005 "\n"
7162 "\n"
7006 "broken pipe\n"
7163 "broken pipe\n"
7007 msgstr ""
7164 msgstr ""
7008
7165
7009 msgid "abort: out of memory\n"
7166 msgid "abort: out of memory\n"
7010 msgstr ""
7167 msgstr ""
7011
7168
7012 msgid "** unknown exception encountered, details follow\n"
7169 msgid "** unknown exception encountered, details follow\n"
7013 msgstr ""
7170 msgstr ""
7014
7171
7015 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7172 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7016 msgstr ""
7173 msgstr ""
7017
7174
7018 msgid "** or mercurial@selenic.com\n"
7175 msgid "** or mercurial@selenic.com\n"
7019 msgstr ""
7176 msgstr ""
7020
7177
7021 #, python-format
7178 #, python-format
7022 msgid "** Mercurial Distributed SCM (version %s)\n"
7179 msgid "** Mercurial Distributed SCM (version %s)\n"
7023 msgstr ""
7180 msgstr ""
7024
7181
7025 #, python-format
7182 #, python-format
7026 msgid "** Extensions loaded: %s\n"
7183 msgid "** Extensions loaded: %s\n"
7027 msgstr ""
7184 msgstr ""
7028
7185
7029 #, python-format
7186 #, python-format
7030 msgid "no definition for alias '%s'\n"
7187 msgid "no definition for alias '%s'\n"
7031 msgstr ""
7188 msgstr ""
7032
7189
7033 #, python-format
7190 #, python-format
7034 msgid "alias '%s' resolves to unknown command '%s'\n"
7191 msgid "alias '%s' resolves to unknown command '%s'\n"
7035 msgstr ""
7192 msgstr ""
7036
7193
7037 #, python-format
7194 #, python-format
7038 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7195 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7039 msgstr ""
7196 msgstr ""
7040
7197
7041 #, python-format
7198 #, python-format
7042 msgid "alias '%s' shadows command\n"
7199 msgid "alias '%s' shadows command\n"
7043 msgstr ""
7200 msgstr ""
7044
7201
7045 #, python-format
7202 #, python-format
7046 msgid "malformed --config option: %s"
7203 msgid "malformed --config option: %s"
7047 msgstr ""
7204 msgstr ""
7048
7205
7049 #, python-format
7206 #, python-format
7050 msgid "extension '%s' overrides commands: %s\n"
7207 msgid "extension '%s' overrides commands: %s\n"
7051 msgstr ""
7208 msgstr ""
7052
7209
7053 msgid "Option --config may not be abbreviated!"
7210 msgid "Option --config may not be abbreviated!"
7054 msgstr ""
7211 msgstr ""
7055
7212
7056 msgid "Option --cwd may not be abbreviated!"
7213 msgid "Option --cwd may not be abbreviated!"
7057 msgstr ""
7214 msgstr ""
7058
7215
7059 msgid ""
7216 msgid ""
7060 "Option -R has to be separated from other options (e.g. not -qR) and --"
7217 "Option -R has to be separated from other options (e.g. not -qR) and --"
7061 "repository may only be abbreviated as --repo!"
7218 "repository may only be abbreviated as --repo!"
7062 msgstr ""
7219 msgstr ""
7063
7220
7064 #, python-format
7221 #, python-format
7065 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7222 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7066 msgstr ""
7223 msgstr ""
7067
7224
7068 #, python-format
7225 #, python-format
7069 msgid "repository '%s' is not local"
7226 msgid "repository '%s' is not local"
7070 msgstr ""
7227 msgstr ""
7071
7228
7072 msgid "invalid arguments"
7229 msgid "invalid arguments"
7073 msgstr ""
7230 msgstr ""
7074
7231
7075 #, python-format
7232 #, python-format
7076 msgid "unrecognized profiling format '%s' - Ignored\n"
7233 msgid "unrecognized profiling format '%s' - Ignored\n"
7077 msgstr ""
7234 msgstr ""
7078
7235
7079 msgid ""
7236 msgid ""
7080 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7237 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7081 "misc/lsprof/"
7238 "misc/lsprof/"
7082 msgstr ""
7239 msgstr ""
7083
7240
7084 #, python-format
7241 #, python-format
7085 msgid "*** failed to import extension %s from %s: %s\n"
7242 msgid "*** failed to import extension %s from %s: %s\n"
7086 msgstr ""
7243 msgstr ""
7087
7244
7088 #, python-format
7245 #, python-format
7089 msgid "*** failed to import extension %s: %s\n"
7246 msgid "*** failed to import extension %s: %s\n"
7090 msgstr ""
7247 msgstr ""
7091
7248
7092 #, python-format
7249 #, python-format
7093 msgid "couldn't find merge tool %s\n"
7250 msgid "couldn't find merge tool %s\n"
7094 msgstr ""
7251 msgstr ""
7095
7252
7096 #, python-format
7253 #, python-format
7097 msgid "tool %s can't handle symlinks\n"
7254 msgid "tool %s can't handle symlinks\n"
7098 msgstr ""
7255 msgstr ""
7099
7256
7100 #, python-format
7257 #, python-format
7101 msgid "tool %s can't handle binary\n"
7258 msgid "tool %s can't handle binary\n"
7102 msgstr ""
7259 msgstr ""
7103
7260
7104 #, python-format
7261 #, python-format
7105 msgid "tool %s requires a GUI\n"
7262 msgid "tool %s requires a GUI\n"
7106 msgstr ""
7263 msgstr ""
7107
7264
7108 #, python-format
7265 #, python-format
7109 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7266 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7110 msgstr ""
7267 msgstr ""
7111
7268
7112 #, python-format
7269 #, python-format
7113 msgid ""
7270 msgid ""
7114 " no tool found to merge %s\n"
7271 " no tool found to merge %s\n"
7115 "keep (l)ocal or take (o)ther?"
7272 "keep (l)ocal or take (o)ther?"
7116 msgstr ""
7273 msgstr ""
7117
7274
7118 msgid "&Local"
7275 msgid "&Local"
7119 msgstr ""
7276 msgstr ""
7120
7277
7121 msgid "&Other"
7278 msgid "&Other"
7122 msgstr ""
7279 msgstr ""
7123
7280
7124 msgid "l"
7281 msgid "l"
7125 msgstr ""
7282 msgstr ""
7126
7283
7127 #, python-format
7284 #, python-format
7128 msgid "merging %s and %s to %s\n"
7285 msgid "merging %s and %s to %s\n"
7129 msgstr ""
7286 msgstr ""
7130
7287
7131 #, python-format
7288 #, python-format
7132 msgid "merging %s\n"
7289 msgid "merging %s\n"
7133 msgstr ""
7290 msgstr ""
7134
7291
7135 #, python-format
7292 #, python-format
7136 msgid "my %s other %s ancestor %s\n"
7293 msgid "my %s other %s ancestor %s\n"
7137 msgstr ""
7294 msgstr ""
7138
7295
7139 msgid " premerge successful\n"
7296 msgid " premerge successful\n"
7140 msgstr ""
7297 msgstr ""
7141
7298
7142 #, python-format
7299 #, python-format
7143 msgid ""
7300 msgid ""
7144 " output file %s appears unchanged\n"
7301 " output file %s appears unchanged\n"
7145 "was merge successful (yn)?"
7302 "was merge successful (yn)?"
7146 msgstr ""
7303 msgstr ""
7147
7304
7148 msgid "&No"
7305 msgid "&No"
7149 msgstr ""
7306 msgstr ""
7150
7307
7151 msgid "&Yes"
7308 msgid "&Yes"
7152 msgstr ""
7309 msgstr ""
7153
7310
7154 msgid "n"
7311 msgid "n"
7155 msgstr ""
7312 msgstr ""
7156
7313
7157 #, python-format
7314 #, python-format
7158 msgid "merging %s failed!\n"
7315 msgid "merging %s failed!\n"
7159 msgstr ""
7316 msgstr ""
7160
7317
7161 #, python-format
7318 #, python-format
7162 msgid "Inconsistent state, %s:%s is good and bad"
7319 msgid "Inconsistent state, %s:%s is good and bad"
7163 msgstr ""
7320 msgstr ""
7164
7321
7165 #, python-format
7322 #, python-format
7166 msgid "unknown bisect kind %s"
7323 msgid "unknown bisect kind %s"
7167 msgstr ""
7324 msgstr ""
7168
7325
7169 msgid ""
7326 msgid ""
7170 "\n"
7327 "\n"
7171 " Mercurial has the ability to add new features through the use of\n"
7328 " Mercurial has the ability to add new features through the use of\n"
7172 " extensions. Extensions may add new commands, add options to\n"
7329 " extensions. Extensions may add new commands, add options to\n"
7173 " existing commands, change the default behavior of commands, or\n"
7330 " existing commands, change the default behavior of commands, or\n"
7174 " implement hooks.\n"
7331 " implement hooks.\n"
7175 "\n"
7332 "\n"
7176 " Extensions are not loaded by default for a variety of reasons:\n"
7333 " Extensions are not loaded by default for a variety of reasons:\n"
7177 " they can increase startup overhead; they may be meant for\n"
7334 " they can increase startup overhead; they may be meant for\n"
7178 " advanced usage only; they may provide potentially dangerous\n"
7335 " advanced usage only; they may provide potentially dangerous\n"
7179 " abilities (such as letting you destroy or modify history); they\n"
7336 " abilities (such as letting you destroy or modify history); they\n"
7180 " might not be ready for prime time; or they may alter some\n"
7337 " might not be ready for prime time; or they may alter some\n"
7181 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7338 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7182 " activate extensions as needed.\n"
7339 " activate extensions as needed.\n"
7183 "\n"
7340 "\n"
7184 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7341 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7185 " or in the Python search path, create an entry for it in your\n"
7342 " or in the Python search path, create an entry for it in your\n"
7186 " hgrc, like this:\n"
7343 " hgrc, like this:\n"
7187 "\n"
7344 "\n"
7188 " [extensions]\n"
7345 " [extensions]\n"
7189 " foo =\n"
7346 " foo =\n"
7190 "\n"
7347 "\n"
7191 " You may also specify the full path to an extension:\n"
7348 " You may also specify the full path to an extension:\n"
7192 "\n"
7349 "\n"
7193 " [extensions]\n"
7350 " [extensions]\n"
7194 " myfeature = ~/.hgext/myfeature.py\n"
7351 " myfeature = ~/.hgext/myfeature.py\n"
7195 "\n"
7352 "\n"
7196 " To explicitly disable an extension enabled in an hgrc of broader\n"
7353 " To explicitly disable an extension enabled in an hgrc of broader\n"
7197 " scope, prepend its path with !:\n"
7354 " scope, prepend its path with !:\n"
7198 "\n"
7355 "\n"
7199 " [extensions]\n"
7356 " [extensions]\n"
7200 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7357 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7201 " hgext.bar = !/path/to/extension/bar.py\n"
7358 " hgext.bar = !/path/to/extension/bar.py\n"
7202 " # ditto, but no path was supplied for extension baz\n"
7359 " # ditto, but no path was supplied for extension baz\n"
7203 " hgext.baz = !\n"
7360 " hgext.baz = !\n"
7204 " "
7361 " "
7205 msgstr ""
7362 msgstr ""
7206 "\n"
7363 "\n"
7207 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7364 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7208 " fonctionnalités par le biais d'extensions. Les extensions\n"
7365 " fonctionnalités par le biais d'extensions. Les extensions\n"
7209 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7366 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7210 " comportement de commandes existantes ou leur ajouter des\n"
7367 " comportement de commandes existantes ou leur ajouter des\n"
7211 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7368 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7212 "\n"
7369 "\n"
7213 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7370 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7214 " pour diverses raisons : elles peuvent accroître la latence\n"
7371 " pour diverses raisons : elles peuvent accroître la latence\n"
7215 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7372 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7216 " une utilisation avancée ; elle peuvent fournir des\n"
7373 " une utilisation avancée ; elle peuvent fournir des\n"
7217 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7374 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7218 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7375 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7219 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7376 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7220 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7377 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7221 " comportements habituels de Mercurial.\n"
7378 " comportements habituels de Mercurial.\n"
7222 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7379 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7223 " de ses besoins.\n"
7380 " de ses besoins.\n"
7224 "\n"
7381 "\n"
7225 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7382 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7226 " présente dans le chemin de recherche de Python, déclarez-la\n"
7383 " présente dans le chemin de recherche de Python, déclarez-la\n"
7227 " dans votre fichier de configuration hgrc comme suit :\n"
7384 " dans votre fichier de configuration hgrc comme suit :\n"
7228 "\n"
7385 "\n"
7229 " [extensions]\n"
7386 " [extensions]\n"
7230 " truc =\n"
7387 " truc =\n"
7231 "\n"
7388 "\n"
7232 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7389 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7233 "\n"
7390 "\n"
7234 " [extensions]\n"
7391 " [extensions]\n"
7235 " monbidule = ~/.hgext/monbidule.py\n"
7392 " monbidule = ~/.hgext/monbidule.py\n"
7236 "\n"
7393 "\n"
7237 " Pour forcer la désactivation d'une extension activée par un\n"
7394 " Pour forcer la désactivation d'une extension activée par un\n"
7238 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7395 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7239 "\n"
7396 "\n"
7240 " [extensions]\n"
7397 " [extensions]\n"
7241 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7398 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7242 " hgext.bar = !/vers/machin.py\n"
7399 " hgext.bar = !/vers/machin.py\n"
7243 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7400 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7244 " hgext.chose = !\n"
7401 " hgext.chose = !\n"
7245 " "
7402 " "
7246
7403
7247 msgid "disabled extensions:"
7404 msgid "disabled extensions:"
7248 msgstr "extensions désactivées :"
7405 msgstr "extensions désactivées :"
7249
7406
7250 msgid "Date Formats"
7407 msgid "Date Formats"
7251 msgstr ""
7408 msgstr ""
7252
7409
7253 msgid ""
7410 msgid ""
7254 "\n"
7411 "\n"
7255 " Some commands allow the user to specify a date, e.g.:\n"
7412 " Some commands allow the user to specify a date, e.g.:\n"
7256 " * backout, commit, import, tag: Specify the commit date.\n"
7413 " * backout, commit, import, tag: Specify the commit date.\n"
7257 " * log, revert, update: Select revision(s) by date.\n"
7414 " * log, revert, update: Select revision(s) by date.\n"
7258 "\n"
7415 "\n"
7259 " Many date formats are valid. Here are some examples:\n"
7416 " Many date formats are valid. Here are some examples:\n"
7260 "\n"
7417 "\n"
7261 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7418 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7262 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7419 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7263 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7420 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7264 " \"Dec 6\" (midnight)\n"
7421 " \"Dec 6\" (midnight)\n"
7265 " \"13:18\" (today assumed)\n"
7422 " \"13:18\" (today assumed)\n"
7266 " \"3:39\" (3:39AM assumed)\n"
7423 " \"3:39\" (3:39AM assumed)\n"
7267 " \"3:39pm\" (15:39)\n"
7424 " \"3:39pm\" (15:39)\n"
7268 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7425 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7269 " \"2006-12-6 13:18\"\n"
7426 " \"2006-12-6 13:18\"\n"
7270 " \"2006-12-6\"\n"
7427 " \"2006-12-6\"\n"
7271 " \"12-6\"\n"
7428 " \"12-6\"\n"
7272 " \"12/6\"\n"
7429 " \"12/6\"\n"
7273 " \"12/6/6\" (Dec 6 2006)\n"
7430 " \"12/6/6\" (Dec 6 2006)\n"
7274 "\n"
7431 "\n"
7275 " Lastly, there is Mercurial's internal format:\n"
7432 " Lastly, there is Mercurial's internal format:\n"
7276 "\n"
7433 "\n"
7277 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7434 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7278 "\n"
7435 "\n"
7279 " This is the internal representation format for dates. unixtime is\n"
7436 " This is the internal representation format for dates. unixtime is\n"
7280 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7437 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7281 " offset is the offset of the local timezone, in seconds west of UTC\n"
7438 " offset is the offset of the local timezone, in seconds west of UTC\n"
7282 " (negative if the timezone is east of UTC).\n"
7439 " (negative if the timezone is east of UTC).\n"
7283 "\n"
7440 "\n"
7284 " The log command also accepts date ranges:\n"
7441 " The log command also accepts date ranges:\n"
7285 "\n"
7442 "\n"
7286 " \"<{datetime}\" - at or before a given date/time\n"
7443 " \"<{datetime}\" - at or before a given date/time\n"
7287 " \">{datetime}\" - on or after a given date/time\n"
7444 " \">{datetime}\" - on or after a given date/time\n"
7288 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7445 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7289 " \"-{days}\" - within a given number of days of today\n"
7446 " \"-{days}\" - within a given number of days of today\n"
7290 " "
7447 " "
7291 msgstr ""
7448 msgstr ""
7292
7449
7293 msgid "File Name Patterns"
7450 msgid "File Name Patterns"
7294 msgstr ""
7451 msgstr ""
7295
7452
7296 msgid ""
7453 msgid ""
7297 "\n"
7454 "\n"
7298 " Mercurial accepts several notations for identifying one or more\n"
7455 " Mercurial accepts several notations for identifying one or more\n"
7299 " files at a time.\n"
7456 " files at a time.\n"
7300 "\n"
7457 "\n"
7301 " By default, Mercurial treats filenames as shell-style extended\n"
7458 " By default, Mercurial treats filenames as shell-style extended\n"
7302 " glob patterns.\n"
7459 " glob patterns.\n"
7303 "\n"
7460 "\n"
7304 " Alternate pattern notations must be specified explicitly.\n"
7461 " Alternate pattern notations must be specified explicitly.\n"
7305 "\n"
7462 "\n"
7306 " To use a plain path name without any pattern matching, start it\n"
7463 " To use a plain path name without any pattern matching, start it\n"
7307 " with \"path:\". These path names must completely match starting at\n"
7464 " with \"path:\". These path names must completely match starting at\n"
7308 " the current repository root.\n"
7465 " the current repository root.\n"
7309 "\n"
7466 "\n"
7310 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7467 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7311 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7468 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7312 " match files in the current directory ending with \".c\".\n"
7469 " match files in the current directory ending with \".c\".\n"
7313 "\n"
7470 "\n"
7314 " The supported glob syntax extensions are \"**\" to match any string\n"
7471 " The supported glob syntax extensions are \"**\" to match any string\n"
7315 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7472 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7316 "\n"
7473 "\n"
7317 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7474 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7318 " Regexp pattern matching is anchored at the root of the repository.\n"
7475 " Regexp pattern matching is anchored at the root of the repository.\n"
7319 "\n"
7476 "\n"
7320 " Plain examples:\n"
7477 " Plain examples:\n"
7321 "\n"
7478 "\n"
7322 " path:foo/bar a name bar in a directory named foo in the root of\n"
7479 " path:foo/bar a name bar in a directory named foo in the root of\n"
7323 " the repository\n"
7480 " the repository\n"
7324 " path:path:name a file or directory named \"path:name\"\n"
7481 " path:path:name a file or directory named \"path:name\"\n"
7325 "\n"
7482 "\n"
7326 " Glob examples:\n"
7483 " Glob examples:\n"
7327 "\n"
7484 "\n"
7328 " glob:*.c any name ending in \".c\" in the current directory\n"
7485 " glob:*.c any name ending in \".c\" in the current directory\n"
7329 " *.c any name ending in \".c\" in the current directory\n"
7486 " *.c any name ending in \".c\" in the current directory\n"
7330 " **.c any name ending in \".c\" in any subdirectory of the\n"
7487 " **.c any name ending in \".c\" in any subdirectory of the\n"
7331 " current directory including itself.\n"
7488 " current directory including itself.\n"
7332 " foo/*.c any name ending in \".c\" in the directory foo\n"
7489 " foo/*.c any name ending in \".c\" in the directory foo\n"
7333 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7490 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7334 " including itself.\n"
7491 " including itself.\n"
7335 "\n"
7492 "\n"
7336 " Regexp examples:\n"
7493 " Regexp examples:\n"
7337 "\n"
7494 "\n"
7338 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7495 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7339 "\n"
7496 "\n"
7340 " "
7497 " "
7341 msgstr ""
7498 msgstr ""
7342
7499
7343 msgid "Environment Variables"
7500 msgid "Environment Variables"
7344 msgstr ""
7501 msgstr ""
7345
7502
7346 msgid ""
7503 msgid ""
7347 "\n"
7504 "\n"
7348 "HG::\n"
7505 "HG::\n"
7349 " Path to the 'hg' executable, automatically passed when running\n"
7506 " Path to the 'hg' executable, automatically passed when running\n"
7350 " hooks, extensions or external tools. If unset or empty, this is\n"
7507 " hooks, extensions or external tools. If unset or empty, this is\n"
7351 " the hg executable's name if it's frozen, or an executable named\n"
7508 " the hg executable's name if it's frozen, or an executable named\n"
7352 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7509 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7353 " Windows) is searched.\n"
7510 " Windows) is searched.\n"
7354 "\n"
7511 "\n"
7355 "HGEDITOR::\n"
7512 "HGEDITOR::\n"
7356 " This is the name of the editor to run when committing. See EDITOR.\n"
7513 " This is the name of the editor to run when committing. See EDITOR.\n"
7357 "\n"
7514 "\n"
7358 " (deprecated, use .hgrc)\n"
7515 " (deprecated, use .hgrc)\n"
7359 "\n"
7516 "\n"
7360 "HGENCODING::\n"
7517 "HGENCODING::\n"
7361 " This overrides the default locale setting detected by Mercurial.\n"
7518 " This overrides the default locale setting detected by Mercurial.\n"
7362 " This setting is used to convert data including usernames,\n"
7519 " This setting is used to convert data including usernames,\n"
7363 " changeset descriptions, tag names, and branches. This setting can\n"
7520 " changeset descriptions, tag names, and branches. This setting can\n"
7364 " be overridden with the --encoding command-line option.\n"
7521 " be overridden with the --encoding command-line option.\n"
7365 "\n"
7522 "\n"
7366 "HGENCODINGMODE::\n"
7523 "HGENCODINGMODE::\n"
7367 " This sets Mercurial's behavior for handling unknown characters\n"
7524 " This sets Mercurial's behavior for handling unknown characters\n"
7368 " while transcoding user input. The default is \"strict\", which\n"
7525 " while transcoding user input. The default is \"strict\", which\n"
7369 " causes Mercurial to abort if it can't map a character. Other\n"
7526 " causes Mercurial to abort if it can't map a character. Other\n"
7370 " settings include \"replace\", which replaces unknown characters, and\n"
7527 " settings include \"replace\", which replaces unknown characters, and\n"
7371 " \"ignore\", which drops them. This setting can be overridden with\n"
7528 " \"ignore\", which drops them. This setting can be overridden with\n"
7372 " the --encodingmode command-line option.\n"
7529 " the --encodingmode command-line option.\n"
7373 "\n"
7530 "\n"
7374 "HGMERGE::\n"
7531 "HGMERGE::\n"
7375 " An executable to use for resolving merge conflicts. The program\n"
7532 " An executable to use for resolving merge conflicts. The program\n"
7376 " will be executed with three arguments: local file, remote file,\n"
7533 " will be executed with three arguments: local file, remote file,\n"
7377 " ancestor file.\n"
7534 " ancestor file.\n"
7378 "\n"
7535 "\n"
7379 " (deprecated, use .hgrc)\n"
7536 " (deprecated, use .hgrc)\n"
7380 "\n"
7537 "\n"
7381 "HGRCPATH::\n"
7538 "HGRCPATH::\n"
7382 " A list of files or directories to search for hgrc files. Item\n"
7539 " A list of files or directories to search for hgrc files. Item\n"
7383 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7540 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7384 " platform default search path is used. If empty, only the .hg/hgrc\n"
7541 " platform default search path is used. If empty, only the .hg/hgrc\n"
7385 " from the current repository is read.\n"
7542 " from the current repository is read.\n"
7386 "\n"
7543 "\n"
7387 " For each element in HGRCPATH:\n"
7544 " For each element in HGRCPATH:\n"
7388 " * if it's a directory, all files ending with .rc are added\n"
7545 " * if it's a directory, all files ending with .rc are added\n"
7389 " * otherwise, the file itself will be added\n"
7546 " * otherwise, the file itself will be added\n"
7390 "\n"
7547 "\n"
7391 "HGUSER::\n"
7548 "HGUSER::\n"
7392 " This is the string used as the author of a commit. If not set,\n"
7549 " This is the string used as the author of a commit. If not set,\n"
7393 " available values will be considered in this order:\n"
7550 " available values will be considered in this order:\n"
7394 "\n"
7551 "\n"
7395 " * HGUSER (deprecated)\n"
7552 " * HGUSER (deprecated)\n"
7396 " * hgrc files from the HGRCPATH\n"
7553 " * hgrc files from the HGRCPATH\n"
7397 " * EMAIL\n"
7554 " * EMAIL\n"
7398 " * interactive prompt\n"
7555 " * interactive prompt\n"
7399 " * LOGNAME (with '@hostname' appended)\n"
7556 " * LOGNAME (with '@hostname' appended)\n"
7400 "\n"
7557 "\n"
7401 " (deprecated, use .hgrc)\n"
7558 " (deprecated, use .hgrc)\n"
7402 "\n"
7559 "\n"
7403 "EMAIL::\n"
7560 "EMAIL::\n"
7404 " May be used as the author of a commit; see HGUSER.\n"
7561 " May be used as the author of a commit; see HGUSER.\n"
7405 "\n"
7562 "\n"
7406 "LOGNAME::\n"
7563 "LOGNAME::\n"
7407 " May be used as the author of a commit; see HGUSER.\n"
7564 " May be used as the author of a commit; see HGUSER.\n"
7408 "\n"
7565 "\n"
7409 "VISUAL::\n"
7566 "VISUAL::\n"
7410 " This is the name of the editor to use when committing. See EDITOR.\n"
7567 " This is the name of the editor to use when committing. See EDITOR.\n"
7411 "\n"
7568 "\n"
7412 "EDITOR::\n"
7569 "EDITOR::\n"
7413 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7570 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7414 " user to modify, for example when writing commit messages. The\n"
7571 " user to modify, for example when writing commit messages. The\n"
7415 " editor it uses is determined by looking at the environment\n"
7572 " editor it uses is determined by looking at the environment\n"
7416 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7573 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7417 " non-empty one is chosen. If all of them are empty, the editor\n"
7574 " non-empty one is chosen. If all of them are empty, the editor\n"
7418 " defaults to 'vi'.\n"
7575 " defaults to 'vi'.\n"
7419 "\n"
7576 "\n"
7420 "PYTHONPATH::\n"
7577 "PYTHONPATH::\n"
7421 " This is used by Python to find imported modules and may need to be\n"
7578 " This is used by Python to find imported modules and may need to be\n"
7422 " set appropriately if this Mercurial is not installed system-wide.\n"
7579 " set appropriately if this Mercurial is not installed system-wide.\n"
7423 " "
7580 " "
7424 msgstr ""
7581 msgstr ""
7425
7582
7426 msgid "Specifying Single Revisions"
7583 msgid "Specifying Single Revisions"
7427 msgstr ""
7584 msgstr ""
7428
7585
7429 msgid ""
7586 msgid ""
7430 "\n"
7587 "\n"
7431 " Mercurial supports several ways to specify individual revisions.\n"
7588 " Mercurial supports several ways to specify individual revisions.\n"
7432 "\n"
7589 "\n"
7433 " A plain integer is treated as a revision number. Negative integers\n"
7590 " A plain integer is treated as a revision number. Negative integers\n"
7434 " are treated as topological offsets from the tip, with -1 denoting\n"
7591 " are treated as topological offsets from the tip, with -1 denoting\n"
7435 " the tip. As such, negative numbers are only useful if you've\n"
7592 " the tip. As such, negative numbers are only useful if you've\n"
7436 " memorized your local tree numbers and want to save typing a single\n"
7593 " memorized your local tree numbers and want to save typing a single\n"
7437 " digit. This editor suggests copy and paste.\n"
7594 " digit. This editor suggests copy and paste.\n"
7438 "\n"
7595 "\n"
7439 " A 40-digit hexadecimal string is treated as a unique revision\n"
7596 " A 40-digit hexadecimal string is treated as a unique revision\n"
7440 " identifier.\n"
7597 " identifier.\n"
7441 "\n"
7598 "\n"
7442 " A hexadecimal string less than 40 characters long is treated as a\n"
7599 " A hexadecimal string less than 40 characters long is treated as a\n"
7443 " unique revision identifier, and referred to as a short-form\n"
7600 " unique revision identifier, and referred to as a short-form\n"
7444 " identifier. A short-form identifier is only valid if it is the\n"
7601 " identifier. A short-form identifier is only valid if it is the\n"
7445 " prefix of exactly one full-length identifier.\n"
7602 " prefix of exactly one full-length identifier.\n"
7446 "\n"
7603 "\n"
7447 " Any other string is treated as a tag name, which is a symbolic\n"
7604 " Any other string is treated as a tag name, which is a symbolic\n"
7448 " name associated with a revision identifier. Tag names may not\n"
7605 " name associated with a revision identifier. Tag names may not\n"
7449 " contain the \":\" character.\n"
7606 " contain the \":\" character.\n"
7450 "\n"
7607 "\n"
7451 " The reserved name \"tip\" is a special tag that always identifies\n"
7608 " The reserved name \"tip\" is a special tag that always identifies\n"
7452 " the most recent revision.\n"
7609 " the most recent revision.\n"
7453 "\n"
7610 "\n"
7454 " The reserved name \"null\" indicates the null revision. This is the\n"
7611 " The reserved name \"null\" indicates the null revision. This is the\n"
7455 " revision of an empty repository, and the parent of revision 0.\n"
7612 " revision of an empty repository, and the parent of revision 0.\n"
7456 "\n"
7613 "\n"
7457 " The reserved name \".\" indicates the working directory parent. If\n"
7614 " The reserved name \".\" indicates the working directory parent. If\n"
7458 " no working directory is checked out, it is equivalent to null. If\n"
7615 " no working directory is checked out, it is equivalent to null. If\n"
7459 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7616 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7460 " first parent.\n"
7617 " first parent.\n"
7461 " "
7618 " "
7462 msgstr ""
7619 msgstr ""
7463
7620
7464 msgid "Specifying Multiple Revisions"
7621 msgid "Specifying Multiple Revisions"
7465 msgstr ""
7622 msgstr ""
7466
7623
7467 msgid ""
7624 msgid ""
7468 "\n"
7625 "\n"
7469 " When Mercurial accepts more than one revision, they may be\n"
7626 " When Mercurial accepts more than one revision, they may be\n"
7470 " specified individually, or provided as a topologically continuous\n"
7627 " specified individually, or provided as a topologically continuous\n"
7471 " range, separated by the \":\" character.\n"
7628 " range, separated by the \":\" character.\n"
7472 "\n"
7629 "\n"
7473 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7630 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7474 " are revision identifiers. Both BEGIN and END are optional. If\n"
7631 " are revision identifiers. Both BEGIN and END are optional. If\n"
7475 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7632 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7476 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7633 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7477 " \"all revisions\".\n"
7634 " \"all revisions\".\n"
7478 "\n"
7635 "\n"
7479 " If BEGIN is greater than END, revisions are treated in reverse\n"
7636 " If BEGIN is greater than END, revisions are treated in reverse\n"
7480 " order.\n"
7637 " order.\n"
7481 "\n"
7638 "\n"
7482 " A range acts as a closed interval. This means that a range of 3:5\n"
7639 " A range acts as a closed interval. This means that a range of 3:5\n"
7483 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7640 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7484 " "
7641 " "
7485 msgstr ""
7642 msgstr ""
7486
7643
7487 msgid "Diff Formats"
7644 msgid "Diff Formats"
7488 msgstr ""
7645 msgstr ""
7489
7646
7490 msgid ""
7647 msgid ""
7491 "\n"
7648 "\n"
7492 " Mercurial's default format for showing changes between two\n"
7649 " Mercurial's default format for showing changes between two\n"
7493 " versions of a file is compatible with the unified format of GNU\n"
7650 " versions of a file is compatible with the unified format of GNU\n"
7494 " diff, which can be used by GNU patch and many other standard\n"
7651 " diff, which can be used by GNU patch and many other standard\n"
7495 " tools.\n"
7652 " tools.\n"
7496 "\n"
7653 "\n"
7497 " While this standard format is often enough, it does not encode the\n"
7654 " While this standard format is often enough, it does not encode the\n"
7498 " following information:\n"
7655 " following information:\n"
7499 "\n"
7656 "\n"
7500 " - executable status and other permission bits\n"
7657 " - executable status and other permission bits\n"
7501 " - copy or rename information\n"
7658 " - copy or rename information\n"
7502 " - changes in binary files\n"
7659 " - changes in binary files\n"
7503 " - creation or deletion of empty files\n"
7660 " - creation or deletion of empty files\n"
7504 "\n"
7661 "\n"
7505 " Mercurial also supports the extended diff format from the git VCS\n"
7662 " Mercurial also supports the extended diff format from the git VCS\n"
7506 " which addresses these limitations. The git diff format is not\n"
7663 " which addresses these limitations. The git diff format is not\n"
7507 " produced by default because a few widespread tools still do not\n"
7664 " produced by default because a few widespread tools still do not\n"
7508 " understand this format.\n"
7665 " understand this format.\n"
7509 "\n"
7666 "\n"
7510 " This means that when generating diffs from a Mercurial repository\n"
7667 " This means that when generating diffs from a Mercurial repository\n"
7511 " (e.g. with \"hg export\"), you should be careful about things like\n"
7668 " (e.g. with \"hg export\"), you should be careful about things like\n"
7512 " file copies and renames or other things mentioned above, because\n"
7669 " file copies and renames or other things mentioned above, because\n"
7513 " when applying a standard diff to a different repository, this\n"
7670 " when applying a standard diff to a different repository, this\n"
7514 " extra information is lost. Mercurial's internal operations (like\n"
7671 " extra information is lost. Mercurial's internal operations (like\n"
7515 " push and pull) are not affected by this, because they use an\n"
7672 " push and pull) are not affected by this, because they use an\n"
7516 " internal binary format for communicating changes.\n"
7673 " internal binary format for communicating changes.\n"
7517 "\n"
7674 "\n"
7518 " To make Mercurial produce the git extended diff format, use the\n"
7675 " To make Mercurial produce the git extended diff format, use the\n"
7519 " --git option available for many commands, or set 'git = True' in\n"
7676 " --git option available for many commands, or set 'git = True' in\n"
7520 " the [diff] section of your hgrc. You do not need to set this\n"
7677 " the [diff] section of your hgrc. You do not need to set this\n"
7521 " option when importing diffs in this format or using them in the mq\n"
7678 " option when importing diffs in this format or using them in the mq\n"
7522 " extension.\n"
7679 " extension.\n"
7523 " "
7680 " "
7524 msgstr ""
7681 msgstr ""
7525
7682
7526 msgid "Template Usage"
7683 msgid "Template Usage"
7527 msgstr ""
7684 msgstr ""
7528
7685
7529 msgid ""
7686 msgid ""
7530 "\n"
7687 "\n"
7531 " Mercurial allows you to customize output of commands through\n"
7688 " Mercurial allows you to customize output of commands through\n"
7532 " templates. You can either pass in a template from the command\n"
7689 " templates. You can either pass in a template from the command\n"
7533 " line, via the --template option, or select an existing\n"
7690 " line, via the --template option, or select an existing\n"
7534 " template-style (--style).\n"
7691 " template-style (--style).\n"
7535 "\n"
7692 "\n"
7536 " You can customize output for any \"log-like\" command: log,\n"
7693 " You can customize output for any \"log-like\" command: log,\n"
7537 " outgoing, incoming, tip, parents, heads and glog.\n"
7694 " outgoing, incoming, tip, parents, heads and glog.\n"
7538 "\n"
7695 "\n"
7539 " Three styles are packaged with Mercurial: default (the style used\n"
7696 " Three styles are packaged with Mercurial: default (the style used\n"
7540 " when no explicit preference is passed), compact and changelog.\n"
7697 " when no explicit preference is passed), compact and changelog.\n"
7541 " Usage:\n"
7698 " Usage:\n"
7542 "\n"
7699 "\n"
7543 " $ hg log -r1 --style changelog\n"
7700 " $ hg log -r1 --style changelog\n"
7544 "\n"
7701 "\n"
7545 " A template is a piece of text, with markup to invoke variable\n"
7702 " A template is a piece of text, with markup to invoke variable\n"
7546 " expansion:\n"
7703 " expansion:\n"
7547 "\n"
7704 "\n"
7548 " $ hg log -r1 --template \"{node}\\n\"\n"
7705 " $ hg log -r1 --template \"{node}\\n\"\n"
7549 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7706 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7550 "\n"
7707 "\n"
7551 " Strings in curly braces are called keywords. The availability of\n"
7708 " Strings in curly braces are called keywords. The availability of\n"
7552 " keywords depends on the exact context of the templater. These\n"
7709 " keywords depends on the exact context of the templater. These\n"
7553 " keywords are usually available for templating a log-like command:\n"
7710 " keywords are usually available for templating a log-like command:\n"
7554 "\n"
7711 "\n"
7555 " - author: String. The unmodified author of the changeset.\n"
7712 " - author: String. The unmodified author of the changeset.\n"
7556 " - branches: String. The name of the branch on which the changeset\n"
7713 " - branches: String. The name of the branch on which the changeset\n"
7557 " was committed. Will be empty if the branch name was default.\n"
7714 " was committed. Will be empty if the branch name was default.\n"
7558 " - date: Date information. The date when the changeset was committed.\n"
7715 " - date: Date information. The date when the changeset was committed.\n"
7559 " - desc: String. The text of the changeset description.\n"
7716 " - desc: String. The text of the changeset description.\n"
7560 " - diffstat: String. Statistics of changes with the following\n"
7717 " - diffstat: String. Statistics of changes with the following\n"
7561 " format: \"modified files: +added/-removed lines\"\n"
7718 " format: \"modified files: +added/-removed lines\"\n"
7562 " - files: List of strings. All files modified, added, or removed by\n"
7719 " - files: List of strings. All files modified, added, or removed by\n"
7563 " this changeset.\n"
7720 " this changeset.\n"
7564 " - file_adds: List of strings. Files added by this changeset.\n"
7721 " - file_adds: List of strings. Files added by this changeset.\n"
7565 " - file_mods: List of strings. Files modified by this changeset.\n"
7722 " - file_mods: List of strings. Files modified by this changeset.\n"
7566 " - file_dels: List of strings. Files removed by this changeset.\n"
7723 " - file_dels: List of strings. Files removed by this changeset.\n"
7567 " - node: String. The changeset identification hash, as a\n"
7724 " - node: String. The changeset identification hash, as a\n"
7568 " 40-character hexadecimal string.\n"
7725 " 40-character hexadecimal string.\n"
7569 " - parents: List of strings. The parents of the changeset.\n"
7726 " - parents: List of strings. The parents of the changeset.\n"
7570 " - rev: Integer. The repository-local changeset revision number.\n"
7727 " - rev: Integer. The repository-local changeset revision number.\n"
7571 " - tags: List of strings. Any tags associated with the changeset.\n"
7728 " - tags: List of strings. Any tags associated with the changeset.\n"
7572 "\n"
7729 "\n"
7573 " The \"date\" keyword does not produce human-readable output. If you\n"
7730 " The \"date\" keyword does not produce human-readable output. If you\n"
7574 " want to use a date in your output, you can use a filter to process\n"
7731 " want to use a date in your output, you can use a filter to process\n"
7575 " it. Filters are functions which return a string based on the input\n"
7732 " it. Filters are functions which return a string based on the input\n"
7576 " variable. You can also use a chain of filters to get the desired\n"
7733 " variable. You can also use a chain of filters to get the desired\n"
7577 " output:\n"
7734 " output:\n"
7578 "\n"
7735 "\n"
7579 " $ hg tip --template \"{date|isodate}\\n\"\n"
7736 " $ hg tip --template \"{date|isodate}\\n\"\n"
7580 " 2008-08-21 18:22 +0000\n"
7737 " 2008-08-21 18:22 +0000\n"
7581 "\n"
7738 "\n"
7582 " List of filters:\n"
7739 " List of filters:\n"
7583 "\n"
7740 "\n"
7584 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7741 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7585 " every line except the last.\n"
7742 " every line except the last.\n"
7586 " - age: Date. Returns a human-readable date/time difference between\n"
7743 " - age: Date. Returns a human-readable date/time difference between\n"
7587 " the given date/time and the current date/time.\n"
7744 " the given date/time and the current date/time.\n"
7588 " - basename: Any text. Treats the text as a path, and returns the\n"
7745 " - basename: Any text. Treats the text as a path, and returns the\n"
7589 " last component of the path after splitting by the path\n"
7746 " last component of the path after splitting by the path\n"
7590 " separator (ignoring trailing separators). For example,\n"
7747 " separator (ignoring trailing separators). For example,\n"
7591 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7748 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7592 "\".\n"
7749 "\".\n"
7593 " - stripdir: Treat the text as path and strip a directory level, if\n"
7750 " - stripdir: Treat the text as path and strip a directory level, if\n"
7594 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7751 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7595 " - date: Date. Returns a date in a Unix date format, including\n"
7752 " - date: Date. Returns a date in a Unix date format, including\n"
7596 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7753 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7597 " - domain: Any text. Finds the first string that looks like an\n"
7754 " - domain: Any text. Finds the first string that looks like an\n"
7598 " email address, and extracts just the domain component.\n"
7755 " email address, and extracts just the domain component.\n"
7599 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7756 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7600 " - email: Any text. Extracts the first string that looks like an\n"
7757 " - email: Any text. Extracts the first string that looks like an\n"
7601 " email address. Example: 'User <user@example.com>' becomes\n"
7758 " email address. Example: 'User <user@example.com>' becomes\n"
7602 " 'user@example.com'.\n"
7759 " 'user@example.com'.\n"
7603 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7760 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7604 " \"<\" and \">\" with XML entities.\n"
7761 " \"<\" and \">\" with XML entities.\n"
7605 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7762 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7606 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7763 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7607 " - firstline: Any text. Returns the first line of text.\n"
7764 " - firstline: Any text. Returns the first line of text.\n"
7608 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7765 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7609 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7766 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7610 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7767 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7611 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7768 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7612 " - localdate: Date. Converts a date to local date.\n"
7769 " - localdate: Date. Converts a date to local date.\n"
7613 " - obfuscate: Any text. Returns the input text rendered as a\n"
7770 " - obfuscate: Any text. Returns the input text rendered as a\n"
7614 " sequence of XML entities.\n"
7771 " sequence of XML entities.\n"
7615 " - person: Any text. Returns the text before an email address.\n"
7772 " - person: Any text. Returns the text before an email address.\n"
7616 " - rfc822date: Date. Returns a date using the same format used\n"
7773 " - rfc822date: Date. Returns a date using the same format used\n"
7617 " in email headers.\n"
7774 " in email headers.\n"
7618 " - short: Changeset hash. Returns the short form of a changeset\n"
7775 " - short: Changeset hash. Returns the short form of a changeset\n"
7619 " hash, i.e. a 12-byte hexadecimal string.\n"
7776 " hash, i.e. a 12-byte hexadecimal string.\n"
7620 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7777 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7621 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7778 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7622 " - tabindent: Any text. Returns the text, with every line except\n"
7779 " - tabindent: Any text. Returns the text, with every line except\n"
7623 " the first starting with a tab character.\n"
7780 " the first starting with a tab character.\n"
7624 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7781 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7625 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7782 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7626 " - user: Any text. Returns the user portion of an email address.\n"
7783 " - user: Any text. Returns the user portion of an email address.\n"
7627 " "
7784 " "
7628 msgstr ""
7785 msgstr ""
7629
7786
7630 msgid "URL Paths"
7787 msgid "URL Paths"
7631 msgstr ""
7788 msgstr ""
7632
7789
7633 msgid ""
7790 msgid ""
7634 "\n"
7791 "\n"
7635 " Valid URLs are of the form:\n"
7792 " Valid URLs are of the form:\n"
7636 "\n"
7793 "\n"
7637 " local/filesystem/path (or file://local/filesystem/path)\n"
7794 " local/filesystem/path (or file://local/filesystem/path)\n"
7638 " http://[user[:pass]@]host[:port]/[path]\n"
7795 " http://[user[:pass]@]host[:port]/[path]\n"
7639 " https://[user[:pass]@]host[:port]/[path]\n"
7796 " https://[user[:pass]@]host[:port]/[path]\n"
7640 " ssh://[user[:pass]@]host[:port]/[path]\n"
7797 " ssh://[user[:pass]@]host[:port]/[path]\n"
7641 "\n"
7798 "\n"
7642 " Paths in the local filesystem can either point to Mercurial\n"
7799 " Paths in the local filesystem can either point to Mercurial\n"
7643 " repositories or to bundle files (as created by 'hg bundle' or\n"
7800 " repositories or to bundle files (as created by 'hg bundle' or\n"
7644 " 'hg incoming --bundle').\n"
7801 " 'hg incoming --bundle').\n"
7645 "\n"
7802 "\n"
7646 " An optional identifier after # indicates a particular branch, tag,\n"
7803 " An optional identifier after # indicates a particular branch, tag,\n"
7647 " or changeset to use from the remote repository.\n"
7804 " or changeset to use from the remote repository.\n"
7648 "\n"
7805 "\n"
7649 " Some features, such as pushing to http:// and https:// URLs are\n"
7806 " Some features, such as pushing to http:// and https:// URLs are\n"
7650 " only possible if the feature is explicitly enabled on the remote\n"
7807 " only possible if the feature is explicitly enabled on the remote\n"
7651 " Mercurial server.\n"
7808 " Mercurial server.\n"
7652 "\n"
7809 "\n"
7653 " Some notes about using SSH with Mercurial:\n"
7810 " Some notes about using SSH with Mercurial:\n"
7654 " - SSH requires an accessible shell account on the destination\n"
7811 " - SSH requires an accessible shell account on the destination\n"
7655 " machine and a copy of hg in the remote path or specified with as\n"
7812 " machine and a copy of hg in the remote path or specified with as\n"
7656 " remotecmd.\n"
7813 " remotecmd.\n"
7657 " - path is relative to the remote user's home directory by default.\n"
7814 " - path is relative to the remote user's home directory by default.\n"
7658 " Use an extra slash at the start of a path to specify an absolute "
7815 " Use an extra slash at the start of a path to specify an absolute "
7659 "path:\n"
7816 "path:\n"
7660 " ssh://example.com//tmp/repository\n"
7817 " ssh://example.com//tmp/repository\n"
7661 " - Mercurial doesn't use its own compression via SSH; the right\n"
7818 " - Mercurial doesn't use its own compression via SSH; the right\n"
7662 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7819 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7663 " Host *.mylocalnetwork.example.com\n"
7820 " Host *.mylocalnetwork.example.com\n"
7664 " Compression no\n"
7821 " Compression no\n"
7665 " Host *\n"
7822 " Host *\n"
7666 " Compression yes\n"
7823 " Compression yes\n"
7667 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7824 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7668 " or with the --ssh command line option.\n"
7825 " or with the --ssh command line option.\n"
7669 "\n"
7826 "\n"
7670 " These URLs can all be stored in your hgrc with path aliases under\n"
7827 " These URLs can all be stored in your hgrc with path aliases under\n"
7671 " the [paths] section like so:\n"
7828 " the [paths] section like so:\n"
7672 " [paths]\n"
7829 " [paths]\n"
7673 " alias1 = URL1\n"
7830 " alias1 = URL1\n"
7674 " alias2 = URL2\n"
7831 " alias2 = URL2\n"
7675 " ...\n"
7832 " ...\n"
7676 "\n"
7833 "\n"
7677 " You can then use the alias for any command that uses a URL (for\n"
7834 " You can then use the alias for any command that uses a URL (for\n"
7678 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7835 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7679 "\n"
7836 "\n"
7680 " Two path aliases are special because they are used as defaults\n"
7837 " Two path aliases are special because they are used as defaults\n"
7681 " when you do not provide the URL to a command:\n"
7838 " when you do not provide the URL to a command:\n"
7682 "\n"
7839 "\n"
7683 " default:\n"
7840 " default:\n"
7684 " When you create a repository with hg clone, the clone command\n"
7841 " When you create a repository with hg clone, the clone command\n"
7685 " saves the location of the source repository as the new\n"
7842 " saves the location of the source repository as the new\n"
7686 " repository's 'default' path. This is then used when you omit\n"
7843 " repository's 'default' path. This is then used when you omit\n"
7687 " path from push- and pull-like commands (including incoming and\n"
7844 " path from push- and pull-like commands (including incoming and\n"
7688 " outgoing).\n"
7845 " outgoing).\n"
7689 "\n"
7846 "\n"
7690 " default-push:\n"
7847 " default-push:\n"
7691 " The push command will look for a path named 'default-push', and\n"
7848 " The push command will look for a path named 'default-push', and\n"
7692 " prefer it over 'default' if both are defined.\n"
7849 " prefer it over 'default' if both are defined.\n"
7693 " "
7850 " "
7694 msgstr ""
7851 msgstr ""
7695
7852
7696 msgid "Using additional features"
7853 msgid "Using additional features"
7697 msgstr ""
7854 msgstr ""
7698
7855
7699 msgid "can only share local repositories"
7856 msgid "can only share local repositories"
7700 msgstr ""
7857 msgstr ""
7701
7858
7702 msgid "destination already exists"
7859 msgid "destination already exists"
7703 msgstr ""
7860 msgstr ""
7704
7861
7705 msgid "updating working directory\n"
7862 msgid "updating working directory\n"
7706 msgstr ""
7863 msgstr ""
7707
7864
7708 #, python-format
7865 #, python-format
7709 msgid "destination directory: %s\n"
7866 msgid "destination directory: %s\n"
7710 msgstr ""
7867 msgstr ""
7711
7868
7712 #, python-format
7869 #, python-format
7713 msgid "destination '%s' already exists"
7870 msgid "destination '%s' already exists"
7714 msgstr ""
7871 msgstr ""
7715
7872
7716 #, python-format
7873 #, python-format
7717 msgid "destination '%s' is not empty"
7874 msgid "destination '%s' is not empty"
7718 msgstr ""
7875 msgstr ""
7719
7876
7720 msgid ""
7877 msgid ""
7721 "src repository does not support revision lookup and so doesn't support clone "
7878 "src repository does not support revision lookup and so doesn't support clone "
7722 "by revision"
7879 "by revision"
7723 msgstr ""
7880 msgstr ""
7724
7881
7725 msgid "clone from remote to remote not supported"
7882 msgid "clone from remote to remote not supported"
7726 msgstr ""
7883 msgstr ""
7727
7884
7728 msgid "updated"
7885 msgid "updated"
7729 msgstr ""
7886 msgstr ""
7730
7887
7731 msgid "merged"
7888 msgid "merged"
7732 msgstr ""
7889 msgstr ""
7733
7890
7734 msgid "removed"
7891 msgid "removed"
7735 msgstr ""
7892 msgstr ""
7736
7893
7737 msgid "unresolved"
7894 msgid "unresolved"
7738 msgstr ""
7895 msgstr ""
7739
7896
7740 #, python-format
7897 #, python-format
7741 msgid "%d files %s"
7898 msgid "%d files %s"
7742 msgstr ""
7899 msgstr ""
7743
7900
7744 msgid "use 'hg resolve' to retry unresolved file merges\n"
7901 msgid "use 'hg resolve' to retry unresolved file merges\n"
7745 msgstr ""
7902 msgstr ""
7746
7903
7747 msgid ""
7904 msgid ""
7748 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7905 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7749 "abandon\n"
7906 "abandon\n"
7750 msgstr ""
7907 msgstr ""
7751
7908
7752 msgid "(branch merge, don't forget to commit)\n"
7909 msgid "(branch merge, don't forget to commit)\n"
7753 msgstr ""
7910 msgstr ""
7754
7911
7755 #, python-format
7912 #, python-format
7756 msgid "error reading %s/.hg/hgrc: %s\n"
7913 msgid "error reading %s/.hg/hgrc: %s\n"
7757 msgstr ""
7914 msgstr ""
7758
7915
7759 msgid "SSL support is unavailable"
7916 msgid "SSL support is unavailable"
7760 msgstr ""
7917 msgstr ""
7761
7918
7762 msgid "IPv6 is not available on this system"
7919 msgid "IPv6 is not available on this system"
7763 msgstr ""
7920 msgstr ""
7764
7921
7765 #, python-format
7922 #, python-format
7766 msgid "cannot start server at '%s:%d': %s"
7923 msgid "cannot start server at '%s:%d': %s"
7767 msgstr ""
7924 msgstr ""
7768
7925
7769 #, python-format
7926 #, python-format
7770 msgid "calling hook %s: %s\n"
7927 msgid "calling hook %s: %s\n"
7771 msgstr ""
7928 msgstr ""
7772
7929
7773 #, python-format
7930 #, python-format
7774 msgid "%s hook is invalid (\"%s\" not in a module)"
7931 msgid "%s hook is invalid (\"%s\" not in a module)"
7775 msgstr ""
7932 msgstr ""
7776
7933
7777 #, python-format
7934 #, python-format
7778 msgid "%s hook is invalid (import of \"%s\" failed)"
7935 msgid "%s hook is invalid (import of \"%s\" failed)"
7779 msgstr ""
7936 msgstr ""
7780
7937
7781 #, python-format
7938 #, python-format
7782 msgid "%s hook is invalid (\"%s\" is not defined)"
7939 msgid "%s hook is invalid (\"%s\" is not defined)"
7783 msgstr ""
7940 msgstr ""
7784
7941
7785 #, python-format
7942 #, python-format
7786 msgid "%s hook is invalid (\"%s\" is not callable)"
7943 msgid "%s hook is invalid (\"%s\" is not callable)"
7787 msgstr ""
7944 msgstr ""
7788
7945
7789 #, python-format
7946 #, python-format
7790 msgid "error: %s hook failed: %s\n"
7947 msgid "error: %s hook failed: %s\n"
7791 msgstr ""
7948 msgstr ""
7792
7949
7793 #, python-format
7950 #, python-format
7794 msgid "error: %s hook raised an exception: %s\n"
7951 msgid "error: %s hook raised an exception: %s\n"
7795 msgstr ""
7952 msgstr ""
7796
7953
7797 #, python-format
7954 #, python-format
7798 msgid "%s hook failed"
7955 msgid "%s hook failed"
7799 msgstr ""
7956 msgstr ""
7800
7957
7801 #, python-format
7958 #, python-format
7802 msgid "warning: %s hook failed\n"
7959 msgid "warning: %s hook failed\n"
7803 msgstr ""
7960 msgstr ""
7804
7961
7805 #, python-format
7962 #, python-format
7806 msgid "running hook %s: %s\n"
7963 msgid "running hook %s: %s\n"
7807 msgstr ""
7964 msgstr ""
7808
7965
7809 #, python-format
7966 #, python-format
7810 msgid "%s hook %s"
7967 msgid "%s hook %s"
7811 msgstr ""
7968 msgstr ""
7812
7969
7813 #, python-format
7970 #, python-format
7814 msgid "warning: %s hook %s\n"
7971 msgid "warning: %s hook %s\n"
7815 msgstr ""
7972 msgstr ""
7816
7973
7817 msgid "connection ended unexpectedly"
7974 msgid "connection ended unexpectedly"
7818 msgstr ""
7975 msgstr ""
7819
7976
7820 #, python-format
7977 #, python-format
7821 msgid "unsupported URL component: \"%s\""
7978 msgid "unsupported URL component: \"%s\""
7822 msgstr ""
7979 msgstr ""
7823
7980
7824 #, python-format
7981 #, python-format
7825 msgid "using %s\n"
7982 msgid "using %s\n"
7826 msgstr ""
7983 msgstr ""
7827
7984
7828 #, python-format
7985 #, python-format
7829 msgid "capabilities: %s\n"
7986 msgid "capabilities: %s\n"
7830 msgstr ""
7987 msgstr ""
7831
7988
7832 msgid "operation not supported over http"
7989 msgid "operation not supported over http"
7833 msgstr ""
7990 msgstr ""
7834
7991
7835 #, python-format
7992 #, python-format
7836 msgid "sending %s command\n"
7993 msgid "sending %s command\n"
7837 msgstr ""
7994 msgstr ""
7838
7995
7839 #, python-format
7996 #, python-format
7840 msgid "sending %s bytes\n"
7997 msgid "sending %s bytes\n"
7841 msgstr ""
7998 msgstr ""
7842
7999
7843 msgid "authorization failed"
8000 msgid "authorization failed"
7844 msgstr ""
8001 msgstr ""
7845
8002
7846 #, python-format
8003 #, python-format
7847 msgid "http error while sending %s command\n"
8004 msgid "http error while sending %s command\n"
7848 msgstr ""
8005 msgstr ""
7849
8006
7850 msgid "http error, possibly caused by proxy setting"
8007 msgid "http error, possibly caused by proxy setting"
7851 msgstr ""
8008 msgstr ""
7852
8009
7853 #, python-format
8010 #, python-format
7854 msgid "real URL is %s\n"
8011 msgid "real URL is %s\n"
7855 msgstr ""
8012 msgstr ""
7856
8013
7857 #, python-format
8014 #, python-format
7858 msgid "requested URL: '%s'\n"
8015 msgid "requested URL: '%s'\n"
7859 msgstr ""
8016 msgstr ""
7860
8017
7861 #, python-format
8018 #, python-format
7862 msgid "'%s' does not appear to be an hg repository"
8019 msgid "'%s' does not appear to be an hg repository"
7863 msgstr ""
8020 msgstr ""
7864
8021
7865 #, python-format
8022 #, python-format
7866 msgid "'%s' sent a broken Content-Type header (%s)"
8023 msgid "'%s' sent a broken Content-Type header (%s)"
7867 msgstr ""
8024 msgstr ""
7868
8025
7869 #, python-format
8026 #, python-format
7870 msgid "'%s' uses newer protocol %s"
8027 msgid "'%s' uses newer protocol %s"
7871 msgstr ""
8028 msgstr ""
7872
8029
7873 msgid "look up remote revision"
8030 msgid "look up remote revision"
7874 msgstr ""
8031 msgstr ""
7875
8032
7876 msgid "unexpected response:"
8033 msgid "unexpected response:"
7877 msgstr ""
8034 msgstr ""
7878
8035
7879 msgid "look up remote changes"
8036 msgid "look up remote changes"
7880 msgstr ""
8037 msgstr ""
7881
8038
7882 msgid "push failed (unexpected response):"
8039 msgid "push failed (unexpected response):"
7883 msgstr ""
8040 msgstr ""
7884
8041
7885 #, python-format
8042 #, python-format
7886 msgid "push failed: %s"
8043 msgid "push failed: %s"
7887 msgstr ""
8044 msgstr ""
7888
8045
7889 msgid "Python support for SSL and HTTPS is not installed"
8046 msgid "Python support for SSL and HTTPS is not installed"
7890 msgstr ""
8047 msgstr ""
7891
8048
7892 msgid "cannot create new http repository"
8049 msgid "cannot create new http repository"
7893 msgstr ""
8050 msgstr ""
7894
8051
7895 #, python-format
8052 #, python-format
7896 msgid "%s: ignoring invalid syntax '%s'\n"
8053 msgid "%s: ignoring invalid syntax '%s'\n"
7897 msgstr ""
8054 msgstr ""
7898
8055
7899 #, python-format
8056 #, python-format
7900 msgid "skipping unreadable ignore file '%s': %s\n"
8057 msgid "skipping unreadable ignore file '%s': %s\n"
7901 msgstr ""
8058 msgstr ""
7902
8059
7903 #, python-format
8060 #, python-format
7904 msgid "repository %s not found"
8061 msgid "repository %s not found"
7905 msgstr ""
8062 msgstr ""
7906
8063
7907 #, python-format
8064 #, python-format
7908 msgid "repository %s already exists"
8065 msgid "repository %s already exists"
7909 msgstr ""
8066 msgstr ""
7910
8067
7911 #, python-format
8068 #, python-format
7912 msgid "requirement '%s' not supported"
8069 msgid "requirement '%s' not supported"
7913 msgstr ""
8070 msgstr ""
7914
8071
7915 #, python-format
8072 #, python-format
7916 msgid ".hg/sharedpath points to nonexistent directory %s"
8073 msgid ".hg/sharedpath points to nonexistent directory %s"
7917 msgstr ""
8074 msgstr ""
7918
8075
7919 #, python-format
8076 #, python-format
7920 msgid "%r cannot be used in a tag name"
8077 msgid "%r cannot be used in a tag name"
7921 msgstr ""
8078 msgstr ""
7922
8079
7923 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8080 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7924 msgstr ""
8081 msgstr ""
7925
8082
7926 #, python-format
8083 #, python-format
7927 msgid "%s, line %s: %s\n"
8084 msgid "%s, line %s: %s\n"
7928 msgstr ""
8085 msgstr ""
7929
8086
7930 msgid "cannot parse entry"
8087 msgid "cannot parse entry"
7931 msgstr ""
8088 msgstr ""
7932
8089
7933 #, python-format
8090 #, python-format
7934 msgid "node '%s' is not well formed"
8091 msgid "node '%s' is not well formed"
7935 msgstr ""
8092 msgstr ""
7936
8093
7937 #, python-format
8094 #, python-format
7938 msgid "working directory has unknown parent '%s'!"
8095 msgid "working directory has unknown parent '%s'!"
7939 msgstr ""
8096 msgstr ""
7940
8097
7941 #, python-format
8098 #, python-format
7942 msgid "unknown revision '%s'"
8099 msgid "unknown revision '%s'"
7943 msgstr ""
8100 msgstr ""
7944
8101
7945 #, python-format
8102 #, python-format
7946 msgid "filtering %s through %s\n"
8103 msgid "filtering %s through %s\n"
7947 msgstr ""
8104 msgstr ""
7948
8105
7949 msgid "journal already exists - run hg recover"
8106 msgid "journal already exists - run hg recover"
7950 msgstr ""
8107 msgstr ""
7951
8108
7952 msgid "rolling back interrupted transaction\n"
8109 msgid "rolling back interrupted transaction\n"
7953 msgstr ""
8110 msgstr ""
7954
8111
7955 msgid "no interrupted transaction available\n"
8112 msgid "no interrupted transaction available\n"
7956 msgstr ""
8113 msgstr ""
7957
8114
7958 msgid "rolling back last transaction\n"
8115 msgid "rolling back last transaction\n"
7959 msgstr ""
8116 msgstr ""
7960
8117
7961 #, python-format
8118 #, python-format
7962 msgid "Named branch could not be reset, current branch still is: %s\n"
8119 msgid "Named branch could not be reset, current branch still is: %s\n"
7963 msgstr ""
8120 msgstr ""
7964
8121
7965 msgid "no rollback information available\n"
8122 msgid "no rollback information available\n"
7966 msgstr ""
8123 msgstr ""
7967
8124
7968 #, python-format
8125 #, python-format
7969 msgid "waiting for lock on %s held by %r\n"
8126 msgid "waiting for lock on %s held by %r\n"
7970 msgstr ""
8127 msgstr ""
7971
8128
7972 #, python-format
8129 #, python-format
7973 msgid "repository %s"
8130 msgid "repository %s"
7974 msgstr ""
8131 msgstr ""
7975
8132
7976 #, python-format
8133 #, python-format
7977 msgid "working directory of %s"
8134 msgid "working directory of %s"
7978 msgstr ""
8135 msgstr ""
7979
8136
7980 #, python-format
8137 #, python-format
7981 msgid " %s: searching for copy revision for %s\n"
8138 msgid " %s: searching for copy revision for %s\n"
7982 msgstr ""
8139 msgstr ""
7983
8140
7984 #, python-format
8141 #, python-format
7985 msgid " %s: copy %s:%s\n"
8142 msgid " %s: copy %s:%s\n"
7986 msgstr ""
8143 msgstr ""
7987
8144
7988 msgid "cannot partially commit a merge (do not specify files or patterns)"
8145 msgid "cannot partially commit a merge (do not specify files or patterns)"
7989 msgstr ""
8146 msgstr ""
7990
8147
7991 msgid "file not found!"
8148 msgid "file not found!"
7992 msgstr ""
8149 msgstr ""
7993
8150
7994 msgid "no match under directory!"
8151 msgid "no match under directory!"
7995 msgstr ""
8152 msgstr ""
7996
8153
7997 msgid "file not tracked!"
8154 msgid "file not tracked!"
7998 msgstr ""
8155 msgstr ""
7999
8156
8000 msgid "nothing changed\n"
8157 msgid "nothing changed\n"
8001 msgstr ""
8158 msgstr ""
8002
8159
8003 msgid "unresolved merge conflicts (see hg resolve)"
8160 msgid "unresolved merge conflicts (see hg resolve)"
8004 msgstr ""
8161 msgstr ""
8005
8162
8006 #, python-format
8163 #, python-format
8007 msgid "committing subrepository %s\n"
8164 msgid "committing subrepository %s\n"
8008 msgstr ""
8165 msgstr ""
8009
8166
8010 #, python-format
8167 #, python-format
8011 msgid "trouble committing %s!\n"
8168 msgid "trouble committing %s!\n"
8012 msgstr ""
8169 msgstr ""
8013
8170
8014 #, python-format
8171 #, python-format
8015 msgid "%s does not exist!\n"
8172 msgid "%s does not exist!\n"
8016 msgstr ""
8173 msgstr ""
8017
8174
8018 #, python-format
8175 #, python-format
8019 msgid ""
8176 msgid ""
8020 "%s: files over 10MB may cause memory and performance problems\n"
8177 "%s: files over 10MB may cause memory and performance problems\n"
8021 "(use 'hg revert %s' to unadd the file)\n"
8178 "(use 'hg revert %s' to unadd the file)\n"
8022 msgstr ""
8179 msgstr ""
8023
8180
8024 #, python-format
8181 #, python-format
8025 msgid "%s not added: only files and symlinks supported currently\n"
8182 msgid "%s not added: only files and symlinks supported currently\n"
8026 msgstr ""
8183 msgstr ""
8027
8184
8028 #, python-format
8185 #, python-format
8029 msgid "%s already tracked!\n"
8186 msgid "%s already tracked!\n"
8030 msgstr ""
8187 msgstr ""
8031
8188
8032 #, python-format
8189 #, python-format
8033 msgid "%s not added!\n"
8190 msgid "%s not added!\n"
8034 msgstr ""
8191 msgstr ""
8035
8192
8036 #, python-format
8193 #, python-format
8037 msgid "%s still exists!\n"
8194 msgid "%s still exists!\n"
8038 msgstr ""
8195 msgstr ""
8039
8196
8040 #, python-format
8197 #, python-format
8041 msgid "%s not tracked!\n"
8198 msgid "%s not tracked!\n"
8042 msgstr ""
8199 msgstr ""
8043
8200
8044 #, python-format
8201 #, python-format
8045 msgid "%s not removed!\n"
8202 msgid "%s not removed!\n"
8046 msgstr ""
8203 msgstr ""
8047
8204
8048 #, python-format
8205 #, python-format
8049 msgid "copy failed: %s is not a file or a symbolic link\n"
8206 msgid "copy failed: %s is not a file or a symbolic link\n"
8050 msgstr ""
8207 msgstr ""
8051
8208
8052 msgid "searching for changes\n"
8209 msgid "searching for changes\n"
8053 msgstr ""
8210 msgstr ""
8054
8211
8055 #, python-format
8212 #, python-format
8056 msgid "examining %s:%s\n"
8213 msgid "examining %s:%s\n"
8057 msgstr ""
8214 msgstr ""
8058
8215
8059 msgid "branch already found\n"
8216 msgid "branch already found\n"
8060 msgstr ""
8217 msgstr ""
8061
8218
8062 #, python-format
8219 #, python-format
8063 msgid "found incomplete branch %s:%s\n"
8220 msgid "found incomplete branch %s:%s\n"
8064 msgstr ""
8221 msgstr ""
8065
8222
8066 #, python-format
8223 #, python-format
8067 msgid "found new changeset %s\n"
8224 msgid "found new changeset %s\n"
8068 msgstr ""
8225 msgstr ""
8069
8226
8070 #, python-format
8227 #, python-format
8071 msgid "request %d: %s\n"
8228 msgid "request %d: %s\n"
8072 msgstr ""
8229 msgstr ""
8073
8230
8074 #, python-format
8231 #, python-format
8075 msgid "received %s:%s\n"
8232 msgid "received %s:%s\n"
8076 msgstr ""
8233 msgstr ""
8077
8234
8078 #, python-format
8235 #, python-format
8079 msgid "narrowing %d:%d %s\n"
8236 msgid "narrowing %d:%d %s\n"
8080 msgstr ""
8237 msgstr ""
8081
8238
8082 #, python-format
8239 #, python-format
8083 msgid "found new branch changeset %s\n"
8240 msgid "found new branch changeset %s\n"
8084 msgstr ""
8241 msgstr ""
8085
8242
8086 #, python-format
8243 #, python-format
8087 msgid "narrowed branch search to %s:%s\n"
8244 msgid "narrowed branch search to %s:%s\n"
8088 msgstr ""
8245 msgstr ""
8089
8246
8090 msgid "already have changeset "
8247 msgid "already have changeset "
8091 msgstr ""
8248 msgstr ""
8092
8249
8093 msgid "warning: repository is unrelated\n"
8250 msgid "warning: repository is unrelated\n"
8094 msgstr ""
8251 msgstr ""
8095
8252
8096 msgid "repository is unrelated"
8253 msgid "repository is unrelated"
8097 msgstr ""
8254 msgstr ""
8098
8255
8099 msgid "found new changesets starting at "
8256 msgid "found new changesets starting at "
8100 msgstr ""
8257 msgstr ""
8101
8258
8102 #, python-format
8259 #, python-format
8103 msgid "%d total queries\n"
8260 msgid "%d total queries\n"
8104 msgstr ""
8261 msgstr ""
8105
8262
8106 msgid "common changesets up to "
8263 msgid "common changesets up to "
8107 msgstr ""
8264 msgstr ""
8108
8265
8109 msgid "requesting all changes\n"
8266 msgid "requesting all changes\n"
8110 msgstr ""
8267 msgstr ""
8111
8268
8112 msgid ""
8269 msgid ""
8113 "Partial pull cannot be done because other repository doesn't support "
8270 "Partial pull cannot be done because other repository doesn't support "
8114 "changegroupsubset."
8271 "changegroupsubset."
8115 msgstr ""
8272 msgstr ""
8116
8273
8117 #, python-format
8274 #, python-format
8118 msgid "abort: push creates new remote branch '%s'!\n"
8275 msgid "abort: push creates new remote branch '%s'!\n"
8119 msgstr ""
8276 msgstr ""
8120
8277
8121 msgid "abort: push creates new remote heads!\n"
8278 msgid "abort: push creates new remote heads!\n"
8122 msgstr ""
8279 msgstr ""
8123
8280
8124 msgid "(did you forget to merge? use push -f to force)\n"
8281 msgid "(did you forget to merge? use push -f to force)\n"
8125 msgstr ""
8282 msgstr ""
8126
8283
8127 msgid "note: unsynced remote changes!\n"
8284 msgid "note: unsynced remote changes!\n"
8128 msgstr ""
8285 msgstr ""
8129
8286
8130 #, python-format
8287 #, python-format
8131 msgid "%d changesets found\n"
8288 msgid "%d changesets found\n"
8132 msgstr ""
8289 msgstr ""
8133
8290
8134 msgid "list of changesets:\n"
8291 msgid "list of changesets:\n"
8135 msgstr ""
8292 msgstr ""
8136
8293
8137 #, python-format
8294 #, python-format
8138 msgid "empty or missing revlog for %s"
8295 msgid "empty or missing revlog for %s"
8139 msgstr ""
8296 msgstr ""
8140
8297
8141 #, python-format
8298 #, python-format
8142 msgid "add changeset %s\n"
8299 msgid "add changeset %s\n"
8143 msgstr ""
8300 msgstr ""
8144
8301
8145 msgid "adding changesets\n"
8302 msgid "adding changesets\n"
8146 msgstr ""
8303 msgstr ""
8147
8304
8148 msgid "received changelog group is empty"
8305 msgid "received changelog group is empty"
8149 msgstr ""
8306 msgstr ""
8150
8307
8151 msgid "adding manifests\n"
8308 msgid "adding manifests\n"
8152 msgstr ""
8309 msgstr ""
8153
8310
8154 msgid "adding file changes\n"
8311 msgid "adding file changes\n"
8155 msgstr ""
8312 msgstr ""
8156
8313
8157 #, python-format
8314 #, python-format
8158 msgid "adding %s revisions\n"
8315 msgid "adding %s revisions\n"
8159 msgstr ""
8316 msgstr ""
8160
8317
8161 msgid "received file revlog group is empty"
8318 msgid "received file revlog group is empty"
8162 msgstr ""
8319 msgstr ""
8163
8320
8164 #, python-format
8321 #, python-format
8165 msgid " (%+d heads)"
8322 msgid " (%+d heads)"
8166 msgstr ""
8323 msgstr ""
8167
8324
8168 #, python-format
8325 #, python-format
8169 msgid "added %d changesets with %d changes to %d files%s\n"
8326 msgid "added %d changesets with %d changes to %d files%s\n"
8170 msgstr ""
8327 msgstr ""
8171
8328
8172 msgid "updating the branch cache\n"
8329 msgid "updating the branch cache\n"
8173 msgstr ""
8330 msgstr ""
8174
8331
8175 msgid "Unexpected response from remote server:"
8332 msgid "Unexpected response from remote server:"
8176 msgstr ""
8333 msgstr ""
8177
8334
8178 msgid "operation forbidden by server"
8335 msgid "operation forbidden by server"
8179 msgstr ""
8336 msgstr ""
8180
8337
8181 msgid "locking the remote repository failed"
8338 msgid "locking the remote repository failed"
8182 msgstr ""
8339 msgstr ""
8183
8340
8184 msgid "the server sent an unknown error code"
8341 msgid "the server sent an unknown error code"
8185 msgstr ""
8342 msgstr ""
8186
8343
8187 msgid "streaming all changes\n"
8344 msgid "streaming all changes\n"
8188 msgstr ""
8345 msgstr ""
8189
8346
8190 #, python-format
8347 #, python-format
8191 msgid "%d files to transfer, %s of data\n"
8348 msgid "%d files to transfer, %s of data\n"
8192 msgstr ""
8349 msgstr ""
8193
8350
8194 #, python-format
8351 #, python-format
8195 msgid "adding %s (%s)\n"
8352 msgid "adding %s (%s)\n"
8196 msgstr ""
8353 msgstr ""
8197
8354
8198 #, python-format
8355 #, python-format
8199 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8356 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8200 msgstr ""
8357 msgstr ""
8201
8358
8202 msgid "no [smtp]host in hgrc - cannot send mail"
8359 msgid "no [smtp]host in hgrc - cannot send mail"
8203 msgstr ""
8360 msgstr ""
8204
8361
8205 #, python-format
8362 #, python-format
8206 msgid "sending mail: smtp host %s, port %s\n"
8363 msgid "sending mail: smtp host %s, port %s\n"
8207 msgstr ""
8364 msgstr ""
8208
8365
8209 msgid "can't use TLS: Python SSL support not installed"
8366 msgid "can't use TLS: Python SSL support not installed"
8210 msgstr ""
8367 msgstr ""
8211
8368
8212 msgid "(using tls)\n"
8369 msgid "(using tls)\n"
8213 msgstr ""
8370 msgstr ""
8214
8371
8215 #, python-format
8372 #, python-format
8216 msgid "(authenticating to mail server as %s)\n"
8373 msgid "(authenticating to mail server as %s)\n"
8217 msgstr ""
8374 msgstr ""
8218
8375
8219 #, python-format
8376 #, python-format
8220 msgid "sending mail: %s\n"
8377 msgid "sending mail: %s\n"
8221 msgstr ""
8378 msgstr ""
8222
8379
8223 msgid "smtp specified as email transport, but no smtp host configured"
8380 msgid "smtp specified as email transport, but no smtp host configured"
8224 msgstr ""
8381 msgstr ""
8225
8382
8226 #, python-format
8383 #, python-format
8227 msgid "%r specified as email transport, but not in PATH"
8384 msgid "%r specified as email transport, but not in PATH"
8228 msgstr ""
8385 msgstr ""
8229
8386
8230 #, python-format
8387 #, python-format
8231 msgid "ignoring invalid sendcharset: %s\n"
8388 msgid "ignoring invalid sendcharset: %s\n"
8232 msgstr ""
8389 msgstr ""
8233
8390
8234 #, python-format
8391 #, python-format
8235 msgid "invalid email address: %s"
8392 msgid "invalid email address: %s"
8236 msgstr ""
8393 msgstr ""
8237
8394
8238 #, python-format
8395 #, python-format
8239 msgid "invalid local address: %s"
8396 msgid "invalid local address: %s"
8240 msgstr ""
8397 msgstr ""
8241
8398
8242 #, python-format
8399 #, python-format
8243 msgid "failed to remove %s from manifest"
8400 msgid "failed to remove %s from manifest"
8244 msgstr ""
8401 msgstr ""
8245
8402
8246 #, python-format
8403 #, python-format
8247 msgid "diff context lines count must be an integer, not %r"
8404 msgid "diff context lines count must be an integer, not %r"
8248 msgstr ""
8405 msgstr ""
8249
8406
8250 #, python-format
8407 #, python-format
8251 msgid ""
8408 msgid ""
8252 "untracked file in working directory differs from file in requested revision: "
8409 "untracked file in working directory differs from file in requested revision: "
8253 "'%s'"
8410 "'%s'"
8254 msgstr ""
8411 msgstr ""
8255
8412
8256 #, python-format
8413 #, python-format
8257 msgid "case-folding collision between %s and %s"
8414 msgid "case-folding collision between %s and %s"
8258 msgstr ""
8415 msgstr ""
8259
8416
8260 #, python-format
8417 #, python-format
8261 msgid ""
8418 msgid ""
8262 " conflicting flags for %s\n"
8419 " conflicting flags for %s\n"
8263 "(n)one, e(x)ec or sym(l)ink?"
8420 "(n)one, e(x)ec or sym(l)ink?"
8264 msgstr ""
8421 msgstr ""
8265
8422
8266 msgid "&None"
8423 msgid "&None"
8267 msgstr ""
8424 msgstr ""
8268
8425
8269 msgid "E&xec"
8426 msgid "E&xec"
8270 msgstr ""
8427 msgstr ""
8271
8428
8272 msgid "Sym&link"
8429 msgid "Sym&link"
8273 msgstr ""
8430 msgstr ""
8274
8431
8275 msgid "resolving manifests\n"
8432 msgid "resolving manifests\n"
8276 msgstr ""
8433 msgstr ""
8277
8434
8278 #, python-format
8435 #, python-format
8279 msgid " overwrite %s partial %s\n"
8436 msgid " overwrite %s partial %s\n"
8280 msgstr ""
8437 msgstr ""
8281
8438
8282 #, python-format
8439 #, python-format
8283 msgid " ancestor %s local %s remote %s\n"
8440 msgid " ancestor %s local %s remote %s\n"
8284 msgstr ""
8441 msgstr ""
8285
8442
8286 #, python-format
8443 #, python-format
8287 msgid ""
8444 msgid ""
8288 " local changed %s which remote deleted\n"
8445 " local changed %s which remote deleted\n"
8289 "use (c)hanged version or (d)elete?"
8446 "use (c)hanged version or (d)elete?"
8290 msgstr ""
8447 msgstr ""
8291
8448
8292 msgid "&Changed"
8449 msgid "&Changed"
8293 msgstr ""
8450 msgstr ""
8294
8451
8295 msgid "&Delete"
8452 msgid "&Delete"
8296 msgstr ""
8453 msgstr ""
8297
8454
8298 msgid "c"
8455 msgid "c"
8299 msgstr ""
8456 msgstr ""
8300
8457
8301 #, python-format
8458 #, python-format
8302 msgid ""
8459 msgid ""
8303 "remote changed %s which local deleted\n"
8460 "remote changed %s which local deleted\n"
8304 "use (c)hanged version or leave (d)eleted?"
8461 "use (c)hanged version or leave (d)eleted?"
8305 msgstr ""
8462 msgstr ""
8306
8463
8307 msgid "&Deleted"
8464 msgid "&Deleted"
8308 msgstr ""
8465 msgstr ""
8309
8466
8310 #, python-format
8467 #, python-format
8311 msgid "preserving %s for resolve of %s\n"
8468 msgid "preserving %s for resolve of %s\n"
8312 msgstr ""
8469 msgstr ""
8313
8470
8314 #, python-format
8471 #, python-format
8315 msgid "update failed to remove %s: %s!\n"
8472 msgid "update failed to remove %s: %s!\n"
8316 msgstr ""
8473 msgstr ""
8317
8474
8318 #, python-format
8475 #, python-format
8319 msgid "getting %s\n"
8476 msgid "getting %s\n"
8320 msgstr ""
8477 msgstr ""
8321
8478
8322 #, python-format
8479 #, python-format
8323 msgid "getting %s to %s\n"
8480 msgid "getting %s to %s\n"
8324 msgstr ""
8481 msgstr ""
8325
8482
8326 #, python-format
8483 #, python-format
8327 msgid "warning: detected divergent renames of %s to:\n"
8484 msgid "warning: detected divergent renames of %s to:\n"
8328 msgstr ""
8485 msgstr ""
8329
8486
8330 #, python-format
8487 #, python-format
8331 msgid "branch %s not found"
8488 msgid "branch %s not found"
8332 msgstr ""
8489 msgstr ""
8333
8490
8334 msgid "can't merge with ancestor"
8491 msgid "can't merge with ancestor"
8335 msgstr ""
8492 msgstr ""
8336
8493
8337 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8494 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8338 msgstr ""
8495 msgstr ""
8339
8496
8340 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8497 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8341 msgstr ""
8498 msgstr ""
8342
8499
8343 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8500 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8344 msgstr ""
8501 msgstr ""
8345
8502
8346 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8503 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8347 msgstr ""
8504 msgstr ""
8348
8505
8349 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8506 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8350 msgstr ""
8507 msgstr ""
8351
8508
8352 #, python-format
8509 #, python-format
8353 msgid "cannot create %s: destination already exists"
8510 msgid "cannot create %s: destination already exists"
8354 msgstr ""
8511 msgstr ""
8355
8512
8356 #, python-format
8513 #, python-format
8357 msgid "cannot create %s: unable to create destination directory"
8514 msgid "cannot create %s: unable to create destination directory"
8358 msgstr ""
8515 msgstr ""
8359
8516
8360 #, python-format
8517 #, python-format
8361 msgid "found patch at byte %d\n"
8518 msgid "found patch at byte %d\n"
8362 msgstr ""
8519 msgstr ""
8363
8520
8364 msgid "patch generated by hg export\n"
8521 msgid "patch generated by hg export\n"
8365 msgstr ""
8522 msgstr ""
8366
8523
8367 #, python-format
8524 #, python-format
8368 msgid "unable to find '%s' for patching\n"
8525 msgid "unable to find '%s' for patching\n"
8369 msgstr ""
8526 msgstr ""
8370
8527
8371 #, python-format
8528 #, python-format
8372 msgid "patching file %s\n"
8529 msgid "patching file %s\n"
8373 msgstr ""
8530 msgstr ""
8374
8531
8375 #, python-format
8532 #, python-format
8376 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8533 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8377 msgstr ""
8534 msgstr ""
8378
8535
8379 #, python-format
8536 #, python-format
8380 msgid "bad hunk #%d %s (%d %d %d %d)"
8537 msgid "bad hunk #%d %s (%d %d %d %d)"
8381 msgstr ""
8538 msgstr ""
8382
8539
8383 #, python-format
8540 #, python-format
8384 msgid "file %s already exists\n"
8541 msgid "file %s already exists\n"
8385 msgstr ""
8542 msgstr ""
8386
8543
8387 #, python-format
8544 #, python-format
8388 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8545 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8389 msgstr ""
8546 msgstr ""
8390
8547
8391 #, python-format
8548 #, python-format
8392 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8549 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8393 msgstr ""
8550 msgstr ""
8394
8551
8395 #, python-format
8552 #, python-format
8396 msgid "Hunk #%d FAILED at %d\n"
8553 msgid "Hunk #%d FAILED at %d\n"
8397 msgstr ""
8554 msgstr ""
8398
8555
8399 #, python-format
8556 #, python-format
8400 msgid "bad hunk #%d"
8557 msgid "bad hunk #%d"
8401 msgstr ""
8558 msgstr ""
8402
8559
8403 #, python-format
8560 #, python-format
8404 msgid "bad hunk #%d old text line %d"
8561 msgid "bad hunk #%d old text line %d"
8405 msgstr ""
8562 msgstr ""
8406
8563
8407 msgid "could not extract binary patch"
8564 msgid "could not extract binary patch"
8408 msgstr ""
8565 msgstr ""
8409
8566
8410 #, python-format
8567 #, python-format
8411 msgid "binary patch is %d bytes, not %d"
8568 msgid "binary patch is %d bytes, not %d"
8412 msgstr ""
8569 msgstr ""
8413
8570
8414 #, python-format
8571 #, python-format
8415 msgid "unable to strip away %d dirs from %s"
8572 msgid "unable to strip away %d dirs from %s"
8416 msgstr ""
8573 msgstr ""
8417
8574
8418 msgid "undefined source and destination files"
8575 msgid "undefined source and destination files"
8419 msgstr ""
8576 msgstr ""
8420
8577
8421 #, python-format
8578 #, python-format
8422 msgid "malformed patch %s %s"
8579 msgid "malformed patch %s %s"
8423 msgstr ""
8580 msgstr ""
8424
8581
8425 #, python-format
8582 #, python-format
8426 msgid "unsupported parser state: %s"
8583 msgid "unsupported parser state: %s"
8427 msgstr ""
8584 msgstr ""
8428
8585
8429 #, python-format
8586 #, python-format
8430 msgid "patch command failed: %s"
8587 msgid "patch command failed: %s"
8431 msgstr ""
8588 msgstr ""
8432
8589
8433 #, python-format
8590 #, python-format
8434 msgid "Unsupported line endings type: %s"
8591 msgid "Unsupported line endings type: %s"
8435 msgstr ""
8592 msgstr ""
8436
8593
8437 #, python-format
8594 #, python-format
8438 msgid "no valid hunks found; trying with %r instead\n"
8595 msgid "no valid hunks found; trying with %r instead\n"
8439 msgstr ""
8596 msgstr ""
8440
8597
8441 #, python-format
8598 #, python-format
8442 msgid "exited with status %d"
8599 msgid "exited with status %d"
8443 msgstr ""
8600 msgstr ""
8444
8601
8445 #, python-format
8602 #, python-format
8446 msgid "killed by signal %d"
8603 msgid "killed by signal %d"
8447 msgstr ""
8604 msgstr ""
8448
8605
8449 #, python-format
8606 #, python-format
8450 msgid "stopped by signal %d"
8607 msgid "stopped by signal %d"
8451 msgstr ""
8608 msgstr ""
8452
8609
8453 msgid "invalid exit code"
8610 msgid "invalid exit code"
8454 msgstr ""
8611 msgstr ""
8455
8612
8456 #, python-format
8613 #, python-format
8457 msgid "saving bundle to %s\n"
8614 msgid "saving bundle to %s\n"
8458 msgstr ""
8615 msgstr ""
8459
8616
8460 msgid "adding branch\n"
8617 msgid "adding branch\n"
8461 msgstr ""
8618 msgstr ""
8462
8619
8463 #, python-format
8620 #, python-format
8464 msgid "cannot %s; remote repository does not support the %r capability"
8621 msgid "cannot %s; remote repository does not support the %r capability"
8465 msgstr ""
8622 msgstr ""
8466
8623
8467 #, python-format
8624 #, python-format
8468 msgid "unknown compression type %r"
8625 msgid "unknown compression type %r"
8469 msgstr ""
8626 msgstr ""
8470
8627
8471 #, python-format
8628 #, python-format
8472 msgid "index %s unknown flags %#04x for format v0"
8629 msgid "index %s unknown flags %#04x for format v0"
8473 msgstr ""
8630 msgstr ""
8474
8631
8475 #, python-format
8632 #, python-format
8476 msgid "index %s unknown flags %#04x for revlogng"
8633 msgid "index %s unknown flags %#04x for revlogng"
8477 msgstr ""
8634 msgstr ""
8478
8635
8479 #, python-format
8636 #, python-format
8480 msgid "index %s unknown format %d"
8637 msgid "index %s unknown format %d"
8481 msgstr ""
8638 msgstr ""
8482
8639
8483 #, python-format
8640 #, python-format
8484 msgid "index %s is corrupted"
8641 msgid "index %s is corrupted"
8485 msgstr ""
8642 msgstr ""
8486
8643
8487 msgid "no node"
8644 msgid "no node"
8488 msgstr ""
8645 msgstr ""
8489
8646
8490 msgid "ambiguous identifier"
8647 msgid "ambiguous identifier"
8491 msgstr ""
8648 msgstr ""
8492
8649
8493 msgid "no match found"
8650 msgid "no match found"
8494 msgstr ""
8651 msgstr ""
8495
8652
8496 #, python-format
8653 #, python-format
8497 msgid "incompatible revision flag %x"
8654 msgid "incompatible revision flag %x"
8498 msgstr ""
8655 msgstr ""
8499
8656
8500 #, python-format
8657 #, python-format
8501 msgid "%s not found in the transaction"
8658 msgid "%s not found in the transaction"
8502 msgstr ""
8659 msgstr ""
8503
8660
8504 msgid "unknown base"
8661 msgid "unknown base"
8505 msgstr ""
8662 msgstr ""
8506
8663
8507 msgid "consistency error adding group"
8664 msgid "consistency error adding group"
8508 msgstr ""
8665 msgstr ""
8509
8666
8510 #, python-format
8667 #, python-format
8511 msgid "%s looks like a binary file."
8668 msgid "%s looks like a binary file."
8512 msgstr ""
8669 msgstr ""
8513
8670
8514 msgid "can only specify two labels."
8671 msgid "can only specify two labels."
8515 msgstr ""
8672 msgstr ""
8516
8673
8517 msgid "warning: conflicts during merge.\n"
8674 msgid "warning: conflicts during merge.\n"
8518 msgstr ""
8675 msgstr ""
8519
8676
8520 #, python-format
8677 #, python-format
8521 msgid "couldn't parse location %s"
8678 msgid "couldn't parse location %s"
8522 msgstr ""
8679 msgstr ""
8523
8680
8524 msgid "could not create remote repo"
8681 msgid "could not create remote repo"
8525 msgstr ""
8682 msgstr ""
8526
8683
8527 msgid "remote: "
8684 msgid "remote: "
8528 msgstr ""
8685 msgstr ""
8529
8686
8530 msgid "no suitable response from remote hg"
8687 msgid "no suitable response from remote hg"
8531 msgstr ""
8688 msgstr ""
8532
8689
8533 #, python-format
8690 #, python-format
8534 msgid "push refused: %s"
8691 msgid "push refused: %s"
8535 msgstr ""
8692 msgstr ""
8536
8693
8537 msgid "unsynced changes"
8694 msgid "unsynced changes"
8538 msgstr ""
8695 msgstr ""
8539
8696
8540 msgid "cannot lock static-http repository"
8697 msgid "cannot lock static-http repository"
8541 msgstr ""
8698 msgstr ""
8542
8699
8543 msgid "cannot create new static-http repository"
8700 msgid "cannot create new static-http repository"
8544 msgstr ""
8701 msgstr ""
8545
8702
8546 #, python-format
8703 #, python-format
8547 msgid "invalid entry in fncache, line %s"
8704 msgid "invalid entry in fncache, line %s"
8548 msgstr ""
8705 msgstr ""
8549
8706
8550 msgid "scanning\n"
8707 msgid "scanning\n"
8551 msgstr ""
8708 msgstr ""
8552
8709
8553 #, python-format
8710 #, python-format
8554 msgid "%d files, %d bytes to transfer\n"
8711 msgid "%d files, %d bytes to transfer\n"
8555 msgstr ""
8712 msgstr ""
8556
8713
8557 #, python-format
8714 #, python-format
8558 msgid "sending %s (%d bytes)\n"
8715 msgid "sending %s (%d bytes)\n"
8559 msgstr ""
8716 msgstr ""
8560
8717
8561 #, python-format
8718 #, python-format
8562 msgid ""
8719 msgid ""
8563 " subrepository sources for %s differ\n"
8720 " subrepository sources for %s differ\n"
8564 "use (l)ocal source (%s) or (r)emote source (%s)?"
8721 "use (l)ocal source (%s) or (r)emote source (%s)?"
8565 msgstr ""
8722 msgstr ""
8566
8723
8567 msgid "&Remote"
8724 msgid "&Remote"
8568 msgstr ""
8725 msgstr ""
8569
8726
8570 msgid "r"
8727 msgid "r"
8571 msgstr ""
8728 msgstr ""
8572
8729
8573 #, python-format
8730 #, python-format
8574 msgid ""
8731 msgid ""
8575 " local changed subrepository %s which remote removed\n"
8732 " local changed subrepository %s which remote removed\n"
8576 "use (c)hanged version or (d)elete?"
8733 "use (c)hanged version or (d)elete?"
8577 msgstr ""
8734 msgstr ""
8578
8735
8579 #, python-format
8736 #, python-format
8580 msgid ""
8737 msgid ""
8581 " remote changed subrepository %s which local removed\n"
8738 " remote changed subrepository %s which local removed\n"
8582 "use (c)hanged version or (d)elete?"
8739 "use (c)hanged version or (d)elete?"
8583 msgstr ""
8740 msgstr ""
8584
8741
8585 #, python-format
8742 #, python-format
8586 msgid "removing subrepo %s\n"
8743 msgid "removing subrepo %s\n"
8587 msgstr ""
8744 msgstr ""
8588
8745
8589 #, python-format
8746 #, python-format
8590 msgid "pulling subrepo %s\n"
8747 msgid "pulling subrepo %s\n"
8591 msgstr ""
8748 msgstr ""
8592
8749
8593 #, python-format
8750 #, python-format
8594 msgid "pushing subrepo %s\n"
8751 msgid "pushing subrepo %s\n"
8595 msgstr ""
8752 msgstr ""
8596
8753
8597 msgid "unmatched quotes"
8754 msgid "unmatched quotes"
8598 msgstr ""
8755 msgstr ""
8599
8756
8600 #, python-format
8757 #, python-format
8601 msgid "error expanding '%s%%%s'"
8758 msgid "error expanding '%s%%%s'"
8602 msgstr ""
8759 msgstr ""
8603
8760
8604 #, python-format
8761 #, python-format
8605 msgid "unknown filter '%s'"
8762 msgid "unknown filter '%s'"
8606 msgstr ""
8763 msgstr ""
8607
8764
8608 #, python-format
8765 #, python-format
8609 msgid "style not found: %s"
8766 msgid "style not found: %s"
8610 msgstr ""
8767 msgstr ""
8611
8768
8612 #, python-format
8769 #, python-format
8613 msgid "template file %s: %s"
8770 msgid "template file %s: %s"
8614 msgstr ""
8771 msgstr ""
8615
8772
8616 msgid "cannot use transaction when it is already committed/aborted"
8773 msgid "cannot use transaction when it is already committed/aborted"
8617 msgstr ""
8774 msgstr ""
8618
8775
8619 #, python-format
8776 #, python-format
8620 msgid "failed to truncate %s\n"
8777 msgid "failed to truncate %s\n"
8621 msgstr ""
8778 msgstr ""
8622
8779
8623 msgid "transaction abort!\n"
8780 msgid "transaction abort!\n"
8624 msgstr ""
8781 msgstr ""
8625
8782
8626 msgid "rollback completed\n"
8783 msgid "rollback completed\n"
8627 msgstr ""
8784 msgstr ""
8628
8785
8629 msgid "rollback failed - please run hg recover\n"
8786 msgid "rollback failed - please run hg recover\n"
8630 msgstr ""
8787 msgstr ""
8631
8788
8632 #, python-format
8789 #, python-format
8633 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8790 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8634 msgstr ""
8791 msgstr ""
8635
8792
8636 #, python-format
8793 #, python-format
8637 msgid "Ignored: %s\n"
8794 msgid "Ignored: %s\n"
8638 msgstr ""
8795 msgstr ""
8639
8796
8640 #, python-format
8797 #, python-format
8641 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8798 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8642 msgstr ""
8799 msgstr ""
8643
8800
8644 #, python-format
8801 #, python-format
8645 msgid "%s.%s not a boolean ('%s')"
8802 msgid "%s.%s not a boolean ('%s')"
8646 msgstr ""
8803 msgstr ""
8647
8804
8648 msgid "enter a commit username:"
8805 msgid "enter a commit username:"
8649 msgstr ""
8806 msgstr ""
8650
8807
8651 #, python-format
8808 #, python-format
8652 msgid "No username found, using '%s' instead\n"
8809 msgid "No username found, using '%s' instead\n"
8653 msgstr ""
8810 msgstr ""
8654
8811
8655 msgid "Please specify a username."
8812 msgid "Please specify a username."
8656 msgstr ""
8813 msgstr ""
8657
8814
8658 #, python-format
8815 #, python-format
8659 msgid "username %s contains a newline\n"
8816 msgid "username %s contains a newline\n"
8660 msgstr ""
8817 msgstr ""
8661
8818
8662 msgid "unrecognized response\n"
8819 msgid "unrecognized response\n"
8663 msgstr ""
8820 msgstr ""
8664
8821
8665 msgid "response expected"
8822 msgid "response expected"
8666 msgstr ""
8823 msgstr ""
8667
8824
8668 msgid "password: "
8825 msgid "password: "
8669 msgstr ""
8826 msgstr ""
8670
8827
8671 msgid "edit failed"
8828 msgid "edit failed"
8672 msgstr ""
8829 msgstr ""
8673
8830
8674 msgid "http authorization required"
8831 msgid "http authorization required"
8675 msgstr ""
8832 msgstr ""
8676
8833
8677 msgid "http authorization required\n"
8834 msgid "http authorization required\n"
8678 msgstr ""
8835 msgstr ""
8679
8836
8680 #, python-format
8837 #, python-format
8681 msgid "realm: %s\n"
8838 msgid "realm: %s\n"
8682 msgstr ""
8839 msgstr ""
8683
8840
8684 #, python-format
8841 #, python-format
8685 msgid "user: %s\n"
8842 msgid "user: %s\n"
8686 msgstr ""
8843 msgstr ""
8687
8844
8688 msgid "user:"
8845 msgid "user:"
8689 msgstr ""
8846 msgstr ""
8690
8847
8691 #, python-format
8848 #, python-format
8692 msgid "http auth: user %s, password %s\n"
8849 msgid "http auth: user %s, password %s\n"
8693 msgstr ""
8850 msgstr ""
8694
8851
8695 #, python-format
8852 #, python-format
8696 msgid "proxying through http://%s:%s\n"
8853 msgid "proxying through http://%s:%s\n"
8697 msgstr ""
8854 msgstr ""
8698
8855
8699 #, python-format
8856 #, python-format
8700 msgid "command '%s' failed: %s"
8857 msgid "command '%s' failed: %s"
8701 msgstr ""
8858 msgstr ""
8702
8859
8703 #, python-format
8860 #, python-format
8704 msgid "path contains illegal component: %s"
8861 msgid "path contains illegal component: %s"
8705 msgstr ""
8862 msgstr ""
8706
8863
8707 #, python-format
8864 #, python-format
8708 msgid "path %r is inside repo %r"
8865 msgid "path %r is inside repo %r"
8709 msgstr ""
8866 msgstr ""
8710
8867
8711 #, python-format
8868 #, python-format
8712 msgid "path %r traverses symbolic link %r"
8869 msgid "path %r traverses symbolic link %r"
8713 msgstr ""
8870 msgstr ""
8714
8871
8715 msgid "Hardlinks not supported"
8872 msgid "Hardlinks not supported"
8716 msgstr ""
8873 msgstr ""
8717
8874
8718 #, python-format
8875 #, python-format
8719 msgid "could not symlink to %r: %s"
8876 msgid "could not symlink to %r: %s"
8720 msgstr ""
8877 msgstr ""
8721
8878
8722 #, python-format
8879 #, python-format
8723 msgid "invalid date: %r "
8880 msgid "invalid date: %r "
8724 msgstr ""
8881 msgstr ""
8725
8882
8726 #, python-format
8883 #, python-format
8727 msgid "date exceeds 32 bits: %d"
8884 msgid "date exceeds 32 bits: %d"
8728 msgstr ""
8885 msgstr ""
8729
8886
8730 #, python-format
8887 #, python-format
8731 msgid "impossible time zone offset: %d"
8888 msgid "impossible time zone offset: %d"
8732 msgstr ""
8889 msgstr ""
8733
8890
8734 #, python-format
8891 #, python-format
8735 msgid "invalid day spec: %s"
8892 msgid "invalid day spec: %s"
8736 msgstr ""
8893 msgstr ""
8737
8894
8738 #, python-format
8895 #, python-format
8739 msgid "%.0f GB"
8896 msgid "%.0f GB"
8740 msgstr ""
8897 msgstr ""
8741
8898
8742 #, python-format
8899 #, python-format
8743 msgid "%.1f GB"
8900 msgid "%.1f GB"
8744 msgstr ""
8901 msgstr ""
8745
8902
8746 #, python-format
8903 #, python-format
8747 msgid "%.2f GB"
8904 msgid "%.2f GB"
8748 msgstr ""
8905 msgstr ""
8749
8906
8750 #, python-format
8907 #, python-format
8751 msgid "%.0f MB"
8908 msgid "%.0f MB"
8752 msgstr ""
8909 msgstr ""
8753
8910
8754 #, python-format
8911 #, python-format
8755 msgid "%.1f MB"
8912 msgid "%.1f MB"
8756 msgstr ""
8913 msgstr ""
8757
8914
8758 #, python-format
8915 #, python-format
8759 msgid "%.2f MB"
8916 msgid "%.2f MB"
8760 msgstr ""
8917 msgstr ""
8761
8918
8762 #, python-format
8919 #, python-format
8763 msgid "%.0f KB"
8920 msgid "%.0f KB"
8764 msgstr ""
8921 msgstr ""
8765
8922
8766 #, python-format
8923 #, python-format
8767 msgid "%.1f KB"
8924 msgid "%.1f KB"
8768 msgstr ""
8925 msgstr ""
8769
8926
8770 #, python-format
8927 #, python-format
8771 msgid "%.2f KB"
8928 msgid "%.2f KB"
8772 msgstr ""
8929 msgstr ""
8773
8930
8774 #, python-format
8931 #, python-format
8775 msgid "%.0f bytes"
8932 msgid "%.0f bytes"
8776 msgstr ""
8933 msgstr ""
8777
8934
8778 msgid "cannot verify bundle or remote repos"
8935 msgid "cannot verify bundle or remote repos"
8779 msgstr ""
8936 msgstr ""
8780
8937
8781 msgid "interrupted"
8938 msgid "interrupted"
8782 msgstr ""
8939 msgstr ""
8783
8940
8784 #, python-format
8941 #, python-format
8785 msgid "empty or missing %s"
8942 msgid "empty or missing %s"
8786 msgstr ""
8943 msgstr ""
8787
8944
8788 #, python-format
8945 #, python-format
8789 msgid "data length off by %d bytes"
8946 msgid "data length off by %d bytes"
8790 msgstr ""
8947 msgstr ""
8791
8948
8792 #, python-format
8949 #, python-format
8793 msgid "index contains %d extra bytes"
8950 msgid "index contains %d extra bytes"
8794 msgstr ""
8951 msgstr ""
8795
8952
8796 #, python-format
8953 #, python-format
8797 msgid "warning: `%s' uses revlog format 1"
8954 msgid "warning: `%s' uses revlog format 1"
8798 msgstr ""
8955 msgstr ""
8799
8956
8800 #, python-format
8957 #, python-format
8801 msgid "warning: `%s' uses revlog format 0"
8958 msgid "warning: `%s' uses revlog format 0"
8802 msgstr ""
8959 msgstr ""
8803
8960
8804 #, python-format
8961 #, python-format
8805 msgid "rev %d points to nonexistent changeset %d"
8962 msgid "rev %d points to nonexistent changeset %d"
8806 msgstr ""
8963 msgstr ""
8807
8964
8808 #, python-format
8965 #, python-format
8809 msgid "rev %d points to unexpected changeset %d"
8966 msgid "rev %d points to unexpected changeset %d"
8810 msgstr ""
8967 msgstr ""
8811
8968
8812 #, python-format
8969 #, python-format
8813 msgid " (expected %s)"
8970 msgid " (expected %s)"
8814 msgstr ""
8971 msgstr ""
8815
8972
8816 #, python-format
8973 #, python-format
8817 msgid "unknown parent 1 %s of %s"
8974 msgid "unknown parent 1 %s of %s"
8818 msgstr ""
8975 msgstr ""
8819
8976
8820 #, python-format
8977 #, python-format
8821 msgid "unknown parent 2 %s of %s"
8978 msgid "unknown parent 2 %s of %s"
8822 msgstr ""
8979 msgstr ""
8823
8980
8824 #, python-format
8981 #, python-format
8825 msgid "checking parents of %s"
8982 msgid "checking parents of %s"
8826 msgstr ""
8983 msgstr ""
8827
8984
8828 #, python-format
8985 #, python-format
8829 msgid "duplicate revision %d (%d)"
8986 msgid "duplicate revision %d (%d)"
8830 msgstr ""
8987 msgstr ""
8831
8988
8832 #, python-format
8989 #, python-format
8833 msgid "repository uses revlog format %d\n"
8990 msgid "repository uses revlog format %d\n"
8834 msgstr ""
8991 msgstr ""
8835
8992
8836 msgid "checking changesets\n"
8993 msgid "checking changesets\n"
8837 msgstr ""
8994 msgstr ""
8838
8995
8839 #, python-format
8996 #, python-format
8840 msgid "unpacking changeset %s"
8997 msgid "unpacking changeset %s"
8841 msgstr ""
8998 msgstr ""
8842
8999
8843 msgid "checking manifests\n"
9000 msgid "checking manifests\n"
8844 msgstr ""
9001 msgstr ""
8845
9002
8846 #, python-format
9003 #, python-format
8847 msgid "%s not in changesets"
9004 msgid "%s not in changesets"
8848 msgstr ""
9005 msgstr ""
8849
9006
8850 msgid "file without name in manifest"
9007 msgid "file without name in manifest"
8851 msgstr ""
9008 msgstr ""
8852
9009
8853 #, python-format
9010 #, python-format
8854 msgid "reading manifest delta %s"
9011 msgid "reading manifest delta %s"
8855 msgstr ""
9012 msgstr ""
8856
9013
8857 msgid "crosschecking files in changesets and manifests\n"
9014 msgid "crosschecking files in changesets and manifests\n"
8858 msgstr ""
9015 msgstr ""
8859
9016
8860 #, python-format
9017 #, python-format
8861 msgid "changeset refers to unknown manifest %s"
9018 msgid "changeset refers to unknown manifest %s"
8862 msgstr ""
9019 msgstr ""
8863
9020
8864 msgid "in changeset but not in manifest"
9021 msgid "in changeset but not in manifest"
8865 msgstr ""
9022 msgstr ""
8866
9023
8867 msgid "in manifest but not in changeset"
9024 msgid "in manifest but not in changeset"
8868 msgstr ""
9025 msgstr ""
8869
9026
8870 msgid "checking files\n"
9027 msgid "checking files\n"
8871 msgstr ""
9028 msgstr ""
8872
9029
8873 #, python-format
9030 #, python-format
8874 msgid "cannot decode filename '%s'"
9031 msgid "cannot decode filename '%s'"
8875 msgstr ""
9032 msgstr ""
8876
9033
8877 #, python-format
9034 #, python-format
8878 msgid "broken revlog! (%s)"
9035 msgid "broken revlog! (%s)"
8879 msgstr ""
9036 msgstr ""
8880
9037
8881 msgid "missing revlog!"
9038 msgid "missing revlog!"
8882 msgstr ""
9039 msgstr ""
8883
9040
8884 #, python-format
9041 #, python-format
8885 msgid "%s not in manifests"
9042 msgid "%s not in manifests"
8886 msgstr ""
9043 msgstr ""
8887
9044
8888 #, python-format
9045 #, python-format
8889 msgid "unpacked size is %s, %s expected"
9046 msgid "unpacked size is %s, %s expected"
8890 msgstr ""
9047 msgstr ""
8891
9048
8892 #, python-format
9049 #, python-format
8893 msgid "unpacking %s"
9050 msgid "unpacking %s"
8894 msgstr ""
9051 msgstr ""
8895
9052
8896 #, python-format
9053 #, python-format
8897 msgid "empty or missing copy source revlog %s:%s"
9054 msgid "empty or missing copy source revlog %s:%s"
8898 msgstr ""
9055 msgstr ""
8899
9056
8900 #, python-format
9057 #, python-format
8901 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
9058 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8902 msgstr ""
9059 msgstr ""
8903
9060
8904 #, python-format
9061 #, python-format
8905 msgid "checking rename of %s"
9062 msgid "checking rename of %s"
8906 msgstr ""
9063 msgstr ""
8907
9064
8908 #, python-format
9065 #, python-format
8909 msgid "%s in manifests not found"
9066 msgid "%s in manifests not found"
8910 msgstr ""
9067 msgstr ""
8911
9068
8912 #, python-format
9069 #, python-format
8913 msgid "warning: orphan revlog '%s'"
9070 msgid "warning: orphan revlog '%s'"
8914 msgstr ""
9071 msgstr ""
8915
9072
8916 #, python-format
9073 #, python-format
8917 msgid "%d files, %d changesets, %d total revisions\n"
9074 msgid "%d files, %d changesets, %d total revisions\n"
8918 msgstr ""
9075 msgstr ""
8919
9076
8920 #, python-format
9077 #, python-format
8921 msgid "%d warnings encountered!\n"
9078 msgid "%d warnings encountered!\n"
8922 msgstr ""
9079 msgstr ""
8923
9080
8924 #, python-format
9081 #, python-format
8925 msgid "%d integrity errors encountered!\n"
9082 msgid "%d integrity errors encountered!\n"
8926 msgstr ""
9083 msgstr ""
8927
9084
8928 #, python-format
9085 #, python-format
8929 msgid "(first damaged changeset appears to be %d)\n"
9086 msgid "(first damaged changeset appears to be %d)\n"
8930 msgstr ""
9087 msgstr ""
8931
9088
8932 msgid "user name not available - set USERNAME environment variable"
9089 msgid "user name not available - set USERNAME environment variable"
8933 msgstr ""
9090 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now