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

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

i18n-fr: translation of the purge extension
Cédric Duval -
r9004:a071bf50 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,8887 +1,8915 b''
1 # French translations for Mercurial
1 # French translations for Mercurial
2 # Traductions françaises de Mercurial
2 # Traductions françaises de Mercurial
3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
3 # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
4 #
4 #
5 # Quelques règles :
5 # Quelques règles :
6 # - dans l'aide d'une commande, la première ligne descriptive
6 # - dans l'aide d'une commande, la première ligne descriptive
7 # commence par un verbe au présent sans majuscule
7 # commence par un verbe au présent sans majuscule
8 # - dans l'aide d'une commande, la description des options
8 # - dans l'aide d'une commande, la description des options
9 # utilise un verbe à l'infinitif
9 # utilise un verbe à l'infinitif
10 #
10 #
11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
11 # Note : la terminologie ci-dessous est loin d'être complète, figée ou
12 # parfaite. À compléter et à améliorer, particulièrement les
12 # parfaite. À compléter et à améliorer, particulièrement les
13 # termes comportant un point d'interrogation...
13 # termes comportant un point d'interrogation...
14 #
14 #
15 # Dictionnaire de termes courants :
15 # Dictionnaire de termes courants :
16 # - to apply a patch appliquer un patch
16 # - to apply a patch appliquer un patch
17 # - a branch une branche
17 # - a branch une branche
18 # - to check out extraire (terminologie utilisée par svn)
18 # - to check out extraire (terminologie utilisée par svn)
19 # - children des rejetons ? des descendants ?
19 # - children des rejetons ? des descendants ?
20 # - to clone clôner
20 # - to clone clôner
21 # - a conflict un conflit
21 # - a conflict un conflit
22 # - an extension une extension (au sens de module Mercurial)
22 # - an extension une extension (au sens de module Mercurial)
23 # - to fold patches agréger des patchs (replier des patch ?? bof)
23 # - to fold patches agréger des patchs (replier des patch ?? bof)
24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
24 # - an integrity check une vérification d'intégrité (ou de cohérence ?)
25 # - a mail un courriel, un courrier électronique
25 # - a mail un courriel, un courrier électronique
26 # - a merge une fusion
26 # - a merge une fusion
27 # - to merge fusionner
27 # - to merge fusionner
28 # - a node un nœud ?
28 # - a node un nœud ?
29 # - a patch queue/stack une pile de patchs (mq)
29 # - a patch queue/stack une pile de patchs (mq)
30 # - à l'utilisation c'est vraiment une _pile_
30 # - à l'utilisation c'est vraiment une _pile_
31 # (on y empile et dépile des patchs)
31 # (on y empile et dépile des patchs)
32 # - l'unique cas où _file_ conviendrait est dans le
32 # - l'unique cas où _file_ conviendrait est dans le
33 # contexte de la commande qfinish
33 # contexte de la commande qfinish
34 # => terme unique de pile pour plus de cohérence
34 # => terme unique de pile pour plus de cohérence
35 # - the patch series la série (complète) de patchs (suite ?)
35 # - the patch series la série (complète) de patchs (suite ?)
36 # - rejects des rejets ? (à propos de l'application d'un
36 # - rejects des rejets ? (à propos de l'application d'un
37 # patch)
37 # patch)
38 # - a repository un dépôt
38 # - a repository un dépôt
39 # - to revert annuler des modifications (ou défaire ?)
39 # - to revert annuler des modifications (ou défaire ?)
40 # - a revision une révision
40 # - a revision une révision
41 # - the topmost patch le dernier patch appliqué
41 # - the topmost patch le dernier patch appliqué
42 # - a tree une arborescence
42 # - a tree une arborescence
43 # - an unrelated repository un dépôt non apparenté
43 # - an unrelated repository un dépôt non apparenté
44 # - unversioned
44 # - unversioned
45 # unmanaged
45 # unmanaged
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
46 # untracked non suivi, non géré, pas sous contrôle du dépôt,
47 # hors révision ?
47 # hors révision ?
48 # - the working directory le répertoire de travail
48 # - the working directory le répertoire de travail
49 #
49 #
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
50 # Termes très courants repris de l'anglais - à utiliser sans guillemets
51 # pour ne pas alourdir inutilement la traduction :
51 # pour ne pas alourdir inutilement la traduction :
52 # - a diff un diff ? (ou également un patch ? synonymes...)
52 # - a diff un diff ? (ou également un patch ? synonymes...)
53 # - a hook un hook
53 # - a hook un hook
54 # - a patch un patch
54 # - a patch un patch
55 # - a tag un tag
55 # - a tag un tag
56 # - to tag taguer
56 # - to tag taguer
57 #
57 #
58 # Termes anglais avec une signification très spécifique, difficile à
58 # Termes anglais avec une signification très spécifique, difficile à
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
59 # paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets :
60 # - a bundle un \"bundle\"
60 # - a bundle un \"bundle\"
61 # - to bundle créer un \"bundle\" ?
61 # - to bundle créer un \"bundle\" ?
62 # - a changeset un \"changeset\"
62 # - a changeset un \"changeset\"
63 # - a changegroup un \"changegroup\"
63 # - a changegroup un \"changegroup\"
64 # - the tip la révision \"tip\"
64 # - the tip la révision \"tip\"
65 #
65 #
66 # Termes dont le classement / la traduction sont à déterminer :
66 # Termes dont le classement / la traduction sont à déterminer :
67 # - a commit un commit, un \"commit\"
67 # - a commit un commit, un \"commit\"
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
68 # - to commit \"committer\" ? (beuark, même dit tous les jours)
69 # - a guard une \"garde\" ? (une protection ?)
69 # - a guard une \"garde\" ? (une protection ?)
70 # - to guard a patch \"garder\" un patch ?
70 # - to guard a patch \"garder\" un patch ?
71 # - to pull rapatrier des \"changesets\" ? effectuer une
71 # - to pull rapatrier des \"changesets\" ? effectuer une
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
72 # opération de \"pull\" ? \"puller\" ?? (argh !)
73 # - to push propager ? (utilisé par svn pour commit)
73 # - to push propager ? (utilisé par svn pour commit)
74 # publier ? pousser ?? envoyer ??
74 # publier ? pousser ?? envoyer ??
75 # - the series file (mq) ?
75 # - the series file (mq) ?
76 #
76 #
77 # Notes :
77 # Notes :
78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
78 # - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide
79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
79 # (par exemple 'hg help glossary') librement remplissable par chaque équipe
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
80 # de traduction, qui introduirait succintement à l'utilisateur les termes
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
81 # qui vont être rencontrés dans mercurial - et en particulier permettrait
82 # de faire le lien avec des termes franglisants parfois utilisés
82 # de faire le lien avec des termes franglisants parfois utilisés
83 # (par ex. fusionner = "merger", etc.) ... ?
83 # (par ex. fusionner = "merger", etc.) ... ?
84 #
84 #
85 msgid ""
85 msgid ""
86 msgstr ""
86 msgstr ""
87 "Project-Id-Version: Mercurial\n"
87 "Project-Id-Version: Mercurial\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
88 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
89 "POT-Creation-Date: 2009-07-01 06:55+0200\n"
89 "POT-Creation-Date: 2009-07-01 06:55+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
90 "PO-Revision-Date: 2009-05-14 13:06+0200\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
91 "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
92 "Language-Team: French\n"
92 "Language-Team: French\n"
93 "MIME-Version: 1.0\n"
93 "MIME-Version: 1.0\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
95 "Content-Transfer-Encoding: 8bit\n"
95 "Content-Transfer-Encoding: 8bit\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
96 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
97
97
98 #, python-format
98 #, python-format
99 msgid " (default: %s)"
99 msgid " (default: %s)"
100 msgstr " (défaut: %s)"
100 msgstr " (défaut: %s)"
101
101
102 msgid "OPTIONS"
102 msgid "OPTIONS"
103 msgstr ""
103 msgstr ""
104
104
105 msgid "COMMANDS"
105 msgid "COMMANDS"
106 msgstr ""
106 msgstr ""
107
107
108 msgid " options:\n"
108 msgid " options:\n"
109 msgstr ""
109 msgstr ""
110
110
111 #, python-format
111 #, python-format
112 msgid ""
112 msgid ""
113 " aliases: %s\n"
113 " aliases: %s\n"
114 "\n"
114 "\n"
115 msgstr ""
115 msgstr ""
116
116
117 msgid ""
117 msgid ""
118 "hooks for controlling repository access\n"
118 "hooks for controlling repository access\n"
119 "\n"
119 "\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
120 "This hook makes it possible to allow or deny write access to portions\n"
121 "of a repository when receiving incoming changesets.\n"
121 "of a repository when receiving incoming changesets.\n"
122 "\n"
122 "\n"
123 "The authorization is matched based on the local user name on the\n"
123 "The authorization is matched based on the local user name on the\n"
124 "system where the hook runs, and not the committer of the original\n"
124 "system where the hook runs, and not the committer of the original\n"
125 "changeset (since the latter is merely informative).\n"
125 "changeset (since the latter is merely informative).\n"
126 "\n"
126 "\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
127 "The acl hook is best used along with a restricted shell like hgsh,\n"
128 "preventing authenticating users from doing anything other than\n"
128 "preventing authenticating users from doing anything other than\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
129 "pushing or pulling. The hook is not safe to use if users have\n"
130 "interactive shell access, as they can then disable the hook.\n"
130 "interactive shell access, as they can then disable the hook.\n"
131 "Nor is it safe if remote users share an account, because then there\n"
131 "Nor is it safe if remote users share an account, because then there\n"
132 "is no way to distinguish them.\n"
132 "is no way to distinguish them.\n"
133 "\n"
133 "\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
134 "To use this hook, configure the acl extension in your hgrc like this:\n"
135 "\n"
135 "\n"
136 " [extensions]\n"
136 " [extensions]\n"
137 " hgext.acl =\n"
137 " hgext.acl =\n"
138 "\n"
138 "\n"
139 " [hooks]\n"
139 " [hooks]\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
140 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
141 "\n"
141 "\n"
142 " [acl]\n"
142 " [acl]\n"
143 " # Check whether the source of incoming changes is in this list\n"
143 " # Check whether the source of incoming changes is in this list\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
144 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
145 " sources = serve\n"
145 " sources = serve\n"
146 "\n"
146 "\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
147 "The allow and deny sections take a subtree pattern as key (with a\n"
148 "glob syntax by default), and a comma separated list of users as\n"
148 "glob syntax by default), and a comma separated list of users as\n"
149 "the corresponding value. The deny list is checked before the allow\n"
149 "the corresponding value. The deny list is checked before the allow\n"
150 "list is.\n"
150 "list is.\n"
151 "\n"
151 "\n"
152 " [acl.allow]\n"
152 " [acl.allow]\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
153 " # If acl.allow is not present, all users are allowed by default.\n"
154 " # An empty acl.allow section means no users allowed.\n"
154 " # An empty acl.allow section means no users allowed.\n"
155 " docs/** = doc_writer\n"
155 " docs/** = doc_writer\n"
156 " .hgtags = release_engineer\n"
156 " .hgtags = release_engineer\n"
157 "\n"
157 "\n"
158 " [acl.deny]\n"
158 " [acl.deny]\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
159 " # If acl.deny is not present, no users are refused by default.\n"
160 " # An empty acl.deny section means all users allowed.\n"
160 " # An empty acl.deny section means all users allowed.\n"
161 " glob pattern = user4, user5\n"
161 " glob pattern = user4, user5\n"
162 " ** = user6\n"
162 " ** = user6\n"
163 msgstr ""
163 msgstr ""
164
164
165 #, python-format
165 #, python-format
166 msgid "acl: %s not enabled\n"
166 msgid "acl: %s not enabled\n"
167 msgstr ""
167 msgstr ""
168
168
169 #, python-format
169 #, python-format
170 msgid "acl: %s enabled, %d entries for user %s\n"
170 msgid "acl: %s enabled, %d entries for user %s\n"
171 msgstr ""
171 msgstr ""
172
172
173 #, python-format
173 #, python-format
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
174 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
175 msgstr ""
175 msgstr ""
176
176
177 #, python-format
177 #, python-format
178 msgid "acl: changes have source \"%s\" - skipping\n"
178 msgid "acl: changes have source \"%s\" - skipping\n"
179 msgstr ""
179 msgstr ""
180
180
181 #, python-format
181 #, python-format
182 msgid "acl: user %s denied on %s\n"
182 msgid "acl: user %s denied on %s\n"
183 msgstr ""
183 msgstr ""
184
184
185 #, python-format
185 #, python-format
186 msgid "acl: access denied for changeset %s"
186 msgid "acl: access denied for changeset %s"
187 msgstr ""
187 msgstr ""
188
188
189 #, python-format
189 #, python-format
190 msgid "acl: user %s not allowed on %s\n"
190 msgid "acl: user %s not allowed on %s\n"
191 msgstr ""
191 msgstr ""
192
192
193 #, python-format
193 #, python-format
194 msgid "acl: allowing changeset %s\n"
194 msgid "acl: allowing changeset %s\n"
195 msgstr ""
195 msgstr ""
196
196
197 msgid ""
197 msgid ""
198 "track a line of development with movable markers\n"
198 "track a line of development with movable markers\n"
199 "\n"
199 "\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
200 "Bookmarks are local movable markers to changesets. Every bookmark\n"
201 "points to a changeset identified by its hash. If you commit a\n"
201 "points to a changeset identified by its hash. If you commit a\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
202 "changeset that is based on a changeset that has a bookmark on it,\n"
203 "the bookmark shifts to the new changeset.\n"
203 "the bookmark shifts to the new changeset.\n"
204 "\n"
204 "\n"
205 "It is possible to use bookmark names in every revision lookup\n"
205 "It is possible to use bookmark names in every revision lookup\n"
206 "(e.g. hg merge, hg update).\n"
206 "(e.g. hg merge, hg update).\n"
207 "\n"
207 "\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
208 "By default, when several bookmarks point to the same changeset, they\n"
209 "will all move forward together. It is possible to obtain a more\n"
209 "will all move forward together. It is possible to obtain a more\n"
210 "git-like experience by adding the following configuration option to\n"
210 "git-like experience by adding the following configuration option to\n"
211 "your .hgrc:\n"
211 "your .hgrc:\n"
212 "\n"
212 "\n"
213 " [bookmarks]\n"
213 " [bookmarks]\n"
214 " track.current = True\n"
214 " track.current = True\n"
215 "\n"
215 "\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
216 "This will cause Mercurial to track the bookmark that you are currently\n"
217 "using, and only update it. This is similar to git's approach to\n"
217 "using, and only update it. This is similar to git's approach to\n"
218 "branching.\n"
218 "branching.\n"
219 msgstr ""
219 msgstr ""
220
220
221 msgid ""
221 msgid ""
222 "track a line of development with movable markers\n"
222 "track a line of development with movable markers\n"
223 "\n"
223 "\n"
224 " Bookmarks are pointers to certain commits that move when\n"
224 " Bookmarks are pointers to certain commits that move when\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
225 " committing. Bookmarks are local. They can be renamed, copied and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
226 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
227 " 'hg update' to merge and update respectively to a given bookmark.\n"
228 "\n"
228 "\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
229 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
230 " directory's parent revision with the given name. If you specify\n"
230 " directory's parent revision with the given name. If you specify\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
231 " a revision using -r REV (where REV may be an existing bookmark),\n"
232 " the bookmark is assigned to that revision.\n"
232 " the bookmark is assigned to that revision.\n"
233 " "
233 " "
234 msgstr ""
234 msgstr ""
235
235
236 msgid "a bookmark of this name does not exist"
236 msgid "a bookmark of this name does not exist"
237 msgstr ""
237 msgstr ""
238
238
239 msgid "a bookmark of the same name already exists"
239 msgid "a bookmark of the same name already exists"
240 msgstr ""
240 msgstr ""
241
241
242 msgid "new bookmark name required"
242 msgid "new bookmark name required"
243 msgstr ""
243 msgstr ""
244
244
245 msgid "bookmark name required"
245 msgid "bookmark name required"
246 msgstr ""
246 msgstr ""
247
247
248 msgid "bookmark name cannot contain newlines"
248 msgid "bookmark name cannot contain newlines"
249 msgstr ""
249 msgstr ""
250
250
251 msgid "a bookmark cannot have the name of an existing branch"
251 msgid "a bookmark cannot have the name of an existing branch"
252 msgstr ""
252 msgstr ""
253
253
254 msgid "force"
254 msgid "force"
255 msgstr ""
255 msgstr ""
256
256
257 msgid "revision"
257 msgid "revision"
258 msgstr ""
258 msgstr ""
259
259
260 msgid "delete a given bookmark"
260 msgid "delete a given bookmark"
261 msgstr ""
261 msgstr ""
262
262
263 msgid "rename a given bookmark"
263 msgid "rename a given bookmark"
264 msgstr ""
264 msgstr ""
265
265
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
266 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
267 msgstr ""
267 msgstr ""
268
268
269 msgid ""
269 msgid ""
270 "hooks for integrating with the Bugzilla bug tracker\n"
270 "hooks for integrating with the Bugzilla bug tracker\n"
271 "\n"
271 "\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
272 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
273 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
274 "bug status.\n"
274 "bug status.\n"
275 "\n"
275 "\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
276 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
277 "installations using MySQL are supported.\n"
277 "installations using MySQL are supported.\n"
278 "\n"
278 "\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
279 "The hook relies on a Bugzilla script to send bug change notification\n"
280 "emails. That script changes between Bugzilla versions; the\n"
280 "emails. That script changes between Bugzilla versions; the\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
281 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
282 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
283 "be run by Mercurial as the user pushing the change; you will need to\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
284 "ensure the Bugzilla install file permissions are set appropriately.\n"
285 "\n"
285 "\n"
286 "Configuring the extension:\n"
286 "Configuring the extension:\n"
287 "\n"
287 "\n"
288 " [bugzilla]\n"
288 " [bugzilla]\n"
289 "\n"
289 "\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
290 " host Hostname of the MySQL server holding the Bugzilla\n"
291 " database.\n"
291 " database.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
292 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
293 " user Username to use to access MySQL server. Default 'bugs'.\n"
294 " password Password to use to access MySQL server.\n"
294 " password Password to use to access MySQL server.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
295 " timeout Database connection timeout (seconds). Default 5.\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
296 " version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
297 " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
298 " and '2.16' for versions prior to 2.18.\n"
298 " and '2.16' for versions prior to 2.18.\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
299 " bzuser Fallback Bugzilla user name to record comments with, if\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
300 " changeset committer cannot be found as a Bugzilla user.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
301 " bzdir Bugzilla install directory. Used by default notify.\n"
302 " Default '/var/www/html/bugzilla'.\n"
302 " Default '/var/www/html/bugzilla'.\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
303 " notify The command to run to get Bugzilla to send bug change\n"
304 " notification emails. Substitutes from a map with 3\n"
304 " notification emails. Substitutes from a map with 3\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
305 " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
306 " bugzilla email). Default depends on version; from 2.18\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
307 " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
308 " %(id)s %(user)s\".\n"
308 " %(id)s %(user)s\".\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
309 " regexp Regular expression to match bug IDs in changeset commit\n"
310 " message. Must contain one \"()\" group. The default\n"
310 " message. Must contain one \"()\" group. The default\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
311 " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
312 " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
313 " variations thereof. Matching is case insensitive.\n"
313 " variations thereof. Matching is case insensitive.\n"
314 " style The style file to use when formatting comments.\n"
314 " style The style file to use when formatting comments.\n"
315 " template Template to use when formatting comments. Overrides\n"
315 " template Template to use when formatting comments. Overrides\n"
316 " style if specified. In addition to the usual Mercurial\n"
316 " style if specified. In addition to the usual Mercurial\n"
317 " keywords, the extension specifies:\n"
317 " keywords, the extension specifies:\n"
318 " {bug} The Bugzilla bug ID.\n"
318 " {bug} The Bugzilla bug ID.\n"
319 " {root} The full pathname of the Mercurial\n"
319 " {root} The full pathname of the Mercurial\n"
320 " repository.\n"
320 " repository.\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
321 " {webroot} Stripped pathname of the Mercurial\n"
322 " repository.\n"
322 " repository.\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
323 " {hgweb} Base URL for browsing Mercurial\n"
324 " repositories.\n"
324 " repositories.\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
325 " Default 'changeset {node|short} in repo {root} refers '\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
326 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
327 " strip The number of slashes to strip from the front of {root}\n"
327 " strip The number of slashes to strip from the front of {root}\n"
328 " to produce {webroot}. Default 0.\n"
328 " to produce {webroot}. Default 0.\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
329 " usermap Path of file containing Mercurial committer ID to\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
330 " Bugzilla user ID mappings. If specified, the file\n"
331 " should contain one mapping per line,\n"
331 " should contain one mapping per line,\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
332 " \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
333 " section.\n"
333 " section.\n"
334 "\n"
334 "\n"
335 " [usermap]\n"
335 " [usermap]\n"
336 " Any entries in this section specify mappings of Mercurial\n"
336 " Any entries in this section specify mappings of Mercurial\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
337 " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
338 " \"committer\"=\"Bugzilla user\"\n"
338 " \"committer\"=\"Bugzilla user\"\n"
339 "\n"
339 "\n"
340 " [web]\n"
340 " [web]\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
341 " baseurl Base URL for browsing Mercurial repositories. Reference\n"
342 " from templates as {hgweb}.\n"
342 " from templates as {hgweb}.\n"
343 "\n"
343 "\n"
344 "Activating the extension:\n"
344 "Activating the extension:\n"
345 "\n"
345 "\n"
346 " [extensions]\n"
346 " [extensions]\n"
347 " hgext.bugzilla =\n"
347 " hgext.bugzilla =\n"
348 "\n"
348 "\n"
349 " [hooks]\n"
349 " [hooks]\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
350 " # run bugzilla hook on every change pulled or pushed in here\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
352 "\n"
352 "\n"
353 "Example configuration:\n"
353 "Example configuration:\n"
354 "\n"
354 "\n"
355 "This example configuration is for a collection of Mercurial\n"
355 "This example configuration is for a collection of Mercurial\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
356 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
357 "installation in /opt/bugzilla-3.2.\n"
357 "installation in /opt/bugzilla-3.2.\n"
358 "\n"
358 "\n"
359 " [bugzilla]\n"
359 " [bugzilla]\n"
360 " host=localhost\n"
360 " host=localhost\n"
361 " password=XYZZY\n"
361 " password=XYZZY\n"
362 " version=3.0\n"
362 " version=3.0\n"
363 " bzuser=unknown@domain.com\n"
363 " bzuser=unknown@domain.com\n"
364 " bzdir=/opt/bugzilla-3.2\n"
364 " bzdir=/opt/bugzilla-3.2\n"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
365 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
366 "rev/{node|short}\\n\\n{desc}\\n\n"
367 " strip=5\n"
367 " strip=5\n"
368 "\n"
368 "\n"
369 " [web]\n"
369 " [web]\n"
370 " baseurl=http://dev.domain.com/hg\n"
370 " baseurl=http://dev.domain.com/hg\n"
371 "\n"
371 "\n"
372 " [usermap]\n"
372 " [usermap]\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
373 " user@emaildomain.com=user.name@bugzilladomain.com\n"
374 "\n"
374 "\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
375 "Commits add a comment to the Bugzilla bug record of the form:\n"
376 "\n"
376 "\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
377 " Changeset 3b16791d6642 in repository-name.\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
378 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
379 "\n"
379 "\n"
380 " Changeset commit comment. Bug 1234.\n"
380 " Changeset commit comment. Bug 1234.\n"
381 msgstr ""
381 msgstr ""
382
382
383 #, python-format
383 #, python-format
384 msgid "connecting to %s:%s as %s, password %s\n"
384 msgid "connecting to %s:%s as %s, password %s\n"
385 msgstr ""
385 msgstr ""
386
386
387 #, python-format
387 #, python-format
388 msgid "query: %s %s\n"
388 msgid "query: %s %s\n"
389 msgstr ""
389 msgstr ""
390
390
391 #, python-format
391 #, python-format
392 msgid "failed query: %s %s\n"
392 msgid "failed query: %s %s\n"
393 msgstr ""
393 msgstr ""
394
394
395 msgid "unknown database schema"
395 msgid "unknown database schema"
396 msgstr ""
396 msgstr ""
397
397
398 #, python-format
398 #, python-format
399 msgid "bug %d already knows about changeset %s\n"
399 msgid "bug %d already knows about changeset %s\n"
400 msgstr ""
400 msgstr ""
401
401
402 msgid "telling bugzilla to send mail:\n"
402 msgid "telling bugzilla to send mail:\n"
403 msgstr ""
403 msgstr ""
404
404
405 #, python-format
405 #, python-format
406 msgid " bug %s\n"
406 msgid " bug %s\n"
407 msgstr ""
407 msgstr ""
408
408
409 #, python-format
409 #, python-format
410 msgid "running notify command %s\n"
410 msgid "running notify command %s\n"
411 msgstr ""
411 msgstr ""
412
412
413 #, python-format
413 #, python-format
414 msgid "bugzilla notify command %s"
414 msgid "bugzilla notify command %s"
415 msgstr ""
415 msgstr ""
416
416
417 msgid "done\n"
417 msgid "done\n"
418 msgstr ""
418 msgstr ""
419
419
420 #, python-format
420 #, python-format
421 msgid "looking up user %s\n"
421 msgid "looking up user %s\n"
422 msgstr ""
422 msgstr ""
423
423
424 #, python-format
424 #, python-format
425 msgid "cannot find bugzilla user id for %s"
425 msgid "cannot find bugzilla user id for %s"
426 msgstr ""
426 msgstr ""
427
427
428 #, python-format
428 #, python-format
429 msgid "cannot find bugzilla user id for %s or %s"
429 msgid "cannot find bugzilla user id for %s or %s"
430 msgstr ""
430 msgstr ""
431
431
432 #, python-format
432 #, python-format
433 msgid "bugzilla version %s not supported"
433 msgid "bugzilla version %s not supported"
434 msgstr ""
434 msgstr ""
435
435
436 msgid ""
436 msgid ""
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
437 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
438 "details:\n"
438 "details:\n"
439 "\t{desc|tabindent}"
439 "\t{desc|tabindent}"
440 msgstr ""
440 msgstr ""
441
441
442 #, python-format
442 #, python-format
443 msgid "python mysql support not available: %s"
443 msgid "python mysql support not available: %s"
444 msgstr ""
444 msgstr ""
445
445
446 #, python-format
446 #, python-format
447 msgid "hook type %s does not pass a changeset id"
447 msgid "hook type %s does not pass a changeset id"
448 msgstr ""
448 msgstr ""
449
449
450 #, python-format
450 #, python-format
451 msgid "database error: %s"
451 msgid "database error: %s"
452 msgstr ""
452 msgstr ""
453
453
454 msgid "command to display child changesets"
454 msgid "command to display child changesets"
455 msgstr ""
455 msgstr ""
456
456
457 msgid ""
457 msgid ""
458 "show the children of the given or working directory revision\n"
458 "show the children of the given or working directory revision\n"
459 "\n"
459 "\n"
460 " Print the children of the working directory's revisions. If a\n"
460 " Print the children of the working directory's revisions. If a\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
461 " revision is given via -r/--rev, the children of that revision will\n"
462 " be printed. If a file argument is given, revision in which the\n"
462 " be printed. If a file argument is given, revision in which the\n"
463 " file was last changed (after the working directory revision or the\n"
463 " file was last changed (after the working directory revision or the\n"
464 " argument to --rev if given) is printed.\n"
464 " argument to --rev if given) is printed.\n"
465 " "
465 " "
466 msgstr ""
466 msgstr ""
467
467
468 msgid "show children of the specified revision"
468 msgid "show children of the specified revision"
469 msgstr ""
469 msgstr ""
470
470
471 msgid "hg children [-r REV] [FILE]"
471 msgid "hg children [-r REV] [FILE]"
472 msgstr ""
472 msgstr ""
473
473
474 msgid "command to display statistics about repository history"
474 msgid "command to display statistics about repository history"
475 msgstr ""
475 msgstr ""
476
476
477 #, python-format
477 #, python-format
478 msgid "Revision %d is a merge, ignoring...\n"
478 msgid "Revision %d is a merge, ignoring...\n"
479 msgstr ""
479 msgstr ""
480
480
481 #, python-format
481 #, python-format
482 msgid "generating stats: %d%%"
482 msgid "generating stats: %d%%"
483 msgstr ""
483 msgstr ""
484
484
485 msgid ""
485 msgid ""
486 "histogram of changes to the repository\n"
486 "histogram of changes to the repository\n"
487 "\n"
487 "\n"
488 " This command will display a histogram representing the number\n"
488 " This command will display a histogram representing the number\n"
489 " of changed lines or revisions, grouped according to the given\n"
489 " of changed lines or revisions, grouped according to the given\n"
490 " template. The default template will group changes by author.\n"
490 " template. The default template will group changes by author.\n"
491 " The --dateformat option may be used to group the results by\n"
491 " The --dateformat option may be used to group the results by\n"
492 " date instead.\n"
492 " date instead.\n"
493 "\n"
493 "\n"
494 " Statistics are based on the number of changed lines, or\n"
494 " Statistics are based on the number of changed lines, or\n"
495 " alternatively the number of matching revisions if the\n"
495 " alternatively the number of matching revisions if the\n"
496 " --changesets option is specified.\n"
496 " --changesets option is specified.\n"
497 "\n"
497 "\n"
498 " Examples:\n"
498 " Examples:\n"
499 "\n"
499 "\n"
500 " # display count of changed lines for every committer\n"
500 " # display count of changed lines for every committer\n"
501 " hg churn -t '{author|email}'\n"
501 " hg churn -t '{author|email}'\n"
502 "\n"
502 "\n"
503 " # display daily activity graph\n"
503 " # display daily activity graph\n"
504 " hg churn -f '%H' -s -c\n"
504 " hg churn -f '%H' -s -c\n"
505 "\n"
505 "\n"
506 " # display activity of developers by month\n"
506 " # display activity of developers by month\n"
507 " hg churn -f '%Y-%m' -s -c\n"
507 " hg churn -f '%Y-%m' -s -c\n"
508 "\n"
508 "\n"
509 " # display count of lines changed in every year\n"
509 " # display count of lines changed in every year\n"
510 " hg churn -f '%Y' -s\n"
510 " hg churn -f '%Y' -s\n"
511 "\n"
511 "\n"
512 " It is possible to map alternate email addresses to a main address\n"
512 " It is possible to map alternate email addresses to a main address\n"
513 " by providing a file using the following format:\n"
513 " by providing a file using the following format:\n"
514 "\n"
514 "\n"
515 " <alias email> <actual email>\n"
515 " <alias email> <actual email>\n"
516 "\n"
516 "\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
517 " Such a file may be specified with the --aliases option, otherwise a\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
518 " .hgchurn file will be looked for in the working directory root.\n"
519 " "
519 " "
520 msgstr ""
520 msgstr ""
521
521
522 #, python-format
522 #, python-format
523 msgid "assuming %i character terminal\n"
523 msgid "assuming %i character terminal\n"
524 msgstr ""
524 msgstr ""
525
525
526 msgid "count rate for the specified revision or range"
526 msgid "count rate for the specified revision or range"
527 msgstr ""
527 msgstr ""
528
528
529 msgid "count rate for revisions matching date spec"
529 msgid "count rate for revisions matching date spec"
530 msgstr ""
530 msgstr ""
531
531
532 msgid "template to group changesets"
532 msgid "template to group changesets"
533 msgstr ""
533 msgstr ""
534
534
535 msgid "strftime-compatible format for grouping by date"
535 msgid "strftime-compatible format for grouping by date"
536 msgstr ""
536 msgstr ""
537
537
538 msgid "count rate by number of changesets"
538 msgid "count rate by number of changesets"
539 msgstr ""
539 msgstr ""
540
540
541 msgid "sort by key (default: sort by count)"
541 msgid "sort by key (default: sort by count)"
542 msgstr ""
542 msgstr ""
543
543
544 msgid "file with email aliases"
544 msgid "file with email aliases"
545 msgstr ""
545 msgstr ""
546
546
547 msgid "show progress"
547 msgid "show progress"
548 msgstr ""
548 msgstr ""
549
549
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
550 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
551 msgstr ""
551 msgstr ""
552
552
553 msgid ""
553 msgid ""
554 "colorize output from some commands\n"
554 "colorize output from some commands\n"
555 "\n"
555 "\n"
556 "This extension modifies the status command to add color to its output\n"
556 "This extension modifies the status command to add color to its output\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
557 "to reflect file status, the qseries command to add color to reflect\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
558 "patch status (applied, unapplied, missing), and to diff-related\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
559 "commands to highlight additions, removals, diff headers, and trailing\n"
560 "whitespace.\n"
560 "whitespace.\n"
561 "\n"
561 "\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
562 "Other effects in addition to color, like bold and underlined text, are\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
563 "also available. Effects are rendered with the ECMA-48 SGR control\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
564 "function (aka ANSI escape codes). This module also provides the\n"
565 "render_text function, which can be used to add effects to any text.\n"
565 "render_text function, which can be used to add effects to any text.\n"
566 "\n"
566 "\n"
567 "Default effects may be overridden from the .hgrc file:\n"
567 "Default effects may be overridden from the .hgrc file:\n"
568 "\n"
568 "\n"
569 "[color]\n"
569 "[color]\n"
570 "status.modified = blue bold underline red_background\n"
570 "status.modified = blue bold underline red_background\n"
571 "status.added = green bold\n"
571 "status.added = green bold\n"
572 "status.removed = red bold blue_background\n"
572 "status.removed = red bold blue_background\n"
573 "status.deleted = cyan bold underline\n"
573 "status.deleted = cyan bold underline\n"
574 "status.unknown = magenta bold underline\n"
574 "status.unknown = magenta bold underline\n"
575 "status.ignored = black bold\n"
575 "status.ignored = black bold\n"
576 "\n"
576 "\n"
577 "# 'none' turns off all effects\n"
577 "# 'none' turns off all effects\n"
578 "status.clean = none\n"
578 "status.clean = none\n"
579 "status.copied = none\n"
579 "status.copied = none\n"
580 "\n"
580 "\n"
581 "qseries.applied = blue bold underline\n"
581 "qseries.applied = blue bold underline\n"
582 "qseries.unapplied = black bold\n"
582 "qseries.unapplied = black bold\n"
583 "qseries.missing = red bold\n"
583 "qseries.missing = red bold\n"
584 "\n"
584 "\n"
585 "diff.diffline = bold\n"
585 "diff.diffline = bold\n"
586 "diff.extended = cyan bold\n"
586 "diff.extended = cyan bold\n"
587 "diff.file_a = red bold\n"
587 "diff.file_a = red bold\n"
588 "diff.file_b = green bold\n"
588 "diff.file_b = green bold\n"
589 "diff.hunk = magenta\n"
589 "diff.hunk = magenta\n"
590 "diff.deleted = red\n"
590 "diff.deleted = red\n"
591 "diff.inserted = green\n"
591 "diff.inserted = green\n"
592 "diff.changed = white\n"
592 "diff.changed = white\n"
593 "diff.trailingwhitespace = bold red_background\n"
593 "diff.trailingwhitespace = bold red_background\n"
594 msgstr ""
594 msgstr ""
595
595
596 msgid "when to colorize (always, auto, or never)"
596 msgid "when to colorize (always, auto, or never)"
597 msgstr ""
597 msgstr ""
598
598
599 msgid "don't colorize output"
599 msgid "don't colorize output"
600 msgstr ""
600 msgstr ""
601
601
602 #, python-format
602 #, python-format
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
603 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
604 msgstr ""
604 msgstr ""
605
605
606 msgid "import revisions from foreign VCS repositories into Mercurial"
606 msgid "import revisions from foreign VCS repositories into Mercurial"
607 msgstr ""
607 msgstr ""
608
608
609 msgid ""
609 msgid ""
610 "convert a foreign SCM repository to a Mercurial one.\n"
610 "convert a foreign SCM repository to a Mercurial one.\n"
611 "\n"
611 "\n"
612 " Accepted source formats [identifiers]:\n"
612 " Accepted source formats [identifiers]:\n"
613 " - Mercurial [hg]\n"
613 " - Mercurial [hg]\n"
614 " - CVS [cvs]\n"
614 " - CVS [cvs]\n"
615 " - Darcs [darcs]\n"
615 " - Darcs [darcs]\n"
616 " - git [git]\n"
616 " - git [git]\n"
617 " - Subversion [svn]\n"
617 " - Subversion [svn]\n"
618 " - Monotone [mtn]\n"
618 " - Monotone [mtn]\n"
619 " - GNU Arch [gnuarch]\n"
619 " - GNU Arch [gnuarch]\n"
620 " - Bazaar [bzr]\n"
620 " - Bazaar [bzr]\n"
621 " - Perforce [p4]\n"
621 " - Perforce [p4]\n"
622 "\n"
622 "\n"
623 " Accepted destination formats [identifiers]:\n"
623 " Accepted destination formats [identifiers]:\n"
624 " - Mercurial [hg]\n"
624 " - Mercurial [hg]\n"
625 " - Subversion [svn] (history on branches is not preserved)\n"
625 " - Subversion [svn] (history on branches is not preserved)\n"
626 "\n"
626 "\n"
627 " If no revision is given, all revisions will be converted.\n"
627 " If no revision is given, all revisions will be converted.\n"
628 " Otherwise, convert will only import up to the named revision\n"
628 " Otherwise, convert will only import up to the named revision\n"
629 " (given in a format understood by the source).\n"
629 " (given in a format understood by the source).\n"
630 "\n"
630 "\n"
631 " If no destination directory name is specified, it defaults to the\n"
631 " If no destination directory name is specified, it defaults to the\n"
632 " basename of the source with '-hg' appended. If the destination\n"
632 " basename of the source with '-hg' appended. If the destination\n"
633 " repository doesn't exist, it will be created.\n"
633 " repository doesn't exist, it will be created.\n"
634 "\n"
634 "\n"
635 " By default, all sources except Mercurial will use\n"
635 " By default, all sources except Mercurial will use\n"
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
636 " --branchsort. Mercurial uses --sourcesort to preserve original\n"
637 " revision numbers order. Sort modes have the following effects:\n"
637 " revision numbers order. Sort modes have the following effects:\n"
638 " --branchsort: convert from parent to child revision when\n"
638 " --branchsort: convert from parent to child revision when\n"
639 " possible, which means branches are usually converted one after\n"
639 " possible, which means branches are usually converted one after\n"
640 " the other. It generates more compact repositories.\n"
640 " the other. It generates more compact repositories.\n"
641 " --datesort: sort revisions by date. Converted repositories have\n"
641 " --datesort: sort revisions by date. Converted repositories have\n"
642 " good-looking changelogs but are often an order of magnitude\n"
642 " good-looking changelogs but are often an order of magnitude\n"
643 " larger than the same ones generated by --branchsort.\n"
643 " larger than the same ones generated by --branchsort.\n"
644 " --sourcesort: try to preserve source revisions order, only\n"
644 " --sourcesort: try to preserve source revisions order, only\n"
645 " supported by Mercurial sources.\n"
645 " supported by Mercurial sources.\n"
646 "\n"
646 "\n"
647 " If <REVMAP> isn't given, it will be put in a default location\n"
647 " If <REVMAP> isn't given, it will be put in a default location\n"
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
648 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
649 " that maps each source commit ID to the destination ID for that\n"
649 " that maps each source commit ID to the destination ID for that\n"
650 " revision, like so:\n"
650 " revision, like so:\n"
651 " <source ID> <destination ID>\n"
651 " <source ID> <destination ID>\n"
652 "\n"
652 "\n"
653 " If the file doesn't exist, it's automatically created. It's\n"
653 " If the file doesn't exist, it's automatically created. It's\n"
654 " updated on each commit copied, so convert-repo can be interrupted\n"
654 " updated on each commit copied, so convert-repo can be interrupted\n"
655 " and can be run repeatedly to copy new commits.\n"
655 " and can be run repeatedly to copy new commits.\n"
656 "\n"
656 "\n"
657 " The [username mapping] file is a simple text file that maps each\n"
657 " The [username mapping] file is a simple text file that maps each\n"
658 " source commit author to a destination commit author. It is handy\n"
658 " source commit author to a destination commit author. It is handy\n"
659 " for source SCMs that use unix logins to identify authors (eg:\n"
659 " for source SCMs that use unix logins to identify authors (eg:\n"
660 " CVS). One line per author mapping and the line format is:\n"
660 " CVS). One line per author mapping and the line format is:\n"
661 " srcauthor=whatever string you want\n"
661 " srcauthor=whatever string you want\n"
662 "\n"
662 "\n"
663 " The filemap is a file that allows filtering and remapping of files\n"
663 " The filemap is a file that allows filtering and remapping of files\n"
664 " and directories. Comment lines start with '#'. Each line can\n"
664 " and directories. Comment lines start with '#'. Each line can\n"
665 " contain one of the following directives:\n"
665 " contain one of the following directives:\n"
666 "\n"
666 "\n"
667 " include path/to/file\n"
667 " include path/to/file\n"
668 "\n"
668 "\n"
669 " exclude path/to/file\n"
669 " exclude path/to/file\n"
670 "\n"
670 "\n"
671 " rename from/file to/file\n"
671 " rename from/file to/file\n"
672 "\n"
672 "\n"
673 " The 'include' directive causes a file, or all files under a\n"
673 " The 'include' directive causes a file, or all files under a\n"
674 " directory, to be included in the destination repository, and the\n"
674 " directory, to be included in the destination repository, and the\n"
675 " exclusion of all other files and directories not explicitly included.\n"
675 " exclusion of all other files and directories not explicitly included.\n"
676 " The 'exclude' directive causes files or directories to be omitted.\n"
676 " The 'exclude' directive causes files or directories to be omitted.\n"
677 " The 'rename' directive renames a file or directory. To rename from\n"
677 " The 'rename' directive renames a file or directory. To rename from\n"
678 " a subdirectory into the root of the repository, use '.' as the\n"
678 " a subdirectory into the root of the repository, use '.' as the\n"
679 " path to rename to.\n"
679 " path to rename to.\n"
680 "\n"
680 "\n"
681 " The splicemap is a file that allows insertion of synthetic\n"
681 " The splicemap is a file that allows insertion of synthetic\n"
682 " history, letting you specify the parents of a revision. This is\n"
682 " history, letting you specify the parents of a revision. This is\n"
683 " useful if you want to e.g. give a Subversion merge two parents, or\n"
683 " useful if you want to e.g. give a Subversion merge two parents, or\n"
684 " graft two disconnected series of history together. Each entry\n"
684 " graft two disconnected series of history together. Each entry\n"
685 " contains a key, followed by a space, followed by one or two\n"
685 " contains a key, followed by a space, followed by one or two\n"
686 " comma-separated values. The key is the revision ID in the source\n"
686 " comma-separated values. The key is the revision ID in the source\n"
687 " revision control system whose parents should be modified (same\n"
687 " revision control system whose parents should be modified (same\n"
688 " format as a key in .hg/shamap). The values are the revision IDs\n"
688 " format as a key in .hg/shamap). The values are the revision IDs\n"
689 " (in either the source or destination revision control system) that\n"
689 " (in either the source or destination revision control system) that\n"
690 " should be used as the new parents for that node.\n"
690 " should be used as the new parents for that node.\n"
691 "\n"
691 "\n"
692 " The branchmap is a file that allows you to rename a branch when it is\n"
692 " The branchmap is a file that allows you to rename a branch when it is\n"
693 " being brought in from whatever external repository. When used in\n"
693 " being brought in from whatever external repository. When used in\n"
694 " conjunction with a splicemap, it allows for a powerful combination\n"
694 " conjunction with a splicemap, it allows for a powerful combination\n"
695 " to help fix even the most badly mismanaged repositories and turn them\n"
695 " to help fix even the most badly mismanaged repositories and turn them\n"
696 " into nicely structured Mercurial repositories. The branchmap contains\n"
696 " into nicely structured Mercurial repositories. The branchmap contains\n"
697 " lines of the form \"original_branch_name new_branch_name\".\n"
697 " lines of the form \"original_branch_name new_branch_name\".\n"
698 " \"original_branch_name\" is the name of the branch in the source\n"
698 " \"original_branch_name\" is the name of the branch in the source\n"
699 " repository, and \"new_branch_name\" is the name of the branch is the\n"
699 " repository, and \"new_branch_name\" is the name of the branch is the\n"
700 " destination repository. This can be used to (for instance) move code\n"
700 " destination repository. This can be used to (for instance) move code\n"
701 " in one repository from \"default\" to a named branch.\n"
701 " in one repository from \"default\" to a named branch.\n"
702 "\n"
702 "\n"
703 " Mercurial Source\n"
703 " Mercurial Source\n"
704 " -----------------\n"
704 " -----------------\n"
705 "\n"
705 "\n"
706 " --config convert.hg.ignoreerrors=False (boolean)\n"
706 " --config convert.hg.ignoreerrors=False (boolean)\n"
707 " ignore integrity errors when reading. Use it to fix Mercurial\n"
707 " ignore integrity errors when reading. Use it to fix Mercurial\n"
708 " repositories with missing revlogs, by converting from and to\n"
708 " repositories with missing revlogs, by converting from and to\n"
709 " Mercurial.\n"
709 " Mercurial.\n"
710 " --config convert.hg.saverev=False (boolean)\n"
710 " --config convert.hg.saverev=False (boolean)\n"
711 " store original revision ID in changeset (forces target IDs to\n"
711 " store original revision ID in changeset (forces target IDs to\n"
712 " change)\n"
712 " change)\n"
713 " --config convert.hg.startrev=0 (hg revision identifier)\n"
713 " --config convert.hg.startrev=0 (hg revision identifier)\n"
714 " convert start revision and its descendants\n"
714 " convert start revision and its descendants\n"
715 "\n"
715 "\n"
716 " CVS Source\n"
716 " CVS Source\n"
717 " ----------\n"
717 " ----------\n"
718 "\n"
718 "\n"
719 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
719 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
720 " to indicate the starting point of what will be converted. Direct\n"
720 " to indicate the starting point of what will be converted. Direct\n"
721 " access to the repository files is not needed, unless of course the\n"
721 " access to the repository files is not needed, unless of course the\n"
722 " repository is :local:. The conversion uses the top level directory\n"
722 " repository is :local:. The conversion uses the top level directory\n"
723 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
723 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
724 " commands to find files to convert. This means that unless a\n"
724 " commands to find files to convert. This means that unless a\n"
725 " filemap is given, all files under the starting directory will be\n"
725 " filemap is given, all files under the starting directory will be\n"
726 " converted, and that any directory reorganization in the CVS\n"
726 " converted, and that any directory reorganization in the CVS\n"
727 " sandbox is ignored.\n"
727 " sandbox is ignored.\n"
728 "\n"
728 "\n"
729 " Because CVS does not have changesets, it is necessary to collect\n"
729 " Because CVS does not have changesets, it is necessary to collect\n"
730 " individual commits to CVS and merge them into changesets. CVS\n"
730 " individual commits to CVS and merge them into changesets. CVS\n"
731 " source uses its internal changeset merging code by default but can\n"
731 " source uses its internal changeset merging code by default but can\n"
732 " be configured to call the external 'cvsps' program by setting:\n"
732 " be configured to call the external 'cvsps' program by setting:\n"
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
733 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
734 " This option is deprecated and will be removed in Mercurial 1.4.\n"
734 " This option is deprecated and will be removed in Mercurial 1.4.\n"
735 "\n"
735 "\n"
736 " The options shown are the defaults.\n"
736 " The options shown are the defaults.\n"
737 "\n"
737 "\n"
738 " Internal cvsps is selected by setting\n"
738 " Internal cvsps is selected by setting\n"
739 " --config convert.cvsps=builtin\n"
739 " --config convert.cvsps=builtin\n"
740 " and has a few more configurable options:\n"
740 " and has a few more configurable options:\n"
741 " --config convert.cvsps.cache=True (boolean)\n"
741 " --config convert.cvsps.cache=True (boolean)\n"
742 " Set to False to disable remote log caching, for testing and\n"
742 " Set to False to disable remote log caching, for testing and\n"
743 " debugging purposes.\n"
743 " debugging purposes.\n"
744 " --config convert.cvsps.fuzz=60 (integer)\n"
744 " --config convert.cvsps.fuzz=60 (integer)\n"
745 " Specify the maximum time (in seconds) that is allowed\n"
745 " Specify the maximum time (in seconds) that is allowed\n"
746 " between commits with identical user and log message in a\n"
746 " between commits with identical user and log message in a\n"
747 " single changeset. When very large files were checked in as\n"
747 " single changeset. When very large files were checked in as\n"
748 " part of a changeset then the default may not be long\n"
748 " part of a changeset then the default may not be long\n"
749 " enough.\n"
749 " enough.\n"
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
750 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
751 " Specify a regular expression to which commit log messages\n"
751 " Specify a regular expression to which commit log messages\n"
752 " are matched. If a match occurs, then the conversion\n"
752 " are matched. If a match occurs, then the conversion\n"
753 " process will insert a dummy revision merging the branch on\n"
753 " process will insert a dummy revision merging the branch on\n"
754 " which this log message occurs to the branch indicated in\n"
754 " which this log message occurs to the branch indicated in\n"
755 " the regex.\n"
755 " the regex.\n"
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
756 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
757 " Specify a regular expression to which commit log messages\n"
757 " Specify a regular expression to which commit log messages\n"
758 " are matched. If a match occurs, then the conversion\n"
758 " are matched. If a match occurs, then the conversion\n"
759 " process will add the most recent revision on the branch\n"
759 " process will add the most recent revision on the branch\n"
760 " indicated in the regex as the second parent of the\n"
760 " indicated in the regex as the second parent of the\n"
761 " changeset.\n"
761 " changeset.\n"
762 "\n"
762 "\n"
763 " The hgext/convert/cvsps wrapper script allows the builtin\n"
763 " The hgext/convert/cvsps wrapper script allows the builtin\n"
764 " changeset merging code to be run without doing a conversion. Its\n"
764 " changeset merging code to be run without doing a conversion. Its\n"
765 " parameters and output are similar to that of cvsps 2.1.\n"
765 " parameters and output are similar to that of cvsps 2.1.\n"
766 "\n"
766 "\n"
767 " Subversion Source\n"
767 " Subversion Source\n"
768 " -----------------\n"
768 " -----------------\n"
769 "\n"
769 "\n"
770 " Subversion source detects classical trunk/branches/tags layouts.\n"
770 " Subversion source detects classical trunk/branches/tags layouts.\n"
771 " By default, the supplied \"svn://repo/path/\" source URL is\n"
771 " By default, the supplied \"svn://repo/path/\" source URL is\n"
772 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
772 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
773 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
773 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
774 " its subdirectories are listed as possible branches. If\n"
774 " its subdirectories are listed as possible branches. If\n"
775 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
775 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
776 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
776 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
777 " can be overridden with following options. Set them to paths\n"
777 " can be overridden with following options. Set them to paths\n"
778 " relative to the source URL, or leave them blank to disable auto\n"
778 " relative to the source URL, or leave them blank to disable auto\n"
779 " detection.\n"
779 " detection.\n"
780 "\n"
780 "\n"
781 " --config convert.svn.branches=branches (directory name)\n"
781 " --config convert.svn.branches=branches (directory name)\n"
782 " specify the directory containing branches\n"
782 " specify the directory containing branches\n"
783 " --config convert.svn.tags=tags (directory name)\n"
783 " --config convert.svn.tags=tags (directory name)\n"
784 " specify the directory containing tags\n"
784 " specify the directory containing tags\n"
785 " --config convert.svn.trunk=trunk (directory name)\n"
785 " --config convert.svn.trunk=trunk (directory name)\n"
786 " specify the name of the trunk branch\n"
786 " specify the name of the trunk branch\n"
787 "\n"
787 "\n"
788 " Source history can be retrieved starting at a specific revision,\n"
788 " Source history can be retrieved starting at a specific revision,\n"
789 " instead of being integrally converted. Only single branch\n"
789 " instead of being integrally converted. Only single branch\n"
790 " conversions are supported.\n"
790 " conversions are supported.\n"
791 "\n"
791 "\n"
792 " --config convert.svn.startrev=0 (svn revision number)\n"
792 " --config convert.svn.startrev=0 (svn revision number)\n"
793 " specify start Subversion revision.\n"
793 " specify start Subversion revision.\n"
794 "\n"
794 "\n"
795 " Perforce Source\n"
795 " Perforce Source\n"
796 " ---------------\n"
796 " ---------------\n"
797 "\n"
797 "\n"
798 " The Perforce (P4) importer can be given a p4 depot path or a\n"
798 " The Perforce (P4) importer can be given a p4 depot path or a\n"
799 " client specification as source. It will convert all files in the\n"
799 " client specification as source. It will convert all files in the\n"
800 " source to a flat Mercurial repository, ignoring labels, branches\n"
800 " source to a flat Mercurial repository, ignoring labels, branches\n"
801 " and integrations. Note that when a depot path is given you then\n"
801 " and integrations. Note that when a depot path is given you then\n"
802 " usually should specify a target directory, because otherwise the\n"
802 " usually should specify a target directory, because otherwise the\n"
803 " target may be named ...-hg.\n"
803 " target may be named ...-hg.\n"
804 "\n"
804 "\n"
805 " It is possible to limit the amount of source history to be\n"
805 " It is possible to limit the amount of source history to be\n"
806 " converted by specifying an initial Perforce revision.\n"
806 " converted by specifying an initial Perforce revision.\n"
807 "\n"
807 "\n"
808 " --config convert.p4.startrev=0 (perforce changelist number)\n"
808 " --config convert.p4.startrev=0 (perforce changelist number)\n"
809 " specify initial Perforce revision.\n"
809 " specify initial Perforce revision.\n"
810 "\n"
810 "\n"
811 "\n"
811 "\n"
812 " Mercurial Destination\n"
812 " Mercurial Destination\n"
813 " ---------------------\n"
813 " ---------------------\n"
814 "\n"
814 "\n"
815 " --config convert.hg.clonebranches=False (boolean)\n"
815 " --config convert.hg.clonebranches=False (boolean)\n"
816 " dispatch source branches in separate clones.\n"
816 " dispatch source branches in separate clones.\n"
817 " --config convert.hg.tagsbranch=default (branch name)\n"
817 " --config convert.hg.tagsbranch=default (branch name)\n"
818 " tag revisions branch name\n"
818 " tag revisions branch name\n"
819 " --config convert.hg.usebranchnames=True (boolean)\n"
819 " --config convert.hg.usebranchnames=True (boolean)\n"
820 " preserve branch names\n"
820 " preserve branch names\n"
821 "\n"
821 "\n"
822 " "
822 " "
823 msgstr ""
823 msgstr ""
824
824
825 msgid ""
825 msgid ""
826 "create changeset information from CVS\n"
826 "create changeset information from CVS\n"
827 "\n"
827 "\n"
828 " This command is intended as a debugging tool for the CVS to\n"
828 " This command is intended as a debugging tool for the CVS to\n"
829 " Mercurial converter, and can be used as a direct replacement for\n"
829 " Mercurial converter, and can be used as a direct replacement for\n"
830 " cvsps.\n"
830 " cvsps.\n"
831 "\n"
831 "\n"
832 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
832 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
833 " named directory) in the CVS repository, and converts the log to a\n"
833 " named directory) in the CVS repository, and converts the log to a\n"
834 " series of changesets based on matching commit log entries and\n"
834 " series of changesets based on matching commit log entries and\n"
835 " dates."
835 " dates."
836 msgstr ""
836 msgstr ""
837
837
838 msgid "username mapping filename"
838 msgid "username mapping filename"
839 msgstr ""
839 msgstr ""
840
840
841 msgid "destination repository type"
841 msgid "destination repository type"
842 msgstr ""
842 msgstr ""
843
843
844 msgid "remap file names using contents of file"
844 msgid "remap file names using contents of file"
845 msgstr ""
845 msgstr ""
846
846
847 msgid "import up to target revision REV"
847 msgid "import up to target revision REV"
848 msgstr ""
848 msgstr ""
849
849
850 msgid "source repository type"
850 msgid "source repository type"
851 msgstr ""
851 msgstr ""
852
852
853 msgid "splice synthesized history into place"
853 msgid "splice synthesized history into place"
854 msgstr ""
854 msgstr ""
855
855
856 msgid "change branch names while converting"
856 msgid "change branch names while converting"
857 msgstr ""
857 msgstr ""
858
858
859 msgid "try to sort changesets by branches"
859 msgid "try to sort changesets by branches"
860 msgstr ""
860 msgstr ""
861
861
862 msgid "try to sort changesets by date"
862 msgid "try to sort changesets by date"
863 msgstr ""
863 msgstr ""
864
864
865 msgid "preserve source changesets order"
865 msgid "preserve source changesets order"
866 msgstr ""
866 msgstr ""
867
867
868 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
868 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
869 msgstr ""
869 msgstr ""
870
870
871 msgid "only return changes on specified branches"
871 msgid "only return changes on specified branches"
872 msgstr ""
872 msgstr ""
873
873
874 msgid "prefix to remove from file names"
874 msgid "prefix to remove from file names"
875 msgstr ""
875 msgstr ""
876
876
877 msgid "only return changes after or between specified tags"
877 msgid "only return changes after or between specified tags"
878 msgstr ""
878 msgstr ""
879
879
880 msgid "update cvs log cache"
880 msgid "update cvs log cache"
881 msgstr ""
881 msgstr ""
882
882
883 msgid "create new cvs log cache"
883 msgid "create new cvs log cache"
884 msgstr ""
884 msgstr ""
885
885
886 msgid "set commit time fuzz in seconds"
886 msgid "set commit time fuzz in seconds"
887 msgstr ""
887 msgstr ""
888
888
889 msgid "specify cvsroot"
889 msgid "specify cvsroot"
890 msgstr ""
890 msgstr ""
891
891
892 msgid "show parent changesets"
892 msgid "show parent changesets"
893 msgstr ""
893 msgstr ""
894
894
895 msgid "show current changeset in ancestor branches"
895 msgid "show current changeset in ancestor branches"
896 msgstr ""
896 msgstr ""
897
897
898 msgid "ignored for compatibility"
898 msgid "ignored for compatibility"
899 msgstr ""
899 msgstr ""
900
900
901 msgid "hg debugcvsps [OPTION]... [PATH]..."
901 msgid "hg debugcvsps [OPTION]... [PATH]..."
902 msgstr ""
902 msgstr ""
903
903
904 msgid ""
904 msgid ""
905 "warning: lightweight checkouts may cause conversion failures, try with a "
905 "warning: lightweight checkouts may cause conversion failures, try with a "
906 "regular branch instead.\n"
906 "regular branch instead.\n"
907 msgstr ""
907 msgstr ""
908
908
909 msgid "bzr source type could not be determined\n"
909 msgid "bzr source type could not be determined\n"
910 msgstr ""
910 msgstr ""
911
911
912 #, python-format
912 #, python-format
913 msgid "%s is not a valid revision in current branch"
913 msgid "%s is not a valid revision in current branch"
914 msgstr ""
914 msgstr ""
915
915
916 #, python-format
916 #, python-format
917 msgid "%s is not available in %s anymore"
917 msgid "%s is not available in %s anymore"
918 msgstr ""
918 msgstr ""
919
919
920 #, python-format
920 #, python-format
921 msgid "%s.%s symlink has no target"
921 msgid "%s.%s symlink has no target"
922 msgstr ""
922 msgstr ""
923
923
924 #, python-format
924 #, python-format
925 msgid "cannot find required \"%s\" tool"
925 msgid "cannot find required \"%s\" tool"
926 msgstr ""
926 msgstr ""
927
927
928 #, python-format
928 #, python-format
929 msgid "running: %s\n"
929 msgid "running: %s\n"
930 msgstr ""
930 msgstr ""
931
931
932 #, python-format
932 #, python-format
933 msgid "%s error:\n"
933 msgid "%s error:\n"
934 msgstr ""
934 msgstr ""
935
935
936 #, python-format
936 #, python-format
937 msgid "syntax error in %s(%d): key/value pair expected"
937 msgid "syntax error in %s(%d): key/value pair expected"
938 msgstr ""
938 msgstr ""
939
939
940 #, python-format
940 #, python-format
941 msgid "could not open map file %r: %s"
941 msgid "could not open map file %r: %s"
942 msgstr ""
942 msgstr ""
943
943
944 #, python-format
944 #, python-format
945 msgid "%s: missing or unsupported repository"
945 msgid "%s: missing or unsupported repository"
946 msgstr ""
946 msgstr ""
947
947
948 #, python-format
948 #, python-format
949 msgid "convert: %s\n"
949 msgid "convert: %s\n"
950 msgstr ""
950 msgstr ""
951
951
952 #, python-format
952 #, python-format
953 msgid "%s: unknown repository type"
953 msgid "%s: unknown repository type"
954 msgstr ""
954 msgstr ""
955
955
956 #, python-format
956 #, python-format
957 msgid "unknown sort mode: %s"
957 msgid "unknown sort mode: %s"
958 msgstr ""
958 msgstr ""
959
959
960 #, python-format
960 #, python-format
961 msgid "cycle detected between %s and %s"
961 msgid "cycle detected between %s and %s"
962 msgstr ""
962 msgstr ""
963
963
964 msgid "not all revisions were sorted"
964 msgid "not all revisions were sorted"
965 msgstr ""
965 msgstr ""
966
966
967 #, python-format
967 #, python-format
968 msgid "Writing author map file %s\n"
968 msgid "Writing author map file %s\n"
969 msgstr ""
969 msgstr ""
970
970
971 #, python-format
971 #, python-format
972 msgid "Ignoring bad line in author map file %s: %s\n"
972 msgid "Ignoring bad line in author map file %s: %s\n"
973 msgstr ""
973 msgstr ""
974
974
975 #, python-format
975 #, python-format
976 msgid "mapping author %s to %s\n"
976 msgid "mapping author %s to %s\n"
977 msgstr ""
977 msgstr ""
978
978
979 #, python-format
979 #, python-format
980 msgid "overriding mapping for author %s, was %s, will be %s\n"
980 msgid "overriding mapping for author %s, was %s, will be %s\n"
981 msgstr ""
981 msgstr ""
982
982
983 #, python-format
983 #, python-format
984 msgid "spliced in %s as parents of %s\n"
984 msgid "spliced in %s as parents of %s\n"
985 msgstr ""
985 msgstr ""
986
986
987 msgid "scanning source...\n"
987 msgid "scanning source...\n"
988 msgstr ""
988 msgstr ""
989
989
990 msgid "sorting...\n"
990 msgid "sorting...\n"
991 msgstr ""
991 msgstr ""
992
992
993 msgid "converting...\n"
993 msgid "converting...\n"
994 msgstr ""
994 msgstr ""
995
995
996 #, python-format
996 #, python-format
997 msgid "source: %s\n"
997 msgid "source: %s\n"
998 msgstr ""
998 msgstr ""
999
999
1000 #, python-format
1000 #, python-format
1001 msgid "assuming destination %s\n"
1001 msgid "assuming destination %s\n"
1002 msgstr ""
1002 msgstr ""
1003
1003
1004 msgid "more than one sort mode specified"
1004 msgid "more than one sort mode specified"
1005 msgstr ""
1005 msgstr ""
1006
1006
1007 msgid "--sourcesort is not supported by this data source"
1007 msgid "--sourcesort is not supported by this data source"
1008 msgstr ""
1008 msgstr ""
1009
1009
1010 msgid ""
1010 msgid ""
1011 "warning: support for external cvsps is deprecated and will be removed in "
1011 "warning: support for external cvsps is deprecated and will be removed in "
1012 "Mercurial 1.4\n"
1012 "Mercurial 1.4\n"
1013 msgstr ""
1013 msgstr ""
1014
1014
1015 #, python-format
1015 #, python-format
1016 msgid "revision %s is not a patchset number or date"
1016 msgid "revision %s is not a patchset number or date"
1017 msgstr ""
1017 msgstr ""
1018
1018
1019 msgid "using builtin cvsps\n"
1019 msgid "using builtin cvsps\n"
1020 msgstr ""
1020 msgstr ""
1021
1021
1022 #, python-format
1022 #, python-format
1023 msgid "connecting to %s\n"
1023 msgid "connecting to %s\n"
1024 msgstr ""
1024 msgstr ""
1025
1025
1026 msgid "CVS pserver authentication failed"
1026 msgid "CVS pserver authentication failed"
1027 msgstr ""
1027 msgstr ""
1028
1028
1029 msgid "server sucks"
1029 msgid "server sucks"
1030 msgstr ""
1030 msgstr ""
1031
1031
1032 #, python-format
1032 #, python-format
1033 msgid "%d bytes missing from remote file"
1033 msgid "%d bytes missing from remote file"
1034 msgstr ""
1034 msgstr ""
1035
1035
1036 #, python-format
1036 #, python-format
1037 msgid "cvs server: %s\n"
1037 msgid "cvs server: %s\n"
1038 msgstr ""
1038 msgstr ""
1039
1039
1040 #, python-format
1040 #, python-format
1041 msgid "unknown CVS response: %s"
1041 msgid "unknown CVS response: %s"
1042 msgstr ""
1042 msgstr ""
1043
1043
1044 msgid "collecting CVS rlog\n"
1044 msgid "collecting CVS rlog\n"
1045 msgstr ""
1045 msgstr ""
1046
1046
1047 #, python-format
1047 #, python-format
1048 msgid "reading cvs log cache %s\n"
1048 msgid "reading cvs log cache %s\n"
1049 msgstr ""
1049 msgstr ""
1050
1050
1051 #, python-format
1051 #, python-format
1052 msgid "cache has %d log entries\n"
1052 msgid "cache has %d log entries\n"
1053 msgstr ""
1053 msgstr ""
1054
1054
1055 #, python-format
1055 #, python-format
1056 msgid "error reading cache: %r\n"
1056 msgid "error reading cache: %r\n"
1057 msgstr ""
1057 msgstr ""
1058
1058
1059 #, python-format
1059 #, python-format
1060 msgid "running %s\n"
1060 msgid "running %s\n"
1061 msgstr ""
1061 msgstr ""
1062
1062
1063 #, python-format
1063 #, python-format
1064 msgid "prefix=%r directory=%r root=%r\n"
1064 msgid "prefix=%r directory=%r root=%r\n"
1065 msgstr ""
1065 msgstr ""
1066
1066
1067 msgid "RCS file must be followed by working file"
1067 msgid "RCS file must be followed by working file"
1068 msgstr ""
1068 msgstr ""
1069
1069
1070 msgid "must have at least some revisions"
1070 msgid "must have at least some revisions"
1071 msgstr ""
1071 msgstr ""
1072
1072
1073 msgid "expected revision number"
1073 msgid "expected revision number"
1074 msgstr ""
1074 msgstr ""
1075
1075
1076 msgid "revision must be followed by date line"
1076 msgid "revision must be followed by date line"
1077 msgstr ""
1077 msgstr ""
1078
1078
1079 #, python-format
1079 #, python-format
1080 msgid "found synthetic revision in %s: %r\n"
1080 msgid "found synthetic revision in %s: %r\n"
1081 msgstr ""
1081 msgstr ""
1082
1082
1083 #, python-format
1083 #, python-format
1084 msgid "writing cvs log cache %s\n"
1084 msgid "writing cvs log cache %s\n"
1085 msgstr ""
1085 msgstr ""
1086
1086
1087 #, python-format
1087 #, python-format
1088 msgid "%d log entries\n"
1088 msgid "%d log entries\n"
1089 msgstr ""
1089 msgstr ""
1090
1090
1091 msgid "creating changesets\n"
1091 msgid "creating changesets\n"
1092 msgstr ""
1092 msgstr ""
1093
1093
1094 msgid "synthetic changeset cannot have multiple parents"
1094 msgid "synthetic changeset cannot have multiple parents"
1095 msgstr ""
1095 msgstr ""
1096
1096
1097 #, python-format
1097 #, python-format
1098 msgid ""
1098 msgid ""
1099 "warning: CVS commit message references non-existent branch %r:\n"
1099 "warning: CVS commit message references non-existent branch %r:\n"
1100 "%s\n"
1100 "%s\n"
1101 msgstr ""
1101 msgstr ""
1102
1102
1103 #, python-format
1103 #, python-format
1104 msgid "%d changeset entries\n"
1104 msgid "%d changeset entries\n"
1105 msgstr ""
1105 msgstr ""
1106
1106
1107 msgid "Python ElementTree module is not available"
1107 msgid "Python ElementTree module is not available"
1108 msgstr ""
1108 msgstr ""
1109
1109
1110 #, python-format
1110 #, python-format
1111 msgid "cleaning up %s\n"
1111 msgid "cleaning up %s\n"
1112 msgstr ""
1112 msgstr ""
1113
1113
1114 msgid "internal calling inconsistency"
1114 msgid "internal calling inconsistency"
1115 msgstr ""
1115 msgstr ""
1116
1116
1117 msgid "errors in filemap"
1117 msgid "errors in filemap"
1118 msgstr ""
1118 msgstr ""
1119
1119
1120 #, python-format
1120 #, python-format
1121 msgid "%s:%d: %r already in %s list\n"
1121 msgid "%s:%d: %r already in %s list\n"
1122 msgstr ""
1122 msgstr ""
1123
1123
1124 #, python-format
1124 #, python-format
1125 msgid "%s:%d: unknown directive %r\n"
1125 msgid "%s:%d: unknown directive %r\n"
1126 msgstr ""
1126 msgstr ""
1127
1127
1128 msgid "source repository doesn't support --filemap"
1128 msgid "source repository doesn't support --filemap"
1129 msgstr ""
1129 msgstr ""
1130
1130
1131 #, python-format
1131 #, python-format
1132 msgid "%s does not look like a GNU Arch repo"
1132 msgid "%s does not look like a GNU Arch repo"
1133 msgstr ""
1133 msgstr ""
1134
1134
1135 msgid "cannot find a GNU Arch tool"
1135 msgid "cannot find a GNU Arch tool"
1136 msgstr ""
1136 msgstr ""
1137
1137
1138 #, python-format
1138 #, python-format
1139 msgid "analyzing tree version %s...\n"
1139 msgid "analyzing tree version %s...\n"
1140 msgstr ""
1140 msgstr ""
1141
1141
1142 #, python-format
1142 #, python-format
1143 msgid ""
1143 msgid ""
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1144 "tree analysis stopped because it points to an unregistered archive %s...\n"
1145 msgstr ""
1145 msgstr ""
1146
1146
1147 #, python-format
1147 #, python-format
1148 msgid "applying revision %s...\n"
1148 msgid "applying revision %s...\n"
1149 msgstr ""
1149 msgstr ""
1150
1150
1151 #, python-format
1151 #, python-format
1152 msgid "computing changeset between %s and %s...\n"
1152 msgid "computing changeset between %s and %s...\n"
1153 msgstr ""
1153 msgstr ""
1154
1154
1155 #, python-format
1155 #, python-format
1156 msgid "obtaining revision %s...\n"
1156 msgid "obtaining revision %s...\n"
1157 msgstr ""
1157 msgstr ""
1158
1158
1159 #, python-format
1159 #, python-format
1160 msgid "analyzing revision %s...\n"
1160 msgid "analyzing revision %s...\n"
1161 msgstr ""
1161 msgstr ""
1162
1162
1163 #, python-format
1163 #, python-format
1164 msgid "could not parse cat-log of %s"
1164 msgid "could not parse cat-log of %s"
1165 msgstr ""
1165 msgstr ""
1166
1166
1167 #, python-format
1167 #, python-format
1168 msgid "%s is not a local Mercurial repo"
1168 msgid "%s is not a local Mercurial repo"
1169 msgstr ""
1169 msgstr ""
1170
1170
1171 #, python-format
1171 #, python-format
1172 msgid "initializing destination %s repository\n"
1172 msgid "initializing destination %s repository\n"
1173 msgstr ""
1173 msgstr ""
1174
1174
1175 msgid "run hg sink pre-conversion action\n"
1175 msgid "run hg sink pre-conversion action\n"
1176 msgstr ""
1176 msgstr ""
1177
1177
1178 msgid "run hg sink post-conversion action\n"
1178 msgid "run hg sink post-conversion action\n"
1179 msgstr ""
1179 msgstr ""
1180
1180
1181 #, python-format
1181 #, python-format
1182 msgid "pulling from %s into %s\n"
1182 msgid "pulling from %s into %s\n"
1183 msgstr ""
1183 msgstr ""
1184
1184
1185 msgid "filtering out empty revision\n"
1185 msgid "filtering out empty revision\n"
1186 msgstr ""
1186 msgstr ""
1187
1187
1188 msgid "updating tags\n"
1188 msgid "updating tags\n"
1189 msgstr ""
1189 msgstr ""
1190
1190
1191 #, python-format
1191 #, python-format
1192 msgid "%s is not a valid start revision"
1192 msgid "%s is not a valid start revision"
1193 msgstr ""
1193 msgstr ""
1194
1194
1195 #, python-format
1195 #, python-format
1196 msgid "ignoring: %s\n"
1196 msgid "ignoring: %s\n"
1197 msgstr ""
1197 msgstr ""
1198
1198
1199 msgid "run hg source pre-conversion action\n"
1199 msgid "run hg source pre-conversion action\n"
1200 msgstr ""
1200 msgstr ""
1201
1201
1202 msgid "run hg source post-conversion action\n"
1202 msgid "run hg source post-conversion action\n"
1203 msgstr ""
1203 msgstr ""
1204
1204
1205 #, python-format
1205 #, python-format
1206 msgid "%s does not look like a monotone repo"
1206 msgid "%s does not look like a monotone repo"
1207 msgstr ""
1207 msgstr ""
1208
1208
1209 #, python-format
1209 #, python-format
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1210 msgid "copying file in renamed directory from '%s' to '%s'"
1211 msgstr ""
1211 msgstr ""
1212
1212
1213 msgid "reading p4 views\n"
1213 msgid "reading p4 views\n"
1214 msgstr ""
1214 msgstr ""
1215
1215
1216 msgid "collecting p4 changelists\n"
1216 msgid "collecting p4 changelists\n"
1217 msgstr ""
1217 msgstr ""
1218
1218
1219 msgid "Subversion python bindings could not be loaded"
1219 msgid "Subversion python bindings could not be loaded"
1220 msgstr ""
1220 msgstr ""
1221
1221
1222 #, python-format
1222 #, python-format
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1223 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1224 msgstr ""
1224 msgstr ""
1225
1225
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1226 msgid "Subversion python bindings are too old, 1.4 or later required"
1227 msgstr ""
1227 msgstr ""
1228
1228
1229 #, python-format
1229 #, python-format
1230 msgid "svn: revision %s is not an integer"
1230 msgid "svn: revision %s is not an integer"
1231 msgstr ""
1231 msgstr ""
1232
1232
1233 #, python-format
1233 #, python-format
1234 msgid "svn: start revision %s is not an integer"
1234 msgid "svn: start revision %s is not an integer"
1235 msgstr ""
1235 msgstr ""
1236
1236
1237 #, python-format
1237 #, python-format
1238 msgid "no revision found in module %s"
1238 msgid "no revision found in module %s"
1239 msgstr ""
1239 msgstr ""
1240
1240
1241 #, python-format
1241 #, python-format
1242 msgid "expected %s to be at %r, but not found"
1242 msgid "expected %s to be at %r, but not found"
1243 msgstr ""
1243 msgstr ""
1244
1244
1245 #, python-format
1245 #, python-format
1246 msgid "found %s at %r\n"
1246 msgid "found %s at %r\n"
1247 msgstr ""
1247 msgstr ""
1248
1248
1249 #, python-format
1249 #, python-format
1250 msgid "ignoring empty branch %s\n"
1250 msgid "ignoring empty branch %s\n"
1251 msgstr ""
1251 msgstr ""
1252
1252
1253 #, python-format
1253 #, python-format
1254 msgid "found branch %s at %d\n"
1254 msgid "found branch %s at %d\n"
1255 msgstr ""
1255 msgstr ""
1256
1256
1257 msgid "svn: start revision is not supported with more than one branch"
1257 msgid "svn: start revision is not supported with more than one branch"
1258 msgstr ""
1258 msgstr ""
1259
1259
1260 #, python-format
1260 #, python-format
1261 msgid "svn: no revision found after start revision %d"
1261 msgid "svn: no revision found after start revision %d"
1262 msgstr ""
1262 msgstr ""
1263
1263
1264 #, python-format
1264 #, python-format
1265 msgid "no tags found at revision %d\n"
1265 msgid "no tags found at revision %d\n"
1266 msgstr ""
1266 msgstr ""
1267
1267
1268 #, python-format
1268 #, python-format
1269 msgid "ignoring foreign branch %r\n"
1269 msgid "ignoring foreign branch %r\n"
1270 msgstr ""
1270 msgstr ""
1271
1271
1272 #, python-format
1272 #, python-format
1273 msgid "%s not found up to revision %d"
1273 msgid "%s not found up to revision %d"
1274 msgstr ""
1274 msgstr ""
1275
1275
1276 #, python-format
1276 #, python-format
1277 msgid "branch renamed from %s to %s at %d\n"
1277 msgid "branch renamed from %s to %s at %d\n"
1278 msgstr ""
1278 msgstr ""
1279
1279
1280 #, python-format
1280 #, python-format
1281 msgid "reparent to %s\n"
1281 msgid "reparent to %s\n"
1282 msgstr ""
1282 msgstr ""
1283
1283
1284 #, python-format
1284 #, python-format
1285 msgid "copied to %s from %s@%s\n"
1285 msgid "copied to %s from %s@%s\n"
1286 msgstr ""
1286 msgstr ""
1287
1287
1288 #, python-format
1288 #, python-format
1289 msgid "gone from %s\n"
1289 msgid "gone from %s\n"
1290 msgstr ""
1290 msgstr ""
1291
1291
1292 #, python-format
1292 #, python-format
1293 msgid "entry %s\n"
1293 msgid "entry %s\n"
1294 msgstr ""
1294 msgstr ""
1295
1295
1296 #, python-format
1296 #, python-format
1297 msgid "unknown path in revision %d: %s\n"
1297 msgid "unknown path in revision %d: %s\n"
1298 msgstr ""
1298 msgstr ""
1299
1299
1300 #, python-format
1300 #, python-format
1301 msgid "mark %s came from %s:%d\n"
1301 msgid "mark %s came from %s:%d\n"
1302 msgstr ""
1302 msgstr ""
1303
1303
1304 #, python-format
1304 #, python-format
1305 msgid "parsing revision %d (%d changes)\n"
1305 msgid "parsing revision %d (%d changes)\n"
1306 msgstr ""
1306 msgstr ""
1307
1307
1308 #, python-format
1308 #, python-format
1309 msgid "found parent of branch %s at %d: %s\n"
1309 msgid "found parent of branch %s at %d: %s\n"
1310 msgstr ""
1310 msgstr ""
1311
1311
1312 msgid "no copyfrom path, don't know what to do.\n"
1312 msgid "no copyfrom path, don't know what to do.\n"
1313 msgstr ""
1313 msgstr ""
1314
1314
1315 #, python-format
1315 #, python-format
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1316 msgid "fetching revision log for \"%s\" from %d to %d\n"
1317 msgstr ""
1317 msgstr ""
1318
1318
1319 #, python-format
1319 #, python-format
1320 msgid "revision %d has no entries\n"
1320 msgid "revision %d has no entries\n"
1321 msgstr ""
1321 msgstr ""
1322
1322
1323 #, python-format
1323 #, python-format
1324 msgid "svn: branch has no revision %s"
1324 msgid "svn: branch has no revision %s"
1325 msgstr ""
1325 msgstr ""
1326
1326
1327 #, python-format
1327 #, python-format
1328 msgid "%r is not under %r, ignoring\n"
1328 msgid "%r is not under %r, ignoring\n"
1329 msgstr ""
1329 msgstr ""
1330
1330
1331 #, python-format
1331 #, python-format
1332 msgid "initializing svn repo %r\n"
1332 msgid "initializing svn repo %r\n"
1333 msgstr ""
1333 msgstr ""
1334
1334
1335 #, python-format
1335 #, python-format
1336 msgid "initializing svn wc %r\n"
1336 msgid "initializing svn wc %r\n"
1337 msgstr ""
1337 msgstr ""
1338
1338
1339 msgid "unexpected svn output:\n"
1339 msgid "unexpected svn output:\n"
1340 msgstr ""
1340 msgstr ""
1341
1341
1342 msgid "unable to cope with svn output"
1342 msgid "unable to cope with svn output"
1343 msgstr ""
1343 msgstr ""
1344
1344
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1345 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1346 msgstr ""
1346 msgstr ""
1347
1347
1348 msgid ""
1348 msgid ""
1349 "command to allow external programs to compare revisions\n"
1349 "command to allow external programs to compare revisions\n"
1350 "\n"
1350 "\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1351 "The `extdiff' Mercurial extension allows you to use external programs\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1352 "to compare revisions, or revision with working directory. The external diff\n"
1353 "programs are called with a configurable set of options and two\n"
1353 "programs are called with a configurable set of options and two\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1354 "non-option arguments: paths to directories containing snapshots of\n"
1355 "files to compare.\n"
1355 "files to compare.\n"
1356 "\n"
1356 "\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1357 "The `extdiff' extension also allows to configure new diff commands, so\n"
1358 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1358 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1359 "\n"
1359 "\n"
1360 " [extdiff]\n"
1360 " [extdiff]\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1361 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1362 " cdiff = gdiff -Nprc5\n"
1362 " cdiff = gdiff -Nprc5\n"
1363 " ## or the old way:\n"
1363 " ## or the old way:\n"
1364 " #cmd.cdiff = gdiff\n"
1364 " #cmd.cdiff = gdiff\n"
1365 " #opts.cdiff = -Nprc5\n"
1365 " #opts.cdiff = -Nprc5\n"
1366 "\n"
1366 "\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1367 " # add new command called vdiff, runs kdiff3\n"
1368 " vdiff = kdiff3\n"
1368 " vdiff = kdiff3\n"
1369 "\n"
1369 "\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1370 " # add new command called meld, runs meld (no need to name twice)\n"
1371 " meld =\n"
1371 " meld =\n"
1372 "\n"
1372 "\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1373 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1374 " # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1375 " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1376 "in\n"
1376 "in\n"
1377 " # your .vimrc\n"
1377 " # your .vimrc\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1378 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1379 "\n"
1379 "\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1380 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1381 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1381 "diff\" command. The `extdiff' extension makes snapshots of only needed\n"
1382 "files, so running the external diff program will actually be pretty\n"
1382 "files, so running the external diff program will actually be pretty\n"
1383 "fast (at least faster than having to compare the entire tree).\n"
1383 "fast (at least faster than having to compare the entire tree).\n"
1384 msgstr ""
1384 msgstr ""
1385
1385
1386 #, python-format
1386 #, python-format
1387 msgid "making snapshot of %d files from rev %s\n"
1387 msgid "making snapshot of %d files from rev %s\n"
1388 msgstr ""
1388 msgstr ""
1389
1389
1390 #, python-format
1390 #, python-format
1391 msgid "making snapshot of %d files from working directory\n"
1391 msgid "making snapshot of %d files from working directory\n"
1392 msgstr ""
1392 msgstr ""
1393
1393
1394 msgid "cannot specify --rev and --change at the same time"
1394 msgid "cannot specify --rev and --change at the same time"
1395 msgstr ""
1395 msgstr ""
1396
1396
1397 #, python-format
1397 #, python-format
1398 msgid "running %r in %s\n"
1398 msgid "running %r in %s\n"
1399 msgstr ""
1399 msgstr ""
1400
1400
1401 #, python-format
1401 #, python-format
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1402 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1403 msgstr ""
1403 msgstr ""
1404
1404
1405 msgid "cleaning up temp directory\n"
1405 msgid "cleaning up temp directory\n"
1406 msgstr ""
1406 msgstr ""
1407
1407
1408 msgid ""
1408 msgid ""
1409 "use external program to diff repository (or selected files)\n"
1409 "use external program to diff repository (or selected files)\n"
1410 "\n"
1410 "\n"
1411 " Show differences between revisions for the specified files, using\n"
1411 " Show differences between revisions for the specified files, using\n"
1412 " an external program. The default program used is diff, with\n"
1412 " an external program. The default program used is diff, with\n"
1413 " default options \"-Npru\".\n"
1413 " default options \"-Npru\".\n"
1414 "\n"
1414 "\n"
1415 " To select a different program, use the -p/--program option. The\n"
1415 " To select a different program, use the -p/--program option. The\n"
1416 " program will be passed the names of two directories to compare. To\n"
1416 " program will be passed the names of two directories to compare. To\n"
1417 " pass additional options to the program, use -o/--option. These\n"
1417 " pass additional options to the program, use -o/--option. These\n"
1418 " will be passed before the names of the directories to compare.\n"
1418 " will be passed before the names of the directories to compare.\n"
1419 "\n"
1419 "\n"
1420 " When two revision arguments are given, then changes are shown\n"
1420 " When two revision arguments are given, then changes are shown\n"
1421 " between those revisions. If only one revision is specified then\n"
1421 " between those revisions. If only one revision is specified then\n"
1422 " that revision is compared to the working directory, and, when no\n"
1422 " that revision is compared to the working directory, and, when no\n"
1423 " revisions are specified, the working directory files are compared\n"
1423 " revisions are specified, the working directory files are compared\n"
1424 " to its parent."
1424 " to its parent."
1425 msgstr ""
1425 msgstr ""
1426
1426
1427 msgid "comparison program to run"
1427 msgid "comparison program to run"
1428 msgstr ""
1428 msgstr ""
1429
1429
1430 msgid "pass option to comparison program"
1430 msgid "pass option to comparison program"
1431 msgstr ""
1431 msgstr ""
1432
1432
1433 msgid "change made by revision"
1433 msgid "change made by revision"
1434 msgstr ""
1434 msgstr ""
1435
1435
1436 msgid "hg extdiff [OPT]... [FILE]..."
1436 msgid "hg extdiff [OPT]... [FILE]..."
1437 msgstr ""
1437 msgstr ""
1438
1438
1439 #, python-format
1439 #, python-format
1440 msgid "hg %s [OPTION]... [FILE]..."
1440 msgid "hg %s [OPTION]... [FILE]..."
1441 msgstr ""
1441 msgstr ""
1442
1442
1443 msgid "pull, update and merge in one command"
1443 msgid "pull, update and merge in one command"
1444 msgstr ""
1444 msgstr ""
1445
1445
1446 msgid ""
1446 msgid ""
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1447 "pull changes from a remote repository, merge new changes if needed.\n"
1448 "\n"
1448 "\n"
1449 " This finds all changes from the repository at the specified path\n"
1449 " This finds all changes from the repository at the specified path\n"
1450 " or URL and adds them to the local repository.\n"
1450 " or URL and adds them to the local repository.\n"
1451 "\n"
1451 "\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1452 " If the pulled changes add a new branch head, the head is\n"
1453 " automatically merged, and the result of the merge is committed.\n"
1453 " automatically merged, and the result of the merge is committed.\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1454 " Otherwise, the working directory is updated to include the new\n"
1455 " changes.\n"
1455 " changes.\n"
1456 "\n"
1456 "\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1457 " When a merge occurs, the newly pulled changes are assumed to be\n"
1458 " \"authoritative\". The head of the new changes is used as the first\n"
1458 " \"authoritative\". The head of the new changes is used as the first\n"
1459 " parent, with local changes as the second. To switch the merge\n"
1459 " parent, with local changes as the second. To switch the merge\n"
1460 " order, use --switch-parent.\n"
1460 " order, use --switch-parent.\n"
1461 "\n"
1461 "\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1462 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1463 " "
1463 " "
1464 msgstr ""
1464 msgstr ""
1465
1465
1466 msgid ""
1466 msgid ""
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1467 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1468 msgstr ""
1468 msgstr ""
1469
1469
1470 msgid "outstanding uncommitted merge"
1470 msgid "outstanding uncommitted merge"
1471 msgstr ""
1471 msgstr ""
1472
1472
1473 msgid "outstanding uncommitted changes"
1473 msgid "outstanding uncommitted changes"
1474 msgstr ""
1474 msgstr ""
1475
1475
1476 msgid "working directory is missing some files"
1476 msgid "working directory is missing some files"
1477 msgstr ""
1477 msgstr ""
1478
1478
1479 msgid ""
1479 msgid ""
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1480 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1481 msgstr ""
1481 msgstr ""
1482
1482
1483 #, python-format
1483 #, python-format
1484 msgid "pulling from %s\n"
1484 msgid "pulling from %s\n"
1485 msgstr ""
1485 msgstr ""
1486
1486
1487 msgid ""
1487 msgid ""
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1488 "Other repository doesn't support revision lookup, so a rev cannot be "
1489 "specified."
1489 "specified."
1490 msgstr ""
1490 msgstr ""
1491
1491
1492 #, python-format
1492 #, python-format
1493 msgid ""
1493 msgid ""
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1494 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1495 "\" to merge them)\n"
1495 "\" to merge them)\n"
1496 msgstr ""
1496 msgstr ""
1497
1497
1498 #, python-format
1498 #, python-format
1499 msgid "updating to %d:%s\n"
1499 msgid "updating to %d:%s\n"
1500 msgstr ""
1500 msgstr ""
1501
1501
1502 #, python-format
1502 #, python-format
1503 msgid "merging with %d:%s\n"
1503 msgid "merging with %d:%s\n"
1504 msgstr ""
1504 msgstr ""
1505
1505
1506 #, python-format
1506 #, python-format
1507 msgid "Automated merge with %s"
1507 msgid "Automated merge with %s"
1508 msgstr ""
1508 msgstr ""
1509
1509
1510 #, python-format
1510 #, python-format
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1511 msgid "new changeset %d:%s merges remote changes with local\n"
1512 msgstr ""
1512 msgstr ""
1513
1513
1514 msgid "a specific revision you would like to pull"
1514 msgid "a specific revision you would like to pull"
1515 msgstr ""
1515 msgstr ""
1516
1516
1517 msgid "edit commit message"
1517 msgid "edit commit message"
1518 msgstr ""
1518 msgstr ""
1519
1519
1520 msgid "edit commit message (DEPRECATED)"
1520 msgid "edit commit message (DEPRECATED)"
1521 msgstr ""
1521 msgstr ""
1522
1522
1523 msgid "switch parents when merging"
1523 msgid "switch parents when merging"
1524 msgstr ""
1524 msgstr ""
1525
1525
1526 msgid "hg fetch [SOURCE]"
1526 msgid "hg fetch [SOURCE]"
1527 msgstr ""
1527 msgstr ""
1528
1528
1529 msgid "commands to sign and verify changesets"
1529 msgid "commands to sign and verify changesets"
1530 msgstr ""
1530 msgstr ""
1531
1531
1532 msgid "error while verifying signature"
1532 msgid "error while verifying signature"
1533 msgstr ""
1533 msgstr ""
1534
1534
1535 #, python-format
1535 #, python-format
1536 msgid "%s Bad signature from \"%s\"\n"
1536 msgid "%s Bad signature from \"%s\"\n"
1537 msgstr ""
1537 msgstr ""
1538
1538
1539 #, python-format
1539 #, python-format
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1540 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1541 msgstr ""
1541 msgstr ""
1542
1542
1543 #, python-format
1543 #, python-format
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1544 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1545 msgstr ""
1545 msgstr ""
1546
1546
1547 msgid "list signed changesets"
1547 msgid "list signed changesets"
1548 msgstr ""
1548 msgstr ""
1549
1549
1550 #, python-format
1550 #, python-format
1551 msgid "%s:%d node does not exist\n"
1551 msgid "%s:%d node does not exist\n"
1552 msgstr ""
1552 msgstr ""
1553
1553
1554 msgid "verify all the signatures there may be for a particular revision"
1554 msgid "verify all the signatures there may be for a particular revision"
1555 msgstr ""
1555 msgstr ""
1556
1556
1557 #, python-format
1557 #, python-format
1558 msgid "No valid signature for %s\n"
1558 msgid "No valid signature for %s\n"
1559 msgstr ""
1559 msgstr ""
1560
1560
1561 msgid ""
1561 msgid ""
1562 "add a signature for the current or given revision\n"
1562 "add a signature for the current or given revision\n"
1563 "\n"
1563 "\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1564 " If no revision is given, the parent of the working directory is used,\n"
1565 " or tip if no revision is checked out.\n"
1565 " or tip if no revision is checked out.\n"
1566 "\n"
1566 "\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1567 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1568 " "
1568 " "
1569 msgstr ""
1569 msgstr ""
1570
1570
1571 msgid "uncommitted merge - please provide a specific revision"
1571 msgid "uncommitted merge - please provide a specific revision"
1572 msgstr ""
1572 msgstr ""
1573
1573
1574 msgid "Error while signing"
1574 msgid "Error while signing"
1575 msgstr ""
1575 msgstr ""
1576
1576
1577 msgid ""
1577 msgid ""
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1578 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1579 "force)"
1579 "force)"
1580 msgstr ""
1580 msgstr ""
1581
1581
1582 #, python-format
1582 #, python-format
1583 msgid "Added signature for changeset %s"
1583 msgid "Added signature for changeset %s"
1584 msgstr ""
1584 msgstr ""
1585
1585
1586 msgid "unknown signature version"
1586 msgid "unknown signature version"
1587 msgstr ""
1587 msgstr ""
1588
1588
1589 msgid "make the signature local"
1589 msgid "make the signature local"
1590 msgstr ""
1590 msgstr ""
1591
1591
1592 msgid "sign even if the sigfile is modified"
1592 msgid "sign even if the sigfile is modified"
1593 msgstr ""
1593 msgstr ""
1594
1594
1595 msgid "do not commit the sigfile after signing"
1595 msgid "do not commit the sigfile after signing"
1596 msgstr ""
1596 msgstr ""
1597
1597
1598 msgid "the key id to sign with"
1598 msgid "the key id to sign with"
1599 msgstr ""
1599 msgstr ""
1600
1600
1601 msgid "commit message"
1601 msgid "commit message"
1602 msgstr ""
1602 msgstr ""
1603
1603
1604 msgid "hg sign [OPTION]... [REVISION]..."
1604 msgid "hg sign [OPTION]... [REVISION]..."
1605 msgstr ""
1605 msgstr ""
1606
1606
1607 msgid "hg sigcheck REVISION"
1607 msgid "hg sigcheck REVISION"
1608 msgstr ""
1608 msgstr ""
1609
1609
1610 msgid "hg sigs"
1610 msgid "hg sigs"
1611 msgstr ""
1611 msgstr ""
1612
1612
1613 msgid ""
1613 msgid ""
1614 "command to view revision graphs from a shell\n"
1614 "command to view revision graphs from a shell\n"
1615 "\n"
1615 "\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1616 "This extension adds a --graph option to the incoming, outgoing and log\n"
1617 "commands. When this options is given, an ASCII representation of the\n"
1617 "commands. When this options is given, an ASCII representation of the\n"
1618 "revision graph is also shown.\n"
1618 "revision graph is also shown.\n"
1619 msgstr ""
1619 msgstr ""
1620
1620
1621 #, python-format
1621 #, python-format
1622 msgid "--graph option is incompatible with --%s"
1622 msgid "--graph option is incompatible with --%s"
1623 msgstr ""
1623 msgstr ""
1624
1624
1625 msgid ""
1625 msgid ""
1626 "show revision history alongside an ASCII revision graph\n"
1626 "show revision history alongside an ASCII revision graph\n"
1627 "\n"
1627 "\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1628 " Print a revision history alongside a revision graph drawn with\n"
1629 " ASCII characters.\n"
1629 " ASCII characters.\n"
1630 "\n"
1630 "\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1631 " Nodes printed as an @ character are parents of the working\n"
1632 " directory.\n"
1632 " directory.\n"
1633 " "
1633 " "
1634 msgstr ""
1634 msgstr ""
1635
1635
1636 #, python-format
1636 #, python-format
1637 msgid "comparing with %s\n"
1637 msgid "comparing with %s\n"
1638 msgstr "comparaison avec %s\n"
1638 msgstr "comparaison avec %s\n"
1639
1639
1640 msgid "no changes found\n"
1640 msgid "no changes found\n"
1641 msgstr "aucun changement trouvé\n"
1641 msgstr "aucun changement trouvé\n"
1642
1642
1643 msgid "show the revision DAG"
1643 msgid "show the revision DAG"
1644 msgstr ""
1644 msgstr ""
1645
1645
1646 msgid "limit number of changes displayed"
1646 msgid "limit number of changes displayed"
1647 msgstr ""
1647 msgstr ""
1648
1648
1649 msgid "show patch"
1649 msgid "show patch"
1650 msgstr ""
1650 msgstr ""
1651
1651
1652 msgid "show the specified revision or range"
1652 msgid "show the specified revision or range"
1653 msgstr ""
1653 msgstr ""
1654
1654
1655 msgid "hg glog [OPTION]... [FILE]"
1655 msgid "hg glog [OPTION]... [FILE]"
1656 msgstr ""
1656 msgstr ""
1657
1657
1658 msgid ""
1658 msgid ""
1659 "hooks for integrating with the CIA.vc notification service\n"
1659 "hooks for integrating with the CIA.vc notification service\n"
1660 "\n"
1660 "\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1661 "This is meant to be run as a changegroup or incoming hook.\n"
1662 "To configure it, set the following options in your hgrc:\n"
1662 "To configure it, set the following options in your hgrc:\n"
1663 "\n"
1663 "\n"
1664 "[cia]\n"
1664 "[cia]\n"
1665 "# your registered CIA user name\n"
1665 "# your registered CIA user name\n"
1666 "user = foo\n"
1666 "user = foo\n"
1667 "# the name of the project in CIA\n"
1667 "# the name of the project in CIA\n"
1668 "project = foo\n"
1668 "project = foo\n"
1669 "# the module (subproject) (optional)\n"
1669 "# the module (subproject) (optional)\n"
1670 "#module = foo\n"
1670 "#module = foo\n"
1671 "# Append a diffstat to the log message (optional)\n"
1671 "# Append a diffstat to the log message (optional)\n"
1672 "#diffstat = False\n"
1672 "#diffstat = False\n"
1673 "# Template to use for log messages (optional)\n"
1673 "# Template to use for log messages (optional)\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1674 "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1675 "# Style to use (optional)\n"
1675 "# Style to use (optional)\n"
1676 "#style = foo\n"
1676 "#style = foo\n"
1677 "# The URL of the CIA notification service (optional)\n"
1677 "# The URL of the CIA notification service (optional)\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1678 "# You can use mailto: URLs to send by email, eg\n"
1679 "# mailto:cia@cia.vc\n"
1679 "# mailto:cia@cia.vc\n"
1680 "# Make sure to set email.from if you do this.\n"
1680 "# Make sure to set email.from if you do this.\n"
1681 "#url = http://cia.vc/\n"
1681 "#url = http://cia.vc/\n"
1682 "# print message instead of sending it (optional)\n"
1682 "# print message instead of sending it (optional)\n"
1683 "#test = False\n"
1683 "#test = False\n"
1684 "\n"
1684 "\n"
1685 "[hooks]\n"
1685 "[hooks]\n"
1686 "# one of these:\n"
1686 "# one of these:\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1687 "changegroup.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1688 "#incoming.cia = python:hgcia.hook\n"
1689 "\n"
1689 "\n"
1690 "[web]\n"
1690 "[web]\n"
1691 "# If you want hyperlinks (optional)\n"
1691 "# If you want hyperlinks (optional)\n"
1692 "baseurl = http://server/path/to/repo\n"
1692 "baseurl = http://server/path/to/repo\n"
1693 msgstr ""
1693 msgstr ""
1694
1694
1695 #, python-format
1695 #, python-format
1696 msgid "hgcia: sending update to %s\n"
1696 msgid "hgcia: sending update to %s\n"
1697 msgstr ""
1697 msgstr ""
1698
1698
1699 msgid "email.from must be defined when sending by email"
1699 msgid "email.from must be defined when sending by email"
1700 msgstr ""
1700 msgstr ""
1701
1701
1702 msgid "cia: no user specified"
1702 msgid "cia: no user specified"
1703 msgstr ""
1703 msgstr ""
1704
1704
1705 msgid "cia: no project specified"
1705 msgid "cia: no project specified"
1706 msgstr ""
1706 msgstr ""
1707
1707
1708 msgid ""
1708 msgid ""
1709 "browse the repository in a graphical way\n"
1709 "browse the repository in a graphical way\n"
1710 "\n"
1710 "\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1711 "The hgk extension allows browsing the history of a repository in a\n"
1712 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1712 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1713 "distributed with Mercurial.)\n"
1713 "distributed with Mercurial.)\n"
1714 "\n"
1714 "\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1715 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1716 "querying of information, and an extension to Mercurial named hgk.py,\n"
1716 "querying of information, and an extension to Mercurial named hgk.py,\n"
1717 "which provides hooks for hgk to get information. hgk can be found in\n"
1717 "which provides hooks for hgk to get information. hgk can be found in\n"
1718 "the contrib directory, and the extension is shipped in the hgext\n"
1718 "the contrib directory, and the extension is shipped in the hgext\n"
1719 "repository, and needs to be enabled.\n"
1719 "repository, and needs to be enabled.\n"
1720 "\n"
1720 "\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1721 "The hg view command will launch the hgk Tcl script. For this command\n"
1722 "to work, hgk must be in your search path. Alternately, you can specify\n"
1722 "to work, hgk must be in your search path. Alternately, you can specify\n"
1723 "the path to hgk in your .hgrc file:\n"
1723 "the path to hgk in your .hgrc file:\n"
1724 "\n"
1724 "\n"
1725 " [hgk]\n"
1725 " [hgk]\n"
1726 " path=/location/of/hgk\n"
1726 " path=/location/of/hgk\n"
1727 "\n"
1727 "\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1728 "hgk can make use of the extdiff extension to visualize revisions.\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1729 "Assuming you had already configured extdiff vdiff command, just add:\n"
1730 "\n"
1730 "\n"
1731 " [hgk]\n"
1731 " [hgk]\n"
1732 " vdiff=vdiff\n"
1732 " vdiff=vdiff\n"
1733 "\n"
1733 "\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1734 "Revisions context menu will now display additional entries to fire\n"
1735 "vdiff on hovered and selected revisions."
1735 "vdiff on hovered and selected revisions."
1736 msgstr ""
1736 msgstr ""
1737
1737
1738 msgid "diff trees from two commits"
1738 msgid "diff trees from two commits"
1739 msgstr ""
1739 msgstr ""
1740
1740
1741 msgid "output common ancestor information"
1741 msgid "output common ancestor information"
1742 msgstr ""
1742 msgstr ""
1743
1743
1744 msgid "cat a specific revision"
1744 msgid "cat a specific revision"
1745 msgstr ""
1745 msgstr ""
1746
1746
1747 msgid "cat-file: type or revision not supplied\n"
1747 msgid "cat-file: type or revision not supplied\n"
1748 msgstr ""
1748 msgstr ""
1749
1749
1750 msgid "aborting hg cat-file only understands commits\n"
1750 msgid "aborting hg cat-file only understands commits\n"
1751 msgstr ""
1751 msgstr ""
1752
1752
1753 msgid "parse given revisions"
1753 msgid "parse given revisions"
1754 msgstr ""
1754 msgstr ""
1755
1755
1756 msgid "print revisions"
1756 msgid "print revisions"
1757 msgstr ""
1757 msgstr ""
1758
1758
1759 msgid "print extension options"
1759 msgid "print extension options"
1760 msgstr ""
1760 msgstr ""
1761
1761
1762 msgid "start interactive history viewer"
1762 msgid "start interactive history viewer"
1763 msgstr ""
1763 msgstr ""
1764
1764
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1765 msgid "hg view [-l LIMIT] [REVRANGE]"
1766 msgstr ""
1766 msgstr ""
1767
1767
1768 msgid "generate patch"
1768 msgid "generate patch"
1769 msgstr ""
1769 msgstr ""
1770
1770
1771 msgid "recursive"
1771 msgid "recursive"
1772 msgstr ""
1772 msgstr ""
1773
1773
1774 msgid "pretty"
1774 msgid "pretty"
1775 msgstr ""
1775 msgstr ""
1776
1776
1777 msgid "stdin"
1777 msgid "stdin"
1778 msgstr ""
1778 msgstr ""
1779
1779
1780 msgid "detect copies"
1780 msgid "detect copies"
1781 msgstr ""
1781 msgstr ""
1782
1782
1783 msgid "search"
1783 msgid "search"
1784 msgstr ""
1784 msgstr ""
1785
1785
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1786 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1787 msgstr ""
1787 msgstr ""
1788
1788
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1789 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1790 msgstr ""
1790 msgstr ""
1791
1791
1792 msgid "hg debug-config"
1792 msgid "hg debug-config"
1793 msgstr ""
1793 msgstr ""
1794
1794
1795 msgid "hg debug-merge-base REV REV"
1795 msgid "hg debug-merge-base REV REV"
1796 msgstr ""
1796 msgstr ""
1797
1797
1798 msgid "ignored"
1798 msgid "ignored"
1799 msgstr ""
1799 msgstr ""
1800
1800
1801 msgid "hg debug-rev-parse REV"
1801 msgid "hg debug-rev-parse REV"
1802 msgstr ""
1802 msgstr ""
1803
1803
1804 msgid "header"
1804 msgid "header"
1805 msgstr ""
1805 msgstr ""
1806
1806
1807 msgid "topo-order"
1807 msgid "topo-order"
1808 msgstr ""
1808 msgstr ""
1809
1809
1810 msgid "parents"
1810 msgid "parents"
1811 msgstr ""
1811 msgstr ""
1812
1812
1813 msgid "max-count"
1813 msgid "max-count"
1814 msgstr ""
1814 msgstr ""
1815
1815
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1816 msgid "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1817 msgstr "hg debug-rev-list [OPTION]... REV..."
1818
1818
1819 msgid ""
1819 msgid ""
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1820 "syntax highlighting for hgweb (requires Pygments)\n"
1821 "\n"
1821 "\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1822 "It depends on the Pygments syntax highlighting library:\n"
1823 "http://pygments.org/\n"
1823 "http://pygments.org/\n"
1824 "\n"
1824 "\n"
1825 "There is a single configuration option:\n"
1825 "There is a single configuration option:\n"
1826 "\n"
1826 "\n"
1827 "[web]\n"
1827 "[web]\n"
1828 "pygments_style = <style>\n"
1828 "pygments_style = <style>\n"
1829 "\n"
1829 "\n"
1830 "The default is 'colorful'.\n"
1830 "The default is 'colorful'.\n"
1831 msgstr ""
1831 msgstr ""
1832
1832
1833 msgid "accelerate status report using Linux's inotify service"
1833 msgid "accelerate status report using Linux's inotify service"
1834 msgstr ""
1834 msgstr ""
1835
1835
1836 msgid "start an inotify server for this repository"
1836 msgid "start an inotify server for this repository"
1837 msgstr ""
1837 msgstr ""
1838
1838
1839 msgid ""
1839 msgid ""
1840 "debugging information for inotify extension\n"
1840 "debugging information for inotify extension\n"
1841 "\n"
1841 "\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1842 " Prints the list of directories being watched by the inotify server.\n"
1843 " "
1843 " "
1844 msgstr ""
1844 msgstr ""
1845
1845
1846 msgid "directories being watched:\n"
1846 msgid "directories being watched:\n"
1847 msgstr ""
1847 msgstr ""
1848
1848
1849 msgid "run server in background"
1849 msgid "run server in background"
1850 msgstr ""
1850 msgstr ""
1851
1851
1852 msgid "used internally by daemon mode"
1852 msgid "used internally by daemon mode"
1853 msgstr ""
1853 msgstr ""
1854
1854
1855 msgid "minutes to sit idle before exiting"
1855 msgid "minutes to sit idle before exiting"
1856 msgstr ""
1856 msgstr ""
1857
1857
1858 msgid "name of file to write process ID to"
1858 msgid "name of file to write process ID to"
1859 msgstr ""
1859 msgstr ""
1860
1860
1861 msgid "hg inserve [OPTION]..."
1861 msgid "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1862 msgstr "hg inserve [OPTION]..."
1863
1863
1864 msgid "(found dead inotify server socket; removing it)\n"
1864 msgid "(found dead inotify server socket; removing it)\n"
1865 msgstr ""
1865 msgstr ""
1866
1866
1867 msgid "(starting inotify server)\n"
1867 msgid "(starting inotify server)\n"
1868 msgstr ""
1868 msgstr ""
1869
1869
1870 #, python-format
1870 #, python-format
1871 msgid "could not start inotify server: %s\n"
1871 msgid "could not start inotify server: %s\n"
1872 msgstr ""
1872 msgstr ""
1873
1873
1874 #, python-format
1874 #, python-format
1875 msgid "could not talk to new inotify server: %s\n"
1875 msgid "could not talk to new inotify server: %s\n"
1876 msgstr ""
1876 msgstr ""
1877
1877
1878 msgid "(inotify server not running)\n"
1878 msgid "(inotify server not running)\n"
1879 msgstr ""
1879 msgstr ""
1880
1880
1881 #, python-format
1881 #, python-format
1882 msgid "failed to contact inotify server: %s\n"
1882 msgid "failed to contact inotify server: %s\n"
1883 msgstr ""
1883 msgstr ""
1884
1884
1885 msgid "received empty answer from inotify server"
1885 msgid "received empty answer from inotify server"
1886 msgstr ""
1886 msgstr ""
1887
1887
1888 #, python-format
1888 #, python-format
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1889 msgid "(inotify: received response from incompatible server version %d)\n"
1890 msgstr ""
1890 msgstr ""
1891
1891
1892 #, python-format
1892 #, python-format
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1893 msgid "(inotify: received '%s' response when expecting '%s')\n"
1894 msgstr ""
1894 msgstr ""
1895
1895
1896 msgid "this system does not seem to support inotify"
1896 msgid "this system does not seem to support inotify"
1897 msgstr ""
1897 msgstr ""
1898
1898
1899 #, python-format
1899 #, python-format
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1900 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
1901 msgstr ""
1901 msgstr ""
1902
1902
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1903 msgid "*** this limit is too low to watch every directory in this repository\n"
1904 msgstr ""
1904 msgstr ""
1905
1905
1906 msgid "*** counting directories: "
1906 msgid "*** counting directories: "
1907 msgstr ""
1907 msgstr ""
1908
1908
1909 #, python-format
1909 #, python-format
1910 msgid "found %d\n"
1910 msgid "found %d\n"
1911 msgstr ""
1911 msgstr ""
1912
1912
1913 #, python-format
1913 #, python-format
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1914 msgid "*** to raise the limit from %d to %d (run as root):\n"
1915 msgstr ""
1915 msgstr ""
1916
1916
1917 #, python-format
1917 #, python-format
1918 msgid "*** echo %d > %s\n"
1918 msgid "*** echo %d > %s\n"
1919 msgstr ""
1919 msgstr ""
1920
1920
1921 #, python-format
1921 #, python-format
1922 msgid "cannot watch %s until inotify watch limit is raised"
1922 msgid "cannot watch %s until inotify watch limit is raised"
1923 msgstr ""
1923 msgstr ""
1924
1924
1925 #, python-format
1925 #, python-format
1926 msgid "inotify service not available: %s"
1926 msgid "inotify service not available: %s"
1927 msgstr ""
1927 msgstr ""
1928
1928
1929 #, python-format
1929 #, python-format
1930 msgid "watching %r\n"
1930 msgid "watching %r\n"
1931 msgstr ""
1931 msgstr ""
1932
1932
1933 #, python-format
1933 #, python-format
1934 msgid "watching directories under %r\n"
1934 msgid "watching directories under %r\n"
1935 msgstr ""
1935 msgstr ""
1936
1936
1937 #, python-format
1937 #, python-format
1938 msgid "status: %r dir(%d) -> %s\n"
1938 msgid "status: %r dir(%d) -> %s\n"
1939 msgstr ""
1939 msgstr ""
1940
1940
1941 #, python-format
1941 #, python-format
1942 msgid "status: %r %s -> %s\n"
1942 msgid "status: %r %s -> %s\n"
1943 msgstr ""
1943 msgstr ""
1944
1944
1945 #, python-format
1945 #, python-format
1946 msgid "%s dirstate reload\n"
1946 msgid "%s dirstate reload\n"
1947 msgstr ""
1947 msgstr ""
1948
1948
1949 #, python-format
1949 #, python-format
1950 msgid "%s end dirstate reload\n"
1950 msgid "%s end dirstate reload\n"
1951 msgstr ""
1951 msgstr ""
1952
1952
1953 msgid "rescanning due to .hgignore change\n"
1953 msgid "rescanning due to .hgignore change\n"
1954 msgstr ""
1954 msgstr ""
1955
1955
1956 #, python-format
1956 #, python-format
1957 msgid "%s event: created %s\n"
1957 msgid "%s event: created %s\n"
1958 msgstr ""
1958 msgstr ""
1959
1959
1960 #, python-format
1960 #, python-format
1961 msgid "%s event: deleted %s\n"
1961 msgid "%s event: deleted %s\n"
1962 msgstr ""
1962 msgstr ""
1963
1963
1964 #, python-format
1964 #, python-format
1965 msgid "%s event: modified %s\n"
1965 msgid "%s event: modified %s\n"
1966 msgstr ""
1966 msgstr ""
1967
1967
1968 #, python-format
1968 #, python-format
1969 msgid "filesystem containing %s was unmounted\n"
1969 msgid "filesystem containing %s was unmounted\n"
1970 msgstr ""
1970 msgstr ""
1971
1971
1972 #, python-format
1972 #, python-format
1973 msgid "%s readable: %d bytes\n"
1973 msgid "%s readable: %d bytes\n"
1974 msgstr ""
1974 msgstr ""
1975
1975
1976 #, python-format
1976 #, python-format
1977 msgid "%s below threshold - unhooking\n"
1977 msgid "%s below threshold - unhooking\n"
1978 msgstr ""
1978 msgstr ""
1979
1979
1980 #, python-format
1980 #, python-format
1981 msgid "%s reading %d events\n"
1981 msgid "%s reading %d events\n"
1982 msgstr ""
1982 msgstr ""
1983
1983
1984 #, python-format
1984 #, python-format
1985 msgid "%s hooking back up with %d bytes readable\n"
1985 msgid "%s hooking back up with %d bytes readable\n"
1986 msgstr ""
1986 msgstr ""
1987
1987
1988 #, python-format
1988 #, python-format
1989 msgid "could not start server: %s"
1989 msgid "could not start server: %s"
1990 msgstr ""
1990 msgstr ""
1991
1991
1992 #, python-format
1992 #, python-format
1993 msgid "answering query for %r\n"
1993 msgid "answering query for %r\n"
1994 msgstr ""
1994 msgstr ""
1995
1995
1996 #, python-format
1996 #, python-format
1997 msgid "received query from incompatible client version %d\n"
1997 msgid "received query from incompatible client version %d\n"
1998 msgstr ""
1998 msgstr ""
1999
1999
2000 #, python-format
2000 #, python-format
2001 msgid "unrecognized query type: %s\n"
2001 msgid "unrecognized query type: %s\n"
2002 msgstr ""
2002 msgstr ""
2003
2003
2004 msgid "finished setup\n"
2004 msgid "finished setup\n"
2005 msgstr ""
2005 msgstr ""
2006
2006
2007 msgid ""
2007 msgid ""
2008 "expand expressions into changelog and summaries\n"
2008 "expand expressions into changelog and summaries\n"
2009 "\n"
2009 "\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2010 "This extension allows the use of a special syntax in summaries,\n"
2011 "which will be automatically expanded into links or any other\n"
2011 "which will be automatically expanded into links or any other\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2012 "arbitrary expression, much like InterWiki does.\n"
2013 "\n"
2013 "\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2014 "A few example patterns (link to bug tracking, etc.) that may\n"
2015 "be used in your hgrc:\n"
2015 "be used in your hgrc:\n"
2016 "\n"
2016 "\n"
2017 " [interhg]\n"
2017 " [interhg]\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2018 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2019 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2019 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2020 "i\n"
2020 "i\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2021 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2022 msgstr ""
2022 msgstr ""
2023
2023
2024 #, python-format
2024 #, python-format
2025 msgid "interhg: invalid pattern for %s: %s\n"
2025 msgid "interhg: invalid pattern for %s: %s\n"
2026 msgstr ""
2026 msgstr ""
2027
2027
2028 #, python-format
2028 #, python-format
2029 msgid "interhg: invalid regexp for %s: %s\n"
2029 msgid "interhg: invalid regexp for %s: %s\n"
2030 msgstr ""
2030 msgstr ""
2031
2031
2032 msgid ""
2032 msgid ""
2033 "expand keywords in tracked files\n"
2033 "expand keywords in tracked files\n"
2034 "\n"
2034 "\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2035 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2036 "tracked text files selected by your configuration.\n"
2036 "tracked text files selected by your configuration.\n"
2037 "\n"
2037 "\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2038 "Keywords are only expanded in local repositories and not stored in the\n"
2039 "change history. The mechanism can be regarded as a convenience for the\n"
2039 "change history. The mechanism can be regarded as a convenience for the\n"
2040 "current user or for archive distribution.\n"
2040 "current user or for archive distribution.\n"
2041 "\n"
2041 "\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2042 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2043 "hgrc files.\n"
2043 "hgrc files.\n"
2044 "\n"
2044 "\n"
2045 "Example:\n"
2045 "Example:\n"
2046 "\n"
2046 "\n"
2047 " [keyword]\n"
2047 " [keyword]\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2048 " # expand keywords in every python file except those matching \"x*\"\n"
2049 " **.py =\n"
2049 " **.py =\n"
2050 " x* = ignore\n"
2050 " x* = ignore\n"
2051 "\n"
2051 "\n"
2052 "Note: the more specific you are in your filename patterns\n"
2052 "Note: the more specific you are in your filename patterns\n"
2053 " the less you lose speed in huge repositories.\n"
2053 " the less you lose speed in huge repositories.\n"
2054 "\n"
2054 "\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2055 "For [keywordmaps] template mapping and expansion demonstration and\n"
2056 "control run \"hg kwdemo\".\n"
2056 "control run \"hg kwdemo\".\n"
2057 "\n"
2057 "\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2058 "An additional date template filter {date|utcdate} is provided.\n"
2059 "\n"
2059 "\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2060 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2061 "replaced with customized keywords and templates. Again, run \"hg\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2062 "kwdemo\" to control the results of your config changes.\n"
2063 "\n"
2063 "\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2064 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2065 "the risk of inadvertently storing expanded keywords in the change\n"
2066 "history.\n"
2066 "history.\n"
2067 "\n"
2067 "\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2068 "To force expansion after enabling it, or a configuration change, run\n"
2069 "\"hg kwexpand\".\n"
2069 "\"hg kwexpand\".\n"
2070 "\n"
2070 "\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2071 "Also, when committing with the record extension or using mq's qrecord,\n"
2072 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2072 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2073 "the files in question to update keyword expansions after all changes\n"
2073 "the files in question to update keyword expansions after all changes\n"
2074 "have been checked in.\n"
2074 "have been checked in.\n"
2075 "\n"
2075 "\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2076 "Expansions spanning more than one line and incremental expansions,\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2077 "like CVS' $Log$, are not supported. A keyword template map\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2078 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2079 msgstr ""
2079 msgstr ""
2080
2080
2081 #, python-format
2081 #, python-format
2082 msgid "overwriting %s expanding keywords\n"
2082 msgid "overwriting %s expanding keywords\n"
2083 msgstr ""
2083 msgstr ""
2084
2084
2085 #, python-format
2085 #, python-format
2086 msgid "overwriting %s shrinking keywords\n"
2086 msgid "overwriting %s shrinking keywords\n"
2087 msgstr ""
2087 msgstr ""
2088
2088
2089 msgid "[keyword] patterns cannot match"
2089 msgid "[keyword] patterns cannot match"
2090 msgstr ""
2090 msgstr ""
2091
2091
2092 msgid "no [keyword] patterns configured"
2092 msgid "no [keyword] patterns configured"
2093 msgstr ""
2093 msgstr ""
2094
2094
2095 msgid ""
2095 msgid ""
2096 "print [keywordmaps] configuration and an expansion example\n"
2096 "print [keywordmaps] configuration and an expansion example\n"
2097 "\n"
2097 "\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2098 " Show current, custom, or default keyword template maps and their\n"
2099 " expansions.\n"
2099 " expansions.\n"
2100 "\n"
2100 "\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2101 " Extend current configuration by specifying maps as arguments and\n"
2102 " optionally by reading from an additional hgrc file.\n"
2102 " optionally by reading from an additional hgrc file.\n"
2103 "\n"
2103 "\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2104 " Override current keyword template maps with \"default\" option.\n"
2105 " "
2105 " "
2106 msgstr ""
2106 msgstr ""
2107
2107
2108 #, python-format
2108 #, python-format
2109 msgid "creating temporary repository at %s\n"
2109 msgid "creating temporary repository at %s\n"
2110 msgstr ""
2110 msgstr ""
2111
2111
2112 #, python-format
2112 #, python-format
2113 msgid ""
2113 msgid ""
2114 "\n"
2114 "\n"
2115 "\tconfig using %s keyword template maps\n"
2115 "\tconfig using %s keyword template maps\n"
2116 msgstr ""
2116 msgstr ""
2117
2117
2118 #, python-format
2118 #, python-format
2119 msgid ""
2119 msgid ""
2120 "\n"
2120 "\n"
2121 "%s keywords written to %s:\n"
2121 "%s keywords written to %s:\n"
2122 msgstr ""
2122 msgstr ""
2123
2123
2124 msgid "unhooked all commit hooks\n"
2124 msgid "unhooked all commit hooks\n"
2125 msgstr ""
2125 msgstr ""
2126
2126
2127 #, python-format
2127 #, python-format
2128 msgid ""
2128 msgid ""
2129 "\n"
2129 "\n"
2130 "\t%s keywords expanded%s\n"
2130 "\t%s keywords expanded%s\n"
2131 msgstr ""
2131 msgstr ""
2132
2132
2133 #, python-format
2133 #, python-format
2134 msgid ""
2134 msgid ""
2135 "\n"
2135 "\n"
2136 "removing temporary repository %s\n"
2136 "removing temporary repository %s\n"
2137 msgstr ""
2137 msgstr ""
2138
2138
2139 msgid ""
2139 msgid ""
2140 "expand keywords in the working directory\n"
2140 "expand keywords in the working directory\n"
2141 "\n"
2141 "\n"
2142 " Run after (re)enabling keyword expansion.\n"
2142 " Run after (re)enabling keyword expansion.\n"
2143 "\n"
2143 "\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2144 " kwexpand refuses to run if given files contain local changes.\n"
2145 " "
2145 " "
2146 msgstr ""
2146 msgstr ""
2147
2147
2148 msgid ""
2148 msgid ""
2149 "show files configured for keyword expansion\n"
2149 "show files configured for keyword expansion\n"
2150 "\n"
2150 "\n"
2151 " List which files in the working directory are matched by the\n"
2151 " List which files in the working directory are matched by the\n"
2152 " [keyword] configuration patterns.\n"
2152 " [keyword] configuration patterns.\n"
2153 "\n"
2153 "\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2154 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2155 " execution by including only files that are actual candidates\n"
2155 " execution by including only files that are actual candidates\n"
2156 " for expansion.\n"
2156 " for expansion.\n"
2157 "\n"
2157 "\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2158 " See \"hg help keyword\" on how to construct patterns both for\n"
2159 " inclusion and exclusion of files.\n"
2159 " inclusion and exclusion of files.\n"
2160 "\n"
2160 "\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2161 " Use -u/--untracked to list untracked files as well.\n"
2162 "\n"
2162 "\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2163 " With -a/--all and -v/--verbose the codes used to show the status\n"
2164 " of files are:\n"
2164 " of files are:\n"
2165 " K = keyword expansion candidate\n"
2165 " K = keyword expansion candidate\n"
2166 " k = keyword expansion candidate (untracked)\n"
2166 " k = keyword expansion candidate (untracked)\n"
2167 " I = ignored\n"
2167 " I = ignored\n"
2168 " i = ignored (untracked)\n"
2168 " i = ignored (untracked)\n"
2169 " "
2169 " "
2170 msgstr ""
2170 msgstr ""
2171
2171
2172 msgid ""
2172 msgid ""
2173 "revert expanded keywords in the working directory\n"
2173 "revert expanded keywords in the working directory\n"
2174 "\n"
2174 "\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2175 " Run before changing/disabling active keywords or if you experience\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2176 " problems with \"hg import\" or \"hg merge\".\n"
2177 "\n"
2177 "\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2178 " kwshrink refuses to run if given files contain local changes.\n"
2179 " "
2179 " "
2180 msgstr ""
2180 msgstr ""
2181
2181
2182 msgid "show default keyword template maps"
2182 msgid "show default keyword template maps"
2183 msgstr ""
2183 msgstr ""
2184
2184
2185 msgid "read maps from rcfile"
2185 msgid "read maps from rcfile"
2186 msgstr ""
2186 msgstr ""
2187
2187
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2188 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2189 msgstr ""
2189 msgstr ""
2190
2190
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2191 msgid "hg kwexpand [OPTION]... [FILE]..."
2192 msgstr ""
2192 msgstr ""
2193
2193
2194 msgid "show keyword status flags of all files"
2194 msgid "show keyword status flags of all files"
2195 msgstr ""
2195 msgstr ""
2196
2196
2197 msgid "show files excluded from expansion"
2197 msgid "show files excluded from expansion"
2198 msgstr ""
2198 msgstr ""
2199
2199
2200 msgid "additionally show untracked files"
2200 msgid "additionally show untracked files"
2201 msgstr ""
2201 msgstr ""
2202
2202
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2203 msgid "hg kwfiles [OPTION]... [FILE]..."
2204 msgstr ""
2204 msgstr ""
2205
2205
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2206 msgid "hg kwshrink [OPTION]... [FILE]..."
2207 msgstr ""
2207 msgstr ""
2208
2208
2209 msgid ""
2209 msgid ""
2210 "manage a stack of patches\n"
2210 "manage a stack of patches\n"
2211 "\n"
2211 "\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2212 "This extension lets you work with a stack of patches in a Mercurial\n"
2213 "repository. It manages two stacks of patches - all known patches, and\n"
2213 "repository. It manages two stacks of patches - all known patches, and\n"
2214 "applied patches (subset of known patches).\n"
2214 "applied patches (subset of known patches).\n"
2215 "\n"
2215 "\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2216 "Known patches are represented as patch files in the .hg/patches\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2217 "directory. Applied patches are both patch files and changesets.\n"
2218 "\n"
2218 "\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2219 "Common tasks (use \"hg help command\" for more details):\n"
2220 "\n"
2220 "\n"
2221 "prepare repository to work with patches qinit\n"
2221 "prepare repository to work with patches qinit\n"
2222 "create new patch qnew\n"
2222 "create new patch qnew\n"
2223 "import existing patch qimport\n"
2223 "import existing patch qimport\n"
2224 "\n"
2224 "\n"
2225 "print patch series qseries\n"
2225 "print patch series qseries\n"
2226 "print applied patches qapplied\n"
2226 "print applied patches qapplied\n"
2227 "print name of top applied patch qtop\n"
2227 "print name of top applied patch qtop\n"
2228 "\n"
2228 "\n"
2229 "add known patch to applied stack qpush\n"
2229 "add known patch to applied stack qpush\n"
2230 "remove patch from applied stack qpop\n"
2230 "remove patch from applied stack qpop\n"
2231 "refresh contents of top applied patch qrefresh\n"
2231 "refresh contents of top applied patch qrefresh\n"
2232 msgstr ""
2232 msgstr ""
2233
2233
2234 #, python-format
2234 #, python-format
2235 msgid "%s appears more than once in %s"
2235 msgid "%s appears more than once in %s"
2236 msgstr ""
2236 msgstr ""
2237
2237
2238 msgid "guard cannot be an empty string"
2238 msgid "guard cannot be an empty string"
2239 msgstr ""
2239 msgstr ""
2240
2240
2241 #, python-format
2241 #, python-format
2242 msgid "guard %r starts with invalid character: %r"
2242 msgid "guard %r starts with invalid character: %r"
2243 msgstr ""
2243 msgstr ""
2244
2244
2245 #, python-format
2245 #, python-format
2246 msgid "invalid character in guard %r: %r"
2246 msgid "invalid character in guard %r: %r"
2247 msgstr ""
2247 msgstr ""
2248
2248
2249 #, python-format
2249 #, python-format
2250 msgid "active guards: %s\n"
2250 msgid "active guards: %s\n"
2251 msgstr ""
2251 msgstr ""
2252
2252
2253 #, python-format
2253 #, python-format
2254 msgid "guard %r too short"
2254 msgid "guard %r too short"
2255 msgstr ""
2255 msgstr ""
2256
2256
2257 #, python-format
2257 #, python-format
2258 msgid "guard %r starts with invalid char"
2258 msgid "guard %r starts with invalid char"
2259 msgstr ""
2259 msgstr ""
2260
2260
2261 #, python-format
2261 #, python-format
2262 msgid "allowing %s - no guards in effect\n"
2262 msgid "allowing %s - no guards in effect\n"
2263 msgstr ""
2263 msgstr ""
2264
2264
2265 #, python-format
2265 #, python-format
2266 msgid "allowing %s - no matching negative guards\n"
2266 msgid "allowing %s - no matching negative guards\n"
2267 msgstr ""
2267 msgstr ""
2268
2268
2269 #, python-format
2269 #, python-format
2270 msgid "allowing %s - guarded by %r\n"
2270 msgid "allowing %s - guarded by %r\n"
2271 msgstr ""
2271 msgstr ""
2272
2272
2273 #, python-format
2273 #, python-format
2274 msgid "skipping %s - guarded by %r\n"
2274 msgid "skipping %s - guarded by %r\n"
2275 msgstr ""
2275 msgstr ""
2276
2276
2277 #, python-format
2277 #, python-format
2278 msgid "skipping %s - no matching guards\n"
2278 msgid "skipping %s - no matching guards\n"
2279 msgstr ""
2279 msgstr ""
2280
2280
2281 #, python-format
2281 #, python-format
2282 msgid "error removing undo: %s\n"
2282 msgid "error removing undo: %s\n"
2283 msgstr ""
2283 msgstr ""
2284
2284
2285 #, python-format
2285 #, python-format
2286 msgid "apply failed for patch %s"
2286 msgid "apply failed for patch %s"
2287 msgstr ""
2287 msgstr ""
2288
2288
2289 #, python-format
2289 #, python-format
2290 msgid "patch didn't work out, merging %s\n"
2290 msgid "patch didn't work out, merging %s\n"
2291 msgstr ""
2291 msgstr ""
2292
2292
2293 #, python-format
2293 #, python-format
2294 msgid "update returned %d"
2294 msgid "update returned %d"
2295 msgstr ""
2295 msgstr ""
2296
2296
2297 msgid "repo commit failed"
2297 msgid "repo commit failed"
2298 msgstr ""
2298 msgstr ""
2299
2299
2300 #, python-format
2300 #, python-format
2301 msgid "unable to read %s"
2301 msgid "unable to read %s"
2302 msgstr ""
2302 msgstr ""
2303
2303
2304 #, python-format
2304 #, python-format
2305 msgid "patch %s does not exist\n"
2305 msgid "patch %s does not exist\n"
2306 msgstr ""
2306 msgstr ""
2307
2307
2308 #, python-format
2308 #, python-format
2309 msgid "patch %s is not applied\n"
2309 msgid "patch %s is not applied\n"
2310 msgstr ""
2310 msgstr ""
2311
2311
2312 msgid "patch failed, unable to continue (try -v)\n"
2312 msgid "patch failed, unable to continue (try -v)\n"
2313 msgstr ""
2313 msgstr ""
2314
2314
2315 #, python-format
2315 #, python-format
2316 msgid "applying %s\n"
2316 msgid "applying %s\n"
2317 msgstr ""
2317 msgstr ""
2318
2318
2319 #, python-format
2319 #, python-format
2320 msgid "unable to read %s\n"
2320 msgid "unable to read %s\n"
2321 msgstr ""
2321 msgstr ""
2322
2322
2323 #, python-format
2323 #, python-format
2324 msgid "imported patch %s\n"
2324 msgid "imported patch %s\n"
2325 msgstr ""
2325 msgstr ""
2326
2326
2327 #, python-format
2327 #, python-format
2328 msgid ""
2328 msgid ""
2329 "\n"
2329 "\n"
2330 "imported patch %s"
2330 "imported patch %s"
2331 msgstr ""
2331 msgstr ""
2332
2332
2333 #, python-format
2333 #, python-format
2334 msgid "patch %s is empty\n"
2334 msgid "patch %s is empty\n"
2335 msgstr ""
2335 msgstr ""
2336
2336
2337 msgid "patch failed, rejects left in working dir\n"
2337 msgid "patch failed, rejects left in working dir\n"
2338 msgstr ""
2338 msgstr ""
2339
2339
2340 msgid "fuzz found when applying patch, stopping\n"
2340 msgid "fuzz found when applying patch, stopping\n"
2341 msgstr ""
2341 msgstr ""
2342
2342
2343 #, python-format
2343 #, python-format
2344 msgid "revision %d is not managed"
2344 msgid "revision %d is not managed"
2345 msgstr ""
2345 msgstr ""
2346
2346
2347 #, python-format
2347 #, python-format
2348 msgid "cannot delete revision %d above applied patches"
2348 msgid "cannot delete revision %d above applied patches"
2349 msgstr ""
2349 msgstr ""
2350
2350
2351 #, python-format
2351 #, python-format
2352 msgid "patch %s finalized without changeset message\n"
2352 msgid "patch %s finalized without changeset message\n"
2353 msgstr ""
2353 msgstr ""
2354
2354
2355 msgid "qdelete requires at least one revision or patch name"
2355 msgid "qdelete requires at least one revision or patch name"
2356 msgstr ""
2356 msgstr ""
2357
2357
2358 #, python-format
2358 #, python-format
2359 msgid "cannot delete applied patch %s"
2359 msgid "cannot delete applied patch %s"
2360 msgstr ""
2360 msgstr ""
2361
2361
2362 #, python-format
2362 #, python-format
2363 msgid "patch %s not in series file"
2363 msgid "patch %s not in series file"
2364 msgstr ""
2364 msgstr ""
2365
2365
2366 msgid "no patches applied"
2366 msgid "no patches applied"
2367 msgstr ""
2367 msgstr ""
2368
2368
2369 msgid "working directory revision is not qtip"
2369 msgid "working directory revision is not qtip"
2370 msgstr ""
2370 msgstr ""
2371
2371
2372 msgid "local changes found, refresh first"
2372 msgid "local changes found, refresh first"
2373 msgstr ""
2373 msgstr ""
2374
2374
2375 msgid "local changes found"
2375 msgid "local changes found"
2376 msgstr ""
2376 msgstr ""
2377
2377
2378 #, python-format
2378 #, python-format
2379 msgid "\"%s\" cannot be used as the name of a patch"
2379 msgid "\"%s\" cannot be used as the name of a patch"
2380 msgstr ""
2380 msgstr ""
2381
2381
2382 #, python-format
2382 #, python-format
2383 msgid "patch \"%s\" already exists"
2383 msgid "patch \"%s\" already exists"
2384 msgstr ""
2384 msgstr ""
2385
2385
2386 #, python-format
2386 #, python-format
2387 msgid "error unlinking %s\n"
2387 msgid "error unlinking %s\n"
2388 msgstr ""
2388 msgstr ""
2389
2389
2390 #, python-format
2390 #, python-format
2391 msgid "patch name \"%s\" is ambiguous:\n"
2391 msgid "patch name \"%s\" is ambiguous:\n"
2392 msgstr ""
2392 msgstr ""
2393
2393
2394 #, python-format
2394 #, python-format
2395 msgid "patch %s not in series"
2395 msgid "patch %s not in series"
2396 msgstr ""
2396 msgstr ""
2397
2397
2398 msgid "(working directory not at a head)\n"
2398 msgid "(working directory not at a head)\n"
2399 msgstr ""
2399 msgstr ""
2400
2400
2401 msgid "no patches in series\n"
2401 msgid "no patches in series\n"
2402 msgstr ""
2402 msgstr ""
2403
2403
2404 #, python-format
2404 #, python-format
2405 msgid "cannot push to a previous patch: %s"
2405 msgid "cannot push to a previous patch: %s"
2406 msgstr ""
2406 msgstr ""
2407
2407
2408 #, python-format
2408 #, python-format
2409 msgid "qpush: %s is already at the top\n"
2409 msgid "qpush: %s is already at the top\n"
2410 msgstr ""
2410 msgstr ""
2411
2411
2412 #, python-format
2412 #, python-format
2413 msgid "guarded by %r"
2413 msgid "guarded by %r"
2414 msgstr ""
2414 msgstr ""
2415
2415
2416 msgid "no matching guards"
2416 msgid "no matching guards"
2417 msgstr ""
2417 msgstr ""
2418
2418
2419 #, python-format
2419 #, python-format
2420 msgid "cannot push '%s' - %s\n"
2420 msgid "cannot push '%s' - %s\n"
2421 msgstr ""
2421 msgstr ""
2422
2422
2423 msgid "all patches are currently applied\n"
2423 msgid "all patches are currently applied\n"
2424 msgstr ""
2424 msgstr ""
2425
2425
2426 msgid "patch series already fully applied\n"
2426 msgid "patch series already fully applied\n"
2427 msgstr ""
2427 msgstr ""
2428
2428
2429 msgid "cleaning up working directory..."
2429 msgid "cleaning up working directory..."
2430 msgstr ""
2430 msgstr ""
2431
2431
2432 #, python-format
2432 #, python-format
2433 msgid "errors during apply, please fix and refresh %s\n"
2433 msgid "errors during apply, please fix and refresh %s\n"
2434 msgstr ""
2434 msgstr ""
2435
2435
2436 #, python-format
2436 #, python-format
2437 msgid "now at: %s\n"
2437 msgid "now at: %s\n"
2438 msgstr ""
2438 msgstr ""
2439
2439
2440 #, python-format
2440 #, python-format
2441 msgid "patch %s is not applied"
2441 msgid "patch %s is not applied"
2442 msgstr ""
2442 msgstr ""
2443
2443
2444 msgid "no patches applied\n"
2444 msgid "no patches applied\n"
2445 msgstr ""
2445 msgstr ""
2446
2446
2447 #, python-format
2447 #, python-format
2448 msgid "qpop: %s is already at the top\n"
2448 msgid "qpop: %s is already at the top\n"
2449 msgstr ""
2449 msgstr ""
2450
2450
2451 msgid "qpop: forcing dirstate update\n"
2451 msgid "qpop: forcing dirstate update\n"
2452 msgstr ""
2452 msgstr ""
2453
2453
2454 #, python-format
2454 #, python-format
2455 msgid "trying to pop unknown node %s"
2455 msgid "trying to pop unknown node %s"
2456 msgstr ""
2456 msgstr ""
2457
2457
2458 msgid "popping would remove a revision not managed by this patch queue"
2458 msgid "popping would remove a revision not managed by this patch queue"
2459 msgstr ""
2459 msgstr ""
2460
2460
2461 msgid "deletions found between repo revs"
2461 msgid "deletions found between repo revs"
2462 msgstr ""
2462 msgstr ""
2463
2463
2464 msgid "patch queue now empty\n"
2464 msgid "patch queue now empty\n"
2465 msgstr ""
2465 msgstr ""
2466
2466
2467 msgid "cannot refresh a revision with children"
2467 msgid "cannot refresh a revision with children"
2468 msgstr ""
2468 msgstr ""
2469
2469
2470 msgid ""
2470 msgid ""
2471 "refresh interrupted while patch was popped! (revert --all, qpush to "
2471 "refresh interrupted while patch was popped! (revert --all, qpush to "
2472 "recover)\n"
2472 "recover)\n"
2473 msgstr ""
2473 msgstr ""
2474
2474
2475 msgid "patch queue directory already exists"
2475 msgid "patch queue directory already exists"
2476 msgstr ""
2476 msgstr ""
2477
2477
2478 #, python-format
2478 #, python-format
2479 msgid "patch %s is not in series file"
2479 msgid "patch %s is not in series file"
2480 msgstr ""
2480 msgstr ""
2481
2481
2482 msgid "No saved patch data found\n"
2482 msgid "No saved patch data found\n"
2483 msgstr ""
2483 msgstr ""
2484
2484
2485 #, python-format
2485 #, python-format
2486 msgid "restoring status: %s\n"
2486 msgid "restoring status: %s\n"
2487 msgstr ""
2487 msgstr ""
2488
2488
2489 msgid "save entry has children, leaving it alone\n"
2489 msgid "save entry has children, leaving it alone\n"
2490 msgstr ""
2490 msgstr ""
2491
2491
2492 #, python-format
2492 #, python-format
2493 msgid "removing save entry %s\n"
2493 msgid "removing save entry %s\n"
2494 msgstr ""
2494 msgstr ""
2495
2495
2496 #, python-format
2496 #, python-format
2497 msgid "saved queue repository parents: %s %s\n"
2497 msgid "saved queue repository parents: %s %s\n"
2498 msgstr ""
2498 msgstr ""
2499
2499
2500 msgid "queue directory updating\n"
2500 msgid "queue directory updating\n"
2501 msgstr ""
2501 msgstr ""
2502
2502
2503 msgid "Unable to load queue repository\n"
2503 msgid "Unable to load queue repository\n"
2504 msgstr ""
2504 msgstr ""
2505
2505
2506 msgid "save: no patches applied, exiting\n"
2506 msgid "save: no patches applied, exiting\n"
2507 msgstr ""
2507 msgstr ""
2508
2508
2509 msgid "status is already saved\n"
2509 msgid "status is already saved\n"
2510 msgstr ""
2510 msgstr ""
2511
2511
2512 msgid "hg patches saved state"
2512 msgid "hg patches saved state"
2513 msgstr ""
2513 msgstr ""
2514
2514
2515 msgid "repo commit failed\n"
2515 msgid "repo commit failed\n"
2516 msgstr ""
2516 msgstr ""
2517
2517
2518 #, python-format
2518 #, python-format
2519 msgid "patch %s is already in the series file"
2519 msgid "patch %s is already in the series file"
2520 msgstr ""
2520 msgstr ""
2521
2521
2522 msgid "option \"-r\" not valid when importing files"
2522 msgid "option \"-r\" not valid when importing files"
2523 msgstr ""
2523 msgstr ""
2524
2524
2525 msgid "option \"-n\" not valid when importing multiple patches"
2525 msgid "option \"-n\" not valid when importing multiple patches"
2526 msgstr ""
2526 msgstr ""
2527
2527
2528 #, python-format
2528 #, python-format
2529 msgid "revision %d is the root of more than one branch"
2529 msgid "revision %d is the root of more than one branch"
2530 msgstr ""
2530 msgstr ""
2531
2531
2532 #, python-format
2532 #, python-format
2533 msgid "revision %d is already managed"
2533 msgid "revision %d is already managed"
2534 msgstr ""
2534 msgstr ""
2535
2535
2536 #, python-format
2536 #, python-format
2537 msgid "revision %d is not the parent of the queue"
2537 msgid "revision %d is not the parent of the queue"
2538 msgstr ""
2538 msgstr ""
2539
2539
2540 #, python-format
2540 #, python-format
2541 msgid "revision %d has unmanaged children"
2541 msgid "revision %d has unmanaged children"
2542 msgstr ""
2542 msgstr ""
2543
2543
2544 #, python-format
2544 #, python-format
2545 msgid "cannot import merge revision %d"
2545 msgid "cannot import merge revision %d"
2546 msgstr ""
2546 msgstr ""
2547
2547
2548 #, python-format
2548 #, python-format
2549 msgid "revision %d is not the parent of %d"
2549 msgid "revision %d is not the parent of %d"
2550 msgstr ""
2550 msgstr ""
2551
2551
2552 msgid "-e is incompatible with import from -"
2552 msgid "-e is incompatible with import from -"
2553 msgstr ""
2553 msgstr ""
2554
2554
2555 #, python-format
2555 #, python-format
2556 msgid "patch %s does not exist"
2556 msgid "patch %s does not exist"
2557 msgstr ""
2557 msgstr ""
2558
2558
2559 msgid "need --name to import a patch from -"
2559 msgid "need --name to import a patch from -"
2560 msgstr ""
2560 msgstr ""
2561
2561
2562 #, python-format
2562 #, python-format
2563 msgid "adding %s to series file\n"
2563 msgid "adding %s to series file\n"
2564 msgstr ""
2564 msgstr ""
2565
2565
2566 msgid ""
2566 msgid ""
2567 "remove patches from queue\n"
2567 "remove patches from queue\n"
2568 "\n"
2568 "\n"
2569 " The patches must not be applied, and at least one patch is required. "
2569 " The patches must not be applied, and at least one patch is required. "
2570 "With\n"
2570 "With\n"
2571 " -k/--keep, the patch files are preserved in the patch directory.\n"
2571 " -k/--keep, the patch files are preserved in the patch directory.\n"
2572 "\n"
2572 "\n"
2573 " To stop managing a patch and move it into permanent history,\n"
2573 " To stop managing a patch and move it into permanent history,\n"
2574 " use the qfinish command."
2574 " use the qfinish command."
2575 msgstr ""
2575 msgstr ""
2576
2576
2577 msgid "print the patches already applied"
2577 msgid "print the patches already applied"
2578 msgstr ""
2578 msgstr ""
2579
2579
2580 msgid "print the patches not yet applied"
2580 msgid "print the patches not yet applied"
2581 msgstr ""
2581 msgstr ""
2582
2582
2583 msgid ""
2583 msgid ""
2584 "import a patch\n"
2584 "import a patch\n"
2585 "\n"
2585 "\n"
2586 " The patch is inserted into the series after the last applied\n"
2586 " The patch is inserted into the series after the last applied\n"
2587 " patch. If no patches have been applied, qimport prepends the patch\n"
2587 " patch. If no patches have been applied, qimport prepends the patch\n"
2588 " to the series.\n"
2588 " to the series.\n"
2589 "\n"
2589 "\n"
2590 " The patch will have the same name as its source file unless you\n"
2590 " The patch will have the same name as its source file unless you\n"
2591 " give it a new one with -n/--name.\n"
2591 " give it a new one with -n/--name.\n"
2592 "\n"
2592 "\n"
2593 " You can register an existing patch inside the patch directory with\n"
2593 " You can register an existing patch inside the patch directory with\n"
2594 " the -e/--existing flag.\n"
2594 " the -e/--existing flag.\n"
2595 "\n"
2595 "\n"
2596 " With -f/--force, an existing patch of the same name will be\n"
2596 " With -f/--force, an existing patch of the same name will be\n"
2597 " overwritten.\n"
2597 " overwritten.\n"
2598 "\n"
2598 "\n"
2599 " An existing changeset may be placed under mq control with -r/--rev\n"
2599 " An existing changeset may be placed under mq control with -r/--rev\n"
2600 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2600 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2601 " With -g/--git, patches imported with --rev will use the git diff\n"
2601 " With -g/--git, patches imported with --rev will use the git diff\n"
2602 " format. See the diffs help topic for information on why this is\n"
2602 " format. See the diffs help topic for information on why this is\n"
2603 " important for preserving rename/copy information and permission\n"
2603 " important for preserving rename/copy information and permission\n"
2604 " changes.\n"
2604 " changes.\n"
2605 "\n"
2605 "\n"
2606 " To import a patch from standard input, pass - as the patch file.\n"
2606 " To import a patch from standard input, pass - as the patch file.\n"
2607 " When importing from standard input, a patch name must be specified\n"
2607 " When importing from standard input, a patch name must be specified\n"
2608 " using the --name flag.\n"
2608 " using the --name flag.\n"
2609 " "
2609 " "
2610 msgstr ""
2610 msgstr ""
2611
2611
2612 msgid ""
2612 msgid ""
2613 "init a new queue repository\n"
2613 "init a new queue repository\n"
2614 "\n"
2614 "\n"
2615 " The queue repository is unversioned by default. If\n"
2615 " The queue repository is unversioned by default. If\n"
2616 " -c/--create-repo is specified, qinit will create a separate nested\n"
2616 " -c/--create-repo is specified, qinit will create a separate nested\n"
2617 " repository for patches (qinit -c may also be run later to convert\n"
2617 " repository for patches (qinit -c may also be run later to convert\n"
2618 " an unversioned patch repository into a versioned one). You can use\n"
2618 " an unversioned patch repository into a versioned one). You can use\n"
2619 " qcommit to commit changes to this queue repository."
2619 " qcommit to commit changes to this queue repository."
2620 msgstr ""
2620 msgstr ""
2621
2621
2622 msgid ""
2622 msgid ""
2623 "clone main and patch repository at same time\n"
2623 "clone main and patch repository at same time\n"
2624 "\n"
2624 "\n"
2625 " If source is local, destination will have no patches applied. If\n"
2625 " If source is local, destination will have no patches applied. If\n"
2626 " source is remote, this command can not check if patches are\n"
2626 " source is remote, this command can not check if patches are\n"
2627 " applied in source, so cannot guarantee that patches are not\n"
2627 " applied in source, so cannot guarantee that patches are not\n"
2628 " applied in destination. If you clone remote repository, be sure\n"
2628 " applied in destination. If you clone remote repository, be sure\n"
2629 " before that it has no patches applied.\n"
2629 " before that it has no patches applied.\n"
2630 "\n"
2630 "\n"
2631 " Source patch repository is looked for in <src>/.hg/patches by\n"
2631 " Source patch repository is looked for in <src>/.hg/patches by\n"
2632 " default. Use -p <url> to change.\n"
2632 " default. Use -p <url> to change.\n"
2633 "\n"
2633 "\n"
2634 " The patch directory must be a nested Mercurial repository, as\n"
2634 " The patch directory must be a nested Mercurial repository, as\n"
2635 " would be created by qinit -c.\n"
2635 " would be created by qinit -c.\n"
2636 " "
2636 " "
2637 msgstr ""
2637 msgstr ""
2638
2638
2639 msgid "versioned patch repository not found (see qinit -c)"
2639 msgid "versioned patch repository not found (see qinit -c)"
2640 msgstr ""
2640 msgstr ""
2641
2641
2642 msgid "cloning main repository\n"
2642 msgid "cloning main repository\n"
2643 msgstr ""
2643 msgstr ""
2644
2644
2645 msgid "cloning patch repository\n"
2645 msgid "cloning patch repository\n"
2646 msgstr ""
2646 msgstr ""
2647
2647
2648 msgid "stripping applied patches from destination repository\n"
2648 msgid "stripping applied patches from destination repository\n"
2649 msgstr ""
2649 msgstr ""
2650
2650
2651 msgid "updating destination repository\n"
2651 msgid "updating destination repository\n"
2652 msgstr ""
2652 msgstr ""
2653
2653
2654 msgid "commit changes in the queue repository"
2654 msgid "commit changes in the queue repository"
2655 msgstr ""
2655 msgstr ""
2656
2656
2657 msgid "print the entire series file"
2657 msgid "print the entire series file"
2658 msgstr ""
2658 msgstr ""
2659
2659
2660 msgid "print the name of the current patch"
2660 msgid "print the name of the current patch"
2661 msgstr ""
2661 msgstr ""
2662
2662
2663 msgid "print the name of the next patch"
2663 msgid "print the name of the next patch"
2664 msgstr ""
2664 msgstr ""
2665
2665
2666 msgid "all patches applied\n"
2666 msgid "all patches applied\n"
2667 msgstr ""
2667 msgstr ""
2668
2668
2669 msgid "print the name of the previous patch"
2669 msgid "print the name of the previous patch"
2670 msgstr ""
2670 msgstr ""
2671
2671
2672 msgid "only one patch applied\n"
2672 msgid "only one patch applied\n"
2673 msgstr ""
2673 msgstr ""
2674
2674
2675 msgid ""
2675 msgid ""
2676 "create a new patch\n"
2676 "create a new patch\n"
2677 "\n"
2677 "\n"
2678 " qnew creates a new patch on top of the currently-applied patch (if\n"
2678 " qnew creates a new patch on top of the currently-applied patch (if\n"
2679 " any). It will refuse to run if there are any outstanding changes\n"
2679 " any). It will refuse to run if there are any outstanding changes\n"
2680 " unless -f/--force is specified, in which case the patch will be\n"
2680 " unless -f/--force is specified, in which case the patch will be\n"
2681 " initialized with them. You may also use -I/--include,\n"
2681 " initialized with them. You may also use -I/--include,\n"
2682 " -X/--exclude, and/or a list of files after the patch name to add\n"
2682 " -X/--exclude, and/or a list of files after the patch name to add\n"
2683 " only changes to matching files to the new patch, leaving the rest\n"
2683 " only changes to matching files to the new patch, leaving the rest\n"
2684 " as uncommitted modifications.\n"
2684 " as uncommitted modifications.\n"
2685 "\n"
2685 "\n"
2686 " -u/--user and -d/--date can be used to set the (given) user and\n"
2686 " -u/--user and -d/--date can be used to set the (given) user and\n"
2687 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2687 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2688 " to current user and date to current date.\n"
2688 " to current user and date to current date.\n"
2689 "\n"
2689 "\n"
2690 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2690 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2691 " well as the commit message. If none is specified, the header is\n"
2691 " well as the commit message. If none is specified, the header is\n"
2692 " empty and the commit message is '[mq]: PATCH'.\n"
2692 " empty and the commit message is '[mq]: PATCH'.\n"
2693 "\n"
2693 "\n"
2694 " Use the -g/--git option to keep the patch in the git extended diff\n"
2694 " Use the -g/--git option to keep the patch in the git extended diff\n"
2695 " format. Read the diffs help topic for more information on why this\n"
2695 " format. Read the diffs help topic for more information on why this\n"
2696 " is important for preserving permission changes and copy/rename\n"
2696 " is important for preserving permission changes and copy/rename\n"
2697 " information.\n"
2697 " information.\n"
2698 " "
2698 " "
2699 msgstr ""
2699 msgstr ""
2700
2700
2701 msgid ""
2701 msgid ""
2702 "update the current patch\n"
2702 "update the current patch\n"
2703 "\n"
2703 "\n"
2704 " If any file patterns are provided, the refreshed patch will\n"
2704 " If any file patterns are provided, the refreshed patch will\n"
2705 " contain only the modifications that match those patterns; the\n"
2705 " contain only the modifications that match those patterns; the\n"
2706 " remaining modifications will remain in the working directory.\n"
2706 " remaining modifications will remain in the working directory.\n"
2707 "\n"
2707 "\n"
2708 " If -s/--short is specified, files currently included in the patch\n"
2708 " If -s/--short is specified, files currently included in the patch\n"
2709 " will be refreshed just like matched files and remain in the patch.\n"
2709 " will be refreshed just like matched files and remain in the patch.\n"
2710 "\n"
2710 "\n"
2711 " hg add/remove/copy/rename work as usual, though you might want to\n"
2711 " hg add/remove/copy/rename work as usual, though you might want to\n"
2712 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2712 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2713 " and renames. See the diffs help topic for more information on the\n"
2713 " and renames. See the diffs help topic for more information on the\n"
2714 " git diff format.\n"
2714 " git diff format.\n"
2715 " "
2715 " "
2716 msgstr ""
2716 msgstr ""
2717
2717
2718 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2718 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2719 msgstr ""
2719 msgstr ""
2720
2720
2721 msgid ""
2721 msgid ""
2722 "diff of the current patch and subsequent modifications\n"
2722 "diff of the current patch and subsequent modifications\n"
2723 "\n"
2723 "\n"
2724 " Shows a diff which includes the current patch as well as any\n"
2724 " Shows a diff which includes the current patch as well as any\n"
2725 " changes which have been made in the working directory since the\n"
2725 " changes which have been made in the working directory since the\n"
2726 " last refresh (thus showing what the current patch would become\n"
2726 " last refresh (thus showing what the current patch would become\n"
2727 " after a qrefresh).\n"
2727 " after a qrefresh).\n"
2728 "\n"
2728 "\n"
2729 " Use 'hg diff' if you only want to see the changes made since the\n"
2729 " Use 'hg diff' if you only want to see the changes made since the\n"
2730 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2730 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2731 " by the current patch without including changes made since the\n"
2731 " by the current patch without including changes made since the\n"
2732 " qrefresh.\n"
2732 " qrefresh.\n"
2733 " "
2733 " "
2734 msgstr ""
2734 msgstr ""
2735
2735
2736 msgid ""
2736 msgid ""
2737 "fold the named patches into the current patch\n"
2737 "fold the named patches into the current patch\n"
2738 "\n"
2738 "\n"
2739 " Patches must not yet be applied. Each patch will be successively\n"
2739 " Patches must not yet be applied. Each patch will be successively\n"
2740 " applied to the current patch in the order given. If all the\n"
2740 " applied to the current patch in the order given. If all the\n"
2741 " patches apply successfully, the current patch will be refreshed\n"
2741 " patches apply successfully, the current patch will be refreshed\n"
2742 " with the new cumulative patch, and the folded patches will be\n"
2742 " with the new cumulative patch, and the folded patches will be\n"
2743 " deleted. With -k/--keep, the folded patch files will not be\n"
2743 " deleted. With -k/--keep, the folded patch files will not be\n"
2744 " removed afterwards.\n"
2744 " removed afterwards.\n"
2745 "\n"
2745 "\n"
2746 " The header for each folded patch will be concatenated with the\n"
2746 " The header for each folded patch will be concatenated with the\n"
2747 " current patch header, separated by a line of '* * *'."
2747 " current patch header, separated by a line of '* * *'."
2748 msgstr ""
2748 msgstr ""
2749
2749
2750 msgid "qfold requires at least one patch name"
2750 msgid "qfold requires at least one patch name"
2751 msgstr ""
2751 msgstr ""
2752
2752
2753 msgid "No patches applied"
2753 msgid "No patches applied"
2754 msgstr ""
2754 msgstr ""
2755
2755
2756 #, python-format
2756 #, python-format
2757 msgid "Skipping already folded patch %s"
2757 msgid "Skipping already folded patch %s"
2758 msgstr ""
2758 msgstr ""
2759
2759
2760 #, python-format
2760 #, python-format
2761 msgid "qfold cannot fold already applied patch %s"
2761 msgid "qfold cannot fold already applied patch %s"
2762 msgstr ""
2762 msgstr ""
2763
2763
2764 #, python-format
2764 #, python-format
2765 msgid "Error folding patch %s"
2765 msgid "Error folding patch %s"
2766 msgstr ""
2766 msgstr ""
2767
2767
2768 msgid "push or pop patches until named patch is at top of stack"
2768 msgid "push or pop patches until named patch is at top of stack"
2769 msgstr ""
2769 msgstr ""
2770
2770
2771 msgid ""
2771 msgid ""
2772 "set or print guards for a patch\n"
2772 "set or print guards for a patch\n"
2773 "\n"
2773 "\n"
2774 " Guards control whether a patch can be pushed. A patch with no\n"
2774 " Guards control whether a patch can be pushed. A patch with no\n"
2775 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2775 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2776 " pushed only if the qselect command has activated it. A patch with\n"
2776 " pushed only if the qselect command has activated it. A patch with\n"
2777 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2777 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2778 " has activated it.\n"
2778 " has activated it.\n"
2779 "\n"
2779 "\n"
2780 " With no arguments, print the currently active guards.\n"
2780 " With no arguments, print the currently active guards.\n"
2781 " With arguments, set guards for the named patch.\n"
2781 " With arguments, set guards for the named patch.\n"
2782 " NOTE: Specifying negative guards now requires '--'.\n"
2782 " NOTE: Specifying negative guards now requires '--'.\n"
2783 "\n"
2783 "\n"
2784 " To set guards on another patch:\n"
2784 " To set guards on another patch:\n"
2785 " hg qguard -- other.patch +2.6.17 -stable\n"
2785 " hg qguard -- other.patch +2.6.17 -stable\n"
2786 " "
2786 " "
2787 msgstr ""
2787 msgstr ""
2788
2788
2789 msgid "cannot mix -l/--list with options or arguments"
2789 msgid "cannot mix -l/--list with options or arguments"
2790 msgstr ""
2790 msgstr ""
2791
2791
2792 msgid "no patch to work with"
2792 msgid "no patch to work with"
2793 msgstr ""
2793 msgstr ""
2794
2794
2795 #, python-format
2795 #, python-format
2796 msgid "no patch named %s"
2796 msgid "no patch named %s"
2797 msgstr ""
2797 msgstr ""
2798
2798
2799 msgid "print the header of the topmost or specified patch"
2799 msgid "print the header of the topmost or specified patch"
2800 msgstr ""
2800 msgstr ""
2801
2801
2802 msgid ""
2802 msgid ""
2803 "push the next patch onto the stack\n"
2803 "push the next patch onto the stack\n"
2804 "\n"
2804 "\n"
2805 " When -f/--force is applied, all local changes in patched files\n"
2805 " When -f/--force is applied, all local changes in patched files\n"
2806 " will be lost.\n"
2806 " will be lost.\n"
2807 " "
2807 " "
2808 msgstr ""
2808 msgstr ""
2809
2809
2810 msgid "no saved queues found, please use -n\n"
2810 msgid "no saved queues found, please use -n\n"
2811 msgstr ""
2811 msgstr ""
2812
2812
2813 #, python-format
2813 #, python-format
2814 msgid "merging with queue at: %s\n"
2814 msgid "merging with queue at: %s\n"
2815 msgstr ""
2815 msgstr ""
2816
2816
2817 msgid ""
2817 msgid ""
2818 "pop the current patch off the stack\n"
2818 "pop the current patch off the stack\n"
2819 "\n"
2819 "\n"
2820 " By default, pops off the top of the patch stack. If given a patch\n"
2820 " By default, pops off the top of the patch stack. If given a patch\n"
2821 " name, keeps popping off patches until the named patch is at the\n"
2821 " name, keeps popping off patches until the named patch is at the\n"
2822 " top of the stack.\n"
2822 " top of the stack.\n"
2823 " "
2823 " "
2824 msgstr ""
2824 msgstr ""
2825
2825
2826 #, python-format
2826 #, python-format
2827 msgid "using patch queue: %s\n"
2827 msgid "using patch queue: %s\n"
2828 msgstr ""
2828 msgstr ""
2829
2829
2830 msgid ""
2830 msgid ""
2831 "rename a patch\n"
2831 "rename a patch\n"
2832 "\n"
2832 "\n"
2833 " With one argument, renames the current patch to PATCH1.\n"
2833 " With one argument, renames the current patch to PATCH1.\n"
2834 " With two arguments, renames PATCH1 to PATCH2."
2834 " With two arguments, renames PATCH1 to PATCH2."
2835 msgstr ""
2835 msgstr ""
2836
2836
2837 #, python-format
2837 #, python-format
2838 msgid "%s already exists"
2838 msgid "%s already exists"
2839 msgstr ""
2839 msgstr ""
2840
2840
2841 #, python-format
2841 #, python-format
2842 msgid "A patch named %s already exists in the series file"
2842 msgid "A patch named %s already exists in the series file"
2843 msgstr ""
2843 msgstr ""
2844
2844
2845 msgid "restore the queue state saved by a revision"
2845 msgid "restore the queue state saved by a revision"
2846 msgstr ""
2846 msgstr ""
2847
2847
2848 msgid "save current queue state"
2848 msgid "save current queue state"
2849 msgstr ""
2849 msgstr ""
2850
2850
2851 #, python-format
2851 #, python-format
2852 msgid "destination %s exists and is not a directory"
2852 msgid "destination %s exists and is not a directory"
2853 msgstr ""
2853 msgstr ""
2854
2854
2855 #, python-format
2855 #, python-format
2856 msgid "destination %s exists, use -f to force"
2856 msgid "destination %s exists, use -f to force"
2857 msgstr ""
2857 msgstr ""
2858
2858
2859 #, python-format
2859 #, python-format
2860 msgid "copy %s to %s\n"
2860 msgid "copy %s to %s\n"
2861 msgstr ""
2861 msgstr ""
2862
2862
2863 msgid ""
2863 msgid ""
2864 "strip a revision and all its descendants from the repository\n"
2864 "strip a revision and all its descendants from the repository\n"
2865 "\n"
2865 "\n"
2866 " If one of the working directory's parent revisions is stripped, the\n"
2866 " If one of the working directory's parent revisions is stripped, the\n"
2867 " working directory will be updated to the parent of the stripped\n"
2867 " working directory will be updated to the parent of the stripped\n"
2868 " revision.\n"
2868 " revision.\n"
2869 " "
2869 " "
2870 msgstr ""
2870 msgstr ""
2871
2871
2872 msgid ""
2872 msgid ""
2873 "set or print guarded patches to push\n"
2873 "set or print guarded patches to push\n"
2874 "\n"
2874 "\n"
2875 " Use the qguard command to set or print guards on patch, then use\n"
2875 " Use the qguard command to set or print guards on patch, then use\n"
2876 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2876 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2877 " it has no guards or any positive guards match the currently\n"
2877 " it has no guards or any positive guards match the currently\n"
2878 " selected guard, but will not be pushed if any negative guards\n"
2878 " selected guard, but will not be pushed if any negative guards\n"
2879 " match the current guard. For example:\n"
2879 " match the current guard. For example:\n"
2880 "\n"
2880 "\n"
2881 " qguard foo.patch -stable (negative guard)\n"
2881 " qguard foo.patch -stable (negative guard)\n"
2882 " qguard bar.patch +stable (positive guard)\n"
2882 " qguard bar.patch +stable (positive guard)\n"
2883 " qselect stable\n"
2883 " qselect stable\n"
2884 "\n"
2884 "\n"
2885 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2885 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2886 " it has a negative match) but push bar.patch (because it has a\n"
2886 " it has a negative match) but push bar.patch (because it has a\n"
2887 " positive match).\n"
2887 " positive match).\n"
2888 "\n"
2888 "\n"
2889 " With no arguments, prints the currently active guards.\n"
2889 " With no arguments, prints the currently active guards.\n"
2890 " With one argument, sets the active guard.\n"
2890 " With one argument, sets the active guard.\n"
2891 "\n"
2891 "\n"
2892 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2892 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2893 " When no guards are active, patches with positive guards are\n"
2893 " When no guards are active, patches with positive guards are\n"
2894 " skipped and patches with negative guards are pushed.\n"
2894 " skipped and patches with negative guards are pushed.\n"
2895 "\n"
2895 "\n"
2896 " qselect can change the guards on applied patches. It does not pop\n"
2896 " qselect can change the guards on applied patches. It does not pop\n"
2897 " guarded patches by default. Use --pop to pop back to the last\n"
2897 " guarded patches by default. Use --pop to pop back to the last\n"
2898 " applied patch that is not guarded. Use --reapply (which implies\n"
2898 " applied patch that is not guarded. Use --reapply (which implies\n"
2899 " --pop) to push back to the current patch afterwards, but skip\n"
2899 " --pop) to push back to the current patch afterwards, but skip\n"
2900 " guarded patches.\n"
2900 " guarded patches.\n"
2901 "\n"
2901 "\n"
2902 " Use -s/--series to print a list of all guards in the series file\n"
2902 " Use -s/--series to print a list of all guards in the series file\n"
2903 " (no other arguments needed). Use -v for more information."
2903 " (no other arguments needed). Use -v for more information."
2904 msgstr ""
2904 msgstr ""
2905
2905
2906 msgid "guards deactivated\n"
2906 msgid "guards deactivated\n"
2907 msgstr ""
2907 msgstr ""
2908
2908
2909 #, python-format
2909 #, python-format
2910 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
2910 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
2911 msgstr ""
2911 msgstr ""
2912
2912
2913 #, python-format
2913 #, python-format
2914 msgid "number of guarded, applied patches has changed from %d to %d\n"
2914 msgid "number of guarded, applied patches has changed from %d to %d\n"
2915 msgstr ""
2915 msgstr ""
2916
2916
2917 msgid "guards in series file:\n"
2917 msgid "guards in series file:\n"
2918 msgstr ""
2918 msgstr ""
2919
2919
2920 msgid "no guards in series file\n"
2920 msgid "no guards in series file\n"
2921 msgstr ""
2921 msgstr ""
2922
2922
2923 msgid "active guards:\n"
2923 msgid "active guards:\n"
2924 msgstr ""
2924 msgstr ""
2925
2925
2926 msgid "no active guards\n"
2926 msgid "no active guards\n"
2927 msgstr ""
2927 msgstr ""
2928
2928
2929 msgid "popping guarded patches\n"
2929 msgid "popping guarded patches\n"
2930 msgstr ""
2930 msgstr ""
2931
2931
2932 msgid "reapplying unguarded patches\n"
2932 msgid "reapplying unguarded patches\n"
2933 msgstr ""
2933 msgstr ""
2934
2934
2935 msgid ""
2935 msgid ""
2936 "move applied patches into repository history\n"
2936 "move applied patches into repository history\n"
2937 "\n"
2937 "\n"
2938 " Finishes the specified revisions (corresponding to applied\n"
2938 " Finishes the specified revisions (corresponding to applied\n"
2939 " patches) by moving them out of mq control into regular repository\n"
2939 " patches) by moving them out of mq control into regular repository\n"
2940 " history.\n"
2940 " history.\n"
2941 "\n"
2941 "\n"
2942 " Accepts a revision range or the -a/--applied option. If --applied\n"
2942 " Accepts a revision range or the -a/--applied option. If --applied\n"
2943 " is specified, all applied mq revisions are removed from mq\n"
2943 " is specified, all applied mq revisions are removed from mq\n"
2944 " control. Otherwise, the given revisions must be at the base of the\n"
2944 " control. Otherwise, the given revisions must be at the base of the\n"
2945 " stack of applied patches.\n"
2945 " stack of applied patches.\n"
2946 "\n"
2946 "\n"
2947 " This can be especially useful if your changes have been applied to\n"
2947 " This can be especially useful if your changes have been applied to\n"
2948 " an upstream repository, or if you are about to push your changes\n"
2948 " an upstream repository, or if you are about to push your changes\n"
2949 " to upstream.\n"
2949 " to upstream.\n"
2950 " "
2950 " "
2951 msgstr ""
2951 msgstr ""
2952
2952
2953 msgid "no revisions specified"
2953 msgid "no revisions specified"
2954 msgstr ""
2954 msgstr ""
2955
2955
2956 msgid "cannot commit over an applied mq patch"
2956 msgid "cannot commit over an applied mq patch"
2957 msgstr ""
2957 msgstr ""
2958
2958
2959 msgid "source has mq patches applied"
2959 msgid "source has mq patches applied"
2960 msgstr ""
2960 msgstr ""
2961
2961
2962 #, python-format
2962 #, python-format
2963 msgid "mq status file refers to unknown node %s\n"
2963 msgid "mq status file refers to unknown node %s\n"
2964 msgstr ""
2964 msgstr ""
2965
2965
2966 #, python-format
2966 #, python-format
2967 msgid "Tag %s overrides mq patch of the same name\n"
2967 msgid "Tag %s overrides mq patch of the same name\n"
2968 msgstr ""
2968 msgstr ""
2969
2969
2970 msgid "cannot import over an applied patch"
2970 msgid "cannot import over an applied patch"
2971 msgstr ""
2971 msgstr ""
2972
2972
2973 msgid "print first line of patch header"
2973 msgid "print first line of patch header"
2974 msgstr ""
2974 msgstr ""
2975
2975
2976 msgid "hg qapplied [-s] [PATCH]"
2976 msgid "hg qapplied [-s] [PATCH]"
2977 msgstr ""
2977 msgstr ""
2978
2978
2979 msgid "use pull protocol to copy metadata"
2979 msgid "use pull protocol to copy metadata"
2980 msgstr ""
2980 msgstr ""
2981
2981
2982 msgid "do not update the new working directories"
2982 msgid "do not update the new working directories"
2983 msgstr ""
2983 msgstr ""
2984
2984
2985 msgid "use uncompressed transfer (fast over LAN)"
2985 msgid "use uncompressed transfer (fast over LAN)"
2986 msgstr ""
2986 msgstr ""
2987
2987
2988 msgid "location of source patch repository"
2988 msgid "location of source patch repository"
2989 msgstr ""
2989 msgstr ""
2990
2990
2991 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2991 msgid "hg qclone [OPTION]... SOURCE [DEST]"
2992 msgstr ""
2992 msgstr ""
2993
2993
2994 msgid "hg qcommit [OPTION]... [FILE]..."
2994 msgid "hg qcommit [OPTION]... [FILE]..."
2995 msgstr ""
2995 msgstr ""
2996
2996
2997 msgid "hg qdiff [OPTION]... [FILE]..."
2997 msgid "hg qdiff [OPTION]... [FILE]..."
2998 msgstr ""
2998 msgstr ""
2999
2999
3000 msgid "keep patch file"
3000 msgid "keep patch file"
3001 msgstr ""
3001 msgstr ""
3002
3002
3003 msgid "stop managing a revision (DEPRECATED)"
3003 msgid "stop managing a revision (DEPRECATED)"
3004 msgstr ""
3004 msgstr ""
3005
3005
3006 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3006 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3007 msgstr ""
3007 msgstr ""
3008
3008
3009 msgid "edit patch header"
3009 msgid "edit patch header"
3010 msgstr ""
3010 msgstr ""
3011
3011
3012 msgid "keep folded patch files"
3012 msgid "keep folded patch files"
3013 msgstr ""
3013 msgstr ""
3014
3014
3015 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3015 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3016 msgstr ""
3016 msgstr ""
3017
3017
3018 msgid "overwrite any local changes"
3018 msgid "overwrite any local changes"
3019 msgstr ""
3019 msgstr ""
3020
3020
3021 msgid "hg qgoto [OPTION]... PATCH"
3021 msgid "hg qgoto [OPTION]... PATCH"
3022 msgstr ""
3022 msgstr ""
3023
3023
3024 msgid "list all patches and guards"
3024 msgid "list all patches and guards"
3025 msgstr ""
3025 msgstr ""
3026
3026
3027 msgid "drop all guards"
3027 msgid "drop all guards"
3028 msgstr ""
3028 msgstr ""
3029
3029
3030 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3030 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3031 msgstr ""
3031 msgstr ""
3032
3032
3033 msgid "hg qheader [PATCH]"
3033 msgid "hg qheader [PATCH]"
3034 msgstr ""
3034 msgstr ""
3035
3035
3036 msgid "import file in patch directory"
3036 msgid "import file in patch directory"
3037 msgstr ""
3037 msgstr ""
3038
3038
3039 msgid "name of patch file"
3039 msgid "name of patch file"
3040 msgstr ""
3040 msgstr ""
3041
3041
3042 msgid "overwrite existing files"
3042 msgid "overwrite existing files"
3043 msgstr ""
3043 msgstr ""
3044
3044
3045 msgid "place existing revisions under mq control"
3045 msgid "place existing revisions under mq control"
3046 msgstr ""
3046 msgstr ""
3047
3047
3048 msgid "use git extended diff format"
3048 msgid "use git extended diff format"
3049 msgstr "utiliser le format de patch étendu de git"
3049 msgstr "utiliser le format de patch étendu de git"
3050
3050
3051 msgid "qpush after importing"
3051 msgid "qpush after importing"
3052 msgstr ""
3052 msgstr ""
3053
3053
3054 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3054 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3055 msgstr ""
3055 msgstr ""
3056
3056
3057 msgid "create queue repository"
3057 msgid "create queue repository"
3058 msgstr ""
3058 msgstr ""
3059
3059
3060 msgid "hg qinit [-c]"
3060 msgid "hg qinit [-c]"
3061 msgstr ""
3061 msgstr ""
3062
3062
3063 msgid "import uncommitted changes into patch"
3063 msgid "import uncommitted changes into patch"
3064 msgstr ""
3064 msgstr ""
3065
3065
3066 msgid "add \"From: <current user>\" to patch"
3066 msgid "add \"From: <current user>\" to patch"
3067 msgstr ""
3067 msgstr ""
3068
3068
3069 msgid "add \"From: <given user>\" to patch"
3069 msgid "add \"From: <given user>\" to patch"
3070 msgstr ""
3070 msgstr ""
3071
3071
3072 msgid "add \"Date: <current date>\" to patch"
3072 msgid "add \"Date: <current date>\" to patch"
3073 msgstr ""
3073 msgstr ""
3074
3074
3075 msgid "add \"Date: <given date>\" to patch"
3075 msgid "add \"Date: <given date>\" to patch"
3076 msgstr ""
3076 msgstr ""
3077
3077
3078 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3078 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3079 msgstr ""
3079 msgstr ""
3080
3080
3081 msgid "hg qnext [-s]"
3081 msgid "hg qnext [-s]"
3082 msgstr ""
3082 msgstr ""
3083
3083
3084 msgid "hg qprev [-s]"
3084 msgid "hg qprev [-s]"
3085 msgstr ""
3085 msgstr ""
3086
3086
3087 msgid "pop all patches"
3087 msgid "pop all patches"
3088 msgstr ""
3088 msgstr ""
3089
3089
3090 msgid "queue name to pop"
3090 msgid "queue name to pop"
3091 msgstr ""
3091 msgstr ""
3092
3092
3093 msgid "forget any local changes"
3093 msgid "forget any local changes"
3094 msgstr ""
3094 msgstr ""
3095
3095
3096 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3096 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3097 msgstr ""
3097 msgstr ""
3098
3098
3099 msgid "apply if the patch has rejects"
3099 msgid "apply if the patch has rejects"
3100 msgstr ""
3100 msgstr ""
3101
3101
3102 msgid "list patch name in commit text"
3102 msgid "list patch name in commit text"
3103 msgstr ""
3103 msgstr ""
3104
3104
3105 msgid "apply all patches"
3105 msgid "apply all patches"
3106 msgstr ""
3106 msgstr ""
3107
3107
3108 msgid "merge from another queue"
3108 msgid "merge from another queue"
3109 msgstr ""
3109 msgstr ""
3110
3110
3111 msgid "merge queue name"
3111 msgid "merge queue name"
3112 msgstr ""
3112 msgstr ""
3113
3113
3114 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3114 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3115 msgstr ""
3115 msgstr ""
3116
3116
3117 msgid "refresh only files already in the patch and specified files"
3117 msgid "refresh only files already in the patch and specified files"
3118 msgstr ""
3118 msgstr ""
3119
3119
3120 msgid "add/update \"From: <current user>\" in patch"
3120 msgid "add/update \"From: <current user>\" in patch"
3121 msgstr ""
3121 msgstr ""
3122
3122
3123 msgid "add/update \"From: <given user>\" in patch"
3123 msgid "add/update \"From: <given user>\" in patch"
3124 msgstr ""
3124 msgstr ""
3125
3125
3126 msgid "update \"Date: <current date>\" in patch (if present)"
3126 msgid "update \"Date: <current date>\" in patch (if present)"
3127 msgstr ""
3127 msgstr ""
3128
3128
3129 msgid "update \"Date: <given date>\" in patch (if present)"
3129 msgid "update \"Date: <given date>\" in patch (if present)"
3130 msgstr ""
3130 msgstr ""
3131
3131
3132 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3132 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3133 msgstr ""
3133 msgstr ""
3134
3134
3135 msgid "hg qrename PATCH1 [PATCH2]"
3135 msgid "hg qrename PATCH1 [PATCH2]"
3136 msgstr ""
3136 msgstr ""
3137
3137
3138 msgid "delete save entry"
3138 msgid "delete save entry"
3139 msgstr ""
3139 msgstr ""
3140
3140
3141 msgid "update queue working directory"
3141 msgid "update queue working directory"
3142 msgstr ""
3142 msgstr ""
3143
3143
3144 msgid "hg qrestore [-d] [-u] REV"
3144 msgid "hg qrestore [-d] [-u] REV"
3145 msgstr ""
3145 msgstr ""
3146
3146
3147 msgid "copy patch directory"
3147 msgid "copy patch directory"
3148 msgstr ""
3148 msgstr ""
3149
3149
3150 msgid "copy directory name"
3150 msgid "copy directory name"
3151 msgstr ""
3151 msgstr ""
3152
3152
3153 msgid "clear queue status file"
3153 msgid "clear queue status file"
3154 msgstr ""
3154 msgstr ""
3155
3155
3156 msgid "force copy"
3156 msgid "force copy"
3157 msgstr ""
3157 msgstr ""
3158
3158
3159 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3159 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3160 msgstr ""
3160 msgstr ""
3161
3161
3162 msgid "disable all guards"
3162 msgid "disable all guards"
3163 msgstr ""
3163 msgstr ""
3164
3164
3165 msgid "list all guards in series file"
3165 msgid "list all guards in series file"
3166 msgstr ""
3166 msgstr ""
3167
3167
3168 msgid "pop to before first guarded applied patch"
3168 msgid "pop to before first guarded applied patch"
3169 msgstr ""
3169 msgstr ""
3170
3170
3171 msgid "pop, then reapply patches"
3171 msgid "pop, then reapply patches"
3172 msgstr ""
3172 msgstr ""
3173
3173
3174 msgid "hg qselect [OPTION]... [GUARD]..."
3174 msgid "hg qselect [OPTION]... [GUARD]..."
3175 msgstr ""
3175 msgstr ""
3176
3176
3177 msgid "print patches not in series"
3177 msgid "print patches not in series"
3178 msgstr ""
3178 msgstr ""
3179
3179
3180 msgid "hg qseries [-ms]"
3180 msgid "hg qseries [-ms]"
3181 msgstr ""
3181 msgstr ""
3182
3182
3183 msgid "force removal with local changes"
3183 msgid "force removal with local changes"
3184 msgstr ""
3184 msgstr ""
3185
3185
3186 msgid "bundle unrelated changesets"
3186 msgid "bundle unrelated changesets"
3187 msgstr ""
3187 msgstr ""
3188
3188
3189 msgid "no backups"
3189 msgid "no backups"
3190 msgstr ""
3190 msgstr ""
3191
3191
3192 msgid "hg strip [-f] [-b] [-n] REV"
3192 msgid "hg strip [-f] [-b] [-n] REV"
3193 msgstr ""
3193 msgstr ""
3194
3194
3195 msgid "hg qtop [-s]"
3195 msgid "hg qtop [-s]"
3196 msgstr ""
3196 msgstr ""
3197
3197
3198 msgid "hg qunapplied [-s] [PATCH]"
3198 msgid "hg qunapplied [-s] [PATCH]"
3199 msgstr ""
3199 msgstr ""
3200
3200
3201 msgid "finish all applied changesets"
3201 msgid "finish all applied changesets"
3202 msgstr ""
3202 msgstr ""
3203
3203
3204 msgid "hg qfinish [-a] [REV]..."
3204 msgid "hg qfinish [-a] [REV]..."
3205 msgstr ""
3205 msgstr ""
3206
3206
3207 msgid ""
3207 msgid ""
3208 "hooks for sending email notifications at commit/push time\n"
3208 "hooks for sending email notifications at commit/push time\n"
3209 "\n"
3209 "\n"
3210 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3210 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3211 "messages to stdout, for testing and configuring.\n"
3211 "messages to stdout, for testing and configuring.\n"
3212 "\n"
3212 "\n"
3213 "To use, configure notify extension and enable in hgrc like this:\n"
3213 "To use, configure notify extension and enable in hgrc like this:\n"
3214 "\n"
3214 "\n"
3215 " [extensions]\n"
3215 " [extensions]\n"
3216 " hgext.notify =\n"
3216 " hgext.notify =\n"
3217 "\n"
3217 "\n"
3218 " [hooks]\n"
3218 " [hooks]\n"
3219 " # one email for each incoming changeset\n"
3219 " # one email for each incoming changeset\n"
3220 " incoming.notify = python:hgext.notify.hook\n"
3220 " incoming.notify = python:hgext.notify.hook\n"
3221 " # batch emails when many changesets incoming at one time\n"
3221 " # batch emails when many changesets incoming at one time\n"
3222 " changegroup.notify = python:hgext.notify.hook\n"
3222 " changegroup.notify = python:hgext.notify.hook\n"
3223 "\n"
3223 "\n"
3224 " [notify]\n"
3224 " [notify]\n"
3225 " # config items go in here\n"
3225 " # config items go in here\n"
3226 "\n"
3226 "\n"
3227 " config items:\n"
3227 " config items:\n"
3228 "\n"
3228 "\n"
3229 " REQUIRED:\n"
3229 " REQUIRED:\n"
3230 " config = /path/to/file # file containing subscriptions\n"
3230 " config = /path/to/file # file containing subscriptions\n"
3231 "\n"
3231 "\n"
3232 " OPTIONAL:\n"
3232 " OPTIONAL:\n"
3233 " test = True # print messages to stdout for testing\n"
3233 " test = True # print messages to stdout for testing\n"
3234 " strip = 3 # number of slashes to strip for url paths\n"
3234 " strip = 3 # number of slashes to strip for url paths\n"
3235 " domain = example.com # domain to use if committer missing domain\n"
3235 " domain = example.com # domain to use if committer missing domain\n"
3236 " style = ... # style file to use when formatting email\n"
3236 " style = ... # style file to use when formatting email\n"
3237 " template = ... # template to use when formatting email\n"
3237 " template = ... # template to use when formatting email\n"
3238 " incoming = ... # template to use when run as incoming hook\n"
3238 " incoming = ... # template to use when run as incoming hook\n"
3239 " changegroup = ... # template when run as changegroup hook\n"
3239 " changegroup = ... # template when run as changegroup hook\n"
3240 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3240 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3241 " maxsubject = 67 # truncate subject line longer than this\n"
3241 " maxsubject = 67 # truncate subject line longer than this\n"
3242 " diffstat = True # add a diffstat before the diff content\n"
3242 " diffstat = True # add a diffstat before the diff content\n"
3243 " sources = serve # notify if source of incoming changes in this "
3243 " sources = serve # notify if source of incoming changes in this "
3244 "list\n"
3244 "list\n"
3245 " # (serve == ssh or http, push, pull, bundle)\n"
3245 " # (serve == ssh or http, push, pull, bundle)\n"
3246 " [email]\n"
3246 " [email]\n"
3247 " from = user@host.com # email address to send as if none given\n"
3247 " from = user@host.com # email address to send as if none given\n"
3248 " [web]\n"
3248 " [web]\n"
3249 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3249 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3250 "\n"
3250 "\n"
3251 " notify config file has same format as regular hgrc. it has two\n"
3251 " notify config file has same format as regular hgrc. it has two\n"
3252 " sections so you can express subscriptions in whatever way is handier\n"
3252 " sections so you can express subscriptions in whatever way is handier\n"
3253 " for you.\n"
3253 " for you.\n"
3254 "\n"
3254 "\n"
3255 " [usersubs]\n"
3255 " [usersubs]\n"
3256 " # key is subscriber email, value is \",\"-separated list of glob "
3256 " # key is subscriber email, value is \",\"-separated list of glob "
3257 "patterns\n"
3257 "patterns\n"
3258 " user@host = pattern\n"
3258 " user@host = pattern\n"
3259 "\n"
3259 "\n"
3260 " [reposubs]\n"
3260 " [reposubs]\n"
3261 " # key is glob pattern, value is \",\"-separated list of subscriber "
3261 " # key is glob pattern, value is \",\"-separated list of subscriber "
3262 "emails\n"
3262 "emails\n"
3263 " pattern = user@host\n"
3263 " pattern = user@host\n"
3264 "\n"
3264 "\n"
3265 " glob patterns are matched against path to repository root.\n"
3265 " glob patterns are matched against path to repository root.\n"
3266 "\n"
3266 "\n"
3267 " if you like, you can put notify config file in repository that users\n"
3267 " if you like, you can put notify config file in repository that users\n"
3268 " can push changes to, they can manage their own subscriptions."
3268 " can push changes to, they can manage their own subscriptions."
3269 msgstr ""
3269 msgstr ""
3270
3270
3271 #, python-format
3271 #, python-format
3272 msgid "%s: %d new changesets"
3272 msgid "%s: %d new changesets"
3273 msgstr ""
3273 msgstr ""
3274
3274
3275 #, python-format
3275 #, python-format
3276 msgid "notify: sending %d subscribers %d changes\n"
3276 msgid "notify: sending %d subscribers %d changes\n"
3277 msgstr ""
3277 msgstr ""
3278
3278
3279 #, python-format
3279 #, python-format
3280 msgid ""
3280 msgid ""
3281 "\n"
3281 "\n"
3282 "diffs (truncated from %d to %d lines):\n"
3282 "diffs (truncated from %d to %d lines):\n"
3283 "\n"
3283 "\n"
3284 msgstr ""
3284 msgstr ""
3285
3285
3286 #, python-format
3286 #, python-format
3287 msgid ""
3287 msgid ""
3288 "\n"
3288 "\n"
3289 "diffs (%d lines):\n"
3289 "diffs (%d lines):\n"
3290 "\n"
3290 "\n"
3291 msgstr ""
3291 msgstr ""
3292
3292
3293 #, python-format
3293 #, python-format
3294 msgid "notify: no subscribers to repository %s\n"
3294 msgid "notify: no subscribers to repository %s\n"
3295 msgstr ""
3295 msgstr ""
3296
3296
3297 #, python-format
3297 #, python-format
3298 msgid "notify: changes have source \"%s\" - skipping\n"
3298 msgid "notify: changes have source \"%s\" - skipping\n"
3299 msgstr ""
3299 msgstr ""
3300
3300
3301 msgid ""
3301 msgid ""
3302 "browse command output with an external pager\n"
3302 "browse command output with an external pager\n"
3303 "\n"
3303 "\n"
3304 "To set the pager that should be used, set the application variable:\n"
3304 "To set the pager that should be used, set the application variable:\n"
3305 "\n"
3305 "\n"
3306 " [pager]\n"
3306 " [pager]\n"
3307 " pager = LESS='FSRX' less\n"
3307 " pager = LESS='FSRX' less\n"
3308 "\n"
3308 "\n"
3309 "If no pager is set, the pager extensions uses the environment variable\n"
3309 "If no pager is set, the pager extensions uses the environment variable\n"
3310 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3310 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3311 "\n"
3311 "\n"
3312 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3312 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3313 "setting:\n"
3313 "setting:\n"
3314 "\n"
3314 "\n"
3315 " [pager]\n"
3315 " [pager]\n"
3316 " quiet = True\n"
3316 " quiet = True\n"
3317 "\n"
3317 "\n"
3318 "You can disable the pager for certain commands by adding them to the\n"
3318 "You can disable the pager for certain commands by adding them to the\n"
3319 "pager.ignore list:\n"
3319 "pager.ignore list:\n"
3320 "\n"
3320 "\n"
3321 " [pager]\n"
3321 " [pager]\n"
3322 " ignore = version, help, update\n"
3322 " ignore = version, help, update\n"
3323 "\n"
3323 "\n"
3324 "You can also enable the pager only for certain commands using\n"
3324 "You can also enable the pager only for certain commands using\n"
3325 "pager.attend:\n"
3325 "pager.attend:\n"
3326 "\n"
3326 "\n"
3327 " [pager]\n"
3327 " [pager]\n"
3328 " attend = log\n"
3328 " attend = log\n"
3329 "\n"
3329 "\n"
3330 "If pager.attend is present, pager.ignore will be ignored.\n"
3330 "If pager.attend is present, pager.ignore will be ignored.\n"
3331 "\n"
3331 "\n"
3332 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3332 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3333 "specify them in the global .hgrc\n"
3333 "specify them in the global .hgrc\n"
3334 msgstr ""
3334 msgstr ""
3335
3335
3336 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3336 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3337 # sera capable de replier automatiquement la première ligne d'aide)
3337 # sera capable de replier automatiquement la première ligne d'aide)
3338 msgid ""
3338 msgid ""
3339 "interpret suffixes to refer to ancestor revisions\n"
3339 "interpret suffixes to refer to ancestor revisions\n"
3340 "\n"
3340 "\n"
3341 "This extension allows you to use git-style suffixes to refer to the\n"
3341 "This extension allows you to use git-style suffixes to refer to the\n"
3342 "ancestors of a specific revision.\n"
3342 "ancestors of a specific revision.\n"
3343 "\n"
3343 "\n"
3344 "For example, if you can refer to a revision as \"foo\", then:\n"
3344 "For example, if you can refer to a revision as \"foo\", then:\n"
3345 "\n"
3345 "\n"
3346 "- foo^N = Nth parent of foo\n"
3346 "- foo^N = Nth parent of foo\n"
3347 " foo^0 = foo\n"
3347 " foo^0 = foo\n"
3348 " foo^1 = first parent of foo\n"
3348 " foo^1 = first parent of foo\n"
3349 " foo^2 = second parent of foo\n"
3349 " foo^2 = second parent of foo\n"
3350 " foo^ = foo^1\n"
3350 " foo^ = foo^1\n"
3351 "\n"
3351 "\n"
3352 "- foo~N = Nth first grandparent of foo\n"
3352 "- foo~N = Nth first grandparent of foo\n"
3353 " foo~0 = foo\n"
3353 " foo~0 = foo\n"
3354 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3354 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3355 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3355 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3356 msgstr ""
3356 msgstr ""
3357 "suffixes faisant référence à des révisions antérieures\n"
3357 "suffixes faisant référence à des révisions antérieures\n"
3358 "\n"
3358 "\n"
3359 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3359 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3360 "faire référence aux ancêtres d'une révision donnée.\n"
3360 "faire référence aux ancêtres d'une révision donnée.\n"
3361 "\n"
3361 "\n"
3362 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3362 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3363 "\n"
3363 "\n"
3364 "- foo^N = Nième parent de foo\n"
3364 "- foo^N = Nième parent de foo\n"
3365 " foo^0 = foo\n"
3365 " foo^0 = foo\n"
3366 " foo^1 = premier parent de foo\n"
3366 " foo^1 = premier parent de foo\n"
3367 " foo^2 = second parent de foo\n"
3367 " foo^2 = second parent de foo\n"
3368 " foo^ = foo^1\n"
3368 " foo^ = foo^1\n"
3369 "\n"
3369 "\n"
3370 "- foo~N = Nième premier grand-parent de foo\n"
3370 "- foo~N = Nième premier grand-parent de foo\n"
3371 " foo~0 = foo\n"
3371 " foo~0 = foo\n"
3372 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3372 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3373 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3373 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3374
3374
3375 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3375 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3376 # sera capable de replier automatiquement la première ligne d'aide)
3376 # sera capable de replier automatiquement la première ligne d'aide)
3377 msgid ""
3377 msgid ""
3378 "command to send changesets as (a series of) patch emails\n"
3378 "command to send changesets as (a series of) patch emails\n"
3379 "\n"
3379 "\n"
3380 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3380 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3381 "describes the series as a whole.\n"
3381 "describes the series as a whole.\n"
3382 "\n"
3382 "\n"
3383 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3383 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3384 "first line of the changeset description as the subject text. The\n"
3384 "first line of the changeset description as the subject text. The\n"
3385 "message contains two or three body parts:\n"
3385 "message contains two or three body parts:\n"
3386 "\n"
3386 "\n"
3387 " The changeset description.\n"
3387 " The changeset description.\n"
3388 "\n"
3388 "\n"
3389 " [Optional] The result of running diffstat on the patch.\n"
3389 " [Optional] The result of running diffstat on the patch.\n"
3390 "\n"
3390 "\n"
3391 " The patch itself, as generated by \"hg export\".\n"
3391 " The patch itself, as generated by \"hg export\".\n"
3392 "\n"
3392 "\n"
3393 "Each message refers to the first in the series using the In-Reply-To\n"
3393 "Each message refers to the first in the series using the In-Reply-To\n"
3394 "and References headers, so they will show up as a sequence in threaded\n"
3394 "and References headers, so they will show up as a sequence in threaded\n"
3395 "mail and news readers, and in mail archives.\n"
3395 "mail and news readers, and in mail archives.\n"
3396 "\n"
3396 "\n"
3397 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3397 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3398 "with a diffstat summary and the changeset summary, so you can be sure\n"
3398 "with a diffstat summary and the changeset summary, so you can be sure\n"
3399 "you are sending the right changes.\n"
3399 "you are sending the right changes.\n"
3400 "\n"
3400 "\n"
3401 "To configure other defaults, add a section like this to your hgrc\n"
3401 "To configure other defaults, add a section like this to your hgrc\n"
3402 "file:\n"
3402 "file:\n"
3403 "\n"
3403 "\n"
3404 " [email]\n"
3404 " [email]\n"
3405 " from = My Name <my@email>\n"
3405 " from = My Name <my@email>\n"
3406 " to = recipient1, recipient2, ...\n"
3406 " to = recipient1, recipient2, ...\n"
3407 " cc = cc1, cc2, ...\n"
3407 " cc = cc1, cc2, ...\n"
3408 " bcc = bcc1, bcc2, ...\n"
3408 " bcc = bcc1, bcc2, ...\n"
3409 "\n"
3409 "\n"
3410 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3410 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3411 "as a patchbomb.\n"
3411 "as a patchbomb.\n"
3412 "\n"
3412 "\n"
3413 "To avoid sending patches prematurely, it is a good idea to first run\n"
3413 "To avoid sending patches prematurely, it is a good idea to first run\n"
3414 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3414 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3415 "prompted for an email recipient address, a subject and an introductory\n"
3415 "prompted for an email recipient address, a subject and an introductory\n"
3416 "message describing the patches of your patchbomb. Then when all is\n"
3416 "message describing the patches of your patchbomb. Then when all is\n"
3417 "done, patchbomb messages are displayed. If the PAGER environment\n"
3417 "done, patchbomb messages are displayed. If the PAGER environment\n"
3418 "variable is set, your pager will be fired up once for each patchbomb\n"
3418 "variable is set, your pager will be fired up once for each patchbomb\n"
3419 "message, so you can verify everything is alright.\n"
3419 "message, so you can verify everything is alright.\n"
3420 "\n"
3420 "\n"
3421 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3421 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3422 "patchbomb message in a pager or sending the messages directly, it will\n"
3422 "patchbomb message in a pager or sending the messages directly, it will\n"
3423 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3423 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3424 "can be previewed with any mail user agent which supports UNIX mbox\n"
3424 "can be previewed with any mail user agent which supports UNIX mbox\n"
3425 "files, e.g. with mutt:\n"
3425 "files, e.g. with mutt:\n"
3426 "\n"
3426 "\n"
3427 " % mutt -R -f mbox\n"
3427 " % mutt -R -f mbox\n"
3428 "\n"
3428 "\n"
3429 "When you are previewing the patchbomb messages, you can use `formail'\n"
3429 "When you are previewing the patchbomb messages, you can use `formail'\n"
3430 "(a utility that is commonly installed as part of the procmail\n"
3430 "(a utility that is commonly installed as part of the procmail\n"
3431 "package), to send each message out:\n"
3431 "package), to send each message out:\n"
3432 "\n"
3432 "\n"
3433 " % formail -s sendmail -bm -t < mbox\n"
3433 " % formail -s sendmail -bm -t < mbox\n"
3434 "\n"
3434 "\n"
3435 "That should be all. Now your patchbomb is on its way out.\n"
3435 "That should be all. Now your patchbomb is on its way out.\n"
3436 "\n"
3436 "\n"
3437 "You can also either configure the method option in the email section\n"
3437 "You can also either configure the method option in the email section\n"
3438 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3438 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3439 "that the patchbomb extension can automatically send patchbombs\n"
3439 "that the patchbomb extension can automatically send patchbombs\n"
3440 "directly from the commandline. See the [email] and [smtp] sections in\n"
3440 "directly from the commandline. See the [email] and [smtp] sections in\n"
3441 "hgrc(5) for details."
3441 "hgrc(5) for details."
3442 msgstr ""
3442 msgstr ""
3443 "envoi d'une série de \"changesets\" par courrier électronique\n"
3443 "envoi d'une série de \"changesets\" par courrier électronique\n"
3444 "\n"
3444 "\n"
3445 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3445 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3446 "décrivant dans son ensemble.\n"
3446 "décrivant dans son ensemble.\n"
3447 "\n"
3447 "\n"
3448 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3448 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3449 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3449 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3450 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3450 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3451 "parties :\n"
3451 "parties :\n"
3452 "\n"
3452 "\n"
3453 " La description du \"changeset\".\n"
3453 " La description du \"changeset\".\n"
3454 "\n"
3454 "\n"
3455 " Optionnellement, un résumé des modifications généré par le\n"
3455 " Optionnellement, un résumé des modifications généré par le\n"
3456 " programme diffstat.\n"
3456 " programme diffstat.\n"
3457 "\n"
3457 "\n"
3458 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3458 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3459 "\n"
3459 "\n"
3460 "Chaque message fait référence au premier de la série (à l'aide\n"
3460 "Chaque message fait référence au premier de la série (à l'aide\n"
3461 "des en-têtes de message In-Reply-To et References) de manière à\n"
3461 "des en-têtes de message In-Reply-To et References) de manière à\n"
3462 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3462 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
3463 "électronique et de nouvelles, ainsi que dans les archives de\n"
3463 "électronique et de nouvelles, ainsi que dans les archives de\n"
3464 "messagerie.\n"
3464 "messagerie.\n"
3465 "\n"
3465 "\n"
3466 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3466 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
3467 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3467 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
3468 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3468 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
3469 "d'être certain de bien envoyer les bonnes modifications.\n"
3469 "d'être certain de bien envoyer les bonnes modifications.\n"
3470 "\n"
3470 "\n"
3471 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3471 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
3472 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3472 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
3473 "\n"
3473 "\n"
3474 " [email]\n"
3474 " [email]\n"
3475 " from = Mon Nom <mon@adresse_de_courriel>\n"
3475 " from = Mon Nom <mon@adresse_de_courriel>\n"
3476 " to = destinataire1, destinataire2, ...\n"
3476 " to = destinataire1, destinataire2, ...\n"
3477 " cc = cc1, cc2, ...\n"
3477 " cc = cc1, cc2, ...\n"
3478 " bcc = bcc1, bcc2, ...\n"
3478 " bcc = bcc1, bcc2, ...\n"
3479 "\n"
3479 "\n"
3480 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3480 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
3481 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3481 "pour envoyer par courrier électronique une série de \"changesets\".\n"
3482 "\n"
3482 "\n"
3483 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3483 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
3484 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3484 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
3485 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3485 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
3486 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3486 "message d'introduction pour la série de patchs. Lorsque tout est\n"
3487 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3487 "prêt, les messages seront affichés. Si la variable d'environnement\n"
3488 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3488 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
3489 "l'affichage chaque message, permettant de vérifier que tout est\n"
3489 "l'affichage chaque message, permettant de vérifier que tout est\n"
3490 "correct.\n"
3490 "correct.\n"
3491 "\n"
3491 "\n"
3492 "L'option -m/--mbox est également très utile : au lieu que les\n"
3492 "L'option -m/--mbox est également très utile : au lieu que les\n"
3493 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3493 "messages soient affichés ou envoyés directement, ils seront écrits\n"
3494 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3494 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
3495 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3495 "aux lettres peut alors être consultée pour vérification par n'importe\n"
3496 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3496 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
3497 "comme par exemple mutt :\n"
3497 "comme par exemple mutt :\n"
3498 "\n"
3498 "\n"
3499 " % mutt -R -f mbox\n"
3499 " % mutt -R -f mbox\n"
3500 "\n"
3500 "\n"
3501 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3501 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
3502 "utilisant formail (un outil généralement installé en même temps que\n"
3502 "utilisant formail (un outil généralement installé en même temps que\n"
3503 "procmail) :\n"
3503 "procmail) :\n"
3504 "\n"
3504 "\n"
3505 " % formail -s sendmail -bm -t < mbox\n"
3505 " % formail -s sendmail -bm -t < mbox\n"
3506 "\n"
3506 "\n"
3507 "Et voilà, vos patchs sont en route vers leur destination.\n"
3507 "Et voilà, vos patchs sont en route vers leur destination.\n"
3508 "\n"
3508 "\n"
3509 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3509 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
3510 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3510 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
3511 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3511 "alors remplir la section [smtp] de telle sorte que l'extension\n"
3512 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3512 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
3513 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3513 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
3514 "page de manuel hgrc(5) pour plus de détails."
3514 "page de manuel hgrc(5) pour plus de détails."
3515
3515
3516 msgid "Please enter a valid value.\n"
3516 msgid "Please enter a valid value.\n"
3517 msgstr "Veuillez fournir une valeur valide.\n"
3517 msgstr "Veuillez fournir une valeur valide.\n"
3518
3518
3519 msgid "does the diffstat above look okay? "
3519 msgid "does the diffstat above look okay? "
3520 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3520 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
3521
3521
3522 msgid "diffstat rejected"
3522 msgid "diffstat rejected"
3523 msgstr "résumé des modifications rejeté"
3523 msgstr "résumé des modifications rejeté"
3524
3524
3525 msgid ""
3525 msgid ""
3526 "send changesets by email\n"
3526 "send changesets by email\n"
3527 "\n"
3527 "\n"
3528 " By default, diffs are sent in the format generated by hg export,\n"
3528 " By default, diffs are sent in the format generated by hg export,\n"
3529 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3529 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3530 " introduction, which describes the series as a whole.\n"
3530 " introduction, which describes the series as a whole.\n"
3531 "\n"
3531 "\n"
3532 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3532 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3533 " the first line of the changeset description as the subject text.\n"
3533 " the first line of the changeset description as the subject text.\n"
3534 " The message contains two or three parts. First, the changeset\n"
3534 " The message contains two or three parts. First, the changeset\n"
3535 " description. Next, (optionally) if the diffstat program is\n"
3535 " description. Next, (optionally) if the diffstat program is\n"
3536 " installed and -d/--diffstat is used, the result of running\n"
3536 " installed and -d/--diffstat is used, the result of running\n"
3537 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3537 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3538 " \"hg export\".\n"
3538 " \"hg export\".\n"
3539 "\n"
3539 "\n"
3540 " By default the patch is included as text in the email body for\n"
3540 " By default the patch is included as text in the email body for\n"
3541 " easy reviewing. Using the -a/--attach option will instead create\n"
3541 " easy reviewing. Using the -a/--attach option will instead create\n"
3542 " an attachment for the patch. With -i/--inline an inline attachment\n"
3542 " an attachment for the patch. With -i/--inline an inline attachment\n"
3543 " will be created.\n"
3543 " will be created.\n"
3544 "\n"
3544 "\n"
3545 " With -o/--outgoing, emails will be generated for patches not found\n"
3545 " With -o/--outgoing, emails will be generated for patches not found\n"
3546 " in the destination repository (or only those which are ancestors\n"
3546 " in the destination repository (or only those which are ancestors\n"
3547 " of the specified revisions if any are provided)\n"
3547 " of the specified revisions if any are provided)\n"
3548 "\n"
3548 "\n"
3549 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3549 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3550 " single email containing a binary Mercurial bundle as an attachment\n"
3550 " single email containing a binary Mercurial bundle as an attachment\n"
3551 " will be sent.\n"
3551 " will be sent.\n"
3552 "\n"
3552 "\n"
3553 " Examples:\n"
3553 " Examples:\n"
3554 "\n"
3554 "\n"
3555 " hg email -r 3000 # send patch 3000 only\n"
3555 " hg email -r 3000 # send patch 3000 only\n"
3556 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3556 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3557 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3557 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3558 " hg email 3000 # send patch 3000 (deprecated)\n"
3558 " hg email 3000 # send patch 3000 (deprecated)\n"
3559 "\n"
3559 "\n"
3560 " hg email -o # send all patches not in default\n"
3560 " hg email -o # send all patches not in default\n"
3561 " hg email -o DEST # send all patches not in DEST\n"
3561 " hg email -o DEST # send all patches not in DEST\n"
3562 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3562 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3563 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3563 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3564 "\n"
3564 "\n"
3565 " hg email -b # send bundle of all patches not in default\n"
3565 " hg email -b # send bundle of all patches not in default\n"
3566 " hg email -b DEST # send bundle of all patches not in DEST\n"
3566 " hg email -b DEST # send bundle of all patches not in DEST\n"
3567 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3567 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3568 "default\n"
3568 "default\n"
3569 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3569 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3570 "\n"
3570 "\n"
3571 " Before using this command, you will need to enable email in your\n"
3571 " Before using this command, you will need to enable email in your\n"
3572 " hgrc. See the [email] section in hgrc(5) for details.\n"
3572 " hgrc. See the [email] section in hgrc(5) for details.\n"
3573 " "
3573 " "
3574 msgstr ""
3574 msgstr ""
3575 "envoi de \"changesets\" par courrier électronique\n"
3575 "envoi de \"changesets\" par courrier électronique\n"
3576 "\n"
3576 "\n"
3577 " Par défaut, les modifications sont envoyées au format généré par\n"
3577 " Par défaut, les modifications sont envoyées au format généré par\n"
3578 " \"hg export\", une par message. La série débute par un message\n"
3578 " \"hg export\", une par message. La série débute par un message\n"
3579 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3579 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
3580 "\n"
3580 "\n"
3581 " Chaque courriel a pour sujet un résumé des modifications\n"
3581 " Chaque courriel a pour sujet un résumé des modifications\n"
3582 " apportées par le patch (pris en première ligne de la description\n"
3582 " apportées par le patch (pris en première ligne de la description\n"
3583 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3583 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
3584 " Le message est constitué de deux ou trois parties. D'abord,\n"
3584 " Le message est constitué de deux ou trois parties. D'abord,\n"
3585 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3585 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
3586 " un résumé des modifications généré par le programme diffstat si\n"
3586 " un résumé des modifications généré par le programme diffstat si\n"
3587 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3587 " celui-ci est installé et que l'option -d/--diffstat a été\n"
3588 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3588 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
3589 "\n"
3589 "\n"
3590 " Par défaut le patch est inclus textuellement dans le corps du\n"
3590 " Par défaut le patch est inclus textuellement dans le corps du\n"
3591 " message afin de faciliter les relectures et commentaires.\n"
3591 " message afin de faciliter les relectures et commentaires.\n"
3592 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3592 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
3593 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3593 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
3594 " insère celle-ci dans le corps.\n"
3594 " insère celle-ci dans le corps.\n"
3595 "\n"
3595 "\n"
3596 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3596 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
3597 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3597 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
3598 " ancêtres des révisions spécifiées, le cas échéant).\n"
3598 " ancêtres des révisions spécifiées, le cas échéant).\n"
3599 "\n"
3599 "\n"
3600 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3600 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
3601 " même manière que pour --outgoing, mais il seront envoyés via\n"
3601 " même manière que pour --outgoing, mais il seront envoyés via\n"
3602 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3602 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
3603 "\n"
3603 "\n"
3604 " Exemples :\n"
3604 " Exemples :\n"
3605 "\n"
3605 "\n"
3606 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3606 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
3607 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3607 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
3608 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3608 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
3609 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3609 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
3610 "\n"
3610 "\n"
3611 " hg email -o # envoyer les patchs absents de la\n"
3611 " hg email -o # envoyer les patchs absents de la\n"
3612 " destination par défaut\n"
3612 " destination par défaut\n"
3613 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3613 " hg email -o DEST # envoyer les patchs absents de DEST\n"
3614 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3614 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
3615 " de la destination par défaut\n"
3615 " de la destination par défaut\n"
3616 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3616 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
3617 " de DEST\n"
3617 " de DEST\n"
3618 "\n"
3618 "\n"
3619 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3619 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
3620 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3620 " d'activer préalablement l'envoi de courriel dans le fichier\n"
3621 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3621 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
3622 " [email] pour plus de détails.\n"
3622 " [email] pour plus de détails.\n"
3623 " "
3623 " "
3624
3624
3625 msgid "specify at least one changeset with -r or -o"
3625 msgid "specify at least one changeset with -r or -o"
3626 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3626 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
3627
3627
3628 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3628 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3629 msgstr ""
3629 msgstr ""
3630 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3630 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
3631 "bundle est utilisé"
3631 "bundle est utilisé"
3632
3632
3633 msgid "too many destinations"
3633 msgid "too many destinations"
3634 msgstr "trop de destinations"
3634 msgstr "trop de destinations"
3635
3635
3636 msgid "use only one form to specify the revision"
3636 msgid "use only one form to specify the revision"
3637 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3637 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
3638
3638
3639 msgid ""
3639 msgid ""
3640 "\n"
3640 "\n"
3641 "Write the introductory message for the patch series.\n"
3641 "Write the introductory message for the patch series.\n"
3642 "\n"
3642 "\n"
3643 msgstr ""
3643 msgstr ""
3644 "\n"
3644 "\n"
3645 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3645 "Veuillez écrire le message d'introduction de la série de patchs.\n"
3646 "\n"
3646 "\n"
3647
3647
3648 #, python-format
3648 #, python-format
3649 msgid ""
3649 msgid ""
3650 "This patch series consists of %d patches.\n"
3650 "This patch series consists of %d patches.\n"
3651 "\n"
3651 "\n"
3652 msgstr ""
3652 msgstr ""
3653 "Cette série comporte %d patchs.\n"
3653 "Cette série comporte %d patchs.\n"
3654 "\n"
3654 "\n"
3655
3655
3656 # diffstat sur l'ensemble des patchs
3656 # diffstat sur l'ensemble des patchs
3657 msgid "Final summary:\n"
3657 msgid "Final summary:\n"
3658 msgstr "Résumé complet des modifications :\n"
3658 msgstr "Résumé complet des modifications :\n"
3659
3659
3660 # mode --test
3660 # mode --test
3661 msgid "Displaying "
3661 msgid "Displaying "
3662 msgstr "Affichage de "
3662 msgstr "Affichage de "
3663
3663
3664 # mode --mbox
3664 # mode --mbox
3665 msgid "Writing "
3665 msgid "Writing "
3666 msgstr "Écriture de "
3666 msgstr "Écriture de "
3667
3667
3668 # mode d'envoi par défaut
3668 # mode d'envoi par défaut
3669 msgid "Sending "
3669 msgid "Sending "
3670 msgstr "Envoi de "
3670 msgstr "Envoi de "
3671
3671
3672 msgid "send patches as attachments"
3672 msgid "send patches as attachments"
3673 msgstr "envoyer les patchs en tant que pièces jointes"
3673 msgstr "envoyer les patchs en tant que pièces jointes"
3674
3674
3675 msgid "send patches as inline attachments"
3675 msgid "send patches as inline attachments"
3676 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3676 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
3677
3677
3678 msgid "email addresses of blind carbon copy recipients"
3678 msgid "email addresses of blind carbon copy recipients"
3679 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3679 msgstr "adresses électroniques des destinataires en copie carbone invisible"
3680
3680
3681 msgid "email addresses of copy recipients"
3681 msgid "email addresses of copy recipients"
3682 msgstr "adresses électroniques des destinataires en copie carbone"
3682 msgstr "adresses électroniques des destinataires en copie carbone"
3683
3683
3684 msgid "add diffstat output to messages"
3684 msgid "add diffstat output to messages"
3685 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3685 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
3686
3686
3687 msgid "use the given date as the sending date"
3687 msgid "use the given date as the sending date"
3688 msgstr "utiliser la date fournie comme date d'envoi"
3688 msgstr "utiliser la date fournie comme date d'envoi"
3689
3689
3690 msgid "use the given file as the series description"
3690 msgid "use the given file as the series description"
3691 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3691 msgstr "lire le message d'introduction à la série dans le fichier fourni"
3692
3692
3693 msgid "email address of sender"
3693 msgid "email address of sender"
3694 msgstr "adresse électronique de l'expéditeur"
3694 msgstr "adresse électronique de l'expéditeur"
3695
3695
3696 msgid "print messages that would be sent"
3696 msgid "print messages that would be sent"
3697 msgstr "afficher les messages tels qu'ils seraient envoyés"
3697 msgstr "afficher les messages tels qu'ils seraient envoyés"
3698
3698
3699 msgid "write messages to mbox file instead of sending them"
3699 msgid "write messages to mbox file instead of sending them"
3700 msgstr ""
3700 msgstr ""
3701 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3701 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
3702
3702
3703 msgid "subject of first message (intro or single patch)"
3703 msgid "subject of first message (intro or single patch)"
3704 msgstr "sujet du premier message (intro ou patch unique)"
3704 msgstr "sujet du premier message (intro ou patch unique)"
3705
3705
3706 msgid "message identifier to reply to"
3706 msgid "message identifier to reply to"
3707 msgstr "identifiant du message auquel répondre"
3707 msgstr "identifiant du message auquel répondre"
3708
3708
3709 msgid "email addresses of recipients"
3709 msgid "email addresses of recipients"
3710 msgstr "adresses électroniques des destinataires"
3710 msgstr "adresses électroniques des destinataires"
3711
3711
3712 msgid "omit hg patch header"
3712 msgid "omit hg patch header"
3713 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3713 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
3714
3714
3715 msgid "send changes not found in the target repository"
3715 msgid "send changes not found in the target repository"
3716 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3716 msgstr "envoyer les modifications non présentes dans le dépôt cible"
3717
3717
3718 msgid "send changes not in target as a binary bundle"
3718 msgid "send changes not in target as a binary bundle"
3719 msgstr ""
3719 msgstr ""
3720 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3720 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
3721 "\"bundle\" binaire"
3721 "\"bundle\" binaire"
3722
3722
3723 msgid "name of the bundle attachment file"
3723 msgid "name of the bundle attachment file"
3724 msgstr "nom à donner au fichier \"bundle\" envoyé"
3724 msgstr "nom à donner au fichier \"bundle\" envoyé"
3725
3725
3726 msgid "a revision to send"
3726 msgid "a revision to send"
3727 msgstr "une révision à envoyer"
3727 msgstr "une révision à envoyer"
3728
3728
3729 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3729 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3730 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3730 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
3731
3731
3732 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3732 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3733 msgstr ""
3733 msgstr ""
3734 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3734 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
3735 "(avec -b/--bundle)"
3735 "(avec -b/--bundle)"
3736
3736
3737 msgid "send an introduction email for a single patch"
3737 msgid "send an introduction email for a single patch"
3738 msgstr "envoyer un courriel d'introduction pour un patch seul"
3738 msgstr "envoyer un courriel d'introduction pour un patch seul"
3739
3739
3740 msgid "hg email [OPTION]... [DEST]..."
3740 msgid "hg email [OPTION]... [DEST]..."
3741 msgstr "hg email [OPTION]... [DEST]..."
3741 msgstr "hg email [OPTION]... [DEST]..."
3742
3742
3743 msgid "command to delete untracked files from the working directory"
3743 msgid "command to delete untracked files from the working directory"
3744 msgstr ""
3744 msgstr ""
3745
3745
3746 msgid ""
3746 msgid ""
3747 "removes files not tracked by Mercurial\n"
3747 "removes files not tracked by Mercurial\n"
3748 "\n"
3748 "\n"
3749 " Delete files not known to Mercurial. This is useful to test local\n"
3749 " Delete files not known to Mercurial. This is useful to test local\n"
3750 " and uncommitted changes in an otherwise-clean source tree.\n"
3750 " and uncommitted changes in an otherwise-clean source tree.\n"
3751 "\n"
3751 "\n"
3752 " This means that purge will delete:\n"
3752 " This means that purge will delete:\n"
3753 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3753 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3754 " - Empty directories: in fact Mercurial ignores directories unless\n"
3754 " - Empty directories: in fact Mercurial ignores directories unless\n"
3755 " they contain files under source control management\n"
3755 " they contain files under source control management\n"
3756 " But it will leave untouched:\n"
3756 " But it will leave untouched:\n"
3757 " - Modified and unmodified tracked files\n"
3757 " - Modified and unmodified tracked files\n"
3758 " - Ignored files (unless --all is specified)\n"
3758 " - Ignored files (unless --all is specified)\n"
3759 " - New files added to the repository (with \"hg add\")\n"
3759 " - New files added to the repository (with \"hg add\")\n"
3760 "\n"
3760 "\n"
3761 " If directories are given on the command line, only files in these\n"
3761 " If directories are given on the command line, only files in these\n"
3762 " directories are considered.\n"
3762 " directories are considered.\n"
3763 "\n"
3763 "\n"
3764 " Be careful with purge, as you could irreversibly delete some files\n"
3764 " Be careful with purge, as you could irreversibly delete some files\n"
3765 " you forgot to add to the repository. If you only want to print the\n"
3765 " you forgot to add to the repository. If you only want to print the\n"
3766 " list of files that this program would delete, use the --print\n"
3766 " list of files that this program would delete, use the --print\n"
3767 " option.\n"
3767 " option.\n"
3768 " "
3768 " "
3769 msgstr ""
3769 msgstr ""
3770 "retire les fichiers non suivis par Mercurial\n"
3771 "\n"
3772 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
3773 " utile pour tester des changements locaux non enregistrés à\n"
3774 " l'intérieur d'une arborescence de sources propre.\n"
3775 "\n"
3776 " Ainsi, purge effacera :\n"
3777 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
3778 " par un point d'interrogation\n"
3779 " - les répertoires vides : en fait Mercurial ignore complètement\n"
3780 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
3781 " sous son contrôle\n"
3782 " Seront par contre laissés intacts :\n"
3783 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
3784 " ou non\n"
3785 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
3786 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
3787 "\n"
3788 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
3789 " seuls les fichiers qu'ils contiennent seront considérés.\n"
3790 "\n"
3791 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
3792 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
3793 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
3794 " seraient effacés par purge, utilisez l'option --print.\n"
3795 " "
3770
3796
3771 #, python-format
3797 #, python-format
3772 msgid "%s cannot be removed"
3798 msgid "%s cannot be removed"
3773 msgstr ""
3799 msgstr "%s ne peut être supprimé"
3774
3800
3775 #, python-format
3801 #, python-format
3776 msgid "warning: %s\n"
3802 msgid "warning: %s\n"
3777 msgstr ""
3803 msgstr "attention: %s\n"
3778
3804
3779 #, python-format
3805 #, python-format
3780 msgid "Removing file %s\n"
3806 msgid "Removing file %s\n"
3781 msgstr ""
3807 msgstr "Suppression du fichier %s\n"
3782
3808
3783 #, python-format
3809 #, python-format
3784 msgid "Removing directory %s\n"
3810 msgid "Removing directory %s\n"
3785 msgstr ""
3811 msgstr "Suppression du répertoire %s\n"
3786
3812
3787 msgid "abort if an error occurs"
3813 msgid "abort if an error occurs"
3788 msgstr ""
3814 msgstr "abandonner en cas d'erreur"
3789
3815
3790 msgid "purge ignored files too"
3816 msgid "purge ignored files too"
3791 msgstr ""
3817 msgstr "supprimer également les fichiers ignorés"
3792
3818
3793 msgid "print filenames instead of deleting them"
3819 msgid "print filenames instead of deleting them"
3794 msgstr ""
3820 msgstr "afficher les nom des fichiers au lieu de les supprimer"
3795
3821
3796 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3822 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3797 msgstr ""
3823 msgstr ""
3824 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
3825 "xargs (implique -p/--print)"
3798
3826
3799 msgid "hg purge [OPTION]... [DIR]..."
3827 msgid "hg purge [OPTION]... [DIR]..."
3800 msgstr ""
3828 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
3801
3829
3802 msgid ""
3830 msgid ""
3803 "command to move sets of revisions to a different ancestor\n"
3831 "command to move sets of revisions to a different ancestor\n"
3804 "\n"
3832 "\n"
3805 "This extension lets you rebase changesets in an existing Mercurial\n"
3833 "This extension lets you rebase changesets in an existing Mercurial\n"
3806 "repository.\n"
3834 "repository.\n"
3807 "\n"
3835 "\n"
3808 "For more information:\n"
3836 "For more information:\n"
3809 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3837 "http://mercurial.selenic.com/wiki/RebaseProject\n"
3810 msgstr ""
3838 msgstr ""
3811
3839
3812 msgid "first revision, do not change ancestor\n"
3840 msgid "first revision, do not change ancestor\n"
3813 msgstr ""
3841 msgstr ""
3814
3842
3815 msgid ""
3843 msgid ""
3816 "move changeset (and descendants) to a different branch\n"
3844 "move changeset (and descendants) to a different branch\n"
3817 "\n"
3845 "\n"
3818 " Rebase uses repeated merging to graft changesets from one part of\n"
3846 " Rebase uses repeated merging to graft changesets from one part of\n"
3819 " history onto another. This can be useful for linearizing local\n"
3847 " history onto another. This can be useful for linearizing local\n"
3820 " changes relative to a master development tree.\n"
3848 " changes relative to a master development tree.\n"
3821 "\n"
3849 "\n"
3822 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3850 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3823 " continued with --continue/-c or aborted with --abort/-a.\n"
3851 " continued with --continue/-c or aborted with --abort/-a.\n"
3824 " "
3852 " "
3825 msgstr ""
3853 msgstr ""
3826
3854
3827 msgid "cannot use both abort and continue"
3855 msgid "cannot use both abort and continue"
3828 msgstr ""
3856 msgstr ""
3829
3857
3830 msgid "cannot use collapse with continue or abort"
3858 msgid "cannot use collapse with continue or abort"
3831 msgstr ""
3859 msgstr ""
3832
3860
3833 msgid "abort and continue do not allow specifying revisions"
3861 msgid "abort and continue do not allow specifying revisions"
3834 msgstr ""
3862 msgstr ""
3835
3863
3836 msgid "cannot specify both a revision and a base"
3864 msgid "cannot specify both a revision and a base"
3837 msgstr ""
3865 msgstr ""
3838
3866
3839 msgid "nothing to rebase\n"
3867 msgid "nothing to rebase\n"
3840 msgstr ""
3868 msgstr ""
3841
3869
3842 msgid "cannot use both keepbranches and extrafn"
3870 msgid "cannot use both keepbranches and extrafn"
3843 msgstr ""
3871 msgstr ""
3844
3872
3845 msgid "rebase merging completed\n"
3873 msgid "rebase merging completed\n"
3846 msgstr ""
3874 msgstr ""
3847
3875
3848 msgid "warning: new changesets detected on source branch, not stripping\n"
3876 msgid "warning: new changesets detected on source branch, not stripping\n"
3849 msgstr ""
3877 msgstr ""
3850
3878
3851 msgid "rebase completed\n"
3879 msgid "rebase completed\n"
3852 msgstr ""
3880 msgstr ""
3853
3881
3854 #, python-format
3882 #, python-format
3855 msgid "%d revisions have been skipped\n"
3883 msgid "%d revisions have been skipped\n"
3856 msgstr ""
3884 msgstr ""
3857
3885
3858 msgid " set parents\n"
3886 msgid " set parents\n"
3859 msgstr ""
3887 msgstr ""
3860
3888
3861 #, python-format
3889 #, python-format
3862 msgid "rebasing %d:%s\n"
3890 msgid "rebasing %d:%s\n"
3863 msgstr ""
3891 msgstr ""
3864
3892
3865 #, python-format
3893 #, python-format
3866 msgid " future parents are %d and %d\n"
3894 msgid " future parents are %d and %d\n"
3867 msgstr ""
3895 msgstr ""
3868
3896
3869 #, python-format
3897 #, python-format
3870 msgid " update to %d:%s\n"
3898 msgid " update to %d:%s\n"
3871 msgstr ""
3899 msgstr ""
3872
3900
3873 msgid " already in target\n"
3901 msgid " already in target\n"
3874 msgstr ""
3902 msgstr ""
3875
3903
3876 #, python-format
3904 #, python-format
3877 msgid " merge against %d:%s\n"
3905 msgid " merge against %d:%s\n"
3878 msgstr ""
3906 msgstr ""
3879
3907
3880 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3908 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3881 msgstr ""
3909 msgstr ""
3882
3910
3883 msgid "resuming interrupted rebase\n"
3911 msgid "resuming interrupted rebase\n"
3884 msgstr ""
3912 msgstr ""
3885
3913
3886 #, python-format
3914 #, python-format
3887 msgid "no changes, revision %d skipped\n"
3915 msgid "no changes, revision %d skipped\n"
3888 msgstr ""
3916 msgstr ""
3889
3917
3890 #, python-format
3918 #, python-format
3891 msgid "next revision set to %s\n"
3919 msgid "next revision set to %s\n"
3892 msgstr ""
3920 msgstr ""
3893
3921
3894 #, python-format
3922 #, python-format
3895 msgid "cannot use revision %d as base, result would have 3 parents"
3923 msgid "cannot use revision %d as base, result would have 3 parents"
3896 msgstr ""
3924 msgstr ""
3897
3925
3898 #, python-format
3926 #, python-format
3899 msgid "revision %d is an mq patch (%s), finalize it.\n"
3927 msgid "revision %d is an mq patch (%s), finalize it.\n"
3900 msgstr ""
3928 msgstr ""
3901
3929
3902 #, python-format
3930 #, python-format
3903 msgid "import mq patch %d (%s)\n"
3931 msgid "import mq patch %d (%s)\n"
3904 msgstr ""
3932 msgstr ""
3905
3933
3906 msgid "rebase status stored\n"
3934 msgid "rebase status stored\n"
3907 msgstr ""
3935 msgstr ""
3908
3936
3909 msgid "rebase status resumed\n"
3937 msgid "rebase status resumed\n"
3910 msgstr ""
3938 msgstr ""
3911
3939
3912 msgid "no rebase in progress"
3940 msgid "no rebase in progress"
3913 msgstr ""
3941 msgstr ""
3914
3942
3915 msgid "warning: new changesets detected on target branch, not stripping\n"
3943 msgid "warning: new changesets detected on target branch, not stripping\n"
3916 msgstr ""
3944 msgstr ""
3917
3945
3918 msgid "rebase aborted\n"
3946 msgid "rebase aborted\n"
3919 msgstr ""
3947 msgstr ""
3920
3948
3921 msgid "cannot rebase onto an applied mq patch"
3949 msgid "cannot rebase onto an applied mq patch"
3922 msgstr ""
3950 msgstr ""
3923
3951
3924 msgid "cannot rebase an ancestor"
3952 msgid "cannot rebase an ancestor"
3925 msgstr ""
3953 msgstr ""
3926
3954
3927 msgid "cannot rebase a descendant"
3955 msgid "cannot rebase a descendant"
3928 msgstr ""
3956 msgstr ""
3929
3957
3930 msgid "already working on current\n"
3958 msgid "already working on current\n"
3931 msgstr ""
3959 msgstr ""
3932
3960
3933 msgid "already working on the current branch\n"
3961 msgid "already working on the current branch\n"
3934 msgstr ""
3962 msgstr ""
3935
3963
3936 #, python-format
3964 #, python-format
3937 msgid "rebase onto %d starting from %d\n"
3965 msgid "rebase onto %d starting from %d\n"
3938 msgstr ""
3966 msgstr ""
3939
3967
3940 msgid "unable to collapse, there is more than one external parent"
3968 msgid "unable to collapse, there is more than one external parent"
3941 msgstr ""
3969 msgstr ""
3942
3970
3943 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3971 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
3944 msgstr ""
3972 msgstr ""
3945
3973
3946 msgid "rebase working directory to branch head"
3974 msgid "rebase working directory to branch head"
3947 msgstr ""
3975 msgstr ""
3948
3976
3949 msgid "rebase from a given revision"
3977 msgid "rebase from a given revision"
3950 msgstr ""
3978 msgstr ""
3951
3979
3952 msgid "rebase from the base of a given revision"
3980 msgid "rebase from the base of a given revision"
3953 msgstr ""
3981 msgstr ""
3954
3982
3955 msgid "rebase onto a given revision"
3983 msgid "rebase onto a given revision"
3956 msgstr ""
3984 msgstr ""
3957
3985
3958 msgid "collapse the rebased revisions"
3986 msgid "collapse the rebased revisions"
3959 msgstr ""
3987 msgstr ""
3960
3988
3961 msgid "keep original revisions"
3989 msgid "keep original revisions"
3962 msgstr ""
3990 msgstr ""
3963
3991
3964 msgid "keep original branches"
3992 msgid "keep original branches"
3965 msgstr ""
3993 msgstr ""
3966
3994
3967 msgid "continue an interrupted rebase"
3995 msgid "continue an interrupted rebase"
3968 msgstr ""
3996 msgstr ""
3969
3997
3970 msgid "abort an interrupted rebase"
3998 msgid "abort an interrupted rebase"
3971 msgstr ""
3999 msgstr ""
3972
4000
3973 msgid ""
4001 msgid ""
3974 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4002 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
3975 "| [-c] | [-a]"
4003 "| [-c] | [-a]"
3976 msgstr ""
4004 msgstr ""
3977
4005
3978 msgid "commands to interactively select changes for commit/qrefresh"
4006 msgid "commands to interactively select changes for commit/qrefresh"
3979 msgstr ""
4007 msgstr ""
3980
4008
3981 msgid "this modifies a binary file (all or nothing)\n"
4009 msgid "this modifies a binary file (all or nothing)\n"
3982 msgstr ""
4010 msgstr ""
3983
4011
3984 msgid "this is a binary file\n"
4012 msgid "this is a binary file\n"
3985 msgstr ""
4013 msgstr ""
3986
4014
3987 #, python-format
4015 #, python-format
3988 msgid "%d hunks, %d lines changed\n"
4016 msgid "%d hunks, %d lines changed\n"
3989 msgstr ""
4017 msgstr ""
3990
4018
3991 msgid "[Ynsfdaq?]"
4019 msgid "[Ynsfdaq?]"
3992 msgstr ""
4020 msgstr ""
3993
4021
3994 msgid "&Yes, record this change"
4022 msgid "&Yes, record this change"
3995 msgstr ""
4023 msgstr ""
3996
4024
3997 msgid "&No, skip this change"
4025 msgid "&No, skip this change"
3998 msgstr ""
4026 msgstr ""
3999
4027
4000 msgid "&Skip remaining changes to this file"
4028 msgid "&Skip remaining changes to this file"
4001 msgstr ""
4029 msgstr ""
4002
4030
4003 msgid "Record remaining changes to this &file"
4031 msgid "Record remaining changes to this &file"
4004 msgstr ""
4032 msgstr ""
4005
4033
4006 msgid "&Done, skip remaining changes and files"
4034 msgid "&Done, skip remaining changes and files"
4007 msgstr ""
4035 msgstr ""
4008
4036
4009 msgid "Record &all changes to all remaining files"
4037 msgid "Record &all changes to all remaining files"
4010 msgstr ""
4038 msgstr ""
4011
4039
4012 msgid "&Quit, recording no changes"
4040 msgid "&Quit, recording no changes"
4013 msgstr ""
4041 msgstr ""
4014
4042
4015 msgid "&?"
4043 msgid "&?"
4016 msgstr ""
4044 msgstr ""
4017
4045
4018 msgid "y"
4046 msgid "y"
4019 msgstr ""
4047 msgstr ""
4020
4048
4021 msgid "?"
4049 msgid "?"
4022 msgstr ""
4050 msgstr ""
4023
4051
4024 msgid "y - record this change"
4052 msgid "y - record this change"
4025 msgstr ""
4053 msgstr ""
4026
4054
4027 msgid "s"
4055 msgid "s"
4028 msgstr ""
4056 msgstr ""
4029
4057
4030 msgid "f"
4058 msgid "f"
4031 msgstr ""
4059 msgstr ""
4032
4060
4033 msgid "d"
4061 msgid "d"
4034 msgstr ""
4062 msgstr ""
4035
4063
4036 msgid "a"
4064 msgid "a"
4037 msgstr ""
4065 msgstr ""
4038
4066
4039 msgid "q"
4067 msgid "q"
4040 msgstr ""
4068 msgstr ""
4041
4069
4042 msgid "user quit"
4070 msgid "user quit"
4043 msgstr ""
4071 msgstr ""
4044
4072
4045 #, python-format
4073 #, python-format
4046 msgid "examine changes to %s?"
4074 msgid "examine changes to %s?"
4047 msgstr ""
4075 msgstr ""
4048
4076
4049 msgid " and "
4077 msgid " and "
4050 msgstr ""
4078 msgstr ""
4051
4079
4052 #, python-format
4080 #, python-format
4053 msgid "record this change to %r?"
4081 msgid "record this change to %r?"
4054 msgstr ""
4082 msgstr ""
4055
4083
4056 #, python-format
4084 #, python-format
4057 msgid "record change %d/%d to %r?"
4085 msgid "record change %d/%d to %r?"
4058 msgstr ""
4086 msgstr ""
4059
4087
4060 msgid ""
4088 msgid ""
4061 "interactively select changes to commit\n"
4089 "interactively select changes to commit\n"
4062 "\n"
4090 "\n"
4063 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4091 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4064 " will be candidates for recording.\n"
4092 " will be candidates for recording.\n"
4065 "\n"
4093 "\n"
4066 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4094 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4067 "\n"
4095 "\n"
4068 " You will be prompted for whether to record changes to each\n"
4096 " You will be prompted for whether to record changes to each\n"
4069 " modified file, and for files with multiple changes, for each\n"
4097 " modified file, and for files with multiple changes, for each\n"
4070 " change to use. For each query, the following responses are\n"
4098 " change to use. For each query, the following responses are\n"
4071 " possible:\n"
4099 " possible:\n"
4072 "\n"
4100 "\n"
4073 " y - record this change\n"
4101 " y - record this change\n"
4074 " n - skip this change\n"
4102 " n - skip this change\n"
4075 "\n"
4103 "\n"
4076 " s - skip remaining changes to this file\n"
4104 " s - skip remaining changes to this file\n"
4077 " f - record remaining changes to this file\n"
4105 " f - record remaining changes to this file\n"
4078 "\n"
4106 "\n"
4079 " d - done, skip remaining changes and files\n"
4107 " d - done, skip remaining changes and files\n"
4080 " a - record all changes to all remaining files\n"
4108 " a - record all changes to all remaining files\n"
4081 " q - quit, recording no changes\n"
4109 " q - quit, recording no changes\n"
4082 "\n"
4110 "\n"
4083 " ? - display help"
4111 " ? - display help"
4084 msgstr ""
4112 msgstr ""
4085
4113
4086 msgid "'mq' extension not loaded"
4114 msgid "'mq' extension not loaded"
4087 msgstr ""
4115 msgstr ""
4088
4116
4089 msgid "running non-interactively, use commit instead"
4117 msgid "running non-interactively, use commit instead"
4090 msgstr ""
4118 msgstr ""
4091
4119
4092 msgid "no changes to record\n"
4120 msgid "no changes to record\n"
4093 msgstr ""
4121 msgstr ""
4094
4122
4095 #, python-format
4123 #, python-format
4096 msgid "backup %r as %r\n"
4124 msgid "backup %r as %r\n"
4097 msgstr ""
4125 msgstr ""
4098
4126
4099 msgid "applying patch\n"
4127 msgid "applying patch\n"
4100 msgstr ""
4128 msgstr ""
4101
4129
4102 msgid "patch failed to apply"
4130 msgid "patch failed to apply"
4103 msgstr ""
4131 msgstr ""
4104
4132
4105 #, python-format
4133 #, python-format
4106 msgid "restoring %r to %r\n"
4134 msgid "restoring %r to %r\n"
4107 msgstr ""
4135 msgstr ""
4108
4136
4109 msgid "hg record [OPTION]... [FILE]..."
4137 msgid "hg record [OPTION]... [FILE]..."
4110 msgstr ""
4138 msgstr ""
4111
4139
4112 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4140 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4113 msgstr ""
4141 msgstr ""
4114
4142
4115 msgid "share a common history between several working directories"
4143 msgid "share a common history between several working directories"
4116 msgstr ""
4144 msgstr ""
4117
4145
4118 msgid ""
4146 msgid ""
4119 "create a new shared repository (experimental)\n"
4147 "create a new shared repository (experimental)\n"
4120 "\n"
4148 "\n"
4121 " Initialize a new repository and working directory that shares its\n"
4149 " Initialize a new repository and working directory that shares its\n"
4122 " history with another repository.\n"
4150 " history with another repository.\n"
4123 "\n"
4151 "\n"
4124 " NOTE: actions that change history such as rollback or moving the\n"
4152 " NOTE: actions that change history such as rollback or moving the\n"
4125 " source may confuse sharers.\n"
4153 " source may confuse sharers.\n"
4126 " "
4154 " "
4127 msgstr ""
4155 msgstr ""
4128
4156
4129 msgid "do not create a working copy"
4157 msgid "do not create a working copy"
4130 msgstr ""
4158 msgstr ""
4131
4159
4132 msgid "[-U] SOURCE [DEST]"
4160 msgid "[-U] SOURCE [DEST]"
4133 msgstr ""
4161 msgstr ""
4134
4162
4135 msgid ""
4163 msgid ""
4136 "command to transplant changesets from another branch\n"
4164 "command to transplant changesets from another branch\n"
4137 "\n"
4165 "\n"
4138 "This extension allows you to transplant patches from another branch.\n"
4166 "This extension allows you to transplant patches from another branch.\n"
4139 "\n"
4167 "\n"
4140 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4168 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4141 "map from a changeset hash to its hash in the source repository.\n"
4169 "map from a changeset hash to its hash in the source repository.\n"
4142 msgstr ""
4170 msgstr ""
4143
4171
4144 #, python-format
4172 #, python-format
4145 msgid "skipping already applied revision %s\n"
4173 msgid "skipping already applied revision %s\n"
4146 msgstr ""
4174 msgstr ""
4147
4175
4148 #, python-format
4176 #, python-format
4149 msgid "skipping merge changeset %s:%s\n"
4177 msgid "skipping merge changeset %s:%s\n"
4150 msgstr ""
4178 msgstr ""
4151
4179
4152 #, python-format
4180 #, python-format
4153 msgid "%s merged at %s\n"
4181 msgid "%s merged at %s\n"
4154 msgstr ""
4182 msgstr ""
4155
4183
4156 #, python-format
4184 #, python-format
4157 msgid "%s transplanted to %s\n"
4185 msgid "%s transplanted to %s\n"
4158 msgstr ""
4186 msgstr ""
4159
4187
4160 #, python-format
4188 #, python-format
4161 msgid "filtering %s\n"
4189 msgid "filtering %s\n"
4162 msgstr ""
4190 msgstr ""
4163
4191
4164 msgid "filter failed"
4192 msgid "filter failed"
4165 msgstr ""
4193 msgstr ""
4166
4194
4167 msgid "can only omit patchfile if merging"
4195 msgid "can only omit patchfile if merging"
4168 msgstr ""
4196 msgstr ""
4169
4197
4170 #, python-format
4198 #, python-format
4171 msgid "%s: empty changeset"
4199 msgid "%s: empty changeset"
4172 msgstr ""
4200 msgstr ""
4173
4201
4174 msgid "Fix up the merge and run hg transplant --continue"
4202 msgid "Fix up the merge and run hg transplant --continue"
4175 msgstr ""
4203 msgstr ""
4176
4204
4177 #, python-format
4205 #, python-format
4178 msgid "%s transplanted as %s\n"
4206 msgid "%s transplanted as %s\n"
4179 msgstr ""
4207 msgstr ""
4180
4208
4181 msgid "transplant log file is corrupt"
4209 msgid "transplant log file is corrupt"
4182 msgstr ""
4210 msgstr ""
4183
4211
4184 #, python-format
4212 #, python-format
4185 msgid "working dir not at transplant parent %s"
4213 msgid "working dir not at transplant parent %s"
4186 msgstr ""
4214 msgstr ""
4187
4215
4188 msgid "commit failed"
4216 msgid "commit failed"
4189 msgstr ""
4217 msgstr ""
4190
4218
4191 msgid "apply changeset? [ynmpcq?]:"
4219 msgid "apply changeset? [ynmpcq?]:"
4192 msgstr ""
4220 msgstr ""
4193
4221
4194 msgid ""
4222 msgid ""
4195 "transplant changesets from another branch\n"
4223 "transplant changesets from another branch\n"
4196 "\n"
4224 "\n"
4197 " Selected changesets will be applied on top of the current working\n"
4225 " Selected changesets will be applied on top of the current working\n"
4198 " directory with the log of the original changeset. If --log is\n"
4226 " directory with the log of the original changeset. If --log is\n"
4199 " specified, log messages will have a comment appended of the form:\n"
4227 " specified, log messages will have a comment appended of the form:\n"
4200 "\n"
4228 "\n"
4201 " (transplanted from CHANGESETHASH)\n"
4229 " (transplanted from CHANGESETHASH)\n"
4202 "\n"
4230 "\n"
4203 " You can rewrite the changelog message with the --filter option.\n"
4231 " You can rewrite the changelog message with the --filter option.\n"
4204 " Its argument will be invoked with the current changelog message as\n"
4232 " Its argument will be invoked with the current changelog message as\n"
4205 " $1 and the patch as $2.\n"
4233 " $1 and the patch as $2.\n"
4206 "\n"
4234 "\n"
4207 " If --source/-s is specified, selects changesets from the named\n"
4235 " If --source/-s is specified, selects changesets from the named\n"
4208 " repository. If --branch/-b is specified, selects changesets from\n"
4236 " repository. If --branch/-b is specified, selects changesets from\n"
4209 " the branch holding the named revision, up to that revision. If\n"
4237 " the branch holding the named revision, up to that revision. If\n"
4210 " --all/-a is specified, all changesets on the branch will be\n"
4238 " --all/-a is specified, all changesets on the branch will be\n"
4211 " transplanted, otherwise you will be prompted to select the\n"
4239 " transplanted, otherwise you will be prompted to select the\n"
4212 " changesets you want.\n"
4240 " changesets you want.\n"
4213 "\n"
4241 "\n"
4214 " hg transplant --branch REVISION --all will rebase the selected\n"
4242 " hg transplant --branch REVISION --all will rebase the selected\n"
4215 " branch (up to the named revision) onto your current working\n"
4243 " branch (up to the named revision) onto your current working\n"
4216 " directory.\n"
4244 " directory.\n"
4217 "\n"
4245 "\n"
4218 " You can optionally mark selected transplanted changesets as merge\n"
4246 " You can optionally mark selected transplanted changesets as merge\n"
4219 " changesets. You will not be prompted to transplant any ancestors\n"
4247 " changesets. You will not be prompted to transplant any ancestors\n"
4220 " of a merged transplant, and you can merge descendants of them\n"
4248 " of a merged transplant, and you can merge descendants of them\n"
4221 " normally instead of transplanting them.\n"
4249 " normally instead of transplanting them.\n"
4222 "\n"
4250 "\n"
4223 " If no merges or revisions are provided, hg transplant will start\n"
4251 " If no merges or revisions are provided, hg transplant will start\n"
4224 " an interactive changeset browser.\n"
4252 " an interactive changeset browser.\n"
4225 "\n"
4253 "\n"
4226 " If a changeset application fails, you can fix the merge by hand\n"
4254 " If a changeset application fails, you can fix the merge by hand\n"
4227 " and then resume where you left off by calling hg transplant\n"
4255 " and then resume where you left off by calling hg transplant\n"
4228 " --continue/-c.\n"
4256 " --continue/-c.\n"
4229 " "
4257 " "
4230 msgstr ""
4258 msgstr ""
4231
4259
4232 msgid "--continue is incompatible with branch, all or merge"
4260 msgid "--continue is incompatible with branch, all or merge"
4233 msgstr ""
4261 msgstr ""
4234
4262
4235 msgid "no source URL, branch tag or revision list provided"
4263 msgid "no source URL, branch tag or revision list provided"
4236 msgstr ""
4264 msgstr ""
4237
4265
4238 msgid "--all requires a branch revision"
4266 msgid "--all requires a branch revision"
4239 msgstr ""
4267 msgstr ""
4240
4268
4241 msgid "--all is incompatible with a revision list"
4269 msgid "--all is incompatible with a revision list"
4242 msgstr ""
4270 msgstr ""
4243
4271
4244 msgid "no revision checked out"
4272 msgid "no revision checked out"
4245 msgstr ""
4273 msgstr ""
4246
4274
4247 msgid "outstanding uncommitted merges"
4275 msgid "outstanding uncommitted merges"
4248 msgstr ""
4276 msgstr ""
4249
4277
4250 msgid "outstanding local changes"
4278 msgid "outstanding local changes"
4251 msgstr ""
4279 msgstr ""
4252
4280
4253 msgid "pull patches from REPOSITORY"
4281 msgid "pull patches from REPOSITORY"
4254 msgstr ""
4282 msgstr ""
4255
4283
4256 msgid "pull patches from branch BRANCH"
4284 msgid "pull patches from branch BRANCH"
4257 msgstr ""
4285 msgstr ""
4258
4286
4259 msgid "pull all changesets up to BRANCH"
4287 msgid "pull all changesets up to BRANCH"
4260 msgstr ""
4288 msgstr ""
4261
4289
4262 msgid "skip over REV"
4290 msgid "skip over REV"
4263 msgstr ""
4291 msgstr ""
4264
4292
4265 msgid "merge at REV"
4293 msgid "merge at REV"
4266 msgstr ""
4294 msgstr ""
4267
4295
4268 msgid "append transplant info to log message"
4296 msgid "append transplant info to log message"
4269 msgstr ""
4297 msgstr ""
4270
4298
4271 msgid "continue last transplant session after repair"
4299 msgid "continue last transplant session after repair"
4272 msgstr ""
4300 msgstr ""
4273
4301
4274 msgid "filter changesets through FILTER"
4302 msgid "filter changesets through FILTER"
4275 msgstr ""
4303 msgstr ""
4276
4304
4277 msgid ""
4305 msgid ""
4278 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4306 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4279 msgstr ""
4307 msgstr ""
4280
4308
4281 msgid ""
4309 msgid ""
4282 "allow the use of MBCS paths with problematic encodings\n"
4310 "allow the use of MBCS paths with problematic encodings\n"
4283 "\n"
4311 "\n"
4284 "Some MBCS encodings are not good for some path operations (i.e.\n"
4312 "Some MBCS encodings are not good for some path operations (i.e.\n"
4285 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4313 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4286 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4314 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4287 "This extension can be used to fix the issue with those encodings by\n"
4315 "This extension can be used to fix the issue with those encodings by\n"
4288 "wrapping some functions to convert to Unicode string before path\n"
4316 "wrapping some functions to convert to Unicode string before path\n"
4289 "operation.\n"
4317 "operation.\n"
4290 "\n"
4318 "\n"
4291 "This extension is useful for:\n"
4319 "This extension is useful for:\n"
4292 " * Japanese Windows users using shift_jis encoding.\n"
4320 " * Japanese Windows users using shift_jis encoding.\n"
4293 " * Chinese Windows users using big5 encoding.\n"
4321 " * Chinese Windows users using big5 encoding.\n"
4294 " * All users who use a repository with one of problematic encodings on\n"
4322 " * All users who use a repository with one of problematic encodings on\n"
4295 " case-insensitive file system.\n"
4323 " case-insensitive file system.\n"
4296 "\n"
4324 "\n"
4297 "This extension is not needed for:\n"
4325 "This extension is not needed for:\n"
4298 " * Any user who use only ASCII chars in path.\n"
4326 " * Any user who use only ASCII chars in path.\n"
4299 " * Any user who do not use any of problematic encodings.\n"
4327 " * Any user who do not use any of problematic encodings.\n"
4300 "\n"
4328 "\n"
4301 "Note that there are some limitations on using this extension:\n"
4329 "Note that there are some limitations on using this extension:\n"
4302 " * You should use single encoding in one repository.\n"
4330 " * You should use single encoding in one repository.\n"
4303 " * You should set same encoding for the repository by locale or\n"
4331 " * You should set same encoding for the repository by locale or\n"
4304 " HGENCODING.\n"
4332 " HGENCODING.\n"
4305 "\n"
4333 "\n"
4306 "Path encoding conversion are done between Unicode and\n"
4334 "Path encoding conversion are done between Unicode and\n"
4307 "encoding.encoding which is decided by Mercurial from current locale\n"
4335 "encoding.encoding which is decided by Mercurial from current locale\n"
4308 "setting or HGENCODING.\n"
4336 "setting or HGENCODING.\n"
4309 msgstr ""
4337 msgstr ""
4310
4338
4311 #, python-format
4339 #, python-format
4312 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4340 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4313 msgstr ""
4341 msgstr ""
4314
4342
4315 msgid "[win32mbcs] cannot activate on this platform.\n"
4343 msgid "[win32mbcs] cannot activate on this platform.\n"
4316 msgstr ""
4344 msgstr ""
4317
4345
4318 #, python-format
4346 #, python-format
4319 msgid "[win32mbcs] activated with encoding: %s\n"
4347 msgid "[win32mbcs] activated with encoding: %s\n"
4320 msgstr ""
4348 msgstr ""
4321
4349
4322 msgid ""
4350 msgid ""
4323 "perform automatic newline conversion\n"
4351 "perform automatic newline conversion\n"
4324 "\n"
4352 "\n"
4325 "To perform automatic newline conversion, use:\n"
4353 "To perform automatic newline conversion, use:\n"
4326 "\n"
4354 "\n"
4327 "[extensions]\n"
4355 "[extensions]\n"
4328 "hgext.win32text =\n"
4356 "hgext.win32text =\n"
4329 "[encode]\n"
4357 "[encode]\n"
4330 "** = cleverencode:\n"
4358 "** = cleverencode:\n"
4331 "# or ** = macencode:\n"
4359 "# or ** = macencode:\n"
4332 "\n"
4360 "\n"
4333 "[decode]\n"
4361 "[decode]\n"
4334 "** = cleverdecode:\n"
4362 "** = cleverdecode:\n"
4335 "# or ** = macdecode:\n"
4363 "# or ** = macdecode:\n"
4336 "\n"
4364 "\n"
4337 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4365 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4338 "accident:\n"
4366 "accident:\n"
4339 "\n"
4367 "\n"
4340 "[hooks]\n"
4368 "[hooks]\n"
4341 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4369 "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4342 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4370 "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4343 "\n"
4371 "\n"
4344 "To do the same check on a server to prevent CRLF/CR from being\n"
4372 "To do the same check on a server to prevent CRLF/CR from being\n"
4345 "pushed or pulled:\n"
4373 "pushed or pulled:\n"
4346 "\n"
4374 "\n"
4347 "[hooks]\n"
4375 "[hooks]\n"
4348 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4376 "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4349 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4377 "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4350 msgstr ""
4378 msgstr ""
4351
4379
4352 #, python-format
4380 #, python-format
4353 msgid ""
4381 msgid ""
4354 "WARNING: %s already has %s line endings\n"
4382 "WARNING: %s already has %s line endings\n"
4355 "and does not need EOL conversion by the win32text plugin.\n"
4383 "and does not need EOL conversion by the win32text plugin.\n"
4356 "Before your next commit, please reconsider your encode/decode settings in \n"
4384 "Before your next commit, please reconsider your encode/decode settings in \n"
4357 "Mercurial.ini or %s.\n"
4385 "Mercurial.ini or %s.\n"
4358 msgstr ""
4386 msgstr ""
4359
4387
4360 #, python-format
4388 #, python-format
4361 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4389 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4362 msgstr ""
4390 msgstr ""
4363
4391
4364 #, python-format
4392 #, python-format
4365 msgid "in %s: %s\n"
4393 msgid "in %s: %s\n"
4366 msgstr ""
4394 msgstr ""
4367
4395
4368 #, python-format
4396 #, python-format
4369 msgid ""
4397 msgid ""
4370 "\n"
4398 "\n"
4371 "To prevent this mistake in your local repository,\n"
4399 "To prevent this mistake in your local repository,\n"
4372 "add to Mercurial.ini or .hg/hgrc:\n"
4400 "add to Mercurial.ini or .hg/hgrc:\n"
4373 "\n"
4401 "\n"
4374 "[hooks]\n"
4402 "[hooks]\n"
4375 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4403 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4376 "\n"
4404 "\n"
4377 "and also consider adding:\n"
4405 "and also consider adding:\n"
4378 "\n"
4406 "\n"
4379 "[extensions]\n"
4407 "[extensions]\n"
4380 "hgext.win32text =\n"
4408 "hgext.win32text =\n"
4381 "[encode]\n"
4409 "[encode]\n"
4382 "** = %sencode:\n"
4410 "** = %sencode:\n"
4383 "[decode]\n"
4411 "[decode]\n"
4384 "** = %sdecode:\n"
4412 "** = %sdecode:\n"
4385 msgstr ""
4413 msgstr ""
4386
4414
4387 msgid ""
4415 msgid ""
4388 "discover and advertise repositories on the local network\n"
4416 "discover and advertise repositories on the local network\n"
4389 "\n"
4417 "\n"
4390 "Zeroconf enabled repositories will be announced in a network without\n"
4418 "Zeroconf enabled repositories will be announced in a network without\n"
4391 "the need to configure a server or a service. They can be discovered\n"
4419 "the need to configure a server or a service. They can be discovered\n"
4392 "without knowing their actual IP address.\n"
4420 "without knowing their actual IP address.\n"
4393 "\n"
4421 "\n"
4394 "To allow other people to discover your repository using run \"hg serve\"\n"
4422 "To allow other people to discover your repository using run \"hg serve\"\n"
4395 "in your repository.\n"
4423 "in your repository.\n"
4396 "\n"
4424 "\n"
4397 " $ cd test\n"
4425 " $ cd test\n"
4398 " $ hg serve\n"
4426 " $ hg serve\n"
4399 "\n"
4427 "\n"
4400 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4428 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4401 "\n"
4429 "\n"
4402 " $ hg paths\n"
4430 " $ hg paths\n"
4403 " zc-test = http://example.com:8000/test\n"
4431 " zc-test = http://example.com:8000/test\n"
4404 msgstr ""
4432 msgstr ""
4405
4433
4406 msgid "archive prefix contains illegal components"
4434 msgid "archive prefix contains illegal components"
4407 msgstr ""
4435 msgstr ""
4408
4436
4409 msgid "cannot give prefix when archiving to files"
4437 msgid "cannot give prefix when archiving to files"
4410 msgstr ""
4438 msgstr ""
4411
4439
4412 #, python-format
4440 #, python-format
4413 msgid "unknown archive type '%s'"
4441 msgid "unknown archive type '%s'"
4414 msgstr ""
4442 msgstr ""
4415
4443
4416 msgid "invalid changegroup"
4444 msgid "invalid changegroup"
4417 msgstr ""
4445 msgstr ""
4418
4446
4419 msgid "unknown parent"
4447 msgid "unknown parent"
4420 msgstr ""
4448 msgstr ""
4421
4449
4422 #, python-format
4450 #, python-format
4423 msgid "integrity check failed on %s:%d"
4451 msgid "integrity check failed on %s:%d"
4424 msgstr ""
4452 msgstr ""
4425
4453
4426 #, python-format
4454 #, python-format
4427 msgid "%s: not a Mercurial bundle file"
4455 msgid "%s: not a Mercurial bundle file"
4428 msgstr ""
4456 msgstr ""
4429
4457
4430 #, python-format
4458 #, python-format
4431 msgid "%s: unknown bundle version"
4459 msgid "%s: unknown bundle version"
4432 msgstr ""
4460 msgstr ""
4433
4461
4434 #, python-format
4462 #, python-format
4435 msgid "%s: unknown bundle compression type"
4463 msgid "%s: unknown bundle compression type"
4436 msgstr ""
4464 msgstr ""
4437
4465
4438 msgid "cannot create new bundle repository"
4466 msgid "cannot create new bundle repository"
4439 msgstr ""
4467 msgstr ""
4440
4468
4441 #, python-format
4469 #, python-format
4442 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4470 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4443 msgstr ""
4471 msgstr ""
4444
4472
4445 msgid "empty username"
4473 msgid "empty username"
4446 msgstr ""
4474 msgstr ""
4447
4475
4448 #, python-format
4476 #, python-format
4449 msgid "username %s contains a newline"
4477 msgid "username %s contains a newline"
4450 msgstr ""
4478 msgstr ""
4451
4479
4452 msgid "options --message and --logfile are mutually exclusive"
4480 msgid "options --message and --logfile are mutually exclusive"
4453 msgstr ""
4481 msgstr ""
4454
4482
4455 #, python-format
4483 #, python-format
4456 msgid "can't read commit message '%s': %s"
4484 msgid "can't read commit message '%s': %s"
4457 msgstr ""
4485 msgstr ""
4458
4486
4459 msgid "limit must be a positive integer"
4487 msgid "limit must be a positive integer"
4460 msgstr ""
4488 msgstr ""
4461
4489
4462 msgid "limit must be positive"
4490 msgid "limit must be positive"
4463 msgstr ""
4491 msgstr ""
4464
4492
4465 msgid "too many revisions specified"
4493 msgid "too many revisions specified"
4466 msgstr ""
4494 msgstr ""
4467
4495
4468 #, python-format
4496 #, python-format
4469 msgid "invalid format spec '%%%s' in output filename"
4497 msgid "invalid format spec '%%%s' in output filename"
4470 msgstr ""
4498 msgstr ""
4471
4499
4472 #, python-format
4500 #, python-format
4473 msgid "adding %s\n"
4501 msgid "adding %s\n"
4474 msgstr ""
4502 msgstr ""
4475
4503
4476 #, python-format
4504 #, python-format
4477 msgid "removing %s\n"
4505 msgid "removing %s\n"
4478 msgstr ""
4506 msgstr ""
4479
4507
4480 #, python-format
4508 #, python-format
4481 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4509 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4482 msgstr ""
4510 msgstr ""
4483
4511
4484 #, python-format
4512 #, python-format
4485 msgid "%s: not copying - file is not managed\n"
4513 msgid "%s: not copying - file is not managed\n"
4486 msgstr ""
4514 msgstr ""
4487
4515
4488 #, python-format
4516 #, python-format
4489 msgid "%s: not copying - file has been marked for remove\n"
4517 msgid "%s: not copying - file has been marked for remove\n"
4490 msgstr ""
4518 msgstr ""
4491
4519
4492 #, python-format
4520 #, python-format
4493 msgid "%s: not overwriting - %s collides with %s\n"
4521 msgid "%s: not overwriting - %s collides with %s\n"
4494 msgstr ""
4522 msgstr ""
4495
4523
4496 #, python-format
4524 #, python-format
4497 msgid "%s: not overwriting - file exists\n"
4525 msgid "%s: not overwriting - file exists\n"
4498 msgstr ""
4526 msgstr ""
4499
4527
4500 #, python-format
4528 #, python-format
4501 msgid "%s: deleted in working copy\n"
4529 msgid "%s: deleted in working copy\n"
4502 msgstr ""
4530 msgstr ""
4503
4531
4504 #, python-format
4532 #, python-format
4505 msgid "%s: cannot copy - %s\n"
4533 msgid "%s: cannot copy - %s\n"
4506 msgstr ""
4534 msgstr ""
4507
4535
4508 #, python-format
4536 #, python-format
4509 msgid "moving %s to %s\n"
4537 msgid "moving %s to %s\n"
4510 msgstr ""
4538 msgstr ""
4511
4539
4512 #, python-format
4540 #, python-format
4513 msgid "copying %s to %s\n"
4541 msgid "copying %s to %s\n"
4514 msgstr ""
4542 msgstr ""
4515
4543
4516 #, python-format
4544 #, python-format
4517 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4545 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4518 msgstr ""
4546 msgstr ""
4519
4547
4520 msgid "no source or destination specified"
4548 msgid "no source or destination specified"
4521 msgstr ""
4549 msgstr ""
4522
4550
4523 msgid "no destination specified"
4551 msgid "no destination specified"
4524 msgstr ""
4552 msgstr ""
4525
4553
4526 msgid "with multiple sources, destination must be an existing directory"
4554 msgid "with multiple sources, destination must be an existing directory"
4527 msgstr ""
4555 msgstr ""
4528
4556
4529 #, python-format
4557 #, python-format
4530 msgid "destination %s is not a directory"
4558 msgid "destination %s is not a directory"
4531 msgstr ""
4559 msgstr ""
4532
4560
4533 msgid "no files to copy"
4561 msgid "no files to copy"
4534 msgstr ""
4562 msgstr ""
4535
4563
4536 msgid "(consider using --after)\n"
4564 msgid "(consider using --after)\n"
4537 msgstr ""
4565 msgstr ""
4538
4566
4539 #, python-format
4567 #, python-format
4540 msgid "changeset: %d:%s\n"
4568 msgid "changeset: %d:%s\n"
4541 msgstr ""
4569 msgstr ""
4542
4570
4543 #, python-format
4571 #, python-format
4544 msgid "branch: %s\n"
4572 msgid "branch: %s\n"
4545 msgstr ""
4573 msgstr ""
4546
4574
4547 #, python-format
4575 #, python-format
4548 msgid "tag: %s\n"
4576 msgid "tag: %s\n"
4549 msgstr ""
4577 msgstr ""
4550
4578
4551 #, python-format
4579 #, python-format
4552 msgid "parent: %d:%s\n"
4580 msgid "parent: %d:%s\n"
4553 msgstr ""
4581 msgstr ""
4554
4582
4555 #, python-format
4583 #, python-format
4556 msgid "manifest: %d:%s\n"
4584 msgid "manifest: %d:%s\n"
4557 msgstr ""
4585 msgstr ""
4558
4586
4559 #, python-format
4587 #, python-format
4560 msgid "user: %s\n"
4588 msgid "user: %s\n"
4561 msgstr ""
4589 msgstr ""
4562
4590
4563 #, python-format
4591 #, python-format
4564 msgid "date: %s\n"
4592 msgid "date: %s\n"
4565 msgstr ""
4593 msgstr ""
4566
4594
4567 msgid "files+:"
4595 msgid "files+:"
4568 msgstr ""
4596 msgstr ""
4569
4597
4570 msgid "files-:"
4598 msgid "files-:"
4571 msgstr ""
4599 msgstr ""
4572
4600
4573 msgid "files:"
4601 msgid "files:"
4574 msgstr ""
4602 msgstr ""
4575
4603
4576 #, python-format
4604 #, python-format
4577 msgid "files: %s\n"
4605 msgid "files: %s\n"
4578 msgstr ""
4606 msgstr ""
4579
4607
4580 #, python-format
4608 #, python-format
4581 msgid "copies: %s\n"
4609 msgid "copies: %s\n"
4582 msgstr ""
4610 msgstr ""
4583
4611
4584 #, python-format
4612 #, python-format
4585 msgid "extra: %s=%s\n"
4613 msgid "extra: %s=%s\n"
4586 msgstr ""
4614 msgstr ""
4587
4615
4588 msgid "description:\n"
4616 msgid "description:\n"
4589 msgstr ""
4617 msgstr ""
4590
4618
4591 #, python-format
4619 #, python-format
4592 msgid "summary: %s\n"
4620 msgid "summary: %s\n"
4593 msgstr ""
4621 msgstr ""
4594
4622
4595 #, python-format
4623 #, python-format
4596 msgid "%s: no key named '%s'"
4624 msgid "%s: no key named '%s'"
4597 msgstr ""
4625 msgstr ""
4598
4626
4599 #, python-format
4627 #, python-format
4600 msgid "%s: %s"
4628 msgid "%s: %s"
4601 msgstr ""
4629 msgstr ""
4602
4630
4603 #, python-format
4631 #, python-format
4604 msgid "Found revision %s from %s\n"
4632 msgid "Found revision %s from %s\n"
4605 msgstr ""
4633 msgstr ""
4606
4634
4607 msgid "revision matching date not found"
4635 msgid "revision matching date not found"
4608 msgstr ""
4636 msgstr ""
4609
4637
4610 #, python-format
4638 #, python-format
4611 msgid "cannot follow nonexistent file: \"%s\""
4639 msgid "cannot follow nonexistent file: \"%s\""
4612 msgstr ""
4640 msgstr ""
4613
4641
4614 #, python-format
4642 #, python-format
4615 msgid "%s:%s copy source revision cannot be found!\n"
4643 msgid "%s:%s copy source revision cannot be found!\n"
4616 msgstr ""
4644 msgstr ""
4617
4645
4618 msgid "can only follow copies/renames for explicit filenames"
4646 msgid "can only follow copies/renames for explicit filenames"
4619 msgstr ""
4647 msgstr ""
4620
4648
4621 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4649 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4622 msgstr ""
4650 msgstr ""
4623
4651
4624 msgid "HG: Leave message empty to abort commit."
4652 msgid "HG: Leave message empty to abort commit."
4625 msgstr ""
4653 msgstr ""
4626
4654
4627 #, python-format
4655 #, python-format
4628 msgid "HG: user: %s"
4656 msgid "HG: user: %s"
4629 msgstr ""
4657 msgstr ""
4630
4658
4631 msgid "HG: branch merge"
4659 msgid "HG: branch merge"
4632 msgstr ""
4660 msgstr ""
4633
4661
4634 #, python-format
4662 #, python-format
4635 msgid "HG: branch '%s'"
4663 msgid "HG: branch '%s'"
4636 msgstr ""
4664 msgstr ""
4637
4665
4638 #, python-format
4666 #, python-format
4639 msgid "HG: added %s"
4667 msgid "HG: added %s"
4640 msgstr ""
4668 msgstr ""
4641
4669
4642 #, python-format
4670 #, python-format
4643 msgid "HG: changed %s"
4671 msgid "HG: changed %s"
4644 msgstr ""
4672 msgstr ""
4645
4673
4646 #, python-format
4674 #, python-format
4647 msgid "HG: removed %s"
4675 msgid "HG: removed %s"
4648 msgstr ""
4676 msgstr ""
4649
4677
4650 msgid "HG: no files changed"
4678 msgid "HG: no files changed"
4651 msgstr ""
4679 msgstr ""
4652
4680
4653 msgid "empty commit message"
4681 msgid "empty commit message"
4654 msgstr ""
4682 msgstr ""
4655
4683
4656 msgid ""
4684 msgid ""
4657 "add the specified files on the next commit\n"
4685 "add the specified files on the next commit\n"
4658 "\n"
4686 "\n"
4659 " Schedule files to be version controlled and added to the\n"
4687 " Schedule files to be version controlled and added to the\n"
4660 " repository.\n"
4688 " repository.\n"
4661 "\n"
4689 "\n"
4662 " The files will be added to the repository at the next commit. To\n"
4690 " The files will be added to the repository at the next commit. To\n"
4663 " undo an add before that, see hg forget.\n"
4691 " undo an add before that, see hg forget.\n"
4664 "\n"
4692 "\n"
4665 " If no names are given, add all files to the repository.\n"
4693 " If no names are given, add all files to the repository.\n"
4666 " "
4694 " "
4667 msgstr ""
4695 msgstr ""
4668
4696
4669 msgid ""
4697 msgid ""
4670 "add all new files, delete all missing files\n"
4698 "add all new files, delete all missing files\n"
4671 "\n"
4699 "\n"
4672 " Add all new files and remove all missing files from the\n"
4700 " Add all new files and remove all missing files from the\n"
4673 " repository.\n"
4701 " repository.\n"
4674 "\n"
4702 "\n"
4675 " New files are ignored if they match any of the patterns in\n"
4703 " New files are ignored if they match any of the patterns in\n"
4676 " .hgignore. As with add, these changes take effect at the next\n"
4704 " .hgignore. As with add, these changes take effect at the next\n"
4677 " commit.\n"
4705 " commit.\n"
4678 "\n"
4706 "\n"
4679 " Use the -s/--similarity option to detect renamed files. With a\n"
4707 " Use the -s/--similarity option to detect renamed files. With a\n"
4680 " parameter > 0, this compares every removed file with every added\n"
4708 " parameter > 0, this compares every removed file with every added\n"
4681 " file and records those similar enough as renames. This option\n"
4709 " file and records those similar enough as renames. This option\n"
4682 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4710 " takes a percentage between 0 (disabled) and 100 (files must be\n"
4683 " identical) as its parameter. Detecting renamed files this way can\n"
4711 " identical) as its parameter. Detecting renamed files this way can\n"
4684 " be expensive.\n"
4712 " be expensive.\n"
4685 " "
4713 " "
4686 msgstr ""
4714 msgstr ""
4687
4715
4688 msgid "similarity must be a number"
4716 msgid "similarity must be a number"
4689 msgstr ""
4717 msgstr ""
4690
4718
4691 msgid "similarity must be between 0 and 100"
4719 msgid "similarity must be between 0 and 100"
4692 msgstr ""
4720 msgstr ""
4693
4721
4694 msgid ""
4722 msgid ""
4695 "show changeset information by line for each file\n"
4723 "show changeset information by line for each file\n"
4696 "\n"
4724 "\n"
4697 " List changes in files, showing the revision id responsible for\n"
4725 " List changes in files, showing the revision id responsible for\n"
4698 " each line\n"
4726 " each line\n"
4699 "\n"
4727 "\n"
4700 " This command is useful for discovering when a change was made and\n"
4728 " This command is useful for discovering when a change was made and\n"
4701 " by whom.\n"
4729 " by whom.\n"
4702 "\n"
4730 "\n"
4703 " Without the -a/--text option, annotate will avoid processing files\n"
4731 " Without the -a/--text option, annotate will avoid processing files\n"
4704 " it detects as binary. With -a, annotate will annotate the file\n"
4732 " it detects as binary. With -a, annotate will annotate the file\n"
4705 " anyway, although the results will probably be neither useful\n"
4733 " anyway, although the results will probably be neither useful\n"
4706 " nor desirable.\n"
4734 " nor desirable.\n"
4707 " "
4735 " "
4708 msgstr ""
4736 msgstr ""
4709
4737
4710 msgid "at least one filename or pattern is required"
4738 msgid "at least one filename or pattern is required"
4711 msgstr ""
4739 msgstr ""
4712
4740
4713 msgid "at least one of -n/-c is required for -l"
4741 msgid "at least one of -n/-c is required for -l"
4714 msgstr ""
4742 msgstr ""
4715
4743
4716 #, python-format
4744 #, python-format
4717 msgid "%s: binary file\n"
4745 msgid "%s: binary file\n"
4718 msgstr ""
4746 msgstr ""
4719
4747
4720 msgid ""
4748 msgid ""
4721 "create an unversioned archive of a repository revision\n"
4749 "create an unversioned archive of a repository revision\n"
4722 "\n"
4750 "\n"
4723 " By default, the revision used is the parent of the working\n"
4751 " By default, the revision used is the parent of the working\n"
4724 " directory; use -r/--rev to specify a different revision.\n"
4752 " directory; use -r/--rev to specify a different revision.\n"
4725 "\n"
4753 "\n"
4726 " To specify the type of archive to create, use -t/--type. Valid\n"
4754 " To specify the type of archive to create, use -t/--type. Valid\n"
4727 " types are:\n"
4755 " types are:\n"
4728 "\n"
4756 "\n"
4729 " \"files\" (default): a directory full of files\n"
4757 " \"files\" (default): a directory full of files\n"
4730 " \"tar\": tar archive, uncompressed\n"
4758 " \"tar\": tar archive, uncompressed\n"
4731 " \"tbz2\": tar archive, compressed using bzip2\n"
4759 " \"tbz2\": tar archive, compressed using bzip2\n"
4732 " \"tgz\": tar archive, compressed using gzip\n"
4760 " \"tgz\": tar archive, compressed using gzip\n"
4733 " \"uzip\": zip archive, uncompressed\n"
4761 " \"uzip\": zip archive, uncompressed\n"
4734 " \"zip\": zip archive, compressed using deflate\n"
4762 " \"zip\": zip archive, compressed using deflate\n"
4735 "\n"
4763 "\n"
4736 " The exact name of the destination archive or directory is given\n"
4764 " The exact name of the destination archive or directory is given\n"
4737 " using a format string; see 'hg help export' for details.\n"
4765 " using a format string; see 'hg help export' for details.\n"
4738 "\n"
4766 "\n"
4739 " Each member added to an archive file has a directory prefix\n"
4767 " Each member added to an archive file has a directory prefix\n"
4740 " prepended. Use -p/--prefix to specify a format string for the\n"
4768 " prepended. Use -p/--prefix to specify a format string for the\n"
4741 " prefix. The default is the basename of the archive, with suffixes\n"
4769 " prefix. The default is the basename of the archive, with suffixes\n"
4742 " removed.\n"
4770 " removed.\n"
4743 " "
4771 " "
4744 msgstr ""
4772 msgstr ""
4745
4773
4746 msgid "no working directory: please specify a revision"
4774 msgid "no working directory: please specify a revision"
4747 msgstr ""
4775 msgstr ""
4748
4776
4749 msgid "repository root cannot be destination"
4777 msgid "repository root cannot be destination"
4750 msgstr ""
4778 msgstr ""
4751
4779
4752 msgid "cannot archive plain files to stdout"
4780 msgid "cannot archive plain files to stdout"
4753 msgstr ""
4781 msgstr ""
4754
4782
4755 msgid ""
4783 msgid ""
4756 "reverse effect of earlier changeset\n"
4784 "reverse effect of earlier changeset\n"
4757 "\n"
4785 "\n"
4758 " Commit the backed out changes as a new changeset. The new\n"
4786 " Commit the backed out changes as a new changeset. The new\n"
4759 " changeset is a child of the backed out changeset.\n"
4787 " changeset is a child of the backed out changeset.\n"
4760 "\n"
4788 "\n"
4761 " If you backout a changeset other than the tip, a new head is\n"
4789 " If you backout a changeset other than the tip, a new head is\n"
4762 " created. This head will be the new tip and you should merge this\n"
4790 " created. This head will be the new tip and you should merge this\n"
4763 " backout changeset with another head.\n"
4791 " backout changeset with another head.\n"
4764 "\n"
4792 "\n"
4765 " The --merge option remembers the parent of the working directory\n"
4793 " The --merge option remembers the parent of the working directory\n"
4766 " before starting the backout, then merges the new head with that\n"
4794 " before starting the backout, then merges the new head with that\n"
4767 " changeset afterwards. This saves you from doing the merge by hand.\n"
4795 " changeset afterwards. This saves you from doing the merge by hand.\n"
4768 " The result of this merge is not committed, as with a normal merge.\n"
4796 " The result of this merge is not committed, as with a normal merge.\n"
4769 "\n"
4797 "\n"
4770 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4798 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4771 " "
4799 " "
4772 msgstr ""
4800 msgstr ""
4773
4801
4774 msgid "please specify just one revision"
4802 msgid "please specify just one revision"
4775 msgstr ""
4803 msgstr ""
4776
4804
4777 msgid "please specify a revision to backout"
4805 msgid "please specify a revision to backout"
4778 msgstr ""
4806 msgstr ""
4779
4807
4780 msgid "cannot backout change on a different branch"
4808 msgid "cannot backout change on a different branch"
4781 msgstr ""
4809 msgstr ""
4782
4810
4783 msgid "cannot backout a change with no parents"
4811 msgid "cannot backout a change with no parents"
4784 msgstr ""
4812 msgstr ""
4785
4813
4786 msgid "cannot backout a merge changeset without --parent"
4814 msgid "cannot backout a merge changeset without --parent"
4787 msgstr ""
4815 msgstr ""
4788
4816
4789 #, python-format
4817 #, python-format
4790 msgid "%s is not a parent of %s"
4818 msgid "%s is not a parent of %s"
4791 msgstr ""
4819 msgstr ""
4792
4820
4793 msgid "cannot use --parent on non-merge changeset"
4821 msgid "cannot use --parent on non-merge changeset"
4794 msgstr ""
4822 msgstr ""
4795
4823
4796 #, python-format
4824 #, python-format
4797 msgid "Backed out changeset %s"
4825 msgid "Backed out changeset %s"
4798 msgstr ""
4826 msgstr ""
4799
4827
4800 #, python-format
4828 #, python-format
4801 msgid "changeset %s backs out changeset %s\n"
4829 msgid "changeset %s backs out changeset %s\n"
4802 msgstr ""
4830 msgstr ""
4803
4831
4804 #, python-format
4832 #, python-format
4805 msgid "merging with changeset %s\n"
4833 msgid "merging with changeset %s\n"
4806 msgstr ""
4834 msgstr ""
4807
4835
4808 msgid "the backout changeset is a new head - do not forget to merge\n"
4836 msgid "the backout changeset is a new head - do not forget to merge\n"
4809 msgstr ""
4837 msgstr ""
4810
4838
4811 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4839 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4812 msgstr ""
4840 msgstr ""
4813
4841
4814 msgid ""
4842 msgid ""
4815 "subdivision search of changesets\n"
4843 "subdivision search of changesets\n"
4816 "\n"
4844 "\n"
4817 " This command helps to find changesets which introduce problems. To\n"
4845 " This command helps to find changesets which introduce problems. To\n"
4818 " use, mark the earliest changeset you know exhibits the problem as\n"
4846 " use, mark the earliest changeset you know exhibits the problem as\n"
4819 " bad, then mark the latest changeset which is free from the problem\n"
4847 " bad, then mark the latest changeset which is free from the problem\n"
4820 " as good. Bisect will update your working directory to a revision\n"
4848 " as good. Bisect will update your working directory to a revision\n"
4821 " for testing (unless the -U/--noupdate option is specified). Once\n"
4849 " for testing (unless the -U/--noupdate option is specified). Once\n"
4822 " you have performed tests, mark the working directory as good or\n"
4850 " you have performed tests, mark the working directory as good or\n"
4823 " bad, and bisect will either update to another candidate changeset\n"
4851 " bad, and bisect will either update to another candidate changeset\n"
4824 " or announce that it has found the bad revision.\n"
4852 " or announce that it has found the bad revision.\n"
4825 "\n"
4853 "\n"
4826 " As a shortcut, you can also use the revision argument to mark a\n"
4854 " As a shortcut, you can also use the revision argument to mark a\n"
4827 " revision as good or bad without checking it out first.\n"
4855 " revision as good or bad without checking it out first.\n"
4828 "\n"
4856 "\n"
4829 " If you supply a command, it will be used for automatic bisection.\n"
4857 " If you supply a command, it will be used for automatic bisection.\n"
4830 " Its exit status will be used to mark revisions as good or bad:\n"
4858 " Its exit status will be used to mark revisions as good or bad:\n"
4831 " status 0 means good, 125 means to skip the revision, 127\n"
4859 " status 0 means good, 125 means to skip the revision, 127\n"
4832 " (command not found) will abort the bisection, and any other\n"
4860 " (command not found) will abort the bisection, and any other\n"
4833 " non-zero exit status means the revision is bad.\n"
4861 " non-zero exit status means the revision is bad.\n"
4834 " "
4862 " "
4835 msgstr ""
4863 msgstr ""
4836
4864
4837 msgid "The first good revision is:\n"
4865 msgid "The first good revision is:\n"
4838 msgstr ""
4866 msgstr ""
4839
4867
4840 msgid "The first bad revision is:\n"
4868 msgid "The first bad revision is:\n"
4841 msgstr ""
4869 msgstr ""
4842
4870
4843 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4871 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4844 msgstr ""
4872 msgstr ""
4845
4873
4846 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4874 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4847 msgstr ""
4875 msgstr ""
4848
4876
4849 msgid "cannot bisect (no known good revisions)"
4877 msgid "cannot bisect (no known good revisions)"
4850 msgstr ""
4878 msgstr ""
4851
4879
4852 msgid "cannot bisect (no known bad revisions)"
4880 msgid "cannot bisect (no known bad revisions)"
4853 msgstr ""
4881 msgstr ""
4854
4882
4855 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4883 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4856 msgstr ""
4884 msgstr ""
4857
4885
4858 msgid "incompatible arguments"
4886 msgid "incompatible arguments"
4859 msgstr ""
4887 msgstr ""
4860
4888
4861 #, python-format
4889 #, python-format
4862 msgid "cannot find executable: %s"
4890 msgid "cannot find executable: %s"
4863 msgstr ""
4891 msgstr ""
4864
4892
4865 #, python-format
4893 #, python-format
4866 msgid "failed to execute %s"
4894 msgid "failed to execute %s"
4867 msgstr ""
4895 msgstr ""
4868
4896
4869 #, python-format
4897 #, python-format
4870 msgid "%s killed"
4898 msgid "%s killed"
4871 msgstr ""
4899 msgstr ""
4872
4900
4873 #, python-format
4901 #, python-format
4874 msgid "Changeset %d:%s: %s\n"
4902 msgid "Changeset %d:%s: %s\n"
4875 msgstr ""
4903 msgstr ""
4876
4904
4877 #, python-format
4905 #, python-format
4878 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4906 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
4879 msgstr ""
4907 msgstr ""
4880
4908
4881 msgid ""
4909 msgid ""
4882 "set or show the current branch name\n"
4910 "set or show the current branch name\n"
4883 "\n"
4911 "\n"
4884 " With no argument, show the current branch name. With one argument,\n"
4912 " With no argument, show the current branch name. With one argument,\n"
4885 " set the working directory branch name (the branch will not exist\n"
4913 " set the working directory branch name (the branch will not exist\n"
4886 " in the repository until the next commit). Standard practice\n"
4914 " in the repository until the next commit). Standard practice\n"
4887 " recommends that primary development take place on the 'default'\n"
4915 " recommends that primary development take place on the 'default'\n"
4888 " branch.\n"
4916 " branch.\n"
4889 "\n"
4917 "\n"
4890 " Unless -f/--force is specified, branch will not let you set a\n"
4918 " Unless -f/--force is specified, branch will not let you set a\n"
4891 " branch name that already exists, even if it's inactive.\n"
4919 " branch name that already exists, even if it's inactive.\n"
4892 "\n"
4920 "\n"
4893 " Use -C/--clean to reset the working directory branch to that of\n"
4921 " Use -C/--clean to reset the working directory branch to that of\n"
4894 " the parent of the working directory, negating a previous branch\n"
4922 " the parent of the working directory, negating a previous branch\n"
4895 " change.\n"
4923 " change.\n"
4896 "\n"
4924 "\n"
4897 " Use the command 'hg update' to switch to an existing branch.\n"
4925 " Use the command 'hg update' to switch to an existing branch.\n"
4898 " "
4926 " "
4899 msgstr ""
4927 msgstr ""
4900
4928
4901 #, python-format
4929 #, python-format
4902 msgid "reset working directory to branch %s\n"
4930 msgid "reset working directory to branch %s\n"
4903 msgstr ""
4931 msgstr ""
4904
4932
4905 msgid "a branch of the same name already exists (use --force to override)"
4933 msgid "a branch of the same name already exists (use --force to override)"
4906 msgstr ""
4934 msgstr ""
4907
4935
4908 #, python-format
4936 #, python-format
4909 msgid "marked working directory as branch %s\n"
4937 msgid "marked working directory as branch %s\n"
4910 msgstr ""
4938 msgstr ""
4911
4939
4912 msgid ""
4940 msgid ""
4913 "list repository named branches\n"
4941 "list repository named branches\n"
4914 "\n"
4942 "\n"
4915 " List the repository's named branches, indicating which ones are\n"
4943 " List the repository's named branches, indicating which ones are\n"
4916 " inactive. If -a/--active is specified, only show active branches.\n"
4944 " inactive. If -a/--active is specified, only show active branches.\n"
4917 "\n"
4945 "\n"
4918 " A branch is considered active if it contains repository heads.\n"
4946 " A branch is considered active if it contains repository heads.\n"
4919 "\n"
4947 "\n"
4920 " Use the command 'hg update' to switch to an existing branch.\n"
4948 " Use the command 'hg update' to switch to an existing branch.\n"
4921 " "
4949 " "
4922 msgstr ""
4950 msgstr ""
4923
4951
4924 msgid ""
4952 msgid ""
4925 "create a changegroup file\n"
4953 "create a changegroup file\n"
4926 "\n"
4954 "\n"
4927 " Generate a compressed changegroup file collecting changesets not\n"
4955 " Generate a compressed changegroup file collecting changesets not\n"
4928 " known to be in another repository.\n"
4956 " known to be in another repository.\n"
4929 "\n"
4957 "\n"
4930 " If no destination repository is specified the destination is\n"
4958 " If no destination repository is specified the destination is\n"
4931 " assumed to have all the nodes specified by one or more --base\n"
4959 " assumed to have all the nodes specified by one or more --base\n"
4932 " parameters. To create a bundle containing all changesets, use\n"
4960 " parameters. To create a bundle containing all changesets, use\n"
4933 " -a/--all (or --base null).\n"
4961 " -a/--all (or --base null).\n"
4934 "\n"
4962 "\n"
4935 " You can change compression method with the -t/--type option.\n"
4963 " You can change compression method with the -t/--type option.\n"
4936 " The available compression methods are: none, bzip2, and\n"
4964 " The available compression methods are: none, bzip2, and\n"
4937 " gzip (by default, bundles are compressed using bzip2).\n"
4965 " gzip (by default, bundles are compressed using bzip2).\n"
4938 "\n"
4966 "\n"
4939 " The bundle file can then be transferred using conventional means\n"
4967 " The bundle file can then be transferred using conventional means\n"
4940 " and applied to another repository with the unbundle or pull\n"
4968 " and applied to another repository with the unbundle or pull\n"
4941 " command. This is useful when direct push and pull are not\n"
4969 " command. This is useful when direct push and pull are not\n"
4942 " available or when exporting an entire repository is undesirable.\n"
4970 " available or when exporting an entire repository is undesirable.\n"
4943 "\n"
4971 "\n"
4944 " Applying bundles preserves all changeset contents including\n"
4972 " Applying bundles preserves all changeset contents including\n"
4945 " permissions, copy/rename information, and revision history.\n"
4973 " permissions, copy/rename information, and revision history.\n"
4946 " "
4974 " "
4947 msgstr ""
4975 msgstr ""
4948
4976
4949 msgid "--base is incompatible with specifying a destination"
4977 msgid "--base is incompatible with specifying a destination"
4950 msgstr ""
4978 msgstr ""
4951
4979
4952 msgid "unknown bundle type specified with --type"
4980 msgid "unknown bundle type specified with --type"
4953 msgstr ""
4981 msgstr ""
4954
4982
4955 msgid ""
4983 msgid ""
4956 "output the current or given revision of files\n"
4984 "output the current or given revision of files\n"
4957 "\n"
4985 "\n"
4958 " Print the specified files as they were at the given revision. If\n"
4986 " Print the specified files as they were at the given revision. If\n"
4959 " no revision is given, the parent of the working directory is used,\n"
4987 " no revision is given, the parent of the working directory is used,\n"
4960 " or tip if no revision is checked out.\n"
4988 " or tip if no revision is checked out.\n"
4961 "\n"
4989 "\n"
4962 " Output may be to a file, in which case the name of the file is\n"
4990 " Output may be to a file, in which case the name of the file is\n"
4963 " given using a format string. The formatting rules are the same as\n"
4991 " given using a format string. The formatting rules are the same as\n"
4964 " for the export command, with the following additions:\n"
4992 " for the export command, with the following additions:\n"
4965 "\n"
4993 "\n"
4966 " %s basename of file being printed\n"
4994 " %s basename of file being printed\n"
4967 " %d dirname of file being printed, or '.' if in repository root\n"
4995 " %d dirname of file being printed, or '.' if in repository root\n"
4968 " %p root-relative path name of file being printed\n"
4996 " %p root-relative path name of file being printed\n"
4969 " "
4997 " "
4970 msgstr ""
4998 msgstr ""
4971
4999
4972 msgid ""
5000 msgid ""
4973 "make a copy of an existing repository\n"
5001 "make a copy of an existing repository\n"
4974 "\n"
5002 "\n"
4975 " Create a copy of an existing repository in a new directory.\n"
5003 " Create a copy of an existing repository in a new directory.\n"
4976 "\n"
5004 "\n"
4977 " If no destination directory name is specified, it defaults to the\n"
5005 " If no destination directory name is specified, it defaults to the\n"
4978 " basename of the source.\n"
5006 " basename of the source.\n"
4979 "\n"
5007 "\n"
4980 " The location of the source is added to the new repository's\n"
5008 " The location of the source is added to the new repository's\n"
4981 " .hg/hgrc file, as the default to be used for future pulls.\n"
5009 " .hg/hgrc file, as the default to be used for future pulls.\n"
4982 "\n"
5010 "\n"
4983 " If you use the -r/--rev option to clone up to a specific revision,\n"
5011 " If you use the -r/--rev option to clone up to a specific revision,\n"
4984 " no subsequent revisions (including subsequent tags) will be\n"
5012 " no subsequent revisions (including subsequent tags) will be\n"
4985 " present in the cloned repository. This option implies --pull, even\n"
5013 " present in the cloned repository. This option implies --pull, even\n"
4986 " on local repositories.\n"
5014 " on local repositories.\n"
4987 "\n"
5015 "\n"
4988 " By default, clone will check out the head of the 'default' branch.\n"
5016 " By default, clone will check out the head of the 'default' branch.\n"
4989 " If the -U/--noupdate option is used, the new clone will contain\n"
5017 " If the -U/--noupdate option is used, the new clone will contain\n"
4990 " only a repository (.hg) and no working copy (the working copy\n"
5018 " only a repository (.hg) and no working copy (the working copy\n"
4991 " parent is the null revision).\n"
5019 " parent is the null revision).\n"
4992 "\n"
5020 "\n"
4993 " See 'hg help urls' for valid source format details.\n"
5021 " See 'hg help urls' for valid source format details.\n"
4994 "\n"
5022 "\n"
4995 " It is possible to specify an ssh:// URL as the destination, but no\n"
5023 " It is possible to specify an ssh:// URL as the destination, but no\n"
4996 " .hg/hgrc and working directory will be created on the remote side.\n"
5024 " .hg/hgrc and working directory will be created on the remote side.\n"
4997 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5025 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
4998 "\n"
5026 "\n"
4999 " For efficiency, hardlinks are used for cloning whenever the source\n"
5027 " For efficiency, hardlinks are used for cloning whenever the source\n"
5000 " and destination are on the same filesystem (note this applies only\n"
5028 " and destination are on the same filesystem (note this applies only\n"
5001 " to the repository data, not to the checked out files). Some\n"
5029 " to the repository data, not to the checked out files). Some\n"
5002 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5030 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5003 " do not report errors. In these cases, use the --pull option to\n"
5031 " do not report errors. In these cases, use the --pull option to\n"
5004 " avoid hardlinking.\n"
5032 " avoid hardlinking.\n"
5005 "\n"
5033 "\n"
5006 " In some cases, you can clone repositories and checked out files\n"
5034 " In some cases, you can clone repositories and checked out files\n"
5007 " using full hardlinks with\n"
5035 " using full hardlinks with\n"
5008 "\n"
5036 "\n"
5009 " $ cp -al REPO REPOCLONE\n"
5037 " $ cp -al REPO REPOCLONE\n"
5010 "\n"
5038 "\n"
5011 " This is the fastest way to clone, but it is not always safe. The\n"
5039 " This is the fastest way to clone, but it is not always safe. The\n"
5012 " operation is not atomic (making sure REPO is not modified during\n"
5040 " operation is not atomic (making sure REPO is not modified during\n"
5013 " the operation is up to you) and you have to make sure your editor\n"
5041 " the operation is up to you) and you have to make sure your editor\n"
5014 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5042 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5015 " this is not compatible with certain extensions that place their\n"
5043 " this is not compatible with certain extensions that place their\n"
5016 " metadata under the .hg directory, such as mq.\n"
5044 " metadata under the .hg directory, such as mq.\n"
5017 "\n"
5045 "\n"
5018 " "
5046 " "
5019 msgstr ""
5047 msgstr ""
5020
5048
5021 msgid ""
5049 msgid ""
5022 "commit the specified files or all outstanding changes\n"
5050 "commit the specified files or all outstanding changes\n"
5023 "\n"
5051 "\n"
5024 " Commit changes to the given files into the repository. Unlike a\n"
5052 " Commit changes to the given files into the repository. Unlike a\n"
5025 " centralized RCS, this operation is a local operation. See hg push\n"
5053 " centralized RCS, this operation is a local operation. See hg push\n"
5026 " for a way to actively distribute your changes.\n"
5054 " for a way to actively distribute your changes.\n"
5027 "\n"
5055 "\n"
5028 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5056 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5029 " will be committed.\n"
5057 " will be committed.\n"
5030 "\n"
5058 "\n"
5031 " If you are committing the result of a merge, do not provide any\n"
5059 " If you are committing the result of a merge, do not provide any\n"
5032 " filenames or -I/-X filters.\n"
5060 " filenames or -I/-X filters.\n"
5033 "\n"
5061 "\n"
5034 " If no commit message is specified, the configured editor is\n"
5062 " If no commit message is specified, the configured editor is\n"
5035 " started to prompt you for a message.\n"
5063 " started to prompt you for a message.\n"
5036 "\n"
5064 "\n"
5037 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5065 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5038 " "
5066 " "
5039 msgstr ""
5067 msgstr ""
5040
5068
5041 msgid "created new head\n"
5069 msgid "created new head\n"
5042 msgstr ""
5070 msgstr ""
5043
5071
5044 #, python-format
5072 #, python-format
5045 msgid "committed changeset %d:%s\n"
5073 msgid "committed changeset %d:%s\n"
5046 msgstr ""
5074 msgstr ""
5047
5075
5048 msgid ""
5076 msgid ""
5049 "mark files as copied for the next commit\n"
5077 "mark files as copied for the next commit\n"
5050 "\n"
5078 "\n"
5051 " Mark dest as having copies of source files. If dest is a\n"
5079 " Mark dest as having copies of source files. If dest is a\n"
5052 " directory, copies are put in that directory. If dest is a file,\n"
5080 " directory, copies are put in that directory. If dest is a file,\n"
5053 " the source must be a single file.\n"
5081 " the source must be a single file.\n"
5054 "\n"
5082 "\n"
5055 " By default, this command copies the contents of files as they\n"
5083 " By default, this command copies the contents of files as they\n"
5056 " exist in the working directory. If invoked with -A/--after, the\n"
5084 " exist in the working directory. If invoked with -A/--after, the\n"
5057 " operation is recorded, but no copying is performed.\n"
5085 " operation is recorded, but no copying is performed.\n"
5058 "\n"
5086 "\n"
5059 " This command takes effect with the next commit. To undo a copy\n"
5087 " This command takes effect with the next commit. To undo a copy\n"
5060 " before that, see hg revert.\n"
5088 " before that, see hg revert.\n"
5061 " "
5089 " "
5062 msgstr ""
5090 msgstr ""
5063
5091
5064 msgid "find the ancestor revision of two revisions in a given index"
5092 msgid "find the ancestor revision of two revisions in a given index"
5065 msgstr ""
5093 msgstr ""
5066
5094
5067 msgid "There is no Mercurial repository here (.hg not found)"
5095 msgid "There is no Mercurial repository here (.hg not found)"
5068 msgstr ""
5096 msgstr ""
5069
5097
5070 msgid "either two or three arguments required"
5098 msgid "either two or three arguments required"
5071 msgstr ""
5099 msgstr ""
5072
5100
5073 msgid "returns the completion list associated with the given command"
5101 msgid "returns the completion list associated with the given command"
5074 msgstr ""
5102 msgstr ""
5075
5103
5076 msgid "rebuild the dirstate as it would look like for the given revision"
5104 msgid "rebuild the dirstate as it would look like for the given revision"
5077 msgstr ""
5105 msgstr ""
5078
5106
5079 msgid "validate the correctness of the current dirstate"
5107 msgid "validate the correctness of the current dirstate"
5080 msgstr ""
5108 msgstr ""
5081
5109
5082 #, python-format
5110 #, python-format
5083 msgid "%s in state %s, but not in manifest1\n"
5111 msgid "%s in state %s, but not in manifest1\n"
5084 msgstr ""
5112 msgstr ""
5085
5113
5086 #, python-format
5114 #, python-format
5087 msgid "%s in state %s, but also in manifest1\n"
5115 msgid "%s in state %s, but also in manifest1\n"
5088 msgstr ""
5116 msgstr ""
5089
5117
5090 #, python-format
5118 #, python-format
5091 msgid "%s in state %s, but not in either manifest\n"
5119 msgid "%s in state %s, but not in either manifest\n"
5092 msgstr ""
5120 msgstr ""
5093
5121
5094 #, python-format
5122 #, python-format
5095 msgid "%s in manifest1, but listed as state %s"
5123 msgid "%s in manifest1, but listed as state %s"
5096 msgstr ""
5124 msgstr ""
5097
5125
5098 msgid ".hg/dirstate inconsistent with current parent's manifest"
5126 msgid ".hg/dirstate inconsistent with current parent's manifest"
5099 msgstr ""
5127 msgstr ""
5100
5128
5101 msgid ""
5129 msgid ""
5102 "show combined config settings from all hgrc files\n"
5130 "show combined config settings from all hgrc files\n"
5103 "\n"
5131 "\n"
5104 " With no arguments, print names and values of all config items.\n"
5132 " With no arguments, print names and values of all config items.\n"
5105 "\n"
5133 "\n"
5106 " With one argument of the form section.name, print just the value\n"
5134 " With one argument of the form section.name, print just the value\n"
5107 " of that config item.\n"
5135 " of that config item.\n"
5108 "\n"
5136 "\n"
5109 " With multiple arguments, print names and values of all config\n"
5137 " With multiple arguments, print names and values of all config\n"
5110 " items with matching section names.\n"
5138 " items with matching section names.\n"
5111 "\n"
5139 "\n"
5112 " With --debug, the source (filename and line number) is printed\n"
5140 " With --debug, the source (filename and line number) is printed\n"
5113 " for each config item.\n"
5141 " for each config item.\n"
5114 " "
5142 " "
5115 msgstr ""
5143 msgstr ""
5116
5144
5117 msgid "only one config item permitted"
5145 msgid "only one config item permitted"
5118 msgstr ""
5146 msgstr ""
5119
5147
5120 msgid ""
5148 msgid ""
5121 "manually set the parents of the current working directory\n"
5149 "manually set the parents of the current working directory\n"
5122 "\n"
5150 "\n"
5123 " This is useful for writing repository conversion tools, but should\n"
5151 " This is useful for writing repository conversion tools, but should\n"
5124 " be used with care.\n"
5152 " be used with care.\n"
5125 " "
5153 " "
5126 msgstr ""
5154 msgstr ""
5127
5155
5128 msgid "show the contents of the current dirstate"
5156 msgid "show the contents of the current dirstate"
5129 msgstr ""
5157 msgstr ""
5130
5158
5131 #, python-format
5159 #, python-format
5132 msgid "copy: %s -> %s\n"
5160 msgid "copy: %s -> %s\n"
5133 msgstr ""
5161 msgstr ""
5134
5162
5135 msgid "dump the contents of a data file revision"
5163 msgid "dump the contents of a data file revision"
5136 msgstr ""
5164 msgstr ""
5137
5165
5138 #, python-format
5166 #, python-format
5139 msgid "invalid revision identifier %s"
5167 msgid "invalid revision identifier %s"
5140 msgstr ""
5168 msgstr ""
5141
5169
5142 msgid "parse and display a date"
5170 msgid "parse and display a date"
5143 msgstr ""
5171 msgstr ""
5144
5172
5145 msgid "dump the contents of an index file"
5173 msgid "dump the contents of an index file"
5146 msgstr ""
5174 msgstr ""
5147
5175
5148 msgid "dump an index DAG as a graphviz dot file"
5176 msgid "dump an index DAG as a graphviz dot file"
5149 msgstr ""
5177 msgstr ""
5150
5178
5151 msgid "test Mercurial installation"
5179 msgid "test Mercurial installation"
5152 msgstr ""
5180 msgstr ""
5153
5181
5154 #, python-format
5182 #, python-format
5155 msgid "Checking encoding (%s)...\n"
5183 msgid "Checking encoding (%s)...\n"
5156 msgstr ""
5184 msgstr ""
5157
5185
5158 msgid " (check that your locale is properly set)\n"
5186 msgid " (check that your locale is properly set)\n"
5159 msgstr ""
5187 msgstr ""
5160
5188
5161 msgid "Checking extensions...\n"
5189 msgid "Checking extensions...\n"
5162 msgstr ""
5190 msgstr ""
5163
5191
5164 msgid " One or more extensions could not be found"
5192 msgid " One or more extensions could not be found"
5165 msgstr ""
5193 msgstr ""
5166
5194
5167 msgid " (check that you compiled the extensions)\n"
5195 msgid " (check that you compiled the extensions)\n"
5168 msgstr ""
5196 msgstr ""
5169
5197
5170 msgid "Checking templates...\n"
5198 msgid "Checking templates...\n"
5171 msgstr ""
5199 msgstr ""
5172
5200
5173 msgid " (templates seem to have been installed incorrectly)\n"
5201 msgid " (templates seem to have been installed incorrectly)\n"
5174 msgstr ""
5202 msgstr ""
5175
5203
5176 msgid "Checking patch...\n"
5204 msgid "Checking patch...\n"
5177 msgstr ""
5205 msgstr ""
5178
5206
5179 msgid " patch call failed:\n"
5207 msgid " patch call failed:\n"
5180 msgstr ""
5208 msgstr ""
5181
5209
5182 msgid " unexpected patch output!\n"
5210 msgid " unexpected patch output!\n"
5183 msgstr ""
5211 msgstr ""
5184
5212
5185 msgid " patch test failed!\n"
5213 msgid " patch test failed!\n"
5186 msgstr ""
5214 msgstr ""
5187
5215
5188 msgid ""
5216 msgid ""
5189 " (Current patch tool may be incompatible with patch, or misconfigured. "
5217 " (Current patch tool may be incompatible with patch, or misconfigured. "
5190 "Please check your .hgrc file)\n"
5218 "Please check your .hgrc file)\n"
5191 msgstr ""
5219 msgstr ""
5192
5220
5193 msgid ""
5221 msgid ""
5194 " Internal patcher failure, please report this error to http://mercurial."
5222 " Internal patcher failure, please report this error to http://mercurial."
5195 "selenic.com/bts/\n"
5223 "selenic.com/bts/\n"
5196 msgstr ""
5224 msgstr ""
5197
5225
5198 msgid "Checking commit editor...\n"
5226 msgid "Checking commit editor...\n"
5199 msgstr ""
5227 msgstr ""
5200
5228
5201 msgid " No commit editor set and can't find vi in PATH\n"
5229 msgid " No commit editor set and can't find vi in PATH\n"
5202 msgstr ""
5230 msgstr ""
5203
5231
5204 msgid " (specify a commit editor in your .hgrc file)\n"
5232 msgid " (specify a commit editor in your .hgrc file)\n"
5205 msgstr ""
5233 msgstr ""
5206
5234
5207 #, python-format
5235 #, python-format
5208 msgid " Can't find editor '%s' in PATH\n"
5236 msgid " Can't find editor '%s' in PATH\n"
5209 msgstr ""
5237 msgstr ""
5210
5238
5211 msgid "Checking username...\n"
5239 msgid "Checking username...\n"
5212 msgstr ""
5240 msgstr ""
5213
5241
5214 msgid " (specify a username in your .hgrc file)\n"
5242 msgid " (specify a username in your .hgrc file)\n"
5215 msgstr ""
5243 msgstr ""
5216
5244
5217 msgid "No problems detected\n"
5245 msgid "No problems detected\n"
5218 msgstr ""
5246 msgstr ""
5219
5247
5220 #, python-format
5248 #, python-format
5221 msgid "%s problems detected, please check your install!\n"
5249 msgid "%s problems detected, please check your install!\n"
5222 msgstr ""
5250 msgstr ""
5223
5251
5224 msgid "dump rename information"
5252 msgid "dump rename information"
5225 msgstr ""
5253 msgstr ""
5226
5254
5227 #, python-format
5255 #, python-format
5228 msgid "%s renamed from %s:%s\n"
5256 msgid "%s renamed from %s:%s\n"
5229 msgstr ""
5257 msgstr ""
5230
5258
5231 #, python-format
5259 #, python-format
5232 msgid "%s not renamed\n"
5260 msgid "%s not renamed\n"
5233 msgstr ""
5261 msgstr ""
5234
5262
5235 msgid "show how files match on given patterns"
5263 msgid "show how files match on given patterns"
5236 msgstr ""
5264 msgstr ""
5237
5265
5238 msgid ""
5266 msgid ""
5239 "diff repository (or selected files)\n"
5267 "diff repository (or selected files)\n"
5240 "\n"
5268 "\n"
5241 " Show differences between revisions for the specified files.\n"
5269 " Show differences between revisions for the specified files.\n"
5242 "\n"
5270 "\n"
5243 " Differences between files are shown using the unified diff format.\n"
5271 " Differences between files are shown using the unified diff format.\n"
5244 "\n"
5272 "\n"
5245 " NOTE: diff may generate unexpected results for merges, as it will\n"
5273 " NOTE: diff may generate unexpected results for merges, as it will\n"
5246 " default to comparing against the working directory's first parent\n"
5274 " default to comparing against the working directory's first parent\n"
5247 " changeset if no revisions are specified.\n"
5275 " changeset if no revisions are specified.\n"
5248 "\n"
5276 "\n"
5249 " When two revision arguments are given, then changes are shown\n"
5277 " When two revision arguments are given, then changes are shown\n"
5250 " between those revisions. If only one revision is specified then\n"
5278 " between those revisions. If only one revision is specified then\n"
5251 " that revision is compared to the working directory, and, when no\n"
5279 " that revision is compared to the working directory, and, when no\n"
5252 " revisions are specified, the working directory files are compared\n"
5280 " revisions are specified, the working directory files are compared\n"
5253 " to its parent.\n"
5281 " to its parent.\n"
5254 "\n"
5282 "\n"
5255 " Without the -a/--text option, diff will avoid generating diffs of\n"
5283 " Without the -a/--text option, diff will avoid generating diffs of\n"
5256 " files it detects as binary. With -a, diff will generate a diff\n"
5284 " files it detects as binary. With -a, diff will generate a diff\n"
5257 " anyway, probably with undesirable results.\n"
5285 " anyway, probably with undesirable results.\n"
5258 "\n"
5286 "\n"
5259 " Use the -g/--git option to generate diffs in the git extended diff\n"
5287 " Use the -g/--git option to generate diffs in the git extended diff\n"
5260 " format. For more information, read 'hg help diffs'.\n"
5288 " format. For more information, read 'hg help diffs'.\n"
5261 " "
5289 " "
5262 msgstr ""
5290 msgstr ""
5263
5291
5264 msgid ""
5292 msgid ""
5265 "dump the header and diffs for one or more changesets\n"
5293 "dump the header and diffs for one or more changesets\n"
5266 "\n"
5294 "\n"
5267 " Print the changeset header and diffs for one or more revisions.\n"
5295 " Print the changeset header and diffs for one or more revisions.\n"
5268 "\n"
5296 "\n"
5269 " The information shown in the changeset header is: author,\n"
5297 " The information shown in the changeset header is: author,\n"
5270 " changeset hash, parent(s) and commit comment.\n"
5298 " changeset hash, parent(s) and commit comment.\n"
5271 "\n"
5299 "\n"
5272 " NOTE: export may generate unexpected diff output for merge\n"
5300 " NOTE: export may generate unexpected diff output for merge\n"
5273 " changesets, as it will compare the merge changeset against its\n"
5301 " changesets, as it will compare the merge changeset against its\n"
5274 " first parent only.\n"
5302 " first parent only.\n"
5275 "\n"
5303 "\n"
5276 " Output may be to a file, in which case the name of the file is\n"
5304 " Output may be to a file, in which case the name of the file is\n"
5277 " given using a format string. The formatting rules are as follows:\n"
5305 " given using a format string. The formatting rules are as follows:\n"
5278 "\n"
5306 "\n"
5279 " %% literal \"%\" character\n"
5307 " %% literal \"%\" character\n"
5280 " %H changeset hash (40 bytes of hexadecimal)\n"
5308 " %H changeset hash (40 bytes of hexadecimal)\n"
5281 " %N number of patches being generated\n"
5309 " %N number of patches being generated\n"
5282 " %R changeset revision number\n"
5310 " %R changeset revision number\n"
5283 " %b basename of the exporting repository\n"
5311 " %b basename of the exporting repository\n"
5284 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5312 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5285 " %n zero-padded sequence number, starting at 1\n"
5313 " %n zero-padded sequence number, starting at 1\n"
5286 " %r zero-padded changeset revision number\n"
5314 " %r zero-padded changeset revision number\n"
5287 "\n"
5315 "\n"
5288 " Without the -a/--text option, export will avoid generating diffs\n"
5316 " Without the -a/--text option, export will avoid generating diffs\n"
5289 " of files it detects as binary. With -a, export will generate a\n"
5317 " of files it detects as binary. With -a, export will generate a\n"
5290 " diff anyway, probably with undesirable results.\n"
5318 " diff anyway, probably with undesirable results.\n"
5291 "\n"
5319 "\n"
5292 " Use the -g/--git option to generate diffs in the git extended diff\n"
5320 " Use the -g/--git option to generate diffs in the git extended diff\n"
5293 " format. See 'hg help diffs' for more information.\n"
5321 " format. See 'hg help diffs' for more information.\n"
5294 "\n"
5322 "\n"
5295 " With the --switch-parent option, the diff will be against the\n"
5323 " With the --switch-parent option, the diff will be against the\n"
5296 " second parent. It can be useful to review a merge.\n"
5324 " second parent. It can be useful to review a merge.\n"
5297 " "
5325 " "
5298 msgstr ""
5326 msgstr ""
5299
5327
5300 msgid "export requires at least one changeset"
5328 msgid "export requires at least one changeset"
5301 msgstr ""
5329 msgstr ""
5302
5330
5303 msgid "exporting patches:\n"
5331 msgid "exporting patches:\n"
5304 msgstr ""
5332 msgstr ""
5305
5333
5306 msgid "exporting patch:\n"
5334 msgid "exporting patch:\n"
5307 msgstr ""
5335 msgstr ""
5308
5336
5309 msgid ""
5337 msgid ""
5310 "forget the specified files on the next commit\n"
5338 "forget the specified files on the next commit\n"
5311 "\n"
5339 "\n"
5312 " Mark the specified files so they will no longer be tracked\n"
5340 " Mark the specified files so they will no longer be tracked\n"
5313 " after the next commit.\n"
5341 " after the next commit.\n"
5314 "\n"
5342 "\n"
5315 " This only removes files from the current branch, not from the\n"
5343 " This only removes files from the current branch, not from the\n"
5316 " entire project history, and it does not delete them from the\n"
5344 " entire project history, and it does not delete them from the\n"
5317 " working directory.\n"
5345 " working directory.\n"
5318 "\n"
5346 "\n"
5319 " To undo a forget before the next commit, see hg add.\n"
5347 " To undo a forget before the next commit, see hg add.\n"
5320 " "
5348 " "
5321 msgstr ""
5349 msgstr ""
5322
5350
5323 msgid "no files specified"
5351 msgid "no files specified"
5324 msgstr ""
5352 msgstr ""
5325
5353
5326 #, python-format
5354 #, python-format
5327 msgid "not removing %s: file is already untracked\n"
5355 msgid "not removing %s: file is already untracked\n"
5328 msgstr ""
5356 msgstr ""
5329
5357
5330 msgid ""
5358 msgid ""
5331 "search for a pattern in specified files and revisions\n"
5359 "search for a pattern in specified files and revisions\n"
5332 "\n"
5360 "\n"
5333 " Search revisions of files for a regular expression.\n"
5361 " Search revisions of files for a regular expression.\n"
5334 "\n"
5362 "\n"
5335 " This command behaves differently than Unix grep. It only accepts\n"
5363 " This command behaves differently than Unix grep. It only accepts\n"
5336 " Python/Perl regexps. It searches repository history, not the\n"
5364 " Python/Perl regexps. It searches repository history, not the\n"
5337 " working directory. It always prints the revision number in which a\n"
5365 " working directory. It always prints the revision number in which a\n"
5338 " match appears.\n"
5366 " match appears.\n"
5339 "\n"
5367 "\n"
5340 " By default, grep only prints output for the first revision of a\n"
5368 " By default, grep only prints output for the first revision of a\n"
5341 " file in which it finds a match. To get it to print every revision\n"
5369 " file in which it finds a match. To get it to print every revision\n"
5342 " that contains a change in match status (\"-\" for a match that\n"
5370 " that contains a change in match status (\"-\" for a match that\n"
5343 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5371 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5344 " use the --all flag.\n"
5372 " use the --all flag.\n"
5345 " "
5373 " "
5346 msgstr ""
5374 msgstr ""
5347
5375
5348 #, python-format
5376 #, python-format
5349 msgid "grep: invalid match pattern: %s\n"
5377 msgid "grep: invalid match pattern: %s\n"
5350 msgstr ""
5378 msgstr ""
5351
5379
5352 msgid ""
5380 msgid ""
5353 "show current repository heads or show branch heads\n"
5381 "show current repository heads or show branch heads\n"
5354 "\n"
5382 "\n"
5355 " With no arguments, show all repository head changesets.\n"
5383 " With no arguments, show all repository head changesets.\n"
5356 "\n"
5384 "\n"
5357 " Repository \"heads\" are changesets that don't have child\n"
5385 " Repository \"heads\" are changesets that don't have child\n"
5358 " changesets. They are where development generally takes place and\n"
5386 " changesets. They are where development generally takes place and\n"
5359 " are the usual targets for update and merge operations.\n"
5387 " are the usual targets for update and merge operations.\n"
5360 "\n"
5388 "\n"
5361 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5389 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5362 " the named branch associated with that revision. The name of the\n"
5390 " the named branch associated with that revision. The name of the\n"
5363 " branch is called the revision's branch tag.\n"
5391 " branch is called the revision's branch tag.\n"
5364 "\n"
5392 "\n"
5365 " Branch heads are revisions on a given named branch that do not have\n"
5393 " Branch heads are revisions on a given named branch that do not have\n"
5366 " any descendants on the same branch. A branch head could be a true head\n"
5394 " any descendants on the same branch. A branch head could be a true head\n"
5367 " or it could be the last changeset on a branch before a new branch\n"
5395 " or it could be the last changeset on a branch before a new branch\n"
5368 " was created. If none of the branch heads are true heads, the branch\n"
5396 " was created. If none of the branch heads are true heads, the branch\n"
5369 " is considered inactive.\n"
5397 " is considered inactive.\n"
5370 "\n"
5398 "\n"
5371 " If STARTREV is specified only those heads (or branch heads) that\n"
5399 " If STARTREV is specified only those heads (or branch heads) that\n"
5372 " are descendants of STARTREV will be displayed.\n"
5400 " are descendants of STARTREV will be displayed.\n"
5373 " "
5401 " "
5374 msgstr ""
5402 msgstr ""
5375
5403
5376 #, python-format
5404 #, python-format
5377 msgid "no open branch heads on branch %s\n"
5405 msgid "no open branch heads on branch %s\n"
5378 msgstr ""
5406 msgstr ""
5379
5407
5380 #, python-format
5408 #, python-format
5381 msgid "no changes on branch %s containing %s are reachable from %s\n"
5409 msgid "no changes on branch %s containing %s are reachable from %s\n"
5382 msgstr ""
5410 msgstr ""
5383
5411
5384 #, python-format
5412 #, python-format
5385 msgid "no changes on branch %s are reachable from %s\n"
5413 msgid "no changes on branch %s are reachable from %s\n"
5386 msgstr ""
5414 msgstr ""
5387
5415
5388 msgid ""
5416 msgid ""
5389 "show help for a given topic or a help overview\n"
5417 "show help for a given topic or a help overview\n"
5390 "\n"
5418 "\n"
5391 " With no arguments, print a list of commands with short help messages.\n"
5419 " With no arguments, print a list of commands with short help messages.\n"
5392 "\n"
5420 "\n"
5393 " Given a topic, extension, or command name, print help for that\n"
5421 " Given a topic, extension, or command name, print help for that\n"
5394 " topic."
5422 " topic."
5395 msgstr ""
5423 msgstr ""
5396
5424
5397 msgid "global options:"
5425 msgid "global options:"
5398 msgstr "options globales :"
5426 msgstr "options globales :"
5399
5427
5400 msgid "use \"hg help\" for the full list of commands"
5428 msgid "use \"hg help\" for the full list of commands"
5401 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5429 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5402
5430
5403 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5431 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5404 msgstr ""
5432 msgstr ""
5405 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5433 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
5406 "plus de détails"
5434 "plus de détails"
5407
5435
5408 # la chaîne passée est préfixée par un espace
5436 # la chaîne passée est préfixée par un espace
5409 #, python-format
5437 #, python-format
5410 msgid "use \"hg -v help%s\" to show aliases and global options"
5438 msgid "use \"hg -v help%s\" to show aliases and global options"
5411 msgstr ""
5439 msgstr ""
5412 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5440 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
5413
5441
5414 #, python-format
5442 #, python-format
5415 msgid "use \"hg -v help %s\" to show global options"
5443 msgid "use \"hg -v help %s\" to show global options"
5416 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5444 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5417
5445
5418 msgid ""
5446 msgid ""
5419 "list of commands:\n"
5447 "list of commands:\n"
5420 "\n"
5448 "\n"
5421 msgstr ""
5449 msgstr ""
5422 "liste des commandes :\n"
5450 "liste des commandes :\n"
5423 "\n"
5451 "\n"
5424
5452
5425 #, python-format
5453 #, python-format
5426 msgid ""
5454 msgid ""
5427 "\n"
5455 "\n"
5428 "aliases: %s\n"
5456 "aliases: %s\n"
5429 msgstr ""
5457 msgstr ""
5430 "\n"
5458 "\n"
5431 "alias : %s\n"
5459 "alias : %s\n"
5432
5460
5433 msgid "(no help text available)"
5461 msgid "(no help text available)"
5434 msgstr "(pas d'aide disponible)"
5462 msgstr "(pas d'aide disponible)"
5435
5463
5436 msgid "options:\n"
5464 msgid "options:\n"
5437 msgstr "options :\n"
5465 msgstr "options :\n"
5438
5466
5439 msgid "no commands defined\n"
5467 msgid "no commands defined\n"
5440 msgstr "pas de commandes définies\n"
5468 msgstr "pas de commandes définies\n"
5441
5469
5442 msgid "enabled extensions:"
5470 msgid "enabled extensions:"
5443 msgstr "extensions activées :"
5471 msgstr "extensions activées :"
5444
5472
5445 msgid "no help text available"
5473 msgid "no help text available"
5446 msgstr "pas d'aide disponible"
5474 msgstr "pas d'aide disponible"
5447
5475
5448 #, python-format
5476 #, python-format
5449 msgid "%s extension - %s\n"
5477 msgid "%s extension - %s\n"
5450 msgstr "extension %s - %s\n"
5478 msgstr "extension %s - %s\n"
5451
5479
5452 msgid "Mercurial Distributed SCM\n"
5480 msgid "Mercurial Distributed SCM\n"
5453 msgstr "Mercurial, système de gestion de sources distribué\n"
5481 msgstr "Mercurial, système de gestion de sources distribué\n"
5454
5482
5455 msgid ""
5483 msgid ""
5456 "basic commands:\n"
5484 "basic commands:\n"
5457 "\n"
5485 "\n"
5458 msgstr ""
5486 msgstr ""
5459 "commandes de base :\n"
5487 "commandes de base :\n"
5460 "\n"
5488 "\n"
5461
5489
5462 msgid ""
5490 msgid ""
5463 "\n"
5491 "\n"
5464 "additional help topics:\n"
5492 "additional help topics:\n"
5465 "\n"
5493 "\n"
5466 msgstr ""
5494 msgstr ""
5467 "\n"
5495 "\n"
5468 "sujets d'aide supplémentaires :\n"
5496 "sujets d'aide supplémentaires :\n"
5469 "\n"
5497 "\n"
5470
5498
5471 msgid ""
5499 msgid ""
5472 "identify the working copy or specified revision\n"
5500 "identify the working copy or specified revision\n"
5473 "\n"
5501 "\n"
5474 " With no revision, print a summary of the current state of the\n"
5502 " With no revision, print a summary of the current state of the\n"
5475 " repository.\n"
5503 " repository.\n"
5476 "\n"
5504 "\n"
5477 " Specifying a path to a repository root or Mercurial bundle will\n"
5505 " Specifying a path to a repository root or Mercurial bundle will\n"
5478 " cause lookup to operate on that repository/bundle.\n"
5506 " cause lookup to operate on that repository/bundle.\n"
5479 "\n"
5507 "\n"
5480 " This summary identifies the repository state using one or two\n"
5508 " This summary identifies the repository state using one or two\n"
5481 " parent hash identifiers, followed by a \"+\" if there are\n"
5509 " parent hash identifiers, followed by a \"+\" if there are\n"
5482 " uncommitted changes in the working directory, a list of tags for\n"
5510 " uncommitted changes in the working directory, a list of tags for\n"
5483 " this revision and a branch name for non-default branches.\n"
5511 " this revision and a branch name for non-default branches.\n"
5484 " "
5512 " "
5485 msgstr ""
5513 msgstr ""
5486
5514
5487 msgid ""
5515 msgid ""
5488 "import an ordered set of patches\n"
5516 "import an ordered set of patches\n"
5489 "\n"
5517 "\n"
5490 " Import a list of patches and commit them individually.\n"
5518 " Import a list of patches and commit them individually.\n"
5491 "\n"
5519 "\n"
5492 " If there are outstanding changes in the working directory, import\n"
5520 " If there are outstanding changes in the working directory, import\n"
5493 " will abort unless given the -f/--force flag.\n"
5521 " will abort unless given the -f/--force flag.\n"
5494 "\n"
5522 "\n"
5495 " You can import a patch straight from a mail message. Even patches\n"
5523 " You can import a patch straight from a mail message. Even patches\n"
5496 " as attachments work (to use the body part, it must have type\n"
5524 " as attachments work (to use the body part, it must have type\n"
5497 " text/plain or text/x-patch). From and Subject headers of email\n"
5525 " text/plain or text/x-patch). From and Subject headers of email\n"
5498 " message are used as default committer and commit message. All\n"
5526 " message are used as default committer and commit message. All\n"
5499 " text/plain body parts before first diff are added to commit\n"
5527 " text/plain body parts before first diff are added to commit\n"
5500 " message.\n"
5528 " message.\n"
5501 "\n"
5529 "\n"
5502 " If the imported patch was generated by hg export, user and\n"
5530 " If the imported patch was generated by hg export, user and\n"
5503 " description from patch override values from message headers and\n"
5531 " description from patch override values from message headers and\n"
5504 " body. Values given on command line with -m/--message and -u/--user\n"
5532 " body. Values given on command line with -m/--message and -u/--user\n"
5505 " override these.\n"
5533 " override these.\n"
5506 "\n"
5534 "\n"
5507 " If --exact is specified, import will set the working directory to\n"
5535 " If --exact is specified, import will set the working directory to\n"
5508 " the parent of each patch before applying it, and will abort if the\n"
5536 " the parent of each patch before applying it, and will abort if the\n"
5509 " resulting changeset has a different ID than the one recorded in\n"
5537 " resulting changeset has a different ID than the one recorded in\n"
5510 " the patch. This may happen due to character set problems or other\n"
5538 " the patch. This may happen due to character set problems or other\n"
5511 " deficiencies in the text patch format.\n"
5539 " deficiencies in the text patch format.\n"
5512 "\n"
5540 "\n"
5513 " With -s/--similarity, hg will attempt to discover renames and\n"
5541 " With -s/--similarity, hg will attempt to discover renames and\n"
5514 " copies in the patch in the same way as 'addremove'.\n"
5542 " copies in the patch in the same way as 'addremove'.\n"
5515 "\n"
5543 "\n"
5516 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5544 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5517 " a URL is specified, the patch will be downloaded from it.\n"
5545 " a URL is specified, the patch will be downloaded from it.\n"
5518 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5546 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5519 " "
5547 " "
5520 msgstr ""
5548 msgstr ""
5521
5549
5522 msgid "applying patch from stdin\n"
5550 msgid "applying patch from stdin\n"
5523 msgstr ""
5551 msgstr ""
5524
5552
5525 msgid "no diffs found"
5553 msgid "no diffs found"
5526 msgstr ""
5554 msgstr ""
5527
5555
5528 #, python-format
5556 #, python-format
5529 msgid ""
5557 msgid ""
5530 "message:\n"
5558 "message:\n"
5531 "%s\n"
5559 "%s\n"
5532 msgstr ""
5560 msgstr ""
5533
5561
5534 msgid "not a Mercurial patch"
5562 msgid "not a Mercurial patch"
5535 msgstr ""
5563 msgstr ""
5536
5564
5537 msgid "patch is damaged or loses information"
5565 msgid "patch is damaged or loses information"
5538 msgstr ""
5566 msgstr ""
5539
5567
5540 msgid ""
5568 msgid ""
5541 "show new changesets found in source\n"
5569 "show new changesets found in source\n"
5542 "\n"
5570 "\n"
5543 " Show new changesets found in the specified path/URL or the default\n"
5571 " Show new changesets found in the specified path/URL or the default\n"
5544 " pull location. These are the changesets that would have been pulled\n"
5572 " pull location. These are the changesets that would have been pulled\n"
5545 " if a pull at the time you issued this command.\n"
5573 " if a pull at the time you issued this command.\n"
5546 "\n"
5574 "\n"
5547 " For remote repository, using --bundle avoids downloading the\n"
5575 " For remote repository, using --bundle avoids downloading the\n"
5548 " changesets twice if the incoming is followed by a pull.\n"
5576 " changesets twice if the incoming is followed by a pull.\n"
5549 "\n"
5577 "\n"
5550 " See pull for valid source format details.\n"
5578 " See pull for valid source format details.\n"
5551 " "
5579 " "
5552 msgstr ""
5580 msgstr ""
5553
5581
5554 msgid ""
5582 msgid ""
5555 "create a new repository in the given directory\n"
5583 "create a new repository in the given directory\n"
5556 "\n"
5584 "\n"
5557 " Initialize a new repository in the given directory. If the given\n"
5585 " Initialize a new repository in the given directory. If the given\n"
5558 " directory does not exist, it will be created.\n"
5586 " directory does not exist, it will be created.\n"
5559 "\n"
5587 "\n"
5560 " If no directory is given, the current directory is used.\n"
5588 " If no directory is given, the current directory is used.\n"
5561 "\n"
5589 "\n"
5562 " It is possible to specify an ssh:// URL as the destination.\n"
5590 " It is possible to specify an ssh:// URL as the destination.\n"
5563 " See 'hg help urls' for more information.\n"
5591 " See 'hg help urls' for more information.\n"
5564 " "
5592 " "
5565 msgstr ""
5593 msgstr ""
5566
5594
5567 msgid ""
5595 msgid ""
5568 "locate files matching specific patterns\n"
5596 "locate files matching specific patterns\n"
5569 "\n"
5597 "\n"
5570 " Print files under Mercurial control in the working directory whose\n"
5598 " Print files under Mercurial control in the working directory whose\n"
5571 " names match the given patterns.\n"
5599 " names match the given patterns.\n"
5572 "\n"
5600 "\n"
5573 " By default, this command searches all directories in the working\n"
5601 " By default, this command searches all directories in the working\n"
5574 " directory. To search just the current directory and its\n"
5602 " directory. To search just the current directory and its\n"
5575 " subdirectories, use \"--include .\".\n"
5603 " subdirectories, use \"--include .\".\n"
5576 "\n"
5604 "\n"
5577 " If no patterns are given to match, this command prints the names\n"
5605 " If no patterns are given to match, this command prints the names\n"
5578 " of all files under Mercurial control in the working directory.\n"
5606 " of all files under Mercurial control in the working directory.\n"
5579 "\n"
5607 "\n"
5580 " If you want to feed the output of this command into the \"xargs\"\n"
5608 " If you want to feed the output of this command into the \"xargs\"\n"
5581 " command, use the -0 option to both this command and \"xargs\". This\n"
5609 " command, use the -0 option to both this command and \"xargs\". This\n"
5582 " will avoid the problem of \"xargs\" treating single filenames that\n"
5610 " will avoid the problem of \"xargs\" treating single filenames that\n"
5583 " contain whitespace as multiple filenames.\n"
5611 " contain whitespace as multiple filenames.\n"
5584 " "
5612 " "
5585 msgstr ""
5613 msgstr ""
5586
5614
5587 msgid ""
5615 msgid ""
5588 "show revision history of entire repository or files\n"
5616 "show revision history of entire repository or files\n"
5589 "\n"
5617 "\n"
5590 " Print the revision history of the specified files or the entire\n"
5618 " Print the revision history of the specified files or the entire\n"
5591 " project.\n"
5619 " project.\n"
5592 "\n"
5620 "\n"
5593 " File history is shown without following rename or copy history of\n"
5621 " File history is shown without following rename or copy history of\n"
5594 " files. Use -f/--follow with a filename to follow history across\n"
5622 " files. Use -f/--follow with a filename to follow history across\n"
5595 " renames and copies. --follow without a filename will only show\n"
5623 " renames and copies. --follow without a filename will only show\n"
5596 " ancestors or descendants of the starting revision. --follow-first\n"
5624 " ancestors or descendants of the starting revision. --follow-first\n"
5597 " only follows the first parent of merge revisions.\n"
5625 " only follows the first parent of merge revisions.\n"
5598 "\n"
5626 "\n"
5599 " If no revision range is specified, the default is tip:0 unless\n"
5627 " If no revision range is specified, the default is tip:0 unless\n"
5600 " --follow is set, in which case the working directory parent is\n"
5628 " --follow is set, in which case the working directory parent is\n"
5601 " used as the starting revision.\n"
5629 " used as the starting revision.\n"
5602 "\n"
5630 "\n"
5603 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5631 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5604 "\n"
5632 "\n"
5605 " By default this command prints revision number and changeset id,\n"
5633 " By default this command prints revision number and changeset id,\n"
5606 " tags, non-trivial parents, user, date and time, and a summary for\n"
5634 " tags, non-trivial parents, user, date and time, and a summary for\n"
5607 " each commit. When the -v/--verbose switch is used, the list of\n"
5635 " each commit. When the -v/--verbose switch is used, the list of\n"
5608 " changed files and full commit message are shown.\n"
5636 " changed files and full commit message are shown.\n"
5609 "\n"
5637 "\n"
5610 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5638 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5611 " changesets, as it will only compare the merge changeset against\n"
5639 " changesets, as it will only compare the merge changeset against\n"
5612 " its first parent. Also, only files different from BOTH parents\n"
5640 " its first parent. Also, only files different from BOTH parents\n"
5613 " will appear in files:.\n"
5641 " will appear in files:.\n"
5614 " "
5642 " "
5615 msgstr ""
5643 msgstr ""
5616
5644
5617 msgid ""
5645 msgid ""
5618 "output the current or given revision of the project manifest\n"
5646 "output the current or given revision of the project manifest\n"
5619 "\n"
5647 "\n"
5620 " Print a list of version controlled files for the given revision.\n"
5648 " Print a list of version controlled files for the given revision.\n"
5621 " If no revision is given, the first parent of the working directory\n"
5649 " If no revision is given, the first parent of the working directory\n"
5622 " is used, or the null revision if no revision is checked out.\n"
5650 " is used, or the null revision if no revision is checked out.\n"
5623 "\n"
5651 "\n"
5624 " With -v, print file permissions, symlink and executable bits.\n"
5652 " With -v, print file permissions, symlink and executable bits.\n"
5625 " With --debug, print file revision hashes.\n"
5653 " With --debug, print file revision hashes.\n"
5626 " "
5654 " "
5627 msgstr ""
5655 msgstr ""
5628
5656
5629 msgid ""
5657 msgid ""
5630 "merge working directory with another revision\n"
5658 "merge working directory with another revision\n"
5631 "\n"
5659 "\n"
5632 " The current working directory is updated with all changes made in\n"
5660 " The current working directory is updated with all changes made in\n"
5633 " the requested revision since the last common predecessor revision.\n"
5661 " the requested revision since the last common predecessor revision.\n"
5634 "\n"
5662 "\n"
5635 " Files that changed between either parent are marked as changed for\n"
5663 " Files that changed between either parent are marked as changed for\n"
5636 " the next commit and a commit must be performed before any further\n"
5664 " the next commit and a commit must be performed before any further\n"
5637 " updates to the repository are allowed. The next commit will have\n"
5665 " updates to the repository are allowed. The next commit will have\n"
5638 " two parents.\n"
5666 " two parents.\n"
5639 "\n"
5667 "\n"
5640 " If no revision is specified, the working directory's parent is a\n"
5668 " If no revision is specified, the working directory's parent is a\n"
5641 " head revision, and the current branch contains exactly one other\n"
5669 " head revision, and the current branch contains exactly one other\n"
5642 " head, the other head is merged with by default. Otherwise, an\n"
5670 " head, the other head is merged with by default. Otherwise, an\n"
5643 " explicit revision with which to merge with must be provided.\n"
5671 " explicit revision with which to merge with must be provided.\n"
5644 " "
5672 " "
5645 msgstr ""
5673 msgstr ""
5646
5674
5647 #, python-format
5675 #, python-format
5648 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5676 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5649 msgstr ""
5677 msgstr ""
5650
5678
5651 #, python-format
5679 #, python-format
5652 msgid "branch '%s' has one head - please merge with an explicit rev"
5680 msgid "branch '%s' has one head - please merge with an explicit rev"
5653 msgstr ""
5681 msgstr ""
5654
5682
5655 msgid "there is nothing to merge"
5683 msgid "there is nothing to merge"
5656 msgstr ""
5684 msgstr ""
5657
5685
5658 #, python-format
5686 #, python-format
5659 msgid "%s - use \"hg update\" instead"
5687 msgid "%s - use \"hg update\" instead"
5660 msgstr ""
5688 msgstr ""
5661
5689
5662 msgid ""
5690 msgid ""
5663 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5691 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5664 "rev"
5692 "rev"
5665 msgstr ""
5693 msgstr ""
5666
5694
5667 msgid ""
5695 msgid ""
5668 "show changesets not found in destination\n"
5696 "show changesets not found in destination\n"
5669 "\n"
5697 "\n"
5670 " Show changesets not found in the specified destination repository\n"
5698 " Show changesets not found in the specified destination repository\n"
5671 " or the default push location. These are the changesets that would\n"
5699 " or the default push location. These are the changesets that would\n"
5672 " be pushed if a push was requested.\n"
5700 " be pushed if a push was requested.\n"
5673 "\n"
5701 "\n"
5674 " See pull for valid destination format details.\n"
5702 " See pull for valid destination format details.\n"
5675 " "
5703 " "
5676 msgstr ""
5704 msgstr ""
5677
5705
5678 msgid ""
5706 msgid ""
5679 "show the parents of the working directory or revision\n"
5707 "show the parents of the working directory or revision\n"
5680 "\n"
5708 "\n"
5681 " Print the working directory's parent revisions. If a revision is\n"
5709 " Print the working directory's parent revisions. If a revision is\n"
5682 " given via -r/--rev, the parent of that revision will be printed.\n"
5710 " given via -r/--rev, the parent of that revision will be printed.\n"
5683 " If a file argument is given, the revision in which the file was\n"
5711 " If a file argument is given, the revision in which the file was\n"
5684 " last changed (before the working directory revision or the\n"
5712 " last changed (before the working directory revision or the\n"
5685 " argument to --rev if given) is printed.\n"
5713 " argument to --rev if given) is printed.\n"
5686 " "
5714 " "
5687 msgstr ""
5715 msgstr ""
5688
5716
5689 msgid "can only specify an explicit filename"
5717 msgid "can only specify an explicit filename"
5690 msgstr ""
5718 msgstr ""
5691
5719
5692 #, python-format
5720 #, python-format
5693 msgid "'%s' not found in manifest!"
5721 msgid "'%s' not found in manifest!"
5694 msgstr ""
5722 msgstr ""
5695
5723
5696 msgid ""
5724 msgid ""
5697 "show aliases for remote repositories\n"
5725 "show aliases for remote repositories\n"
5698 "\n"
5726 "\n"
5699 " Show definition of symbolic path name NAME. If no name is given,\n"
5727 " Show definition of symbolic path name NAME. If no name is given,\n"
5700 " show definition of all available names.\n"
5728 " show definition of all available names.\n"
5701 "\n"
5729 "\n"
5702 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5730 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5703 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5731 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5704 "\n"
5732 "\n"
5705 " See 'hg help urls' for more information.\n"
5733 " See 'hg help urls' for more information.\n"
5706 " "
5734 " "
5707 msgstr ""
5735 msgstr ""
5708
5736
5709 msgid "not found!\n"
5737 msgid "not found!\n"
5710 msgstr ""
5738 msgstr ""
5711
5739
5712 msgid "not updating, since new heads added\n"
5740 msgid "not updating, since new heads added\n"
5713 msgstr ""
5741 msgstr ""
5714
5742
5715 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5743 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5716 msgstr ""
5744 msgstr ""
5717
5745
5718 msgid "(run 'hg update' to get a working copy)\n"
5746 msgid "(run 'hg update' to get a working copy)\n"
5719 msgstr ""
5747 msgstr ""
5720
5748
5721 msgid ""
5749 msgid ""
5722 "pull changes from the specified source\n"
5750 "pull changes from the specified source\n"
5723 "\n"
5751 "\n"
5724 " Pull changes from a remote repository to a local one.\n"
5752 " Pull changes from a remote repository to a local one.\n"
5725 "\n"
5753 "\n"
5726 " This finds all changes from the repository at the specified path\n"
5754 " This finds all changes from the repository at the specified path\n"
5727 " or URL and adds them to a local repository (the current one unless\n"
5755 " or URL and adds them to a local repository (the current one unless\n"
5728 " -R is specified). By default, this does not update the copy of the\n"
5756 " -R is specified). By default, this does not update the copy of the\n"
5729 " project in the working directory.\n"
5757 " project in the working directory.\n"
5730 "\n"
5758 "\n"
5731 " Use hg incoming if you want to see what would have been added by a\n"
5759 " Use hg incoming if you want to see what would have been added by a\n"
5732 " pull at the time you issued this command. If you then decide to\n"
5760 " pull at the time you issued this command. If you then decide to\n"
5733 " added those changes to the repository, you should use pull -r X\n"
5761 " added those changes to the repository, you should use pull -r X\n"
5734 " where X is the last changeset listed by hg incoming.\n"
5762 " where X is the last changeset listed by hg incoming.\n"
5735 "\n"
5763 "\n"
5736 " If SOURCE is omitted, the 'default' path will be used.\n"
5764 " If SOURCE is omitted, the 'default' path will be used.\n"
5737 " See 'hg help urls' for more information.\n"
5765 " See 'hg help urls' for more information.\n"
5738 " "
5766 " "
5739 msgstr ""
5767 msgstr ""
5740
5768
5741 msgid ""
5769 msgid ""
5742 "push changes to the specified destination\n"
5770 "push changes to the specified destination\n"
5743 "\n"
5771 "\n"
5744 " Push changes from the local repository to the given destination.\n"
5772 " Push changes from the local repository to the given destination.\n"
5745 "\n"
5773 "\n"
5746 " This is the symmetrical operation for pull. It moves changes from\n"
5774 " This is the symmetrical operation for pull. It moves changes from\n"
5747 " the current repository to a different one. If the destination is\n"
5775 " the current repository to a different one. If the destination is\n"
5748 " local this is identical to a pull in that directory from the\n"
5776 " local this is identical to a pull in that directory from the\n"
5749 " current one.\n"
5777 " current one.\n"
5750 "\n"
5778 "\n"
5751 " By default, push will refuse to run if it detects the result would\n"
5779 " By default, push will refuse to run if it detects the result would\n"
5752 " increase the number of remote heads. This generally indicates the\n"
5780 " increase the number of remote heads. This generally indicates the\n"
5753 " user forgot to pull and merge before pushing.\n"
5781 " user forgot to pull and merge before pushing.\n"
5754 "\n"
5782 "\n"
5755 " If -r/--rev is used, the named revision and all its ancestors will\n"
5783 " If -r/--rev is used, the named revision and all its ancestors will\n"
5756 " be pushed to the remote repository.\n"
5784 " be pushed to the remote repository.\n"
5757 "\n"
5785 "\n"
5758 " Please see 'hg help urls' for important details about ssh://\n"
5786 " Please see 'hg help urls' for important details about ssh://\n"
5759 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5787 " URLs. If DESTINATION is omitted, a default path will be used.\n"
5760 " "
5788 " "
5761 msgstr ""
5789 msgstr ""
5762
5790
5763 #, python-format
5791 #, python-format
5764 msgid "pushing to %s\n"
5792 msgid "pushing to %s\n"
5765 msgstr ""
5793 msgstr ""
5766
5794
5767 msgid ""
5795 msgid ""
5768 "roll back an interrupted transaction\n"
5796 "roll back an interrupted transaction\n"
5769 "\n"
5797 "\n"
5770 " Recover from an interrupted commit or pull.\n"
5798 " Recover from an interrupted commit or pull.\n"
5771 "\n"
5799 "\n"
5772 " This command tries to fix the repository status after an\n"
5800 " This command tries to fix the repository status after an\n"
5773 " interrupted operation. It should only be necessary when Mercurial\n"
5801 " interrupted operation. It should only be necessary when Mercurial\n"
5774 " suggests it.\n"
5802 " suggests it.\n"
5775 " "
5803 " "
5776 msgstr ""
5804 msgstr ""
5777
5805
5778 msgid ""
5806 msgid ""
5779 "remove the specified files on the next commit\n"
5807 "remove the specified files on the next commit\n"
5780 "\n"
5808 "\n"
5781 " Schedule the indicated files for removal from the repository.\n"
5809 " Schedule the indicated files for removal from the repository.\n"
5782 "\n"
5810 "\n"
5783 " This only removes files from the current branch, not from the\n"
5811 " This only removes files from the current branch, not from the\n"
5784 " entire project history. -A/--after can be used to remove only\n"
5812 " entire project history. -A/--after can be used to remove only\n"
5785 " files that have already been deleted, -f/--force can be used to\n"
5813 " files that have already been deleted, -f/--force can be used to\n"
5786 " force deletion, and -Af can be used to remove files from the next\n"
5814 " force deletion, and -Af can be used to remove files from the next\n"
5787 " revision without deleting them from the working directory.\n"
5815 " revision without deleting them from the working directory.\n"
5788 "\n"
5816 "\n"
5789 " The following table details the behavior of remove for different\n"
5817 " The following table details the behavior of remove for different\n"
5790 " file states (columns) and option combinations (rows). The file\n"
5818 " file states (columns) and option combinations (rows). The file\n"
5791 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5819 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
5792 " (as reported by hg status). The actions are Warn, Remove (from\n"
5820 " (as reported by hg status). The actions are Warn, Remove (from\n"
5793 " branch) and Delete (from disk).\n"
5821 " branch) and Delete (from disk).\n"
5794 "\n"
5822 "\n"
5795 " A C M !\n"
5823 " A C M !\n"
5796 " none W RD W R\n"
5824 " none W RD W R\n"
5797 " -f R RD RD R\n"
5825 " -f R RD RD R\n"
5798 " -A W W W R\n"
5826 " -A W W W R\n"
5799 " -Af R R R R\n"
5827 " -Af R R R R\n"
5800 "\n"
5828 "\n"
5801 " This command schedules the files to be removed at the next commit.\n"
5829 " This command schedules the files to be removed at the next commit.\n"
5802 " To undo a remove before that, see hg revert.\n"
5830 " To undo a remove before that, see hg revert.\n"
5803 " "
5831 " "
5804 msgstr ""
5832 msgstr ""
5805
5833
5806 #, python-format
5834 #, python-format
5807 msgid "not removing %s: file is untracked\n"
5835 msgid "not removing %s: file is untracked\n"
5808 msgstr ""
5836 msgstr ""
5809
5837
5810 #, python-format
5838 #, python-format
5811 msgid "not removing %s: file %s (use -f to force removal)\n"
5839 msgid "not removing %s: file %s (use -f to force removal)\n"
5812 msgstr ""
5840 msgstr ""
5813
5841
5814 msgid "still exists"
5842 msgid "still exists"
5815 msgstr ""
5843 msgstr ""
5816
5844
5817 msgid "is modified"
5845 msgid "is modified"
5818 msgstr ""
5846 msgstr ""
5819
5847
5820 msgid "has been marked for add"
5848 msgid "has been marked for add"
5821 msgstr ""
5849 msgstr ""
5822
5850
5823 msgid ""
5851 msgid ""
5824 "rename files; equivalent of copy + remove\n"
5852 "rename files; equivalent of copy + remove\n"
5825 "\n"
5853 "\n"
5826 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5854 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
5827 " is a directory, copies are put in that directory. If dest is a\n"
5855 " is a directory, copies are put in that directory. If dest is a\n"
5828 " file, there can only be one source.\n"
5856 " file, there can only be one source.\n"
5829 "\n"
5857 "\n"
5830 " By default, this command copies the contents of files as they\n"
5858 " By default, this command copies the contents of files as they\n"
5831 " exist in the working directory. If invoked with -A/--after, the\n"
5859 " exist in the working directory. If invoked with -A/--after, the\n"
5832 " operation is recorded, but no copying is performed.\n"
5860 " operation is recorded, but no copying is performed.\n"
5833 "\n"
5861 "\n"
5834 " This command takes effect at the next commit. To undo a rename\n"
5862 " This command takes effect at the next commit. To undo a rename\n"
5835 " before that, see hg revert.\n"
5863 " before that, see hg revert.\n"
5836 " "
5864 " "
5837 msgstr ""
5865 msgstr ""
5838
5866
5839 msgid ""
5867 msgid ""
5840 "retry file merges from a merge or update\n"
5868 "retry file merges from a merge or update\n"
5841 "\n"
5869 "\n"
5842 " This command will cleanly retry unresolved file merges using file\n"
5870 " This command will cleanly retry unresolved file merges using file\n"
5843 " revisions preserved from the last update or merge. To attempt to\n"
5871 " revisions preserved from the last update or merge. To attempt to\n"
5844 " resolve all unresolved files, use the -a/--all switch.\n"
5872 " resolve all unresolved files, use the -a/--all switch.\n"
5845 "\n"
5873 "\n"
5846 " If a conflict is resolved manually, please note that the changes\n"
5874 " If a conflict is resolved manually, please note that the changes\n"
5847 " will be overwritten if the merge is retried with resolve. The\n"
5875 " will be overwritten if the merge is retried with resolve. The\n"
5848 " -m/--mark switch should be used to mark the file as resolved.\n"
5876 " -m/--mark switch should be used to mark the file as resolved.\n"
5849 "\n"
5877 "\n"
5850 " This command also allows listing resolved files and manually\n"
5878 " This command also allows listing resolved files and manually\n"
5851 " indicating whether or not files are resolved. All files must be\n"
5879 " indicating whether or not files are resolved. All files must be\n"
5852 " marked as resolved before a commit is permitted.\n"
5880 " marked as resolved before a commit is permitted.\n"
5853 "\n"
5881 "\n"
5854 " The codes used to show the status of files are:\n"
5882 " The codes used to show the status of files are:\n"
5855 " U = unresolved\n"
5883 " U = unresolved\n"
5856 " R = resolved\n"
5884 " R = resolved\n"
5857 " "
5885 " "
5858 msgstr ""
5886 msgstr ""
5859
5887
5860 msgid "too many options specified"
5888 msgid "too many options specified"
5861 msgstr ""
5889 msgstr ""
5862
5890
5863 msgid "can't specify --all and patterns"
5891 msgid "can't specify --all and patterns"
5864 msgstr ""
5892 msgstr ""
5865
5893
5866 msgid "no files or directories specified; use --all to remerge all files"
5894 msgid "no files or directories specified; use --all to remerge all files"
5867 msgstr ""
5895 msgstr ""
5868
5896
5869 msgid ""
5897 msgid ""
5870 "restore individual files or directories to an earlier state\n"
5898 "restore individual files or directories to an earlier state\n"
5871 "\n"
5899 "\n"
5872 " (Use update -r to check out earlier revisions, revert does not\n"
5900 " (Use update -r to check out earlier revisions, revert does not\n"
5873 " change the working directory parents.)\n"
5901 " change the working directory parents.)\n"
5874 "\n"
5902 "\n"
5875 " With no revision specified, revert the named files or directories\n"
5903 " With no revision specified, revert the named files or directories\n"
5876 " to the contents they had in the parent of the working directory.\n"
5904 " to the contents they had in the parent of the working directory.\n"
5877 " This restores the contents of the affected files to an unmodified\n"
5905 " This restores the contents of the affected files to an unmodified\n"
5878 " state and unschedules adds, removes, copies, and renames. If the\n"
5906 " state and unschedules adds, removes, copies, and renames. If the\n"
5879 " working directory has two parents, you must explicitly specify the\n"
5907 " working directory has two parents, you must explicitly specify the\n"
5880 " revision to revert to.\n"
5908 " revision to revert to.\n"
5881 "\n"
5909 "\n"
5882 " Using the -r/--rev option, revert the given files or directories\n"
5910 " Using the -r/--rev option, revert the given files or directories\n"
5883 " to their contents as of a specific revision. This can be helpful\n"
5911 " to their contents as of a specific revision. This can be helpful\n"
5884 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5912 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
5885 " dates' for a list of formats valid for -d/--date.\n"
5913 " dates' for a list of formats valid for -d/--date.\n"
5886 "\n"
5914 "\n"
5887 " Revert modifies the working directory. It does not commit any\n"
5915 " Revert modifies the working directory. It does not commit any\n"
5888 " changes, or change the parent of the working directory. If you\n"
5916 " changes, or change the parent of the working directory. If you\n"
5889 " revert to a revision other than the parent of the working\n"
5917 " revert to a revision other than the parent of the working\n"
5890 " directory, the reverted files will thus appear modified\n"
5918 " directory, the reverted files will thus appear modified\n"
5891 " afterwards.\n"
5919 " afterwards.\n"
5892 "\n"
5920 "\n"
5893 " If a file has been deleted, it is restored. If the executable mode\n"
5921 " If a file has been deleted, it is restored. If the executable mode\n"
5894 " of a file was changed, it is reset.\n"
5922 " of a file was changed, it is reset.\n"
5895 "\n"
5923 "\n"
5896 " If names are given, all files matching the names are reverted.\n"
5924 " If names are given, all files matching the names are reverted.\n"
5897 " If no arguments are given, no files are reverted.\n"
5925 " If no arguments are given, no files are reverted.\n"
5898 "\n"
5926 "\n"
5899 " Modified files are saved with a .orig suffix before reverting.\n"
5927 " Modified files are saved with a .orig suffix before reverting.\n"
5900 " To disable these backups, use --no-backup.\n"
5928 " To disable these backups, use --no-backup.\n"
5901 " "
5929 " "
5902 msgstr ""
5930 msgstr ""
5903
5931
5904 msgid "you can't specify a revision and a date"
5932 msgid "you can't specify a revision and a date"
5905 msgstr ""
5933 msgstr ""
5906
5934
5907 msgid "no files or directories specified; use --all to revert the whole repo"
5935 msgid "no files or directories specified; use --all to revert the whole repo"
5908 msgstr ""
5936 msgstr ""
5909
5937
5910 #, python-format
5938 #, python-format
5911 msgid "forgetting %s\n"
5939 msgid "forgetting %s\n"
5912 msgstr ""
5940 msgstr ""
5913
5941
5914 #, python-format
5942 #, python-format
5915 msgid "reverting %s\n"
5943 msgid "reverting %s\n"
5916 msgstr ""
5944 msgstr ""
5917
5945
5918 #, python-format
5946 #, python-format
5919 msgid "undeleting %s\n"
5947 msgid "undeleting %s\n"
5920 msgstr ""
5948 msgstr ""
5921
5949
5922 #, python-format
5950 #, python-format
5923 msgid "saving current version of %s as %s\n"
5951 msgid "saving current version of %s as %s\n"
5924 msgstr ""
5952 msgstr ""
5925
5953
5926 #, python-format
5954 #, python-format
5927 msgid "file not managed: %s\n"
5955 msgid "file not managed: %s\n"
5928 msgstr ""
5956 msgstr ""
5929
5957
5930 #, python-format
5958 #, python-format
5931 msgid "no changes needed to %s\n"
5959 msgid "no changes needed to %s\n"
5932 msgstr ""
5960 msgstr ""
5933
5961
5934 msgid ""
5962 msgid ""
5935 "roll back the last transaction\n"
5963 "roll back the last transaction\n"
5936 "\n"
5964 "\n"
5937 " This command should be used with care. There is only one level of\n"
5965 " This command should be used with care. There is only one level of\n"
5938 " rollback, and there is no way to undo a rollback. It will also\n"
5966 " rollback, and there is no way to undo a rollback. It will also\n"
5939 " restore the dirstate at the time of the last transaction, losing\n"
5967 " restore the dirstate at the time of the last transaction, losing\n"
5940 " any dirstate changes since that time. This command does not alter\n"
5968 " any dirstate changes since that time. This command does not alter\n"
5941 " the working directory.\n"
5969 " the working directory.\n"
5942 "\n"
5970 "\n"
5943 " Transactions are used to encapsulate the effects of all commands\n"
5971 " Transactions are used to encapsulate the effects of all commands\n"
5944 " that create new changesets or propagate existing changesets into a\n"
5972 " that create new changesets or propagate existing changesets into a\n"
5945 " repository. For example, the following commands are transactional,\n"
5973 " repository. For example, the following commands are transactional,\n"
5946 " and their effects can be rolled back:\n"
5974 " and their effects can be rolled back:\n"
5947 "\n"
5975 "\n"
5948 " commit\n"
5976 " commit\n"
5949 " import\n"
5977 " import\n"
5950 " pull\n"
5978 " pull\n"
5951 " push (with this repository as destination)\n"
5979 " push (with this repository as destination)\n"
5952 " unbundle\n"
5980 " unbundle\n"
5953 "\n"
5981 "\n"
5954 " This command is not intended for use on public repositories. Once\n"
5982 " This command is not intended for use on public repositories. Once\n"
5955 " changes are visible for pull by other users, rolling a transaction\n"
5983 " changes are visible for pull by other users, rolling a transaction\n"
5956 " back locally is ineffective (someone else may already have pulled\n"
5984 " back locally is ineffective (someone else may already have pulled\n"
5957 " the changes). Furthermore, a race is possible with readers of the\n"
5985 " the changes). Furthermore, a race is possible with readers of the\n"
5958 " repository; for example an in-progress pull from the repository\n"
5986 " repository; for example an in-progress pull from the repository\n"
5959 " may fail if a rollback is performed.\n"
5987 " may fail if a rollback is performed.\n"
5960 " "
5988 " "
5961 msgstr ""
5989 msgstr ""
5962
5990
5963 msgid ""
5991 msgid ""
5964 "print the root (top) of the current working directory\n"
5992 "print the root (top) of the current working directory\n"
5965 "\n"
5993 "\n"
5966 " Print the root directory of the current repository.\n"
5994 " Print the root directory of the current repository.\n"
5967 " "
5995 " "
5968 msgstr ""
5996 msgstr ""
5969
5997
5970 msgid ""
5998 msgid ""
5971 "export the repository via HTTP\n"
5999 "export the repository via HTTP\n"
5972 "\n"
6000 "\n"
5973 " Start a local HTTP repository browser and pull server.\n"
6001 " Start a local HTTP repository browser and pull server.\n"
5974 "\n"
6002 "\n"
5975 " By default, the server logs accesses to stdout and errors to\n"
6003 " By default, the server logs accesses to stdout and errors to\n"
5976 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6004 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
5977 " files.\n"
6005 " files.\n"
5978 " "
6006 " "
5979 msgstr ""
6007 msgstr ""
5980
6008
5981 #, python-format
6009 #, python-format
5982 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6010 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
5983 msgstr ""
6011 msgstr ""
5984
6012
5985 msgid ""
6013 msgid ""
5986 "show changed files in the working directory\n"
6014 "show changed files in the working directory\n"
5987 "\n"
6015 "\n"
5988 " Show status of files in the repository. If names are given, only\n"
6016 " Show status of files in the repository. If names are given, only\n"
5989 " files that match are shown. Files that are clean or ignored or\n"
6017 " files that match are shown. Files that are clean or ignored or\n"
5990 " the source of a copy/move operation, are not listed unless\n"
6018 " the source of a copy/move operation, are not listed unless\n"
5991 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6019 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
5992 " Unless options described with \"show only ...\" are given, the\n"
6020 " Unless options described with \"show only ...\" are given, the\n"
5993 " options -mardu are used.\n"
6021 " options -mardu are used.\n"
5994 "\n"
6022 "\n"
5995 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6023 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
5996 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6024 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
5997 "\n"
6025 "\n"
5998 " NOTE: status may appear to disagree with diff if permissions have\n"
6026 " NOTE: status may appear to disagree with diff if permissions have\n"
5999 " changed or a merge has occurred. The standard diff format does not\n"
6027 " changed or a merge has occurred. The standard diff format does not\n"
6000 " report permission changes and diff only reports changes relative\n"
6028 " report permission changes and diff only reports changes relative\n"
6001 " to one merge parent.\n"
6029 " to one merge parent.\n"
6002 "\n"
6030 "\n"
6003 " If one revision is given, it is used as the base revision.\n"
6031 " If one revision is given, it is used as the base revision.\n"
6004 " If two revisions are given, the differences between them are\n"
6032 " If two revisions are given, the differences between them are\n"
6005 " shown.\n"
6033 " shown.\n"
6006 "\n"
6034 "\n"
6007 " The codes used to show the status of files are:\n"
6035 " The codes used to show the status of files are:\n"
6008 " M = modified\n"
6036 " M = modified\n"
6009 " A = added\n"
6037 " A = added\n"
6010 " R = removed\n"
6038 " R = removed\n"
6011 " C = clean\n"
6039 " C = clean\n"
6012 " ! = missing (deleted by non-hg command, but still tracked)\n"
6040 " ! = missing (deleted by non-hg command, but still tracked)\n"
6013 " ? = not tracked\n"
6041 " ? = not tracked\n"
6014 " I = ignored\n"
6042 " I = ignored\n"
6015 " = origin of the previous file listed as A (added)\n"
6043 " = origin of the previous file listed as A (added)\n"
6016 " "
6044 " "
6017 msgstr ""
6045 msgstr ""
6018
6046
6019 msgid ""
6047 msgid ""
6020 "add one or more tags for the current or given revision\n"
6048 "add one or more tags for the current or given revision\n"
6021 "\n"
6049 "\n"
6022 " Name a particular revision using <name>.\n"
6050 " Name a particular revision using <name>.\n"
6023 "\n"
6051 "\n"
6024 " Tags are used to name particular revisions of the repository and are\n"
6052 " Tags are used to name particular revisions of the repository and are\n"
6025 " very useful to compare different revisions, to go back to significant\n"
6053 " very useful to compare different revisions, to go back to significant\n"
6026 " earlier versions or to mark branch points as releases, etc.\n"
6054 " earlier versions or to mark branch points as releases, etc.\n"
6027 "\n"
6055 "\n"
6028 " If no revision is given, the parent of the working directory is\n"
6056 " If no revision is given, the parent of the working directory is\n"
6029 " used, or tip if no revision is checked out.\n"
6057 " used, or tip if no revision is checked out.\n"
6030 "\n"
6058 "\n"
6031 " To facilitate version control, distribution, and merging of tags,\n"
6059 " To facilitate version control, distribution, and merging of tags,\n"
6032 " they are stored as a file named \".hgtags\" which is managed\n"
6060 " they are stored as a file named \".hgtags\" which is managed\n"
6033 " similarly to other project files and can be hand-edited if\n"
6061 " similarly to other project files and can be hand-edited if\n"
6034 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6062 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6035 " shared among repositories).\n"
6063 " shared among repositories).\n"
6036 "\n"
6064 "\n"
6037 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6065 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6038 " "
6066 " "
6039 msgstr ""
6067 msgstr ""
6040
6068
6041 msgid "tag names must be unique"
6069 msgid "tag names must be unique"
6042 msgstr ""
6070 msgstr ""
6043
6071
6044 #, python-format
6072 #, python-format
6045 msgid "the name '%s' is reserved"
6073 msgid "the name '%s' is reserved"
6046 msgstr ""
6074 msgstr ""
6047
6075
6048 msgid "--rev and --remove are incompatible"
6076 msgid "--rev and --remove are incompatible"
6049 msgstr ""
6077 msgstr ""
6050
6078
6051 #, python-format
6079 #, python-format
6052 msgid "tag '%s' does not exist"
6080 msgid "tag '%s' does not exist"
6053 msgstr ""
6081 msgstr ""
6054
6082
6055 #, python-format
6083 #, python-format
6056 msgid "tag '%s' is not a global tag"
6084 msgid "tag '%s' is not a global tag"
6057 msgstr ""
6085 msgstr ""
6058
6086
6059 #, python-format
6087 #, python-format
6060 msgid "tag '%s' is not a local tag"
6088 msgid "tag '%s' is not a local tag"
6061 msgstr ""
6089 msgstr ""
6062
6090
6063 #, python-format
6091 #, python-format
6064 msgid "Removed tag %s"
6092 msgid "Removed tag %s"
6065 msgstr ""
6093 msgstr ""
6066
6094
6067 #, python-format
6095 #, python-format
6068 msgid "tag '%s' already exists (use -f to force)"
6096 msgid "tag '%s' already exists (use -f to force)"
6069 msgstr ""
6097 msgstr ""
6070
6098
6071 #, python-format
6099 #, python-format
6072 msgid "Added tag %s for changeset %s"
6100 msgid "Added tag %s for changeset %s"
6073 msgstr ""
6101 msgstr ""
6074
6102
6075 msgid ""
6103 msgid ""
6076 "list repository tags\n"
6104 "list repository tags\n"
6077 "\n"
6105 "\n"
6078 " This lists both regular and local tags. When the -v/--verbose\n"
6106 " This lists both regular and local tags. When the -v/--verbose\n"
6079 " switch is used, a third column \"local\" is printed for local tags.\n"
6107 " switch is used, a third column \"local\" is printed for local tags.\n"
6080 " "
6108 " "
6081 msgstr ""
6109 msgstr ""
6082
6110
6083 msgid ""
6111 msgid ""
6084 "show the tip revision\n"
6112 "show the tip revision\n"
6085 "\n"
6113 "\n"
6086 " The tip revision (usually just called the tip) is the changeset\n"
6114 " The tip revision (usually just called the tip) is the changeset\n"
6087 " most recently added to the repository (and therefore the most\n"
6115 " most recently added to the repository (and therefore the most\n"
6088 " recently changed head).\n"
6116 " recently changed head).\n"
6089 "\n"
6117 "\n"
6090 " If you have just made a commit, that commit will be the tip. If\n"
6118 " If you have just made a commit, that commit will be the tip. If\n"
6091 " you have just pulled changes from another repository, the tip of\n"
6119 " you have just pulled changes from another repository, the tip of\n"
6092 " that repository becomes the current tip. The \"tip\" tag is special\n"
6120 " that repository becomes the current tip. The \"tip\" tag is special\n"
6093 " and cannot be renamed or assigned to a different changeset.\n"
6121 " and cannot be renamed or assigned to a different changeset.\n"
6094 " "
6122 " "
6095 msgstr ""
6123 msgstr ""
6096
6124
6097 msgid ""
6125 msgid ""
6098 "apply one or more changegroup files\n"
6126 "apply one or more changegroup files\n"
6099 "\n"
6127 "\n"
6100 " Apply one or more compressed changegroup files generated by the\n"
6128 " Apply one or more compressed changegroup files generated by the\n"
6101 " bundle command.\n"
6129 " bundle command.\n"
6102 " "
6130 " "
6103 msgstr ""
6131 msgstr ""
6104
6132
6105 msgid ""
6133 msgid ""
6106 "update working directory\n"
6134 "update working directory\n"
6107 "\n"
6135 "\n"
6108 " Update the repository's working directory to the specified\n"
6136 " Update the repository's working directory to the specified\n"
6109 " revision, or the tip of the current branch if none is specified.\n"
6137 " revision, or the tip of the current branch if none is specified.\n"
6110 " Use null as the revision to remove the working copy (like 'hg\n"
6138 " Use null as the revision to remove the working copy (like 'hg\n"
6111 " clone -U').\n"
6139 " clone -U').\n"
6112 "\n"
6140 "\n"
6113 " When the working directory contains no uncommitted changes, it\n"
6141 " When the working directory contains no uncommitted changes, it\n"
6114 " will be replaced by the state of the requested revision from the\n"
6142 " will be replaced by the state of the requested revision from the\n"
6115 " repository. When the requested revision is on a different branch,\n"
6143 " repository. When the requested revision is on a different branch,\n"
6116 " the working directory will additionally be switched to that\n"
6144 " the working directory will additionally be switched to that\n"
6117 " branch.\n"
6145 " branch.\n"
6118 "\n"
6146 "\n"
6119 " When there are uncommitted changes, use option -C/--clean to\n"
6147 " When there are uncommitted changes, use option -C/--clean to\n"
6120 " discard them, forcibly replacing the state of the working\n"
6148 " discard them, forcibly replacing the state of the working\n"
6121 " directory with the requested revision. Alternately, use -c/--check\n"
6149 " directory with the requested revision. Alternately, use -c/--check\n"
6122 " to abort.\n"
6150 " to abort.\n"
6123 "\n"
6151 "\n"
6124 " When there are uncommitted changes and option -C/--clean is not\n"
6152 " When there are uncommitted changes and option -C/--clean is not\n"
6125 " used, and the parent revision and requested revision are on the\n"
6153 " used, and the parent revision and requested revision are on the\n"
6126 " same branch, and one of them is an ancestor of the other, then the\n"
6154 " same branch, and one of them is an ancestor of the other, then the\n"
6127 " new working directory will contain the requested revision merged\n"
6155 " new working directory will contain the requested revision merged\n"
6128 " with the uncommitted changes. Otherwise, the update will fail with\n"
6156 " with the uncommitted changes. Otherwise, the update will fail with\n"
6129 " a suggestion to use 'merge' or 'update -C' instead.\n"
6157 " a suggestion to use 'merge' or 'update -C' instead.\n"
6130 "\n"
6158 "\n"
6131 " If you want to update just one file to an older revision, use\n"
6159 " If you want to update just one file to an older revision, use\n"
6132 " revert.\n"
6160 " revert.\n"
6133 "\n"
6161 "\n"
6134 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6162 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6135 " "
6163 " "
6136 msgstr ""
6164 msgstr ""
6137
6165
6138 msgid "uncommitted local changes"
6166 msgid "uncommitted local changes"
6139 msgstr ""
6167 msgstr ""
6140
6168
6141 msgid ""
6169 msgid ""
6142 "verify the integrity of the repository\n"
6170 "verify the integrity of the repository\n"
6143 "\n"
6171 "\n"
6144 " Verify the integrity of the current repository.\n"
6172 " Verify the integrity of the current repository.\n"
6145 "\n"
6173 "\n"
6146 " This will perform an extensive check of the repository's\n"
6174 " This will perform an extensive check of the repository's\n"
6147 " integrity, validating the hashes and checksums of each entry in\n"
6175 " integrity, validating the hashes and checksums of each entry in\n"
6148 " the changelog, manifest, and tracked files, as well as the\n"
6176 " the changelog, manifest, and tracked files, as well as the\n"
6149 " integrity of their crosslinks and indices.\n"
6177 " integrity of their crosslinks and indices.\n"
6150 " "
6178 " "
6151 msgstr ""
6179 msgstr ""
6152
6180
6153 msgid "output version and copyright information"
6181 msgid "output version and copyright information"
6154 msgstr ""
6182 msgstr ""
6155
6183
6156 #, python-format
6184 #, python-format
6157 msgid "Mercurial Distributed SCM (version %s)\n"
6185 msgid "Mercurial Distributed SCM (version %s)\n"
6158 msgstr ""
6186 msgstr ""
6159
6187
6160 msgid ""
6188 msgid ""
6161 "\n"
6189 "\n"
6162 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6190 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6163 "This is free software; see the source for copying conditions. There is NO\n"
6191 "This is free software; see the source for copying conditions. There is NO\n"
6164 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6192 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6165 msgstr ""
6193 msgstr ""
6166
6194
6167 msgid "repository root directory or symbolic path name"
6195 msgid "repository root directory or symbolic path name"
6168 msgstr ""
6196 msgstr ""
6169
6197
6170 msgid "change working directory"
6198 msgid "change working directory"
6171 msgstr ""
6199 msgstr ""
6172
6200
6173 msgid "do not prompt, assume 'yes' for any required answers"
6201 msgid "do not prompt, assume 'yes' for any required answers"
6174 msgstr ""
6202 msgstr ""
6175
6203
6176 msgid "suppress output"
6204 msgid "suppress output"
6177 msgstr ""
6205 msgstr ""
6178
6206
6179 msgid "enable additional output"
6207 msgid "enable additional output"
6180 msgstr ""
6208 msgstr ""
6181
6209
6182 msgid "set/override config option"
6210 msgid "set/override config option"
6183 msgstr ""
6211 msgstr ""
6184
6212
6185 msgid "enable debugging output"
6213 msgid "enable debugging output"
6186 msgstr ""
6214 msgstr ""
6187
6215
6188 msgid "start debugger"
6216 msgid "start debugger"
6189 msgstr ""
6217 msgstr ""
6190
6218
6191 msgid "set the charset encoding"
6219 msgid "set the charset encoding"
6192 msgstr ""
6220 msgstr ""
6193
6221
6194 msgid "set the charset encoding mode"
6222 msgid "set the charset encoding mode"
6195 msgstr ""
6223 msgstr ""
6196
6224
6197 msgid "print traceback on exception"
6225 msgid "print traceback on exception"
6198 msgstr ""
6226 msgstr ""
6199
6227
6200 msgid "time how long the command takes"
6228 msgid "time how long the command takes"
6201 msgstr ""
6229 msgstr ""
6202
6230
6203 msgid "print command execution profile"
6231 msgid "print command execution profile"
6204 msgstr ""
6232 msgstr ""
6205
6233
6206 msgid "output version information and exit"
6234 msgid "output version information and exit"
6207 msgstr ""
6235 msgstr ""
6208
6236
6209 msgid "display help and exit"
6237 msgid "display help and exit"
6210 msgstr ""
6238 msgstr ""
6211
6239
6212 msgid "do not perform actions, just print output"
6240 msgid "do not perform actions, just print output"
6213 msgstr ""
6241 msgstr ""
6214
6242
6215 msgid "specify ssh command to use"
6243 msgid "specify ssh command to use"
6216 msgstr ""
6244 msgstr ""
6217
6245
6218 msgid "specify hg command to run on the remote side"
6246 msgid "specify hg command to run on the remote side"
6219 msgstr ""
6247 msgstr ""
6220
6248
6221 msgid "include names matching the given patterns"
6249 msgid "include names matching the given patterns"
6222 msgstr ""
6250 msgstr ""
6223
6251
6224 msgid "exclude names matching the given patterns"
6252 msgid "exclude names matching the given patterns"
6225 msgstr ""
6253 msgstr ""
6226
6254
6227 msgid "use <text> as commit message"
6255 msgid "use <text> as commit message"
6228 msgstr ""
6256 msgstr ""
6229
6257
6230 msgid "read commit message from <file>"
6258 msgid "read commit message from <file>"
6231 msgstr ""
6259 msgstr ""
6232
6260
6233 msgid "record datecode as commit date"
6261 msgid "record datecode as commit date"
6234 msgstr ""
6262 msgstr ""
6235
6263
6236 msgid "record the specified user as committer"
6264 msgid "record the specified user as committer"
6237 msgstr ""
6265 msgstr ""
6238
6266
6239 msgid "display using template map file"
6267 msgid "display using template map file"
6240 msgstr ""
6268 msgstr ""
6241
6269
6242 msgid "display with template"
6270 msgid "display with template"
6243 msgstr ""
6271 msgstr ""
6244
6272
6245 msgid "do not show merges"
6273 msgid "do not show merges"
6246 msgstr ""
6274 msgstr ""
6247
6275
6248 msgid "treat all files as text"
6276 msgid "treat all files as text"
6249 msgstr ""
6277 msgstr ""
6250
6278
6251 msgid "don't include dates in diff headers"
6279 msgid "don't include dates in diff headers"
6252 msgstr ""
6280 msgstr ""
6253
6281
6254 msgid "show which function each change is in"
6282 msgid "show which function each change is in"
6255 msgstr ""
6283 msgstr ""
6256
6284
6257 msgid "ignore white space when comparing lines"
6285 msgid "ignore white space when comparing lines"
6258 msgstr ""
6286 msgstr ""
6259
6287
6260 msgid "ignore changes in the amount of white space"
6288 msgid "ignore changes in the amount of white space"
6261 msgstr ""
6289 msgstr ""
6262
6290
6263 msgid "ignore changes whose lines are all blank"
6291 msgid "ignore changes whose lines are all blank"
6264 msgstr ""
6292 msgstr ""
6265
6293
6266 msgid "number of lines of context to show"
6294 msgid "number of lines of context to show"
6267 msgstr ""
6295 msgstr ""
6268
6296
6269 msgid "guess renamed files by similarity (0<=s<=100)"
6297 msgid "guess renamed files by similarity (0<=s<=100)"
6270 msgstr ""
6298 msgstr ""
6271
6299
6272 msgid "[OPTION]... [FILE]..."
6300 msgid "[OPTION]... [FILE]..."
6273 msgstr ""
6301 msgstr ""
6274
6302
6275 msgid "annotate the specified revision"
6303 msgid "annotate the specified revision"
6276 msgstr ""
6304 msgstr ""
6277
6305
6278 msgid "follow file copies and renames"
6306 msgid "follow file copies and renames"
6279 msgstr ""
6307 msgstr ""
6280
6308
6281 msgid "list the author (long with -v)"
6309 msgid "list the author (long with -v)"
6282 msgstr ""
6310 msgstr ""
6283
6311
6284 msgid "list the date (short with -q)"
6312 msgid "list the date (short with -q)"
6285 msgstr ""
6313 msgstr ""
6286
6314
6287 msgid "list the revision number (default)"
6315 msgid "list the revision number (default)"
6288 msgstr ""
6316 msgstr ""
6289
6317
6290 msgid "list the changeset"
6318 msgid "list the changeset"
6291 msgstr ""
6319 msgstr ""
6292
6320
6293 msgid "show line number at the first appearance"
6321 msgid "show line number at the first appearance"
6294 msgstr ""
6322 msgstr ""
6295
6323
6296 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6324 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6297 msgstr ""
6325 msgstr ""
6298
6326
6299 msgid "do not pass files through decoders"
6327 msgid "do not pass files through decoders"
6300 msgstr ""
6328 msgstr ""
6301
6329
6302 msgid "directory prefix for files in archive"
6330 msgid "directory prefix for files in archive"
6303 msgstr ""
6331 msgstr ""
6304
6332
6305 msgid "revision to distribute"
6333 msgid "revision to distribute"
6306 msgstr ""
6334 msgstr ""
6307
6335
6308 msgid "type of distribution to create"
6336 msgid "type of distribution to create"
6309 msgstr ""
6337 msgstr ""
6310
6338
6311 msgid "[OPTION]... DEST"
6339 msgid "[OPTION]... DEST"
6312 msgstr ""
6340 msgstr ""
6313
6341
6314 msgid "merge with old dirstate parent after backout"
6342 msgid "merge with old dirstate parent after backout"
6315 msgstr ""
6343 msgstr ""
6316
6344
6317 msgid "parent to choose when backing out merge"
6345 msgid "parent to choose when backing out merge"
6318 msgstr ""
6346 msgstr ""
6319
6347
6320 msgid "revision to backout"
6348 msgid "revision to backout"
6321 msgstr ""
6349 msgstr ""
6322
6350
6323 msgid "[OPTION]... [-r] REV"
6351 msgid "[OPTION]... [-r] REV"
6324 msgstr ""
6352 msgstr ""
6325
6353
6326 msgid "reset bisect state"
6354 msgid "reset bisect state"
6327 msgstr ""
6355 msgstr ""
6328
6356
6329 msgid "mark changeset good"
6357 msgid "mark changeset good"
6330 msgstr ""
6358 msgstr ""
6331
6359
6332 msgid "mark changeset bad"
6360 msgid "mark changeset bad"
6333 msgstr ""
6361 msgstr ""
6334
6362
6335 msgid "skip testing changeset"
6363 msgid "skip testing changeset"
6336 msgstr ""
6364 msgstr ""
6337
6365
6338 msgid "use command to check changeset state"
6366 msgid "use command to check changeset state"
6339 msgstr ""
6367 msgstr ""
6340
6368
6341 msgid "do not update to target"
6369 msgid "do not update to target"
6342 msgstr ""
6370 msgstr ""
6343
6371
6344 msgid "[-gbsr] [-c CMD] [REV]"
6372 msgid "[-gbsr] [-c CMD] [REV]"
6345 msgstr ""
6373 msgstr ""
6346
6374
6347 msgid "set branch name even if it shadows an existing branch"
6375 msgid "set branch name even if it shadows an existing branch"
6348 msgstr ""
6376 msgstr ""
6349
6377
6350 msgid "reset branch name to parent branch name"
6378 msgid "reset branch name to parent branch name"
6351 msgstr ""
6379 msgstr ""
6352
6380
6353 msgid "[-fC] [NAME]"
6381 msgid "[-fC] [NAME]"
6354 msgstr ""
6382 msgstr ""
6355
6383
6356 msgid "show only branches that have unmerged heads"
6384 msgid "show only branches that have unmerged heads"
6357 msgstr ""
6385 msgstr ""
6358
6386
6359 msgid "[-a]"
6387 msgid "[-a]"
6360 msgstr ""
6388 msgstr ""
6361
6389
6362 msgid "run even when remote repository is unrelated"
6390 msgid "run even when remote repository is unrelated"
6363 msgstr ""
6391 msgstr ""
6364
6392
6365 msgid "a changeset up to which you would like to bundle"
6393 msgid "a changeset up to which you would like to bundle"
6366 msgstr ""
6394 msgstr ""
6367
6395
6368 msgid "a base changeset to specify instead of a destination"
6396 msgid "a base changeset to specify instead of a destination"
6369 msgstr ""
6397 msgstr ""
6370
6398
6371 msgid "bundle all changesets in the repository"
6399 msgid "bundle all changesets in the repository"
6372 msgstr ""
6400 msgstr ""
6373
6401
6374 msgid "bundle compression type to use"
6402 msgid "bundle compression type to use"
6375 msgstr ""
6403 msgstr ""
6376
6404
6377 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6405 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6378 msgstr ""
6406 msgstr ""
6379
6407
6380 msgid "print output to file with formatted name"
6408 msgid "print output to file with formatted name"
6381 msgstr ""
6409 msgstr ""
6382
6410
6383 msgid "print the given revision"
6411 msgid "print the given revision"
6384 msgstr ""
6412 msgstr ""
6385
6413
6386 msgid "apply any matching decode filter"
6414 msgid "apply any matching decode filter"
6387 msgstr ""
6415 msgstr ""
6388
6416
6389 msgid "[OPTION]... FILE..."
6417 msgid "[OPTION]... FILE..."
6390 msgstr ""
6418 msgstr ""
6391
6419
6392 msgid "the clone will only contain a repository (no working copy)"
6420 msgid "the clone will only contain a repository (no working copy)"
6393 msgstr ""
6421 msgstr ""
6394
6422
6395 msgid "a changeset you would like to have after cloning"
6423 msgid "a changeset you would like to have after cloning"
6396 msgstr ""
6424 msgstr ""
6397
6425
6398 msgid "[OPTION]... SOURCE [DEST]"
6426 msgid "[OPTION]... SOURCE [DEST]"
6399 msgstr ""
6427 msgstr ""
6400
6428
6401 msgid "mark new/missing files as added/removed before committing"
6429 msgid "mark new/missing files as added/removed before committing"
6402 msgstr ""
6430 msgstr ""
6403
6431
6404 msgid "mark a branch as closed, hiding it from the branch list"
6432 msgid "mark a branch as closed, hiding it from the branch list"
6405 msgstr ""
6433 msgstr ""
6406
6434
6407 msgid "record a copy that has already occurred"
6435 msgid "record a copy that has already occurred"
6408 msgstr ""
6436 msgstr ""
6409
6437
6410 msgid "forcibly copy over an existing managed file"
6438 msgid "forcibly copy over an existing managed file"
6411 msgstr ""
6439 msgstr ""
6412
6440
6413 msgid "[OPTION]... [SOURCE]... DEST"
6441 msgid "[OPTION]... [SOURCE]... DEST"
6414 msgstr ""
6442 msgstr ""
6415
6443
6416 msgid "[INDEX] REV1 REV2"
6444 msgid "[INDEX] REV1 REV2"
6417 msgstr ""
6445 msgstr ""
6418
6446
6419 msgid "[COMMAND]"
6447 msgid "[COMMAND]"
6420 msgstr ""
6448 msgstr ""
6421
6449
6422 msgid "show the command options"
6450 msgid "show the command options"
6423 msgstr ""
6451 msgstr ""
6424
6452
6425 msgid "[-o] CMD"
6453 msgid "[-o] CMD"
6426 msgstr ""
6454 msgstr ""
6427
6455
6428 msgid "try extended date formats"
6456 msgid "try extended date formats"
6429 msgstr ""
6457 msgstr ""
6430
6458
6431 msgid "[-e] DATE [RANGE]"
6459 msgid "[-e] DATE [RANGE]"
6432 msgstr ""
6460 msgstr ""
6433
6461
6434 msgid "FILE REV"
6462 msgid "FILE REV"
6435 msgstr ""
6463 msgstr ""
6436
6464
6437 msgid "[PATH]"
6465 msgid "[PATH]"
6438 msgstr ""
6466 msgstr ""
6439
6467
6440 msgid "FILE"
6468 msgid "FILE"
6441 msgstr ""
6469 msgstr ""
6442
6470
6443 msgid "revision to rebuild to"
6471 msgid "revision to rebuild to"
6444 msgstr ""
6472 msgstr ""
6445
6473
6446 msgid "[-r REV] [REV]"
6474 msgid "[-r REV] [REV]"
6447 msgstr ""
6475 msgstr ""
6448
6476
6449 msgid "revision to debug"
6477 msgid "revision to debug"
6450 msgstr ""
6478 msgstr ""
6451
6479
6452 msgid "[-r REV] FILE"
6480 msgid "[-r REV] FILE"
6453 msgstr ""
6481 msgstr ""
6454
6482
6455 msgid "REV1 [REV2]"
6483 msgid "REV1 [REV2]"
6456 msgstr ""
6484 msgstr ""
6457
6485
6458 msgid "do not display the saved mtime"
6486 msgid "do not display the saved mtime"
6459 msgstr ""
6487 msgstr ""
6460
6488
6461 msgid "[OPTION]..."
6489 msgid "[OPTION]..."
6462 msgstr ""
6490 msgstr ""
6463
6491
6464 msgid "revision to check"
6492 msgid "revision to check"
6465 msgstr ""
6493 msgstr ""
6466
6494
6467 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6495 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6468 msgstr ""
6496 msgstr ""
6469
6497
6470 msgid "diff against the second parent"
6498 msgid "diff against the second parent"
6471 msgstr ""
6499 msgstr ""
6472
6500
6473 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6501 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6474 msgstr ""
6502 msgstr ""
6475
6503
6476 msgid "end fields with NUL"
6504 msgid "end fields with NUL"
6477 msgstr ""
6505 msgstr ""
6478
6506
6479 msgid "print all revisions that match"
6507 msgid "print all revisions that match"
6480 msgstr ""
6508 msgstr ""
6481
6509
6482 msgid "follow changeset history, or file history across copies and renames"
6510 msgid "follow changeset history, or file history across copies and renames"
6483 msgstr ""
6511 msgstr ""
6484
6512
6485 msgid "ignore case when matching"
6513 msgid "ignore case when matching"
6486 msgstr ""
6514 msgstr ""
6487
6515
6488 msgid "print only filenames and revisions that match"
6516 msgid "print only filenames and revisions that match"
6489 msgstr ""
6517 msgstr ""
6490
6518
6491 msgid "print matching line numbers"
6519 msgid "print matching line numbers"
6492 msgstr ""
6520 msgstr ""
6493
6521
6494 msgid "search in given revision range"
6522 msgid "search in given revision range"
6495 msgstr ""
6523 msgstr ""
6496
6524
6497 msgid "[OPTION]... PATTERN [FILE]..."
6525 msgid "[OPTION]... PATTERN [FILE]..."
6498 msgstr ""
6526 msgstr ""
6499
6527
6500 msgid "show only heads which are descendants of REV"
6528 msgid "show only heads which are descendants of REV"
6501 msgstr ""
6529 msgstr ""
6502
6530
6503 msgid "show only the active heads from open branches"
6531 msgid "show only the active heads from open branches"
6504 msgstr ""
6532 msgstr ""
6505
6533
6506 msgid "show normal and closed heads"
6534 msgid "show normal and closed heads"
6507 msgstr ""
6535 msgstr ""
6508
6536
6509 msgid "[-r STARTREV] [REV]..."
6537 msgid "[-r STARTREV] [REV]..."
6510 msgstr ""
6538 msgstr ""
6511
6539
6512 msgid "[TOPIC]"
6540 msgid "[TOPIC]"
6513 msgstr ""
6541 msgstr ""
6514
6542
6515 msgid "identify the specified revision"
6543 msgid "identify the specified revision"
6516 msgstr ""
6544 msgstr ""
6517
6545
6518 msgid "show local revision number"
6546 msgid "show local revision number"
6519 msgstr ""
6547 msgstr ""
6520
6548
6521 msgid "show global revision id"
6549 msgid "show global revision id"
6522 msgstr ""
6550 msgstr ""
6523
6551
6524 msgid "show branch"
6552 msgid "show branch"
6525 msgstr ""
6553 msgstr ""
6526
6554
6527 msgid "show tags"
6555 msgid "show tags"
6528 msgstr ""
6556 msgstr ""
6529
6557
6530 msgid "[-nibt] [-r REV] [SOURCE]"
6558 msgid "[-nibt] [-r REV] [SOURCE]"
6531 msgstr ""
6559 msgstr ""
6532
6560
6533 msgid ""
6561 msgid ""
6534 "directory strip option for patch. This has the same meaning as the "
6562 "directory strip option for patch. This has the same meaning as the "
6535 "corresponding patch option"
6563 "corresponding patch option"
6536 msgstr ""
6564 msgstr ""
6537
6565
6538 msgid "base path"
6566 msgid "base path"
6539 msgstr ""
6567 msgstr ""
6540
6568
6541 msgid "skip check for outstanding uncommitted changes"
6569 msgid "skip check for outstanding uncommitted changes"
6542 msgstr ""
6570 msgstr ""
6543
6571
6544 msgid "don't commit, just update the working directory"
6572 msgid "don't commit, just update the working directory"
6545 msgstr ""
6573 msgstr ""
6546
6574
6547 msgid "apply patch to the nodes from which it was generated"
6575 msgid "apply patch to the nodes from which it was generated"
6548 msgstr ""
6576 msgstr ""
6549
6577
6550 msgid "use any branch information in patch (implied by --exact)"
6578 msgid "use any branch information in patch (implied by --exact)"
6551 msgstr ""
6579 msgstr ""
6552
6580
6553 msgid "[OPTION]... PATCH..."
6581 msgid "[OPTION]... PATCH..."
6554 msgstr ""
6582 msgstr ""
6555
6583
6556 msgid "show newest record first"
6584 msgid "show newest record first"
6557 msgstr ""
6585 msgstr ""
6558
6586
6559 msgid "file to store the bundles into"
6587 msgid "file to store the bundles into"
6560 msgstr ""
6588 msgstr ""
6561
6589
6562 msgid "a specific revision up to which you would like to pull"
6590 msgid "a specific revision up to which you would like to pull"
6563 msgstr ""
6591 msgstr ""
6564
6592
6565 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6593 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
6566 msgstr ""
6594 msgstr ""
6567
6595
6568 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6596 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
6569 msgstr ""
6597 msgstr ""
6570
6598
6571 msgid "search the repository as it stood at REV"
6599 msgid "search the repository as it stood at REV"
6572 msgstr ""
6600 msgstr ""
6573
6601
6574 msgid "end filenames with NUL, for use with xargs"
6602 msgid "end filenames with NUL, for use with xargs"
6575 msgstr ""
6603 msgstr ""
6576
6604
6577 msgid "print complete paths from the filesystem root"
6605 msgid "print complete paths from the filesystem root"
6578 msgstr ""
6606 msgstr ""
6579
6607
6580 msgid "[OPTION]... [PATTERN]..."
6608 msgid "[OPTION]... [PATTERN]..."
6581 msgstr ""
6609 msgstr ""
6582
6610
6583 msgid "only follow the first parent of merge changesets"
6611 msgid "only follow the first parent of merge changesets"
6584 msgstr ""
6612 msgstr ""
6585
6613
6586 msgid "show revisions matching date spec"
6614 msgid "show revisions matching date spec"
6587 msgstr ""
6615 msgstr ""
6588
6616
6589 msgid "show copied files"
6617 msgid "show copied files"
6590 msgstr ""
6618 msgstr ""
6591
6619
6592 msgid "do case-insensitive search for a keyword"
6620 msgid "do case-insensitive search for a keyword"
6593 msgstr ""
6621 msgstr ""
6594
6622
6595 msgid "include revisions where files were removed"
6623 msgid "include revisions where files were removed"
6596 msgstr ""
6624 msgstr ""
6597
6625
6598 msgid "show only merges"
6626 msgid "show only merges"
6599 msgstr ""
6627 msgstr ""
6600
6628
6601 msgid "revisions committed by user"
6629 msgid "revisions committed by user"
6602 msgstr ""
6630 msgstr ""
6603
6631
6604 msgid "show only changesets within the given named branch"
6632 msgid "show only changesets within the given named branch"
6605 msgstr ""
6633 msgstr ""
6606
6634
6607 msgid "do not display revision or any of its ancestors"
6635 msgid "do not display revision or any of its ancestors"
6608 msgstr ""
6636 msgstr ""
6609
6637
6610 msgid "[OPTION]... [FILE]"
6638 msgid "[OPTION]... [FILE]"
6611 msgstr ""
6639 msgstr ""
6612
6640
6613 msgid "revision to display"
6641 msgid "revision to display"
6614 msgstr ""
6642 msgstr ""
6615
6643
6616 msgid "[-r REV]"
6644 msgid "[-r REV]"
6617 msgstr ""
6645 msgstr ""
6618
6646
6619 msgid "force a merge with outstanding changes"
6647 msgid "force a merge with outstanding changes"
6620 msgstr ""
6648 msgstr ""
6621
6649
6622 msgid "revision to merge"
6650 msgid "revision to merge"
6623 msgstr ""
6651 msgstr ""
6624
6652
6625 msgid "review revisions to merge (no merge is performed)"
6653 msgid "review revisions to merge (no merge is performed)"
6626 msgstr ""
6654 msgstr ""
6627
6655
6628 msgid "[-f] [[-r] REV]"
6656 msgid "[-f] [[-r] REV]"
6629 msgstr ""
6657 msgstr ""
6630
6658
6631 msgid "a specific revision up to which you would like to push"
6659 msgid "a specific revision up to which you would like to push"
6632 msgstr ""
6660 msgstr ""
6633
6661
6634 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6662 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
6635 msgstr ""
6663 msgstr ""
6636
6664
6637 msgid "show parents from the specified revision"
6665 msgid "show parents from the specified revision"
6638 msgstr ""
6666 msgstr ""
6639
6667
6640 msgid "[-r REV] [FILE]"
6668 msgid "[-r REV] [FILE]"
6641 msgstr ""
6669 msgstr ""
6642
6670
6643 msgid "[NAME]"
6671 msgid "[NAME]"
6644 msgstr ""
6672 msgstr ""
6645
6673
6646 msgid "update to new tip if changesets were pulled"
6674 msgid "update to new tip if changesets were pulled"
6647 msgstr ""
6675 msgstr ""
6648
6676
6649 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6677 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
6650 msgstr ""
6678 msgstr ""
6651
6679
6652 msgid "force push"
6680 msgid "force push"
6653 msgstr ""
6681 msgstr ""
6654
6682
6655 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6683 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
6656 msgstr ""
6684 msgstr ""
6657
6685
6658 msgid "record delete for missing files"
6686 msgid "record delete for missing files"
6659 msgstr ""
6687 msgstr ""
6660
6688
6661 msgid "remove (and delete) file even if added or modified"
6689 msgid "remove (and delete) file even if added or modified"
6662 msgstr ""
6690 msgstr ""
6663
6691
6664 msgid "record a rename that has already occurred"
6692 msgid "record a rename that has already occurred"
6665 msgstr ""
6693 msgstr ""
6666
6694
6667 msgid "[OPTION]... SOURCE... DEST"
6695 msgid "[OPTION]... SOURCE... DEST"
6668 msgstr ""
6696 msgstr ""
6669
6697
6670 msgid "remerge all unresolved files"
6698 msgid "remerge all unresolved files"
6671 msgstr ""
6699 msgstr ""
6672
6700
6673 msgid "list state of files needing merge"
6701 msgid "list state of files needing merge"
6674 msgstr ""
6702 msgstr ""
6675
6703
6676 msgid "mark files as resolved"
6704 msgid "mark files as resolved"
6677 msgstr ""
6705 msgstr ""
6678
6706
6679 msgid "unmark files as resolved"
6707 msgid "unmark files as resolved"
6680 msgstr ""
6708 msgstr ""
6681
6709
6682 msgid "revert all changes when no arguments given"
6710 msgid "revert all changes when no arguments given"
6683 msgstr ""
6711 msgstr ""
6684
6712
6685 msgid "tipmost revision matching date"
6713 msgid "tipmost revision matching date"
6686 msgstr ""
6714 msgstr ""
6687
6715
6688 msgid "revision to revert to"
6716 msgid "revision to revert to"
6689 msgstr ""
6717 msgstr ""
6690
6718
6691 msgid "do not save backup copies of files"
6719 msgid "do not save backup copies of files"
6692 msgstr ""
6720 msgstr ""
6693
6721
6694 msgid "[OPTION]... [-r REV] [NAME]..."
6722 msgid "[OPTION]... [-r REV] [NAME]..."
6695 msgstr ""
6723 msgstr ""
6696
6724
6697 msgid "name of access log file to write to"
6725 msgid "name of access log file to write to"
6698 msgstr ""
6726 msgstr ""
6699
6727
6700 msgid "name of error log file to write to"
6728 msgid "name of error log file to write to"
6701 msgstr ""
6729 msgstr ""
6702
6730
6703 msgid "port to listen on (default: 8000)"
6731 msgid "port to listen on (default: 8000)"
6704 msgstr ""
6732 msgstr ""
6705
6733
6706 msgid "address to listen on (default: all interfaces)"
6734 msgid "address to listen on (default: all interfaces)"
6707 msgstr ""
6735 msgstr ""
6708
6736
6709 msgid "prefix path to serve from (default: server root)"
6737 msgid "prefix path to serve from (default: server root)"
6710 msgstr ""
6738 msgstr ""
6711
6739
6712 msgid "name to show in web pages (default: working directory)"
6740 msgid "name to show in web pages (default: working directory)"
6713 msgstr ""
6741 msgstr ""
6714
6742
6715 msgid "name of the webdir config file (serve more than one repository)"
6743 msgid "name of the webdir config file (serve more than one repository)"
6716 msgstr ""
6744 msgstr ""
6717
6745
6718 msgid "for remote clients"
6746 msgid "for remote clients"
6719 msgstr ""
6747 msgstr ""
6720
6748
6721 msgid "web templates to use"
6749 msgid "web templates to use"
6722 msgstr ""
6750 msgstr ""
6723
6751
6724 msgid "template style to use"
6752 msgid "template style to use"
6725 msgstr ""
6753 msgstr ""
6726
6754
6727 msgid "use IPv6 in addition to IPv4"
6755 msgid "use IPv6 in addition to IPv4"
6728 msgstr ""
6756 msgstr ""
6729
6757
6730 msgid "SSL certificate file"
6758 msgid "SSL certificate file"
6731 msgstr ""
6759 msgstr ""
6732
6760
6733 msgid "show untrusted configuration options"
6761 msgid "show untrusted configuration options"
6734 msgstr ""
6762 msgstr ""
6735
6763
6736 msgid "[-u] [NAME]..."
6764 msgid "[-u] [NAME]..."
6737 msgstr ""
6765 msgstr ""
6738
6766
6739 msgid "show status of all files"
6767 msgid "show status of all files"
6740 msgstr ""
6768 msgstr ""
6741
6769
6742 msgid "show only modified files"
6770 msgid "show only modified files"
6743 msgstr ""
6771 msgstr ""
6744
6772
6745 msgid "show only added files"
6773 msgid "show only added files"
6746 msgstr ""
6774 msgstr ""
6747
6775
6748 msgid "show only removed files"
6776 msgid "show only removed files"
6749 msgstr ""
6777 msgstr ""
6750
6778
6751 msgid "show only deleted (but tracked) files"
6779 msgid "show only deleted (but tracked) files"
6752 msgstr ""
6780 msgstr ""
6753
6781
6754 msgid "show only files without changes"
6782 msgid "show only files without changes"
6755 msgstr ""
6783 msgstr ""
6756
6784
6757 msgid "show only unknown (not tracked) files"
6785 msgid "show only unknown (not tracked) files"
6758 msgstr ""
6786 msgstr ""
6759
6787
6760 msgid "show only ignored files"
6788 msgid "show only ignored files"
6761 msgstr ""
6789 msgstr ""
6762
6790
6763 msgid "hide status prefix"
6791 msgid "hide status prefix"
6764 msgstr ""
6792 msgstr ""
6765
6793
6766 msgid "show source of copied files"
6794 msgid "show source of copied files"
6767 msgstr ""
6795 msgstr ""
6768
6796
6769 msgid "show difference from revision"
6797 msgid "show difference from revision"
6770 msgstr ""
6798 msgstr ""
6771
6799
6772 msgid "replace existing tag"
6800 msgid "replace existing tag"
6773 msgstr ""
6801 msgstr ""
6774
6802
6775 msgid "make the tag local"
6803 msgid "make the tag local"
6776 msgstr ""
6804 msgstr ""
6777
6805
6778 msgid "revision to tag"
6806 msgid "revision to tag"
6779 msgstr ""
6807 msgstr ""
6780
6808
6781 msgid "remove a tag"
6809 msgid "remove a tag"
6782 msgstr ""
6810 msgstr ""
6783
6811
6784 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6812 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
6785 msgstr ""
6813 msgstr ""
6786
6814
6787 msgid "[-p]"
6815 msgid "[-p]"
6788 msgstr ""
6816 msgstr ""
6789
6817
6790 msgid "update to new tip if changesets were unbundled"
6818 msgid "update to new tip if changesets were unbundled"
6791 msgstr ""
6819 msgstr ""
6792
6820
6793 msgid "[-u] FILE..."
6821 msgid "[-u] FILE..."
6794 msgstr ""
6822 msgstr ""
6795
6823
6796 msgid "overwrite locally modified files (no backup)"
6824 msgid "overwrite locally modified files (no backup)"
6797 msgstr ""
6825 msgstr ""
6798
6826
6799 msgid "check for uncommitted changes"
6827 msgid "check for uncommitted changes"
6800 msgstr ""
6828 msgstr ""
6801
6829
6802 msgid "[-C] [-d DATE] [[-r] REV]"
6830 msgid "[-C] [-d DATE] [[-r] REV]"
6803 msgstr ""
6831 msgstr ""
6804
6832
6805 #, python-format
6833 #, python-format
6806 msgid "config error at %s:%d: '%s'"
6834 msgid "config error at %s:%d: '%s'"
6807 msgstr ""
6835 msgstr ""
6808
6836
6809 msgid "not found in manifest"
6837 msgid "not found in manifest"
6810 msgstr ""
6838 msgstr ""
6811
6839
6812 msgid "branch name not in UTF-8!"
6840 msgid "branch name not in UTF-8!"
6813 msgstr ""
6841 msgstr ""
6814
6842
6815 #, python-format
6843 #, python-format
6816 msgid " searching for copies back to rev %d\n"
6844 msgid " searching for copies back to rev %d\n"
6817 msgstr ""
6845 msgstr ""
6818
6846
6819 #, python-format
6847 #, python-format
6820 msgid ""
6848 msgid ""
6821 " unmatched files in local:\n"
6849 " unmatched files in local:\n"
6822 " %s\n"
6850 " %s\n"
6823 msgstr ""
6851 msgstr ""
6824
6852
6825 #, python-format
6853 #, python-format
6826 msgid ""
6854 msgid ""
6827 " unmatched files in other:\n"
6855 " unmatched files in other:\n"
6828 " %s\n"
6856 " %s\n"
6829 msgstr ""
6857 msgstr ""
6830
6858
6831 msgid " all copies found (* = to merge, ! = divergent):\n"
6859 msgid " all copies found (* = to merge, ! = divergent):\n"
6832 msgstr ""
6860 msgstr ""
6833
6861
6834 msgid " checking for directory renames\n"
6862 msgid " checking for directory renames\n"
6835 msgstr ""
6863 msgstr ""
6836
6864
6837 #, python-format
6865 #, python-format
6838 msgid " dir %s -> %s\n"
6866 msgid " dir %s -> %s\n"
6839 msgstr ""
6867 msgstr ""
6840
6868
6841 #, python-format
6869 #, python-format
6842 msgid " file %s -> %s\n"
6870 msgid " file %s -> %s\n"
6843 msgstr ""
6871 msgstr ""
6844
6872
6845 msgid "working directory state appears damaged!"
6873 msgid "working directory state appears damaged!"
6846 msgstr ""
6874 msgstr ""
6847
6875
6848 #, python-format
6876 #, python-format
6849 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6877 msgid "'\\n' and '\\r' disallowed in filenames: %r"
6850 msgstr ""
6878 msgstr ""
6851
6879
6852 #, python-format
6880 #, python-format
6853 msgid "directory %r already in dirstate"
6881 msgid "directory %r already in dirstate"
6854 msgstr ""
6882 msgstr ""
6855
6883
6856 #, python-format
6884 #, python-format
6857 msgid "file %r in dirstate clashes with %r"
6885 msgid "file %r in dirstate clashes with %r"
6858 msgstr ""
6886 msgstr ""
6859
6887
6860 #, python-format
6888 #, python-format
6861 msgid "not in dirstate: %s\n"
6889 msgid "not in dirstate: %s\n"
6862 msgstr ""
6890 msgstr ""
6863
6891
6864 msgid "unknown"
6892 msgid "unknown"
6865 msgstr ""
6893 msgstr ""
6866
6894
6867 msgid "character device"
6895 msgid "character device"
6868 msgstr ""
6896 msgstr ""
6869
6897
6870 msgid "block device"
6898 msgid "block device"
6871 msgstr ""
6899 msgstr ""
6872
6900
6873 msgid "fifo"
6901 msgid "fifo"
6874 msgstr ""
6902 msgstr ""
6875
6903
6876 msgid "socket"
6904 msgid "socket"
6877 msgstr ""
6905 msgstr ""
6878
6906
6879 msgid "directory"
6907 msgid "directory"
6880 msgstr ""
6908 msgstr ""
6881
6909
6882 #, python-format
6910 #, python-format
6883 msgid "unsupported file type (type is %s)"
6911 msgid "unsupported file type (type is %s)"
6884 msgstr ""
6912 msgstr ""
6885
6913
6886 #, python-format
6914 #, python-format
6887 msgid "abort: %s\n"
6915 msgid "abort: %s\n"
6888 msgstr ""
6916 msgstr ""
6889
6917
6890 #, python-format
6918 #, python-format
6891 msgid ""
6919 msgid ""
6892 "hg: command '%s' is ambiguous:\n"
6920 "hg: command '%s' is ambiguous:\n"
6893 " %s\n"
6921 " %s\n"
6894 msgstr ""
6922 msgstr ""
6895
6923
6896 #, python-format
6924 #, python-format
6897 msgid "hg: %s\n"
6925 msgid "hg: %s\n"
6898 msgstr ""
6926 msgstr ""
6899
6927
6900 #, python-format
6928 #, python-format
6901 msgid "timed out waiting for lock held by %s"
6929 msgid "timed out waiting for lock held by %s"
6902 msgstr ""
6930 msgstr ""
6903
6931
6904 #, python-format
6932 #, python-format
6905 msgid "lock held by %s"
6933 msgid "lock held by %s"
6906 msgstr ""
6934 msgstr ""
6907
6935
6908 #, python-format
6936 #, python-format
6909 msgid "abort: %s: %s\n"
6937 msgid "abort: %s: %s\n"
6910 msgstr ""
6938 msgstr ""
6911
6939
6912 #, python-format
6940 #, python-format
6913 msgid "abort: could not lock %s: %s\n"
6941 msgid "abort: could not lock %s: %s\n"
6914 msgstr ""
6942 msgstr ""
6915
6943
6916 #, python-format
6944 #, python-format
6917 msgid "hg %s: %s\n"
6945 msgid "hg %s: %s\n"
6918 msgstr ""
6946 msgstr ""
6919
6947
6920 #, python-format
6948 #, python-format
6921 msgid "abort: %s!\n"
6949 msgid "abort: %s!\n"
6922 msgstr ""
6950 msgstr ""
6923
6951
6924 #, python-format
6952 #, python-format
6925 msgid "abort: %s"
6953 msgid "abort: %s"
6926 msgstr ""
6954 msgstr ""
6927
6955
6928 msgid " empty string\n"
6956 msgid " empty string\n"
6929 msgstr ""
6957 msgstr ""
6930
6958
6931 msgid "killed!\n"
6959 msgid "killed!\n"
6932 msgstr ""
6960 msgstr ""
6933
6961
6934 #, python-format
6962 #, python-format
6935 msgid "hg: unknown command '%s'\n"
6963 msgid "hg: unknown command '%s'\n"
6936 msgstr ""
6964 msgstr ""
6937
6965
6938 #, python-format
6966 #, python-format
6939 msgid "abort: could not import module %s!\n"
6967 msgid "abort: could not import module %s!\n"
6940 msgstr ""
6968 msgstr ""
6941
6969
6942 msgid "(did you forget to compile extensions?)\n"
6970 msgid "(did you forget to compile extensions?)\n"
6943 msgstr ""
6971 msgstr ""
6944
6972
6945 msgid "(is your Python install correct?)\n"
6973 msgid "(is your Python install correct?)\n"
6946 msgstr ""
6974 msgstr ""
6947
6975
6948 #, python-format
6976 #, python-format
6949 msgid "abort: error: %s\n"
6977 msgid "abort: error: %s\n"
6950 msgstr ""
6978 msgstr ""
6951
6979
6952 msgid "broken pipe\n"
6980 msgid "broken pipe\n"
6953 msgstr ""
6981 msgstr ""
6954
6982
6955 msgid "interrupted!\n"
6983 msgid "interrupted!\n"
6956 msgstr ""
6984 msgstr ""
6957
6985
6958 msgid ""
6986 msgid ""
6959 "\n"
6987 "\n"
6960 "broken pipe\n"
6988 "broken pipe\n"
6961 msgstr ""
6989 msgstr ""
6962
6990
6963 msgid "abort: out of memory\n"
6991 msgid "abort: out of memory\n"
6964 msgstr ""
6992 msgstr ""
6965
6993
6966 msgid "** unknown exception encountered, details follow\n"
6994 msgid "** unknown exception encountered, details follow\n"
6967 msgstr ""
6995 msgstr ""
6968
6996
6969 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
6997 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
6970 msgstr ""
6998 msgstr ""
6971
6999
6972 msgid "** or mercurial@selenic.com\n"
7000 msgid "** or mercurial@selenic.com\n"
6973 msgstr ""
7001 msgstr ""
6974
7002
6975 #, python-format
7003 #, python-format
6976 msgid "** Mercurial Distributed SCM (version %s)\n"
7004 msgid "** Mercurial Distributed SCM (version %s)\n"
6977 msgstr ""
7005 msgstr ""
6978
7006
6979 #, python-format
7007 #, python-format
6980 msgid "** Extensions loaded: %s\n"
7008 msgid "** Extensions loaded: %s\n"
6981 msgstr ""
7009 msgstr ""
6982
7010
6983 #, python-format
7011 #, python-format
6984 msgid "no definition for alias '%s'\n"
7012 msgid "no definition for alias '%s'\n"
6985 msgstr ""
7013 msgstr ""
6986
7014
6987 #, python-format
7015 #, python-format
6988 msgid "alias '%s' resolves to unknown command '%s'\n"
7016 msgid "alias '%s' resolves to unknown command '%s'\n"
6989 msgstr ""
7017 msgstr ""
6990
7018
6991 #, python-format
7019 #, python-format
6992 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7020 msgid "alias '%s' resolves to ambiguous command '%s'\n"
6993 msgstr ""
7021 msgstr ""
6994
7022
6995 #, python-format
7023 #, python-format
6996 msgid "alias '%s' shadows command\n"
7024 msgid "alias '%s' shadows command\n"
6997 msgstr ""
7025 msgstr ""
6998
7026
6999 #, python-format
7027 #, python-format
7000 msgid "malformed --config option: %s"
7028 msgid "malformed --config option: %s"
7001 msgstr ""
7029 msgstr ""
7002
7030
7003 #, python-format
7031 #, python-format
7004 msgid "extension '%s' overrides commands: %s\n"
7032 msgid "extension '%s' overrides commands: %s\n"
7005 msgstr ""
7033 msgstr ""
7006
7034
7007 msgid "Option --config may not be abbreviated!"
7035 msgid "Option --config may not be abbreviated!"
7008 msgstr ""
7036 msgstr ""
7009
7037
7010 msgid "Option --cwd may not be abbreviated!"
7038 msgid "Option --cwd may not be abbreviated!"
7011 msgstr ""
7039 msgstr ""
7012
7040
7013 msgid ""
7041 msgid ""
7014 "Option -R has to be separated from other options (e.g. not -qR) and --"
7042 "Option -R has to be separated from other options (e.g. not -qR) and --"
7015 "repository may only be abbreviated as --repo!"
7043 "repository may only be abbreviated as --repo!"
7016 msgstr ""
7044 msgstr ""
7017
7045
7018 #, python-format
7046 #, python-format
7019 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7047 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7020 msgstr ""
7048 msgstr ""
7021
7049
7022 #, python-format
7050 #, python-format
7023 msgid "repository '%s' is not local"
7051 msgid "repository '%s' is not local"
7024 msgstr ""
7052 msgstr ""
7025
7053
7026 msgid "invalid arguments"
7054 msgid "invalid arguments"
7027 msgstr ""
7055 msgstr ""
7028
7056
7029 #, python-format
7057 #, python-format
7030 msgid "unrecognized profiling format '%s' - Ignored\n"
7058 msgid "unrecognized profiling format '%s' - Ignored\n"
7031 msgstr ""
7059 msgstr ""
7032
7060
7033 msgid ""
7061 msgid ""
7034 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7062 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7035 "misc/lsprof/"
7063 "misc/lsprof/"
7036 msgstr ""
7064 msgstr ""
7037
7065
7038 #, python-format
7066 #, python-format
7039 msgid "*** failed to import extension %s from %s: %s\n"
7067 msgid "*** failed to import extension %s from %s: %s\n"
7040 msgstr ""
7068 msgstr ""
7041
7069
7042 #, python-format
7070 #, python-format
7043 msgid "*** failed to import extension %s: %s\n"
7071 msgid "*** failed to import extension %s: %s\n"
7044 msgstr ""
7072 msgstr ""
7045
7073
7046 #, python-format
7074 #, python-format
7047 msgid "couldn't find merge tool %s\n"
7075 msgid "couldn't find merge tool %s\n"
7048 msgstr ""
7076 msgstr ""
7049
7077
7050 #, python-format
7078 #, python-format
7051 msgid "tool %s can't handle symlinks\n"
7079 msgid "tool %s can't handle symlinks\n"
7052 msgstr ""
7080 msgstr ""
7053
7081
7054 #, python-format
7082 #, python-format
7055 msgid "tool %s can't handle binary\n"
7083 msgid "tool %s can't handle binary\n"
7056 msgstr ""
7084 msgstr ""
7057
7085
7058 #, python-format
7086 #, python-format
7059 msgid "tool %s requires a GUI\n"
7087 msgid "tool %s requires a GUI\n"
7060 msgstr ""
7088 msgstr ""
7061
7089
7062 #, python-format
7090 #, python-format
7063 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7091 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7064 msgstr ""
7092 msgstr ""
7065
7093
7066 #, python-format
7094 #, python-format
7067 msgid ""
7095 msgid ""
7068 " no tool found to merge %s\n"
7096 " no tool found to merge %s\n"
7069 "keep (l)ocal or take (o)ther?"
7097 "keep (l)ocal or take (o)ther?"
7070 msgstr ""
7098 msgstr ""
7071
7099
7072 msgid "&Local"
7100 msgid "&Local"
7073 msgstr ""
7101 msgstr ""
7074
7102
7075 msgid "&Other"
7103 msgid "&Other"
7076 msgstr ""
7104 msgstr ""
7077
7105
7078 msgid "l"
7106 msgid "l"
7079 msgstr ""
7107 msgstr ""
7080
7108
7081 #, python-format
7109 #, python-format
7082 msgid "merging %s and %s to %s\n"
7110 msgid "merging %s and %s to %s\n"
7083 msgstr ""
7111 msgstr ""
7084
7112
7085 #, python-format
7113 #, python-format
7086 msgid "merging %s\n"
7114 msgid "merging %s\n"
7087 msgstr ""
7115 msgstr ""
7088
7116
7089 #, python-format
7117 #, python-format
7090 msgid "my %s other %s ancestor %s\n"
7118 msgid "my %s other %s ancestor %s\n"
7091 msgstr ""
7119 msgstr ""
7092
7120
7093 msgid " premerge successful\n"
7121 msgid " premerge successful\n"
7094 msgstr ""
7122 msgstr ""
7095
7123
7096 #, python-format
7124 #, python-format
7097 msgid ""
7125 msgid ""
7098 " output file %s appears unchanged\n"
7126 " output file %s appears unchanged\n"
7099 "was merge successful (yn)?"
7127 "was merge successful (yn)?"
7100 msgstr ""
7128 msgstr ""
7101
7129
7102 msgid "&No"
7130 msgid "&No"
7103 msgstr ""
7131 msgstr ""
7104
7132
7105 msgid "&Yes"
7133 msgid "&Yes"
7106 msgstr ""
7134 msgstr ""
7107
7135
7108 msgid "n"
7136 msgid "n"
7109 msgstr ""
7137 msgstr ""
7110
7138
7111 #, python-format
7139 #, python-format
7112 msgid "merging %s failed!\n"
7140 msgid "merging %s failed!\n"
7113 msgstr ""
7141 msgstr ""
7114
7142
7115 #, python-format
7143 #, python-format
7116 msgid "Inconsistent state, %s:%s is good and bad"
7144 msgid "Inconsistent state, %s:%s is good and bad"
7117 msgstr ""
7145 msgstr ""
7118
7146
7119 #, python-format
7147 #, python-format
7120 msgid "unknown bisect kind %s"
7148 msgid "unknown bisect kind %s"
7121 msgstr ""
7149 msgstr ""
7122
7150
7123 msgid ""
7151 msgid ""
7124 "\n"
7152 "\n"
7125 " Mercurial has the ability to add new features through the use of\n"
7153 " Mercurial has the ability to add new features through the use of\n"
7126 " extensions. Extensions may add new commands, add options to\n"
7154 " extensions. Extensions may add new commands, add options to\n"
7127 " existing commands, change the default behavior of commands, or\n"
7155 " existing commands, change the default behavior of commands, or\n"
7128 " implement hooks.\n"
7156 " implement hooks.\n"
7129 "\n"
7157 "\n"
7130 " Extensions are not loaded by default for a variety of reasons:\n"
7158 " Extensions are not loaded by default for a variety of reasons:\n"
7131 " they can increase startup overhead; they may be meant for\n"
7159 " they can increase startup overhead; they may be meant for\n"
7132 " advanced usage only; they may provide potentially dangerous\n"
7160 " advanced usage only; they may provide potentially dangerous\n"
7133 " abilities (such as letting you destroy or modify history); they\n"
7161 " abilities (such as letting you destroy or modify history); they\n"
7134 " might not be ready for prime time; or they may alter some\n"
7162 " might not be ready for prime time; or they may alter some\n"
7135 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7163 " usual behaviors of stock Mercurial. It is thus up to the user to\n"
7136 " activate extensions as needed.\n"
7164 " activate extensions as needed.\n"
7137 "\n"
7165 "\n"
7138 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7166 " To enable the \"foo\" extension, either shipped with Mercurial\n"
7139 " or in the Python search path, create an entry for it in your\n"
7167 " or in the Python search path, create an entry for it in your\n"
7140 " hgrc, like this:\n"
7168 " hgrc, like this:\n"
7141 "\n"
7169 "\n"
7142 " [extensions]\n"
7170 " [extensions]\n"
7143 " foo =\n"
7171 " foo =\n"
7144 "\n"
7172 "\n"
7145 " You may also specify the full path to an extension:\n"
7173 " You may also specify the full path to an extension:\n"
7146 "\n"
7174 "\n"
7147 " [extensions]\n"
7175 " [extensions]\n"
7148 " myfeature = ~/.hgext/myfeature.py\n"
7176 " myfeature = ~/.hgext/myfeature.py\n"
7149 "\n"
7177 "\n"
7150 " To explicitly disable an extension enabled in an hgrc of broader\n"
7178 " To explicitly disable an extension enabled in an hgrc of broader\n"
7151 " scope, prepend its path with !:\n"
7179 " scope, prepend its path with !:\n"
7152 "\n"
7180 "\n"
7153 " [extensions]\n"
7181 " [extensions]\n"
7154 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7182 " # disabling extension bar residing in /path/to/extension/bar.py\n"
7155 " hgext.bar = !/path/to/extension/bar.py\n"
7183 " hgext.bar = !/path/to/extension/bar.py\n"
7156 " # ditto, but no path was supplied for extension baz\n"
7184 " # ditto, but no path was supplied for extension baz\n"
7157 " hgext.baz = !\n"
7185 " hgext.baz = !\n"
7158 " "
7186 " "
7159 msgstr ""
7187 msgstr ""
7160 "\n"
7188 "\n"
7161 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7189 " Mercurial a la capacité de s'enrichir de nouvelles\n"
7162 " fonctionnalités par le biais d'extensions. Les extensions\n"
7190 " fonctionnalités par le biais d'extensions. Les extensions\n"
7163 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7191 " permettent d'ajouter des nouvelles commandes, de changer le\n"
7164 " comportement de commandes existantes ou leur ajouter des\n"
7192 " comportement de commandes existantes ou leur ajouter des\n"
7165 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7193 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
7166 "\n"
7194 "\n"
7167 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7195 " Les extensions ne sont pas chargées automatiquement par défaut\n"
7168 " pour diverses raisons : elles peuvent accroître la latence\n"
7196 " pour diverses raisons : elles peuvent accroître la latence\n"
7169 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7197 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
7170 " une utilisation avancée ; elle peuvent fournir des\n"
7198 " une utilisation avancée ; elle peuvent fournir des\n"
7171 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7199 " fonctionnalités potentiellement dangereuses, comme de vous\n"
7172 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7200 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
7173 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7201 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
7174 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7202 " grand nombre ; ou encore elles peuvent modifier certains des\n"
7175 " comportements habituels de Mercurial.\n"
7203 " comportements habituels de Mercurial.\n"
7176 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7204 " Il appartient donc à l'utilisateur de les activer en fonction\n"
7177 " de ses besoins.\n"
7205 " de ses besoins.\n"
7178 "\n"
7206 "\n"
7179 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7207 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
7180 " présente dans le chemin de recherche de Python, déclarez-la\n"
7208 " présente dans le chemin de recherche de Python, déclarez-la\n"
7181 " dans votre fichier de configuration hgrc comme suit :\n"
7209 " dans votre fichier de configuration hgrc comme suit :\n"
7182 "\n"
7210 "\n"
7183 " [extensions]\n"
7211 " [extensions]\n"
7184 " truc =\n"
7212 " truc =\n"
7185 "\n"
7213 "\n"
7186 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7214 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
7187 "\n"
7215 "\n"
7188 " [extensions]\n"
7216 " [extensions]\n"
7189 " monbidule = ~/.hgext/monbidule.py\n"
7217 " monbidule = ~/.hgext/monbidule.py\n"
7190 "\n"
7218 "\n"
7191 " Pour forcer la désactivation d'une extension activée par un\n"
7219 " Pour forcer la désactivation d'une extension activée par un\n"
7192 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7220 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
7193 "\n"
7221 "\n"
7194 " [extensions]\n"
7222 " [extensions]\n"
7195 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7223 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
7196 " hgext.bar = !/vers/machin.py\n"
7224 " hgext.bar = !/vers/machin.py\n"
7197 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7225 " # idem, mais aucun chemin n'avait été donné pour chose \n"
7198 " hgext.chose = !\n"
7226 " hgext.chose = !\n"
7199 " "
7227 " "
7200
7228
7201 msgid "disabled extensions:"
7229 msgid "disabled extensions:"
7202 msgstr "extensions désactivées :"
7230 msgstr "extensions désactivées :"
7203
7231
7204 msgid "Date Formats"
7232 msgid "Date Formats"
7205 msgstr ""
7233 msgstr ""
7206
7234
7207 msgid ""
7235 msgid ""
7208 "\n"
7236 "\n"
7209 " Some commands allow the user to specify a date, e.g.:\n"
7237 " Some commands allow the user to specify a date, e.g.:\n"
7210 " * backout, commit, import, tag: Specify the commit date.\n"
7238 " * backout, commit, import, tag: Specify the commit date.\n"
7211 " * log, revert, update: Select revision(s) by date.\n"
7239 " * log, revert, update: Select revision(s) by date.\n"
7212 "\n"
7240 "\n"
7213 " Many date formats are valid. Here are some examples:\n"
7241 " Many date formats are valid. Here are some examples:\n"
7214 "\n"
7242 "\n"
7215 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7243 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7216 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7244 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7217 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7245 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7218 " \"Dec 6\" (midnight)\n"
7246 " \"Dec 6\" (midnight)\n"
7219 " \"13:18\" (today assumed)\n"
7247 " \"13:18\" (today assumed)\n"
7220 " \"3:39\" (3:39AM assumed)\n"
7248 " \"3:39\" (3:39AM assumed)\n"
7221 " \"3:39pm\" (15:39)\n"
7249 " \"3:39pm\" (15:39)\n"
7222 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7250 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7223 " \"2006-12-6 13:18\"\n"
7251 " \"2006-12-6 13:18\"\n"
7224 " \"2006-12-6\"\n"
7252 " \"2006-12-6\"\n"
7225 " \"12-6\"\n"
7253 " \"12-6\"\n"
7226 " \"12/6\"\n"
7254 " \"12/6\"\n"
7227 " \"12/6/6\" (Dec 6 2006)\n"
7255 " \"12/6/6\" (Dec 6 2006)\n"
7228 "\n"
7256 "\n"
7229 " Lastly, there is Mercurial's internal format:\n"
7257 " Lastly, there is Mercurial's internal format:\n"
7230 "\n"
7258 "\n"
7231 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7259 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7232 "\n"
7260 "\n"
7233 " This is the internal representation format for dates. unixtime is\n"
7261 " This is the internal representation format for dates. unixtime is\n"
7234 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7262 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
7235 " offset is the offset of the local timezone, in seconds west of UTC\n"
7263 " offset is the offset of the local timezone, in seconds west of UTC\n"
7236 " (negative if the timezone is east of UTC).\n"
7264 " (negative if the timezone is east of UTC).\n"
7237 "\n"
7265 "\n"
7238 " The log command also accepts date ranges:\n"
7266 " The log command also accepts date ranges:\n"
7239 "\n"
7267 "\n"
7240 " \"<{datetime}\" - at or before a given date/time\n"
7268 " \"<{datetime}\" - at or before a given date/time\n"
7241 " \">{datetime}\" - on or after a given date/time\n"
7269 " \">{datetime}\" - on or after a given date/time\n"
7242 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7270 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7243 " \"-{days}\" - within a given number of days of today\n"
7271 " \"-{days}\" - within a given number of days of today\n"
7244 " "
7272 " "
7245 msgstr ""
7273 msgstr ""
7246
7274
7247 msgid "File Name Patterns"
7275 msgid "File Name Patterns"
7248 msgstr ""
7276 msgstr ""
7249
7277
7250 msgid ""
7278 msgid ""
7251 "\n"
7279 "\n"
7252 " Mercurial accepts several notations for identifying one or more\n"
7280 " Mercurial accepts several notations for identifying one or more\n"
7253 " files at a time.\n"
7281 " files at a time.\n"
7254 "\n"
7282 "\n"
7255 " By default, Mercurial treats filenames as shell-style extended\n"
7283 " By default, Mercurial treats filenames as shell-style extended\n"
7256 " glob patterns.\n"
7284 " glob patterns.\n"
7257 "\n"
7285 "\n"
7258 " Alternate pattern notations must be specified explicitly.\n"
7286 " Alternate pattern notations must be specified explicitly.\n"
7259 "\n"
7287 "\n"
7260 " To use a plain path name without any pattern matching, start it\n"
7288 " To use a plain path name without any pattern matching, start it\n"
7261 " with \"path:\". These path names must completely match starting at\n"
7289 " with \"path:\". These path names must completely match starting at\n"
7262 " the current repository root.\n"
7290 " the current repository root.\n"
7263 "\n"
7291 "\n"
7264 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7292 " To use an extended glob, start a name with \"glob:\". Globs are\n"
7265 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7293 " rooted at the current directory; a glob such as \"*.c\" will only\n"
7266 " match files in the current directory ending with \".c\".\n"
7294 " match files in the current directory ending with \".c\".\n"
7267 "\n"
7295 "\n"
7268 " The supported glob syntax extensions are \"**\" to match any string\n"
7296 " The supported glob syntax extensions are \"**\" to match any string\n"
7269 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7297 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
7270 "\n"
7298 "\n"
7271 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7299 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
7272 " Regexp pattern matching is anchored at the root of the repository.\n"
7300 " Regexp pattern matching is anchored at the root of the repository.\n"
7273 "\n"
7301 "\n"
7274 " Plain examples:\n"
7302 " Plain examples:\n"
7275 "\n"
7303 "\n"
7276 " path:foo/bar a name bar in a directory named foo in the root of\n"
7304 " path:foo/bar a name bar in a directory named foo in the root of\n"
7277 " the repository\n"
7305 " the repository\n"
7278 " path:path:name a file or directory named \"path:name\"\n"
7306 " path:path:name a file or directory named \"path:name\"\n"
7279 "\n"
7307 "\n"
7280 " Glob examples:\n"
7308 " Glob examples:\n"
7281 "\n"
7309 "\n"
7282 " glob:*.c any name ending in \".c\" in the current directory\n"
7310 " glob:*.c any name ending in \".c\" in the current directory\n"
7283 " *.c any name ending in \".c\" in the current directory\n"
7311 " *.c any name ending in \".c\" in the current directory\n"
7284 " **.c any name ending in \".c\" in any subdirectory of the\n"
7312 " **.c any name ending in \".c\" in any subdirectory of the\n"
7285 " current directory including itself.\n"
7313 " current directory including itself.\n"
7286 " foo/*.c any name ending in \".c\" in the directory foo\n"
7314 " foo/*.c any name ending in \".c\" in the directory foo\n"
7287 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7315 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
7288 " including itself.\n"
7316 " including itself.\n"
7289 "\n"
7317 "\n"
7290 " Regexp examples:\n"
7318 " Regexp examples:\n"
7291 "\n"
7319 "\n"
7292 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7320 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
7293 "\n"
7321 "\n"
7294 " "
7322 " "
7295 msgstr ""
7323 msgstr ""
7296
7324
7297 msgid "Environment Variables"
7325 msgid "Environment Variables"
7298 msgstr ""
7326 msgstr ""
7299
7327
7300 msgid ""
7328 msgid ""
7301 "\n"
7329 "\n"
7302 "HG::\n"
7330 "HG::\n"
7303 " Path to the 'hg' executable, automatically passed when running\n"
7331 " Path to the 'hg' executable, automatically passed when running\n"
7304 " hooks, extensions or external tools. If unset or empty, this is\n"
7332 " hooks, extensions or external tools. If unset or empty, this is\n"
7305 " the hg executable's name if it's frozen, or an executable named\n"
7333 " the hg executable's name if it's frozen, or an executable named\n"
7306 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7334 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
7307 " Windows) is searched.\n"
7335 " Windows) is searched.\n"
7308 "\n"
7336 "\n"
7309 "HGEDITOR::\n"
7337 "HGEDITOR::\n"
7310 " This is the name of the editor to run when committing. See EDITOR.\n"
7338 " This is the name of the editor to run when committing. See EDITOR.\n"
7311 "\n"
7339 "\n"
7312 " (deprecated, use .hgrc)\n"
7340 " (deprecated, use .hgrc)\n"
7313 "\n"
7341 "\n"
7314 "HGENCODING::\n"
7342 "HGENCODING::\n"
7315 " This overrides the default locale setting detected by Mercurial.\n"
7343 " This overrides the default locale setting detected by Mercurial.\n"
7316 " This setting is used to convert data including usernames,\n"
7344 " This setting is used to convert data including usernames,\n"
7317 " changeset descriptions, tag names, and branches. This setting can\n"
7345 " changeset descriptions, tag names, and branches. This setting can\n"
7318 " be overridden with the --encoding command-line option.\n"
7346 " be overridden with the --encoding command-line option.\n"
7319 "\n"
7347 "\n"
7320 "HGENCODINGMODE::\n"
7348 "HGENCODINGMODE::\n"
7321 " This sets Mercurial's behavior for handling unknown characters\n"
7349 " This sets Mercurial's behavior for handling unknown characters\n"
7322 " while transcoding user input. The default is \"strict\", which\n"
7350 " while transcoding user input. The default is \"strict\", which\n"
7323 " causes Mercurial to abort if it can't map a character. Other\n"
7351 " causes Mercurial to abort if it can't map a character. Other\n"
7324 " settings include \"replace\", which replaces unknown characters, and\n"
7352 " settings include \"replace\", which replaces unknown characters, and\n"
7325 " \"ignore\", which drops them. This setting can be overridden with\n"
7353 " \"ignore\", which drops them. This setting can be overridden with\n"
7326 " the --encodingmode command-line option.\n"
7354 " the --encodingmode command-line option.\n"
7327 "\n"
7355 "\n"
7328 "HGMERGE::\n"
7356 "HGMERGE::\n"
7329 " An executable to use for resolving merge conflicts. The program\n"
7357 " An executable to use for resolving merge conflicts. The program\n"
7330 " will be executed with three arguments: local file, remote file,\n"
7358 " will be executed with three arguments: local file, remote file,\n"
7331 " ancestor file.\n"
7359 " ancestor file.\n"
7332 "\n"
7360 "\n"
7333 " (deprecated, use .hgrc)\n"
7361 " (deprecated, use .hgrc)\n"
7334 "\n"
7362 "\n"
7335 "HGRCPATH::\n"
7363 "HGRCPATH::\n"
7336 " A list of files or directories to search for hgrc files. Item\n"
7364 " A list of files or directories to search for hgrc files. Item\n"
7337 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7365 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
7338 " platform default search path is used. If empty, only the .hg/hgrc\n"
7366 " platform default search path is used. If empty, only the .hg/hgrc\n"
7339 " from the current repository is read.\n"
7367 " from the current repository is read.\n"
7340 "\n"
7368 "\n"
7341 " For each element in HGRCPATH:\n"
7369 " For each element in HGRCPATH:\n"
7342 " * if it's a directory, all files ending with .rc are added\n"
7370 " * if it's a directory, all files ending with .rc are added\n"
7343 " * otherwise, the file itself will be added\n"
7371 " * otherwise, the file itself will be added\n"
7344 "\n"
7372 "\n"
7345 "HGUSER::\n"
7373 "HGUSER::\n"
7346 " This is the string used as the author of a commit. If not set,\n"
7374 " This is the string used as the author of a commit. If not set,\n"
7347 " available values will be considered in this order:\n"
7375 " available values will be considered in this order:\n"
7348 "\n"
7376 "\n"
7349 " * HGUSER (deprecated)\n"
7377 " * HGUSER (deprecated)\n"
7350 " * hgrc files from the HGRCPATH\n"
7378 " * hgrc files from the HGRCPATH\n"
7351 " * EMAIL\n"
7379 " * EMAIL\n"
7352 " * interactive prompt\n"
7380 " * interactive prompt\n"
7353 " * LOGNAME (with '@hostname' appended)\n"
7381 " * LOGNAME (with '@hostname' appended)\n"
7354 "\n"
7382 "\n"
7355 " (deprecated, use .hgrc)\n"
7383 " (deprecated, use .hgrc)\n"
7356 "\n"
7384 "\n"
7357 "EMAIL::\n"
7385 "EMAIL::\n"
7358 " May be used as the author of a commit; see HGUSER.\n"
7386 " May be used as the author of a commit; see HGUSER.\n"
7359 "\n"
7387 "\n"
7360 "LOGNAME::\n"
7388 "LOGNAME::\n"
7361 " May be used as the author of a commit; see HGUSER.\n"
7389 " May be used as the author of a commit; see HGUSER.\n"
7362 "\n"
7390 "\n"
7363 "VISUAL::\n"
7391 "VISUAL::\n"
7364 " This is the name of the editor to use when committing. See EDITOR.\n"
7392 " This is the name of the editor to use when committing. See EDITOR.\n"
7365 "\n"
7393 "\n"
7366 "EDITOR::\n"
7394 "EDITOR::\n"
7367 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7395 " Sometimes Mercurial needs to open a text file in an editor for a\n"
7368 " user to modify, for example when writing commit messages. The\n"
7396 " user to modify, for example when writing commit messages. The\n"
7369 " editor it uses is determined by looking at the environment\n"
7397 " editor it uses is determined by looking at the environment\n"
7370 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7398 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
7371 " non-empty one is chosen. If all of them are empty, the editor\n"
7399 " non-empty one is chosen. If all of them are empty, the editor\n"
7372 " defaults to 'vi'.\n"
7400 " defaults to 'vi'.\n"
7373 "\n"
7401 "\n"
7374 "PYTHONPATH::\n"
7402 "PYTHONPATH::\n"
7375 " This is used by Python to find imported modules and may need to be\n"
7403 " This is used by Python to find imported modules and may need to be\n"
7376 " set appropriately if this Mercurial is not installed system-wide.\n"
7404 " set appropriately if this Mercurial is not installed system-wide.\n"
7377 " "
7405 " "
7378 msgstr ""
7406 msgstr ""
7379
7407
7380 msgid "Specifying Single Revisions"
7408 msgid "Specifying Single Revisions"
7381 msgstr ""
7409 msgstr ""
7382
7410
7383 msgid ""
7411 msgid ""
7384 "\n"
7412 "\n"
7385 " Mercurial supports several ways to specify individual revisions.\n"
7413 " Mercurial supports several ways to specify individual revisions.\n"
7386 "\n"
7414 "\n"
7387 " A plain integer is treated as a revision number. Negative integers\n"
7415 " A plain integer is treated as a revision number. Negative integers\n"
7388 " are treated as topological offsets from the tip, with -1 denoting\n"
7416 " are treated as topological offsets from the tip, with -1 denoting\n"
7389 " the tip. As such, negative numbers are only useful if you've\n"
7417 " the tip. As such, negative numbers are only useful if you've\n"
7390 " memorized your local tree numbers and want to save typing a single\n"
7418 " memorized your local tree numbers and want to save typing a single\n"
7391 " digit. This editor suggests copy and paste.\n"
7419 " digit. This editor suggests copy and paste.\n"
7392 "\n"
7420 "\n"
7393 " A 40-digit hexadecimal string is treated as a unique revision\n"
7421 " A 40-digit hexadecimal string is treated as a unique revision\n"
7394 " identifier.\n"
7422 " identifier.\n"
7395 "\n"
7423 "\n"
7396 " A hexadecimal string less than 40 characters long is treated as a\n"
7424 " A hexadecimal string less than 40 characters long is treated as a\n"
7397 " unique revision identifier, and referred to as a short-form\n"
7425 " unique revision identifier, and referred to as a short-form\n"
7398 " identifier. A short-form identifier is only valid if it is the\n"
7426 " identifier. A short-form identifier is only valid if it is the\n"
7399 " prefix of exactly one full-length identifier.\n"
7427 " prefix of exactly one full-length identifier.\n"
7400 "\n"
7428 "\n"
7401 " Any other string is treated as a tag name, which is a symbolic\n"
7429 " Any other string is treated as a tag name, which is a symbolic\n"
7402 " name associated with a revision identifier. Tag names may not\n"
7430 " name associated with a revision identifier. Tag names may not\n"
7403 " contain the \":\" character.\n"
7431 " contain the \":\" character.\n"
7404 "\n"
7432 "\n"
7405 " The reserved name \"tip\" is a special tag that always identifies\n"
7433 " The reserved name \"tip\" is a special tag that always identifies\n"
7406 " the most recent revision.\n"
7434 " the most recent revision.\n"
7407 "\n"
7435 "\n"
7408 " The reserved name \"null\" indicates the null revision. This is the\n"
7436 " The reserved name \"null\" indicates the null revision. This is the\n"
7409 " revision of an empty repository, and the parent of revision 0.\n"
7437 " revision of an empty repository, and the parent of revision 0.\n"
7410 "\n"
7438 "\n"
7411 " The reserved name \".\" indicates the working directory parent. If\n"
7439 " The reserved name \".\" indicates the working directory parent. If\n"
7412 " no working directory is checked out, it is equivalent to null. If\n"
7440 " no working directory is checked out, it is equivalent to null. If\n"
7413 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7441 " an uncommitted merge is in progress, \".\" is the revision of the\n"
7414 " first parent.\n"
7442 " first parent.\n"
7415 " "
7443 " "
7416 msgstr ""
7444 msgstr ""
7417
7445
7418 msgid "Specifying Multiple Revisions"
7446 msgid "Specifying Multiple Revisions"
7419 msgstr ""
7447 msgstr ""
7420
7448
7421 msgid ""
7449 msgid ""
7422 "\n"
7450 "\n"
7423 " When Mercurial accepts more than one revision, they may be\n"
7451 " When Mercurial accepts more than one revision, they may be\n"
7424 " specified individually, or provided as a topologically continuous\n"
7452 " specified individually, or provided as a topologically continuous\n"
7425 " range, separated by the \":\" character.\n"
7453 " range, separated by the \":\" character.\n"
7426 "\n"
7454 "\n"
7427 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7455 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
7428 " are revision identifiers. Both BEGIN and END are optional. If\n"
7456 " are revision identifiers. Both BEGIN and END are optional. If\n"
7429 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7457 " BEGIN is not specified, it defaults to revision number 0. If END\n"
7430 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7458 " is not specified, it defaults to the tip. The range \":\" thus means\n"
7431 " \"all revisions\".\n"
7459 " \"all revisions\".\n"
7432 "\n"
7460 "\n"
7433 " If BEGIN is greater than END, revisions are treated in reverse\n"
7461 " If BEGIN is greater than END, revisions are treated in reverse\n"
7434 " order.\n"
7462 " order.\n"
7435 "\n"
7463 "\n"
7436 " A range acts as a closed interval. This means that a range of 3:5\n"
7464 " A range acts as a closed interval. This means that a range of 3:5\n"
7437 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7465 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
7438 " "
7466 " "
7439 msgstr ""
7467 msgstr ""
7440
7468
7441 msgid "Diff Formats"
7469 msgid "Diff Formats"
7442 msgstr ""
7470 msgstr ""
7443
7471
7444 msgid ""
7472 msgid ""
7445 "\n"
7473 "\n"
7446 " Mercurial's default format for showing changes between two\n"
7474 " Mercurial's default format for showing changes between two\n"
7447 " versions of a file is compatible with the unified format of GNU\n"
7475 " versions of a file is compatible with the unified format of GNU\n"
7448 " diff, which can be used by GNU patch and many other standard\n"
7476 " diff, which can be used by GNU patch and many other standard\n"
7449 " tools.\n"
7477 " tools.\n"
7450 "\n"
7478 "\n"
7451 " While this standard format is often enough, it does not encode the\n"
7479 " While this standard format is often enough, it does not encode the\n"
7452 " following information:\n"
7480 " following information:\n"
7453 "\n"
7481 "\n"
7454 " - executable status and other permission bits\n"
7482 " - executable status and other permission bits\n"
7455 " - copy or rename information\n"
7483 " - copy or rename information\n"
7456 " - changes in binary files\n"
7484 " - changes in binary files\n"
7457 " - creation or deletion of empty files\n"
7485 " - creation or deletion of empty files\n"
7458 "\n"
7486 "\n"
7459 " Mercurial also supports the extended diff format from the git VCS\n"
7487 " Mercurial also supports the extended diff format from the git VCS\n"
7460 " which addresses these limitations. The git diff format is not\n"
7488 " which addresses these limitations. The git diff format is not\n"
7461 " produced by default because a few widespread tools still do not\n"
7489 " produced by default because a few widespread tools still do not\n"
7462 " understand this format.\n"
7490 " understand this format.\n"
7463 "\n"
7491 "\n"
7464 " This means that when generating diffs from a Mercurial repository\n"
7492 " This means that when generating diffs from a Mercurial repository\n"
7465 " (e.g. with \"hg export\"), you should be careful about things like\n"
7493 " (e.g. with \"hg export\"), you should be careful about things like\n"
7466 " file copies and renames or other things mentioned above, because\n"
7494 " file copies and renames or other things mentioned above, because\n"
7467 " when applying a standard diff to a different repository, this\n"
7495 " when applying a standard diff to a different repository, this\n"
7468 " extra information is lost. Mercurial's internal operations (like\n"
7496 " extra information is lost. Mercurial's internal operations (like\n"
7469 " push and pull) are not affected by this, because they use an\n"
7497 " push and pull) are not affected by this, because they use an\n"
7470 " internal binary format for communicating changes.\n"
7498 " internal binary format for communicating changes.\n"
7471 "\n"
7499 "\n"
7472 " To make Mercurial produce the git extended diff format, use the\n"
7500 " To make Mercurial produce the git extended diff format, use the\n"
7473 " --git option available for many commands, or set 'git = True' in\n"
7501 " --git option available for many commands, or set 'git = True' in\n"
7474 " the [diff] section of your hgrc. You do not need to set this\n"
7502 " the [diff] section of your hgrc. You do not need to set this\n"
7475 " option when importing diffs in this format or using them in the mq\n"
7503 " option when importing diffs in this format or using them in the mq\n"
7476 " extension.\n"
7504 " extension.\n"
7477 " "
7505 " "
7478 msgstr ""
7506 msgstr ""
7479
7507
7480 msgid "Template Usage"
7508 msgid "Template Usage"
7481 msgstr ""
7509 msgstr ""
7482
7510
7483 msgid ""
7511 msgid ""
7484 "\n"
7512 "\n"
7485 " Mercurial allows you to customize output of commands through\n"
7513 " Mercurial allows you to customize output of commands through\n"
7486 " templates. You can either pass in a template from the command\n"
7514 " templates. You can either pass in a template from the command\n"
7487 " line, via the --template option, or select an existing\n"
7515 " line, via the --template option, or select an existing\n"
7488 " template-style (--style).\n"
7516 " template-style (--style).\n"
7489 "\n"
7517 "\n"
7490 " You can customize output for any \"log-like\" command: log,\n"
7518 " You can customize output for any \"log-like\" command: log,\n"
7491 " outgoing, incoming, tip, parents, heads and glog.\n"
7519 " outgoing, incoming, tip, parents, heads and glog.\n"
7492 "\n"
7520 "\n"
7493 " Three styles are packaged with Mercurial: default (the style used\n"
7521 " Three styles are packaged with Mercurial: default (the style used\n"
7494 " when no explicit preference is passed), compact and changelog.\n"
7522 " when no explicit preference is passed), compact and changelog.\n"
7495 " Usage:\n"
7523 " Usage:\n"
7496 "\n"
7524 "\n"
7497 " $ hg log -r1 --style changelog\n"
7525 " $ hg log -r1 --style changelog\n"
7498 "\n"
7526 "\n"
7499 " A template is a piece of text, with markup to invoke variable\n"
7527 " A template is a piece of text, with markup to invoke variable\n"
7500 " expansion:\n"
7528 " expansion:\n"
7501 "\n"
7529 "\n"
7502 " $ hg log -r1 --template \"{node}\\n\"\n"
7530 " $ hg log -r1 --template \"{node}\\n\"\n"
7503 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7531 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
7504 "\n"
7532 "\n"
7505 " Strings in curly braces are called keywords. The availability of\n"
7533 " Strings in curly braces are called keywords. The availability of\n"
7506 " keywords depends on the exact context of the templater. These\n"
7534 " keywords depends on the exact context of the templater. These\n"
7507 " keywords are usually available for templating a log-like command:\n"
7535 " keywords are usually available for templating a log-like command:\n"
7508 "\n"
7536 "\n"
7509 " - author: String. The unmodified author of the changeset.\n"
7537 " - author: String. The unmodified author of the changeset.\n"
7510 " - branches: String. The name of the branch on which the changeset\n"
7538 " - branches: String. The name of the branch on which the changeset\n"
7511 " was committed. Will be empty if the branch name was default.\n"
7539 " was committed. Will be empty if the branch name was default.\n"
7512 " - date: Date information. The date when the changeset was committed.\n"
7540 " - date: Date information. The date when the changeset was committed.\n"
7513 " - desc: String. The text of the changeset description.\n"
7541 " - desc: String. The text of the changeset description.\n"
7514 " - diffstat: String. Statistics of changes with the following\n"
7542 " - diffstat: String. Statistics of changes with the following\n"
7515 " format: \"modified files: +added/-removed lines\"\n"
7543 " format: \"modified files: +added/-removed lines\"\n"
7516 " - files: List of strings. All files modified, added, or removed by\n"
7544 " - files: List of strings. All files modified, added, or removed by\n"
7517 " this changeset.\n"
7545 " this changeset.\n"
7518 " - file_adds: List of strings. Files added by this changeset.\n"
7546 " - file_adds: List of strings. Files added by this changeset.\n"
7519 " - file_mods: List of strings. Files modified by this changeset.\n"
7547 " - file_mods: List of strings. Files modified by this changeset.\n"
7520 " - file_dels: List of strings. Files removed by this changeset.\n"
7548 " - file_dels: List of strings. Files removed by this changeset.\n"
7521 " - node: String. The changeset identification hash, as a\n"
7549 " - node: String. The changeset identification hash, as a\n"
7522 " 40-character hexadecimal string.\n"
7550 " 40-character hexadecimal string.\n"
7523 " - parents: List of strings. The parents of the changeset.\n"
7551 " - parents: List of strings. The parents of the changeset.\n"
7524 " - rev: Integer. The repository-local changeset revision number.\n"
7552 " - rev: Integer. The repository-local changeset revision number.\n"
7525 " - tags: List of strings. Any tags associated with the changeset.\n"
7553 " - tags: List of strings. Any tags associated with the changeset.\n"
7526 "\n"
7554 "\n"
7527 " The \"date\" keyword does not produce human-readable output. If you\n"
7555 " The \"date\" keyword does not produce human-readable output. If you\n"
7528 " want to use a date in your output, you can use a filter to process\n"
7556 " want to use a date in your output, you can use a filter to process\n"
7529 " it. Filters are functions which return a string based on the input\n"
7557 " it. Filters are functions which return a string based on the input\n"
7530 " variable. You can also use a chain of filters to get the desired\n"
7558 " variable. You can also use a chain of filters to get the desired\n"
7531 " output:\n"
7559 " output:\n"
7532 "\n"
7560 "\n"
7533 " $ hg tip --template \"{date|isodate}\\n\"\n"
7561 " $ hg tip --template \"{date|isodate}\\n\"\n"
7534 " 2008-08-21 18:22 +0000\n"
7562 " 2008-08-21 18:22 +0000\n"
7535 "\n"
7563 "\n"
7536 " List of filters:\n"
7564 " List of filters:\n"
7537 "\n"
7565 "\n"
7538 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7566 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
7539 " every line except the last.\n"
7567 " every line except the last.\n"
7540 " - age: Date. Returns a human-readable date/time difference between\n"
7568 " - age: Date. Returns a human-readable date/time difference between\n"
7541 " the given date/time and the current date/time.\n"
7569 " the given date/time and the current date/time.\n"
7542 " - basename: Any text. Treats the text as a path, and returns the\n"
7570 " - basename: Any text. Treats the text as a path, and returns the\n"
7543 " last component of the path after splitting by the path\n"
7571 " last component of the path after splitting by the path\n"
7544 " separator (ignoring trailing separators). For example,\n"
7572 " separator (ignoring trailing separators). For example,\n"
7545 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7573 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
7546 "\".\n"
7574 "\".\n"
7547 " - stripdir: Treat the text as path and strip a directory level, if\n"
7575 " - stripdir: Treat the text as path and strip a directory level, if\n"
7548 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7576 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
7549 " - date: Date. Returns a date in a Unix date format, including\n"
7577 " - date: Date. Returns a date in a Unix date format, including\n"
7550 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7578 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
7551 " - domain: Any text. Finds the first string that looks like an\n"
7579 " - domain: Any text. Finds the first string that looks like an\n"
7552 " email address, and extracts just the domain component.\n"
7580 " email address, and extracts just the domain component.\n"
7553 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7581 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
7554 " - email: Any text. Extracts the first string that looks like an\n"
7582 " - email: Any text. Extracts the first string that looks like an\n"
7555 " email address. Example: 'User <user@example.com>' becomes\n"
7583 " email address. Example: 'User <user@example.com>' becomes\n"
7556 " 'user@example.com'.\n"
7584 " 'user@example.com'.\n"
7557 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7585 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
7558 " \"<\" and \">\" with XML entities.\n"
7586 " \"<\" and \">\" with XML entities.\n"
7559 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7587 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
7560 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7588 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
7561 " - firstline: Any text. Returns the first line of text.\n"
7589 " - firstline: Any text. Returns the first line of text.\n"
7562 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7590 " - nonempty: Any text. Returns '(none)' if the string is empty.\n"
7563 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7591 " - hgdate: Date. Returns the date as a pair of numbers:\n"
7564 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7592 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
7565 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7593 " - isodate: Date. Returns the date in ISO 8601 format.\n"
7566 " - localdate: Date. Converts a date to local date.\n"
7594 " - localdate: Date. Converts a date to local date.\n"
7567 " - obfuscate: Any text. Returns the input text rendered as a\n"
7595 " - obfuscate: Any text. Returns the input text rendered as a\n"
7568 " sequence of XML entities.\n"
7596 " sequence of XML entities.\n"
7569 " - person: Any text. Returns the text before an email address.\n"
7597 " - person: Any text. Returns the text before an email address.\n"
7570 " - rfc822date: Date. Returns a date using the same format used\n"
7598 " - rfc822date: Date. Returns a date using the same format used\n"
7571 " in email headers.\n"
7599 " in email headers.\n"
7572 " - short: Changeset hash. Returns the short form of a changeset\n"
7600 " - short: Changeset hash. Returns the short form of a changeset\n"
7573 " hash, i.e. a 12-byte hexadecimal string.\n"
7601 " hash, i.e. a 12-byte hexadecimal string.\n"
7574 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7602 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
7575 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7603 " - strip: Any text. Strips all leading and trailing whitespace.\n"
7576 " - tabindent: Any text. Returns the text, with every line except\n"
7604 " - tabindent: Any text. Returns the text, with every line except\n"
7577 " the first starting with a tab character.\n"
7605 " the first starting with a tab character.\n"
7578 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7606 " - urlescape: Any text. Escapes all \"special\" characters. For\n"
7579 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7607 " example, \"foo bar\" becomes \"foo%20bar\".\n"
7580 " - user: Any text. Returns the user portion of an email address.\n"
7608 " - user: Any text. Returns the user portion of an email address.\n"
7581 " "
7609 " "
7582 msgstr ""
7610 msgstr ""
7583
7611
7584 msgid "URL Paths"
7612 msgid "URL Paths"
7585 msgstr ""
7613 msgstr ""
7586
7614
7587 msgid ""
7615 msgid ""
7588 "\n"
7616 "\n"
7589 " Valid URLs are of the form:\n"
7617 " Valid URLs are of the form:\n"
7590 "\n"
7618 "\n"
7591 " local/filesystem/path (or file://local/filesystem/path)\n"
7619 " local/filesystem/path (or file://local/filesystem/path)\n"
7592 " http://[user[:pass]@]host[:port]/[path]\n"
7620 " http://[user[:pass]@]host[:port]/[path]\n"
7593 " https://[user[:pass]@]host[:port]/[path]\n"
7621 " https://[user[:pass]@]host[:port]/[path]\n"
7594 " ssh://[user[:pass]@]host[:port]/[path]\n"
7622 " ssh://[user[:pass]@]host[:port]/[path]\n"
7595 "\n"
7623 "\n"
7596 " Paths in the local filesystem can either point to Mercurial\n"
7624 " Paths in the local filesystem can either point to Mercurial\n"
7597 " repositories or to bundle files (as created by 'hg bundle' or\n"
7625 " repositories or to bundle files (as created by 'hg bundle' or\n"
7598 " 'hg incoming --bundle').\n"
7626 " 'hg incoming --bundle').\n"
7599 "\n"
7627 "\n"
7600 " An optional identifier after # indicates a particular branch, tag,\n"
7628 " An optional identifier after # indicates a particular branch, tag,\n"
7601 " or changeset to use from the remote repository.\n"
7629 " or changeset to use from the remote repository.\n"
7602 "\n"
7630 "\n"
7603 " Some features, such as pushing to http:// and https:// URLs are\n"
7631 " Some features, such as pushing to http:// and https:// URLs are\n"
7604 " only possible if the feature is explicitly enabled on the remote\n"
7632 " only possible if the feature is explicitly enabled on the remote\n"
7605 " Mercurial server.\n"
7633 " Mercurial server.\n"
7606 "\n"
7634 "\n"
7607 " Some notes about using SSH with Mercurial:\n"
7635 " Some notes about using SSH with Mercurial:\n"
7608 " - SSH requires an accessible shell account on the destination\n"
7636 " - SSH requires an accessible shell account on the destination\n"
7609 " machine and a copy of hg in the remote path or specified with as\n"
7637 " machine and a copy of hg in the remote path or specified with as\n"
7610 " remotecmd.\n"
7638 " remotecmd.\n"
7611 " - path is relative to the remote user's home directory by default.\n"
7639 " - path is relative to the remote user's home directory by default.\n"
7612 " Use an extra slash at the start of a path to specify an absolute "
7640 " Use an extra slash at the start of a path to specify an absolute "
7613 "path:\n"
7641 "path:\n"
7614 " ssh://example.com//tmp/repository\n"
7642 " ssh://example.com//tmp/repository\n"
7615 " - Mercurial doesn't use its own compression via SSH; the right\n"
7643 " - Mercurial doesn't use its own compression via SSH; the right\n"
7616 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7644 " thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
7617 " Host *.mylocalnetwork.example.com\n"
7645 " Host *.mylocalnetwork.example.com\n"
7618 " Compression no\n"
7646 " Compression no\n"
7619 " Host *\n"
7647 " Host *\n"
7620 " Compression yes\n"
7648 " Compression yes\n"
7621 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7649 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
7622 " or with the --ssh command line option.\n"
7650 " or with the --ssh command line option.\n"
7623 "\n"
7651 "\n"
7624 " These URLs can all be stored in your hgrc with path aliases under\n"
7652 " These URLs can all be stored in your hgrc with path aliases under\n"
7625 " the [paths] section like so:\n"
7653 " the [paths] section like so:\n"
7626 " [paths]\n"
7654 " [paths]\n"
7627 " alias1 = URL1\n"
7655 " alias1 = URL1\n"
7628 " alias2 = URL2\n"
7656 " alias2 = URL2\n"
7629 " ...\n"
7657 " ...\n"
7630 "\n"
7658 "\n"
7631 " You can then use the alias for any command that uses a URL (for\n"
7659 " You can then use the alias for any command that uses a URL (for\n"
7632 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7660 " example 'hg pull alias1' would pull from the 'alias1' path).\n"
7633 "\n"
7661 "\n"
7634 " Two path aliases are special because they are used as defaults\n"
7662 " Two path aliases are special because they are used as defaults\n"
7635 " when you do not provide the URL to a command:\n"
7663 " when you do not provide the URL to a command:\n"
7636 "\n"
7664 "\n"
7637 " default:\n"
7665 " default:\n"
7638 " When you create a repository with hg clone, the clone command\n"
7666 " When you create a repository with hg clone, the clone command\n"
7639 " saves the location of the source repository as the new\n"
7667 " saves the location of the source repository as the new\n"
7640 " repository's 'default' path. This is then used when you omit\n"
7668 " repository's 'default' path. This is then used when you omit\n"
7641 " path from push- and pull-like commands (including incoming and\n"
7669 " path from push- and pull-like commands (including incoming and\n"
7642 " outgoing).\n"
7670 " outgoing).\n"
7643 "\n"
7671 "\n"
7644 " default-push:\n"
7672 " default-push:\n"
7645 " The push command will look for a path named 'default-push', and\n"
7673 " The push command will look for a path named 'default-push', and\n"
7646 " prefer it over 'default' if both are defined.\n"
7674 " prefer it over 'default' if both are defined.\n"
7647 " "
7675 " "
7648 msgstr ""
7676 msgstr ""
7649
7677
7650 msgid "Using additional features"
7678 msgid "Using additional features"
7651 msgstr ""
7679 msgstr ""
7652
7680
7653 msgid "can only share local repositories"
7681 msgid "can only share local repositories"
7654 msgstr ""
7682 msgstr ""
7655
7683
7656 msgid "destination already exists"
7684 msgid "destination already exists"
7657 msgstr ""
7685 msgstr ""
7658
7686
7659 msgid "updating working directory\n"
7687 msgid "updating working directory\n"
7660 msgstr ""
7688 msgstr ""
7661
7689
7662 #, python-format
7690 #, python-format
7663 msgid "destination directory: %s\n"
7691 msgid "destination directory: %s\n"
7664 msgstr ""
7692 msgstr ""
7665
7693
7666 #, python-format
7694 #, python-format
7667 msgid "destination '%s' already exists"
7695 msgid "destination '%s' already exists"
7668 msgstr ""
7696 msgstr ""
7669
7697
7670 #, python-format
7698 #, python-format
7671 msgid "destination '%s' is not empty"
7699 msgid "destination '%s' is not empty"
7672 msgstr ""
7700 msgstr ""
7673
7701
7674 msgid ""
7702 msgid ""
7675 "src repository does not support revision lookup and so doesn't support clone "
7703 "src repository does not support revision lookup and so doesn't support clone "
7676 "by revision"
7704 "by revision"
7677 msgstr ""
7705 msgstr ""
7678
7706
7679 msgid "clone from remote to remote not supported"
7707 msgid "clone from remote to remote not supported"
7680 msgstr ""
7708 msgstr ""
7681
7709
7682 msgid "updated"
7710 msgid "updated"
7683 msgstr ""
7711 msgstr ""
7684
7712
7685 msgid "merged"
7713 msgid "merged"
7686 msgstr ""
7714 msgstr ""
7687
7715
7688 msgid "removed"
7716 msgid "removed"
7689 msgstr ""
7717 msgstr ""
7690
7718
7691 msgid "unresolved"
7719 msgid "unresolved"
7692 msgstr ""
7720 msgstr ""
7693
7721
7694 #, python-format
7722 #, python-format
7695 msgid "%d files %s"
7723 msgid "%d files %s"
7696 msgstr ""
7724 msgstr ""
7697
7725
7698 msgid "use 'hg resolve' to retry unresolved file merges\n"
7726 msgid "use 'hg resolve' to retry unresolved file merges\n"
7699 msgstr ""
7727 msgstr ""
7700
7728
7701 msgid ""
7729 msgid ""
7702 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7730 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
7703 "abandon\n"
7731 "abandon\n"
7704 msgstr ""
7732 msgstr ""
7705
7733
7706 msgid "(branch merge, don't forget to commit)\n"
7734 msgid "(branch merge, don't forget to commit)\n"
7707 msgstr ""
7735 msgstr ""
7708
7736
7709 #, python-format
7737 #, python-format
7710 msgid "error reading %s/.hg/hgrc: %s\n"
7738 msgid "error reading %s/.hg/hgrc: %s\n"
7711 msgstr ""
7739 msgstr ""
7712
7740
7713 msgid "SSL support is unavailable"
7741 msgid "SSL support is unavailable"
7714 msgstr ""
7742 msgstr ""
7715
7743
7716 msgid "IPv6 is not available on this system"
7744 msgid "IPv6 is not available on this system"
7717 msgstr ""
7745 msgstr ""
7718
7746
7719 #, python-format
7747 #, python-format
7720 msgid "cannot start server at '%s:%d': %s"
7748 msgid "cannot start server at '%s:%d': %s"
7721 msgstr ""
7749 msgstr ""
7722
7750
7723 #, python-format
7751 #, python-format
7724 msgid "calling hook %s: %s\n"
7752 msgid "calling hook %s: %s\n"
7725 msgstr ""
7753 msgstr ""
7726
7754
7727 #, python-format
7755 #, python-format
7728 msgid "%s hook is invalid (\"%s\" not in a module)"
7756 msgid "%s hook is invalid (\"%s\" not in a module)"
7729 msgstr ""
7757 msgstr ""
7730
7758
7731 #, python-format
7759 #, python-format
7732 msgid "%s hook is invalid (import of \"%s\" failed)"
7760 msgid "%s hook is invalid (import of \"%s\" failed)"
7733 msgstr ""
7761 msgstr ""
7734
7762
7735 #, python-format
7763 #, python-format
7736 msgid "%s hook is invalid (\"%s\" is not defined)"
7764 msgid "%s hook is invalid (\"%s\" is not defined)"
7737 msgstr ""
7765 msgstr ""
7738
7766
7739 #, python-format
7767 #, python-format
7740 msgid "%s hook is invalid (\"%s\" is not callable)"
7768 msgid "%s hook is invalid (\"%s\" is not callable)"
7741 msgstr ""
7769 msgstr ""
7742
7770
7743 #, python-format
7771 #, python-format
7744 msgid "error: %s hook failed: %s\n"
7772 msgid "error: %s hook failed: %s\n"
7745 msgstr ""
7773 msgstr ""
7746
7774
7747 #, python-format
7775 #, python-format
7748 msgid "error: %s hook raised an exception: %s\n"
7776 msgid "error: %s hook raised an exception: %s\n"
7749 msgstr ""
7777 msgstr ""
7750
7778
7751 #, python-format
7779 #, python-format
7752 msgid "%s hook failed"
7780 msgid "%s hook failed"
7753 msgstr ""
7781 msgstr ""
7754
7782
7755 #, python-format
7783 #, python-format
7756 msgid "warning: %s hook failed\n"
7784 msgid "warning: %s hook failed\n"
7757 msgstr ""
7785 msgstr ""
7758
7786
7759 #, python-format
7787 #, python-format
7760 msgid "running hook %s: %s\n"
7788 msgid "running hook %s: %s\n"
7761 msgstr ""
7789 msgstr ""
7762
7790
7763 #, python-format
7791 #, python-format
7764 msgid "%s hook %s"
7792 msgid "%s hook %s"
7765 msgstr ""
7793 msgstr ""
7766
7794
7767 #, python-format
7795 #, python-format
7768 msgid "warning: %s hook %s\n"
7796 msgid "warning: %s hook %s\n"
7769 msgstr ""
7797 msgstr ""
7770
7798
7771 msgid "connection ended unexpectedly"
7799 msgid "connection ended unexpectedly"
7772 msgstr ""
7800 msgstr ""
7773
7801
7774 #, python-format
7802 #, python-format
7775 msgid "unsupported URL component: \"%s\""
7803 msgid "unsupported URL component: \"%s\""
7776 msgstr ""
7804 msgstr ""
7777
7805
7778 #, python-format
7806 #, python-format
7779 msgid "using %s\n"
7807 msgid "using %s\n"
7780 msgstr ""
7808 msgstr ""
7781
7809
7782 #, python-format
7810 #, python-format
7783 msgid "capabilities: %s\n"
7811 msgid "capabilities: %s\n"
7784 msgstr ""
7812 msgstr ""
7785
7813
7786 msgid "operation not supported over http"
7814 msgid "operation not supported over http"
7787 msgstr ""
7815 msgstr ""
7788
7816
7789 #, python-format
7817 #, python-format
7790 msgid "sending %s command\n"
7818 msgid "sending %s command\n"
7791 msgstr ""
7819 msgstr ""
7792
7820
7793 #, python-format
7821 #, python-format
7794 msgid "sending %s bytes\n"
7822 msgid "sending %s bytes\n"
7795 msgstr ""
7823 msgstr ""
7796
7824
7797 msgid "authorization failed"
7825 msgid "authorization failed"
7798 msgstr ""
7826 msgstr ""
7799
7827
7800 #, python-format
7828 #, python-format
7801 msgid "http error while sending %s command\n"
7829 msgid "http error while sending %s command\n"
7802 msgstr ""
7830 msgstr ""
7803
7831
7804 msgid "http error, possibly caused by proxy setting"
7832 msgid "http error, possibly caused by proxy setting"
7805 msgstr ""
7833 msgstr ""
7806
7834
7807 #, python-format
7835 #, python-format
7808 msgid "real URL is %s\n"
7836 msgid "real URL is %s\n"
7809 msgstr ""
7837 msgstr ""
7810
7838
7811 #, python-format
7839 #, python-format
7812 msgid "requested URL: '%s'\n"
7840 msgid "requested URL: '%s'\n"
7813 msgstr ""
7841 msgstr ""
7814
7842
7815 #, python-format
7843 #, python-format
7816 msgid "'%s' does not appear to be an hg repository"
7844 msgid "'%s' does not appear to be an hg repository"
7817 msgstr ""
7845 msgstr ""
7818
7846
7819 #, python-format
7847 #, python-format
7820 msgid "'%s' sent a broken Content-Type header (%s)"
7848 msgid "'%s' sent a broken Content-Type header (%s)"
7821 msgstr ""
7849 msgstr ""
7822
7850
7823 #, python-format
7851 #, python-format
7824 msgid "'%s' uses newer protocol %s"
7852 msgid "'%s' uses newer protocol %s"
7825 msgstr ""
7853 msgstr ""
7826
7854
7827 msgid "look up remote revision"
7855 msgid "look up remote revision"
7828 msgstr ""
7856 msgstr ""
7829
7857
7830 msgid "unexpected response:"
7858 msgid "unexpected response:"
7831 msgstr ""
7859 msgstr ""
7832
7860
7833 msgid "look up remote changes"
7861 msgid "look up remote changes"
7834 msgstr ""
7862 msgstr ""
7835
7863
7836 msgid "push failed (unexpected response):"
7864 msgid "push failed (unexpected response):"
7837 msgstr ""
7865 msgstr ""
7838
7866
7839 #, python-format
7867 #, python-format
7840 msgid "push failed: %s"
7868 msgid "push failed: %s"
7841 msgstr ""
7869 msgstr ""
7842
7870
7843 msgid "Python support for SSL and HTTPS is not installed"
7871 msgid "Python support for SSL and HTTPS is not installed"
7844 msgstr ""
7872 msgstr ""
7845
7873
7846 msgid "cannot create new http repository"
7874 msgid "cannot create new http repository"
7847 msgstr ""
7875 msgstr ""
7848
7876
7849 #, python-format
7877 #, python-format
7850 msgid "%s: ignoring invalid syntax '%s'\n"
7878 msgid "%s: ignoring invalid syntax '%s'\n"
7851 msgstr ""
7879 msgstr ""
7852
7880
7853 #, python-format
7881 #, python-format
7854 msgid "skipping unreadable ignore file '%s': %s\n"
7882 msgid "skipping unreadable ignore file '%s': %s\n"
7855 msgstr ""
7883 msgstr ""
7856
7884
7857 #, python-format
7885 #, python-format
7858 msgid "repository %s not found"
7886 msgid "repository %s not found"
7859 msgstr ""
7887 msgstr ""
7860
7888
7861 #, python-format
7889 #, python-format
7862 msgid "repository %s already exists"
7890 msgid "repository %s already exists"
7863 msgstr ""
7891 msgstr ""
7864
7892
7865 #, python-format
7893 #, python-format
7866 msgid "requirement '%s' not supported"
7894 msgid "requirement '%s' not supported"
7867 msgstr ""
7895 msgstr ""
7868
7896
7869 #, python-format
7897 #, python-format
7870 msgid ".hg/sharedpath points to nonexistent directory %s"
7898 msgid ".hg/sharedpath points to nonexistent directory %s"
7871 msgstr ""
7899 msgstr ""
7872
7900
7873 #, python-format
7901 #, python-format
7874 msgid "%r cannot be used in a tag name"
7902 msgid "%r cannot be used in a tag name"
7875 msgstr ""
7903 msgstr ""
7876
7904
7877 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7905 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7878 msgstr ""
7906 msgstr ""
7879
7907
7880 #, python-format
7908 #, python-format
7881 msgid "%s, line %s: %s\n"
7909 msgid "%s, line %s: %s\n"
7882 msgstr ""
7910 msgstr ""
7883
7911
7884 msgid "cannot parse entry"
7912 msgid "cannot parse entry"
7885 msgstr ""
7913 msgstr ""
7886
7914
7887 #, python-format
7915 #, python-format
7888 msgid "node '%s' is not well formed"
7916 msgid "node '%s' is not well formed"
7889 msgstr ""
7917 msgstr ""
7890
7918
7891 #, python-format
7919 #, python-format
7892 msgid "working directory has unknown parent '%s'!"
7920 msgid "working directory has unknown parent '%s'!"
7893 msgstr ""
7921 msgstr ""
7894
7922
7895 #, python-format
7923 #, python-format
7896 msgid "unknown revision '%s'"
7924 msgid "unknown revision '%s'"
7897 msgstr ""
7925 msgstr ""
7898
7926
7899 #, python-format
7927 #, python-format
7900 msgid "filtering %s through %s\n"
7928 msgid "filtering %s through %s\n"
7901 msgstr ""
7929 msgstr ""
7902
7930
7903 msgid "journal already exists - run hg recover"
7931 msgid "journal already exists - run hg recover"
7904 msgstr ""
7932 msgstr ""
7905
7933
7906 msgid "rolling back interrupted transaction\n"
7934 msgid "rolling back interrupted transaction\n"
7907 msgstr ""
7935 msgstr ""
7908
7936
7909 msgid "no interrupted transaction available\n"
7937 msgid "no interrupted transaction available\n"
7910 msgstr ""
7938 msgstr ""
7911
7939
7912 msgid "rolling back last transaction\n"
7940 msgid "rolling back last transaction\n"
7913 msgstr ""
7941 msgstr ""
7914
7942
7915 #, python-format
7943 #, python-format
7916 msgid "Named branch could not be reset, current branch still is: %s\n"
7944 msgid "Named branch could not be reset, current branch still is: %s\n"
7917 msgstr ""
7945 msgstr ""
7918
7946
7919 msgid "no rollback information available\n"
7947 msgid "no rollback information available\n"
7920 msgstr ""
7948 msgstr ""
7921
7949
7922 #, python-format
7950 #, python-format
7923 msgid "waiting for lock on %s held by %r\n"
7951 msgid "waiting for lock on %s held by %r\n"
7924 msgstr ""
7952 msgstr ""
7925
7953
7926 #, python-format
7954 #, python-format
7927 msgid "repository %s"
7955 msgid "repository %s"
7928 msgstr ""
7956 msgstr ""
7929
7957
7930 #, python-format
7958 #, python-format
7931 msgid "working directory of %s"
7959 msgid "working directory of %s"
7932 msgstr ""
7960 msgstr ""
7933
7961
7934 #, python-format
7962 #, python-format
7935 msgid " %s: searching for copy revision for %s\n"
7963 msgid " %s: searching for copy revision for %s\n"
7936 msgstr ""
7964 msgstr ""
7937
7965
7938 #, python-format
7966 #, python-format
7939 msgid " %s: copy %s:%s\n"
7967 msgid " %s: copy %s:%s\n"
7940 msgstr ""
7968 msgstr ""
7941
7969
7942 msgid "cannot partially commit a merge (do not specify files or patterns)"
7970 msgid "cannot partially commit a merge (do not specify files or patterns)"
7943 msgstr ""
7971 msgstr ""
7944
7972
7945 msgid "file not found!"
7973 msgid "file not found!"
7946 msgstr ""
7974 msgstr ""
7947
7975
7948 msgid "no match under directory!"
7976 msgid "no match under directory!"
7949 msgstr ""
7977 msgstr ""
7950
7978
7951 msgid "file not tracked!"
7979 msgid "file not tracked!"
7952 msgstr ""
7980 msgstr ""
7953
7981
7954 msgid "nothing changed\n"
7982 msgid "nothing changed\n"
7955 msgstr ""
7983 msgstr ""
7956
7984
7957 msgid "unresolved merge conflicts (see hg resolve)"
7985 msgid "unresolved merge conflicts (see hg resolve)"
7958 msgstr ""
7986 msgstr ""
7959
7987
7960 #, python-format
7988 #, python-format
7961 msgid "committing subrepository %s\n"
7989 msgid "committing subrepository %s\n"
7962 msgstr ""
7990 msgstr ""
7963
7991
7964 #, python-format
7992 #, python-format
7965 msgid "trouble committing %s!\n"
7993 msgid "trouble committing %s!\n"
7966 msgstr ""
7994 msgstr ""
7967
7995
7968 #, python-format
7996 #, python-format
7969 msgid "%s does not exist!\n"
7997 msgid "%s does not exist!\n"
7970 msgstr ""
7998 msgstr ""
7971
7999
7972 #, python-format
8000 #, python-format
7973 msgid ""
8001 msgid ""
7974 "%s: files over 10MB may cause memory and performance problems\n"
8002 "%s: files over 10MB may cause memory and performance problems\n"
7975 "(use 'hg revert %s' to unadd the file)\n"
8003 "(use 'hg revert %s' to unadd the file)\n"
7976 msgstr ""
8004 msgstr ""
7977
8005
7978 #, python-format
8006 #, python-format
7979 msgid "%s not added: only files and symlinks supported currently\n"
8007 msgid "%s not added: only files and symlinks supported currently\n"
7980 msgstr ""
8008 msgstr ""
7981
8009
7982 #, python-format
8010 #, python-format
7983 msgid "%s already tracked!\n"
8011 msgid "%s already tracked!\n"
7984 msgstr ""
8012 msgstr ""
7985
8013
7986 #, python-format
8014 #, python-format
7987 msgid "%s not added!\n"
8015 msgid "%s not added!\n"
7988 msgstr ""
8016 msgstr ""
7989
8017
7990 #, python-format
8018 #, python-format
7991 msgid "%s still exists!\n"
8019 msgid "%s still exists!\n"
7992 msgstr ""
8020 msgstr ""
7993
8021
7994 #, python-format
8022 #, python-format
7995 msgid "%s not tracked!\n"
8023 msgid "%s not tracked!\n"
7996 msgstr ""
8024 msgstr ""
7997
8025
7998 #, python-format
8026 #, python-format
7999 msgid "%s not removed!\n"
8027 msgid "%s not removed!\n"
8000 msgstr ""
8028 msgstr ""
8001
8029
8002 #, python-format
8030 #, python-format
8003 msgid "copy failed: %s is not a file or a symbolic link\n"
8031 msgid "copy failed: %s is not a file or a symbolic link\n"
8004 msgstr ""
8032 msgstr ""
8005
8033
8006 msgid "searching for changes\n"
8034 msgid "searching for changes\n"
8007 msgstr ""
8035 msgstr ""
8008
8036
8009 #, python-format
8037 #, python-format
8010 msgid "examining %s:%s\n"
8038 msgid "examining %s:%s\n"
8011 msgstr ""
8039 msgstr ""
8012
8040
8013 msgid "branch already found\n"
8041 msgid "branch already found\n"
8014 msgstr ""
8042 msgstr ""
8015
8043
8016 #, python-format
8044 #, python-format
8017 msgid "found incomplete branch %s:%s\n"
8045 msgid "found incomplete branch %s:%s\n"
8018 msgstr ""
8046 msgstr ""
8019
8047
8020 #, python-format
8048 #, python-format
8021 msgid "found new changeset %s\n"
8049 msgid "found new changeset %s\n"
8022 msgstr ""
8050 msgstr ""
8023
8051
8024 #, python-format
8052 #, python-format
8025 msgid "request %d: %s\n"
8053 msgid "request %d: %s\n"
8026 msgstr ""
8054 msgstr ""
8027
8055
8028 #, python-format
8056 #, python-format
8029 msgid "received %s:%s\n"
8057 msgid "received %s:%s\n"
8030 msgstr ""
8058 msgstr ""
8031
8059
8032 #, python-format
8060 #, python-format
8033 msgid "narrowing %d:%d %s\n"
8061 msgid "narrowing %d:%d %s\n"
8034 msgstr ""
8062 msgstr ""
8035
8063
8036 #, python-format
8064 #, python-format
8037 msgid "found new branch changeset %s\n"
8065 msgid "found new branch changeset %s\n"
8038 msgstr ""
8066 msgstr ""
8039
8067
8040 #, python-format
8068 #, python-format
8041 msgid "narrowed branch search to %s:%s\n"
8069 msgid "narrowed branch search to %s:%s\n"
8042 msgstr ""
8070 msgstr ""
8043
8071
8044 msgid "already have changeset "
8072 msgid "already have changeset "
8045 msgstr ""
8073 msgstr ""
8046
8074
8047 msgid "warning: repository is unrelated\n"
8075 msgid "warning: repository is unrelated\n"
8048 msgstr ""
8076 msgstr ""
8049
8077
8050 msgid "repository is unrelated"
8078 msgid "repository is unrelated"
8051 msgstr ""
8079 msgstr ""
8052
8080
8053 msgid "found new changesets starting at "
8081 msgid "found new changesets starting at "
8054 msgstr ""
8082 msgstr ""
8055
8083
8056 #, python-format
8084 #, python-format
8057 msgid "%d total queries\n"
8085 msgid "%d total queries\n"
8058 msgstr ""
8086 msgstr ""
8059
8087
8060 msgid "common changesets up to "
8088 msgid "common changesets up to "
8061 msgstr ""
8089 msgstr ""
8062
8090
8063 msgid "requesting all changes\n"
8091 msgid "requesting all changes\n"
8064 msgstr ""
8092 msgstr ""
8065
8093
8066 msgid ""
8094 msgid ""
8067 "Partial pull cannot be done because other repository doesn't support "
8095 "Partial pull cannot be done because other repository doesn't support "
8068 "changegroupsubset."
8096 "changegroupsubset."
8069 msgstr ""
8097 msgstr ""
8070
8098
8071 #, python-format
8099 #, python-format
8072 msgid "abort: push creates new remote branch '%s'!\n"
8100 msgid "abort: push creates new remote branch '%s'!\n"
8073 msgstr ""
8101 msgstr ""
8074
8102
8075 msgid "abort: push creates new remote heads!\n"
8103 msgid "abort: push creates new remote heads!\n"
8076 msgstr ""
8104 msgstr ""
8077
8105
8078 msgid "(did you forget to merge? use push -f to force)\n"
8106 msgid "(did you forget to merge? use push -f to force)\n"
8079 msgstr ""
8107 msgstr ""
8080
8108
8081 msgid "note: unsynced remote changes!\n"
8109 msgid "note: unsynced remote changes!\n"
8082 msgstr ""
8110 msgstr ""
8083
8111
8084 #, python-format
8112 #, python-format
8085 msgid "%d changesets found\n"
8113 msgid "%d changesets found\n"
8086 msgstr ""
8114 msgstr ""
8087
8115
8088 msgid "list of changesets:\n"
8116 msgid "list of changesets:\n"
8089 msgstr ""
8117 msgstr ""
8090
8118
8091 #, python-format
8119 #, python-format
8092 msgid "empty or missing revlog for %s"
8120 msgid "empty or missing revlog for %s"
8093 msgstr ""
8121 msgstr ""
8094
8122
8095 #, python-format
8123 #, python-format
8096 msgid "add changeset %s\n"
8124 msgid "add changeset %s\n"
8097 msgstr ""
8125 msgstr ""
8098
8126
8099 msgid "adding changesets\n"
8127 msgid "adding changesets\n"
8100 msgstr ""
8128 msgstr ""
8101
8129
8102 msgid "received changelog group is empty"
8130 msgid "received changelog group is empty"
8103 msgstr ""
8131 msgstr ""
8104
8132
8105 msgid "adding manifests\n"
8133 msgid "adding manifests\n"
8106 msgstr ""
8134 msgstr ""
8107
8135
8108 msgid "adding file changes\n"
8136 msgid "adding file changes\n"
8109 msgstr ""
8137 msgstr ""
8110
8138
8111 #, python-format
8139 #, python-format
8112 msgid "adding %s revisions\n"
8140 msgid "adding %s revisions\n"
8113 msgstr ""
8141 msgstr ""
8114
8142
8115 msgid "received file revlog group is empty"
8143 msgid "received file revlog group is empty"
8116 msgstr ""
8144 msgstr ""
8117
8145
8118 #, python-format
8146 #, python-format
8119 msgid " (%+d heads)"
8147 msgid " (%+d heads)"
8120 msgstr ""
8148 msgstr ""
8121
8149
8122 #, python-format
8150 #, python-format
8123 msgid "added %d changesets with %d changes to %d files%s\n"
8151 msgid "added %d changesets with %d changes to %d files%s\n"
8124 msgstr ""
8152 msgstr ""
8125
8153
8126 msgid "updating the branch cache\n"
8154 msgid "updating the branch cache\n"
8127 msgstr ""
8155 msgstr ""
8128
8156
8129 msgid "Unexpected response from remote server:"
8157 msgid "Unexpected response from remote server:"
8130 msgstr ""
8158 msgstr ""
8131
8159
8132 msgid "operation forbidden by server"
8160 msgid "operation forbidden by server"
8133 msgstr ""
8161 msgstr ""
8134
8162
8135 msgid "locking the remote repository failed"
8163 msgid "locking the remote repository failed"
8136 msgstr ""
8164 msgstr ""
8137
8165
8138 msgid "the server sent an unknown error code"
8166 msgid "the server sent an unknown error code"
8139 msgstr ""
8167 msgstr ""
8140
8168
8141 msgid "streaming all changes\n"
8169 msgid "streaming all changes\n"
8142 msgstr ""
8170 msgstr ""
8143
8171
8144 #, python-format
8172 #, python-format
8145 msgid "%d files to transfer, %s of data\n"
8173 msgid "%d files to transfer, %s of data\n"
8146 msgstr ""
8174 msgstr ""
8147
8175
8148 #, python-format
8176 #, python-format
8149 msgid "adding %s (%s)\n"
8177 msgid "adding %s (%s)\n"
8150 msgstr ""
8178 msgstr ""
8151
8179
8152 #, python-format
8180 #, python-format
8153 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8181 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8154 msgstr ""
8182 msgstr ""
8155
8183
8156 msgid "no [smtp]host in hgrc - cannot send mail"
8184 msgid "no [smtp]host in hgrc - cannot send mail"
8157 msgstr ""
8185 msgstr ""
8158
8186
8159 #, python-format
8187 #, python-format
8160 msgid "sending mail: smtp host %s, port %s\n"
8188 msgid "sending mail: smtp host %s, port %s\n"
8161 msgstr ""
8189 msgstr ""
8162
8190
8163 msgid "can't use TLS: Python SSL support not installed"
8191 msgid "can't use TLS: Python SSL support not installed"
8164 msgstr ""
8192 msgstr ""
8165
8193
8166 msgid "(using tls)\n"
8194 msgid "(using tls)\n"
8167 msgstr ""
8195 msgstr ""
8168
8196
8169 #, python-format
8197 #, python-format
8170 msgid "(authenticating to mail server as %s)\n"
8198 msgid "(authenticating to mail server as %s)\n"
8171 msgstr ""
8199 msgstr ""
8172
8200
8173 #, python-format
8201 #, python-format
8174 msgid "sending mail: %s\n"
8202 msgid "sending mail: %s\n"
8175 msgstr ""
8203 msgstr ""
8176
8204
8177 msgid "smtp specified as email transport, but no smtp host configured"
8205 msgid "smtp specified as email transport, but no smtp host configured"
8178 msgstr ""
8206 msgstr ""
8179
8207
8180 #, python-format
8208 #, python-format
8181 msgid "%r specified as email transport, but not in PATH"
8209 msgid "%r specified as email transport, but not in PATH"
8182 msgstr ""
8210 msgstr ""
8183
8211
8184 #, python-format
8212 #, python-format
8185 msgid "ignoring invalid sendcharset: %s\n"
8213 msgid "ignoring invalid sendcharset: %s\n"
8186 msgstr ""
8214 msgstr ""
8187
8215
8188 #, python-format
8216 #, python-format
8189 msgid "invalid email address: %s"
8217 msgid "invalid email address: %s"
8190 msgstr ""
8218 msgstr ""
8191
8219
8192 #, python-format
8220 #, python-format
8193 msgid "invalid local address: %s"
8221 msgid "invalid local address: %s"
8194 msgstr ""
8222 msgstr ""
8195
8223
8196 #, python-format
8224 #, python-format
8197 msgid "failed to remove %s from manifest"
8225 msgid "failed to remove %s from manifest"
8198 msgstr ""
8226 msgstr ""
8199
8227
8200 #, python-format
8228 #, python-format
8201 msgid "diff context lines count must be an integer, not %r"
8229 msgid "diff context lines count must be an integer, not %r"
8202 msgstr ""
8230 msgstr ""
8203
8231
8204 #, python-format
8232 #, python-format
8205 msgid ""
8233 msgid ""
8206 "untracked file in working directory differs from file in requested revision: "
8234 "untracked file in working directory differs from file in requested revision: "
8207 "'%s'"
8235 "'%s'"
8208 msgstr ""
8236 msgstr ""
8209
8237
8210 #, python-format
8238 #, python-format
8211 msgid "case-folding collision between %s and %s"
8239 msgid "case-folding collision between %s and %s"
8212 msgstr ""
8240 msgstr ""
8213
8241
8214 #, python-format
8242 #, python-format
8215 msgid ""
8243 msgid ""
8216 " conflicting flags for %s\n"
8244 " conflicting flags for %s\n"
8217 "(n)one, e(x)ec or sym(l)ink?"
8245 "(n)one, e(x)ec or sym(l)ink?"
8218 msgstr ""
8246 msgstr ""
8219
8247
8220 msgid "&None"
8248 msgid "&None"
8221 msgstr ""
8249 msgstr ""
8222
8250
8223 msgid "E&xec"
8251 msgid "E&xec"
8224 msgstr ""
8252 msgstr ""
8225
8253
8226 msgid "Sym&link"
8254 msgid "Sym&link"
8227 msgstr ""
8255 msgstr ""
8228
8256
8229 msgid "resolving manifests\n"
8257 msgid "resolving manifests\n"
8230 msgstr ""
8258 msgstr ""
8231
8259
8232 #, python-format
8260 #, python-format
8233 msgid " overwrite %s partial %s\n"
8261 msgid " overwrite %s partial %s\n"
8234 msgstr ""
8262 msgstr ""
8235
8263
8236 #, python-format
8264 #, python-format
8237 msgid " ancestor %s local %s remote %s\n"
8265 msgid " ancestor %s local %s remote %s\n"
8238 msgstr ""
8266 msgstr ""
8239
8267
8240 #, python-format
8268 #, python-format
8241 msgid ""
8269 msgid ""
8242 " local changed %s which remote deleted\n"
8270 " local changed %s which remote deleted\n"
8243 "use (c)hanged version or (d)elete?"
8271 "use (c)hanged version or (d)elete?"
8244 msgstr ""
8272 msgstr ""
8245
8273
8246 msgid "&Changed"
8274 msgid "&Changed"
8247 msgstr ""
8275 msgstr ""
8248
8276
8249 msgid "&Delete"
8277 msgid "&Delete"
8250 msgstr ""
8278 msgstr ""
8251
8279
8252 msgid "c"
8280 msgid "c"
8253 msgstr ""
8281 msgstr ""
8254
8282
8255 #, python-format
8283 #, python-format
8256 msgid ""
8284 msgid ""
8257 "remote changed %s which local deleted\n"
8285 "remote changed %s which local deleted\n"
8258 "use (c)hanged version or leave (d)eleted?"
8286 "use (c)hanged version or leave (d)eleted?"
8259 msgstr ""
8287 msgstr ""
8260
8288
8261 msgid "&Deleted"
8289 msgid "&Deleted"
8262 msgstr ""
8290 msgstr ""
8263
8291
8264 #, python-format
8292 #, python-format
8265 msgid "preserving %s for resolve of %s\n"
8293 msgid "preserving %s for resolve of %s\n"
8266 msgstr ""
8294 msgstr ""
8267
8295
8268 #, python-format
8296 #, python-format
8269 msgid "update failed to remove %s: %s!\n"
8297 msgid "update failed to remove %s: %s!\n"
8270 msgstr ""
8298 msgstr ""
8271
8299
8272 #, python-format
8300 #, python-format
8273 msgid "getting %s\n"
8301 msgid "getting %s\n"
8274 msgstr ""
8302 msgstr ""
8275
8303
8276 #, python-format
8304 #, python-format
8277 msgid "getting %s to %s\n"
8305 msgid "getting %s to %s\n"
8278 msgstr ""
8306 msgstr ""
8279
8307
8280 #, python-format
8308 #, python-format
8281 msgid "warning: detected divergent renames of %s to:\n"
8309 msgid "warning: detected divergent renames of %s to:\n"
8282 msgstr ""
8310 msgstr ""
8283
8311
8284 #, python-format
8312 #, python-format
8285 msgid "branch %s not found"
8313 msgid "branch %s not found"
8286 msgstr ""
8314 msgstr ""
8287
8315
8288 msgid "can't merge with ancestor"
8316 msgid "can't merge with ancestor"
8289 msgstr ""
8317 msgstr ""
8290
8318
8291 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8319 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8292 msgstr ""
8320 msgstr ""
8293
8321
8294 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8322 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8295 msgstr ""
8323 msgstr ""
8296
8324
8297 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8325 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8298 msgstr ""
8326 msgstr ""
8299
8327
8300 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8328 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8301 msgstr ""
8329 msgstr ""
8302
8330
8303 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8331 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8304 msgstr ""
8332 msgstr ""
8305
8333
8306 #, python-format
8334 #, python-format
8307 msgid "cannot create %s: destination already exists"
8335 msgid "cannot create %s: destination already exists"
8308 msgstr ""
8336 msgstr ""
8309
8337
8310 #, python-format
8338 #, python-format
8311 msgid "cannot create %s: unable to create destination directory"
8339 msgid "cannot create %s: unable to create destination directory"
8312 msgstr ""
8340 msgstr ""
8313
8341
8314 #, python-format
8342 #, python-format
8315 msgid "found patch at byte %d\n"
8343 msgid "found patch at byte %d\n"
8316 msgstr ""
8344 msgstr ""
8317
8345
8318 msgid "patch generated by hg export\n"
8346 msgid "patch generated by hg export\n"
8319 msgstr ""
8347 msgstr ""
8320
8348
8321 #, python-format
8349 #, python-format
8322 msgid "unable to find '%s' for patching\n"
8350 msgid "unable to find '%s' for patching\n"
8323 msgstr ""
8351 msgstr ""
8324
8352
8325 #, python-format
8353 #, python-format
8326 msgid "patching file %s\n"
8354 msgid "patching file %s\n"
8327 msgstr ""
8355 msgstr ""
8328
8356
8329 #, python-format
8357 #, python-format
8330 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8358 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8331 msgstr ""
8359 msgstr ""
8332
8360
8333 #, python-format
8361 #, python-format
8334 msgid "bad hunk #%d %s (%d %d %d %d)"
8362 msgid "bad hunk #%d %s (%d %d %d %d)"
8335 msgstr ""
8363 msgstr ""
8336
8364
8337 #, python-format
8365 #, python-format
8338 msgid "file %s already exists\n"
8366 msgid "file %s already exists\n"
8339 msgstr ""
8367 msgstr ""
8340
8368
8341 #, python-format
8369 #, python-format
8342 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8370 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8343 msgstr ""
8371 msgstr ""
8344
8372
8345 #, python-format
8373 #, python-format
8346 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8374 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8347 msgstr ""
8375 msgstr ""
8348
8376
8349 #, python-format
8377 #, python-format
8350 msgid "Hunk #%d FAILED at %d\n"
8378 msgid "Hunk #%d FAILED at %d\n"
8351 msgstr ""
8379 msgstr ""
8352
8380
8353 #, python-format
8381 #, python-format
8354 msgid "bad hunk #%d"
8382 msgid "bad hunk #%d"
8355 msgstr ""
8383 msgstr ""
8356
8384
8357 #, python-format
8385 #, python-format
8358 msgid "bad hunk #%d old text line %d"
8386 msgid "bad hunk #%d old text line %d"
8359 msgstr ""
8387 msgstr ""
8360
8388
8361 msgid "could not extract binary patch"
8389 msgid "could not extract binary patch"
8362 msgstr ""
8390 msgstr ""
8363
8391
8364 #, python-format
8392 #, python-format
8365 msgid "binary patch is %d bytes, not %d"
8393 msgid "binary patch is %d bytes, not %d"
8366 msgstr ""
8394 msgstr ""
8367
8395
8368 #, python-format
8396 #, python-format
8369 msgid "unable to strip away %d dirs from %s"
8397 msgid "unable to strip away %d dirs from %s"
8370 msgstr ""
8398 msgstr ""
8371
8399
8372 msgid "undefined source and destination files"
8400 msgid "undefined source and destination files"
8373 msgstr ""
8401 msgstr ""
8374
8402
8375 #, python-format
8403 #, python-format
8376 msgid "malformed patch %s %s"
8404 msgid "malformed patch %s %s"
8377 msgstr ""
8405 msgstr ""
8378
8406
8379 #, python-format
8407 #, python-format
8380 msgid "unsupported parser state: %s"
8408 msgid "unsupported parser state: %s"
8381 msgstr ""
8409 msgstr ""
8382
8410
8383 #, python-format
8411 #, python-format
8384 msgid "patch command failed: %s"
8412 msgid "patch command failed: %s"
8385 msgstr ""
8413 msgstr ""
8386
8414
8387 #, python-format
8415 #, python-format
8388 msgid "Unsupported line endings type: %s"
8416 msgid "Unsupported line endings type: %s"
8389 msgstr ""
8417 msgstr ""
8390
8418
8391 #, python-format
8419 #, python-format
8392 msgid "no valid hunks found; trying with %r instead\n"
8420 msgid "no valid hunks found; trying with %r instead\n"
8393 msgstr ""
8421 msgstr ""
8394
8422
8395 #, python-format
8423 #, python-format
8396 msgid "exited with status %d"
8424 msgid "exited with status %d"
8397 msgstr ""
8425 msgstr ""
8398
8426
8399 #, python-format
8427 #, python-format
8400 msgid "killed by signal %d"
8428 msgid "killed by signal %d"
8401 msgstr ""
8429 msgstr ""
8402
8430
8403 #, python-format
8431 #, python-format
8404 msgid "stopped by signal %d"
8432 msgid "stopped by signal %d"
8405 msgstr ""
8433 msgstr ""
8406
8434
8407 msgid "invalid exit code"
8435 msgid "invalid exit code"
8408 msgstr ""
8436 msgstr ""
8409
8437
8410 #, python-format
8438 #, python-format
8411 msgid "saving bundle to %s\n"
8439 msgid "saving bundle to %s\n"
8412 msgstr ""
8440 msgstr ""
8413
8441
8414 msgid "adding branch\n"
8442 msgid "adding branch\n"
8415 msgstr ""
8443 msgstr ""
8416
8444
8417 #, python-format
8445 #, python-format
8418 msgid "cannot %s; remote repository does not support the %r capability"
8446 msgid "cannot %s; remote repository does not support the %r capability"
8419 msgstr ""
8447 msgstr ""
8420
8448
8421 #, python-format
8449 #, python-format
8422 msgid "unknown compression type %r"
8450 msgid "unknown compression type %r"
8423 msgstr ""
8451 msgstr ""
8424
8452
8425 #, python-format
8453 #, python-format
8426 msgid "index %s unknown flags %#04x for format v0"
8454 msgid "index %s unknown flags %#04x for format v0"
8427 msgstr ""
8455 msgstr ""
8428
8456
8429 #, python-format
8457 #, python-format
8430 msgid "index %s unknown flags %#04x for revlogng"
8458 msgid "index %s unknown flags %#04x for revlogng"
8431 msgstr ""
8459 msgstr ""
8432
8460
8433 #, python-format
8461 #, python-format
8434 msgid "index %s unknown format %d"
8462 msgid "index %s unknown format %d"
8435 msgstr ""
8463 msgstr ""
8436
8464
8437 #, python-format
8465 #, python-format
8438 msgid "index %s is corrupted"
8466 msgid "index %s is corrupted"
8439 msgstr ""
8467 msgstr ""
8440
8468
8441 msgid "no node"
8469 msgid "no node"
8442 msgstr ""
8470 msgstr ""
8443
8471
8444 msgid "ambiguous identifier"
8472 msgid "ambiguous identifier"
8445 msgstr ""
8473 msgstr ""
8446
8474
8447 msgid "no match found"
8475 msgid "no match found"
8448 msgstr ""
8476 msgstr ""
8449
8477
8450 #, python-format
8478 #, python-format
8451 msgid "incompatible revision flag %x"
8479 msgid "incompatible revision flag %x"
8452 msgstr ""
8480 msgstr ""
8453
8481
8454 #, python-format
8482 #, python-format
8455 msgid "%s not found in the transaction"
8483 msgid "%s not found in the transaction"
8456 msgstr ""
8484 msgstr ""
8457
8485
8458 msgid "unknown base"
8486 msgid "unknown base"
8459 msgstr ""
8487 msgstr ""
8460
8488
8461 msgid "consistency error adding group"
8489 msgid "consistency error adding group"
8462 msgstr ""
8490 msgstr ""
8463
8491
8464 #, python-format
8492 #, python-format
8465 msgid "%s looks like a binary file."
8493 msgid "%s looks like a binary file."
8466 msgstr ""
8494 msgstr ""
8467
8495
8468 msgid "can only specify two labels."
8496 msgid "can only specify two labels."
8469 msgstr ""
8497 msgstr ""
8470
8498
8471 msgid "warning: conflicts during merge.\n"
8499 msgid "warning: conflicts during merge.\n"
8472 msgstr ""
8500 msgstr ""
8473
8501
8474 #, python-format
8502 #, python-format
8475 msgid "couldn't parse location %s"
8503 msgid "couldn't parse location %s"
8476 msgstr ""
8504 msgstr ""
8477
8505
8478 msgid "could not create remote repo"
8506 msgid "could not create remote repo"
8479 msgstr ""
8507 msgstr ""
8480
8508
8481 msgid "remote: "
8509 msgid "remote: "
8482 msgstr ""
8510 msgstr ""
8483
8511
8484 msgid "no suitable response from remote hg"
8512 msgid "no suitable response from remote hg"
8485 msgstr ""
8513 msgstr ""
8486
8514
8487 #, python-format
8515 #, python-format
8488 msgid "push refused: %s"
8516 msgid "push refused: %s"
8489 msgstr ""
8517 msgstr ""
8490
8518
8491 msgid "unsynced changes"
8519 msgid "unsynced changes"
8492 msgstr ""
8520 msgstr ""
8493
8521
8494 msgid "cannot lock static-http repository"
8522 msgid "cannot lock static-http repository"
8495 msgstr ""
8523 msgstr ""
8496
8524
8497 msgid "cannot create new static-http repository"
8525 msgid "cannot create new static-http repository"
8498 msgstr ""
8526 msgstr ""
8499
8527
8500 #, python-format
8528 #, python-format
8501 msgid "invalid entry in fncache, line %s"
8529 msgid "invalid entry in fncache, line %s"
8502 msgstr ""
8530 msgstr ""
8503
8531
8504 msgid "scanning\n"
8532 msgid "scanning\n"
8505 msgstr ""
8533 msgstr ""
8506
8534
8507 #, python-format
8535 #, python-format
8508 msgid "%d files, %d bytes to transfer\n"
8536 msgid "%d files, %d bytes to transfer\n"
8509 msgstr ""
8537 msgstr ""
8510
8538
8511 #, python-format
8539 #, python-format
8512 msgid "sending %s (%d bytes)\n"
8540 msgid "sending %s (%d bytes)\n"
8513 msgstr ""
8541 msgstr ""
8514
8542
8515 #, python-format
8543 #, python-format
8516 msgid ""
8544 msgid ""
8517 " subrepository sources for %s differ\n"
8545 " subrepository sources for %s differ\n"
8518 "use (l)ocal source (%s) or (r)emote source (%s)?"
8546 "use (l)ocal source (%s) or (r)emote source (%s)?"
8519 msgstr ""
8547 msgstr ""
8520
8548
8521 msgid "&Remote"
8549 msgid "&Remote"
8522 msgstr ""
8550 msgstr ""
8523
8551
8524 msgid "r"
8552 msgid "r"
8525 msgstr ""
8553 msgstr ""
8526
8554
8527 #, python-format
8555 #, python-format
8528 msgid ""
8556 msgid ""
8529 " local changed subrepository %s which remote removed\n"
8557 " local changed subrepository %s which remote removed\n"
8530 "use (c)hanged version or (d)elete?"
8558 "use (c)hanged version or (d)elete?"
8531 msgstr ""
8559 msgstr ""
8532
8560
8533 #, python-format
8561 #, python-format
8534 msgid ""
8562 msgid ""
8535 " remote changed subrepository %s which local removed\n"
8563 " remote changed subrepository %s which local removed\n"
8536 "use (c)hanged version or (d)elete?"
8564 "use (c)hanged version or (d)elete?"
8537 msgstr ""
8565 msgstr ""
8538
8566
8539 #, python-format
8567 #, python-format
8540 msgid "removing subrepo %s\n"
8568 msgid "removing subrepo %s\n"
8541 msgstr ""
8569 msgstr ""
8542
8570
8543 #, python-format
8571 #, python-format
8544 msgid "pulling subrepo %s\n"
8572 msgid "pulling subrepo %s\n"
8545 msgstr ""
8573 msgstr ""
8546
8574
8547 #, python-format
8575 #, python-format
8548 msgid "pushing subrepo %s\n"
8576 msgid "pushing subrepo %s\n"
8549 msgstr ""
8577 msgstr ""
8550
8578
8551 msgid "unmatched quotes"
8579 msgid "unmatched quotes"
8552 msgstr ""
8580 msgstr ""
8553
8581
8554 #, python-format
8582 #, python-format
8555 msgid "error expanding '%s%%%s'"
8583 msgid "error expanding '%s%%%s'"
8556 msgstr ""
8584 msgstr ""
8557
8585
8558 #, python-format
8586 #, python-format
8559 msgid "unknown filter '%s'"
8587 msgid "unknown filter '%s'"
8560 msgstr ""
8588 msgstr ""
8561
8589
8562 #, python-format
8590 #, python-format
8563 msgid "style not found: %s"
8591 msgid "style not found: %s"
8564 msgstr ""
8592 msgstr ""
8565
8593
8566 #, python-format
8594 #, python-format
8567 msgid "template file %s: %s"
8595 msgid "template file %s: %s"
8568 msgstr ""
8596 msgstr ""
8569
8597
8570 msgid "cannot use transaction when it is already committed/aborted"
8598 msgid "cannot use transaction when it is already committed/aborted"
8571 msgstr ""
8599 msgstr ""
8572
8600
8573 #, python-format
8601 #, python-format
8574 msgid "failed to truncate %s\n"
8602 msgid "failed to truncate %s\n"
8575 msgstr ""
8603 msgstr ""
8576
8604
8577 msgid "transaction abort!\n"
8605 msgid "transaction abort!\n"
8578 msgstr ""
8606 msgstr ""
8579
8607
8580 msgid "rollback completed\n"
8608 msgid "rollback completed\n"
8581 msgstr ""
8609 msgstr ""
8582
8610
8583 msgid "rollback failed - please run hg recover\n"
8611 msgid "rollback failed - please run hg recover\n"
8584 msgstr ""
8612 msgstr ""
8585
8613
8586 #, python-format
8614 #, python-format
8587 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8615 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8588 msgstr ""
8616 msgstr ""
8589
8617
8590 #, python-format
8618 #, python-format
8591 msgid "Ignored: %s\n"
8619 msgid "Ignored: %s\n"
8592 msgstr ""
8620 msgstr ""
8593
8621
8594 #, python-format
8622 #, python-format
8595 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8623 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8596 msgstr ""
8624 msgstr ""
8597
8625
8598 #, python-format
8626 #, python-format
8599 msgid "%s.%s not a boolean ('%s')"
8627 msgid "%s.%s not a boolean ('%s')"
8600 msgstr ""
8628 msgstr ""
8601
8629
8602 msgid "enter a commit username:"
8630 msgid "enter a commit username:"
8603 msgstr ""
8631 msgstr ""
8604
8632
8605 #, python-format
8633 #, python-format
8606 msgid "No username found, using '%s' instead\n"
8634 msgid "No username found, using '%s' instead\n"
8607 msgstr ""
8635 msgstr ""
8608
8636
8609 msgid "Please specify a username."
8637 msgid "Please specify a username."
8610 msgstr ""
8638 msgstr ""
8611
8639
8612 #, python-format
8640 #, python-format
8613 msgid "username %s contains a newline\n"
8641 msgid "username %s contains a newline\n"
8614 msgstr ""
8642 msgstr ""
8615
8643
8616 msgid "unrecognized response\n"
8644 msgid "unrecognized response\n"
8617 msgstr ""
8645 msgstr ""
8618
8646
8619 msgid "response expected"
8647 msgid "response expected"
8620 msgstr ""
8648 msgstr ""
8621
8649
8622 msgid "password: "
8650 msgid "password: "
8623 msgstr ""
8651 msgstr ""
8624
8652
8625 msgid "edit failed"
8653 msgid "edit failed"
8626 msgstr ""
8654 msgstr ""
8627
8655
8628 msgid "http authorization required"
8656 msgid "http authorization required"
8629 msgstr ""
8657 msgstr ""
8630
8658
8631 msgid "http authorization required\n"
8659 msgid "http authorization required\n"
8632 msgstr ""
8660 msgstr ""
8633
8661
8634 #, python-format
8662 #, python-format
8635 msgid "realm: %s\n"
8663 msgid "realm: %s\n"
8636 msgstr ""
8664 msgstr ""
8637
8665
8638 #, python-format
8666 #, python-format
8639 msgid "user: %s\n"
8667 msgid "user: %s\n"
8640 msgstr ""
8668 msgstr ""
8641
8669
8642 msgid "user:"
8670 msgid "user:"
8643 msgstr ""
8671 msgstr ""
8644
8672
8645 #, python-format
8673 #, python-format
8646 msgid "http auth: user %s, password %s\n"
8674 msgid "http auth: user %s, password %s\n"
8647 msgstr ""
8675 msgstr ""
8648
8676
8649 #, python-format
8677 #, python-format
8650 msgid "proxying through http://%s:%s\n"
8678 msgid "proxying through http://%s:%s\n"
8651 msgstr ""
8679 msgstr ""
8652
8680
8653 #, python-format
8681 #, python-format
8654 msgid "command '%s' failed: %s"
8682 msgid "command '%s' failed: %s"
8655 msgstr ""
8683 msgstr ""
8656
8684
8657 #, python-format
8685 #, python-format
8658 msgid "path contains illegal component: %s"
8686 msgid "path contains illegal component: %s"
8659 msgstr ""
8687 msgstr ""
8660
8688
8661 #, python-format
8689 #, python-format
8662 msgid "path %r is inside repo %r"
8690 msgid "path %r is inside repo %r"
8663 msgstr ""
8691 msgstr ""
8664
8692
8665 #, python-format
8693 #, python-format
8666 msgid "path %r traverses symbolic link %r"
8694 msgid "path %r traverses symbolic link %r"
8667 msgstr ""
8695 msgstr ""
8668
8696
8669 msgid "Hardlinks not supported"
8697 msgid "Hardlinks not supported"
8670 msgstr ""
8698 msgstr ""
8671
8699
8672 #, python-format
8700 #, python-format
8673 msgid "could not symlink to %r: %s"
8701 msgid "could not symlink to %r: %s"
8674 msgstr ""
8702 msgstr ""
8675
8703
8676 #, python-format
8704 #, python-format
8677 msgid "invalid date: %r "
8705 msgid "invalid date: %r "
8678 msgstr ""
8706 msgstr ""
8679
8707
8680 #, python-format
8708 #, python-format
8681 msgid "date exceeds 32 bits: %d"
8709 msgid "date exceeds 32 bits: %d"
8682 msgstr ""
8710 msgstr ""
8683
8711
8684 #, python-format
8712 #, python-format
8685 msgid "impossible time zone offset: %d"
8713 msgid "impossible time zone offset: %d"
8686 msgstr ""
8714 msgstr ""
8687
8715
8688 #, python-format
8716 #, python-format
8689 msgid "invalid day spec: %s"
8717 msgid "invalid day spec: %s"
8690 msgstr ""
8718 msgstr ""
8691
8719
8692 #, python-format
8720 #, python-format
8693 msgid "%.0f GB"
8721 msgid "%.0f GB"
8694 msgstr ""
8722 msgstr ""
8695
8723
8696 #, python-format
8724 #, python-format
8697 msgid "%.1f GB"
8725 msgid "%.1f GB"
8698 msgstr ""
8726 msgstr ""
8699
8727
8700 #, python-format
8728 #, python-format
8701 msgid "%.2f GB"
8729 msgid "%.2f GB"
8702 msgstr ""
8730 msgstr ""
8703
8731
8704 #, python-format
8732 #, python-format
8705 msgid "%.0f MB"
8733 msgid "%.0f MB"
8706 msgstr ""
8734 msgstr ""
8707
8735
8708 #, python-format
8736 #, python-format
8709 msgid "%.1f MB"
8737 msgid "%.1f MB"
8710 msgstr ""
8738 msgstr ""
8711
8739
8712 #, python-format
8740 #, python-format
8713 msgid "%.2f MB"
8741 msgid "%.2f MB"
8714 msgstr ""
8742 msgstr ""
8715
8743
8716 #, python-format
8744 #, python-format
8717 msgid "%.0f KB"
8745 msgid "%.0f KB"
8718 msgstr ""
8746 msgstr ""
8719
8747
8720 #, python-format
8748 #, python-format
8721 msgid "%.1f KB"
8749 msgid "%.1f KB"
8722 msgstr ""
8750 msgstr ""
8723
8751
8724 #, python-format
8752 #, python-format
8725 msgid "%.2f KB"
8753 msgid "%.2f KB"
8726 msgstr ""
8754 msgstr ""
8727
8755
8728 #, python-format
8756 #, python-format
8729 msgid "%.0f bytes"
8757 msgid "%.0f bytes"
8730 msgstr ""
8758 msgstr ""
8731
8759
8732 msgid "cannot verify bundle or remote repos"
8760 msgid "cannot verify bundle or remote repos"
8733 msgstr ""
8761 msgstr ""
8734
8762
8735 msgid "interrupted"
8763 msgid "interrupted"
8736 msgstr ""
8764 msgstr ""
8737
8765
8738 #, python-format
8766 #, python-format
8739 msgid "empty or missing %s"
8767 msgid "empty or missing %s"
8740 msgstr ""
8768 msgstr ""
8741
8769
8742 #, python-format
8770 #, python-format
8743 msgid "data length off by %d bytes"
8771 msgid "data length off by %d bytes"
8744 msgstr ""
8772 msgstr ""
8745
8773
8746 #, python-format
8774 #, python-format
8747 msgid "index contains %d extra bytes"
8775 msgid "index contains %d extra bytes"
8748 msgstr ""
8776 msgstr ""
8749
8777
8750 #, python-format
8778 #, python-format
8751 msgid "warning: `%s' uses revlog format 1"
8779 msgid "warning: `%s' uses revlog format 1"
8752 msgstr ""
8780 msgstr ""
8753
8781
8754 #, python-format
8782 #, python-format
8755 msgid "warning: `%s' uses revlog format 0"
8783 msgid "warning: `%s' uses revlog format 0"
8756 msgstr ""
8784 msgstr ""
8757
8785
8758 #, python-format
8786 #, python-format
8759 msgid "rev %d points to nonexistent changeset %d"
8787 msgid "rev %d points to nonexistent changeset %d"
8760 msgstr ""
8788 msgstr ""
8761
8789
8762 #, python-format
8790 #, python-format
8763 msgid "rev %d points to unexpected changeset %d"
8791 msgid "rev %d points to unexpected changeset %d"
8764 msgstr ""
8792 msgstr ""
8765
8793
8766 #, python-format
8794 #, python-format
8767 msgid " (expected %s)"
8795 msgid " (expected %s)"
8768 msgstr ""
8796 msgstr ""
8769
8797
8770 #, python-format
8798 #, python-format
8771 msgid "unknown parent 1 %s of %s"
8799 msgid "unknown parent 1 %s of %s"
8772 msgstr ""
8800 msgstr ""
8773
8801
8774 #, python-format
8802 #, python-format
8775 msgid "unknown parent 2 %s of %s"
8803 msgid "unknown parent 2 %s of %s"
8776 msgstr ""
8804 msgstr ""
8777
8805
8778 #, python-format
8806 #, python-format
8779 msgid "checking parents of %s"
8807 msgid "checking parents of %s"
8780 msgstr ""
8808 msgstr ""
8781
8809
8782 #, python-format
8810 #, python-format
8783 msgid "duplicate revision %d (%d)"
8811 msgid "duplicate revision %d (%d)"
8784 msgstr ""
8812 msgstr ""
8785
8813
8786 #, python-format
8814 #, python-format
8787 msgid "repository uses revlog format %d\n"
8815 msgid "repository uses revlog format %d\n"
8788 msgstr ""
8816 msgstr ""
8789
8817
8790 msgid "checking changesets\n"
8818 msgid "checking changesets\n"
8791 msgstr ""
8819 msgstr ""
8792
8820
8793 #, python-format
8821 #, python-format
8794 msgid "unpacking changeset %s"
8822 msgid "unpacking changeset %s"
8795 msgstr ""
8823 msgstr ""
8796
8824
8797 msgid "checking manifests\n"
8825 msgid "checking manifests\n"
8798 msgstr ""
8826 msgstr ""
8799
8827
8800 #, python-format
8828 #, python-format
8801 msgid "%s not in changesets"
8829 msgid "%s not in changesets"
8802 msgstr ""
8830 msgstr ""
8803
8831
8804 msgid "file without name in manifest"
8832 msgid "file without name in manifest"
8805 msgstr ""
8833 msgstr ""
8806
8834
8807 #, python-format
8835 #, python-format
8808 msgid "reading manifest delta %s"
8836 msgid "reading manifest delta %s"
8809 msgstr ""
8837 msgstr ""
8810
8838
8811 msgid "crosschecking files in changesets and manifests\n"
8839 msgid "crosschecking files in changesets and manifests\n"
8812 msgstr ""
8840 msgstr ""
8813
8841
8814 #, python-format
8842 #, python-format
8815 msgid "changeset refers to unknown manifest %s"
8843 msgid "changeset refers to unknown manifest %s"
8816 msgstr ""
8844 msgstr ""
8817
8845
8818 msgid "in changeset but not in manifest"
8846 msgid "in changeset but not in manifest"
8819 msgstr ""
8847 msgstr ""
8820
8848
8821 msgid "in manifest but not in changeset"
8849 msgid "in manifest but not in changeset"
8822 msgstr ""
8850 msgstr ""
8823
8851
8824 msgid "checking files\n"
8852 msgid "checking files\n"
8825 msgstr ""
8853 msgstr ""
8826
8854
8827 #, python-format
8855 #, python-format
8828 msgid "cannot decode filename '%s'"
8856 msgid "cannot decode filename '%s'"
8829 msgstr ""
8857 msgstr ""
8830
8858
8831 #, python-format
8859 #, python-format
8832 msgid "broken revlog! (%s)"
8860 msgid "broken revlog! (%s)"
8833 msgstr ""
8861 msgstr ""
8834
8862
8835 msgid "missing revlog!"
8863 msgid "missing revlog!"
8836 msgstr ""
8864 msgstr ""
8837
8865
8838 #, python-format
8866 #, python-format
8839 msgid "%s not in manifests"
8867 msgid "%s not in manifests"
8840 msgstr ""
8868 msgstr ""
8841
8869
8842 #, python-format
8870 #, python-format
8843 msgid "unpacked size is %s, %s expected"
8871 msgid "unpacked size is %s, %s expected"
8844 msgstr ""
8872 msgstr ""
8845
8873
8846 #, python-format
8874 #, python-format
8847 msgid "unpacking %s"
8875 msgid "unpacking %s"
8848 msgstr ""
8876 msgstr ""
8849
8877
8850 #, python-format
8878 #, python-format
8851 msgid "empty or missing copy source revlog %s:%s"
8879 msgid "empty or missing copy source revlog %s:%s"
8852 msgstr ""
8880 msgstr ""
8853
8881
8854 #, python-format
8882 #, python-format
8855 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8883 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
8856 msgstr ""
8884 msgstr ""
8857
8885
8858 #, python-format
8886 #, python-format
8859 msgid "checking rename of %s"
8887 msgid "checking rename of %s"
8860 msgstr ""
8888 msgstr ""
8861
8889
8862 #, python-format
8890 #, python-format
8863 msgid "%s in manifests not found"
8891 msgid "%s in manifests not found"
8864 msgstr ""
8892 msgstr ""
8865
8893
8866 #, python-format
8894 #, python-format
8867 msgid "warning: orphan revlog '%s'"
8895 msgid "warning: orphan revlog '%s'"
8868 msgstr ""
8896 msgstr ""
8869
8897
8870 #, python-format
8898 #, python-format
8871 msgid "%d files, %d changesets, %d total revisions\n"
8899 msgid "%d files, %d changesets, %d total revisions\n"
8872 msgstr ""
8900 msgstr ""
8873
8901
8874 #, python-format
8902 #, python-format
8875 msgid "%d warnings encountered!\n"
8903 msgid "%d warnings encountered!\n"
8876 msgstr ""
8904 msgstr ""
8877
8905
8878 #, python-format
8906 #, python-format
8879 msgid "%d integrity errors encountered!\n"
8907 msgid "%d integrity errors encountered!\n"
8880 msgstr ""
8908 msgstr ""
8881
8909
8882 #, python-format
8910 #, python-format
8883 msgid "(first damaged changeset appears to be %d)\n"
8911 msgid "(first damaged changeset appears to be %d)\n"
8884 msgstr ""
8912 msgstr ""
8885
8913
8886 msgid "user name not available - set USERNAME environment variable"
8914 msgid "user name not available - set USERNAME environment variable"
8887 msgstr ""
8915 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now