##// END OF EJS Templates
i18n-fr: translation of the extensions help topic
Cédric Duval -
r8977:d414749e default
parent child Browse files
Show More
@@ -1,8806 +1,8846 b''
1 # French translations for Mercurial
1 # French translations for Mercurial
2 # Traductions françaises de Mercurial
2 # Traductions françaises de Mercurial
3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
4 #
4 #
5 # Quelques règles :
5 # Quelques règles :
6 # - dans l'aide d'une commande, la première ligne descriptive
6 # - dans l'aide d'une commande, la première ligne descriptive
7 # commence par un verbe au présent sans majuscule
7 # commence par un verbe au présent sans majuscule
8 # - dans l'aide d'une commande, la description des options
8 # - dans l'aide d'une commande, la description des options
9 # utilise un verbe à l'infinitif
9 # utilise un verbe à l'infinitif
10 #
10 #
11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
12 # parfaite. À compléter et à améliorer, particulièrement les
12 # parfaite. À compléter et à améliorer, particulièrement les
13 # termes comportant un point d'interrogation...
13 # termes comportant un point d'interrogation...
14 #
14 #
15 # Dictionnaire de termes courants :
15 # Dictionnaire de termes courants :
16 # - to apply a patch appliquer un patch
16 # - to apply a patch appliquer un patch
17 # - a branch une branche
17 # - a branch une branche
18 # - to check out extraire (terminologie utilisée par svn)
18 # - to check out extraire (terminologie utilisée par svn)
19 # - children des rejetons ? des descendants ?
19 # - children des rejetons ? des descendants ?
20 # - to clone clôner
20 # - to clone clôner
21 # - a conflict un conflit
21 # - a conflict un conflit
22 # - an extension une extension (au sens de module Mercurial)
22 # - an extension une extension (au sens de module Mercurial)
23 # - to fold patches agréger des patchs (replier des patch ?? bof)
23 # - to fold patches agréger des patchs (replier des patch ?? bof)
24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
25 # - a mail un courriel, un courrier électronique
25 # - a mail un courriel, un courrier électronique
26 # - a merge une fusion
26 # - a merge une fusion
27 # - to merge fusionner
27 # - to merge fusionner
28 # - a node un nœud ?
28 # - a node un nœud ?
29 # - a patch queue/stack une pile de patchs (mq)
29 # - a patch queue/stack une pile de patchs (mq)
30 # - à l'utilisation c'est vraiment une _pile_
30 # - à l'utilisation c'est vraiment une _pile_
31 # (on y empile et dépile des patchs)
31 # (on y empile et dépile des patchs)
32 # - l'unique cas où _file_ conviendrait est dans le
32 # - l'unique cas où _file_ conviendrait est dans le
33 # contexte de la commande qfinish
33 # contexte de la commande qfinish
34 # => terme unique de pile pour plus de cohérence
34 # => terme unique de pile pour plus de cohérence
35 # - the patch series la série (complète) de patchs (suite ?)
35 # - the patch series la série (complète) de patchs (suite ?)
36 # - rejects des rejets ? (à propos de l'application d'un
36 # - rejects des rejets ? (à propos de l'application d'un
37 # patch)
37 # patch)
38 # - a repository un dépôt
38 # - a repository un dépôt
39 # - to revert annuler des modifications (ou défaire ?)
39 # - to revert annuler des modifications (ou défaire ?)
40 # - a revision une révision
40 # - a revision une révision
41 # - the topmost patch le dernier patch appliqué
41 # - the topmost patch le dernier patch appliqué
42 # - a tree une arborescence
42 # - a tree une arborescence
43 # - an unrelated repository un dépôt non apparenté
43 # - an unrelated repository un dépôt non apparenté
44 # - unversioned
44 # - unversioned
45 # unmanaged
45 # unmanaged
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
47 # hors révision ?
47 # hors révision ?
48 # - the working directory le répertoire de travail
48 # - the working directory le répertoire de travail
49 #
49 #
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
51 # pour ne pas alourdir inutilement la traduction :
51 # pour ne pas alourdir inutilement la traduction :
52 # - a diff un diff ? (ou également un patch ? synonymes...)
52 # - a diff un diff ? (ou également un patch ? synonymes...)
53 # - a hook un hook
53 # - a hook un hook
54 # - a patch un patch
54 # - a patch un patch
55 # - a tag un tag
55 # - a tag un tag
56 # - to tag taguer
56 # - to tag taguer
57 #
57 #
58 # Termes anglais avec une signification très spécifique, difficile à
58 # Termes anglais avec une signification très spécifique, difficile à
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
60 # - a bundle un \"bundle\"
60 # - a bundle un \"bundle\"
61 # - to bundle créer un \"bundle\" ?
61 # - to bundle créer un \"bundle\" ?
62 # - a changeset un \"changeset\"
62 # - a changeset un \"changeset\"
63 # - a changegroup un \"changegroup\"
63 # - a changegroup un \"changegroup\"
64 # - the tip la révision \"tip\"
64 # - the tip la révision \"tip\"
65 #
65 #
66 # Termes dont le classement / la traduction sont à déterminer :
66 # Termes dont le classement / la traduction sont à déterminer :
67 # - a commit un commit, un \"commit\"
67 # - a commit un commit, un \"commit\"
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
69 # - a guard une \"garde\" ? (une protection ?)
69 # - a guard une \"garde\" ? (une protection ?)
70 # - to guard a patch \"garder\" un patch ?
70 # - to guard a patch \"garder\" un patch ?
71 # - to pull rapatrier des \"changesets\" ? effectuer une
71 # - to pull rapatrier des \"changesets\" ? effectuer une
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
73 # - to push propager ? (utilisé par svn pour commit)
73 # - to push propager ? (utilisé par svn pour commit)
74 # publier ? pousser ?? envoyer ??
74 # publier ? pousser ?? envoyer ??
75 # - the series file (mq) ?
75 # - the series file (mq) ?
76 #
76 #
77 # Notes :
77 # Notes :
78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
82 # de faire le lien avec des termes franglisants parfois utilisés
82 # de faire le lien avec des termes franglisants parfois utilisés
83 # (par ex. fusionner = "merger", etc.) ... ?
83 # (par ex. fusionner = "merger", etc.) ... ?
84 #
84 #
85 msgid ""
85 msgid ""
86 msgstr ""
86 msgstr ""
87 "Project-Id-Version: Mercurial\n"
87 "Project-Id-Version: Mercurial\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
89 "POT-Creation-Date: 2009-06-28 20:09+0200\n"
89 "POT-Creation-Date: 2009-06-28 20:09+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
92 "Language-Team: French\n"
92 "Language-Team: French\n"
93 "MIME-Version: 1.0\n"
93 "MIME-Version: 1.0\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
95 "Content-Transfer-Encoding: 8bit\n"
95 "Content-Transfer-Encoding: 8bit\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
97
97
98 #, python-format
98 #, python-format
99 msgid " (default: %s)"
99 msgid " (default: %s)"
100 msgstr " (défaut: %s)"
100 msgstr " (défaut: %s)"
101
101
102 msgid "OPTIONS"
102 msgid "OPTIONS"
103 msgstr ""
103 msgstr ""
104
104
105 msgid "COMMANDS"
105 msgid "COMMANDS"
106 msgstr ""
106 msgstr ""
107
107
108 msgid " options:\n"
108 msgid " options:\n"
109 msgstr ""
109 msgstr ""
110
110
111 #, python-format
111 #, python-format
112 msgid ""
112 msgid ""
113 " aliases: %s\n"
113 " aliases: %s\n"
114 "\n"
114 "\n"
115 msgstr ""
115 msgstr ""
116
116
117 msgid ""
117 msgid ""
118 "control access to a repository using simple hooks\n"
118 "control access to a repository using simple hooks\n"
119 "\n"
119 "\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
121 "of a repository when receiving incoming changesets.\n"
121 "of a repository when receiving incoming changesets.\n"
122 "\n"
122 "\n"
123 "The authorization is matched based on the local user name on the\n"
123 "The authorization is matched based on the local user name on the\n"
124 "system where the hook runs, and not the committer of the original\n"
124 "system where the hook runs, and not the committer of the original\n"
125 "changeset (since the latter is merely informative).\n"
125 "changeset (since the latter is merely informative).\n"
126 "\n"
126 "\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
128 "preventing authenticating users from doing anything other than\n"
128 "preventing authenticating users from doing anything other than\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
130 "interactive shell access, as they can then disable the hook.\n"
130 "interactive shell access, as they can then disable the hook.\n"
131 "Nor is it safe if remote users share an account, because then there\n"
131 "Nor is it safe if remote users share an account, because then there\n"
132 "is no way to distinguish them.\n"
132 "is no way to distinguish them.\n"
133 "\n"
133 "\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
135 "\n"
135 "\n"
136 " [extensions]\n"
136 " [extensions]\n"
137 " hgext.acl =\n"
137 " hgext.acl =\n"
138 "\n"
138 "\n"
139 " [hooks]\n"
139 " [hooks]\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
141 "\n"
141 "\n"
142 " [acl]\n"
142 " [acl]\n"
143 " # Check whether the source of incoming changes is in this list\n"
143 " # Check whether the source of incoming changes is in this list\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
145 " sources = serve\n"
145 " sources = serve\n"
146 "\n"
146 "\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
148 "glob syntax by default), and a comma separated list of users as\n"
148 "glob syntax by default), and a comma separated list of users as\n"
149 "the corresponding value. The deny list is checked before the allow\n"
149 "the corresponding value. The deny list is checked before the allow\n"
150 "list is.\n"
150 "list is.\n"
151 "\n"
151 "\n"
152 " [acl.allow]\n"
152 " [acl.allow]\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
154 " # An empty acl.allow section means no users allowed.\n"
154 " # An empty acl.allow section means no users allowed.\n"
155 " docs/** = doc_writer\n"
155 " docs/** = doc_writer\n"
156 " .hgtags = release_engineer\n"
156 " .hgtags = release_engineer\n"
157 "\n"
157 "\n"
158 " [acl.deny]\n"
158 " [acl.deny]\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
160 " # An empty acl.deny section means all users allowed.\n"
160 " # An empty acl.deny section means all users allowed.\n"
161 " glob pattern = user4, user5\n"
161 " glob pattern = user4, user5\n"
162 " ** = user6\n"
162 " ** = user6\n"
163 msgstr ""
163 msgstr ""
164
164
165 #, python-format
165 #, python-format
166 msgid "acl: %s not enabled\n"
166 msgid "acl: %s not enabled\n"
167 msgstr ""
167 msgstr ""
168
168
169 #, python-format
169 #, python-format
170 msgid "acl: %s enabled, %d entries for user %s\n"
170 msgid "acl: %s enabled, %d entries for user %s\n"
171 msgstr ""
171 msgstr ""
172
172
173 #, python-format
173 #, python-format
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
175 msgstr ""
175 msgstr ""
176
176
177 #, python-format
177 #, python-format
178 msgid "acl: changes have source \"%s\" - skipping\n"
178 msgid "acl: changes have source \"%s\" - skipping\n"
179 msgstr ""
179 msgstr ""
180
180
181 #, python-format
181 #, python-format
182 msgid "acl: user %s denied on %s\n"
182 msgid "acl: user %s denied on %s\n"
183 msgstr ""
183 msgstr ""
184
184
185 #, python-format
185 #, python-format
186 msgid "acl: access denied for changeset %s"
186 msgid "acl: access denied for changeset %s"
187 msgstr ""
187 msgstr ""
188
188
189 #, python-format
189 #, python-format
190 msgid "acl: user %s not allowed on %s\n"
190 msgid "acl: user %s not allowed on %s\n"
191 msgstr ""
191 msgstr ""
192
192
193 #, python-format
193 #, python-format
194 msgid "acl: allowing changeset %s\n"
194 msgid "acl: allowing changeset %s\n"
195 msgstr ""
195 msgstr ""
196
196
197 msgid ""
197 msgid ""
198 "track a line of development with movable markers\n"
198 "track a line of development with movable markers\n"
199 "\n"
199 "\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
201 "points to a changeset identified by its hash. If you commit a\n"
201 "points to a changeset identified by its hash. If you commit a\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
203 "the bookmark shifts to the new changeset.\n"
203 "the bookmark shifts to the new changeset.\n"
204 "\n"
204 "\n"
205 "It is possible to use bookmark names in every revision lookup\n"
205 "It is possible to use bookmark names in every revision lookup\n"
206 "(e.g. hg merge, hg update).\n"
206 "(e.g. hg merge, hg update).\n"
207 "\n"
207 "\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
209 "will all move forward together. It is possible to obtain a more\n"
209 "will all move forward together. It is possible to obtain a more\n"
210 "git-like experience by adding the following configuration option to\n"
210 "git-like experience by adding the following configuration option to\n"
211 "your .hgrc:\n"
211 "your .hgrc:\n"
212 "\n"
212 "\n"
213 " [bookmarks]\n"
213 " [bookmarks]\n"
214 " track.current = True\n"
214 " track.current = True\n"
215 "\n"
215 "\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
217 "using, and only update it. This is similar to git's approach to\n"
217 "using, and only update it. This is similar to git's approach to\n"
218 "branching.\n"
218 "branching.\n"
219 msgstr ""
219 msgstr ""
220
220
221 msgid ""
221 msgid ""
222 "track a line of development with movable markers\n"
222 "track a line of development with movable markers\n"
223 "\n"
223 "\n"
224 " Bookmarks are pointers to certain commits that move when\n"
224 " Bookmarks are pointers to certain commits that move when\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
228 "\n"
228 "\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
230 " directory's parent revision with the given name. If you specify\n"
230 " directory's parent revision with the given name. If you specify\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
232 " the bookmark is assigned to that revision.\n"
232 " the bookmark is assigned to that revision.\n"
233 " "
233 " "
234 msgstr ""
234 msgstr ""
235
235
236 msgid "a bookmark of this name does not exist"
236 msgid "a bookmark of this name does not exist"
237 msgstr ""
237 msgstr ""
238
238
239 msgid "a bookmark of the same name already exists"
239 msgid "a bookmark of the same name already exists"
240 msgstr ""
240 msgstr ""
241
241
242 msgid "new bookmark name required"
242 msgid "new bookmark name required"
243 msgstr ""
243 msgstr ""
244
244
245 msgid "bookmark name required"
245 msgid "bookmark name required"
246 msgstr ""
246 msgstr ""
247
247
248 msgid "bookmark name cannot contain newlines"
248 msgid "bookmark name cannot contain newlines"
249 msgstr ""
249 msgstr ""
250
250
251 msgid "a bookmark cannot have the name of an existing branch"
251 msgid "a bookmark cannot have the name of an existing branch"
252 msgstr ""
252 msgstr ""
253
253
254 msgid "force"
254 msgid "force"
255 msgstr ""
255 msgstr ""
256
256
257 msgid "revision"
257 msgid "revision"
258 msgstr ""
258 msgstr ""
259
259
260 msgid "delete a given bookmark"
260 msgid "delete a given bookmark"
261 msgstr ""
261 msgstr ""
262
262
263 msgid "rename a given bookmark"
263 msgid "rename a given bookmark"
264 msgstr ""
264 msgstr ""
265
265
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
267 msgstr ""
267 msgstr ""
268
268
269 msgid ""
269 msgid ""
270 "integrate Mercurial with a Bugzilla bug tracker\n"
270 "integrate Mercurial with a Bugzilla bug tracker\n"
271 "\n"
271 "\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
274 "bug status.\n"
274 "bug status.\n"
275 "\n"
275 "\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
277 "installations using MySQL are supported.\n"
277 "installations using MySQL are supported.\n"
278 "\n"
278 "\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
280 "emails. That script changes between Bugzilla versions; the\n"
280 "emails. That script changes between Bugzilla versions; the\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
285 "\n"
285 "\n"
286 "Configuring the extension:\n"
286 "Configuring the extension:\n"
287 "\n"
287 "\n"
288 " [bugzilla]\n"
288 " [bugzilla]\n"
289 "\n"
289 "\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
291 " database.\n"
291 " database.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
294 " password Password to use to access MySQL server.\n"
294 " password Password to use to access MySQL server.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
298 " and '2.16' for versions prior to 2.18.\n"
298 " and '2.16' for versions prior to 2.18.\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
302 " Default '/var/www/html/bugzilla'.\n"
302 " Default '/var/www/html/bugzilla'.\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
304 " notification emails. Substitutes from a map with 3\n"
304 " notification emails. Substitutes from a map with 3\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
308 " %(id)s %(user)s\".\n"
308 " %(id)s %(user)s\".\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
310 " message. Must contain one \"()\" group. The default\n"
310 " message. Must contain one \"()\" group. The default\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
313 " variations thereof. Matching is case insensitive.\n"
313 " variations thereof. Matching is case insensitive.\n"
314 " style The style file to use when formatting comments.\n"
314 " style The style file to use when formatting comments.\n"
315 " template Template to use when formatting comments. Overrides\n"
315 " template Template to use when formatting comments. Overrides\n"
316 " style if specified. In addition to the usual Mercurial\n"
316 " style if specified. In addition to the usual Mercurial\n"
317 " keywords, the extension specifies:\n"
317 " keywords, the extension specifies:\n"
318 " {bug} The Bugzilla bug ID.\n"
318 " {bug} The Bugzilla bug ID.\n"
319 " {root} The full pathname of the Mercurial\n"
319 " {root} The full pathname of the Mercurial\n"
320 " repository.\n"
320 " repository.\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
322 " repository.\n"
322 " repository.\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
324 " repositories.\n"
324 " repositories.\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
327 " strip The number of slashes to strip from the front of {root}\n"
327 " strip The number of slashes to strip from the front of {root}\n"
328 " to produce {webroot}. Default 0.\n"
328 " to produce {webroot}. Default 0.\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
331 " should contain one mapping per line,\n"
331 " should contain one mapping per line,\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
333 " section.\n"
333 " section.\n"
334 "\n"
334 "\n"
335 " [usermap]\n"
335 " [usermap]\n"
336 " Any entries in this section specify mappings of Mercurial\n"
336 " Any entries in this section specify mappings of Mercurial\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
338 " \"committer\"=\"Bugzilla user\"\n"
338 " \"committer\"=\"Bugzilla user\"\n"
339 "\n"
339 "\n"
340 " [web]\n"
340 " [web]\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
342 " from templates as {hgweb}.\n"
342 " from templates as {hgweb}.\n"
343 "\n"
343 "\n"
344 "Activating the extension:\n"
344 "Activating the extension:\n"
345 "\n"
345 "\n"
346 " [extensions]\n"
346 " [extensions]\n"
347 " hgext.bugzilla =\n"
347 " hgext.bugzilla =\n"
348 "\n"
348 "\n"
349 " [hooks]\n"
349 " [hooks]\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
352 "\n"
352 "\n"
353 "Example configuration:\n"
353 "Example configuration:\n"
354 "\n"
354 "\n"
355 "This example configuration is for a collection of Mercurial\n"
355 "This example configuration is for a collection of Mercurial\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
357 "installation in /opt/bugzilla-3.2.\n"
357 "installation in /opt/bugzilla-3.2.\n"
358 "\n"
358 "\n"
359 " [bugzilla]\n"
359 " [bugzilla]\n"
360 " host=localhost\n"
360 " host=localhost\n"
361 " password=XYZZY\n"
361 " password=XYZZY\n"
362 " version=3.0\n"
362 " version=3.0\n"
363 " bzuser=unknown@domain.com\n"
363 " bzuser=unknown@domain.com\n"
364 " bzdir=/opt/bugzilla-3.2\n"
364 " bzdir=/opt/bugzilla-3.2\n"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
367 " strip=5\n"
367 " strip=5\n"
368 "\n"
368 "\n"
369 " [web]\n"
369 " [web]\n"
370 " baseurl=http://dev.domain.com/hg\n"
370 " baseurl=http://dev.domain.com/hg\n"
371 "\n"
371 "\n"
372 " [usermap]\n"
372 " [usermap]\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
374 "\n"
374 "\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
376 "\n"
376 "\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
379 "\n"
379 "\n"
380 " Changeset commit comment. Bug 1234.\n"
380 " Changeset commit comment. Bug 1234.\n"
381 msgstr ""
381 msgstr ""
382
382
383 #, python-format
383 #, python-format
384 msgid "connecting to %s:%s as %s, password %s\n"
384 msgid "connecting to %s:%s as %s, password %s\n"
385 msgstr ""
385 msgstr ""
386
386
387 #, python-format
387 #, python-format
388 msgid "query: %s %s\n"
388 msgid "query: %s %s\n"
389 msgstr ""
389 msgstr ""
390
390
391 #, python-format
391 #, python-format
392 msgid "failed query: %s %s\n"
392 msgid "failed query: %s %s\n"
393 msgstr ""
393 msgstr ""
394
394
395 msgid "unknown database schema"
395 msgid "unknown database schema"
396 msgstr ""
396 msgstr ""
397
397
398 #, python-format
398 #, python-format
399 msgid "bug %d already knows about changeset %s\n"
399 msgid "bug %d already knows about changeset %s\n"
400 msgstr ""
400 msgstr ""
401
401
402 msgid "telling bugzilla to send mail:\n"
402 msgid "telling bugzilla to send mail:\n"
403 msgstr ""
403 msgstr ""
404
404
405 #, python-format
405 #, python-format
406 msgid " bug %s\n"
406 msgid " bug %s\n"
407 msgstr ""
407 msgstr ""
408
408
409 #, python-format
409 #, python-format
410 msgid "running notify command %s\n"
410 msgid "running notify command %s\n"
411 msgstr ""
411 msgstr ""
412
412
413 #, python-format
413 #, python-format
414 msgid "bugzilla notify command %s"
414 msgid "bugzilla notify command %s"
415 msgstr ""
415 msgstr ""
416
416
417 msgid "done\n"
417 msgid "done\n"
418 msgstr ""
418 msgstr ""
419
419
420 #, python-format
420 #, python-format
421 msgid "looking up user %s\n"
421 msgid "looking up user %s\n"
422 msgstr ""
422 msgstr ""
423
423
424 #, python-format
424 #, python-format
425 msgid "cannot find bugzilla user id for %s"
425 msgid "cannot find bugzilla user id for %s"
426 msgstr ""
426 msgstr ""
427
427
428 #, python-format
428 #, python-format
429 msgid "cannot find bugzilla user id for %s or %s"
429 msgid "cannot find bugzilla user id for %s or %s"
430 msgstr ""
430 msgstr ""
431
431
432 #, python-format
432 #, python-format
433 msgid "bugzilla version %s not supported"
433 msgid "bugzilla version %s not supported"
434 msgstr ""
434 msgstr ""
435
435
436 msgid ""
436 msgid ""
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
438 "details:\n"
438 "details:\n"
439 "\t{desc|tabindent}"
439 "\t{desc|tabindent}"
440 msgstr ""
440 msgstr ""
441
441
442 #, python-format
442 #, python-format
443 msgid "python mysql support not available: %s"
443 msgid "python mysql support not available: %s"
444 msgstr ""
444 msgstr ""
445
445
446 #, python-format
446 #, python-format
447 msgid "hook type %s does not pass a changeset id"
447 msgid "hook type %s does not pass a changeset id"
448 msgstr ""
448 msgstr ""
449
449
450 #, python-format
450 #, python-format
451 msgid "database error: %s"
451 msgid "database error: %s"
452 msgstr ""
452 msgstr ""
453
453
454 msgid "display children changesets"
454 msgid "display children changesets"
455 msgstr ""
455 msgstr ""
456
456
457 msgid ""
457 msgid ""
458 "show the children of the given or working directory revision\n"
458 "show the children of the given or working directory revision\n"
459 "\n"
459 "\n"
460 " Print the children of the working directory's revisions. If a\n"
460 " Print the children of the working directory's revisions. If a\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
462 " be printed. If a file argument is given, revision in which the\n"
462 " be printed. If a file argument is given, revision in which the\n"
463 " file was last changed (after the working directory revision or the\n"
463 " file was last changed (after the working directory revision or the\n"
464 " argument to --rev if given) is printed.\n"
464 " argument to --rev if given) is printed.\n"
465 " "
465 " "
466 msgstr ""
466 msgstr ""
467
467
468 msgid "show children of the specified revision"
468 msgid "show children of the specified revision"
469 msgstr ""
469 msgstr ""
470
470
471 msgid "hg children [-r REV] [FILE]"
471 msgid "hg children [-r REV] [FILE]"
472 msgstr ""
472 msgstr ""
473
473
474 msgid "display statistics about repository history"
474 msgid "display statistics about repository history"
475 msgstr ""
475 msgstr ""
476
476
477 #, python-format
477 #, python-format
478 msgid "Revision %d is a merge, ignoring...\n"
478 msgid "Revision %d is a merge, ignoring...\n"
479 msgstr ""
479 msgstr ""
480
480
481 #, python-format
481 #, python-format
482 msgid "generating stats: %d%%"
482 msgid "generating stats: %d%%"
483 msgstr ""
483 msgstr ""
484
484
485 msgid ""
485 msgid ""
486 "histogram of changes to the repository\n"
486 "histogram of changes to the repository\n"
487 "\n"
487 "\n"
488 " This command will display a histogram representing the number\n"
488 " This command will display a histogram representing the number\n"
489 " of changed lines or revisions, grouped according to the given\n"
489 " of changed lines or revisions, grouped according to the given\n"
490 " template. The default template will group changes by author.\n"
490 " template. The default template will group changes by author.\n"
491 " The --dateformat option may be used to group the results by\n"
491 " The --dateformat option may be used to group the results by\n"
492 " date instead.\n"
492 " date instead.\n"
493 "\n"
493 "\n"
494 " Statistics are based on the number of changed lines, or\n"
494 " Statistics are based on the number of changed lines, or\n"
495 " alternatively the number of matching revisions if the\n"
495 " alternatively the number of matching revisions if the\n"
496 " --changesets option is specified.\n"
496 " --changesets option is specified.\n"
497 "\n"
497 "\n"
498 " Examples:\n"
498 " Examples:\n"
499 "\n"
499 "\n"
500 " # display count of changed lines for every committer\n"
500 " # display count of changed lines for every committer\n"
501 " hg churn -t '{author|email}'\n"
501 " hg churn -t '{author|email}'\n"
502 "\n"
502 "\n"
503 " # display daily activity graph\n"
503 " # display daily activity graph\n"
504 " hg churn -f '%H' -s -c\n"
504 " hg churn -f '%H' -s -c\n"
505 "\n"
505 "\n"
506 " # display activity of developers by month\n"
506 " # display activity of developers by month\n"
507 " hg churn -f '%Y-%m' -s -c\n"
507 " hg churn -f '%Y-%m' -s -c\n"
508 "\n"
508 "\n"
509 " # display count of lines changed in every year\n"
509 " # display count of lines changed in every year\n"
510 " hg churn -f '%Y' -s\n"
510 " hg churn -f '%Y' -s\n"
511 "\n"
511 "\n"
512 " It is possible to map alternate email addresses to a main address\n"
512 " It is possible to map alternate email addresses to a main address\n"
513 " by providing a file using the following format:\n"
513 " by providing a file using the following format:\n"
514 "\n"
514 "\n"
515 " <alias email> <actual email>\n"
515 " <alias email> <actual email>\n"
516 "\n"
516 "\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
519 " "
519 " "
520 msgstr ""
520 msgstr ""
521
521
522 #, python-format
522 #, python-format
523 msgid "assuming %i character terminal\n"
523 msgid "assuming %i character terminal\n"
524 msgstr ""
524 msgstr ""
525
525
526 msgid "count rate for the specified revision or range"
526 msgid "count rate for the specified revision or range"
527 msgstr ""
527 msgstr ""
528
528
529 msgid "count rate for revisions matching date spec"
529 msgid "count rate for revisions matching date spec"
530 msgstr ""
530 msgstr ""
531
531
532 msgid "template to group changesets"
532 msgid "template to group changesets"
533 msgstr ""
533 msgstr ""
534
534
535 msgid "strftime-compatible format for grouping by date"
535 msgid "strftime-compatible format for grouping by date"
536 msgstr ""
536 msgstr ""
537
537
538 msgid "count rate by number of changesets"
538 msgid "count rate by number of changesets"
539 msgstr ""
539 msgstr ""
540
540
541 msgid "sort by key (default: sort by count)"
541 msgid "sort by key (default: sort by count)"
542 msgstr ""
542 msgstr ""
543
543
544 msgid "file with email aliases"
544 msgid "file with email aliases"
545 msgstr ""
545 msgstr ""
546
546
547 msgid "show progress"
547 msgid "show progress"
548 msgstr ""
548 msgstr ""
549
549
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
551 msgstr ""
551 msgstr ""
552
552
553 msgid ""
553 msgid ""
554 "colorize output from some commands\n"
554 "colorize output from some commands\n"
555 "\n"
555 "\n"
556 "This extension modifies the status command to add color to its output\n"
556 "This extension modifies the status command to add color to its output\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
560 "whitespace.\n"
560 "whitespace.\n"
561 "\n"
561 "\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
565 "render_text function, which can be used to add effects to any text.\n"
565 "render_text function, which can be used to add effects to any text.\n"
566 "\n"
566 "\n"
567 "Default effects may be overridden from the .hgrc file:\n"
567 "Default effects may be overridden from the .hgrc file:\n"
568 "\n"
568 "\n"
569 "[color]\n"
569 "[color]\n"
570 "status.modified = blue bold underline red_background\n"
570 "status.modified = blue bold underline red_background\n"
571 "status.added = green bold\n"
571 "status.added = green bold\n"
572 "status.removed = red bold blue_background\n"
572 "status.removed = red bold blue_background\n"
573 "status.deleted = cyan bold underline\n"
573 "status.deleted = cyan bold underline\n"
574 "status.unknown = magenta bold underline\n"
574 "status.unknown = magenta bold underline\n"
575 "status.ignored = black bold\n"
575 "status.ignored = black bold\n"
576 "\n"
576 "\n"
577 "# 'none' turns off all effects\n"
577 "# 'none' turns off all effects\n"
578 "status.clean = none\n"
578 "status.clean = none\n"
579 "status.copied = none\n"
579 "status.copied = none\n"
580 "\n"
580 "\n"
581 "qseries.applied = blue bold underline\n"
581 "qseries.applied = blue bold underline\n"
582 "qseries.unapplied = black bold\n"
582 "qseries.unapplied = black bold\n"
583 "qseries.missing = red bold\n"
583 "qseries.missing = red bold\n"
584 "\n"
584 "\n"
585 "diff.diffline = bold\n"
585 "diff.diffline = bold\n"
586 "diff.extended = cyan bold\n"
586 "diff.extended = cyan bold\n"
587 "diff.file_a = red bold\n"
587 "diff.file_a = red bold\n"
588 "diff.file_b = green bold\n"
588 "diff.file_b = green bold\n"
589 "diff.hunk = magenta\n"
589 "diff.hunk = magenta\n"
590 "diff.deleted = red\n"
590 "diff.deleted = red\n"
591 "diff.inserted = green\n"
591 "diff.inserted = green\n"
592 "diff.changed = white\n"
592 "diff.changed = white\n"
593 "diff.trailingwhitespace = bold red_background\n"
593 "diff.trailingwhitespace = bold red_background\n"
594 msgstr ""
594 msgstr ""
595
595
596 msgid "when to colorize (always, auto, or never)"
596 msgid "when to colorize (always, auto, or never)"
597 msgstr ""
597 msgstr ""
598
598
599 msgid "don't colorize output"
599 msgid "don't colorize output"
600 msgstr ""
600 msgstr ""
601
601
602 msgid "import from foreign VCS repositories into Mercurial"
602 msgid "import from foreign VCS repositories into Mercurial"
603 msgstr ""
603 msgstr ""
604
604
605 msgid ""
605 msgid ""
606 "convert a foreign SCM repository to a Mercurial one.\n"
606 "convert a foreign SCM repository to a Mercurial one.\n"
607 "\n"
607 "\n"
608 " Accepted source formats [identifiers]:\n"
608 " Accepted source formats [identifiers]:\n"
609 " - Mercurial [hg]\n"
609 " - Mercurial [hg]\n"
610 " - CVS [cvs]\n"
610 " - CVS [cvs]\n"
611 " - Darcs [darcs]\n"
611 " - Darcs [darcs]\n"
612 " - git [git]\n"
612 " - git [git]\n"
613 " - Subversion [svn]\n"
613 " - Subversion [svn]\n"
614 " - Monotone [mtn]\n"
614 " - Monotone [mtn]\n"
615 " - GNU Arch [gnuarch]\n"
615 " - GNU Arch [gnuarch]\n"
616 " - Bazaar [bzr]\n"
616 " - Bazaar [bzr]\n"
617 " - Perforce [p4]\n"
617 " - Perforce [p4]\n"
618 "\n"
618 "\n"
619 " Accepted destination formats [identifiers]:\n"
619 " Accepted destination formats [identifiers]:\n"
620 " - Mercurial [hg]\n"
620 " - Mercurial [hg]\n"
621 " - Subversion [svn] (history on branches is not preserved)\n"
621 " - Subversion [svn] (history on branches is not preserved)\n"
622 "\n"
622 "\n"
623 " If no revision is given, all revisions will be converted.\n"
623 " If no revision is given, all revisions will be converted.\n"
624 " Otherwise, convert will only import up to the named revision\n"
624 " Otherwise, convert will only import up to the named revision\n"
625 " (given in a format understood by the source).\n"
625 " (given in a format understood by the source).\n"
626 "\n"
626 "\n"
627 " 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"
628 " basename of the source with '-hg' appended. If the destination\n"
628 " basename of the source with '-hg' appended. If the destination\n"
629 " repository doesn't exist, it will be created.\n"
629 " repository doesn't exist, it will be created.\n"
630 "\n"
630 "\n"
631 " By default, all sources except Mercurial will use\n"
631 " By default, all sources except Mercurial will use\n"
632 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
632 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
633 " revision numbers order. Sort modes have the following effects:\n"
633 " revision numbers order. Sort modes have the following effects:\n"
634 " --branchsort: convert from parent to child revision when\n"
634 " --branchsort: convert from parent to child revision when\n"
635 " possible, which means branches are usually converted one after\n"
635 " possible, which means branches are usually converted one after\n"
636 " the other. It generates more compact repositories.\n"
636 " the other. It generates more compact repositories.\n"
637 " --datesort: sort revisions by date. Converted repositories have\n"
637 " --datesort: sort revisions by date. Converted repositories have\n"
638 " good-looking changelogs but are often an order of magnitude\n"
638 " good-looking changelogs but are often an order of magnitude\n"
639 " larger than the same ones generated by --branchsort.\n"
639 " larger than the same ones generated by --branchsort.\n"
640 " --sourcesort: try to preserve source revisions order, only\n"
640 " --sourcesort: try to preserve source revisions order, only\n"
641 " supported by Mercurial sources.\n"
641 " supported by Mercurial sources.\n"
642 "\n"
642 "\n"
643 " 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"
644 " (<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"
645 " 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"
646 " revision, like so:\n"
646 " revision, like so:\n"
647 " <source ID> <destination ID>\n"
647 " <source ID> <destination ID>\n"
648 "\n"
648 "\n"
649 " 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"
650 " 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"
651 " and can be run repeatedly to copy new commits.\n"
651 " and can be run repeatedly to copy new commits.\n"
652 "\n"
652 "\n"
653 " 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"
654 " 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"
655 " 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"
656 " 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"
657 " srcauthor=whatever string you want\n"
657 " srcauthor=whatever string you want\n"
658 "\n"
658 "\n"
659 " 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"
660 " and directories. Comment lines start with '#'. Each line can\n"
660 " and directories. Comment lines start with '#'. Each line can\n"
661 " contain one of the following directives:\n"
661 " contain one of the following directives:\n"
662 "\n"
662 "\n"
663 " include path/to/file\n"
663 " include path/to/file\n"
664 "\n"
664 "\n"
665 " exclude path/to/file\n"
665 " exclude path/to/file\n"
666 "\n"
666 "\n"
667 " rename from/file to/file\n"
667 " rename from/file to/file\n"
668 "\n"
668 "\n"
669 " 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"
670 " directory, to be included in the destination repository, and the\n"
670 " directory, to be included in the destination repository, and the\n"
671 " exclusion of all other files and directories not explicitly included.\n"
671 " exclusion of all other files and directories not explicitly included.\n"
672 " The 'exclude' directive causes files or directories to be omitted.\n"
672 " The 'exclude' directive causes files or directories to be omitted.\n"
673 " 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"
674 " 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"
675 " path to rename to.\n"
675 " path to rename to.\n"
676 "\n"
676 "\n"
677 " The splicemap is a file that allows insertion of synthetic\n"
677 " The splicemap is a file that allows insertion of synthetic\n"
678 " 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"
679 " 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"
680 " graft two disconnected series of history together. Each entry\n"
680 " graft two disconnected series of history together. Each entry\n"
681 " 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"
682 " 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"
683 " revision control system whose parents should be modified (same\n"
683 " revision control system whose parents should be modified (same\n"
684 " 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"
685 " (in either the source or destination revision control system) that\n"
685 " (in either the source or destination revision control system) that\n"
686 " should be used as the new parents for that node.\n"
686 " should be used as the new parents for that node.\n"
687 "\n"
687 "\n"
688 " 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"
689 " being brought in from whatever external repository. When used in\n"
689 " being brought in from whatever external repository. When used in\n"
690 " conjunction with a splicemap, it allows for a powerful combination\n"
690 " conjunction with a splicemap, it allows for a powerful combination\n"
691 " 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"
692 " into nicely structured Mercurial repositories. The branchmap contains\n"
692 " into nicely structured Mercurial repositories. The branchmap contains\n"
693 " lines of the form \"original_branch_name new_branch_name\".\n"
693 " lines of the form \"original_branch_name new_branch_name\".\n"
694 " \"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"
695 " 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"
696 " 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"
697 " in one repository from \"default\" to a named branch.\n"
697 " in one repository from \"default\" to a named branch.\n"
698 "\n"
698 "\n"
699 " Mercurial Source\n"
699 " Mercurial Source\n"
700 " -----------------\n"
700 " -----------------\n"
701 "\n"
701 "\n"
702 " --config convert.hg.ignoreerrors=False (boolean)\n"
702 " --config convert.hg.ignoreerrors=False (boolean)\n"
703 " ignore integrity errors when reading. Use it to fix Mercurial\n"
703 " ignore integrity errors when reading. Use it to fix Mercurial\n"
704 " repositories with missing revlogs, by converting from and to\n"
704 " repositories with missing revlogs, by converting from and to\n"
705 " Mercurial.\n"
705 " Mercurial.\n"
706 " --config convert.hg.saverev=False (boolean)\n"
706 " --config convert.hg.saverev=False (boolean)\n"
707 " store original revision ID in changeset (forces target IDs to\n"
707 " store original revision ID in changeset (forces target IDs to\n"
708 " change)\n"
708 " change)\n"
709 " --config convert.hg.startrev=0 (hg revision identifier)\n"
709 " --config convert.hg.startrev=0 (hg revision identifier)\n"
710 " convert start revision and its descendants\n"
710 " convert start revision and its descendants\n"
711 "\n"
711 "\n"
712 " CVS Source\n"
712 " CVS Source\n"
713 " ----------\n"
713 " ----------\n"
714 "\n"
714 "\n"
715 " 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"
716 " 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"
717 " 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"
718 " repository is :local:. The conversion uses the top level directory\n"
718 " repository is :local:. The conversion uses the top level directory\n"
719 " 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"
720 " 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"
721 " 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"
722 " converted, and that any directory reorganization in the CVS\n"
722 " converted, and that any directory reorganization in the CVS\n"
723 " sandbox is ignored.\n"
723 " sandbox is ignored.\n"
724 "\n"
724 "\n"
725 " 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"
726 " individual commits to CVS and merge them into changesets. CVS\n"
726 " individual commits to CVS and merge them into changesets. CVS\n"
727 " 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"
728 " be configured to call the external 'cvsps' program by setting:\n"
728 " be configured to call the external 'cvsps' program by setting:\n"
729 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
729 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
730 " 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"
731 "\n"
731 "\n"
732 " The options shown are the defaults.\n"
732 " The options shown are the defaults.\n"
733 "\n"
733 "\n"
734 " Internal cvsps is selected by setting\n"
734 " Internal cvsps is selected by setting\n"
735 " --config convert.cvsps=builtin\n"
735 " --config convert.cvsps=builtin\n"
736 " and has a few more configurable options:\n"
736 " and has a few more configurable options:\n"
737 " --config convert.cvsps.cache=True (boolean)\n"
737 " --config convert.cvsps.cache=True (boolean)\n"
738 " 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"
739 " debugging purposes.\n"
739 " debugging purposes.\n"
740 " --config convert.cvsps.fuzz=60 (integer)\n"
740 " --config convert.cvsps.fuzz=60 (integer)\n"
741 " Specify the maximum time (in seconds) that is allowed\n"
741 " Specify the maximum time (in seconds) that is allowed\n"
742 " between commits with identical user and log message in a\n"
742 " between commits with identical user and log message in a\n"
743 " single changeset. When very large files were checked in as\n"
743 " single changeset. When very large files were checked in as\n"
744 " 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"
745 " enough.\n"
745 " enough.\n"
746 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
746 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
747 " Specify a regular expression to which commit log messages\n"
747 " Specify a regular expression to which commit log messages\n"
748 " are matched. If a match occurs, then the conversion\n"
748 " are matched. If a match occurs, then the conversion\n"
749 " process will insert a dummy revision merging the branch on\n"
749 " process will insert a dummy revision merging the branch on\n"
750 " which this log message occurs to the branch indicated in\n"
750 " which this log message occurs to the branch indicated in\n"
751 " the regex.\n"
751 " the regex.\n"
752 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
752 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
753 " Specify a regular expression to which commit log messages\n"
753 " Specify a regular expression to which commit log messages\n"
754 " are matched. If a match occurs, then the conversion\n"
754 " are matched. If a match occurs, then the conversion\n"
755 " process will add the most recent revision on the branch\n"
755 " process will add the most recent revision on the branch\n"
756 " indicated in the regex as the second parent of the\n"
756 " indicated in the regex as the second parent of the\n"
757 " changeset.\n"
757 " changeset.\n"
758 "\n"
758 "\n"
759 " The hgext/convert/cvsps wrapper script allows the builtin\n"
759 " The hgext/convert/cvsps wrapper script allows the builtin\n"
760 " 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"
761 " 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"
762 "\n"
762 "\n"
763 " Subversion Source\n"
763 " Subversion Source\n"
764 " -----------------\n"
764 " -----------------\n"
765 "\n"
765 "\n"
766 " Subversion source detects classical trunk/branches/tags layouts.\n"
766 " Subversion source detects classical trunk/branches/tags layouts.\n"
767 " By default, the supplied \"svn://repo/path/\" source URL is\n"
767 " By default, the supplied \"svn://repo/path/\" source URL is\n"
768 " 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"
769 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
769 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
770 " its subdirectories are listed as possible branches. If\n"
770 " its subdirectories are listed as possible branches. If\n"
771 " \"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"
772 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
772 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
773 " can be overridden with following options. Set them to paths\n"
773 " can be overridden with following options. Set them to paths\n"
774 " 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"
775 " detection.\n"
775 " detection.\n"
776 "\n"
776 "\n"
777 " --config convert.svn.branches=branches (directory name)\n"
777 " --config convert.svn.branches=branches (directory name)\n"
778 " specify the directory containing branches\n"
778 " specify the directory containing branches\n"
779 " --config convert.svn.tags=tags (directory name)\n"
779 " --config convert.svn.tags=tags (directory name)\n"
780 " specify the directory containing tags\n"
780 " specify the directory containing tags\n"
781 " --config convert.svn.trunk=trunk (directory name)\n"
781 " --config convert.svn.trunk=trunk (directory name)\n"
782 " specify the name of the trunk branch\n"
782 " specify the name of the trunk branch\n"
783 "\n"
783 "\n"
784 " Source history can be retrieved starting at a specific revision,\n"
784 " Source history can be retrieved starting at a specific revision,\n"
785 " instead of being integrally converted. Only single branch\n"
785 " instead of being integrally converted. Only single branch\n"
786 " conversions are supported.\n"
786 " conversions are supported.\n"
787 "\n"
787 "\n"
788 " --config convert.svn.startrev=0 (svn revision number)\n"
788 " --config convert.svn.startrev=0 (svn revision number)\n"
789 " specify start Subversion revision.\n"
789 " specify start Subversion revision.\n"
790 "\n"
790 "\n"
791 " Perforce Source\n"
791 " Perforce Source\n"
792 " ---------------\n"
792 " ---------------\n"
793 "\n"
793 "\n"
794 " 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"
795 " 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"
796 " source to a flat Mercurial repository, ignoring labels, branches\n"
796 " source to a flat Mercurial repository, ignoring labels, branches\n"
797 " 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"
798 " usually should specify a target directory, because otherwise the\n"
798 " usually should specify a target directory, because otherwise the\n"
799 " target may be named ...-hg.\n"
799 " target may be named ...-hg.\n"
800 "\n"
800 "\n"
801 " 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"
802 " converted by specifying an initial Perforce revision.\n"
802 " converted by specifying an initial Perforce revision.\n"
803 "\n"
803 "\n"
804 " --config convert.p4.startrev=0 (perforce changelist number)\n"
804 " --config convert.p4.startrev=0 (perforce changelist number)\n"
805 " specify initial Perforce revision.\n"
805 " specify initial Perforce revision.\n"
806 "\n"
806 "\n"
807 "\n"
807 "\n"
808 " Mercurial Destination\n"
808 " Mercurial Destination\n"
809 " ---------------------\n"
809 " ---------------------\n"
810 "\n"
810 "\n"
811 " --config convert.hg.clonebranches=False (boolean)\n"
811 " --config convert.hg.clonebranches=False (boolean)\n"
812 " dispatch source branches in separate clones.\n"
812 " dispatch source branches in separate clones.\n"
813 " --config convert.hg.tagsbranch=default (branch name)\n"
813 " --config convert.hg.tagsbranch=default (branch name)\n"
814 " tag revisions branch name\n"
814 " tag revisions branch name\n"
815 " --config convert.hg.usebranchnames=True (boolean)\n"
815 " --config convert.hg.usebranchnames=True (boolean)\n"
816 " preserve branch names\n"
816 " preserve branch names\n"
817 "\n"
817 "\n"
818 " "
818 " "
819 msgstr ""
819 msgstr ""
820
820
821 msgid ""
821 msgid ""
822 "create changeset information from CVS\n"
822 "create changeset information from CVS\n"
823 "\n"
823 "\n"
824 " 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"
825 " 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"
826 " cvsps.\n"
826 " cvsps.\n"
827 "\n"
827 "\n"
828 " 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"
829 " 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"
830 " series of changesets based on matching commit log entries and\n"
830 " series of changesets based on matching commit log entries and\n"
831 " dates."
831 " dates."
832 msgstr ""
832 msgstr ""
833
833
834 msgid "username mapping filename"
834 msgid "username mapping filename"
835 msgstr ""
835 msgstr ""
836
836
837 msgid "destination repository type"
837 msgid "destination repository type"
838 msgstr ""
838 msgstr ""
839
839
840 msgid "remap file names using contents of file"
840 msgid "remap file names using contents of file"
841 msgstr ""
841 msgstr ""
842
842
843 msgid "import up to target revision REV"
843 msgid "import up to target revision REV"
844 msgstr ""
844 msgstr ""
845
845
846 msgid "source repository type"
846 msgid "source repository type"
847 msgstr ""
847 msgstr ""
848
848
849 msgid "splice synthesized history into place"
849 msgid "splice synthesized history into place"
850 msgstr ""
850 msgstr ""
851
851
852 msgid "change branch names while converting"
852 msgid "change branch names while converting"
853 msgstr ""
853 msgstr ""
854
854
855 msgid "try to sort changesets by branches"
855 msgid "try to sort changesets by branches"
856 msgstr ""
856 msgstr ""
857
857
858 msgid "try to sort changesets by date"
858 msgid "try to sort changesets by date"
859 msgstr ""
859 msgstr ""
860
860
861 msgid "preserve source changesets order"
861 msgid "preserve source changesets order"
862 msgstr ""
862 msgstr ""
863
863
864 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
864 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
865 msgstr ""
865 msgstr ""
866
866
867 msgid "only return changes on specified branches"
867 msgid "only return changes on specified branches"
868 msgstr ""
868 msgstr ""
869
869
870 msgid "prefix to remove from file names"
870 msgid "prefix to remove from file names"
871 msgstr ""
871 msgstr ""
872
872
873 msgid "only return changes after or between specified tags"
873 msgid "only return changes after or between specified tags"
874 msgstr ""
874 msgstr ""
875
875
876 msgid "update cvs log cache"
876 msgid "update cvs log cache"
877 msgstr ""
877 msgstr ""
878
878
879 msgid "create new cvs log cache"
879 msgid "create new cvs log cache"
880 msgstr ""
880 msgstr ""
881
881
882 msgid "set commit time fuzz in seconds"
882 msgid "set commit time fuzz in seconds"
883 msgstr ""
883 msgstr ""
884
884
885 msgid "specify cvsroot"
885 msgid "specify cvsroot"
886 msgstr ""
886 msgstr ""
887
887
888 msgid "show parent changesets"
888 msgid "show parent changesets"
889 msgstr ""
889 msgstr ""
890
890
891 msgid "show current changeset in ancestor branches"
891 msgid "show current changeset in ancestor branches"
892 msgstr ""
892 msgstr ""
893
893
894 msgid "ignored for compatibility"
894 msgid "ignored for compatibility"
895 msgstr ""
895 msgstr ""
896
896
897 msgid "hg debugcvsps [OPTION]... [PATH]..."
897 msgid "hg debugcvsps [OPTION]... [PATH]..."
898 msgstr ""
898 msgstr ""
899
899
900 msgid ""
900 msgid ""
901 "warning: lightweight checkouts may cause conversion failures, try with a "
901 "warning: lightweight checkouts may cause conversion failures, try with a "
902 "regular branch instead.\n"
902 "regular branch instead.\n"
903 msgstr ""
903 msgstr ""
904
904
905 msgid "bzr source type could not be determined\n"
905 msgid "bzr source type could not be determined\n"
906 msgstr ""
906 msgstr ""
907
907
908 #, python-format
908 #, python-format
909 msgid "%s is not a valid revision in current branch"
909 msgid "%s is not a valid revision in current branch"
910 msgstr ""
910 msgstr ""
911
911
912 #, python-format
912 #, python-format
913 msgid "%s is not available in %s anymore"
913 msgid "%s is not available in %s anymore"
914 msgstr ""
914 msgstr ""
915
915
916 #, python-format
916 #, python-format
917 msgid "%s.%s symlink has no target"
917 msgid "%s.%s symlink has no target"
918 msgstr ""
918 msgstr ""
919
919
920 #, python-format
920 #, python-format
921 msgid "cannot find required \"%s\" tool"
921 msgid "cannot find required \"%s\" tool"
922 msgstr ""
922 msgstr ""
923
923
924 #, python-format
924 #, python-format
925 msgid "running: %s\n"
925 msgid "running: %s\n"
926 msgstr ""
926 msgstr ""
927
927
928 #, python-format
928 #, python-format
929 msgid "%s error:\n"
929 msgid "%s error:\n"
930 msgstr ""
930 msgstr ""
931
931
932 #, python-format
932 #, python-format
933 msgid "syntax error in %s(%d): key/value pair expected"
933 msgid "syntax error in %s(%d): key/value pair expected"
934 msgstr ""
934 msgstr ""
935
935
936 #, python-format
936 #, python-format
937 msgid "could not open map file %r: %s"
937 msgid "could not open map file %r: %s"
938 msgstr ""
938 msgstr ""
939
939
940 #, python-format
940 #, python-format
941 msgid "%s: missing or unsupported repository"
941 msgid "%s: missing or unsupported repository"
942 msgstr ""
942 msgstr ""
943
943
944 #, python-format
944 #, python-format
945 msgid "convert: %s\n"
945 msgid "convert: %s\n"
946 msgstr ""
946 msgstr ""
947
947
948 #, python-format
948 #, python-format
949 msgid "%s: unknown repository type"
949 msgid "%s: unknown repository type"
950 msgstr ""
950 msgstr ""
951
951
952 #, python-format
952 #, python-format
953 msgid "unknown sort mode: %s"
953 msgid "unknown sort mode: %s"
954 msgstr ""
954 msgstr ""
955
955
956 #, python-format
956 #, python-format
957 msgid "cycle detected between %s and %s"
957 msgid "cycle detected between %s and %s"
958 msgstr ""
958 msgstr ""
959
959
960 msgid "not all revisions were sorted"
960 msgid "not all revisions were sorted"
961 msgstr ""
961 msgstr ""
962
962
963 #, python-format
963 #, python-format
964 msgid "Writing author map file %s\n"
964 msgid "Writing author map file %s\n"
965 msgstr ""
965 msgstr ""
966
966
967 #, python-format
967 #, python-format
968 msgid "Ignoring bad line in author map file %s: %s\n"
968 msgid "Ignoring bad line in author map file %s: %s\n"
969 msgstr ""
969 msgstr ""
970
970
971 #, python-format
971 #, python-format
972 msgid "mapping author %s to %s\n"
972 msgid "mapping author %s to %s\n"
973 msgstr ""
973 msgstr ""
974
974
975 #, python-format
975 #, python-format
976 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"
977 msgstr ""
977 msgstr ""
978
978
979 #, python-format
979 #, python-format
980 msgid "spliced in %s as parents of %s\n"
980 msgid "spliced in %s as parents of %s\n"
981 msgstr ""
981 msgstr ""
982
982
983 msgid "scanning source...\n"
983 msgid "scanning source...\n"
984 msgstr ""
984 msgstr ""
985
985
986 msgid "sorting...\n"
986 msgid "sorting...\n"
987 msgstr ""
987 msgstr ""
988
988
989 msgid "converting...\n"
989 msgid "converting...\n"
990 msgstr ""
990 msgstr ""
991
991
992 #, python-format
992 #, python-format
993 msgid "source: %s\n"
993 msgid "source: %s\n"
994 msgstr ""
994 msgstr ""
995
995
996 #, python-format
996 #, python-format
997 msgid "assuming destination %s\n"
997 msgid "assuming destination %s\n"
998 msgstr ""
998 msgstr ""
999
999
1000 msgid "more than one sort mode specified"
1000 msgid "more than one sort mode specified"
1001 msgstr ""
1001 msgstr ""
1002
1002
1003 msgid "--sourcesort is not supported by this data source"
1003 msgid "--sourcesort is not supported by this data source"
1004 msgstr ""
1004 msgstr ""
1005
1005
1006 msgid ""
1006 msgid ""
1007 "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 "
1008 "Mercurial 1.4\n"
1008 "Mercurial 1.4\n"
1009 msgstr ""
1009 msgstr ""
1010
1010
1011 #, python-format
1011 #, python-format
1012 msgid "revision %s is not a patchset number or date"
1012 msgid "revision %s is not a patchset number or date"
1013 msgstr ""
1013 msgstr ""
1014
1014
1015 msgid "using builtin cvsps\n"
1015 msgid "using builtin cvsps\n"
1016 msgstr ""
1016 msgstr ""
1017
1017
1018 #, python-format
1018 #, python-format
1019 msgid "connecting to %s\n"
1019 msgid "connecting to %s\n"
1020 msgstr ""
1020 msgstr ""
1021
1021
1022 msgid "CVS pserver authentication failed"
1022 msgid "CVS pserver authentication failed"
1023 msgstr ""
1023 msgstr ""
1024
1024
1025 msgid "server sucks"
1025 msgid "server sucks"
1026 msgstr ""
1026 msgstr ""
1027
1027
1028 #, python-format
1028 #, python-format
1029 msgid "%d bytes missing from remote file"
1029 msgid "%d bytes missing from remote file"
1030 msgstr ""
1030 msgstr ""
1031
1031
1032 #, python-format
1032 #, python-format
1033 msgid "cvs server: %s\n"
1033 msgid "cvs server: %s\n"
1034 msgstr ""
1034 msgstr ""
1035
1035
1036 #, python-format
1036 #, python-format
1037 msgid "unknown CVS response: %s"
1037 msgid "unknown CVS response: %s"
1038 msgstr ""
1038 msgstr ""
1039
1039
1040 msgid "collecting CVS rlog\n"
1040 msgid "collecting CVS rlog\n"
1041 msgstr ""
1041 msgstr ""
1042
1042
1043 #, python-format
1043 #, python-format
1044 msgid "reading cvs log cache %s\n"
1044 msgid "reading cvs log cache %s\n"
1045 msgstr ""
1045 msgstr ""
1046
1046
1047 #, python-format
1047 #, python-format
1048 msgid "cache has %d log entries\n"
1048 msgid "cache has %d log entries\n"
1049 msgstr ""
1049 msgstr ""
1050
1050
1051 #, python-format
1051 #, python-format
1052 msgid "error reading cache: %r\n"
1052 msgid "error reading cache: %r\n"
1053 msgstr ""
1053 msgstr ""
1054
1054
1055 #, python-format
1055 #, python-format
1056 msgid "running %s\n"
1056 msgid "running %s\n"
1057 msgstr ""
1057 msgstr ""
1058
1058
1059 #, python-format
1059 #, python-format
1060 msgid "prefix=%r directory=%r root=%r\n"
1060 msgid "prefix=%r directory=%r root=%r\n"
1061 msgstr ""
1061 msgstr ""
1062
1062
1063 msgid "RCS file must be followed by working file"
1063 msgid "RCS file must be followed by working file"
1064 msgstr ""
1064 msgstr ""
1065
1065
1066 msgid "must have at least some revisions"
1066 msgid "must have at least some revisions"
1067 msgstr ""
1067 msgstr ""
1068
1068
1069 msgid "expected revision number"
1069 msgid "expected revision number"
1070 msgstr ""
1070 msgstr ""
1071
1071
1072 msgid "revision must be followed by date line"
1072 msgid "revision must be followed by date line"
1073 msgstr ""
1073 msgstr ""
1074
1074
1075 #, python-format
1075 #, python-format
1076 msgid "found synthetic revision in %s: %r\n"
1076 msgid "found synthetic revision in %s: %r\n"
1077 msgstr ""
1077 msgstr ""
1078
1078
1079 #, python-format
1079 #, python-format
1080 msgid "writing cvs log cache %s\n"
1080 msgid "writing cvs log cache %s\n"
1081 msgstr ""
1081 msgstr ""
1082
1082
1083 #, python-format
1083 #, python-format
1084 msgid "%d log entries\n"
1084 msgid "%d log entries\n"
1085 msgstr ""
1085 msgstr ""
1086
1086
1087 msgid "creating changesets\n"
1087 msgid "creating changesets\n"
1088 msgstr ""
1088 msgstr ""
1089
1089
1090 msgid "synthetic changeset cannot have multiple parents"
1090 msgid "synthetic changeset cannot have multiple parents"
1091 msgstr ""
1091 msgstr ""
1092
1092
1093 #, python-format
1093 #, python-format
1094 msgid ""
1094 msgid ""
1095 "warning: CVS commit message references non-existent branch %r:\n"
1095 "warning: CVS commit message references non-existent branch %r:\n"
1096 "%s\n"
1096 "%s\n"
1097 msgstr ""
1097 msgstr ""
1098
1098
1099 #, python-format
1099 #, python-format
1100 msgid "%d changeset entries\n"
1100 msgid "%d changeset entries\n"
1101 msgstr ""
1101 msgstr ""
1102
1102
1103 msgid "Python ElementTree module is not available"
1103 msgid "Python ElementTree module is not available"
1104 msgstr ""
1104 msgstr ""
1105
1105
1106 #, python-format
1106 #, python-format
1107 msgid "cleaning up %s\n"
1107 msgid "cleaning up %s\n"
1108 msgstr ""
1108 msgstr ""
1109
1109
1110 msgid "internal calling inconsistency"
1110 msgid "internal calling inconsistency"
1111 msgstr ""
1111 msgstr ""
1112
1112
1113 msgid "errors in filemap"
1113 msgid "errors in filemap"
1114 msgstr ""
1114 msgstr ""
1115
1115
1116 #, python-format
1116 #, python-format
1117 msgid "%s:%d: %r already in %s list\n"
1117 msgid "%s:%d: %r already in %s list\n"
1118 msgstr ""
1118 msgstr ""
1119
1119
1120 #, python-format
1120 #, python-format
1121 msgid "%s:%d: unknown directive %r\n"
1121 msgid "%s:%d: unknown directive %r\n"
1122 msgstr ""
1122 msgstr ""
1123
1123
1124 msgid "source repository doesn't support --filemap"
1124 msgid "source repository doesn't support --filemap"
1125 msgstr ""
1125 msgstr ""
1126
1126
1127 #, python-format
1127 #, python-format
1128 msgid "%s does not look like a GNU Arch repo"
1128 msgid "%s does not look like a GNU Arch repo"
1129 msgstr ""
1129 msgstr ""
1130
1130
1131 msgid "cannot find a GNU Arch tool"
1131 msgid "cannot find a GNU Arch tool"
1132 msgstr ""
1132 msgstr ""
1133
1133
1134 #, python-format
1134 #, python-format
1135 msgid "analyzing tree version %s...\n"
1135 msgid "analyzing tree version %s...\n"
1136 msgstr ""
1136 msgstr ""
1137
1137
1138 #, python-format
1138 #, python-format
1139 msgid ""
1139 msgid ""
1140 "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"
1141 msgstr ""
1141 msgstr ""
1142
1142
1143 #, python-format
1143 #, python-format
1144 msgid "applying revision %s...\n"
1144 msgid "applying revision %s...\n"
1145 msgstr ""
1145 msgstr ""
1146
1146
1147 #, python-format
1147 #, python-format
1148 msgid "computing changeset between %s and %s...\n"
1148 msgid "computing changeset between %s and %s...\n"
1149 msgstr ""
1149 msgstr ""
1150
1150
1151 #, python-format
1151 #, python-format
1152 msgid "obtaining revision %s...\n"
1152 msgid "obtaining revision %s...\n"
1153 msgstr ""
1153 msgstr ""
1154
1154
1155 #, python-format
1155 #, python-format
1156 msgid "analyzing revision %s...\n"
1156 msgid "analyzing revision %s...\n"
1157 msgstr ""
1157 msgstr ""
1158
1158
1159 #, python-format
1159 #, python-format
1160 msgid "could not parse cat-log of %s"
1160 msgid "could not parse cat-log of %s"
1161 msgstr ""
1161 msgstr ""
1162
1162
1163 #, python-format
1163 #, python-format
1164 msgid "%s is not a local Mercurial repo"
1164 msgid "%s is not a local Mercurial repo"
1165 msgstr ""
1165 msgstr ""
1166
1166
1167 #, python-format
1167 #, python-format
1168 msgid "initializing destination %s repository\n"
1168 msgid "initializing destination %s repository\n"
1169 msgstr ""
1169 msgstr ""
1170
1170
1171 msgid "run hg sink pre-conversion action\n"
1171 msgid "run hg sink pre-conversion action\n"
1172 msgstr ""
1172 msgstr ""
1173
1173
1174 msgid "run hg sink post-conversion action\n"
1174 msgid "run hg sink post-conversion action\n"
1175 msgstr ""
1175 msgstr ""
1176
1176
1177 #, python-format
1177 #, python-format
1178 msgid "pulling from %s into %s\n"
1178 msgid "pulling from %s into %s\n"
1179 msgstr ""
1179 msgstr ""
1180
1180
1181 msgid "filtering out empty revision\n"
1181 msgid "filtering out empty revision\n"
1182 msgstr ""
1182 msgstr ""
1183
1183
1184 msgid "updating tags\n"
1184 msgid "updating tags\n"
1185 msgstr ""
1185 msgstr ""
1186
1186
1187 #, python-format
1187 #, python-format
1188 msgid "%s is not a valid start revision"
1188 msgid "%s is not a valid start revision"
1189 msgstr ""
1189 msgstr ""
1190
1190
1191 #, python-format
1191 #, python-format
1192 msgid "ignoring: %s\n"
1192 msgid "ignoring: %s\n"
1193 msgstr ""
1193 msgstr ""
1194
1194
1195 msgid "run hg source pre-conversion action\n"
1195 msgid "run hg source pre-conversion action\n"
1196 msgstr ""
1196 msgstr ""
1197
1197
1198 msgid "run hg source post-conversion action\n"
1198 msgid "run hg source post-conversion action\n"
1199 msgstr ""
1199 msgstr ""
1200
1200
1201 #, python-format
1201 #, python-format
1202 msgid "%s does not look like a monotone repo"
1202 msgid "%s does not look like a monotone repo"
1203 msgstr ""
1203 msgstr ""
1204
1204
1205 #, python-format
1205 #, python-format
1206 msgid "copying file in renamed directory from '%s' to '%s'"
1206 msgid "copying file in renamed directory from '%s' to '%s'"
1207 msgstr ""
1207 msgstr ""
1208
1208
1209 msgid "reading p4 views\n"
1209 msgid "reading p4 views\n"
1210 msgstr ""
1210 msgstr ""
1211
1211
1212 msgid "collecting p4 changelists\n"
1212 msgid "collecting p4 changelists\n"
1213 msgstr ""
1213 msgstr ""
1214
1214
1215 msgid "Subversion python bindings could not be loaded"
1215 msgid "Subversion python bindings could not be loaded"
1216 msgstr ""
1216 msgstr ""
1217
1217
1218 #, python-format
1218 #, python-format
1219 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"
1220 msgstr ""
1220 msgstr ""
1221
1221
1222 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"
1223 msgstr ""
1223 msgstr ""
1224
1224
1225 #, python-format
1225 #, python-format
1226 msgid "svn: revision %s is not an integer"
1226 msgid "svn: revision %s is not an integer"
1227 msgstr ""
1227 msgstr ""
1228
1228
1229 #, python-format
1229 #, python-format
1230 msgid "svn: start revision %s is not an integer"
1230 msgid "svn: start revision %s is not an integer"
1231 msgstr ""
1231 msgstr ""
1232
1232
1233 #, python-format
1233 #, python-format
1234 msgid "no revision found in module %s"
1234 msgid "no revision found in module %s"
1235 msgstr ""
1235 msgstr ""
1236
1236
1237 #, python-format
1237 #, python-format
1238 msgid "expected %s to be at %r, but not found"
1238 msgid "expected %s to be at %r, but not found"
1239 msgstr ""
1239 msgstr ""
1240
1240
1241 #, python-format
1241 #, python-format
1242 msgid "found %s at %r\n"
1242 msgid "found %s at %r\n"
1243 msgstr ""
1243 msgstr ""
1244
1244
1245 #, python-format
1245 #, python-format
1246 msgid "ignoring empty branch %s\n"
1246 msgid "ignoring empty branch %s\n"
1247 msgstr ""
1247 msgstr ""
1248
1248
1249 #, python-format
1249 #, python-format
1250 msgid "found branch %s at %d\n"
1250 msgid "found branch %s at %d\n"
1251 msgstr ""
1251 msgstr ""
1252
1252
1253 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"
1254 msgstr ""
1254 msgstr ""
1255
1255
1256 #, python-format
1256 #, python-format
1257 msgid "svn: no revision found after start revision %d"
1257 msgid "svn: no revision found after start revision %d"
1258 msgstr ""
1258 msgstr ""
1259
1259
1260 #, python-format
1260 #, python-format
1261 msgid "no tags found at revision %d\n"
1261 msgid "no tags found at revision %d\n"
1262 msgstr ""
1262 msgstr ""
1263
1263
1264 #, python-format
1264 #, python-format
1265 msgid "ignoring foreign branch %r\n"
1265 msgid "ignoring foreign branch %r\n"
1266 msgstr ""
1266 msgstr ""
1267
1267
1268 #, python-format
1268 #, python-format
1269 msgid "%s not found up to revision %d"
1269 msgid "%s not found up to revision %d"
1270 msgstr ""
1270 msgstr ""
1271
1271
1272 #, python-format
1272 #, python-format
1273 msgid "branch renamed from %s to %s at %d\n"
1273 msgid "branch renamed from %s to %s at %d\n"
1274 msgstr ""
1274 msgstr ""
1275
1275
1276 #, python-format
1276 #, python-format
1277 msgid "reparent to %s\n"
1277 msgid "reparent to %s\n"
1278 msgstr ""
1278 msgstr ""
1279
1279
1280 #, python-format
1280 #, python-format
1281 msgid "copied to %s from %s@%s\n"
1281 msgid "copied to %s from %s@%s\n"
1282 msgstr ""
1282 msgstr ""
1283
1283
1284 #, python-format
1284 #, python-format
1285 msgid "gone from %s\n"
1285 msgid "gone from %s\n"
1286 msgstr ""
1286 msgstr ""
1287
1287
1288 #, python-format
1288 #, python-format
1289 msgid "entry %s\n"
1289 msgid "entry %s\n"
1290 msgstr ""
1290 msgstr ""
1291
1291
1292 #, python-format
1292 #, python-format
1293 msgid "unknown path in revision %d: %s\n"
1293 msgid "unknown path in revision %d: %s\n"
1294 msgstr ""
1294 msgstr ""
1295
1295
1296 #, python-format
1296 #, python-format
1297 msgid "mark %s came from %s:%d\n"
1297 msgid "mark %s came from %s:%d\n"
1298 msgstr ""
1298 msgstr ""
1299
1299
1300 #, python-format
1300 #, python-format
1301 msgid "parsing revision %d (%d changes)\n"
1301 msgid "parsing revision %d (%d changes)\n"
1302 msgstr ""
1302 msgstr ""
1303
1303
1304 #, python-format
1304 #, python-format
1305 msgid "found parent of branch %s at %d: %s\n"
1305 msgid "found parent of branch %s at %d: %s\n"
1306 msgstr ""
1306 msgstr ""
1307
1307
1308 msgid "no copyfrom path, don't know what to do.\n"
1308 msgid "no copyfrom path, don't know what to do.\n"
1309 msgstr ""
1309 msgstr ""
1310
1310
1311 #, python-format
1311 #, python-format
1312 msgid "fetching revision log for \"%s\" from %d to %d\n"
1312 msgid "fetching revision log for \"%s\" from %d to %d\n"
1313 msgstr ""
1313 msgstr ""
1314
1314
1315 #, python-format
1315 #, python-format
1316 msgid "revision %d has no entries\n"
1316 msgid "revision %d has no entries\n"
1317 msgstr ""
1317 msgstr ""
1318
1318
1319 #, python-format
1319 #, python-format
1320 msgid "svn: branch has no revision %s"
1320 msgid "svn: branch has no revision %s"
1321 msgstr ""
1321 msgstr ""
1322
1322
1323 #, python-format
1323 #, python-format
1324 msgid "%r is not under %r, ignoring\n"
1324 msgid "%r is not under %r, ignoring\n"
1325 msgstr ""
1325 msgstr ""
1326
1326
1327 #, python-format
1327 #, python-format
1328 msgid "initializing svn repo %r\n"
1328 msgid "initializing svn repo %r\n"
1329 msgstr ""
1329 msgstr ""
1330
1330
1331 #, python-format
1331 #, python-format
1332 msgid "initializing svn wc %r\n"
1332 msgid "initializing svn wc %r\n"
1333 msgstr ""
1333 msgstr ""
1334
1334
1335 msgid "unexpected svn output:\n"
1335 msgid "unexpected svn output:\n"
1336 msgstr ""
1336 msgstr ""
1337
1337
1338 msgid "unable to cope with svn output"
1338 msgid "unable to cope with svn output"
1339 msgstr ""
1339 msgstr ""
1340
1340
1341 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1341 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1342 msgstr ""
1342 msgstr ""
1343
1343
1344 msgid ""
1344 msgid ""
1345 "allow external programs to compare revisions\n"
1345 "allow external programs to compare revisions\n"
1346 "\n"
1346 "\n"
1347 "The `extdiff' Mercurial extension allows you to use external programs\n"
1347 "The `extdiff' Mercurial extension allows you to use external programs\n"
1348 "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"
1349 "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"
1350 "non-option arguments: paths to directories containing snapshots of\n"
1350 "non-option arguments: paths to directories containing snapshots of\n"
1351 "files to compare.\n"
1351 "files to compare.\n"
1352 "\n"
1352 "\n"
1353 "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"
1354 "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"
1355 "\n"
1355 "\n"
1356 " [extdiff]\n"
1356 " [extdiff]\n"
1357 " # 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"
1358 " cdiff = gdiff -Nprc5\n"
1358 " cdiff = gdiff -Nprc5\n"
1359 " ## or the old way:\n"
1359 " ## or the old way:\n"
1360 " #cmd.cdiff = gdiff\n"
1360 " #cmd.cdiff = gdiff\n"
1361 " #opts.cdiff = -Nprc5\n"
1361 " #opts.cdiff = -Nprc5\n"
1362 "\n"
1362 "\n"
1363 " # add new command called vdiff, runs kdiff3\n"
1363 " # add new command called vdiff, runs kdiff3\n"
1364 " vdiff = kdiff3\n"
1364 " vdiff = kdiff3\n"
1365 "\n"
1365 "\n"
1366 " # 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"
1367 " meld =\n"
1367 " meld =\n"
1368 "\n"
1368 "\n"
1369 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1369 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1370 " # (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"
1371 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1371 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1372 "in\n"
1372 "in\n"
1373 " # your .vimrc\n"
1373 " # your .vimrc\n"
1374 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1374 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1375 "\n"
1375 "\n"
1376 "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"
1377 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1377 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1378 "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"
1379 "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"
1380 msgstr ""
1380 msgstr ""
1381
1381
1382 #, python-format
1382 #, python-format
1383 msgid "making snapshot of %d files from rev %s\n"
1383 msgid "making snapshot of %d files from rev %s\n"
1384 msgstr ""
1384 msgstr ""
1385
1385
1386 #, python-format
1386 #, python-format
1387 msgid "making snapshot of %d files from working directory\n"
1387 msgid "making snapshot of %d files from working directory\n"
1388 msgstr ""
1388 msgstr ""
1389
1389
1390 msgid "cannot specify --rev and --change at the same time"
1390 msgid "cannot specify --rev and --change at the same time"
1391 msgstr ""
1391 msgstr ""
1392
1392
1393 #, python-format
1393 #, python-format
1394 msgid "running %r in %s\n"
1394 msgid "running %r in %s\n"
1395 msgstr ""
1395 msgstr ""
1396
1396
1397 #, python-format
1397 #, python-format
1398 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1398 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1399 msgstr ""
1399 msgstr ""
1400
1400
1401 msgid "cleaning up temp directory\n"
1401 msgid "cleaning up temp directory\n"
1402 msgstr ""
1402 msgstr ""
1403
1403
1404 msgid ""
1404 msgid ""
1405 "use external program to diff repository (or selected files)\n"
1405 "use external program to diff repository (or selected files)\n"
1406 "\n"
1406 "\n"
1407 " Show differences between revisions for the specified files, using\n"
1407 " Show differences between revisions for the specified files, using\n"
1408 " an external program. The default program used is diff, with\n"
1408 " an external program. The default program used is diff, with\n"
1409 " default options \"-Npru\".\n"
1409 " default options \"-Npru\".\n"
1410 "\n"
1410 "\n"
1411 " 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"
1412 " 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"
1413 " pass additional options to the program, use -o/--option. These\n"
1413 " pass additional options to the program, use -o/--option. These\n"
1414 " 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"
1415 "\n"
1415 "\n"
1416 " When two revision arguments are given, then changes are shown\n"
1416 " When two revision arguments are given, then changes are shown\n"
1417 " between those revisions. If only one revision is specified then\n"
1417 " between those revisions. If only one revision is specified then\n"
1418 " 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"
1419 " revisions are specified, the working directory files are compared\n"
1419 " revisions are specified, the working directory files are compared\n"
1420 " to its parent."
1420 " to its parent."
1421 msgstr ""
1421 msgstr ""
1422
1422
1423 msgid "comparison program to run"
1423 msgid "comparison program to run"
1424 msgstr ""
1424 msgstr ""
1425
1425
1426 msgid "pass option to comparison program"
1426 msgid "pass option to comparison program"
1427 msgstr ""
1427 msgstr ""
1428
1428
1429 msgid "change made by revision"
1429 msgid "change made by revision"
1430 msgstr ""
1430 msgstr ""
1431
1431
1432 msgid "hg extdiff [OPT]... [FILE]..."
1432 msgid "hg extdiff [OPT]... [FILE]..."
1433 msgstr ""
1433 msgstr ""
1434
1434
1435 #, python-format
1435 #, python-format
1436 msgid "hg %s [OPTION]... [FILE]..."
1436 msgid "hg %s [OPTION]... [FILE]..."
1437 msgstr ""
1437 msgstr ""
1438
1438
1439 msgid "pull, update and merge in one command"
1439 msgid "pull, update and merge in one command"
1440 msgstr ""
1440 msgstr ""
1441
1441
1442 msgid ""
1442 msgid ""
1443 "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"
1444 "\n"
1444 "\n"
1445 " 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"
1446 " or URL and adds them to the local repository.\n"
1446 " or URL and adds them to the local repository.\n"
1447 "\n"
1447 "\n"
1448 " 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"
1449 " automatically merged, and the result of the merge is committed.\n"
1449 " automatically merged, and the result of the merge is committed.\n"
1450 " Otherwise, the working directory is updated to include the new\n"
1450 " Otherwise, the working directory is updated to include the new\n"
1451 " changes.\n"
1451 " changes.\n"
1452 "\n"
1452 "\n"
1453 " 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"
1454 " \"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"
1455 " 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"
1456 " order, use --switch-parent.\n"
1456 " order, use --switch-parent.\n"
1457 "\n"
1457 "\n"
1458 " 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"
1459 " "
1459 " "
1460 msgstr ""
1460 msgstr ""
1461
1461
1462 msgid ""
1462 msgid ""
1463 "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)"
1464 msgstr ""
1464 msgstr ""
1465
1465
1466 msgid "outstanding uncommitted merge"
1466 msgid "outstanding uncommitted merge"
1467 msgstr ""
1467 msgstr ""
1468
1468
1469 msgid "outstanding uncommitted changes"
1469 msgid "outstanding uncommitted changes"
1470 msgstr ""
1470 msgstr ""
1471
1471
1472 msgid "working directory is missing some files"
1472 msgid "working directory is missing some files"
1473 msgstr ""
1473 msgstr ""
1474
1474
1475 msgid ""
1475 msgid ""
1476 "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)"
1477 msgstr ""
1477 msgstr ""
1478
1478
1479 #, python-format
1479 #, python-format
1480 msgid "pulling from %s\n"
1480 msgid "pulling from %s\n"
1481 msgstr ""
1481 msgstr ""
1482
1482
1483 msgid ""
1483 msgid ""
1484 "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 "
1485 "specified."
1485 "specified."
1486 msgstr ""
1486 msgstr ""
1487
1487
1488 #, python-format
1488 #, python-format
1489 msgid ""
1489 msgid ""
1490 "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"
1491 "\" to merge them)\n"
1491 "\" to merge them)\n"
1492 msgstr ""
1492 msgstr ""
1493
1493
1494 #, python-format
1494 #, python-format
1495 msgid "updating to %d:%s\n"
1495 msgid "updating to %d:%s\n"
1496 msgstr ""
1496 msgstr ""
1497
1497
1498 #, python-format
1498 #, python-format
1499 msgid "merging with %d:%s\n"
1499 msgid "merging with %d:%s\n"
1500 msgstr ""
1500 msgstr ""
1501
1501
1502 #, python-format
1502 #, python-format
1503 msgid "Automated merge with %s"
1503 msgid "Automated merge with %s"
1504 msgstr ""
1504 msgstr ""
1505
1505
1506 #, python-format
1506 #, python-format
1507 msgid "new changeset %d:%s merges remote changes with local\n"
1507 msgid "new changeset %d:%s merges remote changes with local\n"
1508 msgstr ""
1508 msgstr ""
1509
1509
1510 msgid "a specific revision you would like to pull"
1510 msgid "a specific revision you would like to pull"
1511 msgstr ""
1511 msgstr ""
1512
1512
1513 msgid "edit commit message"
1513 msgid "edit commit message"
1514 msgstr ""
1514 msgstr ""
1515
1515
1516 msgid "edit commit message (DEPRECATED)"
1516 msgid "edit commit message (DEPRECATED)"
1517 msgstr ""
1517 msgstr ""
1518
1518
1519 msgid "switch parents when merging"
1519 msgid "switch parents when merging"
1520 msgstr ""
1520 msgstr ""
1521
1521
1522 msgid "hg fetch [SOURCE]"
1522 msgid "hg fetch [SOURCE]"
1523 msgstr ""
1523 msgstr ""
1524
1524
1525 msgid "sign and verify changesets"
1525 msgid "sign and verify changesets"
1526 msgstr ""
1526 msgstr ""
1527
1527
1528 msgid "error while verifying signature"
1528 msgid "error while verifying signature"
1529 msgstr ""
1529 msgstr ""
1530
1530
1531 #, python-format
1531 #, python-format
1532 msgid "%s Bad signature from \"%s\"\n"
1532 msgid "%s Bad signature from \"%s\"\n"
1533 msgstr ""
1533 msgstr ""
1534
1534
1535 #, python-format
1535 #, python-format
1536 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1536 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1537 msgstr ""
1537 msgstr ""
1538
1538
1539 #, python-format
1539 #, python-format
1540 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1540 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1541 msgstr ""
1541 msgstr ""
1542
1542
1543 msgid "list signed changesets"
1543 msgid "list signed changesets"
1544 msgstr ""
1544 msgstr ""
1545
1545
1546 #, python-format
1546 #, python-format
1547 msgid "%s:%d node does not exist\n"
1547 msgid "%s:%d node does not exist\n"
1548 msgstr ""
1548 msgstr ""
1549
1549
1550 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"
1551 msgstr ""
1551 msgstr ""
1552
1552
1553 #, python-format
1553 #, python-format
1554 msgid "No valid signature for %s\n"
1554 msgid "No valid signature for %s\n"
1555 msgstr ""
1555 msgstr ""
1556
1556
1557 msgid ""
1557 msgid ""
1558 "add a signature for the current or given revision\n"
1558 "add a signature for the current or given revision\n"
1559 "\n"
1559 "\n"
1560 " 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"
1561 " or tip if no revision is checked out.\n"
1561 " or tip if no revision is checked out.\n"
1562 "\n"
1562 "\n"
1563 " 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"
1564 " "
1564 " "
1565 msgstr ""
1565 msgstr ""
1566
1566
1567 msgid "uncommitted merge - please provide a specific revision"
1567 msgid "uncommitted merge - please provide a specific revision"
1568 msgstr ""
1568 msgstr ""
1569
1569
1570 msgid "Error while signing"
1570 msgid "Error while signing"
1571 msgstr ""
1571 msgstr ""
1572
1572
1573 msgid ""
1573 msgid ""
1574 "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 --"
1575 "force)"
1575 "force)"
1576 msgstr ""
1576 msgstr ""
1577
1577
1578 #, python-format
1578 #, python-format
1579 msgid "Added signature for changeset %s"
1579 msgid "Added signature for changeset %s"
1580 msgstr ""
1580 msgstr ""
1581
1581
1582 msgid "unknown signature version"
1582 msgid "unknown signature version"
1583 msgstr ""
1583 msgstr ""
1584
1584
1585 msgid "make the signature local"
1585 msgid "make the signature local"
1586 msgstr ""
1586 msgstr ""
1587
1587
1588 msgid "sign even if the sigfile is modified"
1588 msgid "sign even if the sigfile is modified"
1589 msgstr ""
1589 msgstr ""
1590
1590
1591 msgid "do not commit the sigfile after signing"
1591 msgid "do not commit the sigfile after signing"
1592 msgstr ""
1592 msgstr ""
1593
1593
1594 msgid "the key id to sign with"
1594 msgid "the key id to sign with"
1595 msgstr ""
1595 msgstr ""
1596
1596
1597 msgid "commit message"
1597 msgid "commit message"
1598 msgstr ""
1598 msgstr ""
1599
1599
1600 msgid "hg sign [OPTION]... [REVISION]..."
1600 msgid "hg sign [OPTION]... [REVISION]..."
1601 msgstr ""
1601 msgstr ""
1602
1602
1603 msgid "hg sigcheck REVISION"
1603 msgid "hg sigcheck REVISION"
1604 msgstr ""
1604 msgstr ""
1605
1605
1606 msgid "hg sigs"
1606 msgid "hg sigs"
1607 msgstr ""
1607 msgstr ""
1608
1608
1609 msgid ""
1609 msgid ""
1610 "show revision graphs in terminals\n"
1610 "show revision graphs in terminals\n"
1611 "\n"
1611 "\n"
1612 "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"
1613 "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"
1614 "revision graph is also shown.\n"
1614 "revision graph is also shown.\n"
1615 msgstr ""
1615 msgstr ""
1616
1616
1617 #, python-format
1617 #, python-format
1618 msgid "--graph option is incompatible with --%s"
1618 msgid "--graph option is incompatible with --%s"
1619 msgstr ""
1619 msgstr ""
1620
1620
1621 msgid ""
1621 msgid ""
1622 "show revision history alongside an ASCII revision graph\n"
1622 "show revision history alongside an ASCII revision graph\n"
1623 "\n"
1623 "\n"
1624 " Print a revision history alongside a revision graph drawn with\n"
1624 " Print a revision history alongside a revision graph drawn with\n"
1625 " ASCII characters.\n"
1625 " ASCII characters.\n"
1626 "\n"
1626 "\n"
1627 " Nodes printed as an @ character are parents of the working\n"
1627 " Nodes printed as an @ character are parents of the working\n"
1628 " directory.\n"
1628 " directory.\n"
1629 " "
1629 " "
1630 msgstr ""
1630 msgstr ""
1631
1631
1632 #, python-format
1632 #, python-format
1633 msgid "comparing with %s\n"
1633 msgid "comparing with %s\n"
1634 msgstr "comparaison avec %s\n"
1634 msgstr "comparaison avec %s\n"
1635
1635
1636 msgid "no changes found\n"
1636 msgid "no changes found\n"
1637 msgstr "aucun changement trouvé\n"
1637 msgstr "aucun changement trouvé\n"
1638
1638
1639 msgid "show the revision DAG"
1639 msgid "show the revision DAG"
1640 msgstr ""
1640 msgstr ""
1641
1641
1642 msgid "limit number of changes displayed"
1642 msgid "limit number of changes displayed"
1643 msgstr ""
1643 msgstr ""
1644
1644
1645 msgid "show patch"
1645 msgid "show patch"
1646 msgstr ""
1646 msgstr ""
1647
1647
1648 msgid "show the specified revision or range"
1648 msgid "show the specified revision or range"
1649 msgstr ""
1649 msgstr ""
1650
1650
1651 msgid "hg glog [OPTION]... [FILE]"
1651 msgid "hg glog [OPTION]... [FILE]"
1652 msgstr ""
1652 msgstr ""
1653
1653
1654 msgid ""
1654 msgid ""
1655 "integrate Mercurial with a CIA notification service\n"
1655 "integrate Mercurial with a CIA notification service\n"
1656 "\n"
1656 "\n"
1657 "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"
1658 "To configure it, set the following options in your hgrc:\n"
1658 "To configure it, set the following options in your hgrc:\n"
1659 "\n"
1659 "\n"
1660 "[cia]\n"
1660 "[cia]\n"
1661 "# your registered CIA user name\n"
1661 "# your registered CIA user name\n"
1662 "user = foo\n"
1662 "user = foo\n"
1663 "# the name of the project in CIA\n"
1663 "# the name of the project in CIA\n"
1664 "project = foo\n"
1664 "project = foo\n"
1665 "# the module (subproject) (optional)\n"
1665 "# the module (subproject) (optional)\n"
1666 "#module = foo\n"
1666 "#module = foo\n"
1667 "# Append a diffstat to the log message (optional)\n"
1667 "# Append a diffstat to the log message (optional)\n"
1668 "#diffstat = False\n"
1668 "#diffstat = False\n"
1669 "# Template to use for log messages (optional)\n"
1669 "# Template to use for log messages (optional)\n"
1670 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1670 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1671 "# Style to use (optional)\n"
1671 "# Style to use (optional)\n"
1672 "#style = foo\n"
1672 "#style = foo\n"
1673 "# The URL of the CIA notification service (optional)\n"
1673 "# The URL of the CIA notification service (optional)\n"
1674 "# You can use mailto: URLs to send by email, eg\n"
1674 "# You can use mailto: URLs to send by email, eg\n"
1675 "# mailto:cia@cia.vc\n"
1675 "# mailto:cia@cia.vc\n"
1676 "# Make sure to set email.from if you do this.\n"
1676 "# Make sure to set email.from if you do this.\n"
1677 "#url = http://cia.vc/\n"
1677 "#url = http://cia.vc/\n"
1678 "# print message instead of sending it (optional)\n"
1678 "# print message instead of sending it (optional)\n"
1679 "#test = False\n"
1679 "#test = False\n"
1680 "\n"
1680 "\n"
1681 "[hooks]\n"
1681 "[hooks]\n"
1682 "# one of these:\n"
1682 "# one of these:\n"
1683 "changegroup.cia = python:hgcia.hook\n"
1683 "changegroup.cia = python:hgcia.hook\n"
1684 "#incoming.cia = python:hgcia.hook\n"
1684 "#incoming.cia = python:hgcia.hook\n"
1685 "\n"
1685 "\n"
1686 "[web]\n"
1686 "[web]\n"
1687 "# If you want hyperlinks (optional)\n"
1687 "# If you want hyperlinks (optional)\n"
1688 "baseurl = http://server/path/to/repo\n"
1688 "baseurl = http://server/path/to/repo\n"
1689 msgstr ""
1689 msgstr ""
1690
1690
1691 #, python-format
1691 #, python-format
1692 msgid "hgcia: sending update to %s\n"
1692 msgid "hgcia: sending update to %s\n"
1693 msgstr ""
1693 msgstr ""
1694
1694
1695 msgid "email.from must be defined when sending by email"
1695 msgid "email.from must be defined when sending by email"
1696 msgstr ""
1696 msgstr ""
1697
1697
1698 msgid "cia: no user specified"
1698 msgid "cia: no user specified"
1699 msgstr ""
1699 msgstr ""
1700
1700
1701 msgid "cia: no project specified"
1701 msgid "cia: no project specified"
1702 msgstr ""
1702 msgstr ""
1703
1703
1704 msgid ""
1704 msgid ""
1705 "browse the repository in a graphical way\n"
1705 "browse the repository in a graphical way\n"
1706 "\n"
1706 "\n"
1707 "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"
1708 "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"
1709 "distributed with Mercurial.)\n"
1709 "distributed with Mercurial.)\n"
1710 "\n"
1710 "\n"
1711 "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"
1712 "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"
1713 "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"
1714 "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"
1715 "repository, and needs to be enabled.\n"
1715 "repository, and needs to be enabled.\n"
1716 "\n"
1716 "\n"
1717 "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"
1718 "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"
1719 "the path to hgk in your .hgrc file:\n"
1719 "the path to hgk in your .hgrc file:\n"
1720 "\n"
1720 "\n"
1721 " [hgk]\n"
1721 " [hgk]\n"
1722 " path=/location/of/hgk\n"
1722 " path=/location/of/hgk\n"
1723 "\n"
1723 "\n"
1724 "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"
1725 "Assuming you had already configured extdiff vdiff command, just add:\n"
1725 "Assuming you had already configured extdiff vdiff command, just add:\n"
1726 "\n"
1726 "\n"
1727 " [hgk]\n"
1727 " [hgk]\n"
1728 " vdiff=vdiff\n"
1728 " vdiff=vdiff\n"
1729 "\n"
1729 "\n"
1730 "Revisions context menu will now display additional entries to fire\n"
1730 "Revisions context menu will now display additional entries to fire\n"
1731 "vdiff on hovered and selected revisions."
1731 "vdiff on hovered and selected revisions."
1732 msgstr ""
1732 msgstr ""
1733
1733
1734 msgid "diff trees from two commits"
1734 msgid "diff trees from two commits"
1735 msgstr ""
1735 msgstr ""
1736
1736
1737 msgid "output common ancestor information"
1737 msgid "output common ancestor information"
1738 msgstr ""
1738 msgstr ""
1739
1739
1740 msgid "cat a specific revision"
1740 msgid "cat a specific revision"
1741 msgstr ""
1741 msgstr ""
1742
1742
1743 msgid "cat-file: type or revision not supplied\n"
1743 msgid "cat-file: type or revision not supplied\n"
1744 msgstr ""
1744 msgstr ""
1745
1745
1746 msgid "aborting hg cat-file only understands commits\n"
1746 msgid "aborting hg cat-file only understands commits\n"
1747 msgstr ""
1747 msgstr ""
1748
1748
1749 msgid "parse given revisions"
1749 msgid "parse given revisions"
1750 msgstr ""
1750 msgstr ""
1751
1751
1752 msgid "print revisions"
1752 msgid "print revisions"
1753 msgstr ""
1753 msgstr ""
1754
1754
1755 msgid "print extension options"
1755 msgid "print extension options"
1756 msgstr ""
1756 msgstr ""
1757
1757
1758 msgid "start interactive history viewer"
1758 msgid "start interactive history viewer"
1759 msgstr ""
1759 msgstr ""
1760
1760
1761 msgid "hg view [-l LIMIT] [REVRANGE]"
1761 msgid "hg view [-l LIMIT] [REVRANGE]"
1762 msgstr ""
1762 msgstr ""
1763
1763
1764 msgid "generate patch"
1764 msgid "generate patch"
1765 msgstr ""
1765 msgstr ""
1766
1766
1767 msgid "recursive"
1767 msgid "recursive"
1768 msgstr ""
1768 msgstr ""
1769
1769
1770 msgid "pretty"
1770 msgid "pretty"
1771 msgstr ""
1771 msgstr ""
1772
1772
1773 msgid "stdin"
1773 msgid "stdin"
1774 msgstr ""
1774 msgstr ""
1775
1775
1776 msgid "detect copies"
1776 msgid "detect copies"
1777 msgstr ""
1777 msgstr ""
1778
1778
1779 msgid "search"
1779 msgid "search"
1780 msgstr ""
1780 msgstr ""
1781
1781
1782 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1782 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1783 msgstr ""
1783 msgstr ""
1784
1784
1785 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1785 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1786 msgstr ""
1786 msgstr ""
1787
1787
1788 msgid "hg debug-config"
1788 msgid "hg debug-config"
1789 msgstr ""
1789 msgstr ""
1790
1790
1791 msgid "hg debug-merge-base node node"
1791 msgid "hg debug-merge-base node node"
1792 msgstr ""
1792 msgstr ""
1793
1793
1794 msgid "ignored"
1794 msgid "ignored"
1795 msgstr ""
1795 msgstr ""
1796
1796
1797 msgid "hg debug-rev-parse REV"
1797 msgid "hg debug-rev-parse REV"
1798 msgstr ""
1798 msgstr ""
1799
1799
1800 msgid "header"
1800 msgid "header"
1801 msgstr ""
1801 msgstr ""
1802
1802
1803 msgid "topo-order"
1803 msgid "topo-order"
1804 msgstr ""
1804 msgstr ""
1805
1805
1806 msgid "parents"
1806 msgid "parents"
1807 msgstr ""
1807 msgstr ""
1808
1808
1809 msgid "max-count"
1809 msgid "max-count"
1810 msgstr ""
1810 msgstr ""
1811
1811
1812 msgid "hg debug-rev-list [options] revs"
1812 msgid "hg debug-rev-list [options] revs"
1813 msgstr ""
1813 msgstr ""
1814
1814
1815 msgid ""
1815 msgid ""
1816 "syntax highlighting for hgweb\n"
1816 "syntax highlighting for hgweb\n"
1817 "\n"
1817 "\n"
1818 "It depends on the Pygments syntax highlighting library:\n"
1818 "It depends on the Pygments syntax highlighting library:\n"
1819 "http://pygments.org/\n"
1819 "http://pygments.org/\n"
1820 "\n"
1820 "\n"
1821 "There is a single configuration option:\n"
1821 "There is a single configuration option:\n"
1822 "\n"
1822 "\n"
1823 "[web]\n"
1823 "[web]\n"
1824 "pygments_style = <style>\n"
1824 "pygments_style = <style>\n"
1825 "\n"
1825 "\n"
1826 "The default is 'colorful'.\n"
1826 "The default is 'colorful'.\n"
1827 "\n"
1827 "\n"
1828 "-- Adam Hupp <adam@hupp.org>\n"
1828 "-- Adam Hupp <adam@hupp.org>\n"
1829 msgstr ""
1829 msgstr ""
1830
1830
1831 msgid "accelerate status report using system level services"
1831 msgid "accelerate status report using system level services"
1832 msgstr ""
1832 msgstr ""
1833
1833
1834 msgid "start an inotify server for this repository"
1834 msgid "start an inotify server for this repository"
1835 msgstr ""
1835 msgstr ""
1836
1836
1837 msgid ""
1837 msgid ""
1838 "debugging information for inotify extension\n"
1838 "debugging information for inotify extension\n"
1839 "\n"
1839 "\n"
1840 " 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"
1841 " "
1841 " "
1842 msgstr ""
1842 msgstr ""
1843
1843
1844 msgid "directories being watched:\n"
1844 msgid "directories being watched:\n"
1845 msgstr ""
1845 msgstr ""
1846
1846
1847 msgid "run server in background"
1847 msgid "run server in background"
1848 msgstr ""
1848 msgstr ""
1849
1849
1850 msgid "used internally by daemon mode"
1850 msgid "used internally by daemon mode"
1851 msgstr ""
1851 msgstr ""
1852
1852
1853 msgid "minutes to sit idle before exiting"
1853 msgid "minutes to sit idle before exiting"
1854 msgstr ""
1854 msgstr ""
1855
1855
1856 msgid "name of file to write process ID to"
1856 msgid "name of file to write process ID to"
1857 msgstr ""
1857 msgstr ""
1858
1858
1859 msgid "hg inserve [OPT]..."
1859 msgid "hg inserve [OPT]..."
1860 msgstr ""
1860 msgstr ""
1861
1861
1862 msgid "(found dead inotify server socket; removing it)\n"
1862 msgid "(found dead inotify server socket; removing it)\n"
1863 msgstr ""
1863 msgstr ""
1864
1864
1865 msgid "(starting inotify server)\n"
1865 msgid "(starting inotify server)\n"
1866 msgstr ""
1866 msgstr ""
1867
1867
1868 #, python-format
1868 #, python-format
1869 msgid "could not start inotify server: %s\n"
1869 msgid "could not start inotify server: %s\n"
1870 msgstr ""
1870 msgstr ""
1871
1871
1872 #, python-format
1872 #, python-format
1873 msgid "could not talk to new inotify server: %s\n"
1873 msgid "could not talk to new inotify server: %s\n"
1874 msgstr ""
1874 msgstr ""
1875
1875
1876 msgid "(inotify server not running)\n"
1876 msgid "(inotify server not running)\n"
1877 msgstr ""
1877 msgstr ""
1878
1878
1879 #, python-format
1879 #, python-format
1880 msgid "failed to contact inotify server: %s\n"
1880 msgid "failed to contact inotify server: %s\n"
1881 msgstr ""
1881 msgstr ""
1882
1882
1883 msgid "received empty answer from inotify server"
1883 msgid "received empty answer from inotify server"
1884 msgstr ""
1884 msgstr ""
1885
1885
1886 #, python-format
1886 #, python-format
1887 msgid "(inotify: received response from incompatible server version %d)\n"
1887 msgid "(inotify: received response from incompatible server version %d)\n"
1888 msgstr ""
1888 msgstr ""
1889
1889
1890 #, python-format
1890 #, python-format
1891 msgid "(inotify: received '%s' response when expecting '%s')\n"
1891 msgid "(inotify: received '%s' response when expecting '%s')\n"
1892 msgstr ""
1892 msgstr ""
1893
1893
1894 msgid "this system does not seem to support inotify"
1894 msgid "this system does not seem to support inotify"
1895 msgstr ""
1895 msgstr ""
1896
1896
1897 #, python-format
1897 #, python-format
1898 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"
1899 msgstr ""
1899 msgstr ""
1900
1900
1901 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"
1902 msgstr ""
1902 msgstr ""
1903
1903
1904 msgid "*** counting directories: "
1904 msgid "*** counting directories: "
1905 msgstr ""
1905 msgstr ""
1906
1906
1907 #, python-format
1907 #, python-format
1908 msgid "found %d\n"
1908 msgid "found %d\n"
1909 msgstr ""
1909 msgstr ""
1910
1910
1911 #, python-format
1911 #, python-format
1912 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"
1913 msgstr ""
1913 msgstr ""
1914
1914
1915 #, python-format
1915 #, python-format
1916 msgid "*** echo %d > %s\n"
1916 msgid "*** echo %d > %s\n"
1917 msgstr ""
1917 msgstr ""
1918
1918
1919 #, python-format
1919 #, python-format
1920 msgid "cannot watch %s until inotify watch limit is raised"
1920 msgid "cannot watch %s until inotify watch limit is raised"
1921 msgstr ""
1921 msgstr ""
1922
1922
1923 #, python-format
1923 #, python-format
1924 msgid "inotify service not available: %s"
1924 msgid "inotify service not available: %s"
1925 msgstr ""
1925 msgstr ""
1926
1926
1927 #, python-format
1927 #, python-format
1928 msgid "watching %r\n"
1928 msgid "watching %r\n"
1929 msgstr ""
1929 msgstr ""
1930
1930
1931 #, python-format
1931 #, python-format
1932 msgid "watching directories under %r\n"
1932 msgid "watching directories under %r\n"
1933 msgstr ""
1933 msgstr ""
1934
1934
1935 #, python-format
1935 #, python-format
1936 msgid "status: %r dir(%d) -> %s\n"
1936 msgid "status: %r dir(%d) -> %s\n"
1937 msgstr ""
1937 msgstr ""
1938
1938
1939 #, python-format
1939 #, python-format
1940 msgid "status: %r %s -> %s\n"
1940 msgid "status: %r %s -> %s\n"
1941 msgstr ""
1941 msgstr ""
1942
1942
1943 #, python-format
1943 #, python-format
1944 msgid "%s dirstate reload\n"
1944 msgid "%s dirstate reload\n"
1945 msgstr ""
1945 msgstr ""
1946
1946
1947 #, python-format
1947 #, python-format
1948 msgid "%s end dirstate reload\n"
1948 msgid "%s end dirstate reload\n"
1949 msgstr ""
1949 msgstr ""
1950
1950
1951 msgid "rescanning due to .hgignore change\n"
1951 msgid "rescanning due to .hgignore change\n"
1952 msgstr ""
1952 msgstr ""
1953
1953
1954 #, python-format
1954 #, python-format
1955 msgid "%s event: created %s\n"
1955 msgid "%s event: created %s\n"
1956 msgstr ""
1956 msgstr ""
1957
1957
1958 #, python-format
1958 #, python-format
1959 msgid "%s event: deleted %s\n"
1959 msgid "%s event: deleted %s\n"
1960 msgstr ""
1960 msgstr ""
1961
1961
1962 #, python-format
1962 #, python-format
1963 msgid "%s event: modified %s\n"
1963 msgid "%s event: modified %s\n"
1964 msgstr ""
1964 msgstr ""
1965
1965
1966 #, python-format
1966 #, python-format
1967 msgid "filesystem containing %s was unmounted\n"
1967 msgid "filesystem containing %s was unmounted\n"
1968 msgstr ""
1968 msgstr ""
1969
1969
1970 #, python-format
1970 #, python-format
1971 msgid "%s readable: %d bytes\n"
1971 msgid "%s readable: %d bytes\n"
1972 msgstr ""
1972 msgstr ""
1973
1973
1974 #, python-format
1974 #, python-format
1975 msgid "%s below threshold - unhooking\n"
1975 msgid "%s below threshold - unhooking\n"
1976 msgstr ""
1976 msgstr ""
1977
1977
1978 #, python-format
1978 #, python-format
1979 msgid "%s reading %d events\n"
1979 msgid "%s reading %d events\n"
1980 msgstr ""
1980 msgstr ""
1981
1981
1982 #, python-format
1982 #, python-format
1983 msgid "%s hooking back up with %d bytes readable\n"
1983 msgid "%s hooking back up with %d bytes readable\n"
1984 msgstr ""
1984 msgstr ""
1985
1985
1986 #, python-format
1986 #, python-format
1987 msgid "could not start server: %s"
1987 msgid "could not start server: %s"
1988 msgstr ""
1988 msgstr ""
1989
1989
1990 #, python-format
1990 #, python-format
1991 msgid "answering query for %r\n"
1991 msgid "answering query for %r\n"
1992 msgstr ""
1992 msgstr ""
1993
1993
1994 #, python-format
1994 #, python-format
1995 msgid "received query from incompatible client version %d\n"
1995 msgid "received query from incompatible client version %d\n"
1996 msgstr ""
1996 msgstr ""
1997
1997
1998 #, python-format
1998 #, python-format
1999 msgid "unrecognized query type: %s\n"
1999 msgid "unrecognized query type: %s\n"
2000 msgstr ""
2000 msgstr ""
2001
2001
2002 msgid "finished setup\n"
2002 msgid "finished setup\n"
2003 msgstr ""
2003 msgstr ""
2004
2004
2005 msgid ""
2005 msgid ""
2006 "expand expressions into changelog and summaries\n"
2006 "expand expressions into changelog and summaries\n"
2007 "\n"
2007 "\n"
2008 "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"
2009 "which will be automatically expanded into links or any other\n"
2009 "which will be automatically expanded into links or any other\n"
2010 "arbitrary expression, much like InterWiki does.\n"
2010 "arbitrary expression, much like InterWiki does.\n"
2011 "\n"
2011 "\n"
2012 "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"
2013 "be used in your hgrc:\n"
2013 "be used in your hgrc:\n"
2014 "\n"
2014 "\n"
2015 " [interhg]\n"
2015 " [interhg]\n"
2016 " 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"
2017 " 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>!"
2018 "i\n"
2018 "i\n"
2019 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2019 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2020 msgstr ""
2020 msgstr ""
2021
2021
2022 #, python-format
2022 #, python-format
2023 msgid "interhg: invalid pattern for %s: %s\n"
2023 msgid "interhg: invalid pattern for %s: %s\n"
2024 msgstr ""
2024 msgstr ""
2025
2025
2026 #, python-format
2026 #, python-format
2027 msgid "interhg: invalid regexp for %s: %s\n"
2027 msgid "interhg: invalid regexp for %s: %s\n"
2028 msgstr ""
2028 msgstr ""
2029
2029
2030 msgid ""
2030 msgid ""
2031 "expand keywords in tracked files\n"
2031 "expand keywords in tracked files\n"
2032 "\n"
2032 "\n"
2033 "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"
2034 "tracked text files selected by your configuration.\n"
2034 "tracked text files selected by your configuration.\n"
2035 "\n"
2035 "\n"
2036 "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"
2037 "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"
2038 "current user or for archive distribution.\n"
2038 "current user or for archive distribution.\n"
2039 "\n"
2039 "\n"
2040 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2040 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2041 "hgrc files.\n"
2041 "hgrc files.\n"
2042 "\n"
2042 "\n"
2043 "Example:\n"
2043 "Example:\n"
2044 "\n"
2044 "\n"
2045 " [keyword]\n"
2045 " [keyword]\n"
2046 " # expand keywords in every python file except those matching \"x*\"\n"
2046 " # expand keywords in every python file except those matching \"x*\"\n"
2047 " **.py =\n"
2047 " **.py =\n"
2048 " x* = ignore\n"
2048 " x* = ignore\n"
2049 "\n"
2049 "\n"
2050 "Note: the more specific you are in your filename patterns\n"
2050 "Note: the more specific you are in your filename patterns\n"
2051 " the less you lose speed in huge repositories.\n"
2051 " the less you lose speed in huge repositories.\n"
2052 "\n"
2052 "\n"
2053 "For [keywordmaps] template mapping and expansion demonstration and\n"
2053 "For [keywordmaps] template mapping and expansion demonstration and\n"
2054 "control run \"hg kwdemo\".\n"
2054 "control run \"hg kwdemo\".\n"
2055 "\n"
2055 "\n"
2056 "An additional date template filter {date|utcdate} is provided.\n"
2056 "An additional date template filter {date|utcdate} is provided.\n"
2057 "\n"
2057 "\n"
2058 "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"
2059 "replaced with customized keywords and templates. Again, run \"hg\n"
2059 "replaced with customized keywords and templates. Again, run \"hg\n"
2060 "kwdemo\" to control the results of your config changes.\n"
2060 "kwdemo\" to control the results of your config changes.\n"
2061 "\n"
2061 "\n"
2062 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2062 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2063 "the risk of inadvertently storing expanded keywords in the change\n"
2063 "the risk of inadvertently storing expanded keywords in the change\n"
2064 "history.\n"
2064 "history.\n"
2065 "\n"
2065 "\n"
2066 "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"
2067 "\"hg kwexpand\".\n"
2067 "\"hg kwexpand\".\n"
2068 "\n"
2068 "\n"
2069 "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"
2070 "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"
2071 "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"
2072 "have been checked in.\n"
2072 "have been checked in.\n"
2073 "\n"
2073 "\n"
2074 "Expansions spanning more than one line and incremental expansions,\n"
2074 "Expansions spanning more than one line and incremental expansions,\n"
2075 "like CVS' $Log$, are not supported. A keyword template map\n"
2075 "like CVS' $Log$, are not supported. A keyword template map\n"
2076 "\"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"
2077 msgstr ""
2077 msgstr ""
2078
2078
2079 #, python-format
2079 #, python-format
2080 msgid "overwriting %s expanding keywords\n"
2080 msgid "overwriting %s expanding keywords\n"
2081 msgstr ""
2081 msgstr ""
2082
2082
2083 #, python-format
2083 #, python-format
2084 msgid "overwriting %s shrinking keywords\n"
2084 msgid "overwriting %s shrinking keywords\n"
2085 msgstr ""
2085 msgstr ""
2086
2086
2087 msgid "[keyword] patterns cannot match"
2087 msgid "[keyword] patterns cannot match"
2088 msgstr ""
2088 msgstr ""
2089
2089
2090 msgid "no [keyword] patterns configured"
2090 msgid "no [keyword] patterns configured"
2091 msgstr ""
2091 msgstr ""
2092
2092
2093 msgid ""
2093 msgid ""
2094 "print [keywordmaps] configuration and an expansion example\n"
2094 "print [keywordmaps] configuration and an expansion example\n"
2095 "\n"
2095 "\n"
2096 " Show current, custom, or default keyword template maps and their\n"
2096 " Show current, custom, or default keyword template maps and their\n"
2097 " expansions.\n"
2097 " expansions.\n"
2098 "\n"
2098 "\n"
2099 " Extend current configuration by specifying maps as arguments and\n"
2099 " Extend current configuration by specifying maps as arguments and\n"
2100 " optionally by reading from an additional hgrc file.\n"
2100 " optionally by reading from an additional hgrc file.\n"
2101 "\n"
2101 "\n"
2102 " Override current keyword template maps with \"default\" option.\n"
2102 " Override current keyword template maps with \"default\" option.\n"
2103 " "
2103 " "
2104 msgstr ""
2104 msgstr ""
2105
2105
2106 #, python-format
2106 #, python-format
2107 msgid ""
2107 msgid ""
2108 "\n"
2108 "\n"
2109 "\t%s\n"
2109 "\t%s\n"
2110 msgstr ""
2110 msgstr ""
2111
2111
2112 #, python-format
2112 #, python-format
2113 msgid "creating temporary repository at %s\n"
2113 msgid "creating temporary repository at %s\n"
2114 msgstr ""
2114 msgstr ""
2115
2115
2116 #, python-format
2116 #, python-format
2117 msgid ""
2117 msgid ""
2118 "\n"
2118 "\n"
2119 "%s keywords written to %s:\n"
2119 "%s keywords written to %s:\n"
2120 msgstr ""
2120 msgstr ""
2121
2121
2122 msgid "unhooked all commit hooks\n"
2122 msgid "unhooked all commit hooks\n"
2123 msgstr ""
2123 msgstr ""
2124
2124
2125 #, python-format
2125 #, python-format
2126 msgid ""
2126 msgid ""
2127 "\n"
2127 "\n"
2128 "removing temporary repository %s\n"
2128 "removing temporary repository %s\n"
2129 msgstr ""
2129 msgstr ""
2130
2130
2131 msgid ""
2131 msgid ""
2132 "expand keywords in the working directory\n"
2132 "expand keywords in the working directory\n"
2133 "\n"
2133 "\n"
2134 " Run after (re)enabling keyword expansion.\n"
2134 " Run after (re)enabling keyword expansion.\n"
2135 "\n"
2135 "\n"
2136 " kwexpand refuses to run if given files contain local changes.\n"
2136 " kwexpand refuses to run if given files contain local changes.\n"
2137 " "
2137 " "
2138 msgstr ""
2138 msgstr ""
2139
2139
2140 msgid ""
2140 msgid ""
2141 "print files currently configured for keyword expansion\n"
2141 "print files currently configured for keyword expansion\n"
2142 "\n"
2142 "\n"
2143 " Crosscheck which files in working directory are potential targets\n"
2143 " Crosscheck which files in working directory are potential targets\n"
2144 " for keyword expansion. That is, files matched by [keyword] config\n"
2144 " for keyword expansion. That is, files matched by [keyword] config\n"
2145 " patterns but not symlinks.\n"
2145 " patterns but not symlinks.\n"
2146 " "
2146 " "
2147 msgstr ""
2147 msgstr ""
2148
2148
2149 msgid ""
2149 msgid ""
2150 "revert expanded keywords in the working directory\n"
2150 "revert expanded keywords in the working directory\n"
2151 "\n"
2151 "\n"
2152 " Run before changing/disabling active keywords or if you experience\n"
2152 " Run before changing/disabling active keywords or if you experience\n"
2153 " problems with \"hg import\" or \"hg merge\".\n"
2153 " problems with \"hg import\" or \"hg merge\".\n"
2154 "\n"
2154 "\n"
2155 " kwshrink refuses to run if given files contain local changes.\n"
2155 " kwshrink refuses to run if given files contain local changes.\n"
2156 " "
2156 " "
2157 msgstr ""
2157 msgstr ""
2158
2158
2159 msgid "show default keyword template maps"
2159 msgid "show default keyword template maps"
2160 msgstr ""
2160 msgstr ""
2161
2161
2162 msgid "read maps from rcfile"
2162 msgid "read maps from rcfile"
2163 msgstr ""
2163 msgstr ""
2164
2164
2165 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2165 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2166 msgstr ""
2166 msgstr ""
2167
2167
2168 msgid "hg kwexpand [OPTION]... [FILE]..."
2168 msgid "hg kwexpand [OPTION]... [FILE]..."
2169 msgstr ""
2169 msgstr ""
2170
2170
2171 msgid "show keyword status flags of all files"
2171 msgid "show keyword status flags of all files"
2172 msgstr ""
2172 msgstr ""
2173
2173
2174 msgid "show files excluded from expansion"
2174 msgid "show files excluded from expansion"
2175 msgstr ""
2175 msgstr ""
2176
2176
2177 msgid "additionally show untracked files"
2177 msgid "additionally show untracked files"
2178 msgstr ""
2178 msgstr ""
2179
2179
2180 msgid "hg kwfiles [OPTION]... [FILE]..."
2180 msgid "hg kwfiles [OPTION]... [FILE]..."
2181 msgstr ""
2181 msgstr ""
2182
2182
2183 msgid "hg kwshrink [OPTION]... [FILE]..."
2183 msgid "hg kwshrink [OPTION]... [FILE]..."
2184 msgstr ""
2184 msgstr ""
2185
2185
2186 msgid ""
2186 msgid ""
2187 "work with a stack of patches\n"
2187 "work with a stack of patches\n"
2188 "\n"
2188 "\n"
2189 "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"
2190 "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"
2191 "applied patches (subset of known patches).\n"
2191 "applied patches (subset of known patches).\n"
2192 "\n"
2192 "\n"
2193 "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"
2194 "directory. Applied patches are both patch files and changesets.\n"
2194 "directory. Applied patches are both patch files and changesets.\n"
2195 "\n"
2195 "\n"
2196 "Common tasks (use \"hg help command\" for more details):\n"
2196 "Common tasks (use \"hg help command\" for more details):\n"
2197 "\n"
2197 "\n"
2198 "prepare repository to work with patches qinit\n"
2198 "prepare repository to work with patches qinit\n"
2199 "create new patch qnew\n"
2199 "create new patch qnew\n"
2200 "import existing patch qimport\n"
2200 "import existing patch qimport\n"
2201 "\n"
2201 "\n"
2202 "print patch series qseries\n"
2202 "print patch series qseries\n"
2203 "print applied patches qapplied\n"
2203 "print applied patches qapplied\n"
2204 "print name of top applied patch qtop\n"
2204 "print name of top applied patch qtop\n"
2205 "\n"
2205 "\n"
2206 "add known patch to applied stack qpush\n"
2206 "add known patch to applied stack qpush\n"
2207 "remove patch from applied stack qpop\n"
2207 "remove patch from applied stack qpop\n"
2208 "refresh contents of top applied patch qrefresh\n"
2208 "refresh contents of top applied patch qrefresh\n"
2209 msgstr ""
2209 msgstr ""
2210
2210
2211 #, python-format
2211 #, python-format
2212 msgid "%s appears more than once in %s"
2212 msgid "%s appears more than once in %s"
2213 msgstr ""
2213 msgstr ""
2214
2214
2215 msgid "guard cannot be an empty string"
2215 msgid "guard cannot be an empty string"
2216 msgstr ""
2216 msgstr ""
2217
2217
2218 #, python-format
2218 #, python-format
2219 msgid "guard %r starts with invalid character: %r"
2219 msgid "guard %r starts with invalid character: %r"
2220 msgstr ""
2220 msgstr ""
2221
2221
2222 #, python-format
2222 #, python-format
2223 msgid "invalid character in guard %r: %r"
2223 msgid "invalid character in guard %r: %r"
2224 msgstr ""
2224 msgstr ""
2225
2225
2226 #, python-format
2226 #, python-format
2227 msgid "active guards: %s\n"
2227 msgid "active guards: %s\n"
2228 msgstr ""
2228 msgstr ""
2229
2229
2230 #, python-format
2230 #, python-format
2231 msgid "guard %r too short"
2231 msgid "guard %r too short"
2232 msgstr ""
2232 msgstr ""
2233
2233
2234 #, python-format
2234 #, python-format
2235 msgid "guard %r starts with invalid char"
2235 msgid "guard %r starts with invalid char"
2236 msgstr ""
2236 msgstr ""
2237
2237
2238 #, python-format
2238 #, python-format
2239 msgid "allowing %s - no guards in effect\n"
2239 msgid "allowing %s - no guards in effect\n"
2240 msgstr ""
2240 msgstr ""
2241
2241
2242 #, python-format
2242 #, python-format
2243 msgid "allowing %s - no matching negative guards\n"
2243 msgid "allowing %s - no matching negative guards\n"
2244 msgstr ""
2244 msgstr ""
2245
2245
2246 #, python-format
2246 #, python-format
2247 msgid "allowing %s - guarded by %r\n"
2247 msgid "allowing %s - guarded by %r\n"
2248 msgstr ""
2248 msgstr ""
2249
2249
2250 #, python-format
2250 #, python-format
2251 msgid "skipping %s - guarded by %r\n"
2251 msgid "skipping %s - guarded by %r\n"
2252 msgstr ""
2252 msgstr ""
2253
2253
2254 #, python-format
2254 #, python-format
2255 msgid "skipping %s - no matching guards\n"
2255 msgid "skipping %s - no matching guards\n"
2256 msgstr ""
2256 msgstr ""
2257
2257
2258 #, python-format
2258 #, python-format
2259 msgid "error removing undo: %s\n"
2259 msgid "error removing undo: %s\n"
2260 msgstr ""
2260 msgstr ""
2261
2261
2262 #, python-format
2262 #, python-format
2263 msgid "apply failed for patch %s"
2263 msgid "apply failed for patch %s"
2264 msgstr ""
2264 msgstr ""
2265
2265
2266 #, python-format
2266 #, python-format
2267 msgid "patch didn't work out, merging %s\n"
2267 msgid "patch didn't work out, merging %s\n"
2268 msgstr ""
2268 msgstr ""
2269
2269
2270 #, python-format
2270 #, python-format
2271 msgid "update returned %d"
2271 msgid "update returned %d"
2272 msgstr ""
2272 msgstr ""
2273
2273
2274 msgid "repo commit failed"
2274 msgid "repo commit failed"
2275 msgstr ""
2275 msgstr ""
2276
2276
2277 #, python-format
2277 #, python-format
2278 msgid "unable to read %s"
2278 msgid "unable to read %s"
2279 msgstr ""
2279 msgstr ""
2280
2280
2281 #, python-format
2281 #, python-format
2282 msgid "patch %s does not exist\n"
2282 msgid "patch %s does not exist\n"
2283 msgstr ""
2283 msgstr ""
2284
2284
2285 #, python-format
2285 #, python-format
2286 msgid "patch %s is not applied\n"
2286 msgid "patch %s is not applied\n"
2287 msgstr ""
2287 msgstr ""
2288
2288
2289 msgid "patch failed, unable to continue (try -v)\n"
2289 msgid "patch failed, unable to continue (try -v)\n"
2290 msgstr ""
2290 msgstr ""
2291
2291
2292 #, python-format
2292 #, python-format
2293 msgid "applying %s\n"
2293 msgid "applying %s\n"
2294 msgstr ""
2294 msgstr ""
2295
2295
2296 #, python-format
2296 #, python-format
2297 msgid "unable to read %s\n"
2297 msgid "unable to read %s\n"
2298 msgstr ""
2298 msgstr ""
2299
2299
2300 #, python-format
2300 #, python-format
2301 msgid "imported patch %s\n"
2301 msgid "imported patch %s\n"
2302 msgstr ""
2302 msgstr ""
2303
2303
2304 #, python-format
2304 #, python-format
2305 msgid ""
2305 msgid ""
2306 "\n"
2306 "\n"
2307 "imported patch %s"
2307 "imported patch %s"
2308 msgstr ""
2308 msgstr ""
2309
2309
2310 #, python-format
2310 #, python-format
2311 msgid "patch %s is empty\n"
2311 msgid "patch %s is empty\n"
2312 msgstr ""
2312 msgstr ""
2313
2313
2314 msgid "patch failed, rejects left in working dir\n"
2314 msgid "patch failed, rejects left in working dir\n"
2315 msgstr ""
2315 msgstr ""
2316
2316
2317 msgid "fuzz found when applying patch, stopping\n"
2317 msgid "fuzz found when applying patch, stopping\n"
2318 msgstr ""
2318 msgstr ""
2319
2319
2320 #, python-format
2320 #, python-format
2321 msgid "revision %d is not managed"
2321 msgid "revision %d is not managed"
2322 msgstr ""
2322 msgstr ""
2323
2323
2324 #, python-format
2324 #, python-format
2325 msgid "cannot delete revision %d above applied patches"
2325 msgid "cannot delete revision %d above applied patches"
2326 msgstr ""
2326 msgstr ""
2327
2327
2328 #, python-format
2328 #, python-format
2329 msgid "patch %s finalized without changeset message\n"
2329 msgid "patch %s finalized without changeset message\n"
2330 msgstr ""
2330 msgstr ""
2331
2331
2332 msgid "qdelete requires at least one revision or patch name"
2332 msgid "qdelete requires at least one revision or patch name"
2333 msgstr ""
2333 msgstr ""
2334
2334
2335 #, python-format
2335 #, python-format
2336 msgid "cannot delete applied patch %s"
2336 msgid "cannot delete applied patch %s"
2337 msgstr ""
2337 msgstr ""
2338
2338
2339 #, python-format
2339 #, python-format
2340 msgid "patch %s not in series file"
2340 msgid "patch %s not in series file"
2341 msgstr ""
2341 msgstr ""
2342
2342
2343 msgid "no patches applied"
2343 msgid "no patches applied"
2344 msgstr ""
2344 msgstr ""
2345
2345
2346 msgid "working directory revision is not qtip"
2346 msgid "working directory revision is not qtip"
2347 msgstr ""
2347 msgstr ""
2348
2348
2349 msgid "local changes found, refresh first"
2349 msgid "local changes found, refresh first"
2350 msgstr ""
2350 msgstr ""
2351
2351
2352 msgid "local changes found"
2352 msgid "local changes found"
2353 msgstr ""
2353 msgstr ""
2354
2354
2355 #, python-format
2355 #, python-format
2356 msgid "\"%s\" cannot be used as the name of a patch"
2356 msgid "\"%s\" cannot be used as the name of a patch"
2357 msgstr ""
2357 msgstr ""
2358
2358
2359 #, python-format
2359 #, python-format
2360 msgid "patch \"%s\" already exists"
2360 msgid "patch \"%s\" already exists"
2361 msgstr ""
2361 msgstr ""
2362
2362
2363 #, python-format
2363 #, python-format
2364 msgid "error unlinking %s\n"
2364 msgid "error unlinking %s\n"
2365 msgstr ""
2365 msgstr ""
2366
2366
2367 #, python-format
2367 #, python-format
2368 msgid "patch name \"%s\" is ambiguous:\n"
2368 msgid "patch name \"%s\" is ambiguous:\n"
2369 msgstr ""
2369 msgstr ""
2370
2370
2371 #, python-format
2371 #, python-format
2372 msgid "patch %s not in series"
2372 msgid "patch %s not in series"
2373 msgstr ""
2373 msgstr ""
2374
2374
2375 msgid "(working directory not at a head)\n"
2375 msgid "(working directory not at a head)\n"
2376 msgstr ""
2376 msgstr ""
2377
2377
2378 msgid "no patches in series\n"
2378 msgid "no patches in series\n"
2379 msgstr ""
2379 msgstr ""
2380
2380
2381 #, python-format
2381 #, python-format
2382 msgid "cannot push to a previous patch: %s"
2382 msgid "cannot push to a previous patch: %s"
2383 msgstr ""
2383 msgstr ""
2384
2384
2385 #, python-format
2385 #, python-format
2386 msgid "qpush: %s is already at the top\n"
2386 msgid "qpush: %s is already at the top\n"
2387 msgstr ""
2387 msgstr ""
2388
2388
2389 #, python-format
2389 #, python-format
2390 msgid "guarded by %r"
2390 msgid "guarded by %r"
2391 msgstr ""
2391 msgstr ""
2392
2392
2393 msgid "no matching guards"
2393 msgid "no matching guards"
2394 msgstr ""
2394 msgstr ""
2395
2395
2396 #, python-format
2396 #, python-format
2397 msgid "cannot push '%s' - %s\n"
2397 msgid "cannot push '%s' - %s\n"
2398 msgstr ""
2398 msgstr ""
2399
2399
2400 msgid "all patches are currently applied\n"
2400 msgid "all patches are currently applied\n"
2401 msgstr ""
2401 msgstr ""
2402
2402
2403 msgid "patch series already fully applied\n"
2403 msgid "patch series already fully applied\n"
2404 msgstr ""
2404 msgstr ""
2405
2405
2406 msgid "cleaning up working directory..."
2406 msgid "cleaning up working directory..."
2407 msgstr ""
2407 msgstr ""
2408
2408
2409 #, python-format
2409 #, python-format
2410 msgid "errors during apply, please fix and refresh %s\n"
2410 msgid "errors during apply, please fix and refresh %s\n"
2411 msgstr ""
2411 msgstr ""
2412
2412
2413 #, python-format
2413 #, python-format
2414 msgid "now at: %s\n"
2414 msgid "now at: %s\n"
2415 msgstr ""
2415 msgstr ""
2416
2416
2417 #, python-format
2417 #, python-format
2418 msgid "patch %s is not applied"
2418 msgid "patch %s is not applied"
2419 msgstr ""
2419 msgstr ""
2420
2420
2421 msgid "no patches applied\n"
2421 msgid "no patches applied\n"
2422 msgstr ""
2422 msgstr ""
2423
2423
2424 #, python-format
2424 #, python-format
2425 msgid "qpop: %s is already at the top\n"
2425 msgid "qpop: %s is already at the top\n"
2426 msgstr ""
2426 msgstr ""
2427
2427
2428 msgid "qpop: forcing dirstate update\n"
2428 msgid "qpop: forcing dirstate update\n"
2429 msgstr ""
2429 msgstr ""
2430
2430
2431 #, python-format
2431 #, python-format
2432 msgid "trying to pop unknown node %s"
2432 msgid "trying to pop unknown node %s"
2433 msgstr ""
2433 msgstr ""
2434
2434
2435 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"
2436 msgstr ""
2436 msgstr ""
2437
2437
2438 msgid "deletions found between repo revs"
2438 msgid "deletions found between repo revs"
2439 msgstr ""
2439 msgstr ""
2440
2440
2441 msgid "patch queue now empty\n"
2441 msgid "patch queue now empty\n"
2442 msgstr ""
2442 msgstr ""
2443
2443
2444 msgid "cannot refresh a revision with children"
2444 msgid "cannot refresh a revision with children"
2445 msgstr ""
2445 msgstr ""
2446
2446
2447 msgid ""
2447 msgid ""
2448 "refresh interrupted while patch was popped! (revert --all, qpush to "
2448 "refresh interrupted while patch was popped! (revert --all, qpush to "
2449 "recover)\n"
2449 "recover)\n"
2450 msgstr ""
2450 msgstr ""
2451
2451
2452 msgid "patch queue directory already exists"
2452 msgid "patch queue directory already exists"
2453 msgstr ""
2453 msgstr ""
2454
2454
2455 #, python-format
2455 #, python-format
2456 msgid "patch %s is not in series file"
2456 msgid "patch %s is not in series file"
2457 msgstr ""
2457 msgstr ""
2458
2458
2459 msgid "No saved patch data found\n"
2459 msgid "No saved patch data found\n"
2460 msgstr ""
2460 msgstr ""
2461
2461
2462 #, python-format
2462 #, python-format
2463 msgid "restoring status: %s\n"
2463 msgid "restoring status: %s\n"
2464 msgstr ""
2464 msgstr ""
2465
2465
2466 msgid "save entry has children, leaving it alone\n"
2466 msgid "save entry has children, leaving it alone\n"
2467 msgstr ""
2467 msgstr ""
2468
2468
2469 #, python-format
2469 #, python-format
2470 msgid "removing save entry %s\n"
2470 msgid "removing save entry %s\n"
2471 msgstr ""
2471 msgstr ""
2472
2472
2473 #, python-format
2473 #, python-format
2474 msgid "saved queue repository parents: %s %s\n"
2474 msgid "saved queue repository parents: %s %s\n"
2475 msgstr ""
2475 msgstr ""
2476
2476
2477 msgid "queue directory updating\n"
2477 msgid "queue directory updating\n"
2478 msgstr ""
2478 msgstr ""
2479
2479
2480 msgid "Unable to load queue repository\n"
2480 msgid "Unable to load queue repository\n"
2481 msgstr ""
2481 msgstr ""
2482
2482
2483 msgid "save: no patches applied, exiting\n"
2483 msgid "save: no patches applied, exiting\n"
2484 msgstr ""
2484 msgstr ""
2485
2485
2486 msgid "status is already saved\n"
2486 msgid "status is already saved\n"
2487 msgstr ""
2487 msgstr ""
2488
2488
2489 msgid "hg patches saved state"
2489 msgid "hg patches saved state"
2490 msgstr ""
2490 msgstr ""
2491
2491
2492 msgid "repo commit failed\n"
2492 msgid "repo commit failed\n"
2493 msgstr ""
2493 msgstr ""
2494
2494
2495 #, python-format
2495 #, python-format
2496 msgid "patch %s is already in the series file"
2496 msgid "patch %s is already in the series file"
2497 msgstr ""
2497 msgstr ""
2498
2498
2499 msgid "option \"-r\" not valid when importing files"
2499 msgid "option \"-r\" not valid when importing files"
2500 msgstr ""
2500 msgstr ""
2501
2501
2502 msgid "option \"-n\" not valid when importing multiple patches"
2502 msgid "option \"-n\" not valid when importing multiple patches"
2503 msgstr ""
2503 msgstr ""
2504
2504
2505 #, python-format
2505 #, python-format
2506 msgid "revision %d is the root of more than one branch"
2506 msgid "revision %d is the root of more than one branch"
2507 msgstr ""
2507 msgstr ""
2508
2508
2509 #, python-format
2509 #, python-format
2510 msgid "revision %d is already managed"
2510 msgid "revision %d is already managed"
2511 msgstr ""
2511 msgstr ""
2512
2512
2513 #, python-format
2513 #, python-format
2514 msgid "revision %d is not the parent of the queue"
2514 msgid "revision %d is not the parent of the queue"
2515 msgstr ""
2515 msgstr ""
2516
2516
2517 #, python-format
2517 #, python-format
2518 msgid "revision %d has unmanaged children"
2518 msgid "revision %d has unmanaged children"
2519 msgstr ""
2519 msgstr ""
2520
2520
2521 #, python-format
2521 #, python-format
2522 msgid "cannot import merge revision %d"
2522 msgid "cannot import merge revision %d"
2523 msgstr ""
2523 msgstr ""
2524
2524
2525 #, python-format
2525 #, python-format
2526 msgid "revision %d is not the parent of %d"
2526 msgid "revision %d is not the parent of %d"
2527 msgstr ""
2527 msgstr ""
2528
2528
2529 msgid "-e is incompatible with import from -"
2529 msgid "-e is incompatible with import from -"
2530 msgstr ""
2530 msgstr ""
2531
2531
2532 #, python-format
2532 #, python-format
2533 msgid "patch %s does not exist"
2533 msgid "patch %s does not exist"
2534 msgstr ""
2534 msgstr ""
2535
2535
2536 msgid "need --name to import a patch from -"
2536 msgid "need --name to import a patch from -"
2537 msgstr ""
2537 msgstr ""
2538
2538
2539 #, python-format
2539 #, python-format
2540 msgid "adding %s to series file\n"
2540 msgid "adding %s to series file\n"
2541 msgstr ""
2541 msgstr ""
2542
2542
2543 msgid ""
2543 msgid ""
2544 "remove patches from queue\n"
2544 "remove patches from queue\n"
2545 "\n"
2545 "\n"
2546 " 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"
2547 " required.\n"
2547 " required.\n"
2548 "\n"
2548 "\n"
2549 " 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"
2550 " directory.\n"
2550 " directory.\n"
2551 "\n"
2551 "\n"
2552 " 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"
2553 " use the qfinish command."
2553 " use the qfinish command."
2554 msgstr ""
2554 msgstr ""
2555
2555
2556 msgid "print the patches already applied"
2556 msgid "print the patches already applied"
2557 msgstr ""
2557 msgstr ""
2558
2558
2559 msgid "print the patches not yet applied"
2559 msgid "print the patches not yet applied"
2560 msgstr ""
2560 msgstr ""
2561
2561
2562 msgid ""
2562 msgid ""
2563 "import a patch\n"
2563 "import a patch\n"
2564 "\n"
2564 "\n"
2565 " 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"
2566 " 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"
2567 " to the series.\n"
2567 " to the series.\n"
2568 "\n"
2568 "\n"
2569 " 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"
2570 " give it a new one with -n/--name.\n"
2570 " give it a new one with -n/--name.\n"
2571 "\n"
2571 "\n"
2572 " 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"
2573 " the -e/--existing flag.\n"
2573 " the -e/--existing flag.\n"
2574 "\n"
2574 "\n"
2575 " 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"
2576 " overwritten.\n"
2576 " overwritten.\n"
2577 "\n"
2577 "\n"
2578 " 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"
2579 " (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"
2580 " 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"
2581 " 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"
2582 " important for preserving rename/copy information and permission\n"
2582 " important for preserving rename/copy information and permission\n"
2583 " changes.\n"
2583 " changes.\n"
2584 "\n"
2584 "\n"
2585 " 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"
2586 " 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"
2587 " using the --name flag.\n"
2587 " using the --name flag.\n"
2588 " "
2588 " "
2589 msgstr ""
2589 msgstr ""
2590
2590
2591 msgid ""
2591 msgid ""
2592 "init a new queue repository\n"
2592 "init a new queue repository\n"
2593 "\n"
2593 "\n"
2594 " The queue repository is unversioned by default. If\n"
2594 " The queue repository is unversioned by default. If\n"
2595 " -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"
2596 " 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"
2597 " 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"
2598 " qcommit to commit changes to this queue repository."
2598 " qcommit to commit changes to this queue repository."
2599 msgstr ""
2599 msgstr ""
2600
2600
2601 msgid ""
2601 msgid ""
2602 "clone main and patch repository at same time\n"
2602 "clone main and patch repository at same time\n"
2603 "\n"
2603 "\n"
2604 " 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"
2605 " 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"
2606 " applied in source, so cannot guarantee that patches are not\n"
2606 " applied in source, so cannot guarantee that patches are not\n"
2607 " applied in destination. If you clone remote repository, be sure\n"
2607 " applied in destination. If you clone remote repository, be sure\n"
2608 " before that it has no patches applied.\n"
2608 " before that it has no patches applied.\n"
2609 "\n"
2609 "\n"
2610 " 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"
2611 " default. Use -p <url> to change.\n"
2611 " default. Use -p <url> to change.\n"
2612 "\n"
2612 "\n"
2613 " The patch directory must be a nested Mercurial repository, as\n"
2613 " The patch directory must be a nested Mercurial repository, as\n"
2614 " would be created by qinit -c.\n"
2614 " would be created by qinit -c.\n"
2615 " "
2615 " "
2616 msgstr ""
2616 msgstr ""
2617
2617
2618 msgid "versioned patch repository not found (see qinit -c)"
2618 msgid "versioned patch repository not found (see qinit -c)"
2619 msgstr ""
2619 msgstr ""
2620
2620
2621 msgid "cloning main repository\n"
2621 msgid "cloning main repository\n"
2622 msgstr ""
2622 msgstr ""
2623
2623
2624 msgid "cloning patch repository\n"
2624 msgid "cloning patch repository\n"
2625 msgstr ""
2625 msgstr ""
2626
2626
2627 msgid "stripping applied patches from destination repository\n"
2627 msgid "stripping applied patches from destination repository\n"
2628 msgstr ""
2628 msgstr ""
2629
2629
2630 msgid "updating destination repository\n"
2630 msgid "updating destination repository\n"
2631 msgstr ""
2631 msgstr ""
2632
2632
2633 msgid "commit changes in the queue repository"
2633 msgid "commit changes in the queue repository"
2634 msgstr ""
2634 msgstr ""
2635
2635
2636 msgid "print the entire series file"
2636 msgid "print the entire series file"
2637 msgstr ""
2637 msgstr ""
2638
2638
2639 msgid "print the name of the current patch"
2639 msgid "print the name of the current patch"
2640 msgstr ""
2640 msgstr ""
2641
2641
2642 msgid "print the name of the next patch"
2642 msgid "print the name of the next patch"
2643 msgstr ""
2643 msgstr ""
2644
2644
2645 msgid "all patches applied\n"
2645 msgid "all patches applied\n"
2646 msgstr ""
2646 msgstr ""
2647
2647
2648 msgid "print the name of the previous patch"
2648 msgid "print the name of the previous patch"
2649 msgstr ""
2649 msgstr ""
2650
2650
2651 msgid "only one patch applied\n"
2651 msgid "only one patch applied\n"
2652 msgstr ""
2652 msgstr ""
2653
2653
2654 msgid ""
2654 msgid ""
2655 "create a new patch\n"
2655 "create a new patch\n"
2656 "\n"
2656 "\n"
2657 " 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"
2658 " 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"
2659 " 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"
2660 " initialized with them. You may also use -I/--include,\n"
2660 " initialized with them. You may also use -I/--include,\n"
2661 " -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"
2662 " 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"
2663 " as uncommitted modifications.\n"
2663 " as uncommitted modifications.\n"
2664 "\n"
2664 "\n"
2665 " -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"
2666 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2666 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2667 " to current user and date to current date.\n"
2667 " to current user and date to current date.\n"
2668 "\n"
2668 "\n"
2669 " -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"
2670 " 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"
2671 " empty and the commit message is '[mq]: PATCH'.\n"
2671 " empty and the commit message is '[mq]: PATCH'.\n"
2672 "\n"
2672 "\n"
2673 " 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"
2674 " 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"
2675 " is important for preserving permission changes and copy/rename\n"
2675 " is important for preserving permission changes and copy/rename\n"
2676 " information.\n"
2676 " information.\n"
2677 " "
2677 " "
2678 msgstr ""
2678 msgstr ""
2679
2679
2680 msgid ""
2680 msgid ""
2681 "update the current patch\n"
2681 "update the current patch\n"
2682 "\n"
2682 "\n"
2683 " If any file patterns are provided, the refreshed patch will\n"
2683 " If any file patterns are provided, the refreshed patch will\n"
2684 " contain only the modifications that match those patterns; the\n"
2684 " contain only the modifications that match those patterns; the\n"
2685 " remaining modifications will remain in the working directory.\n"
2685 " remaining modifications will remain in the working directory.\n"
2686 "\n"
2686 "\n"
2687 " 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"
2688 " 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"
2689 "\n"
2689 "\n"
2690 " 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"
2691 " 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"
2692 " 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"
2693 " git diff format.\n"
2693 " git diff format.\n"
2694 " "
2694 " "
2695 msgstr ""
2695 msgstr ""
2696
2696
2697 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2697 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2698 msgstr ""
2698 msgstr ""
2699
2699
2700 msgid ""
2700 msgid ""
2701 "diff of the current patch and subsequent modifications\n"
2701 "diff of the current patch and subsequent modifications\n"
2702 "\n"
2702 "\n"
2703 " 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"
2704 " 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"
2705 " last refresh (thus showing what the current patch would become\n"
2705 " last refresh (thus showing what the current patch would become\n"
2706 " after a qrefresh).\n"
2706 " after a qrefresh).\n"
2707 "\n"
2707 "\n"
2708 " 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"
2709 " 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"
2710 " by the current patch without including changes made since the\n"
2710 " by the current patch without including changes made since the\n"
2711 " qrefresh.\n"
2711 " qrefresh.\n"
2712 " "
2712 " "
2713 msgstr ""
2713 msgstr ""
2714
2714
2715 msgid ""
2715 msgid ""
2716 "fold the named patches into the current patch\n"
2716 "fold the named patches into the current patch\n"
2717 "\n"
2717 "\n"
2718 " 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"
2719 " 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"
2720 " patches apply successfully, the current patch will be refreshed\n"
2720 " patches apply successfully, the current patch will be refreshed\n"
2721 " 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"
2722 " 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"
2723 " removed afterwards.\n"
2723 " removed afterwards.\n"
2724 "\n"
2724 "\n"
2725 " 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"
2726 " current patch header, separated by a line of '* * *'."
2726 " current patch header, separated by a line of '* * *'."
2727 msgstr ""
2727 msgstr ""
2728
2728
2729 msgid "qfold requires at least one patch name"
2729 msgid "qfold requires at least one patch name"
2730 msgstr ""
2730 msgstr ""
2731
2731
2732 msgid "No patches applied"
2732 msgid "No patches applied"
2733 msgstr ""
2733 msgstr ""
2734
2734
2735 #, python-format
2735 #, python-format
2736 msgid "Skipping already folded patch %s"
2736 msgid "Skipping already folded patch %s"
2737 msgstr ""
2737 msgstr ""
2738
2738
2739 #, python-format
2739 #, python-format
2740 msgid "qfold cannot fold already applied patch %s"
2740 msgid "qfold cannot fold already applied patch %s"
2741 msgstr ""
2741 msgstr ""
2742
2742
2743 #, python-format
2743 #, python-format
2744 msgid "Error folding patch %s"
2744 msgid "Error folding patch %s"
2745 msgstr ""
2745 msgstr ""
2746
2746
2747 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"
2748 msgstr ""
2748 msgstr ""
2749
2749
2750 msgid ""
2750 msgid ""
2751 "set or print guards for a patch\n"
2751 "set or print guards for a patch\n"
2752 "\n"
2752 "\n"
2753 " 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"
2754 " 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"
2755 " 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"
2756 " 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"
2757 " has activated it.\n"
2757 " has activated it.\n"
2758 "\n"
2758 "\n"
2759 " With no arguments, print the currently active guards.\n"
2759 " With no arguments, print the currently active guards.\n"
2760 " With arguments, set guards for the named patch.\n"
2760 " With arguments, set guards for the named patch.\n"
2761 " NOTE: Specifying negative guards now requires '--'.\n"
2761 " NOTE: Specifying negative guards now requires '--'.\n"
2762 "\n"
2762 "\n"
2763 " To set guards on another patch:\n"
2763 " To set guards on another patch:\n"
2764 " hg qguard -- other.patch +2.6.17 -stable\n"
2764 " hg qguard -- other.patch +2.6.17 -stable\n"
2765 " "
2765 " "
2766 msgstr ""
2766 msgstr ""
2767
2767
2768 msgid "cannot mix -l/--list with options or arguments"
2768 msgid "cannot mix -l/--list with options or arguments"
2769 msgstr ""
2769 msgstr ""
2770
2770
2771 msgid "no patch to work with"
2771 msgid "no patch to work with"
2772 msgstr ""
2772 msgstr ""
2773
2773
2774 #, python-format
2774 #, python-format
2775 msgid "no patch named %s"
2775 msgid "no patch named %s"
2776 msgstr ""
2776 msgstr ""
2777
2777
2778 msgid "print the header of the topmost or specified patch"
2778 msgid "print the header of the topmost or specified patch"
2779 msgstr ""
2779 msgstr ""
2780
2780
2781 msgid ""
2781 msgid ""
2782 "push the next patch onto the stack\n"
2782 "push the next patch onto the stack\n"
2783 "\n"
2783 "\n"
2784 " 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"
2785 " will be lost.\n"
2785 " will be lost.\n"
2786 " "
2786 " "
2787 msgstr ""
2787 msgstr ""
2788
2788
2789 msgid "no saved queues found, please use -n\n"
2789 msgid "no saved queues found, please use -n\n"
2790 msgstr ""
2790 msgstr ""
2791
2791
2792 #, python-format
2792 #, python-format
2793 msgid "merging with queue at: %s\n"
2793 msgid "merging with queue at: %s\n"
2794 msgstr ""
2794 msgstr ""
2795
2795
2796 msgid ""
2796 msgid ""
2797 "pop the current patch off the stack\n"
2797 "pop the current patch off the stack\n"
2798 "\n"
2798 "\n"
2799 " 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"
2800 " 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"
2801 " top of the stack.\n"
2801 " top of the stack.\n"
2802 " "
2802 " "
2803 msgstr ""
2803 msgstr ""
2804
2804
2805 #, python-format
2805 #, python-format
2806 msgid "using patch queue: %s\n"
2806 msgid "using patch queue: %s\n"
2807 msgstr ""
2807 msgstr ""
2808
2808
2809 msgid ""
2809 msgid ""
2810 "rename a patch\n"
2810 "rename a patch\n"
2811 "\n"
2811 "\n"
2812 " With one argument, renames the current patch to PATCH1.\n"
2812 " With one argument, renames the current patch to PATCH1.\n"
2813 " With two arguments, renames PATCH1 to PATCH2."
2813 " With two arguments, renames PATCH1 to PATCH2."
2814 msgstr ""
2814 msgstr ""
2815
2815
2816 #, python-format
2816 #, python-format
2817 msgid "%s already exists"
2817 msgid "%s already exists"
2818 msgstr ""
2818 msgstr ""
2819
2819
2820 #, python-format
2820 #, python-format
2821 msgid "A patch named %s already exists in the series file"
2821 msgid "A patch named %s already exists in the series file"
2822 msgstr ""
2822 msgstr ""
2823
2823
2824 msgid "restore the queue state saved by a revision"
2824 msgid "restore the queue state saved by a revision"
2825 msgstr ""
2825 msgstr ""
2826
2826
2827 msgid "save current queue state"
2827 msgid "save current queue state"
2828 msgstr ""
2828 msgstr ""
2829
2829
2830 #, python-format
2830 #, python-format
2831 msgid "destination %s exists and is not a directory"
2831 msgid "destination %s exists and is not a directory"
2832 msgstr ""
2832 msgstr ""
2833
2833
2834 #, python-format
2834 #, python-format
2835 msgid "destination %s exists, use -f to force"
2835 msgid "destination %s exists, use -f to force"
2836 msgstr ""
2836 msgstr ""
2837
2837
2838 #, python-format
2838 #, python-format
2839 msgid "copy %s to %s\n"
2839 msgid "copy %s to %s\n"
2840 msgstr ""
2840 msgstr ""
2841
2841
2842 msgid ""
2842 msgid ""
2843 "strip a revision and all its descendants from the repository\n"
2843 "strip a revision and all its descendants from the repository\n"
2844 "\n"
2844 "\n"
2845 " 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"
2846 " 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"
2847 " revision.\n"
2847 " revision.\n"
2848 " "
2848 " "
2849 msgstr ""
2849 msgstr ""
2850
2850
2851 msgid ""
2851 msgid ""
2852 "set or print guarded patches to push\n"
2852 "set or print guarded patches to push\n"
2853 "\n"
2853 "\n"
2854 " 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"
2855 " 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"
2856 " 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"
2857 " 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"
2858 " match the current guard. For example:\n"
2858 " match the current guard. For example:\n"
2859 "\n"
2859 "\n"
2860 " qguard foo.patch -stable (negative guard)\n"
2860 " qguard foo.patch -stable (negative guard)\n"
2861 " qguard bar.patch +stable (positive guard)\n"
2861 " qguard bar.patch +stable (positive guard)\n"
2862 " qselect stable\n"
2862 " qselect stable\n"
2863 "\n"
2863 "\n"
2864 " 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"
2865 " 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"
2866 " positive match).\n"
2866 " positive match).\n"
2867 "\n"
2867 "\n"
2868 " With no arguments, prints the currently active guards.\n"
2868 " With no arguments, prints the currently active guards.\n"
2869 " With one argument, sets the active guard.\n"
2869 " With one argument, sets the active guard.\n"
2870 "\n"
2870 "\n"
2871 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2871 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2872 " When no guards are active, patches with positive guards are\n"
2872 " When no guards are active, patches with positive guards are\n"
2873 " skipped and patches with negative guards are pushed.\n"
2873 " skipped and patches with negative guards are pushed.\n"
2874 "\n"
2874 "\n"
2875 " 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"
2876 " 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"
2877 " applied patch that is not guarded. Use --reapply (which implies\n"
2877 " applied patch that is not guarded. Use --reapply (which implies\n"
2878 " --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"
2879 " guarded patches.\n"
2879 " guarded patches.\n"
2880 "\n"
2880 "\n"
2881 " 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"
2882 " (no other arguments needed). Use -v for more information."
2882 " (no other arguments needed). Use -v for more information."
2883 msgstr ""
2883 msgstr ""
2884
2884
2885 msgid "guards deactivated\n"
2885 msgid "guards deactivated\n"
2886 msgstr ""
2886 msgstr ""
2887
2887
2888 #, python-format
2888 #, python-format
2889 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"
2890 msgstr ""
2890 msgstr ""
2891
2891
2892 #, python-format
2892 #, python-format
2893 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"
2894 msgstr ""
2894 msgstr ""
2895
2895
2896 msgid "guards in series file:\n"
2896 msgid "guards in series file:\n"
2897 msgstr ""
2897 msgstr ""
2898
2898
2899 msgid "no guards in series file\n"
2899 msgid "no guards in series file\n"
2900 msgstr ""
2900 msgstr ""
2901
2901
2902 msgid "active guards:\n"
2902 msgid "active guards:\n"
2903 msgstr ""
2903 msgstr ""
2904
2904
2905 msgid "no active guards\n"
2905 msgid "no active guards\n"
2906 msgstr ""
2906 msgstr ""
2907
2907
2908 msgid "popping guarded patches\n"
2908 msgid "popping guarded patches\n"
2909 msgstr ""
2909 msgstr ""
2910
2910
2911 msgid "reapplying unguarded patches\n"
2911 msgid "reapplying unguarded patches\n"
2912 msgstr ""
2912 msgstr ""
2913
2913
2914 msgid ""
2914 msgid ""
2915 "move applied patches into repository history\n"
2915 "move applied patches into repository history\n"
2916 "\n"
2916 "\n"
2917 " Finishes the specified revisions (corresponding to applied\n"
2917 " Finishes the specified revisions (corresponding to applied\n"
2918 " 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"
2919 " history.\n"
2919 " history.\n"
2920 "\n"
2920 "\n"
2921 " 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"
2922 " is specified, all applied mq revisions are removed from mq\n"
2922 " is specified, all applied mq revisions are removed from mq\n"
2923 " 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"
2924 " stack of applied patches.\n"
2924 " stack of applied patches.\n"
2925 "\n"
2925 "\n"
2926 " 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"
2927 " 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"
2928 " to upstream.\n"
2928 " to upstream.\n"
2929 " "
2929 " "
2930 msgstr ""
2930 msgstr ""
2931
2931
2932 msgid "no revisions specified"
2932 msgid "no revisions specified"
2933 msgstr ""
2933 msgstr ""
2934
2934
2935 msgid "cannot commit over an applied mq patch"
2935 msgid "cannot commit over an applied mq patch"
2936 msgstr ""
2936 msgstr ""
2937
2937
2938 msgid "source has mq patches applied"
2938 msgid "source has mq patches applied"
2939 msgstr ""
2939 msgstr ""
2940
2940
2941 #, python-format
2941 #, python-format
2942 msgid "mq status file refers to unknown node %s\n"
2942 msgid "mq status file refers to unknown node %s\n"
2943 msgstr ""
2943 msgstr ""
2944
2944
2945 #, python-format
2945 #, python-format
2946 msgid "Tag %s overrides mq patch of the same name\n"
2946 msgid "Tag %s overrides mq patch of the same name\n"
2947 msgstr ""
2947 msgstr ""
2948
2948
2949 msgid "cannot import over an applied patch"
2949 msgid "cannot import over an applied patch"
2950 msgstr ""
2950 msgstr ""
2951
2951
2952 msgid "print first line of patch header"
2952 msgid "print first line of patch header"
2953 msgstr ""
2953 msgstr ""
2954
2954
2955 msgid "hg qapplied [-s] [PATCH]"
2955 msgid "hg qapplied [-s] [PATCH]"
2956 msgstr ""
2956 msgstr ""
2957
2957
2958 msgid "use pull protocol to copy metadata"
2958 msgid "use pull protocol to copy metadata"
2959 msgstr ""
2959 msgstr ""
2960
2960
2961 msgid "do not update the new working directories"
2961 msgid "do not update the new working directories"
2962 msgstr ""
2962 msgstr ""
2963
2963
2964 msgid "use uncompressed transfer (fast over LAN)"
2964 msgid "use uncompressed transfer (fast over LAN)"
2965 msgstr ""
2965 msgstr ""
2966
2966
2967 msgid "location of source patch repository"
2967 msgid "location of source patch repository"
2968 msgstr ""
2968 msgstr ""
2969
2969
2970 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2970 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2971 msgstr ""
2971 msgstr ""
2972
2972
2973 msgid "hg qcommit [OPTION]... [FILE]..."
2973 msgid "hg qcommit [OPTION]... [FILE]..."
2974 msgstr ""
2974 msgstr ""
2975
2975
2976 msgid "hg qdiff [OPTION]... [FILE]..."
2976 msgid "hg qdiff [OPTION]... [FILE]..."
2977 msgstr ""
2977 msgstr ""
2978
2978
2979 msgid "keep patch file"
2979 msgid "keep patch file"
2980 msgstr ""
2980 msgstr ""
2981
2981
2982 msgid "stop managing a revision (DEPRECATED)"
2982 msgid "stop managing a revision (DEPRECATED)"
2983 msgstr ""
2983 msgstr ""
2984
2984
2985 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
2985 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
2986 msgstr ""
2986 msgstr ""
2987
2987
2988 msgid "edit patch header"
2988 msgid "edit patch header"
2989 msgstr ""
2989 msgstr ""
2990
2990
2991 msgid "keep folded patch files"
2991 msgid "keep folded patch files"
2992 msgstr ""
2992 msgstr ""
2993
2993
2994 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
2994 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
2995 msgstr ""
2995 msgstr ""
2996
2996
2997 msgid "overwrite any local changes"
2997 msgid "overwrite any local changes"
2998 msgstr ""
2998 msgstr ""
2999
2999
3000 msgid "hg qgoto [OPTION]... PATCH"
3000 msgid "hg qgoto [OPTION]... PATCH"
3001 msgstr ""
3001 msgstr ""
3002
3002
3003 msgid "list all patches and guards"
3003 msgid "list all patches and guards"
3004 msgstr ""
3004 msgstr ""
3005
3005
3006 msgid "drop all guards"
3006 msgid "drop all guards"
3007 msgstr ""
3007 msgstr ""
3008
3008
3009 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3009 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3010 msgstr ""
3010 msgstr ""
3011
3011
3012 msgid "hg qheader [PATCH]"
3012 msgid "hg qheader [PATCH]"
3013 msgstr ""
3013 msgstr ""
3014
3014
3015 msgid "import file in patch directory"
3015 msgid "import file in patch directory"
3016 msgstr ""
3016 msgstr ""
3017
3017
3018 msgid "name of patch file"
3018 msgid "name of patch file"
3019 msgstr ""
3019 msgstr ""
3020
3020
3021 msgid "overwrite existing files"
3021 msgid "overwrite existing files"
3022 msgstr ""
3022 msgstr ""
3023
3023
3024 msgid "place existing revisions under mq control"
3024 msgid "place existing revisions under mq control"
3025 msgstr ""
3025 msgstr ""
3026
3026
3027 msgid "use git extended diff format"
3027 msgid "use git extended diff format"
3028 msgstr "utiliser le format de patch étendu de git"
3028 msgstr "utiliser le format de patch étendu de git"
3029
3029
3030 msgid "qpush after importing"
3030 msgid "qpush after importing"
3031 msgstr ""
3031 msgstr ""
3032
3032
3033 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..."
3034 msgstr ""
3034 msgstr ""
3035
3035
3036 msgid "create queue repository"
3036 msgid "create queue repository"
3037 msgstr ""
3037 msgstr ""
3038
3038
3039 msgid "hg qinit [-c]"
3039 msgid "hg qinit [-c]"
3040 msgstr ""
3040 msgstr ""
3041
3041
3042 msgid "import uncommitted changes into patch"
3042 msgid "import uncommitted changes into patch"
3043 msgstr ""
3043 msgstr ""
3044
3044
3045 msgid "add \"From: <current user>\" to patch"
3045 msgid "add \"From: <current user>\" to patch"
3046 msgstr ""
3046 msgstr ""
3047
3047
3048 msgid "add \"From: <given user>\" to patch"
3048 msgid "add \"From: <given user>\" to patch"
3049 msgstr ""
3049 msgstr ""
3050
3050
3051 msgid "add \"Date: <current date>\" to patch"
3051 msgid "add \"Date: <current date>\" to patch"
3052 msgstr ""
3052 msgstr ""
3053
3053
3054 msgid "add \"Date: <given date>\" to patch"
3054 msgid "add \"Date: <given date>\" to patch"
3055 msgstr ""
3055 msgstr ""
3056
3056
3057 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3057 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3058 msgstr ""
3058 msgstr ""
3059
3059
3060 msgid "hg qnext [-s]"
3060 msgid "hg qnext [-s]"
3061 msgstr ""
3061 msgstr ""
3062
3062
3063 msgid "hg qprev [-s]"
3063 msgid "hg qprev [-s]"
3064 msgstr ""
3064 msgstr ""
3065
3065
3066 msgid "pop all patches"
3066 msgid "pop all patches"
3067 msgstr ""
3067 msgstr ""
3068
3068
3069 msgid "queue name to pop"
3069 msgid "queue name to pop"
3070 msgstr ""
3070 msgstr ""
3071
3071
3072 msgid "forget any local changes"
3072 msgid "forget any local changes"
3073 msgstr ""
3073 msgstr ""
3074
3074
3075 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3075 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3076 msgstr ""
3076 msgstr ""
3077
3077
3078 msgid "apply if the patch has rejects"
3078 msgid "apply if the patch has rejects"
3079 msgstr ""
3079 msgstr ""
3080
3080
3081 msgid "list patch name in commit text"
3081 msgid "list patch name in commit text"
3082 msgstr ""
3082 msgstr ""
3083
3083
3084 msgid "apply all patches"
3084 msgid "apply all patches"
3085 msgstr ""
3085 msgstr ""
3086
3086
3087 msgid "merge from another queue"
3087 msgid "merge from another queue"
3088 msgstr ""
3088 msgstr ""
3089
3089
3090 msgid "merge queue name"
3090 msgid "merge queue name"
3091 msgstr ""
3091 msgstr ""
3092
3092
3093 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3093 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3094 msgstr ""
3094 msgstr ""
3095
3095
3096 msgid "refresh only files already in the patch and specified files"
3096 msgid "refresh only files already in the patch and specified files"
3097 msgstr ""
3097 msgstr ""
3098
3098
3099 msgid "add/update \"From: <current user>\" in patch"
3099 msgid "add/update \"From: <current user>\" in patch"
3100 msgstr ""
3100 msgstr ""
3101
3101
3102 msgid "add/update \"From: <given user>\" in patch"
3102 msgid "add/update \"From: <given user>\" in patch"
3103 msgstr ""
3103 msgstr ""
3104
3104
3105 msgid "update \"Date: <current date>\" in patch (if present)"
3105 msgid "update \"Date: <current date>\" in patch (if present)"
3106 msgstr ""
3106 msgstr ""
3107
3107
3108 msgid "update \"Date: <given date>\" in patch (if present)"
3108 msgid "update \"Date: <given date>\" in patch (if present)"
3109 msgstr ""
3109 msgstr ""
3110
3110
3111 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]..."
3112 msgstr ""
3112 msgstr ""
3113
3113
3114 msgid "hg qrename PATCH1 [PATCH2]"
3114 msgid "hg qrename PATCH1 [PATCH2]"
3115 msgstr ""
3115 msgstr ""
3116
3116
3117 msgid "delete save entry"
3117 msgid "delete save entry"
3118 msgstr ""
3118 msgstr ""
3119
3119
3120 msgid "update queue working directory"
3120 msgid "update queue working directory"
3121 msgstr ""
3121 msgstr ""
3122
3122
3123 msgid "hg qrestore [-d] [-u] REV"
3123 msgid "hg qrestore [-d] [-u] REV"
3124 msgstr ""
3124 msgstr ""
3125
3125
3126 msgid "copy patch directory"
3126 msgid "copy patch directory"
3127 msgstr ""
3127 msgstr ""
3128
3128
3129 msgid "copy directory name"
3129 msgid "copy directory name"
3130 msgstr ""
3130 msgstr ""
3131
3131
3132 msgid "clear queue status file"
3132 msgid "clear queue status file"
3133 msgstr ""
3133 msgstr ""
3134
3134
3135 msgid "force copy"
3135 msgid "force copy"
3136 msgstr ""
3136 msgstr ""
3137
3137
3138 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]"
3139 msgstr ""
3139 msgstr ""
3140
3140
3141 msgid "disable all guards"
3141 msgid "disable all guards"
3142 msgstr ""
3142 msgstr ""
3143
3143
3144 msgid "list all guards in series file"
3144 msgid "list all guards in series file"
3145 msgstr ""
3145 msgstr ""
3146
3146
3147 msgid "pop to before first guarded applied patch"
3147 msgid "pop to before first guarded applied patch"
3148 msgstr ""
3148 msgstr ""
3149
3149
3150 msgid "pop, then reapply patches"
3150 msgid "pop, then reapply patches"
3151 msgstr ""
3151 msgstr ""
3152
3152
3153 msgid "hg qselect [OPTION]... [GUARD]..."
3153 msgid "hg qselect [OPTION]... [GUARD]..."
3154 msgstr ""
3154 msgstr ""
3155
3155
3156 msgid "print patches not in series"
3156 msgid "print patches not in series"
3157 msgstr ""
3157 msgstr ""
3158
3158
3159 msgid "hg qseries [-ms]"
3159 msgid "hg qseries [-ms]"
3160 msgstr ""
3160 msgstr ""
3161
3161
3162 msgid "force removal with local changes"
3162 msgid "force removal with local changes"
3163 msgstr ""
3163 msgstr ""
3164
3164
3165 msgid "bundle unrelated changesets"
3165 msgid "bundle unrelated changesets"
3166 msgstr ""
3166 msgstr ""
3167
3167
3168 msgid "no backups"
3168 msgid "no backups"
3169 msgstr ""
3169 msgstr ""
3170
3170
3171 msgid "hg strip [-f] [-b] [-n] REV"
3171 msgid "hg strip [-f] [-b] [-n] REV"
3172 msgstr ""
3172 msgstr ""
3173
3173
3174 msgid "hg qtop [-s]"
3174 msgid "hg qtop [-s]"
3175 msgstr ""
3175 msgstr ""
3176
3176
3177 msgid "hg qunapplied [-s] [PATCH]"
3177 msgid "hg qunapplied [-s] [PATCH]"
3178 msgstr ""
3178 msgstr ""
3179
3179
3180 msgid "finish all applied changesets"
3180 msgid "finish all applied changesets"
3181 msgstr ""
3181 msgstr ""
3182
3182
3183 msgid "hg qfinish [-a] [REV...]"
3183 msgid "hg qfinish [-a] [REV...]"
3184 msgstr ""
3184 msgstr ""
3185
3185
3186 msgid ""
3186 msgid ""
3187 "send e-mail notifications for commits/pushes\n"
3187 "send e-mail notifications for commits/pushes\n"
3188 "\n"
3188 "\n"
3189 "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"
3190 "messages to stdout, for testing and configuring.\n"
3190 "messages to stdout, for testing and configuring.\n"
3191 "\n"
3191 "\n"
3192 "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"
3193 "\n"
3193 "\n"
3194 " [extensions]\n"
3194 " [extensions]\n"
3195 " hgext.notify =\n"
3195 " hgext.notify =\n"
3196 "\n"
3196 "\n"
3197 " [hooks]\n"
3197 " [hooks]\n"
3198 " # one email for each incoming changeset\n"
3198 " # one email for each incoming changeset\n"
3199 " incoming.notify = python:hgext.notify.hook\n"
3199 " incoming.notify = python:hgext.notify.hook\n"
3200 " # batch emails when many changesets incoming at one time\n"
3200 " # batch emails when many changesets incoming at one time\n"
3201 " changegroup.notify = python:hgext.notify.hook\n"
3201 " changegroup.notify = python:hgext.notify.hook\n"
3202 "\n"
3202 "\n"
3203 " [notify]\n"
3203 " [notify]\n"
3204 " # config items go in here\n"
3204 " # config items go in here\n"
3205 "\n"
3205 "\n"
3206 " config items:\n"
3206 " config items:\n"
3207 "\n"
3207 "\n"
3208 " REQUIRED:\n"
3208 " REQUIRED:\n"
3209 " config = /path/to/file # file containing subscriptions\n"
3209 " config = /path/to/file # file containing subscriptions\n"
3210 "\n"
3210 "\n"
3211 " OPTIONAL:\n"
3211 " OPTIONAL:\n"
3212 " test = True # print messages to stdout for testing\n"
3212 " test = True # print messages to stdout for testing\n"
3213 " strip = 3 # number of slashes to strip for url paths\n"
3213 " strip = 3 # number of slashes to strip for url paths\n"
3214 " domain = example.com # domain to use if committer missing domain\n"
3214 " domain = example.com # domain to use if committer missing domain\n"
3215 " style = ... # style file to use when formatting email\n"
3215 " style = ... # style file to use when formatting email\n"
3216 " template = ... # template to use when formatting email\n"
3216 " template = ... # template to use when formatting email\n"
3217 " incoming = ... # template to use when run as incoming hook\n"
3217 " incoming = ... # template to use when run as incoming hook\n"
3218 " changegroup = ... # template when run as changegroup hook\n"
3218 " changegroup = ... # template when run as changegroup hook\n"
3219 " 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"
3220 " maxsubject = 67 # truncate subject line longer than this\n"
3220 " maxsubject = 67 # truncate subject line longer than this\n"
3221 " diffstat = True # add a diffstat before the diff content\n"
3221 " diffstat = True # add a diffstat before the diff content\n"
3222 " sources = serve # notify if source of incoming changes in this "
3222 " sources = serve # notify if source of incoming changes in this "
3223 "list\n"
3223 "list\n"
3224 " # (serve == ssh or http, push, pull, bundle)\n"
3224 " # (serve == ssh or http, push, pull, bundle)\n"
3225 " [email]\n"
3225 " [email]\n"
3226 " 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"
3227 " [web]\n"
3227 " [web]\n"
3228 " 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"
3229 "\n"
3229 "\n"
3230 " 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"
3231 " 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"
3232 " for you.\n"
3232 " for you.\n"
3233 "\n"
3233 "\n"
3234 " [usersubs]\n"
3234 " [usersubs]\n"
3235 " # key is subscriber email, value is \",\"-separated list of glob "
3235 " # key is subscriber email, value is \",\"-separated list of glob "
3236 "patterns\n"
3236 "patterns\n"
3237 " user@host = pattern\n"
3237 " user@host = pattern\n"
3238 "\n"
3238 "\n"
3239 " [reposubs]\n"
3239 " [reposubs]\n"
3240 " # key is glob pattern, value is \",\"-separated list of subscriber "
3240 " # key is glob pattern, value is \",\"-separated list of subscriber "
3241 "emails\n"
3241 "emails\n"
3242 " pattern = user@host\n"
3242 " pattern = user@host\n"
3243 "\n"
3243 "\n"
3244 " glob patterns are matched against path to repository root.\n"
3244 " glob patterns are matched against path to repository root.\n"
3245 "\n"
3245 "\n"
3246 " 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"
3247 " can push changes to, they can manage their own subscriptions."
3247 " can push changes to, they can manage their own subscriptions."
3248 msgstr ""
3248 msgstr ""
3249
3249
3250 #, python-format
3250 #, python-format
3251 msgid "%s: %d new changesets"
3251 msgid "%s: %d new changesets"
3252 msgstr ""
3252 msgstr ""
3253
3253
3254 #, python-format
3254 #, python-format
3255 msgid "notify: sending %d subscribers %d changes\n"
3255 msgid "notify: sending %d subscribers %d changes\n"
3256 msgstr ""
3256 msgstr ""
3257
3257
3258 #, python-format
3258 #, python-format
3259 msgid ""
3259 msgid ""
3260 "\n"
3260 "\n"
3261 "diffs (truncated from %d to %d lines):\n"
3261 "diffs (truncated from %d to %d lines):\n"
3262 "\n"
3262 "\n"
3263 msgstr ""
3263 msgstr ""
3264
3264
3265 #, python-format
3265 #, python-format
3266 msgid ""
3266 msgid ""
3267 "\n"
3267 "\n"
3268 "diffs (%d lines):\n"
3268 "diffs (%d lines):\n"
3269 "\n"
3269 "\n"
3270 msgstr ""
3270 msgstr ""
3271
3271
3272 #, python-format
3272 #, python-format
3273 msgid "notify: no subscribers to repository %s\n"
3273 msgid "notify: no subscribers to repository %s\n"
3274 msgstr ""
3274 msgstr ""
3275
3275
3276 #, python-format
3276 #, python-format
3277 msgid "notify: changes have source \"%s\" - skipping\n"
3277 msgid "notify: changes have source \"%s\" - skipping\n"
3278 msgstr ""
3278 msgstr ""
3279
3279
3280 msgid ""
3280 msgid ""
3281 "browse command output with an external pager\n"
3281 "browse command output with an external pager\n"
3282 "\n"
3282 "\n"
3283 "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"
3284 "\n"
3284 "\n"
3285 " [pager]\n"
3285 " [pager]\n"
3286 " pager = LESS='FSRX' less\n"
3286 " pager = LESS='FSRX' less\n"
3287 "\n"
3287 "\n"
3288 "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"
3289 "$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"
3290 "\n"
3290 "\n"
3291 "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"
3292 "setting:\n"
3292 "setting:\n"
3293 "\n"
3293 "\n"
3294 " [pager]\n"
3294 " [pager]\n"
3295 " quiet = True\n"
3295 " quiet = True\n"
3296 "\n"
3296 "\n"
3297 "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"
3298 "pager.ignore list:\n"
3298 "pager.ignore list:\n"
3299 "\n"
3299 "\n"
3300 " [pager]\n"
3300 " [pager]\n"
3301 " ignore = version, help, update\n"
3301 " ignore = version, help, update\n"
3302 "\n"
3302 "\n"
3303 "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"
3304 "pager.attend:\n"
3304 "pager.attend:\n"
3305 "\n"
3305 "\n"
3306 " [pager]\n"
3306 " [pager]\n"
3307 " attend = log\n"
3307 " attend = log\n"
3308 "\n"
3308 "\n"
3309 "If pager.attend is present, pager.ignore will be ignored.\n"
3309 "If pager.attend is present, pager.ignore will be ignored.\n"
3310 "\n"
3310 "\n"
3311 "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"
3312 "specify them in the global .hgrc\n"
3312 "specify them in the global .hgrc\n"
3313 msgstr ""
3313 msgstr ""
3314
3314
3315 msgid ""
3315 msgid ""
3316 "interpret suffixes to refer to ancestor revisions\n"
3316 "interpret suffixes to refer to ancestor revisions\n"
3317 "\n"
3317 "\n"
3318 "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"
3319 "ancestors of a specific revision.\n"
3319 "ancestors of a specific revision.\n"
3320 "\n"
3320 "\n"
3321 "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"
3322 "\n"
3322 "\n"
3323 "- foo^N = Nth parent of foo\n"
3323 "- foo^N = Nth parent of foo\n"
3324 " foo^0 = foo\n"
3324 " foo^0 = foo\n"
3325 " foo^1 = first parent of foo\n"
3325 " foo^1 = first parent of foo\n"
3326 " foo^2 = second parent of foo\n"
3326 " foo^2 = second parent of foo\n"
3327 " foo^ = foo^1\n"
3327 " foo^ = foo^1\n"
3328 "\n"
3328 "\n"
3329 "- foo~N = Nth first grandparent of foo\n"
3329 "- foo~N = Nth first grandparent of foo\n"
3330 " foo~0 = foo\n"
3330 " foo~0 = foo\n"
3331 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3331 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3332 " 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"
3333 msgstr ""
3333 msgstr ""
3334
3334
3335 # cédric: première ligne trop longue (utilisée pour la liste d'extensions
3335 # cédric: première ligne trop longue (utilisée pour la liste d'extensions
3336 # activée, une par ligne) -> traduction abrégée
3336 # activée, une par ligne) -> traduction abrégée
3337 msgid ""
3337 msgid ""
3338 "send Mercurial changesets as a series of patch e-mails\n"
3338 "send Mercurial changesets as a series of patch e-mails\n"
3339 "\n"
3339 "\n"
3340 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3340 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3341 "describes the series as a whole.\n"
3341 "describes the series as a whole.\n"
3342 "\n"
3342 "\n"
3343 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3343 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3344 "first line of the changeset description as the subject text. The\n"
3344 "first line of the changeset description as the subject text. The\n"
3345 "message contains two or three body parts:\n"
3345 "message contains two or three body parts:\n"
3346 "\n"
3346 "\n"
3347 " The changeset description.\n"
3347 " The changeset description.\n"
3348 "\n"
3348 "\n"
3349 " [Optional] The result of running diffstat on the patch.\n"
3349 " [Optional] The result of running diffstat on the patch.\n"
3350 "\n"
3350 "\n"
3351 " The patch itself, as generated by \"hg export\".\n"
3351 " The patch itself, as generated by \"hg export\".\n"
3352 "\n"
3352 "\n"
3353 "Each message refers to the first in the series using the In-Reply-To\n"
3353 "Each message refers to the first in the series using the In-Reply-To\n"
3354 "and References headers, so they will show up as a sequence in threaded\n"
3354 "and References headers, so they will show up as a sequence in threaded\n"
3355 "mail and news readers, and in mail archives.\n"
3355 "mail and news readers, and in mail archives.\n"
3356 "\n"
3356 "\n"
3357 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3357 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3358 "with a diffstat summary and the changeset summary, so you can be sure\n"
3358 "with a diffstat summary and the changeset summary, so you can be sure\n"
3359 "you are sending the right changes.\n"
3359 "you are sending the right changes.\n"
3360 "\n"
3360 "\n"
3361 "To configure other defaults, add a section like this to your hgrc\n"
3361 "To configure other defaults, add a section like this to your hgrc\n"
3362 "file:\n"
3362 "file:\n"
3363 "\n"
3363 "\n"
3364 " [email]\n"
3364 " [email]\n"
3365 " from = My Name <my@email>\n"
3365 " from = My Name <my@email>\n"
3366 " to = recipient1, recipient2, ...\n"
3366 " to = recipient1, recipient2, ...\n"
3367 " cc = cc1, cc2, ...\n"
3367 " cc = cc1, cc2, ...\n"
3368 " bcc = bcc1, bcc2, ...\n"
3368 " bcc = bcc1, bcc2, ...\n"
3369 "\n"
3369 "\n"
3370 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3370 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3371 "as a patchbomb.\n"
3371 "as a patchbomb.\n"
3372 "\n"
3372 "\n"
3373 "To avoid sending patches prematurely, it is a good idea to first run\n"
3373 "To avoid sending patches prematurely, it is a good idea to first run\n"
3374 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3374 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3375 "prompted for an email recipient address, a subject and an introductory\n"
3375 "prompted for an email recipient address, a subject and an introductory\n"
3376 "message describing the patches of your patchbomb. Then when all is\n"
3376 "message describing the patches of your patchbomb. Then when all is\n"
3377 "done, patchbomb messages are displayed. If the PAGER environment\n"
3377 "done, patchbomb messages are displayed. If the PAGER environment\n"
3378 "variable is set, your pager will be fired up once for each patchbomb\n"
3378 "variable is set, your pager will be fired up once for each patchbomb\n"
3379 "message, so you can verify everything is alright.\n"
3379 "message, so you can verify everything is alright.\n"
3380 "\n"
3380 "\n"
3381 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3381 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3382 "patchbomb message in a pager or sending the messages directly, it will\n"
3382 "patchbomb message in a pager or sending the messages directly, it will\n"
3383 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3383 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3384 "can be previewed with any mail user agent which supports UNIX mbox\n"
3384 "can be previewed with any mail user agent which supports UNIX mbox\n"
3385 "files, e.g. with mutt:\n"
3385 "files, e.g. with mutt:\n"
3386 "\n"
3386 "\n"
3387 " % mutt -R -f mbox\n"
3387 " % mutt -R -f mbox\n"
3388 "\n"
3388 "\n"
3389 "When you are previewing the patchbomb messages, you can use `formail'\n"
3389 "When you are previewing the patchbomb messages, you can use `formail'\n"
3390 "(a utility that is commonly installed as part of the procmail\n"
3390 "(a utility that is commonly installed as part of the procmail\n"
3391 "package), to send each message out:\n"
3391 "package), to send each message out:\n"
3392 "\n"
3392 "\n"
3393 " % formail -s sendmail -bm -t < mbox\n"
3393 " % formail -s sendmail -bm -t < mbox\n"
3394 "\n"
3394 "\n"
3395 "That should be all. Now your patchbomb is on its way out.\n"
3395 "That should be all. Now your patchbomb is on its way out.\n"
3396 "\n"
3396 "\n"
3397 "You can also either configure the method option in the email section\n"
3397 "You can also either configure the method option in the email section\n"
3398 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3398 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3399 "that the patchbomb extension can automatically send patchbombs\n"
3399 "that the patchbomb extension can automatically send patchbombs\n"
3400 "directly from the commandline. See the [email] and [smtp] sections in\n"
3400 "directly from the commandline. See the [email] and [smtp] sections in\n"
3401 "hgrc(5) for details."
3401 "hgrc(5) for details."
3402 msgstr ""
3402 msgstr ""
3403 "envoi d'une série de \"changesets\" par courrier électronique\n"
3403 "envoi d'une série de \"changesets\" par courrier électronique\n"
3404 "\n"
3404 "\n"
3405 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3405 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3406 "décrivant dans son ensemble.\n"
3406 "décrivant dans son ensemble.\n"
3407 "\n"
3407 "\n"
3408 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3408 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3409 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3409 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3410 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3410 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3411 "parties :\n"
3411 "parties :\n"
3412 "\n"
3412 "\n"
3413 " La description du \"changeset\".\n"
3413 " La description du \"changeset\".\n"
3414 "\n"
3414 "\n"
3415 " Optionnellement, un résumé des modifications généré par le\n"
3415 " Optionnellement, un résumé des modifications généré par le\n"
3416 " programme diffstat.\n"
3416 " programme diffstat.\n"
3417 "\n"
3417 "\n"
3418 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3418 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3419 "\n"
3419 "\n"
3420 "Chaque message fait référence au premier de la série (à l'aide\n"
3420 "Chaque message fait référence au premier de la série (à l'aide\n"
3421 "des en-têtes de message In-Reply-To et References) de manière à\n"
3421 "des en-têtes de message In-Reply-To et References) de manière à\n"
3422 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3422 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3423 "électronique et de nouvelles, ainsi que dans les archives de\n"
3423 "électronique et de nouvelles, ainsi que dans les archives de\n"
3424 "messagerie.\n"
3424 "messagerie.\n"
3425 "\n"
3425 "\n"
3426 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3426 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3427 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3427 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3428 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3428 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3429 "d'être certain de bien envoyer les bonnes modifications.\n"
3429 "d'être certain de bien envoyer les bonnes modifications.\n"
3430 "\n"
3430 "\n"
3431 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3431 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3432 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3432 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3433 "\n"
3433 "\n"
3434 " [email]\n"
3434 " [email]\n"
3435 " from = Mon Nom <mon@adresse_de_courriel>\n"
3435 " from = Mon Nom <mon@adresse_de_courriel>\n"
3436 " to = destinataire1, destinataire2, ...\n"
3436 " to = destinataire1, destinataire2, ...\n"
3437 " cc = cc1, cc2, ...\n"
3437 " cc = cc1, cc2, ...\n"
3438 " bcc = bcc1, bcc2, ...\n"
3438 " bcc = bcc1, bcc2, ...\n"
3439 "\n"
3439 "\n"
3440 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3440 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3441 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3441 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3442 "\n"
3442 "\n"
3443 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3443 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3444 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3444 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3445 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3445 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3446 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3446 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3447 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3447 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3448 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3448 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3449 "l'affichage chaque message, permettant de vérifier que tout est\n"
3449 "l'affichage chaque message, permettant de vérifier que tout est\n"
3450 "correct.\n"
3450 "correct.\n"
3451 "\n"
3451 "\n"
3452 "L'option -m/--mbox est également très utile : au lieu que les\n"
3452 "L'option -m/--mbox est également très utile : au lieu que les\n"
3453 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3453 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3454 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3454 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3455 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3455 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3456 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3456 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3457 "comme par exemple mutt :\n"
3457 "comme par exemple mutt :\n"
3458 "\n"
3458 "\n"
3459 " % mutt -R -f mbox\n"
3459 " % mutt -R -f mbox\n"
3460 "\n"
3460 "\n"
3461 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3461 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3462 "utilisant formail (un outil généralement installé en même temps que\n"
3462 "utilisant formail (un outil généralement installé en même temps que\n"
3463 "procmail) :\n"
3463 "procmail) :\n"
3464 "\n"
3464 "\n"
3465 " % formail -s sendmail -bm -t < mbox\n"
3465 " % formail -s sendmail -bm -t < mbox\n"
3466 "\n"
3466 "\n"
3467 "Et voilà, vos patchs sont en route vers leur destination.\n"
3467 "Et voilà, vos patchs sont en route vers leur destination.\n"
3468 "\n"
3468 "\n"
3469 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3469 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3470 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3470 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3471 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3471 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3472 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3472 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3473 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3473 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3474 "page de manuel hgrc(5) pour plus de détails."
3474 "page de manuel hgrc(5) pour plus de détails."
3475
3475
3476 msgid "Please enter a valid value.\n"
3476 msgid "Please enter a valid value.\n"
3477 msgstr "Veuillez fournir une valeur valide.\n"
3477 msgstr "Veuillez fournir une valeur valide.\n"
3478
3478
3479 msgid "does the diffstat above look okay? "
3479 msgid "does the diffstat above look okay? "
3480 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3480 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3481
3481
3482 msgid "diffstat rejected"
3482 msgid "diffstat rejected"
3483 msgstr "résumé des modifications rejeté"
3483 msgstr "résumé des modifications rejeté"
3484
3484
3485 msgid ""
3485 msgid ""
3486 "send changesets by email\n"
3486 "send changesets by email\n"
3487 "\n"
3487 "\n"
3488 " By default, diffs are sent in the format generated by hg export,\n"
3488 " By default, diffs are sent in the format generated by hg export,\n"
3489 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3489 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3490 " introduction, which describes the series as a whole.\n"
3490 " introduction, which describes the series as a whole.\n"
3491 "\n"
3491 "\n"
3492 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3492 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3493 " the first line of the changeset description as the subject text.\n"
3493 " the first line of the changeset description as the subject text.\n"
3494 " The message contains two or three parts. First, the changeset\n"
3494 " The message contains two or three parts. First, the changeset\n"
3495 " description. Next, (optionally) if the diffstat program is\n"
3495 " description. Next, (optionally) if the diffstat program is\n"
3496 " installed and -d/--diffstat is used, the result of running\n"
3496 " installed and -d/--diffstat is used, the result of running\n"
3497 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3497 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3498 " \"hg export\".\n"
3498 " \"hg export\".\n"
3499 "\n"
3499 "\n"
3500 " By default the patch is included as text in the email body for\n"
3500 " By default the patch is included as text in the email body for\n"
3501 " easy reviewing. Using the -a/--attach option will instead create\n"
3501 " easy reviewing. Using the -a/--attach option will instead create\n"
3502 " an attachment for the patch. With -i/--inline an inline attachment\n"
3502 " an attachment for the patch. With -i/--inline an inline attachment\n"
3503 " will be created.\n"
3503 " will be created.\n"
3504 "\n"
3504 "\n"
3505 " With -o/--outgoing, emails will be generated for patches not found\n"
3505 " With -o/--outgoing, emails will be generated for patches not found\n"
3506 " in the destination repository (or only those which are ancestors\n"
3506 " in the destination repository (or only those which are ancestors\n"
3507 " of the specified revisions if any are provided)\n"
3507 " of the specified revisions if any are provided)\n"
3508 "\n"
3508 "\n"
3509 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3509 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3510 " single email containing a binary Mercurial bundle as an attachment\n"
3510 " single email containing a binary Mercurial bundle as an attachment\n"
3511 " will be sent.\n"
3511 " will be sent.\n"
3512 "\n"
3512 "\n"
3513 " Examples:\n"
3513 " Examples:\n"
3514 "\n"
3514 "\n"
3515 " hg email -r 3000 # send patch 3000 only\n"
3515 " hg email -r 3000 # send patch 3000 only\n"
3516 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3516 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3517 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3517 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3518 " hg email 3000 # send patch 3000 (deprecated)\n"
3518 " hg email 3000 # send patch 3000 (deprecated)\n"
3519 "\n"
3519 "\n"
3520 " hg email -o # send all patches not in default\n"
3520 " hg email -o # send all patches not in default\n"
3521 " hg email -o DEST # send all patches not in DEST\n"
3521 " hg email -o DEST # send all patches not in DEST\n"
3522 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3522 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3523 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3523 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3524 "\n"
3524 "\n"
3525 " hg email -b # send bundle of all patches not in default\n"
3525 " hg email -b # send bundle of all patches not in default\n"
3526 " hg email -b DEST # send bundle of all patches not in DEST\n"
3526 " hg email -b DEST # send bundle of all patches not in DEST\n"
3527 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3527 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3528 "default\n"
3528 "default\n"
3529 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3529 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3530 "\n"
3530 "\n"
3531 " Before using this command, you will need to enable email in your\n"
3531 " Before using this command, you will need to enable email in your\n"
3532 " hgrc. See the [email] section in hgrc(5) for details.\n"
3532 " hgrc. See the [email] section in hgrc(5) for details.\n"
3533 " "
3533 " "
3534 msgstr ""
3534 msgstr ""
3535 "envoi de \"changesets\" par courrier électronique\n"
3535 "envoi de \"changesets\" par courrier électronique\n"
3536 "\n"
3536 "\n"
3537 " Par défaut, les modifications sont envoyées au format généré par\n"
3537 " Par défaut, les modifications sont envoyées au format généré par\n"
3538 " \"hg export\", une par message. La série débute par un message\n"
3538 " \"hg export\", une par message. La série débute par un message\n"
3539 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3539 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3540 "\n"
3540 "\n"
3541 " Chaque courriel a pour sujet un résumé des modifications\n"
3541 " Chaque courriel a pour sujet un résumé des modifications\n"
3542 " apportées par le patch (pris en première ligne de la description\n"
3542 " apportées par le patch (pris en première ligne de la description\n"
3543 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3543 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3544 " Le message est constitué de deux ou trois parties. D'abord,\n"
3544 " Le message est constitué de deux ou trois parties. D'abord,\n"
3545 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3545 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3546 " un résumé des modifications généré par le programme diffstat si\n"
3546 " un résumé des modifications généré par le programme diffstat si\n"
3547 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3547 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3548 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3548 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3549 "\n"
3549 "\n"
3550 " Par défaut le patch est inclus textuellement dans le corps du\n"
3550 " Par défaut le patch est inclus textuellement dans le corps du\n"
3551 " message afin de faciliter les relectures et commentaires.\n"
3551 " message afin de faciliter les relectures et commentaires.\n"
3552 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3552 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3553 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3553 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3554 " insère celle-ci dans le corps.\n"
3554 " insère celle-ci dans le corps.\n"
3555 "\n"
3555 "\n"
3556 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3556 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3557 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3557 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3558 " ancêtres des révisions spécifiées, le cas échéant).\n"
3558 " ancêtres des révisions spécifiées, le cas échéant).\n"
3559 "\n"
3559 "\n"
3560 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3560 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3561 " même manière que pour --outgoing, mais il seront envoyés via\n"
3561 " même manière que pour --outgoing, mais il seront envoyés via\n"
3562 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3562 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3563 "\n"
3563 "\n"
3564 " Exemples :\n"
3564 " Exemples :\n"
3565 "\n"
3565 "\n"
3566 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3566 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3567 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3567 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3568 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3568 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3569 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3569 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3570 "\n"
3570 "\n"
3571 " hg email -o # envoyer les patchs absents de la\n"
3571 " hg email -o # envoyer les patchs absents de la\n"
3572 " destination par défaut\n"
3572 " destination par défaut\n"
3573 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3573 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3574 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3574 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3575 " de la destination par défaut\n"
3575 " de la destination par défaut\n"
3576 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3576 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3577 " de DEST\n"
3577 " de DEST\n"
3578 "\n"
3578 "\n"
3579 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3579 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3580 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3580 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3581 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3581 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3582 " [email] pour plus de détails.\n"
3582 " [email] pour plus de détails.\n"
3583 " "
3583 " "
3584
3584
3585 msgid "specify at least one changeset with -r or -o"
3585 msgid "specify at least one changeset with -r or -o"
3586 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3586 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3587
3587
3588 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3588 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3589 msgstr ""
3589 msgstr ""
3590 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3590 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3591 "bundle est utilisé"
3591 "bundle est utilisé"
3592
3592
3593 msgid "too many destinations"
3593 msgid "too many destinations"
3594 msgstr "trop de destinations"
3594 msgstr "trop de destinations"
3595
3595
3596 msgid "use only one form to specify the revision"
3596 msgid "use only one form to specify the revision"
3597 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3597 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3598
3598
3599 msgid ""
3599 msgid ""
3600 "\n"
3600 "\n"
3601 "Write the introductory message for the patch series.\n"
3601 "Write the introductory message for the patch series.\n"
3602 "\n"
3602 "\n"
3603 msgstr ""
3603 msgstr ""
3604 "\n"
3604 "\n"
3605 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3605 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3606 "\n"
3606 "\n"
3607
3607
3608 #, python-format
3608 #, python-format
3609 msgid ""
3609 msgid ""
3610 "This patch series consists of %d patches.\n"
3610 "This patch series consists of %d patches.\n"
3611 "\n"
3611 "\n"
3612 msgstr ""
3612 msgstr ""
3613 "Cette série comporte %d patchs.\n"
3613 "Cette série comporte %d patchs.\n"
3614 "\n"
3614 "\n"
3615
3615
3616 # diffstat sur l'ensemble des patchs
3616 # diffstat sur l'ensemble des patchs
3617 msgid "Final summary:\n"
3617 msgid "Final summary:\n"
3618 msgstr "Résumé complet des modifications :\n"
3618 msgstr "Résumé complet des modifications :\n"
3619
3619
3620 # mode --test
3620 # mode --test
3621 msgid "Displaying "
3621 msgid "Displaying "
3622 msgstr "Affichage de "
3622 msgstr "Affichage de "
3623
3623
3624 # mode --mbox
3624 # mode --mbox
3625 msgid "Writing "
3625 msgid "Writing "
3626 msgstr "Écriture de "
3626 msgstr "Écriture de "
3627
3627
3628 # mode d'envoi par défaut
3628 # mode d'envoi par défaut
3629 msgid "Sending "
3629 msgid "Sending "
3630 msgstr "Envoi de "
3630 msgstr "Envoi de "
3631
3631
3632 msgid "send patches as attachments"
3632 msgid "send patches as attachments"
3633 msgstr "envoyer les patchs en tant que pièces jointes"
3633 msgstr "envoyer les patchs en tant que pièces jointes"
3634
3634
3635 msgid "send patches as inline attachments"
3635 msgid "send patches as inline attachments"
3636 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3636 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3637
3637
3638 msgid "email addresses of blind carbon copy recipients"
3638 msgid "email addresses of blind carbon copy recipients"
3639 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3639 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3640
3640
3641 msgid "email addresses of copy recipients"
3641 msgid "email addresses of copy recipients"
3642 msgstr "adresses électroniques des destinataires en copie carbone"
3642 msgstr "adresses électroniques des destinataires en copie carbone"
3643
3643
3644 msgid "add diffstat output to messages"
3644 msgid "add diffstat output to messages"
3645 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3645 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3646
3646
3647 msgid "use the given date as the sending date"
3647 msgid "use the given date as the sending date"
3648 msgstr "utiliser la date fournie comme date d'envoi"
3648 msgstr "utiliser la date fournie comme date d'envoi"
3649
3649
3650 msgid "use the given file as the series description"
3650 msgid "use the given file as the series description"
3651 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3651 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3652
3652
3653 msgid "email address of sender"
3653 msgid "email address of sender"
3654 msgstr "adresse électronique de l'expéditeur"
3654 msgstr "adresse électronique de l'expéditeur"
3655
3655
3656 msgid "print messages that would be sent"
3656 msgid "print messages that would be sent"
3657 msgstr "afficher les messages tels qu'ils seraient envoyés"
3657 msgstr "afficher les messages tels qu'ils seraient envoyés"
3658
3658
3659 msgid "write messages to mbox file instead of sending them"
3659 msgid "write messages to mbox file instead of sending them"
3660 msgstr ""
3660 msgstr ""
3661 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3661 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3662
3662
3663 msgid "subject of first message (intro or single patch)"
3663 msgid "subject of first message (intro or single patch)"
3664 msgstr "sujet du premier message (intro ou patch unique)"
3664 msgstr "sujet du premier message (intro ou patch unique)"
3665
3665
3666 msgid "message identifier to reply to"
3666 msgid "message identifier to reply to"
3667 msgstr "identifiant du message auquel répondre"
3667 msgstr "identifiant du message auquel répondre"
3668
3668
3669 msgid "email addresses of recipients"
3669 msgid "email addresses of recipients"
3670 msgstr "adresses électroniques des destinataires"
3670 msgstr "adresses électroniques des destinataires"
3671
3671
3672 msgid "omit hg patch header"
3672 msgid "omit hg patch header"
3673 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3673 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3674
3674
3675 msgid "send changes not found in the target repository"
3675 msgid "send changes not found in the target repository"
3676 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3676 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3677
3677
3678 msgid "send changes not in target as a binary bundle"
3678 msgid "send changes not in target as a binary bundle"
3679 msgstr ""
3679 msgstr ""
3680 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3680 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3681 "\"bundle\" binaire"
3681 "\"bundle\" binaire"
3682
3682
3683 msgid "name of the bundle attachment file"
3683 msgid "name of the bundle attachment file"
3684 msgstr "nom à donner au fichier \"bundle\" envoyé"
3684 msgstr "nom à donner au fichier \"bundle\" envoyé"
3685
3685
3686 msgid "a revision to send"
3686 msgid "a revision to send"
3687 msgstr "une révision à envoyer"
3687 msgstr "une révision à envoyer"
3688
3688
3689 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3689 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3690 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3690 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3691
3691
3692 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3692 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3693 msgstr ""
3693 msgstr ""
3694 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3694 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3695 "(avec -b/--bundle)"
3695 "(avec -b/--bundle)"
3696
3696
3697 msgid "send an introduction email for a single patch"
3697 msgid "send an introduction email for a single patch"
3698 msgstr "envoyer un courriel d'introduction pour un patch seul"
3698 msgstr "envoyer un courriel d'introduction pour un patch seul"
3699
3699
3700 msgid "hg email [OPTION]... [DEST]..."
3700 msgid "hg email [OPTION]... [DEST]..."
3701 msgstr "hg email [OPTION]... [DEST]..."
3701 msgstr "hg email [OPTION]... [DEST]..."
3702
3702
3703 msgid "delete files not tracked from the working directory"
3703 msgid "delete files not tracked from the working directory"
3704 msgstr ""
3704 msgstr ""
3705
3705
3706 msgid ""
3706 msgid ""
3707 "removes files not tracked by Mercurial\n"
3707 "removes files not tracked by Mercurial\n"
3708 "\n"
3708 "\n"
3709 " Delete files not known to Mercurial. This is useful to test local\n"
3709 " Delete files not known to Mercurial. This is useful to test local\n"
3710 " and uncommitted changes in an otherwise-clean source tree.\n"
3710 " and uncommitted changes in an otherwise-clean source tree.\n"
3711 "\n"
3711 "\n"
3712 " This means that purge will delete:\n"
3712 " This means that purge will delete:\n"
3713 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3713 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3714 " - Empty directories: in fact Mercurial ignores directories unless\n"
3714 " - Empty directories: in fact Mercurial ignores directories unless\n"
3715 " they contain files under source control management\n"
3715 " they contain files under source control management\n"
3716 " But it will leave untouched:\n"
3716 " But it will leave untouched:\n"
3717 " - Modified and unmodified tracked files\n"
3717 " - Modified and unmodified tracked files\n"
3718 " - Ignored files (unless --all is specified)\n"
3718 " - Ignored files (unless --all is specified)\n"
3719 " - New files added to the repository (with \"hg add\")\n"
3719 " - New files added to the repository (with \"hg add\")\n"
3720 "\n"
3720 "\n"
3721 " If directories are given on the command line, only files in these\n"
3721 " If directories are given on the command line, only files in these\n"
3722 " directories are considered.\n"
3722 " directories are considered.\n"
3723 "\n"
3723 "\n"
3724 " Be careful with purge, as you could irreversibly delete some files\n"
3724 " Be careful with purge, as you could irreversibly delete some files\n"
3725 " you forgot to add to the repository. If you only want to print the\n"
3725 " you forgot to add to the repository. If you only want to print the\n"
3726 " list of files that this program would delete, use the --print\n"
3726 " list of files that this program would delete, use the --print\n"
3727 " option.\n"
3727 " option.\n"
3728 " "
3728 " "
3729 msgstr ""
3729 msgstr ""
3730
3730
3731 #, python-format
3731 #, python-format
3732 msgid "%s cannot be removed"
3732 msgid "%s cannot be removed"
3733 msgstr ""
3733 msgstr ""
3734
3734
3735 #, python-format
3735 #, python-format
3736 msgid "warning: %s\n"
3736 msgid "warning: %s\n"
3737 msgstr ""
3737 msgstr ""
3738
3738
3739 #, python-format
3739 #, python-format
3740 msgid "Removing file %s\n"
3740 msgid "Removing file %s\n"
3741 msgstr ""
3741 msgstr ""
3742
3742
3743 #, python-format
3743 #, python-format
3744 msgid "Removing directory %s\n"
3744 msgid "Removing directory %s\n"
3745 msgstr ""
3745 msgstr ""
3746
3746
3747 msgid "abort if an error occurs"
3747 msgid "abort if an error occurs"
3748 msgstr ""
3748 msgstr ""
3749
3749
3750 msgid "purge ignored files too"
3750 msgid "purge ignored files too"
3751 msgstr ""
3751 msgstr ""
3752
3752
3753 msgid "print filenames instead of deleting them"
3753 msgid "print filenames instead of deleting them"
3754 msgstr ""
3754 msgstr ""
3755
3755
3756 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3756 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3757 msgstr ""
3757 msgstr ""
3758
3758
3759 msgid "hg purge [OPTION]... [DIR]..."
3759 msgid "hg purge [OPTION]... [DIR]..."
3760 msgstr ""
3760 msgstr ""
3761
3761
3762 msgid ""
3762 msgid ""
3763 "move sets of revisions to a different ancestor\n"
3763 "move sets of revisions to a different ancestor\n"
3764 "\n"
3764 "\n"
3765 "This extension lets you rebase changesets in an existing Mercurial\n"
3765 "This extension lets you rebase changesets in an existing Mercurial\n"
3766 "repository.\n"
3766 "repository.\n"
3767 "\n"
3767 "\n"
3768 "For more information:\n"
3768 "For more information:\n"
3769 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3769 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3770 msgstr ""
3770 msgstr ""
3771
3771
3772 msgid "first revision, do not change ancestor\n"
3772 msgid "first revision, do not change ancestor\n"
3773 msgstr ""
3773 msgstr ""
3774
3774
3775 msgid ""
3775 msgid ""
3776 "move changeset (and descendants) to a different branch\n"
3776 "move changeset (and descendants) to a different branch\n"
3777 "\n"
3777 "\n"
3778 " Rebase uses repeated merging to graft changesets from one part of\n"
3778 " Rebase uses repeated merging to graft changesets from one part of\n"
3779 " history onto another. This can be useful for linearizing local\n"
3779 " history onto another. This can be useful for linearizing local\n"
3780 " changes relative to a master development tree.\n"
3780 " changes relative to a master development tree.\n"
3781 "\n"
3781 "\n"
3782 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3782 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3783 " continued with --continue/-c or aborted with --abort/-a.\n"
3783 " continued with --continue/-c or aborted with --abort/-a.\n"
3784 " "
3784 " "
3785 msgstr ""
3785 msgstr ""
3786
3786
3787 msgid "cannot use both abort and continue"
3787 msgid "cannot use both abort and continue"
3788 msgstr ""
3788 msgstr ""
3789
3789
3790 msgid "cannot use collapse with continue or abort"
3790 msgid "cannot use collapse with continue or abort"
3791 msgstr ""
3791 msgstr ""
3792
3792
3793 msgid "abort and continue do not allow specifying revisions"
3793 msgid "abort and continue do not allow specifying revisions"
3794 msgstr ""
3794 msgstr ""
3795
3795
3796 msgid "cannot specify both a revision and a base"
3796 msgid "cannot specify both a revision and a base"
3797 msgstr ""
3797 msgstr ""
3798
3798
3799 msgid "nothing to rebase\n"
3799 msgid "nothing to rebase\n"
3800 msgstr ""
3800 msgstr ""
3801
3801
3802 msgid "cannot use both keepbranches and extrafn"
3802 msgid "cannot use both keepbranches and extrafn"
3803 msgstr ""
3803 msgstr ""
3804
3804
3805 msgid "rebase merging completed\n"
3805 msgid "rebase merging completed\n"
3806 msgstr ""
3806 msgstr ""
3807
3807
3808 msgid "warning: new changesets detected on source branch, not stripping\n"
3808 msgid "warning: new changesets detected on source branch, not stripping\n"
3809 msgstr ""
3809 msgstr ""
3810
3810
3811 msgid "rebase completed\n"
3811 msgid "rebase completed\n"
3812 msgstr ""
3812 msgstr ""
3813
3813
3814 #, python-format
3814 #, python-format
3815 msgid "%d revisions have been skipped\n"
3815 msgid "%d revisions have been skipped\n"
3816 msgstr ""
3816 msgstr ""
3817
3817
3818 msgid " set parents\n"
3818 msgid " set parents\n"
3819 msgstr ""
3819 msgstr ""
3820
3820
3821 #, python-format
3821 #, python-format
3822 msgid "rebasing %d:%s\n"
3822 msgid "rebasing %d:%s\n"
3823 msgstr ""
3823 msgstr ""
3824
3824
3825 #, python-format
3825 #, python-format
3826 msgid " future parents are %d and %d\n"
3826 msgid " future parents are %d and %d\n"
3827 msgstr ""
3827 msgstr ""
3828
3828
3829 #, python-format
3829 #, python-format
3830 msgid " update to %d:%s\n"
3830 msgid " update to %d:%s\n"
3831 msgstr ""
3831 msgstr ""
3832
3832
3833 msgid " already in target\n"
3833 msgid " already in target\n"
3834 msgstr ""
3834 msgstr ""
3835
3835
3836 #, python-format
3836 #, python-format
3837 msgid " merge against %d:%s\n"
3837 msgid " merge against %d:%s\n"
3838 msgstr ""
3838 msgstr ""
3839
3839
3840 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3840 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3841 msgstr ""
3841 msgstr ""
3842
3842
3843 msgid "resuming interrupted rebase\n"
3843 msgid "resuming interrupted rebase\n"
3844 msgstr ""
3844 msgstr ""
3845
3845
3846 #, python-format
3846 #, python-format
3847 msgid "no changes, revision %d skipped\n"
3847 msgid "no changes, revision %d skipped\n"
3848 msgstr ""
3848 msgstr ""
3849
3849
3850 #, python-format
3850 #, python-format
3851 msgid "next revision set to %s\n"
3851 msgid "next revision set to %s\n"
3852 msgstr ""
3852 msgstr ""
3853
3853
3854 #, python-format
3854 #, python-format
3855 msgid "cannot use revision %d as base, result would have 3 parents"
3855 msgid "cannot use revision %d as base, result would have 3 parents"
3856 msgstr ""
3856 msgstr ""
3857
3857
3858 #, python-format
3858 #, python-format
3859 msgid "revision %d is an mq patch (%s), finalize it.\n"
3859 msgid "revision %d is an mq patch (%s), finalize it.\n"
3860 msgstr ""
3860 msgstr ""
3861
3861
3862 #, python-format
3862 #, python-format
3863 msgid "import mq patch %d (%s)\n"
3863 msgid "import mq patch %d (%s)\n"
3864 msgstr ""
3864 msgstr ""
3865
3865
3866 msgid "rebase status stored\n"
3866 msgid "rebase status stored\n"
3867 msgstr ""
3867 msgstr ""
3868
3868
3869 msgid "rebase status resumed\n"
3869 msgid "rebase status resumed\n"
3870 msgstr ""
3870 msgstr ""
3871
3871
3872 msgid "no rebase in progress"
3872 msgid "no rebase in progress"
3873 msgstr ""
3873 msgstr ""
3874
3874
3875 msgid "warning: new changesets detected on target branch, not stripping\n"
3875 msgid "warning: new changesets detected on target branch, not stripping\n"
3876 msgstr ""
3876 msgstr ""
3877
3877
3878 msgid "rebase aborted\n"
3878 msgid "rebase aborted\n"
3879 msgstr ""
3879 msgstr ""
3880
3880
3881 msgid "cannot rebase onto an applied mq patch"
3881 msgid "cannot rebase onto an applied mq patch"
3882 msgstr ""
3882 msgstr ""
3883
3883
3884 msgid "cannot rebase an ancestor"
3884 msgid "cannot rebase an ancestor"
3885 msgstr ""
3885 msgstr ""
3886
3886
3887 msgid "cannot rebase a descendant"
3887 msgid "cannot rebase a descendant"
3888 msgstr ""
3888 msgstr ""
3889
3889
3890 msgid "already working on current\n"
3890 msgid "already working on current\n"
3891 msgstr ""
3891 msgstr ""
3892
3892
3893 msgid "already working on the current branch\n"
3893 msgid "already working on the current branch\n"
3894 msgstr ""
3894 msgstr ""
3895
3895
3896 #, python-format
3896 #, python-format
3897 msgid "rebase onto %d starting from %d\n"
3897 msgid "rebase onto %d starting from %d\n"
3898 msgstr ""
3898 msgstr ""
3899
3899
3900 msgid "unable to collapse, there is more than one external parent"
3900 msgid "unable to collapse, there is more than one external parent"
3901 msgstr ""
3901 msgstr ""
3902
3902
3903 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3903 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3904 msgstr ""
3904 msgstr ""
3905
3905
3906 msgid "rebase working directory to branch head"
3906 msgid "rebase working directory to branch head"
3907 msgstr ""
3907 msgstr ""
3908
3908
3909 msgid "rebase from a given revision"
3909 msgid "rebase from a given revision"
3910 msgstr ""
3910 msgstr ""
3911
3911
3912 msgid "rebase from the base of a given revision"
3912 msgid "rebase from the base of a given revision"
3913 msgstr ""
3913 msgstr ""
3914
3914
3915 msgid "rebase onto a given revision"
3915 msgid "rebase onto a given revision"
3916 msgstr ""
3916 msgstr ""
3917
3917
3918 msgid "collapse the rebased revisions"
3918 msgid "collapse the rebased revisions"
3919 msgstr ""
3919 msgstr ""
3920
3920
3921 msgid "keep original revisions"
3921 msgid "keep original revisions"
3922 msgstr ""
3922 msgstr ""
3923
3923
3924 msgid "keep original branches"
3924 msgid "keep original branches"
3925 msgstr ""
3925 msgstr ""
3926
3926
3927 msgid "continue an interrupted rebase"
3927 msgid "continue an interrupted rebase"
3928 msgstr ""
3928 msgstr ""
3929
3929
3930 msgid "abort an interrupted rebase"
3930 msgid "abort an interrupted rebase"
3931 msgstr ""
3931 msgstr ""
3932
3932
3933 msgid ""
3933 msgid ""
3934 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
3934 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
3935 "| [-c] | [-a]"
3935 "| [-c] | [-a]"
3936 msgstr ""
3936 msgstr ""
3937
3937
3938 msgid "interactively select which sets of changes to commit/qrefresh"
3938 msgid "interactively select which sets of changes to commit/qrefresh"
3939 msgstr ""
3939 msgstr ""
3940
3940
3941 msgid "this modifies a binary file (all or nothing)\n"
3941 msgid "this modifies a binary file (all or nothing)\n"
3942 msgstr ""
3942 msgstr ""
3943
3943
3944 msgid "this is a binary file\n"
3944 msgid "this is a binary file\n"
3945 msgstr ""
3945 msgstr ""
3946
3946
3947 #, python-format
3947 #, python-format
3948 msgid "%d hunks, %d lines changed\n"
3948 msgid "%d hunks, %d lines changed\n"
3949 msgstr ""
3949 msgstr ""
3950
3950
3951 msgid "[Ynsfdaq?]"
3951 msgid "[Ynsfdaq?]"
3952 msgstr ""
3952 msgstr ""
3953
3953
3954 msgid "&Yes, record this change"
3954 msgid "&Yes, record this change"
3955 msgstr ""
3955 msgstr ""
3956
3956
3957 msgid "&No, skip this change"
3957 msgid "&No, skip this change"
3958 msgstr ""
3958 msgstr ""
3959
3959
3960 msgid "&Skip remaining changes to this file"
3960 msgid "&Skip remaining changes to this file"
3961 msgstr ""
3961 msgstr ""
3962
3962
3963 msgid "Record remaining changes to this &file"
3963 msgid "Record remaining changes to this &file"
3964 msgstr ""
3964 msgstr ""
3965
3965
3966 msgid "&Done, skip remaining changes and files"
3966 msgid "&Done, skip remaining changes and files"
3967 msgstr ""
3967 msgstr ""
3968
3968
3969 msgid "Record &all changes to all remaining files"
3969 msgid "Record &all changes to all remaining files"
3970 msgstr ""
3970 msgstr ""
3971
3971
3972 msgid "&Quit, recording no changes"
3972 msgid "&Quit, recording no changes"
3973 msgstr ""
3973 msgstr ""
3974
3974
3975 msgid "&?"
3975 msgid "&?"
3976 msgstr ""
3976 msgstr ""
3977
3977
3978 msgid "y"
3978 msgid "y"
3979 msgstr ""
3979 msgstr ""
3980
3980
3981 msgid "?"
3981 msgid "?"
3982 msgstr ""
3982 msgstr ""
3983
3983
3984 msgid "y - record this change"
3984 msgid "y - record this change"
3985 msgstr ""
3985 msgstr ""
3986
3986
3987 msgid "s"
3987 msgid "s"
3988 msgstr ""
3988 msgstr ""
3989
3989
3990 msgid "f"
3990 msgid "f"
3991 msgstr ""
3991 msgstr ""
3992
3992
3993 msgid "d"
3993 msgid "d"
3994 msgstr ""
3994 msgstr ""
3995
3995
3996 msgid "a"
3996 msgid "a"
3997 msgstr ""
3997 msgstr ""
3998
3998
3999 msgid "q"
3999 msgid "q"
4000 msgstr ""
4000 msgstr ""
4001
4001
4002 msgid "user quit"
4002 msgid "user quit"
4003 msgstr ""
4003 msgstr ""
4004
4004
4005 #, python-format
4005 #, python-format
4006 msgid "examine changes to %s?"
4006 msgid "examine changes to %s?"
4007 msgstr ""
4007 msgstr ""
4008
4008
4009 msgid " and "
4009 msgid " and "
4010 msgstr ""
4010 msgstr ""
4011
4011
4012 #, python-format
4012 #, python-format
4013 msgid "record this change to %r?"
4013 msgid "record this change to %r?"
4014 msgstr ""
4014 msgstr ""
4015
4015
4016 #, python-format
4016 #, python-format
4017 msgid "record change %d/%d to %r?"
4017 msgid "record change %d/%d to %r?"
4018 msgstr ""
4018 msgstr ""
4019
4019
4020 msgid ""
4020 msgid ""
4021 "interactively select changes to commit\n"
4021 "interactively select changes to commit\n"
4022 "\n"
4022 "\n"
4023 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4023 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4024 " will be candidates for recording.\n"
4024 " will be candidates for recording.\n"
4025 "\n"
4025 "\n"
4026 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4026 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4027 "\n"
4027 "\n"
4028 " You will be prompted for whether to record changes to each\n"
4028 " You will be prompted for whether to record changes to each\n"
4029 " modified file, and for files with multiple changes, for each\n"
4029 " modified file, and for files with multiple changes, for each\n"
4030 " change to use. For each query, the following responses are\n"
4030 " change to use. For each query, the following responses are\n"
4031 " possible:\n"
4031 " possible:\n"
4032 "\n"
4032 "\n"
4033 " y - record this change\n"
4033 " y - record this change\n"
4034 " n - skip this change\n"
4034 " n - skip this change\n"
4035 "\n"
4035 "\n"
4036 " s - skip remaining changes to this file\n"
4036 " s - skip remaining changes to this file\n"
4037 " f - record remaining changes to this file\n"
4037 " f - record remaining changes to this file\n"
4038 "\n"
4038 "\n"
4039 " d - done, skip remaining changes and files\n"
4039 " d - done, skip remaining changes and files\n"
4040 " a - record all changes to all remaining files\n"
4040 " a - record all changes to all remaining files\n"
4041 " q - quit, recording no changes\n"
4041 " q - quit, recording no changes\n"
4042 "\n"
4042 "\n"
4043 " ? - display help"
4043 " ? - display help"
4044 msgstr ""
4044 msgstr ""
4045
4045
4046 msgid "'mq' extension not loaded"
4046 msgid "'mq' extension not loaded"
4047 msgstr ""
4047 msgstr ""
4048
4048
4049 msgid "running non-interactively, use commit instead"
4049 msgid "running non-interactively, use commit instead"
4050 msgstr ""
4050 msgstr ""
4051
4051
4052 msgid "no changes to record\n"
4052 msgid "no changes to record\n"
4053 msgstr ""
4053 msgstr ""
4054
4054
4055 #, python-format
4055 #, python-format
4056 msgid "backup %r as %r\n"
4056 msgid "backup %r as %r\n"
4057 msgstr ""
4057 msgstr ""
4058
4058
4059 msgid "applying patch\n"
4059 msgid "applying patch\n"
4060 msgstr ""
4060 msgstr ""
4061
4061
4062 msgid "patch failed to apply"
4062 msgid "patch failed to apply"
4063 msgstr ""
4063 msgstr ""
4064
4064
4065 #, python-format
4065 #, python-format
4066 msgid "restoring %r to %r\n"
4066 msgid "restoring %r to %r\n"
4067 msgstr ""
4067 msgstr ""
4068
4068
4069 msgid "hg record [OPTION]... [FILE]..."
4069 msgid "hg record [OPTION]... [FILE]..."
4070 msgstr ""
4070 msgstr ""
4071
4071
4072 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4072 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4073 msgstr ""
4073 msgstr ""
4074
4074
4075 msgid "share a common history between several working directories"
4075 msgid "share a common history between several working directories"
4076 msgstr ""
4076 msgstr ""
4077
4077
4078 msgid ""
4078 msgid ""
4079 "create a new shared repository (experimental)\n"
4079 "create a new shared repository (experimental)\n"
4080 "\n"
4080 "\n"
4081 " Initialize a new repository and working directory that shares its\n"
4081 " Initialize a new repository and working directory that shares its\n"
4082 " history with another repository.\n"
4082 " history with another repository.\n"
4083 "\n"
4083 "\n"
4084 " NOTE: actions that change history such as rollback or moving the\n"
4084 " NOTE: actions that change history such as rollback or moving the\n"
4085 " source may confuse sharers.\n"
4085 " source may confuse sharers.\n"
4086 " "
4086 " "
4087 msgstr ""
4087 msgstr ""
4088
4088
4089 msgid "do not create a working copy"
4089 msgid "do not create a working copy"
4090 msgstr ""
4090 msgstr ""
4091
4091
4092 msgid "[-U] SOURCE [DEST]"
4092 msgid "[-U] SOURCE [DEST]"
4093 msgstr ""
4093 msgstr ""
4094
4094
4095 msgid ""
4095 msgid ""
4096 "transplant changesets from another branch\n"
4096 "transplant changesets from another branch\n"
4097 "\n"
4097 "\n"
4098 "This extension allows you to transplant patches from another branch.\n"
4098 "This extension allows you to transplant patches from another branch.\n"
4099 "\n"
4099 "\n"
4100 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4100 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4101 "map from a changeset hash to its hash in the source repository.\n"
4101 "map from a changeset hash to its hash in the source repository.\n"
4102 msgstr ""
4102 msgstr ""
4103
4103
4104 #, python-format
4104 #, python-format
4105 msgid "skipping already applied revision %s\n"
4105 msgid "skipping already applied revision %s\n"
4106 msgstr ""
4106 msgstr ""
4107
4107
4108 #, python-format
4108 #, python-format
4109 msgid "skipping merge changeset %s:%s\n"
4109 msgid "skipping merge changeset %s:%s\n"
4110 msgstr ""
4110 msgstr ""
4111
4111
4112 #, python-format
4112 #, python-format
4113 msgid "%s merged at %s\n"
4113 msgid "%s merged at %s\n"
4114 msgstr ""
4114 msgstr ""
4115
4115
4116 #, python-format
4116 #, python-format
4117 msgid "%s transplanted to %s\n"
4117 msgid "%s transplanted to %s\n"
4118 msgstr ""
4118 msgstr ""
4119
4119
4120 #, python-format
4120 #, python-format
4121 msgid "filtering %s\n"
4121 msgid "filtering %s\n"
4122 msgstr ""
4122 msgstr ""
4123
4123
4124 msgid "filter failed"
4124 msgid "filter failed"
4125 msgstr ""
4125 msgstr ""
4126
4126
4127 msgid "can only omit patchfile if merging"
4127 msgid "can only omit patchfile if merging"
4128 msgstr ""
4128 msgstr ""
4129
4129
4130 #, python-format
4130 #, python-format
4131 msgid "%s: empty changeset"
4131 msgid "%s: empty changeset"
4132 msgstr ""
4132 msgstr ""
4133
4133
4134 msgid "Fix up the merge and run hg transplant --continue"
4134 msgid "Fix up the merge and run hg transplant --continue"
4135 msgstr ""
4135 msgstr ""
4136
4136
4137 #, python-format
4137 #, python-format
4138 msgid "%s transplanted as %s\n"
4138 msgid "%s transplanted as %s\n"
4139 msgstr ""
4139 msgstr ""
4140
4140
4141 msgid "transplant log file is corrupt"
4141 msgid "transplant log file is corrupt"
4142 msgstr ""
4142 msgstr ""
4143
4143
4144 #, python-format
4144 #, python-format
4145 msgid "working dir not at transplant parent %s"
4145 msgid "working dir not at transplant parent %s"
4146 msgstr ""
4146 msgstr ""
4147
4147
4148 msgid "commit failed"
4148 msgid "commit failed"
4149 msgstr ""
4149 msgstr ""
4150
4150
4151 msgid "apply changeset? [ynmpcq?]:"
4151 msgid "apply changeset? [ynmpcq?]:"
4152 msgstr ""
4152 msgstr ""
4153
4153
4154 msgid ""
4154 msgid ""
4155 "transplant changesets from another branch\n"
4155 "transplant changesets from another branch\n"
4156 "\n"
4156 "\n"
4157 " Selected changesets will be applied on top of the current working\n"
4157 " Selected changesets will be applied on top of the current working\n"
4158 " directory with the log of the original changeset. If --log is\n"
4158 " directory with the log of the original changeset. If --log is\n"
4159 " specified, log messages will have a comment appended of the form:\n"
4159 " specified, log messages will have a comment appended of the form:\n"
4160 "\n"
4160 "\n"
4161 " (transplanted from CHANGESETHASH)\n"
4161 " (transplanted from CHANGESETHASH)\n"
4162 "\n"
4162 "\n"
4163 " You can rewrite the changelog message with the --filter option.\n"
4163 " You can rewrite the changelog message with the --filter option.\n"
4164 " Its argument will be invoked with the current changelog message as\n"
4164 " Its argument will be invoked with the current changelog message as\n"
4165 " $1 and the patch as $2.\n"
4165 " $1 and the patch as $2.\n"
4166 "\n"
4166 "\n"
4167 " If --source/-s is specified, selects changesets from the named\n"
4167 " If --source/-s is specified, selects changesets from the named\n"
4168 " repository. If --branch/-b is specified, selects changesets from\n"
4168 " repository. If --branch/-b is specified, selects changesets from\n"
4169 " the branch holding the named revision, up to that revision. If\n"
4169 " the branch holding the named revision, up to that revision. If\n"
4170 " --all/-a is specified, all changesets on the branch will be\n"
4170 " --all/-a is specified, all changesets on the branch will be\n"
4171 " transplanted, otherwise you will be prompted to select the\n"
4171 " transplanted, otherwise you will be prompted to select the\n"
4172 " changesets you want.\n"
4172 " changesets you want.\n"
4173 "\n"
4173 "\n"
4174 " hg transplant --branch REVISION --all will rebase the selected\n"
4174 " hg transplant --branch REVISION --all will rebase the selected\n"
4175 " branch (up to the named revision) onto your current working\n"
4175 " branch (up to the named revision) onto your current working\n"
4176 " directory.\n"
4176 " directory.\n"
4177 "\n"
4177 "\n"
4178 " You can optionally mark selected transplanted changesets as merge\n"
4178 " You can optionally mark selected transplanted changesets as merge\n"
4179 " changesets. You will not be prompted to transplant any ancestors\n"
4179 " changesets. You will not be prompted to transplant any ancestors\n"
4180 " of a merged transplant, and you can merge descendants of them\n"
4180 " of a merged transplant, and you can merge descendants of them\n"
4181 " normally instead of transplanting them.\n"
4181 " normally instead of transplanting them.\n"
4182 "\n"
4182 "\n"
4183 " If no merges or revisions are provided, hg transplant will start\n"
4183 " If no merges or revisions are provided, hg transplant will start\n"
4184 " an interactive changeset browser.\n"
4184 " an interactive changeset browser.\n"
4185 "\n"
4185 "\n"
4186 " If a changeset application fails, you can fix the merge by hand\n"
4186 " If a changeset application fails, you can fix the merge by hand\n"
4187 " and then resume where you left off by calling hg transplant\n"
4187 " and then resume where you left off by calling hg transplant\n"
4188 " --continue/-c.\n"
4188 " --continue/-c.\n"
4189 " "
4189 " "
4190 msgstr ""
4190 msgstr ""
4191
4191
4192 msgid "--continue is incompatible with branch, all or merge"
4192 msgid "--continue is incompatible with branch, all or merge"
4193 msgstr ""
4193 msgstr ""
4194
4194
4195 msgid "no source URL, branch tag or revision list provided"
4195 msgid "no source URL, branch tag or revision list provided"
4196 msgstr ""
4196 msgstr ""
4197
4197
4198 msgid "--all requires a branch revision"
4198 msgid "--all requires a branch revision"
4199 msgstr ""
4199 msgstr ""
4200
4200
4201 msgid "--all is incompatible with a revision list"
4201 msgid "--all is incompatible with a revision list"
4202 msgstr ""
4202 msgstr ""
4203
4203
4204 msgid "no revision checked out"
4204 msgid "no revision checked out"
4205 msgstr ""
4205 msgstr ""
4206
4206
4207 msgid "outstanding uncommitted merges"
4207 msgid "outstanding uncommitted merges"
4208 msgstr ""
4208 msgstr ""
4209
4209
4210 msgid "outstanding local changes"
4210 msgid "outstanding local changes"
4211 msgstr ""
4211 msgstr ""
4212
4212
4213 msgid "pull patches from REPOSITORY"
4213 msgid "pull patches from REPOSITORY"
4214 msgstr ""
4214 msgstr ""
4215
4215
4216 msgid "pull patches from branch BRANCH"
4216 msgid "pull patches from branch BRANCH"
4217 msgstr ""
4217 msgstr ""
4218
4218
4219 msgid "pull all changesets up to BRANCH"
4219 msgid "pull all changesets up to BRANCH"
4220 msgstr ""
4220 msgstr ""
4221
4221
4222 msgid "skip over REV"
4222 msgid "skip over REV"
4223 msgstr ""
4223 msgstr ""
4224
4224
4225 msgid "merge at REV"
4225 msgid "merge at REV"
4226 msgstr ""
4226 msgstr ""
4227
4227
4228 msgid "append transplant info to log message"
4228 msgid "append transplant info to log message"
4229 msgstr ""
4229 msgstr ""
4230
4230
4231 msgid "continue last transplant session after repair"
4231 msgid "continue last transplant session after repair"
4232 msgstr ""
4232 msgstr ""
4233
4233
4234 msgid "filter changesets through FILTER"
4234 msgid "filter changesets through FILTER"
4235 msgstr ""
4235 msgstr ""
4236
4236
4237 msgid ""
4237 msgid ""
4238 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4238 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4239 msgstr ""
4239 msgstr ""
4240
4240
4241 msgid ""
4241 msgid ""
4242 "allow the use of MBCS paths with problematic encoding\n"
4242 "allow the use of MBCS paths with problematic encoding\n"
4243 "\n"
4243 "\n"
4244 "Some MBCS encodings are not good for some path operations (i.e.\n"
4244 "Some MBCS encodings are not good for some path operations (i.e.\n"
4245 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4245 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4246 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4246 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4247 "This extension can be used to fix the issue with those encodings by\n"
4247 "This extension can be used to fix the issue with those encodings by\n"
4248 "wrapping some functions to convert to Unicode string before path\n"
4248 "wrapping some functions to convert to Unicode string before path\n"
4249 "operation.\n"
4249 "operation.\n"
4250 "\n"
4250 "\n"
4251 "This extension is useful for:\n"
4251 "This extension is useful for:\n"
4252 " * Japanese Windows users using shift_jis encoding.\n"
4252 " * Japanese Windows users using shift_jis encoding.\n"
4253 " * Chinese Windows users using big5 encoding.\n"
4253 " * Chinese Windows users using big5 encoding.\n"
4254 " * All users who use a repository with one of problematic encodings on\n"
4254 " * All users who use a repository with one of problematic encodings on\n"
4255 " case-insensitive file system.\n"
4255 " case-insensitive file system.\n"
4256 "\n"
4256 "\n"
4257 "This extension is not needed for:\n"
4257 "This extension is not needed for:\n"
4258 " * Any user who use only ASCII chars in path.\n"
4258 " * Any user who use only ASCII chars in path.\n"
4259 " * Any user who do not use any of problematic encodings.\n"
4259 " * Any user who do not use any of problematic encodings.\n"
4260 "\n"
4260 "\n"
4261 "Note that there are some limitations on using this extension:\n"
4261 "Note that there are some limitations on using this extension:\n"
4262 " * You should use single encoding in one repository.\n"
4262 " * You should use single encoding in one repository.\n"
4263 " * You should set same encoding for the repository by locale or\n"
4263 " * You should set same encoding for the repository by locale or\n"
4264 " HGENCODING.\n"
4264 " HGENCODING.\n"
4265 "\n"
4265 "\n"
4266 "Path encoding conversion are done between Unicode and\n"
4266 "Path encoding conversion are done between Unicode and\n"
4267 "encoding.encoding which is decided by Mercurial from current locale\n"
4267 "encoding.encoding which is decided by Mercurial from current locale\n"
4268 "setting or HGENCODING.\n"
4268 "setting or HGENCODING.\n"
4269 msgstr ""
4269 msgstr ""
4270
4270
4271 #, python-format
4271 #, python-format
4272 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4272 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4273 msgstr ""
4273 msgstr ""
4274
4274
4275 msgid "[win32mbcs] cannot activate on this platform.\n"
4275 msgid "[win32mbcs] cannot activate on this platform.\n"
4276 msgstr ""
4276 msgstr ""
4277
4277
4278 #, python-format
4278 #, python-format
4279 msgid "[win32mbcs] activated with encoding: %s\n"
4279 msgid "[win32mbcs] activated with encoding: %s\n"
4280 msgstr ""
4280 msgstr ""
4281
4281
4282 msgid ""
4282 msgid ""
4283 "perform automatic newline conversion\n"
4283 "perform automatic newline conversion\n"
4284 "\n"
4284 "\n"
4285 "To perform automatic newline conversion, use:\n"
4285 "To perform automatic newline conversion, use:\n"
4286 "\n"
4286 "\n"
4287 "[extensions]\n"
4287 "[extensions]\n"
4288 "hgext.win32text =\n"
4288 "hgext.win32text =\n"
4289 "[encode]\n"
4289 "[encode]\n"
4290 "** = cleverencode:\n"
4290 "** = cleverencode:\n"
4291 "# or ** = macencode:\n"
4291 "# or ** = macencode:\n"
4292 "\n"
4292 "\n"
4293 "[decode]\n"
4293 "[decode]\n"
4294 "** = cleverdecode:\n"
4294 "** = cleverdecode:\n"
4295 "# or ** = macdecode:\n"
4295 "# or ** = macdecode:\n"
4296 "\n"
4296 "\n"
4297 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4297 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4298 "accident:\n"
4298 "accident:\n"
4299 "\n"
4299 "\n"
4300 "[hooks]\n"
4300 "[hooks]\n"
4301 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4301 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4302 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4302 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4303 "\n"
4303 "\n"
4304 "To do the same check on a server to prevent CRLF/CR from being\n"
4304 "To do the same check on a server to prevent CRLF/CR from being\n"
4305 "pushed or pulled:\n"
4305 "pushed or pulled:\n"
4306 "\n"
4306 "\n"
4307 "[hooks]\n"
4307 "[hooks]\n"
4308 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4308 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4309 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4309 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4310 msgstr ""
4310 msgstr ""
4311
4311
4312 #, python-format
4312 #, python-format
4313 msgid ""
4313 msgid ""
4314 "WARNING: %s already has %s line endings\n"
4314 "WARNING: %s already has %s line endings\n"
4315 "and does not need EOL conversion by the win32text plugin.\n"
4315 "and does not need EOL conversion by the win32text plugin.\n"
4316 "Before your next commit, please reconsider your encode/decode settings in \n"
4316 "Before your next commit, please reconsider your encode/decode settings in \n"
4317 "Mercurial.ini or %s.\n"
4317 "Mercurial.ini or %s.\n"
4318 msgstr ""
4318 msgstr ""
4319
4319
4320 #, python-format
4320 #, python-format
4321 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4321 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4322 msgstr ""
4322 msgstr ""
4323
4323
4324 #, python-format
4324 #, python-format
4325 msgid "in %s: %s\n"
4325 msgid "in %s: %s\n"
4326 msgstr ""
4326 msgstr ""
4327
4327
4328 #, python-format
4328 #, python-format
4329 msgid ""
4329 msgid ""
4330 "\n"
4330 "\n"
4331 "To prevent this mistake in your local repository,\n"
4331 "To prevent this mistake in your local repository,\n"
4332 "add to Mercurial.ini or .hg/hgrc:\n"
4332 "add to Mercurial.ini or .hg/hgrc:\n"
4333 "\n"
4333 "\n"
4334 "[hooks]\n"
4334 "[hooks]\n"
4335 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4335 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4336 "\n"
4336 "\n"
4337 "and also consider adding:\n"
4337 "and also consider adding:\n"
4338 "\n"
4338 "\n"
4339 "[extensions]\n"
4339 "[extensions]\n"
4340 "hgext.win32text =\n"
4340 "hgext.win32text =\n"
4341 "[encode]\n"
4341 "[encode]\n"
4342 "** = %sencode:\n"
4342 "** = %sencode:\n"
4343 "[decode]\n"
4343 "[decode]\n"
4344 "** = %sdecode:\n"
4344 "** = %sdecode:\n"
4345 msgstr ""
4345 msgstr ""
4346
4346
4347 msgid ""
4347 msgid ""
4348 "discover and advertise repositories on the local network\n"
4348 "discover and advertise repositories on the local network\n"
4349 "\n"
4349 "\n"
4350 "Zeroconf enabled repositories will be announced in a network without\n"
4350 "Zeroconf enabled repositories will be announced in a network without\n"
4351 "the need to configure a server or a service. They can be discovered\n"
4351 "the need to configure a server or a service. They can be discovered\n"
4352 "without knowing their actual IP address.\n"
4352 "without knowing their actual IP address.\n"
4353 "\n"
4353 "\n"
4354 "To allow other people to discover your repository using run \"hg serve\"\n"
4354 "To allow other people to discover your repository using run \"hg serve\"\n"
4355 "in your repository.\n"
4355 "in your repository.\n"
4356 "\n"
4356 "\n"
4357 " $ cd test\n"
4357 " $ cd test\n"
4358 " $ hg serve\n"
4358 " $ hg serve\n"
4359 "\n"
4359 "\n"
4360 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4360 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4361 "\n"
4361 "\n"
4362 " $ hg paths\n"
4362 " $ hg paths\n"
4363 " zc-test = http://example.com:8000/test\n"
4363 " zc-test = http://example.com:8000/test\n"
4364 msgstr ""
4364 msgstr ""
4365
4365
4366 msgid "archive prefix contains illegal components"
4366 msgid "archive prefix contains illegal components"
4367 msgstr ""
4367 msgstr ""
4368
4368
4369 msgid "cannot give prefix when archiving to files"
4369 msgid "cannot give prefix when archiving to files"
4370 msgstr ""
4370 msgstr ""
4371
4371
4372 #, python-format
4372 #, python-format
4373 msgid "unknown archive type '%s'"
4373 msgid "unknown archive type '%s'"
4374 msgstr ""
4374 msgstr ""
4375
4375
4376 msgid "invalid changegroup"
4376 msgid "invalid changegroup"
4377 msgstr ""
4377 msgstr ""
4378
4378
4379 msgid "unknown parent"
4379 msgid "unknown parent"
4380 msgstr ""
4380 msgstr ""
4381
4381
4382 #, python-format
4382 #, python-format
4383 msgid "integrity check failed on %s:%d"
4383 msgid "integrity check failed on %s:%d"
4384 msgstr ""
4384 msgstr ""
4385
4385
4386 #, python-format
4386 #, python-format
4387 msgid "%s: not a Mercurial bundle file"
4387 msgid "%s: not a Mercurial bundle file"
4388 msgstr ""
4388 msgstr ""
4389
4389
4390 #, python-format
4390 #, python-format
4391 msgid "%s: unknown bundle version"
4391 msgid "%s: unknown bundle version"
4392 msgstr ""
4392 msgstr ""
4393
4393
4394 #, python-format
4394 #, python-format
4395 msgid "%s: unknown bundle compression type"
4395 msgid "%s: unknown bundle compression type"
4396 msgstr ""
4396 msgstr ""
4397
4397
4398 msgid "cannot create new bundle repository"
4398 msgid "cannot create new bundle repository"
4399 msgstr ""
4399 msgstr ""
4400
4400
4401 #, python-format
4401 #, python-format
4402 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4402 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4403 msgstr ""
4403 msgstr ""
4404
4404
4405 msgid "empty username"
4405 msgid "empty username"
4406 msgstr ""
4406 msgstr ""
4407
4407
4408 #, python-format
4408 #, python-format
4409 msgid "username %s contains a newline"
4409 msgid "username %s contains a newline"
4410 msgstr ""
4410 msgstr ""
4411
4411
4412 msgid "options --message and --logfile are mutually exclusive"
4412 msgid "options --message and --logfile are mutually exclusive"
4413 msgstr ""
4413 msgstr ""
4414
4414
4415 #, python-format
4415 #, python-format
4416 msgid "can't read commit message '%s': %s"
4416 msgid "can't read commit message '%s': %s"
4417 msgstr ""
4417 msgstr ""
4418
4418
4419 msgid "limit must be a positive integer"
4419 msgid "limit must be a positive integer"
4420 msgstr ""
4420 msgstr ""
4421
4421
4422 msgid "limit must be positive"
4422 msgid "limit must be positive"
4423 msgstr ""
4423 msgstr ""
4424
4424
4425 msgid "too many revisions specified"
4425 msgid "too many revisions specified"
4426 msgstr ""
4426 msgstr ""
4427
4427
4428 #, python-format
4428 #, python-format
4429 msgid "invalid format spec '%%%s' in output filename"
4429 msgid "invalid format spec '%%%s' in output filename"
4430 msgstr ""
4430 msgstr ""
4431
4431
4432 #, python-format
4432 #, python-format
4433 msgid "adding %s\n"
4433 msgid "adding %s\n"
4434 msgstr ""
4434 msgstr ""
4435
4435
4436 #, python-format
4436 #, python-format
4437 msgid "removing %s\n"
4437 msgid "removing %s\n"
4438 msgstr ""
4438 msgstr ""
4439
4439
4440 #, python-format
4440 #, python-format
4441 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4441 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4442 msgstr ""
4442 msgstr ""
4443
4443
4444 #, python-format
4444 #, python-format
4445 msgid "%s: not copying - file is not managed\n"
4445 msgid "%s: not copying - file is not managed\n"
4446 msgstr ""
4446 msgstr ""
4447
4447
4448 #, python-format
4448 #, python-format
4449 msgid "%s: not copying - file has been marked for remove\n"
4449 msgid "%s: not copying - file has been marked for remove\n"
4450 msgstr ""
4450 msgstr ""
4451
4451
4452 #, python-format
4452 #, python-format
4453 msgid "%s: not overwriting - %s collides with %s\n"
4453 msgid "%s: not overwriting - %s collides with %s\n"
4454 msgstr ""
4454 msgstr ""
4455
4455
4456 #, python-format
4456 #, python-format
4457 msgid "%s: not overwriting - file exists\n"
4457 msgid "%s: not overwriting - file exists\n"
4458 msgstr ""
4458 msgstr ""
4459
4459
4460 #, python-format
4460 #, python-format
4461 msgid "%s: deleted in working copy\n"
4461 msgid "%s: deleted in working copy\n"
4462 msgstr ""
4462 msgstr ""
4463
4463
4464 #, python-format
4464 #, python-format
4465 msgid "%s: cannot copy - %s\n"
4465 msgid "%s: cannot copy - %s\n"
4466 msgstr ""
4466 msgstr ""
4467
4467
4468 #, python-format
4468 #, python-format
4469 msgid "moving %s to %s\n"
4469 msgid "moving %s to %s\n"
4470 msgstr ""
4470 msgstr ""
4471
4471
4472 #, python-format
4472 #, python-format
4473 msgid "copying %s to %s\n"
4473 msgid "copying %s to %s\n"
4474 msgstr ""
4474 msgstr ""
4475
4475
4476 #, python-format
4476 #, python-format
4477 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4477 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4478 msgstr ""
4478 msgstr ""
4479
4479
4480 msgid "no source or destination specified"
4480 msgid "no source or destination specified"
4481 msgstr ""
4481 msgstr ""
4482
4482
4483 msgid "no destination specified"
4483 msgid "no destination specified"
4484 msgstr ""
4484 msgstr ""
4485
4485
4486 msgid "with multiple sources, destination must be an existing directory"
4486 msgid "with multiple sources, destination must be an existing directory"
4487 msgstr ""
4487 msgstr ""
4488
4488
4489 #, python-format
4489 #, python-format
4490 msgid "destination %s is not a directory"
4490 msgid "destination %s is not a directory"
4491 msgstr ""
4491 msgstr ""
4492
4492
4493 msgid "no files to copy"
4493 msgid "no files to copy"
4494 msgstr ""
4494 msgstr ""
4495
4495
4496 msgid "(consider using --after)\n"
4496 msgid "(consider using --after)\n"
4497 msgstr ""
4497 msgstr ""
4498
4498
4499 #, python-format
4499 #, python-format
4500 msgid "changeset: %d:%s\n"
4500 msgid "changeset: %d:%s\n"
4501 msgstr ""
4501 msgstr ""
4502
4502
4503 #, python-format
4503 #, python-format
4504 msgid "branch: %s\n"
4504 msgid "branch: %s\n"
4505 msgstr ""
4505 msgstr ""
4506
4506
4507 #, python-format
4507 #, python-format
4508 msgid "tag: %s\n"
4508 msgid "tag: %s\n"
4509 msgstr ""
4509 msgstr ""
4510
4510
4511 #, python-format
4511 #, python-format
4512 msgid "parent: %d:%s\n"
4512 msgid "parent: %d:%s\n"
4513 msgstr ""
4513 msgstr ""
4514
4514
4515 #, python-format
4515 #, python-format
4516 msgid "manifest: %d:%s\n"
4516 msgid "manifest: %d:%s\n"
4517 msgstr ""
4517 msgstr ""
4518
4518
4519 #, python-format
4519 #, python-format
4520 msgid "user: %s\n"
4520 msgid "user: %s\n"
4521 msgstr ""
4521 msgstr ""
4522
4522
4523 #, python-format
4523 #, python-format
4524 msgid "date: %s\n"
4524 msgid "date: %s\n"
4525 msgstr ""
4525 msgstr ""
4526
4526
4527 msgid "files+:"
4527 msgid "files+:"
4528 msgstr ""
4528 msgstr ""
4529
4529
4530 msgid "files-:"
4530 msgid "files-:"
4531 msgstr ""
4531 msgstr ""
4532
4532
4533 msgid "files:"
4533 msgid "files:"
4534 msgstr ""
4534 msgstr ""
4535
4535
4536 #, python-format
4536 #, python-format
4537 msgid "files: %s\n"
4537 msgid "files: %s\n"
4538 msgstr ""
4538 msgstr ""
4539
4539
4540 #, python-format
4540 #, python-format
4541 msgid "copies: %s\n"
4541 msgid "copies: %s\n"
4542 msgstr ""
4542 msgstr ""
4543
4543
4544 #, python-format
4544 #, python-format
4545 msgid "extra: %s=%s\n"
4545 msgid "extra: %s=%s\n"
4546 msgstr ""
4546 msgstr ""
4547
4547
4548 msgid "description:\n"
4548 msgid "description:\n"
4549 msgstr ""
4549 msgstr ""
4550
4550
4551 #, python-format
4551 #, python-format
4552 msgid "summary: %s\n"
4552 msgid "summary: %s\n"
4553 msgstr ""
4553 msgstr ""
4554
4554
4555 #, python-format
4555 #, python-format
4556 msgid "%s: no key named '%s'"
4556 msgid "%s: no key named '%s'"
4557 msgstr ""
4557 msgstr ""
4558
4558
4559 #, python-format
4559 #, python-format
4560 msgid "%s: %s"
4560 msgid "%s: %s"
4561 msgstr ""
4561 msgstr ""
4562
4562
4563 #, python-format
4563 #, python-format
4564 msgid "Found revision %s from %s\n"
4564 msgid "Found revision %s from %s\n"
4565 msgstr ""
4565 msgstr ""
4566
4566
4567 msgid "revision matching date not found"
4567 msgid "revision matching date not found"
4568 msgstr ""
4568 msgstr ""
4569
4569
4570 #, python-format
4570 #, python-format
4571 msgid "cannot follow nonexistent file: \"%s\""
4571 msgid "cannot follow nonexistent file: \"%s\""
4572 msgstr ""
4572 msgstr ""
4573
4573
4574 #, python-format
4574 #, python-format
4575 msgid "%s:%s copy source revision cannot be found!\n"
4575 msgid "%s:%s copy source revision cannot be found!\n"
4576 msgstr ""
4576 msgstr ""
4577
4577
4578 msgid "can only follow copies/renames for explicit filenames"
4578 msgid "can only follow copies/renames for explicit filenames"
4579 msgstr ""
4579 msgstr ""
4580
4580
4581 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4581 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4582 msgstr ""
4582 msgstr ""
4583
4583
4584 msgid "HG: Leave message empty to abort commit."
4584 msgid "HG: Leave message empty to abort commit."
4585 msgstr ""
4585 msgstr ""
4586
4586
4587 #, python-format
4587 #, python-format
4588 msgid "HG: user: %s"
4588 msgid "HG: user: %s"
4589 msgstr ""
4589 msgstr ""
4590
4590
4591 msgid "HG: branch merge"
4591 msgid "HG: branch merge"
4592 msgstr ""
4592 msgstr ""
4593
4593
4594 #, python-format
4594 #, python-format
4595 msgid "HG: branch '%s'"
4595 msgid "HG: branch '%s'"
4596 msgstr ""
4596 msgstr ""
4597
4597
4598 #, python-format
4598 #, python-format
4599 msgid "HG: added %s"
4599 msgid "HG: added %s"
4600 msgstr ""
4600 msgstr ""
4601
4601
4602 #, python-format
4602 #, python-format
4603 msgid "HG: changed %s"
4603 msgid "HG: changed %s"
4604 msgstr ""
4604 msgstr ""
4605
4605
4606 #, python-format
4606 #, python-format
4607 msgid "HG: removed %s"
4607 msgid "HG: removed %s"
4608 msgstr ""
4608 msgstr ""
4609
4609
4610 msgid "HG: no files changed"
4610 msgid "HG: no files changed"
4611 msgstr ""
4611 msgstr ""
4612
4612
4613 msgid "empty commit message"
4613 msgid "empty commit message"
4614 msgstr ""
4614 msgstr ""
4615
4615
4616 msgid ""
4616 msgid ""
4617 "add the specified files on the next commit\n"
4617 "add the specified files on the next commit\n"
4618 "\n"
4618 "\n"
4619 " Schedule files to be version controlled and added to the\n"
4619 " Schedule files to be version controlled and added to the\n"
4620 " repository.\n"
4620 " repository.\n"
4621 "\n"
4621 "\n"
4622 " The files will be added to the repository at the next commit. To\n"
4622 " The files will be added to the repository at the next commit. To\n"
4623 " undo an add before that, see hg forget.\n"
4623 " undo an add before that, see hg forget.\n"
4624 "\n"
4624 "\n"
4625 " If no names are given, add all files to the repository.\n"
4625 " If no names are given, add all files to the repository.\n"
4626 " "
4626 " "
4627 msgstr ""
4627 msgstr ""
4628
4628
4629 msgid ""
4629 msgid ""
4630 "add all new files, delete all missing files\n"
4630 "add all new files, delete all missing files\n"
4631 "\n"
4631 "\n"
4632 " Add all new files and remove all missing files from the\n"
4632 " Add all new files and remove all missing files from the\n"
4633 " repository.\n"
4633 " repository.\n"
4634 "\n"
4634 "\n"
4635 " New files are ignored if they match any of the patterns in\n"
4635 " New files are ignored if they match any of the patterns in\n"
4636 " .hgignore. As with add, these changes take effect at the next\n"
4636 " .hgignore. As with add, these changes take effect at the next\n"
4637 " commit.\n"
4637 " commit.\n"
4638 "\n"
4638 "\n"
4639 " Use the -s/--similarity option to detect renamed files. With a\n"
4639 " Use the -s/--similarity option to detect renamed files. With a\n"
4640 " parameter > 0, this compares every removed file with every added\n"
4640 " parameter > 0, this compares every removed file with every added\n"
4641 " file and records those similar enough as renames. This option\n"
4641 " file and records those similar enough as renames. This option\n"
4642 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4642 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4643 " identical) as its parameter. Detecting renamed files this way can\n"
4643 " identical) as its parameter. Detecting renamed files this way can\n"
4644 " be expensive.\n"
4644 " be expensive.\n"
4645 " "
4645 " "
4646 msgstr ""
4646 msgstr ""
4647
4647
4648 msgid "similarity must be a number"
4648 msgid "similarity must be a number"
4649 msgstr ""
4649 msgstr ""
4650
4650
4651 msgid "similarity must be between 0 and 100"
4651 msgid "similarity must be between 0 and 100"
4652 msgstr ""
4652 msgstr ""
4653
4653
4654 msgid ""
4654 msgid ""
4655 "show changeset information by line for each file\n"
4655 "show changeset information by line for each file\n"
4656 "\n"
4656 "\n"
4657 " List changes in files, showing the revision id responsible for\n"
4657 " List changes in files, showing the revision id responsible for\n"
4658 " each line\n"
4658 " each line\n"
4659 "\n"
4659 "\n"
4660 " This command is useful for discovering when a change was made and\n"
4660 " This command is useful for discovering when a change was made and\n"
4661 " by whom.\n"
4661 " by whom.\n"
4662 "\n"
4662 "\n"
4663 " Without the -a/--text option, annotate will avoid processing files\n"
4663 " Without the -a/--text option, annotate will avoid processing files\n"
4664 " it detects as binary. With -a, annotate will annotate the file\n"
4664 " it detects as binary. With -a, annotate will annotate the file\n"
4665 " anyway, although the results will probably be neither useful\n"
4665 " anyway, although the results will probably be neither useful\n"
4666 " nor desirable.\n"
4666 " nor desirable.\n"
4667 " "
4667 " "
4668 msgstr ""
4668 msgstr ""
4669
4669
4670 msgid "at least one filename or pattern is required"
4670 msgid "at least one filename or pattern is required"
4671 msgstr ""
4671 msgstr ""
4672
4672
4673 msgid "at least one of -n/-c is required for -l"
4673 msgid "at least one of -n/-c is required for -l"
4674 msgstr ""
4674 msgstr ""
4675
4675
4676 #, python-format
4676 #, python-format
4677 msgid "%s: binary file\n"
4677 msgid "%s: binary file\n"
4678 msgstr ""
4678 msgstr ""
4679
4679
4680 msgid ""
4680 msgid ""
4681 "create an unversioned archive of a repository revision\n"
4681 "create an unversioned archive of a repository revision\n"
4682 "\n"
4682 "\n"
4683 " By default, the revision used is the parent of the working\n"
4683 " By default, the revision used is the parent of the working\n"
4684 " directory; use -r/--rev to specify a different revision.\n"
4684 " directory; use -r/--rev to specify a different revision.\n"
4685 "\n"
4685 "\n"
4686 " To specify the type of archive to create, use -t/--type. Valid\n"
4686 " To specify the type of archive to create, use -t/--type. Valid\n"
4687 " types are:\n"
4687 " types are:\n"
4688 "\n"
4688 "\n"
4689 " \"files\" (default): a directory full of files\n"
4689 " \"files\" (default): a directory full of files\n"
4690 " \"tar\": tar archive, uncompressed\n"
4690 " \"tar\": tar archive, uncompressed\n"
4691 " \"tbz2\": tar archive, compressed using bzip2\n"
4691 " \"tbz2\": tar archive, compressed using bzip2\n"
4692 " \"tgz\": tar archive, compressed using gzip\n"
4692 " \"tgz\": tar archive, compressed using gzip\n"
4693 " \"uzip\": zip archive, uncompressed\n"
4693 " \"uzip\": zip archive, uncompressed\n"
4694 " \"zip\": zip archive, compressed using deflate\n"
4694 " \"zip\": zip archive, compressed using deflate\n"
4695 "\n"
4695 "\n"
4696 " The exact name of the destination archive or directory is given\n"
4696 " The exact name of the destination archive or directory is given\n"
4697 " using a format string; see 'hg help export' for details.\n"
4697 " using a format string; see 'hg help export' for details.\n"
4698 "\n"
4698 "\n"
4699 " Each member added to an archive file has a directory prefix\n"
4699 " Each member added to an archive file has a directory prefix\n"
4700 " prepended. Use -p/--prefix to specify a format string for the\n"
4700 " prepended. Use -p/--prefix to specify a format string for the\n"
4701 " prefix. The default is the basename of the archive, with suffixes\n"
4701 " prefix. The default is the basename of the archive, with suffixes\n"
4702 " removed.\n"
4702 " removed.\n"
4703 " "
4703 " "
4704 msgstr ""
4704 msgstr ""
4705
4705
4706 msgid "no working directory: please specify a revision"
4706 msgid "no working directory: please specify a revision"
4707 msgstr ""
4707 msgstr ""
4708
4708
4709 msgid "repository root cannot be destination"
4709 msgid "repository root cannot be destination"
4710 msgstr ""
4710 msgstr ""
4711
4711
4712 msgid "cannot archive plain files to stdout"
4712 msgid "cannot archive plain files to stdout"
4713 msgstr ""
4713 msgstr ""
4714
4714
4715 msgid ""
4715 msgid ""
4716 "reverse effect of earlier changeset\n"
4716 "reverse effect of earlier changeset\n"
4717 "\n"
4717 "\n"
4718 " Commit the backed out changes as a new changeset. The new\n"
4718 " Commit the backed out changes as a new changeset. The new\n"
4719 " changeset is a child of the backed out changeset.\n"
4719 " changeset is a child of the backed out changeset.\n"
4720 "\n"
4720 "\n"
4721 " If you backout a changeset other than the tip, a new head is\n"
4721 " If you backout a changeset other than the tip, a new head is\n"
4722 " created. This head will be the new tip and you should merge this\n"
4722 " created. This head will be the new tip and you should merge this\n"
4723 " backout changeset with another head.\n"
4723 " backout changeset with another head.\n"
4724 "\n"
4724 "\n"
4725 " The --merge option remembers the parent of the working directory\n"
4725 " The --merge option remembers the parent of the working directory\n"
4726 " before starting the backout, then merges the new head with that\n"
4726 " before starting the backout, then merges the new head with that\n"
4727 " changeset afterwards. This saves you from doing the merge by hand.\n"
4727 " changeset afterwards. This saves you from doing the merge by hand.\n"
4728 " The result of this merge is not committed, as with a normal merge.\n"
4728 " The result of this merge is not committed, as with a normal merge.\n"
4729 "\n"
4729 "\n"
4730 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4730 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4731 " "
4731 " "
4732 msgstr ""
4732 msgstr ""
4733
4733
4734 msgid "please specify just one revision"
4734 msgid "please specify just one revision"
4735 msgstr ""
4735 msgstr ""
4736
4736
4737 msgid "please specify a revision to backout"
4737 msgid "please specify a revision to backout"
4738 msgstr ""
4738 msgstr ""
4739
4739
4740 msgid "cannot backout change on a different branch"
4740 msgid "cannot backout change on a different branch"
4741 msgstr ""
4741 msgstr ""
4742
4742
4743 msgid "cannot backout a change with no parents"
4743 msgid "cannot backout a change with no parents"
4744 msgstr ""
4744 msgstr ""
4745
4745
4746 msgid "cannot backout a merge changeset without --parent"
4746 msgid "cannot backout a merge changeset without --parent"
4747 msgstr ""
4747 msgstr ""
4748
4748
4749 #, python-format
4749 #, python-format
4750 msgid "%s is not a parent of %s"
4750 msgid "%s is not a parent of %s"
4751 msgstr ""
4751 msgstr ""
4752
4752
4753 msgid "cannot use --parent on non-merge changeset"
4753 msgid "cannot use --parent on non-merge changeset"
4754 msgstr ""
4754 msgstr ""
4755
4755
4756 #, python-format
4756 #, python-format
4757 msgid "Backed out changeset %s"
4757 msgid "Backed out changeset %s"
4758 msgstr ""
4758 msgstr ""
4759
4759
4760 #, python-format
4760 #, python-format
4761 msgid "changeset %s backs out changeset %s\n"
4761 msgid "changeset %s backs out changeset %s\n"
4762 msgstr ""
4762 msgstr ""
4763
4763
4764 #, python-format
4764 #, python-format
4765 msgid "merging with changeset %s\n"
4765 msgid "merging with changeset %s\n"
4766 msgstr ""
4766 msgstr ""
4767
4767
4768 msgid "the backout changeset is a new head - do not forget to merge\n"
4768 msgid "the backout changeset is a new head - do not forget to merge\n"
4769 msgstr ""
4769 msgstr ""
4770
4770
4771 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4771 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4772 msgstr ""
4772 msgstr ""
4773
4773
4774 msgid ""
4774 msgid ""
4775 "subdivision search of changesets\n"
4775 "subdivision search of changesets\n"
4776 "\n"
4776 "\n"
4777 " This command helps to find changesets which introduce problems. To\n"
4777 " This command helps to find changesets which introduce problems. To\n"
4778 " use, mark the earliest changeset you know exhibits the problem as\n"
4778 " use, mark the earliest changeset you know exhibits the problem as\n"
4779 " bad, then mark the latest changeset which is free from the problem\n"
4779 " bad, then mark the latest changeset which is free from the problem\n"
4780 " as good. Bisect will update your working directory to a revision\n"
4780 " as good. Bisect will update your working directory to a revision\n"
4781 " for testing (unless the -U/--noupdate option is specified). Once\n"
4781 " for testing (unless the -U/--noupdate option is specified). Once\n"
4782 " you have performed tests, mark the working directory as good or\n"
4782 " you have performed tests, mark the working directory as good or\n"
4783 " bad, and bisect will either update to another candidate changeset\n"
4783 " bad, and bisect will either update to another candidate changeset\n"
4784 " or announce that it has found the bad revision.\n"
4784 " or announce that it has found the bad revision.\n"
4785 "\n"
4785 "\n"
4786 " As a shortcut, you can also use the revision argument to mark a\n"
4786 " As a shortcut, you can also use the revision argument to mark a\n"
4787 " revision as good or bad without checking it out first.\n"
4787 " revision as good or bad without checking it out first.\n"
4788 "\n"
4788 "\n"
4789 " If you supply a command, it will be used for automatic bisection.\n"
4789 " If you supply a command, it will be used for automatic bisection.\n"
4790 " Its exit status will be used to mark revisions as good or bad:\n"
4790 " Its exit status will be used to mark revisions as good or bad:\n"
4791 " status 0 means good, 125 means to skip the revision, 127\n"
4791 " status 0 means good, 125 means to skip the revision, 127\n"
4792 " (command not found) will abort the bisection, and any other\n"
4792 " (command not found) will abort the bisection, and any other\n"
4793 " non-zero exit status means the revision is bad.\n"
4793 " non-zero exit status means the revision is bad.\n"
4794 " "
4794 " "
4795 msgstr ""
4795 msgstr ""
4796
4796
4797 msgid "The first good revision is:\n"
4797 msgid "The first good revision is:\n"
4798 msgstr ""
4798 msgstr ""
4799
4799
4800 msgid "The first bad revision is:\n"
4800 msgid "The first bad revision is:\n"
4801 msgstr ""
4801 msgstr ""
4802
4802
4803 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4803 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4804 msgstr ""
4804 msgstr ""
4805
4805
4806 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4806 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4807 msgstr ""
4807 msgstr ""
4808
4808
4809 msgid "cannot bisect (no known good revisions)"
4809 msgid "cannot bisect (no known good revisions)"
4810 msgstr ""
4810 msgstr ""
4811
4811
4812 msgid "cannot bisect (no known bad revisions)"
4812 msgid "cannot bisect (no known bad revisions)"
4813 msgstr ""
4813 msgstr ""
4814
4814
4815 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4815 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4816 msgstr ""
4816 msgstr ""
4817
4817
4818 msgid "incompatible arguments"
4818 msgid "incompatible arguments"
4819 msgstr ""
4819 msgstr ""
4820
4820
4821 #, python-format
4821 #, python-format
4822 msgid "cannot find executable: %s"
4822 msgid "cannot find executable: %s"
4823 msgstr ""
4823 msgstr ""
4824
4824
4825 #, python-format
4825 #, python-format
4826 msgid "failed to execute %s"
4826 msgid "failed to execute %s"
4827 msgstr ""
4827 msgstr ""
4828
4828
4829 #, python-format
4829 #, python-format
4830 msgid "%s killed"
4830 msgid "%s killed"
4831 msgstr ""
4831 msgstr ""
4832
4832
4833 #, python-format
4833 #, python-format
4834 msgid "Changeset %d:%s: %s\n"
4834 msgid "Changeset %d:%s: %s\n"
4835 msgstr ""
4835 msgstr ""
4836
4836
4837 #, python-format
4837 #, python-format
4838 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4838 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4839 msgstr ""
4839 msgstr ""
4840
4840
4841 msgid ""
4841 msgid ""
4842 "set or show the current branch name\n"
4842 "set or show the current branch name\n"
4843 "\n"
4843 "\n"
4844 " With no argument, show the current branch name. With one argument,\n"
4844 " With no argument, show the current branch name. With one argument,\n"
4845 " set the working directory branch name (the branch will not exist\n"
4845 " set the working directory branch name (the branch will not exist\n"
4846 " in the repository until the next commit). Standard practice\n"
4846 " in the repository until the next commit). Standard practice\n"
4847 " recommends that primary development take place on the 'default'\n"
4847 " recommends that primary development take place on the 'default'\n"
4848 " branch.\n"
4848 " branch.\n"
4849 "\n"
4849 "\n"
4850 " Unless -f/--force is specified, branch will not let you set a\n"
4850 " Unless -f/--force is specified, branch will not let you set a\n"
4851 " branch name that already exists, even if it's inactive.\n"
4851 " branch name that already exists, even if it's inactive.\n"
4852 "\n"
4852 "\n"
4853 " Use -C/--clean to reset the working directory branch to that of\n"
4853 " Use -C/--clean to reset the working directory branch to that of\n"
4854 " the parent of the working directory, negating a previous branch\n"
4854 " the parent of the working directory, negating a previous branch\n"
4855 " change.\n"
4855 " change.\n"
4856 "\n"
4856 "\n"
4857 " Use the command 'hg update' to switch to an existing branch.\n"
4857 " Use the command 'hg update' to switch to an existing branch.\n"
4858 " "
4858 " "
4859 msgstr ""
4859 msgstr ""
4860
4860
4861 #, python-format
4861 #, python-format
4862 msgid "reset working directory to branch %s\n"
4862 msgid "reset working directory to branch %s\n"
4863 msgstr ""
4863 msgstr ""
4864
4864
4865 msgid "a branch of the same name already exists (use --force to override)"
4865 msgid "a branch of the same name already exists (use --force to override)"
4866 msgstr ""
4866 msgstr ""
4867
4867
4868 #, python-format
4868 #, python-format
4869 msgid "marked working directory as branch %s\n"
4869 msgid "marked working directory as branch %s\n"
4870 msgstr ""
4870 msgstr ""
4871
4871
4872 msgid ""
4872 msgid ""
4873 "list repository named branches\n"
4873 "list repository named branches\n"
4874 "\n"
4874 "\n"
4875 " List the repository's named branches, indicating which ones are\n"
4875 " List the repository's named branches, indicating which ones are\n"
4876 " inactive. If active is specified, only show active branches.\n"
4876 " inactive. If active is specified, only show active branches.\n"
4877 "\n"
4877 "\n"
4878 " A branch is considered active if it contains repository heads.\n"
4878 " A branch is considered active if it contains repository heads.\n"
4879 "\n"
4879 "\n"
4880 " Use the command 'hg update' to switch to an existing branch.\n"
4880 " Use the command 'hg update' to switch to an existing branch.\n"
4881 " "
4881 " "
4882 msgstr ""
4882 msgstr ""
4883
4883
4884 msgid ""
4884 msgid ""
4885 "create a changegroup file\n"
4885 "create a changegroup file\n"
4886 "\n"
4886 "\n"
4887 " Generate a compressed changegroup file collecting changesets not\n"
4887 " Generate a compressed changegroup file collecting changesets not\n"
4888 " known to be in another repository.\n"
4888 " known to be in another repository.\n"
4889 "\n"
4889 "\n"
4890 " If no destination repository is specified the destination is\n"
4890 " If no destination repository is specified the destination is\n"
4891 " assumed to have all the nodes specified by one or more --base\n"
4891 " assumed to have all the nodes specified by one or more --base\n"
4892 " parameters. To create a bundle containing all changesets, use\n"
4892 " parameters. To create a bundle containing all changesets, use\n"
4893 " -a/--all (or --base null).\n"
4893 " -a/--all (or --base null).\n"
4894 "\n"
4894 "\n"
4895 " To change the compression method applied, use the -t/--type\n"
4895 " To change the compression method applied, use the -t/--type\n"
4896 " option. The available compression methods are: none, bzip2, and\n"
4896 " option. The available compression methods are: none, bzip2, and\n"
4897 " gzip (by default, bundles are compressed using bzip2).\n"
4897 " gzip (by default, bundles are compressed using bzip2).\n"
4898 "\n"
4898 "\n"
4899 " The bundle file can then be transferred using conventional means\n"
4899 " The bundle file can then be transferred using conventional means\n"
4900 " and applied to another repository with the unbundle or pull\n"
4900 " and applied to another repository with the unbundle or pull\n"
4901 " command. This is useful when direct push and pull are not\n"
4901 " command. This is useful when direct push and pull are not\n"
4902 " available or when exporting an entire repository is undesirable.\n"
4902 " available or when exporting an entire repository is undesirable.\n"
4903 "\n"
4903 "\n"
4904 " Applying bundles preserves all changeset contents including\n"
4904 " Applying bundles preserves all changeset contents including\n"
4905 " permissions, copy/rename information, and revision history.\n"
4905 " permissions, copy/rename information, and revision history.\n"
4906 " "
4906 " "
4907 msgstr ""
4907 msgstr ""
4908
4908
4909 msgid "--base is incompatible with specifying a destination"
4909 msgid "--base is incompatible with specifying a destination"
4910 msgstr ""
4910 msgstr ""
4911
4911
4912 msgid "unknown bundle type specified with --type"
4912 msgid "unknown bundle type specified with --type"
4913 msgstr ""
4913 msgstr ""
4914
4914
4915 msgid ""
4915 msgid ""
4916 "output the current or given revision of files\n"
4916 "output the current or given revision of files\n"
4917 "\n"
4917 "\n"
4918 " Print the specified files as they were at the given revision. If\n"
4918 " Print the specified files as they were at the given revision. If\n"
4919 " no revision is given, the parent of the working directory is used,\n"
4919 " no revision is given, the parent of the working directory is used,\n"
4920 " or tip if no revision is checked out.\n"
4920 " or tip if no revision is checked out.\n"
4921 "\n"
4921 "\n"
4922 " Output may be to a file, in which case the name of the file is\n"
4922 " Output may be to a file, in which case the name of the file is\n"
4923 " given using a format string. The formatting rules are the same as\n"
4923 " given using a format string. The formatting rules are the same as\n"
4924 " for the export command, with the following additions:\n"
4924 " for the export command, with the following additions:\n"
4925 "\n"
4925 "\n"
4926 " %s basename of file being printed\n"
4926 " %s basename of file being printed\n"
4927 " %d dirname of file being printed, or '.' if in repository root\n"
4927 " %d dirname of file being printed, or '.' if in repository root\n"
4928 " %p root-relative path name of file being printed\n"
4928 " %p root-relative path name of file being printed\n"
4929 " "
4929 " "
4930 msgstr ""
4930 msgstr ""
4931
4931
4932 msgid ""
4932 msgid ""
4933 "make a copy of an existing repository\n"
4933 "make a copy of an existing repository\n"
4934 "\n"
4934 "\n"
4935 " Create a copy of an existing repository in a new directory.\n"
4935 " Create a copy of an existing repository in a new directory.\n"
4936 "\n"
4936 "\n"
4937 " If no destination directory name is specified, it defaults to the\n"
4937 " If no destination directory name is specified, it defaults to the\n"
4938 " basename of the source.\n"
4938 " basename of the source.\n"
4939 "\n"
4939 "\n"
4940 " The location of the source is added to the new repository's\n"
4940 " The location of the source is added to the new repository's\n"
4941 " .hg/hgrc file, as the default to be used for future pulls.\n"
4941 " .hg/hgrc file, as the default to be used for future pulls.\n"
4942 "\n"
4942 "\n"
4943 " If you use the -r/--rev option to clone up to a specific revision,\n"
4943 " If you use the -r/--rev option to clone up to a specific revision,\n"
4944 " no subsequent revisions (including subsequent tags) will be\n"
4944 " no subsequent revisions (including subsequent tags) will be\n"
4945 " present in the cloned repository. This option implies --pull, even\n"
4945 " present in the cloned repository. This option implies --pull, even\n"
4946 " on local repositories.\n"
4946 " on local repositories.\n"
4947 "\n"
4947 "\n"
4948 " By default, clone will check out the head of the 'default' branch.\n"
4948 " By default, clone will check out the head of the 'default' branch.\n"
4949 " If the -U/--noupdate option is used, the new clone will contain\n"
4949 " If the -U/--noupdate option is used, the new clone will contain\n"
4950 " only a repository (.hg) and no working copy (the working copy\n"
4950 " only a repository (.hg) and no working copy (the working copy\n"
4951 " parent is the null revision).\n"
4951 " parent is the null revision).\n"
4952 "\n"
4952 "\n"
4953 " See 'hg help urls' for valid source format details.\n"
4953 " See 'hg help urls' for valid source format details.\n"
4954 "\n"
4954 "\n"
4955 " It is possible to specify an ssh:// URL as the destination, but no\n"
4955 " It is possible to specify an ssh:// URL as the destination, but no\n"
4956 " .hg/hgrc and working directory will be created on the remote side.\n"
4956 " .hg/hgrc and working directory will be created on the remote side.\n"
4957 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4957 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4958 "\n"
4958 "\n"
4959 " For efficiency, hardlinks are used for cloning whenever the source\n"
4959 " For efficiency, hardlinks are used for cloning whenever the source\n"
4960 " and destination are on the same filesystem (note this applies only\n"
4960 " and destination are on the same filesystem (note this applies only\n"
4961 " to the repository data, not to the checked out files). Some\n"
4961 " to the repository data, not to the checked out files). Some\n"
4962 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4962 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
4963 " do not report errors. In these cases, use the --pull option to\n"
4963 " do not report errors. In these cases, use the --pull option to\n"
4964 " avoid hardlinking.\n"
4964 " avoid hardlinking.\n"
4965 "\n"
4965 "\n"
4966 " In some cases, you can clone repositories and checked out files\n"
4966 " In some cases, you can clone repositories and checked out files\n"
4967 " using full hardlinks with\n"
4967 " using full hardlinks with\n"
4968 "\n"
4968 "\n"
4969 " $ cp -al REPO REPOCLONE\n"
4969 " $ cp -al REPO REPOCLONE\n"
4970 "\n"
4970 "\n"
4971 " This is the fastest way to clone, but it is not always safe. The\n"
4971 " This is the fastest way to clone, but it is not always safe. The\n"
4972 " operation is not atomic (making sure REPO is not modified during\n"
4972 " operation is not atomic (making sure REPO is not modified during\n"
4973 " the operation is up to you) and you have to make sure your editor\n"
4973 " the operation is up to you) and you have to make sure your editor\n"
4974 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4974 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
4975 " this is not compatible with certain extensions that place their\n"
4975 " this is not compatible with certain extensions that place their\n"
4976 " metadata under the .hg directory, such as mq.\n"
4976 " metadata under the .hg directory, such as mq.\n"
4977 "\n"
4977 "\n"
4978 " "
4978 " "
4979 msgstr ""
4979 msgstr ""
4980
4980
4981 msgid ""
4981 msgid ""
4982 "commit the specified files or all outstanding changes\n"
4982 "commit the specified files or all outstanding changes\n"
4983 "\n"
4983 "\n"
4984 " Commit changes to the given files into the repository. Unlike a\n"
4984 " Commit changes to the given files into the repository. Unlike a\n"
4985 " centralized RCS, this operation is a local operation. See hg push\n"
4985 " centralized RCS, this operation is a local operation. See hg push\n"
4986 " for a way to actively distribute your changes.\n"
4986 " for a way to actively distribute your changes.\n"
4987 "\n"
4987 "\n"
4988 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4988 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4989 " will be committed.\n"
4989 " will be committed.\n"
4990 "\n"
4990 "\n"
4991 " If you are committing the result of a merge, do not provide any\n"
4991 " If you are committing the result of a merge, do not provide any\n"
4992 " filenames or -I/-X filters.\n"
4992 " filenames or -I/-X filters.\n"
4993 "\n"
4993 "\n"
4994 " If no commit message is specified, the configured editor is\n"
4994 " If no commit message is specified, the configured editor is\n"
4995 " started to prompt you for a message.\n"
4995 " started to prompt you for a message.\n"
4996 "\n"
4996 "\n"
4997 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4997 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4998 " "
4998 " "
4999 msgstr ""
4999 msgstr ""
5000
5000
5001 msgid "created new head\n"
5001 msgid "created new head\n"
5002 msgstr ""
5002 msgstr ""
5003
5003
5004 #, python-format
5004 #, python-format
5005 msgid "committed changeset %d:%s\n"
5005 msgid "committed changeset %d:%s\n"
5006 msgstr ""
5006 msgstr ""
5007
5007
5008 msgid ""
5008 msgid ""
5009 "mark files as copied for the next commit\n"
5009 "mark files as copied for the next commit\n"
5010 "\n"
5010 "\n"
5011 " Mark dest as having copies of source files. If dest is a\n"
5011 " Mark dest as having copies of source files. If dest is a\n"
5012 " directory, copies are put in that directory. If dest is a file,\n"
5012 " directory, copies are put in that directory. If dest is a file,\n"
5013 " the source must be a single file.\n"
5013 " the source must be a single file.\n"
5014 "\n"
5014 "\n"
5015 " By default, this command copies the contents of files as they\n"
5015 " By default, this command copies the contents of files as they\n"
5016 " exist in the working directory. If invoked with -A/--after, the\n"
5016 " exist in the working directory. If invoked with -A/--after, the\n"
5017 " operation is recorded, but no copying is performed.\n"
5017 " operation is recorded, but no copying is performed.\n"
5018 "\n"
5018 "\n"
5019 " This command takes effect with the next commit. To undo a copy\n"
5019 " This command takes effect with the next commit. To undo a copy\n"
5020 " before that, see hg revert.\n"
5020 " before that, see hg revert.\n"
5021 " "
5021 " "
5022 msgstr ""
5022 msgstr ""
5023
5023
5024 msgid "find the ancestor revision of two revisions in a given index"
5024 msgid "find the ancestor revision of two revisions in a given index"
5025 msgstr ""
5025 msgstr ""
5026
5026
5027 msgid "There is no Mercurial repository here (.hg not found)"
5027 msgid "There is no Mercurial repository here (.hg not found)"
5028 msgstr ""
5028 msgstr ""
5029
5029
5030 msgid "either two or three arguments required"
5030 msgid "either two or three arguments required"
5031 msgstr ""
5031 msgstr ""
5032
5032
5033 msgid "returns the completion list associated with the given command"
5033 msgid "returns the completion list associated with the given command"
5034 msgstr ""
5034 msgstr ""
5035
5035
5036 msgid "rebuild the dirstate as it would look like for the given revision"
5036 msgid "rebuild the dirstate as it would look like for the given revision"
5037 msgstr ""
5037 msgstr ""
5038
5038
5039 msgid "validate the correctness of the current dirstate"
5039 msgid "validate the correctness of the current dirstate"
5040 msgstr ""
5040 msgstr ""
5041
5041
5042 #, python-format
5042 #, python-format
5043 msgid "%s in state %s, but not in manifest1\n"
5043 msgid "%s in state %s, but not in manifest1\n"
5044 msgstr ""
5044 msgstr ""
5045
5045
5046 #, python-format
5046 #, python-format
5047 msgid "%s in state %s, but also in manifest1\n"
5047 msgid "%s in state %s, but also in manifest1\n"
5048 msgstr ""
5048 msgstr ""
5049
5049
5050 #, python-format
5050 #, python-format
5051 msgid "%s in state %s, but not in either manifest\n"
5051 msgid "%s in state %s, but not in either manifest\n"
5052 msgstr ""
5052 msgstr ""
5053
5053
5054 #, python-format
5054 #, python-format
5055 msgid "%s in manifest1, but listed as state %s"
5055 msgid "%s in manifest1, but listed as state %s"
5056 msgstr ""
5056 msgstr ""
5057
5057
5058 msgid ".hg/dirstate inconsistent with current parent's manifest"
5058 msgid ".hg/dirstate inconsistent with current parent's manifest"
5059 msgstr ""
5059 msgstr ""
5060
5060
5061 msgid ""
5061 msgid ""
5062 "show combined config settings from all hgrc files\n"
5062 "show combined config settings from all hgrc files\n"
5063 "\n"
5063 "\n"
5064 " With no arguments, print names and values of all config items.\n"
5064 " With no arguments, print names and values of all config items.\n"
5065 "\n"
5065 "\n"
5066 " With one argument of the form section.name, print just the value\n"
5066 " With one argument of the form section.name, print just the value\n"
5067 " of that config item.\n"
5067 " of that config item.\n"
5068 "\n"
5068 "\n"
5069 " With multiple arguments, print names and values of all config\n"
5069 " With multiple arguments, print names and values of all config\n"
5070 " items with matching section names.\n"
5070 " items with matching section names.\n"
5071 "\n"
5071 "\n"
5072 " With --debug, the source (filename and line number) is printed\n"
5072 " With --debug, the source (filename and line number) is printed\n"
5073 " for each config item.\n"
5073 " for each config item.\n"
5074 " "
5074 " "
5075 msgstr ""
5075 msgstr ""
5076
5076
5077 msgid "only one config item permitted"
5077 msgid "only one config item permitted"
5078 msgstr ""
5078 msgstr ""
5079
5079
5080 msgid ""
5080 msgid ""
5081 "manually set the parents of the current working directory\n"
5081 "manually set the parents of the current working directory\n"
5082 "\n"
5082 "\n"
5083 " This is useful for writing repository conversion tools, but should\n"
5083 " This is useful for writing repository conversion tools, but should\n"
5084 " be used with care.\n"
5084 " be used with care.\n"
5085 " "
5085 " "
5086 msgstr ""
5086 msgstr ""
5087
5087
5088 msgid "show the contents of the current dirstate"
5088 msgid "show the contents of the current dirstate"
5089 msgstr ""
5089 msgstr ""
5090
5090
5091 #, python-format
5091 #, python-format
5092 msgid "copy: %s -> %s\n"
5092 msgid "copy: %s -> %s\n"
5093 msgstr ""
5093 msgstr ""
5094
5094
5095 msgid "dump the contents of a data file revision"
5095 msgid "dump the contents of a data file revision"
5096 msgstr ""
5096 msgstr ""
5097
5097
5098 #, python-format
5098 #, python-format
5099 msgid "invalid revision identifier %s"
5099 msgid "invalid revision identifier %s"
5100 msgstr ""
5100 msgstr ""
5101
5101
5102 msgid "parse and display a date"
5102 msgid "parse and display a date"
5103 msgstr ""
5103 msgstr ""
5104
5104
5105 msgid "dump the contents of an index file"
5105 msgid "dump the contents of an index file"
5106 msgstr ""
5106 msgstr ""
5107
5107
5108 msgid "dump an index DAG as a graphviz dot file"
5108 msgid "dump an index DAG as a graphviz dot file"
5109 msgstr ""
5109 msgstr ""
5110
5110
5111 msgid "test Mercurial installation"
5111 msgid "test Mercurial installation"
5112 msgstr ""
5112 msgstr ""
5113
5113
5114 #, python-format
5114 #, python-format
5115 msgid "Checking encoding (%s)...\n"
5115 msgid "Checking encoding (%s)...\n"
5116 msgstr ""
5116 msgstr ""
5117
5117
5118 msgid " (check that your locale is properly set)\n"
5118 msgid " (check that your locale is properly set)\n"
5119 msgstr ""
5119 msgstr ""
5120
5120
5121 msgid "Checking extensions...\n"
5121 msgid "Checking extensions...\n"
5122 msgstr ""
5122 msgstr ""
5123
5123
5124 msgid " One or more extensions could not be found"
5124 msgid " One or more extensions could not be found"
5125 msgstr ""
5125 msgstr ""
5126
5126
5127 msgid " (check that you compiled the extensions)\n"
5127 msgid " (check that you compiled the extensions)\n"
5128 msgstr ""
5128 msgstr ""
5129
5129
5130 msgid "Checking templates...\n"
5130 msgid "Checking templates...\n"
5131 msgstr ""
5131 msgstr ""
5132
5132
5133 msgid " (templates seem to have been installed incorrectly)\n"
5133 msgid " (templates seem to have been installed incorrectly)\n"
5134 msgstr ""
5134 msgstr ""
5135
5135
5136 msgid "Checking patch...\n"
5136 msgid "Checking patch...\n"
5137 msgstr ""
5137 msgstr ""
5138
5138
5139 msgid " patch call failed:\n"
5139 msgid " patch call failed:\n"
5140 msgstr ""
5140 msgstr ""
5141
5141
5142 msgid " unexpected patch output!\n"
5142 msgid " unexpected patch output!\n"
5143 msgstr ""
5143 msgstr ""
5144
5144
5145 msgid " patch test failed!\n"
5145 msgid " patch test failed!\n"
5146 msgstr ""
5146 msgstr ""
5147
5147
5148 msgid ""
5148 msgid ""
5149 " (Current patch tool may be incompatible with patch, or misconfigured. "
5149 " (Current patch tool may be incompatible with patch, or misconfigured. "
5150 "Please check your .hgrc file)\n"
5150 "Please check your .hgrc file)\n"
5151 msgstr ""
5151 msgstr ""
5152
5152
5153 msgid ""
5153 msgid ""
5154 " Internal patcher failure, please report this error to http://www.selenic."
5154 " Internal patcher failure, please report this error to http://www.selenic."
5155 "com/mercurial/bts\n"
5155 "com/mercurial/bts\n"
5156 msgstr ""
5156 msgstr ""
5157
5157
5158 msgid "Checking commit editor...\n"
5158 msgid "Checking commit editor...\n"
5159 msgstr ""
5159 msgstr ""
5160
5160
5161 msgid " No commit editor set and can't find vi in PATH\n"
5161 msgid " No commit editor set and can't find vi in PATH\n"
5162 msgstr ""
5162 msgstr ""
5163
5163
5164 msgid " (specify a commit editor in your .hgrc file)\n"
5164 msgid " (specify a commit editor in your .hgrc file)\n"
5165 msgstr ""
5165 msgstr ""
5166
5166
5167 #, python-format
5167 #, python-format
5168 msgid " Can't find editor '%s' in PATH\n"
5168 msgid " Can't find editor '%s' in PATH\n"
5169 msgstr ""
5169 msgstr ""
5170
5170
5171 msgid "Checking username...\n"
5171 msgid "Checking username...\n"
5172 msgstr ""
5172 msgstr ""
5173
5173
5174 msgid " (specify a username in your .hgrc file)\n"
5174 msgid " (specify a username in your .hgrc file)\n"
5175 msgstr ""
5175 msgstr ""
5176
5176
5177 msgid "No problems detected\n"
5177 msgid "No problems detected\n"
5178 msgstr ""
5178 msgstr ""
5179
5179
5180 #, python-format
5180 #, python-format
5181 msgid "%s problems detected, please check your install!\n"
5181 msgid "%s problems detected, please check your install!\n"
5182 msgstr ""
5182 msgstr ""
5183
5183
5184 msgid "dump rename information"
5184 msgid "dump rename information"
5185 msgstr ""
5185 msgstr ""
5186
5186
5187 #, python-format
5187 #, python-format
5188 msgid "%s renamed from %s:%s\n"
5188 msgid "%s renamed from %s:%s\n"
5189 msgstr ""
5189 msgstr ""
5190
5190
5191 #, python-format
5191 #, python-format
5192 msgid "%s not renamed\n"
5192 msgid "%s not renamed\n"
5193 msgstr ""
5193 msgstr ""
5194
5194
5195 msgid "show how files match on given patterns"
5195 msgid "show how files match on given patterns"
5196 msgstr ""
5196 msgstr ""
5197
5197
5198 msgid ""
5198 msgid ""
5199 "diff repository (or selected files)\n"
5199 "diff repository (or selected files)\n"
5200 "\n"
5200 "\n"
5201 " Show differences between revisions for the specified files.\n"
5201 " Show differences between revisions for the specified files.\n"
5202 "\n"
5202 "\n"
5203 " Differences between files are shown using the unified diff format.\n"
5203 " Differences between files are shown using the unified diff format.\n"
5204 "\n"
5204 "\n"
5205 " NOTE: diff may generate unexpected results for merges, as it will\n"
5205 " NOTE: diff may generate unexpected results for merges, as it will\n"
5206 " default to comparing against the working directory's first parent\n"
5206 " default to comparing against the working directory's first parent\n"
5207 " changeset if no revisions are specified.\n"
5207 " changeset if no revisions are specified.\n"
5208 "\n"
5208 "\n"
5209 " When two revision arguments are given, then changes are shown\n"
5209 " When two revision arguments are given, then changes are shown\n"
5210 " between those revisions. If only one revision is specified then\n"
5210 " between those revisions. If only one revision is specified then\n"
5211 " that revision is compared to the working directory, and, when no\n"
5211 " that revision is compared to the working directory, and, when no\n"
5212 " revisions are specified, the working directory files are compared\n"
5212 " revisions are specified, the working directory files are compared\n"
5213 " to its parent.\n"
5213 " to its parent.\n"
5214 "\n"
5214 "\n"
5215 " Without the -a/--text option, diff will avoid generating diffs of\n"
5215 " Without the -a/--text option, diff will avoid generating diffs of\n"
5216 " files it detects as binary. With -a, diff will generate a diff\n"
5216 " files it detects as binary. With -a, diff will generate a diff\n"
5217 " anyway, probably with undesirable results.\n"
5217 " anyway, probably with undesirable results.\n"
5218 "\n"
5218 "\n"
5219 " Use the -g/--git option to generate diffs in the git extended diff\n"
5219 " Use the -g/--git option to generate diffs in the git extended diff\n"
5220 " format. For more information, read 'hg help diffs'.\n"
5220 " format. For more information, read 'hg help diffs'.\n"
5221 " "
5221 " "
5222 msgstr ""
5222 msgstr ""
5223
5223
5224 msgid ""
5224 msgid ""
5225 "dump the header and diffs for one or more changesets\n"
5225 "dump the header and diffs for one or more changesets\n"
5226 "\n"
5226 "\n"
5227 " Print the changeset header and diffs for one or more revisions.\n"
5227 " Print the changeset header and diffs for one or more revisions.\n"
5228 "\n"
5228 "\n"
5229 " The information shown in the changeset header is: author,\n"
5229 " The information shown in the changeset header is: author,\n"
5230 " changeset hash, parent(s) and commit comment.\n"
5230 " changeset hash, parent(s) and commit comment.\n"
5231 "\n"
5231 "\n"
5232 " NOTE: export may generate unexpected diff output for merge\n"
5232 " NOTE: export may generate unexpected diff output for merge\n"
5233 " changesets, as it will compare the merge changeset against its\n"
5233 " changesets, as it will compare the merge changeset against its\n"
5234 " first parent only.\n"
5234 " first parent only.\n"
5235 "\n"
5235 "\n"
5236 " Output may be to a file, in which case the name of the file is\n"
5236 " Output may be to a file, in which case the name of the file is\n"
5237 " given using a format string. The formatting rules are as follows:\n"
5237 " given using a format string. The formatting rules are as follows:\n"
5238 "\n"
5238 "\n"
5239 " %% literal \"%\" character\n"
5239 " %% literal \"%\" character\n"
5240 " %H changeset hash (40 bytes of hexadecimal)\n"
5240 " %H changeset hash (40 bytes of hexadecimal)\n"
5241 " %N number of patches being generated\n"
5241 " %N number of patches being generated\n"
5242 " %R changeset revision number\n"
5242 " %R changeset revision number\n"
5243 " %b basename of the exporting repository\n"
5243 " %b basename of the exporting repository\n"
5244 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5244 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5245 " %n zero-padded sequence number, starting at 1\n"
5245 " %n zero-padded sequence number, starting at 1\n"
5246 " %r zero-padded changeset revision number\n"
5246 " %r zero-padded changeset revision number\n"
5247 "\n"
5247 "\n"
5248 " Without the -a/--text option, export will avoid generating diffs\n"
5248 " Without the -a/--text option, export will avoid generating diffs\n"
5249 " of files it detects as binary. With -a, export will generate a\n"
5249 " of files it detects as binary. With -a, export will generate a\n"
5250 " diff anyway, probably with undesirable results.\n"
5250 " diff anyway, probably with undesirable results.\n"
5251 "\n"
5251 "\n"
5252 " Use the -g/--git option to generate diffs in the git extended diff\n"
5252 " Use the -g/--git option to generate diffs in the git extended diff\n"
5253 " format. See 'hg help diffs' for more information.\n"
5253 " format. See 'hg help diffs' for more information.\n"
5254 "\n"
5254 "\n"
5255 " With the --switch-parent option, the diff will be against the\n"
5255 " With the --switch-parent option, the diff will be against the\n"
5256 " second parent. It can be useful to review a merge.\n"
5256 " second parent. It can be useful to review a merge.\n"
5257 " "
5257 " "
5258 msgstr ""
5258 msgstr ""
5259
5259
5260 msgid "export requires at least one changeset"
5260 msgid "export requires at least one changeset"
5261 msgstr ""
5261 msgstr ""
5262
5262
5263 msgid "exporting patches:\n"
5263 msgid "exporting patches:\n"
5264 msgstr ""
5264 msgstr ""
5265
5265
5266 msgid "exporting patch:\n"
5266 msgid "exporting patch:\n"
5267 msgstr ""
5267 msgstr ""
5268
5268
5269 msgid ""
5269 msgid ""
5270 "forget the specified files on the next commit\n"
5270 "forget the specified files on the next commit\n"
5271 "\n"
5271 "\n"
5272 " Mark the specified files so they will no longer be tracked\n"
5272 " Mark the specified files so they will no longer be tracked\n"
5273 " after the next commit.\n"
5273 " after the next commit.\n"
5274 "\n"
5274 "\n"
5275 " This only removes files from the current branch, not from the\n"
5275 " This only removes files from the current branch, not from the\n"
5276 " entire project history, and it does not delete them from the\n"
5276 " entire project history, and it does not delete them from the\n"
5277 " working directory.\n"
5277 " working directory.\n"
5278 "\n"
5278 "\n"
5279 " To undo a forget before the next commit, see hg add.\n"
5279 " To undo a forget before the next commit, see hg add.\n"
5280 " "
5280 " "
5281 msgstr ""
5281 msgstr ""
5282
5282
5283 msgid "no files specified"
5283 msgid "no files specified"
5284 msgstr ""
5284 msgstr ""
5285
5285
5286 #, python-format
5286 #, python-format
5287 msgid "not removing %s: file is already untracked\n"
5287 msgid "not removing %s: file is already untracked\n"
5288 msgstr ""
5288 msgstr ""
5289
5289
5290 msgid ""
5290 msgid ""
5291 "search for a pattern in specified files and revisions\n"
5291 "search for a pattern in specified files and revisions\n"
5292 "\n"
5292 "\n"
5293 " Search revisions of files for a regular expression.\n"
5293 " Search revisions of files for a regular expression.\n"
5294 "\n"
5294 "\n"
5295 " This command behaves differently than Unix grep. It only accepts\n"
5295 " This command behaves differently than Unix grep. It only accepts\n"
5296 " Python/Perl regexps. It searches repository history, not the\n"
5296 " Python/Perl regexps. It searches repository history, not the\n"
5297 " working directory. It always prints the revision number in which a\n"
5297 " working directory. It always prints the revision number in which a\n"
5298 " match appears.\n"
5298 " match appears.\n"
5299 "\n"
5299 "\n"
5300 " By default, grep only prints output for the first revision of a\n"
5300 " By default, grep only prints output for the first revision of a\n"
5301 " file in which it finds a match. To get it to print every revision\n"
5301 " file in which it finds a match. To get it to print every revision\n"
5302 " that contains a change in match status (\"-\" for a match that\n"
5302 " that contains a change in match status (\"-\" for a match that\n"
5303 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5303 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5304 " use the --all flag.\n"
5304 " use the --all flag.\n"
5305 " "
5305 " "
5306 msgstr ""
5306 msgstr ""
5307
5307
5308 #, python-format
5308 #, python-format
5309 msgid "grep: invalid match pattern: %s\n"
5309 msgid "grep: invalid match pattern: %s\n"
5310 msgstr ""
5310 msgstr ""
5311
5311
5312 msgid ""
5312 msgid ""
5313 "show current repository heads or show branch heads\n"
5313 "show current repository heads or show branch heads\n"
5314 "\n"
5314 "\n"
5315 " With no arguments, show all repository head changesets.\n"
5315 " With no arguments, show all repository head changesets.\n"
5316 "\n"
5316 "\n"
5317 " Repository \"heads\" are changesets that don't have child\n"
5317 " Repository \"heads\" are changesets that don't have child\n"
5318 " changesets. They are where development generally takes place and\n"
5318 " changesets. They are where development generally takes place and\n"
5319 " are the usual targets for update and merge operations.\n"
5319 " are the usual targets for update and merge operations.\n"
5320 "\n"
5320 "\n"
5321 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5321 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5322 " the named branch associated with that revision. The name of the\n"
5322 " the named branch associated with that revision. The name of the\n"
5323 " branch is called the revision's branch tag.\n"
5323 " branch is called the revision's branch tag.\n"
5324 "\n"
5324 "\n"
5325 " Branch heads are revisions on a given named branch that do not have\n"
5325 " Branch heads are revisions on a given named branch that do not have\n"
5326 " any children on the same branch. A branch head could be a true head\n"
5326 " any children on the same branch. A branch head could be a true head\n"
5327 " or it could be the last changeset on a branch before a new branch\n"
5327 " or it could be the last changeset on a branch before a new branch\n"
5328 " was created. If none of the branch heads are true heads, the branch\n"
5328 " was created. If none of the branch heads are true heads, the branch\n"
5329 " is considered inactive.\n"
5329 " is considered inactive.\n"
5330 "\n"
5330 "\n"
5331 " If STARTREV is specified only those heads (or branch heads) that\n"
5331 " If STARTREV is specified only those heads (or branch heads) that\n"
5332 " are descendants of STARTREV will be displayed.\n"
5332 " are descendants of STARTREV will be displayed.\n"
5333 " "
5333 " "
5334 msgstr ""
5334 msgstr ""
5335
5335
5336 #, python-format
5336 #, python-format
5337 msgid "no open branch heads on branch %s\n"
5337 msgid "no open branch heads on branch %s\n"
5338 msgstr ""
5338 msgstr ""
5339
5339
5340 #, python-format
5340 #, python-format
5341 msgid "no changes on branch %s containing %s are reachable from %s\n"
5341 msgid "no changes on branch %s containing %s are reachable from %s\n"
5342 msgstr ""
5342 msgstr ""
5343
5343
5344 #, python-format
5344 #, python-format
5345 msgid "no changes on branch %s are reachable from %s\n"
5345 msgid "no changes on branch %s are reachable from %s\n"
5346 msgstr ""
5346 msgstr ""
5347
5347
5348 msgid ""
5348 msgid ""
5349 "show help for a given topic or a help overview\n"
5349 "show help for a given topic or a help overview\n"
5350 "\n"
5350 "\n"
5351 " With no arguments, print a list of commands with short help messages.\n"
5351 " With no arguments, print a list of commands with short help messages.\n"
5352 "\n"
5352 "\n"
5353 " Given a topic, extension, or command name, print help for that\n"
5353 " Given a topic, extension, or command name, print help for that\n"
5354 " topic."
5354 " topic."
5355 msgstr ""
5355 msgstr ""
5356
5356
5357 msgid "global options:"
5357 msgid "global options:"
5358 msgstr "options globales :"
5358 msgstr "options globales :"
5359
5359
5360 msgid "use \"hg help\" for the full list of commands"
5360 msgid "use \"hg help\" for the full list of commands"
5361 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5361 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5362
5362
5363 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5363 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5364 msgstr ""
5364 msgstr ""
5365 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5365 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5366 "plus de détails"
5366 "plus de détails"
5367
5367
5368 # la chaîne passée est préfixée par un espace
5368 # la chaîne passée est préfixée par un espace
5369 #, python-format
5369 #, python-format
5370 msgid "use \"hg -v help%s\" to show aliases and global options"
5370 msgid "use \"hg -v help%s\" to show aliases and global options"
5371 msgstr ""
5371 msgstr ""
5372 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5372 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5373
5373
5374 #, python-format
5374 #, python-format
5375 msgid "use \"hg -v help %s\" to show global options"
5375 msgid "use \"hg -v help %s\" to show global options"
5376 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5376 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5377
5377
5378 msgid ""
5378 msgid ""
5379 "list of commands:\n"
5379 "list of commands:\n"
5380 "\n"
5380 "\n"
5381 msgstr ""
5381 msgstr ""
5382 "liste des commandes :\n"
5382 "liste des commandes :\n"
5383 "\n"
5383 "\n"
5384
5384
5385 #, python-format
5385 #, python-format
5386 msgid ""
5386 msgid ""
5387 "\n"
5387 "\n"
5388 "aliases: %s\n"
5388 "aliases: %s\n"
5389 msgstr ""
5389 msgstr ""
5390 "\n"
5390 "\n"
5391 "alias : %s\n"
5391 "alias : %s\n"
5392
5392
5393 msgid "(no help text available)"
5393 msgid "(no help text available)"
5394 msgstr "(pas d'aide disponible)"
5394 msgstr "(pas d'aide disponible)"
5395
5395
5396 msgid "options:\n"
5396 msgid "options:\n"
5397 msgstr "options :\n"
5397 msgstr "options :\n"
5398
5398
5399 msgid "no commands defined\n"
5399 msgid "no commands defined\n"
5400 msgstr "pas de commandes définies\n"
5400 msgstr "pas de commandes définies\n"
5401
5401
5402 msgid "enabled extensions:"
5402 msgid "enabled extensions:"
5403 msgstr "extensions activées :"
5403 msgstr "extensions activées :"
5404
5404
5405 msgid "no help text available"
5405 msgid "no help text available"
5406 msgstr "pas d'aide disponible"
5406 msgstr "pas d'aide disponible"
5407
5407
5408 #, python-format
5408 #, python-format
5409 msgid "%s extension - %s\n"
5409 msgid "%s extension - %s\n"
5410 msgstr "extension %s - %s\n"
5410 msgstr "extension %s - %s\n"
5411
5411
5412 msgid "Mercurial Distributed SCM\n"
5412 msgid "Mercurial Distributed SCM\n"
5413 msgstr "Mercurial, système de gestion de sources distribué\n"
5413 msgstr "Mercurial, système de gestion de sources distribué\n"
5414
5414
5415 msgid ""
5415 msgid ""
5416 "basic commands:\n"
5416 "basic commands:\n"
5417 "\n"
5417 "\n"
5418 msgstr ""
5418 msgstr ""
5419 "commandes de base :\n"
5419 "commandes de base :\n"
5420 "\n"
5420 "\n"
5421
5421
5422 msgid ""
5422 msgid ""
5423 "\n"
5423 "\n"
5424 "additional help topics:\n"
5424 "additional help topics:\n"
5425 "\n"
5425 "\n"
5426 msgstr ""
5426 msgstr ""
5427 "\n"
5427 "\n"
5428 "sujets d'aide supplémentaires :\n"
5428 "sujets d'aide supplémentaires :\n"
5429 "\n"
5429 "\n"
5430
5430
5431 msgid ""
5431 msgid ""
5432 "identify the working copy or specified revision\n"
5432 "identify the working copy or specified revision\n"
5433 "\n"
5433 "\n"
5434 " With no revision, print a summary of the current state of the\n"
5434 " With no revision, print a summary of the current state of the\n"
5435 " repository.\n"
5435 " repository.\n"
5436 "\n"
5436 "\n"
5437 " Specifying a path to a repository root or Mercurial bundle will\n"
5437 " Specifying a path to a repository root or Mercurial bundle will\n"
5438 " cause lookup to operate on that repository/bundle.\n"
5438 " cause lookup to operate on that repository/bundle.\n"
5439 "\n"
5439 "\n"
5440 " This summary identifies the repository state using one or two\n"
5440 " This summary identifies the repository state using one or two\n"
5441 " parent hash identifiers, followed by a \"+\" if there are\n"
5441 " parent hash identifiers, followed by a \"+\" if there are\n"
5442 " uncommitted changes in the working directory, a list of tags for\n"
5442 " uncommitted changes in the working directory, a list of tags for\n"
5443 " this revision and a branch name for non-default branches.\n"
5443 " this revision and a branch name for non-default branches.\n"
5444 " "
5444 " "
5445 msgstr ""
5445 msgstr ""
5446
5446
5447 msgid ""
5447 msgid ""
5448 "import an ordered set of patches\n"
5448 "import an ordered set of patches\n"
5449 "\n"
5449 "\n"
5450 " Import a list of patches and commit them individually.\n"
5450 " Import a list of patches and commit them individually.\n"
5451 "\n"
5451 "\n"
5452 " If there are outstanding changes in the working directory, import\n"
5452 " If there are outstanding changes in the working directory, import\n"
5453 " will abort unless given the -f/--force flag.\n"
5453 " will abort unless given the -f/--force flag.\n"
5454 "\n"
5454 "\n"
5455 " You can import a patch straight from a mail message. Even patches\n"
5455 " You can import a patch straight from a mail message. Even patches\n"
5456 " as attachments work (to use the body part, it must have type\n"
5456 " as attachments work (to use the body part, it must have type\n"
5457 " text/plain or text/x-patch). From and Subject headers of email\n"
5457 " text/plain or text/x-patch). From and Subject headers of email\n"
5458 " message are used as default committer and commit message. All\n"
5458 " message are used as default committer and commit message. All\n"
5459 " text/plain body parts before first diff are added to commit\n"
5459 " text/plain body parts before first diff are added to commit\n"
5460 " message.\n"
5460 " message.\n"
5461 "\n"
5461 "\n"
5462 " If the imported patch was generated by hg export, user and\n"
5462 " If the imported patch was generated by hg export, user and\n"
5463 " description from patch override values from message headers and\n"
5463 " description from patch override values from message headers and\n"
5464 " body. Values given on command line with -m/--message and -u/--user\n"
5464 " body. Values given on command line with -m/--message and -u/--user\n"
5465 " override these.\n"
5465 " override these.\n"
5466 "\n"
5466 "\n"
5467 " If --exact is specified, import will set the working directory to\n"
5467 " If --exact is specified, import will set the working directory to\n"
5468 " the parent of each patch before applying it, and will abort if the\n"
5468 " the parent of each patch before applying it, and will abort if the\n"
5469 " resulting changeset has a different ID than the one recorded in\n"
5469 " resulting changeset has a different ID than the one recorded in\n"
5470 " the patch. This may happen due to character set problems or other\n"
5470 " the patch. This may happen due to character set problems or other\n"
5471 " deficiencies in the text patch format.\n"
5471 " deficiencies in the text patch format.\n"
5472 "\n"
5472 "\n"
5473 " With -s/--similarity, hg will attempt to discover renames and\n"
5473 " With -s/--similarity, hg will attempt to discover renames and\n"
5474 " copies in the patch in the same way as 'addremove'.\n"
5474 " copies in the patch in the same way as 'addremove'.\n"
5475 "\n"
5475 "\n"
5476 " To read a patch from standard input, use \"-\" as the patch name.\n"
5476 " To read a patch from standard input, use \"-\" as the patch name.\n"
5477 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5477 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5478 " "
5478 " "
5479 msgstr ""
5479 msgstr ""
5480
5480
5481 msgid "applying patch from stdin\n"
5481 msgid "applying patch from stdin\n"
5482 msgstr ""
5482 msgstr ""
5483
5483
5484 msgid "no diffs found"
5484 msgid "no diffs found"
5485 msgstr ""
5485 msgstr ""
5486
5486
5487 #, python-format
5487 #, python-format
5488 msgid ""
5488 msgid ""
5489 "message:\n"
5489 "message:\n"
5490 "%s\n"
5490 "%s\n"
5491 msgstr ""
5491 msgstr ""
5492
5492
5493 msgid "not a Mercurial patch"
5493 msgid "not a Mercurial patch"
5494 msgstr ""
5494 msgstr ""
5495
5495
5496 msgid "patch is damaged or loses information"
5496 msgid "patch is damaged or loses information"
5497 msgstr ""
5497 msgstr ""
5498
5498
5499 msgid ""
5499 msgid ""
5500 "show new changesets found in source\n"
5500 "show new changesets found in source\n"
5501 "\n"
5501 "\n"
5502 " Show new changesets found in the specified path/URL or the default\n"
5502 " Show new changesets found in the specified path/URL or the default\n"
5503 " pull location. These are the changesets that would have been pulled\n"
5503 " pull location. These are the changesets that would have been pulled\n"
5504 " if a pull at the time you issued this command.\n"
5504 " if a pull at the time you issued this command.\n"
5505 "\n"
5505 "\n"
5506 " For remote repository, using --bundle avoids downloading the\n"
5506 " For remote repository, using --bundle avoids downloading the\n"
5507 " changesets twice if the incoming is followed by a pull.\n"
5507 " changesets twice if the incoming is followed by a pull.\n"
5508 "\n"
5508 "\n"
5509 " See pull for valid source format details.\n"
5509 " See pull for valid source format details.\n"
5510 " "
5510 " "
5511 msgstr ""
5511 msgstr ""
5512
5512
5513 msgid ""
5513 msgid ""
5514 "create a new repository in the given directory\n"
5514 "create a new repository in the given directory\n"
5515 "\n"
5515 "\n"
5516 " Initialize a new repository in the given directory. If the given\n"
5516 " Initialize a new repository in the given directory. If the given\n"
5517 " directory does not exist, it will be created.\n"
5517 " directory does not exist, it will be created.\n"
5518 "\n"
5518 "\n"
5519 " If no directory is given, the current directory is used.\n"
5519 " If no directory is given, the current directory is used.\n"
5520 "\n"
5520 "\n"
5521 " It is possible to specify an ssh:// URL as the destination.\n"
5521 " It is possible to specify an ssh:// URL as the destination.\n"
5522 " See 'hg help urls' for more information.\n"
5522 " See 'hg help urls' for more information.\n"
5523 " "
5523 " "
5524 msgstr ""
5524 msgstr ""
5525
5525
5526 msgid ""
5526 msgid ""
5527 "locate files matching specific patterns\n"
5527 "locate files matching specific patterns\n"
5528 "\n"
5528 "\n"
5529 " Print files under Mercurial control in the working directory whose\n"
5529 " Print files under Mercurial control in the working directory whose\n"
5530 " names match the given patterns.\n"
5530 " names match the given patterns.\n"
5531 "\n"
5531 "\n"
5532 " By default, this command searches all directories in the working\n"
5532 " By default, this command searches all directories in the working\n"
5533 " directory. To search just the current directory and its\n"
5533 " directory. To search just the current directory and its\n"
5534 " subdirectories, use \"--include .\".\n"
5534 " subdirectories, use \"--include .\".\n"
5535 "\n"
5535 "\n"
5536 " If no patterns are given to match, this command prints the names\n"
5536 " If no patterns are given to match, this command prints the names\n"
5537 " of all files under Mercurial control in the working directory.\n"
5537 " of all files under Mercurial control in the working directory.\n"
5538 "\n"
5538 "\n"
5539 " If you want to feed the output of this command into the \"xargs\"\n"
5539 " If you want to feed the output of this command into the \"xargs\"\n"
5540 " command, use the -0 option to both this command and \"xargs\". This\n"
5540 " command, use the -0 option to both this command and \"xargs\". This\n"
5541 " will avoid the problem of \"xargs\" treating single filenames that\n"
5541 " will avoid the problem of \"xargs\" treating single filenames that\n"
5542 " contain whitespace as multiple filenames.\n"
5542 " contain whitespace as multiple filenames.\n"
5543 " "
5543 " "
5544 msgstr ""
5544 msgstr ""
5545
5545
5546 msgid ""
5546 msgid ""
5547 "show revision history of entire repository or files\n"
5547 "show revision history of entire repository or files\n"
5548 "\n"
5548 "\n"
5549 " Print the revision history of the specified files or the entire\n"
5549 " Print the revision history of the specified files or the entire\n"
5550 " project.\n"
5550 " project.\n"
5551 "\n"
5551 "\n"
5552 " File history is shown without following rename or copy history of\n"
5552 " File history is shown without following rename or copy history of\n"
5553 " files. Use -f/--follow with a filename to follow history across\n"
5553 " files. Use -f/--follow with a filename to follow history across\n"
5554 " renames and copies. --follow without a filename will only show\n"
5554 " renames and copies. --follow without a filename will only show\n"
5555 " ancestors or descendants of the starting revision. --follow-first\n"
5555 " ancestors or descendants of the starting revision. --follow-first\n"
5556 " only follows the first parent of merge revisions.\n"
5556 " only follows the first parent of merge revisions.\n"
5557 "\n"
5557 "\n"
5558 " If no revision range is specified, the default is tip:0 unless\n"
5558 " If no revision range is specified, the default is tip:0 unless\n"
5559 " --follow is set, in which case the working directory parent is\n"
5559 " --follow is set, in which case the working directory parent is\n"
5560 " used as the starting revision.\n"
5560 " used as the starting revision.\n"
5561 "\n"
5561 "\n"
5562 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5562 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5563 "\n"
5563 "\n"
5564 " By default this command prints revision number and changeset id,\n"
5564 " By default this command prints revision number and changeset id,\n"
5565 " tags, non-trivial parents, user, date and time, and a summary for\n"
5565 " tags, non-trivial parents, user, date and time, and a summary for\n"
5566 " each commit. When the -v/--verbose switch is used, the list of\n"
5566 " each commit. When the -v/--verbose switch is used, the list of\n"
5567 " changed files and full commit message are shown.\n"
5567 " changed files and full commit message are shown.\n"
5568 "\n"
5568 "\n"
5569 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5569 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5570 " changesets, as it will only compare the merge changeset against\n"
5570 " changesets, as it will only compare the merge changeset against\n"
5571 " its first parent. Also, only files different from BOTH parents\n"
5571 " its first parent. Also, only files different from BOTH parents\n"
5572 " will appear in files:.\n"
5572 " will appear in files:.\n"
5573 " "
5573 " "
5574 msgstr ""
5574 msgstr ""
5575
5575
5576 msgid ""
5576 msgid ""
5577 "output the current or given revision of the project manifest\n"
5577 "output the current or given revision of the project manifest\n"
5578 "\n"
5578 "\n"
5579 " Print a list of version controlled files for the given revision.\n"
5579 " Print a list of version controlled files for the given revision.\n"
5580 " If no revision is given, the first parent of the working directory\n"
5580 " If no revision is given, the first parent of the working directory\n"
5581 " is used, or the null revision if no revision is checked out.\n"
5581 " is used, or the null revision if no revision is checked out.\n"
5582 "\n"
5582 "\n"
5583 " With -v, print file permissions, symlink and executable bits.\n"
5583 " With -v, print file permissions, symlink and executable bits.\n"
5584 " With --debug, print file revision hashes.\n"
5584 " With --debug, print file revision hashes.\n"
5585 " "
5585 " "
5586 msgstr ""
5586 msgstr ""
5587
5587
5588 msgid ""
5588 msgid ""
5589 "merge working directory with another revision\n"
5589 "merge working directory with another revision\n"
5590 "\n"
5590 "\n"
5591 " The current working directory is updated with all changes made in\n"
5591 " The current working directory is updated with all changes made in\n"
5592 " the requested revision since the last common predecessor revision.\n"
5592 " the requested revision since the last common predecessor revision.\n"
5593 "\n"
5593 "\n"
5594 " Files that changed between either parent are marked as changed for\n"
5594 " Files that changed between either parent are marked as changed for\n"
5595 " the next commit and a commit must be performed before any further\n"
5595 " the next commit and a commit must be performed before any further\n"
5596 " updates to the repository are allowed. The next commit will have\n"
5596 " updates to the repository are allowed. The next commit will have\n"
5597 " two parents.\n"
5597 " two parents.\n"
5598 "\n"
5598 "\n"
5599 " If no revision is specified, the working directory's parent is a\n"
5599 " If no revision is specified, the working directory's parent is a\n"
5600 " head revision, and the current branch contains exactly one other\n"
5600 " head revision, and the current branch contains exactly one other\n"
5601 " head, the other head is merged with by default. Otherwise, an\n"
5601 " head, the other head is merged with by default. Otherwise, an\n"
5602 " explicit revision with which to merge with must be provided.\n"
5602 " explicit revision with which to merge with must be provided.\n"
5603 " "
5603 " "
5604 msgstr ""
5604 msgstr ""
5605
5605
5606 #, python-format
5606 #, python-format
5607 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5607 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5608 msgstr ""
5608 msgstr ""
5609
5609
5610 #, python-format
5610 #, python-format
5611 msgid "branch '%s' has one head - please merge with an explicit rev"
5611 msgid "branch '%s' has one head - please merge with an explicit rev"
5612 msgstr ""
5612 msgstr ""
5613
5613
5614 msgid "there is nothing to merge"
5614 msgid "there is nothing to merge"
5615 msgstr ""
5615 msgstr ""
5616
5616
5617 #, python-format
5617 #, python-format
5618 msgid "%s - use \"hg update\" instead"
5618 msgid "%s - use \"hg update\" instead"
5619 msgstr ""
5619 msgstr ""
5620
5620
5621 msgid ""
5621 msgid ""
5622 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5622 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5623 "rev"
5623 "rev"
5624 msgstr ""
5624 msgstr ""
5625
5625
5626 msgid ""
5626 msgid ""
5627 "show changesets not found in destination\n"
5627 "show changesets not found in destination\n"
5628 "\n"
5628 "\n"
5629 " Show changesets not found in the specified destination repository\n"
5629 " Show changesets not found in the specified destination repository\n"
5630 " or the default push location. These are the changesets that would\n"
5630 " or the default push location. These are the changesets that would\n"
5631 " be pushed if a push was requested.\n"
5631 " be pushed if a push was requested.\n"
5632 "\n"
5632 "\n"
5633 " See pull for valid destination format details.\n"
5633 " See pull for valid destination format details.\n"
5634 " "
5634 " "
5635 msgstr ""
5635 msgstr ""
5636
5636
5637 msgid ""
5637 msgid ""
5638 "show the parents of the working directory or revision\n"
5638 "show the parents of the working directory or revision\n"
5639 "\n"
5639 "\n"
5640 " Print the working directory's parent revisions. If a revision is\n"
5640 " Print the working directory's parent revisions. If a revision is\n"
5641 " given via -r/--rev, the parent of that revision will be printed.\n"
5641 " given via -r/--rev, the parent of that revision will be printed.\n"
5642 " If a file argument is given, the revision in which the file was\n"
5642 " If a file argument is given, the revision in which the file was\n"
5643 " last changed (before the working directory revision or the\n"
5643 " last changed (before the working directory revision or the\n"
5644 " argument to --rev if given) is printed.\n"
5644 " argument to --rev if given) is printed.\n"
5645 " "
5645 " "
5646 msgstr ""
5646 msgstr ""
5647
5647
5648 msgid "can only specify an explicit filename"
5648 msgid "can only specify an explicit filename"
5649 msgstr ""
5649 msgstr ""
5650
5650
5651 #, python-format
5651 #, python-format
5652 msgid "'%s' not found in manifest!"
5652 msgid "'%s' not found in manifest!"
5653 msgstr ""
5653 msgstr ""
5654
5654
5655 msgid ""
5655 msgid ""
5656 "show aliases for remote repositories\n"
5656 "show aliases for remote repositories\n"
5657 "\n"
5657 "\n"
5658 " Show definition of symbolic path name NAME. If no name is given,\n"
5658 " Show definition of symbolic path name NAME. If no name is given,\n"
5659 " show definition of all available names.\n"
5659 " show definition of all available names.\n"
5660 "\n"
5660 "\n"
5661 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5661 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5662 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5662 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5663 "\n"
5663 "\n"
5664 " See 'hg help urls' for more information.\n"
5664 " See 'hg help urls' for more information.\n"
5665 " "
5665 " "
5666 msgstr ""
5666 msgstr ""
5667
5667
5668 msgid "not found!\n"
5668 msgid "not found!\n"
5669 msgstr ""
5669 msgstr ""
5670
5670
5671 msgid "not updating, since new heads added\n"
5671 msgid "not updating, since new heads added\n"
5672 msgstr ""
5672 msgstr ""
5673
5673
5674 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5674 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5675 msgstr ""
5675 msgstr ""
5676
5676
5677 msgid "(run 'hg update' to get a working copy)\n"
5677 msgid "(run 'hg update' to get a working copy)\n"
5678 msgstr ""
5678 msgstr ""
5679
5679
5680 msgid ""
5680 msgid ""
5681 "pull changes from the specified source\n"
5681 "pull changes from the specified source\n"
5682 "\n"
5682 "\n"
5683 " Pull changes from a remote repository to a local one.\n"
5683 " Pull changes from a remote repository to a local one.\n"
5684 "\n"
5684 "\n"
5685 " This finds all changes from the repository at the specified path\n"
5685 " This finds all changes from the repository at the specified path\n"
5686 " or URL and adds them to a local repository (the current one unless\n"
5686 " or URL and adds them to a local repository (the current one unless\n"
5687 " -R is specified). By default, this does not update the copy of the\n"
5687 " -R is specified). By default, this does not update the copy of the\n"
5688 " project in the working directory.\n"
5688 " project in the working directory.\n"
5689 "\n"
5689 "\n"
5690 " Use hg incoming if you want to see what would have been added by a\n"
5690 " Use hg incoming if you want to see what would have been added by a\n"
5691 " pull at the time you issued this command. If you then decide to\n"
5691 " pull at the time you issued this command. If you then decide to\n"
5692 " added those changes to the repository, you should use pull -r X\n"
5692 " added those changes to the repository, you should use pull -r X\n"
5693 " where X is the last changeset listed by hg incoming.\n"
5693 " where X is the last changeset listed by hg incoming.\n"
5694 "\n"
5694 "\n"
5695 " If SOURCE is omitted, the 'default' path will be used.\n"
5695 " If SOURCE is omitted, the 'default' path will be used.\n"
5696 " See 'hg help urls' for more information.\n"
5696 " See 'hg help urls' for more information.\n"
5697 " "
5697 " "
5698 msgstr ""
5698 msgstr ""
5699
5699
5700 msgid ""
5700 msgid ""
5701 "push changes to the specified destination\n"
5701 "push changes to the specified destination\n"
5702 "\n"
5702 "\n"
5703 " Push changes from the local repository to the given destination.\n"
5703 " Push changes from the local repository to the given destination.\n"
5704 "\n"
5704 "\n"
5705 " This is the symmetrical operation for pull. It moves changes from\n"
5705 " This is the symmetrical operation for pull. It moves changes from\n"
5706 " the current repository to a different one. If the destination is\n"
5706 " the current repository to a different one. If the destination is\n"
5707 " local this is identical to a pull in that directory from the\n"
5707 " local this is identical to a pull in that directory from the\n"
5708 " current one.\n"
5708 " current one.\n"
5709 "\n"
5709 "\n"
5710 " By default, push will refuse to run if it detects the result would\n"
5710 " By default, push will refuse to run if it detects the result would\n"
5711 " increase the number of remote heads. This generally indicates the\n"
5711 " increase the number of remote heads. This generally indicates the\n"
5712 " user forgot to pull and merge before pushing.\n"
5712 " user forgot to pull and merge before pushing.\n"
5713 "\n"
5713 "\n"
5714 " If -r/--rev is used, the named revision and all its ancestors will\n"
5714 " If -r/--rev is used, the named revision and all its ancestors will\n"
5715 " be pushed to the remote repository.\n"
5715 " be pushed to the remote repository.\n"
5716 "\n"
5716 "\n"
5717 " Please see 'hg help urls' for important details about ssh://\n"
5717 " Please see 'hg help urls' for important details about ssh://\n"
5718 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5718 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5719 " "
5719 " "
5720 msgstr ""
5720 msgstr ""
5721
5721
5722 #, python-format
5722 #, python-format
5723 msgid "pushing to %s\n"
5723 msgid "pushing to %s\n"
5724 msgstr ""
5724 msgstr ""
5725
5725
5726 msgid ""
5726 msgid ""
5727 "roll back an interrupted transaction\n"
5727 "roll back an interrupted transaction\n"
5728 "\n"
5728 "\n"
5729 " Recover from an interrupted commit or pull.\n"
5729 " Recover from an interrupted commit or pull.\n"
5730 "\n"
5730 "\n"
5731 " This command tries to fix the repository status after an\n"
5731 " This command tries to fix the repository status after an\n"
5732 " interrupted operation. It should only be necessary when Mercurial\n"
5732 " interrupted operation. It should only be necessary when Mercurial\n"
5733 " suggests it.\n"
5733 " suggests it.\n"
5734 " "
5734 " "
5735 msgstr ""
5735 msgstr ""
5736
5736
5737 msgid ""
5737 msgid ""
5738 "remove the specified files on the next commit\n"
5738 "remove the specified files on the next commit\n"
5739 "\n"
5739 "\n"
5740 " Schedule the indicated files for removal from the repository.\n"
5740 " Schedule the indicated files for removal from the repository.\n"
5741 "\n"
5741 "\n"
5742 " This only removes files from the current branch, not from the\n"
5742 " This only removes files from the current branch, not from the\n"
5743 " entire project history. -A/--after can be used to remove only\n"
5743 " entire project history. -A/--after can be used to remove only\n"
5744 " files that have already been deleted, -f/--force can be used to\n"
5744 " files that have already been deleted, -f/--force can be used to\n"
5745 " force deletion, and -Af can be used to remove files from the next\n"
5745 " force deletion, and -Af can be used to remove files from the next\n"
5746 " revision without deleting them from the working directory.\n"
5746 " revision without deleting them from the working directory.\n"
5747 "\n"
5747 "\n"
5748 " The following table details the behavior of remove for different\n"
5748 " The following table details the behavior of remove for different\n"
5749 " file states (columns) and option combinations (rows). The file\n"
5749 " file states (columns) and option combinations (rows). The file\n"
5750 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5750 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5751 " (as reported by hg status). The actions are Warn, Remove (from\n"
5751 " (as reported by hg status). The actions are Warn, Remove (from\n"
5752 " branch) and Delete (from disk).\n"
5752 " branch) and Delete (from disk).\n"
5753 "\n"
5753 "\n"
5754 " A C M !\n"
5754 " A C M !\n"
5755 " none W RD W R\n"
5755 " none W RD W R\n"
5756 " -f R RD RD R\n"
5756 " -f R RD RD R\n"
5757 " -A W W W R\n"
5757 " -A W W W R\n"
5758 " -Af R R R R\n"
5758 " -Af R R R R\n"
5759 "\n"
5759 "\n"
5760 " This command schedules the files to be removed at the next commit.\n"
5760 " This command schedules the files to be removed at the next commit.\n"
5761 " To undo a remove before that, see hg revert.\n"
5761 " To undo a remove before that, see hg revert.\n"
5762 " "
5762 " "
5763 msgstr ""
5763 msgstr ""
5764
5764
5765 #, python-format
5765 #, python-format
5766 msgid "not removing %s: file is untracked\n"
5766 msgid "not removing %s: file is untracked\n"
5767 msgstr ""
5767 msgstr ""
5768
5768
5769 #, python-format
5769 #, python-format
5770 msgid "not removing %s: file %s (use -f to force removal)\n"
5770 msgid "not removing %s: file %s (use -f to force removal)\n"
5771 msgstr ""
5771 msgstr ""
5772
5772
5773 msgid "still exists"
5773 msgid "still exists"
5774 msgstr ""
5774 msgstr ""
5775
5775
5776 msgid "is modified"
5776 msgid "is modified"
5777 msgstr ""
5777 msgstr ""
5778
5778
5779 msgid "has been marked for add"
5779 msgid "has been marked for add"
5780 msgstr ""
5780 msgstr ""
5781
5781
5782 msgid ""
5782 msgid ""
5783 "rename files; equivalent of copy + remove\n"
5783 "rename files; equivalent of copy + remove\n"
5784 "\n"
5784 "\n"
5785 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5785 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5786 " is a directory, copies are put in that directory. If dest is a\n"
5786 " is a directory, copies are put in that directory. If dest is a\n"
5787 " file, there can only be one source.\n"
5787 " file, there can only be one source.\n"
5788 "\n"
5788 "\n"
5789 " By default, this command copies the contents of files as they\n"
5789 " By default, this command copies the contents of files as they\n"
5790 " exist in the working directory. If invoked with -A/--after, the\n"
5790 " exist in the working directory. If invoked with -A/--after, the\n"
5791 " operation is recorded, but no copying is performed.\n"
5791 " operation is recorded, but no copying is performed.\n"
5792 "\n"
5792 "\n"
5793 " This command takes effect at the next commit. To undo a rename\n"
5793 " This command takes effect at the next commit. To undo a rename\n"
5794 " before that, see hg revert.\n"
5794 " before that, see hg revert.\n"
5795 " "
5795 " "
5796 msgstr ""
5796 msgstr ""
5797
5797
5798 msgid ""
5798 msgid ""
5799 "retry file merges from a merge or update\n"
5799 "retry file merges from a merge or update\n"
5800 "\n"
5800 "\n"
5801 " This command will cleanly retry unresolved file merges using file\n"
5801 " This command will cleanly retry unresolved file merges using file\n"
5802 " revisions preserved from the last update or merge. To attempt to\n"
5802 " revisions preserved from the last update or merge. To attempt to\n"
5803 " resolve all unresolved files, use the -a/--all switch.\n"
5803 " resolve all unresolved files, use the -a/--all switch.\n"
5804 "\n"
5804 "\n"
5805 " If a conflict is resolved manually, please note that the changes\n"
5805 " If a conflict is resolved manually, please note that the changes\n"
5806 " will be overwritten if the merge is retried with resolve. The\n"
5806 " will be overwritten if the merge is retried with resolve. The\n"
5807 " -m/--mark switch should be used to mark the file as resolved.\n"
5807 " -m/--mark switch should be used to mark the file as resolved.\n"
5808 "\n"
5808 "\n"
5809 " This command also allows listing resolved files and manually\n"
5809 " This command also allows listing resolved files and manually\n"
5810 " indicating whether or not files are resolved. All files must be\n"
5810 " indicating whether or not files are resolved. All files must be\n"
5811 " marked as resolved before a commit is permitted.\n"
5811 " marked as resolved before a commit is permitted.\n"
5812 "\n"
5812 "\n"
5813 " The codes used to show the status of files are:\n"
5813 " The codes used to show the status of files are:\n"
5814 " U = unresolved\n"
5814 " U = unresolved\n"
5815 " R = resolved\n"
5815 " R = resolved\n"
5816 " "
5816 " "
5817 msgstr ""
5817 msgstr ""
5818
5818
5819 msgid "too many options specified"
5819 msgid "too many options specified"
5820 msgstr ""
5820 msgstr ""
5821
5821
5822 msgid "can't specify --all and patterns"
5822 msgid "can't specify --all and patterns"
5823 msgstr ""
5823 msgstr ""
5824
5824
5825 msgid "no files or directories specified; use --all to remerge all files"
5825 msgid "no files or directories specified; use --all to remerge all files"
5826 msgstr ""
5826 msgstr ""
5827
5827
5828 msgid ""
5828 msgid ""
5829 "restore individual files or directories to an earlier state\n"
5829 "restore individual files or directories to an earlier state\n"
5830 "\n"
5830 "\n"
5831 " (Use update -r to check out earlier revisions, revert does not\n"
5831 " (Use update -r to check out earlier revisions, revert does not\n"
5832 " change the working directory parents.)\n"
5832 " change the working directory parents.)\n"
5833 "\n"
5833 "\n"
5834 " With no revision specified, revert the named files or directories\n"
5834 " With no revision specified, revert the named files or directories\n"
5835 " to the contents they had in the parent of the working directory.\n"
5835 " to the contents they had in the parent of the working directory.\n"
5836 " This restores the contents of the affected files to an unmodified\n"
5836 " This restores the contents of the affected files to an unmodified\n"
5837 " state and unschedules adds, removes, copies, and renames. If the\n"
5837 " state and unschedules adds, removes, copies, and renames. If the\n"
5838 " working directory has two parents, you must explicitly specify the\n"
5838 " working directory has two parents, you must explicitly specify the\n"
5839 " revision to revert to.\n"
5839 " revision to revert to.\n"
5840 "\n"
5840 "\n"
5841 " Using the -r/--rev option, revert the given files or directories\n"
5841 " Using the -r/--rev option, revert the given files or directories\n"
5842 " to their contents as of a specific revision. This can be helpful\n"
5842 " to their contents as of a specific revision. This can be helpful\n"
5843 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5843 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5844 " dates' for a list of formats valid for -d/--date.\n"
5844 " dates' for a list of formats valid for -d/--date.\n"
5845 "\n"
5845 "\n"
5846 " Revert modifies the working directory. It does not commit any\n"
5846 " Revert modifies the working directory. It does not commit any\n"
5847 " changes, or change the parent of the working directory. If you\n"
5847 " changes, or change the parent of the working directory. If you\n"
5848 " revert to a revision other than the parent of the working\n"
5848 " revert to a revision other than the parent of the working\n"
5849 " directory, the reverted files will thus appear modified\n"
5849 " directory, the reverted files will thus appear modified\n"
5850 " afterwards.\n"
5850 " afterwards.\n"
5851 "\n"
5851 "\n"
5852 " If a file has been deleted, it is restored. If the executable mode\n"
5852 " If a file has been deleted, it is restored. If the executable mode\n"
5853 " of a file was changed, it is reset.\n"
5853 " of a file was changed, it is reset.\n"
5854 "\n"
5854 "\n"
5855 " If names are given, all files matching the names are reverted.\n"
5855 " If names are given, all files matching the names are reverted.\n"
5856 " If no arguments are given, no files are reverted.\n"
5856 " If no arguments are given, no files are reverted.\n"
5857 "\n"
5857 "\n"
5858 " Modified files are saved with a .orig suffix before reverting.\n"
5858 " Modified files are saved with a .orig suffix before reverting.\n"
5859 " To disable these backups, use --no-backup.\n"
5859 " To disable these backups, use --no-backup.\n"
5860 " "
5860 " "
5861 msgstr ""
5861 msgstr ""
5862
5862
5863 msgid "you can't specify a revision and a date"
5863 msgid "you can't specify a revision and a date"
5864 msgstr ""
5864 msgstr ""
5865
5865
5866 msgid "no files or directories specified; use --all to revert the whole repo"
5866 msgid "no files or directories specified; use --all to revert the whole repo"
5867 msgstr ""
5867 msgstr ""
5868
5868
5869 #, python-format
5869 #, python-format
5870 msgid "forgetting %s\n"
5870 msgid "forgetting %s\n"
5871 msgstr ""
5871 msgstr ""
5872
5872
5873 #, python-format
5873 #, python-format
5874 msgid "reverting %s\n"
5874 msgid "reverting %s\n"
5875 msgstr ""
5875 msgstr ""
5876
5876
5877 #, python-format
5877 #, python-format
5878 msgid "undeleting %s\n"
5878 msgid "undeleting %s\n"
5879 msgstr ""
5879 msgstr ""
5880
5880
5881 #, python-format
5881 #, python-format
5882 msgid "saving current version of %s as %s\n"
5882 msgid "saving current version of %s as %s\n"
5883 msgstr ""
5883 msgstr ""
5884
5884
5885 #, python-format
5885 #, python-format
5886 msgid "file not managed: %s\n"
5886 msgid "file not managed: %s\n"
5887 msgstr ""
5887 msgstr ""
5888
5888
5889 #, python-format
5889 #, python-format
5890 msgid "no changes needed to %s\n"
5890 msgid "no changes needed to %s\n"
5891 msgstr ""
5891 msgstr ""
5892
5892
5893 msgid ""
5893 msgid ""
5894 "roll back the last transaction\n"
5894 "roll back the last transaction\n"
5895 "\n"
5895 "\n"
5896 " This command should be used with care. There is only one level of\n"
5896 " This command should be used with care. There is only one level of\n"
5897 " rollback, and there is no way to undo a rollback. It will also\n"
5897 " rollback, and there is no way to undo a rollback. It will also\n"
5898 " restore the dirstate at the time of the last transaction, losing\n"
5898 " restore the dirstate at the time of the last transaction, losing\n"
5899 " any dirstate changes since that time. This command does not alter\n"
5899 " any dirstate changes since that time. This command does not alter\n"
5900 " the working directory.\n"
5900 " the working directory.\n"
5901 "\n"
5901 "\n"
5902 " Transactions are used to encapsulate the effects of all commands\n"
5902 " Transactions are used to encapsulate the effects of all commands\n"
5903 " that create new changesets or propagate existing changesets into a\n"
5903 " that create new changesets or propagate existing changesets into a\n"
5904 " repository. For example, the following commands are transactional,\n"
5904 " repository. For example, the following commands are transactional,\n"
5905 " and their effects can be rolled back:\n"
5905 " and their effects can be rolled back:\n"
5906 "\n"
5906 "\n"
5907 " commit\n"
5907 " commit\n"
5908 " import\n"
5908 " import\n"
5909 " pull\n"
5909 " pull\n"
5910 " push (with this repository as destination)\n"
5910 " push (with this repository as destination)\n"
5911 " unbundle\n"
5911 " unbundle\n"
5912 "\n"
5912 "\n"
5913 " This command is not intended for use on public repositories. Once\n"
5913 " This command is not intended for use on public repositories. Once\n"
5914 " changes are visible for pull by other users, rolling a transaction\n"
5914 " changes are visible for pull by other users, rolling a transaction\n"
5915 " back locally is ineffective (someone else may already have pulled\n"
5915 " back locally is ineffective (someone else may already have pulled\n"
5916 " the changes). Furthermore, a race is possible with readers of the\n"
5916 " the changes). Furthermore, a race is possible with readers of the\n"
5917 " repository; for example an in-progress pull from the repository\n"
5917 " repository; for example an in-progress pull from the repository\n"
5918 " may fail if a rollback is performed.\n"
5918 " may fail if a rollback is performed.\n"
5919 " "
5919 " "
5920 msgstr ""
5920 msgstr ""
5921
5921
5922 msgid ""
5922 msgid ""
5923 "print the root (top) of the current working directory\n"
5923 "print the root (top) of the current working directory\n"
5924 "\n"
5924 "\n"
5925 " Print the root directory of the current repository.\n"
5925 " Print the root directory of the current repository.\n"
5926 " "
5926 " "
5927 msgstr ""
5927 msgstr ""
5928
5928
5929 msgid ""
5929 msgid ""
5930 "export the repository via HTTP\n"
5930 "export the repository via HTTP\n"
5931 "\n"
5931 "\n"
5932 " Start a local HTTP repository browser and pull server.\n"
5932 " Start a local HTTP repository browser and pull server.\n"
5933 "\n"
5933 "\n"
5934 " By default, the server logs accesses to stdout and errors to\n"
5934 " By default, the server logs accesses to stdout and errors to\n"
5935 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
5935 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
5936 " files.\n"
5936 " files.\n"
5937 " "
5937 " "
5938 msgstr ""
5938 msgstr ""
5939
5939
5940 #, python-format
5940 #, python-format
5941 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
5941 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
5942 msgstr ""
5942 msgstr ""
5943
5943
5944 msgid ""
5944 msgid ""
5945 "show changed files in the working directory\n"
5945 "show changed files in the working directory\n"
5946 "\n"
5946 "\n"
5947 " Show status of files in the repository. If names are given, only\n"
5947 " Show status of files in the repository. If names are given, only\n"
5948 " files that match are shown. Files that are clean or ignored or\n"
5948 " files that match are shown. Files that are clean or ignored or\n"
5949 " the source of a copy/move operation, are not listed unless\n"
5949 " the source of a copy/move operation, are not listed unless\n"
5950 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
5950 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
5951 " Unless options described with \"show only ...\" are given, the\n"
5951 " Unless options described with \"show only ...\" are given, the\n"
5952 " options -mardu are used.\n"
5952 " options -mardu are used.\n"
5953 "\n"
5953 "\n"
5954 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
5954 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
5955 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
5955 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
5956 "\n"
5956 "\n"
5957 " NOTE: status may appear to disagree with diff if permissions have\n"
5957 " NOTE: status may appear to disagree with diff if permissions have\n"
5958 " changed or a merge has occurred. The standard diff format does not\n"
5958 " changed or a merge has occurred. The standard diff format does not\n"
5959 " report permission changes and diff only reports changes relative\n"
5959 " report permission changes and diff only reports changes relative\n"
5960 " to one merge parent.\n"
5960 " to one merge parent.\n"
5961 "\n"
5961 "\n"
5962 " If one revision is given, it is used as the base revision.\n"
5962 " If one revision is given, it is used as the base revision.\n"
5963 " If two revisions are given, the differences between them are\n"
5963 " If two revisions are given, the differences between them are\n"
5964 " shown.\n"
5964 " shown.\n"
5965 "\n"
5965 "\n"
5966 " The codes used to show the status of files are:\n"
5966 " The codes used to show the status of files are:\n"
5967 " M = modified\n"
5967 " M = modified\n"
5968 " A = added\n"
5968 " A = added\n"
5969 " R = removed\n"
5969 " R = removed\n"
5970 " C = clean\n"
5970 " C = clean\n"
5971 " ! = missing (deleted by non-hg command, but still tracked)\n"
5971 " ! = missing (deleted by non-hg command, but still tracked)\n"
5972 " ? = not tracked\n"
5972 " ? = not tracked\n"
5973 " I = ignored\n"
5973 " I = ignored\n"
5974 " = origin of the previous file listed as A (added)\n"
5974 " = origin of the previous file listed as A (added)\n"
5975 " "
5975 " "
5976 msgstr ""
5976 msgstr ""
5977
5977
5978 msgid ""
5978 msgid ""
5979 "add one or more tags for the current or given revision\n"
5979 "add one or more tags for the current or given revision\n"
5980 "\n"
5980 "\n"
5981 " Name a particular revision using <name>.\n"
5981 " Name a particular revision using <name>.\n"
5982 "\n"
5982 "\n"
5983 " Tags are used to name particular revisions of the repository and are\n"
5983 " Tags are used to name particular revisions of the repository and are\n"
5984 " very useful to compare different revisions, to go back to significant\n"
5984 " very useful to compare different revisions, to go back to significant\n"
5985 " earlier versions or to mark branch points as releases, etc.\n"
5985 " earlier versions or to mark branch points as releases, etc.\n"
5986 "\n"
5986 "\n"
5987 " If no revision is given, the parent of the working directory is\n"
5987 " If no revision is given, the parent of the working directory is\n"
5988 " used, or tip if no revision is checked out.\n"
5988 " used, or tip if no revision is checked out.\n"
5989 "\n"
5989 "\n"
5990 " To facilitate version control, distribution, and merging of tags,\n"
5990 " To facilitate version control, distribution, and merging of tags,\n"
5991 " they are stored as a file named \".hgtags\" which is managed\n"
5991 " they are stored as a file named \".hgtags\" which is managed\n"
5992 " similarly to other project files and can be hand-edited if\n"
5992 " similarly to other project files and can be hand-edited if\n"
5993 " necessary. The file '.hg/localtags' is used for local tags (not\n"
5993 " necessary. The file '.hg/localtags' is used for local tags (not\n"
5994 " shared among repositories).\n"
5994 " shared among repositories).\n"
5995 "\n"
5995 "\n"
5996 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5996 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5997 " "
5997 " "
5998 msgstr ""
5998 msgstr ""
5999
5999
6000 msgid "tag names must be unique"
6000 msgid "tag names must be unique"
6001 msgstr ""
6001 msgstr ""
6002
6002
6003 #, python-format
6003 #, python-format
6004 msgid "the name '%s' is reserved"
6004 msgid "the name '%s' is reserved"
6005 msgstr ""
6005 msgstr ""
6006
6006
6007 msgid "--rev and --remove are incompatible"
6007 msgid "--rev and --remove are incompatible"
6008 msgstr ""
6008 msgstr ""
6009
6009
6010 #, python-format
6010 #, python-format
6011 msgid "tag '%s' does not exist"
6011 msgid "tag '%s' does not exist"
6012 msgstr ""
6012 msgstr ""
6013
6013
6014 #, python-format
6014 #, python-format
6015 msgid "tag '%s' is not a global tag"
6015 msgid "tag '%s' is not a global tag"
6016 msgstr ""
6016 msgstr ""
6017
6017
6018 #, python-format
6018 #, python-format
6019 msgid "tag '%s' is not a local tag"
6019 msgid "tag '%s' is not a local tag"
6020 msgstr ""
6020 msgstr ""
6021
6021
6022 #, python-format
6022 #, python-format
6023 msgid "Removed tag %s"
6023 msgid "Removed tag %s"
6024 msgstr ""
6024 msgstr ""
6025
6025
6026 #, python-format
6026 #, python-format
6027 msgid "tag '%s' already exists (use -f to force)"
6027 msgid "tag '%s' already exists (use -f to force)"
6028 msgstr ""
6028 msgstr ""
6029
6029
6030 #, python-format
6030 #, python-format
6031 msgid "Added tag %s for changeset %s"
6031 msgid "Added tag %s for changeset %s"
6032 msgstr ""
6032 msgstr ""
6033
6033
6034 msgid ""
6034 msgid ""
6035 "list repository tags\n"
6035 "list repository tags\n"
6036 "\n"
6036 "\n"
6037 " This lists both regular and local tags. When the -v/--verbose\n"
6037 " This lists both regular and local tags. When the -v/--verbose\n"
6038 " switch is used, a third column \"local\" is printed for local tags.\n"
6038 " switch is used, a third column \"local\" is printed for local tags.\n"
6039 " "
6039 " "
6040 msgstr ""
6040 msgstr ""
6041
6041
6042 msgid ""
6042 msgid ""
6043 "show the tip revision\n"
6043 "show the tip revision\n"
6044 "\n"
6044 "\n"
6045 " The tip revision (usually just called the tip) is the changeset\n"
6045 " The tip revision (usually just called the tip) is the changeset\n"
6046 " most recently added to the repository (and therefore the most\n"
6046 " most recently added to the repository (and therefore the most\n"
6047 " recently changed head).\n"
6047 " recently changed head).\n"
6048 "\n"
6048 "\n"
6049 " If you have just made a commit, that commit will be the tip. If\n"
6049 " If you have just made a commit, that commit will be the tip. If\n"
6050 " you have just pulled changes from another repository, the tip of\n"
6050 " you have just pulled changes from another repository, the tip of\n"
6051 " that repository becomes the current tip. The \"tip\" tag is special\n"
6051 " that repository becomes the current tip. The \"tip\" tag is special\n"
6052 " and cannot be renamed or assigned to a different changeset.\n"
6052 " and cannot be renamed or assigned to a different changeset.\n"
6053 " "
6053 " "
6054 msgstr ""
6054 msgstr ""
6055
6055
6056 msgid ""
6056 msgid ""
6057 "apply one or more changegroup files\n"
6057 "apply one or more changegroup files\n"
6058 "\n"
6058 "\n"
6059 " Apply one or more compressed changegroup files generated by the\n"
6059 " Apply one or more compressed changegroup files generated by the\n"
6060 " bundle command.\n"
6060 " bundle command.\n"
6061 " "
6061 " "
6062 msgstr ""
6062 msgstr ""
6063
6063
6064 msgid ""
6064 msgid ""
6065 "update working directory\n"
6065 "update working directory\n"
6066 "\n"
6066 "\n"
6067 " Update the repository's working directory to the specified\n"
6067 " Update the repository's working directory to the specified\n"
6068 " revision, or the tip of the current branch if none is specified.\n"
6068 " revision, or the tip of the current branch if none is specified.\n"
6069 " Use null as the revision to remove the working copy (like 'hg\n"
6069 " Use null as the revision to remove the working copy (like 'hg\n"
6070 " clone -U').\n"
6070 " clone -U').\n"
6071 "\n"
6071 "\n"
6072 " When the working directory contains no uncommitted changes, it\n"
6072 " When the working directory contains no uncommitted changes, it\n"
6073 " will be replaced by the state of the requested revision from the\n"
6073 " will be replaced by the state of the requested revision from the\n"
6074 " repository. When the requested revision is on a different branch,\n"
6074 " repository. When the requested revision is on a different branch,\n"
6075 " the working directory will additionally be switched to that\n"
6075 " the working directory will additionally be switched to that\n"
6076 " branch.\n"
6076 " branch.\n"
6077 "\n"
6077 "\n"
6078 " When there are uncommitted changes, use option -C/--clean to\n"
6078 " When there are uncommitted changes, use option -C/--clean to\n"
6079 " discard them, forcibly replacing the state of the working\n"
6079 " discard them, forcibly replacing the state of the working\n"
6080 " directory with the requested revision. Alternately, use -c/--check\n"
6080 " directory with the requested revision. Alternately, use -c/--check\n"
6081 " to abort.\n"
6081 " to abort.\n"
6082 "\n"
6082 "\n"
6083 " When there are uncommitted changes and option -C/--clean is not\n"
6083 " When there are uncommitted changes and option -C/--clean is not\n"
6084 " used, and the parent revision and requested revision are on the\n"
6084 " used, and the parent revision and requested revision are on the\n"
6085 " same branch, and one of them is an ancestor of the other, then the\n"
6085 " same branch, and one of them is an ancestor of the other, then the\n"
6086 " new working directory will contain the requested revision merged\n"
6086 " new working directory will contain the requested revision merged\n"
6087 " with the uncommitted changes. Otherwise, the update will fail with\n"
6087 " with the uncommitted changes. Otherwise, the update will fail with\n"
6088 " a suggestion to use 'merge' or 'update -C' instead.\n"
6088 " a suggestion to use 'merge' or 'update -C' instead.\n"
6089 "\n"
6089 "\n"
6090 " If you want to update just one file to an older revision, use\n"
6090 " If you want to update just one file to an older revision, use\n"
6091 " revert.\n"
6091 " revert.\n"
6092 "\n"
6092 "\n"
6093 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6093 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6094 " "
6094 " "
6095 msgstr ""
6095 msgstr ""
6096
6096
6097 msgid "uncommitted local changes"
6097 msgid "uncommitted local changes"
6098 msgstr ""
6098 msgstr ""
6099
6099
6100 msgid ""
6100 msgid ""
6101 "verify the integrity of the repository\n"
6101 "verify the integrity of the repository\n"
6102 "\n"
6102 "\n"
6103 " Verify the integrity of the current repository.\n"
6103 " Verify the integrity of the current repository.\n"
6104 "\n"
6104 "\n"
6105 " This will perform an extensive check of the repository's\n"
6105 " This will perform an extensive check of the repository's\n"
6106 " integrity, validating the hashes and checksums of each entry in\n"
6106 " integrity, validating the hashes and checksums of each entry in\n"
6107 " the changelog, manifest, and tracked files, as well as the\n"
6107 " the changelog, manifest, and tracked files, as well as the\n"
6108 " integrity of their crosslinks and indices.\n"
6108 " integrity of their crosslinks and indices.\n"
6109 " "
6109 " "
6110 msgstr ""
6110 msgstr ""
6111
6111
6112 msgid "output version and copyright information"
6112 msgid "output version and copyright information"
6113 msgstr ""
6113 msgstr ""
6114
6114
6115 #, python-format
6115 #, python-format
6116 msgid "Mercurial Distributed SCM (version %s)\n"
6116 msgid "Mercurial Distributed SCM (version %s)\n"
6117 msgstr ""
6117 msgstr ""
6118
6118
6119 msgid ""
6119 msgid ""
6120 "\n"
6120 "\n"
6121 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6121 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6122 "This is free software; see the source for copying conditions. There is NO\n"
6122 "This is free software; see the source for copying conditions. There is NO\n"
6123 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6123 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6124 msgstr ""
6124 msgstr ""
6125
6125
6126 msgid "repository root directory or symbolic path name"
6126 msgid "repository root directory or symbolic path name"
6127 msgstr ""
6127 msgstr ""
6128
6128
6129 msgid "change working directory"
6129 msgid "change working directory"
6130 msgstr ""
6130 msgstr ""
6131
6131
6132 msgid "do not prompt, assume 'yes' for any required answers"
6132 msgid "do not prompt, assume 'yes' for any required answers"
6133 msgstr ""
6133 msgstr ""
6134
6134
6135 msgid "suppress output"
6135 msgid "suppress output"
6136 msgstr ""
6136 msgstr ""
6137
6137
6138 msgid "enable additional output"
6138 msgid "enable additional output"
6139 msgstr ""
6139 msgstr ""
6140
6140
6141 msgid "set/override config option"
6141 msgid "set/override config option"
6142 msgstr ""
6142 msgstr ""
6143
6143
6144 msgid "enable debugging output"
6144 msgid "enable debugging output"
6145 msgstr ""
6145 msgstr ""
6146
6146
6147 msgid "start debugger"
6147 msgid "start debugger"
6148 msgstr ""
6148 msgstr ""
6149
6149
6150 msgid "set the charset encoding"
6150 msgid "set the charset encoding"
6151 msgstr ""
6151 msgstr ""
6152
6152
6153 msgid "set the charset encoding mode"
6153 msgid "set the charset encoding mode"
6154 msgstr ""
6154 msgstr ""
6155
6155
6156 msgid "print traceback on exception"
6156 msgid "print traceback on exception"
6157 msgstr ""
6157 msgstr ""
6158
6158
6159 msgid "time how long the command takes"
6159 msgid "time how long the command takes"
6160 msgstr ""
6160 msgstr ""
6161
6161
6162 msgid "print command execution profile"
6162 msgid "print command execution profile"
6163 msgstr ""
6163 msgstr ""
6164
6164
6165 msgid "output version information and exit"
6165 msgid "output version information and exit"
6166 msgstr ""
6166 msgstr ""
6167
6167
6168 msgid "display help and exit"
6168 msgid "display help and exit"
6169 msgstr ""
6169 msgstr ""
6170
6170
6171 msgid "do not perform actions, just print output"
6171 msgid "do not perform actions, just print output"
6172 msgstr ""
6172 msgstr ""
6173
6173
6174 msgid "specify ssh command to use"
6174 msgid "specify ssh command to use"
6175 msgstr ""
6175 msgstr ""
6176
6176
6177 msgid "specify hg command to run on the remote side"
6177 msgid "specify hg command to run on the remote side"
6178 msgstr ""
6178 msgstr ""
6179
6179
6180 msgid "include names matching the given patterns"
6180 msgid "include names matching the given patterns"
6181 msgstr ""
6181 msgstr ""
6182
6182
6183 msgid "exclude names matching the given patterns"
6183 msgid "exclude names matching the given patterns"
6184 msgstr ""
6184 msgstr ""
6185
6185
6186 msgid "use <text> as commit message"
6186 msgid "use <text> as commit message"
6187 msgstr ""
6187 msgstr ""
6188
6188
6189 msgid "read commit message from <file>"
6189 msgid "read commit message from <file>"
6190 msgstr ""
6190 msgstr ""
6191
6191
6192 msgid "record datecode as commit date"
6192 msgid "record datecode as commit date"
6193 msgstr ""
6193 msgstr ""
6194
6194
6195 msgid "record the specified user as committer"
6195 msgid "record the specified user as committer"
6196 msgstr ""
6196 msgstr ""
6197
6197
6198 msgid "display using template map file"
6198 msgid "display using template map file"
6199 msgstr ""
6199 msgstr ""
6200
6200
6201 msgid "display with template"
6201 msgid "display with template"
6202 msgstr ""
6202 msgstr ""
6203
6203
6204 msgid "do not show merges"
6204 msgid "do not show merges"
6205 msgstr ""
6205 msgstr ""
6206
6206
6207 msgid "treat all files as text"
6207 msgid "treat all files as text"
6208 msgstr ""
6208 msgstr ""
6209
6209
6210 msgid "don't include dates in diff headers"
6210 msgid "don't include dates in diff headers"
6211 msgstr ""
6211 msgstr ""
6212
6212
6213 msgid "show which function each change is in"
6213 msgid "show which function each change is in"
6214 msgstr ""
6214 msgstr ""
6215
6215
6216 msgid "ignore white space when comparing lines"
6216 msgid "ignore white space when comparing lines"
6217 msgstr ""
6217 msgstr ""
6218
6218
6219 msgid "ignore changes in the amount of white space"
6219 msgid "ignore changes in the amount of white space"
6220 msgstr ""
6220 msgstr ""
6221
6221
6222 msgid "ignore changes whose lines are all blank"
6222 msgid "ignore changes whose lines are all blank"
6223 msgstr ""
6223 msgstr ""
6224
6224
6225 msgid "number of lines of context to show"
6225 msgid "number of lines of context to show"
6226 msgstr ""
6226 msgstr ""
6227
6227
6228 msgid "guess renamed files by similarity (0<=s<=100)"
6228 msgid "guess renamed files by similarity (0<=s<=100)"
6229 msgstr ""
6229 msgstr ""
6230
6230
6231 msgid "[OPTION]... [FILE]..."
6231 msgid "[OPTION]... [FILE]..."
6232 msgstr ""
6232 msgstr ""
6233
6233
6234 msgid "annotate the specified revision"
6234 msgid "annotate the specified revision"
6235 msgstr ""
6235 msgstr ""
6236
6236
6237 msgid "follow file copies and renames"
6237 msgid "follow file copies and renames"
6238 msgstr ""
6238 msgstr ""
6239
6239
6240 msgid "list the author (long with -v)"
6240 msgid "list the author (long with -v)"
6241 msgstr ""
6241 msgstr ""
6242
6242
6243 msgid "list the date (short with -q)"
6243 msgid "list the date (short with -q)"
6244 msgstr ""
6244 msgstr ""
6245
6245
6246 msgid "list the revision number (default)"
6246 msgid "list the revision number (default)"
6247 msgstr ""
6247 msgstr ""
6248
6248
6249 msgid "list the changeset"
6249 msgid "list the changeset"
6250 msgstr ""
6250 msgstr ""
6251
6251
6252 msgid "show line number at the first appearance"
6252 msgid "show line number at the first appearance"
6253 msgstr ""
6253 msgstr ""
6254
6254
6255 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6255 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6256 msgstr ""
6256 msgstr ""
6257
6257
6258 msgid "do not pass files through decoders"
6258 msgid "do not pass files through decoders"
6259 msgstr ""
6259 msgstr ""
6260
6260
6261 msgid "directory prefix for files in archive"
6261 msgid "directory prefix for files in archive"
6262 msgstr ""
6262 msgstr ""
6263
6263
6264 msgid "revision to distribute"
6264 msgid "revision to distribute"
6265 msgstr ""
6265 msgstr ""
6266
6266
6267 msgid "type of distribution to create"
6267 msgid "type of distribution to create"
6268 msgstr ""
6268 msgstr ""
6269
6269
6270 msgid "[OPTION]... DEST"
6270 msgid "[OPTION]... DEST"
6271 msgstr ""
6271 msgstr ""
6272
6272
6273 msgid "merge with old dirstate parent after backout"
6273 msgid "merge with old dirstate parent after backout"
6274 msgstr ""
6274 msgstr ""
6275
6275
6276 msgid "parent to choose when backing out merge"
6276 msgid "parent to choose when backing out merge"
6277 msgstr ""
6277 msgstr ""
6278
6278
6279 msgid "revision to backout"
6279 msgid "revision to backout"
6280 msgstr ""
6280 msgstr ""
6281
6281
6282 msgid "[OPTION]... [-r] REV"
6282 msgid "[OPTION]... [-r] REV"
6283 msgstr ""
6283 msgstr ""
6284
6284
6285 msgid "reset bisect state"
6285 msgid "reset bisect state"
6286 msgstr ""
6286 msgstr ""
6287
6287
6288 msgid "mark changeset good"
6288 msgid "mark changeset good"
6289 msgstr ""
6289 msgstr ""
6290
6290
6291 msgid "mark changeset bad"
6291 msgid "mark changeset bad"
6292 msgstr ""
6292 msgstr ""
6293
6293
6294 msgid "skip testing changeset"
6294 msgid "skip testing changeset"
6295 msgstr ""
6295 msgstr ""
6296
6296
6297 msgid "use command to check changeset state"
6297 msgid "use command to check changeset state"
6298 msgstr ""
6298 msgstr ""
6299
6299
6300 msgid "do not update to target"
6300 msgid "do not update to target"
6301 msgstr ""
6301 msgstr ""
6302
6302
6303 msgid "[-gbsr] [-c CMD] [REV]"
6303 msgid "[-gbsr] [-c CMD] [REV]"
6304 msgstr ""
6304 msgstr ""
6305
6305
6306 msgid "set branch name even if it shadows an existing branch"
6306 msgid "set branch name even if it shadows an existing branch"
6307 msgstr ""
6307 msgstr ""
6308
6308
6309 msgid "reset branch name to parent branch name"
6309 msgid "reset branch name to parent branch name"
6310 msgstr ""
6310 msgstr ""
6311
6311
6312 msgid "[-fC] [NAME]"
6312 msgid "[-fC] [NAME]"
6313 msgstr ""
6313 msgstr ""
6314
6314
6315 msgid "show only branches that have unmerged heads"
6315 msgid "show only branches that have unmerged heads"
6316 msgstr ""
6316 msgstr ""
6317
6317
6318 msgid "[-a]"
6318 msgid "[-a]"
6319 msgstr ""
6319 msgstr ""
6320
6320
6321 msgid "run even when remote repository is unrelated"
6321 msgid "run even when remote repository is unrelated"
6322 msgstr ""
6322 msgstr ""
6323
6323
6324 msgid "a changeset up to which you would like to bundle"
6324 msgid "a changeset up to which you would like to bundle"
6325 msgstr ""
6325 msgstr ""
6326
6326
6327 msgid "a base changeset to specify instead of a destination"
6327 msgid "a base changeset to specify instead of a destination"
6328 msgstr ""
6328 msgstr ""
6329
6329
6330 msgid "bundle all changesets in the repository"
6330 msgid "bundle all changesets in the repository"
6331 msgstr ""
6331 msgstr ""
6332
6332
6333 msgid "bundle compression type to use"
6333 msgid "bundle compression type to use"
6334 msgstr ""
6334 msgstr ""
6335
6335
6336 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6336 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6337 msgstr ""
6337 msgstr ""
6338
6338
6339 msgid "print output to file with formatted name"
6339 msgid "print output to file with formatted name"
6340 msgstr ""
6340 msgstr ""
6341
6341
6342 msgid "print the given revision"
6342 msgid "print the given revision"
6343 msgstr ""
6343 msgstr ""
6344
6344
6345 msgid "apply any matching decode filter"
6345 msgid "apply any matching decode filter"
6346 msgstr ""
6346 msgstr ""
6347
6347
6348 msgid "[OPTION]... FILE..."
6348 msgid "[OPTION]... FILE..."
6349 msgstr ""
6349 msgstr ""
6350
6350
6351 msgid "the clone will only contain a repository (no working copy)"
6351 msgid "the clone will only contain a repository (no working copy)"
6352 msgstr ""
6352 msgstr ""
6353
6353
6354 msgid "a changeset you would like to have after cloning"
6354 msgid "a changeset you would like to have after cloning"
6355 msgstr ""
6355 msgstr ""
6356
6356
6357 msgid "[OPTION]... SOURCE [DEST]"
6357 msgid "[OPTION]... SOURCE [DEST]"
6358 msgstr ""
6358 msgstr ""
6359
6359
6360 msgid "mark new/missing files as added/removed before committing"
6360 msgid "mark new/missing files as added/removed before committing"
6361 msgstr ""
6361 msgstr ""
6362
6362
6363 msgid "mark a branch as closed, hiding it from the branch list"
6363 msgid "mark a branch as closed, hiding it from the branch list"
6364 msgstr ""
6364 msgstr ""
6365
6365
6366 msgid "record a copy that has already occurred"
6366 msgid "record a copy that has already occurred"
6367 msgstr ""
6367 msgstr ""
6368
6368
6369 msgid "forcibly copy over an existing managed file"
6369 msgid "forcibly copy over an existing managed file"
6370 msgstr ""
6370 msgstr ""
6371
6371
6372 msgid "[OPTION]... [SOURCE]... DEST"
6372 msgid "[OPTION]... [SOURCE]... DEST"
6373 msgstr ""
6373 msgstr ""
6374
6374
6375 msgid "[INDEX] REV1 REV2"
6375 msgid "[INDEX] REV1 REV2"
6376 msgstr ""
6376 msgstr ""
6377
6377
6378 msgid "[COMMAND]"
6378 msgid "[COMMAND]"
6379 msgstr ""
6379 msgstr ""
6380
6380
6381 msgid "show the command options"
6381 msgid "show the command options"
6382 msgstr ""
6382 msgstr ""
6383
6383
6384 msgid "[-o] CMD"
6384 msgid "[-o] CMD"
6385 msgstr ""
6385 msgstr ""
6386
6386
6387 msgid "try extended date formats"
6387 msgid "try extended date formats"
6388 msgstr ""
6388 msgstr ""
6389
6389
6390 msgid "[-e] DATE [RANGE]"
6390 msgid "[-e] DATE [RANGE]"
6391 msgstr ""
6391 msgstr ""
6392
6392
6393 msgid "FILE REV"
6393 msgid "FILE REV"
6394 msgstr ""
6394 msgstr ""
6395
6395
6396 msgid "[PATH]"
6396 msgid "[PATH]"
6397 msgstr ""
6397 msgstr ""
6398
6398
6399 msgid "FILE"
6399 msgid "FILE"
6400 msgstr ""
6400 msgstr ""
6401
6401
6402 msgid "revision to rebuild to"
6402 msgid "revision to rebuild to"
6403 msgstr ""
6403 msgstr ""
6404
6404
6405 msgid "[-r REV] [REV]"
6405 msgid "[-r REV] [REV]"
6406 msgstr ""
6406 msgstr ""
6407
6407
6408 msgid "revision to debug"
6408 msgid "revision to debug"
6409 msgstr ""
6409 msgstr ""
6410
6410
6411 msgid "[-r REV] FILE"
6411 msgid "[-r REV] FILE"
6412 msgstr ""
6412 msgstr ""
6413
6413
6414 msgid "REV1 [REV2]"
6414 msgid "REV1 [REV2]"
6415 msgstr ""
6415 msgstr ""
6416
6416
6417 msgid "do not display the saved mtime"
6417 msgid "do not display the saved mtime"
6418 msgstr ""
6418 msgstr ""
6419
6419
6420 msgid "[OPTION]..."
6420 msgid "[OPTION]..."
6421 msgstr ""
6421 msgstr ""
6422
6422
6423 msgid "revision to check"
6423 msgid "revision to check"
6424 msgstr ""
6424 msgstr ""
6425
6425
6426 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6426 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6427 msgstr ""
6427 msgstr ""
6428
6428
6429 msgid "diff against the second parent"
6429 msgid "diff against the second parent"
6430 msgstr ""
6430 msgstr ""
6431
6431
6432 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6432 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6433 msgstr ""
6433 msgstr ""
6434
6434
6435 msgid "end fields with NUL"
6435 msgid "end fields with NUL"
6436 msgstr ""
6436 msgstr ""
6437
6437
6438 msgid "print all revisions that match"
6438 msgid "print all revisions that match"
6439 msgstr ""
6439 msgstr ""
6440
6440
6441 msgid "follow changeset history, or file history across copies and renames"
6441 msgid "follow changeset history, or file history across copies and renames"
6442 msgstr ""
6442 msgstr ""
6443
6443
6444 msgid "ignore case when matching"
6444 msgid "ignore case when matching"
6445 msgstr ""
6445 msgstr ""
6446
6446
6447 msgid "print only filenames and revisions that match"
6447 msgid "print only filenames and revisions that match"
6448 msgstr ""
6448 msgstr ""
6449
6449
6450 msgid "print matching line numbers"
6450 msgid "print matching line numbers"
6451 msgstr ""
6451 msgstr ""
6452
6452
6453 msgid "search in given revision range"
6453 msgid "search in given revision range"
6454 msgstr ""
6454 msgstr ""
6455
6455
6456 msgid "[OPTION]... PATTERN [FILE]..."
6456 msgid "[OPTION]... PATTERN [FILE]..."
6457 msgstr ""
6457 msgstr ""
6458
6458
6459 msgid "show only heads which are descendants of REV"
6459 msgid "show only heads which are descendants of REV"
6460 msgstr ""
6460 msgstr ""
6461
6461
6462 msgid "show only the active heads from open branches"
6462 msgid "show only the active heads from open branches"
6463 msgstr ""
6463 msgstr ""
6464
6464
6465 msgid "show normal and closed heads"
6465 msgid "show normal and closed heads"
6466 msgstr ""
6466 msgstr ""
6467
6467
6468 msgid "[-r STARTREV] [REV]..."
6468 msgid "[-r STARTREV] [REV]..."
6469 msgstr ""
6469 msgstr ""
6470
6470
6471 msgid "[TOPIC]"
6471 msgid "[TOPIC]"
6472 msgstr ""
6472 msgstr ""
6473
6473
6474 msgid "identify the specified revision"
6474 msgid "identify the specified revision"
6475 msgstr ""
6475 msgstr ""
6476
6476
6477 msgid "show local revision number"
6477 msgid "show local revision number"
6478 msgstr ""
6478 msgstr ""
6479
6479
6480 msgid "show global revision id"
6480 msgid "show global revision id"
6481 msgstr ""
6481 msgstr ""
6482
6482
6483 msgid "show branch"
6483 msgid "show branch"
6484 msgstr ""
6484 msgstr ""
6485
6485
6486 msgid "show tags"
6486 msgid "show tags"
6487 msgstr ""
6487 msgstr ""
6488
6488
6489 msgid "[-nibt] [-r REV] [SOURCE]"
6489 msgid "[-nibt] [-r REV] [SOURCE]"
6490 msgstr ""
6490 msgstr ""
6491
6491
6492 msgid ""
6492 msgid ""
6493 "directory strip option for patch. This has the same meaning as the "
6493 "directory strip option for patch. This has the same meaning as the "
6494 "corresponding patch option"
6494 "corresponding patch option"
6495 msgstr ""
6495 msgstr ""
6496
6496
6497 msgid "base path"
6497 msgid "base path"
6498 msgstr ""
6498 msgstr ""
6499
6499
6500 msgid "skip check for outstanding uncommitted changes"
6500 msgid "skip check for outstanding uncommitted changes"
6501 msgstr ""
6501 msgstr ""
6502
6502
6503 msgid "don't commit, just update the working directory"
6503 msgid "don't commit, just update the working directory"
6504 msgstr ""
6504 msgstr ""
6505
6505
6506 msgid "apply patch to the nodes from which it was generated"
6506 msgid "apply patch to the nodes from which it was generated"
6507 msgstr ""
6507 msgstr ""
6508
6508
6509 msgid "use any branch information in patch (implied by --exact)"
6509 msgid "use any branch information in patch (implied by --exact)"
6510 msgstr ""
6510 msgstr ""
6511
6511
6512 msgid "[OPTION]... PATCH..."
6512 msgid "[OPTION]... PATCH..."
6513 msgstr ""
6513 msgstr ""
6514
6514
6515 msgid "show newest record first"
6515 msgid "show newest record first"
6516 msgstr ""
6516 msgstr ""
6517
6517
6518 msgid "file to store the bundles into"
6518 msgid "file to store the bundles into"
6519 msgstr ""
6519 msgstr ""
6520
6520
6521 msgid "a specific revision up to which you would like to pull"
6521 msgid "a specific revision up to which you would like to pull"
6522 msgstr ""
6522 msgstr ""
6523
6523
6524 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6524 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6525 msgstr ""
6525 msgstr ""
6526
6526
6527 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6527 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6528 msgstr ""
6528 msgstr ""
6529
6529
6530 msgid "search the repository as it stood at REV"
6530 msgid "search the repository as it stood at REV"
6531 msgstr ""
6531 msgstr ""
6532
6532
6533 msgid "end filenames with NUL, for use with xargs"
6533 msgid "end filenames with NUL, for use with xargs"
6534 msgstr ""
6534 msgstr ""
6535
6535
6536 msgid "print complete paths from the filesystem root"
6536 msgid "print complete paths from the filesystem root"
6537 msgstr ""
6537 msgstr ""
6538
6538
6539 msgid "[OPTION]... [PATTERN]..."
6539 msgid "[OPTION]... [PATTERN]..."
6540 msgstr ""
6540 msgstr ""
6541
6541
6542 msgid "only follow the first parent of merge changesets"
6542 msgid "only follow the first parent of merge changesets"
6543 msgstr ""
6543 msgstr ""
6544
6544
6545 msgid "show revisions matching date spec"
6545 msgid "show revisions matching date spec"
6546 msgstr ""
6546 msgstr ""
6547
6547
6548 msgid "show copied files"
6548 msgid "show copied files"
6549 msgstr ""
6549 msgstr ""
6550
6550
6551 msgid "do case-insensitive search for a keyword"
6551 msgid "do case-insensitive search for a keyword"
6552 msgstr ""
6552 msgstr ""
6553
6553
6554 msgid "include revisions where files were removed"
6554 msgid "include revisions where files were removed"
6555 msgstr ""
6555 msgstr ""
6556
6556
6557 msgid "show only merges"
6557 msgid "show only merges"
6558 msgstr ""
6558 msgstr ""
6559
6559
6560 msgid "revisions committed by user"
6560 msgid "revisions committed by user"
6561 msgstr ""
6561 msgstr ""
6562
6562
6563 msgid "show only changesets within the given named branch"
6563 msgid "show only changesets within the given named branch"
6564 msgstr ""
6564 msgstr ""
6565
6565
6566 msgid "do not display revision or any of its ancestors"
6566 msgid "do not display revision or any of its ancestors"
6567 msgstr ""
6567 msgstr ""
6568
6568
6569 msgid "[OPTION]... [FILE]"
6569 msgid "[OPTION]... [FILE]"
6570 msgstr ""
6570 msgstr ""
6571
6571
6572 msgid "revision to display"
6572 msgid "revision to display"
6573 msgstr ""
6573 msgstr ""
6574
6574
6575 msgid "[-r REV]"
6575 msgid "[-r REV]"
6576 msgstr ""
6576 msgstr ""
6577
6577
6578 msgid "force a merge with outstanding changes"
6578 msgid "force a merge with outstanding changes"
6579 msgstr ""
6579 msgstr ""
6580
6580
6581 msgid "revision to merge"
6581 msgid "revision to merge"
6582 msgstr ""
6582 msgstr ""
6583
6583
6584 msgid "review revisions to merge (no merge is performed)"
6584 msgid "review revisions to merge (no merge is performed)"
6585 msgstr ""
6585 msgstr ""
6586
6586
6587 msgid "[-f] [[-r] REV]"
6587 msgid "[-f] [[-r] REV]"
6588 msgstr ""
6588 msgstr ""
6589
6589
6590 msgid "a specific revision up to which you would like to push"
6590 msgid "a specific revision up to which you would like to push"
6591 msgstr ""
6591 msgstr ""
6592
6592
6593 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6593 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6594 msgstr ""
6594 msgstr ""
6595
6595
6596 msgid "show parents from the specified revision"
6596 msgid "show parents from the specified revision"
6597 msgstr ""
6597 msgstr ""
6598
6598
6599 msgid "[-r REV] [FILE]"
6599 msgid "[-r REV] [FILE]"
6600 msgstr ""
6600 msgstr ""
6601
6601
6602 msgid "[NAME]"
6602 msgid "[NAME]"
6603 msgstr ""
6603 msgstr ""
6604
6604
6605 msgid "update to new tip if changesets were pulled"
6605 msgid "update to new tip if changesets were pulled"
6606 msgstr ""
6606 msgstr ""
6607
6607
6608 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6608 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6609 msgstr ""
6609 msgstr ""
6610
6610
6611 msgid "force push"
6611 msgid "force push"
6612 msgstr ""
6612 msgstr ""
6613
6613
6614 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6614 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6615 msgstr ""
6615 msgstr ""
6616
6616
6617 msgid "record delete for missing files"
6617 msgid "record delete for missing files"
6618 msgstr ""
6618 msgstr ""
6619
6619
6620 msgid "remove (and delete) file even if added or modified"
6620 msgid "remove (and delete) file even if added or modified"
6621 msgstr ""
6621 msgstr ""
6622
6622
6623 msgid "record a rename that has already occurred"
6623 msgid "record a rename that has already occurred"
6624 msgstr ""
6624 msgstr ""
6625
6625
6626 msgid "[OPTION]... SOURCE... DEST"
6626 msgid "[OPTION]... SOURCE... DEST"
6627 msgstr ""
6627 msgstr ""
6628
6628
6629 msgid "remerge all unresolved files"
6629 msgid "remerge all unresolved files"
6630 msgstr ""
6630 msgstr ""
6631
6631
6632 msgid "list state of files needing merge"
6632 msgid "list state of files needing merge"
6633 msgstr ""
6633 msgstr ""
6634
6634
6635 msgid "mark files as resolved"
6635 msgid "mark files as resolved"
6636 msgstr ""
6636 msgstr ""
6637
6637
6638 msgid "unmark files as resolved"
6638 msgid "unmark files as resolved"
6639 msgstr ""
6639 msgstr ""
6640
6640
6641 msgid "revert all changes when no arguments given"
6641 msgid "revert all changes when no arguments given"
6642 msgstr ""
6642 msgstr ""
6643
6643
6644 msgid "tipmost revision matching date"
6644 msgid "tipmost revision matching date"
6645 msgstr ""
6645 msgstr ""
6646
6646
6647 msgid "revision to revert to"
6647 msgid "revision to revert to"
6648 msgstr ""
6648 msgstr ""
6649
6649
6650 msgid "do not save backup copies of files"
6650 msgid "do not save backup copies of files"
6651 msgstr ""
6651 msgstr ""
6652
6652
6653 msgid "[OPTION]... [-r REV] [NAME]..."
6653 msgid "[OPTION]... [-r REV] [NAME]..."
6654 msgstr ""
6654 msgstr ""
6655
6655
6656 msgid "name of access log file to write to"
6656 msgid "name of access log file to write to"
6657 msgstr ""
6657 msgstr ""
6658
6658
6659 msgid "name of error log file to write to"
6659 msgid "name of error log file to write to"
6660 msgstr ""
6660 msgstr ""
6661
6661
6662 msgid "port to listen on (default: 8000)"
6662 msgid "port to listen on (default: 8000)"
6663 msgstr ""
6663 msgstr ""
6664
6664
6665 msgid "address to listen on (default: all interfaces)"
6665 msgid "address to listen on (default: all interfaces)"
6666 msgstr ""
6666 msgstr ""
6667
6667
6668 msgid "prefix path to serve from (default: server root)"
6668 msgid "prefix path to serve from (default: server root)"
6669 msgstr ""
6669 msgstr ""
6670
6670
6671 msgid "name to show in web pages (default: working directory)"
6671 msgid "name to show in web pages (default: working directory)"
6672 msgstr ""
6672 msgstr ""
6673
6673
6674 msgid "name of the webdir config file (serve more than one repository)"
6674 msgid "name of the webdir config file (serve more than one repository)"
6675 msgstr ""
6675 msgstr ""
6676
6676
6677 msgid "for remote clients"
6677 msgid "for remote clients"
6678 msgstr ""
6678 msgstr ""
6679
6679
6680 msgid "web templates to use"
6680 msgid "web templates to use"
6681 msgstr ""
6681 msgstr ""
6682
6682
6683 msgid "template style to use"
6683 msgid "template style to use"
6684 msgstr ""
6684 msgstr ""
6685
6685
6686 msgid "use IPv6 in addition to IPv4"
6686 msgid "use IPv6 in addition to IPv4"
6687 msgstr ""
6687 msgstr ""
6688
6688
6689 msgid "SSL certificate file"
6689 msgid "SSL certificate file"
6690 msgstr ""
6690 msgstr ""
6691
6691
6692 msgid "show untrusted configuration options"
6692 msgid "show untrusted configuration options"
6693 msgstr ""
6693 msgstr ""
6694
6694
6695 msgid "[-u] [NAME]..."
6695 msgid "[-u] [NAME]..."
6696 msgstr ""
6696 msgstr ""
6697
6697
6698 msgid "show status of all files"
6698 msgid "show status of all files"
6699 msgstr ""
6699 msgstr ""
6700
6700
6701 msgid "show only modified files"
6701 msgid "show only modified files"
6702 msgstr ""
6702 msgstr ""
6703
6703
6704 msgid "show only added files"
6704 msgid "show only added files"
6705 msgstr ""
6705 msgstr ""
6706
6706
6707 msgid "show only removed files"
6707 msgid "show only removed files"
6708 msgstr ""
6708 msgstr ""
6709
6709
6710 msgid "show only deleted (but tracked) files"
6710 msgid "show only deleted (but tracked) files"
6711 msgstr ""
6711 msgstr ""
6712
6712
6713 msgid "show only files without changes"
6713 msgid "show only files without changes"
6714 msgstr ""
6714 msgstr ""
6715
6715
6716 msgid "show only unknown (not tracked) files"
6716 msgid "show only unknown (not tracked) files"
6717 msgstr ""
6717 msgstr ""
6718
6718
6719 msgid "show only ignored files"
6719 msgid "show only ignored files"
6720 msgstr ""
6720 msgstr ""
6721
6721
6722 msgid "hide status prefix"
6722 msgid "hide status prefix"
6723 msgstr ""
6723 msgstr ""
6724
6724
6725 msgid "show source of copied files"
6725 msgid "show source of copied files"
6726 msgstr ""
6726 msgstr ""
6727
6727
6728 msgid "show difference from revision"
6728 msgid "show difference from revision"
6729 msgstr ""
6729 msgstr ""
6730
6730
6731 msgid "replace existing tag"
6731 msgid "replace existing tag"
6732 msgstr ""
6732 msgstr ""
6733
6733
6734 msgid "make the tag local"
6734 msgid "make the tag local"
6735 msgstr ""
6735 msgstr ""
6736
6736
6737 msgid "revision to tag"
6737 msgid "revision to tag"
6738 msgstr ""
6738 msgstr ""
6739
6739
6740 msgid "remove a tag"
6740 msgid "remove a tag"
6741 msgstr ""
6741 msgstr ""
6742
6742
6743 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6743 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6744 msgstr ""
6744 msgstr ""
6745
6745
6746 msgid "[-p]"
6746 msgid "[-p]"
6747 msgstr ""
6747 msgstr ""
6748
6748
6749 msgid "update to new tip if changesets were unbundled"
6749 msgid "update to new tip if changesets were unbundled"
6750 msgstr ""
6750 msgstr ""
6751
6751
6752 msgid "[-u] FILE..."
6752 msgid "[-u] FILE..."
6753 msgstr ""
6753 msgstr ""
6754
6754
6755 msgid "overwrite locally modified files (no backup)"
6755 msgid "overwrite locally modified files (no backup)"
6756 msgstr ""
6756 msgstr ""
6757
6757
6758 msgid "check for uncommitted changes"
6758 msgid "check for uncommitted changes"
6759 msgstr ""
6759 msgstr ""
6760
6760
6761 msgid "[-C] [-d DATE] [[-r] REV]"
6761 msgid "[-C] [-d DATE] [[-r] REV]"
6762 msgstr ""
6762 msgstr ""
6763
6763
6764 #, python-format
6764 #, python-format
6765 msgid "config error at %s:%d: '%s'"
6765 msgid "config error at %s:%d: '%s'"
6766 msgstr ""
6766 msgstr ""
6767
6767
6768 msgid "not found in manifest"
6768 msgid "not found in manifest"
6769 msgstr ""
6769 msgstr ""
6770
6770
6771 msgid "branch name not in UTF-8!"
6771 msgid "branch name not in UTF-8!"
6772 msgstr ""
6772 msgstr ""
6773
6773
6774 #, python-format
6774 #, python-format
6775 msgid " searching for copies back to rev %d\n"
6775 msgid " searching for copies back to rev %d\n"
6776 msgstr ""
6776 msgstr ""
6777
6777
6778 #, python-format
6778 #, python-format
6779 msgid ""
6779 msgid ""
6780 " unmatched files in local:\n"
6780 " unmatched files in local:\n"
6781 " %s\n"
6781 " %s\n"
6782 msgstr ""
6782 msgstr ""
6783
6783
6784 #, python-format
6784 #, python-format
6785 msgid ""
6785 msgid ""
6786 " unmatched files in other:\n"
6786 " unmatched files in other:\n"
6787 " %s\n"
6787 " %s\n"
6788 msgstr ""
6788 msgstr ""
6789
6789
6790 msgid " all copies found (* = to merge, ! = divergent):\n"
6790 msgid " all copies found (* = to merge, ! = divergent):\n"
6791 msgstr ""
6791 msgstr ""
6792
6792
6793 msgid " checking for directory renames\n"
6793 msgid " checking for directory renames\n"
6794 msgstr ""
6794 msgstr ""
6795
6795
6796 #, python-format
6796 #, python-format
6797 msgid " dir %s -> %s\n"
6797 msgid " dir %s -> %s\n"
6798 msgstr ""
6798 msgstr ""
6799
6799
6800 #, python-format
6800 #, python-format
6801 msgid " file %s -> %s\n"
6801 msgid " file %s -> %s\n"
6802 msgstr ""
6802 msgstr ""
6803
6803
6804 msgid "working directory state appears damaged!"
6804 msgid "working directory state appears damaged!"
6805 msgstr ""
6805 msgstr ""
6806
6806
6807 #, python-format
6807 #, python-format
6808 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6808 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6809 msgstr ""
6809 msgstr ""
6810
6810
6811 #, python-format
6811 #, python-format
6812 msgid "directory %r already in dirstate"
6812 msgid "directory %r already in dirstate"
6813 msgstr ""
6813 msgstr ""
6814
6814
6815 #, python-format
6815 #, python-format
6816 msgid "file %r in dirstate clashes with %r"
6816 msgid "file %r in dirstate clashes with %r"
6817 msgstr ""
6817 msgstr ""
6818
6818
6819 #, python-format
6819 #, python-format
6820 msgid "not in dirstate: %s\n"
6820 msgid "not in dirstate: %s\n"
6821 msgstr ""
6821 msgstr ""
6822
6822
6823 msgid "unknown"
6823 msgid "unknown"
6824 msgstr ""
6824 msgstr ""
6825
6825
6826 msgid "character device"
6826 msgid "character device"
6827 msgstr ""
6827 msgstr ""
6828
6828
6829 msgid "block device"
6829 msgid "block device"
6830 msgstr ""
6830 msgstr ""
6831
6831
6832 msgid "fifo"
6832 msgid "fifo"
6833 msgstr ""
6833 msgstr ""
6834
6834
6835 msgid "socket"
6835 msgid "socket"
6836 msgstr ""
6836 msgstr ""
6837
6837
6838 msgid "directory"
6838 msgid "directory"
6839 msgstr ""
6839 msgstr ""
6840
6840
6841 #, python-format
6841 #, python-format
6842 msgid "unsupported file type (type is %s)"
6842 msgid "unsupported file type (type is %s)"
6843 msgstr ""
6843 msgstr ""
6844
6844
6845 #, python-format
6845 #, python-format
6846 msgid "abort: %s\n"
6846 msgid "abort: %s\n"
6847 msgstr ""
6847 msgstr ""
6848
6848
6849 #, python-format
6849 #, python-format
6850 msgid ""
6850 msgid ""
6851 "hg: command '%s' is ambiguous:\n"
6851 "hg: command '%s' is ambiguous:\n"
6852 " %s\n"
6852 " %s\n"
6853 msgstr ""
6853 msgstr ""
6854
6854
6855 #, python-format
6855 #, python-format
6856 msgid "hg: %s\n"
6856 msgid "hg: %s\n"
6857 msgstr ""
6857 msgstr ""
6858
6858
6859 #, python-format
6859 #, python-format
6860 msgid "timed out waiting for lock held by %s"
6860 msgid "timed out waiting for lock held by %s"
6861 msgstr ""
6861 msgstr ""
6862
6862
6863 #, python-format
6863 #, python-format
6864 msgid "lock held by %s"
6864 msgid "lock held by %s"
6865 msgstr ""
6865 msgstr ""
6866
6866
6867 #, python-format
6867 #, python-format
6868 msgid "abort: %s: %s\n"
6868 msgid "abort: %s: %s\n"
6869 msgstr ""
6869 msgstr ""
6870
6870
6871 #, python-format
6871 #, python-format
6872 msgid "abort: could not lock %s: %s\n"
6872 msgid "abort: could not lock %s: %s\n"
6873 msgstr ""
6873 msgstr ""
6874
6874
6875 #, python-format
6875 #, python-format
6876 msgid "hg %s: %s\n"
6876 msgid "hg %s: %s\n"
6877 msgstr ""
6877 msgstr ""
6878
6878
6879 #, python-format
6879 #, python-format
6880 msgid "abort: %s!\n"
6880 msgid "abort: %s!\n"
6881 msgstr ""
6881 msgstr ""
6882
6882
6883 #, python-format
6883 #, python-format
6884 msgid "abort: %s"
6884 msgid "abort: %s"
6885 msgstr ""
6885 msgstr ""
6886
6886
6887 msgid " empty string\n"
6887 msgid " empty string\n"
6888 msgstr ""
6888 msgstr ""
6889
6889
6890 msgid "killed!\n"
6890 msgid "killed!\n"
6891 msgstr ""
6891 msgstr ""
6892
6892
6893 #, python-format
6893 #, python-format
6894 msgid "hg: unknown command '%s'\n"
6894 msgid "hg: unknown command '%s'\n"
6895 msgstr ""
6895 msgstr ""
6896
6896
6897 #, python-format
6897 #, python-format
6898 msgid "abort: could not import module %s!\n"
6898 msgid "abort: could not import module %s!\n"
6899 msgstr ""
6899 msgstr ""
6900
6900
6901 msgid "(did you forget to compile extensions?)\n"
6901 msgid "(did you forget to compile extensions?)\n"
6902 msgstr ""
6902 msgstr ""
6903
6903
6904 msgid "(is your Python install correct?)\n"
6904 msgid "(is your Python install correct?)\n"
6905 msgstr ""
6905 msgstr ""
6906
6906
6907 #, python-format
6907 #, python-format
6908 msgid "abort: error: %s\n"
6908 msgid "abort: error: %s\n"
6909 msgstr ""
6909 msgstr ""
6910
6910
6911 msgid "broken pipe\n"
6911 msgid "broken pipe\n"
6912 msgstr ""
6912 msgstr ""
6913
6913
6914 msgid "interrupted!\n"
6914 msgid "interrupted!\n"
6915 msgstr ""
6915 msgstr ""
6916
6916
6917 msgid ""
6917 msgid ""
6918 "\n"
6918 "\n"
6919 "broken pipe\n"
6919 "broken pipe\n"
6920 msgstr ""
6920 msgstr ""
6921
6921
6922 msgid "abort: out of memory\n"
6922 msgid "abort: out of memory\n"
6923 msgstr ""
6923 msgstr ""
6924
6924
6925 msgid "** unknown exception encountered, details follow\n"
6925 msgid "** unknown exception encountered, details follow\n"
6926 msgstr ""
6926 msgstr ""
6927
6927
6928 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
6928 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
6929 msgstr ""
6929 msgstr ""
6930
6930
6931 msgid "** or mercurial@selenic.com\n"
6931 msgid "** or mercurial@selenic.com\n"
6932 msgstr ""
6932 msgstr ""
6933
6933
6934 #, python-format
6934 #, python-format
6935 msgid "** Mercurial Distributed SCM (version %s)\n"
6935 msgid "** Mercurial Distributed SCM (version %s)\n"
6936 msgstr ""
6936 msgstr ""
6937
6937
6938 #, python-format
6938 #, python-format
6939 msgid "** Extensions loaded: %s\n"
6939 msgid "** Extensions loaded: %s\n"
6940 msgstr ""
6940 msgstr ""
6941
6941
6942 #, python-format
6942 #, python-format
6943 msgid "no definition for alias '%s'\n"
6943 msgid "no definition for alias '%s'\n"
6944 msgstr ""
6944 msgstr ""
6945
6945
6946 #, python-format
6946 #, python-format
6947 msgid "alias '%s' resolves to unknown command '%s'\n"
6947 msgid "alias '%s' resolves to unknown command '%s'\n"
6948 msgstr ""
6948 msgstr ""
6949
6949
6950 #, python-format
6950 #, python-format
6951 msgid "alias '%s' resolves to ambiguous command '%s'\n"
6951 msgid "alias '%s' resolves to ambiguous command '%s'\n"
6952 msgstr ""
6952 msgstr ""
6953
6953
6954 #, python-format
6954 #, python-format
6955 msgid "alias '%s' shadows command\n"
6955 msgid "alias '%s' shadows command\n"
6956 msgstr ""
6956 msgstr ""
6957
6957
6958 #, python-format
6958 #, python-format
6959 msgid "malformed --config option: %s"
6959 msgid "malformed --config option: %s"
6960 msgstr ""
6960 msgstr ""
6961
6961
6962 #, python-format
6962 #, python-format
6963 msgid "extension '%s' overrides commands: %s\n"
6963 msgid "extension '%s' overrides commands: %s\n"
6964 msgstr ""
6964 msgstr ""
6965
6965
6966 msgid "Option --config may not be abbreviated!"
6966 msgid "Option --config may not be abbreviated!"
6967 msgstr ""
6967 msgstr ""
6968
6968
6969 msgid "Option --cwd may not be abbreviated!"
6969 msgid "Option --cwd may not be abbreviated!"
6970 msgstr ""
6970 msgstr ""
6971
6971
6972 msgid ""
6972 msgid ""
6973 "Option -R has to be separated from other options (e.g. not -qR) and --"
6973 "Option -R has to be separated from other options (e.g. not -qR) and --"
6974 "repository may only be abbreviated as --repo!"
6974 "repository may only be abbreviated as --repo!"
6975 msgstr ""
6975 msgstr ""
6976
6976
6977 #, python-format
6977 #, python-format
6978 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
6978 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
6979 msgstr ""
6979 msgstr ""
6980
6980
6981 #, python-format
6981 #, python-format
6982 msgid "repository '%s' is not local"
6982 msgid "repository '%s' is not local"
6983 msgstr ""
6983 msgstr ""
6984
6984
6985 msgid "invalid arguments"
6985 msgid "invalid arguments"
6986 msgstr ""
6986 msgstr ""
6987
6987
6988 #, python-format
6988 #, python-format
6989 msgid "unrecognized profiling format '%s' - Ignored\n"
6989 msgid "unrecognized profiling format '%s' - Ignored\n"
6990 msgstr ""
6990 msgstr ""
6991
6991
6992 msgid ""
6992 msgid ""
6993 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
6993 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
6994 "misc/lsprof/"
6994 "misc/lsprof/"
6995 msgstr ""
6995 msgstr ""
6996
6996
6997 #, python-format
6997 #, python-format
6998 msgid "*** failed to import extension %s from %s: %s\n"
6998 msgid "*** failed to import extension %s from %s: %s\n"
6999 msgstr ""
6999 msgstr ""
7000
7000
7001 #, python-format
7001 #, python-format
7002 msgid "*** failed to import extension %s: %s\n"
7002 msgid "*** failed to import extension %s: %s\n"
7003 msgstr ""
7003 msgstr ""
7004
7004
7005 #, python-format
7005 #, python-format
7006 msgid "couldn't find merge tool %s\n"
7006 msgid "couldn't find merge tool %s\n"
7007 msgstr ""
7007 msgstr ""
7008
7008
7009 #, python-format
7009 #, python-format
7010 msgid "tool %s can't handle symlinks\n"
7010 msgid "tool %s can't handle symlinks\n"
7011 msgstr ""
7011 msgstr ""
7012
7012
7013 #, python-format
7013 #, python-format
7014 msgid "tool %s can't handle binary\n"
7014 msgid "tool %s can't handle binary\n"
7015 msgstr ""
7015 msgstr ""
7016
7016
7017 #, python-format
7017 #, python-format
7018 msgid "tool %s requires a GUI\n"
7018 msgid "tool %s requires a GUI\n"
7019 msgstr ""
7019 msgstr ""
7020
7020
7021 #, python-format
7021 #, python-format
7022 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7022 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7023 msgstr ""
7023 msgstr ""
7024
7024
7025 #, python-format
7025 #, python-format
7026 msgid ""
7026 msgid ""
7027 " no tool found to merge %s\n"
7027 " no tool found to merge %s\n"
7028 "keep (l)ocal or take (o)ther?"
7028 "keep (l)ocal or take (o)ther?"
7029 msgstr ""
7029 msgstr ""
7030
7030
7031 msgid "&Local"
7031 msgid "&Local"
7032 msgstr ""
7032 msgstr ""
7033
7033
7034 msgid "&Other"
7034 msgid "&Other"
7035 msgstr ""
7035 msgstr ""
7036
7036
7037 msgid "l"
7037 msgid "l"
7038 msgstr ""
7038 msgstr ""
7039
7039
7040 #, python-format
7040 #, python-format
7041 msgid "merging %s and %s to %s\n"
7041 msgid "merging %s and %s to %s\n"
7042 msgstr ""
7042 msgstr ""
7043
7043
7044 #, python-format
7044 #, python-format
7045 msgid "merging %s\n"
7045 msgid "merging %s\n"
7046 msgstr ""
7046 msgstr ""
7047
7047
7048 #, python-format
7048 #, python-format
7049 msgid "my %s other %s ancestor %s\n"
7049 msgid "my %s other %s ancestor %s\n"
7050 msgstr ""
7050 msgstr ""
7051
7051
7052 msgid " premerge successful\n"
7052 msgid " premerge successful\n"
7053 msgstr ""
7053 msgstr ""
7054
7054
7055 #, python-format
7055 #, python-format
7056 msgid ""
7056 msgid ""
7057 " output file %s appears unchanged\n"
7057 " output file %s appears unchanged\n"
7058 "was merge successful (yn)?"
7058 "was merge successful (yn)?"
7059 msgstr ""
7059 msgstr ""
7060
7060
7061 msgid "&No"
7061 msgid "&No"
7062 msgstr ""
7062 msgstr ""
7063
7063
7064 msgid "&Yes"
7064 msgid "&Yes"
7065 msgstr ""
7065 msgstr ""
7066
7066
7067 msgid "n"
7067 msgid "n"
7068 msgstr ""
7068 msgstr ""
7069
7069
7070 #, python-format
7070 #, python-format
7071 msgid "merging %s failed!\n"
7071 msgid "merging %s failed!\n"
7072 msgstr ""
7072 msgstr ""
7073
7073
7074 #, python-format
7074 #, python-format
7075 msgid "Inconsistent state, %s:%s is good and bad"
7075 msgid "Inconsistent state, %s:%s is good and bad"
7076 msgstr ""
7076 msgstr ""
7077
7077
7078 #, python-format
7078 #, python-format
7079 msgid "unknown bisect kind %s"
7079 msgid "unknown bisect kind %s"
7080 msgstr ""
7080 msgstr ""
7081
7081
7082 msgid ""
7082 msgid ""
7083 "\n"
7083 "\n"
7084 " Mercurial has the ability to add new features through the use of\n"
7084 " Mercurial has the ability to add new features through the use of\n"
7085 " extensions. Extensions may add new commands, add options to\n"
7085 " extensions. Extensions may add new commands, add options to\n"
7086 " existing commands, change the default behavior of commands, or\n"
7086 " existing commands, change the default behavior of commands, or\n"
7087 " implement hooks.\n"
7087 " implement hooks.\n"
7088 "\n"
7088 "\n"
7089 " Extensions are not loaded by default for a variety of reasons:\n"
7089 " Extensions are not loaded by default for a variety of reasons:\n"
7090 " they can increase startup overhead; they may be meant for\n"
7090 " they can increase startup overhead; they may be meant for\n"
7091 " advanced usage only; they may provide potentially dangerous\n"
7091 " advanced usage only; they may provide potentially dangerous\n"
7092 " abilities (such as letting you destroy or modify history); they\n"
7092 " abilities (such as letting you destroy or modify history); they\n"
7093 " might not be ready for prime time; or they may alter some\n"
7093 " might not be ready for prime time; or they may alter some\n"
7094 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7094 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7095 " activate extensions as needed.\n"
7095 " activate extensions as needed.\n"
7096 "\n"
7096 "\n"
7097 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7097 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7098 " or in the Python search path, create an entry for it in your\n"
7098 " or in the Python search path, create an entry for it in your\n"
7099 " hgrc, like this:\n"
7099 " hgrc, like this:\n"
7100 "\n"
7100 "\n"
7101 " [extensions]\n"
7101 " [extensions]\n"
7102 " foo =\n"
7102 " foo =\n"
7103 "\n"
7103 "\n"
7104 " You may also specify the full path to an extension:\n"
7104 " You may also specify the full path to an extension:\n"
7105 "\n"
7105 "\n"
7106 " [extensions]\n"
7106 " [extensions]\n"
7107 " myfeature = ~/.hgext/myfeature.py\n"
7107 " myfeature = ~/.hgext/myfeature.py\n"
7108 "\n"
7108 "\n"
7109 " To explicitly disable an extension enabled in an hgrc of broader\n"
7109 " To explicitly disable an extension enabled in an hgrc of broader\n"
7110 " scope, prepend its path with !:\n"
7110 " scope, prepend its path with !:\n"
7111 "\n"
7111 "\n"
7112 " [extensions]\n"
7112 " [extensions]\n"
7113 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7113 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7114 " hgext.bar = !/path/to/extension/bar.py\n"
7114 " hgext.bar = !/path/to/extension/bar.py\n"
7115 " # ditto, but no path was supplied for extension baz\n"
7115 " # ditto, but no path was supplied for extension baz\n"
7116 " hgext.baz = !\n"
7116 " hgext.baz = !\n"
7117 " "
7117 " "
7118 msgstr ""
7118 msgstr ""
7119 "\n"
7120 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7121 " fonctionnalités par le biais d'extensions. Les extensions\n"
7122 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7123 " comportement de commandes existantes ou leur ajouter des\n"
7124 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7125 "\n"
7126 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7127 " pour diverses raisons : elles peuvent accroître la latence\n"
7128 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7129 " une utilisation avancée ; elle peuvent fournir des\n"
7130 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7131 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7132 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7133 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7134 " comportements habituels de Mercurial.\n"
7135 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7136 " de ses besoins.\n"
7137 "\n"
7138 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7139 " présente dans le chemin de recherche de Python, déclarez-la\n"
7140 " dans votre fichier de configuration hgrc comme suit :\n"
7141 "\n"
7142 " [extensions]\n"
7143 " truc =\n"
7144 "\n"
7145 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7146 "\n"
7147 " [extensions]\n"
7148 " monbidule = ~/.hgext/monbidule.py\n"
7149 "\n"
7150 " Pour forcer la désactivation d'une extension activée par un\n"
7151 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7152 "\n"
7153 " [extensions]\n"
7154 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7155 " hgext.bar = !/vers/machin.py\n"
7156 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7157 " hgext.chose = !\n"
7158 " "
7119
7159
7120 msgid "disabled extensions:"
7160 msgid "disabled extensions:"
7121 msgstr ""
7161 msgstr "extensions désactivées :"
7122
7162
7123 msgid "Date Formats"
7163 msgid "Date Formats"
7124 msgstr ""
7164 msgstr ""
7125
7165
7126 msgid ""
7166 msgid ""
7127 "\n"
7167 "\n"
7128 " Some commands allow the user to specify a date, e.g.:\n"
7168 " Some commands allow the user to specify a date, e.g.:\n"
7129 " * backout, commit, import, tag: Specify the commit date.\n"
7169 " * backout, commit, import, tag: Specify the commit date.\n"
7130 " * log, revert, update: Select revision(s) by date.\n"
7170 " * log, revert, update: Select revision(s) by date.\n"
7131 "\n"
7171 "\n"
7132 " Many date formats are valid. Here are some examples:\n"
7172 " Many date formats are valid. Here are some examples:\n"
7133 "\n"
7173 "\n"
7134 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7174 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7135 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7175 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7136 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7176 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7137 " \"Dec 6\" (midnight)\n"
7177 " \"Dec 6\" (midnight)\n"
7138 " \"13:18\" (today assumed)\n"
7178 " \"13:18\" (today assumed)\n"
7139 " \"3:39\" (3:39AM assumed)\n"
7179 " \"3:39\" (3:39AM assumed)\n"
7140 " \"3:39pm\" (15:39)\n"
7180 " \"3:39pm\" (15:39)\n"
7141 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7181 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7142 " \"2006-12-6 13:18\"\n"
7182 " \"2006-12-6 13:18\"\n"
7143 " \"2006-12-6\"\n"
7183 " \"2006-12-6\"\n"
7144 " \"12-6\"\n"
7184 " \"12-6\"\n"
7145 " \"12/6\"\n"
7185 " \"12/6\"\n"
7146 " \"12/6/6\" (Dec 6 2006)\n"
7186 " \"12/6/6\" (Dec 6 2006)\n"
7147 "\n"
7187 "\n"
7148 " Lastly, there is Mercurial's internal format:\n"
7188 " Lastly, there is Mercurial's internal format:\n"
7149 "\n"
7189 "\n"
7150 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7190 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7151 "\n"
7191 "\n"
7152 " This is the internal representation format for dates. unixtime is\n"
7192 " This is the internal representation format for dates. unixtime is\n"
7153 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7193 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7154 " offset is the offset of the local timezone, in seconds west of UTC\n"
7194 " offset is the offset of the local timezone, in seconds west of UTC\n"
7155 " (negative if the timezone is east of UTC).\n"
7195 " (negative if the timezone is east of UTC).\n"
7156 "\n"
7196 "\n"
7157 " The log command also accepts date ranges:\n"
7197 " The log command also accepts date ranges:\n"
7158 "\n"
7198 "\n"
7159 " \"<{datetime}\" - at or before a given date/time\n"
7199 " \"<{datetime}\" - at or before a given date/time\n"
7160 " \">{datetime}\" - on or after a given date/time\n"
7200 " \">{datetime}\" - on or after a given date/time\n"
7161 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7201 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7162 " \"-{days}\" - within a given number of days of today\n"
7202 " \"-{days}\" - within a given number of days of today\n"
7163 " "
7203 " "
7164 msgstr ""
7204 msgstr ""
7165
7205
7166 msgid "File Name Patterns"
7206 msgid "File Name Patterns"
7167 msgstr ""
7207 msgstr ""
7168
7208
7169 msgid ""
7209 msgid ""
7170 "\n"
7210 "\n"
7171 " Mercurial accepts several notations for identifying one or more\n"
7211 " Mercurial accepts several notations for identifying one or more\n"
7172 " files at a time.\n"
7212 " files at a time.\n"
7173 "\n"
7213 "\n"
7174 " By default, Mercurial treats filenames as shell-style extended\n"
7214 " By default, Mercurial treats filenames as shell-style extended\n"
7175 " glob patterns.\n"
7215 " glob patterns.\n"
7176 "\n"
7216 "\n"
7177 " Alternate pattern notations must be specified explicitly.\n"
7217 " Alternate pattern notations must be specified explicitly.\n"
7178 "\n"
7218 "\n"
7179 " To use a plain path name without any pattern matching, start it\n"
7219 " To use a plain path name without any pattern matching, start it\n"
7180 " with \"path:\". These path names must completely match starting at\n"
7220 " with \"path:\". These path names must completely match starting at\n"
7181 " the current repository root.\n"
7221 " the current repository root.\n"
7182 "\n"
7222 "\n"
7183 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7223 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7184 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7224 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7185 " match files in the current directory ending with \".c\".\n"
7225 " match files in the current directory ending with \".c\".\n"
7186 "\n"
7226 "\n"
7187 " The supported glob syntax extensions are \"**\" to match any string\n"
7227 " The supported glob syntax extensions are \"**\" to match any string\n"
7188 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7228 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7189 "\n"
7229 "\n"
7190 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7230 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7191 " Regexp pattern matching is anchored at the root of the repository.\n"
7231 " Regexp pattern matching is anchored at the root of the repository.\n"
7192 "\n"
7232 "\n"
7193 " Plain examples:\n"
7233 " Plain examples:\n"
7194 "\n"
7234 "\n"
7195 " path:foo/bar a name bar in a directory named foo in the root of\n"
7235 " path:foo/bar a name bar in a directory named foo in the root of\n"
7196 " the repository\n"
7236 " the repository\n"
7197 " path:path:name a file or directory named \"path:name\"\n"
7237 " path:path:name a file or directory named \"path:name\"\n"
7198 "\n"
7238 "\n"
7199 " Glob examples:\n"
7239 " Glob examples:\n"
7200 "\n"
7240 "\n"
7201 " glob:*.c any name ending in \".c\" in the current directory\n"
7241 " glob:*.c any name ending in \".c\" in the current directory\n"
7202 " *.c any name ending in \".c\" in the current directory\n"
7242 " *.c any name ending in \".c\" in the current directory\n"
7203 " **.c any name ending in \".c\" in any subdirectory of the\n"
7243 " **.c any name ending in \".c\" in any subdirectory of the\n"
7204 " current directory including itself.\n"
7244 " current directory including itself.\n"
7205 " foo/*.c any name ending in \".c\" in the directory foo\n"
7245 " foo/*.c any name ending in \".c\" in the directory foo\n"
7206 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7246 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7207 " including itself.\n"
7247 " including itself.\n"
7208 "\n"
7248 "\n"
7209 " Regexp examples:\n"
7249 " Regexp examples:\n"
7210 "\n"
7250 "\n"
7211 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7251 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7212 "\n"
7252 "\n"
7213 " "
7253 " "
7214 msgstr ""
7254 msgstr ""
7215
7255
7216 msgid "Environment Variables"
7256 msgid "Environment Variables"
7217 msgstr ""
7257 msgstr ""
7218
7258
7219 msgid ""
7259 msgid ""
7220 "\n"
7260 "\n"
7221 "HG::\n"
7261 "HG::\n"
7222 " Path to the 'hg' executable, automatically passed when running\n"
7262 " Path to the 'hg' executable, automatically passed when running\n"
7223 " hooks, extensions or external tools. If unset or empty, this is\n"
7263 " hooks, extensions or external tools. If unset or empty, this is\n"
7224 " the hg executable's name if it's frozen, or an executable named\n"
7264 " the hg executable's name if it's frozen, or an executable named\n"
7225 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7265 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7226 " Windows) is searched.\n"
7266 " Windows) is searched.\n"
7227 "\n"
7267 "\n"
7228 "HGEDITOR::\n"
7268 "HGEDITOR::\n"
7229 " This is the name of the editor to run when committing. See EDITOR.\n"
7269 " This is the name of the editor to run when committing. See EDITOR.\n"
7230 "\n"
7270 "\n"
7231 " (deprecated, use .hgrc)\n"
7271 " (deprecated, use .hgrc)\n"
7232 "\n"
7272 "\n"
7233 "HGENCODING::\n"
7273 "HGENCODING::\n"
7234 " This overrides the default locale setting detected by Mercurial.\n"
7274 " This overrides the default locale setting detected by Mercurial.\n"
7235 " This setting is used to convert data including usernames,\n"
7275 " This setting is used to convert data including usernames,\n"
7236 " changeset descriptions, tag names, and branches. This setting can\n"
7276 " changeset descriptions, tag names, and branches. This setting can\n"
7237 " be overridden with the --encoding command-line option.\n"
7277 " be overridden with the --encoding command-line option.\n"
7238 "\n"
7278 "\n"
7239 "HGENCODINGMODE::\n"
7279 "HGENCODINGMODE::\n"
7240 " This sets Mercurial's behavior for handling unknown characters\n"
7280 " This sets Mercurial's behavior for handling unknown characters\n"
7241 " while transcoding user input. The default is \"strict\", which\n"
7281 " while transcoding user input. The default is \"strict\", which\n"
7242 " causes Mercurial to abort if it can't map a character. Other\n"
7282 " causes Mercurial to abort if it can't map a character. Other\n"
7243 " settings include \"replace\", which replaces unknown characters, and\n"
7283 " settings include \"replace\", which replaces unknown characters, and\n"
7244 " \"ignore\", which drops them. This setting can be overridden with\n"
7284 " \"ignore\", which drops them. This setting can be overridden with\n"
7245 " the --encodingmode command-line option.\n"
7285 " the --encodingmode command-line option.\n"
7246 "\n"
7286 "\n"
7247 "HGMERGE::\n"
7287 "HGMERGE::\n"
7248 " An executable to use for resolving merge conflicts. The program\n"
7288 " An executable to use for resolving merge conflicts. The program\n"
7249 " will be executed with three arguments: local file, remote file,\n"
7289 " will be executed with three arguments: local file, remote file,\n"
7250 " ancestor file.\n"
7290 " ancestor file.\n"
7251 "\n"
7291 "\n"
7252 " (deprecated, use .hgrc)\n"
7292 " (deprecated, use .hgrc)\n"
7253 "\n"
7293 "\n"
7254 "HGRCPATH::\n"
7294 "HGRCPATH::\n"
7255 " A list of files or directories to search for hgrc files. Item\n"
7295 " A list of files or directories to search for hgrc files. Item\n"
7256 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7296 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7257 " platform default search path is used. If empty, only the .hg/hgrc\n"
7297 " platform default search path is used. If empty, only the .hg/hgrc\n"
7258 " from the current repository is read.\n"
7298 " from the current repository is read.\n"
7259 "\n"
7299 "\n"
7260 " For each element in HGRCPATH:\n"
7300 " For each element in HGRCPATH:\n"
7261 " * if it's a directory, all files ending with .rc are added\n"
7301 " * if it's a directory, all files ending with .rc are added\n"
7262 " * otherwise, the file itself will be added\n"
7302 " * otherwise, the file itself will be added\n"
7263 "\n"
7303 "\n"
7264 "HGUSER::\n"
7304 "HGUSER::\n"
7265 " This is the string used as the author of a commit. If not set,\n"
7305 " This is the string used as the author of a commit. If not set,\n"
7266 " available values will be considered in this order:\n"
7306 " available values will be considered in this order:\n"
7267 "\n"
7307 "\n"
7268 " * HGUSER (deprecated)\n"
7308 " * HGUSER (deprecated)\n"
7269 " * hgrc files from the HGRCPATH\n"
7309 " * hgrc files from the HGRCPATH\n"
7270 " * EMAIL\n"
7310 " * EMAIL\n"
7271 " * interactive prompt\n"
7311 " * interactive prompt\n"
7272 " * LOGNAME (with '@hostname' appended)\n"
7312 " * LOGNAME (with '@hostname' appended)\n"
7273 "\n"
7313 "\n"
7274 " (deprecated, use .hgrc)\n"
7314 " (deprecated, use .hgrc)\n"
7275 "\n"
7315 "\n"
7276 "EMAIL::\n"
7316 "EMAIL::\n"
7277 " May be used as the author of a commit; see HGUSER.\n"
7317 " May be used as the author of a commit; see HGUSER.\n"
7278 "\n"
7318 "\n"
7279 "LOGNAME::\n"
7319 "LOGNAME::\n"
7280 " May be used as the author of a commit; see HGUSER.\n"
7320 " May be used as the author of a commit; see HGUSER.\n"
7281 "\n"
7321 "\n"
7282 "VISUAL::\n"
7322 "VISUAL::\n"
7283 " This is the name of the editor to use when committing. See EDITOR.\n"
7323 " This is the name of the editor to use when committing. See EDITOR.\n"
7284 "\n"
7324 "\n"
7285 "EDITOR::\n"
7325 "EDITOR::\n"
7286 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7326 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7287 " user to modify, for example when writing commit messages. The\n"
7327 " user to modify, for example when writing commit messages. The\n"
7288 " editor it uses is determined by looking at the environment\n"
7328 " editor it uses is determined by looking at the environment\n"
7289 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7329 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7290 " non-empty one is chosen. If all of them are empty, the editor\n"
7330 " non-empty one is chosen. If all of them are empty, the editor\n"
7291 " defaults to 'vi'.\n"
7331 " defaults to 'vi'.\n"
7292 "\n"
7332 "\n"
7293 "PYTHONPATH::\n"
7333 "PYTHONPATH::\n"
7294 " This is used by Python to find imported modules and may need to be\n"
7334 " This is used by Python to find imported modules and may need to be\n"
7295 " set appropriately if this Mercurial is not installed system-wide.\n"
7335 " set appropriately if this Mercurial is not installed system-wide.\n"
7296 " "
7336 " "
7297 msgstr ""
7337 msgstr ""
7298
7338
7299 msgid "Specifying Single Revisions"
7339 msgid "Specifying Single Revisions"
7300 msgstr ""
7340 msgstr ""
7301
7341
7302 msgid ""
7342 msgid ""
7303 "\n"
7343 "\n"
7304 " Mercurial supports several ways to specify individual revisions.\n"
7344 " Mercurial supports several ways to specify individual revisions.\n"
7305 "\n"
7345 "\n"
7306 " A plain integer is treated as a revision number. Negative integers\n"
7346 " A plain integer is treated as a revision number. Negative integers\n"
7307 " are treated as topological offsets from the tip, with -1 denoting\n"
7347 " are treated as topological offsets from the tip, with -1 denoting\n"
7308 " the tip. As such, negative numbers are only useful if you've\n"
7348 " the tip. As such, negative numbers are only useful if you've\n"
7309 " memorized your local tree numbers and want to save typing a single\n"
7349 " memorized your local tree numbers and want to save typing a single\n"
7310 " digit. This editor suggests copy and paste.\n"
7350 " digit. This editor suggests copy and paste.\n"
7311 "\n"
7351 "\n"
7312 " A 40-digit hexadecimal string is treated as a unique revision\n"
7352 " A 40-digit hexadecimal string is treated as a unique revision\n"
7313 " identifier.\n"
7353 " identifier.\n"
7314 "\n"
7354 "\n"
7315 " A hexadecimal string less than 40 characters long is treated as a\n"
7355 " A hexadecimal string less than 40 characters long is treated as a\n"
7316 " unique revision identifier, and referred to as a short-form\n"
7356 " unique revision identifier, and referred to as a short-form\n"
7317 " identifier. A short-form identifier is only valid if it is the\n"
7357 " identifier. A short-form identifier is only valid if it is the\n"
7318 " prefix of exactly one full-length identifier.\n"
7358 " prefix of exactly one full-length identifier.\n"
7319 "\n"
7359 "\n"
7320 " Any other string is treated as a tag name, which is a symbolic\n"
7360 " Any other string is treated as a tag name, which is a symbolic\n"
7321 " name associated with a revision identifier. Tag names may not\n"
7361 " name associated with a revision identifier. Tag names may not\n"
7322 " contain the \":\" character.\n"
7362 " contain the \":\" character.\n"
7323 "\n"
7363 "\n"
7324 " The reserved name \"tip\" is a special tag that always identifies\n"
7364 " The reserved name \"tip\" is a special tag that always identifies\n"
7325 " the most recent revision.\n"
7365 " the most recent revision.\n"
7326 "\n"
7366 "\n"
7327 " The reserved name \"null\" indicates the null revision. This is the\n"
7367 " The reserved name \"null\" indicates the null revision. This is the\n"
7328 " revision of an empty repository, and the parent of revision 0.\n"
7368 " revision of an empty repository, and the parent of revision 0.\n"
7329 "\n"
7369 "\n"
7330 " The reserved name \".\" indicates the working directory parent. If\n"
7370 " The reserved name \".\" indicates the working directory parent. If\n"
7331 " no working directory is checked out, it is equivalent to null. If\n"
7371 " no working directory is checked out, it is equivalent to null. If\n"
7332 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7372 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7333 " first parent.\n"
7373 " first parent.\n"
7334 " "
7374 " "
7335 msgstr ""
7375 msgstr ""
7336
7376
7337 msgid "Specifying Multiple Revisions"
7377 msgid "Specifying Multiple Revisions"
7338 msgstr ""
7378 msgstr ""
7339
7379
7340 msgid ""
7380 msgid ""
7341 "\n"
7381 "\n"
7342 " When Mercurial accepts more than one revision, they may be\n"
7382 " When Mercurial accepts more than one revision, they may be\n"
7343 " specified individually, or provided as a topologically continuous\n"
7383 " specified individually, or provided as a topologically continuous\n"
7344 " range, separated by the \":\" character.\n"
7384 " range, separated by the \":\" character.\n"
7345 "\n"
7385 "\n"
7346 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7386 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7347 " are revision identifiers. Both BEGIN and END are optional. If\n"
7387 " are revision identifiers. Both BEGIN and END are optional. If\n"
7348 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7388 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7349 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7389 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7350 " \"all revisions\".\n"
7390 " \"all revisions\".\n"
7351 "\n"
7391 "\n"
7352 " If BEGIN is greater than END, revisions are treated in reverse\n"
7392 " If BEGIN is greater than END, revisions are treated in reverse\n"
7353 " order.\n"
7393 " order.\n"
7354 "\n"
7394 "\n"
7355 " A range acts as a closed interval. This means that a range of 3:5\n"
7395 " A range acts as a closed interval. This means that a range of 3:5\n"
7356 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7396 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7357 " "
7397 " "
7358 msgstr ""
7398 msgstr ""
7359
7399
7360 msgid "Diff Formats"
7400 msgid "Diff Formats"
7361 msgstr ""
7401 msgstr ""
7362
7402
7363 msgid ""
7403 msgid ""
7364 "\n"
7404 "\n"
7365 " Mercurial's default format for showing changes between two\n"
7405 " Mercurial's default format for showing changes between two\n"
7366 " versions of a file is compatible with the unified format of GNU\n"
7406 " versions of a file is compatible with the unified format of GNU\n"
7367 " diff, which can be used by GNU patch and many other standard\n"
7407 " diff, which can be used by GNU patch and many other standard\n"
7368 " tools.\n"
7408 " tools.\n"
7369 "\n"
7409 "\n"
7370 " While this standard format is often enough, it does not encode the\n"
7410 " While this standard format is often enough, it does not encode the\n"
7371 " following information:\n"
7411 " following information:\n"
7372 "\n"
7412 "\n"
7373 " - executable status and other permission bits\n"
7413 " - executable status and other permission bits\n"
7374 " - copy or rename information\n"
7414 " - copy or rename information\n"
7375 " - changes in binary files\n"
7415 " - changes in binary files\n"
7376 " - creation or deletion of empty files\n"
7416 " - creation or deletion of empty files\n"
7377 "\n"
7417 "\n"
7378 " Mercurial also supports the extended diff format from the git VCS\n"
7418 " Mercurial also supports the extended diff format from the git VCS\n"
7379 " which addresses these limitations. The git diff format is not\n"
7419 " which addresses these limitations. The git diff format is not\n"
7380 " produced by default because a few widespread tools still do not\n"
7420 " produced by default because a few widespread tools still do not\n"
7381 " understand this format.\n"
7421 " understand this format.\n"
7382 "\n"
7422 "\n"
7383 " This means that when generating diffs from a Mercurial repository\n"
7423 " This means that when generating diffs from a Mercurial repository\n"
7384 " (e.g. with \"hg export\"), you should be careful about things like\n"
7424 " (e.g. with \"hg export\"), you should be careful about things like\n"
7385 " file copies and renames or other things mentioned above, because\n"
7425 " file copies and renames or other things mentioned above, because\n"
7386 " when applying a standard diff to a different repository, this\n"
7426 " when applying a standard diff to a different repository, this\n"
7387 " extra information is lost. Mercurial's internal operations (like\n"
7427 " extra information is lost. Mercurial's internal operations (like\n"
7388 " push and pull) are not affected by this, because they use an\n"
7428 " push and pull) are not affected by this, because they use an\n"
7389 " internal binary format for communicating changes.\n"
7429 " internal binary format for communicating changes.\n"
7390 "\n"
7430 "\n"
7391 " To make Mercurial produce the git extended diff format, use the\n"
7431 " To make Mercurial produce the git extended diff format, use the\n"
7392 " --git option available for many commands, or set 'git = True' in\n"
7432 " --git option available for many commands, or set 'git = True' in\n"
7393 " the [diff] section of your hgrc. You do not need to set this\n"
7433 " the [diff] section of your hgrc. You do not need to set this\n"
7394 " option when importing diffs in this format or using them in the mq\n"
7434 " option when importing diffs in this format or using them in the mq\n"
7395 " extension.\n"
7435 " extension.\n"
7396 " "
7436 " "
7397 msgstr ""
7437 msgstr ""
7398
7438
7399 msgid "Template Usage"
7439 msgid "Template Usage"
7400 msgstr ""
7440 msgstr ""
7401
7441
7402 msgid ""
7442 msgid ""
7403 "\n"
7443 "\n"
7404 " Mercurial allows you to customize output of commands through\n"
7444 " Mercurial allows you to customize output of commands through\n"
7405 " templates. You can either pass in a template from the command\n"
7445 " templates. You can either pass in a template from the command\n"
7406 " line, via the --template option, or select an existing\n"
7446 " line, via the --template option, or select an existing\n"
7407 " template-style (--style).\n"
7447 " template-style (--style).\n"
7408 "\n"
7448 "\n"
7409 " You can customize output for any \"log-like\" command: log,\n"
7449 " You can customize output for any \"log-like\" command: log,\n"
7410 " outgoing, incoming, tip, parents, heads and glog.\n"
7450 " outgoing, incoming, tip, parents, heads and glog.\n"
7411 "\n"
7451 "\n"
7412 " Three styles are packaged with Mercurial: default (the style used\n"
7452 " Three styles are packaged with Mercurial: default (the style used\n"
7413 " when no explicit preference is passed), compact and changelog.\n"
7453 " when no explicit preference is passed), compact and changelog.\n"
7414 " Usage:\n"
7454 " Usage:\n"
7415 "\n"
7455 "\n"
7416 " $ hg log -r1 --style changelog\n"
7456 " $ hg log -r1 --style changelog\n"
7417 "\n"
7457 "\n"
7418 " A template is a piece of text, with markup to invoke variable\n"
7458 " A template is a piece of text, with markup to invoke variable\n"
7419 " expansion:\n"
7459 " expansion:\n"
7420 "\n"
7460 "\n"
7421 " $ hg log -r1 --template \"{node}\\n\"\n"
7461 " $ hg log -r1 --template \"{node}\\n\"\n"
7422 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7462 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7423 "\n"
7463 "\n"
7424 " Strings in curly braces are called keywords. The availability of\n"
7464 " Strings in curly braces are called keywords. The availability of\n"
7425 " keywords depends on the exact context of the templater. These\n"
7465 " keywords depends on the exact context of the templater. These\n"
7426 " keywords are usually available for templating a log-like command:\n"
7466 " keywords are usually available for templating a log-like command:\n"
7427 "\n"
7467 "\n"
7428 " - author: String. The unmodified author of the changeset.\n"
7468 " - author: String. The unmodified author of the changeset.\n"
7429 " - branches: String. The name of the branch on which the changeset\n"
7469 " - branches: String. The name of the branch on which the changeset\n"
7430 " was committed. Will be empty if the branch name was default.\n"
7470 " was committed. Will be empty if the branch name was default.\n"
7431 " - date: Date information. The date when the changeset was committed.\n"
7471 " - date: Date information. The date when the changeset was committed.\n"
7432 " - desc: String. The text of the changeset description.\n"
7472 " - desc: String. The text of the changeset description.\n"
7433 " - diffstat: String. Statistics of changes with the following\n"
7473 " - diffstat: String. Statistics of changes with the following\n"
7434 " format: \"modified files: +added/-removed lines\"\n"
7474 " format: \"modified files: +added/-removed lines\"\n"
7435 " - files: List of strings. All files modified, added, or removed by\n"
7475 " - files: List of strings. All files modified, added, or removed by\n"
7436 " this changeset.\n"
7476 " this changeset.\n"
7437 " - file_adds: List of strings. Files added by this changeset.\n"
7477 " - file_adds: List of strings. Files added by this changeset.\n"
7438 " - file_mods: List of strings. Files modified by this changeset.\n"
7478 " - file_mods: List of strings. Files modified by this changeset.\n"
7439 " - file_dels: List of strings. Files removed by this changeset.\n"
7479 " - file_dels: List of strings. Files removed by this changeset.\n"
7440 " - node: String. The changeset identification hash, as a\n"
7480 " - node: String. The changeset identification hash, as a\n"
7441 " 40-character hexadecimal string.\n"
7481 " 40-character hexadecimal string.\n"
7442 " - parents: List of strings. The parents of the changeset.\n"
7482 " - parents: List of strings. The parents of the changeset.\n"
7443 " - rev: Integer. The repository-local changeset revision number.\n"
7483 " - rev: Integer. The repository-local changeset revision number.\n"
7444 " - tags: List of strings. Any tags associated with the changeset.\n"
7484 " - tags: List of strings. Any tags associated with the changeset.\n"
7445 "\n"
7485 "\n"
7446 " The \"date\" keyword does not produce human-readable output. If you\n"
7486 " The \"date\" keyword does not produce human-readable output. If you\n"
7447 " want to use a date in your output, you can use a filter to process\n"
7487 " want to use a date in your output, you can use a filter to process\n"
7448 " it. Filters are functions which return a string based on the input\n"
7488 " it. Filters are functions which return a string based on the input\n"
7449 " variable. You can also use a chain of filters to get the desired\n"
7489 " variable. You can also use a chain of filters to get the desired\n"
7450 " output:\n"
7490 " output:\n"
7451 "\n"
7491 "\n"
7452 " $ hg tip --template \"{date|isodate}\\n\"\n"
7492 " $ hg tip --template \"{date|isodate}\\n\"\n"
7453 " 2008-08-21 18:22 +0000\n"
7493 " 2008-08-21 18:22 +0000\n"
7454 "\n"
7494 "\n"
7455 " List of filters:\n"
7495 " List of filters:\n"
7456 "\n"
7496 "\n"
7457 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7497 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7458 " every line except the last.\n"
7498 " every line except the last.\n"
7459 " - age: Date. Returns a human-readable date/time difference between\n"
7499 " - age: Date. Returns a human-readable date/time difference between\n"
7460 " the given date/time and the current date/time.\n"
7500 " the given date/time and the current date/time.\n"
7461 " - basename: Any text. Treats the text as a path, and returns the\n"
7501 " - basename: Any text. Treats the text as a path, and returns the\n"
7462 " last component of the path after splitting by the path\n"
7502 " last component of the path after splitting by the path\n"
7463 " separator (ignoring trailing separators). For example,\n"
7503 " separator (ignoring trailing separators). For example,\n"
7464 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7504 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7465 "\".\n"
7505 "\".\n"
7466 " - stripdir: Treat the text as path and strip a directory level, if\n"
7506 " - stripdir: Treat the text as path and strip a directory level, if\n"
7467 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7507 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7468 " - date: Date. Returns a date in a Unix date format, including\n"
7508 " - date: Date. Returns a date in a Unix date format, including\n"
7469 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7509 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7470 " - domain: Any text. Finds the first string that looks like an\n"
7510 " - domain: Any text. Finds the first string that looks like an\n"
7471 " email address, and extracts just the domain component.\n"
7511 " email address, and extracts just the domain component.\n"
7472 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7512 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7473 " - email: Any text. Extracts the first string that looks like an\n"
7513 " - email: Any text. Extracts the first string that looks like an\n"
7474 " email address. Example: 'User <user@example.com>' becomes\n"
7514 " email address. Example: 'User <user@example.com>' becomes\n"
7475 " 'user@example.com'.\n"
7515 " 'user@example.com'.\n"
7476 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7516 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7477 " \"<\" and \">\" with XML entities.\n"
7517 " \"<\" and \">\" with XML entities.\n"
7478 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7518 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7479 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7519 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7480 " - firstline: Any text. Returns the first line of text.\n"
7520 " - firstline: Any text. Returns the first line of text.\n"
7481 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7521 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7482 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7522 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7483 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7523 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7484 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7524 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7485 " - localdate: Date. Converts a date to local date.\n"
7525 " - localdate: Date. Converts a date to local date.\n"
7486 " - obfuscate: Any text. Returns the input text rendered as a\n"
7526 " - obfuscate: Any text. Returns the input text rendered as a\n"
7487 " sequence of XML entities.\n"
7527 " sequence of XML entities.\n"
7488 " - person: Any text. Returns the text before an email address.\n"
7528 " - person: Any text. Returns the text before an email address.\n"
7489 " - rfc822date: Date. Returns a date using the same format used\n"
7529 " - rfc822date: Date. Returns a date using the same format used\n"
7490 " in email headers.\n"
7530 " in email headers.\n"
7491 " - short: Changeset hash. Returns the short form of a changeset\n"
7531 " - short: Changeset hash. Returns the short form of a changeset\n"
7492 " hash, i.e. a 12-byte hexadecimal string.\n"
7532 " hash, i.e. a 12-byte hexadecimal string.\n"
7493 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7533 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7494 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7534 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7495 " - tabindent: Any text. Returns the text, with every line except\n"
7535 " - tabindent: Any text. Returns the text, with every line except\n"
7496 " the first starting with a tab character.\n"
7536 " the first starting with a tab character.\n"
7497 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7537 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7498 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7538 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7499 " - user: Any text. Returns the user portion of an email address.\n"
7539 " - user: Any text. Returns the user portion of an email address.\n"
7500 " "
7540 " "
7501 msgstr ""
7541 msgstr ""
7502
7542
7503 msgid "URL Paths"
7543 msgid "URL Paths"
7504 msgstr ""
7544 msgstr ""
7505
7545
7506 msgid ""
7546 msgid ""
7507 "\n"
7547 "\n"
7508 " Valid URLs are of the form:\n"
7548 " Valid URLs are of the form:\n"
7509 "\n"
7549 "\n"
7510 " local/filesystem/path (or file://local/filesystem/path)\n"
7550 " local/filesystem/path (or file://local/filesystem/path)\n"
7511 " http://[user[:pass]@]host[:port]/[path]\n"
7551 " http://[user[:pass]@]host[:port]/[path]\n"
7512 " https://[user[:pass]@]host[:port]/[path]\n"
7552 " https://[user[:pass]@]host[:port]/[path]\n"
7513 " ssh://[user[:pass]@]host[:port]/[path]\n"
7553 " ssh://[user[:pass]@]host[:port]/[path]\n"
7514 "\n"
7554 "\n"
7515 " Paths in the local filesystem can either point to Mercurial\n"
7555 " Paths in the local filesystem can either point to Mercurial\n"
7516 " repositories or to bundle files (as created by 'hg bundle' or\n"
7556 " repositories or to bundle files (as created by 'hg bundle' or\n"
7517 " 'hg incoming --bundle').\n"
7557 " 'hg incoming --bundle').\n"
7518 "\n"
7558 "\n"
7519 " An optional identifier after # indicates a particular branch, tag,\n"
7559 " An optional identifier after # indicates a particular branch, tag,\n"
7520 " or changeset to use from the remote repository.\n"
7560 " or changeset to use from the remote repository.\n"
7521 "\n"
7561 "\n"
7522 " Some features, such as pushing to http:// and https:// URLs are\n"
7562 " Some features, such as pushing to http:// and https:// URLs are\n"
7523 " only possible if the feature is explicitly enabled on the remote\n"
7563 " only possible if the feature is explicitly enabled on the remote\n"
7524 " Mercurial server.\n"
7564 " Mercurial server.\n"
7525 "\n"
7565 "\n"
7526 " Some notes about using SSH with Mercurial:\n"
7566 " Some notes about using SSH with Mercurial:\n"
7527 " - SSH requires an accessible shell account on the destination\n"
7567 " - SSH requires an accessible shell account on the destination\n"
7528 " machine and a copy of hg in the remote path or specified with as\n"
7568 " machine and a copy of hg in the remote path or specified with as\n"
7529 " remotecmd.\n"
7569 " remotecmd.\n"
7530 " - path is relative to the remote user's home directory by default.\n"
7570 " - path is relative to the remote user's home directory by default.\n"
7531 " Use an extra slash at the start of a path to specify an absolute "
7571 " Use an extra slash at the start of a path to specify an absolute "
7532 "path:\n"
7572 "path:\n"
7533 " ssh://example.com//tmp/repository\n"
7573 " ssh://example.com//tmp/repository\n"
7534 " - Mercurial doesn't use its own compression via SSH; the right\n"
7574 " - Mercurial doesn't use its own compression via SSH; the right\n"
7535 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7575 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7536 " Host *.mylocalnetwork.example.com\n"
7576 " Host *.mylocalnetwork.example.com\n"
7537 " Compression no\n"
7577 " Compression no\n"
7538 " Host *\n"
7578 " Host *\n"
7539 " Compression yes\n"
7579 " Compression yes\n"
7540 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7580 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7541 " or with the --ssh command line option.\n"
7581 " or with the --ssh command line option.\n"
7542 "\n"
7582 "\n"
7543 " These URLs can all be stored in your hgrc with path aliases under\n"
7583 " These URLs can all be stored in your hgrc with path aliases under\n"
7544 " the [paths] section like so:\n"
7584 " the [paths] section like so:\n"
7545 " [paths]\n"
7585 " [paths]\n"
7546 " alias1 = URL1\n"
7586 " alias1 = URL1\n"
7547 " alias2 = URL2\n"
7587 " alias2 = URL2\n"
7548 " ...\n"
7588 " ...\n"
7549 "\n"
7589 "\n"
7550 " You can then use the alias for any command that uses a URL (for\n"
7590 " You can then use the alias for any command that uses a URL (for\n"
7551 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7591 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7552 "\n"
7592 "\n"
7553 " Two path aliases are special because they are used as defaults\n"
7593 " Two path aliases are special because they are used as defaults\n"
7554 " when you do not provide the URL to a command:\n"
7594 " when you do not provide the URL to a command:\n"
7555 "\n"
7595 "\n"
7556 " default:\n"
7596 " default:\n"
7557 " When you create a repository with hg clone, the clone command\n"
7597 " When you create a repository with hg clone, the clone command\n"
7558 " saves the location of the source repository as the new\n"
7598 " saves the location of the source repository as the new\n"
7559 " repository's 'default' path. This is then used when you omit\n"
7599 " repository's 'default' path. This is then used when you omit\n"
7560 " path from push- and pull-like commands (including incoming and\n"
7600 " path from push- and pull-like commands (including incoming and\n"
7561 " outgoing).\n"
7601 " outgoing).\n"
7562 "\n"
7602 "\n"
7563 " default-push:\n"
7603 " default-push:\n"
7564 " The push command will look for a path named 'default-push', and\n"
7604 " The push command will look for a path named 'default-push', and\n"
7565 " prefer it over 'default' if both are defined.\n"
7605 " prefer it over 'default' if both are defined.\n"
7566 " "
7606 " "
7567 msgstr ""
7607 msgstr ""
7568
7608
7569 msgid "Using additional features"
7609 msgid "Using additional features"
7570 msgstr ""
7610 msgstr ""
7571
7611
7572 msgid "can only share local repositories"
7612 msgid "can only share local repositories"
7573 msgstr ""
7613 msgstr ""
7574
7614
7575 msgid "destination already exists"
7615 msgid "destination already exists"
7576 msgstr ""
7616 msgstr ""
7577
7617
7578 msgid "updating working directory\n"
7618 msgid "updating working directory\n"
7579 msgstr ""
7619 msgstr ""
7580
7620
7581 #, python-format
7621 #, python-format
7582 msgid "destination directory: %s\n"
7622 msgid "destination directory: %s\n"
7583 msgstr ""
7623 msgstr ""
7584
7624
7585 #, python-format
7625 #, python-format
7586 msgid "destination '%s' already exists"
7626 msgid "destination '%s' already exists"
7587 msgstr ""
7627 msgstr ""
7588
7628
7589 #, python-format
7629 #, python-format
7590 msgid "destination '%s' is not empty"
7630 msgid "destination '%s' is not empty"
7591 msgstr ""
7631 msgstr ""
7592
7632
7593 msgid ""
7633 msgid ""
7594 "src repository does not support revision lookup and so doesn't support clone "
7634 "src repository does not support revision lookup and so doesn't support clone "
7595 "by revision"
7635 "by revision"
7596 msgstr ""
7636 msgstr ""
7597
7637
7598 msgid "clone from remote to remote not supported"
7638 msgid "clone from remote to remote not supported"
7599 msgstr ""
7639 msgstr ""
7600
7640
7601 msgid "updated"
7641 msgid "updated"
7602 msgstr ""
7642 msgstr ""
7603
7643
7604 msgid "merged"
7644 msgid "merged"
7605 msgstr ""
7645 msgstr ""
7606
7646
7607 msgid "removed"
7647 msgid "removed"
7608 msgstr ""
7648 msgstr ""
7609
7649
7610 msgid "unresolved"
7650 msgid "unresolved"
7611 msgstr ""
7651 msgstr ""
7612
7652
7613 #, python-format
7653 #, python-format
7614 msgid "%d files %s"
7654 msgid "%d files %s"
7615 msgstr ""
7655 msgstr ""
7616
7656
7617 msgid "use 'hg resolve' to retry unresolved file merges\n"
7657 msgid "use 'hg resolve' to retry unresolved file merges\n"
7618 msgstr ""
7658 msgstr ""
7619
7659
7620 msgid ""
7660 msgid ""
7621 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7661 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7622 "abandon\n"
7662 "abandon\n"
7623 msgstr ""
7663 msgstr ""
7624
7664
7625 msgid "(branch merge, don't forget to commit)\n"
7665 msgid "(branch merge, don't forget to commit)\n"
7626 msgstr ""
7666 msgstr ""
7627
7667
7628 #, python-format
7668 #, python-format
7629 msgid "error reading %s/.hg/hgrc: %s\n"
7669 msgid "error reading %s/.hg/hgrc: %s\n"
7630 msgstr ""
7670 msgstr ""
7631
7671
7632 msgid "SSL support is unavailable"
7672 msgid "SSL support is unavailable"
7633 msgstr ""
7673 msgstr ""
7634
7674
7635 msgid "IPv6 is not available on this system"
7675 msgid "IPv6 is not available on this system"
7636 msgstr ""
7676 msgstr ""
7637
7677
7638 #, python-format
7678 #, python-format
7639 msgid "cannot start server at '%s:%d': %s"
7679 msgid "cannot start server at '%s:%d': %s"
7640 msgstr ""
7680 msgstr ""
7641
7681
7642 #, python-format
7682 #, python-format
7643 msgid "calling hook %s: %s\n"
7683 msgid "calling hook %s: %s\n"
7644 msgstr ""
7684 msgstr ""
7645
7685
7646 #, python-format
7686 #, python-format
7647 msgid "%s hook is invalid (\"%s\" not in a module)"
7687 msgid "%s hook is invalid (\"%s\" not in a module)"
7648 msgstr ""
7688 msgstr ""
7649
7689
7650 #, python-format
7690 #, python-format
7651 msgid "%s hook is invalid (import of \"%s\" failed)"
7691 msgid "%s hook is invalid (import of \"%s\" failed)"
7652 msgstr ""
7692 msgstr ""
7653
7693
7654 #, python-format
7694 #, python-format
7655 msgid "%s hook is invalid (\"%s\" is not defined)"
7695 msgid "%s hook is invalid (\"%s\" is not defined)"
7656 msgstr ""
7696 msgstr ""
7657
7697
7658 #, python-format
7698 #, python-format
7659 msgid "%s hook is invalid (\"%s\" is not callable)"
7699 msgid "%s hook is invalid (\"%s\" is not callable)"
7660 msgstr ""
7700 msgstr ""
7661
7701
7662 #, python-format
7702 #, python-format
7663 msgid "error: %s hook failed: %s\n"
7703 msgid "error: %s hook failed: %s\n"
7664 msgstr ""
7704 msgstr ""
7665
7705
7666 #, python-format
7706 #, python-format
7667 msgid "error: %s hook raised an exception: %s\n"
7707 msgid "error: %s hook raised an exception: %s\n"
7668 msgstr ""
7708 msgstr ""
7669
7709
7670 #, python-format
7710 #, python-format
7671 msgid "%s hook failed"
7711 msgid "%s hook failed"
7672 msgstr ""
7712 msgstr ""
7673
7713
7674 #, python-format
7714 #, python-format
7675 msgid "warning: %s hook failed\n"
7715 msgid "warning: %s hook failed\n"
7676 msgstr ""
7716 msgstr ""
7677
7717
7678 #, python-format
7718 #, python-format
7679 msgid "running hook %s: %s\n"
7719 msgid "running hook %s: %s\n"
7680 msgstr ""
7720 msgstr ""
7681
7721
7682 #, python-format
7722 #, python-format
7683 msgid "%s hook %s"
7723 msgid "%s hook %s"
7684 msgstr ""
7724 msgstr ""
7685
7725
7686 #, python-format
7726 #, python-format
7687 msgid "warning: %s hook %s\n"
7727 msgid "warning: %s hook %s\n"
7688 msgstr ""
7728 msgstr ""
7689
7729
7690 msgid "connection ended unexpectedly"
7730 msgid "connection ended unexpectedly"
7691 msgstr ""
7731 msgstr ""
7692
7732
7693 #, python-format
7733 #, python-format
7694 msgid "unsupported URL component: \"%s\""
7734 msgid "unsupported URL component: \"%s\""
7695 msgstr ""
7735 msgstr ""
7696
7736
7697 #, python-format
7737 #, python-format
7698 msgid "using %s\n"
7738 msgid "using %s\n"
7699 msgstr ""
7739 msgstr ""
7700
7740
7701 #, python-format
7741 #, python-format
7702 msgid "capabilities: %s\n"
7742 msgid "capabilities: %s\n"
7703 msgstr ""
7743 msgstr ""
7704
7744
7705 msgid "operation not supported over http"
7745 msgid "operation not supported over http"
7706 msgstr ""
7746 msgstr ""
7707
7747
7708 #, python-format
7748 #, python-format
7709 msgid "sending %s command\n"
7749 msgid "sending %s command\n"
7710 msgstr ""
7750 msgstr ""
7711
7751
7712 #, python-format
7752 #, python-format
7713 msgid "sending %s bytes\n"
7753 msgid "sending %s bytes\n"
7714 msgstr ""
7754 msgstr ""
7715
7755
7716 msgid "authorization failed"
7756 msgid "authorization failed"
7717 msgstr ""
7757 msgstr ""
7718
7758
7719 #, python-format
7759 #, python-format
7720 msgid "http error while sending %s command\n"
7760 msgid "http error while sending %s command\n"
7721 msgstr ""
7761 msgstr ""
7722
7762
7723 msgid "http error, possibly caused by proxy setting"
7763 msgid "http error, possibly caused by proxy setting"
7724 msgstr ""
7764 msgstr ""
7725
7765
7726 #, python-format
7766 #, python-format
7727 msgid "real URL is %s\n"
7767 msgid "real URL is %s\n"
7728 msgstr ""
7768 msgstr ""
7729
7769
7730 #, python-format
7770 #, python-format
7731 msgid "requested URL: '%s'\n"
7771 msgid "requested URL: '%s'\n"
7732 msgstr ""
7772 msgstr ""
7733
7773
7734 #, python-format
7774 #, python-format
7735 msgid "'%s' does not appear to be an hg repository"
7775 msgid "'%s' does not appear to be an hg repository"
7736 msgstr ""
7776 msgstr ""
7737
7777
7738 #, python-format
7778 #, python-format
7739 msgid "'%s' sent a broken Content-Type header (%s)"
7779 msgid "'%s' sent a broken Content-Type header (%s)"
7740 msgstr ""
7780 msgstr ""
7741
7781
7742 #, python-format
7782 #, python-format
7743 msgid "'%s' uses newer protocol %s"
7783 msgid "'%s' uses newer protocol %s"
7744 msgstr ""
7784 msgstr ""
7745
7785
7746 msgid "look up remote revision"
7786 msgid "look up remote revision"
7747 msgstr ""
7787 msgstr ""
7748
7788
7749 msgid "unexpected response:"
7789 msgid "unexpected response:"
7750 msgstr ""
7790 msgstr ""
7751
7791
7752 msgid "look up remote changes"
7792 msgid "look up remote changes"
7753 msgstr ""
7793 msgstr ""
7754
7794
7755 msgid "push failed (unexpected response):"
7795 msgid "push failed (unexpected response):"
7756 msgstr ""
7796 msgstr ""
7757
7797
7758 #, python-format
7798 #, python-format
7759 msgid "push failed: %s"
7799 msgid "push failed: %s"
7760 msgstr ""
7800 msgstr ""
7761
7801
7762 msgid "Python support for SSL and HTTPS is not installed"
7802 msgid "Python support for SSL and HTTPS is not installed"
7763 msgstr ""
7803 msgstr ""
7764
7804
7765 msgid "cannot create new http repository"
7805 msgid "cannot create new http repository"
7766 msgstr ""
7806 msgstr ""
7767
7807
7768 #, python-format
7808 #, python-format
7769 msgid "%s: ignoring invalid syntax '%s'\n"
7809 msgid "%s: ignoring invalid syntax '%s'\n"
7770 msgstr ""
7810 msgstr ""
7771
7811
7772 #, python-format
7812 #, python-format
7773 msgid "skipping unreadable ignore file '%s': %s\n"
7813 msgid "skipping unreadable ignore file '%s': %s\n"
7774 msgstr ""
7814 msgstr ""
7775
7815
7776 #, python-format
7816 #, python-format
7777 msgid "repository %s not found"
7817 msgid "repository %s not found"
7778 msgstr ""
7818 msgstr ""
7779
7819
7780 #, python-format
7820 #, python-format
7781 msgid "repository %s already exists"
7821 msgid "repository %s already exists"
7782 msgstr ""
7822 msgstr ""
7783
7823
7784 #, python-format
7824 #, python-format
7785 msgid "requirement '%s' not supported"
7825 msgid "requirement '%s' not supported"
7786 msgstr ""
7826 msgstr ""
7787
7827
7788 #, python-format
7828 #, python-format
7789 msgid ".hg/sharedpath points to nonexistent directory %s"
7829 msgid ".hg/sharedpath points to nonexistent directory %s"
7790 msgstr ""
7830 msgstr ""
7791
7831
7792 #, python-format
7832 #, python-format
7793 msgid "%r cannot be used in a tag name"
7833 msgid "%r cannot be used in a tag name"
7794 msgstr ""
7834 msgstr ""
7795
7835
7796 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7836 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7797 msgstr ""
7837 msgstr ""
7798
7838
7799 #, python-format
7839 #, python-format
7800 msgid "%s, line %s: %s\n"
7840 msgid "%s, line %s: %s\n"
7801 msgstr ""
7841 msgstr ""
7802
7842
7803 msgid "cannot parse entry"
7843 msgid "cannot parse entry"
7804 msgstr ""
7844 msgstr ""
7805
7845
7806 #, python-format
7846 #, python-format
7807 msgid "node '%s' is not well formed"
7847 msgid "node '%s' is not well formed"
7808 msgstr ""
7848 msgstr ""
7809
7849
7810 #, python-format
7850 #, python-format
7811 msgid "working directory has unknown parent '%s'!"
7851 msgid "working directory has unknown parent '%s'!"
7812 msgstr ""
7852 msgstr ""
7813
7853
7814 #, python-format
7854 #, python-format
7815 msgid "unknown revision '%s'"
7855 msgid "unknown revision '%s'"
7816 msgstr ""
7856 msgstr ""
7817
7857
7818 #, python-format
7858 #, python-format
7819 msgid "filtering %s through %s\n"
7859 msgid "filtering %s through %s\n"
7820 msgstr ""
7860 msgstr ""
7821
7861
7822 msgid "journal already exists - run hg recover"
7862 msgid "journal already exists - run hg recover"
7823 msgstr ""
7863 msgstr ""
7824
7864
7825 msgid "rolling back interrupted transaction\n"
7865 msgid "rolling back interrupted transaction\n"
7826 msgstr ""
7866 msgstr ""
7827
7867
7828 msgid "no interrupted transaction available\n"
7868 msgid "no interrupted transaction available\n"
7829 msgstr ""
7869 msgstr ""
7830
7870
7831 msgid "rolling back last transaction\n"
7871 msgid "rolling back last transaction\n"
7832 msgstr ""
7872 msgstr ""
7833
7873
7834 #, python-format
7874 #, python-format
7835 msgid "Named branch could not be reset, current branch still is: %s\n"
7875 msgid "Named branch could not be reset, current branch still is: %s\n"
7836 msgstr ""
7876 msgstr ""
7837
7877
7838 msgid "no rollback information available\n"
7878 msgid "no rollback information available\n"
7839 msgstr ""
7879 msgstr ""
7840
7880
7841 #, python-format
7881 #, python-format
7842 msgid "waiting for lock on %s held by %r\n"
7882 msgid "waiting for lock on %s held by %r\n"
7843 msgstr ""
7883 msgstr ""
7844
7884
7845 #, python-format
7885 #, python-format
7846 msgid "repository %s"
7886 msgid "repository %s"
7847 msgstr ""
7887 msgstr ""
7848
7888
7849 #, python-format
7889 #, python-format
7850 msgid "working directory of %s"
7890 msgid "working directory of %s"
7851 msgstr ""
7891 msgstr ""
7852
7892
7853 #, python-format
7893 #, python-format
7854 msgid " %s: searching for copy revision for %s\n"
7894 msgid " %s: searching for copy revision for %s\n"
7855 msgstr ""
7895 msgstr ""
7856
7896
7857 #, python-format
7897 #, python-format
7858 msgid " %s: copy %s:%s\n"
7898 msgid " %s: copy %s:%s\n"
7859 msgstr ""
7899 msgstr ""
7860
7900
7861 msgid "cannot partially commit a merge (do not specify files or patterns)"
7901 msgid "cannot partially commit a merge (do not specify files or patterns)"
7862 msgstr ""
7902 msgstr ""
7863
7903
7864 msgid "file not found!"
7904 msgid "file not found!"
7865 msgstr ""
7905 msgstr ""
7866
7906
7867 msgid "no match under directory!"
7907 msgid "no match under directory!"
7868 msgstr ""
7908 msgstr ""
7869
7909
7870 msgid "file not tracked!"
7910 msgid "file not tracked!"
7871 msgstr ""
7911 msgstr ""
7872
7912
7873 msgid "nothing changed\n"
7913 msgid "nothing changed\n"
7874 msgstr ""
7914 msgstr ""
7875
7915
7876 msgid "unresolved merge conflicts (see hg resolve)"
7916 msgid "unresolved merge conflicts (see hg resolve)"
7877 msgstr ""
7917 msgstr ""
7878
7918
7879 #, python-format
7919 #, python-format
7880 msgid "committing subrepository %s\n"
7920 msgid "committing subrepository %s\n"
7881 msgstr ""
7921 msgstr ""
7882
7922
7883 #, python-format
7923 #, python-format
7884 msgid "trouble committing %s!\n"
7924 msgid "trouble committing %s!\n"
7885 msgstr ""
7925 msgstr ""
7886
7926
7887 #, python-format
7927 #, python-format
7888 msgid "%s does not exist!\n"
7928 msgid "%s does not exist!\n"
7889 msgstr ""
7929 msgstr ""
7890
7930
7891 #, python-format
7931 #, python-format
7892 msgid ""
7932 msgid ""
7893 "%s: files over 10MB may cause memory and performance problems\n"
7933 "%s: files over 10MB may cause memory and performance problems\n"
7894 "(use 'hg revert %s' to unadd the file)\n"
7934 "(use 'hg revert %s' to unadd the file)\n"
7895 msgstr ""
7935 msgstr ""
7896
7936
7897 #, python-format
7937 #, python-format
7898 msgid "%s not added: only files and symlinks supported currently\n"
7938 msgid "%s not added: only files and symlinks supported currently\n"
7899 msgstr ""
7939 msgstr ""
7900
7940
7901 #, python-format
7941 #, python-format
7902 msgid "%s already tracked!\n"
7942 msgid "%s already tracked!\n"
7903 msgstr ""
7943 msgstr ""
7904
7944
7905 #, python-format
7945 #, python-format
7906 msgid "%s not added!\n"
7946 msgid "%s not added!\n"
7907 msgstr ""
7947 msgstr ""
7908
7948
7909 #, python-format
7949 #, python-format
7910 msgid "%s still exists!\n"
7950 msgid "%s still exists!\n"
7911 msgstr ""
7951 msgstr ""
7912
7952
7913 #, python-format
7953 #, python-format
7914 msgid "%s not tracked!\n"
7954 msgid "%s not tracked!\n"
7915 msgstr ""
7955 msgstr ""
7916
7956
7917 #, python-format
7957 #, python-format
7918 msgid "%s not removed!\n"
7958 msgid "%s not removed!\n"
7919 msgstr ""
7959 msgstr ""
7920
7960
7921 #, python-format
7961 #, python-format
7922 msgid "copy failed: %s is not a file or a symbolic link\n"
7962 msgid "copy failed: %s is not a file or a symbolic link\n"
7923 msgstr ""
7963 msgstr ""
7924
7964
7925 msgid "searching for changes\n"
7965 msgid "searching for changes\n"
7926 msgstr ""
7966 msgstr ""
7927
7967
7928 #, python-format
7968 #, python-format
7929 msgid "examining %s:%s\n"
7969 msgid "examining %s:%s\n"
7930 msgstr ""
7970 msgstr ""
7931
7971
7932 msgid "branch already found\n"
7972 msgid "branch already found\n"
7933 msgstr ""
7973 msgstr ""
7934
7974
7935 #, python-format
7975 #, python-format
7936 msgid "found incomplete branch %s:%s\n"
7976 msgid "found incomplete branch %s:%s\n"
7937 msgstr ""
7977 msgstr ""
7938
7978
7939 #, python-format
7979 #, python-format
7940 msgid "found new changeset %s\n"
7980 msgid "found new changeset %s\n"
7941 msgstr ""
7981 msgstr ""
7942
7982
7943 #, python-format
7983 #, python-format
7944 msgid "request %d: %s\n"
7984 msgid "request %d: %s\n"
7945 msgstr ""
7985 msgstr ""
7946
7986
7947 #, python-format
7987 #, python-format
7948 msgid "received %s:%s\n"
7988 msgid "received %s:%s\n"
7949 msgstr ""
7989 msgstr ""
7950
7990
7951 #, python-format
7991 #, python-format
7952 msgid "narrowing %d:%d %s\n"
7992 msgid "narrowing %d:%d %s\n"
7953 msgstr ""
7993 msgstr ""
7954
7994
7955 #, python-format
7995 #, python-format
7956 msgid "found new branch changeset %s\n"
7996 msgid "found new branch changeset %s\n"
7957 msgstr ""
7997 msgstr ""
7958
7998
7959 #, python-format
7999 #, python-format
7960 msgid "narrowed branch search to %s:%s\n"
8000 msgid "narrowed branch search to %s:%s\n"
7961 msgstr ""
8001 msgstr ""
7962
8002
7963 msgid "already have changeset "
8003 msgid "already have changeset "
7964 msgstr ""
8004 msgstr ""
7965
8005
7966 msgid "warning: repository is unrelated\n"
8006 msgid "warning: repository is unrelated\n"
7967 msgstr ""
8007 msgstr ""
7968
8008
7969 msgid "repository is unrelated"
8009 msgid "repository is unrelated"
7970 msgstr ""
8010 msgstr ""
7971
8011
7972 msgid "found new changesets starting at "
8012 msgid "found new changesets starting at "
7973 msgstr ""
8013 msgstr ""
7974
8014
7975 #, python-format
8015 #, python-format
7976 msgid "%d total queries\n"
8016 msgid "%d total queries\n"
7977 msgstr ""
8017 msgstr ""
7978
8018
7979 msgid "common changesets up to "
8019 msgid "common changesets up to "
7980 msgstr ""
8020 msgstr ""
7981
8021
7982 msgid "requesting all changes\n"
8022 msgid "requesting all changes\n"
7983 msgstr ""
8023 msgstr ""
7984
8024
7985 msgid ""
8025 msgid ""
7986 "Partial pull cannot be done because other repository doesn't support "
8026 "Partial pull cannot be done because other repository doesn't support "
7987 "changegroupsubset."
8027 "changegroupsubset."
7988 msgstr ""
8028 msgstr ""
7989
8029
7990 #, python-format
8030 #, python-format
7991 msgid "abort: push creates new remote branch '%s'!\n"
8031 msgid "abort: push creates new remote branch '%s'!\n"
7992 msgstr ""
8032 msgstr ""
7993
8033
7994 msgid "abort: push creates new remote heads!\n"
8034 msgid "abort: push creates new remote heads!\n"
7995 msgstr ""
8035 msgstr ""
7996
8036
7997 msgid "(did you forget to merge? use push -f to force)\n"
8037 msgid "(did you forget to merge? use push -f to force)\n"
7998 msgstr ""
8038 msgstr ""
7999
8039
8000 msgid "note: unsynced remote changes!\n"
8040 msgid "note: unsynced remote changes!\n"
8001 msgstr ""
8041 msgstr ""
8002
8042
8003 #, python-format
8043 #, python-format
8004 msgid "%d changesets found\n"
8044 msgid "%d changesets found\n"
8005 msgstr ""
8045 msgstr ""
8006
8046
8007 msgid "list of changesets:\n"
8047 msgid "list of changesets:\n"
8008 msgstr ""
8048 msgstr ""
8009
8049
8010 #, python-format
8050 #, python-format
8011 msgid "empty or missing revlog for %s"
8051 msgid "empty or missing revlog for %s"
8012 msgstr ""
8052 msgstr ""
8013
8053
8014 #, python-format
8054 #, python-format
8015 msgid "add changeset %s\n"
8055 msgid "add changeset %s\n"
8016 msgstr ""
8056 msgstr ""
8017
8057
8018 msgid "adding changesets\n"
8058 msgid "adding changesets\n"
8019 msgstr ""
8059 msgstr ""
8020
8060
8021 msgid "received changelog group is empty"
8061 msgid "received changelog group is empty"
8022 msgstr ""
8062 msgstr ""
8023
8063
8024 msgid "adding manifests\n"
8064 msgid "adding manifests\n"
8025 msgstr ""
8065 msgstr ""
8026
8066
8027 msgid "adding file changes\n"
8067 msgid "adding file changes\n"
8028 msgstr ""
8068 msgstr ""
8029
8069
8030 #, python-format
8070 #, python-format
8031 msgid "adding %s revisions\n"
8071 msgid "adding %s revisions\n"
8032 msgstr ""
8072 msgstr ""
8033
8073
8034 msgid "received file revlog group is empty"
8074 msgid "received file revlog group is empty"
8035 msgstr ""
8075 msgstr ""
8036
8076
8037 #, python-format
8077 #, python-format
8038 msgid " (%+d heads)"
8078 msgid " (%+d heads)"
8039 msgstr ""
8079 msgstr ""
8040
8080
8041 #, python-format
8081 #, python-format
8042 msgid "added %d changesets with %d changes to %d files%s\n"
8082 msgid "added %d changesets with %d changes to %d files%s\n"
8043 msgstr ""
8083 msgstr ""
8044
8084
8045 msgid "updating the branch cache\n"
8085 msgid "updating the branch cache\n"
8046 msgstr ""
8086 msgstr ""
8047
8087
8048 msgid "Unexpected response from remote server:"
8088 msgid "Unexpected response from remote server:"
8049 msgstr ""
8089 msgstr ""
8050
8090
8051 msgid "operation forbidden by server"
8091 msgid "operation forbidden by server"
8052 msgstr ""
8092 msgstr ""
8053
8093
8054 msgid "locking the remote repository failed"
8094 msgid "locking the remote repository failed"
8055 msgstr ""
8095 msgstr ""
8056
8096
8057 msgid "the server sent an unknown error code"
8097 msgid "the server sent an unknown error code"
8058 msgstr ""
8098 msgstr ""
8059
8099
8060 msgid "streaming all changes\n"
8100 msgid "streaming all changes\n"
8061 msgstr ""
8101 msgstr ""
8062
8102
8063 #, python-format
8103 #, python-format
8064 msgid "%d files to transfer, %s of data\n"
8104 msgid "%d files to transfer, %s of data\n"
8065 msgstr ""
8105 msgstr ""
8066
8106
8067 #, python-format
8107 #, python-format
8068 msgid "adding %s (%s)\n"
8108 msgid "adding %s (%s)\n"
8069 msgstr ""
8109 msgstr ""
8070
8110
8071 #, python-format
8111 #, python-format
8072 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8112 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8073 msgstr ""
8113 msgstr ""
8074
8114
8075 msgid "no [smtp]host in hgrc - cannot send mail"
8115 msgid "no [smtp]host in hgrc - cannot send mail"
8076 msgstr ""
8116 msgstr ""
8077
8117
8078 #, python-format
8118 #, python-format
8079 msgid "sending mail: smtp host %s, port %s\n"
8119 msgid "sending mail: smtp host %s, port %s\n"
8080 msgstr ""
8120 msgstr ""
8081
8121
8082 msgid "can't use TLS: Python SSL support not installed"
8122 msgid "can't use TLS: Python SSL support not installed"
8083 msgstr ""
8123 msgstr ""
8084
8124
8085 msgid "(using tls)\n"
8125 msgid "(using tls)\n"
8086 msgstr ""
8126 msgstr ""
8087
8127
8088 #, python-format
8128 #, python-format
8089 msgid "(authenticating to mail server as %s)\n"
8129 msgid "(authenticating to mail server as %s)\n"
8090 msgstr ""
8130 msgstr ""
8091
8131
8092 #, python-format
8132 #, python-format
8093 msgid "sending mail: %s\n"
8133 msgid "sending mail: %s\n"
8094 msgstr ""
8134 msgstr ""
8095
8135
8096 msgid "smtp specified as email transport, but no smtp host configured"
8136 msgid "smtp specified as email transport, but no smtp host configured"
8097 msgstr ""
8137 msgstr ""
8098
8138
8099 #, python-format
8139 #, python-format
8100 msgid "%r specified as email transport, but not in PATH"
8140 msgid "%r specified as email transport, but not in PATH"
8101 msgstr ""
8141 msgstr ""
8102
8142
8103 #, python-format
8143 #, python-format
8104 msgid "ignoring invalid sendcharset: %s\n"
8144 msgid "ignoring invalid sendcharset: %s\n"
8105 msgstr ""
8145 msgstr ""
8106
8146
8107 #, python-format
8147 #, python-format
8108 msgid "invalid email address: %s"
8148 msgid "invalid email address: %s"
8109 msgstr ""
8149 msgstr ""
8110
8150
8111 #, python-format
8151 #, python-format
8112 msgid "invalid local address: %s"
8152 msgid "invalid local address: %s"
8113 msgstr ""
8153 msgstr ""
8114
8154
8115 #, python-format
8155 #, python-format
8116 msgid "failed to remove %s from manifest"
8156 msgid "failed to remove %s from manifest"
8117 msgstr ""
8157 msgstr ""
8118
8158
8119 #, python-format
8159 #, python-format
8120 msgid "diff context lines count must be an integer, not %r"
8160 msgid "diff context lines count must be an integer, not %r"
8121 msgstr ""
8161 msgstr ""
8122
8162
8123 #, python-format
8163 #, python-format
8124 msgid ""
8164 msgid ""
8125 "untracked file in working directory differs from file in requested revision: "
8165 "untracked file in working directory differs from file in requested revision: "
8126 "'%s'"
8166 "'%s'"
8127 msgstr ""
8167 msgstr ""
8128
8168
8129 #, python-format
8169 #, python-format
8130 msgid "case-folding collision between %s and %s"
8170 msgid "case-folding collision between %s and %s"
8131 msgstr ""
8171 msgstr ""
8132
8172
8133 #, python-format
8173 #, python-format
8134 msgid ""
8174 msgid ""
8135 " conflicting flags for %s\n"
8175 " conflicting flags for %s\n"
8136 "(n)one, e(x)ec or sym(l)ink?"
8176 "(n)one, e(x)ec or sym(l)ink?"
8137 msgstr ""
8177 msgstr ""
8138
8178
8139 msgid "&None"
8179 msgid "&None"
8140 msgstr ""
8180 msgstr ""
8141
8181
8142 msgid "E&xec"
8182 msgid "E&xec"
8143 msgstr ""
8183 msgstr ""
8144
8184
8145 msgid "Sym&link"
8185 msgid "Sym&link"
8146 msgstr ""
8186 msgstr ""
8147
8187
8148 msgid "resolving manifests\n"
8188 msgid "resolving manifests\n"
8149 msgstr ""
8189 msgstr ""
8150
8190
8151 #, python-format
8191 #, python-format
8152 msgid " overwrite %s partial %s\n"
8192 msgid " overwrite %s partial %s\n"
8153 msgstr ""
8193 msgstr ""
8154
8194
8155 #, python-format
8195 #, python-format
8156 msgid " ancestor %s local %s remote %s\n"
8196 msgid " ancestor %s local %s remote %s\n"
8157 msgstr ""
8197 msgstr ""
8158
8198
8159 #, python-format
8199 #, python-format
8160 msgid ""
8200 msgid ""
8161 " local changed %s which remote deleted\n"
8201 " local changed %s which remote deleted\n"
8162 "use (c)hanged version or (d)elete?"
8202 "use (c)hanged version or (d)elete?"
8163 msgstr ""
8203 msgstr ""
8164
8204
8165 msgid "&Changed"
8205 msgid "&Changed"
8166 msgstr ""
8206 msgstr ""
8167
8207
8168 msgid "&Delete"
8208 msgid "&Delete"
8169 msgstr ""
8209 msgstr ""
8170
8210
8171 msgid "c"
8211 msgid "c"
8172 msgstr ""
8212 msgstr ""
8173
8213
8174 #, python-format
8214 #, python-format
8175 msgid ""
8215 msgid ""
8176 "remote changed %s which local deleted\n"
8216 "remote changed %s which local deleted\n"
8177 "use (c)hanged version or leave (d)eleted?"
8217 "use (c)hanged version or leave (d)eleted?"
8178 msgstr ""
8218 msgstr ""
8179
8219
8180 msgid "&Deleted"
8220 msgid "&Deleted"
8181 msgstr ""
8221 msgstr ""
8182
8222
8183 #, python-format
8223 #, python-format
8184 msgid "preserving %s for resolve of %s\n"
8224 msgid "preserving %s for resolve of %s\n"
8185 msgstr ""
8225 msgstr ""
8186
8226
8187 #, python-format
8227 #, python-format
8188 msgid "update failed to remove %s: %s!\n"
8228 msgid "update failed to remove %s: %s!\n"
8189 msgstr ""
8229 msgstr ""
8190
8230
8191 #, python-format
8231 #, python-format
8192 msgid "getting %s\n"
8232 msgid "getting %s\n"
8193 msgstr ""
8233 msgstr ""
8194
8234
8195 #, python-format
8235 #, python-format
8196 msgid "getting %s to %s\n"
8236 msgid "getting %s to %s\n"
8197 msgstr ""
8237 msgstr ""
8198
8238
8199 #, python-format
8239 #, python-format
8200 msgid "warning: detected divergent renames of %s to:\n"
8240 msgid "warning: detected divergent renames of %s to:\n"
8201 msgstr ""
8241 msgstr ""
8202
8242
8203 #, python-format
8243 #, python-format
8204 msgid "branch %s not found"
8244 msgid "branch %s not found"
8205 msgstr ""
8245 msgstr ""
8206
8246
8207 msgid "can't merge with ancestor"
8247 msgid "can't merge with ancestor"
8208 msgstr ""
8248 msgstr ""
8209
8249
8210 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8250 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8211 msgstr ""
8251 msgstr ""
8212
8252
8213 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8253 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8214 msgstr ""
8254 msgstr ""
8215
8255
8216 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8256 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8217 msgstr ""
8257 msgstr ""
8218
8258
8219 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8259 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8220 msgstr ""
8260 msgstr ""
8221
8261
8222 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8262 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8223 msgstr ""
8263 msgstr ""
8224
8264
8225 #, python-format
8265 #, python-format
8226 msgid "cannot create %s: destination already exists"
8266 msgid "cannot create %s: destination already exists"
8227 msgstr ""
8267 msgstr ""
8228
8268
8229 #, python-format
8269 #, python-format
8230 msgid "cannot create %s: unable to create destination directory"
8270 msgid "cannot create %s: unable to create destination directory"
8231 msgstr ""
8271 msgstr ""
8232
8272
8233 #, python-format
8273 #, python-format
8234 msgid "found patch at byte %d\n"
8274 msgid "found patch at byte %d\n"
8235 msgstr ""
8275 msgstr ""
8236
8276
8237 msgid "patch generated by hg export\n"
8277 msgid "patch generated by hg export\n"
8238 msgstr ""
8278 msgstr ""
8239
8279
8240 #, python-format
8280 #, python-format
8241 msgid "unable to find '%s' for patching\n"
8281 msgid "unable to find '%s' for patching\n"
8242 msgstr ""
8282 msgstr ""
8243
8283
8244 #, python-format
8284 #, python-format
8245 msgid "patching file %s\n"
8285 msgid "patching file %s\n"
8246 msgstr ""
8286 msgstr ""
8247
8287
8248 #, python-format
8288 #, python-format
8249 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8289 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8250 msgstr ""
8290 msgstr ""
8251
8291
8252 #, python-format
8292 #, python-format
8253 msgid "bad hunk #%d %s (%d %d %d %d)"
8293 msgid "bad hunk #%d %s (%d %d %d %d)"
8254 msgstr ""
8294 msgstr ""
8255
8295
8256 #, python-format
8296 #, python-format
8257 msgid "file %s already exists\n"
8297 msgid "file %s already exists\n"
8258 msgstr ""
8298 msgstr ""
8259
8299
8260 #, python-format
8300 #, python-format
8261 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8301 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8262 msgstr ""
8302 msgstr ""
8263
8303
8264 #, python-format
8304 #, python-format
8265 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8305 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8266 msgstr ""
8306 msgstr ""
8267
8307
8268 #, python-format
8308 #, python-format
8269 msgid "Hunk #%d FAILED at %d\n"
8309 msgid "Hunk #%d FAILED at %d\n"
8270 msgstr ""
8310 msgstr ""
8271
8311
8272 #, python-format
8312 #, python-format
8273 msgid "bad hunk #%d"
8313 msgid "bad hunk #%d"
8274 msgstr ""
8314 msgstr ""
8275
8315
8276 #, python-format
8316 #, python-format
8277 msgid "bad hunk #%d old text line %d"
8317 msgid "bad hunk #%d old text line %d"
8278 msgstr ""
8318 msgstr ""
8279
8319
8280 msgid "could not extract binary patch"
8320 msgid "could not extract binary patch"
8281 msgstr ""
8321 msgstr ""
8282
8322
8283 #, python-format
8323 #, python-format
8284 msgid "binary patch is %d bytes, not %d"
8324 msgid "binary patch is %d bytes, not %d"
8285 msgstr ""
8325 msgstr ""
8286
8326
8287 #, python-format
8327 #, python-format
8288 msgid "unable to strip away %d dirs from %s"
8328 msgid "unable to strip away %d dirs from %s"
8289 msgstr ""
8329 msgstr ""
8290
8330
8291 msgid "undefined source and destination files"
8331 msgid "undefined source and destination files"
8292 msgstr ""
8332 msgstr ""
8293
8333
8294 #, python-format
8334 #, python-format
8295 msgid "malformed patch %s %s"
8335 msgid "malformed patch %s %s"
8296 msgstr ""
8336 msgstr ""
8297
8337
8298 #, python-format
8338 #, python-format
8299 msgid "unsupported parser state: %s"
8339 msgid "unsupported parser state: %s"
8300 msgstr ""
8340 msgstr ""
8301
8341
8302 #, python-format
8342 #, python-format
8303 msgid "patch command failed: %s"
8343 msgid "patch command failed: %s"
8304 msgstr ""
8344 msgstr ""
8305
8345
8306 #, python-format
8346 #, python-format
8307 msgid "Unsupported line endings type: %s"
8347 msgid "Unsupported line endings type: %s"
8308 msgstr ""
8348 msgstr ""
8309
8349
8310 #, python-format
8350 #, python-format
8311 msgid "no valid hunks found; trying with %r instead\n"
8351 msgid "no valid hunks found; trying with %r instead\n"
8312 msgstr ""
8352 msgstr ""
8313
8353
8314 #, python-format
8354 #, python-format
8315 msgid "exited with status %d"
8355 msgid "exited with status %d"
8316 msgstr ""
8356 msgstr ""
8317
8357
8318 #, python-format
8358 #, python-format
8319 msgid "killed by signal %d"
8359 msgid "killed by signal %d"
8320 msgstr ""
8360 msgstr ""
8321
8361
8322 #, python-format
8362 #, python-format
8323 msgid "stopped by signal %d"
8363 msgid "stopped by signal %d"
8324 msgstr ""
8364 msgstr ""
8325
8365
8326 msgid "invalid exit code"
8366 msgid "invalid exit code"
8327 msgstr ""
8367 msgstr ""
8328
8368
8329 #, python-format
8369 #, python-format
8330 msgid "saving bundle to %s\n"
8370 msgid "saving bundle to %s\n"
8331 msgstr ""
8371 msgstr ""
8332
8372
8333 msgid "adding branch\n"
8373 msgid "adding branch\n"
8334 msgstr ""
8374 msgstr ""
8335
8375
8336 #, python-format
8376 #, python-format
8337 msgid "cannot %s; remote repository does not support the %r capability"
8377 msgid "cannot %s; remote repository does not support the %r capability"
8338 msgstr ""
8378 msgstr ""
8339
8379
8340 #, python-format
8380 #, python-format
8341 msgid "unknown compression type %r"
8381 msgid "unknown compression type %r"
8342 msgstr ""
8382 msgstr ""
8343
8383
8344 #, python-format
8384 #, python-format
8345 msgid "index %s unknown flags %#04x for format v0"
8385 msgid "index %s unknown flags %#04x for format v0"
8346 msgstr ""
8386 msgstr ""
8347
8387
8348 #, python-format
8388 #, python-format
8349 msgid "index %s unknown flags %#04x for revlogng"
8389 msgid "index %s unknown flags %#04x for revlogng"
8350 msgstr ""
8390 msgstr ""
8351
8391
8352 #, python-format
8392 #, python-format
8353 msgid "index %s unknown format %d"
8393 msgid "index %s unknown format %d"
8354 msgstr ""
8394 msgstr ""
8355
8395
8356 #, python-format
8396 #, python-format
8357 msgid "index %s is corrupted"
8397 msgid "index %s is corrupted"
8358 msgstr ""
8398 msgstr ""
8359
8399
8360 msgid "no node"
8400 msgid "no node"
8361 msgstr ""
8401 msgstr ""
8362
8402
8363 msgid "ambiguous identifier"
8403 msgid "ambiguous identifier"
8364 msgstr ""
8404 msgstr ""
8365
8405
8366 msgid "no match found"
8406 msgid "no match found"
8367 msgstr ""
8407 msgstr ""
8368
8408
8369 #, python-format
8409 #, python-format
8370 msgid "incompatible revision flag %x"
8410 msgid "incompatible revision flag %x"
8371 msgstr ""
8411 msgstr ""
8372
8412
8373 #, python-format
8413 #, python-format
8374 msgid "%s not found in the transaction"
8414 msgid "%s not found in the transaction"
8375 msgstr ""
8415 msgstr ""
8376
8416
8377 msgid "unknown base"
8417 msgid "unknown base"
8378 msgstr ""
8418 msgstr ""
8379
8419
8380 msgid "consistency error adding group"
8420 msgid "consistency error adding group"
8381 msgstr ""
8421 msgstr ""
8382
8422
8383 #, python-format
8423 #, python-format
8384 msgid "%s looks like a binary file."
8424 msgid "%s looks like a binary file."
8385 msgstr ""
8425 msgstr ""
8386
8426
8387 msgid "can only specify two labels."
8427 msgid "can only specify two labels."
8388 msgstr ""
8428 msgstr ""
8389
8429
8390 msgid "warning: conflicts during merge.\n"
8430 msgid "warning: conflicts during merge.\n"
8391 msgstr ""
8431 msgstr ""
8392
8432
8393 #, python-format
8433 #, python-format
8394 msgid "couldn't parse location %s"
8434 msgid "couldn't parse location %s"
8395 msgstr ""
8435 msgstr ""
8396
8436
8397 msgid "could not create remote repo"
8437 msgid "could not create remote repo"
8398 msgstr ""
8438 msgstr ""
8399
8439
8400 msgid "remote: "
8440 msgid "remote: "
8401 msgstr ""
8441 msgstr ""
8402
8442
8403 msgid "no suitable response from remote hg"
8443 msgid "no suitable response from remote hg"
8404 msgstr ""
8444 msgstr ""
8405
8445
8406 #, python-format
8446 #, python-format
8407 msgid "push refused: %s"
8447 msgid "push refused: %s"
8408 msgstr ""
8448 msgstr ""
8409
8449
8410 msgid "unsynced changes"
8450 msgid "unsynced changes"
8411 msgstr ""
8451 msgstr ""
8412
8452
8413 msgid "cannot lock static-http repository"
8453 msgid "cannot lock static-http repository"
8414 msgstr ""
8454 msgstr ""
8415
8455
8416 msgid "cannot create new static-http repository"
8456 msgid "cannot create new static-http repository"
8417 msgstr ""
8457 msgstr ""
8418
8458
8419 #, python-format
8459 #, python-format
8420 msgid "invalid entry in fncache, line %s"
8460 msgid "invalid entry in fncache, line %s"
8421 msgstr ""
8461 msgstr ""
8422
8462
8423 msgid "scanning\n"
8463 msgid "scanning\n"
8424 msgstr ""
8464 msgstr ""
8425
8465
8426 #, python-format
8466 #, python-format
8427 msgid "%d files, %d bytes to transfer\n"
8467 msgid "%d files, %d bytes to transfer\n"
8428 msgstr ""
8468 msgstr ""
8429
8469
8430 #, python-format
8470 #, python-format
8431 msgid "sending %s (%d bytes)\n"
8471 msgid "sending %s (%d bytes)\n"
8432 msgstr ""
8472 msgstr ""
8433
8473
8434 #, python-format
8474 #, python-format
8435 msgid ""
8475 msgid ""
8436 " subrepository sources for %s differ\n"
8476 " subrepository sources for %s differ\n"
8437 "use (l)ocal source (%s) or (r)emote source (%s)?"
8477 "use (l)ocal source (%s) or (r)emote source (%s)?"
8438 msgstr ""
8478 msgstr ""
8439
8479
8440 msgid "&Remote"
8480 msgid "&Remote"
8441 msgstr ""
8481 msgstr ""
8442
8482
8443 msgid "r"
8483 msgid "r"
8444 msgstr ""
8484 msgstr ""
8445
8485
8446 #, python-format
8486 #, python-format
8447 msgid ""
8487 msgid ""
8448 " local changed subrepository %s which remote removed\n"
8488 " local changed subrepository %s which remote removed\n"
8449 "use (c)hanged version or (d)elete?"
8489 "use (c)hanged version or (d)elete?"
8450 msgstr ""
8490 msgstr ""
8451
8491
8452 #, python-format
8492 #, python-format
8453 msgid ""
8493 msgid ""
8454 " remote changed subrepository %s which local removed\n"
8494 " remote changed subrepository %s which local removed\n"
8455 "use (c)hanged version or (d)elete?"
8495 "use (c)hanged version or (d)elete?"
8456 msgstr ""
8496 msgstr ""
8457
8497
8458 #, python-format
8498 #, python-format
8459 msgid "removing subrepo %s\n"
8499 msgid "removing subrepo %s\n"
8460 msgstr ""
8500 msgstr ""
8461
8501
8462 #, python-format
8502 #, python-format
8463 msgid "pulling subrepo %s\n"
8503 msgid "pulling subrepo %s\n"
8464 msgstr ""
8504 msgstr ""
8465
8505
8466 #, python-format
8506 #, python-format
8467 msgid "pushing subrepo %s\n"
8507 msgid "pushing subrepo %s\n"
8468 msgstr ""
8508 msgstr ""
8469
8509
8470 msgid "unmatched quotes"
8510 msgid "unmatched quotes"
8471 msgstr ""
8511 msgstr ""
8472
8512
8473 #, python-format
8513 #, python-format
8474 msgid "error expanding '%s%%%s'"
8514 msgid "error expanding '%s%%%s'"
8475 msgstr ""
8515 msgstr ""
8476
8516
8477 #, python-format
8517 #, python-format
8478 msgid "unknown filter '%s'"
8518 msgid "unknown filter '%s'"
8479 msgstr ""
8519 msgstr ""
8480
8520
8481 #, python-format
8521 #, python-format
8482 msgid "style not found: %s"
8522 msgid "style not found: %s"
8483 msgstr ""
8523 msgstr ""
8484
8524
8485 #, python-format
8525 #, python-format
8486 msgid "template file %s: %s"
8526 msgid "template file %s: %s"
8487 msgstr ""
8527 msgstr ""
8488
8528
8489 msgid "cannot use transaction when it is already committed/aborted"
8529 msgid "cannot use transaction when it is already committed/aborted"
8490 msgstr ""
8530 msgstr ""
8491
8531
8492 #, python-format
8532 #, python-format
8493 msgid "failed to truncate %s\n"
8533 msgid "failed to truncate %s\n"
8494 msgstr ""
8534 msgstr ""
8495
8535
8496 msgid "transaction abort!\n"
8536 msgid "transaction abort!\n"
8497 msgstr ""
8537 msgstr ""
8498
8538
8499 msgid "rollback completed\n"
8539 msgid "rollback completed\n"
8500 msgstr ""
8540 msgstr ""
8501
8541
8502 msgid "rollback failed - please run hg recover\n"
8542 msgid "rollback failed - please run hg recover\n"
8503 msgstr ""
8543 msgstr ""
8504
8544
8505 #, python-format
8545 #, python-format
8506 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8546 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8507 msgstr ""
8547 msgstr ""
8508
8548
8509 #, python-format
8549 #, python-format
8510 msgid "Ignored: %s\n"
8550 msgid "Ignored: %s\n"
8511 msgstr ""
8551 msgstr ""
8512
8552
8513 #, python-format
8553 #, python-format
8514 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8554 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8515 msgstr ""
8555 msgstr ""
8516
8556
8517 #, python-format
8557 #, python-format
8518 msgid "%s.%s not a boolean ('%s')"
8558 msgid "%s.%s not a boolean ('%s')"
8519 msgstr ""
8559 msgstr ""
8520
8560
8521 msgid "enter a commit username:"
8561 msgid "enter a commit username:"
8522 msgstr ""
8562 msgstr ""
8523
8563
8524 #, python-format
8564 #, python-format
8525 msgid "No username found, using '%s' instead\n"
8565 msgid "No username found, using '%s' instead\n"
8526 msgstr ""
8566 msgstr ""
8527
8567
8528 msgid "Please specify a username."
8568 msgid "Please specify a username."
8529 msgstr ""
8569 msgstr ""
8530
8570
8531 #, python-format
8571 #, python-format
8532 msgid "username %s contains a newline\n"
8572 msgid "username %s contains a newline\n"
8533 msgstr ""
8573 msgstr ""
8534
8574
8535 msgid "unrecognized response\n"
8575 msgid "unrecognized response\n"
8536 msgstr ""
8576 msgstr ""
8537
8577
8538 msgid "response expected"
8578 msgid "response expected"
8539 msgstr ""
8579 msgstr ""
8540
8580
8541 msgid "password: "
8581 msgid "password: "
8542 msgstr ""
8582 msgstr ""
8543
8583
8544 msgid "edit failed"
8584 msgid "edit failed"
8545 msgstr ""
8585 msgstr ""
8546
8586
8547 msgid "http authorization required"
8587 msgid "http authorization required"
8548 msgstr ""
8588 msgstr ""
8549
8589
8550 msgid "http authorization required\n"
8590 msgid "http authorization required\n"
8551 msgstr ""
8591 msgstr ""
8552
8592
8553 #, python-format
8593 #, python-format
8554 msgid "realm: %s\n"
8594 msgid "realm: %s\n"
8555 msgstr ""
8595 msgstr ""
8556
8596
8557 #, python-format
8597 #, python-format
8558 msgid "user: %s\n"
8598 msgid "user: %s\n"
8559 msgstr ""
8599 msgstr ""
8560
8600
8561 msgid "user:"
8601 msgid "user:"
8562 msgstr ""
8602 msgstr ""
8563
8603
8564 #, python-format
8604 #, python-format
8565 msgid "http auth: user %s, password %s\n"
8605 msgid "http auth: user %s, password %s\n"
8566 msgstr ""
8606 msgstr ""
8567
8607
8568 #, python-format
8608 #, python-format
8569 msgid "proxying through http://%s:%s\n"
8609 msgid "proxying through http://%s:%s\n"
8570 msgstr ""
8610 msgstr ""
8571
8611
8572 #, python-format
8612 #, python-format
8573 msgid "command '%s' failed: %s"
8613 msgid "command '%s' failed: %s"
8574 msgstr ""
8614 msgstr ""
8575
8615
8576 #, python-format
8616 #, python-format
8577 msgid "path contains illegal component: %s"
8617 msgid "path contains illegal component: %s"
8578 msgstr ""
8618 msgstr ""
8579
8619
8580 #, python-format
8620 #, python-format
8581 msgid "path %r is inside repo %r"
8621 msgid "path %r is inside repo %r"
8582 msgstr ""
8622 msgstr ""
8583
8623
8584 #, python-format
8624 #, python-format
8585 msgid "path %r traverses symbolic link %r"
8625 msgid "path %r traverses symbolic link %r"
8586 msgstr ""
8626 msgstr ""
8587
8627
8588 msgid "Hardlinks not supported"
8628 msgid "Hardlinks not supported"
8589 msgstr ""
8629 msgstr ""
8590
8630
8591 #, python-format
8631 #, python-format
8592 msgid "could not symlink to %r: %s"
8632 msgid "could not symlink to %r: %s"
8593 msgstr ""
8633 msgstr ""
8594
8634
8595 #, python-format
8635 #, python-format
8596 msgid "invalid date: %r "
8636 msgid "invalid date: %r "
8597 msgstr ""
8637 msgstr ""
8598
8638
8599 #, python-format
8639 #, python-format
8600 msgid "date exceeds 32 bits: %d"
8640 msgid "date exceeds 32 bits: %d"
8601 msgstr ""
8641 msgstr ""
8602
8642
8603 #, python-format
8643 #, python-format
8604 msgid "impossible time zone offset: %d"
8644 msgid "impossible time zone offset: %d"
8605 msgstr ""
8645 msgstr ""
8606
8646
8607 #, python-format
8647 #, python-format
8608 msgid "invalid day spec: %s"
8648 msgid "invalid day spec: %s"
8609 msgstr ""
8649 msgstr ""
8610
8650
8611 #, python-format
8651 #, python-format
8612 msgid "%.0f GB"
8652 msgid "%.0f GB"
8613 msgstr ""
8653 msgstr ""
8614
8654
8615 #, python-format
8655 #, python-format
8616 msgid "%.1f GB"
8656 msgid "%.1f GB"
8617 msgstr ""
8657 msgstr ""
8618
8658
8619 #, python-format
8659 #, python-format
8620 msgid "%.2f GB"
8660 msgid "%.2f GB"
8621 msgstr ""
8661 msgstr ""
8622
8662
8623 #, python-format
8663 #, python-format
8624 msgid "%.0f MB"
8664 msgid "%.0f MB"
8625 msgstr ""
8665 msgstr ""
8626
8666
8627 #, python-format
8667 #, python-format
8628 msgid "%.1f MB"
8668 msgid "%.1f MB"
8629 msgstr ""
8669 msgstr ""
8630
8670
8631 #, python-format
8671 #, python-format
8632 msgid "%.2f MB"
8672 msgid "%.2f MB"
8633 msgstr ""
8673 msgstr ""
8634
8674
8635 #, python-format
8675 #, python-format
8636 msgid "%.0f KB"
8676 msgid "%.0f KB"
8637 msgstr ""
8677 msgstr ""
8638
8678
8639 #, python-format
8679 #, python-format
8640 msgid "%.1f KB"
8680 msgid "%.1f KB"
8641 msgstr ""
8681 msgstr ""
8642
8682
8643 #, python-format
8683 #, python-format
8644 msgid "%.2f KB"
8684 msgid "%.2f KB"
8645 msgstr ""
8685 msgstr ""
8646
8686
8647 #, python-format
8687 #, python-format
8648 msgid "%.0f bytes"
8688 msgid "%.0f bytes"
8649 msgstr ""
8689 msgstr ""
8650
8690
8651 msgid "cannot verify bundle or remote repos"
8691 msgid "cannot verify bundle or remote repos"
8652 msgstr ""
8692 msgstr ""
8653
8693
8654 msgid "interrupted"
8694 msgid "interrupted"
8655 msgstr ""
8695 msgstr ""
8656
8696
8657 #, python-format
8697 #, python-format
8658 msgid "empty or missing %s"
8698 msgid "empty or missing %s"
8659 msgstr ""
8699 msgstr ""
8660
8700
8661 #, python-format
8701 #, python-format
8662 msgid "data length off by %d bytes"
8702 msgid "data length off by %d bytes"
8663 msgstr ""
8703 msgstr ""
8664
8704
8665 #, python-format
8705 #, python-format
8666 msgid "index contains %d extra bytes"
8706 msgid "index contains %d extra bytes"
8667 msgstr ""
8707 msgstr ""
8668
8708
8669 #, python-format
8709 #, python-format
8670 msgid "warning: `%s' uses revlog format 1"
8710 msgid "warning: `%s' uses revlog format 1"
8671 msgstr ""
8711 msgstr ""
8672
8712
8673 #, python-format
8713 #, python-format
8674 msgid "warning: `%s' uses revlog format 0"
8714 msgid "warning: `%s' uses revlog format 0"
8675 msgstr ""
8715 msgstr ""
8676
8716
8677 #, python-format
8717 #, python-format
8678 msgid "rev %d points to nonexistent changeset %d"
8718 msgid "rev %d points to nonexistent changeset %d"
8679 msgstr ""
8719 msgstr ""
8680
8720
8681 #, python-format
8721 #, python-format
8682 msgid "rev %d points to unexpected changeset %d"
8722 msgid "rev %d points to unexpected changeset %d"
8683 msgstr ""
8723 msgstr ""
8684
8724
8685 #, python-format
8725 #, python-format
8686 msgid " (expected %s)"
8726 msgid " (expected %s)"
8687 msgstr ""
8727 msgstr ""
8688
8728
8689 #, python-format
8729 #, python-format
8690 msgid "unknown parent 1 %s of %s"
8730 msgid "unknown parent 1 %s of %s"
8691 msgstr ""
8731 msgstr ""
8692
8732
8693 #, python-format
8733 #, python-format
8694 msgid "unknown parent 2 %s of %s"
8734 msgid "unknown parent 2 %s of %s"
8695 msgstr ""
8735 msgstr ""
8696
8736
8697 #, python-format
8737 #, python-format
8698 msgid "checking parents of %s"
8738 msgid "checking parents of %s"
8699 msgstr ""
8739 msgstr ""
8700
8740
8701 #, python-format
8741 #, python-format
8702 msgid "duplicate revision %d (%d)"
8742 msgid "duplicate revision %d (%d)"
8703 msgstr ""
8743 msgstr ""
8704
8744
8705 #, python-format
8745 #, python-format
8706 msgid "repository uses revlog format %d\n"
8746 msgid "repository uses revlog format %d\n"
8707 msgstr ""
8747 msgstr ""
8708
8748
8709 msgid "checking changesets\n"
8749 msgid "checking changesets\n"
8710 msgstr ""
8750 msgstr ""
8711
8751
8712 #, python-format
8752 #, python-format
8713 msgid "unpacking changeset %s"
8753 msgid "unpacking changeset %s"
8714 msgstr ""
8754 msgstr ""
8715
8755
8716 msgid "checking manifests\n"
8756 msgid "checking manifests\n"
8717 msgstr ""
8757 msgstr ""
8718
8758
8719 #, python-format
8759 #, python-format
8720 msgid "%s not in changesets"
8760 msgid "%s not in changesets"
8721 msgstr ""
8761 msgstr ""
8722
8762
8723 msgid "file without name in manifest"
8763 msgid "file without name in manifest"
8724 msgstr ""
8764 msgstr ""
8725
8765
8726 #, python-format
8766 #, python-format
8727 msgid "reading manifest delta %s"
8767 msgid "reading manifest delta %s"
8728 msgstr ""
8768 msgstr ""
8729
8769
8730 msgid "crosschecking files in changesets and manifests\n"
8770 msgid "crosschecking files in changesets and manifests\n"
8731 msgstr ""
8771 msgstr ""
8732
8772
8733 #, python-format
8773 #, python-format
8734 msgid "changeset refers to unknown manifest %s"
8774 msgid "changeset refers to unknown manifest %s"
8735 msgstr ""
8775 msgstr ""
8736
8776
8737 msgid "in changeset but not in manifest"
8777 msgid "in changeset but not in manifest"
8738 msgstr ""
8778 msgstr ""
8739
8779
8740 msgid "in manifest but not in changeset"
8780 msgid "in manifest but not in changeset"
8741 msgstr ""
8781 msgstr ""
8742
8782
8743 msgid "checking files\n"
8783 msgid "checking files\n"
8744 msgstr ""
8784 msgstr ""
8745
8785
8746 #, python-format
8786 #, python-format
8747 msgid "cannot decode filename '%s'"
8787 msgid "cannot decode filename '%s'"
8748 msgstr ""
8788 msgstr ""
8749
8789
8750 #, python-format
8790 #, python-format
8751 msgid "broken revlog! (%s)"
8791 msgid "broken revlog! (%s)"
8752 msgstr ""
8792 msgstr ""
8753
8793
8754 msgid "missing revlog!"
8794 msgid "missing revlog!"
8755 msgstr ""
8795 msgstr ""
8756
8796
8757 #, python-format
8797 #, python-format
8758 msgid "%s not in manifests"
8798 msgid "%s not in manifests"
8759 msgstr ""
8799 msgstr ""
8760
8800
8761 #, python-format
8801 #, python-format
8762 msgid "unpacked size is %s, %s expected"
8802 msgid "unpacked size is %s, %s expected"
8763 msgstr ""
8803 msgstr ""
8764
8804
8765 #, python-format
8805 #, python-format
8766 msgid "unpacking %s"
8806 msgid "unpacking %s"
8767 msgstr ""
8807 msgstr ""
8768
8808
8769 #, python-format
8809 #, python-format
8770 msgid "empty or missing copy source revlog %s:%s"
8810 msgid "empty or missing copy source revlog %s:%s"
8771 msgstr ""
8811 msgstr ""
8772
8812
8773 #, python-format
8813 #, python-format
8774 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8814 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8775 msgstr ""
8815 msgstr ""
8776
8816
8777 #, python-format
8817 #, python-format
8778 msgid "checking rename of %s"
8818 msgid "checking rename of %s"
8779 msgstr ""
8819 msgstr ""
8780
8820
8781 #, python-format
8821 #, python-format
8782 msgid "%s in manifests not found"
8822 msgid "%s in manifests not found"
8783 msgstr ""
8823 msgstr ""
8784
8824
8785 #, python-format
8825 #, python-format
8786 msgid "warning: orphan revlog '%s'"
8826 msgid "warning: orphan revlog '%s'"
8787 msgstr ""
8827 msgstr ""
8788
8828
8789 #, python-format
8829 #, python-format
8790 msgid "%d files, %d changesets, %d total revisions\n"
8830 msgid "%d files, %d changesets, %d total revisions\n"
8791 msgstr ""
8831 msgstr ""
8792
8832
8793 #, python-format
8833 #, python-format
8794 msgid "%d warnings encountered!\n"
8834 msgid "%d warnings encountered!\n"
8795 msgstr ""
8835 msgstr ""
8796
8836
8797 #, python-format
8837 #, python-format
8798 msgid "%d integrity errors encountered!\n"
8838 msgid "%d integrity errors encountered!\n"
8799 msgstr ""
8839 msgstr ""
8800
8840
8801 #, python-format
8841 #, python-format
8802 msgid "(first damaged changeset appears to be %d)\n"
8842 msgid "(first damaged changeset appears to be %d)\n"
8803 msgstr ""
8843 msgstr ""
8804
8844
8805 msgid "user name not available - set USERNAME environment variable"
8845 msgid "user name not available - set USERNAME environment variable"
8806 msgstr ""
8846 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now