##// END OF EJS Templates
i18n-fr: add a glossary and recommendations
Cédric Duval -
r8974:d48080fe default
parent child Browse files
Show More
@@ -1,8574 +1,8654
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 :
6 # - dans l'aide d'une commande, la première ligne descriptive
7 # commence par un verbe au présent sans majuscule
8 # - dans l'aide d'une commande, la description des options
9 # utilise un verbe à l'infinitif
10 #
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
13 # termes comportant un point d'interrogation...
14 #
15 # Dictionnaire de termes courants :
16 # - to apply a patch appliquer un patch
17 # - a branch une branche
18 # - to check out extraire (terminologie utilisée par svn)
19 # - children des rejetons ? des descendants ?
20 # - to clone clôner
21 # - a conflict un conflit
22 # - an extension une extension (au sens de module Mercurial)
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 ?)
25 # - a mail un courriel, un courrier électronique
26 # - a merge une fusion
27 # - to merge fusionner
28 # - a node un nœud ?
29 # - a patch queue/stack une pile de patchs (mq)
30 # - à l'utilisation c'est vraiment une _pile_
31 # (on y empile et dépile des patchs)
32 # - l'unique cas où _file_ conviendrait est dans le
33 # contexte de la commande qfinish
34 # => terme unique de pile pour plus de cohérence
35 # - the patch series la série (complète) de patchs (suite ?)
36 # - rejects des rejets ? (à propos de l'application d'un
37 # patch)
38 # - a repository un dépôt
39 # - to revert annuler des modifications (ou défaire ?)
40 # - a revision une révision
41 # - the topmost patch le dernier patch appliqué
42 # - a tree une arborescence
43 # - an unrelated repository un dépôt non apparenté
44 # - unversioned
45 # unmanaged
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
47 # hors révision ?
48 # - the working directory le répertoire de travail
49 #
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
51 # pour ne pas alourdir inutilement la traduction :
52 # - a diff un diff ? (ou également un patch ? synonymes...)
53 # - a hook un hook
54 # - a patch un patch
55 # - a tag un tag
56 # - to tag taguer
57 #
58 # Termes anglais avec une signification très spécifique, difficile à
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
60 # - a bundle un \"bundle\"
61 # - to bundle créer un \"bundle\" ?
62 # - a changeset un \"changeset\"
63 # - a changegroup un \"changegroup\"
64 # - the tip la révision \"tip\"
65 #
66 # Termes dont le classement / la traduction sont à déterminer :
67 # - a commit un commit, un \"commit\"
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
69 # - a guard une \"garde\" ? (une protection ?)
70 # - to guard a patch \"garder\" un patch ?
71 # - to pull rapatrier des \"changesets\" ? effectuer une
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
73 # - to push propager ? (utilisé par svn pour commit)
74 # publier ? pousser ?? envoyer ??
75 # - the series file (mq) ?
76 #
77 # Notes :
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
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
82 # de faire le lien avec des termes franglisants parfois utilisés
83 # (par ex. fusionner = "merger", etc.) ... ?
84 #
5 msgid ""
85 msgid ""
6 msgstr ""
86 msgstr ""
7 "Project-Id-Version: Mercurial\n"
87 "Project-Id-Version: Mercurial\n"
8 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
9 "POT-Creation-Date: 2009-06-28 19:53+0200\n"
89 "POT-Creation-Date: 2009-06-28 19:53+0200\n"
10 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
11 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
12 "Language-Team: French\n"
92 "Language-Team: French\n"
13 "MIME-Version: 1.0\n"
93 "MIME-Version: 1.0\n"
14 "Content-Type: text/plain; charset=UTF-8\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
95 "Content-Transfer-Encoding: 8bit\n"
16 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
17
97
18 #, python-format
98 #, python-format
19 msgid " (default: %s)"
99 msgid " (default: %s)"
20 msgstr ""
100 msgstr ""
21
101
22 msgid "OPTIONS"
102 msgid "OPTIONS"
23 msgstr ""
103 msgstr ""
24
104
25 msgid "COMMANDS"
105 msgid "COMMANDS"
26 msgstr ""
106 msgstr ""
27
107
28 msgid " options:\n"
108 msgid " options:\n"
29 msgstr ""
109 msgstr ""
30
110
31 #, python-format
111 #, python-format
32 msgid ""
112 msgid ""
33 " aliases: %s\n"
113 " aliases: %s\n"
34 "\n"
114 "\n"
35 msgstr ""
115 msgstr ""
36
116
37 msgid ""
117 msgid ""
38 "control access to a repository using simple hooks\n"
118 "control access to a repository using simple hooks\n"
39 "\n"
119 "\n"
40 "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"
41 "of a repository when receiving incoming changesets.\n"
121 "of a repository when receiving incoming changesets.\n"
42 "\n"
122 "\n"
43 "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"
44 "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"
45 "changeset (since the latter is merely informative).\n"
125 "changeset (since the latter is merely informative).\n"
46 "\n"
126 "\n"
47 "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"
48 "preventing authenticating users from doing anything other than\n"
128 "preventing authenticating users from doing anything other than\n"
49 "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"
50 "interactive shell access, as they can then disable the hook.\n"
130 "interactive shell access, as they can then disable the hook.\n"
51 "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"
52 "is no way to distinguish them.\n"
132 "is no way to distinguish them.\n"
53 "\n"
133 "\n"
54 "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"
55 "\n"
135 "\n"
56 " [extensions]\n"
136 " [extensions]\n"
57 " hgext.acl =\n"
137 " hgext.acl =\n"
58 "\n"
138 "\n"
59 " [hooks]\n"
139 " [hooks]\n"
60 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
61 "\n"
141 "\n"
62 " [acl]\n"
142 " [acl]\n"
63 " # 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"
64 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
65 " sources = serve\n"
145 " sources = serve\n"
66 "\n"
146 "\n"
67 "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"
68 "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"
69 "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"
70 "list is.\n"
150 "list is.\n"
71 "\n"
151 "\n"
72 " [acl.allow]\n"
152 " [acl.allow]\n"
73 " # 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"
74 " # An empty acl.allow section means no users allowed.\n"
154 " # An empty acl.allow section means no users allowed.\n"
75 " docs/** = doc_writer\n"
155 " docs/** = doc_writer\n"
76 " .hgtags = release_engineer\n"
156 " .hgtags = release_engineer\n"
77 "\n"
157 "\n"
78 " [acl.deny]\n"
158 " [acl.deny]\n"
79 " # 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"
80 " # An empty acl.deny section means all users allowed.\n"
160 " # An empty acl.deny section means all users allowed.\n"
81 " glob pattern = user4, user5\n"
161 " glob pattern = user4, user5\n"
82 " ** = user6\n"
162 " ** = user6\n"
83 msgstr ""
163 msgstr ""
84
164
85 #, python-format
165 #, python-format
86 msgid "acl: %s not enabled\n"
166 msgid "acl: %s not enabled\n"
87 msgstr ""
167 msgstr ""
88
168
89 #, python-format
169 #, python-format
90 msgid "acl: %s enabled, %d entries for user %s\n"
170 msgid "acl: %s enabled, %d entries for user %s\n"
91 msgstr ""
171 msgstr ""
92
172
93 #, python-format
173 #, python-format
94 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
95 msgstr ""
175 msgstr ""
96
176
97 #, python-format
177 #, python-format
98 msgid "acl: changes have source \"%s\" - skipping\n"
178 msgid "acl: changes have source \"%s\" - skipping\n"
99 msgstr ""
179 msgstr ""
100
180
101 #, python-format
181 #, python-format
102 msgid "acl: user %s denied on %s\n"
182 msgid "acl: user %s denied on %s\n"
103 msgstr ""
183 msgstr ""
104
184
105 #, python-format
185 #, python-format
106 msgid "acl: access denied for changeset %s"
186 msgid "acl: access denied for changeset %s"
107 msgstr ""
187 msgstr ""
108
188
109 #, python-format
189 #, python-format
110 msgid "acl: user %s not allowed on %s\n"
190 msgid "acl: user %s not allowed on %s\n"
111 msgstr ""
191 msgstr ""
112
192
113 #, python-format
193 #, python-format
114 msgid "acl: allowing changeset %s\n"
194 msgid "acl: allowing changeset %s\n"
115 msgstr ""
195 msgstr ""
116
196
117 msgid ""
197 msgid ""
118 "track a line of development with movable markers\n"
198 "track a line of development with movable markers\n"
119 "\n"
199 "\n"
120 "Bookmarks are local movable markers to changesets. Every bookmark\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
121 "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"
122 "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"
123 "the bookmark shifts to the new changeset.\n"
203 "the bookmark shifts to the new changeset.\n"
124 "\n"
204 "\n"
125 "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"
126 "(e.g. hg merge, hg update).\n"
206 "(e.g. hg merge, hg update).\n"
127 "\n"
207 "\n"
128 "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"
129 "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"
130 "git-like experience by adding the following configuration option to\n"
210 "git-like experience by adding the following configuration option to\n"
131 "your .hgrc:\n"
211 "your .hgrc:\n"
132 "\n"
212 "\n"
133 " [bookmarks]\n"
213 " [bookmarks]\n"
134 " track.current = True\n"
214 " track.current = True\n"
135 "\n"
215 "\n"
136 "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"
137 "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"
138 "branching.\n"
218 "branching.\n"
139 msgstr ""
219 msgstr ""
140
220
141 msgid ""
221 msgid ""
142 "track a line of development with movable markers\n"
222 "track a line of development with movable markers\n"
143 "\n"
223 "\n"
144 " Bookmarks are pointers to certain commits that move when\n"
224 " Bookmarks are pointers to certain commits that move when\n"
145 " committing. Bookmarks are local. They can be renamed, copied and\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
146 " 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"
147 " '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"
148 "\n"
228 "\n"
149 " 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"
150 " 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"
151 " 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"
152 " the bookmark is assigned to that revision.\n"
232 " the bookmark is assigned to that revision.\n"
153 " "
233 " "
154 msgstr ""
234 msgstr ""
155
235
156 msgid "a bookmark of this name does not exist"
236 msgid "a bookmark of this name does not exist"
157 msgstr ""
237 msgstr ""
158
238
159 msgid "a bookmark of the same name already exists"
239 msgid "a bookmark of the same name already exists"
160 msgstr ""
240 msgstr ""
161
241
162 msgid "new bookmark name required"
242 msgid "new bookmark name required"
163 msgstr ""
243 msgstr ""
164
244
165 msgid "bookmark name required"
245 msgid "bookmark name required"
166 msgstr ""
246 msgstr ""
167
247
168 msgid "bookmark name cannot contain newlines"
248 msgid "bookmark name cannot contain newlines"
169 msgstr ""
249 msgstr ""
170
250
171 msgid "a bookmark cannot have the name of an existing branch"
251 msgid "a bookmark cannot have the name of an existing branch"
172 msgstr ""
252 msgstr ""
173
253
174 msgid "force"
254 msgid "force"
175 msgstr ""
255 msgstr ""
176
256
177 msgid "revision"
257 msgid "revision"
178 msgstr ""
258 msgstr ""
179
259
180 msgid "delete a given bookmark"
260 msgid "delete a given bookmark"
181 msgstr ""
261 msgstr ""
182
262
183 msgid "rename a given bookmark"
263 msgid "rename a given bookmark"
184 msgstr ""
264 msgstr ""
185
265
186 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
187 msgstr ""
267 msgstr ""
188
268
189 msgid ""
269 msgid ""
190 "integrate Mercurial with a Bugzilla bug tracker\n"
270 "integrate Mercurial with a Bugzilla bug tracker\n"
191 "\n"
271 "\n"
192 "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"
193 "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"
194 "bug status.\n"
274 "bug status.\n"
195 "\n"
275 "\n"
196 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
197 "installations using MySQL are supported.\n"
277 "installations using MySQL are supported.\n"
198 "\n"
278 "\n"
199 "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"
200 "emails. That script changes between Bugzilla versions; the\n"
280 "emails. That script changes between Bugzilla versions; the\n"
201 "'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"
202 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
203 "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"
204 "ensure the Bugzilla install file permissions are set appropriately.\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
205 "\n"
285 "\n"
206 "Configuring the extension:\n"
286 "Configuring the extension:\n"
207 "\n"
287 "\n"
208 " [bugzilla]\n"
288 " [bugzilla]\n"
209 "\n"
289 "\n"
210 " host Hostname of the MySQL server holding the Bugzilla\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
211 " database.\n"
291 " database.\n"
212 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
213 " user Username to use to access MySQL server. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
214 " password Password to use to access MySQL server.\n"
294 " password Password to use to access MySQL server.\n"
215 " timeout Database connection timeout (seconds). Default 5.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
216 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
217 " 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"
218 " and '2.16' for versions prior to 2.18.\n"
298 " and '2.16' for versions prior to 2.18.\n"
219 " bzuser Fallback Bugzilla user name to record comments with, if\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
220 " changeset committer cannot be found as a Bugzilla user.\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
221 " bzdir Bugzilla install directory. Used by default notify.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
222 " Default '/var/www/html/bugzilla'.\n"
302 " Default '/var/www/html/bugzilla'.\n"
223 " 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"
224 " notification emails. Substitutes from a map with 3\n"
304 " notification emails. Substitutes from a map with 3\n"
225 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
226 " bugzilla email). Default depends on version; from 2.18\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
227 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
228 " %(id)s %(user)s\".\n"
308 " %(id)s %(user)s\".\n"
229 " regexp Regular expression to match bug IDs in changeset commit\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
230 " message. Must contain one \"()\" group. The default\n"
310 " message. Must contain one \"()\" group. The default\n"
231 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
232 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
233 " variations thereof. Matching is case insensitive.\n"
313 " variations thereof. Matching is case insensitive.\n"
234 " style The style file to use when formatting comments.\n"
314 " style The style file to use when formatting comments.\n"
235 " template Template to use when formatting comments. Overrides\n"
315 " template Template to use when formatting comments. Overrides\n"
236 " style if specified. In addition to the usual Mercurial\n"
316 " style if specified. In addition to the usual Mercurial\n"
237 " keywords, the extension specifies:\n"
317 " keywords, the extension specifies:\n"
238 " {bug} The Bugzilla bug ID.\n"
318 " {bug} The Bugzilla bug ID.\n"
239 " {root} The full pathname of the Mercurial\n"
319 " {root} The full pathname of the Mercurial\n"
240 " repository.\n"
320 " repository.\n"
241 " {webroot} Stripped pathname of the Mercurial\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
242 " repository.\n"
322 " repository.\n"
243 " {hgweb} Base URL for browsing Mercurial\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
244 " repositories.\n"
324 " repositories.\n"
245 " Default 'changeset {node|short} in repo {root} refers '\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
246 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
247 " 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"
248 " to produce {webroot}. Default 0.\n"
328 " to produce {webroot}. Default 0.\n"
249 " usermap Path of file containing Mercurial committer ID to\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
250 " Bugzilla user ID mappings. If specified, the file\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
251 " should contain one mapping per line,\n"
331 " should contain one mapping per line,\n"
252 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
253 " section.\n"
333 " section.\n"
254 "\n"
334 "\n"
255 " [usermap]\n"
335 " [usermap]\n"
256 " Any entries in this section specify mappings of Mercurial\n"
336 " Any entries in this section specify mappings of Mercurial\n"
257 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
258 " \"committer\"=\"Bugzilla user\"\n"
338 " \"committer\"=\"Bugzilla user\"\n"
259 "\n"
339 "\n"
260 " [web]\n"
340 " [web]\n"
261 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
262 " from templates as {hgweb}.\n"
342 " from templates as {hgweb}.\n"
263 "\n"
343 "\n"
264 "Activating the extension:\n"
344 "Activating the extension:\n"
265 "\n"
345 "\n"
266 " [extensions]\n"
346 " [extensions]\n"
267 " hgext.bugzilla =\n"
347 " hgext.bugzilla =\n"
268 "\n"
348 "\n"
269 " [hooks]\n"
349 " [hooks]\n"
270 " # 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"
271 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
272 "\n"
352 "\n"
273 "Example configuration:\n"
353 "Example configuration:\n"
274 "\n"
354 "\n"
275 "This example configuration is for a collection of Mercurial\n"
355 "This example configuration is for a collection of Mercurial\n"
276 "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"
277 "installation in /opt/bugzilla-3.2.\n"
357 "installation in /opt/bugzilla-3.2.\n"
278 "\n"
358 "\n"
279 " [bugzilla]\n"
359 " [bugzilla]\n"
280 " host=localhost\n"
360 " host=localhost\n"
281 " password=XYZZY\n"
361 " password=XYZZY\n"
282 " version=3.0\n"
362 " version=3.0\n"
283 " bzuser=unknown@domain.com\n"
363 " bzuser=unknown@domain.com\n"
284 " bzdir=/opt/bugzilla-3.2\n"
364 " bzdir=/opt/bugzilla-3.2\n"
285 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
286 "rev/{node|short}\\n\\n{desc}\\n\n"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
287 " strip=5\n"
367 " strip=5\n"
288 "\n"
368 "\n"
289 " [web]\n"
369 " [web]\n"
290 " baseurl=http://dev.domain.com/hg\n"
370 " baseurl=http://dev.domain.com/hg\n"
291 "\n"
371 "\n"
292 " [usermap]\n"
372 " [usermap]\n"
293 " user@emaildomain.com=user.name@bugzilladomain.com\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
294 "\n"
374 "\n"
295 "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"
296 "\n"
376 "\n"
297 " Changeset 3b16791d6642 in repository-name.\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
298 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
299 "\n"
379 "\n"
300 " Changeset commit comment. Bug 1234.\n"
380 " Changeset commit comment. Bug 1234.\n"
301 msgstr ""
381 msgstr ""
302
382
303 #, python-format
383 #, python-format
304 msgid "connecting to %s:%s as %s, password %s\n"
384 msgid "connecting to %s:%s as %s, password %s\n"
305 msgstr ""
385 msgstr ""
306
386
307 #, python-format
387 #, python-format
308 msgid "query: %s %s\n"
388 msgid "query: %s %s\n"
309 msgstr ""
389 msgstr ""
310
390
311 #, python-format
391 #, python-format
312 msgid "failed query: %s %s\n"
392 msgid "failed query: %s %s\n"
313 msgstr ""
393 msgstr ""
314
394
315 msgid "unknown database schema"
395 msgid "unknown database schema"
316 msgstr ""
396 msgstr ""
317
397
318 #, python-format
398 #, python-format
319 msgid "bug %d already knows about changeset %s\n"
399 msgid "bug %d already knows about changeset %s\n"
320 msgstr ""
400 msgstr ""
321
401
322 msgid "telling bugzilla to send mail:\n"
402 msgid "telling bugzilla to send mail:\n"
323 msgstr ""
403 msgstr ""
324
404
325 #, python-format
405 #, python-format
326 msgid " bug %s\n"
406 msgid " bug %s\n"
327 msgstr ""
407 msgstr ""
328
408
329 #, python-format
409 #, python-format
330 msgid "running notify command %s\n"
410 msgid "running notify command %s\n"
331 msgstr ""
411 msgstr ""
332
412
333 #, python-format
413 #, python-format
334 msgid "bugzilla notify command %s"
414 msgid "bugzilla notify command %s"
335 msgstr ""
415 msgstr ""
336
416
337 msgid "done\n"
417 msgid "done\n"
338 msgstr ""
418 msgstr ""
339
419
340 #, python-format
420 #, python-format
341 msgid "looking up user %s\n"
421 msgid "looking up user %s\n"
342 msgstr ""
422 msgstr ""
343
423
344 #, python-format
424 #, python-format
345 msgid "cannot find bugzilla user id for %s"
425 msgid "cannot find bugzilla user id for %s"
346 msgstr ""
426 msgstr ""
347
427
348 #, python-format
428 #, python-format
349 msgid "cannot find bugzilla user id for %s or %s"
429 msgid "cannot find bugzilla user id for %s or %s"
350 msgstr ""
430 msgstr ""
351
431
352 #, python-format
432 #, python-format
353 msgid "bugzilla version %s not supported"
433 msgid "bugzilla version %s not supported"
354 msgstr ""
434 msgstr ""
355
435
356 msgid ""
436 msgid ""
357 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
358 "details:\n"
438 "details:\n"
359 "\t{desc|tabindent}"
439 "\t{desc|tabindent}"
360 msgstr ""
440 msgstr ""
361
441
362 #, python-format
442 #, python-format
363 msgid "python mysql support not available: %s"
443 msgid "python mysql support not available: %s"
364 msgstr ""
444 msgstr ""
365
445
366 #, python-format
446 #, python-format
367 msgid "hook type %s does not pass a changeset id"
447 msgid "hook type %s does not pass a changeset id"
368 msgstr ""
448 msgstr ""
369
449
370 #, python-format
450 #, python-format
371 msgid "database error: %s"
451 msgid "database error: %s"
372 msgstr ""
452 msgstr ""
373
453
374 msgid "display children changesets"
454 msgid "display children changesets"
375 msgstr ""
455 msgstr ""
376
456
377 msgid ""
457 msgid ""
378 "show the children of the given or working directory revision\n"
458 "show the children of the given or working directory revision\n"
379 "\n"
459 "\n"
380 " 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"
381 " 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"
382 " 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"
383 " 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"
384 " argument to --rev if given) is printed.\n"
464 " argument to --rev if given) is printed.\n"
385 " "
465 " "
386 msgstr ""
466 msgstr ""
387
467
388 msgid "show children of the specified revision"
468 msgid "show children of the specified revision"
389 msgstr ""
469 msgstr ""
390
470
391 msgid "hg children [-r REV] [FILE]"
471 msgid "hg children [-r REV] [FILE]"
392 msgstr ""
472 msgstr ""
393
473
394 msgid "display statistics about repository history"
474 msgid "display statistics about repository history"
395 msgstr ""
475 msgstr ""
396
476
397 #, python-format
477 #, python-format
398 msgid "Revision %d is a merge, ignoring...\n"
478 msgid "Revision %d is a merge, ignoring...\n"
399 msgstr ""
479 msgstr ""
400
480
401 #, python-format
481 #, python-format
402 msgid "generating stats: %d%%"
482 msgid "generating stats: %d%%"
403 msgstr ""
483 msgstr ""
404
484
405 msgid ""
485 msgid ""
406 "histogram of changes to the repository\n"
486 "histogram of changes to the repository\n"
407 "\n"
487 "\n"
408 " This command will display a histogram representing the number\n"
488 " This command will display a histogram representing the number\n"
409 " of changed lines or revisions, grouped according to the given\n"
489 " of changed lines or revisions, grouped according to the given\n"
410 " template. The default template will group changes by author.\n"
490 " template. The default template will group changes by author.\n"
411 " 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"
412 " date instead.\n"
492 " date instead.\n"
413 "\n"
493 "\n"
414 " Statistics are based on the number of changed lines, or\n"
494 " Statistics are based on the number of changed lines, or\n"
415 " alternatively the number of matching revisions if the\n"
495 " alternatively the number of matching revisions if the\n"
416 " --changesets option is specified.\n"
496 " --changesets option is specified.\n"
417 "\n"
497 "\n"
418 " Examples:\n"
498 " Examples:\n"
419 "\n"
499 "\n"
420 " # display count of changed lines for every committer\n"
500 " # display count of changed lines for every committer\n"
421 " hg churn -t '{author|email}'\n"
501 " hg churn -t '{author|email}'\n"
422 "\n"
502 "\n"
423 " # display daily activity graph\n"
503 " # display daily activity graph\n"
424 " hg churn -f '%H' -s -c\n"
504 " hg churn -f '%H' -s -c\n"
425 "\n"
505 "\n"
426 " # display activity of developers by month\n"
506 " # display activity of developers by month\n"
427 " hg churn -f '%Y-%m' -s -c\n"
507 " hg churn -f '%Y-%m' -s -c\n"
428 "\n"
508 "\n"
429 " # display count of lines changed in every year\n"
509 " # display count of lines changed in every year\n"
430 " hg churn -f '%Y' -s\n"
510 " hg churn -f '%Y' -s\n"
431 "\n"
511 "\n"
432 " 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"
433 " by providing a file using the following format:\n"
513 " by providing a file using the following format:\n"
434 "\n"
514 "\n"
435 " <alias email> <actual email>\n"
515 " <alias email> <actual email>\n"
436 "\n"
516 "\n"
437 " 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"
438 " .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"
439 " "
519 " "
440 msgstr ""
520 msgstr ""
441
521
442 #, python-format
522 #, python-format
443 msgid "assuming %i character terminal\n"
523 msgid "assuming %i character terminal\n"
444 msgstr ""
524 msgstr ""
445
525
446 msgid "count rate for the specified revision or range"
526 msgid "count rate for the specified revision or range"
447 msgstr ""
527 msgstr ""
448
528
449 msgid "count rate for revisions matching date spec"
529 msgid "count rate for revisions matching date spec"
450 msgstr ""
530 msgstr ""
451
531
452 msgid "template to group changesets"
532 msgid "template to group changesets"
453 msgstr ""
533 msgstr ""
454
534
455 msgid "strftime-compatible format for grouping by date"
535 msgid "strftime-compatible format for grouping by date"
456 msgstr ""
536 msgstr ""
457
537
458 msgid "count rate by number of changesets"
538 msgid "count rate by number of changesets"
459 msgstr ""
539 msgstr ""
460
540
461 msgid "sort by key (default: sort by count)"
541 msgid "sort by key (default: sort by count)"
462 msgstr ""
542 msgstr ""
463
543
464 msgid "file with email aliases"
544 msgid "file with email aliases"
465 msgstr ""
545 msgstr ""
466
546
467 msgid "show progress"
547 msgid "show progress"
468 msgstr ""
548 msgstr ""
469
549
470 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
471 msgstr ""
551 msgstr ""
472
552
473 msgid ""
553 msgid ""
474 "colorize output from some commands\n"
554 "colorize output from some commands\n"
475 "\n"
555 "\n"
476 "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"
477 "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"
478 "patch status (applied, unapplied, missing), and to diff-related\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
479 "commands to highlight additions, removals, diff headers, and trailing\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
480 "whitespace.\n"
560 "whitespace.\n"
481 "\n"
561 "\n"
482 "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"
483 "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"
484 "function (aka ANSI escape codes). This module also provides the\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
485 "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"
486 "\n"
566 "\n"
487 "Default effects may be overridden from the .hgrc file:\n"
567 "Default effects may be overridden from the .hgrc file:\n"
488 "\n"
568 "\n"
489 "[color]\n"
569 "[color]\n"
490 "status.modified = blue bold underline red_background\n"
570 "status.modified = blue bold underline red_background\n"
491 "status.added = green bold\n"
571 "status.added = green bold\n"
492 "status.removed = red bold blue_background\n"
572 "status.removed = red bold blue_background\n"
493 "status.deleted = cyan bold underline\n"
573 "status.deleted = cyan bold underline\n"
494 "status.unknown = magenta bold underline\n"
574 "status.unknown = magenta bold underline\n"
495 "status.ignored = black bold\n"
575 "status.ignored = black bold\n"
496 "\n"
576 "\n"
497 "# 'none' turns off all effects\n"
577 "# 'none' turns off all effects\n"
498 "status.clean = none\n"
578 "status.clean = none\n"
499 "status.copied = none\n"
579 "status.copied = none\n"
500 "\n"
580 "\n"
501 "qseries.applied = blue bold underline\n"
581 "qseries.applied = blue bold underline\n"
502 "qseries.unapplied = black bold\n"
582 "qseries.unapplied = black bold\n"
503 "qseries.missing = red bold\n"
583 "qseries.missing = red bold\n"
504 "\n"
584 "\n"
505 "diff.diffline = bold\n"
585 "diff.diffline = bold\n"
506 "diff.extended = cyan bold\n"
586 "diff.extended = cyan bold\n"
507 "diff.file_a = red bold\n"
587 "diff.file_a = red bold\n"
508 "diff.file_b = green bold\n"
588 "diff.file_b = green bold\n"
509 "diff.hunk = magenta\n"
589 "diff.hunk = magenta\n"
510 "diff.deleted = red\n"
590 "diff.deleted = red\n"
511 "diff.inserted = green\n"
591 "diff.inserted = green\n"
512 "diff.changed = white\n"
592 "diff.changed = white\n"
513 "diff.trailingwhitespace = bold red_background\n"
593 "diff.trailingwhitespace = bold red_background\n"
514 msgstr ""
594 msgstr ""
515
595
516 msgid "when to colorize (always, auto, or never)"
596 msgid "when to colorize (always, auto, or never)"
517 msgstr ""
597 msgstr ""
518
598
519 msgid "don't colorize output"
599 msgid "don't colorize output"
520 msgstr ""
600 msgstr ""
521
601
522 msgid "import from foreign VCS repositories into Mercurial"
602 msgid "import from foreign VCS repositories into Mercurial"
523 msgstr ""
603 msgstr ""
524
604
525 msgid ""
605 msgid ""
526 "convert a foreign SCM repository to a Mercurial one.\n"
606 "convert a foreign SCM repository to a Mercurial one.\n"
527 "\n"
607 "\n"
528 " Accepted source formats [identifiers]:\n"
608 " Accepted source formats [identifiers]:\n"
529 " - Mercurial [hg]\n"
609 " - Mercurial [hg]\n"
530 " - CVS [cvs]\n"
610 " - CVS [cvs]\n"
531 " - Darcs [darcs]\n"
611 " - Darcs [darcs]\n"
532 " - git [git]\n"
612 " - git [git]\n"
533 " - Subversion [svn]\n"
613 " - Subversion [svn]\n"
534 " - Monotone [mtn]\n"
614 " - Monotone [mtn]\n"
535 " - GNU Arch [gnuarch]\n"
615 " - GNU Arch [gnuarch]\n"
536 " - Bazaar [bzr]\n"
616 " - Bazaar [bzr]\n"
537 " - Perforce [p4]\n"
617 " - Perforce [p4]\n"
538 "\n"
618 "\n"
539 " Accepted destination formats [identifiers]:\n"
619 " Accepted destination formats [identifiers]:\n"
540 " - Mercurial [hg]\n"
620 " - Mercurial [hg]\n"
541 " - Subversion [svn] (history on branches is not preserved)\n"
621 " - Subversion [svn] (history on branches is not preserved)\n"
542 "\n"
622 "\n"
543 " If no revision is given, all revisions will be converted.\n"
623 " If no revision is given, all revisions will be converted.\n"
544 " Otherwise, convert will only import up to the named revision\n"
624 " Otherwise, convert will only import up to the named revision\n"
545 " (given in a format understood by the source).\n"
625 " (given in a format understood by the source).\n"
546 "\n"
626 "\n"
547 " If no destination directory name is specified, it defaults to the\n"
627 " If no destination directory name is specified, it defaults to the\n"
548 " basename of the source with '-hg' appended. If the destination\n"
628 " basename of the source with '-hg' appended. If the destination\n"
549 " repository doesn't exist, it will be created.\n"
629 " repository doesn't exist, it will be created.\n"
550 "\n"
630 "\n"
551 " By default, all sources except Mercurial will use\n"
631 " By default, all sources except Mercurial will use\n"
552 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
632 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
553 " revision numbers order. Sort modes have the following effects:\n"
633 " revision numbers order. Sort modes have the following effects:\n"
554 " --branchsort: convert from parent to child revision when\n"
634 " --branchsort: convert from parent to child revision when\n"
555 " possible, which means branches are usually converted one after\n"
635 " possible, which means branches are usually converted one after\n"
556 " the other. It generates more compact repositories.\n"
636 " the other. It generates more compact repositories.\n"
557 " --datesort: sort revisions by date. Converted repositories have\n"
637 " --datesort: sort revisions by date. Converted repositories have\n"
558 " good-looking changelogs but are often an order of magnitude\n"
638 " good-looking changelogs but are often an order of magnitude\n"
559 " larger than the same ones generated by --branchsort.\n"
639 " larger than the same ones generated by --branchsort.\n"
560 " --sourcesort: try to preserve source revisions order, only\n"
640 " --sourcesort: try to preserve source revisions order, only\n"
561 " supported by Mercurial sources.\n"
641 " supported by Mercurial sources.\n"
562 "\n"
642 "\n"
563 " If <REVMAP> isn't given, it will be put in a default location\n"
643 " If <REVMAP> isn't given, it will be put in a default location\n"
564 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
644 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
565 " that maps each source commit ID to the destination ID for that\n"
645 " that maps each source commit ID to the destination ID for that\n"
566 " revision, like so:\n"
646 " revision, like so:\n"
567 " <source ID> <destination ID>\n"
647 " <source ID> <destination ID>\n"
568 "\n"
648 "\n"
569 " If the file doesn't exist, it's automatically created. It's\n"
649 " If the file doesn't exist, it's automatically created. It's\n"
570 " updated on each commit copied, so convert-repo can be interrupted\n"
650 " updated on each commit copied, so convert-repo can be interrupted\n"
571 " and can be run repeatedly to copy new commits.\n"
651 " and can be run repeatedly to copy new commits.\n"
572 "\n"
652 "\n"
573 " The [username mapping] file is a simple text file that maps each\n"
653 " The [username mapping] file is a simple text file that maps each\n"
574 " source commit author to a destination commit author. It is handy\n"
654 " source commit author to a destination commit author. It is handy\n"
575 " for source SCMs that use unix logins to identify authors (eg:\n"
655 " for source SCMs that use unix logins to identify authors (eg:\n"
576 " CVS). One line per author mapping and the line format is:\n"
656 " CVS). One line per author mapping and the line format is:\n"
577 " srcauthor=whatever string you want\n"
657 " srcauthor=whatever string you want\n"
578 "\n"
658 "\n"
579 " The filemap is a file that allows filtering and remapping of files\n"
659 " The filemap is a file that allows filtering and remapping of files\n"
580 " and directories. Comment lines start with '#'. Each line can\n"
660 " and directories. Comment lines start with '#'. Each line can\n"
581 " contain one of the following directives:\n"
661 " contain one of the following directives:\n"
582 "\n"
662 "\n"
583 " include path/to/file\n"
663 " include path/to/file\n"
584 "\n"
664 "\n"
585 " exclude path/to/file\n"
665 " exclude path/to/file\n"
586 "\n"
666 "\n"
587 " rename from/file to/file\n"
667 " rename from/file to/file\n"
588 "\n"
668 "\n"
589 " The 'include' directive causes a file, or all files under a\n"
669 " The 'include' directive causes a file, or all files under a\n"
590 " directory, to be included in the destination repository, and the\n"
670 " directory, to be included in the destination repository, and the\n"
591 " exclusion of all other files and directories not explicitly included.\n"
671 " exclusion of all other files and directories not explicitly included.\n"
592 " The 'exclude' directive causes files or directories to be omitted.\n"
672 " The 'exclude' directive causes files or directories to be omitted.\n"
593 " The 'rename' directive renames a file or directory. To rename from\n"
673 " The 'rename' directive renames a file or directory. To rename from\n"
594 " a subdirectory into the root of the repository, use '.' as the\n"
674 " a subdirectory into the root of the repository, use '.' as the\n"
595 " path to rename to.\n"
675 " path to rename to.\n"
596 "\n"
676 "\n"
597 " The splicemap is a file that allows insertion of synthetic\n"
677 " The splicemap is a file that allows insertion of synthetic\n"
598 " history, letting you specify the parents of a revision. This is\n"
678 " history, letting you specify the parents of a revision. This is\n"
599 " useful if you want to e.g. give a Subversion merge two parents, or\n"
679 " useful if you want to e.g. give a Subversion merge two parents, or\n"
600 " graft two disconnected series of history together. Each entry\n"
680 " graft two disconnected series of history together. Each entry\n"
601 " contains a key, followed by a space, followed by one or two\n"
681 " contains a key, followed by a space, followed by one or two\n"
602 " comma-separated values. The key is the revision ID in the source\n"
682 " comma-separated values. The key is the revision ID in the source\n"
603 " revision control system whose parents should be modified (same\n"
683 " revision control system whose parents should be modified (same\n"
604 " format as a key in .hg/shamap). The values are the revision IDs\n"
684 " format as a key in .hg/shamap). The values are the revision IDs\n"
605 " (in either the source or destination revision control system) that\n"
685 " (in either the source or destination revision control system) that\n"
606 " should be used as the new parents for that node.\n"
686 " should be used as the new parents for that node.\n"
607 "\n"
687 "\n"
608 " The branchmap is a file that allows you to rename a branch when it is\n"
688 " The branchmap is a file that allows you to rename a branch when it is\n"
609 " being brought in from whatever external repository. When used in\n"
689 " being brought in from whatever external repository. When used in\n"
610 " conjunction with a splicemap, it allows for a powerful combination\n"
690 " conjunction with a splicemap, it allows for a powerful combination\n"
611 " to help fix even the most badly mismanaged repositories and turn them\n"
691 " to help fix even the most badly mismanaged repositories and turn them\n"
612 " into nicely structured Mercurial repositories. The branchmap contains\n"
692 " into nicely structured Mercurial repositories. The branchmap contains\n"
613 " lines of the form \"original_branch_name new_branch_name\".\n"
693 " lines of the form \"original_branch_name new_branch_name\".\n"
614 " \"original_branch_name\" is the name of the branch in the source\n"
694 " \"original_branch_name\" is the name of the branch in the source\n"
615 " repository, and \"new_branch_name\" is the name of the branch is the\n"
695 " repository, and \"new_branch_name\" is the name of the branch is the\n"
616 " destination repository. This can be used to (for instance) move code\n"
696 " destination repository. This can be used to (for instance) move code\n"
617 " in one repository from \"default\" to a named branch.\n"
697 " in one repository from \"default\" to a named branch.\n"
618 "\n"
698 "\n"
619 " Mercurial Source\n"
699 " Mercurial Source\n"
620 " -----------------\n"
700 " -----------------\n"
621 "\n"
701 "\n"
622 " --config convert.hg.ignoreerrors=False (boolean)\n"
702 " --config convert.hg.ignoreerrors=False (boolean)\n"
623 " ignore integrity errors when reading. Use it to fix Mercurial\n"
703 " ignore integrity errors when reading. Use it to fix Mercurial\n"
624 " repositories with missing revlogs, by converting from and to\n"
704 " repositories with missing revlogs, by converting from and to\n"
625 " Mercurial.\n"
705 " Mercurial.\n"
626 " --config convert.hg.saverev=False (boolean)\n"
706 " --config convert.hg.saverev=False (boolean)\n"
627 " store original revision ID in changeset (forces target IDs to\n"
707 " store original revision ID in changeset (forces target IDs to\n"
628 " change)\n"
708 " change)\n"
629 " --config convert.hg.startrev=0 (hg revision identifier)\n"
709 " --config convert.hg.startrev=0 (hg revision identifier)\n"
630 " convert start revision and its descendants\n"
710 " convert start revision and its descendants\n"
631 "\n"
711 "\n"
632 " CVS Source\n"
712 " CVS Source\n"
633 " ----------\n"
713 " ----------\n"
634 "\n"
714 "\n"
635 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
715 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
636 " to indicate the starting point of what will be converted. Direct\n"
716 " to indicate the starting point of what will be converted. Direct\n"
637 " access to the repository files is not needed, unless of course the\n"
717 " access to the repository files is not needed, unless of course the\n"
638 " repository is :local:. The conversion uses the top level directory\n"
718 " repository is :local:. The conversion uses the top level directory\n"
639 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
719 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
640 " commands to find files to convert. This means that unless a\n"
720 " commands to find files to convert. This means that unless a\n"
641 " filemap is given, all files under the starting directory will be\n"
721 " filemap is given, all files under the starting directory will be\n"
642 " converted, and that any directory reorganization in the CVS\n"
722 " converted, and that any directory reorganization in the CVS\n"
643 " sandbox is ignored.\n"
723 " sandbox is ignored.\n"
644 "\n"
724 "\n"
645 " Because CVS does not have changesets, it is necessary to collect\n"
725 " Because CVS does not have changesets, it is necessary to collect\n"
646 " individual commits to CVS and merge them into changesets. CVS\n"
726 " individual commits to CVS and merge them into changesets. CVS\n"
647 " source uses its internal changeset merging code by default but can\n"
727 " source uses its internal changeset merging code by default but can\n"
648 " be configured to call the external 'cvsps' program by setting:\n"
728 " be configured to call the external 'cvsps' program by setting:\n"
649 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
729 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
650 " This option is deprecated and will be removed in Mercurial 1.4.\n"
730 " This option is deprecated and will be removed in Mercurial 1.4.\n"
651 "\n"
731 "\n"
652 " The options shown are the defaults.\n"
732 " The options shown are the defaults.\n"
653 "\n"
733 "\n"
654 " Internal cvsps is selected by setting\n"
734 " Internal cvsps is selected by setting\n"
655 " --config convert.cvsps=builtin\n"
735 " --config convert.cvsps=builtin\n"
656 " and has a few more configurable options:\n"
736 " and has a few more configurable options:\n"
657 " --config convert.cvsps.cache=True (boolean)\n"
737 " --config convert.cvsps.cache=True (boolean)\n"
658 " Set to False to disable remote log caching, for testing and\n"
738 " Set to False to disable remote log caching, for testing and\n"
659 " debugging purposes.\n"
739 " debugging purposes.\n"
660 " --config convert.cvsps.fuzz=60 (integer)\n"
740 " --config convert.cvsps.fuzz=60 (integer)\n"
661 " Specify the maximum time (in seconds) that is allowed\n"
741 " Specify the maximum time (in seconds) that is allowed\n"
662 " between commits with identical user and log message in a\n"
742 " between commits with identical user and log message in a\n"
663 " single changeset. When very large files were checked in as\n"
743 " single changeset. When very large files were checked in as\n"
664 " part of a changeset then the default may not be long\n"
744 " part of a changeset then the default may not be long\n"
665 " enough.\n"
745 " enough.\n"
666 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
746 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
667 " Specify a regular expression to which commit log messages\n"
747 " Specify a regular expression to which commit log messages\n"
668 " are matched. If a match occurs, then the conversion\n"
748 " are matched. If a match occurs, then the conversion\n"
669 " process will insert a dummy revision merging the branch on\n"
749 " process will insert a dummy revision merging the branch on\n"
670 " which this log message occurs to the branch indicated in\n"
750 " which this log message occurs to the branch indicated in\n"
671 " the regex.\n"
751 " the regex.\n"
672 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
752 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
673 " Specify a regular expression to which commit log messages\n"
753 " Specify a regular expression to which commit log messages\n"
674 " are matched. If a match occurs, then the conversion\n"
754 " are matched. If a match occurs, then the conversion\n"
675 " process will add the most recent revision on the branch\n"
755 " process will add the most recent revision on the branch\n"
676 " indicated in the regex as the second parent of the\n"
756 " indicated in the regex as the second parent of the\n"
677 " changeset.\n"
757 " changeset.\n"
678 "\n"
758 "\n"
679 " The hgext/convert/cvsps wrapper script allows the builtin\n"
759 " The hgext/convert/cvsps wrapper script allows the builtin\n"
680 " changeset merging code to be run without doing a conversion. Its\n"
760 " changeset merging code to be run without doing a conversion. Its\n"
681 " parameters and output are similar to that of cvsps 2.1.\n"
761 " parameters and output are similar to that of cvsps 2.1.\n"
682 "\n"
762 "\n"
683 " Subversion Source\n"
763 " Subversion Source\n"
684 " -----------------\n"
764 " -----------------\n"
685 "\n"
765 "\n"
686 " Subversion source detects classical trunk/branches/tags layouts.\n"
766 " Subversion source detects classical trunk/branches/tags layouts.\n"
687 " By default, the supplied \"svn://repo/path/\" source URL is\n"
767 " By default, the supplied \"svn://repo/path/\" source URL is\n"
688 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
768 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
689 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
769 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
690 " its subdirectories are listed as possible branches. If\n"
770 " its subdirectories are listed as possible branches. If\n"
691 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
771 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
692 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
772 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
693 " can be overridden with following options. Set them to paths\n"
773 " can be overridden with following options. Set them to paths\n"
694 " relative to the source URL, or leave them blank to disable auto\n"
774 " relative to the source URL, or leave them blank to disable auto\n"
695 " detection.\n"
775 " detection.\n"
696 "\n"
776 "\n"
697 " --config convert.svn.branches=branches (directory name)\n"
777 " --config convert.svn.branches=branches (directory name)\n"
698 " specify the directory containing branches\n"
778 " specify the directory containing branches\n"
699 " --config convert.svn.tags=tags (directory name)\n"
779 " --config convert.svn.tags=tags (directory name)\n"
700 " specify the directory containing tags\n"
780 " specify the directory containing tags\n"
701 " --config convert.svn.trunk=trunk (directory name)\n"
781 " --config convert.svn.trunk=trunk (directory name)\n"
702 " specify the name of the trunk branch\n"
782 " specify the name of the trunk branch\n"
703 "\n"
783 "\n"
704 " Source history can be retrieved starting at a specific revision,\n"
784 " Source history can be retrieved starting at a specific revision,\n"
705 " instead of being integrally converted. Only single branch\n"
785 " instead of being integrally converted. Only single branch\n"
706 " conversions are supported.\n"
786 " conversions are supported.\n"
707 "\n"
787 "\n"
708 " --config convert.svn.startrev=0 (svn revision number)\n"
788 " --config convert.svn.startrev=0 (svn revision number)\n"
709 " specify start Subversion revision.\n"
789 " specify start Subversion revision.\n"
710 "\n"
790 "\n"
711 " Perforce Source\n"
791 " Perforce Source\n"
712 " ---------------\n"
792 " ---------------\n"
713 "\n"
793 "\n"
714 " The Perforce (P4) importer can be given a p4 depot path or a\n"
794 " The Perforce (P4) importer can be given a p4 depot path or a\n"
715 " client specification as source. It will convert all files in the\n"
795 " client specification as source. It will convert all files in the\n"
716 " source to a flat Mercurial repository, ignoring labels, branches\n"
796 " source to a flat Mercurial repository, ignoring labels, branches\n"
717 " and integrations. Note that when a depot path is given you then\n"
797 " and integrations. Note that when a depot path is given you then\n"
718 " usually should specify a target directory, because otherwise the\n"
798 " usually should specify a target directory, because otherwise the\n"
719 " target may be named ...-hg.\n"
799 " target may be named ...-hg.\n"
720 "\n"
800 "\n"
721 " It is possible to limit the amount of source history to be\n"
801 " It is possible to limit the amount of source history to be\n"
722 " converted by specifying an initial Perforce revision.\n"
802 " converted by specifying an initial Perforce revision.\n"
723 "\n"
803 "\n"
724 " --config convert.p4.startrev=0 (perforce changelist number)\n"
804 " --config convert.p4.startrev=0 (perforce changelist number)\n"
725 " specify initial Perforce revision.\n"
805 " specify initial Perforce revision.\n"
726 "\n"
806 "\n"
727 "\n"
807 "\n"
728 " Mercurial Destination\n"
808 " Mercurial Destination\n"
729 " ---------------------\n"
809 " ---------------------\n"
730 "\n"
810 "\n"
731 " --config convert.hg.clonebranches=False (boolean)\n"
811 " --config convert.hg.clonebranches=False (boolean)\n"
732 " dispatch source branches in separate clones.\n"
812 " dispatch source branches in separate clones.\n"
733 " --config convert.hg.tagsbranch=default (branch name)\n"
813 " --config convert.hg.tagsbranch=default (branch name)\n"
734 " tag revisions branch name\n"
814 " tag revisions branch name\n"
735 " --config convert.hg.usebranchnames=True (boolean)\n"
815 " --config convert.hg.usebranchnames=True (boolean)\n"
736 " preserve branch names\n"
816 " preserve branch names\n"
737 "\n"
817 "\n"
738 " "
818 " "
739 msgstr ""
819 msgstr ""
740
820
741 msgid ""
821 msgid ""
742 "create changeset information from CVS\n"
822 "create changeset information from CVS\n"
743 "\n"
823 "\n"
744 " This command is intended as a debugging tool for the CVS to\n"
824 " This command is intended as a debugging tool for the CVS to\n"
745 " Mercurial converter, and can be used as a direct replacement for\n"
825 " Mercurial converter, and can be used as a direct replacement for\n"
746 " cvsps.\n"
826 " cvsps.\n"
747 "\n"
827 "\n"
748 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
828 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
749 " named directory) in the CVS repository, and converts the log to a\n"
829 " named directory) in the CVS repository, and converts the log to a\n"
750 " series of changesets based on matching commit log entries and\n"
830 " series of changesets based on matching commit log entries and\n"
751 " dates."
831 " dates."
752 msgstr ""
832 msgstr ""
753
833
754 msgid "username mapping filename"
834 msgid "username mapping filename"
755 msgstr ""
835 msgstr ""
756
836
757 msgid "destination repository type"
837 msgid "destination repository type"
758 msgstr ""
838 msgstr ""
759
839
760 msgid "remap file names using contents of file"
840 msgid "remap file names using contents of file"
761 msgstr ""
841 msgstr ""
762
842
763 msgid "import up to target revision REV"
843 msgid "import up to target revision REV"
764 msgstr ""
844 msgstr ""
765
845
766 msgid "source repository type"
846 msgid "source repository type"
767 msgstr ""
847 msgstr ""
768
848
769 msgid "splice synthesized history into place"
849 msgid "splice synthesized history into place"
770 msgstr ""
850 msgstr ""
771
851
772 msgid "change branch names while converting"
852 msgid "change branch names while converting"
773 msgstr ""
853 msgstr ""
774
854
775 msgid "try to sort changesets by branches"
855 msgid "try to sort changesets by branches"
776 msgstr ""
856 msgstr ""
777
857
778 msgid "try to sort changesets by date"
858 msgid "try to sort changesets by date"
779 msgstr ""
859 msgstr ""
780
860
781 msgid "preserve source changesets order"
861 msgid "preserve source changesets order"
782 msgstr ""
862 msgstr ""
783
863
784 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
864 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
785 msgstr ""
865 msgstr ""
786
866
787 msgid "only return changes on specified branches"
867 msgid "only return changes on specified branches"
788 msgstr ""
868 msgstr ""
789
869
790 msgid "prefix to remove from file names"
870 msgid "prefix to remove from file names"
791 msgstr ""
871 msgstr ""
792
872
793 msgid "only return changes after or between specified tags"
873 msgid "only return changes after or between specified tags"
794 msgstr ""
874 msgstr ""
795
875
796 msgid "update cvs log cache"
876 msgid "update cvs log cache"
797 msgstr ""
877 msgstr ""
798
878
799 msgid "create new cvs log cache"
879 msgid "create new cvs log cache"
800 msgstr ""
880 msgstr ""
801
881
802 msgid "set commit time fuzz in seconds"
882 msgid "set commit time fuzz in seconds"
803 msgstr ""
883 msgstr ""
804
884
805 msgid "specify cvsroot"
885 msgid "specify cvsroot"
806 msgstr ""
886 msgstr ""
807
887
808 msgid "show parent changesets"
888 msgid "show parent changesets"
809 msgstr ""
889 msgstr ""
810
890
811 msgid "show current changeset in ancestor branches"
891 msgid "show current changeset in ancestor branches"
812 msgstr ""
892 msgstr ""
813
893
814 msgid "ignored for compatibility"
894 msgid "ignored for compatibility"
815 msgstr ""
895 msgstr ""
816
896
817 msgid "hg debugcvsps [OPTION]... [PATH]..."
897 msgid "hg debugcvsps [OPTION]... [PATH]..."
818 msgstr ""
898 msgstr ""
819
899
820 msgid ""
900 msgid ""
821 "warning: lightweight checkouts may cause conversion failures, try with a "
901 "warning: lightweight checkouts may cause conversion failures, try with a "
822 "regular branch instead.\n"
902 "regular branch instead.\n"
823 msgstr ""
903 msgstr ""
824
904
825 msgid "bzr source type could not be determined\n"
905 msgid "bzr source type could not be determined\n"
826 msgstr ""
906 msgstr ""
827
907
828 #, python-format
908 #, python-format
829 msgid "%s is not a valid revision in current branch"
909 msgid "%s is not a valid revision in current branch"
830 msgstr ""
910 msgstr ""
831
911
832 #, python-format
912 #, python-format
833 msgid "%s is not available in %s anymore"
913 msgid "%s is not available in %s anymore"
834 msgstr ""
914 msgstr ""
835
915
836 #, python-format
916 #, python-format
837 msgid "%s.%s symlink has no target"
917 msgid "%s.%s symlink has no target"
838 msgstr ""
918 msgstr ""
839
919
840 #, python-format
920 #, python-format
841 msgid "cannot find required \"%s\" tool"
921 msgid "cannot find required \"%s\" tool"
842 msgstr ""
922 msgstr ""
843
923
844 #, python-format
924 #, python-format
845 msgid "running: %s\n"
925 msgid "running: %s\n"
846 msgstr ""
926 msgstr ""
847
927
848 #, python-format
928 #, python-format
849 msgid "%s error:\n"
929 msgid "%s error:\n"
850 msgstr ""
930 msgstr ""
851
931
852 #, python-format
932 #, python-format
853 msgid "syntax error in %s(%d): key/value pair expected"
933 msgid "syntax error in %s(%d): key/value pair expected"
854 msgstr ""
934 msgstr ""
855
935
856 #, python-format
936 #, python-format
857 msgid "could not open map file %r: %s"
937 msgid "could not open map file %r: %s"
858 msgstr ""
938 msgstr ""
859
939
860 #, python-format
940 #, python-format
861 msgid "%s: missing or unsupported repository"
941 msgid "%s: missing or unsupported repository"
862 msgstr ""
942 msgstr ""
863
943
864 #, python-format
944 #, python-format
865 msgid "convert: %s\n"
945 msgid "convert: %s\n"
866 msgstr ""
946 msgstr ""
867
947
868 #, python-format
948 #, python-format
869 msgid "%s: unknown repository type"
949 msgid "%s: unknown repository type"
870 msgstr ""
950 msgstr ""
871
951
872 #, python-format
952 #, python-format
873 msgid "unknown sort mode: %s"
953 msgid "unknown sort mode: %s"
874 msgstr ""
954 msgstr ""
875
955
876 #, python-format
956 #, python-format
877 msgid "cycle detected between %s and %s"
957 msgid "cycle detected between %s and %s"
878 msgstr ""
958 msgstr ""
879
959
880 msgid "not all revisions were sorted"
960 msgid "not all revisions were sorted"
881 msgstr ""
961 msgstr ""
882
962
883 #, python-format
963 #, python-format
884 msgid "Writing author map file %s\n"
964 msgid "Writing author map file %s\n"
885 msgstr ""
965 msgstr ""
886
966
887 #, python-format
967 #, python-format
888 msgid "Ignoring bad line in author map file %s: %s\n"
968 msgid "Ignoring bad line in author map file %s: %s\n"
889 msgstr ""
969 msgstr ""
890
970
891 #, python-format
971 #, python-format
892 msgid "mapping author %s to %s\n"
972 msgid "mapping author %s to %s\n"
893 msgstr ""
973 msgstr ""
894
974
895 #, python-format
975 #, python-format
896 msgid "overriding mapping for author %s, was %s, will be %s\n"
976 msgid "overriding mapping for author %s, was %s, will be %s\n"
897 msgstr ""
977 msgstr ""
898
978
899 #, python-format
979 #, python-format
900 msgid "spliced in %s as parents of %s\n"
980 msgid "spliced in %s as parents of %s\n"
901 msgstr ""
981 msgstr ""
902
982
903 msgid "scanning source...\n"
983 msgid "scanning source...\n"
904 msgstr ""
984 msgstr ""
905
985
906 msgid "sorting...\n"
986 msgid "sorting...\n"
907 msgstr ""
987 msgstr ""
908
988
909 msgid "converting...\n"
989 msgid "converting...\n"
910 msgstr ""
990 msgstr ""
911
991
912 #, python-format
992 #, python-format
913 msgid "source: %s\n"
993 msgid "source: %s\n"
914 msgstr ""
994 msgstr ""
915
995
916 #, python-format
996 #, python-format
917 msgid "assuming destination %s\n"
997 msgid "assuming destination %s\n"
918 msgstr ""
998 msgstr ""
919
999
920 msgid "more than one sort mode specified"
1000 msgid "more than one sort mode specified"
921 msgstr ""
1001 msgstr ""
922
1002
923 msgid "--sourcesort is not supported by this data source"
1003 msgid "--sourcesort is not supported by this data source"
924 msgstr ""
1004 msgstr ""
925
1005
926 msgid ""
1006 msgid ""
927 "warning: support for external cvsps is deprecated and will be removed in "
1007 "warning: support for external cvsps is deprecated and will be removed in "
928 "Mercurial 1.4\n"
1008 "Mercurial 1.4\n"
929 msgstr ""
1009 msgstr ""
930
1010
931 #, python-format
1011 #, python-format
932 msgid "revision %s is not a patchset number or date"
1012 msgid "revision %s is not a patchset number or date"
933 msgstr ""
1013 msgstr ""
934
1014
935 msgid "using builtin cvsps\n"
1015 msgid "using builtin cvsps\n"
936 msgstr ""
1016 msgstr ""
937
1017
938 #, python-format
1018 #, python-format
939 msgid "connecting to %s\n"
1019 msgid "connecting to %s\n"
940 msgstr ""
1020 msgstr ""
941
1021
942 msgid "CVS pserver authentication failed"
1022 msgid "CVS pserver authentication failed"
943 msgstr ""
1023 msgstr ""
944
1024
945 msgid "server sucks"
1025 msgid "server sucks"
946 msgstr ""
1026 msgstr ""
947
1027
948 #, python-format
1028 #, python-format
949 msgid "%d bytes missing from remote file"
1029 msgid "%d bytes missing from remote file"
950 msgstr ""
1030 msgstr ""
951
1031
952 #, python-format
1032 #, python-format
953 msgid "cvs server: %s\n"
1033 msgid "cvs server: %s\n"
954 msgstr ""
1034 msgstr ""
955
1035
956 #, python-format
1036 #, python-format
957 msgid "unknown CVS response: %s"
1037 msgid "unknown CVS response: %s"
958 msgstr ""
1038 msgstr ""
959
1039
960 msgid "collecting CVS rlog\n"
1040 msgid "collecting CVS rlog\n"
961 msgstr ""
1041 msgstr ""
962
1042
963 #, python-format
1043 #, python-format
964 msgid "reading cvs log cache %s\n"
1044 msgid "reading cvs log cache %s\n"
965 msgstr ""
1045 msgstr ""
966
1046
967 #, python-format
1047 #, python-format
968 msgid "cache has %d log entries\n"
1048 msgid "cache has %d log entries\n"
969 msgstr ""
1049 msgstr ""
970
1050
971 #, python-format
1051 #, python-format
972 msgid "error reading cache: %r\n"
1052 msgid "error reading cache: %r\n"
973 msgstr ""
1053 msgstr ""
974
1054
975 #, python-format
1055 #, python-format
976 msgid "running %s\n"
1056 msgid "running %s\n"
977 msgstr ""
1057 msgstr ""
978
1058
979 #, python-format
1059 #, python-format
980 msgid "prefix=%r directory=%r root=%r\n"
1060 msgid "prefix=%r directory=%r root=%r\n"
981 msgstr ""
1061 msgstr ""
982
1062
983 msgid "RCS file must be followed by working file"
1063 msgid "RCS file must be followed by working file"
984 msgstr ""
1064 msgstr ""
985
1065
986 msgid "must have at least some revisions"
1066 msgid "must have at least some revisions"
987 msgstr ""
1067 msgstr ""
988
1068
989 msgid "expected revision number"
1069 msgid "expected revision number"
990 msgstr ""
1070 msgstr ""
991
1071
992 msgid "revision must be followed by date line"
1072 msgid "revision must be followed by date line"
993 msgstr ""
1073 msgstr ""
994
1074
995 #, python-format
1075 #, python-format
996 msgid "found synthetic revision in %s: %r\n"
1076 msgid "found synthetic revision in %s: %r\n"
997 msgstr ""
1077 msgstr ""
998
1078
999 #, python-format
1079 #, python-format
1000 msgid "writing cvs log cache %s\n"
1080 msgid "writing cvs log cache %s\n"
1001 msgstr ""
1081 msgstr ""
1002
1082
1003 #, python-format
1083 #, python-format
1004 msgid "%d log entries\n"
1084 msgid "%d log entries\n"
1005 msgstr ""
1085 msgstr ""
1006
1086
1007 msgid "creating changesets\n"
1087 msgid "creating changesets\n"
1008 msgstr ""
1088 msgstr ""
1009
1089
1010 msgid "synthetic changeset cannot have multiple parents"
1090 msgid "synthetic changeset cannot have multiple parents"
1011 msgstr ""
1091 msgstr ""
1012
1092
1013 #, python-format
1093 #, python-format
1014 msgid ""
1094 msgid ""
1015 "warning: CVS commit message references non-existent branch %r:\n"
1095 "warning: CVS commit message references non-existent branch %r:\n"
1016 "%s\n"
1096 "%s\n"
1017 msgstr ""
1097 msgstr ""
1018
1098
1019 #, python-format
1099 #, python-format
1020 msgid "%d changeset entries\n"
1100 msgid "%d changeset entries\n"
1021 msgstr ""
1101 msgstr ""
1022
1102
1023 msgid "Python ElementTree module is not available"
1103 msgid "Python ElementTree module is not available"
1024 msgstr ""
1104 msgstr ""
1025
1105
1026 #, python-format
1106 #, python-format
1027 msgid "cleaning up %s\n"
1107 msgid "cleaning up %s\n"
1028 msgstr ""
1108 msgstr ""
1029
1109
1030 msgid "internal calling inconsistency"
1110 msgid "internal calling inconsistency"
1031 msgstr ""
1111 msgstr ""
1032
1112
1033 msgid "errors in filemap"
1113 msgid "errors in filemap"
1034 msgstr ""
1114 msgstr ""
1035
1115
1036 #, python-format
1116 #, python-format
1037 msgid "%s:%d: %r already in %s list\n"
1117 msgid "%s:%d: %r already in %s list\n"
1038 msgstr ""
1118 msgstr ""
1039
1119
1040 #, python-format
1120 #, python-format
1041 msgid "%s:%d: unknown directive %r\n"
1121 msgid "%s:%d: unknown directive %r\n"
1042 msgstr ""
1122 msgstr ""
1043
1123
1044 msgid "source repository doesn't support --filemap"
1124 msgid "source repository doesn't support --filemap"
1045 msgstr ""
1125 msgstr ""
1046
1126
1047 #, python-format
1127 #, python-format
1048 msgid "%s does not look like a GNU Arch repo"
1128 msgid "%s does not look like a GNU Arch repo"
1049 msgstr ""
1129 msgstr ""
1050
1130
1051 msgid "cannot find a GNU Arch tool"
1131 msgid "cannot find a GNU Arch tool"
1052 msgstr ""
1132 msgstr ""
1053
1133
1054 #, python-format
1134 #, python-format
1055 msgid "analyzing tree version %s...\n"
1135 msgid "analyzing tree version %s...\n"
1056 msgstr ""
1136 msgstr ""
1057
1137
1058 #, python-format
1138 #, python-format
1059 msgid ""
1139 msgid ""
1060 "tree analysis stopped because it points to an unregistered archive %s...\n"
1140 "tree analysis stopped because it points to an unregistered archive %s...\n"
1061 msgstr ""
1141 msgstr ""
1062
1142
1063 #, python-format
1143 #, python-format
1064 msgid "applying revision %s...\n"
1144 msgid "applying revision %s...\n"
1065 msgstr ""
1145 msgstr ""
1066
1146
1067 #, python-format
1147 #, python-format
1068 msgid "computing changeset between %s and %s...\n"
1148 msgid "computing changeset between %s and %s...\n"
1069 msgstr ""
1149 msgstr ""
1070
1150
1071 #, python-format
1151 #, python-format
1072 msgid "obtaining revision %s...\n"
1152 msgid "obtaining revision %s...\n"
1073 msgstr ""
1153 msgstr ""
1074
1154
1075 #, python-format
1155 #, python-format
1076 msgid "analyzing revision %s...\n"
1156 msgid "analyzing revision %s...\n"
1077 msgstr ""
1157 msgstr ""
1078
1158
1079 #, python-format
1159 #, python-format
1080 msgid "could not parse cat-log of %s"
1160 msgid "could not parse cat-log of %s"
1081 msgstr ""
1161 msgstr ""
1082
1162
1083 #, python-format
1163 #, python-format
1084 msgid "%s is not a local Mercurial repo"
1164 msgid "%s is not a local Mercurial repo"
1085 msgstr ""
1165 msgstr ""
1086
1166
1087 #, python-format
1167 #, python-format
1088 msgid "initializing destination %s repository\n"
1168 msgid "initializing destination %s repository\n"
1089 msgstr ""
1169 msgstr ""
1090
1170
1091 msgid "run hg sink pre-conversion action\n"
1171 msgid "run hg sink pre-conversion action\n"
1092 msgstr ""
1172 msgstr ""
1093
1173
1094 msgid "run hg sink post-conversion action\n"
1174 msgid "run hg sink post-conversion action\n"
1095 msgstr ""
1175 msgstr ""
1096
1176
1097 #, python-format
1177 #, python-format
1098 msgid "pulling from %s into %s\n"
1178 msgid "pulling from %s into %s\n"
1099 msgstr ""
1179 msgstr ""
1100
1180
1101 msgid "filtering out empty revision\n"
1181 msgid "filtering out empty revision\n"
1102 msgstr ""
1182 msgstr ""
1103
1183
1104 msgid "updating tags\n"
1184 msgid "updating tags\n"
1105 msgstr ""
1185 msgstr ""
1106
1186
1107 #, python-format
1187 #, python-format
1108 msgid "%s is not a valid start revision"
1188 msgid "%s is not a valid start revision"
1109 msgstr ""
1189 msgstr ""
1110
1190
1111 #, python-format
1191 #, python-format
1112 msgid "ignoring: %s\n"
1192 msgid "ignoring: %s\n"
1113 msgstr ""
1193 msgstr ""
1114
1194
1115 msgid "run hg source pre-conversion action\n"
1195 msgid "run hg source pre-conversion action\n"
1116 msgstr ""
1196 msgstr ""
1117
1197
1118 msgid "run hg source post-conversion action\n"
1198 msgid "run hg source post-conversion action\n"
1119 msgstr ""
1199 msgstr ""
1120
1200
1121 #, python-format
1201 #, python-format
1122 msgid "%s does not look like a monotone repo"
1202 msgid "%s does not look like a monotone repo"
1123 msgstr ""
1203 msgstr ""
1124
1204
1125 #, python-format
1205 #, python-format
1126 msgid "copying file in renamed directory from '%s' to '%s'"
1206 msgid "copying file in renamed directory from '%s' to '%s'"
1127 msgstr ""
1207 msgstr ""
1128
1208
1129 msgid "reading p4 views\n"
1209 msgid "reading p4 views\n"
1130 msgstr ""
1210 msgstr ""
1131
1211
1132 msgid "collecting p4 changelists\n"
1212 msgid "collecting p4 changelists\n"
1133 msgstr ""
1213 msgstr ""
1134
1214
1135 msgid "Subversion python bindings could not be loaded"
1215 msgid "Subversion python bindings could not be loaded"
1136 msgstr ""
1216 msgstr ""
1137
1217
1138 #, python-format
1218 #, python-format
1139 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1219 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1140 msgstr ""
1220 msgstr ""
1141
1221
1142 msgid "Subversion python bindings are too old, 1.4 or later required"
1222 msgid "Subversion python bindings are too old, 1.4 or later required"
1143 msgstr ""
1223 msgstr ""
1144
1224
1145 #, python-format
1225 #, python-format
1146 msgid "svn: revision %s is not an integer"
1226 msgid "svn: revision %s is not an integer"
1147 msgstr ""
1227 msgstr ""
1148
1228
1149 #, python-format
1229 #, python-format
1150 msgid "svn: start revision %s is not an integer"
1230 msgid "svn: start revision %s is not an integer"
1151 msgstr ""
1231 msgstr ""
1152
1232
1153 #, python-format
1233 #, python-format
1154 msgid "no revision found in module %s"
1234 msgid "no revision found in module %s"
1155 msgstr ""
1235 msgstr ""
1156
1236
1157 #, python-format
1237 #, python-format
1158 msgid "expected %s to be at %r, but not found"
1238 msgid "expected %s to be at %r, but not found"
1159 msgstr ""
1239 msgstr ""
1160
1240
1161 #, python-format
1241 #, python-format
1162 msgid "found %s at %r\n"
1242 msgid "found %s at %r\n"
1163 msgstr ""
1243 msgstr ""
1164
1244
1165 #, python-format
1245 #, python-format
1166 msgid "ignoring empty branch %s\n"
1246 msgid "ignoring empty branch %s\n"
1167 msgstr ""
1247 msgstr ""
1168
1248
1169 #, python-format
1249 #, python-format
1170 msgid "found branch %s at %d\n"
1250 msgid "found branch %s at %d\n"
1171 msgstr ""
1251 msgstr ""
1172
1252
1173 msgid "svn: start revision is not supported with more than one branch"
1253 msgid "svn: start revision is not supported with more than one branch"
1174 msgstr ""
1254 msgstr ""
1175
1255
1176 #, python-format
1256 #, python-format
1177 msgid "svn: no revision found after start revision %d"
1257 msgid "svn: no revision found after start revision %d"
1178 msgstr ""
1258 msgstr ""
1179
1259
1180 #, python-format
1260 #, python-format
1181 msgid "no tags found at revision %d\n"
1261 msgid "no tags found at revision %d\n"
1182 msgstr ""
1262 msgstr ""
1183
1263
1184 #, python-format
1264 #, python-format
1185 msgid "ignoring foreign branch %r\n"
1265 msgid "ignoring foreign branch %r\n"
1186 msgstr ""
1266 msgstr ""
1187
1267
1188 #, python-format
1268 #, python-format
1189 msgid "%s not found up to revision %d"
1269 msgid "%s not found up to revision %d"
1190 msgstr ""
1270 msgstr ""
1191
1271
1192 #, python-format
1272 #, python-format
1193 msgid "branch renamed from %s to %s at %d\n"
1273 msgid "branch renamed from %s to %s at %d\n"
1194 msgstr ""
1274 msgstr ""
1195
1275
1196 #, python-format
1276 #, python-format
1197 msgid "reparent to %s\n"
1277 msgid "reparent to %s\n"
1198 msgstr ""
1278 msgstr ""
1199
1279
1200 #, python-format
1280 #, python-format
1201 msgid "copied to %s from %s@%s\n"
1281 msgid "copied to %s from %s@%s\n"
1202 msgstr ""
1282 msgstr ""
1203
1283
1204 #, python-format
1284 #, python-format
1205 msgid "gone from %s\n"
1285 msgid "gone from %s\n"
1206 msgstr ""
1286 msgstr ""
1207
1287
1208 #, python-format
1288 #, python-format
1209 msgid "entry %s\n"
1289 msgid "entry %s\n"
1210 msgstr ""
1290 msgstr ""
1211
1291
1212 #, python-format
1292 #, python-format
1213 msgid "unknown path in revision %d: %s\n"
1293 msgid "unknown path in revision %d: %s\n"
1214 msgstr ""
1294 msgstr ""
1215
1295
1216 #, python-format
1296 #, python-format
1217 msgid "mark %s came from %s:%d\n"
1297 msgid "mark %s came from %s:%d\n"
1218 msgstr ""
1298 msgstr ""
1219
1299
1220 #, python-format
1300 #, python-format
1221 msgid "parsing revision %d (%d changes)\n"
1301 msgid "parsing revision %d (%d changes)\n"
1222 msgstr ""
1302 msgstr ""
1223
1303
1224 #, python-format
1304 #, python-format
1225 msgid "found parent of branch %s at %d: %s\n"
1305 msgid "found parent of branch %s at %d: %s\n"
1226 msgstr ""
1306 msgstr ""
1227
1307
1228 msgid "no copyfrom path, don't know what to do.\n"
1308 msgid "no copyfrom path, don't know what to do.\n"
1229 msgstr ""
1309 msgstr ""
1230
1310
1231 #, python-format
1311 #, python-format
1232 msgid "fetching revision log for \"%s\" from %d to %d\n"
1312 msgid "fetching revision log for \"%s\" from %d to %d\n"
1233 msgstr ""
1313 msgstr ""
1234
1314
1235 #, python-format
1315 #, python-format
1236 msgid "revision %d has no entries\n"
1316 msgid "revision %d has no entries\n"
1237 msgstr ""
1317 msgstr ""
1238
1318
1239 #, python-format
1319 #, python-format
1240 msgid "svn: branch has no revision %s"
1320 msgid "svn: branch has no revision %s"
1241 msgstr ""
1321 msgstr ""
1242
1322
1243 #, python-format
1323 #, python-format
1244 msgid "%r is not under %r, ignoring\n"
1324 msgid "%r is not under %r, ignoring\n"
1245 msgstr ""
1325 msgstr ""
1246
1326
1247 #, python-format
1327 #, python-format
1248 msgid "initializing svn repo %r\n"
1328 msgid "initializing svn repo %r\n"
1249 msgstr ""
1329 msgstr ""
1250
1330
1251 #, python-format
1331 #, python-format
1252 msgid "initializing svn wc %r\n"
1332 msgid "initializing svn wc %r\n"
1253 msgstr ""
1333 msgstr ""
1254
1334
1255 msgid "unexpected svn output:\n"
1335 msgid "unexpected svn output:\n"
1256 msgstr ""
1336 msgstr ""
1257
1337
1258 msgid "unable to cope with svn output"
1338 msgid "unable to cope with svn output"
1259 msgstr ""
1339 msgstr ""
1260
1340
1261 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1341 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1262 msgstr ""
1342 msgstr ""
1263
1343
1264 msgid ""
1344 msgid ""
1265 "allow external programs to compare revisions\n"
1345 "allow external programs to compare revisions\n"
1266 "\n"
1346 "\n"
1267 "The `extdiff' Mercurial extension allows you to use external programs\n"
1347 "The `extdiff' Mercurial extension allows you to use external programs\n"
1268 "to compare revisions, or revision with working directory. The external diff\n"
1348 "to compare revisions, or revision with working directory. The external diff\n"
1269 "programs are called with a configurable set of options and two\n"
1349 "programs are called with a configurable set of options and two\n"
1270 "non-option arguments: paths to directories containing snapshots of\n"
1350 "non-option arguments: paths to directories containing snapshots of\n"
1271 "files to compare.\n"
1351 "files to compare.\n"
1272 "\n"
1352 "\n"
1273 "The `extdiff' extension also allows to configure new diff commands, so\n"
1353 "The `extdiff' extension also allows to configure new diff commands, so\n"
1274 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1354 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1275 "\n"
1355 "\n"
1276 " [extdiff]\n"
1356 " [extdiff]\n"
1277 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1357 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1278 " cdiff = gdiff -Nprc5\n"
1358 " cdiff = gdiff -Nprc5\n"
1279 " ## or the old way:\n"
1359 " ## or the old way:\n"
1280 " #cmd.cdiff = gdiff\n"
1360 " #cmd.cdiff = gdiff\n"
1281 " #opts.cdiff = -Nprc5\n"
1361 " #opts.cdiff = -Nprc5\n"
1282 "\n"
1362 "\n"
1283 " # add new command called vdiff, runs kdiff3\n"
1363 " # add new command called vdiff, runs kdiff3\n"
1284 " vdiff = kdiff3\n"
1364 " vdiff = kdiff3\n"
1285 "\n"
1365 "\n"
1286 " # add new command called meld, runs meld (no need to name twice)\n"
1366 " # add new command called meld, runs meld (no need to name twice)\n"
1287 " meld =\n"
1367 " meld =\n"
1288 "\n"
1368 "\n"
1289 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1369 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1290 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1370 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1291 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1371 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1292 "in\n"
1372 "in\n"
1293 " # your .vimrc\n"
1373 " # your .vimrc\n"
1294 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1374 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1295 "\n"
1375 "\n"
1296 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1376 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1297 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1377 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1298 "files, so running the external diff program will actually be pretty\n"
1378 "files, so running the external diff program will actually be pretty\n"
1299 "fast (at least faster than having to compare the entire tree).\n"
1379 "fast (at least faster than having to compare the entire tree).\n"
1300 msgstr ""
1380 msgstr ""
1301
1381
1302 #, python-format
1382 #, python-format
1303 msgid "making snapshot of %d files from rev %s\n"
1383 msgid "making snapshot of %d files from rev %s\n"
1304 msgstr ""
1384 msgstr ""
1305
1385
1306 #, python-format
1386 #, python-format
1307 msgid "making snapshot of %d files from working directory\n"
1387 msgid "making snapshot of %d files from working directory\n"
1308 msgstr ""
1388 msgstr ""
1309
1389
1310 msgid "cannot specify --rev and --change at the same time"
1390 msgid "cannot specify --rev and --change at the same time"
1311 msgstr ""
1391 msgstr ""
1312
1392
1313 #, python-format
1393 #, python-format
1314 msgid "running %r in %s\n"
1394 msgid "running %r in %s\n"
1315 msgstr ""
1395 msgstr ""
1316
1396
1317 #, python-format
1397 #, python-format
1318 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1398 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1319 msgstr ""
1399 msgstr ""
1320
1400
1321 msgid "cleaning up temp directory\n"
1401 msgid "cleaning up temp directory\n"
1322 msgstr ""
1402 msgstr ""
1323
1403
1324 msgid ""
1404 msgid ""
1325 "use external program to diff repository (or selected files)\n"
1405 "use external program to diff repository (or selected files)\n"
1326 "\n"
1406 "\n"
1327 " Show differences between revisions for the specified files, using\n"
1407 " Show differences between revisions for the specified files, using\n"
1328 " an external program. The default program used is diff, with\n"
1408 " an external program. The default program used is diff, with\n"
1329 " default options \"-Npru\".\n"
1409 " default options \"-Npru\".\n"
1330 "\n"
1410 "\n"
1331 " To select a different program, use the -p/--program option. The\n"
1411 " To select a different program, use the -p/--program option. The\n"
1332 " program will be passed the names of two directories to compare. To\n"
1412 " program will be passed the names of two directories to compare. To\n"
1333 " pass additional options to the program, use -o/--option. These\n"
1413 " pass additional options to the program, use -o/--option. These\n"
1334 " will be passed before the names of the directories to compare.\n"
1414 " will be passed before the names of the directories to compare.\n"
1335 "\n"
1415 "\n"
1336 " When two revision arguments are given, then changes are shown\n"
1416 " When two revision arguments are given, then changes are shown\n"
1337 " between those revisions. If only one revision is specified then\n"
1417 " between those revisions. If only one revision is specified then\n"
1338 " that revision is compared to the working directory, and, when no\n"
1418 " that revision is compared to the working directory, and, when no\n"
1339 " revisions are specified, the working directory files are compared\n"
1419 " revisions are specified, the working directory files are compared\n"
1340 " to its parent."
1420 " to its parent."
1341 msgstr ""
1421 msgstr ""
1342
1422
1343 msgid "comparison program to run"
1423 msgid "comparison program to run"
1344 msgstr ""
1424 msgstr ""
1345
1425
1346 msgid "pass option to comparison program"
1426 msgid "pass option to comparison program"
1347 msgstr ""
1427 msgstr ""
1348
1428
1349 msgid "change made by revision"
1429 msgid "change made by revision"
1350 msgstr ""
1430 msgstr ""
1351
1431
1352 msgid "hg extdiff [OPT]... [FILE]..."
1432 msgid "hg extdiff [OPT]... [FILE]..."
1353 msgstr ""
1433 msgstr ""
1354
1434
1355 #, python-format
1435 #, python-format
1356 msgid "hg %s [OPTION]... [FILE]..."
1436 msgid "hg %s [OPTION]... [FILE]..."
1357 msgstr ""
1437 msgstr ""
1358
1438
1359 msgid "pull, update and merge in one command"
1439 msgid "pull, update and merge in one command"
1360 msgstr ""
1440 msgstr ""
1361
1441
1362 msgid ""
1442 msgid ""
1363 "pull changes from a remote repository, merge new changes if needed.\n"
1443 "pull changes from a remote repository, merge new changes if needed.\n"
1364 "\n"
1444 "\n"
1365 " This finds all changes from the repository at the specified path\n"
1445 " This finds all changes from the repository at the specified path\n"
1366 " or URL and adds them to the local repository.\n"
1446 " or URL and adds them to the local repository.\n"
1367 "\n"
1447 "\n"
1368 " If the pulled changes add a new branch head, the head is\n"
1448 " If the pulled changes add a new branch head, the head is\n"
1369 " automatically merged, and the result of the merge is committed.\n"
1449 " automatically merged, and the result of the merge is committed.\n"
1370 " Otherwise, the working directory is updated to include the new\n"
1450 " Otherwise, the working directory is updated to include the new\n"
1371 " changes.\n"
1451 " changes.\n"
1372 "\n"
1452 "\n"
1373 " When a merge occurs, the newly pulled changes are assumed to be\n"
1453 " When a merge occurs, the newly pulled changes are assumed to be\n"
1374 " \"authoritative\". The head of the new changes is used as the first\n"
1454 " \"authoritative\". The head of the new changes is used as the first\n"
1375 " parent, with local changes as the second. To switch the merge\n"
1455 " parent, with local changes as the second. To switch the merge\n"
1376 " order, use --switch-parent.\n"
1456 " order, use --switch-parent.\n"
1377 "\n"
1457 "\n"
1378 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1458 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1379 " "
1459 " "
1380 msgstr ""
1460 msgstr ""
1381
1461
1382 msgid ""
1462 msgid ""
1383 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1463 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1384 msgstr ""
1464 msgstr ""
1385
1465
1386 msgid "outstanding uncommitted merge"
1466 msgid "outstanding uncommitted merge"
1387 msgstr ""
1467 msgstr ""
1388
1468
1389 msgid "outstanding uncommitted changes"
1469 msgid "outstanding uncommitted changes"
1390 msgstr ""
1470 msgstr ""
1391
1471
1392 msgid "working directory is missing some files"
1472 msgid "working directory is missing some files"
1393 msgstr ""
1473 msgstr ""
1394
1474
1395 msgid ""
1475 msgid ""
1396 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1476 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1397 msgstr ""
1477 msgstr ""
1398
1478
1399 #, python-format
1479 #, python-format
1400 msgid "pulling from %s\n"
1480 msgid "pulling from %s\n"
1401 msgstr ""
1481 msgstr ""
1402
1482
1403 msgid ""
1483 msgid ""
1404 "Other repository doesn't support revision lookup, so a rev cannot be "
1484 "Other repository doesn't support revision lookup, so a rev cannot be "
1405 "specified."
1485 "specified."
1406 msgstr ""
1486 msgstr ""
1407
1487
1408 #, python-format
1488 #, python-format
1409 msgid ""
1489 msgid ""
1410 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1490 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1411 "\" to merge them)\n"
1491 "\" to merge them)\n"
1412 msgstr ""
1492 msgstr ""
1413
1493
1414 #, python-format
1494 #, python-format
1415 msgid "updating to %d:%s\n"
1495 msgid "updating to %d:%s\n"
1416 msgstr ""
1496 msgstr ""
1417
1497
1418 #, python-format
1498 #, python-format
1419 msgid "merging with %d:%s\n"
1499 msgid "merging with %d:%s\n"
1420 msgstr ""
1500 msgstr ""
1421
1501
1422 #, python-format
1502 #, python-format
1423 msgid "Automated merge with %s"
1503 msgid "Automated merge with %s"
1424 msgstr ""
1504 msgstr ""
1425
1505
1426 #, python-format
1506 #, python-format
1427 msgid "new changeset %d:%s merges remote changes with local\n"
1507 msgid "new changeset %d:%s merges remote changes with local\n"
1428 msgstr ""
1508 msgstr ""
1429
1509
1430 msgid "a specific revision you would like to pull"
1510 msgid "a specific revision you would like to pull"
1431 msgstr ""
1511 msgstr ""
1432
1512
1433 msgid "edit commit message"
1513 msgid "edit commit message"
1434 msgstr ""
1514 msgstr ""
1435
1515
1436 msgid "edit commit message (DEPRECATED)"
1516 msgid "edit commit message (DEPRECATED)"
1437 msgstr ""
1517 msgstr ""
1438
1518
1439 msgid "switch parents when merging"
1519 msgid "switch parents when merging"
1440 msgstr ""
1520 msgstr ""
1441
1521
1442 msgid "hg fetch [SOURCE]"
1522 msgid "hg fetch [SOURCE]"
1443 msgstr ""
1523 msgstr ""
1444
1524
1445 msgid "sign and verify changesets"
1525 msgid "sign and verify changesets"
1446 msgstr ""
1526 msgstr ""
1447
1527
1448 msgid "error while verifying signature"
1528 msgid "error while verifying signature"
1449 msgstr ""
1529 msgstr ""
1450
1530
1451 #, python-format
1531 #, python-format
1452 msgid "%s Bad signature from \"%s\"\n"
1532 msgid "%s Bad signature from \"%s\"\n"
1453 msgstr ""
1533 msgstr ""
1454
1534
1455 #, python-format
1535 #, python-format
1456 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1536 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1457 msgstr ""
1537 msgstr ""
1458
1538
1459 #, python-format
1539 #, python-format
1460 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1540 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1461 msgstr ""
1541 msgstr ""
1462
1542
1463 msgid "list signed changesets"
1543 msgid "list signed changesets"
1464 msgstr ""
1544 msgstr ""
1465
1545
1466 #, python-format
1546 #, python-format
1467 msgid "%s:%d node does not exist\n"
1547 msgid "%s:%d node does not exist\n"
1468 msgstr ""
1548 msgstr ""
1469
1549
1470 msgid "verify all the signatures there may be for a particular revision"
1550 msgid "verify all the signatures there may be for a particular revision"
1471 msgstr ""
1551 msgstr ""
1472
1552
1473 #, python-format
1553 #, python-format
1474 msgid "No valid signature for %s\n"
1554 msgid "No valid signature for %s\n"
1475 msgstr ""
1555 msgstr ""
1476
1556
1477 msgid ""
1557 msgid ""
1478 "add a signature for the current or given revision\n"
1558 "add a signature for the current or given revision\n"
1479 "\n"
1559 "\n"
1480 " If no revision is given, the parent of the working directory is used,\n"
1560 " If no revision is given, the parent of the working directory is used,\n"
1481 " or tip if no revision is checked out.\n"
1561 " or tip if no revision is checked out.\n"
1482 "\n"
1562 "\n"
1483 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1563 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1484 " "
1564 " "
1485 msgstr ""
1565 msgstr ""
1486
1566
1487 msgid "uncommitted merge - please provide a specific revision"
1567 msgid "uncommitted merge - please provide a specific revision"
1488 msgstr ""
1568 msgstr ""
1489
1569
1490 msgid "Error while signing"
1570 msgid "Error while signing"
1491 msgstr ""
1571 msgstr ""
1492
1572
1493 msgid ""
1573 msgid ""
1494 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1574 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1495 "force)"
1575 "force)"
1496 msgstr ""
1576 msgstr ""
1497
1577
1498 #, python-format
1578 #, python-format
1499 msgid "Added signature for changeset %s"
1579 msgid "Added signature for changeset %s"
1500 msgstr ""
1580 msgstr ""
1501
1581
1502 msgid "unknown signature version"
1582 msgid "unknown signature version"
1503 msgstr ""
1583 msgstr ""
1504
1584
1505 msgid "make the signature local"
1585 msgid "make the signature local"
1506 msgstr ""
1586 msgstr ""
1507
1587
1508 msgid "sign even if the sigfile is modified"
1588 msgid "sign even if the sigfile is modified"
1509 msgstr ""
1589 msgstr ""
1510
1590
1511 msgid "do not commit the sigfile after signing"
1591 msgid "do not commit the sigfile after signing"
1512 msgstr ""
1592 msgstr ""
1513
1593
1514 msgid "the key id to sign with"
1594 msgid "the key id to sign with"
1515 msgstr ""
1595 msgstr ""
1516
1596
1517 msgid "commit message"
1597 msgid "commit message"
1518 msgstr ""
1598 msgstr ""
1519
1599
1520 msgid "hg sign [OPTION]... [REVISION]..."
1600 msgid "hg sign [OPTION]... [REVISION]..."
1521 msgstr ""
1601 msgstr ""
1522
1602
1523 msgid "hg sigcheck REVISION"
1603 msgid "hg sigcheck REVISION"
1524 msgstr ""
1604 msgstr ""
1525
1605
1526 msgid "hg sigs"
1606 msgid "hg sigs"
1527 msgstr ""
1607 msgstr ""
1528
1608
1529 msgid ""
1609 msgid ""
1530 "show revision graphs in terminals\n"
1610 "show revision graphs in terminals\n"
1531 "\n"
1611 "\n"
1532 "This extension adds a --graph option to the incoming, outgoing and log\n"
1612 "This extension adds a --graph option to the incoming, outgoing and log\n"
1533 "commands. When this options is given, an ASCII representation of the\n"
1613 "commands. When this options is given, an ASCII representation of the\n"
1534 "revision graph is also shown.\n"
1614 "revision graph is also shown.\n"
1535 msgstr ""
1615 msgstr ""
1536
1616
1537 #, python-format
1617 #, python-format
1538 msgid "--graph option is incompatible with --%s"
1618 msgid "--graph option is incompatible with --%s"
1539 msgstr ""
1619 msgstr ""
1540
1620
1541 msgid ""
1621 msgid ""
1542 "show revision history alongside an ASCII revision graph\n"
1622 "show revision history alongside an ASCII revision graph\n"
1543 "\n"
1623 "\n"
1544 " Print a revision history alongside a revision graph drawn with\n"
1624 " Print a revision history alongside a revision graph drawn with\n"
1545 " ASCII characters.\n"
1625 " ASCII characters.\n"
1546 "\n"
1626 "\n"
1547 " Nodes printed as an @ character are parents of the working\n"
1627 " Nodes printed as an @ character are parents of the working\n"
1548 " directory.\n"
1628 " directory.\n"
1549 " "
1629 " "
1550 msgstr ""
1630 msgstr ""
1551
1631
1552 #, python-format
1632 #, python-format
1553 msgid "comparing with %s\n"
1633 msgid "comparing with %s\n"
1554 msgstr ""
1634 msgstr ""
1555
1635
1556 msgid "no changes found\n"
1636 msgid "no changes found\n"
1557 msgstr ""
1637 msgstr ""
1558
1638
1559 msgid "show the revision DAG"
1639 msgid "show the revision DAG"
1560 msgstr ""
1640 msgstr ""
1561
1641
1562 msgid "limit number of changes displayed"
1642 msgid "limit number of changes displayed"
1563 msgstr ""
1643 msgstr ""
1564
1644
1565 msgid "show patch"
1645 msgid "show patch"
1566 msgstr ""
1646 msgstr ""
1567
1647
1568 msgid "show the specified revision or range"
1648 msgid "show the specified revision or range"
1569 msgstr ""
1649 msgstr ""
1570
1650
1571 msgid "hg glog [OPTION]... [FILE]"
1651 msgid "hg glog [OPTION]... [FILE]"
1572 msgstr ""
1652 msgstr ""
1573
1653
1574 msgid ""
1654 msgid ""
1575 "integrate Mercurial with a CIA notification service\n"
1655 "integrate Mercurial with a CIA notification service\n"
1576 "\n"
1656 "\n"
1577 "This is meant to be run as a changegroup or incoming hook.\n"
1657 "This is meant to be run as a changegroup or incoming hook.\n"
1578 "To configure it, set the following options in your hgrc:\n"
1658 "To configure it, set the following options in your hgrc:\n"
1579 "\n"
1659 "\n"
1580 "[cia]\n"
1660 "[cia]\n"
1581 "# your registered CIA user name\n"
1661 "# your registered CIA user name\n"
1582 "user = foo\n"
1662 "user = foo\n"
1583 "# the name of the project in CIA\n"
1663 "# the name of the project in CIA\n"
1584 "project = foo\n"
1664 "project = foo\n"
1585 "# the module (subproject) (optional)\n"
1665 "# the module (subproject) (optional)\n"
1586 "#module = foo\n"
1666 "#module = foo\n"
1587 "# Append a diffstat to the log message (optional)\n"
1667 "# Append a diffstat to the log message (optional)\n"
1588 "#diffstat = False\n"
1668 "#diffstat = False\n"
1589 "# Template to use for log messages (optional)\n"
1669 "# Template to use for log messages (optional)\n"
1590 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1670 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1591 "# Style to use (optional)\n"
1671 "# Style to use (optional)\n"
1592 "#style = foo\n"
1672 "#style = foo\n"
1593 "# The URL of the CIA notification service (optional)\n"
1673 "# The URL of the CIA notification service (optional)\n"
1594 "# You can use mailto: URLs to send by email, eg\n"
1674 "# You can use mailto: URLs to send by email, eg\n"
1595 "# mailto:cia@cia.vc\n"
1675 "# mailto:cia@cia.vc\n"
1596 "# Make sure to set email.from if you do this.\n"
1676 "# Make sure to set email.from if you do this.\n"
1597 "#url = http://cia.vc/\n"
1677 "#url = http://cia.vc/\n"
1598 "# print message instead of sending it (optional)\n"
1678 "# print message instead of sending it (optional)\n"
1599 "#test = False\n"
1679 "#test = False\n"
1600 "\n"
1680 "\n"
1601 "[hooks]\n"
1681 "[hooks]\n"
1602 "# one of these:\n"
1682 "# one of these:\n"
1603 "changegroup.cia = python:hgcia.hook\n"
1683 "changegroup.cia = python:hgcia.hook\n"
1604 "#incoming.cia = python:hgcia.hook\n"
1684 "#incoming.cia = python:hgcia.hook\n"
1605 "\n"
1685 "\n"
1606 "[web]\n"
1686 "[web]\n"
1607 "# If you want hyperlinks (optional)\n"
1687 "# If you want hyperlinks (optional)\n"
1608 "baseurl = http://server/path/to/repo\n"
1688 "baseurl = http://server/path/to/repo\n"
1609 msgstr ""
1689 msgstr ""
1610
1690
1611 #, python-format
1691 #, python-format
1612 msgid "hgcia: sending update to %s\n"
1692 msgid "hgcia: sending update to %s\n"
1613 msgstr ""
1693 msgstr ""
1614
1694
1615 msgid "email.from must be defined when sending by email"
1695 msgid "email.from must be defined when sending by email"
1616 msgstr ""
1696 msgstr ""
1617
1697
1618 msgid "cia: no user specified"
1698 msgid "cia: no user specified"
1619 msgstr ""
1699 msgstr ""
1620
1700
1621 msgid "cia: no project specified"
1701 msgid "cia: no project specified"
1622 msgstr ""
1702 msgstr ""
1623
1703
1624 msgid ""
1704 msgid ""
1625 "browse the repository in a graphical way\n"
1705 "browse the repository in a graphical way\n"
1626 "\n"
1706 "\n"
1627 "The hgk extension allows browsing the history of a repository in a\n"
1707 "The hgk extension allows browsing the history of a repository in a\n"
1628 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1708 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1629 "distributed with Mercurial.)\n"
1709 "distributed with Mercurial.)\n"
1630 "\n"
1710 "\n"
1631 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1711 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1632 "querying of information, and an extension to Mercurial named hgk.py,\n"
1712 "querying of information, and an extension to Mercurial named hgk.py,\n"
1633 "which provides hooks for hgk to get information. hgk can be found in\n"
1713 "which provides hooks for hgk to get information. hgk can be found in\n"
1634 "the contrib directory, and the extension is shipped in the hgext\n"
1714 "the contrib directory, and the extension is shipped in the hgext\n"
1635 "repository, and needs to be enabled.\n"
1715 "repository, and needs to be enabled.\n"
1636 "\n"
1716 "\n"
1637 "The hg view command will launch the hgk Tcl script. For this command\n"
1717 "The hg view command will launch the hgk Tcl script. For this command\n"
1638 "to work, hgk must be in your search path. Alternately, you can specify\n"
1718 "to work, hgk must be in your search path. Alternately, you can specify\n"
1639 "the path to hgk in your .hgrc file:\n"
1719 "the path to hgk in your .hgrc file:\n"
1640 "\n"
1720 "\n"
1641 " [hgk]\n"
1721 " [hgk]\n"
1642 " path=/location/of/hgk\n"
1722 " path=/location/of/hgk\n"
1643 "\n"
1723 "\n"
1644 "hgk can make use of the extdiff extension to visualize revisions.\n"
1724 "hgk can make use of the extdiff extension to visualize revisions.\n"
1645 "Assuming you had already configured extdiff vdiff command, just add:\n"
1725 "Assuming you had already configured extdiff vdiff command, just add:\n"
1646 "\n"
1726 "\n"
1647 " [hgk]\n"
1727 " [hgk]\n"
1648 " vdiff=vdiff\n"
1728 " vdiff=vdiff\n"
1649 "\n"
1729 "\n"
1650 "Revisions context menu will now display additional entries to fire\n"
1730 "Revisions context menu will now display additional entries to fire\n"
1651 "vdiff on hovered and selected revisions."
1731 "vdiff on hovered and selected revisions."
1652 msgstr ""
1732 msgstr ""
1653
1733
1654 msgid "diff trees from two commits"
1734 msgid "diff trees from two commits"
1655 msgstr ""
1735 msgstr ""
1656
1736
1657 msgid "output common ancestor information"
1737 msgid "output common ancestor information"
1658 msgstr ""
1738 msgstr ""
1659
1739
1660 msgid "cat a specific revision"
1740 msgid "cat a specific revision"
1661 msgstr ""
1741 msgstr ""
1662
1742
1663 msgid "cat-file: type or revision not supplied\n"
1743 msgid "cat-file: type or revision not supplied\n"
1664 msgstr ""
1744 msgstr ""
1665
1745
1666 msgid "aborting hg cat-file only understands commits\n"
1746 msgid "aborting hg cat-file only understands commits\n"
1667 msgstr ""
1747 msgstr ""
1668
1748
1669 msgid "parse given revisions"
1749 msgid "parse given revisions"
1670 msgstr ""
1750 msgstr ""
1671
1751
1672 msgid "print revisions"
1752 msgid "print revisions"
1673 msgstr ""
1753 msgstr ""
1674
1754
1675 msgid "print extension options"
1755 msgid "print extension options"
1676 msgstr ""
1756 msgstr ""
1677
1757
1678 msgid "start interactive history viewer"
1758 msgid "start interactive history viewer"
1679 msgstr ""
1759 msgstr ""
1680
1760
1681 msgid "hg view [-l LIMIT] [REVRANGE]"
1761 msgid "hg view [-l LIMIT] [REVRANGE]"
1682 msgstr ""
1762 msgstr ""
1683
1763
1684 msgid "generate patch"
1764 msgid "generate patch"
1685 msgstr ""
1765 msgstr ""
1686
1766
1687 msgid "recursive"
1767 msgid "recursive"
1688 msgstr ""
1768 msgstr ""
1689
1769
1690 msgid "pretty"
1770 msgid "pretty"
1691 msgstr ""
1771 msgstr ""
1692
1772
1693 msgid "stdin"
1773 msgid "stdin"
1694 msgstr ""
1774 msgstr ""
1695
1775
1696 msgid "detect copies"
1776 msgid "detect copies"
1697 msgstr ""
1777 msgstr ""
1698
1778
1699 msgid "search"
1779 msgid "search"
1700 msgstr ""
1780 msgstr ""
1701
1781
1702 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1782 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1703 msgstr ""
1783 msgstr ""
1704
1784
1705 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1785 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1706 msgstr ""
1786 msgstr ""
1707
1787
1708 msgid "hg debug-config"
1788 msgid "hg debug-config"
1709 msgstr ""
1789 msgstr ""
1710
1790
1711 msgid "hg debug-merge-base node node"
1791 msgid "hg debug-merge-base node node"
1712 msgstr ""
1792 msgstr ""
1713
1793
1714 msgid "ignored"
1794 msgid "ignored"
1715 msgstr ""
1795 msgstr ""
1716
1796
1717 msgid "hg debug-rev-parse REV"
1797 msgid "hg debug-rev-parse REV"
1718 msgstr ""
1798 msgstr ""
1719
1799
1720 msgid "header"
1800 msgid "header"
1721 msgstr ""
1801 msgstr ""
1722
1802
1723 msgid "topo-order"
1803 msgid "topo-order"
1724 msgstr ""
1804 msgstr ""
1725
1805
1726 msgid "parents"
1806 msgid "parents"
1727 msgstr ""
1807 msgstr ""
1728
1808
1729 msgid "max-count"
1809 msgid "max-count"
1730 msgstr ""
1810 msgstr ""
1731
1811
1732 msgid "hg debug-rev-list [options] revs"
1812 msgid "hg debug-rev-list [options] revs"
1733 msgstr ""
1813 msgstr ""
1734
1814
1735 msgid ""
1815 msgid ""
1736 "syntax highlighting for hgweb\n"
1816 "syntax highlighting for hgweb\n"
1737 "\n"
1817 "\n"
1738 "It depends on the Pygments syntax highlighting library:\n"
1818 "It depends on the Pygments syntax highlighting library:\n"
1739 "http://pygments.org/\n"
1819 "http://pygments.org/\n"
1740 "\n"
1820 "\n"
1741 "There is a single configuration option:\n"
1821 "There is a single configuration option:\n"
1742 "\n"
1822 "\n"
1743 "[web]\n"
1823 "[web]\n"
1744 "pygments_style = <style>\n"
1824 "pygments_style = <style>\n"
1745 "\n"
1825 "\n"
1746 "The default is 'colorful'.\n"
1826 "The default is 'colorful'.\n"
1747 "\n"
1827 "\n"
1748 "-- Adam Hupp <adam@hupp.org>\n"
1828 "-- Adam Hupp <adam@hupp.org>\n"
1749 msgstr ""
1829 msgstr ""
1750
1830
1751 msgid "accelerate status report using system level services"
1831 msgid "accelerate status report using system level services"
1752 msgstr ""
1832 msgstr ""
1753
1833
1754 msgid "start an inotify server for this repository"
1834 msgid "start an inotify server for this repository"
1755 msgstr ""
1835 msgstr ""
1756
1836
1757 msgid ""
1837 msgid ""
1758 "debugging information for inotify extension\n"
1838 "debugging information for inotify extension\n"
1759 "\n"
1839 "\n"
1760 " Prints the list of directories being watched by the inotify server.\n"
1840 " Prints the list of directories being watched by the inotify server.\n"
1761 " "
1841 " "
1762 msgstr ""
1842 msgstr ""
1763
1843
1764 msgid "directories being watched:\n"
1844 msgid "directories being watched:\n"
1765 msgstr ""
1845 msgstr ""
1766
1846
1767 msgid "run server in background"
1847 msgid "run server in background"
1768 msgstr ""
1848 msgstr ""
1769
1849
1770 msgid "used internally by daemon mode"
1850 msgid "used internally by daemon mode"
1771 msgstr ""
1851 msgstr ""
1772
1852
1773 msgid "minutes to sit idle before exiting"
1853 msgid "minutes to sit idle before exiting"
1774 msgstr ""
1854 msgstr ""
1775
1855
1776 msgid "name of file to write process ID to"
1856 msgid "name of file to write process ID to"
1777 msgstr ""
1857 msgstr ""
1778
1858
1779 msgid "hg inserve [OPT]..."
1859 msgid "hg inserve [OPT]..."
1780 msgstr ""
1860 msgstr ""
1781
1861
1782 msgid "(found dead inotify server socket; removing it)\n"
1862 msgid "(found dead inotify server socket; removing it)\n"
1783 msgstr ""
1863 msgstr ""
1784
1864
1785 msgid "(starting inotify server)\n"
1865 msgid "(starting inotify server)\n"
1786 msgstr ""
1866 msgstr ""
1787
1867
1788 #, python-format
1868 #, python-format
1789 msgid "could not start inotify server: %s\n"
1869 msgid "could not start inotify server: %s\n"
1790 msgstr ""
1870 msgstr ""
1791
1871
1792 #, python-format
1872 #, python-format
1793 msgid "could not talk to new inotify server: %s\n"
1873 msgid "could not talk to new inotify server: %s\n"
1794 msgstr ""
1874 msgstr ""
1795
1875
1796 msgid "(inotify server not running)\n"
1876 msgid "(inotify server not running)\n"
1797 msgstr ""
1877 msgstr ""
1798
1878
1799 #, python-format
1879 #, python-format
1800 msgid "failed to contact inotify server: %s\n"
1880 msgid "failed to contact inotify server: %s\n"
1801 msgstr ""
1881 msgstr ""
1802
1882
1803 msgid "received empty answer from inotify server"
1883 msgid "received empty answer from inotify server"
1804 msgstr ""
1884 msgstr ""
1805
1885
1806 #, python-format
1886 #, python-format
1807 msgid "(inotify: received response from incompatible server version %d)\n"
1887 msgid "(inotify: received response from incompatible server version %d)\n"
1808 msgstr ""
1888 msgstr ""
1809
1889
1810 #, python-format
1890 #, python-format
1811 msgid "(inotify: received '%s' response when expecting '%s')\n"
1891 msgid "(inotify: received '%s' response when expecting '%s')\n"
1812 msgstr ""
1892 msgstr ""
1813
1893
1814 msgid "this system does not seem to support inotify"
1894 msgid "this system does not seem to support inotify"
1815 msgstr ""
1895 msgstr ""
1816
1896
1817 #, python-format
1897 #, python-format
1818 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1898 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1819 msgstr ""
1899 msgstr ""
1820
1900
1821 msgid "*** this limit is too low to watch every directory in this repository\n"
1901 msgid "*** this limit is too low to watch every directory in this repository\n"
1822 msgstr ""
1902 msgstr ""
1823
1903
1824 msgid "*** counting directories: "
1904 msgid "*** counting directories: "
1825 msgstr ""
1905 msgstr ""
1826
1906
1827 #, python-format
1907 #, python-format
1828 msgid "found %d\n"
1908 msgid "found %d\n"
1829 msgstr ""
1909 msgstr ""
1830
1910
1831 #, python-format
1911 #, python-format
1832 msgid "*** to raise the limit from %d to %d (run as root):\n"
1912 msgid "*** to raise the limit from %d to %d (run as root):\n"
1833 msgstr ""
1913 msgstr ""
1834
1914
1835 #, python-format
1915 #, python-format
1836 msgid "*** echo %d > %s\n"
1916 msgid "*** echo %d > %s\n"
1837 msgstr ""
1917 msgstr ""
1838
1918
1839 #, python-format
1919 #, python-format
1840 msgid "cannot watch %s until inotify watch limit is raised"
1920 msgid "cannot watch %s until inotify watch limit is raised"
1841 msgstr ""
1921 msgstr ""
1842
1922
1843 #, python-format
1923 #, python-format
1844 msgid "inotify service not available: %s"
1924 msgid "inotify service not available: %s"
1845 msgstr ""
1925 msgstr ""
1846
1926
1847 #, python-format
1927 #, python-format
1848 msgid "watching %r\n"
1928 msgid "watching %r\n"
1849 msgstr ""
1929 msgstr ""
1850
1930
1851 #, python-format
1931 #, python-format
1852 msgid "watching directories under %r\n"
1932 msgid "watching directories under %r\n"
1853 msgstr ""
1933 msgstr ""
1854
1934
1855 #, python-format
1935 #, python-format
1856 msgid "status: %r dir(%d) -> %s\n"
1936 msgid "status: %r dir(%d) -> %s\n"
1857 msgstr ""
1937 msgstr ""
1858
1938
1859 #, python-format
1939 #, python-format
1860 msgid "status: %r %s -> %s\n"
1940 msgid "status: %r %s -> %s\n"
1861 msgstr ""
1941 msgstr ""
1862
1942
1863 #, python-format
1943 #, python-format
1864 msgid "%s dirstate reload\n"
1944 msgid "%s dirstate reload\n"
1865 msgstr ""
1945 msgstr ""
1866
1946
1867 #, python-format
1947 #, python-format
1868 msgid "%s end dirstate reload\n"
1948 msgid "%s end dirstate reload\n"
1869 msgstr ""
1949 msgstr ""
1870
1950
1871 msgid "rescanning due to .hgignore change\n"
1951 msgid "rescanning due to .hgignore change\n"
1872 msgstr ""
1952 msgstr ""
1873
1953
1874 #, python-format
1954 #, python-format
1875 msgid "%s event: created %s\n"
1955 msgid "%s event: created %s\n"
1876 msgstr ""
1956 msgstr ""
1877
1957
1878 #, python-format
1958 #, python-format
1879 msgid "%s event: deleted %s\n"
1959 msgid "%s event: deleted %s\n"
1880 msgstr ""
1960 msgstr ""
1881
1961
1882 #, python-format
1962 #, python-format
1883 msgid "%s event: modified %s\n"
1963 msgid "%s event: modified %s\n"
1884 msgstr ""
1964 msgstr ""
1885
1965
1886 #, python-format
1966 #, python-format
1887 msgid "filesystem containing %s was unmounted\n"
1967 msgid "filesystem containing %s was unmounted\n"
1888 msgstr ""
1968 msgstr ""
1889
1969
1890 #, python-format
1970 #, python-format
1891 msgid "%s readable: %d bytes\n"
1971 msgid "%s readable: %d bytes\n"
1892 msgstr ""
1972 msgstr ""
1893
1973
1894 #, python-format
1974 #, python-format
1895 msgid "%s below threshold - unhooking\n"
1975 msgid "%s below threshold - unhooking\n"
1896 msgstr ""
1976 msgstr ""
1897
1977
1898 #, python-format
1978 #, python-format
1899 msgid "%s reading %d events\n"
1979 msgid "%s reading %d events\n"
1900 msgstr ""
1980 msgstr ""
1901
1981
1902 #, python-format
1982 #, python-format
1903 msgid "%s hooking back up with %d bytes readable\n"
1983 msgid "%s hooking back up with %d bytes readable\n"
1904 msgstr ""
1984 msgstr ""
1905
1985
1906 #, python-format
1986 #, python-format
1907 msgid "could not start server: %s"
1987 msgid "could not start server: %s"
1908 msgstr ""
1988 msgstr ""
1909
1989
1910 #, python-format
1990 #, python-format
1911 msgid "answering query for %r\n"
1991 msgid "answering query for %r\n"
1912 msgstr ""
1992 msgstr ""
1913
1993
1914 #, python-format
1994 #, python-format
1915 msgid "received query from incompatible client version %d\n"
1995 msgid "received query from incompatible client version %d\n"
1916 msgstr ""
1996 msgstr ""
1917
1997
1918 #, python-format
1998 #, python-format
1919 msgid "unrecognized query type: %s\n"
1999 msgid "unrecognized query type: %s\n"
1920 msgstr ""
2000 msgstr ""
1921
2001
1922 msgid "finished setup\n"
2002 msgid "finished setup\n"
1923 msgstr ""
2003 msgstr ""
1924
2004
1925 msgid ""
2005 msgid ""
1926 "expand expressions into changelog and summaries\n"
2006 "expand expressions into changelog and summaries\n"
1927 "\n"
2007 "\n"
1928 "This extension allows the use of a special syntax in summaries,\n"
2008 "This extension allows the use of a special syntax in summaries,\n"
1929 "which will be automatically expanded into links or any other\n"
2009 "which will be automatically expanded into links or any other\n"
1930 "arbitrary expression, much like InterWiki does.\n"
2010 "arbitrary expression, much like InterWiki does.\n"
1931 "\n"
2011 "\n"
1932 "A few example patterns (link to bug tracking, etc.) that may\n"
2012 "A few example patterns (link to bug tracking, etc.) that may\n"
1933 "be used in your hgrc:\n"
2013 "be used in your hgrc:\n"
1934 "\n"
2014 "\n"
1935 " [interhg]\n"
2015 " [interhg]\n"
1936 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2016 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
1937 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2017 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
1938 "i\n"
2018 "i\n"
1939 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2019 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
1940 msgstr ""
2020 msgstr ""
1941
2021
1942 #, python-format
2022 #, python-format
1943 msgid "interhg: invalid pattern for %s: %s\n"
2023 msgid "interhg: invalid pattern for %s: %s\n"
1944 msgstr ""
2024 msgstr ""
1945
2025
1946 #, python-format
2026 #, python-format
1947 msgid "interhg: invalid regexp for %s: %s\n"
2027 msgid "interhg: invalid regexp for %s: %s\n"
1948 msgstr ""
2028 msgstr ""
1949
2029
1950 msgid ""
2030 msgid ""
1951 "expand keywords in tracked files\n"
2031 "expand keywords in tracked files\n"
1952 "\n"
2032 "\n"
1953 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2033 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
1954 "tracked text files selected by your configuration.\n"
2034 "tracked text files selected by your configuration.\n"
1955 "\n"
2035 "\n"
1956 "Keywords are only expanded in local repositories and not stored in the\n"
2036 "Keywords are only expanded in local repositories and not stored in the\n"
1957 "change history. The mechanism can be regarded as a convenience for the\n"
2037 "change history. The mechanism can be regarded as a convenience for the\n"
1958 "current user or for archive distribution.\n"
2038 "current user or for archive distribution.\n"
1959 "\n"
2039 "\n"
1960 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2040 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
1961 "hgrc files.\n"
2041 "hgrc files.\n"
1962 "\n"
2042 "\n"
1963 "Example:\n"
2043 "Example:\n"
1964 "\n"
2044 "\n"
1965 " [keyword]\n"
2045 " [keyword]\n"
1966 " # expand keywords in every python file except those matching \"x*\"\n"
2046 " # expand keywords in every python file except those matching \"x*\"\n"
1967 " **.py =\n"
2047 " **.py =\n"
1968 " x* = ignore\n"
2048 " x* = ignore\n"
1969 "\n"
2049 "\n"
1970 "Note: the more specific you are in your filename patterns\n"
2050 "Note: the more specific you are in your filename patterns\n"
1971 " the less you lose speed in huge repositories.\n"
2051 " the less you lose speed in huge repositories.\n"
1972 "\n"
2052 "\n"
1973 "For [keywordmaps] template mapping and expansion demonstration and\n"
2053 "For [keywordmaps] template mapping and expansion demonstration and\n"
1974 "control run \"hg kwdemo\".\n"
2054 "control run \"hg kwdemo\".\n"
1975 "\n"
2055 "\n"
1976 "An additional date template filter {date|utcdate} is provided.\n"
2056 "An additional date template filter {date|utcdate} is provided.\n"
1977 "\n"
2057 "\n"
1978 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2058 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
1979 "replaced with customized keywords and templates. Again, run \"hg\n"
2059 "replaced with customized keywords and templates. Again, run \"hg\n"
1980 "kwdemo\" to control the results of your config changes.\n"
2060 "kwdemo\" to control the results of your config changes.\n"
1981 "\n"
2061 "\n"
1982 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2062 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
1983 "the risk of inadvertently storing expanded keywords in the change\n"
2063 "the risk of inadvertently storing expanded keywords in the change\n"
1984 "history.\n"
2064 "history.\n"
1985 "\n"
2065 "\n"
1986 "To force expansion after enabling it, or a configuration change, run\n"
2066 "To force expansion after enabling it, or a configuration change, run\n"
1987 "\"hg kwexpand\".\n"
2067 "\"hg kwexpand\".\n"
1988 "\n"
2068 "\n"
1989 "Also, when committing with the record extension or using mq's qrecord,\n"
2069 "Also, when committing with the record extension or using mq's qrecord,\n"
1990 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2070 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
1991 "the files in question to update keyword expansions after all changes\n"
2071 "the files in question to update keyword expansions after all changes\n"
1992 "have been checked in.\n"
2072 "have been checked in.\n"
1993 "\n"
2073 "\n"
1994 "Expansions spanning more than one line and incremental expansions,\n"
2074 "Expansions spanning more than one line and incremental expansions,\n"
1995 "like CVS' $Log$, are not supported. A keyword template map\n"
2075 "like CVS' $Log$, are not supported. A keyword template map\n"
1996 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2076 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
1997 msgstr ""
2077 msgstr ""
1998
2078
1999 #, python-format
2079 #, python-format
2000 msgid "overwriting %s expanding keywords\n"
2080 msgid "overwriting %s expanding keywords\n"
2001 msgstr ""
2081 msgstr ""
2002
2082
2003 #, python-format
2083 #, python-format
2004 msgid "overwriting %s shrinking keywords\n"
2084 msgid "overwriting %s shrinking keywords\n"
2005 msgstr ""
2085 msgstr ""
2006
2086
2007 msgid "[keyword] patterns cannot match"
2087 msgid "[keyword] patterns cannot match"
2008 msgstr ""
2088 msgstr ""
2009
2089
2010 msgid "no [keyword] patterns configured"
2090 msgid "no [keyword] patterns configured"
2011 msgstr ""
2091 msgstr ""
2012
2092
2013 msgid ""
2093 msgid ""
2014 "print [keywordmaps] configuration and an expansion example\n"
2094 "print [keywordmaps] configuration and an expansion example\n"
2015 "\n"
2095 "\n"
2016 " Show current, custom, or default keyword template maps and their\n"
2096 " Show current, custom, or default keyword template maps and their\n"
2017 " expansions.\n"
2097 " expansions.\n"
2018 "\n"
2098 "\n"
2019 " Extend current configuration by specifying maps as arguments and\n"
2099 " Extend current configuration by specifying maps as arguments and\n"
2020 " optionally by reading from an additional hgrc file.\n"
2100 " optionally by reading from an additional hgrc file.\n"
2021 "\n"
2101 "\n"
2022 " Override current keyword template maps with \"default\" option.\n"
2102 " Override current keyword template maps with \"default\" option.\n"
2023 " "
2103 " "
2024 msgstr ""
2104 msgstr ""
2025
2105
2026 #, python-format
2106 #, python-format
2027 msgid ""
2107 msgid ""
2028 "\n"
2108 "\n"
2029 "\t%s\n"
2109 "\t%s\n"
2030 msgstr ""
2110 msgstr ""
2031
2111
2032 #, python-format
2112 #, python-format
2033 msgid "creating temporary repository at %s\n"
2113 msgid "creating temporary repository at %s\n"
2034 msgstr ""
2114 msgstr ""
2035
2115
2036 #, python-format
2116 #, python-format
2037 msgid ""
2117 msgid ""
2038 "\n"
2118 "\n"
2039 "%s keywords written to %s:\n"
2119 "%s keywords written to %s:\n"
2040 msgstr ""
2120 msgstr ""
2041
2121
2042 msgid "unhooked all commit hooks\n"
2122 msgid "unhooked all commit hooks\n"
2043 msgstr ""
2123 msgstr ""
2044
2124
2045 #, python-format
2125 #, python-format
2046 msgid ""
2126 msgid ""
2047 "\n"
2127 "\n"
2048 "removing temporary repository %s\n"
2128 "removing temporary repository %s\n"
2049 msgstr ""
2129 msgstr ""
2050
2130
2051 msgid ""
2131 msgid ""
2052 "expand keywords in the working directory\n"
2132 "expand keywords in the working directory\n"
2053 "\n"
2133 "\n"
2054 " Run after (re)enabling keyword expansion.\n"
2134 " Run after (re)enabling keyword expansion.\n"
2055 "\n"
2135 "\n"
2056 " kwexpand refuses to run if given files contain local changes.\n"
2136 " kwexpand refuses to run if given files contain local changes.\n"
2057 " "
2137 " "
2058 msgstr ""
2138 msgstr ""
2059
2139
2060 msgid ""
2140 msgid ""
2061 "print files currently configured for keyword expansion\n"
2141 "print files currently configured for keyword expansion\n"
2062 "\n"
2142 "\n"
2063 " Crosscheck which files in working directory are potential targets\n"
2143 " Crosscheck which files in working directory are potential targets\n"
2064 " for keyword expansion. That is, files matched by [keyword] config\n"
2144 " for keyword expansion. That is, files matched by [keyword] config\n"
2065 " patterns but not symlinks.\n"
2145 " patterns but not symlinks.\n"
2066 " "
2146 " "
2067 msgstr ""
2147 msgstr ""
2068
2148
2069 msgid ""
2149 msgid ""
2070 "revert expanded keywords in the working directory\n"
2150 "revert expanded keywords in the working directory\n"
2071 "\n"
2151 "\n"
2072 " Run before changing/disabling active keywords or if you experience\n"
2152 " Run before changing/disabling active keywords or if you experience\n"
2073 " problems with \"hg import\" or \"hg merge\".\n"
2153 " problems with \"hg import\" or \"hg merge\".\n"
2074 "\n"
2154 "\n"
2075 " kwshrink refuses to run if given files contain local changes.\n"
2155 " kwshrink refuses to run if given files contain local changes.\n"
2076 " "
2156 " "
2077 msgstr ""
2157 msgstr ""
2078
2158
2079 msgid "show default keyword template maps"
2159 msgid "show default keyword template maps"
2080 msgstr ""
2160 msgstr ""
2081
2161
2082 msgid "read maps from rcfile"
2162 msgid "read maps from rcfile"
2083 msgstr ""
2163 msgstr ""
2084
2164
2085 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2165 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2086 msgstr ""
2166 msgstr ""
2087
2167
2088 msgid "hg kwexpand [OPTION]... [FILE]..."
2168 msgid "hg kwexpand [OPTION]... [FILE]..."
2089 msgstr ""
2169 msgstr ""
2090
2170
2091 msgid "show keyword status flags of all files"
2171 msgid "show keyword status flags of all files"
2092 msgstr ""
2172 msgstr ""
2093
2173
2094 msgid "show files excluded from expansion"
2174 msgid "show files excluded from expansion"
2095 msgstr ""
2175 msgstr ""
2096
2176
2097 msgid "additionally show untracked files"
2177 msgid "additionally show untracked files"
2098 msgstr ""
2178 msgstr ""
2099
2179
2100 msgid "hg kwfiles [OPTION]... [FILE]..."
2180 msgid "hg kwfiles [OPTION]... [FILE]..."
2101 msgstr ""
2181 msgstr ""
2102
2182
2103 msgid "hg kwshrink [OPTION]... [FILE]..."
2183 msgid "hg kwshrink [OPTION]... [FILE]..."
2104 msgstr ""
2184 msgstr ""
2105
2185
2106 msgid ""
2186 msgid ""
2107 "work with a stack of patches\n"
2187 "work with a stack of patches\n"
2108 "\n"
2188 "\n"
2109 "This extension lets you work with a stack of patches in a Mercurial\n"
2189 "This extension lets you work with a stack of patches in a Mercurial\n"
2110 "repository. It manages two stacks of patches - all known patches, and\n"
2190 "repository. It manages two stacks of patches - all known patches, and\n"
2111 "applied patches (subset of known patches).\n"
2191 "applied patches (subset of known patches).\n"
2112 "\n"
2192 "\n"
2113 "Known patches are represented as patch files in the .hg/patches\n"
2193 "Known patches are represented as patch files in the .hg/patches\n"
2114 "directory. Applied patches are both patch files and changesets.\n"
2194 "directory. Applied patches are both patch files and changesets.\n"
2115 "\n"
2195 "\n"
2116 "Common tasks (use \"hg help command\" for more details):\n"
2196 "Common tasks (use \"hg help command\" for more details):\n"
2117 "\n"
2197 "\n"
2118 "prepare repository to work with patches qinit\n"
2198 "prepare repository to work with patches qinit\n"
2119 "create new patch qnew\n"
2199 "create new patch qnew\n"
2120 "import existing patch qimport\n"
2200 "import existing patch qimport\n"
2121 "\n"
2201 "\n"
2122 "print patch series qseries\n"
2202 "print patch series qseries\n"
2123 "print applied patches qapplied\n"
2203 "print applied patches qapplied\n"
2124 "print name of top applied patch qtop\n"
2204 "print name of top applied patch qtop\n"
2125 "\n"
2205 "\n"
2126 "add known patch to applied stack qpush\n"
2206 "add known patch to applied stack qpush\n"
2127 "remove patch from applied stack qpop\n"
2207 "remove patch from applied stack qpop\n"
2128 "refresh contents of top applied patch qrefresh\n"
2208 "refresh contents of top applied patch qrefresh\n"
2129 msgstr ""
2209 msgstr ""
2130
2210
2131 #, python-format
2211 #, python-format
2132 msgid "%s appears more than once in %s"
2212 msgid "%s appears more than once in %s"
2133 msgstr ""
2213 msgstr ""
2134
2214
2135 msgid "guard cannot be an empty string"
2215 msgid "guard cannot be an empty string"
2136 msgstr ""
2216 msgstr ""
2137
2217
2138 #, python-format
2218 #, python-format
2139 msgid "guard %r starts with invalid character: %r"
2219 msgid "guard %r starts with invalid character: %r"
2140 msgstr ""
2220 msgstr ""
2141
2221
2142 #, python-format
2222 #, python-format
2143 msgid "invalid character in guard %r: %r"
2223 msgid "invalid character in guard %r: %r"
2144 msgstr ""
2224 msgstr ""
2145
2225
2146 #, python-format
2226 #, python-format
2147 msgid "active guards: %s\n"
2227 msgid "active guards: %s\n"
2148 msgstr ""
2228 msgstr ""
2149
2229
2150 #, python-format
2230 #, python-format
2151 msgid "guard %r too short"
2231 msgid "guard %r too short"
2152 msgstr ""
2232 msgstr ""
2153
2233
2154 #, python-format
2234 #, python-format
2155 msgid "guard %r starts with invalid char"
2235 msgid "guard %r starts with invalid char"
2156 msgstr ""
2236 msgstr ""
2157
2237
2158 #, python-format
2238 #, python-format
2159 msgid "allowing %s - no guards in effect\n"
2239 msgid "allowing %s - no guards in effect\n"
2160 msgstr ""
2240 msgstr ""
2161
2241
2162 #, python-format
2242 #, python-format
2163 msgid "allowing %s - no matching negative guards\n"
2243 msgid "allowing %s - no matching negative guards\n"
2164 msgstr ""
2244 msgstr ""
2165
2245
2166 #, python-format
2246 #, python-format
2167 msgid "allowing %s - guarded by %r\n"
2247 msgid "allowing %s - guarded by %r\n"
2168 msgstr ""
2248 msgstr ""
2169
2249
2170 #, python-format
2250 #, python-format
2171 msgid "skipping %s - guarded by %r\n"
2251 msgid "skipping %s - guarded by %r\n"
2172 msgstr ""
2252 msgstr ""
2173
2253
2174 #, python-format
2254 #, python-format
2175 msgid "skipping %s - no matching guards\n"
2255 msgid "skipping %s - no matching guards\n"
2176 msgstr ""
2256 msgstr ""
2177
2257
2178 #, python-format
2258 #, python-format
2179 msgid "error removing undo: %s\n"
2259 msgid "error removing undo: %s\n"
2180 msgstr ""
2260 msgstr ""
2181
2261
2182 #, python-format
2262 #, python-format
2183 msgid "apply failed for patch %s"
2263 msgid "apply failed for patch %s"
2184 msgstr ""
2264 msgstr ""
2185
2265
2186 #, python-format
2266 #, python-format
2187 msgid "patch didn't work out, merging %s\n"
2267 msgid "patch didn't work out, merging %s\n"
2188 msgstr ""
2268 msgstr ""
2189
2269
2190 #, python-format
2270 #, python-format
2191 msgid "update returned %d"
2271 msgid "update returned %d"
2192 msgstr ""
2272 msgstr ""
2193
2273
2194 msgid "repo commit failed"
2274 msgid "repo commit failed"
2195 msgstr ""
2275 msgstr ""
2196
2276
2197 #, python-format
2277 #, python-format
2198 msgid "unable to read %s"
2278 msgid "unable to read %s"
2199 msgstr ""
2279 msgstr ""
2200
2280
2201 #, python-format
2281 #, python-format
2202 msgid "patch %s does not exist\n"
2282 msgid "patch %s does not exist\n"
2203 msgstr ""
2283 msgstr ""
2204
2284
2205 #, python-format
2285 #, python-format
2206 msgid "patch %s is not applied\n"
2286 msgid "patch %s is not applied\n"
2207 msgstr ""
2287 msgstr ""
2208
2288
2209 msgid "patch failed, unable to continue (try -v)\n"
2289 msgid "patch failed, unable to continue (try -v)\n"
2210 msgstr ""
2290 msgstr ""
2211
2291
2212 #, python-format
2292 #, python-format
2213 msgid "applying %s\n"
2293 msgid "applying %s\n"
2214 msgstr ""
2294 msgstr ""
2215
2295
2216 #, python-format
2296 #, python-format
2217 msgid "unable to read %s\n"
2297 msgid "unable to read %s\n"
2218 msgstr ""
2298 msgstr ""
2219
2299
2220 #, python-format
2300 #, python-format
2221 msgid "imported patch %s\n"
2301 msgid "imported patch %s\n"
2222 msgstr ""
2302 msgstr ""
2223
2303
2224 #, python-format
2304 #, python-format
2225 msgid ""
2305 msgid ""
2226 "\n"
2306 "\n"
2227 "imported patch %s"
2307 "imported patch %s"
2228 msgstr ""
2308 msgstr ""
2229
2309
2230 #, python-format
2310 #, python-format
2231 msgid "patch %s is empty\n"
2311 msgid "patch %s is empty\n"
2232 msgstr ""
2312 msgstr ""
2233
2313
2234 msgid "patch failed, rejects left in working dir\n"
2314 msgid "patch failed, rejects left in working dir\n"
2235 msgstr ""
2315 msgstr ""
2236
2316
2237 msgid "fuzz found when applying patch, stopping\n"
2317 msgid "fuzz found when applying patch, stopping\n"
2238 msgstr ""
2318 msgstr ""
2239
2319
2240 #, python-format
2320 #, python-format
2241 msgid "revision %d is not managed"
2321 msgid "revision %d is not managed"
2242 msgstr ""
2322 msgstr ""
2243
2323
2244 #, python-format
2324 #, python-format
2245 msgid "cannot delete revision %d above applied patches"
2325 msgid "cannot delete revision %d above applied patches"
2246 msgstr ""
2326 msgstr ""
2247
2327
2248 #, python-format
2328 #, python-format
2249 msgid "patch %s finalized without changeset message\n"
2329 msgid "patch %s finalized without changeset message\n"
2250 msgstr ""
2330 msgstr ""
2251
2331
2252 msgid "qdelete requires at least one revision or patch name"
2332 msgid "qdelete requires at least one revision or patch name"
2253 msgstr ""
2333 msgstr ""
2254
2334
2255 #, python-format
2335 #, python-format
2256 msgid "cannot delete applied patch %s"
2336 msgid "cannot delete applied patch %s"
2257 msgstr ""
2337 msgstr ""
2258
2338
2259 #, python-format
2339 #, python-format
2260 msgid "patch %s not in series file"
2340 msgid "patch %s not in series file"
2261 msgstr ""
2341 msgstr ""
2262
2342
2263 msgid "no patches applied"
2343 msgid "no patches applied"
2264 msgstr ""
2344 msgstr ""
2265
2345
2266 msgid "working directory revision is not qtip"
2346 msgid "working directory revision is not qtip"
2267 msgstr ""
2347 msgstr ""
2268
2348
2269 msgid "local changes found, refresh first"
2349 msgid "local changes found, refresh first"
2270 msgstr ""
2350 msgstr ""
2271
2351
2272 msgid "local changes found"
2352 msgid "local changes found"
2273 msgstr ""
2353 msgstr ""
2274
2354
2275 #, python-format
2355 #, python-format
2276 msgid "\"%s\" cannot be used as the name of a patch"
2356 msgid "\"%s\" cannot be used as the name of a patch"
2277 msgstr ""
2357 msgstr ""
2278
2358
2279 #, python-format
2359 #, python-format
2280 msgid "patch \"%s\" already exists"
2360 msgid "patch \"%s\" already exists"
2281 msgstr ""
2361 msgstr ""
2282
2362
2283 #, python-format
2363 #, python-format
2284 msgid "error unlinking %s\n"
2364 msgid "error unlinking %s\n"
2285 msgstr ""
2365 msgstr ""
2286
2366
2287 #, python-format
2367 #, python-format
2288 msgid "patch name \"%s\" is ambiguous:\n"
2368 msgid "patch name \"%s\" is ambiguous:\n"
2289 msgstr ""
2369 msgstr ""
2290
2370
2291 #, python-format
2371 #, python-format
2292 msgid "patch %s not in series"
2372 msgid "patch %s not in series"
2293 msgstr ""
2373 msgstr ""
2294
2374
2295 msgid "(working directory not at a head)\n"
2375 msgid "(working directory not at a head)\n"
2296 msgstr ""
2376 msgstr ""
2297
2377
2298 msgid "no patches in series\n"
2378 msgid "no patches in series\n"
2299 msgstr ""
2379 msgstr ""
2300
2380
2301 #, python-format
2381 #, python-format
2302 msgid "cannot push to a previous patch: %s"
2382 msgid "cannot push to a previous patch: %s"
2303 msgstr ""
2383 msgstr ""
2304
2384
2305 #, python-format
2385 #, python-format
2306 msgid "qpush: %s is already at the top\n"
2386 msgid "qpush: %s is already at the top\n"
2307 msgstr ""
2387 msgstr ""
2308
2388
2309 #, python-format
2389 #, python-format
2310 msgid "guarded by %r"
2390 msgid "guarded by %r"
2311 msgstr ""
2391 msgstr ""
2312
2392
2313 msgid "no matching guards"
2393 msgid "no matching guards"
2314 msgstr ""
2394 msgstr ""
2315
2395
2316 #, python-format
2396 #, python-format
2317 msgid "cannot push '%s' - %s\n"
2397 msgid "cannot push '%s' - %s\n"
2318 msgstr ""
2398 msgstr ""
2319
2399
2320 msgid "all patches are currently applied\n"
2400 msgid "all patches are currently applied\n"
2321 msgstr ""
2401 msgstr ""
2322
2402
2323 msgid "patch series already fully applied\n"
2403 msgid "patch series already fully applied\n"
2324 msgstr ""
2404 msgstr ""
2325
2405
2326 msgid "cleaning up working directory..."
2406 msgid "cleaning up working directory..."
2327 msgstr ""
2407 msgstr ""
2328
2408
2329 #, python-format
2409 #, python-format
2330 msgid "errors during apply, please fix and refresh %s\n"
2410 msgid "errors during apply, please fix and refresh %s\n"
2331 msgstr ""
2411 msgstr ""
2332
2412
2333 #, python-format
2413 #, python-format
2334 msgid "now at: %s\n"
2414 msgid "now at: %s\n"
2335 msgstr ""
2415 msgstr ""
2336
2416
2337 #, python-format
2417 #, python-format
2338 msgid "patch %s is not applied"
2418 msgid "patch %s is not applied"
2339 msgstr ""
2419 msgstr ""
2340
2420
2341 msgid "no patches applied\n"
2421 msgid "no patches applied\n"
2342 msgstr ""
2422 msgstr ""
2343
2423
2344 #, python-format
2424 #, python-format
2345 msgid "qpop: %s is already at the top\n"
2425 msgid "qpop: %s is already at the top\n"
2346 msgstr ""
2426 msgstr ""
2347
2427
2348 msgid "qpop: forcing dirstate update\n"
2428 msgid "qpop: forcing dirstate update\n"
2349 msgstr ""
2429 msgstr ""
2350
2430
2351 #, python-format
2431 #, python-format
2352 msgid "trying to pop unknown node %s"
2432 msgid "trying to pop unknown node %s"
2353 msgstr ""
2433 msgstr ""
2354
2434
2355 msgid "popping would remove a revision not managed by this patch queue"
2435 msgid "popping would remove a revision not managed by this patch queue"
2356 msgstr ""
2436 msgstr ""
2357
2437
2358 msgid "deletions found between repo revs"
2438 msgid "deletions found between repo revs"
2359 msgstr ""
2439 msgstr ""
2360
2440
2361 msgid "patch queue now empty\n"
2441 msgid "patch queue now empty\n"
2362 msgstr ""
2442 msgstr ""
2363
2443
2364 msgid "cannot refresh a revision with children"
2444 msgid "cannot refresh a revision with children"
2365 msgstr ""
2445 msgstr ""
2366
2446
2367 msgid ""
2447 msgid ""
2368 "refresh interrupted while patch was popped! (revert --all, qpush to "
2448 "refresh interrupted while patch was popped! (revert --all, qpush to "
2369 "recover)\n"
2449 "recover)\n"
2370 msgstr ""
2450 msgstr ""
2371
2451
2372 msgid "patch queue directory already exists"
2452 msgid "patch queue directory already exists"
2373 msgstr ""
2453 msgstr ""
2374
2454
2375 #, python-format
2455 #, python-format
2376 msgid "patch %s is not in series file"
2456 msgid "patch %s is not in series file"
2377 msgstr ""
2457 msgstr ""
2378
2458
2379 msgid "No saved patch data found\n"
2459 msgid "No saved patch data found\n"
2380 msgstr ""
2460 msgstr ""
2381
2461
2382 #, python-format
2462 #, python-format
2383 msgid "restoring status: %s\n"
2463 msgid "restoring status: %s\n"
2384 msgstr ""
2464 msgstr ""
2385
2465
2386 msgid "save entry has children, leaving it alone\n"
2466 msgid "save entry has children, leaving it alone\n"
2387 msgstr ""
2467 msgstr ""
2388
2468
2389 #, python-format
2469 #, python-format
2390 msgid "removing save entry %s\n"
2470 msgid "removing save entry %s\n"
2391 msgstr ""
2471 msgstr ""
2392
2472
2393 #, python-format
2473 #, python-format
2394 msgid "saved queue repository parents: %s %s\n"
2474 msgid "saved queue repository parents: %s %s\n"
2395 msgstr ""
2475 msgstr ""
2396
2476
2397 msgid "queue directory updating\n"
2477 msgid "queue directory updating\n"
2398 msgstr ""
2478 msgstr ""
2399
2479
2400 msgid "Unable to load queue repository\n"
2480 msgid "Unable to load queue repository\n"
2401 msgstr ""
2481 msgstr ""
2402
2482
2403 msgid "save: no patches applied, exiting\n"
2483 msgid "save: no patches applied, exiting\n"
2404 msgstr ""
2484 msgstr ""
2405
2485
2406 msgid "status is already saved\n"
2486 msgid "status is already saved\n"
2407 msgstr ""
2487 msgstr ""
2408
2488
2409 msgid "hg patches saved state"
2489 msgid "hg patches saved state"
2410 msgstr ""
2490 msgstr ""
2411
2491
2412 msgid "repo commit failed\n"
2492 msgid "repo commit failed\n"
2413 msgstr ""
2493 msgstr ""
2414
2494
2415 #, python-format
2495 #, python-format
2416 msgid "patch %s is already in the series file"
2496 msgid "patch %s is already in the series file"
2417 msgstr ""
2497 msgstr ""
2418
2498
2419 msgid "option \"-r\" not valid when importing files"
2499 msgid "option \"-r\" not valid when importing files"
2420 msgstr ""
2500 msgstr ""
2421
2501
2422 msgid "option \"-n\" not valid when importing multiple patches"
2502 msgid "option \"-n\" not valid when importing multiple patches"
2423 msgstr ""
2503 msgstr ""
2424
2504
2425 #, python-format
2505 #, python-format
2426 msgid "revision %d is the root of more than one branch"
2506 msgid "revision %d is the root of more than one branch"
2427 msgstr ""
2507 msgstr ""
2428
2508
2429 #, python-format
2509 #, python-format
2430 msgid "revision %d is already managed"
2510 msgid "revision %d is already managed"
2431 msgstr ""
2511 msgstr ""
2432
2512
2433 #, python-format
2513 #, python-format
2434 msgid "revision %d is not the parent of the queue"
2514 msgid "revision %d is not the parent of the queue"
2435 msgstr ""
2515 msgstr ""
2436
2516
2437 #, python-format
2517 #, python-format
2438 msgid "revision %d has unmanaged children"
2518 msgid "revision %d has unmanaged children"
2439 msgstr ""
2519 msgstr ""
2440
2520
2441 #, python-format
2521 #, python-format
2442 msgid "cannot import merge revision %d"
2522 msgid "cannot import merge revision %d"
2443 msgstr ""
2523 msgstr ""
2444
2524
2445 #, python-format
2525 #, python-format
2446 msgid "revision %d is not the parent of %d"
2526 msgid "revision %d is not the parent of %d"
2447 msgstr ""
2527 msgstr ""
2448
2528
2449 msgid "-e is incompatible with import from -"
2529 msgid "-e is incompatible with import from -"
2450 msgstr ""
2530 msgstr ""
2451
2531
2452 #, python-format
2532 #, python-format
2453 msgid "patch %s does not exist"
2533 msgid "patch %s does not exist"
2454 msgstr ""
2534 msgstr ""
2455
2535
2456 msgid "need --name to import a patch from -"
2536 msgid "need --name to import a patch from -"
2457 msgstr ""
2537 msgstr ""
2458
2538
2459 #, python-format
2539 #, python-format
2460 msgid "adding %s to series file\n"
2540 msgid "adding %s to series file\n"
2461 msgstr ""
2541 msgstr ""
2462
2542
2463 msgid ""
2543 msgid ""
2464 "remove patches from queue\n"
2544 "remove patches from queue\n"
2465 "\n"
2545 "\n"
2466 " The patches must not be applied, and at least one patch is\n"
2546 " The patches must not be applied, and at least one patch is\n"
2467 " required.\n"
2547 " required.\n"
2468 "\n"
2548 "\n"
2469 " With -k/--keep, the patch files are preserved in the patch\n"
2549 " With -k/--keep, the patch files are preserved in the patch\n"
2470 " directory.\n"
2550 " directory.\n"
2471 "\n"
2551 "\n"
2472 " To stop managing a patch and move it into permanent history,\n"
2552 " To stop managing a patch and move it into permanent history,\n"
2473 " use the qfinish command."
2553 " use the qfinish command."
2474 msgstr ""
2554 msgstr ""
2475
2555
2476 msgid "print the patches already applied"
2556 msgid "print the patches already applied"
2477 msgstr ""
2557 msgstr ""
2478
2558
2479 msgid "print the patches not yet applied"
2559 msgid "print the patches not yet applied"
2480 msgstr ""
2560 msgstr ""
2481
2561
2482 msgid ""
2562 msgid ""
2483 "import a patch\n"
2563 "import a patch\n"
2484 "\n"
2564 "\n"
2485 " The patch is inserted into the series after the last applied\n"
2565 " The patch is inserted into the series after the last applied\n"
2486 " patch. If no patches have been applied, qimport prepends the patch\n"
2566 " patch. If no patches have been applied, qimport prepends the patch\n"
2487 " to the series.\n"
2567 " to the series.\n"
2488 "\n"
2568 "\n"
2489 " The patch will have the same name as its source file unless you\n"
2569 " The patch will have the same name as its source file unless you\n"
2490 " give it a new one with -n/--name.\n"
2570 " give it a new one with -n/--name.\n"
2491 "\n"
2571 "\n"
2492 " You can register an existing patch inside the patch directory with\n"
2572 " You can register an existing patch inside the patch directory with\n"
2493 " the -e/--existing flag.\n"
2573 " the -e/--existing flag.\n"
2494 "\n"
2574 "\n"
2495 " With -f/--force, an existing patch of the same name will be\n"
2575 " With -f/--force, an existing patch of the same name will be\n"
2496 " overwritten.\n"
2576 " overwritten.\n"
2497 "\n"
2577 "\n"
2498 " An existing changeset may be placed under mq control with -r/--rev\n"
2578 " An existing changeset may be placed under mq control with -r/--rev\n"
2499 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2579 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2500 " With -g/--git, patches imported with --rev will use the git diff\n"
2580 " With -g/--git, patches imported with --rev will use the git diff\n"
2501 " format. See the diffs help topic for information on why this is\n"
2581 " format. See the diffs help topic for information on why this is\n"
2502 " important for preserving rename/copy information and permission\n"
2582 " important for preserving rename/copy information and permission\n"
2503 " changes.\n"
2583 " changes.\n"
2504 "\n"
2584 "\n"
2505 " To import a patch from standard input, pass - as the patch file.\n"
2585 " To import a patch from standard input, pass - as the patch file.\n"
2506 " When importing from standard input, a patch name must be specified\n"
2586 " When importing from standard input, a patch name must be specified\n"
2507 " using the --name flag.\n"
2587 " using the --name flag.\n"
2508 " "
2588 " "
2509 msgstr ""
2589 msgstr ""
2510
2590
2511 msgid ""
2591 msgid ""
2512 "init a new queue repository\n"
2592 "init a new queue repository\n"
2513 "\n"
2593 "\n"
2514 " The queue repository is unversioned by default. If\n"
2594 " The queue repository is unversioned by default. If\n"
2515 " -c/--create-repo is specified, qinit will create a separate nested\n"
2595 " -c/--create-repo is specified, qinit will create a separate nested\n"
2516 " repository for patches (qinit -c may also be run later to convert\n"
2596 " repository for patches (qinit -c may also be run later to convert\n"
2517 " an unversioned patch repository into a versioned one). You can use\n"
2597 " an unversioned patch repository into a versioned one). You can use\n"
2518 " qcommit to commit changes to this queue repository."
2598 " qcommit to commit changes to this queue repository."
2519 msgstr ""
2599 msgstr ""
2520
2600
2521 msgid ""
2601 msgid ""
2522 "clone main and patch repository at same time\n"
2602 "clone main and patch repository at same time\n"
2523 "\n"
2603 "\n"
2524 " If source is local, destination will have no patches applied. If\n"
2604 " If source is local, destination will have no patches applied. If\n"
2525 " source is remote, this command can not check if patches are\n"
2605 " source is remote, this command can not check if patches are\n"
2526 " applied in source, so cannot guarantee that patches are not\n"
2606 " applied in source, so cannot guarantee that patches are not\n"
2527 " applied in destination. If you clone remote repository, be sure\n"
2607 " applied in destination. If you clone remote repository, be sure\n"
2528 " before that it has no patches applied.\n"
2608 " before that it has no patches applied.\n"
2529 "\n"
2609 "\n"
2530 " Source patch repository is looked for in <src>/.hg/patches by\n"
2610 " Source patch repository is looked for in <src>/.hg/patches by\n"
2531 " default. Use -p <url> to change.\n"
2611 " default. Use -p <url> to change.\n"
2532 "\n"
2612 "\n"
2533 " The patch directory must be a nested Mercurial repository, as\n"
2613 " The patch directory must be a nested Mercurial repository, as\n"
2534 " would be created by qinit -c.\n"
2614 " would be created by qinit -c.\n"
2535 " "
2615 " "
2536 msgstr ""
2616 msgstr ""
2537
2617
2538 msgid "versioned patch repository not found (see qinit -c)"
2618 msgid "versioned patch repository not found (see qinit -c)"
2539 msgstr ""
2619 msgstr ""
2540
2620
2541 msgid "cloning main repository\n"
2621 msgid "cloning main repository\n"
2542 msgstr ""
2622 msgstr ""
2543
2623
2544 msgid "cloning patch repository\n"
2624 msgid "cloning patch repository\n"
2545 msgstr ""
2625 msgstr ""
2546
2626
2547 msgid "stripping applied patches from destination repository\n"
2627 msgid "stripping applied patches from destination repository\n"
2548 msgstr ""
2628 msgstr ""
2549
2629
2550 msgid "updating destination repository\n"
2630 msgid "updating destination repository\n"
2551 msgstr ""
2631 msgstr ""
2552
2632
2553 msgid "commit changes in the queue repository"
2633 msgid "commit changes in the queue repository"
2554 msgstr ""
2634 msgstr ""
2555
2635
2556 msgid "print the entire series file"
2636 msgid "print the entire series file"
2557 msgstr ""
2637 msgstr ""
2558
2638
2559 msgid "print the name of the current patch"
2639 msgid "print the name of the current patch"
2560 msgstr ""
2640 msgstr ""
2561
2641
2562 msgid "print the name of the next patch"
2642 msgid "print the name of the next patch"
2563 msgstr ""
2643 msgstr ""
2564
2644
2565 msgid "all patches applied\n"
2645 msgid "all patches applied\n"
2566 msgstr ""
2646 msgstr ""
2567
2647
2568 msgid "print the name of the previous patch"
2648 msgid "print the name of the previous patch"
2569 msgstr ""
2649 msgstr ""
2570
2650
2571 msgid "only one patch applied\n"
2651 msgid "only one patch applied\n"
2572 msgstr ""
2652 msgstr ""
2573
2653
2574 msgid ""
2654 msgid ""
2575 "create a new patch\n"
2655 "create a new patch\n"
2576 "\n"
2656 "\n"
2577 " qnew creates a new patch on top of the currently-applied patch (if\n"
2657 " qnew creates a new patch on top of the currently-applied patch (if\n"
2578 " any). It will refuse to run if there are any outstanding changes\n"
2658 " any). It will refuse to run if there are any outstanding changes\n"
2579 " unless -f/--force is specified, in which case the patch will be\n"
2659 " unless -f/--force is specified, in which case the patch will be\n"
2580 " initialized with them. You may also use -I/--include,\n"
2660 " initialized with them. You may also use -I/--include,\n"
2581 " -X/--exclude, and/or a list of files after the patch name to add\n"
2661 " -X/--exclude, and/or a list of files after the patch name to add\n"
2582 " only changes to matching files to the new patch, leaving the rest\n"
2662 " only changes to matching files to the new patch, leaving the rest\n"
2583 " as uncommitted modifications.\n"
2663 " as uncommitted modifications.\n"
2584 "\n"
2664 "\n"
2585 " -u/--user and -d/--date can be used to set the (given) user and\n"
2665 " -u/--user and -d/--date can be used to set the (given) user and\n"
2586 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2666 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2587 " to current user and date to current date.\n"
2667 " to current user and date to current date.\n"
2588 "\n"
2668 "\n"
2589 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2669 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2590 " well as the commit message. If none is specified, the header is\n"
2670 " well as the commit message. If none is specified, the header is\n"
2591 " empty and the commit message is '[mq]: PATCH'.\n"
2671 " empty and the commit message is '[mq]: PATCH'.\n"
2592 "\n"
2672 "\n"
2593 " Use the -g/--git option to keep the patch in the git extended diff\n"
2673 " Use the -g/--git option to keep the patch in the git extended diff\n"
2594 " format. Read the diffs help topic for more information on why this\n"
2674 " format. Read the diffs help topic for more information on why this\n"
2595 " is important for preserving permission changes and copy/rename\n"
2675 " is important for preserving permission changes and copy/rename\n"
2596 " information.\n"
2676 " information.\n"
2597 " "
2677 " "
2598 msgstr ""
2678 msgstr ""
2599
2679
2600 msgid ""
2680 msgid ""
2601 "update the current patch\n"
2681 "update the current patch\n"
2602 "\n"
2682 "\n"
2603 " If any file patterns are provided, the refreshed patch will\n"
2683 " If any file patterns are provided, the refreshed patch will\n"
2604 " contain only the modifications that match those patterns; the\n"
2684 " contain only the modifications that match those patterns; the\n"
2605 " remaining modifications will remain in the working directory.\n"
2685 " remaining modifications will remain in the working directory.\n"
2606 "\n"
2686 "\n"
2607 " If -s/--short is specified, files currently included in the patch\n"
2687 " If -s/--short is specified, files currently included in the patch\n"
2608 " will be refreshed just like matched files and remain in the patch.\n"
2688 " will be refreshed just like matched files and remain in the patch.\n"
2609 "\n"
2689 "\n"
2610 " hg add/remove/copy/rename work as usual, though you might want to\n"
2690 " hg add/remove/copy/rename work as usual, though you might want to\n"
2611 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2691 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2612 " and renames. See the diffs help topic for more information on the\n"
2692 " and renames. See the diffs help topic for more information on the\n"
2613 " git diff format.\n"
2693 " git diff format.\n"
2614 " "
2694 " "
2615 msgstr ""
2695 msgstr ""
2616
2696
2617 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2697 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2618 msgstr ""
2698 msgstr ""
2619
2699
2620 msgid ""
2700 msgid ""
2621 "diff of the current patch and subsequent modifications\n"
2701 "diff of the current patch and subsequent modifications\n"
2622 "\n"
2702 "\n"
2623 " Shows a diff which includes the current patch as well as any\n"
2703 " Shows a diff which includes the current patch as well as any\n"
2624 " changes which have been made in the working directory since the\n"
2704 " changes which have been made in the working directory since the\n"
2625 " last refresh (thus showing what the current patch would become\n"
2705 " last refresh (thus showing what the current patch would become\n"
2626 " after a qrefresh).\n"
2706 " after a qrefresh).\n"
2627 "\n"
2707 "\n"
2628 " Use 'hg diff' if you only want to see the changes made since the\n"
2708 " Use 'hg diff' if you only want to see the changes made since the\n"
2629 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2709 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2630 " by the current patch without including changes made since the\n"
2710 " by the current patch without including changes made since the\n"
2631 " qrefresh.\n"
2711 " qrefresh.\n"
2632 " "
2712 " "
2633 msgstr ""
2713 msgstr ""
2634
2714
2635 msgid ""
2715 msgid ""
2636 "fold the named patches into the current patch\n"
2716 "fold the named patches into the current patch\n"
2637 "\n"
2717 "\n"
2638 " Patches must not yet be applied. Each patch will be successively\n"
2718 " Patches must not yet be applied. Each patch will be successively\n"
2639 " applied to the current patch in the order given. If all the\n"
2719 " applied to the current patch in the order given. If all the\n"
2640 " patches apply successfully, the current patch will be refreshed\n"
2720 " patches apply successfully, the current patch will be refreshed\n"
2641 " with the new cumulative patch, and the folded patches will be\n"
2721 " with the new cumulative patch, and the folded patches will be\n"
2642 " deleted. With -k/--keep, the folded patch files will not be\n"
2722 " deleted. With -k/--keep, the folded patch files will not be\n"
2643 " removed afterwards.\n"
2723 " removed afterwards.\n"
2644 "\n"
2724 "\n"
2645 " The header for each folded patch will be concatenated with the\n"
2725 " The header for each folded patch will be concatenated with the\n"
2646 " current patch header, separated by a line of '* * *'."
2726 " current patch header, separated by a line of '* * *'."
2647 msgstr ""
2727 msgstr ""
2648
2728
2649 msgid "qfold requires at least one patch name"
2729 msgid "qfold requires at least one patch name"
2650 msgstr ""
2730 msgstr ""
2651
2731
2652 msgid "No patches applied"
2732 msgid "No patches applied"
2653 msgstr ""
2733 msgstr ""
2654
2734
2655 #, python-format
2735 #, python-format
2656 msgid "Skipping already folded patch %s"
2736 msgid "Skipping already folded patch %s"
2657 msgstr ""
2737 msgstr ""
2658
2738
2659 #, python-format
2739 #, python-format
2660 msgid "qfold cannot fold already applied patch %s"
2740 msgid "qfold cannot fold already applied patch %s"
2661 msgstr ""
2741 msgstr ""
2662
2742
2663 #, python-format
2743 #, python-format
2664 msgid "Error folding patch %s"
2744 msgid "Error folding patch %s"
2665 msgstr ""
2745 msgstr ""
2666
2746
2667 msgid "push or pop patches until named patch is at top of stack"
2747 msgid "push or pop patches until named patch is at top of stack"
2668 msgstr ""
2748 msgstr ""
2669
2749
2670 msgid ""
2750 msgid ""
2671 "set or print guards for a patch\n"
2751 "set or print guards for a patch\n"
2672 "\n"
2752 "\n"
2673 " Guards control whether a patch can be pushed. A patch with no\n"
2753 " Guards control whether a patch can be pushed. A patch with no\n"
2674 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2754 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2675 " pushed only if the qselect command has activated it. A patch with\n"
2755 " pushed only if the qselect command has activated it. A patch with\n"
2676 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2756 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2677 " has activated it.\n"
2757 " has activated it.\n"
2678 "\n"
2758 "\n"
2679 " With no arguments, print the currently active guards.\n"
2759 " With no arguments, print the currently active guards.\n"
2680 " With arguments, set guards for the named patch.\n"
2760 " With arguments, set guards for the named patch.\n"
2681 " NOTE: Specifying negative guards now requires '--'.\n"
2761 " NOTE: Specifying negative guards now requires '--'.\n"
2682 "\n"
2762 "\n"
2683 " To set guards on another patch:\n"
2763 " To set guards on another patch:\n"
2684 " hg qguard -- other.patch +2.6.17 -stable\n"
2764 " hg qguard -- other.patch +2.6.17 -stable\n"
2685 " "
2765 " "
2686 msgstr ""
2766 msgstr ""
2687
2767
2688 msgid "cannot mix -l/--list with options or arguments"
2768 msgid "cannot mix -l/--list with options or arguments"
2689 msgstr ""
2769 msgstr ""
2690
2770
2691 msgid "no patch to work with"
2771 msgid "no patch to work with"
2692 msgstr ""
2772 msgstr ""
2693
2773
2694 #, python-format
2774 #, python-format
2695 msgid "no patch named %s"
2775 msgid "no patch named %s"
2696 msgstr ""
2776 msgstr ""
2697
2777
2698 msgid "print the header of the topmost or specified patch"
2778 msgid "print the header of the topmost or specified patch"
2699 msgstr ""
2779 msgstr ""
2700
2780
2701 msgid ""
2781 msgid ""
2702 "push the next patch onto the stack\n"
2782 "push the next patch onto the stack\n"
2703 "\n"
2783 "\n"
2704 " When -f/--force is applied, all local changes in patched files\n"
2784 " When -f/--force is applied, all local changes in patched files\n"
2705 " will be lost.\n"
2785 " will be lost.\n"
2706 " "
2786 " "
2707 msgstr ""
2787 msgstr ""
2708
2788
2709 msgid "no saved queues found, please use -n\n"
2789 msgid "no saved queues found, please use -n\n"
2710 msgstr ""
2790 msgstr ""
2711
2791
2712 #, python-format
2792 #, python-format
2713 msgid "merging with queue at: %s\n"
2793 msgid "merging with queue at: %s\n"
2714 msgstr ""
2794 msgstr ""
2715
2795
2716 msgid ""
2796 msgid ""
2717 "pop the current patch off the stack\n"
2797 "pop the current patch off the stack\n"
2718 "\n"
2798 "\n"
2719 " By default, pops off the top of the patch stack. If given a patch\n"
2799 " By default, pops off the top of the patch stack. If given a patch\n"
2720 " name, keeps popping off patches until the named patch is at the\n"
2800 " name, keeps popping off patches until the named patch is at the\n"
2721 " top of the stack.\n"
2801 " top of the stack.\n"
2722 " "
2802 " "
2723 msgstr ""
2803 msgstr ""
2724
2804
2725 #, python-format
2805 #, python-format
2726 msgid "using patch queue: %s\n"
2806 msgid "using patch queue: %s\n"
2727 msgstr ""
2807 msgstr ""
2728
2808
2729 msgid ""
2809 msgid ""
2730 "rename a patch\n"
2810 "rename a patch\n"
2731 "\n"
2811 "\n"
2732 " With one argument, renames the current patch to PATCH1.\n"
2812 " With one argument, renames the current patch to PATCH1.\n"
2733 " With two arguments, renames PATCH1 to PATCH2."
2813 " With two arguments, renames PATCH1 to PATCH2."
2734 msgstr ""
2814 msgstr ""
2735
2815
2736 #, python-format
2816 #, python-format
2737 msgid "%s already exists"
2817 msgid "%s already exists"
2738 msgstr ""
2818 msgstr ""
2739
2819
2740 #, python-format
2820 #, python-format
2741 msgid "A patch named %s already exists in the series file"
2821 msgid "A patch named %s already exists in the series file"
2742 msgstr ""
2822 msgstr ""
2743
2823
2744 msgid "restore the queue state saved by a revision"
2824 msgid "restore the queue state saved by a revision"
2745 msgstr ""
2825 msgstr ""
2746
2826
2747 msgid "save current queue state"
2827 msgid "save current queue state"
2748 msgstr ""
2828 msgstr ""
2749
2829
2750 #, python-format
2830 #, python-format
2751 msgid "destination %s exists and is not a directory"
2831 msgid "destination %s exists and is not a directory"
2752 msgstr ""
2832 msgstr ""
2753
2833
2754 #, python-format
2834 #, python-format
2755 msgid "destination %s exists, use -f to force"
2835 msgid "destination %s exists, use -f to force"
2756 msgstr ""
2836 msgstr ""
2757
2837
2758 #, python-format
2838 #, python-format
2759 msgid "copy %s to %s\n"
2839 msgid "copy %s to %s\n"
2760 msgstr ""
2840 msgstr ""
2761
2841
2762 msgid ""
2842 msgid ""
2763 "strip a revision and all its descendants from the repository\n"
2843 "strip a revision and all its descendants from the repository\n"
2764 "\n"
2844 "\n"
2765 " If one of the working directory's parent revisions is stripped, the\n"
2845 " If one of the working directory's parent revisions is stripped, the\n"
2766 " working directory will be updated to the parent of the stripped\n"
2846 " working directory will be updated to the parent of the stripped\n"
2767 " revision.\n"
2847 " revision.\n"
2768 " "
2848 " "
2769 msgstr ""
2849 msgstr ""
2770
2850
2771 msgid ""
2851 msgid ""
2772 "set or print guarded patches to push\n"
2852 "set or print guarded patches to push\n"
2773 "\n"
2853 "\n"
2774 " Use the qguard command to set or print guards on patch, then use\n"
2854 " Use the qguard command to set or print guards on patch, then use\n"
2775 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2855 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2776 " it has no guards or any positive guards match the currently\n"
2856 " it has no guards or any positive guards match the currently\n"
2777 " selected guard, but will not be pushed if any negative guards\n"
2857 " selected guard, but will not be pushed if any negative guards\n"
2778 " match the current guard. For example:\n"
2858 " match the current guard. For example:\n"
2779 "\n"
2859 "\n"
2780 " qguard foo.patch -stable (negative guard)\n"
2860 " qguard foo.patch -stable (negative guard)\n"
2781 " qguard bar.patch +stable (positive guard)\n"
2861 " qguard bar.patch +stable (positive guard)\n"
2782 " qselect stable\n"
2862 " qselect stable\n"
2783 "\n"
2863 "\n"
2784 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2864 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2785 " it has a negative match) but push bar.patch (because it has a\n"
2865 " it has a negative match) but push bar.patch (because it has a\n"
2786 " positive match).\n"
2866 " positive match).\n"
2787 "\n"
2867 "\n"
2788 " With no arguments, prints the currently active guards.\n"
2868 " With no arguments, prints the currently active guards.\n"
2789 " With one argument, sets the active guard.\n"
2869 " With one argument, sets the active guard.\n"
2790 "\n"
2870 "\n"
2791 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2871 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2792 " When no guards are active, patches with positive guards are\n"
2872 " When no guards are active, patches with positive guards are\n"
2793 " skipped and patches with negative guards are pushed.\n"
2873 " skipped and patches with negative guards are pushed.\n"
2794 "\n"
2874 "\n"
2795 " qselect can change the guards on applied patches. It does not pop\n"
2875 " qselect can change the guards on applied patches. It does not pop\n"
2796 " guarded patches by default. Use --pop to pop back to the last\n"
2876 " guarded patches by default. Use --pop to pop back to the last\n"
2797 " applied patch that is not guarded. Use --reapply (which implies\n"
2877 " applied patch that is not guarded. Use --reapply (which implies\n"
2798 " --pop) to push back to the current patch afterwards, but skip\n"
2878 " --pop) to push back to the current patch afterwards, but skip\n"
2799 " guarded patches.\n"
2879 " guarded patches.\n"
2800 "\n"
2880 "\n"
2801 " Use -s/--series to print a list of all guards in the series file\n"
2881 " Use -s/--series to print a list of all guards in the series file\n"
2802 " (no other arguments needed). Use -v for more information."
2882 " (no other arguments needed). Use -v for more information."
2803 msgstr ""
2883 msgstr ""
2804
2884
2805 msgid "guards deactivated\n"
2885 msgid "guards deactivated\n"
2806 msgstr ""
2886 msgstr ""
2807
2887
2808 #, python-format
2888 #, python-format
2809 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
2889 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
2810 msgstr ""
2890 msgstr ""
2811
2891
2812 #, python-format
2892 #, python-format
2813 msgid "number of guarded, applied patches has changed from %d to %d\n"
2893 msgid "number of guarded, applied patches has changed from %d to %d\n"
2814 msgstr ""
2894 msgstr ""
2815
2895
2816 msgid "guards in series file:\n"
2896 msgid "guards in series file:\n"
2817 msgstr ""
2897 msgstr ""
2818
2898
2819 msgid "no guards in series file\n"
2899 msgid "no guards in series file\n"
2820 msgstr ""
2900 msgstr ""
2821
2901
2822 msgid "active guards:\n"
2902 msgid "active guards:\n"
2823 msgstr ""
2903 msgstr ""
2824
2904
2825 msgid "no active guards\n"
2905 msgid "no active guards\n"
2826 msgstr ""
2906 msgstr ""
2827
2907
2828 msgid "popping guarded patches\n"
2908 msgid "popping guarded patches\n"
2829 msgstr ""
2909 msgstr ""
2830
2910
2831 msgid "reapplying unguarded patches\n"
2911 msgid "reapplying unguarded patches\n"
2832 msgstr ""
2912 msgstr ""
2833
2913
2834 msgid ""
2914 msgid ""
2835 "move applied patches into repository history\n"
2915 "move applied patches into repository history\n"
2836 "\n"
2916 "\n"
2837 " Finishes the specified revisions (corresponding to applied\n"
2917 " Finishes the specified revisions (corresponding to applied\n"
2838 " patches) by moving them out of mq control into regular repository\n"
2918 " patches) by moving them out of mq control into regular repository\n"
2839 " history.\n"
2919 " history.\n"
2840 "\n"
2920 "\n"
2841 " Accepts a revision range or the -a/--applied option. If --applied\n"
2921 " Accepts a revision range or the -a/--applied option. If --applied\n"
2842 " is specified, all applied mq revisions are removed from mq\n"
2922 " is specified, all applied mq revisions are removed from mq\n"
2843 " control. Otherwise, the given revisions must be at the base of the\n"
2923 " control. Otherwise, the given revisions must be at the base of the\n"
2844 " stack of applied patches.\n"
2924 " stack of applied patches.\n"
2845 "\n"
2925 "\n"
2846 " This can be especially useful if your changes have been applied to\n"
2926 " This can be especially useful if your changes have been applied to\n"
2847 " an upstream repository, or if you are about to push your changes\n"
2927 " an upstream repository, or if you are about to push your changes\n"
2848 " to upstream.\n"
2928 " to upstream.\n"
2849 " "
2929 " "
2850 msgstr ""
2930 msgstr ""
2851
2931
2852 msgid "no revisions specified"
2932 msgid "no revisions specified"
2853 msgstr ""
2933 msgstr ""
2854
2934
2855 msgid "cannot commit over an applied mq patch"
2935 msgid "cannot commit over an applied mq patch"
2856 msgstr ""
2936 msgstr ""
2857
2937
2858 msgid "source has mq patches applied"
2938 msgid "source has mq patches applied"
2859 msgstr ""
2939 msgstr ""
2860
2940
2861 #, python-format
2941 #, python-format
2862 msgid "mq status file refers to unknown node %s\n"
2942 msgid "mq status file refers to unknown node %s\n"
2863 msgstr ""
2943 msgstr ""
2864
2944
2865 #, python-format
2945 #, python-format
2866 msgid "Tag %s overrides mq patch of the same name\n"
2946 msgid "Tag %s overrides mq patch of the same name\n"
2867 msgstr ""
2947 msgstr ""
2868
2948
2869 msgid "cannot import over an applied patch"
2949 msgid "cannot import over an applied patch"
2870 msgstr ""
2950 msgstr ""
2871
2951
2872 msgid "print first line of patch header"
2952 msgid "print first line of patch header"
2873 msgstr ""
2953 msgstr ""
2874
2954
2875 msgid "hg qapplied [-s] [PATCH]"
2955 msgid "hg qapplied [-s] [PATCH]"
2876 msgstr ""
2956 msgstr ""
2877
2957
2878 msgid "use pull protocol to copy metadata"
2958 msgid "use pull protocol to copy metadata"
2879 msgstr ""
2959 msgstr ""
2880
2960
2881 msgid "do not update the new working directories"
2961 msgid "do not update the new working directories"
2882 msgstr ""
2962 msgstr ""
2883
2963
2884 msgid "use uncompressed transfer (fast over LAN)"
2964 msgid "use uncompressed transfer (fast over LAN)"
2885 msgstr ""
2965 msgstr ""
2886
2966
2887 msgid "location of source patch repository"
2967 msgid "location of source patch repository"
2888 msgstr ""
2968 msgstr ""
2889
2969
2890 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2970 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2891 msgstr ""
2971 msgstr ""
2892
2972
2893 msgid "hg qcommit [OPTION]... [FILE]..."
2973 msgid "hg qcommit [OPTION]... [FILE]..."
2894 msgstr ""
2974 msgstr ""
2895
2975
2896 msgid "hg qdiff [OPTION]... [FILE]..."
2976 msgid "hg qdiff [OPTION]... [FILE]..."
2897 msgstr ""
2977 msgstr ""
2898
2978
2899 msgid "keep patch file"
2979 msgid "keep patch file"
2900 msgstr ""
2980 msgstr ""
2901
2981
2902 msgid "stop managing a revision (DEPRECATED)"
2982 msgid "stop managing a revision (DEPRECATED)"
2903 msgstr ""
2983 msgstr ""
2904
2984
2905 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
2985 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
2906 msgstr ""
2986 msgstr ""
2907
2987
2908 msgid "edit patch header"
2988 msgid "edit patch header"
2909 msgstr ""
2989 msgstr ""
2910
2990
2911 msgid "keep folded patch files"
2991 msgid "keep folded patch files"
2912 msgstr ""
2992 msgstr ""
2913
2993
2914 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
2994 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
2915 msgstr ""
2995 msgstr ""
2916
2996
2917 msgid "overwrite any local changes"
2997 msgid "overwrite any local changes"
2918 msgstr ""
2998 msgstr ""
2919
2999
2920 msgid "hg qgoto [OPTION]... PATCH"
3000 msgid "hg qgoto [OPTION]... PATCH"
2921 msgstr ""
3001 msgstr ""
2922
3002
2923 msgid "list all patches and guards"
3003 msgid "list all patches and guards"
2924 msgstr ""
3004 msgstr ""
2925
3005
2926 msgid "drop all guards"
3006 msgid "drop all guards"
2927 msgstr ""
3007 msgstr ""
2928
3008
2929 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3009 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
2930 msgstr ""
3010 msgstr ""
2931
3011
2932 msgid "hg qheader [PATCH]"
3012 msgid "hg qheader [PATCH]"
2933 msgstr ""
3013 msgstr ""
2934
3014
2935 msgid "import file in patch directory"
3015 msgid "import file in patch directory"
2936 msgstr ""
3016 msgstr ""
2937
3017
2938 msgid "name of patch file"
3018 msgid "name of patch file"
2939 msgstr ""
3019 msgstr ""
2940
3020
2941 msgid "overwrite existing files"
3021 msgid "overwrite existing files"
2942 msgstr ""
3022 msgstr ""
2943
3023
2944 msgid "place existing revisions under mq control"
3024 msgid "place existing revisions under mq control"
2945 msgstr ""
3025 msgstr ""
2946
3026
2947 msgid "use git extended diff format"
3027 msgid "use git extended diff format"
2948 msgstr ""
3028 msgstr ""
2949
3029
2950 msgid "qpush after importing"
3030 msgid "qpush after importing"
2951 msgstr ""
3031 msgstr ""
2952
3032
2953 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3033 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
2954 msgstr ""
3034 msgstr ""
2955
3035
2956 msgid "create queue repository"
3036 msgid "create queue repository"
2957 msgstr ""
3037 msgstr ""
2958
3038
2959 msgid "hg qinit [-c]"
3039 msgid "hg qinit [-c]"
2960 msgstr ""
3040 msgstr ""
2961
3041
2962 msgid "import uncommitted changes into patch"
3042 msgid "import uncommitted changes into patch"
2963 msgstr ""
3043 msgstr ""
2964
3044
2965 msgid "add \"From: <current user>\" to patch"
3045 msgid "add \"From: <current user>\" to patch"
2966 msgstr ""
3046 msgstr ""
2967
3047
2968 msgid "add \"From: <given user>\" to patch"
3048 msgid "add \"From: <given user>\" to patch"
2969 msgstr ""
3049 msgstr ""
2970
3050
2971 msgid "add \"Date: <current date>\" to patch"
3051 msgid "add \"Date: <current date>\" to patch"
2972 msgstr ""
3052 msgstr ""
2973
3053
2974 msgid "add \"Date: <given date>\" to patch"
3054 msgid "add \"Date: <given date>\" to patch"
2975 msgstr ""
3055 msgstr ""
2976
3056
2977 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3057 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
2978 msgstr ""
3058 msgstr ""
2979
3059
2980 msgid "hg qnext [-s]"
3060 msgid "hg qnext [-s]"
2981 msgstr ""
3061 msgstr ""
2982
3062
2983 msgid "hg qprev [-s]"
3063 msgid "hg qprev [-s]"
2984 msgstr ""
3064 msgstr ""
2985
3065
2986 msgid "pop all patches"
3066 msgid "pop all patches"
2987 msgstr ""
3067 msgstr ""
2988
3068
2989 msgid "queue name to pop"
3069 msgid "queue name to pop"
2990 msgstr ""
3070 msgstr ""
2991
3071
2992 msgid "forget any local changes"
3072 msgid "forget any local changes"
2993 msgstr ""
3073 msgstr ""
2994
3074
2995 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3075 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
2996 msgstr ""
3076 msgstr ""
2997
3077
2998 msgid "apply if the patch has rejects"
3078 msgid "apply if the patch has rejects"
2999 msgstr ""
3079 msgstr ""
3000
3080
3001 msgid "list patch name in commit text"
3081 msgid "list patch name in commit text"
3002 msgstr ""
3082 msgstr ""
3003
3083
3004 msgid "apply all patches"
3084 msgid "apply all patches"
3005 msgstr ""
3085 msgstr ""
3006
3086
3007 msgid "merge from another queue"
3087 msgid "merge from another queue"
3008 msgstr ""
3088 msgstr ""
3009
3089
3010 msgid "merge queue name"
3090 msgid "merge queue name"
3011 msgstr ""
3091 msgstr ""
3012
3092
3013 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3093 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3014 msgstr ""
3094 msgstr ""
3015
3095
3016 msgid "refresh only files already in the patch and specified files"
3096 msgid "refresh only files already in the patch and specified files"
3017 msgstr ""
3097 msgstr ""
3018
3098
3019 msgid "add/update \"From: <current user>\" in patch"
3099 msgid "add/update \"From: <current user>\" in patch"
3020 msgstr ""
3100 msgstr ""
3021
3101
3022 msgid "add/update \"From: <given user>\" in patch"
3102 msgid "add/update \"From: <given user>\" in patch"
3023 msgstr ""
3103 msgstr ""
3024
3104
3025 msgid "update \"Date: <current date>\" in patch (if present)"
3105 msgid "update \"Date: <current date>\" in patch (if present)"
3026 msgstr ""
3106 msgstr ""
3027
3107
3028 msgid "update \"Date: <given date>\" in patch (if present)"
3108 msgid "update \"Date: <given date>\" in patch (if present)"
3029 msgstr ""
3109 msgstr ""
3030
3110
3031 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3111 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3032 msgstr ""
3112 msgstr ""
3033
3113
3034 msgid "hg qrename PATCH1 [PATCH2]"
3114 msgid "hg qrename PATCH1 [PATCH2]"
3035 msgstr ""
3115 msgstr ""
3036
3116
3037 msgid "delete save entry"
3117 msgid "delete save entry"
3038 msgstr ""
3118 msgstr ""
3039
3119
3040 msgid "update queue working directory"
3120 msgid "update queue working directory"
3041 msgstr ""
3121 msgstr ""
3042
3122
3043 msgid "hg qrestore [-d] [-u] REV"
3123 msgid "hg qrestore [-d] [-u] REV"
3044 msgstr ""
3124 msgstr ""
3045
3125
3046 msgid "copy patch directory"
3126 msgid "copy patch directory"
3047 msgstr ""
3127 msgstr ""
3048
3128
3049 msgid "copy directory name"
3129 msgid "copy directory name"
3050 msgstr ""
3130 msgstr ""
3051
3131
3052 msgid "clear queue status file"
3132 msgid "clear queue status file"
3053 msgstr ""
3133 msgstr ""
3054
3134
3055 msgid "force copy"
3135 msgid "force copy"
3056 msgstr ""
3136 msgstr ""
3057
3137
3058 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3138 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3059 msgstr ""
3139 msgstr ""
3060
3140
3061 msgid "disable all guards"
3141 msgid "disable all guards"
3062 msgstr ""
3142 msgstr ""
3063
3143
3064 msgid "list all guards in series file"
3144 msgid "list all guards in series file"
3065 msgstr ""
3145 msgstr ""
3066
3146
3067 msgid "pop to before first guarded applied patch"
3147 msgid "pop to before first guarded applied patch"
3068 msgstr ""
3148 msgstr ""
3069
3149
3070 msgid "pop, then reapply patches"
3150 msgid "pop, then reapply patches"
3071 msgstr ""
3151 msgstr ""
3072
3152
3073 msgid "hg qselect [OPTION]... [GUARD]..."
3153 msgid "hg qselect [OPTION]... [GUARD]..."
3074 msgstr ""
3154 msgstr ""
3075
3155
3076 msgid "print patches not in series"
3156 msgid "print patches not in series"
3077 msgstr ""
3157 msgstr ""
3078
3158
3079 msgid "hg qseries [-ms]"
3159 msgid "hg qseries [-ms]"
3080 msgstr ""
3160 msgstr ""
3081
3161
3082 msgid "force removal with local changes"
3162 msgid "force removal with local changes"
3083 msgstr ""
3163 msgstr ""
3084
3164
3085 msgid "bundle unrelated changesets"
3165 msgid "bundle unrelated changesets"
3086 msgstr ""
3166 msgstr ""
3087
3167
3088 msgid "no backups"
3168 msgid "no backups"
3089 msgstr ""
3169 msgstr ""
3090
3170
3091 msgid "hg strip [-f] [-b] [-n] REV"
3171 msgid "hg strip [-f] [-b] [-n] REV"
3092 msgstr ""
3172 msgstr ""
3093
3173
3094 msgid "hg qtop [-s]"
3174 msgid "hg qtop [-s]"
3095 msgstr ""
3175 msgstr ""
3096
3176
3097 msgid "hg qunapplied [-s] [PATCH]"
3177 msgid "hg qunapplied [-s] [PATCH]"
3098 msgstr ""
3178 msgstr ""
3099
3179
3100 msgid "finish all applied changesets"
3180 msgid "finish all applied changesets"
3101 msgstr ""
3181 msgstr ""
3102
3182
3103 msgid "hg qfinish [-a] [REV...]"
3183 msgid "hg qfinish [-a] [REV...]"
3104 msgstr ""
3184 msgstr ""
3105
3185
3106 msgid ""
3186 msgid ""
3107 "send e-mail notifications for commits/pushes\n"
3187 "send e-mail notifications for commits/pushes\n"
3108 "\n"
3188 "\n"
3109 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3189 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3110 "messages to stdout, for testing and configuring.\n"
3190 "messages to stdout, for testing and configuring.\n"
3111 "\n"
3191 "\n"
3112 "To use, configure notify extension and enable in hgrc like this:\n"
3192 "To use, configure notify extension and enable in hgrc like this:\n"
3113 "\n"
3193 "\n"
3114 " [extensions]\n"
3194 " [extensions]\n"
3115 " hgext.notify =\n"
3195 " hgext.notify =\n"
3116 "\n"
3196 "\n"
3117 " [hooks]\n"
3197 " [hooks]\n"
3118 " # one email for each incoming changeset\n"
3198 " # one email for each incoming changeset\n"
3119 " incoming.notify = python:hgext.notify.hook\n"
3199 " incoming.notify = python:hgext.notify.hook\n"
3120 " # batch emails when many changesets incoming at one time\n"
3200 " # batch emails when many changesets incoming at one time\n"
3121 " changegroup.notify = python:hgext.notify.hook\n"
3201 " changegroup.notify = python:hgext.notify.hook\n"
3122 "\n"
3202 "\n"
3123 " [notify]\n"
3203 " [notify]\n"
3124 " # config items go in here\n"
3204 " # config items go in here\n"
3125 "\n"
3205 "\n"
3126 " config items:\n"
3206 " config items:\n"
3127 "\n"
3207 "\n"
3128 " REQUIRED:\n"
3208 " REQUIRED:\n"
3129 " config = /path/to/file # file containing subscriptions\n"
3209 " config = /path/to/file # file containing subscriptions\n"
3130 "\n"
3210 "\n"
3131 " OPTIONAL:\n"
3211 " OPTIONAL:\n"
3132 " test = True # print messages to stdout for testing\n"
3212 " test = True # print messages to stdout for testing\n"
3133 " strip = 3 # number of slashes to strip for url paths\n"
3213 " strip = 3 # number of slashes to strip for url paths\n"
3134 " domain = example.com # domain to use if committer missing domain\n"
3214 " domain = example.com # domain to use if committer missing domain\n"
3135 " style = ... # style file to use when formatting email\n"
3215 " style = ... # style file to use when formatting email\n"
3136 " template = ... # template to use when formatting email\n"
3216 " template = ... # template to use when formatting email\n"
3137 " incoming = ... # template to use when run as incoming hook\n"
3217 " incoming = ... # template to use when run as incoming hook\n"
3138 " changegroup = ... # template when run as changegroup hook\n"
3218 " changegroup = ... # template when run as changegroup hook\n"
3139 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3219 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3140 " maxsubject = 67 # truncate subject line longer than this\n"
3220 " maxsubject = 67 # truncate subject line longer than this\n"
3141 " diffstat = True # add a diffstat before the diff content\n"
3221 " diffstat = True # add a diffstat before the diff content\n"
3142 " sources = serve # notify if source of incoming changes in this "
3222 " sources = serve # notify if source of incoming changes in this "
3143 "list\n"
3223 "list\n"
3144 " # (serve == ssh or http, push, pull, bundle)\n"
3224 " # (serve == ssh or http, push, pull, bundle)\n"
3145 " [email]\n"
3225 " [email]\n"
3146 " from = user@host.com # email address to send as if none given\n"
3226 " from = user@host.com # email address to send as if none given\n"
3147 " [web]\n"
3227 " [web]\n"
3148 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3228 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3149 "\n"
3229 "\n"
3150 " notify config file has same format as regular hgrc. it has two\n"
3230 " notify config file has same format as regular hgrc. it has two\n"
3151 " sections so you can express subscriptions in whatever way is handier\n"
3231 " sections so you can express subscriptions in whatever way is handier\n"
3152 " for you.\n"
3232 " for you.\n"
3153 "\n"
3233 "\n"
3154 " [usersubs]\n"
3234 " [usersubs]\n"
3155 " # key is subscriber email, value is \",\"-separated list of glob "
3235 " # key is subscriber email, value is \",\"-separated list of glob "
3156 "patterns\n"
3236 "patterns\n"
3157 " user@host = pattern\n"
3237 " user@host = pattern\n"
3158 "\n"
3238 "\n"
3159 " [reposubs]\n"
3239 " [reposubs]\n"
3160 " # key is glob pattern, value is \",\"-separated list of subscriber "
3240 " # key is glob pattern, value is \",\"-separated list of subscriber "
3161 "emails\n"
3241 "emails\n"
3162 " pattern = user@host\n"
3242 " pattern = user@host\n"
3163 "\n"
3243 "\n"
3164 " glob patterns are matched against path to repository root.\n"
3244 " glob patterns are matched against path to repository root.\n"
3165 "\n"
3245 "\n"
3166 " if you like, you can put notify config file in repository that users\n"
3246 " if you like, you can put notify config file in repository that users\n"
3167 " can push changes to, they can manage their own subscriptions."
3247 " can push changes to, they can manage their own subscriptions."
3168 msgstr ""
3248 msgstr ""
3169
3249
3170 #, python-format
3250 #, python-format
3171 msgid "%s: %d new changesets"
3251 msgid "%s: %d new changesets"
3172 msgstr ""
3252 msgstr ""
3173
3253
3174 #, python-format
3254 #, python-format
3175 msgid "notify: sending %d subscribers %d changes\n"
3255 msgid "notify: sending %d subscribers %d changes\n"
3176 msgstr ""
3256 msgstr ""
3177
3257
3178 #, python-format
3258 #, python-format
3179 msgid ""
3259 msgid ""
3180 "\n"
3260 "\n"
3181 "diffs (truncated from %d to %d lines):\n"
3261 "diffs (truncated from %d to %d lines):\n"
3182 "\n"
3262 "\n"
3183 msgstr ""
3263 msgstr ""
3184
3264
3185 #, python-format
3265 #, python-format
3186 msgid ""
3266 msgid ""
3187 "\n"
3267 "\n"
3188 "diffs (%d lines):\n"
3268 "diffs (%d lines):\n"
3189 "\n"
3269 "\n"
3190 msgstr ""
3270 msgstr ""
3191
3271
3192 #, python-format
3272 #, python-format
3193 msgid "notify: no subscribers to repository %s\n"
3273 msgid "notify: no subscribers to repository %s\n"
3194 msgstr ""
3274 msgstr ""
3195
3275
3196 #, python-format
3276 #, python-format
3197 msgid "notify: changes have source \"%s\" - skipping\n"
3277 msgid "notify: changes have source \"%s\" - skipping\n"
3198 msgstr ""
3278 msgstr ""
3199
3279
3200 msgid ""
3280 msgid ""
3201 "browse command output with an external pager\n"
3281 "browse command output with an external pager\n"
3202 "\n"
3282 "\n"
3203 "To set the pager that should be used, set the application variable:\n"
3283 "To set the pager that should be used, set the application variable:\n"
3204 "\n"
3284 "\n"
3205 " [pager]\n"
3285 " [pager]\n"
3206 " pager = LESS='FSRX' less\n"
3286 " pager = LESS='FSRX' less\n"
3207 "\n"
3287 "\n"
3208 "If no pager is set, the pager extensions uses the environment variable\n"
3288 "If no pager is set, the pager extensions uses the environment variable\n"
3209 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3289 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3210 "\n"
3290 "\n"
3211 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3291 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3212 "setting:\n"
3292 "setting:\n"
3213 "\n"
3293 "\n"
3214 " [pager]\n"
3294 " [pager]\n"
3215 " quiet = True\n"
3295 " quiet = True\n"
3216 "\n"
3296 "\n"
3217 "You can disable the pager for certain commands by adding them to the\n"
3297 "You can disable the pager for certain commands by adding them to the\n"
3218 "pager.ignore list:\n"
3298 "pager.ignore list:\n"
3219 "\n"
3299 "\n"
3220 " [pager]\n"
3300 " [pager]\n"
3221 " ignore = version, help, update\n"
3301 " ignore = version, help, update\n"
3222 "\n"
3302 "\n"
3223 "You can also enable the pager only for certain commands using\n"
3303 "You can also enable the pager only for certain commands using\n"
3224 "pager.attend:\n"
3304 "pager.attend:\n"
3225 "\n"
3305 "\n"
3226 " [pager]\n"
3306 " [pager]\n"
3227 " attend = log\n"
3307 " attend = log\n"
3228 "\n"
3308 "\n"
3229 "If pager.attend is present, pager.ignore will be ignored.\n"
3309 "If pager.attend is present, pager.ignore will be ignored.\n"
3230 "\n"
3310 "\n"
3231 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3311 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3232 "specify them in the global .hgrc\n"
3312 "specify them in the global .hgrc\n"
3233 msgstr ""
3313 msgstr ""
3234
3314
3235 msgid ""
3315 msgid ""
3236 "interpret suffixes to refer to ancestor revisions\n"
3316 "interpret suffixes to refer to ancestor revisions\n"
3237 "\n"
3317 "\n"
3238 "This extension allows you to use git-style suffixes to refer to the\n"
3318 "This extension allows you to use git-style suffixes to refer to the\n"
3239 "ancestors of a specific revision.\n"
3319 "ancestors of a specific revision.\n"
3240 "\n"
3320 "\n"
3241 "For example, if you can refer to a revision as \"foo\", then:\n"
3321 "For example, if you can refer to a revision as \"foo\", then:\n"
3242 "\n"
3322 "\n"
3243 "- foo^N = Nth parent of foo\n"
3323 "- foo^N = Nth parent of foo\n"
3244 " foo^0 = foo\n"
3324 " foo^0 = foo\n"
3245 " foo^1 = first parent of foo\n"
3325 " foo^1 = first parent of foo\n"
3246 " foo^2 = second parent of foo\n"
3326 " foo^2 = second parent of foo\n"
3247 " foo^ = foo^1\n"
3327 " foo^ = foo^1\n"
3248 "\n"
3328 "\n"
3249 "- foo~N = Nth first grandparent of foo\n"
3329 "- foo~N = Nth first grandparent of foo\n"
3250 " foo~0 = foo\n"
3330 " foo~0 = foo\n"
3251 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3331 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3252 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3332 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3253 msgstr ""
3333 msgstr ""
3254
3334
3255 msgid ""
3335 msgid ""
3256 "send Mercurial changesets as a series of patch e-mails\n"
3336 "send Mercurial changesets as a series of patch e-mails\n"
3257 "\n"
3337 "\n"
3258 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3338 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3259 "describes the series as a whole.\n"
3339 "describes the series as a whole.\n"
3260 "\n"
3340 "\n"
3261 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3341 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3262 "first line of the changeset description as the subject text. The\n"
3342 "first line of the changeset description as the subject text. The\n"
3263 "message contains two or three body parts:\n"
3343 "message contains two or three body parts:\n"
3264 "\n"
3344 "\n"
3265 " The changeset description.\n"
3345 " The changeset description.\n"
3266 "\n"
3346 "\n"
3267 " [Optional] The result of running diffstat on the patch.\n"
3347 " [Optional] The result of running diffstat on the patch.\n"
3268 "\n"
3348 "\n"
3269 " The patch itself, as generated by \"hg export\".\n"
3349 " The patch itself, as generated by \"hg export\".\n"
3270 "\n"
3350 "\n"
3271 "Each message refers to the first in the series using the In-Reply-To\n"
3351 "Each message refers to the first in the series using the In-Reply-To\n"
3272 "and References headers, so they will show up as a sequence in threaded\n"
3352 "and References headers, so they will show up as a sequence in threaded\n"
3273 "mail and news readers, and in mail archives.\n"
3353 "mail and news readers, and in mail archives.\n"
3274 "\n"
3354 "\n"
3275 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3355 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3276 "with a diffstat summary and the changeset summary, so you can be sure\n"
3356 "with a diffstat summary and the changeset summary, so you can be sure\n"
3277 "you are sending the right changes.\n"
3357 "you are sending the right changes.\n"
3278 "\n"
3358 "\n"
3279 "To configure other defaults, add a section like this to your hgrc\n"
3359 "To configure other defaults, add a section like this to your hgrc\n"
3280 "file:\n"
3360 "file:\n"
3281 "\n"
3361 "\n"
3282 " [email]\n"
3362 " [email]\n"
3283 " from = My Name <my@email>\n"
3363 " from = My Name <my@email>\n"
3284 " to = recipient1, recipient2, ...\n"
3364 " to = recipient1, recipient2, ...\n"
3285 " cc = cc1, cc2, ...\n"
3365 " cc = cc1, cc2, ...\n"
3286 " bcc = bcc1, bcc2, ...\n"
3366 " bcc = bcc1, bcc2, ...\n"
3287 "\n"
3367 "\n"
3288 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3368 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3289 "as a patchbomb.\n"
3369 "as a patchbomb.\n"
3290 "\n"
3370 "\n"
3291 "To avoid sending patches prematurely, it is a good idea to first run\n"
3371 "To avoid sending patches prematurely, it is a good idea to first run\n"
3292 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3372 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3293 "prompted for an email recipient address, a subject and an introductory\n"
3373 "prompted for an email recipient address, a subject and an introductory\n"
3294 "message describing the patches of your patchbomb. Then when all is\n"
3374 "message describing the patches of your patchbomb. Then when all is\n"
3295 "done, patchbomb messages are displayed. If the PAGER environment\n"
3375 "done, patchbomb messages are displayed. If the PAGER environment\n"
3296 "variable is set, your pager will be fired up once for each patchbomb\n"
3376 "variable is set, your pager will be fired up once for each patchbomb\n"
3297 "message, so you can verify everything is alright.\n"
3377 "message, so you can verify everything is alright.\n"
3298 "\n"
3378 "\n"
3299 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3379 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3300 "patchbomb message in a pager or sending the messages directly, it will\n"
3380 "patchbomb message in a pager or sending the messages directly, it will\n"
3301 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3381 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3302 "can be previewed with any mail user agent which supports UNIX mbox\n"
3382 "can be previewed with any mail user agent which supports UNIX mbox\n"
3303 "files, e.g. with mutt:\n"
3383 "files, e.g. with mutt:\n"
3304 "\n"
3384 "\n"
3305 " % mutt -R -f mbox\n"
3385 " % mutt -R -f mbox\n"
3306 "\n"
3386 "\n"
3307 "When you are previewing the patchbomb messages, you can use `formail'\n"
3387 "When you are previewing the patchbomb messages, you can use `formail'\n"
3308 "(a utility that is commonly installed as part of the procmail\n"
3388 "(a utility that is commonly installed as part of the procmail\n"
3309 "package), to send each message out:\n"
3389 "package), to send each message out:\n"
3310 "\n"
3390 "\n"
3311 " % formail -s sendmail -bm -t < mbox\n"
3391 " % formail -s sendmail -bm -t < mbox\n"
3312 "\n"
3392 "\n"
3313 "That should be all. Now your patchbomb is on its way out.\n"
3393 "That should be all. Now your patchbomb is on its way out.\n"
3314 "\n"
3394 "\n"
3315 "You can also either configure the method option in the email section\n"
3395 "You can also either configure the method option in the email section\n"
3316 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3396 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3317 "that the patchbomb extension can automatically send patchbombs\n"
3397 "that the patchbomb extension can automatically send patchbombs\n"
3318 "directly from the commandline. See the [email] and [smtp] sections in\n"
3398 "directly from the commandline. See the [email] and [smtp] sections in\n"
3319 "hgrc(5) for details."
3399 "hgrc(5) for details."
3320 msgstr ""
3400 msgstr ""
3321
3401
3322 msgid "Please enter a valid value.\n"
3402 msgid "Please enter a valid value.\n"
3323 msgstr ""
3403 msgstr ""
3324
3404
3325 msgid "does the diffstat above look okay? "
3405 msgid "does the diffstat above look okay? "
3326 msgstr ""
3406 msgstr ""
3327
3407
3328 msgid "diffstat rejected"
3408 msgid "diffstat rejected"
3329 msgstr ""
3409 msgstr ""
3330
3410
3331 msgid ""
3411 msgid ""
3332 "send changesets by email\n"
3412 "send changesets by email\n"
3333 "\n"
3413 "\n"
3334 " By default, diffs are sent in the format generated by hg export,\n"
3414 " By default, diffs are sent in the format generated by hg export,\n"
3335 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3415 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3336 " introduction, which describes the series as a whole.\n"
3416 " introduction, which describes the series as a whole.\n"
3337 "\n"
3417 "\n"
3338 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3418 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3339 " the first line of the changeset description as the subject text.\n"
3419 " the first line of the changeset description as the subject text.\n"
3340 " The message contains two or three parts. First, the changeset\n"
3420 " The message contains two or three parts. First, the changeset\n"
3341 " description. Next, (optionally) if the diffstat program is\n"
3421 " description. Next, (optionally) if the diffstat program is\n"
3342 " installed and -d/--diffstat is used, the result of running\n"
3422 " installed and -d/--diffstat is used, the result of running\n"
3343 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3423 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3344 " \"hg export\".\n"
3424 " \"hg export\".\n"
3345 "\n"
3425 "\n"
3346 " By default the patch is included as text in the email body for\n"
3426 " By default the patch is included as text in the email body for\n"
3347 " easy reviewing. Using the -a/--attach option will instead create\n"
3427 " easy reviewing. Using the -a/--attach option will instead create\n"
3348 " an attachment for the patch. With -i/--inline an inline attachment\n"
3428 " an attachment for the patch. With -i/--inline an inline attachment\n"
3349 " will be created.\n"
3429 " will be created.\n"
3350 "\n"
3430 "\n"
3351 " With -o/--outgoing, emails will be generated for patches not found\n"
3431 " With -o/--outgoing, emails will be generated for patches not found\n"
3352 " in the destination repository (or only those which are ancestors\n"
3432 " in the destination repository (or only those which are ancestors\n"
3353 " of the specified revisions if any are provided)\n"
3433 " of the specified revisions if any are provided)\n"
3354 "\n"
3434 "\n"
3355 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3435 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3356 " single email containing a binary Mercurial bundle as an attachment\n"
3436 " single email containing a binary Mercurial bundle as an attachment\n"
3357 " will be sent.\n"
3437 " will be sent.\n"
3358 "\n"
3438 "\n"
3359 " Examples:\n"
3439 " Examples:\n"
3360 "\n"
3440 "\n"
3361 " hg email -r 3000 # send patch 3000 only\n"
3441 " hg email -r 3000 # send patch 3000 only\n"
3362 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3442 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3363 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3443 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3364 " hg email 3000 # send patch 3000 (deprecated)\n"
3444 " hg email 3000 # send patch 3000 (deprecated)\n"
3365 "\n"
3445 "\n"
3366 " hg email -o # send all patches not in default\n"
3446 " hg email -o # send all patches not in default\n"
3367 " hg email -o DEST # send all patches not in DEST\n"
3447 " hg email -o DEST # send all patches not in DEST\n"
3368 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3448 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3369 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3449 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3370 "\n"
3450 "\n"
3371 " hg email -b # send bundle of all patches not in default\n"
3451 " hg email -b # send bundle of all patches not in default\n"
3372 " hg email -b DEST # send bundle of all patches not in DEST\n"
3452 " hg email -b DEST # send bundle of all patches not in DEST\n"
3373 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3453 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3374 "default\n"
3454 "default\n"
3375 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3455 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3376 "\n"
3456 "\n"
3377 " Before using this command, you will need to enable email in your\n"
3457 " Before using this command, you will need to enable email in your\n"
3378 " hgrc. See the [email] section in hgrc(5) for details.\n"
3458 " hgrc. See the [email] section in hgrc(5) for details.\n"
3379 " "
3459 " "
3380 msgstr ""
3460 msgstr ""
3381
3461
3382 msgid "specify at least one changeset with -r or -o"
3462 msgid "specify at least one changeset with -r or -o"
3383 msgstr ""
3463 msgstr ""
3384
3464
3385 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3465 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3386 msgstr ""
3466 msgstr ""
3387
3467
3388 msgid "too many destinations"
3468 msgid "too many destinations"
3389 msgstr ""
3469 msgstr ""
3390
3470
3391 msgid "use only one form to specify the revision"
3471 msgid "use only one form to specify the revision"
3392 msgstr ""
3472 msgstr ""
3393
3473
3394 msgid ""
3474 msgid ""
3395 "\n"
3475 "\n"
3396 "Write the introductory message for the patch series.\n"
3476 "Write the introductory message for the patch series.\n"
3397 "\n"
3477 "\n"
3398 msgstr ""
3478 msgstr ""
3399
3479
3400 #, python-format
3480 #, python-format
3401 msgid ""
3481 msgid ""
3402 "This patch series consists of %d patches.\n"
3482 "This patch series consists of %d patches.\n"
3403 "\n"
3483 "\n"
3404 msgstr ""
3484 msgstr ""
3405
3485
3406 msgid "Final summary:\n"
3486 msgid "Final summary:\n"
3407 msgstr ""
3487 msgstr ""
3408
3488
3409 msgid "Displaying "
3489 msgid "Displaying "
3410 msgstr ""
3490 msgstr ""
3411
3491
3412 msgid "Writing "
3492 msgid "Writing "
3413 msgstr ""
3493 msgstr ""
3414
3494
3415 msgid "Sending "
3495 msgid "Sending "
3416 msgstr ""
3496 msgstr ""
3417
3497
3418 msgid "send patches as attachments"
3498 msgid "send patches as attachments"
3419 msgstr ""
3499 msgstr ""
3420
3500
3421 msgid "send patches as inline attachments"
3501 msgid "send patches as inline attachments"
3422 msgstr ""
3502 msgstr ""
3423
3503
3424 msgid "email addresses of blind carbon copy recipients"
3504 msgid "email addresses of blind carbon copy recipients"
3425 msgstr ""
3505 msgstr ""
3426
3506
3427 msgid "email addresses of copy recipients"
3507 msgid "email addresses of copy recipients"
3428 msgstr ""
3508 msgstr ""
3429
3509
3430 msgid "add diffstat output to messages"
3510 msgid "add diffstat output to messages"
3431 msgstr ""
3511 msgstr ""
3432
3512
3433 msgid "use the given date as the sending date"
3513 msgid "use the given date as the sending date"
3434 msgstr ""
3514 msgstr ""
3435
3515
3436 msgid "use the given file as the series description"
3516 msgid "use the given file as the series description"
3437 msgstr ""
3517 msgstr ""
3438
3518
3439 msgid "email address of sender"
3519 msgid "email address of sender"
3440 msgstr ""
3520 msgstr ""
3441
3521
3442 msgid "print messages that would be sent"
3522 msgid "print messages that would be sent"
3443 msgstr ""
3523 msgstr ""
3444
3524
3445 msgid "write messages to mbox file instead of sending them"
3525 msgid "write messages to mbox file instead of sending them"
3446 msgstr ""
3526 msgstr ""
3447
3527
3448 msgid "subject of first message (intro or single patch)"
3528 msgid "subject of first message (intro or single patch)"
3449 msgstr ""
3529 msgstr ""
3450
3530
3451 msgid "message identifier to reply to"
3531 msgid "message identifier to reply to"
3452 msgstr ""
3532 msgstr ""
3453
3533
3454 msgid "email addresses of recipients"
3534 msgid "email addresses of recipients"
3455 msgstr ""
3535 msgstr ""
3456
3536
3457 msgid "omit hg patch header"
3537 msgid "omit hg patch header"
3458 msgstr ""
3538 msgstr ""
3459
3539
3460 msgid "send changes not found in the target repository"
3540 msgid "send changes not found in the target repository"
3461 msgstr ""
3541 msgstr ""
3462
3542
3463 msgid "send changes not in target as a binary bundle"
3543 msgid "send changes not in target as a binary bundle"
3464 msgstr ""
3544 msgstr ""
3465
3545
3466 msgid "name of the bundle attachment file"
3546 msgid "name of the bundle attachment file"
3467 msgstr ""
3547 msgstr ""
3468
3548
3469 msgid "a revision to send"
3549 msgid "a revision to send"
3470 msgstr ""
3550 msgstr ""
3471
3551
3472 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3552 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3473 msgstr ""
3553 msgstr ""
3474
3554
3475 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3555 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3476 msgstr ""
3556 msgstr ""
3477
3557
3478 msgid "send an introduction email for a single patch"
3558 msgid "send an introduction email for a single patch"
3479 msgstr ""
3559 msgstr ""
3480
3560
3481 msgid "hg email [OPTION]... [DEST]..."
3561 msgid "hg email [OPTION]... [DEST]..."
3482 msgstr ""
3562 msgstr ""
3483
3563
3484 msgid "delete files not tracked from the working directory"
3564 msgid "delete files not tracked from the working directory"
3485 msgstr ""
3565 msgstr ""
3486
3566
3487 msgid ""
3567 msgid ""
3488 "removes files not tracked by Mercurial\n"
3568 "removes files not tracked by Mercurial\n"
3489 "\n"
3569 "\n"
3490 " Delete files not known to Mercurial. This is useful to test local\n"
3570 " Delete files not known to Mercurial. This is useful to test local\n"
3491 " and uncommitted changes in an otherwise-clean source tree.\n"
3571 " and uncommitted changes in an otherwise-clean source tree.\n"
3492 "\n"
3572 "\n"
3493 " This means that purge will delete:\n"
3573 " This means that purge will delete:\n"
3494 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3574 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3495 " - Empty directories: in fact Mercurial ignores directories unless\n"
3575 " - Empty directories: in fact Mercurial ignores directories unless\n"
3496 " they contain files under source control management\n"
3576 " they contain files under source control management\n"
3497 " But it will leave untouched:\n"
3577 " But it will leave untouched:\n"
3498 " - Modified and unmodified tracked files\n"
3578 " - Modified and unmodified tracked files\n"
3499 " - Ignored files (unless --all is specified)\n"
3579 " - Ignored files (unless --all is specified)\n"
3500 " - New files added to the repository (with \"hg add\")\n"
3580 " - New files added to the repository (with \"hg add\")\n"
3501 "\n"
3581 "\n"
3502 " If directories are given on the command line, only files in these\n"
3582 " If directories are given on the command line, only files in these\n"
3503 " directories are considered.\n"
3583 " directories are considered.\n"
3504 "\n"
3584 "\n"
3505 " Be careful with purge, as you could irreversibly delete some files\n"
3585 " Be careful with purge, as you could irreversibly delete some files\n"
3506 " you forgot to add to the repository. If you only want to print the\n"
3586 " you forgot to add to the repository. If you only want to print the\n"
3507 " list of files that this program would delete, use the --print\n"
3587 " list of files that this program would delete, use the --print\n"
3508 " option.\n"
3588 " option.\n"
3509 " "
3589 " "
3510 msgstr ""
3590 msgstr ""
3511
3591
3512 #, python-format
3592 #, python-format
3513 msgid "%s cannot be removed"
3593 msgid "%s cannot be removed"
3514 msgstr ""
3594 msgstr ""
3515
3595
3516 #, python-format
3596 #, python-format
3517 msgid "warning: %s\n"
3597 msgid "warning: %s\n"
3518 msgstr ""
3598 msgstr ""
3519
3599
3520 #, python-format
3600 #, python-format
3521 msgid "Removing file %s\n"
3601 msgid "Removing file %s\n"
3522 msgstr ""
3602 msgstr ""
3523
3603
3524 #, python-format
3604 #, python-format
3525 msgid "Removing directory %s\n"
3605 msgid "Removing directory %s\n"
3526 msgstr ""
3606 msgstr ""
3527
3607
3528 msgid "abort if an error occurs"
3608 msgid "abort if an error occurs"
3529 msgstr ""
3609 msgstr ""
3530
3610
3531 msgid "purge ignored files too"
3611 msgid "purge ignored files too"
3532 msgstr ""
3612 msgstr ""
3533
3613
3534 msgid "print filenames instead of deleting them"
3614 msgid "print filenames instead of deleting them"
3535 msgstr ""
3615 msgstr ""
3536
3616
3537 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3617 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3538 msgstr ""
3618 msgstr ""
3539
3619
3540 msgid "hg purge [OPTION]... [DIR]..."
3620 msgid "hg purge [OPTION]... [DIR]..."
3541 msgstr ""
3621 msgstr ""
3542
3622
3543 msgid ""
3623 msgid ""
3544 "move sets of revisions to a different ancestor\n"
3624 "move sets of revisions to a different ancestor\n"
3545 "\n"
3625 "\n"
3546 "This extension lets you rebase changesets in an existing Mercurial\n"
3626 "This extension lets you rebase changesets in an existing Mercurial\n"
3547 "repository.\n"
3627 "repository.\n"
3548 "\n"
3628 "\n"
3549 "For more information:\n"
3629 "For more information:\n"
3550 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3630 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3551 msgstr ""
3631 msgstr ""
3552
3632
3553 msgid "first revision, do not change ancestor\n"
3633 msgid "first revision, do not change ancestor\n"
3554 msgstr ""
3634 msgstr ""
3555
3635
3556 msgid ""
3636 msgid ""
3557 "move changeset (and descendants) to a different branch\n"
3637 "move changeset (and descendants) to a different branch\n"
3558 "\n"
3638 "\n"
3559 " Rebase uses repeated merging to graft changesets from one part of\n"
3639 " Rebase uses repeated merging to graft changesets from one part of\n"
3560 " history onto another. This can be useful for linearizing local\n"
3640 " history onto another. This can be useful for linearizing local\n"
3561 " changes relative to a master development tree.\n"
3641 " changes relative to a master development tree.\n"
3562 "\n"
3642 "\n"
3563 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3643 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3564 " continued with --continue/-c or aborted with --abort/-a.\n"
3644 " continued with --continue/-c or aborted with --abort/-a.\n"
3565 " "
3645 " "
3566 msgstr ""
3646 msgstr ""
3567
3647
3568 msgid "cannot use both abort and continue"
3648 msgid "cannot use both abort and continue"
3569 msgstr ""
3649 msgstr ""
3570
3650
3571 msgid "cannot use collapse with continue or abort"
3651 msgid "cannot use collapse with continue or abort"
3572 msgstr ""
3652 msgstr ""
3573
3653
3574 msgid "abort and continue do not allow specifying revisions"
3654 msgid "abort and continue do not allow specifying revisions"
3575 msgstr ""
3655 msgstr ""
3576
3656
3577 msgid "cannot specify both a revision and a base"
3657 msgid "cannot specify both a revision and a base"
3578 msgstr ""
3658 msgstr ""
3579
3659
3580 msgid "nothing to rebase\n"
3660 msgid "nothing to rebase\n"
3581 msgstr ""
3661 msgstr ""
3582
3662
3583 msgid "cannot use both keepbranches and extrafn"
3663 msgid "cannot use both keepbranches and extrafn"
3584 msgstr ""
3664 msgstr ""
3585
3665
3586 msgid "rebase merging completed\n"
3666 msgid "rebase merging completed\n"
3587 msgstr ""
3667 msgstr ""
3588
3668
3589 msgid "warning: new changesets detected on source branch, not stripping\n"
3669 msgid "warning: new changesets detected on source branch, not stripping\n"
3590 msgstr ""
3670 msgstr ""
3591
3671
3592 msgid "rebase completed\n"
3672 msgid "rebase completed\n"
3593 msgstr ""
3673 msgstr ""
3594
3674
3595 #, python-format
3675 #, python-format
3596 msgid "%d revisions have been skipped\n"
3676 msgid "%d revisions have been skipped\n"
3597 msgstr ""
3677 msgstr ""
3598
3678
3599 msgid " set parents\n"
3679 msgid " set parents\n"
3600 msgstr ""
3680 msgstr ""
3601
3681
3602 #, python-format
3682 #, python-format
3603 msgid "rebasing %d:%s\n"
3683 msgid "rebasing %d:%s\n"
3604 msgstr ""
3684 msgstr ""
3605
3685
3606 #, python-format
3686 #, python-format
3607 msgid " future parents are %d and %d\n"
3687 msgid " future parents are %d and %d\n"
3608 msgstr ""
3688 msgstr ""
3609
3689
3610 #, python-format
3690 #, python-format
3611 msgid " update to %d:%s\n"
3691 msgid " update to %d:%s\n"
3612 msgstr ""
3692 msgstr ""
3613
3693
3614 msgid " already in target\n"
3694 msgid " already in target\n"
3615 msgstr ""
3695 msgstr ""
3616
3696
3617 #, python-format
3697 #, python-format
3618 msgid " merge against %d:%s\n"
3698 msgid " merge against %d:%s\n"
3619 msgstr ""
3699 msgstr ""
3620
3700
3621 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3701 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3622 msgstr ""
3702 msgstr ""
3623
3703
3624 msgid "resuming interrupted rebase\n"
3704 msgid "resuming interrupted rebase\n"
3625 msgstr ""
3705 msgstr ""
3626
3706
3627 #, python-format
3707 #, python-format
3628 msgid "no changes, revision %d skipped\n"
3708 msgid "no changes, revision %d skipped\n"
3629 msgstr ""
3709 msgstr ""
3630
3710
3631 #, python-format
3711 #, python-format
3632 msgid "next revision set to %s\n"
3712 msgid "next revision set to %s\n"
3633 msgstr ""
3713 msgstr ""
3634
3714
3635 #, python-format
3715 #, python-format
3636 msgid "cannot use revision %d as base, result would have 3 parents"
3716 msgid "cannot use revision %d as base, result would have 3 parents"
3637 msgstr ""
3717 msgstr ""
3638
3718
3639 #, python-format
3719 #, python-format
3640 msgid "revision %d is an mq patch (%s), finalize it.\n"
3720 msgid "revision %d is an mq patch (%s), finalize it.\n"
3641 msgstr ""
3721 msgstr ""
3642
3722
3643 #, python-format
3723 #, python-format
3644 msgid "import mq patch %d (%s)\n"
3724 msgid "import mq patch %d (%s)\n"
3645 msgstr ""
3725 msgstr ""
3646
3726
3647 msgid "rebase status stored\n"
3727 msgid "rebase status stored\n"
3648 msgstr ""
3728 msgstr ""
3649
3729
3650 msgid "rebase status resumed\n"
3730 msgid "rebase status resumed\n"
3651 msgstr ""
3731 msgstr ""
3652
3732
3653 msgid "no rebase in progress"
3733 msgid "no rebase in progress"
3654 msgstr ""
3734 msgstr ""
3655
3735
3656 msgid "warning: new changesets detected on target branch, not stripping\n"
3736 msgid "warning: new changesets detected on target branch, not stripping\n"
3657 msgstr ""
3737 msgstr ""
3658
3738
3659 msgid "rebase aborted\n"
3739 msgid "rebase aborted\n"
3660 msgstr ""
3740 msgstr ""
3661
3741
3662 msgid "cannot rebase onto an applied mq patch"
3742 msgid "cannot rebase onto an applied mq patch"
3663 msgstr ""
3743 msgstr ""
3664
3744
3665 msgid "cannot rebase an ancestor"
3745 msgid "cannot rebase an ancestor"
3666 msgstr ""
3746 msgstr ""
3667
3747
3668 msgid "cannot rebase a descendant"
3748 msgid "cannot rebase a descendant"
3669 msgstr ""
3749 msgstr ""
3670
3750
3671 msgid "already working on current\n"
3751 msgid "already working on current\n"
3672 msgstr ""
3752 msgstr ""
3673
3753
3674 msgid "already working on the current branch\n"
3754 msgid "already working on the current branch\n"
3675 msgstr ""
3755 msgstr ""
3676
3756
3677 #, python-format
3757 #, python-format
3678 msgid "rebase onto %d starting from %d\n"
3758 msgid "rebase onto %d starting from %d\n"
3679 msgstr ""
3759 msgstr ""
3680
3760
3681 msgid "unable to collapse, there is more than one external parent"
3761 msgid "unable to collapse, there is more than one external parent"
3682 msgstr ""
3762 msgstr ""
3683
3763
3684 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3764 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3685 msgstr ""
3765 msgstr ""
3686
3766
3687 msgid "rebase working directory to branch head"
3767 msgid "rebase working directory to branch head"
3688 msgstr ""
3768 msgstr ""
3689
3769
3690 msgid "rebase from a given revision"
3770 msgid "rebase from a given revision"
3691 msgstr ""
3771 msgstr ""
3692
3772
3693 msgid "rebase from the base of a given revision"
3773 msgid "rebase from the base of a given revision"
3694 msgstr ""
3774 msgstr ""
3695
3775
3696 msgid "rebase onto a given revision"
3776 msgid "rebase onto a given revision"
3697 msgstr ""
3777 msgstr ""
3698
3778
3699 msgid "collapse the rebased revisions"
3779 msgid "collapse the rebased revisions"
3700 msgstr ""
3780 msgstr ""
3701
3781
3702 msgid "keep original revisions"
3782 msgid "keep original revisions"
3703 msgstr ""
3783 msgstr ""
3704
3784
3705 msgid "keep original branches"
3785 msgid "keep original branches"
3706 msgstr ""
3786 msgstr ""
3707
3787
3708 msgid "continue an interrupted rebase"
3788 msgid "continue an interrupted rebase"
3709 msgstr ""
3789 msgstr ""
3710
3790
3711 msgid "abort an interrupted rebase"
3791 msgid "abort an interrupted rebase"
3712 msgstr ""
3792 msgstr ""
3713
3793
3714 msgid ""
3794 msgid ""
3715 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
3795 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
3716 "| [-c] | [-a]"
3796 "| [-c] | [-a]"
3717 msgstr ""
3797 msgstr ""
3718
3798
3719 msgid "interactively select which sets of changes to commit/qrefresh"
3799 msgid "interactively select which sets of changes to commit/qrefresh"
3720 msgstr ""
3800 msgstr ""
3721
3801
3722 msgid "this modifies a binary file (all or nothing)\n"
3802 msgid "this modifies a binary file (all or nothing)\n"
3723 msgstr ""
3803 msgstr ""
3724
3804
3725 msgid "this is a binary file\n"
3805 msgid "this is a binary file\n"
3726 msgstr ""
3806 msgstr ""
3727
3807
3728 #, python-format
3808 #, python-format
3729 msgid "%d hunks, %d lines changed\n"
3809 msgid "%d hunks, %d lines changed\n"
3730 msgstr ""
3810 msgstr ""
3731
3811
3732 msgid "[Ynsfdaq?]"
3812 msgid "[Ynsfdaq?]"
3733 msgstr ""
3813 msgstr ""
3734
3814
3735 msgid "&Yes, record this change"
3815 msgid "&Yes, record this change"
3736 msgstr ""
3816 msgstr ""
3737
3817
3738 msgid "&No, skip this change"
3818 msgid "&No, skip this change"
3739 msgstr ""
3819 msgstr ""
3740
3820
3741 msgid "&Skip remaining changes to this file"
3821 msgid "&Skip remaining changes to this file"
3742 msgstr ""
3822 msgstr ""
3743
3823
3744 msgid "Record remaining changes to this &file"
3824 msgid "Record remaining changes to this &file"
3745 msgstr ""
3825 msgstr ""
3746
3826
3747 msgid "&Done, skip remaining changes and files"
3827 msgid "&Done, skip remaining changes and files"
3748 msgstr ""
3828 msgstr ""
3749
3829
3750 msgid "Record &all changes to all remaining files"
3830 msgid "Record &all changes to all remaining files"
3751 msgstr ""
3831 msgstr ""
3752
3832
3753 msgid "&Quit, recording no changes"
3833 msgid "&Quit, recording no changes"
3754 msgstr ""
3834 msgstr ""
3755
3835
3756 msgid "&?"
3836 msgid "&?"
3757 msgstr ""
3837 msgstr ""
3758
3838
3759 msgid "y"
3839 msgid "y"
3760 msgstr ""
3840 msgstr ""
3761
3841
3762 msgid "?"
3842 msgid "?"
3763 msgstr ""
3843 msgstr ""
3764
3844
3765 msgid "y - record this change"
3845 msgid "y - record this change"
3766 msgstr ""
3846 msgstr ""
3767
3847
3768 msgid "s"
3848 msgid "s"
3769 msgstr ""
3849 msgstr ""
3770
3850
3771 msgid "f"
3851 msgid "f"
3772 msgstr ""
3852 msgstr ""
3773
3853
3774 msgid "d"
3854 msgid "d"
3775 msgstr ""
3855 msgstr ""
3776
3856
3777 msgid "a"
3857 msgid "a"
3778 msgstr ""
3858 msgstr ""
3779
3859
3780 msgid "q"
3860 msgid "q"
3781 msgstr ""
3861 msgstr ""
3782
3862
3783 msgid "user quit"
3863 msgid "user quit"
3784 msgstr ""
3864 msgstr ""
3785
3865
3786 #, python-format
3866 #, python-format
3787 msgid "examine changes to %s?"
3867 msgid "examine changes to %s?"
3788 msgstr ""
3868 msgstr ""
3789
3869
3790 msgid " and "
3870 msgid " and "
3791 msgstr ""
3871 msgstr ""
3792
3872
3793 #, python-format
3873 #, python-format
3794 msgid "record this change to %r?"
3874 msgid "record this change to %r?"
3795 msgstr ""
3875 msgstr ""
3796
3876
3797 #, python-format
3877 #, python-format
3798 msgid "record change %d/%d to %r?"
3878 msgid "record change %d/%d to %r?"
3799 msgstr ""
3879 msgstr ""
3800
3880
3801 msgid ""
3881 msgid ""
3802 "interactively select changes to commit\n"
3882 "interactively select changes to commit\n"
3803 "\n"
3883 "\n"
3804 " If a list of files is omitted, all changes reported by \"hg status\"\n"
3884 " If a list of files is omitted, all changes reported by \"hg status\"\n"
3805 " will be candidates for recording.\n"
3885 " will be candidates for recording.\n"
3806 "\n"
3886 "\n"
3807 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
3887 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
3808 "\n"
3888 "\n"
3809 " You will be prompted for whether to record changes to each\n"
3889 " You will be prompted for whether to record changes to each\n"
3810 " modified file, and for files with multiple changes, for each\n"
3890 " modified file, and for files with multiple changes, for each\n"
3811 " change to use. For each query, the following responses are\n"
3891 " change to use. For each query, the following responses are\n"
3812 " possible:\n"
3892 " possible:\n"
3813 "\n"
3893 "\n"
3814 " y - record this change\n"
3894 " y - record this change\n"
3815 " n - skip this change\n"
3895 " n - skip this change\n"
3816 "\n"
3896 "\n"
3817 " s - skip remaining changes to this file\n"
3897 " s - skip remaining changes to this file\n"
3818 " f - record remaining changes to this file\n"
3898 " f - record remaining changes to this file\n"
3819 "\n"
3899 "\n"
3820 " d - done, skip remaining changes and files\n"
3900 " d - done, skip remaining changes and files\n"
3821 " a - record all changes to all remaining files\n"
3901 " a - record all changes to all remaining files\n"
3822 " q - quit, recording no changes\n"
3902 " q - quit, recording no changes\n"
3823 "\n"
3903 "\n"
3824 " ? - display help"
3904 " ? - display help"
3825 msgstr ""
3905 msgstr ""
3826
3906
3827 msgid "'mq' extension not loaded"
3907 msgid "'mq' extension not loaded"
3828 msgstr ""
3908 msgstr ""
3829
3909
3830 msgid "running non-interactively, use commit instead"
3910 msgid "running non-interactively, use commit instead"
3831 msgstr ""
3911 msgstr ""
3832
3912
3833 msgid "no changes to record\n"
3913 msgid "no changes to record\n"
3834 msgstr ""
3914 msgstr ""
3835
3915
3836 #, python-format
3916 #, python-format
3837 msgid "backup %r as %r\n"
3917 msgid "backup %r as %r\n"
3838 msgstr ""
3918 msgstr ""
3839
3919
3840 msgid "applying patch\n"
3920 msgid "applying patch\n"
3841 msgstr ""
3921 msgstr ""
3842
3922
3843 msgid "patch failed to apply"
3923 msgid "patch failed to apply"
3844 msgstr ""
3924 msgstr ""
3845
3925
3846 #, python-format
3926 #, python-format
3847 msgid "restoring %r to %r\n"
3927 msgid "restoring %r to %r\n"
3848 msgstr ""
3928 msgstr ""
3849
3929
3850 msgid "hg record [OPTION]... [FILE]..."
3930 msgid "hg record [OPTION]... [FILE]..."
3851 msgstr ""
3931 msgstr ""
3852
3932
3853 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
3933 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
3854 msgstr ""
3934 msgstr ""
3855
3935
3856 msgid "share a common history between several working directories"
3936 msgid "share a common history between several working directories"
3857 msgstr ""
3937 msgstr ""
3858
3938
3859 msgid ""
3939 msgid ""
3860 "create a new shared repository (experimental)\n"
3940 "create a new shared repository (experimental)\n"
3861 "\n"
3941 "\n"
3862 " Initialize a new repository and working directory that shares its\n"
3942 " Initialize a new repository and working directory that shares its\n"
3863 " history with another repository.\n"
3943 " history with another repository.\n"
3864 "\n"
3944 "\n"
3865 " NOTE: actions that change history such as rollback or moving the\n"
3945 " NOTE: actions that change history such as rollback or moving the\n"
3866 " source may confuse sharers.\n"
3946 " source may confuse sharers.\n"
3867 " "
3947 " "
3868 msgstr ""
3948 msgstr ""
3869
3949
3870 msgid "do not create a working copy"
3950 msgid "do not create a working copy"
3871 msgstr ""
3951 msgstr ""
3872
3952
3873 msgid "[-U] SOURCE [DEST]"
3953 msgid "[-U] SOURCE [DEST]"
3874 msgstr ""
3954 msgstr ""
3875
3955
3876 msgid ""
3956 msgid ""
3877 "transplant changesets from another branch\n"
3957 "transplant changesets from another branch\n"
3878 "\n"
3958 "\n"
3879 "This extension allows you to transplant patches from another branch.\n"
3959 "This extension allows you to transplant patches from another branch.\n"
3880 "\n"
3960 "\n"
3881 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
3961 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
3882 "map from a changeset hash to its hash in the source repository.\n"
3962 "map from a changeset hash to its hash in the source repository.\n"
3883 msgstr ""
3963 msgstr ""
3884
3964
3885 #, python-format
3965 #, python-format
3886 msgid "skipping already applied revision %s\n"
3966 msgid "skipping already applied revision %s\n"
3887 msgstr ""
3967 msgstr ""
3888
3968
3889 #, python-format
3969 #, python-format
3890 msgid "skipping merge changeset %s:%s\n"
3970 msgid "skipping merge changeset %s:%s\n"
3891 msgstr ""
3971 msgstr ""
3892
3972
3893 #, python-format
3973 #, python-format
3894 msgid "%s merged at %s\n"
3974 msgid "%s merged at %s\n"
3895 msgstr ""
3975 msgstr ""
3896
3976
3897 #, python-format
3977 #, python-format
3898 msgid "%s transplanted to %s\n"
3978 msgid "%s transplanted to %s\n"
3899 msgstr ""
3979 msgstr ""
3900
3980
3901 #, python-format
3981 #, python-format
3902 msgid "filtering %s\n"
3982 msgid "filtering %s\n"
3903 msgstr ""
3983 msgstr ""
3904
3984
3905 msgid "filter failed"
3985 msgid "filter failed"
3906 msgstr ""
3986 msgstr ""
3907
3987
3908 msgid "can only omit patchfile if merging"
3988 msgid "can only omit patchfile if merging"
3909 msgstr ""
3989 msgstr ""
3910
3990
3911 #, python-format
3991 #, python-format
3912 msgid "%s: empty changeset"
3992 msgid "%s: empty changeset"
3913 msgstr ""
3993 msgstr ""
3914
3994
3915 msgid "Fix up the merge and run hg transplant --continue"
3995 msgid "Fix up the merge and run hg transplant --continue"
3916 msgstr ""
3996 msgstr ""
3917
3997
3918 #, python-format
3998 #, python-format
3919 msgid "%s transplanted as %s\n"
3999 msgid "%s transplanted as %s\n"
3920 msgstr ""
4000 msgstr ""
3921
4001
3922 msgid "transplant log file is corrupt"
4002 msgid "transplant log file is corrupt"
3923 msgstr ""
4003 msgstr ""
3924
4004
3925 #, python-format
4005 #, python-format
3926 msgid "working dir not at transplant parent %s"
4006 msgid "working dir not at transplant parent %s"
3927 msgstr ""
4007 msgstr ""
3928
4008
3929 msgid "commit failed"
4009 msgid "commit failed"
3930 msgstr ""
4010 msgstr ""
3931
4011
3932 msgid "apply changeset? [ynmpcq?]:"
4012 msgid "apply changeset? [ynmpcq?]:"
3933 msgstr ""
4013 msgstr ""
3934
4014
3935 msgid ""
4015 msgid ""
3936 "transplant changesets from another branch\n"
4016 "transplant changesets from another branch\n"
3937 "\n"
4017 "\n"
3938 " Selected changesets will be applied on top of the current working\n"
4018 " Selected changesets will be applied on top of the current working\n"
3939 " directory with the log of the original changeset. If --log is\n"
4019 " directory with the log of the original changeset. If --log is\n"
3940 " specified, log messages will have a comment appended of the form:\n"
4020 " specified, log messages will have a comment appended of the form:\n"
3941 "\n"
4021 "\n"
3942 " (transplanted from CHANGESETHASH)\n"
4022 " (transplanted from CHANGESETHASH)\n"
3943 "\n"
4023 "\n"
3944 " You can rewrite the changelog message with the --filter option.\n"
4024 " You can rewrite the changelog message with the --filter option.\n"
3945 " Its argument will be invoked with the current changelog message as\n"
4025 " Its argument will be invoked with the current changelog message as\n"
3946 " $1 and the patch as $2.\n"
4026 " $1 and the patch as $2.\n"
3947 "\n"
4027 "\n"
3948 " If --source/-s is specified, selects changesets from the named\n"
4028 " If --source/-s is specified, selects changesets from the named\n"
3949 " repository. If --branch/-b is specified, selects changesets from\n"
4029 " repository. If --branch/-b is specified, selects changesets from\n"
3950 " the branch holding the named revision, up to that revision. If\n"
4030 " the branch holding the named revision, up to that revision. If\n"
3951 " --all/-a is specified, all changesets on the branch will be\n"
4031 " --all/-a is specified, all changesets on the branch will be\n"
3952 " transplanted, otherwise you will be prompted to select the\n"
4032 " transplanted, otherwise you will be prompted to select the\n"
3953 " changesets you want.\n"
4033 " changesets you want.\n"
3954 "\n"
4034 "\n"
3955 " hg transplant --branch REVISION --all will rebase the selected\n"
4035 " hg transplant --branch REVISION --all will rebase the selected\n"
3956 " branch (up to the named revision) onto your current working\n"
4036 " branch (up to the named revision) onto your current working\n"
3957 " directory.\n"
4037 " directory.\n"
3958 "\n"
4038 "\n"
3959 " You can optionally mark selected transplanted changesets as merge\n"
4039 " You can optionally mark selected transplanted changesets as merge\n"
3960 " changesets. You will not be prompted to transplant any ancestors\n"
4040 " changesets. You will not be prompted to transplant any ancestors\n"
3961 " of a merged transplant, and you can merge descendants of them\n"
4041 " of a merged transplant, and you can merge descendants of them\n"
3962 " normally instead of transplanting them.\n"
4042 " normally instead of transplanting them.\n"
3963 "\n"
4043 "\n"
3964 " If no merges or revisions are provided, hg transplant will start\n"
4044 " If no merges or revisions are provided, hg transplant will start\n"
3965 " an interactive changeset browser.\n"
4045 " an interactive changeset browser.\n"
3966 "\n"
4046 "\n"
3967 " If a changeset application fails, you can fix the merge by hand\n"
4047 " If a changeset application fails, you can fix the merge by hand\n"
3968 " and then resume where you left off by calling hg transplant\n"
4048 " and then resume where you left off by calling hg transplant\n"
3969 " --continue/-c.\n"
4049 " --continue/-c.\n"
3970 " "
4050 " "
3971 msgstr ""
4051 msgstr ""
3972
4052
3973 msgid "--continue is incompatible with branch, all or merge"
4053 msgid "--continue is incompatible with branch, all or merge"
3974 msgstr ""
4054 msgstr ""
3975
4055
3976 msgid "no source URL, branch tag or revision list provided"
4056 msgid "no source URL, branch tag or revision list provided"
3977 msgstr ""
4057 msgstr ""
3978
4058
3979 msgid "--all requires a branch revision"
4059 msgid "--all requires a branch revision"
3980 msgstr ""
4060 msgstr ""
3981
4061
3982 msgid "--all is incompatible with a revision list"
4062 msgid "--all is incompatible with a revision list"
3983 msgstr ""
4063 msgstr ""
3984
4064
3985 msgid "no revision checked out"
4065 msgid "no revision checked out"
3986 msgstr ""
4066 msgstr ""
3987
4067
3988 msgid "outstanding uncommitted merges"
4068 msgid "outstanding uncommitted merges"
3989 msgstr ""
4069 msgstr ""
3990
4070
3991 msgid "outstanding local changes"
4071 msgid "outstanding local changes"
3992 msgstr ""
4072 msgstr ""
3993
4073
3994 msgid "pull patches from REPOSITORY"
4074 msgid "pull patches from REPOSITORY"
3995 msgstr ""
4075 msgstr ""
3996
4076
3997 msgid "pull patches from branch BRANCH"
4077 msgid "pull patches from branch BRANCH"
3998 msgstr ""
4078 msgstr ""
3999
4079
4000 msgid "pull all changesets up to BRANCH"
4080 msgid "pull all changesets up to BRANCH"
4001 msgstr ""
4081 msgstr ""
4002
4082
4003 msgid "skip over REV"
4083 msgid "skip over REV"
4004 msgstr ""
4084 msgstr ""
4005
4085
4006 msgid "merge at REV"
4086 msgid "merge at REV"
4007 msgstr ""
4087 msgstr ""
4008
4088
4009 msgid "append transplant info to log message"
4089 msgid "append transplant info to log message"
4010 msgstr ""
4090 msgstr ""
4011
4091
4012 msgid "continue last transplant session after repair"
4092 msgid "continue last transplant session after repair"
4013 msgstr ""
4093 msgstr ""
4014
4094
4015 msgid "filter changesets through FILTER"
4095 msgid "filter changesets through FILTER"
4016 msgstr ""
4096 msgstr ""
4017
4097
4018 msgid ""
4098 msgid ""
4019 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4099 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4020 msgstr ""
4100 msgstr ""
4021
4101
4022 msgid ""
4102 msgid ""
4023 "allow the use of MBCS paths with problematic encoding\n"
4103 "allow the use of MBCS paths with problematic encoding\n"
4024 "\n"
4104 "\n"
4025 "Some MBCS encodings are not good for some path operations (i.e.\n"
4105 "Some MBCS encodings are not good for some path operations (i.e.\n"
4026 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4106 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4027 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4107 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4028 "This extension can be used to fix the issue with those encodings by\n"
4108 "This extension can be used to fix the issue with those encodings by\n"
4029 "wrapping some functions to convert to Unicode string before path\n"
4109 "wrapping some functions to convert to Unicode string before path\n"
4030 "operation.\n"
4110 "operation.\n"
4031 "\n"
4111 "\n"
4032 "This extension is useful for:\n"
4112 "This extension is useful for:\n"
4033 " * Japanese Windows users using shift_jis encoding.\n"
4113 " * Japanese Windows users using shift_jis encoding.\n"
4034 " * Chinese Windows users using big5 encoding.\n"
4114 " * Chinese Windows users using big5 encoding.\n"
4035 " * All users who use a repository with one of problematic encodings on\n"
4115 " * All users who use a repository with one of problematic encodings on\n"
4036 " case-insensitive file system.\n"
4116 " case-insensitive file system.\n"
4037 "\n"
4117 "\n"
4038 "This extension is not needed for:\n"
4118 "This extension is not needed for:\n"
4039 " * Any user who use only ASCII chars in path.\n"
4119 " * Any user who use only ASCII chars in path.\n"
4040 " * Any user who do not use any of problematic encodings.\n"
4120 " * Any user who do not use any of problematic encodings.\n"
4041 "\n"
4121 "\n"
4042 "Note that there are some limitations on using this extension:\n"
4122 "Note that there are some limitations on using this extension:\n"
4043 " * You should use single encoding in one repository.\n"
4123 " * You should use single encoding in one repository.\n"
4044 " * You should set same encoding for the repository by locale or\n"
4124 " * You should set same encoding for the repository by locale or\n"
4045 " HGENCODING.\n"
4125 " HGENCODING.\n"
4046 "\n"
4126 "\n"
4047 "Path encoding conversion are done between Unicode and\n"
4127 "Path encoding conversion are done between Unicode and\n"
4048 "encoding.encoding which is decided by Mercurial from current locale\n"
4128 "encoding.encoding which is decided by Mercurial from current locale\n"
4049 "setting or HGENCODING.\n"
4129 "setting or HGENCODING.\n"
4050 msgstr ""
4130 msgstr ""
4051
4131
4052 #, python-format
4132 #, python-format
4053 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4133 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4054 msgstr ""
4134 msgstr ""
4055
4135
4056 msgid "[win32mbcs] cannot activate on this platform.\n"
4136 msgid "[win32mbcs] cannot activate on this platform.\n"
4057 msgstr ""
4137 msgstr ""
4058
4138
4059 #, python-format
4139 #, python-format
4060 msgid "[win32mbcs] activated with encoding: %s\n"
4140 msgid "[win32mbcs] activated with encoding: %s\n"
4061 msgstr ""
4141 msgstr ""
4062
4142
4063 msgid ""
4143 msgid ""
4064 "perform automatic newline conversion\n"
4144 "perform automatic newline conversion\n"
4065 "\n"
4145 "\n"
4066 "To perform automatic newline conversion, use:\n"
4146 "To perform automatic newline conversion, use:\n"
4067 "\n"
4147 "\n"
4068 "[extensions]\n"
4148 "[extensions]\n"
4069 "hgext.win32text =\n"
4149 "hgext.win32text =\n"
4070 "[encode]\n"
4150 "[encode]\n"
4071 "** = cleverencode:\n"
4151 "** = cleverencode:\n"
4072 "# or ** = macencode:\n"
4152 "# or ** = macencode:\n"
4073 "\n"
4153 "\n"
4074 "[decode]\n"
4154 "[decode]\n"
4075 "** = cleverdecode:\n"
4155 "** = cleverdecode:\n"
4076 "# or ** = macdecode:\n"
4156 "# or ** = macdecode:\n"
4077 "\n"
4157 "\n"
4078 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4158 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4079 "accident:\n"
4159 "accident:\n"
4080 "\n"
4160 "\n"
4081 "[hooks]\n"
4161 "[hooks]\n"
4082 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4162 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4083 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4163 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4084 "\n"
4164 "\n"
4085 "To do the same check on a server to prevent CRLF/CR from being\n"
4165 "To do the same check on a server to prevent CRLF/CR from being\n"
4086 "pushed or pulled:\n"
4166 "pushed or pulled:\n"
4087 "\n"
4167 "\n"
4088 "[hooks]\n"
4168 "[hooks]\n"
4089 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4169 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4090 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4170 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4091 msgstr ""
4171 msgstr ""
4092
4172
4093 #, python-format
4173 #, python-format
4094 msgid ""
4174 msgid ""
4095 "WARNING: %s already has %s line endings\n"
4175 "WARNING: %s already has %s line endings\n"
4096 "and does not need EOL conversion by the win32text plugin.\n"
4176 "and does not need EOL conversion by the win32text plugin.\n"
4097 "Before your next commit, please reconsider your encode/decode settings in \n"
4177 "Before your next commit, please reconsider your encode/decode settings in \n"
4098 "Mercurial.ini or %s.\n"
4178 "Mercurial.ini or %s.\n"
4099 msgstr ""
4179 msgstr ""
4100
4180
4101 #, python-format
4181 #, python-format
4102 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4182 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4103 msgstr ""
4183 msgstr ""
4104
4184
4105 #, python-format
4185 #, python-format
4106 msgid "in %s: %s\n"
4186 msgid "in %s: %s\n"
4107 msgstr ""
4187 msgstr ""
4108
4188
4109 #, python-format
4189 #, python-format
4110 msgid ""
4190 msgid ""
4111 "\n"
4191 "\n"
4112 "To prevent this mistake in your local repository,\n"
4192 "To prevent this mistake in your local repository,\n"
4113 "add to Mercurial.ini or .hg/hgrc:\n"
4193 "add to Mercurial.ini or .hg/hgrc:\n"
4114 "\n"
4194 "\n"
4115 "[hooks]\n"
4195 "[hooks]\n"
4116 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4196 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4117 "\n"
4197 "\n"
4118 "and also consider adding:\n"
4198 "and also consider adding:\n"
4119 "\n"
4199 "\n"
4120 "[extensions]\n"
4200 "[extensions]\n"
4121 "hgext.win32text =\n"
4201 "hgext.win32text =\n"
4122 "[encode]\n"
4202 "[encode]\n"
4123 "** = %sencode:\n"
4203 "** = %sencode:\n"
4124 "[decode]\n"
4204 "[decode]\n"
4125 "** = %sdecode:\n"
4205 "** = %sdecode:\n"
4126 msgstr ""
4206 msgstr ""
4127
4207
4128 msgid ""
4208 msgid ""
4129 "discover and advertise repositories on the local network\n"
4209 "discover and advertise repositories on the local network\n"
4130 "\n"
4210 "\n"
4131 "Zeroconf enabled repositories will be announced in a network without\n"
4211 "Zeroconf enabled repositories will be announced in a network without\n"
4132 "the need to configure a server or a service. They can be discovered\n"
4212 "the need to configure a server or a service. They can be discovered\n"
4133 "without knowing their actual IP address.\n"
4213 "without knowing their actual IP address.\n"
4134 "\n"
4214 "\n"
4135 "To allow other people to discover your repository using run \"hg serve\"\n"
4215 "To allow other people to discover your repository using run \"hg serve\"\n"
4136 "in your repository.\n"
4216 "in your repository.\n"
4137 "\n"
4217 "\n"
4138 " $ cd test\n"
4218 " $ cd test\n"
4139 " $ hg serve\n"
4219 " $ hg serve\n"
4140 "\n"
4220 "\n"
4141 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4221 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4142 "\n"
4222 "\n"
4143 " $ hg paths\n"
4223 " $ hg paths\n"
4144 " zc-test = http://example.com:8000/test\n"
4224 " zc-test = http://example.com:8000/test\n"
4145 msgstr ""
4225 msgstr ""
4146
4226
4147 msgid "archive prefix contains illegal components"
4227 msgid "archive prefix contains illegal components"
4148 msgstr ""
4228 msgstr ""
4149
4229
4150 msgid "cannot give prefix when archiving to files"
4230 msgid "cannot give prefix when archiving to files"
4151 msgstr ""
4231 msgstr ""
4152
4232
4153 #, python-format
4233 #, python-format
4154 msgid "unknown archive type '%s'"
4234 msgid "unknown archive type '%s'"
4155 msgstr ""
4235 msgstr ""
4156
4236
4157 msgid "invalid changegroup"
4237 msgid "invalid changegroup"
4158 msgstr ""
4238 msgstr ""
4159
4239
4160 msgid "unknown parent"
4240 msgid "unknown parent"
4161 msgstr ""
4241 msgstr ""
4162
4242
4163 #, python-format
4243 #, python-format
4164 msgid "integrity check failed on %s:%d"
4244 msgid "integrity check failed on %s:%d"
4165 msgstr ""
4245 msgstr ""
4166
4246
4167 #, python-format
4247 #, python-format
4168 msgid "%s: not a Mercurial bundle file"
4248 msgid "%s: not a Mercurial bundle file"
4169 msgstr ""
4249 msgstr ""
4170
4250
4171 #, python-format
4251 #, python-format
4172 msgid "%s: unknown bundle version"
4252 msgid "%s: unknown bundle version"
4173 msgstr ""
4253 msgstr ""
4174
4254
4175 #, python-format
4255 #, python-format
4176 msgid "%s: unknown bundle compression type"
4256 msgid "%s: unknown bundle compression type"
4177 msgstr ""
4257 msgstr ""
4178
4258
4179 msgid "cannot create new bundle repository"
4259 msgid "cannot create new bundle repository"
4180 msgstr ""
4260 msgstr ""
4181
4261
4182 #, python-format
4262 #, python-format
4183 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4263 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4184 msgstr ""
4264 msgstr ""
4185
4265
4186 msgid "empty username"
4266 msgid "empty username"
4187 msgstr ""
4267 msgstr ""
4188
4268
4189 #, python-format
4269 #, python-format
4190 msgid "username %s contains a newline"
4270 msgid "username %s contains a newline"
4191 msgstr ""
4271 msgstr ""
4192
4272
4193 msgid "options --message and --logfile are mutually exclusive"
4273 msgid "options --message and --logfile are mutually exclusive"
4194 msgstr ""
4274 msgstr ""
4195
4275
4196 #, python-format
4276 #, python-format
4197 msgid "can't read commit message '%s': %s"
4277 msgid "can't read commit message '%s': %s"
4198 msgstr ""
4278 msgstr ""
4199
4279
4200 msgid "limit must be a positive integer"
4280 msgid "limit must be a positive integer"
4201 msgstr ""
4281 msgstr ""
4202
4282
4203 msgid "limit must be positive"
4283 msgid "limit must be positive"
4204 msgstr ""
4284 msgstr ""
4205
4285
4206 msgid "too many revisions specified"
4286 msgid "too many revisions specified"
4207 msgstr ""
4287 msgstr ""
4208
4288
4209 #, python-format
4289 #, python-format
4210 msgid "invalid format spec '%%%s' in output filename"
4290 msgid "invalid format spec '%%%s' in output filename"
4211 msgstr ""
4291 msgstr ""
4212
4292
4213 #, python-format
4293 #, python-format
4214 msgid "adding %s\n"
4294 msgid "adding %s\n"
4215 msgstr ""
4295 msgstr ""
4216
4296
4217 #, python-format
4297 #, python-format
4218 msgid "removing %s\n"
4298 msgid "removing %s\n"
4219 msgstr ""
4299 msgstr ""
4220
4300
4221 #, python-format
4301 #, python-format
4222 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4302 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4223 msgstr ""
4303 msgstr ""
4224
4304
4225 #, python-format
4305 #, python-format
4226 msgid "%s: not copying - file is not managed\n"
4306 msgid "%s: not copying - file is not managed\n"
4227 msgstr ""
4307 msgstr ""
4228
4308
4229 #, python-format
4309 #, python-format
4230 msgid "%s: not copying - file has been marked for remove\n"
4310 msgid "%s: not copying - file has been marked for remove\n"
4231 msgstr ""
4311 msgstr ""
4232
4312
4233 #, python-format
4313 #, python-format
4234 msgid "%s: not overwriting - %s collides with %s\n"
4314 msgid "%s: not overwriting - %s collides with %s\n"
4235 msgstr ""
4315 msgstr ""
4236
4316
4237 #, python-format
4317 #, python-format
4238 msgid "%s: not overwriting - file exists\n"
4318 msgid "%s: not overwriting - file exists\n"
4239 msgstr ""
4319 msgstr ""
4240
4320
4241 #, python-format
4321 #, python-format
4242 msgid "%s: deleted in working copy\n"
4322 msgid "%s: deleted in working copy\n"
4243 msgstr ""
4323 msgstr ""
4244
4324
4245 #, python-format
4325 #, python-format
4246 msgid "%s: cannot copy - %s\n"
4326 msgid "%s: cannot copy - %s\n"
4247 msgstr ""
4327 msgstr ""
4248
4328
4249 #, python-format
4329 #, python-format
4250 msgid "moving %s to %s\n"
4330 msgid "moving %s to %s\n"
4251 msgstr ""
4331 msgstr ""
4252
4332
4253 #, python-format
4333 #, python-format
4254 msgid "copying %s to %s\n"
4334 msgid "copying %s to %s\n"
4255 msgstr ""
4335 msgstr ""
4256
4336
4257 #, python-format
4337 #, python-format
4258 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4338 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4259 msgstr ""
4339 msgstr ""
4260
4340
4261 msgid "no source or destination specified"
4341 msgid "no source or destination specified"
4262 msgstr ""
4342 msgstr ""
4263
4343
4264 msgid "no destination specified"
4344 msgid "no destination specified"
4265 msgstr ""
4345 msgstr ""
4266
4346
4267 msgid "with multiple sources, destination must be an existing directory"
4347 msgid "with multiple sources, destination must be an existing directory"
4268 msgstr ""
4348 msgstr ""
4269
4349
4270 #, python-format
4350 #, python-format
4271 msgid "destination %s is not a directory"
4351 msgid "destination %s is not a directory"
4272 msgstr ""
4352 msgstr ""
4273
4353
4274 msgid "no files to copy"
4354 msgid "no files to copy"
4275 msgstr ""
4355 msgstr ""
4276
4356
4277 msgid "(consider using --after)\n"
4357 msgid "(consider using --after)\n"
4278 msgstr ""
4358 msgstr ""
4279
4359
4280 #, python-format
4360 #, python-format
4281 msgid "changeset: %d:%s\n"
4361 msgid "changeset: %d:%s\n"
4282 msgstr ""
4362 msgstr ""
4283
4363
4284 #, python-format
4364 #, python-format
4285 msgid "branch: %s\n"
4365 msgid "branch: %s\n"
4286 msgstr ""
4366 msgstr ""
4287
4367
4288 #, python-format
4368 #, python-format
4289 msgid "tag: %s\n"
4369 msgid "tag: %s\n"
4290 msgstr ""
4370 msgstr ""
4291
4371
4292 #, python-format
4372 #, python-format
4293 msgid "parent: %d:%s\n"
4373 msgid "parent: %d:%s\n"
4294 msgstr ""
4374 msgstr ""
4295
4375
4296 #, python-format
4376 #, python-format
4297 msgid "manifest: %d:%s\n"
4377 msgid "manifest: %d:%s\n"
4298 msgstr ""
4378 msgstr ""
4299
4379
4300 #, python-format
4380 #, python-format
4301 msgid "user: %s\n"
4381 msgid "user: %s\n"
4302 msgstr ""
4382 msgstr ""
4303
4383
4304 #, python-format
4384 #, python-format
4305 msgid "date: %s\n"
4385 msgid "date: %s\n"
4306 msgstr ""
4386 msgstr ""
4307
4387
4308 msgid "files+:"
4388 msgid "files+:"
4309 msgstr ""
4389 msgstr ""
4310
4390
4311 msgid "files-:"
4391 msgid "files-:"
4312 msgstr ""
4392 msgstr ""
4313
4393
4314 msgid "files:"
4394 msgid "files:"
4315 msgstr ""
4395 msgstr ""
4316
4396
4317 #, python-format
4397 #, python-format
4318 msgid "files: %s\n"
4398 msgid "files: %s\n"
4319 msgstr ""
4399 msgstr ""
4320
4400
4321 #, python-format
4401 #, python-format
4322 msgid "copies: %s\n"
4402 msgid "copies: %s\n"
4323 msgstr ""
4403 msgstr ""
4324
4404
4325 #, python-format
4405 #, python-format
4326 msgid "extra: %s=%s\n"
4406 msgid "extra: %s=%s\n"
4327 msgstr ""
4407 msgstr ""
4328
4408
4329 msgid "description:\n"
4409 msgid "description:\n"
4330 msgstr ""
4410 msgstr ""
4331
4411
4332 #, python-format
4412 #, python-format
4333 msgid "summary: %s\n"
4413 msgid "summary: %s\n"
4334 msgstr ""
4414 msgstr ""
4335
4415
4336 #, python-format
4416 #, python-format
4337 msgid "%s: no key named '%s'"
4417 msgid "%s: no key named '%s'"
4338 msgstr ""
4418 msgstr ""
4339
4419
4340 #, python-format
4420 #, python-format
4341 msgid "%s: %s"
4421 msgid "%s: %s"
4342 msgstr ""
4422 msgstr ""
4343
4423
4344 #, python-format
4424 #, python-format
4345 msgid "Found revision %s from %s\n"
4425 msgid "Found revision %s from %s\n"
4346 msgstr ""
4426 msgstr ""
4347
4427
4348 msgid "revision matching date not found"
4428 msgid "revision matching date not found"
4349 msgstr ""
4429 msgstr ""
4350
4430
4351 #, python-format
4431 #, python-format
4352 msgid "cannot follow nonexistent file: \"%s\""
4432 msgid "cannot follow nonexistent file: \"%s\""
4353 msgstr ""
4433 msgstr ""
4354
4434
4355 #, python-format
4435 #, python-format
4356 msgid "%s:%s copy source revision cannot be found!\n"
4436 msgid "%s:%s copy source revision cannot be found!\n"
4357 msgstr ""
4437 msgstr ""
4358
4438
4359 msgid "can only follow copies/renames for explicit filenames"
4439 msgid "can only follow copies/renames for explicit filenames"
4360 msgstr ""
4440 msgstr ""
4361
4441
4362 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4442 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4363 msgstr ""
4443 msgstr ""
4364
4444
4365 msgid "HG: Leave message empty to abort commit."
4445 msgid "HG: Leave message empty to abort commit."
4366 msgstr ""
4446 msgstr ""
4367
4447
4368 #, python-format
4448 #, python-format
4369 msgid "HG: user: %s"
4449 msgid "HG: user: %s"
4370 msgstr ""
4450 msgstr ""
4371
4451
4372 msgid "HG: branch merge"
4452 msgid "HG: branch merge"
4373 msgstr ""
4453 msgstr ""
4374
4454
4375 #, python-format
4455 #, python-format
4376 msgid "HG: branch '%s'"
4456 msgid "HG: branch '%s'"
4377 msgstr ""
4457 msgstr ""
4378
4458
4379 #, python-format
4459 #, python-format
4380 msgid "HG: added %s"
4460 msgid "HG: added %s"
4381 msgstr ""
4461 msgstr ""
4382
4462
4383 #, python-format
4463 #, python-format
4384 msgid "HG: changed %s"
4464 msgid "HG: changed %s"
4385 msgstr ""
4465 msgstr ""
4386
4466
4387 #, python-format
4467 #, python-format
4388 msgid "HG: removed %s"
4468 msgid "HG: removed %s"
4389 msgstr ""
4469 msgstr ""
4390
4470
4391 msgid "HG: no files changed"
4471 msgid "HG: no files changed"
4392 msgstr ""
4472 msgstr ""
4393
4473
4394 msgid "empty commit message"
4474 msgid "empty commit message"
4395 msgstr ""
4475 msgstr ""
4396
4476
4397 msgid ""
4477 msgid ""
4398 "add the specified files on the next commit\n"
4478 "add the specified files on the next commit\n"
4399 "\n"
4479 "\n"
4400 " Schedule files to be version controlled and added to the\n"
4480 " Schedule files to be version controlled and added to the\n"
4401 " repository.\n"
4481 " repository.\n"
4402 "\n"
4482 "\n"
4403 " The files will be added to the repository at the next commit. To\n"
4483 " The files will be added to the repository at the next commit. To\n"
4404 " undo an add before that, see hg forget.\n"
4484 " undo an add before that, see hg forget.\n"
4405 "\n"
4485 "\n"
4406 " If no names are given, add all files to the repository.\n"
4486 " If no names are given, add all files to the repository.\n"
4407 " "
4487 " "
4408 msgstr ""
4488 msgstr ""
4409
4489
4410 msgid ""
4490 msgid ""
4411 "add all new files, delete all missing files\n"
4491 "add all new files, delete all missing files\n"
4412 "\n"
4492 "\n"
4413 " Add all new files and remove all missing files from the\n"
4493 " Add all new files and remove all missing files from the\n"
4414 " repository.\n"
4494 " repository.\n"
4415 "\n"
4495 "\n"
4416 " New files are ignored if they match any of the patterns in\n"
4496 " New files are ignored if they match any of the patterns in\n"
4417 " .hgignore. As with add, these changes take effect at the next\n"
4497 " .hgignore. As with add, these changes take effect at the next\n"
4418 " commit.\n"
4498 " commit.\n"
4419 "\n"
4499 "\n"
4420 " Use the -s/--similarity option to detect renamed files. With a\n"
4500 " Use the -s/--similarity option to detect renamed files. With a\n"
4421 " parameter > 0, this compares every removed file with every added\n"
4501 " parameter > 0, this compares every removed file with every added\n"
4422 " file and records those similar enough as renames. This option\n"
4502 " file and records those similar enough as renames. This option\n"
4423 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4503 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4424 " identical) as its parameter. Detecting renamed files this way can\n"
4504 " identical) as its parameter. Detecting renamed files this way can\n"
4425 " be expensive.\n"
4505 " be expensive.\n"
4426 " "
4506 " "
4427 msgstr ""
4507 msgstr ""
4428
4508
4429 msgid "similarity must be a number"
4509 msgid "similarity must be a number"
4430 msgstr ""
4510 msgstr ""
4431
4511
4432 msgid "similarity must be between 0 and 100"
4512 msgid "similarity must be between 0 and 100"
4433 msgstr ""
4513 msgstr ""
4434
4514
4435 msgid ""
4515 msgid ""
4436 "show changeset information by line for each file\n"
4516 "show changeset information by line for each file\n"
4437 "\n"
4517 "\n"
4438 " List changes in files, showing the revision id responsible for\n"
4518 " List changes in files, showing the revision id responsible for\n"
4439 " each line\n"
4519 " each line\n"
4440 "\n"
4520 "\n"
4441 " This command is useful for discovering when a change was made and\n"
4521 " This command is useful for discovering when a change was made and\n"
4442 " by whom.\n"
4522 " by whom.\n"
4443 "\n"
4523 "\n"
4444 " Without the -a/--text option, annotate will avoid processing files\n"
4524 " Without the -a/--text option, annotate will avoid processing files\n"
4445 " it detects as binary. With -a, annotate will annotate the file\n"
4525 " it detects as binary. With -a, annotate will annotate the file\n"
4446 " anyway, although the results will probably be neither useful\n"
4526 " anyway, although the results will probably be neither useful\n"
4447 " nor desirable.\n"
4527 " nor desirable.\n"
4448 " "
4528 " "
4449 msgstr ""
4529 msgstr ""
4450
4530
4451 msgid "at least one filename or pattern is required"
4531 msgid "at least one filename or pattern is required"
4452 msgstr ""
4532 msgstr ""
4453
4533
4454 msgid "at least one of -n/-c is required for -l"
4534 msgid "at least one of -n/-c is required for -l"
4455 msgstr ""
4535 msgstr ""
4456
4536
4457 #, python-format
4537 #, python-format
4458 msgid "%s: binary file\n"
4538 msgid "%s: binary file\n"
4459 msgstr ""
4539 msgstr ""
4460
4540
4461 msgid ""
4541 msgid ""
4462 "create an unversioned archive of a repository revision\n"
4542 "create an unversioned archive of a repository revision\n"
4463 "\n"
4543 "\n"
4464 " By default, the revision used is the parent of the working\n"
4544 " By default, the revision used is the parent of the working\n"
4465 " directory; use -r/--rev to specify a different revision.\n"
4545 " directory; use -r/--rev to specify a different revision.\n"
4466 "\n"
4546 "\n"
4467 " To specify the type of archive to create, use -t/--type. Valid\n"
4547 " To specify the type of archive to create, use -t/--type. Valid\n"
4468 " types are:\n"
4548 " types are:\n"
4469 "\n"
4549 "\n"
4470 " \"files\" (default): a directory full of files\n"
4550 " \"files\" (default): a directory full of files\n"
4471 " \"tar\": tar archive, uncompressed\n"
4551 " \"tar\": tar archive, uncompressed\n"
4472 " \"tbz2\": tar archive, compressed using bzip2\n"
4552 " \"tbz2\": tar archive, compressed using bzip2\n"
4473 " \"tgz\": tar archive, compressed using gzip\n"
4553 " \"tgz\": tar archive, compressed using gzip\n"
4474 " \"uzip\": zip archive, uncompressed\n"
4554 " \"uzip\": zip archive, uncompressed\n"
4475 " \"zip\": zip archive, compressed using deflate\n"
4555 " \"zip\": zip archive, compressed using deflate\n"
4476 "\n"
4556 "\n"
4477 " The exact name of the destination archive or directory is given\n"
4557 " The exact name of the destination archive or directory is given\n"
4478 " using a format string; see 'hg help export' for details.\n"
4558 " using a format string; see 'hg help export' for details.\n"
4479 "\n"
4559 "\n"
4480 " Each member added to an archive file has a directory prefix\n"
4560 " Each member added to an archive file has a directory prefix\n"
4481 " prepended. Use -p/--prefix to specify a format string for the\n"
4561 " prepended. Use -p/--prefix to specify a format string for the\n"
4482 " prefix. The default is the basename of the archive, with suffixes\n"
4562 " prefix. The default is the basename of the archive, with suffixes\n"
4483 " removed.\n"
4563 " removed.\n"
4484 " "
4564 " "
4485 msgstr ""
4565 msgstr ""
4486
4566
4487 msgid "no working directory: please specify a revision"
4567 msgid "no working directory: please specify a revision"
4488 msgstr ""
4568 msgstr ""
4489
4569
4490 msgid "repository root cannot be destination"
4570 msgid "repository root cannot be destination"
4491 msgstr ""
4571 msgstr ""
4492
4572
4493 msgid "cannot archive plain files to stdout"
4573 msgid "cannot archive plain files to stdout"
4494 msgstr ""
4574 msgstr ""
4495
4575
4496 msgid ""
4576 msgid ""
4497 "reverse effect of earlier changeset\n"
4577 "reverse effect of earlier changeset\n"
4498 "\n"
4578 "\n"
4499 " Commit the backed out changes as a new changeset. The new\n"
4579 " Commit the backed out changes as a new changeset. The new\n"
4500 " changeset is a child of the backed out changeset.\n"
4580 " changeset is a child of the backed out changeset.\n"
4501 "\n"
4581 "\n"
4502 " If you backout a changeset other than the tip, a new head is\n"
4582 " If you backout a changeset other than the tip, a new head is\n"
4503 " created. This head will be the new tip and you should merge this\n"
4583 " created. This head will be the new tip and you should merge this\n"
4504 " backout changeset with another head.\n"
4584 " backout changeset with another head.\n"
4505 "\n"
4585 "\n"
4506 " The --merge option remembers the parent of the working directory\n"
4586 " The --merge option remembers the parent of the working directory\n"
4507 " before starting the backout, then merges the new head with that\n"
4587 " before starting the backout, then merges the new head with that\n"
4508 " changeset afterwards. This saves you from doing the merge by hand.\n"
4588 " changeset afterwards. This saves you from doing the merge by hand.\n"
4509 " The result of this merge is not committed, as with a normal merge.\n"
4589 " The result of this merge is not committed, as with a normal merge.\n"
4510 "\n"
4590 "\n"
4511 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4591 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4512 " "
4592 " "
4513 msgstr ""
4593 msgstr ""
4514
4594
4515 msgid "please specify just one revision"
4595 msgid "please specify just one revision"
4516 msgstr ""
4596 msgstr ""
4517
4597
4518 msgid "please specify a revision to backout"
4598 msgid "please specify a revision to backout"
4519 msgstr ""
4599 msgstr ""
4520
4600
4521 msgid "cannot backout change on a different branch"
4601 msgid "cannot backout change on a different branch"
4522 msgstr ""
4602 msgstr ""
4523
4603
4524 msgid "cannot backout a change with no parents"
4604 msgid "cannot backout a change with no parents"
4525 msgstr ""
4605 msgstr ""
4526
4606
4527 msgid "cannot backout a merge changeset without --parent"
4607 msgid "cannot backout a merge changeset without --parent"
4528 msgstr ""
4608 msgstr ""
4529
4609
4530 #, python-format
4610 #, python-format
4531 msgid "%s is not a parent of %s"
4611 msgid "%s is not a parent of %s"
4532 msgstr ""
4612 msgstr ""
4533
4613
4534 msgid "cannot use --parent on non-merge changeset"
4614 msgid "cannot use --parent on non-merge changeset"
4535 msgstr ""
4615 msgstr ""
4536
4616
4537 #, python-format
4617 #, python-format
4538 msgid "Backed out changeset %s"
4618 msgid "Backed out changeset %s"
4539 msgstr ""
4619 msgstr ""
4540
4620
4541 #, python-format
4621 #, python-format
4542 msgid "changeset %s backs out changeset %s\n"
4622 msgid "changeset %s backs out changeset %s\n"
4543 msgstr ""
4623 msgstr ""
4544
4624
4545 #, python-format
4625 #, python-format
4546 msgid "merging with changeset %s\n"
4626 msgid "merging with changeset %s\n"
4547 msgstr ""
4627 msgstr ""
4548
4628
4549 msgid "the backout changeset is a new head - do not forget to merge\n"
4629 msgid "the backout changeset is a new head - do not forget to merge\n"
4550 msgstr ""
4630 msgstr ""
4551
4631
4552 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4632 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4553 msgstr ""
4633 msgstr ""
4554
4634
4555 msgid ""
4635 msgid ""
4556 "subdivision search of changesets\n"
4636 "subdivision search of changesets\n"
4557 "\n"
4637 "\n"
4558 " This command helps to find changesets which introduce problems. To\n"
4638 " This command helps to find changesets which introduce problems. To\n"
4559 " use, mark the earliest changeset you know exhibits the problem as\n"
4639 " use, mark the earliest changeset you know exhibits the problem as\n"
4560 " bad, then mark the latest changeset which is free from the problem\n"
4640 " bad, then mark the latest changeset which is free from the problem\n"
4561 " as good. Bisect will update your working directory to a revision\n"
4641 " as good. Bisect will update your working directory to a revision\n"
4562 " for testing (unless the -U/--noupdate option is specified). Once\n"
4642 " for testing (unless the -U/--noupdate option is specified). Once\n"
4563 " you have performed tests, mark the working directory as good or\n"
4643 " you have performed tests, mark the working directory as good or\n"
4564 " bad, and bisect will either update to another candidate changeset\n"
4644 " bad, and bisect will either update to another candidate changeset\n"
4565 " or announce that it has found the bad revision.\n"
4645 " or announce that it has found the bad revision.\n"
4566 "\n"
4646 "\n"
4567 " As a shortcut, you can also use the revision argument to mark a\n"
4647 " As a shortcut, you can also use the revision argument to mark a\n"
4568 " revision as good or bad without checking it out first.\n"
4648 " revision as good or bad without checking it out first.\n"
4569 "\n"
4649 "\n"
4570 " If you supply a command, it will be used for automatic bisection.\n"
4650 " If you supply a command, it will be used for automatic bisection.\n"
4571 " Its exit status will be used to mark revisions as good or bad:\n"
4651 " Its exit status will be used to mark revisions as good or bad:\n"
4572 " status 0 means good, 125 means to skip the revision, 127\n"
4652 " status 0 means good, 125 means to skip the revision, 127\n"
4573 " (command not found) will abort the bisection, and any other\n"
4653 " (command not found) will abort the bisection, and any other\n"
4574 " non-zero exit status means the revision is bad.\n"
4654 " non-zero exit status means the revision is bad.\n"
4575 " "
4655 " "
4576 msgstr ""
4656 msgstr ""
4577
4657
4578 msgid "The first good revision is:\n"
4658 msgid "The first good revision is:\n"
4579 msgstr ""
4659 msgstr ""
4580
4660
4581 msgid "The first bad revision is:\n"
4661 msgid "The first bad revision is:\n"
4582 msgstr ""
4662 msgstr ""
4583
4663
4584 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4664 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4585 msgstr ""
4665 msgstr ""
4586
4666
4587 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4667 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4588 msgstr ""
4668 msgstr ""
4589
4669
4590 msgid "cannot bisect (no known good revisions)"
4670 msgid "cannot bisect (no known good revisions)"
4591 msgstr ""
4671 msgstr ""
4592
4672
4593 msgid "cannot bisect (no known bad revisions)"
4673 msgid "cannot bisect (no known bad revisions)"
4594 msgstr ""
4674 msgstr ""
4595
4675
4596 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4676 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4597 msgstr ""
4677 msgstr ""
4598
4678
4599 msgid "incompatible arguments"
4679 msgid "incompatible arguments"
4600 msgstr ""
4680 msgstr ""
4601
4681
4602 #, python-format
4682 #, python-format
4603 msgid "cannot find executable: %s"
4683 msgid "cannot find executable: %s"
4604 msgstr ""
4684 msgstr ""
4605
4685
4606 #, python-format
4686 #, python-format
4607 msgid "failed to execute %s"
4687 msgid "failed to execute %s"
4608 msgstr ""
4688 msgstr ""
4609
4689
4610 #, python-format
4690 #, python-format
4611 msgid "%s killed"
4691 msgid "%s killed"
4612 msgstr ""
4692 msgstr ""
4613
4693
4614 #, python-format
4694 #, python-format
4615 msgid "Changeset %d:%s: %s\n"
4695 msgid "Changeset %d:%s: %s\n"
4616 msgstr ""
4696 msgstr ""
4617
4697
4618 #, python-format
4698 #, python-format
4619 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4699 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4620 msgstr ""
4700 msgstr ""
4621
4701
4622 msgid ""
4702 msgid ""
4623 "set or show the current branch name\n"
4703 "set or show the current branch name\n"
4624 "\n"
4704 "\n"
4625 " With no argument, show the current branch name. With one argument,\n"
4705 " With no argument, show the current branch name. With one argument,\n"
4626 " set the working directory branch name (the branch will not exist\n"
4706 " set the working directory branch name (the branch will not exist\n"
4627 " in the repository until the next commit). Standard practice\n"
4707 " in the repository until the next commit). Standard practice\n"
4628 " recommends that primary development take place on the 'default'\n"
4708 " recommends that primary development take place on the 'default'\n"
4629 " branch.\n"
4709 " branch.\n"
4630 "\n"
4710 "\n"
4631 " Unless -f/--force is specified, branch will not let you set a\n"
4711 " Unless -f/--force is specified, branch will not let you set a\n"
4632 " branch name that already exists, even if it's inactive.\n"
4712 " branch name that already exists, even if it's inactive.\n"
4633 "\n"
4713 "\n"
4634 " Use -C/--clean to reset the working directory branch to that of\n"
4714 " Use -C/--clean to reset the working directory branch to that of\n"
4635 " the parent of the working directory, negating a previous branch\n"
4715 " the parent of the working directory, negating a previous branch\n"
4636 " change.\n"
4716 " change.\n"
4637 "\n"
4717 "\n"
4638 " Use the command 'hg update' to switch to an existing branch.\n"
4718 " Use the command 'hg update' to switch to an existing branch.\n"
4639 " "
4719 " "
4640 msgstr ""
4720 msgstr ""
4641
4721
4642 #, python-format
4722 #, python-format
4643 msgid "reset working directory to branch %s\n"
4723 msgid "reset working directory to branch %s\n"
4644 msgstr ""
4724 msgstr ""
4645
4725
4646 msgid "a branch of the same name already exists (use --force to override)"
4726 msgid "a branch of the same name already exists (use --force to override)"
4647 msgstr ""
4727 msgstr ""
4648
4728
4649 #, python-format
4729 #, python-format
4650 msgid "marked working directory as branch %s\n"
4730 msgid "marked working directory as branch %s\n"
4651 msgstr ""
4731 msgstr ""
4652
4732
4653 msgid ""
4733 msgid ""
4654 "list repository named branches\n"
4734 "list repository named branches\n"
4655 "\n"
4735 "\n"
4656 " List the repository's named branches, indicating which ones are\n"
4736 " List the repository's named branches, indicating which ones are\n"
4657 " inactive. If active is specified, only show active branches.\n"
4737 " inactive. If active is specified, only show active branches.\n"
4658 "\n"
4738 "\n"
4659 " A branch is considered active if it contains repository heads.\n"
4739 " A branch is considered active if it contains repository heads.\n"
4660 "\n"
4740 "\n"
4661 " Use the command 'hg update' to switch to an existing branch.\n"
4741 " Use the command 'hg update' to switch to an existing branch.\n"
4662 " "
4742 " "
4663 msgstr ""
4743 msgstr ""
4664
4744
4665 msgid ""
4745 msgid ""
4666 "create a changegroup file\n"
4746 "create a changegroup file\n"
4667 "\n"
4747 "\n"
4668 " Generate a compressed changegroup file collecting changesets not\n"
4748 " Generate a compressed changegroup file collecting changesets not\n"
4669 " known to be in another repository.\n"
4749 " known to be in another repository.\n"
4670 "\n"
4750 "\n"
4671 " If no destination repository is specified the destination is\n"
4751 " If no destination repository is specified the destination is\n"
4672 " assumed to have all the nodes specified by one or more --base\n"
4752 " assumed to have all the nodes specified by one or more --base\n"
4673 " parameters. To create a bundle containing all changesets, use\n"
4753 " parameters. To create a bundle containing all changesets, use\n"
4674 " -a/--all (or --base null).\n"
4754 " -a/--all (or --base null).\n"
4675 "\n"
4755 "\n"
4676 " To change the compression method applied, use the -t/--type\n"
4756 " To change the compression method applied, use the -t/--type\n"
4677 " option. The available compression methods are: none, bzip2, and\n"
4757 " option. The available compression methods are: none, bzip2, and\n"
4678 " gzip (by default, bundles are compressed using bzip2).\n"
4758 " gzip (by default, bundles are compressed using bzip2).\n"
4679 "\n"
4759 "\n"
4680 " The bundle file can then be transferred using conventional means\n"
4760 " The bundle file can then be transferred using conventional means\n"
4681 " and applied to another repository with the unbundle or pull\n"
4761 " and applied to another repository with the unbundle or pull\n"
4682 " command. This is useful when direct push and pull are not\n"
4762 " command. This is useful when direct push and pull are not\n"
4683 " available or when exporting an entire repository is undesirable.\n"
4763 " available or when exporting an entire repository is undesirable.\n"
4684 "\n"
4764 "\n"
4685 " Applying bundles preserves all changeset contents including\n"
4765 " Applying bundles preserves all changeset contents including\n"
4686 " permissions, copy/rename information, and revision history.\n"
4766 " permissions, copy/rename information, and revision history.\n"
4687 " "
4767 " "
4688 msgstr ""
4768 msgstr ""
4689
4769
4690 msgid "--base is incompatible with specifying a destination"
4770 msgid "--base is incompatible with specifying a destination"
4691 msgstr ""
4771 msgstr ""
4692
4772
4693 msgid "unknown bundle type specified with --type"
4773 msgid "unknown bundle type specified with --type"
4694 msgstr ""
4774 msgstr ""
4695
4775
4696 msgid ""
4776 msgid ""
4697 "output the current or given revision of files\n"
4777 "output the current or given revision of files\n"
4698 "\n"
4778 "\n"
4699 " Print the specified files as they were at the given revision. If\n"
4779 " Print the specified files as they were at the given revision. If\n"
4700 " no revision is given, the parent of the working directory is used,\n"
4780 " no revision is given, the parent of the working directory is used,\n"
4701 " or tip if no revision is checked out.\n"
4781 " or tip if no revision is checked out.\n"
4702 "\n"
4782 "\n"
4703 " Output may be to a file, in which case the name of the file is\n"
4783 " Output may be to a file, in which case the name of the file is\n"
4704 " given using a format string. The formatting rules are the same as\n"
4784 " given using a format string. The formatting rules are the same as\n"
4705 " for the export command, with the following additions:\n"
4785 " for the export command, with the following additions:\n"
4706 "\n"
4786 "\n"
4707 " %s basename of file being printed\n"
4787 " %s basename of file being printed\n"
4708 " %d dirname of file being printed, or '.' if in repository root\n"
4788 " %d dirname of file being printed, or '.' if in repository root\n"
4709 " %p root-relative path name of file being printed\n"
4789 " %p root-relative path name of file being printed\n"
4710 " "
4790 " "
4711 msgstr ""
4791 msgstr ""
4712
4792
4713 msgid ""
4793 msgid ""
4714 "make a copy of an existing repository\n"
4794 "make a copy of an existing repository\n"
4715 "\n"
4795 "\n"
4716 " Create a copy of an existing repository in a new directory.\n"
4796 " Create a copy of an existing repository in a new directory.\n"
4717 "\n"
4797 "\n"
4718 " If no destination directory name is specified, it defaults to the\n"
4798 " If no destination directory name is specified, it defaults to the\n"
4719 " basename of the source.\n"
4799 " basename of the source.\n"
4720 "\n"
4800 "\n"
4721 " The location of the source is added to the new repository's\n"
4801 " The location of the source is added to the new repository's\n"
4722 " .hg/hgrc file, as the default to be used for future pulls.\n"
4802 " .hg/hgrc file, as the default to be used for future pulls.\n"
4723 "\n"
4803 "\n"
4724 " If you use the -r/--rev option to clone up to a specific revision,\n"
4804 " If you use the -r/--rev option to clone up to a specific revision,\n"
4725 " no subsequent revisions (including subsequent tags) will be\n"
4805 " no subsequent revisions (including subsequent tags) will be\n"
4726 " present in the cloned repository. This option implies --pull, even\n"
4806 " present in the cloned repository. This option implies --pull, even\n"
4727 " on local repositories.\n"
4807 " on local repositories.\n"
4728 "\n"
4808 "\n"
4729 " By default, clone will check out the head of the 'default' branch.\n"
4809 " By default, clone will check out the head of the 'default' branch.\n"
4730 " If the -U/--noupdate option is used, the new clone will contain\n"
4810 " If the -U/--noupdate option is used, the new clone will contain\n"
4731 " only a repository (.hg) and no working copy (the working copy\n"
4811 " only a repository (.hg) and no working copy (the working copy\n"
4732 " parent is the null revision).\n"
4812 " parent is the null revision).\n"
4733 "\n"
4813 "\n"
4734 " See 'hg help urls' for valid source format details.\n"
4814 " See 'hg help urls' for valid source format details.\n"
4735 "\n"
4815 "\n"
4736 " It is possible to specify an ssh:// URL as the destination, but no\n"
4816 " It is possible to specify an ssh:// URL as the destination, but no\n"
4737 " .hg/hgrc and working directory will be created on the remote side.\n"
4817 " .hg/hgrc and working directory will be created on the remote side.\n"
4738 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4818 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4739 "\n"
4819 "\n"
4740 " For efficiency, hardlinks are used for cloning whenever the source\n"
4820 " For efficiency, hardlinks are used for cloning whenever the source\n"
4741 " and destination are on the same filesystem (note this applies only\n"
4821 " and destination are on the same filesystem (note this applies only\n"
4742 " to the repository data, not to the checked out files). Some\n"
4822 " to the repository data, not to the checked out files). Some\n"
4743 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4823 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4744 " do not report errors. In these cases, use the --pull option to\n"
4824 " do not report errors. In these cases, use the --pull option to\n"
4745 " avoid hardlinking.\n"
4825 " avoid hardlinking.\n"
4746 "\n"
4826 "\n"
4747 " In some cases, you can clone repositories and checked out files\n"
4827 " In some cases, you can clone repositories and checked out files\n"
4748 " using full hardlinks with\n"
4828 " using full hardlinks with\n"
4749 "\n"
4829 "\n"
4750 " $ cp -al REPO REPOCLONE\n"
4830 " $ cp -al REPO REPOCLONE\n"
4751 "\n"
4831 "\n"
4752 " This is the fastest way to clone, but it is not always safe. The\n"
4832 " This is the fastest way to clone, but it is not always safe. The\n"
4753 " operation is not atomic (making sure REPO is not modified during\n"
4833 " operation is not atomic (making sure REPO is not modified during\n"
4754 " the operation is up to you) and you have to make sure your editor\n"
4834 " the operation is up to you) and you have to make sure your editor\n"
4755 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4835 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4756 " this is not compatible with certain extensions that place their\n"
4836 " this is not compatible with certain extensions that place their\n"
4757 " metadata under the .hg directory, such as mq.\n"
4837 " metadata under the .hg directory, such as mq.\n"
4758 "\n"
4838 "\n"
4759 " "
4839 " "
4760 msgstr ""
4840 msgstr ""
4761
4841
4762 msgid ""
4842 msgid ""
4763 "commit the specified files or all outstanding changes\n"
4843 "commit the specified files or all outstanding changes\n"
4764 "\n"
4844 "\n"
4765 " Commit changes to the given files into the repository. Unlike a\n"
4845 " Commit changes to the given files into the repository. Unlike a\n"
4766 " centralized RCS, this operation is a local operation. See hg push\n"
4846 " centralized RCS, this operation is a local operation. See hg push\n"
4767 " for a way to actively distribute your changes.\n"
4847 " for a way to actively distribute your changes.\n"
4768 "\n"
4848 "\n"
4769 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4849 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4770 " will be committed.\n"
4850 " will be committed.\n"
4771 "\n"
4851 "\n"
4772 " If you are committing the result of a merge, do not provide any\n"
4852 " If you are committing the result of a merge, do not provide any\n"
4773 " filenames or -I/-X filters.\n"
4853 " filenames or -I/-X filters.\n"
4774 "\n"
4854 "\n"
4775 " If no commit message is specified, the configured editor is\n"
4855 " If no commit message is specified, the configured editor is\n"
4776 " started to prompt you for a message.\n"
4856 " started to prompt you for a message.\n"
4777 "\n"
4857 "\n"
4778 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4858 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4779 " "
4859 " "
4780 msgstr ""
4860 msgstr ""
4781
4861
4782 msgid "created new head\n"
4862 msgid "created new head\n"
4783 msgstr ""
4863 msgstr ""
4784
4864
4785 #, python-format
4865 #, python-format
4786 msgid "committed changeset %d:%s\n"
4866 msgid "committed changeset %d:%s\n"
4787 msgstr ""
4867 msgstr ""
4788
4868
4789 msgid ""
4869 msgid ""
4790 "mark files as copied for the next commit\n"
4870 "mark files as copied for the next commit\n"
4791 "\n"
4871 "\n"
4792 " Mark dest as having copies of source files. If dest is a\n"
4872 " Mark dest as having copies of source files. If dest is a\n"
4793 " directory, copies are put in that directory. If dest is a file,\n"
4873 " directory, copies are put in that directory. If dest is a file,\n"
4794 " the source must be a single file.\n"
4874 " the source must be a single file.\n"
4795 "\n"
4875 "\n"
4796 " By default, this command copies the contents of files as they\n"
4876 " By default, this command copies the contents of files as they\n"
4797 " exist in the working directory. If invoked with -A/--after, the\n"
4877 " exist in the working directory. If invoked with -A/--after, the\n"
4798 " operation is recorded, but no copying is performed.\n"
4878 " operation is recorded, but no copying is performed.\n"
4799 "\n"
4879 "\n"
4800 " This command takes effect with the next commit. To undo a copy\n"
4880 " This command takes effect with the next commit. To undo a copy\n"
4801 " before that, see hg revert.\n"
4881 " before that, see hg revert.\n"
4802 " "
4882 " "
4803 msgstr ""
4883 msgstr ""
4804
4884
4805 msgid "find the ancestor revision of two revisions in a given index"
4885 msgid "find the ancestor revision of two revisions in a given index"
4806 msgstr ""
4886 msgstr ""
4807
4887
4808 msgid "There is no Mercurial repository here (.hg not found)"
4888 msgid "There is no Mercurial repository here (.hg not found)"
4809 msgstr ""
4889 msgstr ""
4810
4890
4811 msgid "either two or three arguments required"
4891 msgid "either two or three arguments required"
4812 msgstr ""
4892 msgstr ""
4813
4893
4814 msgid "returns the completion list associated with the given command"
4894 msgid "returns the completion list associated with the given command"
4815 msgstr ""
4895 msgstr ""
4816
4896
4817 msgid "rebuild the dirstate as it would look like for the given revision"
4897 msgid "rebuild the dirstate as it would look like for the given revision"
4818 msgstr ""
4898 msgstr ""
4819
4899
4820 msgid "validate the correctness of the current dirstate"
4900 msgid "validate the correctness of the current dirstate"
4821 msgstr ""
4901 msgstr ""
4822
4902
4823 #, python-format
4903 #, python-format
4824 msgid "%s in state %s, but not in manifest1\n"
4904 msgid "%s in state %s, but not in manifest1\n"
4825 msgstr ""
4905 msgstr ""
4826
4906
4827 #, python-format
4907 #, python-format
4828 msgid "%s in state %s, but also in manifest1\n"
4908 msgid "%s in state %s, but also in manifest1\n"
4829 msgstr ""
4909 msgstr ""
4830
4910
4831 #, python-format
4911 #, python-format
4832 msgid "%s in state %s, but not in either manifest\n"
4912 msgid "%s in state %s, but not in either manifest\n"
4833 msgstr ""
4913 msgstr ""
4834
4914
4835 #, python-format
4915 #, python-format
4836 msgid "%s in manifest1, but listed as state %s"
4916 msgid "%s in manifest1, but listed as state %s"
4837 msgstr ""
4917 msgstr ""
4838
4918
4839 msgid ".hg/dirstate inconsistent with current parent's manifest"
4919 msgid ".hg/dirstate inconsistent with current parent's manifest"
4840 msgstr ""
4920 msgstr ""
4841
4921
4842 msgid ""
4922 msgid ""
4843 "show combined config settings from all hgrc files\n"
4923 "show combined config settings from all hgrc files\n"
4844 "\n"
4924 "\n"
4845 " With no arguments, print names and values of all config items.\n"
4925 " With no arguments, print names and values of all config items.\n"
4846 "\n"
4926 "\n"
4847 " With one argument of the form section.name, print just the value\n"
4927 " With one argument of the form section.name, print just the value\n"
4848 " of that config item.\n"
4928 " of that config item.\n"
4849 "\n"
4929 "\n"
4850 " With multiple arguments, print names and values of all config\n"
4930 " With multiple arguments, print names and values of all config\n"
4851 " items with matching section names.\n"
4931 " items with matching section names.\n"
4852 "\n"
4932 "\n"
4853 " With --debug, the source (filename and line number) is printed\n"
4933 " With --debug, the source (filename and line number) is printed\n"
4854 " for each config item.\n"
4934 " for each config item.\n"
4855 " "
4935 " "
4856 msgstr ""
4936 msgstr ""
4857
4937
4858 msgid "only one config item permitted"
4938 msgid "only one config item permitted"
4859 msgstr ""
4939 msgstr ""
4860
4940
4861 msgid ""
4941 msgid ""
4862 "manually set the parents of the current working directory\n"
4942 "manually set the parents of the current working directory\n"
4863 "\n"
4943 "\n"
4864 " This is useful for writing repository conversion tools, but should\n"
4944 " This is useful for writing repository conversion tools, but should\n"
4865 " be used with care.\n"
4945 " be used with care.\n"
4866 " "
4946 " "
4867 msgstr ""
4947 msgstr ""
4868
4948
4869 msgid "show the contents of the current dirstate"
4949 msgid "show the contents of the current dirstate"
4870 msgstr ""
4950 msgstr ""
4871
4951
4872 #, python-format
4952 #, python-format
4873 msgid "copy: %s -> %s\n"
4953 msgid "copy: %s -> %s\n"
4874 msgstr ""
4954 msgstr ""
4875
4955
4876 msgid "dump the contents of a data file revision"
4956 msgid "dump the contents of a data file revision"
4877 msgstr ""
4957 msgstr ""
4878
4958
4879 #, python-format
4959 #, python-format
4880 msgid "invalid revision identifier %s"
4960 msgid "invalid revision identifier %s"
4881 msgstr ""
4961 msgstr ""
4882
4962
4883 msgid "parse and display a date"
4963 msgid "parse and display a date"
4884 msgstr ""
4964 msgstr ""
4885
4965
4886 msgid "dump the contents of an index file"
4966 msgid "dump the contents of an index file"
4887 msgstr ""
4967 msgstr ""
4888
4968
4889 msgid "dump an index DAG as a graphviz dot file"
4969 msgid "dump an index DAG as a graphviz dot file"
4890 msgstr ""
4970 msgstr ""
4891
4971
4892 msgid "test Mercurial installation"
4972 msgid "test Mercurial installation"
4893 msgstr ""
4973 msgstr ""
4894
4974
4895 #, python-format
4975 #, python-format
4896 msgid "Checking encoding (%s)...\n"
4976 msgid "Checking encoding (%s)...\n"
4897 msgstr ""
4977 msgstr ""
4898
4978
4899 msgid " (check that your locale is properly set)\n"
4979 msgid " (check that your locale is properly set)\n"
4900 msgstr ""
4980 msgstr ""
4901
4981
4902 msgid "Checking extensions...\n"
4982 msgid "Checking extensions...\n"
4903 msgstr ""
4983 msgstr ""
4904
4984
4905 msgid " One or more extensions could not be found"
4985 msgid " One or more extensions could not be found"
4906 msgstr ""
4986 msgstr ""
4907
4987
4908 msgid " (check that you compiled the extensions)\n"
4988 msgid " (check that you compiled the extensions)\n"
4909 msgstr ""
4989 msgstr ""
4910
4990
4911 msgid "Checking templates...\n"
4991 msgid "Checking templates...\n"
4912 msgstr ""
4992 msgstr ""
4913
4993
4914 msgid " (templates seem to have been installed incorrectly)\n"
4994 msgid " (templates seem to have been installed incorrectly)\n"
4915 msgstr ""
4995 msgstr ""
4916
4996
4917 msgid "Checking patch...\n"
4997 msgid "Checking patch...\n"
4918 msgstr ""
4998 msgstr ""
4919
4999
4920 msgid " patch call failed:\n"
5000 msgid " patch call failed:\n"
4921 msgstr ""
5001 msgstr ""
4922
5002
4923 msgid " unexpected patch output!\n"
5003 msgid " unexpected patch output!\n"
4924 msgstr ""
5004 msgstr ""
4925
5005
4926 msgid " patch test failed!\n"
5006 msgid " patch test failed!\n"
4927 msgstr ""
5007 msgstr ""
4928
5008
4929 msgid ""
5009 msgid ""
4930 " (Current patch tool may be incompatible with patch, or misconfigured. "
5010 " (Current patch tool may be incompatible with patch, or misconfigured. "
4931 "Please check your .hgrc file)\n"
5011 "Please check your .hgrc file)\n"
4932 msgstr ""
5012 msgstr ""
4933
5013
4934 msgid ""
5014 msgid ""
4935 " Internal patcher failure, please report this error to http://www.selenic."
5015 " Internal patcher failure, please report this error to http://www.selenic."
4936 "com/mercurial/bts\n"
5016 "com/mercurial/bts\n"
4937 msgstr ""
5017 msgstr ""
4938
5018
4939 msgid "Checking commit editor...\n"
5019 msgid "Checking commit editor...\n"
4940 msgstr ""
5020 msgstr ""
4941
5021
4942 msgid " No commit editor set and can't find vi in PATH\n"
5022 msgid " No commit editor set and can't find vi in PATH\n"
4943 msgstr ""
5023 msgstr ""
4944
5024
4945 msgid " (specify a commit editor in your .hgrc file)\n"
5025 msgid " (specify a commit editor in your .hgrc file)\n"
4946 msgstr ""
5026 msgstr ""
4947
5027
4948 #, python-format
5028 #, python-format
4949 msgid " Can't find editor '%s' in PATH\n"
5029 msgid " Can't find editor '%s' in PATH\n"
4950 msgstr ""
5030 msgstr ""
4951
5031
4952 msgid "Checking username...\n"
5032 msgid "Checking username...\n"
4953 msgstr ""
5033 msgstr ""
4954
5034
4955 msgid " (specify a username in your .hgrc file)\n"
5035 msgid " (specify a username in your .hgrc file)\n"
4956 msgstr ""
5036 msgstr ""
4957
5037
4958 msgid "No problems detected\n"
5038 msgid "No problems detected\n"
4959 msgstr ""
5039 msgstr ""
4960
5040
4961 #, python-format
5041 #, python-format
4962 msgid "%s problems detected, please check your install!\n"
5042 msgid "%s problems detected, please check your install!\n"
4963 msgstr ""
5043 msgstr ""
4964
5044
4965 msgid "dump rename information"
5045 msgid "dump rename information"
4966 msgstr ""
5046 msgstr ""
4967
5047
4968 #, python-format
5048 #, python-format
4969 msgid "%s renamed from %s:%s\n"
5049 msgid "%s renamed from %s:%s\n"
4970 msgstr ""
5050 msgstr ""
4971
5051
4972 #, python-format
5052 #, python-format
4973 msgid "%s not renamed\n"
5053 msgid "%s not renamed\n"
4974 msgstr ""
5054 msgstr ""
4975
5055
4976 msgid "show how files match on given patterns"
5056 msgid "show how files match on given patterns"
4977 msgstr ""
5057 msgstr ""
4978
5058
4979 msgid ""
5059 msgid ""
4980 "diff repository (or selected files)\n"
5060 "diff repository (or selected files)\n"
4981 "\n"
5061 "\n"
4982 " Show differences between revisions for the specified files.\n"
5062 " Show differences between revisions for the specified files.\n"
4983 "\n"
5063 "\n"
4984 " Differences between files are shown using the unified diff format.\n"
5064 " Differences between files are shown using the unified diff format.\n"
4985 "\n"
5065 "\n"
4986 " NOTE: diff may generate unexpected results for merges, as it will\n"
5066 " NOTE: diff may generate unexpected results for merges, as it will\n"
4987 " default to comparing against the working directory's first parent\n"
5067 " default to comparing against the working directory's first parent\n"
4988 " changeset if no revisions are specified.\n"
5068 " changeset if no revisions are specified.\n"
4989 "\n"
5069 "\n"
4990 " When two revision arguments are given, then changes are shown\n"
5070 " When two revision arguments are given, then changes are shown\n"
4991 " between those revisions. If only one revision is specified then\n"
5071 " between those revisions. If only one revision is specified then\n"
4992 " that revision is compared to the working directory, and, when no\n"
5072 " that revision is compared to the working directory, and, when no\n"
4993 " revisions are specified, the working directory files are compared\n"
5073 " revisions are specified, the working directory files are compared\n"
4994 " to its parent.\n"
5074 " to its parent.\n"
4995 "\n"
5075 "\n"
4996 " Without the -a/--text option, diff will avoid generating diffs of\n"
5076 " Without the -a/--text option, diff will avoid generating diffs of\n"
4997 " files it detects as binary. With -a, diff will generate a diff\n"
5077 " files it detects as binary. With -a, diff will generate a diff\n"
4998 " anyway, probably with undesirable results.\n"
5078 " anyway, probably with undesirable results.\n"
4999 "\n"
5079 "\n"
5000 " Use the -g/--git option to generate diffs in the git extended diff\n"
5080 " Use the -g/--git option to generate diffs in the git extended diff\n"
5001 " format. For more information, read 'hg help diffs'.\n"
5081 " format. For more information, read 'hg help diffs'.\n"
5002 " "
5082 " "
5003 msgstr ""
5083 msgstr ""
5004
5084
5005 msgid ""
5085 msgid ""
5006 "dump the header and diffs for one or more changesets\n"
5086 "dump the header and diffs for one or more changesets\n"
5007 "\n"
5087 "\n"
5008 " Print the changeset header and diffs for one or more revisions.\n"
5088 " Print the changeset header and diffs for one or more revisions.\n"
5009 "\n"
5089 "\n"
5010 " The information shown in the changeset header is: author,\n"
5090 " The information shown in the changeset header is: author,\n"
5011 " changeset hash, parent(s) and commit comment.\n"
5091 " changeset hash, parent(s) and commit comment.\n"
5012 "\n"
5092 "\n"
5013 " NOTE: export may generate unexpected diff output for merge\n"
5093 " NOTE: export may generate unexpected diff output for merge\n"
5014 " changesets, as it will compare the merge changeset against its\n"
5094 " changesets, as it will compare the merge changeset against its\n"
5015 " first parent only.\n"
5095 " first parent only.\n"
5016 "\n"
5096 "\n"
5017 " Output may be to a file, in which case the name of the file is\n"
5097 " Output may be to a file, in which case the name of the file is\n"
5018 " given using a format string. The formatting rules are as follows:\n"
5098 " given using a format string. The formatting rules are as follows:\n"
5019 "\n"
5099 "\n"
5020 " %% literal \"%\" character\n"
5100 " %% literal \"%\" character\n"
5021 " %H changeset hash (40 bytes of hexadecimal)\n"
5101 " %H changeset hash (40 bytes of hexadecimal)\n"
5022 " %N number of patches being generated\n"
5102 " %N number of patches being generated\n"
5023 " %R changeset revision number\n"
5103 " %R changeset revision number\n"
5024 " %b basename of the exporting repository\n"
5104 " %b basename of the exporting repository\n"
5025 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5105 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5026 " %n zero-padded sequence number, starting at 1\n"
5106 " %n zero-padded sequence number, starting at 1\n"
5027 " %r zero-padded changeset revision number\n"
5107 " %r zero-padded changeset revision number\n"
5028 "\n"
5108 "\n"
5029 " Without the -a/--text option, export will avoid generating diffs\n"
5109 " Without the -a/--text option, export will avoid generating diffs\n"
5030 " of files it detects as binary. With -a, export will generate a\n"
5110 " of files it detects as binary. With -a, export will generate a\n"
5031 " diff anyway, probably with undesirable results.\n"
5111 " diff anyway, probably with undesirable results.\n"
5032 "\n"
5112 "\n"
5033 " Use the -g/--git option to generate diffs in the git extended diff\n"
5113 " Use the -g/--git option to generate diffs in the git extended diff\n"
5034 " format. See 'hg help diffs' for more information.\n"
5114 " format. See 'hg help diffs' for more information.\n"
5035 "\n"
5115 "\n"
5036 " With the --switch-parent option, the diff will be against the\n"
5116 " With the --switch-parent option, the diff will be against the\n"
5037 " second parent. It can be useful to review a merge.\n"
5117 " second parent. It can be useful to review a merge.\n"
5038 " "
5118 " "
5039 msgstr ""
5119 msgstr ""
5040
5120
5041 msgid "export requires at least one changeset"
5121 msgid "export requires at least one changeset"
5042 msgstr ""
5122 msgstr ""
5043
5123
5044 msgid "exporting patches:\n"
5124 msgid "exporting patches:\n"
5045 msgstr ""
5125 msgstr ""
5046
5126
5047 msgid "exporting patch:\n"
5127 msgid "exporting patch:\n"
5048 msgstr ""
5128 msgstr ""
5049
5129
5050 msgid ""
5130 msgid ""
5051 "forget the specified files on the next commit\n"
5131 "forget the specified files on the next commit\n"
5052 "\n"
5132 "\n"
5053 " Mark the specified files so they will no longer be tracked\n"
5133 " Mark the specified files so they will no longer be tracked\n"
5054 " after the next commit.\n"
5134 " after the next commit.\n"
5055 "\n"
5135 "\n"
5056 " This only removes files from the current branch, not from the\n"
5136 " This only removes files from the current branch, not from the\n"
5057 " entire project history, and it does not delete them from the\n"
5137 " entire project history, and it does not delete them from the\n"
5058 " working directory.\n"
5138 " working directory.\n"
5059 "\n"
5139 "\n"
5060 " To undo a forget before the next commit, see hg add.\n"
5140 " To undo a forget before the next commit, see hg add.\n"
5061 " "
5141 " "
5062 msgstr ""
5142 msgstr ""
5063
5143
5064 msgid "no files specified"
5144 msgid "no files specified"
5065 msgstr ""
5145 msgstr ""
5066
5146
5067 #, python-format
5147 #, python-format
5068 msgid "not removing %s: file is already untracked\n"
5148 msgid "not removing %s: file is already untracked\n"
5069 msgstr ""
5149 msgstr ""
5070
5150
5071 msgid ""
5151 msgid ""
5072 "search for a pattern in specified files and revisions\n"
5152 "search for a pattern in specified files and revisions\n"
5073 "\n"
5153 "\n"
5074 " Search revisions of files for a regular expression.\n"
5154 " Search revisions of files for a regular expression.\n"
5075 "\n"
5155 "\n"
5076 " This command behaves differently than Unix grep. It only accepts\n"
5156 " This command behaves differently than Unix grep. It only accepts\n"
5077 " Python/Perl regexps. It searches repository history, not the\n"
5157 " Python/Perl regexps. It searches repository history, not the\n"
5078 " working directory. It always prints the revision number in which a\n"
5158 " working directory. It always prints the revision number in which a\n"
5079 " match appears.\n"
5159 " match appears.\n"
5080 "\n"
5160 "\n"
5081 " By default, grep only prints output for the first revision of a\n"
5161 " By default, grep only prints output for the first revision of a\n"
5082 " file in which it finds a match. To get it to print every revision\n"
5162 " file in which it finds a match. To get it to print every revision\n"
5083 " that contains a change in match status (\"-\" for a match that\n"
5163 " that contains a change in match status (\"-\" for a match that\n"
5084 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5164 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5085 " use the --all flag.\n"
5165 " use the --all flag.\n"
5086 " "
5166 " "
5087 msgstr ""
5167 msgstr ""
5088
5168
5089 #, python-format
5169 #, python-format
5090 msgid "grep: invalid match pattern: %s\n"
5170 msgid "grep: invalid match pattern: %s\n"
5091 msgstr ""
5171 msgstr ""
5092
5172
5093 msgid ""
5173 msgid ""
5094 "show current repository heads or show branch heads\n"
5174 "show current repository heads or show branch heads\n"
5095 "\n"
5175 "\n"
5096 " With no arguments, show all repository head changesets.\n"
5176 " With no arguments, show all repository head changesets.\n"
5097 "\n"
5177 "\n"
5098 " Repository \"heads\" are changesets that don't have child\n"
5178 " Repository \"heads\" are changesets that don't have child\n"
5099 " changesets. They are where development generally takes place and\n"
5179 " changesets. They are where development generally takes place and\n"
5100 " are the usual targets for update and merge operations.\n"
5180 " are the usual targets for update and merge operations.\n"
5101 "\n"
5181 "\n"
5102 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5182 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5103 " the named branch associated with that revision. The name of the\n"
5183 " the named branch associated with that revision. The name of the\n"
5104 " branch is called the revision's branch tag.\n"
5184 " branch is called the revision's branch tag.\n"
5105 "\n"
5185 "\n"
5106 " Branch heads are revisions on a given named branch that do not have\n"
5186 " Branch heads are revisions on a given named branch that do not have\n"
5107 " any children on the same branch. A branch head could be a true head\n"
5187 " any children on the same branch. A branch head could be a true head\n"
5108 " or it could be the last changeset on a branch before a new branch\n"
5188 " or it could be the last changeset on a branch before a new branch\n"
5109 " was created. If none of the branch heads are true heads, the branch\n"
5189 " was created. If none of the branch heads are true heads, the branch\n"
5110 " is considered inactive.\n"
5190 " is considered inactive.\n"
5111 "\n"
5191 "\n"
5112 " If STARTREV is specified only those heads (or branch heads) that\n"
5192 " If STARTREV is specified only those heads (or branch heads) that\n"
5113 " are descendants of STARTREV will be displayed.\n"
5193 " are descendants of STARTREV will be displayed.\n"
5114 " "
5194 " "
5115 msgstr ""
5195 msgstr ""
5116
5196
5117 #, python-format
5197 #, python-format
5118 msgid "no open branch heads on branch %s\n"
5198 msgid "no open branch heads on branch %s\n"
5119 msgstr ""
5199 msgstr ""
5120
5200
5121 #, python-format
5201 #, python-format
5122 msgid "no changes on branch %s containing %s are reachable from %s\n"
5202 msgid "no changes on branch %s containing %s are reachable from %s\n"
5123 msgstr ""
5203 msgstr ""
5124
5204
5125 #, python-format
5205 #, python-format
5126 msgid "no changes on branch %s are reachable from %s\n"
5206 msgid "no changes on branch %s are reachable from %s\n"
5127 msgstr ""
5207 msgstr ""
5128
5208
5129 msgid ""
5209 msgid ""
5130 "show help for a given topic or a help overview\n"
5210 "show help for a given topic or a help overview\n"
5131 "\n"
5211 "\n"
5132 " With no arguments, print a list of commands with short help messages.\n"
5212 " With no arguments, print a list of commands with short help messages.\n"
5133 "\n"
5213 "\n"
5134 " Given a topic, extension, or command name, print help for that\n"
5214 " Given a topic, extension, or command name, print help for that\n"
5135 " topic."
5215 " topic."
5136 msgstr ""
5216 msgstr ""
5137
5217
5138 msgid "global options:"
5218 msgid "global options:"
5139 msgstr ""
5219 msgstr ""
5140
5220
5141 msgid "use \"hg help\" for the full list of commands"
5221 msgid "use \"hg help\" for the full list of commands"
5142 msgstr ""
5222 msgstr ""
5143
5223
5144 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5224 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5145 msgstr ""
5225 msgstr ""
5146
5226
5147 #, python-format
5227 #, python-format
5148 msgid "use \"hg -v help%s\" to show aliases and global options"
5228 msgid "use \"hg -v help%s\" to show aliases and global options"
5149 msgstr ""
5229 msgstr ""
5150
5230
5151 #, python-format
5231 #, python-format
5152 msgid "use \"hg -v help %s\" to show global options"
5232 msgid "use \"hg -v help %s\" to show global options"
5153 msgstr ""
5233 msgstr ""
5154
5234
5155 msgid ""
5235 msgid ""
5156 "list of commands:\n"
5236 "list of commands:\n"
5157 "\n"
5237 "\n"
5158 msgstr ""
5238 msgstr ""
5159
5239
5160 #, python-format
5240 #, python-format
5161 msgid ""
5241 msgid ""
5162 "\n"
5242 "\n"
5163 "aliases: %s\n"
5243 "aliases: %s\n"
5164 msgstr ""
5244 msgstr ""
5165
5245
5166 msgid "(no help text available)"
5246 msgid "(no help text available)"
5167 msgstr ""
5247 msgstr ""
5168
5248
5169 msgid "options:\n"
5249 msgid "options:\n"
5170 msgstr ""
5250 msgstr ""
5171
5251
5172 msgid "no commands defined\n"
5252 msgid "no commands defined\n"
5173 msgstr ""
5253 msgstr ""
5174
5254
5175 msgid "enabled extensions:"
5255 msgid "enabled extensions:"
5176 msgstr ""
5256 msgstr ""
5177
5257
5178 msgid "no help text available"
5258 msgid "no help text available"
5179 msgstr ""
5259 msgstr ""
5180
5260
5181 #, python-format
5261 #, python-format
5182 msgid "%s extension - %s\n"
5262 msgid "%s extension - %s\n"
5183 msgstr ""
5263 msgstr ""
5184
5264
5185 msgid "Mercurial Distributed SCM\n"
5265 msgid "Mercurial Distributed SCM\n"
5186 msgstr ""
5266 msgstr ""
5187
5267
5188 msgid ""
5268 msgid ""
5189 "basic commands:\n"
5269 "basic commands:\n"
5190 "\n"
5270 "\n"
5191 msgstr ""
5271 msgstr ""
5192
5272
5193 msgid ""
5273 msgid ""
5194 "\n"
5274 "\n"
5195 "additional help topics:\n"
5275 "additional help topics:\n"
5196 "\n"
5276 "\n"
5197 msgstr ""
5277 msgstr ""
5198
5278
5199 msgid ""
5279 msgid ""
5200 "identify the working copy or specified revision\n"
5280 "identify the working copy or specified revision\n"
5201 "\n"
5281 "\n"
5202 " With no revision, print a summary of the current state of the\n"
5282 " With no revision, print a summary of the current state of the\n"
5203 " repository.\n"
5283 " repository.\n"
5204 "\n"
5284 "\n"
5205 " Specifying a path to a repository root or Mercurial bundle will\n"
5285 " Specifying a path to a repository root or Mercurial bundle will\n"
5206 " cause lookup to operate on that repository/bundle.\n"
5286 " cause lookup to operate on that repository/bundle.\n"
5207 "\n"
5287 "\n"
5208 " This summary identifies the repository state using one or two\n"
5288 " This summary identifies the repository state using one or two\n"
5209 " parent hash identifiers, followed by a \"+\" if there are\n"
5289 " parent hash identifiers, followed by a \"+\" if there are\n"
5210 " uncommitted changes in the working directory, a list of tags for\n"
5290 " uncommitted changes in the working directory, a list of tags for\n"
5211 " this revision and a branch name for non-default branches.\n"
5291 " this revision and a branch name for non-default branches.\n"
5212 " "
5292 " "
5213 msgstr ""
5293 msgstr ""
5214
5294
5215 msgid ""
5295 msgid ""
5216 "import an ordered set of patches\n"
5296 "import an ordered set of patches\n"
5217 "\n"
5297 "\n"
5218 " Import a list of patches and commit them individually.\n"
5298 " Import a list of patches and commit them individually.\n"
5219 "\n"
5299 "\n"
5220 " If there are outstanding changes in the working directory, import\n"
5300 " If there are outstanding changes in the working directory, import\n"
5221 " will abort unless given the -f/--force flag.\n"
5301 " will abort unless given the -f/--force flag.\n"
5222 "\n"
5302 "\n"
5223 " You can import a patch straight from a mail message. Even patches\n"
5303 " You can import a patch straight from a mail message. Even patches\n"
5224 " as attachments work (to use the body part, it must have type\n"
5304 " as attachments work (to use the body part, it must have type\n"
5225 " text/plain or text/x-patch). From and Subject headers of email\n"
5305 " text/plain or text/x-patch). From and Subject headers of email\n"
5226 " message are used as default committer and commit message. All\n"
5306 " message are used as default committer and commit message. All\n"
5227 " text/plain body parts before first diff are added to commit\n"
5307 " text/plain body parts before first diff are added to commit\n"
5228 " message.\n"
5308 " message.\n"
5229 "\n"
5309 "\n"
5230 " If the imported patch was generated by hg export, user and\n"
5310 " If the imported patch was generated by hg export, user and\n"
5231 " description from patch override values from message headers and\n"
5311 " description from patch override values from message headers and\n"
5232 " body. Values given on command line with -m/--message and -u/--user\n"
5312 " body. Values given on command line with -m/--message and -u/--user\n"
5233 " override these.\n"
5313 " override these.\n"
5234 "\n"
5314 "\n"
5235 " If --exact is specified, import will set the working directory to\n"
5315 " If --exact is specified, import will set the working directory to\n"
5236 " the parent of each patch before applying it, and will abort if the\n"
5316 " the parent of each patch before applying it, and will abort if the\n"
5237 " resulting changeset has a different ID than the one recorded in\n"
5317 " resulting changeset has a different ID than the one recorded in\n"
5238 " the patch. This may happen due to character set problems or other\n"
5318 " the patch. This may happen due to character set problems or other\n"
5239 " deficiencies in the text patch format.\n"
5319 " deficiencies in the text patch format.\n"
5240 "\n"
5320 "\n"
5241 " With -s/--similarity, hg will attempt to discover renames and\n"
5321 " With -s/--similarity, hg will attempt to discover renames and\n"
5242 " copies in the patch in the same way as 'addremove'.\n"
5322 " copies in the patch in the same way as 'addremove'.\n"
5243 "\n"
5323 "\n"
5244 " To read a patch from standard input, use \"-\" as the patch name.\n"
5324 " To read a patch from standard input, use \"-\" as the patch name.\n"
5245 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5325 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5246 " "
5326 " "
5247 msgstr ""
5327 msgstr ""
5248
5328
5249 msgid "applying patch from stdin\n"
5329 msgid "applying patch from stdin\n"
5250 msgstr ""
5330 msgstr ""
5251
5331
5252 msgid "no diffs found"
5332 msgid "no diffs found"
5253 msgstr ""
5333 msgstr ""
5254
5334
5255 #, python-format
5335 #, python-format
5256 msgid ""
5336 msgid ""
5257 "message:\n"
5337 "message:\n"
5258 "%s\n"
5338 "%s\n"
5259 msgstr ""
5339 msgstr ""
5260
5340
5261 msgid "not a Mercurial patch"
5341 msgid "not a Mercurial patch"
5262 msgstr ""
5342 msgstr ""
5263
5343
5264 msgid "patch is damaged or loses information"
5344 msgid "patch is damaged or loses information"
5265 msgstr ""
5345 msgstr ""
5266
5346
5267 msgid ""
5347 msgid ""
5268 "show new changesets found in source\n"
5348 "show new changesets found in source\n"
5269 "\n"
5349 "\n"
5270 " Show new changesets found in the specified path/URL or the default\n"
5350 " Show new changesets found in the specified path/URL or the default\n"
5271 " pull location. These are the changesets that would have been pulled\n"
5351 " pull location. These are the changesets that would have been pulled\n"
5272 " if a pull at the time you issued this command.\n"
5352 " if a pull at the time you issued this command.\n"
5273 "\n"
5353 "\n"
5274 " For remote repository, using --bundle avoids downloading the\n"
5354 " For remote repository, using --bundle avoids downloading the\n"
5275 " changesets twice if the incoming is followed by a pull.\n"
5355 " changesets twice if the incoming is followed by a pull.\n"
5276 "\n"
5356 "\n"
5277 " See pull for valid source format details.\n"
5357 " See pull for valid source format details.\n"
5278 " "
5358 " "
5279 msgstr ""
5359 msgstr ""
5280
5360
5281 msgid ""
5361 msgid ""
5282 "create a new repository in the given directory\n"
5362 "create a new repository in the given directory\n"
5283 "\n"
5363 "\n"
5284 " Initialize a new repository in the given directory. If the given\n"
5364 " Initialize a new repository in the given directory. If the given\n"
5285 " directory does not exist, it will be created.\n"
5365 " directory does not exist, it will be created.\n"
5286 "\n"
5366 "\n"
5287 " If no directory is given, the current directory is used.\n"
5367 " If no directory is given, the current directory is used.\n"
5288 "\n"
5368 "\n"
5289 " It is possible to specify an ssh:// URL as the destination.\n"
5369 " It is possible to specify an ssh:// URL as the destination.\n"
5290 " See 'hg help urls' for more information.\n"
5370 " See 'hg help urls' for more information.\n"
5291 " "
5371 " "
5292 msgstr ""
5372 msgstr ""
5293
5373
5294 msgid ""
5374 msgid ""
5295 "locate files matching specific patterns\n"
5375 "locate files matching specific patterns\n"
5296 "\n"
5376 "\n"
5297 " Print files under Mercurial control in the working directory whose\n"
5377 " Print files under Mercurial control in the working directory whose\n"
5298 " names match the given patterns.\n"
5378 " names match the given patterns.\n"
5299 "\n"
5379 "\n"
5300 " By default, this command searches all directories in the working\n"
5380 " By default, this command searches all directories in the working\n"
5301 " directory. To search just the current directory and its\n"
5381 " directory. To search just the current directory and its\n"
5302 " subdirectories, use \"--include .\".\n"
5382 " subdirectories, use \"--include .\".\n"
5303 "\n"
5383 "\n"
5304 " If no patterns are given to match, this command prints the names\n"
5384 " If no patterns are given to match, this command prints the names\n"
5305 " of all files under Mercurial control in the working directory.\n"
5385 " of all files under Mercurial control in the working directory.\n"
5306 "\n"
5386 "\n"
5307 " If you want to feed the output of this command into the \"xargs\"\n"
5387 " If you want to feed the output of this command into the \"xargs\"\n"
5308 " command, use the -0 option to both this command and \"xargs\". This\n"
5388 " command, use the -0 option to both this command and \"xargs\". This\n"
5309 " will avoid the problem of \"xargs\" treating single filenames that\n"
5389 " will avoid the problem of \"xargs\" treating single filenames that\n"
5310 " contain whitespace as multiple filenames.\n"
5390 " contain whitespace as multiple filenames.\n"
5311 " "
5391 " "
5312 msgstr ""
5392 msgstr ""
5313
5393
5314 msgid ""
5394 msgid ""
5315 "show revision history of entire repository or files\n"
5395 "show revision history of entire repository or files\n"
5316 "\n"
5396 "\n"
5317 " Print the revision history of the specified files or the entire\n"
5397 " Print the revision history of the specified files or the entire\n"
5318 " project.\n"
5398 " project.\n"
5319 "\n"
5399 "\n"
5320 " File history is shown without following rename or copy history of\n"
5400 " File history is shown without following rename or copy history of\n"
5321 " files. Use -f/--follow with a filename to follow history across\n"
5401 " files. Use -f/--follow with a filename to follow history across\n"
5322 " renames and copies. --follow without a filename will only show\n"
5402 " renames and copies. --follow without a filename will only show\n"
5323 " ancestors or descendants of the starting revision. --follow-first\n"
5403 " ancestors or descendants of the starting revision. --follow-first\n"
5324 " only follows the first parent of merge revisions.\n"
5404 " only follows the first parent of merge revisions.\n"
5325 "\n"
5405 "\n"
5326 " If no revision range is specified, the default is tip:0 unless\n"
5406 " If no revision range is specified, the default is tip:0 unless\n"
5327 " --follow is set, in which case the working directory parent is\n"
5407 " --follow is set, in which case the working directory parent is\n"
5328 " used as the starting revision.\n"
5408 " used as the starting revision.\n"
5329 "\n"
5409 "\n"
5330 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5410 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5331 "\n"
5411 "\n"
5332 " By default this command prints revision number and changeset id,\n"
5412 " By default this command prints revision number and changeset id,\n"
5333 " tags, non-trivial parents, user, date and time, and a summary for\n"
5413 " tags, non-trivial parents, user, date and time, and a summary for\n"
5334 " each commit. When the -v/--verbose switch is used, the list of\n"
5414 " each commit. When the -v/--verbose switch is used, the list of\n"
5335 " changed files and full commit message are shown.\n"
5415 " changed files and full commit message are shown.\n"
5336 "\n"
5416 "\n"
5337 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5417 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5338 " changesets, as it will only compare the merge changeset against\n"
5418 " changesets, as it will only compare the merge changeset against\n"
5339 " its first parent. Also, only files different from BOTH parents\n"
5419 " its first parent. Also, only files different from BOTH parents\n"
5340 " will appear in files:.\n"
5420 " will appear in files:.\n"
5341 " "
5421 " "
5342 msgstr ""
5422 msgstr ""
5343
5423
5344 msgid ""
5424 msgid ""
5345 "output the current or given revision of the project manifest\n"
5425 "output the current or given revision of the project manifest\n"
5346 "\n"
5426 "\n"
5347 " Print a list of version controlled files for the given revision.\n"
5427 " Print a list of version controlled files for the given revision.\n"
5348 " If no revision is given, the first parent of the working directory\n"
5428 " If no revision is given, the first parent of the working directory\n"
5349 " is used, or the null revision if no revision is checked out.\n"
5429 " is used, or the null revision if no revision is checked out.\n"
5350 "\n"
5430 "\n"
5351 " With -v, print file permissions, symlink and executable bits.\n"
5431 " With -v, print file permissions, symlink and executable bits.\n"
5352 " With --debug, print file revision hashes.\n"
5432 " With --debug, print file revision hashes.\n"
5353 " "
5433 " "
5354 msgstr ""
5434 msgstr ""
5355
5435
5356 msgid ""
5436 msgid ""
5357 "merge working directory with another revision\n"
5437 "merge working directory with another revision\n"
5358 "\n"
5438 "\n"
5359 " The current working directory is updated with all changes made in\n"
5439 " The current working directory is updated with all changes made in\n"
5360 " the requested revision since the last common predecessor revision.\n"
5440 " the requested revision since the last common predecessor revision.\n"
5361 "\n"
5441 "\n"
5362 " Files that changed between either parent are marked as changed for\n"
5442 " Files that changed between either parent are marked as changed for\n"
5363 " the next commit and a commit must be performed before any further\n"
5443 " the next commit and a commit must be performed before any further\n"
5364 " updates to the repository are allowed. The next commit will have\n"
5444 " updates to the repository are allowed. The next commit will have\n"
5365 " two parents.\n"
5445 " two parents.\n"
5366 "\n"
5446 "\n"
5367 " If no revision is specified, the working directory's parent is a\n"
5447 " If no revision is specified, the working directory's parent is a\n"
5368 " head revision, and the current branch contains exactly one other\n"
5448 " head revision, and the current branch contains exactly one other\n"
5369 " head, the other head is merged with by default. Otherwise, an\n"
5449 " head, the other head is merged with by default. Otherwise, an\n"
5370 " explicit revision with which to merge with must be provided.\n"
5450 " explicit revision with which to merge with must be provided.\n"
5371 " "
5451 " "
5372 msgstr ""
5452 msgstr ""
5373
5453
5374 #, python-format
5454 #, python-format
5375 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5455 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5376 msgstr ""
5456 msgstr ""
5377
5457
5378 #, python-format
5458 #, python-format
5379 msgid "branch '%s' has one head - please merge with an explicit rev"
5459 msgid "branch '%s' has one head - please merge with an explicit rev"
5380 msgstr ""
5460 msgstr ""
5381
5461
5382 msgid "there is nothing to merge"
5462 msgid "there is nothing to merge"
5383 msgstr ""
5463 msgstr ""
5384
5464
5385 #, python-format
5465 #, python-format
5386 msgid "%s - use \"hg update\" instead"
5466 msgid "%s - use \"hg update\" instead"
5387 msgstr ""
5467 msgstr ""
5388
5468
5389 msgid ""
5469 msgid ""
5390 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5470 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5391 "rev"
5471 "rev"
5392 msgstr ""
5472 msgstr ""
5393
5473
5394 msgid ""
5474 msgid ""
5395 "show changesets not found in destination\n"
5475 "show changesets not found in destination\n"
5396 "\n"
5476 "\n"
5397 " Show changesets not found in the specified destination repository\n"
5477 " Show changesets not found in the specified destination repository\n"
5398 " or the default push location. These are the changesets that would\n"
5478 " or the default push location. These are the changesets that would\n"
5399 " be pushed if a push was requested.\n"
5479 " be pushed if a push was requested.\n"
5400 "\n"
5480 "\n"
5401 " See pull for valid destination format details.\n"
5481 " See pull for valid destination format details.\n"
5402 " "
5482 " "
5403 msgstr ""
5483 msgstr ""
5404
5484
5405 msgid ""
5485 msgid ""
5406 "show the parents of the working directory or revision\n"
5486 "show the parents of the working directory or revision\n"
5407 "\n"
5487 "\n"
5408 " Print the working directory's parent revisions. If a revision is\n"
5488 " Print the working directory's parent revisions. If a revision is\n"
5409 " given via -r/--rev, the parent of that revision will be printed.\n"
5489 " given via -r/--rev, the parent of that revision will be printed.\n"
5410 " If a file argument is given, the revision in which the file was\n"
5490 " If a file argument is given, the revision in which the file was\n"
5411 " last changed (before the working directory revision or the\n"
5491 " last changed (before the working directory revision or the\n"
5412 " argument to --rev if given) is printed.\n"
5492 " argument to --rev if given) is printed.\n"
5413 " "
5493 " "
5414 msgstr ""
5494 msgstr ""
5415
5495
5416 msgid "can only specify an explicit filename"
5496 msgid "can only specify an explicit filename"
5417 msgstr ""
5497 msgstr ""
5418
5498
5419 #, python-format
5499 #, python-format
5420 msgid "'%s' not found in manifest!"
5500 msgid "'%s' not found in manifest!"
5421 msgstr ""
5501 msgstr ""
5422
5502
5423 msgid ""
5503 msgid ""
5424 "show aliases for remote repositories\n"
5504 "show aliases for remote repositories\n"
5425 "\n"
5505 "\n"
5426 " Show definition of symbolic path name NAME. If no name is given,\n"
5506 " Show definition of symbolic path name NAME. If no name is given,\n"
5427 " show definition of all available names.\n"
5507 " show definition of all available names.\n"
5428 "\n"
5508 "\n"
5429 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5509 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5430 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5510 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5431 "\n"
5511 "\n"
5432 " See 'hg help urls' for more information.\n"
5512 " See 'hg help urls' for more information.\n"
5433 " "
5513 " "
5434 msgstr ""
5514 msgstr ""
5435
5515
5436 msgid "not found!\n"
5516 msgid "not found!\n"
5437 msgstr ""
5517 msgstr ""
5438
5518
5439 msgid "not updating, since new heads added\n"
5519 msgid "not updating, since new heads added\n"
5440 msgstr ""
5520 msgstr ""
5441
5521
5442 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5522 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5443 msgstr ""
5523 msgstr ""
5444
5524
5445 msgid "(run 'hg update' to get a working copy)\n"
5525 msgid "(run 'hg update' to get a working copy)\n"
5446 msgstr ""
5526 msgstr ""
5447
5527
5448 msgid ""
5528 msgid ""
5449 "pull changes from the specified source\n"
5529 "pull changes from the specified source\n"
5450 "\n"
5530 "\n"
5451 " Pull changes from a remote repository to a local one.\n"
5531 " Pull changes from a remote repository to a local one.\n"
5452 "\n"
5532 "\n"
5453 " This finds all changes from the repository at the specified path\n"
5533 " This finds all changes from the repository at the specified path\n"
5454 " or URL and adds them to a local repository (the current one unless\n"
5534 " or URL and adds them to a local repository (the current one unless\n"
5455 " -R is specified). By default, this does not update the copy of the\n"
5535 " -R is specified). By default, this does not update the copy of the\n"
5456 " project in the working directory.\n"
5536 " project in the working directory.\n"
5457 "\n"
5537 "\n"
5458 " Use hg incoming if you want to see what would have been added by a\n"
5538 " Use hg incoming if you want to see what would have been added by a\n"
5459 " pull at the time you issued this command. If you then decide to\n"
5539 " pull at the time you issued this command. If you then decide to\n"
5460 " added those changes to the repository, you should use pull -r X\n"
5540 " added those changes to the repository, you should use pull -r X\n"
5461 " where X is the last changeset listed by hg incoming.\n"
5541 " where X is the last changeset listed by hg incoming.\n"
5462 "\n"
5542 "\n"
5463 " If SOURCE is omitted, the 'default' path will be used.\n"
5543 " If SOURCE is omitted, the 'default' path will be used.\n"
5464 " See 'hg help urls' for more information.\n"
5544 " See 'hg help urls' for more information.\n"
5465 " "
5545 " "
5466 msgstr ""
5546 msgstr ""
5467
5547
5468 msgid ""
5548 msgid ""
5469 "push changes to the specified destination\n"
5549 "push changes to the specified destination\n"
5470 "\n"
5550 "\n"
5471 " Push changes from the local repository to the given destination.\n"
5551 " Push changes from the local repository to the given destination.\n"
5472 "\n"
5552 "\n"
5473 " This is the symmetrical operation for pull. It moves changes from\n"
5553 " This is the symmetrical operation for pull. It moves changes from\n"
5474 " the current repository to a different one. If the destination is\n"
5554 " the current repository to a different one. If the destination is\n"
5475 " local this is identical to a pull in that directory from the\n"
5555 " local this is identical to a pull in that directory from the\n"
5476 " current one.\n"
5556 " current one.\n"
5477 "\n"
5557 "\n"
5478 " By default, push will refuse to run if it detects the result would\n"
5558 " By default, push will refuse to run if it detects the result would\n"
5479 " increase the number of remote heads. This generally indicates the\n"
5559 " increase the number of remote heads. This generally indicates the\n"
5480 " user forgot to pull and merge before pushing.\n"
5560 " user forgot to pull and merge before pushing.\n"
5481 "\n"
5561 "\n"
5482 " If -r/--rev is used, the named revision and all its ancestors will\n"
5562 " If -r/--rev is used, the named revision and all its ancestors will\n"
5483 " be pushed to the remote repository.\n"
5563 " be pushed to the remote repository.\n"
5484 "\n"
5564 "\n"
5485 " Please see 'hg help urls' for important details about ssh://\n"
5565 " Please see 'hg help urls' for important details about ssh://\n"
5486 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5566 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5487 " "
5567 " "
5488 msgstr ""
5568 msgstr ""
5489
5569
5490 #, python-format
5570 #, python-format
5491 msgid "pushing to %s\n"
5571 msgid "pushing to %s\n"
5492 msgstr ""
5572 msgstr ""
5493
5573
5494 msgid ""
5574 msgid ""
5495 "roll back an interrupted transaction\n"
5575 "roll back an interrupted transaction\n"
5496 "\n"
5576 "\n"
5497 " Recover from an interrupted commit or pull.\n"
5577 " Recover from an interrupted commit or pull.\n"
5498 "\n"
5578 "\n"
5499 " This command tries to fix the repository status after an\n"
5579 " This command tries to fix the repository status after an\n"
5500 " interrupted operation. It should only be necessary when Mercurial\n"
5580 " interrupted operation. It should only be necessary when Mercurial\n"
5501 " suggests it.\n"
5581 " suggests it.\n"
5502 " "
5582 " "
5503 msgstr ""
5583 msgstr ""
5504
5584
5505 msgid ""
5585 msgid ""
5506 "remove the specified files on the next commit\n"
5586 "remove the specified files on the next commit\n"
5507 "\n"
5587 "\n"
5508 " Schedule the indicated files for removal from the repository.\n"
5588 " Schedule the indicated files for removal from the repository.\n"
5509 "\n"
5589 "\n"
5510 " This only removes files from the current branch, not from the\n"
5590 " This only removes files from the current branch, not from the\n"
5511 " entire project history. -A/--after can be used to remove only\n"
5591 " entire project history. -A/--after can be used to remove only\n"
5512 " files that have already been deleted, -f/--force can be used to\n"
5592 " files that have already been deleted, -f/--force can be used to\n"
5513 " force deletion, and -Af can be used to remove files from the next\n"
5593 " force deletion, and -Af can be used to remove files from the next\n"
5514 " revision without deleting them from the working directory.\n"
5594 " revision without deleting them from the working directory.\n"
5515 "\n"
5595 "\n"
5516 " The following table details the behavior of remove for different\n"
5596 " The following table details the behavior of remove for different\n"
5517 " file states (columns) and option combinations (rows). The file\n"
5597 " file states (columns) and option combinations (rows). The file\n"
5518 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5598 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5519 " (as reported by hg status). The actions are Warn, Remove (from\n"
5599 " (as reported by hg status). The actions are Warn, Remove (from\n"
5520 " branch) and Delete (from disk).\n"
5600 " branch) and Delete (from disk).\n"
5521 "\n"
5601 "\n"
5522 " A C M !\n"
5602 " A C M !\n"
5523 " none W RD W R\n"
5603 " none W RD W R\n"
5524 " -f R RD RD R\n"
5604 " -f R RD RD R\n"
5525 " -A W W W R\n"
5605 " -A W W W R\n"
5526 " -Af R R R R\n"
5606 " -Af R R R R\n"
5527 "\n"
5607 "\n"
5528 " This command schedules the files to be removed at the next commit.\n"
5608 " This command schedules the files to be removed at the next commit.\n"
5529 " To undo a remove before that, see hg revert.\n"
5609 " To undo a remove before that, see hg revert.\n"
5530 " "
5610 " "
5531 msgstr ""
5611 msgstr ""
5532
5612
5533 #, python-format
5613 #, python-format
5534 msgid "not removing %s: file is untracked\n"
5614 msgid "not removing %s: file is untracked\n"
5535 msgstr ""
5615 msgstr ""
5536
5616
5537 #, python-format
5617 #, python-format
5538 msgid "not removing %s: file %s (use -f to force removal)\n"
5618 msgid "not removing %s: file %s (use -f to force removal)\n"
5539 msgstr ""
5619 msgstr ""
5540
5620
5541 msgid "still exists"
5621 msgid "still exists"
5542 msgstr ""
5622 msgstr ""
5543
5623
5544 msgid "is modified"
5624 msgid "is modified"
5545 msgstr ""
5625 msgstr ""
5546
5626
5547 msgid "has been marked for add"
5627 msgid "has been marked for add"
5548 msgstr ""
5628 msgstr ""
5549
5629
5550 msgid ""
5630 msgid ""
5551 "rename files; equivalent of copy + remove\n"
5631 "rename files; equivalent of copy + remove\n"
5552 "\n"
5632 "\n"
5553 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5633 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5554 " is a directory, copies are put in that directory. If dest is a\n"
5634 " is a directory, copies are put in that directory. If dest is a\n"
5555 " file, there can only be one source.\n"
5635 " file, there can only be one source.\n"
5556 "\n"
5636 "\n"
5557 " By default, this command copies the contents of files as they\n"
5637 " By default, this command copies the contents of files as they\n"
5558 " exist in the working directory. If invoked with -A/--after, the\n"
5638 " exist in the working directory. If invoked with -A/--after, the\n"
5559 " operation is recorded, but no copying is performed.\n"
5639 " operation is recorded, but no copying is performed.\n"
5560 "\n"
5640 "\n"
5561 " This command takes effect at the next commit. To undo a rename\n"
5641 " This command takes effect at the next commit. To undo a rename\n"
5562 " before that, see hg revert.\n"
5642 " before that, see hg revert.\n"
5563 " "
5643 " "
5564 msgstr ""
5644 msgstr ""
5565
5645
5566 msgid ""
5646 msgid ""
5567 "retry file merges from a merge or update\n"
5647 "retry file merges from a merge or update\n"
5568 "\n"
5648 "\n"
5569 " This command will cleanly retry unresolved file merges using file\n"
5649 " This command will cleanly retry unresolved file merges using file\n"
5570 " revisions preserved from the last update or merge. To attempt to\n"
5650 " revisions preserved from the last update or merge. To attempt to\n"
5571 " resolve all unresolved files, use the -a/--all switch.\n"
5651 " resolve all unresolved files, use the -a/--all switch.\n"
5572 "\n"
5652 "\n"
5573 " If a conflict is resolved manually, please note that the changes\n"
5653 " If a conflict is resolved manually, please note that the changes\n"
5574 " will be overwritten if the merge is retried with resolve. The\n"
5654 " will be overwritten if the merge is retried with resolve. The\n"
5575 " -m/--mark switch should be used to mark the file as resolved.\n"
5655 " -m/--mark switch should be used to mark the file as resolved.\n"
5576 "\n"
5656 "\n"
5577 " This command also allows listing resolved files and manually\n"
5657 " This command also allows listing resolved files and manually\n"
5578 " indicating whether or not files are resolved. All files must be\n"
5658 " indicating whether or not files are resolved. All files must be\n"
5579 " marked as resolved before a commit is permitted.\n"
5659 " marked as resolved before a commit is permitted.\n"
5580 "\n"
5660 "\n"
5581 " The codes used to show the status of files are:\n"
5661 " The codes used to show the status of files are:\n"
5582 " U = unresolved\n"
5662 " U = unresolved\n"
5583 " R = resolved\n"
5663 " R = resolved\n"
5584 " "
5664 " "
5585 msgstr ""
5665 msgstr ""
5586
5666
5587 msgid "too many options specified"
5667 msgid "too many options specified"
5588 msgstr ""
5668 msgstr ""
5589
5669
5590 msgid "can't specify --all and patterns"
5670 msgid "can't specify --all and patterns"
5591 msgstr ""
5671 msgstr ""
5592
5672
5593 msgid "no files or directories specified; use --all to remerge all files"
5673 msgid "no files or directories specified; use --all to remerge all files"
5594 msgstr ""
5674 msgstr ""
5595
5675
5596 msgid ""
5676 msgid ""
5597 "restore individual files or directories to an earlier state\n"
5677 "restore individual files or directories to an earlier state\n"
5598 "\n"
5678 "\n"
5599 " (Use update -r to check out earlier revisions, revert does not\n"
5679 " (Use update -r to check out earlier revisions, revert does not\n"
5600 " change the working directory parents.)\n"
5680 " change the working directory parents.)\n"
5601 "\n"
5681 "\n"
5602 " With no revision specified, revert the named files or directories\n"
5682 " With no revision specified, revert the named files or directories\n"
5603 " to the contents they had in the parent of the working directory.\n"
5683 " to the contents they had in the parent of the working directory.\n"
5604 " This restores the contents of the affected files to an unmodified\n"
5684 " This restores the contents of the affected files to an unmodified\n"
5605 " state and unschedules adds, removes, copies, and renames. If the\n"
5685 " state and unschedules adds, removes, copies, and renames. If the\n"
5606 " working directory has two parents, you must explicitly specify the\n"
5686 " working directory has two parents, you must explicitly specify the\n"
5607 " revision to revert to.\n"
5687 " revision to revert to.\n"
5608 "\n"
5688 "\n"
5609 " Using the -r/--rev option, revert the given files or directories\n"
5689 " Using the -r/--rev option, revert the given files or directories\n"
5610 " to their contents as of a specific revision. This can be helpful\n"
5690 " to their contents as of a specific revision. This can be helpful\n"
5611 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5691 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5612 " dates' for a list of formats valid for -d/--date.\n"
5692 " dates' for a list of formats valid for -d/--date.\n"
5613 "\n"
5693 "\n"
5614 " Revert modifies the working directory. It does not commit any\n"
5694 " Revert modifies the working directory. It does not commit any\n"
5615 " changes, or change the parent of the working directory. If you\n"
5695 " changes, or change the parent of the working directory. If you\n"
5616 " revert to a revision other than the parent of the working\n"
5696 " revert to a revision other than the parent of the working\n"
5617 " directory, the reverted files will thus appear modified\n"
5697 " directory, the reverted files will thus appear modified\n"
5618 " afterwards.\n"
5698 " afterwards.\n"
5619 "\n"
5699 "\n"
5620 " If a file has been deleted, it is restored. If the executable mode\n"
5700 " If a file has been deleted, it is restored. If the executable mode\n"
5621 " of a file was changed, it is reset.\n"
5701 " of a file was changed, it is reset.\n"
5622 "\n"
5702 "\n"
5623 " If names are given, all files matching the names are reverted.\n"
5703 " If names are given, all files matching the names are reverted.\n"
5624 " If no arguments are given, no files are reverted.\n"
5704 " If no arguments are given, no files are reverted.\n"
5625 "\n"
5705 "\n"
5626 " Modified files are saved with a .orig suffix before reverting.\n"
5706 " Modified files are saved with a .orig suffix before reverting.\n"
5627 " To disable these backups, use --no-backup.\n"
5707 " To disable these backups, use --no-backup.\n"
5628 " "
5708 " "
5629 msgstr ""
5709 msgstr ""
5630
5710
5631 msgid "you can't specify a revision and a date"
5711 msgid "you can't specify a revision and a date"
5632 msgstr ""
5712 msgstr ""
5633
5713
5634 msgid "no files or directories specified; use --all to revert the whole repo"
5714 msgid "no files or directories specified; use --all to revert the whole repo"
5635 msgstr ""
5715 msgstr ""
5636
5716
5637 #, python-format
5717 #, python-format
5638 msgid "forgetting %s\n"
5718 msgid "forgetting %s\n"
5639 msgstr ""
5719 msgstr ""
5640
5720
5641 #, python-format
5721 #, python-format
5642 msgid "reverting %s\n"
5722 msgid "reverting %s\n"
5643 msgstr ""
5723 msgstr ""
5644
5724
5645 #, python-format
5725 #, python-format
5646 msgid "undeleting %s\n"
5726 msgid "undeleting %s\n"
5647 msgstr ""
5727 msgstr ""
5648
5728
5649 #, python-format
5729 #, python-format
5650 msgid "saving current version of %s as %s\n"
5730 msgid "saving current version of %s as %s\n"
5651 msgstr ""
5731 msgstr ""
5652
5732
5653 #, python-format
5733 #, python-format
5654 msgid "file not managed: %s\n"
5734 msgid "file not managed: %s\n"
5655 msgstr ""
5735 msgstr ""
5656
5736
5657 #, python-format
5737 #, python-format
5658 msgid "no changes needed to %s\n"
5738 msgid "no changes needed to %s\n"
5659 msgstr ""
5739 msgstr ""
5660
5740
5661 msgid ""
5741 msgid ""
5662 "roll back the last transaction\n"
5742 "roll back the last transaction\n"
5663 "\n"
5743 "\n"
5664 " This command should be used with care. There is only one level of\n"
5744 " This command should be used with care. There is only one level of\n"
5665 " rollback, and there is no way to undo a rollback. It will also\n"
5745 " rollback, and there is no way to undo a rollback. It will also\n"
5666 " restore the dirstate at the time of the last transaction, losing\n"
5746 " restore the dirstate at the time of the last transaction, losing\n"
5667 " any dirstate changes since that time. This command does not alter\n"
5747 " any dirstate changes since that time. This command does not alter\n"
5668 " the working directory.\n"
5748 " the working directory.\n"
5669 "\n"
5749 "\n"
5670 " Transactions are used to encapsulate the effects of all commands\n"
5750 " Transactions are used to encapsulate the effects of all commands\n"
5671 " that create new changesets or propagate existing changesets into a\n"
5751 " that create new changesets or propagate existing changesets into a\n"
5672 " repository. For example, the following commands are transactional,\n"
5752 " repository. For example, the following commands are transactional,\n"
5673 " and their effects can be rolled back:\n"
5753 " and their effects can be rolled back:\n"
5674 "\n"
5754 "\n"
5675 " commit\n"
5755 " commit\n"
5676 " import\n"
5756 " import\n"
5677 " pull\n"
5757 " pull\n"
5678 " push (with this repository as destination)\n"
5758 " push (with this repository as destination)\n"
5679 " unbundle\n"
5759 " unbundle\n"
5680 "\n"
5760 "\n"
5681 " This command is not intended for use on public repositories. Once\n"
5761 " This command is not intended for use on public repositories. Once\n"
5682 " changes are visible for pull by other users, rolling a transaction\n"
5762 " changes are visible for pull by other users, rolling a transaction\n"
5683 " back locally is ineffective (someone else may already have pulled\n"
5763 " back locally is ineffective (someone else may already have pulled\n"
5684 " the changes). Furthermore, a race is possible with readers of the\n"
5764 " the changes). Furthermore, a race is possible with readers of the\n"
5685 " repository; for example an in-progress pull from the repository\n"
5765 " repository; for example an in-progress pull from the repository\n"
5686 " may fail if a rollback is performed.\n"
5766 " may fail if a rollback is performed.\n"
5687 " "
5767 " "
5688 msgstr ""
5768 msgstr ""
5689
5769
5690 msgid ""
5770 msgid ""
5691 "print the root (top) of the current working directory\n"
5771 "print the root (top) of the current working directory\n"
5692 "\n"
5772 "\n"
5693 " Print the root directory of the current repository.\n"
5773 " Print the root directory of the current repository.\n"
5694 " "
5774 " "
5695 msgstr ""
5775 msgstr ""
5696
5776
5697 msgid ""
5777 msgid ""
5698 "export the repository via HTTP\n"
5778 "export the repository via HTTP\n"
5699 "\n"
5779 "\n"
5700 " Start a local HTTP repository browser and pull server.\n"
5780 " Start a local HTTP repository browser and pull server.\n"
5701 "\n"
5781 "\n"
5702 " By default, the server logs accesses to stdout and errors to\n"
5782 " By default, the server logs accesses to stdout and errors to\n"
5703 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
5783 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
5704 " files.\n"
5784 " files.\n"
5705 " "
5785 " "
5706 msgstr ""
5786 msgstr ""
5707
5787
5708 #, python-format
5788 #, python-format
5709 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
5789 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
5710 msgstr ""
5790 msgstr ""
5711
5791
5712 msgid ""
5792 msgid ""
5713 "show changed files in the working directory\n"
5793 "show changed files in the working directory\n"
5714 "\n"
5794 "\n"
5715 " Show status of files in the repository. If names are given, only\n"
5795 " Show status of files in the repository. If names are given, only\n"
5716 " files that match are shown. Files that are clean or ignored or\n"
5796 " files that match are shown. Files that are clean or ignored or\n"
5717 " the source of a copy/move operation, are not listed unless\n"
5797 " the source of a copy/move operation, are not listed unless\n"
5718 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
5798 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
5719 " Unless options described with \"show only ...\" are given, the\n"
5799 " Unless options described with \"show only ...\" are given, the\n"
5720 " options -mardu are used.\n"
5800 " options -mardu are used.\n"
5721 "\n"
5801 "\n"
5722 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
5802 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
5723 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
5803 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
5724 "\n"
5804 "\n"
5725 " NOTE: status may appear to disagree with diff if permissions have\n"
5805 " NOTE: status may appear to disagree with diff if permissions have\n"
5726 " changed or a merge has occurred. The standard diff format does not\n"
5806 " changed or a merge has occurred. The standard diff format does not\n"
5727 " report permission changes and diff only reports changes relative\n"
5807 " report permission changes and diff only reports changes relative\n"
5728 " to one merge parent.\n"
5808 " to one merge parent.\n"
5729 "\n"
5809 "\n"
5730 " If one revision is given, it is used as the base revision.\n"
5810 " If one revision is given, it is used as the base revision.\n"
5731 " If two revisions are given, the differences between them are\n"
5811 " If two revisions are given, the differences between them are\n"
5732 " shown.\n"
5812 " shown.\n"
5733 "\n"
5813 "\n"
5734 " The codes used to show the status of files are:\n"
5814 " The codes used to show the status of files are:\n"
5735 " M = modified\n"
5815 " M = modified\n"
5736 " A = added\n"
5816 " A = added\n"
5737 " R = removed\n"
5817 " R = removed\n"
5738 " C = clean\n"
5818 " C = clean\n"
5739 " ! = missing (deleted by non-hg command, but still tracked)\n"
5819 " ! = missing (deleted by non-hg command, but still tracked)\n"
5740 " ? = not tracked\n"
5820 " ? = not tracked\n"
5741 " I = ignored\n"
5821 " I = ignored\n"
5742 " = origin of the previous file listed as A (added)\n"
5822 " = origin of the previous file listed as A (added)\n"
5743 " "
5823 " "
5744 msgstr ""
5824 msgstr ""
5745
5825
5746 msgid ""
5826 msgid ""
5747 "add one or more tags for the current or given revision\n"
5827 "add one or more tags for the current or given revision\n"
5748 "\n"
5828 "\n"
5749 " Name a particular revision using <name>.\n"
5829 " Name a particular revision using <name>.\n"
5750 "\n"
5830 "\n"
5751 " Tags are used to name particular revisions of the repository and are\n"
5831 " Tags are used to name particular revisions of the repository and are\n"
5752 " very useful to compare different revisions, to go back to significant\n"
5832 " very useful to compare different revisions, to go back to significant\n"
5753 " earlier versions or to mark branch points as releases, etc.\n"
5833 " earlier versions or to mark branch points as releases, etc.\n"
5754 "\n"
5834 "\n"
5755 " If no revision is given, the parent of the working directory is\n"
5835 " If no revision is given, the parent of the working directory is\n"
5756 " used, or tip if no revision is checked out.\n"
5836 " used, or tip if no revision is checked out.\n"
5757 "\n"
5837 "\n"
5758 " To facilitate version control, distribution, and merging of tags,\n"
5838 " To facilitate version control, distribution, and merging of tags,\n"
5759 " they are stored as a file named \".hgtags\" which is managed\n"
5839 " they are stored as a file named \".hgtags\" which is managed\n"
5760 " similarly to other project files and can be hand-edited if\n"
5840 " similarly to other project files and can be hand-edited if\n"
5761 " necessary. The file '.hg/localtags' is used for local tags (not\n"
5841 " necessary. The file '.hg/localtags' is used for local tags (not\n"
5762 " shared among repositories).\n"
5842 " shared among repositories).\n"
5763 "\n"
5843 "\n"
5764 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5844 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5765 " "
5845 " "
5766 msgstr ""
5846 msgstr ""
5767
5847
5768 msgid "tag names must be unique"
5848 msgid "tag names must be unique"
5769 msgstr ""
5849 msgstr ""
5770
5850
5771 #, python-format
5851 #, python-format
5772 msgid "the name '%s' is reserved"
5852 msgid "the name '%s' is reserved"
5773 msgstr ""
5853 msgstr ""
5774
5854
5775 msgid "--rev and --remove are incompatible"
5855 msgid "--rev and --remove are incompatible"
5776 msgstr ""
5856 msgstr ""
5777
5857
5778 #, python-format
5858 #, python-format
5779 msgid "tag '%s' does not exist"
5859 msgid "tag '%s' does not exist"
5780 msgstr ""
5860 msgstr ""
5781
5861
5782 #, python-format
5862 #, python-format
5783 msgid "tag '%s' is not a global tag"
5863 msgid "tag '%s' is not a global tag"
5784 msgstr ""
5864 msgstr ""
5785
5865
5786 #, python-format
5866 #, python-format
5787 msgid "tag '%s' is not a local tag"
5867 msgid "tag '%s' is not a local tag"
5788 msgstr ""
5868 msgstr ""
5789
5869
5790 #, python-format
5870 #, python-format
5791 msgid "Removed tag %s"
5871 msgid "Removed tag %s"
5792 msgstr ""
5872 msgstr ""
5793
5873
5794 #, python-format
5874 #, python-format
5795 msgid "tag '%s' already exists (use -f to force)"
5875 msgid "tag '%s' already exists (use -f to force)"
5796 msgstr ""
5876 msgstr ""
5797
5877
5798 #, python-format
5878 #, python-format
5799 msgid "Added tag %s for changeset %s"
5879 msgid "Added tag %s for changeset %s"
5800 msgstr ""
5880 msgstr ""
5801
5881
5802 msgid ""
5882 msgid ""
5803 "list repository tags\n"
5883 "list repository tags\n"
5804 "\n"
5884 "\n"
5805 " This lists both regular and local tags. When the -v/--verbose\n"
5885 " This lists both regular and local tags. When the -v/--verbose\n"
5806 " switch is used, a third column \"local\" is printed for local tags.\n"
5886 " switch is used, a third column \"local\" is printed for local tags.\n"
5807 " "
5887 " "
5808 msgstr ""
5888 msgstr ""
5809
5889
5810 msgid ""
5890 msgid ""
5811 "show the tip revision\n"
5891 "show the tip revision\n"
5812 "\n"
5892 "\n"
5813 " The tip revision (usually just called the tip) is the changeset\n"
5893 " The tip revision (usually just called the tip) is the changeset\n"
5814 " most recently added to the repository (and therefore the most\n"
5894 " most recently added to the repository (and therefore the most\n"
5815 " recently changed head).\n"
5895 " recently changed head).\n"
5816 "\n"
5896 "\n"
5817 " If you have just made a commit, that commit will be the tip. If\n"
5897 " If you have just made a commit, that commit will be the tip. If\n"
5818 " you have just pulled changes from another repository, the tip of\n"
5898 " you have just pulled changes from another repository, the tip of\n"
5819 " that repository becomes the current tip. The \"tip\" tag is special\n"
5899 " that repository becomes the current tip. The \"tip\" tag is special\n"
5820 " and cannot be renamed or assigned to a different changeset.\n"
5900 " and cannot be renamed or assigned to a different changeset.\n"
5821 " "
5901 " "
5822 msgstr ""
5902 msgstr ""
5823
5903
5824 msgid ""
5904 msgid ""
5825 "apply one or more changegroup files\n"
5905 "apply one or more changegroup files\n"
5826 "\n"
5906 "\n"
5827 " Apply one or more compressed changegroup files generated by the\n"
5907 " Apply one or more compressed changegroup files generated by the\n"
5828 " bundle command.\n"
5908 " bundle command.\n"
5829 " "
5909 " "
5830 msgstr ""
5910 msgstr ""
5831
5911
5832 msgid ""
5912 msgid ""
5833 "update working directory\n"
5913 "update working directory\n"
5834 "\n"
5914 "\n"
5835 " Update the repository's working directory to the specified\n"
5915 " Update the repository's working directory to the specified\n"
5836 " revision, or the tip of the current branch if none is specified.\n"
5916 " revision, or the tip of the current branch if none is specified.\n"
5837 " Use null as the revision to remove the working copy (like 'hg\n"
5917 " Use null as the revision to remove the working copy (like 'hg\n"
5838 " clone -U').\n"
5918 " clone -U').\n"
5839 "\n"
5919 "\n"
5840 " When the working directory contains no uncommitted changes, it\n"
5920 " When the working directory contains no uncommitted changes, it\n"
5841 " will be replaced by the state of the requested revision from the\n"
5921 " will be replaced by the state of the requested revision from the\n"
5842 " repository. When the requested revision is on a different branch,\n"
5922 " repository. When the requested revision is on a different branch,\n"
5843 " the working directory will additionally be switched to that\n"
5923 " the working directory will additionally be switched to that\n"
5844 " branch.\n"
5924 " branch.\n"
5845 "\n"
5925 "\n"
5846 " When there are uncommitted changes, use option -C/--clean to\n"
5926 " When there are uncommitted changes, use option -C/--clean to\n"
5847 " discard them, forcibly replacing the state of the working\n"
5927 " discard them, forcibly replacing the state of the working\n"
5848 " directory with the requested revision. Alternately, use -c/--check\n"
5928 " directory with the requested revision. Alternately, use -c/--check\n"
5849 " to abort.\n"
5929 " to abort.\n"
5850 "\n"
5930 "\n"
5851 " When there are uncommitted changes and option -C/--clean is not\n"
5931 " When there are uncommitted changes and option -C/--clean is not\n"
5852 " used, and the parent revision and requested revision are on the\n"
5932 " used, and the parent revision and requested revision are on the\n"
5853 " same branch, and one of them is an ancestor of the other, then the\n"
5933 " same branch, and one of them is an ancestor of the other, then the\n"
5854 " new working directory will contain the requested revision merged\n"
5934 " new working directory will contain the requested revision merged\n"
5855 " with the uncommitted changes. Otherwise, the update will fail with\n"
5935 " with the uncommitted changes. Otherwise, the update will fail with\n"
5856 " a suggestion to use 'merge' or 'update -C' instead.\n"
5936 " a suggestion to use 'merge' or 'update -C' instead.\n"
5857 "\n"
5937 "\n"
5858 " If you want to update just one file to an older revision, use\n"
5938 " If you want to update just one file to an older revision, use\n"
5859 " revert.\n"
5939 " revert.\n"
5860 "\n"
5940 "\n"
5861 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5941 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5862 " "
5942 " "
5863 msgstr ""
5943 msgstr ""
5864
5944
5865 msgid "uncommitted local changes"
5945 msgid "uncommitted local changes"
5866 msgstr ""
5946 msgstr ""
5867
5947
5868 msgid ""
5948 msgid ""
5869 "verify the integrity of the repository\n"
5949 "verify the integrity of the repository\n"
5870 "\n"
5950 "\n"
5871 " Verify the integrity of the current repository.\n"
5951 " Verify the integrity of the current repository.\n"
5872 "\n"
5952 "\n"
5873 " This will perform an extensive check of the repository's\n"
5953 " This will perform an extensive check of the repository's\n"
5874 " integrity, validating the hashes and checksums of each entry in\n"
5954 " integrity, validating the hashes and checksums of each entry in\n"
5875 " the changelog, manifest, and tracked files, as well as the\n"
5955 " the changelog, manifest, and tracked files, as well as the\n"
5876 " integrity of their crosslinks and indices.\n"
5956 " integrity of their crosslinks and indices.\n"
5877 " "
5957 " "
5878 msgstr ""
5958 msgstr ""
5879
5959
5880 msgid "output version and copyright information"
5960 msgid "output version and copyright information"
5881 msgstr ""
5961 msgstr ""
5882
5962
5883 #, python-format
5963 #, python-format
5884 msgid "Mercurial Distributed SCM (version %s)\n"
5964 msgid "Mercurial Distributed SCM (version %s)\n"
5885 msgstr ""
5965 msgstr ""
5886
5966
5887 msgid ""
5967 msgid ""
5888 "\n"
5968 "\n"
5889 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
5969 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
5890 "This is free software; see the source for copying conditions. There is NO\n"
5970 "This is free software; see the source for copying conditions. There is NO\n"
5891 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5971 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5892 msgstr ""
5972 msgstr ""
5893
5973
5894 msgid "repository root directory or symbolic path name"
5974 msgid "repository root directory or symbolic path name"
5895 msgstr ""
5975 msgstr ""
5896
5976
5897 msgid "change working directory"
5977 msgid "change working directory"
5898 msgstr ""
5978 msgstr ""
5899
5979
5900 msgid "do not prompt, assume 'yes' for any required answers"
5980 msgid "do not prompt, assume 'yes' for any required answers"
5901 msgstr ""
5981 msgstr ""
5902
5982
5903 msgid "suppress output"
5983 msgid "suppress output"
5904 msgstr ""
5984 msgstr ""
5905
5985
5906 msgid "enable additional output"
5986 msgid "enable additional output"
5907 msgstr ""
5987 msgstr ""
5908
5988
5909 msgid "set/override config option"
5989 msgid "set/override config option"
5910 msgstr ""
5990 msgstr ""
5911
5991
5912 msgid "enable debugging output"
5992 msgid "enable debugging output"
5913 msgstr ""
5993 msgstr ""
5914
5994
5915 msgid "start debugger"
5995 msgid "start debugger"
5916 msgstr ""
5996 msgstr ""
5917
5997
5918 msgid "set the charset encoding"
5998 msgid "set the charset encoding"
5919 msgstr ""
5999 msgstr ""
5920
6000
5921 msgid "set the charset encoding mode"
6001 msgid "set the charset encoding mode"
5922 msgstr ""
6002 msgstr ""
5923
6003
5924 msgid "print traceback on exception"
6004 msgid "print traceback on exception"
5925 msgstr ""
6005 msgstr ""
5926
6006
5927 msgid "time how long the command takes"
6007 msgid "time how long the command takes"
5928 msgstr ""
6008 msgstr ""
5929
6009
5930 msgid "print command execution profile"
6010 msgid "print command execution profile"
5931 msgstr ""
6011 msgstr ""
5932
6012
5933 msgid "output version information and exit"
6013 msgid "output version information and exit"
5934 msgstr ""
6014 msgstr ""
5935
6015
5936 msgid "display help and exit"
6016 msgid "display help and exit"
5937 msgstr ""
6017 msgstr ""
5938
6018
5939 msgid "do not perform actions, just print output"
6019 msgid "do not perform actions, just print output"
5940 msgstr ""
6020 msgstr ""
5941
6021
5942 msgid "specify ssh command to use"
6022 msgid "specify ssh command to use"
5943 msgstr ""
6023 msgstr ""
5944
6024
5945 msgid "specify hg command to run on the remote side"
6025 msgid "specify hg command to run on the remote side"
5946 msgstr ""
6026 msgstr ""
5947
6027
5948 msgid "include names matching the given patterns"
6028 msgid "include names matching the given patterns"
5949 msgstr ""
6029 msgstr ""
5950
6030
5951 msgid "exclude names matching the given patterns"
6031 msgid "exclude names matching the given patterns"
5952 msgstr ""
6032 msgstr ""
5953
6033
5954 msgid "use <text> as commit message"
6034 msgid "use <text> as commit message"
5955 msgstr ""
6035 msgstr ""
5956
6036
5957 msgid "read commit message from <file>"
6037 msgid "read commit message from <file>"
5958 msgstr ""
6038 msgstr ""
5959
6039
5960 msgid "record datecode as commit date"
6040 msgid "record datecode as commit date"
5961 msgstr ""
6041 msgstr ""
5962
6042
5963 msgid "record the specified user as committer"
6043 msgid "record the specified user as committer"
5964 msgstr ""
6044 msgstr ""
5965
6045
5966 msgid "display using template map file"
6046 msgid "display using template map file"
5967 msgstr ""
6047 msgstr ""
5968
6048
5969 msgid "display with template"
6049 msgid "display with template"
5970 msgstr ""
6050 msgstr ""
5971
6051
5972 msgid "do not show merges"
6052 msgid "do not show merges"
5973 msgstr ""
6053 msgstr ""
5974
6054
5975 msgid "treat all files as text"
6055 msgid "treat all files as text"
5976 msgstr ""
6056 msgstr ""
5977
6057
5978 msgid "don't include dates in diff headers"
6058 msgid "don't include dates in diff headers"
5979 msgstr ""
6059 msgstr ""
5980
6060
5981 msgid "show which function each change is in"
6061 msgid "show which function each change is in"
5982 msgstr ""
6062 msgstr ""
5983
6063
5984 msgid "ignore white space when comparing lines"
6064 msgid "ignore white space when comparing lines"
5985 msgstr ""
6065 msgstr ""
5986
6066
5987 msgid "ignore changes in the amount of white space"
6067 msgid "ignore changes in the amount of white space"
5988 msgstr ""
6068 msgstr ""
5989
6069
5990 msgid "ignore changes whose lines are all blank"
6070 msgid "ignore changes whose lines are all blank"
5991 msgstr ""
6071 msgstr ""
5992
6072
5993 msgid "number of lines of context to show"
6073 msgid "number of lines of context to show"
5994 msgstr ""
6074 msgstr ""
5995
6075
5996 msgid "guess renamed files by similarity (0<=s<=100)"
6076 msgid "guess renamed files by similarity (0<=s<=100)"
5997 msgstr ""
6077 msgstr ""
5998
6078
5999 msgid "[OPTION]... [FILE]..."
6079 msgid "[OPTION]... [FILE]..."
6000 msgstr ""
6080 msgstr ""
6001
6081
6002 msgid "annotate the specified revision"
6082 msgid "annotate the specified revision"
6003 msgstr ""
6083 msgstr ""
6004
6084
6005 msgid "follow file copies and renames"
6085 msgid "follow file copies and renames"
6006 msgstr ""
6086 msgstr ""
6007
6087
6008 msgid "list the author (long with -v)"
6088 msgid "list the author (long with -v)"
6009 msgstr ""
6089 msgstr ""
6010
6090
6011 msgid "list the date (short with -q)"
6091 msgid "list the date (short with -q)"
6012 msgstr ""
6092 msgstr ""
6013
6093
6014 msgid "list the revision number (default)"
6094 msgid "list the revision number (default)"
6015 msgstr ""
6095 msgstr ""
6016
6096
6017 msgid "list the changeset"
6097 msgid "list the changeset"
6018 msgstr ""
6098 msgstr ""
6019
6099
6020 msgid "show line number at the first appearance"
6100 msgid "show line number at the first appearance"
6021 msgstr ""
6101 msgstr ""
6022
6102
6023 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6103 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6024 msgstr ""
6104 msgstr ""
6025
6105
6026 msgid "do not pass files through decoders"
6106 msgid "do not pass files through decoders"
6027 msgstr ""
6107 msgstr ""
6028
6108
6029 msgid "directory prefix for files in archive"
6109 msgid "directory prefix for files in archive"
6030 msgstr ""
6110 msgstr ""
6031
6111
6032 msgid "revision to distribute"
6112 msgid "revision to distribute"
6033 msgstr ""
6113 msgstr ""
6034
6114
6035 msgid "type of distribution to create"
6115 msgid "type of distribution to create"
6036 msgstr ""
6116 msgstr ""
6037
6117
6038 msgid "[OPTION]... DEST"
6118 msgid "[OPTION]... DEST"
6039 msgstr ""
6119 msgstr ""
6040
6120
6041 msgid "merge with old dirstate parent after backout"
6121 msgid "merge with old dirstate parent after backout"
6042 msgstr ""
6122 msgstr ""
6043
6123
6044 msgid "parent to choose when backing out merge"
6124 msgid "parent to choose when backing out merge"
6045 msgstr ""
6125 msgstr ""
6046
6126
6047 msgid "revision to backout"
6127 msgid "revision to backout"
6048 msgstr ""
6128 msgstr ""
6049
6129
6050 msgid "[OPTION]... [-r] REV"
6130 msgid "[OPTION]... [-r] REV"
6051 msgstr ""
6131 msgstr ""
6052
6132
6053 msgid "reset bisect state"
6133 msgid "reset bisect state"
6054 msgstr ""
6134 msgstr ""
6055
6135
6056 msgid "mark changeset good"
6136 msgid "mark changeset good"
6057 msgstr ""
6137 msgstr ""
6058
6138
6059 msgid "mark changeset bad"
6139 msgid "mark changeset bad"
6060 msgstr ""
6140 msgstr ""
6061
6141
6062 msgid "skip testing changeset"
6142 msgid "skip testing changeset"
6063 msgstr ""
6143 msgstr ""
6064
6144
6065 msgid "use command to check changeset state"
6145 msgid "use command to check changeset state"
6066 msgstr ""
6146 msgstr ""
6067
6147
6068 msgid "do not update to target"
6148 msgid "do not update to target"
6069 msgstr ""
6149 msgstr ""
6070
6150
6071 msgid "[-gbsr] [-c CMD] [REV]"
6151 msgid "[-gbsr] [-c CMD] [REV]"
6072 msgstr ""
6152 msgstr ""
6073
6153
6074 msgid "set branch name even if it shadows an existing branch"
6154 msgid "set branch name even if it shadows an existing branch"
6075 msgstr ""
6155 msgstr ""
6076
6156
6077 msgid "reset branch name to parent branch name"
6157 msgid "reset branch name to parent branch name"
6078 msgstr ""
6158 msgstr ""
6079
6159
6080 msgid "[-fC] [NAME]"
6160 msgid "[-fC] [NAME]"
6081 msgstr ""
6161 msgstr ""
6082
6162
6083 msgid "show only branches that have unmerged heads"
6163 msgid "show only branches that have unmerged heads"
6084 msgstr ""
6164 msgstr ""
6085
6165
6086 msgid "[-a]"
6166 msgid "[-a]"
6087 msgstr ""
6167 msgstr ""
6088
6168
6089 msgid "run even when remote repository is unrelated"
6169 msgid "run even when remote repository is unrelated"
6090 msgstr ""
6170 msgstr ""
6091
6171
6092 msgid "a changeset up to which you would like to bundle"
6172 msgid "a changeset up to which you would like to bundle"
6093 msgstr ""
6173 msgstr ""
6094
6174
6095 msgid "a base changeset to specify instead of a destination"
6175 msgid "a base changeset to specify instead of a destination"
6096 msgstr ""
6176 msgstr ""
6097
6177
6098 msgid "bundle all changesets in the repository"
6178 msgid "bundle all changesets in the repository"
6099 msgstr ""
6179 msgstr ""
6100
6180
6101 msgid "bundle compression type to use"
6181 msgid "bundle compression type to use"
6102 msgstr ""
6182 msgstr ""
6103
6183
6104 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6184 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6105 msgstr ""
6185 msgstr ""
6106
6186
6107 msgid "print output to file with formatted name"
6187 msgid "print output to file with formatted name"
6108 msgstr ""
6188 msgstr ""
6109
6189
6110 msgid "print the given revision"
6190 msgid "print the given revision"
6111 msgstr ""
6191 msgstr ""
6112
6192
6113 msgid "apply any matching decode filter"
6193 msgid "apply any matching decode filter"
6114 msgstr ""
6194 msgstr ""
6115
6195
6116 msgid "[OPTION]... FILE..."
6196 msgid "[OPTION]... FILE..."
6117 msgstr ""
6197 msgstr ""
6118
6198
6119 msgid "the clone will only contain a repository (no working copy)"
6199 msgid "the clone will only contain a repository (no working copy)"
6120 msgstr ""
6200 msgstr ""
6121
6201
6122 msgid "a changeset you would like to have after cloning"
6202 msgid "a changeset you would like to have after cloning"
6123 msgstr ""
6203 msgstr ""
6124
6204
6125 msgid "[OPTION]... SOURCE [DEST]"
6205 msgid "[OPTION]... SOURCE [DEST]"
6126 msgstr ""
6206 msgstr ""
6127
6207
6128 msgid "mark new/missing files as added/removed before committing"
6208 msgid "mark new/missing files as added/removed before committing"
6129 msgstr ""
6209 msgstr ""
6130
6210
6131 msgid "mark a branch as closed, hiding it from the branch list"
6211 msgid "mark a branch as closed, hiding it from the branch list"
6132 msgstr ""
6212 msgstr ""
6133
6213
6134 msgid "record a copy that has already occurred"
6214 msgid "record a copy that has already occurred"
6135 msgstr ""
6215 msgstr ""
6136
6216
6137 msgid "forcibly copy over an existing managed file"
6217 msgid "forcibly copy over an existing managed file"
6138 msgstr ""
6218 msgstr ""
6139
6219
6140 msgid "[OPTION]... [SOURCE]... DEST"
6220 msgid "[OPTION]... [SOURCE]... DEST"
6141 msgstr ""
6221 msgstr ""
6142
6222
6143 msgid "[INDEX] REV1 REV2"
6223 msgid "[INDEX] REV1 REV2"
6144 msgstr ""
6224 msgstr ""
6145
6225
6146 msgid "[COMMAND]"
6226 msgid "[COMMAND]"
6147 msgstr ""
6227 msgstr ""
6148
6228
6149 msgid "show the command options"
6229 msgid "show the command options"
6150 msgstr ""
6230 msgstr ""
6151
6231
6152 msgid "[-o] CMD"
6232 msgid "[-o] CMD"
6153 msgstr ""
6233 msgstr ""
6154
6234
6155 msgid "try extended date formats"
6235 msgid "try extended date formats"
6156 msgstr ""
6236 msgstr ""
6157
6237
6158 msgid "[-e] DATE [RANGE]"
6238 msgid "[-e] DATE [RANGE]"
6159 msgstr ""
6239 msgstr ""
6160
6240
6161 msgid "FILE REV"
6241 msgid "FILE REV"
6162 msgstr ""
6242 msgstr ""
6163
6243
6164 msgid "[PATH]"
6244 msgid "[PATH]"
6165 msgstr ""
6245 msgstr ""
6166
6246
6167 msgid "FILE"
6247 msgid "FILE"
6168 msgstr ""
6248 msgstr ""
6169
6249
6170 msgid "revision to rebuild to"
6250 msgid "revision to rebuild to"
6171 msgstr ""
6251 msgstr ""
6172
6252
6173 msgid "[-r REV] [REV]"
6253 msgid "[-r REV] [REV]"
6174 msgstr ""
6254 msgstr ""
6175
6255
6176 msgid "revision to debug"
6256 msgid "revision to debug"
6177 msgstr ""
6257 msgstr ""
6178
6258
6179 msgid "[-r REV] FILE"
6259 msgid "[-r REV] FILE"
6180 msgstr ""
6260 msgstr ""
6181
6261
6182 msgid "REV1 [REV2]"
6262 msgid "REV1 [REV2]"
6183 msgstr ""
6263 msgstr ""
6184
6264
6185 msgid "do not display the saved mtime"
6265 msgid "do not display the saved mtime"
6186 msgstr ""
6266 msgstr ""
6187
6267
6188 msgid "[OPTION]..."
6268 msgid "[OPTION]..."
6189 msgstr ""
6269 msgstr ""
6190
6270
6191 msgid "revision to check"
6271 msgid "revision to check"
6192 msgstr ""
6272 msgstr ""
6193
6273
6194 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6274 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6195 msgstr ""
6275 msgstr ""
6196
6276
6197 msgid "diff against the second parent"
6277 msgid "diff against the second parent"
6198 msgstr ""
6278 msgstr ""
6199
6279
6200 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6280 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6201 msgstr ""
6281 msgstr ""
6202
6282
6203 msgid "end fields with NUL"
6283 msgid "end fields with NUL"
6204 msgstr ""
6284 msgstr ""
6205
6285
6206 msgid "print all revisions that match"
6286 msgid "print all revisions that match"
6207 msgstr ""
6287 msgstr ""
6208
6288
6209 msgid "follow changeset history, or file history across copies and renames"
6289 msgid "follow changeset history, or file history across copies and renames"
6210 msgstr ""
6290 msgstr ""
6211
6291
6212 msgid "ignore case when matching"
6292 msgid "ignore case when matching"
6213 msgstr ""
6293 msgstr ""
6214
6294
6215 msgid "print only filenames and revisions that match"
6295 msgid "print only filenames and revisions that match"
6216 msgstr ""
6296 msgstr ""
6217
6297
6218 msgid "print matching line numbers"
6298 msgid "print matching line numbers"
6219 msgstr ""
6299 msgstr ""
6220
6300
6221 msgid "search in given revision range"
6301 msgid "search in given revision range"
6222 msgstr ""
6302 msgstr ""
6223
6303
6224 msgid "[OPTION]... PATTERN [FILE]..."
6304 msgid "[OPTION]... PATTERN [FILE]..."
6225 msgstr ""
6305 msgstr ""
6226
6306
6227 msgid "show only heads which are descendants of REV"
6307 msgid "show only heads which are descendants of REV"
6228 msgstr ""
6308 msgstr ""
6229
6309
6230 msgid "show only the active heads from open branches"
6310 msgid "show only the active heads from open branches"
6231 msgstr ""
6311 msgstr ""
6232
6312
6233 msgid "show normal and closed heads"
6313 msgid "show normal and closed heads"
6234 msgstr ""
6314 msgstr ""
6235
6315
6236 msgid "[-r STARTREV] [REV]..."
6316 msgid "[-r STARTREV] [REV]..."
6237 msgstr ""
6317 msgstr ""
6238
6318
6239 msgid "[TOPIC]"
6319 msgid "[TOPIC]"
6240 msgstr ""
6320 msgstr ""
6241
6321
6242 msgid "identify the specified revision"
6322 msgid "identify the specified revision"
6243 msgstr ""
6323 msgstr ""
6244
6324
6245 msgid "show local revision number"
6325 msgid "show local revision number"
6246 msgstr ""
6326 msgstr ""
6247
6327
6248 msgid "show global revision id"
6328 msgid "show global revision id"
6249 msgstr ""
6329 msgstr ""
6250
6330
6251 msgid "show branch"
6331 msgid "show branch"
6252 msgstr ""
6332 msgstr ""
6253
6333
6254 msgid "show tags"
6334 msgid "show tags"
6255 msgstr ""
6335 msgstr ""
6256
6336
6257 msgid "[-nibt] [-r REV] [SOURCE]"
6337 msgid "[-nibt] [-r REV] [SOURCE]"
6258 msgstr ""
6338 msgstr ""
6259
6339
6260 msgid ""
6340 msgid ""
6261 "directory strip option for patch. This has the same meaning as the "
6341 "directory strip option for patch. This has the same meaning as the "
6262 "corresponding patch option"
6342 "corresponding patch option"
6263 msgstr ""
6343 msgstr ""
6264
6344
6265 msgid "base path"
6345 msgid "base path"
6266 msgstr ""
6346 msgstr ""
6267
6347
6268 msgid "skip check for outstanding uncommitted changes"
6348 msgid "skip check for outstanding uncommitted changes"
6269 msgstr ""
6349 msgstr ""
6270
6350
6271 msgid "don't commit, just update the working directory"
6351 msgid "don't commit, just update the working directory"
6272 msgstr ""
6352 msgstr ""
6273
6353
6274 msgid "apply patch to the nodes from which it was generated"
6354 msgid "apply patch to the nodes from which it was generated"
6275 msgstr ""
6355 msgstr ""
6276
6356
6277 msgid "use any branch information in patch (implied by --exact)"
6357 msgid "use any branch information in patch (implied by --exact)"
6278 msgstr ""
6358 msgstr ""
6279
6359
6280 msgid "[OPTION]... PATCH..."
6360 msgid "[OPTION]... PATCH..."
6281 msgstr ""
6361 msgstr ""
6282
6362
6283 msgid "show newest record first"
6363 msgid "show newest record first"
6284 msgstr ""
6364 msgstr ""
6285
6365
6286 msgid "file to store the bundles into"
6366 msgid "file to store the bundles into"
6287 msgstr ""
6367 msgstr ""
6288
6368
6289 msgid "a specific revision up to which you would like to pull"
6369 msgid "a specific revision up to which you would like to pull"
6290 msgstr ""
6370 msgstr ""
6291
6371
6292 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6372 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6293 msgstr ""
6373 msgstr ""
6294
6374
6295 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6375 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6296 msgstr ""
6376 msgstr ""
6297
6377
6298 msgid "search the repository as it stood at REV"
6378 msgid "search the repository as it stood at REV"
6299 msgstr ""
6379 msgstr ""
6300
6380
6301 msgid "end filenames with NUL, for use with xargs"
6381 msgid "end filenames with NUL, for use with xargs"
6302 msgstr ""
6382 msgstr ""
6303
6383
6304 msgid "print complete paths from the filesystem root"
6384 msgid "print complete paths from the filesystem root"
6305 msgstr ""
6385 msgstr ""
6306
6386
6307 msgid "[OPTION]... [PATTERN]..."
6387 msgid "[OPTION]... [PATTERN]..."
6308 msgstr ""
6388 msgstr ""
6309
6389
6310 msgid "only follow the first parent of merge changesets"
6390 msgid "only follow the first parent of merge changesets"
6311 msgstr ""
6391 msgstr ""
6312
6392
6313 msgid "show revisions matching date spec"
6393 msgid "show revisions matching date spec"
6314 msgstr ""
6394 msgstr ""
6315
6395
6316 msgid "show copied files"
6396 msgid "show copied files"
6317 msgstr ""
6397 msgstr ""
6318
6398
6319 msgid "do case-insensitive search for a keyword"
6399 msgid "do case-insensitive search for a keyword"
6320 msgstr ""
6400 msgstr ""
6321
6401
6322 msgid "include revisions where files were removed"
6402 msgid "include revisions where files were removed"
6323 msgstr ""
6403 msgstr ""
6324
6404
6325 msgid "show only merges"
6405 msgid "show only merges"
6326 msgstr ""
6406 msgstr ""
6327
6407
6328 msgid "revisions committed by user"
6408 msgid "revisions committed by user"
6329 msgstr ""
6409 msgstr ""
6330
6410
6331 msgid "show only changesets within the given named branch"
6411 msgid "show only changesets within the given named branch"
6332 msgstr ""
6412 msgstr ""
6333
6413
6334 msgid "do not display revision or any of its ancestors"
6414 msgid "do not display revision or any of its ancestors"
6335 msgstr ""
6415 msgstr ""
6336
6416
6337 msgid "[OPTION]... [FILE]"
6417 msgid "[OPTION]... [FILE]"
6338 msgstr ""
6418 msgstr ""
6339
6419
6340 msgid "revision to display"
6420 msgid "revision to display"
6341 msgstr ""
6421 msgstr ""
6342
6422
6343 msgid "[-r REV]"
6423 msgid "[-r REV]"
6344 msgstr ""
6424 msgstr ""
6345
6425
6346 msgid "force a merge with outstanding changes"
6426 msgid "force a merge with outstanding changes"
6347 msgstr ""
6427 msgstr ""
6348
6428
6349 msgid "revision to merge"
6429 msgid "revision to merge"
6350 msgstr ""
6430 msgstr ""
6351
6431
6352 msgid "review revisions to merge (no merge is performed)"
6432 msgid "review revisions to merge (no merge is performed)"
6353 msgstr ""
6433 msgstr ""
6354
6434
6355 msgid "[-f] [[-r] REV]"
6435 msgid "[-f] [[-r] REV]"
6356 msgstr ""
6436 msgstr ""
6357
6437
6358 msgid "a specific revision up to which you would like to push"
6438 msgid "a specific revision up to which you would like to push"
6359 msgstr ""
6439 msgstr ""
6360
6440
6361 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6441 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6362 msgstr ""
6442 msgstr ""
6363
6443
6364 msgid "show parents from the specified revision"
6444 msgid "show parents from the specified revision"
6365 msgstr ""
6445 msgstr ""
6366
6446
6367 msgid "[-r REV] [FILE]"
6447 msgid "[-r REV] [FILE]"
6368 msgstr ""
6448 msgstr ""
6369
6449
6370 msgid "[NAME]"
6450 msgid "[NAME]"
6371 msgstr ""
6451 msgstr ""
6372
6452
6373 msgid "update to new tip if changesets were pulled"
6453 msgid "update to new tip if changesets were pulled"
6374 msgstr ""
6454 msgstr ""
6375
6455
6376 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6456 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6377 msgstr ""
6457 msgstr ""
6378
6458
6379 msgid "force push"
6459 msgid "force push"
6380 msgstr ""
6460 msgstr ""
6381
6461
6382 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6462 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6383 msgstr ""
6463 msgstr ""
6384
6464
6385 msgid "record delete for missing files"
6465 msgid "record delete for missing files"
6386 msgstr ""
6466 msgstr ""
6387
6467
6388 msgid "remove (and delete) file even if added or modified"
6468 msgid "remove (and delete) file even if added or modified"
6389 msgstr ""
6469 msgstr ""
6390
6470
6391 msgid "record a rename that has already occurred"
6471 msgid "record a rename that has already occurred"
6392 msgstr ""
6472 msgstr ""
6393
6473
6394 msgid "[OPTION]... SOURCE... DEST"
6474 msgid "[OPTION]... SOURCE... DEST"
6395 msgstr ""
6475 msgstr ""
6396
6476
6397 msgid "remerge all unresolved files"
6477 msgid "remerge all unresolved files"
6398 msgstr ""
6478 msgstr ""
6399
6479
6400 msgid "list state of files needing merge"
6480 msgid "list state of files needing merge"
6401 msgstr ""
6481 msgstr ""
6402
6482
6403 msgid "mark files as resolved"
6483 msgid "mark files as resolved"
6404 msgstr ""
6484 msgstr ""
6405
6485
6406 msgid "unmark files as resolved"
6486 msgid "unmark files as resolved"
6407 msgstr ""
6487 msgstr ""
6408
6488
6409 msgid "revert all changes when no arguments given"
6489 msgid "revert all changes when no arguments given"
6410 msgstr ""
6490 msgstr ""
6411
6491
6412 msgid "tipmost revision matching date"
6492 msgid "tipmost revision matching date"
6413 msgstr ""
6493 msgstr ""
6414
6494
6415 msgid "revision to revert to"
6495 msgid "revision to revert to"
6416 msgstr ""
6496 msgstr ""
6417
6497
6418 msgid "do not save backup copies of files"
6498 msgid "do not save backup copies of files"
6419 msgstr ""
6499 msgstr ""
6420
6500
6421 msgid "[OPTION]... [-r REV] [NAME]..."
6501 msgid "[OPTION]... [-r REV] [NAME]..."
6422 msgstr ""
6502 msgstr ""
6423
6503
6424 msgid "name of access log file to write to"
6504 msgid "name of access log file to write to"
6425 msgstr ""
6505 msgstr ""
6426
6506
6427 msgid "name of error log file to write to"
6507 msgid "name of error log file to write to"
6428 msgstr ""
6508 msgstr ""
6429
6509
6430 msgid "port to listen on (default: 8000)"
6510 msgid "port to listen on (default: 8000)"
6431 msgstr ""
6511 msgstr ""
6432
6512
6433 msgid "address to listen on (default: all interfaces)"
6513 msgid "address to listen on (default: all interfaces)"
6434 msgstr ""
6514 msgstr ""
6435
6515
6436 msgid "prefix path to serve from (default: server root)"
6516 msgid "prefix path to serve from (default: server root)"
6437 msgstr ""
6517 msgstr ""
6438
6518
6439 msgid "name to show in web pages (default: working directory)"
6519 msgid "name to show in web pages (default: working directory)"
6440 msgstr ""
6520 msgstr ""
6441
6521
6442 msgid "name of the webdir config file (serve more than one repository)"
6522 msgid "name of the webdir config file (serve more than one repository)"
6443 msgstr ""
6523 msgstr ""
6444
6524
6445 msgid "for remote clients"
6525 msgid "for remote clients"
6446 msgstr ""
6526 msgstr ""
6447
6527
6448 msgid "web templates to use"
6528 msgid "web templates to use"
6449 msgstr ""
6529 msgstr ""
6450
6530
6451 msgid "template style to use"
6531 msgid "template style to use"
6452 msgstr ""
6532 msgstr ""
6453
6533
6454 msgid "use IPv6 in addition to IPv4"
6534 msgid "use IPv6 in addition to IPv4"
6455 msgstr ""
6535 msgstr ""
6456
6536
6457 msgid "SSL certificate file"
6537 msgid "SSL certificate file"
6458 msgstr ""
6538 msgstr ""
6459
6539
6460 msgid "show untrusted configuration options"
6540 msgid "show untrusted configuration options"
6461 msgstr ""
6541 msgstr ""
6462
6542
6463 msgid "[-u] [NAME]..."
6543 msgid "[-u] [NAME]..."
6464 msgstr ""
6544 msgstr ""
6465
6545
6466 msgid "show status of all files"
6546 msgid "show status of all files"
6467 msgstr ""
6547 msgstr ""
6468
6548
6469 msgid "show only modified files"
6549 msgid "show only modified files"
6470 msgstr ""
6550 msgstr ""
6471
6551
6472 msgid "show only added files"
6552 msgid "show only added files"
6473 msgstr ""
6553 msgstr ""
6474
6554
6475 msgid "show only removed files"
6555 msgid "show only removed files"
6476 msgstr ""
6556 msgstr ""
6477
6557
6478 msgid "show only deleted (but tracked) files"
6558 msgid "show only deleted (but tracked) files"
6479 msgstr ""
6559 msgstr ""
6480
6560
6481 msgid "show only files without changes"
6561 msgid "show only files without changes"
6482 msgstr ""
6562 msgstr ""
6483
6563
6484 msgid "show only unknown (not tracked) files"
6564 msgid "show only unknown (not tracked) files"
6485 msgstr ""
6565 msgstr ""
6486
6566
6487 msgid "show only ignored files"
6567 msgid "show only ignored files"
6488 msgstr ""
6568 msgstr ""
6489
6569
6490 msgid "hide status prefix"
6570 msgid "hide status prefix"
6491 msgstr ""
6571 msgstr ""
6492
6572
6493 msgid "show source of copied files"
6573 msgid "show source of copied files"
6494 msgstr ""
6574 msgstr ""
6495
6575
6496 msgid "show difference from revision"
6576 msgid "show difference from revision"
6497 msgstr ""
6577 msgstr ""
6498
6578
6499 msgid "replace existing tag"
6579 msgid "replace existing tag"
6500 msgstr ""
6580 msgstr ""
6501
6581
6502 msgid "make the tag local"
6582 msgid "make the tag local"
6503 msgstr ""
6583 msgstr ""
6504
6584
6505 msgid "revision to tag"
6585 msgid "revision to tag"
6506 msgstr ""
6586 msgstr ""
6507
6587
6508 msgid "remove a tag"
6588 msgid "remove a tag"
6509 msgstr ""
6589 msgstr ""
6510
6590
6511 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6591 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6512 msgstr ""
6592 msgstr ""
6513
6593
6514 msgid "[-p]"
6594 msgid "[-p]"
6515 msgstr ""
6595 msgstr ""
6516
6596
6517 msgid "update to new tip if changesets were unbundled"
6597 msgid "update to new tip if changesets were unbundled"
6518 msgstr ""
6598 msgstr ""
6519
6599
6520 msgid "[-u] FILE..."
6600 msgid "[-u] FILE..."
6521 msgstr ""
6601 msgstr ""
6522
6602
6523 msgid "overwrite locally modified files (no backup)"
6603 msgid "overwrite locally modified files (no backup)"
6524 msgstr ""
6604 msgstr ""
6525
6605
6526 msgid "check for uncommitted changes"
6606 msgid "check for uncommitted changes"
6527 msgstr ""
6607 msgstr ""
6528
6608
6529 msgid "[-C] [-d DATE] [[-r] REV]"
6609 msgid "[-C] [-d DATE] [[-r] REV]"
6530 msgstr ""
6610 msgstr ""
6531
6611
6532 #, python-format
6612 #, python-format
6533 msgid "config error at %s:%d: '%s'"
6613 msgid "config error at %s:%d: '%s'"
6534 msgstr ""
6614 msgstr ""
6535
6615
6536 msgid "not found in manifest"
6616 msgid "not found in manifest"
6537 msgstr ""
6617 msgstr ""
6538
6618
6539 msgid "branch name not in UTF-8!"
6619 msgid "branch name not in UTF-8!"
6540 msgstr ""
6620 msgstr ""
6541
6621
6542 #, python-format
6622 #, python-format
6543 msgid " searching for copies back to rev %d\n"
6623 msgid " searching for copies back to rev %d\n"
6544 msgstr ""
6624 msgstr ""
6545
6625
6546 #, python-format
6626 #, python-format
6547 msgid ""
6627 msgid ""
6548 " unmatched files in local:\n"
6628 " unmatched files in local:\n"
6549 " %s\n"
6629 " %s\n"
6550 msgstr ""
6630 msgstr ""
6551
6631
6552 #, python-format
6632 #, python-format
6553 msgid ""
6633 msgid ""
6554 " unmatched files in other:\n"
6634 " unmatched files in other:\n"
6555 " %s\n"
6635 " %s\n"
6556 msgstr ""
6636 msgstr ""
6557
6637
6558 msgid " all copies found (* = to merge, ! = divergent):\n"
6638 msgid " all copies found (* = to merge, ! = divergent):\n"
6559 msgstr ""
6639 msgstr ""
6560
6640
6561 msgid " checking for directory renames\n"
6641 msgid " checking for directory renames\n"
6562 msgstr ""
6642 msgstr ""
6563
6643
6564 #, python-format
6644 #, python-format
6565 msgid " dir %s -> %s\n"
6645 msgid " dir %s -> %s\n"
6566 msgstr ""
6646 msgstr ""
6567
6647
6568 #, python-format
6648 #, python-format
6569 msgid " file %s -> %s\n"
6649 msgid " file %s -> %s\n"
6570 msgstr ""
6650 msgstr ""
6571
6651
6572 msgid "working directory state appears damaged!"
6652 msgid "working directory state appears damaged!"
6573 msgstr ""
6653 msgstr ""
6574
6654
6575 #, python-format
6655 #, python-format
6576 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6656 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6577 msgstr ""
6657 msgstr ""
6578
6658
6579 #, python-format
6659 #, python-format
6580 msgid "directory %r already in dirstate"
6660 msgid "directory %r already in dirstate"
6581 msgstr ""
6661 msgstr ""
6582
6662
6583 #, python-format
6663 #, python-format
6584 msgid "file %r in dirstate clashes with %r"
6664 msgid "file %r in dirstate clashes with %r"
6585 msgstr ""
6665 msgstr ""
6586
6666
6587 #, python-format
6667 #, python-format
6588 msgid "not in dirstate: %s\n"
6668 msgid "not in dirstate: %s\n"
6589 msgstr ""
6669 msgstr ""
6590
6670
6591 msgid "unknown"
6671 msgid "unknown"
6592 msgstr ""
6672 msgstr ""
6593
6673
6594 msgid "character device"
6674 msgid "character device"
6595 msgstr ""
6675 msgstr ""
6596
6676
6597 msgid "block device"
6677 msgid "block device"
6598 msgstr ""
6678 msgstr ""
6599
6679
6600 msgid "fifo"
6680 msgid "fifo"
6601 msgstr ""
6681 msgstr ""
6602
6682
6603 msgid "socket"
6683 msgid "socket"
6604 msgstr ""
6684 msgstr ""
6605
6685
6606 msgid "directory"
6686 msgid "directory"
6607 msgstr ""
6687 msgstr ""
6608
6688
6609 #, python-format
6689 #, python-format
6610 msgid "unsupported file type (type is %s)"
6690 msgid "unsupported file type (type is %s)"
6611 msgstr ""
6691 msgstr ""
6612
6692
6613 #, python-format
6693 #, python-format
6614 msgid "abort: %s\n"
6694 msgid "abort: %s\n"
6615 msgstr ""
6695 msgstr ""
6616
6696
6617 #, python-format
6697 #, python-format
6618 msgid ""
6698 msgid ""
6619 "hg: command '%s' is ambiguous:\n"
6699 "hg: command '%s' is ambiguous:\n"
6620 " %s\n"
6700 " %s\n"
6621 msgstr ""
6701 msgstr ""
6622
6702
6623 #, python-format
6703 #, python-format
6624 msgid "hg: %s\n"
6704 msgid "hg: %s\n"
6625 msgstr ""
6705 msgstr ""
6626
6706
6627 #, python-format
6707 #, python-format
6628 msgid "timed out waiting for lock held by %s"
6708 msgid "timed out waiting for lock held by %s"
6629 msgstr ""
6709 msgstr ""
6630
6710
6631 #, python-format
6711 #, python-format
6632 msgid "lock held by %s"
6712 msgid "lock held by %s"
6633 msgstr ""
6713 msgstr ""
6634
6714
6635 #, python-format
6715 #, python-format
6636 msgid "abort: %s: %s\n"
6716 msgid "abort: %s: %s\n"
6637 msgstr ""
6717 msgstr ""
6638
6718
6639 #, python-format
6719 #, python-format
6640 msgid "abort: could not lock %s: %s\n"
6720 msgid "abort: could not lock %s: %s\n"
6641 msgstr ""
6721 msgstr ""
6642
6722
6643 #, python-format
6723 #, python-format
6644 msgid "hg %s: %s\n"
6724 msgid "hg %s: %s\n"
6645 msgstr ""
6725 msgstr ""
6646
6726
6647 #, python-format
6727 #, python-format
6648 msgid "abort: %s!\n"
6728 msgid "abort: %s!\n"
6649 msgstr ""
6729 msgstr ""
6650
6730
6651 #, python-format
6731 #, python-format
6652 msgid "abort: %s"
6732 msgid "abort: %s"
6653 msgstr ""
6733 msgstr ""
6654
6734
6655 msgid " empty string\n"
6735 msgid " empty string\n"
6656 msgstr ""
6736 msgstr ""
6657
6737
6658 msgid "killed!\n"
6738 msgid "killed!\n"
6659 msgstr ""
6739 msgstr ""
6660
6740
6661 #, python-format
6741 #, python-format
6662 msgid "hg: unknown command '%s'\n"
6742 msgid "hg: unknown command '%s'\n"
6663 msgstr ""
6743 msgstr ""
6664
6744
6665 #, python-format
6745 #, python-format
6666 msgid "abort: could not import module %s!\n"
6746 msgid "abort: could not import module %s!\n"
6667 msgstr ""
6747 msgstr ""
6668
6748
6669 msgid "(did you forget to compile extensions?)\n"
6749 msgid "(did you forget to compile extensions?)\n"
6670 msgstr ""
6750 msgstr ""
6671
6751
6672 msgid "(is your Python install correct?)\n"
6752 msgid "(is your Python install correct?)\n"
6673 msgstr ""
6753 msgstr ""
6674
6754
6675 #, python-format
6755 #, python-format
6676 msgid "abort: error: %s\n"
6756 msgid "abort: error: %s\n"
6677 msgstr ""
6757 msgstr ""
6678
6758
6679 msgid "broken pipe\n"
6759 msgid "broken pipe\n"
6680 msgstr ""
6760 msgstr ""
6681
6761
6682 msgid "interrupted!\n"
6762 msgid "interrupted!\n"
6683 msgstr ""
6763 msgstr ""
6684
6764
6685 msgid ""
6765 msgid ""
6686 "\n"
6766 "\n"
6687 "broken pipe\n"
6767 "broken pipe\n"
6688 msgstr ""
6768 msgstr ""
6689
6769
6690 msgid "abort: out of memory\n"
6770 msgid "abort: out of memory\n"
6691 msgstr ""
6771 msgstr ""
6692
6772
6693 msgid "** unknown exception encountered, details follow\n"
6773 msgid "** unknown exception encountered, details follow\n"
6694 msgstr ""
6774 msgstr ""
6695
6775
6696 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
6776 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
6697 msgstr ""
6777 msgstr ""
6698
6778
6699 msgid "** or mercurial@selenic.com\n"
6779 msgid "** or mercurial@selenic.com\n"
6700 msgstr ""
6780 msgstr ""
6701
6781
6702 #, python-format
6782 #, python-format
6703 msgid "** Mercurial Distributed SCM (version %s)\n"
6783 msgid "** Mercurial Distributed SCM (version %s)\n"
6704 msgstr ""
6784 msgstr ""
6705
6785
6706 #, python-format
6786 #, python-format
6707 msgid "** Extensions loaded: %s\n"
6787 msgid "** Extensions loaded: %s\n"
6708 msgstr ""
6788 msgstr ""
6709
6789
6710 #, python-format
6790 #, python-format
6711 msgid "no definition for alias '%s'\n"
6791 msgid "no definition for alias '%s'\n"
6712 msgstr ""
6792 msgstr ""
6713
6793
6714 #, python-format
6794 #, python-format
6715 msgid "alias '%s' resolves to unknown command '%s'\n"
6795 msgid "alias '%s' resolves to unknown command '%s'\n"
6716 msgstr ""
6796 msgstr ""
6717
6797
6718 #, python-format
6798 #, python-format
6719 msgid "alias '%s' resolves to ambiguous command '%s'\n"
6799 msgid "alias '%s' resolves to ambiguous command '%s'\n"
6720 msgstr ""
6800 msgstr ""
6721
6801
6722 #, python-format
6802 #, python-format
6723 msgid "alias '%s' shadows command\n"
6803 msgid "alias '%s' shadows command\n"
6724 msgstr ""
6804 msgstr ""
6725
6805
6726 #, python-format
6806 #, python-format
6727 msgid "malformed --config option: %s"
6807 msgid "malformed --config option: %s"
6728 msgstr ""
6808 msgstr ""
6729
6809
6730 #, python-format
6810 #, python-format
6731 msgid "extension '%s' overrides commands: %s\n"
6811 msgid "extension '%s' overrides commands: %s\n"
6732 msgstr ""
6812 msgstr ""
6733
6813
6734 msgid "Option --config may not be abbreviated!"
6814 msgid "Option --config may not be abbreviated!"
6735 msgstr ""
6815 msgstr ""
6736
6816
6737 msgid "Option --cwd may not be abbreviated!"
6817 msgid "Option --cwd may not be abbreviated!"
6738 msgstr ""
6818 msgstr ""
6739
6819
6740 msgid ""
6820 msgid ""
6741 "Option -R has to be separated from other options (e.g. not -qR) and --"
6821 "Option -R has to be separated from other options (e.g. not -qR) and --"
6742 "repository may only be abbreviated as --repo!"
6822 "repository may only be abbreviated as --repo!"
6743 msgstr ""
6823 msgstr ""
6744
6824
6745 #, python-format
6825 #, python-format
6746 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
6826 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
6747 msgstr ""
6827 msgstr ""
6748
6828
6749 #, python-format
6829 #, python-format
6750 msgid "repository '%s' is not local"
6830 msgid "repository '%s' is not local"
6751 msgstr ""
6831 msgstr ""
6752
6832
6753 msgid "invalid arguments"
6833 msgid "invalid arguments"
6754 msgstr ""
6834 msgstr ""
6755
6835
6756 #, python-format
6836 #, python-format
6757 msgid "unrecognized profiling format '%s' - Ignored\n"
6837 msgid "unrecognized profiling format '%s' - Ignored\n"
6758 msgstr ""
6838 msgstr ""
6759
6839
6760 msgid ""
6840 msgid ""
6761 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
6841 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
6762 "misc/lsprof/"
6842 "misc/lsprof/"
6763 msgstr ""
6843 msgstr ""
6764
6844
6765 #, python-format
6845 #, python-format
6766 msgid "*** failed to import extension %s from %s: %s\n"
6846 msgid "*** failed to import extension %s from %s: %s\n"
6767 msgstr ""
6847 msgstr ""
6768
6848
6769 #, python-format
6849 #, python-format
6770 msgid "*** failed to import extension %s: %s\n"
6850 msgid "*** failed to import extension %s: %s\n"
6771 msgstr ""
6851 msgstr ""
6772
6852
6773 #, python-format
6853 #, python-format
6774 msgid "couldn't find merge tool %s\n"
6854 msgid "couldn't find merge tool %s\n"
6775 msgstr ""
6855 msgstr ""
6776
6856
6777 #, python-format
6857 #, python-format
6778 msgid "tool %s can't handle symlinks\n"
6858 msgid "tool %s can't handle symlinks\n"
6779 msgstr ""
6859 msgstr ""
6780
6860
6781 #, python-format
6861 #, python-format
6782 msgid "tool %s can't handle binary\n"
6862 msgid "tool %s can't handle binary\n"
6783 msgstr ""
6863 msgstr ""
6784
6864
6785 #, python-format
6865 #, python-format
6786 msgid "tool %s requires a GUI\n"
6866 msgid "tool %s requires a GUI\n"
6787 msgstr ""
6867 msgstr ""
6788
6868
6789 #, python-format
6869 #, python-format
6790 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
6870 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
6791 msgstr ""
6871 msgstr ""
6792
6872
6793 #, python-format
6873 #, python-format
6794 msgid ""
6874 msgid ""
6795 " no tool found to merge %s\n"
6875 " no tool found to merge %s\n"
6796 "keep (l)ocal or take (o)ther?"
6876 "keep (l)ocal or take (o)ther?"
6797 msgstr ""
6877 msgstr ""
6798
6878
6799 msgid "&Local"
6879 msgid "&Local"
6800 msgstr ""
6880 msgstr ""
6801
6881
6802 msgid "&Other"
6882 msgid "&Other"
6803 msgstr ""
6883 msgstr ""
6804
6884
6805 msgid "l"
6885 msgid "l"
6806 msgstr ""
6886 msgstr ""
6807
6887
6808 #, python-format
6888 #, python-format
6809 msgid "merging %s and %s to %s\n"
6889 msgid "merging %s and %s to %s\n"
6810 msgstr ""
6890 msgstr ""
6811
6891
6812 #, python-format
6892 #, python-format
6813 msgid "merging %s\n"
6893 msgid "merging %s\n"
6814 msgstr ""
6894 msgstr ""
6815
6895
6816 #, python-format
6896 #, python-format
6817 msgid "my %s other %s ancestor %s\n"
6897 msgid "my %s other %s ancestor %s\n"
6818 msgstr ""
6898 msgstr ""
6819
6899
6820 msgid " premerge successful\n"
6900 msgid " premerge successful\n"
6821 msgstr ""
6901 msgstr ""
6822
6902
6823 #, python-format
6903 #, python-format
6824 msgid ""
6904 msgid ""
6825 " output file %s appears unchanged\n"
6905 " output file %s appears unchanged\n"
6826 "was merge successful (yn)?"
6906 "was merge successful (yn)?"
6827 msgstr ""
6907 msgstr ""
6828
6908
6829 msgid "&No"
6909 msgid "&No"
6830 msgstr ""
6910 msgstr ""
6831
6911
6832 msgid "&Yes"
6912 msgid "&Yes"
6833 msgstr ""
6913 msgstr ""
6834
6914
6835 msgid "n"
6915 msgid "n"
6836 msgstr ""
6916 msgstr ""
6837
6917
6838 #, python-format
6918 #, python-format
6839 msgid "merging %s failed!\n"
6919 msgid "merging %s failed!\n"
6840 msgstr ""
6920 msgstr ""
6841
6921
6842 #, python-format
6922 #, python-format
6843 msgid "Inconsistent state, %s:%s is good and bad"
6923 msgid "Inconsistent state, %s:%s is good and bad"
6844 msgstr ""
6924 msgstr ""
6845
6925
6846 #, python-format
6926 #, python-format
6847 msgid "unknown bisect kind %s"
6927 msgid "unknown bisect kind %s"
6848 msgstr ""
6928 msgstr ""
6849
6929
6850 msgid ""
6930 msgid ""
6851 "\n"
6931 "\n"
6852 " Mercurial has the ability to add new features through the use of\n"
6932 " Mercurial has the ability to add new features through the use of\n"
6853 " extensions. Extensions may add new commands, add options to\n"
6933 " extensions. Extensions may add new commands, add options to\n"
6854 " existing commands, change the default behavior of commands, or\n"
6934 " existing commands, change the default behavior of commands, or\n"
6855 " implement hooks.\n"
6935 " implement hooks.\n"
6856 "\n"
6936 "\n"
6857 " Extensions are not loaded by default for a variety of reasons:\n"
6937 " Extensions are not loaded by default for a variety of reasons:\n"
6858 " they can increase startup overhead; they may be meant for\n"
6938 " they can increase startup overhead; they may be meant for\n"
6859 " advanced usage only; they may provide potentially dangerous\n"
6939 " advanced usage only; they may provide potentially dangerous\n"
6860 " abilities (such as letting you destroy or modify history); they\n"
6940 " abilities (such as letting you destroy or modify history); they\n"
6861 " might not be ready for prime time; or they may alter some\n"
6941 " might not be ready for prime time; or they may alter some\n"
6862 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
6942 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
6863 " activate extensions as needed.\n"
6943 " activate extensions as needed.\n"
6864 "\n"
6944 "\n"
6865 " To enable the \"foo\" extension, either shipped with Mercurial\n"
6945 " To enable the \"foo\" extension, either shipped with Mercurial\n"
6866 " or in the Python search path, create an entry for it in your\n"
6946 " or in the Python search path, create an entry for it in your\n"
6867 " hgrc, like this:\n"
6947 " hgrc, like this:\n"
6868 "\n"
6948 "\n"
6869 " [extensions]\n"
6949 " [extensions]\n"
6870 " foo =\n"
6950 " foo =\n"
6871 "\n"
6951 "\n"
6872 " You may also specify the full path to an extension:\n"
6952 " You may also specify the full path to an extension:\n"
6873 "\n"
6953 "\n"
6874 " [extensions]\n"
6954 " [extensions]\n"
6875 " myfeature = ~/.hgext/myfeature.py\n"
6955 " myfeature = ~/.hgext/myfeature.py\n"
6876 "\n"
6956 "\n"
6877 " To explicitly disable an extension enabled in an hgrc of broader\n"
6957 " To explicitly disable an extension enabled in an hgrc of broader\n"
6878 " scope, prepend its path with !:\n"
6958 " scope, prepend its path with !:\n"
6879 "\n"
6959 "\n"
6880 " [extensions]\n"
6960 " [extensions]\n"
6881 " # disabling extension bar residing in /path/to/extension/bar.py\n"
6961 " # disabling extension bar residing in /path/to/extension/bar.py\n"
6882 " hgext.bar = !/path/to/extension/bar.py\n"
6962 " hgext.bar = !/path/to/extension/bar.py\n"
6883 " # ditto, but no path was supplied for extension baz\n"
6963 " # ditto, but no path was supplied for extension baz\n"
6884 " hgext.baz = !\n"
6964 " hgext.baz = !\n"
6885 " "
6965 " "
6886 msgstr ""
6966 msgstr ""
6887
6967
6888 msgid "disabled extensions:"
6968 msgid "disabled extensions:"
6889 msgstr ""
6969 msgstr ""
6890
6970
6891 msgid "Date Formats"
6971 msgid "Date Formats"
6892 msgstr ""
6972 msgstr ""
6893
6973
6894 msgid ""
6974 msgid ""
6895 "\n"
6975 "\n"
6896 " Some commands allow the user to specify a date, e.g.:\n"
6976 " Some commands allow the user to specify a date, e.g.:\n"
6897 " * backout, commit, import, tag: Specify the commit date.\n"
6977 " * backout, commit, import, tag: Specify the commit date.\n"
6898 " * log, revert, update: Select revision(s) by date.\n"
6978 " * log, revert, update: Select revision(s) by date.\n"
6899 "\n"
6979 "\n"
6900 " Many date formats are valid. Here are some examples:\n"
6980 " Many date formats are valid. Here are some examples:\n"
6901 "\n"
6981 "\n"
6902 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
6982 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
6903 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
6983 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
6904 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
6984 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
6905 " \"Dec 6\" (midnight)\n"
6985 " \"Dec 6\" (midnight)\n"
6906 " \"13:18\" (today assumed)\n"
6986 " \"13:18\" (today assumed)\n"
6907 " \"3:39\" (3:39AM assumed)\n"
6987 " \"3:39\" (3:39AM assumed)\n"
6908 " \"3:39pm\" (15:39)\n"
6988 " \"3:39pm\" (15:39)\n"
6909 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
6989 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
6910 " \"2006-12-6 13:18\"\n"
6990 " \"2006-12-6 13:18\"\n"
6911 " \"2006-12-6\"\n"
6991 " \"2006-12-6\"\n"
6912 " \"12-6\"\n"
6992 " \"12-6\"\n"
6913 " \"12/6\"\n"
6993 " \"12/6\"\n"
6914 " \"12/6/6\" (Dec 6 2006)\n"
6994 " \"12/6/6\" (Dec 6 2006)\n"
6915 "\n"
6995 "\n"
6916 " Lastly, there is Mercurial's internal format:\n"
6996 " Lastly, there is Mercurial's internal format:\n"
6917 "\n"
6997 "\n"
6918 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
6998 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
6919 "\n"
6999 "\n"
6920 " This is the internal representation format for dates. unixtime is\n"
7000 " This is the internal representation format for dates. unixtime is\n"
6921 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7001 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
6922 " offset is the offset of the local timezone, in seconds west of UTC\n"
7002 " offset is the offset of the local timezone, in seconds west of UTC\n"
6923 " (negative if the timezone is east of UTC).\n"
7003 " (negative if the timezone is east of UTC).\n"
6924 "\n"
7004 "\n"
6925 " The log command also accepts date ranges:\n"
7005 " The log command also accepts date ranges:\n"
6926 "\n"
7006 "\n"
6927 " \"<{datetime}\" - at or before a given date/time\n"
7007 " \"<{datetime}\" - at or before a given date/time\n"
6928 " \">{datetime}\" - on or after a given date/time\n"
7008 " \">{datetime}\" - on or after a given date/time\n"
6929 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7009 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
6930 " \"-{days}\" - within a given number of days of today\n"
7010 " \"-{days}\" - within a given number of days of today\n"
6931 " "
7011 " "
6932 msgstr ""
7012 msgstr ""
6933
7013
6934 msgid "File Name Patterns"
7014 msgid "File Name Patterns"
6935 msgstr ""
7015 msgstr ""
6936
7016
6937 msgid ""
7017 msgid ""
6938 "\n"
7018 "\n"
6939 " Mercurial accepts several notations for identifying one or more\n"
7019 " Mercurial accepts several notations for identifying one or more\n"
6940 " files at a time.\n"
7020 " files at a time.\n"
6941 "\n"
7021 "\n"
6942 " By default, Mercurial treats filenames as shell-style extended\n"
7022 " By default, Mercurial treats filenames as shell-style extended\n"
6943 " glob patterns.\n"
7023 " glob patterns.\n"
6944 "\n"
7024 "\n"
6945 " Alternate pattern notations must be specified explicitly.\n"
7025 " Alternate pattern notations must be specified explicitly.\n"
6946 "\n"
7026 "\n"
6947 " To use a plain path name without any pattern matching, start it\n"
7027 " To use a plain path name without any pattern matching, start it\n"
6948 " with \"path:\". These path names must completely match starting at\n"
7028 " with \"path:\". These path names must completely match starting at\n"
6949 " the current repository root.\n"
7029 " the current repository root.\n"
6950 "\n"
7030 "\n"
6951 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7031 " To use an extended glob, start a name with \"glob:\". Globs are\n"
6952 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7032 " rooted at the current directory; a glob such as \"*.c\" will only\n"
6953 " match files in the current directory ending with \".c\".\n"
7033 " match files in the current directory ending with \".c\".\n"
6954 "\n"
7034 "\n"
6955 " The supported glob syntax extensions are \"**\" to match any string\n"
7035 " The supported glob syntax extensions are \"**\" to match any string\n"
6956 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7036 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
6957 "\n"
7037 "\n"
6958 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7038 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
6959 " Regexp pattern matching is anchored at the root of the repository.\n"
7039 " Regexp pattern matching is anchored at the root of the repository.\n"
6960 "\n"
7040 "\n"
6961 " Plain examples:\n"
7041 " Plain examples:\n"
6962 "\n"
7042 "\n"
6963 " path:foo/bar a name bar in a directory named foo in the root of\n"
7043 " path:foo/bar a name bar in a directory named foo in the root of\n"
6964 " the repository\n"
7044 " the repository\n"
6965 " path:path:name a file or directory named \"path:name\"\n"
7045 " path:path:name a file or directory named \"path:name\"\n"
6966 "\n"
7046 "\n"
6967 " Glob examples:\n"
7047 " Glob examples:\n"
6968 "\n"
7048 "\n"
6969 " glob:*.c any name ending in \".c\" in the current directory\n"
7049 " glob:*.c any name ending in \".c\" in the current directory\n"
6970 " *.c any name ending in \".c\" in the current directory\n"
7050 " *.c any name ending in \".c\" in the current directory\n"
6971 " **.c any name ending in \".c\" in any subdirectory of the\n"
7051 " **.c any name ending in \".c\" in any subdirectory of the\n"
6972 " current directory including itself.\n"
7052 " current directory including itself.\n"
6973 " foo/*.c any name ending in \".c\" in the directory foo\n"
7053 " foo/*.c any name ending in \".c\" in the directory foo\n"
6974 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7054 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
6975 " including itself.\n"
7055 " including itself.\n"
6976 "\n"
7056 "\n"
6977 " Regexp examples:\n"
7057 " Regexp examples:\n"
6978 "\n"
7058 "\n"
6979 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7059 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
6980 "\n"
7060 "\n"
6981 " "
7061 " "
6982 msgstr ""
7062 msgstr ""
6983
7063
6984 msgid "Environment Variables"
7064 msgid "Environment Variables"
6985 msgstr ""
7065 msgstr ""
6986
7066
6987 msgid ""
7067 msgid ""
6988 "\n"
7068 "\n"
6989 "HG::\n"
7069 "HG::\n"
6990 " Path to the 'hg' executable, automatically passed when running\n"
7070 " Path to the 'hg' executable, automatically passed when running\n"
6991 " hooks, extensions or external tools. If unset or empty, this is\n"
7071 " hooks, extensions or external tools. If unset or empty, this is\n"
6992 " the hg executable's name if it's frozen, or an executable named\n"
7072 " the hg executable's name if it's frozen, or an executable named\n"
6993 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7073 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
6994 " Windows) is searched.\n"
7074 " Windows) is searched.\n"
6995 "\n"
7075 "\n"
6996 "HGEDITOR::\n"
7076 "HGEDITOR::\n"
6997 " This is the name of the editor to run when committing. See EDITOR.\n"
7077 " This is the name of the editor to run when committing. See EDITOR.\n"
6998 "\n"
7078 "\n"
6999 " (deprecated, use .hgrc)\n"
7079 " (deprecated, use .hgrc)\n"
7000 "\n"
7080 "\n"
7001 "HGENCODING::\n"
7081 "HGENCODING::\n"
7002 " This overrides the default locale setting detected by Mercurial.\n"
7082 " This overrides the default locale setting detected by Mercurial.\n"
7003 " This setting is used to convert data including usernames,\n"
7083 " This setting is used to convert data including usernames,\n"
7004 " changeset descriptions, tag names, and branches. This setting can\n"
7084 " changeset descriptions, tag names, and branches. This setting can\n"
7005 " be overridden with the --encoding command-line option.\n"
7085 " be overridden with the --encoding command-line option.\n"
7006 "\n"
7086 "\n"
7007 "HGENCODINGMODE::\n"
7087 "HGENCODINGMODE::\n"
7008 " This sets Mercurial's behavior for handling unknown characters\n"
7088 " This sets Mercurial's behavior for handling unknown characters\n"
7009 " while transcoding user input. The default is \"strict\", which\n"
7089 " while transcoding user input. The default is \"strict\", which\n"
7010 " causes Mercurial to abort if it can't map a character. Other\n"
7090 " causes Mercurial to abort if it can't map a character. Other\n"
7011 " settings include \"replace\", which replaces unknown characters, and\n"
7091 " settings include \"replace\", which replaces unknown characters, and\n"
7012 " \"ignore\", which drops them. This setting can be overridden with\n"
7092 " \"ignore\", which drops them. This setting can be overridden with\n"
7013 " the --encodingmode command-line option.\n"
7093 " the --encodingmode command-line option.\n"
7014 "\n"
7094 "\n"
7015 "HGMERGE::\n"
7095 "HGMERGE::\n"
7016 " An executable to use for resolving merge conflicts. The program\n"
7096 " An executable to use for resolving merge conflicts. The program\n"
7017 " will be executed with three arguments: local file, remote file,\n"
7097 " will be executed with three arguments: local file, remote file,\n"
7018 " ancestor file.\n"
7098 " ancestor file.\n"
7019 "\n"
7099 "\n"
7020 " (deprecated, use .hgrc)\n"
7100 " (deprecated, use .hgrc)\n"
7021 "\n"
7101 "\n"
7022 "HGRCPATH::\n"
7102 "HGRCPATH::\n"
7023 " A list of files or directories to search for hgrc files. Item\n"
7103 " A list of files or directories to search for hgrc files. Item\n"
7024 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7104 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7025 " platform default search path is used. If empty, only the .hg/hgrc\n"
7105 " platform default search path is used. If empty, only the .hg/hgrc\n"
7026 " from the current repository is read.\n"
7106 " from the current repository is read.\n"
7027 "\n"
7107 "\n"
7028 " For each element in HGRCPATH:\n"
7108 " For each element in HGRCPATH:\n"
7029 " * if it's a directory, all files ending with .rc are added\n"
7109 " * if it's a directory, all files ending with .rc are added\n"
7030 " * otherwise, the file itself will be added\n"
7110 " * otherwise, the file itself will be added\n"
7031 "\n"
7111 "\n"
7032 "HGUSER::\n"
7112 "HGUSER::\n"
7033 " This is the string used as the author of a commit. If not set,\n"
7113 " This is the string used as the author of a commit. If not set,\n"
7034 " available values will be considered in this order:\n"
7114 " available values will be considered in this order:\n"
7035 "\n"
7115 "\n"
7036 " * HGUSER (deprecated)\n"
7116 " * HGUSER (deprecated)\n"
7037 " * hgrc files from the HGRCPATH\n"
7117 " * hgrc files from the HGRCPATH\n"
7038 " * EMAIL\n"
7118 " * EMAIL\n"
7039 " * interactive prompt\n"
7119 " * interactive prompt\n"
7040 " * LOGNAME (with '@hostname' appended)\n"
7120 " * LOGNAME (with '@hostname' appended)\n"
7041 "\n"
7121 "\n"
7042 " (deprecated, use .hgrc)\n"
7122 " (deprecated, use .hgrc)\n"
7043 "\n"
7123 "\n"
7044 "EMAIL::\n"
7124 "EMAIL::\n"
7045 " May be used as the author of a commit; see HGUSER.\n"
7125 " May be used as the author of a commit; see HGUSER.\n"
7046 "\n"
7126 "\n"
7047 "LOGNAME::\n"
7127 "LOGNAME::\n"
7048 " May be used as the author of a commit; see HGUSER.\n"
7128 " May be used as the author of a commit; see HGUSER.\n"
7049 "\n"
7129 "\n"
7050 "VISUAL::\n"
7130 "VISUAL::\n"
7051 " This is the name of the editor to use when committing. See EDITOR.\n"
7131 " This is the name of the editor to use when committing. See EDITOR.\n"
7052 "\n"
7132 "\n"
7053 "EDITOR::\n"
7133 "EDITOR::\n"
7054 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7134 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7055 " user to modify, for example when writing commit messages. The\n"
7135 " user to modify, for example when writing commit messages. The\n"
7056 " editor it uses is determined by looking at the environment\n"
7136 " editor it uses is determined by looking at the environment\n"
7057 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7137 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7058 " non-empty one is chosen. If all of them are empty, the editor\n"
7138 " non-empty one is chosen. If all of them are empty, the editor\n"
7059 " defaults to 'vi'.\n"
7139 " defaults to 'vi'.\n"
7060 "\n"
7140 "\n"
7061 "PYTHONPATH::\n"
7141 "PYTHONPATH::\n"
7062 " This is used by Python to find imported modules and may need to be\n"
7142 " This is used by Python to find imported modules and may need to be\n"
7063 " set appropriately if this Mercurial is not installed system-wide.\n"
7143 " set appropriately if this Mercurial is not installed system-wide.\n"
7064 " "
7144 " "
7065 msgstr ""
7145 msgstr ""
7066
7146
7067 msgid "Specifying Single Revisions"
7147 msgid "Specifying Single Revisions"
7068 msgstr ""
7148 msgstr ""
7069
7149
7070 msgid ""
7150 msgid ""
7071 "\n"
7151 "\n"
7072 " Mercurial supports several ways to specify individual revisions.\n"
7152 " Mercurial supports several ways to specify individual revisions.\n"
7073 "\n"
7153 "\n"
7074 " A plain integer is treated as a revision number. Negative integers\n"
7154 " A plain integer is treated as a revision number. Negative integers\n"
7075 " are treated as topological offsets from the tip, with -1 denoting\n"
7155 " are treated as topological offsets from the tip, with -1 denoting\n"
7076 " the tip. As such, negative numbers are only useful if you've\n"
7156 " the tip. As such, negative numbers are only useful if you've\n"
7077 " memorized your local tree numbers and want to save typing a single\n"
7157 " memorized your local tree numbers and want to save typing a single\n"
7078 " digit. This editor suggests copy and paste.\n"
7158 " digit. This editor suggests copy and paste.\n"
7079 "\n"
7159 "\n"
7080 " A 40-digit hexadecimal string is treated as a unique revision\n"
7160 " A 40-digit hexadecimal string is treated as a unique revision\n"
7081 " identifier.\n"
7161 " identifier.\n"
7082 "\n"
7162 "\n"
7083 " A hexadecimal string less than 40 characters long is treated as a\n"
7163 " A hexadecimal string less than 40 characters long is treated as a\n"
7084 " unique revision identifier, and referred to as a short-form\n"
7164 " unique revision identifier, and referred to as a short-form\n"
7085 " identifier. A short-form identifier is only valid if it is the\n"
7165 " identifier. A short-form identifier is only valid if it is the\n"
7086 " prefix of exactly one full-length identifier.\n"
7166 " prefix of exactly one full-length identifier.\n"
7087 "\n"
7167 "\n"
7088 " Any other string is treated as a tag name, which is a symbolic\n"
7168 " Any other string is treated as a tag name, which is a symbolic\n"
7089 " name associated with a revision identifier. Tag names may not\n"
7169 " name associated with a revision identifier. Tag names may not\n"
7090 " contain the \":\" character.\n"
7170 " contain the \":\" character.\n"
7091 "\n"
7171 "\n"
7092 " The reserved name \"tip\" is a special tag that always identifies\n"
7172 " The reserved name \"tip\" is a special tag that always identifies\n"
7093 " the most recent revision.\n"
7173 " the most recent revision.\n"
7094 "\n"
7174 "\n"
7095 " The reserved name \"null\" indicates the null revision. This is the\n"
7175 " The reserved name \"null\" indicates the null revision. This is the\n"
7096 " revision of an empty repository, and the parent of revision 0.\n"
7176 " revision of an empty repository, and the parent of revision 0.\n"
7097 "\n"
7177 "\n"
7098 " The reserved name \".\" indicates the working directory parent. If\n"
7178 " The reserved name \".\" indicates the working directory parent. If\n"
7099 " no working directory is checked out, it is equivalent to null. If\n"
7179 " no working directory is checked out, it is equivalent to null. If\n"
7100 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7180 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7101 " first parent.\n"
7181 " first parent.\n"
7102 " "
7182 " "
7103 msgstr ""
7183 msgstr ""
7104
7184
7105 msgid "Specifying Multiple Revisions"
7185 msgid "Specifying Multiple Revisions"
7106 msgstr ""
7186 msgstr ""
7107
7187
7108 msgid ""
7188 msgid ""
7109 "\n"
7189 "\n"
7110 " When Mercurial accepts more than one revision, they may be\n"
7190 " When Mercurial accepts more than one revision, they may be\n"
7111 " specified individually, or provided as a topologically continuous\n"
7191 " specified individually, or provided as a topologically continuous\n"
7112 " range, separated by the \":\" character.\n"
7192 " range, separated by the \":\" character.\n"
7113 "\n"
7193 "\n"
7114 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7194 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7115 " are revision identifiers. Both BEGIN and END are optional. If\n"
7195 " are revision identifiers. Both BEGIN and END are optional. If\n"
7116 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7196 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7117 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7197 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7118 " \"all revisions\".\n"
7198 " \"all revisions\".\n"
7119 "\n"
7199 "\n"
7120 " If BEGIN is greater than END, revisions are treated in reverse\n"
7200 " If BEGIN is greater than END, revisions are treated in reverse\n"
7121 " order.\n"
7201 " order.\n"
7122 "\n"
7202 "\n"
7123 " A range acts as a closed interval. This means that a range of 3:5\n"
7203 " A range acts as a closed interval. This means that a range of 3:5\n"
7124 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7204 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7125 " "
7205 " "
7126 msgstr ""
7206 msgstr ""
7127
7207
7128 msgid "Diff Formats"
7208 msgid "Diff Formats"
7129 msgstr ""
7209 msgstr ""
7130
7210
7131 msgid ""
7211 msgid ""
7132 "\n"
7212 "\n"
7133 " Mercurial's default format for showing changes between two\n"
7213 " Mercurial's default format for showing changes between two\n"
7134 " versions of a file is compatible with the unified format of GNU\n"
7214 " versions of a file is compatible with the unified format of GNU\n"
7135 " diff, which can be used by GNU patch and many other standard\n"
7215 " diff, which can be used by GNU patch and many other standard\n"
7136 " tools.\n"
7216 " tools.\n"
7137 "\n"
7217 "\n"
7138 " While this standard format is often enough, it does not encode the\n"
7218 " While this standard format is often enough, it does not encode the\n"
7139 " following information:\n"
7219 " following information:\n"
7140 "\n"
7220 "\n"
7141 " - executable status and other permission bits\n"
7221 " - executable status and other permission bits\n"
7142 " - copy or rename information\n"
7222 " - copy or rename information\n"
7143 " - changes in binary files\n"
7223 " - changes in binary files\n"
7144 " - creation or deletion of empty files\n"
7224 " - creation or deletion of empty files\n"
7145 "\n"
7225 "\n"
7146 " Mercurial also supports the extended diff format from the git VCS\n"
7226 " Mercurial also supports the extended diff format from the git VCS\n"
7147 " which addresses these limitations. The git diff format is not\n"
7227 " which addresses these limitations. The git diff format is not\n"
7148 " produced by default because a few widespread tools still do not\n"
7228 " produced by default because a few widespread tools still do not\n"
7149 " understand this format.\n"
7229 " understand this format.\n"
7150 "\n"
7230 "\n"
7151 " This means that when generating diffs from a Mercurial repository\n"
7231 " This means that when generating diffs from a Mercurial repository\n"
7152 " (e.g. with \"hg export\"), you should be careful about things like\n"
7232 " (e.g. with \"hg export\"), you should be careful about things like\n"
7153 " file copies and renames or other things mentioned above, because\n"
7233 " file copies and renames or other things mentioned above, because\n"
7154 " when applying a standard diff to a different repository, this\n"
7234 " when applying a standard diff to a different repository, this\n"
7155 " extra information is lost. Mercurial's internal operations (like\n"
7235 " extra information is lost. Mercurial's internal operations (like\n"
7156 " push and pull) are not affected by this, because they use an\n"
7236 " push and pull) are not affected by this, because they use an\n"
7157 " internal binary format for communicating changes.\n"
7237 " internal binary format for communicating changes.\n"
7158 "\n"
7238 "\n"
7159 " To make Mercurial produce the git extended diff format, use the\n"
7239 " To make Mercurial produce the git extended diff format, use the\n"
7160 " --git option available for many commands, or set 'git = True' in\n"
7240 " --git option available for many commands, or set 'git = True' in\n"
7161 " the [diff] section of your hgrc. You do not need to set this\n"
7241 " the [diff] section of your hgrc. You do not need to set this\n"
7162 " option when importing diffs in this format or using them in the mq\n"
7242 " option when importing diffs in this format or using them in the mq\n"
7163 " extension.\n"
7243 " extension.\n"
7164 " "
7244 " "
7165 msgstr ""
7245 msgstr ""
7166
7246
7167 msgid "Template Usage"
7247 msgid "Template Usage"
7168 msgstr ""
7248 msgstr ""
7169
7249
7170 msgid ""
7250 msgid ""
7171 "\n"
7251 "\n"
7172 " Mercurial allows you to customize output of commands through\n"
7252 " Mercurial allows you to customize output of commands through\n"
7173 " templates. You can either pass in a template from the command\n"
7253 " templates. You can either pass in a template from the command\n"
7174 " line, via the --template option, or select an existing\n"
7254 " line, via the --template option, or select an existing\n"
7175 " template-style (--style).\n"
7255 " template-style (--style).\n"
7176 "\n"
7256 "\n"
7177 " You can customize output for any \"log-like\" command: log,\n"
7257 " You can customize output for any \"log-like\" command: log,\n"
7178 " outgoing, incoming, tip, parents, heads and glog.\n"
7258 " outgoing, incoming, tip, parents, heads and glog.\n"
7179 "\n"
7259 "\n"
7180 " Three styles are packaged with Mercurial: default (the style used\n"
7260 " Three styles are packaged with Mercurial: default (the style used\n"
7181 " when no explicit preference is passed), compact and changelog.\n"
7261 " when no explicit preference is passed), compact and changelog.\n"
7182 " Usage:\n"
7262 " Usage:\n"
7183 "\n"
7263 "\n"
7184 " $ hg log -r1 --style changelog\n"
7264 " $ hg log -r1 --style changelog\n"
7185 "\n"
7265 "\n"
7186 " A template is a piece of text, with markup to invoke variable\n"
7266 " A template is a piece of text, with markup to invoke variable\n"
7187 " expansion:\n"
7267 " expansion:\n"
7188 "\n"
7268 "\n"
7189 " $ hg log -r1 --template \"{node}\\n\"\n"
7269 " $ hg log -r1 --template \"{node}\\n\"\n"
7190 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7270 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7191 "\n"
7271 "\n"
7192 " Strings in curly braces are called keywords. The availability of\n"
7272 " Strings in curly braces are called keywords. The availability of\n"
7193 " keywords depends on the exact context of the templater. These\n"
7273 " keywords depends on the exact context of the templater. These\n"
7194 " keywords are usually available for templating a log-like command:\n"
7274 " keywords are usually available for templating a log-like command:\n"
7195 "\n"
7275 "\n"
7196 " - author: String. The unmodified author of the changeset.\n"
7276 " - author: String. The unmodified author of the changeset.\n"
7197 " - branches: String. The name of the branch on which the changeset\n"
7277 " - branches: String. The name of the branch on which the changeset\n"
7198 " was committed. Will be empty if the branch name was default.\n"
7278 " was committed. Will be empty if the branch name was default.\n"
7199 " - date: Date information. The date when the changeset was committed.\n"
7279 " - date: Date information. The date when the changeset was committed.\n"
7200 " - desc: String. The text of the changeset description.\n"
7280 " - desc: String. The text of the changeset description.\n"
7201 " - diffstat: String. Statistics of changes with the following\n"
7281 " - diffstat: String. Statistics of changes with the following\n"
7202 " format: \"modified files: +added/-removed lines\"\n"
7282 " format: \"modified files: +added/-removed lines\"\n"
7203 " - files: List of strings. All files modified, added, or removed by\n"
7283 " - files: List of strings. All files modified, added, or removed by\n"
7204 " this changeset.\n"
7284 " this changeset.\n"
7205 " - file_adds: List of strings. Files added by this changeset.\n"
7285 " - file_adds: List of strings. Files added by this changeset.\n"
7206 " - file_mods: List of strings. Files modified by this changeset.\n"
7286 " - file_mods: List of strings. Files modified by this changeset.\n"
7207 " - file_dels: List of strings. Files removed by this changeset.\n"
7287 " - file_dels: List of strings. Files removed by this changeset.\n"
7208 " - node: String. The changeset identification hash, as a\n"
7288 " - node: String. The changeset identification hash, as a\n"
7209 " 40-character hexadecimal string.\n"
7289 " 40-character hexadecimal string.\n"
7210 " - parents: List of strings. The parents of the changeset.\n"
7290 " - parents: List of strings. The parents of the changeset.\n"
7211 " - rev: Integer. The repository-local changeset revision number.\n"
7291 " - rev: Integer. The repository-local changeset revision number.\n"
7212 " - tags: List of strings. Any tags associated with the changeset.\n"
7292 " - tags: List of strings. Any tags associated with the changeset.\n"
7213 "\n"
7293 "\n"
7214 " The \"date\" keyword does not produce human-readable output. If you\n"
7294 " The \"date\" keyword does not produce human-readable output. If you\n"
7215 " want to use a date in your output, you can use a filter to process\n"
7295 " want to use a date in your output, you can use a filter to process\n"
7216 " it. Filters are functions which return a string based on the input\n"
7296 " it. Filters are functions which return a string based on the input\n"
7217 " variable. You can also use a chain of filters to get the desired\n"
7297 " variable. You can also use a chain of filters to get the desired\n"
7218 " output:\n"
7298 " output:\n"
7219 "\n"
7299 "\n"
7220 " $ hg tip --template \"{date|isodate}\\n\"\n"
7300 " $ hg tip --template \"{date|isodate}\\n\"\n"
7221 " 2008-08-21 18:22 +0000\n"
7301 " 2008-08-21 18:22 +0000\n"
7222 "\n"
7302 "\n"
7223 " List of filters:\n"
7303 " List of filters:\n"
7224 "\n"
7304 "\n"
7225 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7305 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7226 " every line except the last.\n"
7306 " every line except the last.\n"
7227 " - age: Date. Returns a human-readable date/time difference between\n"
7307 " - age: Date. Returns a human-readable date/time difference between\n"
7228 " the given date/time and the current date/time.\n"
7308 " the given date/time and the current date/time.\n"
7229 " - basename: Any text. Treats the text as a path, and returns the\n"
7309 " - basename: Any text. Treats the text as a path, and returns the\n"
7230 " last component of the path after splitting by the path\n"
7310 " last component of the path after splitting by the path\n"
7231 " separator (ignoring trailing separators). For example,\n"
7311 " separator (ignoring trailing separators). For example,\n"
7232 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7312 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7233 "\".\n"
7313 "\".\n"
7234 " - stripdir: Treat the text as path and strip a directory level, if\n"
7314 " - stripdir: Treat the text as path and strip a directory level, if\n"
7235 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7315 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7236 " - date: Date. Returns a date in a Unix date format, including\n"
7316 " - date: Date. Returns a date in a Unix date format, including\n"
7237 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7317 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7238 " - domain: Any text. Finds the first string that looks like an\n"
7318 " - domain: Any text. Finds the first string that looks like an\n"
7239 " email address, and extracts just the domain component.\n"
7319 " email address, and extracts just the domain component.\n"
7240 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7320 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7241 " - email: Any text. Extracts the first string that looks like an\n"
7321 " - email: Any text. Extracts the first string that looks like an\n"
7242 " email address. Example: 'User <user@example.com>' becomes\n"
7322 " email address. Example: 'User <user@example.com>' becomes\n"
7243 " 'user@example.com'.\n"
7323 " 'user@example.com'.\n"
7244 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7324 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7245 " \"<\" and \">\" with XML entities.\n"
7325 " \"<\" and \">\" with XML entities.\n"
7246 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7326 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7247 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7327 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7248 " - firstline: Any text. Returns the first line of text.\n"
7328 " - firstline: Any text. Returns the first line of text.\n"
7249 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7329 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7250 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7330 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7251 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7331 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7252 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7332 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7253 " - localdate: Date. Converts a date to local date.\n"
7333 " - localdate: Date. Converts a date to local date.\n"
7254 " - obfuscate: Any text. Returns the input text rendered as a\n"
7334 " - obfuscate: Any text. Returns the input text rendered as a\n"
7255 " sequence of XML entities.\n"
7335 " sequence of XML entities.\n"
7256 " - person: Any text. Returns the text before an email address.\n"
7336 " - person: Any text. Returns the text before an email address.\n"
7257 " - rfc822date: Date. Returns a date using the same format used\n"
7337 " - rfc822date: Date. Returns a date using the same format used\n"
7258 " in email headers.\n"
7338 " in email headers.\n"
7259 " - short: Changeset hash. Returns the short form of a changeset\n"
7339 " - short: Changeset hash. Returns the short form of a changeset\n"
7260 " hash, i.e. a 12-byte hexadecimal string.\n"
7340 " hash, i.e. a 12-byte hexadecimal string.\n"
7261 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7341 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7262 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7342 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7263 " - tabindent: Any text. Returns the text, with every line except\n"
7343 " - tabindent: Any text. Returns the text, with every line except\n"
7264 " the first starting with a tab character.\n"
7344 " the first starting with a tab character.\n"
7265 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7345 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7266 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7346 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7267 " - user: Any text. Returns the user portion of an email address.\n"
7347 " - user: Any text. Returns the user portion of an email address.\n"
7268 " "
7348 " "
7269 msgstr ""
7349 msgstr ""
7270
7350
7271 msgid "URL Paths"
7351 msgid "URL Paths"
7272 msgstr ""
7352 msgstr ""
7273
7353
7274 msgid ""
7354 msgid ""
7275 "\n"
7355 "\n"
7276 " Valid URLs are of the form:\n"
7356 " Valid URLs are of the form:\n"
7277 "\n"
7357 "\n"
7278 " local/filesystem/path (or file://local/filesystem/path)\n"
7358 " local/filesystem/path (or file://local/filesystem/path)\n"
7279 " http://[user[:pass]@]host[:port]/[path]\n"
7359 " http://[user[:pass]@]host[:port]/[path]\n"
7280 " https://[user[:pass]@]host[:port]/[path]\n"
7360 " https://[user[:pass]@]host[:port]/[path]\n"
7281 " ssh://[user[:pass]@]host[:port]/[path]\n"
7361 " ssh://[user[:pass]@]host[:port]/[path]\n"
7282 "\n"
7362 "\n"
7283 " Paths in the local filesystem can either point to Mercurial\n"
7363 " Paths in the local filesystem can either point to Mercurial\n"
7284 " repositories or to bundle files (as created by 'hg bundle' or\n"
7364 " repositories or to bundle files (as created by 'hg bundle' or\n"
7285 " 'hg incoming --bundle').\n"
7365 " 'hg incoming --bundle').\n"
7286 "\n"
7366 "\n"
7287 " An optional identifier after # indicates a particular branch, tag,\n"
7367 " An optional identifier after # indicates a particular branch, tag,\n"
7288 " or changeset to use from the remote repository.\n"
7368 " or changeset to use from the remote repository.\n"
7289 "\n"
7369 "\n"
7290 " Some features, such as pushing to http:// and https:// URLs are\n"
7370 " Some features, such as pushing to http:// and https:// URLs are\n"
7291 " only possible if the feature is explicitly enabled on the remote\n"
7371 " only possible if the feature is explicitly enabled on the remote\n"
7292 " Mercurial server.\n"
7372 " Mercurial server.\n"
7293 "\n"
7373 "\n"
7294 " Some notes about using SSH with Mercurial:\n"
7374 " Some notes about using SSH with Mercurial:\n"
7295 " - SSH requires an accessible shell account on the destination\n"
7375 " - SSH requires an accessible shell account on the destination\n"
7296 " machine and a copy of hg in the remote path or specified with as\n"
7376 " machine and a copy of hg in the remote path or specified with as\n"
7297 " remotecmd.\n"
7377 " remotecmd.\n"
7298 " - path is relative to the remote user's home directory by default.\n"
7378 " - path is relative to the remote user's home directory by default.\n"
7299 " Use an extra slash at the start of a path to specify an absolute "
7379 " Use an extra slash at the start of a path to specify an absolute "
7300 "path:\n"
7380 "path:\n"
7301 " ssh://example.com//tmp/repository\n"
7381 " ssh://example.com//tmp/repository\n"
7302 " - Mercurial doesn't use its own compression via SSH; the right\n"
7382 " - Mercurial doesn't use its own compression via SSH; the right\n"
7303 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7383 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7304 " Host *.mylocalnetwork.example.com\n"
7384 " Host *.mylocalnetwork.example.com\n"
7305 " Compression no\n"
7385 " Compression no\n"
7306 " Host *\n"
7386 " Host *\n"
7307 " Compression yes\n"
7387 " Compression yes\n"
7308 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7388 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7309 " or with the --ssh command line option.\n"
7389 " or with the --ssh command line option.\n"
7310 "\n"
7390 "\n"
7311 " These URLs can all be stored in your hgrc with path aliases under\n"
7391 " These URLs can all be stored in your hgrc with path aliases under\n"
7312 " the [paths] section like so:\n"
7392 " the [paths] section like so:\n"
7313 " [paths]\n"
7393 " [paths]\n"
7314 " alias1 = URL1\n"
7394 " alias1 = URL1\n"
7315 " alias2 = URL2\n"
7395 " alias2 = URL2\n"
7316 " ...\n"
7396 " ...\n"
7317 "\n"
7397 "\n"
7318 " You can then use the alias for any command that uses a URL (for\n"
7398 " You can then use the alias for any command that uses a URL (for\n"
7319 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7399 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7320 "\n"
7400 "\n"
7321 " Two path aliases are special because they are used as defaults\n"
7401 " Two path aliases are special because they are used as defaults\n"
7322 " when you do not provide the URL to a command:\n"
7402 " when you do not provide the URL to a command:\n"
7323 "\n"
7403 "\n"
7324 " default:\n"
7404 " default:\n"
7325 " When you create a repository with hg clone, the clone command\n"
7405 " When you create a repository with hg clone, the clone command\n"
7326 " saves the location of the source repository as the new\n"
7406 " saves the location of the source repository as the new\n"
7327 " repository's 'default' path. This is then used when you omit\n"
7407 " repository's 'default' path. This is then used when you omit\n"
7328 " path from push- and pull-like commands (including incoming and\n"
7408 " path from push- and pull-like commands (including incoming and\n"
7329 " outgoing).\n"
7409 " outgoing).\n"
7330 "\n"
7410 "\n"
7331 " default-push:\n"
7411 " default-push:\n"
7332 " The push command will look for a path named 'default-push', and\n"
7412 " The push command will look for a path named 'default-push', and\n"
7333 " prefer it over 'default' if both are defined.\n"
7413 " prefer it over 'default' if both are defined.\n"
7334 " "
7414 " "
7335 msgstr ""
7415 msgstr ""
7336
7416
7337 msgid "Using additional features"
7417 msgid "Using additional features"
7338 msgstr ""
7418 msgstr ""
7339
7419
7340 msgid "can only share local repositories"
7420 msgid "can only share local repositories"
7341 msgstr ""
7421 msgstr ""
7342
7422
7343 msgid "destination already exists"
7423 msgid "destination already exists"
7344 msgstr ""
7424 msgstr ""
7345
7425
7346 msgid "updating working directory\n"
7426 msgid "updating working directory\n"
7347 msgstr ""
7427 msgstr ""
7348
7428
7349 #, python-format
7429 #, python-format
7350 msgid "destination directory: %s\n"
7430 msgid "destination directory: %s\n"
7351 msgstr ""
7431 msgstr ""
7352
7432
7353 #, python-format
7433 #, python-format
7354 msgid "destination '%s' already exists"
7434 msgid "destination '%s' already exists"
7355 msgstr ""
7435 msgstr ""
7356
7436
7357 #, python-format
7437 #, python-format
7358 msgid "destination '%s' is not empty"
7438 msgid "destination '%s' is not empty"
7359 msgstr ""
7439 msgstr ""
7360
7440
7361 msgid ""
7441 msgid ""
7362 "src repository does not support revision lookup and so doesn't support clone "
7442 "src repository does not support revision lookup and so doesn't support clone "
7363 "by revision"
7443 "by revision"
7364 msgstr ""
7444 msgstr ""
7365
7445
7366 msgid "clone from remote to remote not supported"
7446 msgid "clone from remote to remote not supported"
7367 msgstr ""
7447 msgstr ""
7368
7448
7369 msgid "updated"
7449 msgid "updated"
7370 msgstr ""
7450 msgstr ""
7371
7451
7372 msgid "merged"
7452 msgid "merged"
7373 msgstr ""
7453 msgstr ""
7374
7454
7375 msgid "removed"
7455 msgid "removed"
7376 msgstr ""
7456 msgstr ""
7377
7457
7378 msgid "unresolved"
7458 msgid "unresolved"
7379 msgstr ""
7459 msgstr ""
7380
7460
7381 #, python-format
7461 #, python-format
7382 msgid "%d files %s"
7462 msgid "%d files %s"
7383 msgstr ""
7463 msgstr ""
7384
7464
7385 msgid "use 'hg resolve' to retry unresolved file merges\n"
7465 msgid "use 'hg resolve' to retry unresolved file merges\n"
7386 msgstr ""
7466 msgstr ""
7387
7467
7388 msgid ""
7468 msgid ""
7389 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7469 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7390 "abandon\n"
7470 "abandon\n"
7391 msgstr ""
7471 msgstr ""
7392
7472
7393 msgid "(branch merge, don't forget to commit)\n"
7473 msgid "(branch merge, don't forget to commit)\n"
7394 msgstr ""
7474 msgstr ""
7395
7475
7396 #, python-format
7476 #, python-format
7397 msgid "error reading %s/.hg/hgrc: %s\n"
7477 msgid "error reading %s/.hg/hgrc: %s\n"
7398 msgstr ""
7478 msgstr ""
7399
7479
7400 msgid "SSL support is unavailable"
7480 msgid "SSL support is unavailable"
7401 msgstr ""
7481 msgstr ""
7402
7482
7403 msgid "IPv6 is not available on this system"
7483 msgid "IPv6 is not available on this system"
7404 msgstr ""
7484 msgstr ""
7405
7485
7406 #, python-format
7486 #, python-format
7407 msgid "cannot start server at '%s:%d': %s"
7487 msgid "cannot start server at '%s:%d': %s"
7408 msgstr ""
7488 msgstr ""
7409
7489
7410 #, python-format
7490 #, python-format
7411 msgid "calling hook %s: %s\n"
7491 msgid "calling hook %s: %s\n"
7412 msgstr ""
7492 msgstr ""
7413
7493
7414 #, python-format
7494 #, python-format
7415 msgid "%s hook is invalid (\"%s\" not in a module)"
7495 msgid "%s hook is invalid (\"%s\" not in a module)"
7416 msgstr ""
7496 msgstr ""
7417
7497
7418 #, python-format
7498 #, python-format
7419 msgid "%s hook is invalid (import of \"%s\" failed)"
7499 msgid "%s hook is invalid (import of \"%s\" failed)"
7420 msgstr ""
7500 msgstr ""
7421
7501
7422 #, python-format
7502 #, python-format
7423 msgid "%s hook is invalid (\"%s\" is not defined)"
7503 msgid "%s hook is invalid (\"%s\" is not defined)"
7424 msgstr ""
7504 msgstr ""
7425
7505
7426 #, python-format
7506 #, python-format
7427 msgid "%s hook is invalid (\"%s\" is not callable)"
7507 msgid "%s hook is invalid (\"%s\" is not callable)"
7428 msgstr ""
7508 msgstr ""
7429
7509
7430 #, python-format
7510 #, python-format
7431 msgid "error: %s hook failed: %s\n"
7511 msgid "error: %s hook failed: %s\n"
7432 msgstr ""
7512 msgstr ""
7433
7513
7434 #, python-format
7514 #, python-format
7435 msgid "error: %s hook raised an exception: %s\n"
7515 msgid "error: %s hook raised an exception: %s\n"
7436 msgstr ""
7516 msgstr ""
7437
7517
7438 #, python-format
7518 #, python-format
7439 msgid "%s hook failed"
7519 msgid "%s hook failed"
7440 msgstr ""
7520 msgstr ""
7441
7521
7442 #, python-format
7522 #, python-format
7443 msgid "warning: %s hook failed\n"
7523 msgid "warning: %s hook failed\n"
7444 msgstr ""
7524 msgstr ""
7445
7525
7446 #, python-format
7526 #, python-format
7447 msgid "running hook %s: %s\n"
7527 msgid "running hook %s: %s\n"
7448 msgstr ""
7528 msgstr ""
7449
7529
7450 #, python-format
7530 #, python-format
7451 msgid "%s hook %s"
7531 msgid "%s hook %s"
7452 msgstr ""
7532 msgstr ""
7453
7533
7454 #, python-format
7534 #, python-format
7455 msgid "warning: %s hook %s\n"
7535 msgid "warning: %s hook %s\n"
7456 msgstr ""
7536 msgstr ""
7457
7537
7458 msgid "connection ended unexpectedly"
7538 msgid "connection ended unexpectedly"
7459 msgstr ""
7539 msgstr ""
7460
7540
7461 #, python-format
7541 #, python-format
7462 msgid "unsupported URL component: \"%s\""
7542 msgid "unsupported URL component: \"%s\""
7463 msgstr ""
7543 msgstr ""
7464
7544
7465 #, python-format
7545 #, python-format
7466 msgid "using %s\n"
7546 msgid "using %s\n"
7467 msgstr ""
7547 msgstr ""
7468
7548
7469 #, python-format
7549 #, python-format
7470 msgid "capabilities: %s\n"
7550 msgid "capabilities: %s\n"
7471 msgstr ""
7551 msgstr ""
7472
7552
7473 msgid "operation not supported over http"
7553 msgid "operation not supported over http"
7474 msgstr ""
7554 msgstr ""
7475
7555
7476 #, python-format
7556 #, python-format
7477 msgid "sending %s command\n"
7557 msgid "sending %s command\n"
7478 msgstr ""
7558 msgstr ""
7479
7559
7480 #, python-format
7560 #, python-format
7481 msgid "sending %s bytes\n"
7561 msgid "sending %s bytes\n"
7482 msgstr ""
7562 msgstr ""
7483
7563
7484 msgid "authorization failed"
7564 msgid "authorization failed"
7485 msgstr ""
7565 msgstr ""
7486
7566
7487 #, python-format
7567 #, python-format
7488 msgid "http error while sending %s command\n"
7568 msgid "http error while sending %s command\n"
7489 msgstr ""
7569 msgstr ""
7490
7570
7491 msgid "http error, possibly caused by proxy setting"
7571 msgid "http error, possibly caused by proxy setting"
7492 msgstr ""
7572 msgstr ""
7493
7573
7494 #, python-format
7574 #, python-format
7495 msgid "real URL is %s\n"
7575 msgid "real URL is %s\n"
7496 msgstr ""
7576 msgstr ""
7497
7577
7498 #, python-format
7578 #, python-format
7499 msgid "requested URL: '%s'\n"
7579 msgid "requested URL: '%s'\n"
7500 msgstr ""
7580 msgstr ""
7501
7581
7502 #, python-format
7582 #, python-format
7503 msgid "'%s' does not appear to be an hg repository"
7583 msgid "'%s' does not appear to be an hg repository"
7504 msgstr ""
7584 msgstr ""
7505
7585
7506 #, python-format
7586 #, python-format
7507 msgid "'%s' sent a broken Content-Type header (%s)"
7587 msgid "'%s' sent a broken Content-Type header (%s)"
7508 msgstr ""
7588 msgstr ""
7509
7589
7510 #, python-format
7590 #, python-format
7511 msgid "'%s' uses newer protocol %s"
7591 msgid "'%s' uses newer protocol %s"
7512 msgstr ""
7592 msgstr ""
7513
7593
7514 msgid "look up remote revision"
7594 msgid "look up remote revision"
7515 msgstr ""
7595 msgstr ""
7516
7596
7517 msgid "unexpected response:"
7597 msgid "unexpected response:"
7518 msgstr ""
7598 msgstr ""
7519
7599
7520 msgid "look up remote changes"
7600 msgid "look up remote changes"
7521 msgstr ""
7601 msgstr ""
7522
7602
7523 msgid "push failed (unexpected response):"
7603 msgid "push failed (unexpected response):"
7524 msgstr ""
7604 msgstr ""
7525
7605
7526 #, python-format
7606 #, python-format
7527 msgid "push failed: %s"
7607 msgid "push failed: %s"
7528 msgstr ""
7608 msgstr ""
7529
7609
7530 msgid "Python support for SSL and HTTPS is not installed"
7610 msgid "Python support for SSL and HTTPS is not installed"
7531 msgstr ""
7611 msgstr ""
7532
7612
7533 msgid "cannot create new http repository"
7613 msgid "cannot create new http repository"
7534 msgstr ""
7614 msgstr ""
7535
7615
7536 #, python-format
7616 #, python-format
7537 msgid "%s: ignoring invalid syntax '%s'\n"
7617 msgid "%s: ignoring invalid syntax '%s'\n"
7538 msgstr ""
7618 msgstr ""
7539
7619
7540 #, python-format
7620 #, python-format
7541 msgid "skipping unreadable ignore file '%s': %s\n"
7621 msgid "skipping unreadable ignore file '%s': %s\n"
7542 msgstr ""
7622 msgstr ""
7543
7623
7544 #, python-format
7624 #, python-format
7545 msgid "repository %s not found"
7625 msgid "repository %s not found"
7546 msgstr ""
7626 msgstr ""
7547
7627
7548 #, python-format
7628 #, python-format
7549 msgid "repository %s already exists"
7629 msgid "repository %s already exists"
7550 msgstr ""
7630 msgstr ""
7551
7631
7552 #, python-format
7632 #, python-format
7553 msgid "requirement '%s' not supported"
7633 msgid "requirement '%s' not supported"
7554 msgstr ""
7634 msgstr ""
7555
7635
7556 #, python-format
7636 #, python-format
7557 msgid ".hg/sharedpath points to nonexistent directory %s"
7637 msgid ".hg/sharedpath points to nonexistent directory %s"
7558 msgstr ""
7638 msgstr ""
7559
7639
7560 #, python-format
7640 #, python-format
7561 msgid "%r cannot be used in a tag name"
7641 msgid "%r cannot be used in a tag name"
7562 msgstr ""
7642 msgstr ""
7563
7643
7564 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7644 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7565 msgstr ""
7645 msgstr ""
7566
7646
7567 #, python-format
7647 #, python-format
7568 msgid "%s, line %s: %s\n"
7648 msgid "%s, line %s: %s\n"
7569 msgstr ""
7649 msgstr ""
7570
7650
7571 msgid "cannot parse entry"
7651 msgid "cannot parse entry"
7572 msgstr ""
7652 msgstr ""
7573
7653
7574 #, python-format
7654 #, python-format
7575 msgid "node '%s' is not well formed"
7655 msgid "node '%s' is not well formed"
7576 msgstr ""
7656 msgstr ""
7577
7657
7578 #, python-format
7658 #, python-format
7579 msgid "working directory has unknown parent '%s'!"
7659 msgid "working directory has unknown parent '%s'!"
7580 msgstr ""
7660 msgstr ""
7581
7661
7582 #, python-format
7662 #, python-format
7583 msgid "unknown revision '%s'"
7663 msgid "unknown revision '%s'"
7584 msgstr ""
7664 msgstr ""
7585
7665
7586 #, python-format
7666 #, python-format
7587 msgid "filtering %s through %s\n"
7667 msgid "filtering %s through %s\n"
7588 msgstr ""
7668 msgstr ""
7589
7669
7590 msgid "journal already exists - run hg recover"
7670 msgid "journal already exists - run hg recover"
7591 msgstr ""
7671 msgstr ""
7592
7672
7593 msgid "rolling back interrupted transaction\n"
7673 msgid "rolling back interrupted transaction\n"
7594 msgstr ""
7674 msgstr ""
7595
7675
7596 msgid "no interrupted transaction available\n"
7676 msgid "no interrupted transaction available\n"
7597 msgstr ""
7677 msgstr ""
7598
7678
7599 msgid "rolling back last transaction\n"
7679 msgid "rolling back last transaction\n"
7600 msgstr ""
7680 msgstr ""
7601
7681
7602 #, python-format
7682 #, python-format
7603 msgid "Named branch could not be reset, current branch still is: %s\n"
7683 msgid "Named branch could not be reset, current branch still is: %s\n"
7604 msgstr ""
7684 msgstr ""
7605
7685
7606 msgid "no rollback information available\n"
7686 msgid "no rollback information available\n"
7607 msgstr ""
7687 msgstr ""
7608
7688
7609 #, python-format
7689 #, python-format
7610 msgid "waiting for lock on %s held by %r\n"
7690 msgid "waiting for lock on %s held by %r\n"
7611 msgstr ""
7691 msgstr ""
7612
7692
7613 #, python-format
7693 #, python-format
7614 msgid "repository %s"
7694 msgid "repository %s"
7615 msgstr ""
7695 msgstr ""
7616
7696
7617 #, python-format
7697 #, python-format
7618 msgid "working directory of %s"
7698 msgid "working directory of %s"
7619 msgstr ""
7699 msgstr ""
7620
7700
7621 #, python-format
7701 #, python-format
7622 msgid " %s: searching for copy revision for %s\n"
7702 msgid " %s: searching for copy revision for %s\n"
7623 msgstr ""
7703 msgstr ""
7624
7704
7625 #, python-format
7705 #, python-format
7626 msgid " %s: copy %s:%s\n"
7706 msgid " %s: copy %s:%s\n"
7627 msgstr ""
7707 msgstr ""
7628
7708
7629 msgid "cannot partially commit a merge (do not specify files or patterns)"
7709 msgid "cannot partially commit a merge (do not specify files or patterns)"
7630 msgstr ""
7710 msgstr ""
7631
7711
7632 msgid "file not found!"
7712 msgid "file not found!"
7633 msgstr ""
7713 msgstr ""
7634
7714
7635 msgid "no match under directory!"
7715 msgid "no match under directory!"
7636 msgstr ""
7716 msgstr ""
7637
7717
7638 msgid "file not tracked!"
7718 msgid "file not tracked!"
7639 msgstr ""
7719 msgstr ""
7640
7720
7641 msgid "nothing changed\n"
7721 msgid "nothing changed\n"
7642 msgstr ""
7722 msgstr ""
7643
7723
7644 msgid "unresolved merge conflicts (see hg resolve)"
7724 msgid "unresolved merge conflicts (see hg resolve)"
7645 msgstr ""
7725 msgstr ""
7646
7726
7647 #, python-format
7727 #, python-format
7648 msgid "committing subrepository %s\n"
7728 msgid "committing subrepository %s\n"
7649 msgstr ""
7729 msgstr ""
7650
7730
7651 #, python-format
7731 #, python-format
7652 msgid "trouble committing %s!\n"
7732 msgid "trouble committing %s!\n"
7653 msgstr ""
7733 msgstr ""
7654
7734
7655 #, python-format
7735 #, python-format
7656 msgid "%s does not exist!\n"
7736 msgid "%s does not exist!\n"
7657 msgstr ""
7737 msgstr ""
7658
7738
7659 #, python-format
7739 #, python-format
7660 msgid ""
7740 msgid ""
7661 "%s: files over 10MB may cause memory and performance problems\n"
7741 "%s: files over 10MB may cause memory and performance problems\n"
7662 "(use 'hg revert %s' to unadd the file)\n"
7742 "(use 'hg revert %s' to unadd the file)\n"
7663 msgstr ""
7743 msgstr ""
7664
7744
7665 #, python-format
7745 #, python-format
7666 msgid "%s not added: only files and symlinks supported currently\n"
7746 msgid "%s not added: only files and symlinks supported currently\n"
7667 msgstr ""
7747 msgstr ""
7668
7748
7669 #, python-format
7749 #, python-format
7670 msgid "%s already tracked!\n"
7750 msgid "%s already tracked!\n"
7671 msgstr ""
7751 msgstr ""
7672
7752
7673 #, python-format
7753 #, python-format
7674 msgid "%s not added!\n"
7754 msgid "%s not added!\n"
7675 msgstr ""
7755 msgstr ""
7676
7756
7677 #, python-format
7757 #, python-format
7678 msgid "%s still exists!\n"
7758 msgid "%s still exists!\n"
7679 msgstr ""
7759 msgstr ""
7680
7760
7681 #, python-format
7761 #, python-format
7682 msgid "%s not tracked!\n"
7762 msgid "%s not tracked!\n"
7683 msgstr ""
7763 msgstr ""
7684
7764
7685 #, python-format
7765 #, python-format
7686 msgid "%s not removed!\n"
7766 msgid "%s not removed!\n"
7687 msgstr ""
7767 msgstr ""
7688
7768
7689 #, python-format
7769 #, python-format
7690 msgid "copy failed: %s is not a file or a symbolic link\n"
7770 msgid "copy failed: %s is not a file or a symbolic link\n"
7691 msgstr ""
7771 msgstr ""
7692
7772
7693 msgid "searching for changes\n"
7773 msgid "searching for changes\n"
7694 msgstr ""
7774 msgstr ""
7695
7775
7696 #, python-format
7776 #, python-format
7697 msgid "examining %s:%s\n"
7777 msgid "examining %s:%s\n"
7698 msgstr ""
7778 msgstr ""
7699
7779
7700 msgid "branch already found\n"
7780 msgid "branch already found\n"
7701 msgstr ""
7781 msgstr ""
7702
7782
7703 #, python-format
7783 #, python-format
7704 msgid "found incomplete branch %s:%s\n"
7784 msgid "found incomplete branch %s:%s\n"
7705 msgstr ""
7785 msgstr ""
7706
7786
7707 #, python-format
7787 #, python-format
7708 msgid "found new changeset %s\n"
7788 msgid "found new changeset %s\n"
7709 msgstr ""
7789 msgstr ""
7710
7790
7711 #, python-format
7791 #, python-format
7712 msgid "request %d: %s\n"
7792 msgid "request %d: %s\n"
7713 msgstr ""
7793 msgstr ""
7714
7794
7715 #, python-format
7795 #, python-format
7716 msgid "received %s:%s\n"
7796 msgid "received %s:%s\n"
7717 msgstr ""
7797 msgstr ""
7718
7798
7719 #, python-format
7799 #, python-format
7720 msgid "narrowing %d:%d %s\n"
7800 msgid "narrowing %d:%d %s\n"
7721 msgstr ""
7801 msgstr ""
7722
7802
7723 #, python-format
7803 #, python-format
7724 msgid "found new branch changeset %s\n"
7804 msgid "found new branch changeset %s\n"
7725 msgstr ""
7805 msgstr ""
7726
7806
7727 #, python-format
7807 #, python-format
7728 msgid "narrowed branch search to %s:%s\n"
7808 msgid "narrowed branch search to %s:%s\n"
7729 msgstr ""
7809 msgstr ""
7730
7810
7731 msgid "already have changeset "
7811 msgid "already have changeset "
7732 msgstr ""
7812 msgstr ""
7733
7813
7734 msgid "warning: repository is unrelated\n"
7814 msgid "warning: repository is unrelated\n"
7735 msgstr ""
7815 msgstr ""
7736
7816
7737 msgid "repository is unrelated"
7817 msgid "repository is unrelated"
7738 msgstr ""
7818 msgstr ""
7739
7819
7740 msgid "found new changesets starting at "
7820 msgid "found new changesets starting at "
7741 msgstr ""
7821 msgstr ""
7742
7822
7743 #, python-format
7823 #, python-format
7744 msgid "%d total queries\n"
7824 msgid "%d total queries\n"
7745 msgstr ""
7825 msgstr ""
7746
7826
7747 msgid "common changesets up to "
7827 msgid "common changesets up to "
7748 msgstr ""
7828 msgstr ""
7749
7829
7750 msgid "requesting all changes\n"
7830 msgid "requesting all changes\n"
7751 msgstr ""
7831 msgstr ""
7752
7832
7753 msgid ""
7833 msgid ""
7754 "Partial pull cannot be done because other repository doesn't support "
7834 "Partial pull cannot be done because other repository doesn't support "
7755 "changegroupsubset."
7835 "changegroupsubset."
7756 msgstr ""
7836 msgstr ""
7757
7837
7758 #, python-format
7838 #, python-format
7759 msgid "abort: push creates new remote branch '%s'!\n"
7839 msgid "abort: push creates new remote branch '%s'!\n"
7760 msgstr ""
7840 msgstr ""
7761
7841
7762 msgid "abort: push creates new remote heads!\n"
7842 msgid "abort: push creates new remote heads!\n"
7763 msgstr ""
7843 msgstr ""
7764
7844
7765 msgid "(did you forget to merge? use push -f to force)\n"
7845 msgid "(did you forget to merge? use push -f to force)\n"
7766 msgstr ""
7846 msgstr ""
7767
7847
7768 msgid "note: unsynced remote changes!\n"
7848 msgid "note: unsynced remote changes!\n"
7769 msgstr ""
7849 msgstr ""
7770
7850
7771 #, python-format
7851 #, python-format
7772 msgid "%d changesets found\n"
7852 msgid "%d changesets found\n"
7773 msgstr ""
7853 msgstr ""
7774
7854
7775 msgid "list of changesets:\n"
7855 msgid "list of changesets:\n"
7776 msgstr ""
7856 msgstr ""
7777
7857
7778 #, python-format
7858 #, python-format
7779 msgid "empty or missing revlog for %s"
7859 msgid "empty or missing revlog for %s"
7780 msgstr ""
7860 msgstr ""
7781
7861
7782 #, python-format
7862 #, python-format
7783 msgid "add changeset %s\n"
7863 msgid "add changeset %s\n"
7784 msgstr ""
7864 msgstr ""
7785
7865
7786 msgid "adding changesets\n"
7866 msgid "adding changesets\n"
7787 msgstr ""
7867 msgstr ""
7788
7868
7789 msgid "received changelog group is empty"
7869 msgid "received changelog group is empty"
7790 msgstr ""
7870 msgstr ""
7791
7871
7792 msgid "adding manifests\n"
7872 msgid "adding manifests\n"
7793 msgstr ""
7873 msgstr ""
7794
7874
7795 msgid "adding file changes\n"
7875 msgid "adding file changes\n"
7796 msgstr ""
7876 msgstr ""
7797
7877
7798 #, python-format
7878 #, python-format
7799 msgid "adding %s revisions\n"
7879 msgid "adding %s revisions\n"
7800 msgstr ""
7880 msgstr ""
7801
7881
7802 msgid "received file revlog group is empty"
7882 msgid "received file revlog group is empty"
7803 msgstr ""
7883 msgstr ""
7804
7884
7805 #, python-format
7885 #, python-format
7806 msgid " (%+d heads)"
7886 msgid " (%+d heads)"
7807 msgstr ""
7887 msgstr ""
7808
7888
7809 #, python-format
7889 #, python-format
7810 msgid "added %d changesets with %d changes to %d files%s\n"
7890 msgid "added %d changesets with %d changes to %d files%s\n"
7811 msgstr ""
7891 msgstr ""
7812
7892
7813 msgid "updating the branch cache\n"
7893 msgid "updating the branch cache\n"
7814 msgstr ""
7894 msgstr ""
7815
7895
7816 msgid "Unexpected response from remote server:"
7896 msgid "Unexpected response from remote server:"
7817 msgstr ""
7897 msgstr ""
7818
7898
7819 msgid "operation forbidden by server"
7899 msgid "operation forbidden by server"
7820 msgstr ""
7900 msgstr ""
7821
7901
7822 msgid "locking the remote repository failed"
7902 msgid "locking the remote repository failed"
7823 msgstr ""
7903 msgstr ""
7824
7904
7825 msgid "the server sent an unknown error code"
7905 msgid "the server sent an unknown error code"
7826 msgstr ""
7906 msgstr ""
7827
7907
7828 msgid "streaming all changes\n"
7908 msgid "streaming all changes\n"
7829 msgstr ""
7909 msgstr ""
7830
7910
7831 #, python-format
7911 #, python-format
7832 msgid "%d files to transfer, %s of data\n"
7912 msgid "%d files to transfer, %s of data\n"
7833 msgstr ""
7913 msgstr ""
7834
7914
7835 #, python-format
7915 #, python-format
7836 msgid "adding %s (%s)\n"
7916 msgid "adding %s (%s)\n"
7837 msgstr ""
7917 msgstr ""
7838
7918
7839 #, python-format
7919 #, python-format
7840 msgid "transferred %s in %.1f seconds (%s/sec)\n"
7920 msgid "transferred %s in %.1f seconds (%s/sec)\n"
7841 msgstr ""
7921 msgstr ""
7842
7922
7843 msgid "no [smtp]host in hgrc - cannot send mail"
7923 msgid "no [smtp]host in hgrc - cannot send mail"
7844 msgstr ""
7924 msgstr ""
7845
7925
7846 #, python-format
7926 #, python-format
7847 msgid "sending mail: smtp host %s, port %s\n"
7927 msgid "sending mail: smtp host %s, port %s\n"
7848 msgstr ""
7928 msgstr ""
7849
7929
7850 msgid "can't use TLS: Python SSL support not installed"
7930 msgid "can't use TLS: Python SSL support not installed"
7851 msgstr ""
7931 msgstr ""
7852
7932
7853 msgid "(using tls)\n"
7933 msgid "(using tls)\n"
7854 msgstr ""
7934 msgstr ""
7855
7935
7856 #, python-format
7936 #, python-format
7857 msgid "(authenticating to mail server as %s)\n"
7937 msgid "(authenticating to mail server as %s)\n"
7858 msgstr ""
7938 msgstr ""
7859
7939
7860 #, python-format
7940 #, python-format
7861 msgid "sending mail: %s\n"
7941 msgid "sending mail: %s\n"
7862 msgstr ""
7942 msgstr ""
7863
7943
7864 msgid "smtp specified as email transport, but no smtp host configured"
7944 msgid "smtp specified as email transport, but no smtp host configured"
7865 msgstr ""
7945 msgstr ""
7866
7946
7867 #, python-format
7947 #, python-format
7868 msgid "%r specified as email transport, but not in PATH"
7948 msgid "%r specified as email transport, but not in PATH"
7869 msgstr ""
7949 msgstr ""
7870
7950
7871 #, python-format
7951 #, python-format
7872 msgid "ignoring invalid sendcharset: %s\n"
7952 msgid "ignoring invalid sendcharset: %s\n"
7873 msgstr ""
7953 msgstr ""
7874
7954
7875 #, python-format
7955 #, python-format
7876 msgid "invalid email address: %s"
7956 msgid "invalid email address: %s"
7877 msgstr ""
7957 msgstr ""
7878
7958
7879 #, python-format
7959 #, python-format
7880 msgid "invalid local address: %s"
7960 msgid "invalid local address: %s"
7881 msgstr ""
7961 msgstr ""
7882
7962
7883 #, python-format
7963 #, python-format
7884 msgid "failed to remove %s from manifest"
7964 msgid "failed to remove %s from manifest"
7885 msgstr ""
7965 msgstr ""
7886
7966
7887 #, python-format
7967 #, python-format
7888 msgid "diff context lines count must be an integer, not %r"
7968 msgid "diff context lines count must be an integer, not %r"
7889 msgstr ""
7969 msgstr ""
7890
7970
7891 #, python-format
7971 #, python-format
7892 msgid ""
7972 msgid ""
7893 "untracked file in working directory differs from file in requested revision: "
7973 "untracked file in working directory differs from file in requested revision: "
7894 "'%s'"
7974 "'%s'"
7895 msgstr ""
7975 msgstr ""
7896
7976
7897 #, python-format
7977 #, python-format
7898 msgid "case-folding collision between %s and %s"
7978 msgid "case-folding collision between %s and %s"
7899 msgstr ""
7979 msgstr ""
7900
7980
7901 #, python-format
7981 #, python-format
7902 msgid ""
7982 msgid ""
7903 " conflicting flags for %s\n"
7983 " conflicting flags for %s\n"
7904 "(n)one, e(x)ec or sym(l)ink?"
7984 "(n)one, e(x)ec or sym(l)ink?"
7905 msgstr ""
7985 msgstr ""
7906
7986
7907 msgid "&None"
7987 msgid "&None"
7908 msgstr ""
7988 msgstr ""
7909
7989
7910 msgid "E&xec"
7990 msgid "E&xec"
7911 msgstr ""
7991 msgstr ""
7912
7992
7913 msgid "Sym&link"
7993 msgid "Sym&link"
7914 msgstr ""
7994 msgstr ""
7915
7995
7916 msgid "resolving manifests\n"
7996 msgid "resolving manifests\n"
7917 msgstr ""
7997 msgstr ""
7918
7998
7919 #, python-format
7999 #, python-format
7920 msgid " overwrite %s partial %s\n"
8000 msgid " overwrite %s partial %s\n"
7921 msgstr ""
8001 msgstr ""
7922
8002
7923 #, python-format
8003 #, python-format
7924 msgid " ancestor %s local %s remote %s\n"
8004 msgid " ancestor %s local %s remote %s\n"
7925 msgstr ""
8005 msgstr ""
7926
8006
7927 #, python-format
8007 #, python-format
7928 msgid ""
8008 msgid ""
7929 " local changed %s which remote deleted\n"
8009 " local changed %s which remote deleted\n"
7930 "use (c)hanged version or (d)elete?"
8010 "use (c)hanged version or (d)elete?"
7931 msgstr ""
8011 msgstr ""
7932
8012
7933 msgid "&Changed"
8013 msgid "&Changed"
7934 msgstr ""
8014 msgstr ""
7935
8015
7936 msgid "&Delete"
8016 msgid "&Delete"
7937 msgstr ""
8017 msgstr ""
7938
8018
7939 msgid "c"
8019 msgid "c"
7940 msgstr ""
8020 msgstr ""
7941
8021
7942 #, python-format
8022 #, python-format
7943 msgid ""
8023 msgid ""
7944 "remote changed %s which local deleted\n"
8024 "remote changed %s which local deleted\n"
7945 "use (c)hanged version or leave (d)eleted?"
8025 "use (c)hanged version or leave (d)eleted?"
7946 msgstr ""
8026 msgstr ""
7947
8027
7948 msgid "&Deleted"
8028 msgid "&Deleted"
7949 msgstr ""
8029 msgstr ""
7950
8030
7951 #, python-format
8031 #, python-format
7952 msgid "preserving %s for resolve of %s\n"
8032 msgid "preserving %s for resolve of %s\n"
7953 msgstr ""
8033 msgstr ""
7954
8034
7955 #, python-format
8035 #, python-format
7956 msgid "update failed to remove %s: %s!\n"
8036 msgid "update failed to remove %s: %s!\n"
7957 msgstr ""
8037 msgstr ""
7958
8038
7959 #, python-format
8039 #, python-format
7960 msgid "getting %s\n"
8040 msgid "getting %s\n"
7961 msgstr ""
8041 msgstr ""
7962
8042
7963 #, python-format
8043 #, python-format
7964 msgid "getting %s to %s\n"
8044 msgid "getting %s to %s\n"
7965 msgstr ""
8045 msgstr ""
7966
8046
7967 #, python-format
8047 #, python-format
7968 msgid "warning: detected divergent renames of %s to:\n"
8048 msgid "warning: detected divergent renames of %s to:\n"
7969 msgstr ""
8049 msgstr ""
7970
8050
7971 #, python-format
8051 #, python-format
7972 msgid "branch %s not found"
8052 msgid "branch %s not found"
7973 msgstr ""
8053 msgstr ""
7974
8054
7975 msgid "can't merge with ancestor"
8055 msgid "can't merge with ancestor"
7976 msgstr ""
8056 msgstr ""
7977
8057
7978 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8058 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
7979 msgstr ""
8059 msgstr ""
7980
8060
7981 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8061 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
7982 msgstr ""
8062 msgstr ""
7983
8063
7984 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8064 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
7985 msgstr ""
8065 msgstr ""
7986
8066
7987 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8067 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
7988 msgstr ""
8068 msgstr ""
7989
8069
7990 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8070 msgid "crosses named branches (use 'hg update -C' to discard changes)"
7991 msgstr ""
8071 msgstr ""
7992
8072
7993 #, python-format
8073 #, python-format
7994 msgid "cannot create %s: destination already exists"
8074 msgid "cannot create %s: destination already exists"
7995 msgstr ""
8075 msgstr ""
7996
8076
7997 #, python-format
8077 #, python-format
7998 msgid "cannot create %s: unable to create destination directory"
8078 msgid "cannot create %s: unable to create destination directory"
7999 msgstr ""
8079 msgstr ""
8000
8080
8001 #, python-format
8081 #, python-format
8002 msgid "found patch at byte %d\n"
8082 msgid "found patch at byte %d\n"
8003 msgstr ""
8083 msgstr ""
8004
8084
8005 msgid "patch generated by hg export\n"
8085 msgid "patch generated by hg export\n"
8006 msgstr ""
8086 msgstr ""
8007
8087
8008 #, python-format
8088 #, python-format
8009 msgid "unable to find '%s' for patching\n"
8089 msgid "unable to find '%s' for patching\n"
8010 msgstr ""
8090 msgstr ""
8011
8091
8012 #, python-format
8092 #, python-format
8013 msgid "patching file %s\n"
8093 msgid "patching file %s\n"
8014 msgstr ""
8094 msgstr ""
8015
8095
8016 #, python-format
8096 #, python-format
8017 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8097 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8018 msgstr ""
8098 msgstr ""
8019
8099
8020 #, python-format
8100 #, python-format
8021 msgid "bad hunk #%d %s (%d %d %d %d)"
8101 msgid "bad hunk #%d %s (%d %d %d %d)"
8022 msgstr ""
8102 msgstr ""
8023
8103
8024 #, python-format
8104 #, python-format
8025 msgid "file %s already exists\n"
8105 msgid "file %s already exists\n"
8026 msgstr ""
8106 msgstr ""
8027
8107
8028 #, python-format
8108 #, python-format
8029 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8109 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8030 msgstr ""
8110 msgstr ""
8031
8111
8032 #, python-format
8112 #, python-format
8033 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8113 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8034 msgstr ""
8114 msgstr ""
8035
8115
8036 #, python-format
8116 #, python-format
8037 msgid "Hunk #%d FAILED at %d\n"
8117 msgid "Hunk #%d FAILED at %d\n"
8038 msgstr ""
8118 msgstr ""
8039
8119
8040 #, python-format
8120 #, python-format
8041 msgid "bad hunk #%d"
8121 msgid "bad hunk #%d"
8042 msgstr ""
8122 msgstr ""
8043
8123
8044 #, python-format
8124 #, python-format
8045 msgid "bad hunk #%d old text line %d"
8125 msgid "bad hunk #%d old text line %d"
8046 msgstr ""
8126 msgstr ""
8047
8127
8048 msgid "could not extract binary patch"
8128 msgid "could not extract binary patch"
8049 msgstr ""
8129 msgstr ""
8050
8130
8051 #, python-format
8131 #, python-format
8052 msgid "binary patch is %d bytes, not %d"
8132 msgid "binary patch is %d bytes, not %d"
8053 msgstr ""
8133 msgstr ""
8054
8134
8055 #, python-format
8135 #, python-format
8056 msgid "unable to strip away %d dirs from %s"
8136 msgid "unable to strip away %d dirs from %s"
8057 msgstr ""
8137 msgstr ""
8058
8138
8059 msgid "undefined source and destination files"
8139 msgid "undefined source and destination files"
8060 msgstr ""
8140 msgstr ""
8061
8141
8062 #, python-format
8142 #, python-format
8063 msgid "malformed patch %s %s"
8143 msgid "malformed patch %s %s"
8064 msgstr ""
8144 msgstr ""
8065
8145
8066 #, python-format
8146 #, python-format
8067 msgid "unsupported parser state: %s"
8147 msgid "unsupported parser state: %s"
8068 msgstr ""
8148 msgstr ""
8069
8149
8070 #, python-format
8150 #, python-format
8071 msgid "patch command failed: %s"
8151 msgid "patch command failed: %s"
8072 msgstr ""
8152 msgstr ""
8073
8153
8074 #, python-format
8154 #, python-format
8075 msgid "Unsupported line endings type: %s"
8155 msgid "Unsupported line endings type: %s"
8076 msgstr ""
8156 msgstr ""
8077
8157
8078 #, python-format
8158 #, python-format
8079 msgid "no valid hunks found; trying with %r instead\n"
8159 msgid "no valid hunks found; trying with %r instead\n"
8080 msgstr ""
8160 msgstr ""
8081
8161
8082 #, python-format
8162 #, python-format
8083 msgid "exited with status %d"
8163 msgid "exited with status %d"
8084 msgstr ""
8164 msgstr ""
8085
8165
8086 #, python-format
8166 #, python-format
8087 msgid "killed by signal %d"
8167 msgid "killed by signal %d"
8088 msgstr ""
8168 msgstr ""
8089
8169
8090 #, python-format
8170 #, python-format
8091 msgid "stopped by signal %d"
8171 msgid "stopped by signal %d"
8092 msgstr ""
8172 msgstr ""
8093
8173
8094 msgid "invalid exit code"
8174 msgid "invalid exit code"
8095 msgstr ""
8175 msgstr ""
8096
8176
8097 #, python-format
8177 #, python-format
8098 msgid "saving bundle to %s\n"
8178 msgid "saving bundle to %s\n"
8099 msgstr ""
8179 msgstr ""
8100
8180
8101 msgid "adding branch\n"
8181 msgid "adding branch\n"
8102 msgstr ""
8182 msgstr ""
8103
8183
8104 #, python-format
8184 #, python-format
8105 msgid "cannot %s; remote repository does not support the %r capability"
8185 msgid "cannot %s; remote repository does not support the %r capability"
8106 msgstr ""
8186 msgstr ""
8107
8187
8108 #, python-format
8188 #, python-format
8109 msgid "unknown compression type %r"
8189 msgid "unknown compression type %r"
8110 msgstr ""
8190 msgstr ""
8111
8191
8112 #, python-format
8192 #, python-format
8113 msgid "index %s unknown flags %#04x for format v0"
8193 msgid "index %s unknown flags %#04x for format v0"
8114 msgstr ""
8194 msgstr ""
8115
8195
8116 #, python-format
8196 #, python-format
8117 msgid "index %s unknown flags %#04x for revlogng"
8197 msgid "index %s unknown flags %#04x for revlogng"
8118 msgstr ""
8198 msgstr ""
8119
8199
8120 #, python-format
8200 #, python-format
8121 msgid "index %s unknown format %d"
8201 msgid "index %s unknown format %d"
8122 msgstr ""
8202 msgstr ""
8123
8203
8124 #, python-format
8204 #, python-format
8125 msgid "index %s is corrupted"
8205 msgid "index %s is corrupted"
8126 msgstr ""
8206 msgstr ""
8127
8207
8128 msgid "no node"
8208 msgid "no node"
8129 msgstr ""
8209 msgstr ""
8130
8210
8131 msgid "ambiguous identifier"
8211 msgid "ambiguous identifier"
8132 msgstr ""
8212 msgstr ""
8133
8213
8134 msgid "no match found"
8214 msgid "no match found"
8135 msgstr ""
8215 msgstr ""
8136
8216
8137 #, python-format
8217 #, python-format
8138 msgid "incompatible revision flag %x"
8218 msgid "incompatible revision flag %x"
8139 msgstr ""
8219 msgstr ""
8140
8220
8141 #, python-format
8221 #, python-format
8142 msgid "%s not found in the transaction"
8222 msgid "%s not found in the transaction"
8143 msgstr ""
8223 msgstr ""
8144
8224
8145 msgid "unknown base"
8225 msgid "unknown base"
8146 msgstr ""
8226 msgstr ""
8147
8227
8148 msgid "consistency error adding group"
8228 msgid "consistency error adding group"
8149 msgstr ""
8229 msgstr ""
8150
8230
8151 #, python-format
8231 #, python-format
8152 msgid "%s looks like a binary file."
8232 msgid "%s looks like a binary file."
8153 msgstr ""
8233 msgstr ""
8154
8234
8155 msgid "can only specify two labels."
8235 msgid "can only specify two labels."
8156 msgstr ""
8236 msgstr ""
8157
8237
8158 msgid "warning: conflicts during merge.\n"
8238 msgid "warning: conflicts during merge.\n"
8159 msgstr ""
8239 msgstr ""
8160
8240
8161 #, python-format
8241 #, python-format
8162 msgid "couldn't parse location %s"
8242 msgid "couldn't parse location %s"
8163 msgstr ""
8243 msgstr ""
8164
8244
8165 msgid "could not create remote repo"
8245 msgid "could not create remote repo"
8166 msgstr ""
8246 msgstr ""
8167
8247
8168 msgid "remote: "
8248 msgid "remote: "
8169 msgstr ""
8249 msgstr ""
8170
8250
8171 msgid "no suitable response from remote hg"
8251 msgid "no suitable response from remote hg"
8172 msgstr ""
8252 msgstr ""
8173
8253
8174 #, python-format
8254 #, python-format
8175 msgid "push refused: %s"
8255 msgid "push refused: %s"
8176 msgstr ""
8256 msgstr ""
8177
8257
8178 msgid "unsynced changes"
8258 msgid "unsynced changes"
8179 msgstr ""
8259 msgstr ""
8180
8260
8181 msgid "cannot lock static-http repository"
8261 msgid "cannot lock static-http repository"
8182 msgstr ""
8262 msgstr ""
8183
8263
8184 msgid "cannot create new static-http repository"
8264 msgid "cannot create new static-http repository"
8185 msgstr ""
8265 msgstr ""
8186
8266
8187 #, python-format
8267 #, python-format
8188 msgid "invalid entry in fncache, line %s"
8268 msgid "invalid entry in fncache, line %s"
8189 msgstr ""
8269 msgstr ""
8190
8270
8191 msgid "scanning\n"
8271 msgid "scanning\n"
8192 msgstr ""
8272 msgstr ""
8193
8273
8194 #, python-format
8274 #, python-format
8195 msgid "%d files, %d bytes to transfer\n"
8275 msgid "%d files, %d bytes to transfer\n"
8196 msgstr ""
8276 msgstr ""
8197
8277
8198 #, python-format
8278 #, python-format
8199 msgid "sending %s (%d bytes)\n"
8279 msgid "sending %s (%d bytes)\n"
8200 msgstr ""
8280 msgstr ""
8201
8281
8202 #, python-format
8282 #, python-format
8203 msgid ""
8283 msgid ""
8204 " subrepository sources for %s differ\n"
8284 " subrepository sources for %s differ\n"
8205 "use (l)ocal source (%s) or (r)emote source (%s)?"
8285 "use (l)ocal source (%s) or (r)emote source (%s)?"
8206 msgstr ""
8286 msgstr ""
8207
8287
8208 msgid "&Remote"
8288 msgid "&Remote"
8209 msgstr ""
8289 msgstr ""
8210
8290
8211 msgid "r"
8291 msgid "r"
8212 msgstr ""
8292 msgstr ""
8213
8293
8214 #, python-format
8294 #, python-format
8215 msgid ""
8295 msgid ""
8216 " local changed subrepository %s which remote removed\n"
8296 " local changed subrepository %s which remote removed\n"
8217 "use (c)hanged version or (d)elete?"
8297 "use (c)hanged version or (d)elete?"
8218 msgstr ""
8298 msgstr ""
8219
8299
8220 #, python-format
8300 #, python-format
8221 msgid ""
8301 msgid ""
8222 " remote changed subrepository %s which local removed\n"
8302 " remote changed subrepository %s which local removed\n"
8223 "use (c)hanged version or (d)elete?"
8303 "use (c)hanged version or (d)elete?"
8224 msgstr ""
8304 msgstr ""
8225
8305
8226 #, python-format
8306 #, python-format
8227 msgid "removing subrepo %s\n"
8307 msgid "removing subrepo %s\n"
8228 msgstr ""
8308 msgstr ""
8229
8309
8230 #, python-format
8310 #, python-format
8231 msgid "pulling subrepo %s\n"
8311 msgid "pulling subrepo %s\n"
8232 msgstr ""
8312 msgstr ""
8233
8313
8234 #, python-format
8314 #, python-format
8235 msgid "pushing subrepo %s\n"
8315 msgid "pushing subrepo %s\n"
8236 msgstr ""
8316 msgstr ""
8237
8317
8238 msgid "unmatched quotes"
8318 msgid "unmatched quotes"
8239 msgstr ""
8319 msgstr ""
8240
8320
8241 #, python-format
8321 #, python-format
8242 msgid "error expanding '%s%%%s'"
8322 msgid "error expanding '%s%%%s'"
8243 msgstr ""
8323 msgstr ""
8244
8324
8245 #, python-format
8325 #, python-format
8246 msgid "unknown filter '%s'"
8326 msgid "unknown filter '%s'"
8247 msgstr ""
8327 msgstr ""
8248
8328
8249 #, python-format
8329 #, python-format
8250 msgid "style not found: %s"
8330 msgid "style not found: %s"
8251 msgstr ""
8331 msgstr ""
8252
8332
8253 #, python-format
8333 #, python-format
8254 msgid "template file %s: %s"
8334 msgid "template file %s: %s"
8255 msgstr ""
8335 msgstr ""
8256
8336
8257 msgid "cannot use transaction when it is already committed/aborted"
8337 msgid "cannot use transaction when it is already committed/aborted"
8258 msgstr ""
8338 msgstr ""
8259
8339
8260 #, python-format
8340 #, python-format
8261 msgid "failed to truncate %s\n"
8341 msgid "failed to truncate %s\n"
8262 msgstr ""
8342 msgstr ""
8263
8343
8264 msgid "transaction abort!\n"
8344 msgid "transaction abort!\n"
8265 msgstr ""
8345 msgstr ""
8266
8346
8267 msgid "rollback completed\n"
8347 msgid "rollback completed\n"
8268 msgstr ""
8348 msgstr ""
8269
8349
8270 msgid "rollback failed - please run hg recover\n"
8350 msgid "rollback failed - please run hg recover\n"
8271 msgstr ""
8351 msgstr ""
8272
8352
8273 #, python-format
8353 #, python-format
8274 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8354 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8275 msgstr ""
8355 msgstr ""
8276
8356
8277 #, python-format
8357 #, python-format
8278 msgid "Ignored: %s\n"
8358 msgid "Ignored: %s\n"
8279 msgstr ""
8359 msgstr ""
8280
8360
8281 #, python-format
8361 #, python-format
8282 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8362 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8283 msgstr ""
8363 msgstr ""
8284
8364
8285 #, python-format
8365 #, python-format
8286 msgid "%s.%s not a boolean ('%s')"
8366 msgid "%s.%s not a boolean ('%s')"
8287 msgstr ""
8367 msgstr ""
8288
8368
8289 msgid "enter a commit username:"
8369 msgid "enter a commit username:"
8290 msgstr ""
8370 msgstr ""
8291
8371
8292 #, python-format
8372 #, python-format
8293 msgid "No username found, using '%s' instead\n"
8373 msgid "No username found, using '%s' instead\n"
8294 msgstr ""
8374 msgstr ""
8295
8375
8296 msgid "Please specify a username."
8376 msgid "Please specify a username."
8297 msgstr ""
8377 msgstr ""
8298
8378
8299 #, python-format
8379 #, python-format
8300 msgid "username %s contains a newline\n"
8380 msgid "username %s contains a newline\n"
8301 msgstr ""
8381 msgstr ""
8302
8382
8303 msgid "unrecognized response\n"
8383 msgid "unrecognized response\n"
8304 msgstr ""
8384 msgstr ""
8305
8385
8306 msgid "response expected"
8386 msgid "response expected"
8307 msgstr ""
8387 msgstr ""
8308
8388
8309 msgid "password: "
8389 msgid "password: "
8310 msgstr ""
8390 msgstr ""
8311
8391
8312 msgid "edit failed"
8392 msgid "edit failed"
8313 msgstr ""
8393 msgstr ""
8314
8394
8315 msgid "http authorization required"
8395 msgid "http authorization required"
8316 msgstr ""
8396 msgstr ""
8317
8397
8318 msgid "http authorization required\n"
8398 msgid "http authorization required\n"
8319 msgstr ""
8399 msgstr ""
8320
8400
8321 #, python-format
8401 #, python-format
8322 msgid "realm: %s\n"
8402 msgid "realm: %s\n"
8323 msgstr ""
8403 msgstr ""
8324
8404
8325 #, python-format
8405 #, python-format
8326 msgid "user: %s\n"
8406 msgid "user: %s\n"
8327 msgstr ""
8407 msgstr ""
8328
8408
8329 msgid "user:"
8409 msgid "user:"
8330 msgstr ""
8410 msgstr ""
8331
8411
8332 #, python-format
8412 #, python-format
8333 msgid "http auth: user %s, password %s\n"
8413 msgid "http auth: user %s, password %s\n"
8334 msgstr ""
8414 msgstr ""
8335
8415
8336 #, python-format
8416 #, python-format
8337 msgid "proxying through http://%s:%s\n"
8417 msgid "proxying through http://%s:%s\n"
8338 msgstr ""
8418 msgstr ""
8339
8419
8340 #, python-format
8420 #, python-format
8341 msgid "command '%s' failed: %s"
8421 msgid "command '%s' failed: %s"
8342 msgstr ""
8422 msgstr ""
8343
8423
8344 #, python-format
8424 #, python-format
8345 msgid "path contains illegal component: %s"
8425 msgid "path contains illegal component: %s"
8346 msgstr ""
8426 msgstr ""
8347
8427
8348 #, python-format
8428 #, python-format
8349 msgid "path %r is inside repo %r"
8429 msgid "path %r is inside repo %r"
8350 msgstr ""
8430 msgstr ""
8351
8431
8352 #, python-format
8432 #, python-format
8353 msgid "path %r traverses symbolic link %r"
8433 msgid "path %r traverses symbolic link %r"
8354 msgstr ""
8434 msgstr ""
8355
8435
8356 msgid "Hardlinks not supported"
8436 msgid "Hardlinks not supported"
8357 msgstr ""
8437 msgstr ""
8358
8438
8359 #, python-format
8439 #, python-format
8360 msgid "could not symlink to %r: %s"
8440 msgid "could not symlink to %r: %s"
8361 msgstr ""
8441 msgstr ""
8362
8442
8363 #, python-format
8443 #, python-format
8364 msgid "invalid date: %r "
8444 msgid "invalid date: %r "
8365 msgstr ""
8445 msgstr ""
8366
8446
8367 #, python-format
8447 #, python-format
8368 msgid "date exceeds 32 bits: %d"
8448 msgid "date exceeds 32 bits: %d"
8369 msgstr ""
8449 msgstr ""
8370
8450
8371 #, python-format
8451 #, python-format
8372 msgid "impossible time zone offset: %d"
8452 msgid "impossible time zone offset: %d"
8373 msgstr ""
8453 msgstr ""
8374
8454
8375 #, python-format
8455 #, python-format
8376 msgid "invalid day spec: %s"
8456 msgid "invalid day spec: %s"
8377 msgstr ""
8457 msgstr ""
8378
8458
8379 #, python-format
8459 #, python-format
8380 msgid "%.0f GB"
8460 msgid "%.0f GB"
8381 msgstr ""
8461 msgstr ""
8382
8462
8383 #, python-format
8463 #, python-format
8384 msgid "%.1f GB"
8464 msgid "%.1f GB"
8385 msgstr ""
8465 msgstr ""
8386
8466
8387 #, python-format
8467 #, python-format
8388 msgid "%.2f GB"
8468 msgid "%.2f GB"
8389 msgstr ""
8469 msgstr ""
8390
8470
8391 #, python-format
8471 #, python-format
8392 msgid "%.0f MB"
8472 msgid "%.0f MB"
8393 msgstr ""
8473 msgstr ""
8394
8474
8395 #, python-format
8475 #, python-format
8396 msgid "%.1f MB"
8476 msgid "%.1f MB"
8397 msgstr ""
8477 msgstr ""
8398
8478
8399 #, python-format
8479 #, python-format
8400 msgid "%.2f MB"
8480 msgid "%.2f MB"
8401 msgstr ""
8481 msgstr ""
8402
8482
8403 #, python-format
8483 #, python-format
8404 msgid "%.0f KB"
8484 msgid "%.0f KB"
8405 msgstr ""
8485 msgstr ""
8406
8486
8407 #, python-format
8487 #, python-format
8408 msgid "%.1f KB"
8488 msgid "%.1f KB"
8409 msgstr ""
8489 msgstr ""
8410
8490
8411 #, python-format
8491 #, python-format
8412 msgid "%.2f KB"
8492 msgid "%.2f KB"
8413 msgstr ""
8493 msgstr ""
8414
8494
8415 #, python-format
8495 #, python-format
8416 msgid "%.0f bytes"
8496 msgid "%.0f bytes"
8417 msgstr ""
8497 msgstr ""
8418
8498
8419 msgid "cannot verify bundle or remote repos"
8499 msgid "cannot verify bundle or remote repos"
8420 msgstr ""
8500 msgstr ""
8421
8501
8422 msgid "interrupted"
8502 msgid "interrupted"
8423 msgstr ""
8503 msgstr ""
8424
8504
8425 #, python-format
8505 #, python-format
8426 msgid "empty or missing %s"
8506 msgid "empty or missing %s"
8427 msgstr ""
8507 msgstr ""
8428
8508
8429 #, python-format
8509 #, python-format
8430 msgid "data length off by %d bytes"
8510 msgid "data length off by %d bytes"
8431 msgstr ""
8511 msgstr ""
8432
8512
8433 #, python-format
8513 #, python-format
8434 msgid "index contains %d extra bytes"
8514 msgid "index contains %d extra bytes"
8435 msgstr ""
8515 msgstr ""
8436
8516
8437 #, python-format
8517 #, python-format
8438 msgid "warning: `%s' uses revlog format 1"
8518 msgid "warning: `%s' uses revlog format 1"
8439 msgstr ""
8519 msgstr ""
8440
8520
8441 #, python-format
8521 #, python-format
8442 msgid "warning: `%s' uses revlog format 0"
8522 msgid "warning: `%s' uses revlog format 0"
8443 msgstr ""
8523 msgstr ""
8444
8524
8445 #, python-format
8525 #, python-format
8446 msgid "rev %d points to nonexistent changeset %d"
8526 msgid "rev %d points to nonexistent changeset %d"
8447 msgstr ""
8527 msgstr ""
8448
8528
8449 #, python-format
8529 #, python-format
8450 msgid "rev %d points to unexpected changeset %d"
8530 msgid "rev %d points to unexpected changeset %d"
8451 msgstr ""
8531 msgstr ""
8452
8532
8453 #, python-format
8533 #, python-format
8454 msgid " (expected %s)"
8534 msgid " (expected %s)"
8455 msgstr ""
8535 msgstr ""
8456
8536
8457 #, python-format
8537 #, python-format
8458 msgid "unknown parent 1 %s of %s"
8538 msgid "unknown parent 1 %s of %s"
8459 msgstr ""
8539 msgstr ""
8460
8540
8461 #, python-format
8541 #, python-format
8462 msgid "unknown parent 2 %s of %s"
8542 msgid "unknown parent 2 %s of %s"
8463 msgstr ""
8543 msgstr ""
8464
8544
8465 #, python-format
8545 #, python-format
8466 msgid "checking parents of %s"
8546 msgid "checking parents of %s"
8467 msgstr ""
8547 msgstr ""
8468
8548
8469 #, python-format
8549 #, python-format
8470 msgid "duplicate revision %d (%d)"
8550 msgid "duplicate revision %d (%d)"
8471 msgstr ""
8551 msgstr ""
8472
8552
8473 #, python-format
8553 #, python-format
8474 msgid "repository uses revlog format %d\n"
8554 msgid "repository uses revlog format %d\n"
8475 msgstr ""
8555 msgstr ""
8476
8556
8477 msgid "checking changesets\n"
8557 msgid "checking changesets\n"
8478 msgstr ""
8558 msgstr ""
8479
8559
8480 #, python-format
8560 #, python-format
8481 msgid "unpacking changeset %s"
8561 msgid "unpacking changeset %s"
8482 msgstr ""
8562 msgstr ""
8483
8563
8484 msgid "checking manifests\n"
8564 msgid "checking manifests\n"
8485 msgstr ""
8565 msgstr ""
8486
8566
8487 #, python-format
8567 #, python-format
8488 msgid "%s not in changesets"
8568 msgid "%s not in changesets"
8489 msgstr ""
8569 msgstr ""
8490
8570
8491 msgid "file without name in manifest"
8571 msgid "file without name in manifest"
8492 msgstr ""
8572 msgstr ""
8493
8573
8494 #, python-format
8574 #, python-format
8495 msgid "reading manifest delta %s"
8575 msgid "reading manifest delta %s"
8496 msgstr ""
8576 msgstr ""
8497
8577
8498 msgid "crosschecking files in changesets and manifests\n"
8578 msgid "crosschecking files in changesets and manifests\n"
8499 msgstr ""
8579 msgstr ""
8500
8580
8501 #, python-format
8581 #, python-format
8502 msgid "changeset refers to unknown manifest %s"
8582 msgid "changeset refers to unknown manifest %s"
8503 msgstr ""
8583 msgstr ""
8504
8584
8505 msgid "in changeset but not in manifest"
8585 msgid "in changeset but not in manifest"
8506 msgstr ""
8586 msgstr ""
8507
8587
8508 msgid "in manifest but not in changeset"
8588 msgid "in manifest but not in changeset"
8509 msgstr ""
8589 msgstr ""
8510
8590
8511 msgid "checking files\n"
8591 msgid "checking files\n"
8512 msgstr ""
8592 msgstr ""
8513
8593
8514 #, python-format
8594 #, python-format
8515 msgid "cannot decode filename '%s'"
8595 msgid "cannot decode filename '%s'"
8516 msgstr ""
8596 msgstr ""
8517
8597
8518 #, python-format
8598 #, python-format
8519 msgid "broken revlog! (%s)"
8599 msgid "broken revlog! (%s)"
8520 msgstr ""
8600 msgstr ""
8521
8601
8522 msgid "missing revlog!"
8602 msgid "missing revlog!"
8523 msgstr ""
8603 msgstr ""
8524
8604
8525 #, python-format
8605 #, python-format
8526 msgid "%s not in manifests"
8606 msgid "%s not in manifests"
8527 msgstr ""
8607 msgstr ""
8528
8608
8529 #, python-format
8609 #, python-format
8530 msgid "unpacked size is %s, %s expected"
8610 msgid "unpacked size is %s, %s expected"
8531 msgstr ""
8611 msgstr ""
8532
8612
8533 #, python-format
8613 #, python-format
8534 msgid "unpacking %s"
8614 msgid "unpacking %s"
8535 msgstr ""
8615 msgstr ""
8536
8616
8537 #, python-format
8617 #, python-format
8538 msgid "empty or missing copy source revlog %s:%s"
8618 msgid "empty or missing copy source revlog %s:%s"
8539 msgstr ""
8619 msgstr ""
8540
8620
8541 #, python-format
8621 #, python-format
8542 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8622 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8543 msgstr ""
8623 msgstr ""
8544
8624
8545 #, python-format
8625 #, python-format
8546 msgid "checking rename of %s"
8626 msgid "checking rename of %s"
8547 msgstr ""
8627 msgstr ""
8548
8628
8549 #, python-format
8629 #, python-format
8550 msgid "%s in manifests not found"
8630 msgid "%s in manifests not found"
8551 msgstr ""
8631 msgstr ""
8552
8632
8553 #, python-format
8633 #, python-format
8554 msgid "warning: orphan revlog '%s'"
8634 msgid "warning: orphan revlog '%s'"
8555 msgstr ""
8635 msgstr ""
8556
8636
8557 #, python-format
8637 #, python-format
8558 msgid "%d files, %d changesets, %d total revisions\n"
8638 msgid "%d files, %d changesets, %d total revisions\n"
8559 msgstr ""
8639 msgstr ""
8560
8640
8561 #, python-format
8641 #, python-format
8562 msgid "%d warnings encountered!\n"
8642 msgid "%d warnings encountered!\n"
8563 msgstr ""
8643 msgstr ""
8564
8644
8565 #, python-format
8645 #, python-format
8566 msgid "%d integrity errors encountered!\n"
8646 msgid "%d integrity errors encountered!\n"
8567 msgstr ""
8647 msgstr ""
8568
8648
8569 #, python-format
8649 #, python-format
8570 msgid "(first damaged changeset appears to be %d)\n"
8650 msgid "(first damaged changeset appears to be %d)\n"
8571 msgstr ""
8651 msgstr ""
8572
8652
8573 msgid "user name not available - set USERNAME environment variable"
8653 msgid "user name not available - set USERNAME environment variable"
8574 msgstr ""
8654 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now