##// END OF EJS Templates
l10n: Updates to French (fr) translation...
bttfmcf -
r10805:318da45f default
parent child Browse files
Show More
@@ -1,8900 +1,8821 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-10-25 12:38+0100\n"
89 "POT-Creation-Date: 2009-10-25 12:38+0100\n"
90 "PO-Revision-Date: 2009-10-25 12:43+0100\n"
90 "PO-Revision-Date: 2009-10-25 12:43+0100\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 "OPTIONS"
104
104
105 msgid "COMMANDS"
105 msgid "COMMANDS"
106 msgstr ""
106 msgstr "COMMANDES"
107
107
108 #, fuzzy
108 #, fuzzy
109 msgid ""
109 msgid ""
110 " options:\n"
110 " options:\n"
111 "\n"
111 "\n"
112 msgstr "options :\n"
112 msgstr "options :\n"
113
113
114 #, python-format
114 #, python-format
115 msgid ""
115 msgid ""
116 " aliases: %s\n"
116 " aliases: %s\n"
117 "\n"
117 "\n"
118 msgstr ""
118 msgstr ""
119
119
120 msgid ""
120 msgid ""
121 "Some commands allow the user to specify a date, e.g.:\n"
121 "Some commands allow the user to specify a date, e.g.:\n"
122 "\n"
122 "\n"
123 "- backout, commit, import, tag: Specify the commit date.\n"
123 "- backout, commit, import, tag: Specify the commit date.\n"
124 "- log, revert, update: Select revision(s) by date.\n"
124 "- log, revert, update: Select revision(s) by date.\n"
125 "\n"
125 "\n"
126 "Many date formats are valid. Here are some examples::\n"
126 "Many date formats are valid. Here are some examples::\n"
127 "\n"
127 "\n"
128 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
128 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
129 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
129 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
130 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
130 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
131 " \"Dec 6\" (midnight)\n"
131 " \"Dec 6\" (midnight)\n"
132 " \"13:18\" (today assumed)\n"
132 " \"13:18\" (today assumed)\n"
133 " \"3:39\" (3:39AM assumed)\n"
133 " \"3:39\" (3:39AM assumed)\n"
134 " \"3:39pm\" (15:39)\n"
134 " \"3:39pm\" (15:39)\n"
135 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
135 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
136 " \"2006-12-6 13:18\"\n"
136 " \"2006-12-6 13:18\"\n"
137 " \"2006-12-6\"\n"
137 " \"2006-12-6\"\n"
138 " \"12-6\"\n"
138 " \"12-6\"\n"
139 " \"12/6\"\n"
139 " \"12/6\"\n"
140 " \"12/6/6\" (Dec 6 2006)\n"
140 " \"12/6/6\" (Dec 6 2006)\n"
141 "\n"
141 "\n"
142 "Lastly, there is Mercurial's internal format::\n"
142 "Lastly, there is Mercurial's internal format::\n"
143 "\n"
143 "\n"
144 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
144 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
145 "\n"
145 "\n"
146 "This is the internal representation format for dates. unixtime is the\n"
146 "This is the internal representation format for dates. unixtime is the\n"
147 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
147 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
148 "the offset of the local timezone, in seconds west of UTC (negative if\n"
148 "the offset of the local timezone, in seconds west of UTC (negative if\n"
149 "the timezone is east of UTC).\n"
149 "the timezone is east of UTC).\n"
150 "\n"
150 "\n"
151 "The log command also accepts date ranges::\n"
151 "The log command also accepts date ranges::\n"
152 "\n"
152 "\n"
153 " \"<{datetime}\" - at or before a given date/time\n"
153 " \"<{datetime}\" - at or before a given date/time\n"
154 " \">{datetime}\" - on or after a given date/time\n"
154 " \">{datetime}\" - on or after a given date/time\n"
155 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
155 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
156 " \"-{days}\" - within a given number of days of today\n"
156 " \"-{days}\" - within a given number of days of today\n"
157 msgstr ""
157 msgstr ""
158
158
159 msgid ""
159 msgid ""
160 "Mercurial's default format for showing changes between two versions of\n"
160 "Mercurial's default format for showing changes between two versions of\n"
161 "a file is compatible with the unified format of GNU diff, which can be\n"
161 "a file is compatible with the unified format of GNU diff, which can be\n"
162 "used by GNU patch and many other standard tools.\n"
162 "used by GNU patch and many other standard tools.\n"
163 "\n"
163 "\n"
164 "While this standard format is often enough, it does not encode the\n"
164 "While this standard format is often enough, it does not encode the\n"
165 "following information:\n"
165 "following information:\n"
166 "\n"
166 "\n"
167 "- executable status and other permission bits\n"
167 "- executable status and other permission bits\n"
168 "- copy or rename information\n"
168 "- copy or rename information\n"
169 "- changes in binary files\n"
169 "- changes in binary files\n"
170 "- creation or deletion of empty files\n"
170 "- creation or deletion of empty files\n"
171 "\n"
171 "\n"
172 "Mercurial also supports the extended diff format from the git VCS\n"
172 "Mercurial also supports the extended diff format from the git VCS\n"
173 "which addresses these limitations. The git diff format is not produced\n"
173 "which addresses these limitations. The git diff format is not produced\n"
174 "by default because a few widespread tools still do not understand this\n"
174 "by default because a few widespread tools still do not understand this\n"
175 "format.\n"
175 "format.\n"
176 "\n"
176 "\n"
177 "This means that when generating diffs from a Mercurial repository\n"
177 "This means that when generating diffs from a Mercurial repository\n"
178 "(e.g. with \"hg export\"), you should be careful about things like file\n"
178 "(e.g. with \"hg export\"), you should be careful about things like file\n"
179 "copies and renames or other things mentioned above, because when\n"
179 "copies and renames or other things mentioned above, because when\n"
180 "applying a standard diff to a different repository, this extra\n"
180 "applying a standard diff to a different repository, this extra\n"
181 "information is lost. Mercurial's internal operations (like push and\n"
181 "information is lost. Mercurial's internal operations (like push and\n"
182 "pull) are not affected by this, because they use an internal binary\n"
182 "pull) are not affected by this, because they use an internal binary\n"
183 "format for communicating changes.\n"
183 "format for communicating changes.\n"
184 "\n"
184 "\n"
185 "To make Mercurial produce the git extended diff format, use the --git\n"
185 "To make Mercurial produce the git extended diff format, use the --git\n"
186 "option available for many commands, or set 'git = True' in the [diff]\n"
186 "option available for many commands, or set 'git = True' in the [diff]\n"
187 "section of your hgrc. You do not need to set this option when\n"
187 "section of your hgrc. You do not need to set this option when\n"
188 "importing diffs in this format or using them in the mq extension.\n"
188 "importing diffs in this format or using them in the mq extension.\n"
189 msgstr ""
189 msgstr ""
190
190
191 msgid ""
191 msgid ""
192 "HG\n"
192 "HG\n"
193 " Path to the 'hg' executable, automatically passed when running\n"
193 " Path to the 'hg' executable, automatically passed when running\n"
194 " hooks, extensions or external tools. If unset or empty, this is\n"
194 " hooks, extensions or external tools. If unset or empty, this is\n"
195 " the hg executable's name if it's frozen, or an executable named\n"
195 " the hg executable's name if it's frozen, or an executable named\n"
196 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
196 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
197 " Windows) is searched.\n"
197 " Windows) is searched.\n"
198 "\n"
198 "\n"
199 "HGEDITOR\n"
199 "HGEDITOR\n"
200 " This is the name of the editor to run when committing. See EDITOR.\n"
200 " This is the name of the editor to run when committing. See EDITOR.\n"
201 "\n"
201 "\n"
202 " (deprecated, use .hgrc)\n"
202 " (deprecated, use .hgrc)\n"
203 "\n"
203 "\n"
204 "HGENCODING\n"
204 "HGENCODING\n"
205 " This overrides the default locale setting detected by Mercurial.\n"
205 " This overrides the default locale setting detected by Mercurial.\n"
206 " This setting is used to convert data including usernames,\n"
206 " This setting is used to convert data including usernames,\n"
207 " changeset descriptions, tag names, and branches. This setting can\n"
207 " changeset descriptions, tag names, and branches. This setting can\n"
208 " be overridden with the --encoding command-line option.\n"
208 " be overridden with the --encoding command-line option.\n"
209 "\n"
209 "\n"
210 "HGENCODINGMODE\n"
210 "HGENCODINGMODE\n"
211 " This sets Mercurial's behavior for handling unknown characters\n"
211 " This sets Mercurial's behavior for handling unknown characters\n"
212 " while transcoding user input. The default is \"strict\", which\n"
212 " while transcoding user input. The default is \"strict\", which\n"
213 " causes Mercurial to abort if it can't map a character. Other\n"
213 " causes Mercurial to abort if it can't map a character. Other\n"
214 " settings include \"replace\", which replaces unknown characters, and\n"
214 " settings include \"replace\", which replaces unknown characters, and\n"
215 " \"ignore\", which drops them. This setting can be overridden with\n"
215 " \"ignore\", which drops them. This setting can be overridden with\n"
216 " the --encodingmode command-line option.\n"
216 " the --encodingmode command-line option.\n"
217 "\n"
217 "\n"
218 "HGMERGE\n"
218 "HGMERGE\n"
219 " An executable to use for resolving merge conflicts. The program\n"
219 " An executable to use for resolving merge conflicts. The program\n"
220 " will be executed with three arguments: local file, remote file,\n"
220 " will be executed with three arguments: local file, remote file,\n"
221 " ancestor file.\n"
221 " ancestor file.\n"
222 "\n"
222 "\n"
223 " (deprecated, use .hgrc)\n"
223 " (deprecated, use .hgrc)\n"
224 "\n"
224 "\n"
225 "HGRCPATH\n"
225 "HGRCPATH\n"
226 " A list of files or directories to search for hgrc files. Item\n"
226 " A list of files or directories to search for hgrc files. Item\n"
227 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
227 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
228 " platform default search path is used. If empty, only the .hg/hgrc\n"
228 " platform default search path is used. If empty, only the .hg/hgrc\n"
229 " from the current repository is read.\n"
229 " from the current repository is read.\n"
230 "\n"
230 "\n"
231 " For each element in HGRCPATH:\n"
231 " For each element in HGRCPATH:\n"
232 "\n"
232 "\n"
233 " - if it's a directory, all files ending with .rc are added\n"
233 " - if it's a directory, all files ending with .rc are added\n"
234 " - otherwise, the file itself will be added\n"
234 " - otherwise, the file itself will be added\n"
235 "\n"
235 "\n"
236 "HGUSER\n"
236 "HGUSER\n"
237 " This is the string used as the author of a commit. If not set,\n"
237 " This is the string used as the author of a commit. If not set,\n"
238 " available values will be considered in this order:\n"
238 " available values will be considered in this order:\n"
239 "\n"
239 "\n"
240 " - HGUSER (deprecated)\n"
240 " - HGUSER (deprecated)\n"
241 " - hgrc files from the HGRCPATH\n"
241 " - hgrc files from the HGRCPATH\n"
242 " - EMAIL\n"
242 " - EMAIL\n"
243 " - interactive prompt\n"
243 " - interactive prompt\n"
244 " - LOGNAME (with '@hostname' appended)\n"
244 " - LOGNAME (with '@hostname' appended)\n"
245 "\n"
245 "\n"
246 " (deprecated, use .hgrc)\n"
246 " (deprecated, use .hgrc)\n"
247 "\n"
247 "\n"
248 "EMAIL\n"
248 "EMAIL\n"
249 " May be used as the author of a commit; see HGUSER.\n"
249 " May be used as the author of a commit; see HGUSER.\n"
250 "\n"
250 "\n"
251 "LOGNAME\n"
251 "LOGNAME\n"
252 " May be used as the author of a commit; see HGUSER.\n"
252 " May be used as the author of a commit; see HGUSER.\n"
253 "\n"
253 "\n"
254 "VISUAL\n"
254 "VISUAL\n"
255 " This is the name of the editor to use when committing. See EDITOR.\n"
255 " This is the name of the editor to use when committing. See EDITOR.\n"
256 "\n"
256 "\n"
257 "EDITOR\n"
257 "EDITOR\n"
258 " Sometimes Mercurial needs to open a text file in an editor for a\n"
258 " Sometimes Mercurial needs to open a text file in an editor for a\n"
259 " user to modify, for example when writing commit messages. The\n"
259 " user to modify, for example when writing commit messages. The\n"
260 " editor it uses is determined by looking at the environment\n"
260 " editor it uses is determined by looking at the environment\n"
261 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
261 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
262 " non-empty one is chosen. If all of them are empty, the editor\n"
262 " non-empty one is chosen. If all of them are empty, the editor\n"
263 " defaults to 'vi'.\n"
263 " defaults to 'vi'.\n"
264 "\n"
264 "\n"
265 "PYTHONPATH\n"
265 "PYTHONPATH\n"
266 " This is used by Python to find imported modules and may need to be\n"
266 " This is used by Python to find imported modules and may need to be\n"
267 " set appropriately if this Mercurial is not installed system-wide.\n"
267 " set appropriately if this Mercurial is not installed system-wide.\n"
268 msgstr ""
268 msgstr ""
269
269
270 #, fuzzy
270 #, fuzzy
271 msgid ""
271 msgid ""
272 "Mercurial has the ability to add new features through the use of\n"
272 "Mercurial has the ability to add new features through the use of\n"
273 "extensions. Extensions may add new commands, add options to\n"
273 "extensions. Extensions may add new commands, add options to\n"
274 "existing commands, change the default behavior of commands, or\n"
274 "existing commands, change the default behavior of commands, or\n"
275 "implement hooks.\n"
275 "implement hooks.\n"
276 "\n"
276 "\n"
277 "Extensions are not loaded by default for a variety of reasons:\n"
277 "Extensions are not loaded by default for a variety of reasons:\n"
278 "they can increase startup overhead; they may be meant for advanced\n"
278 "they can increase startup overhead; they may be meant for advanced\n"
279 "usage only; they may provide potentially dangerous abilities (such\n"
279 "usage only; they may provide potentially dangerous abilities (such\n"
280 "as letting you destroy or modify history); they might not be ready\n"
280 "as letting you destroy or modify history); they might not be ready\n"
281 "for prime time; or they may alter some usual behaviors of stock\n"
281 "for prime time; or they may alter some usual behaviors of stock\n"
282 "Mercurial. It is thus up to the user to activate extensions as\n"
282 "Mercurial. It is thus up to the user to activate extensions as\n"
283 "needed.\n"
283 "needed.\n"
284 "\n"
284 "\n"
285 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
285 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
286 "the Python search path, create an entry for it in your hgrc, like\n"
286 "the Python search path, create an entry for it in your hgrc, like\n"
287 "this::\n"
287 "this::\n"
288 "\n"
288 "\n"
289 " [extensions]\n"
289 " [extensions]\n"
290 " foo =\n"
290 " foo =\n"
291 "\n"
291 "\n"
292 "You may also specify the full path to an extension::\n"
292 "You may also specify the full path to an extension::\n"
293 "\n"
293 "\n"
294 " [extensions]\n"
294 " [extensions]\n"
295 " myfeature = ~/.hgext/myfeature.py\n"
295 " myfeature = ~/.hgext/myfeature.py\n"
296 "\n"
296 "\n"
297 "To explicitly disable an extension enabled in an hgrc of broader\n"
297 "To explicitly disable an extension enabled in an hgrc of broader\n"
298 "scope, prepend its path with !::\n"
298 "scope, prepend its path with !::\n"
299 "\n"
299 "\n"
300 " [extensions]\n"
300 " [extensions]\n"
301 " # disabling extension bar residing in /path/to/extension/bar.py\n"
301 " # disabling extension bar residing in /path/to/extension/bar.py\n"
302 " bar = !/path/to/extension/bar.py\n"
302 " bar = !/path/to/extension/bar.py\n"
303 " # ditto, but no path was supplied for extension baz\n"
303 " # ditto, but no path was supplied for extension baz\n"
304 " baz = !\n"
304 " baz = !\n"
305 msgstr ""
305 msgstr ""
306 "\n"
306 "\n"
307 " Mercurial a la capacité de s'enrichir de nouvelles\n"
307 " Mercurial a la capacité de s'enrichir de nouvelles\n"
308 " fonctionnalités par le biais d'extensions. Les extensions\n"
308 " fonctionnalités par le biais d'extensions. Les extensions\n"
309 " permettent d'ajouter des nouvelles commandes, de changer le\n"
309 " permettent d'ajouter des nouvelles commandes, de changer le\n"
310 " comportement de commandes existantes ou leur ajouter des\n"
310 " comportement de commandes existantes ou leur ajouter des\n"
311 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
311 " options, ou encore d'implémenter de nouveaux \"hooks\".\n"
312 "\n"
312 "\n"
313 " Les extensions ne sont pas chargées automatiquement par défaut\n"
313 " Les extensions ne sont pas chargées automatiquement par défaut\n"
314 " pour diverses raisons : elles peuvent accroître la latence\n"
314 " pour diverses raisons : elles peuvent accroître la latence\n"
315 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
315 " de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n"
316 " une utilisation avancée ; elle peuvent fournir des\n"
316 " une utilisation avancée ; elle peuvent fournir des\n"
317 " fonctionnalités potentiellement dangereuses, comme de vous\n"
317 " fonctionnalités potentiellement dangereuses, comme de vous\n"
318 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
318 " permettre de modifier ou détruire l'historique du dépôt ; elles\n"
319 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
319 " peuvent ne pas être encore prêtes à être utilisées par le plus\n"
320 " grand nombre ; ou encore elles peuvent modifier certains des\n"
320 " grand nombre ; ou encore elles peuvent modifier certains des\n"
321 " comportements habituels de Mercurial.\n"
321 " comportements habituels de Mercurial.\n"
322 " Il appartient donc à l'utilisateur de les activer en fonction\n"
322 " Il appartient donc à l'utilisateur de les activer en fonction\n"
323 " de ses besoins.\n"
323 " de ses besoins.\n"
324 "\n"
324 "\n"
325 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
325 " Pour activer l'extension \"truc\" fournie avec Mercurial ou\n"
326 " présente dans le chemin de recherche de Python, déclarez-la\n"
326 " présente dans le chemin de recherche de Python, déclarez-la\n"
327 " dans votre fichier de configuration hgrc comme suit :\n"
327 " dans votre fichier de configuration hgrc comme suit :\n"
328 "\n"
328 "\n"
329 " [extensions]\n"
329 " [extensions]\n"
330 " truc =\n"
330 " truc =\n"
331 "\n"
331 "\n"
332 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
332 " Vous pouvez aussi indiquer l'endroit où elle se trouve :\n"
333 "\n"
333 "\n"
334 " [extensions]\n"
334 " [extensions]\n"
335 " monbidule = ~/.hgext/monbidule.py\n"
335 " monbidule = ~/.hgext/monbidule.py\n"
336 "\n"
336 "\n"
337 " Pour forcer la désactivation d'une extension activée par un\n"
337 " Pour forcer la désactivation d'une extension activée par un\n"
338 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
338 " autre hgrc, précédez son chemin d'un point d'exclamation :\n"
339 "\n"
339 "\n"
340 " [extensions]\n"
340 " [extensions]\n"
341 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
341 " # désactivation de machin qui se trouve dans /vers/machin.py\n"
342 " bar = !/vers/machin.py\n"
342 " bar = !/vers/machin.py\n"
343 " # idem, mais aucun chemin n'avait été donné pour chose \n"
343 " # idem, mais aucun chemin n'avait été donné pour chose \n"
344 " chose = !\n"
344 " chose = !\n"
345 " "
345 " "
346
346
347 msgid ""
347 msgid ""
348 "When Mercurial accepts more than one revision, they may be specified\n"
348 "When Mercurial accepts more than one revision, they may be specified\n"
349 "individually, or provided as a topologically continuous range,\n"
349 "individually, or provided as a topologically continuous range,\n"
350 "separated by the \":\" character.\n"
350 "separated by the \":\" character.\n"
351 "\n"
351 "\n"
352 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
352 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
353 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
353 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
354 "specified, it defaults to revision number 0. If END is not specified,\n"
354 "specified, it defaults to revision number 0. If END is not specified,\n"
355 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
355 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
356 "\n"
356 "\n"
357 "If BEGIN is greater than END, revisions are treated in reverse order.\n"
357 "If BEGIN is greater than END, revisions are treated in reverse order.\n"
358 "\n"
358 "\n"
359 "A range acts as a closed interval. This means that a range of 3:5\n"
359 "A range acts as a closed interval. This means that a range of 3:5\n"
360 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
360 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
361 msgstr ""
361 msgstr ""
362
362
363 msgid ""
363 msgid ""
364 "Mercurial accepts several notations for identifying one or more files\n"
364 "Mercurial accepts several notations for identifying one or more files\n"
365 "at a time.\n"
365 "at a time.\n"
366 "\n"
366 "\n"
367 "By default, Mercurial treats filenames as shell-style extended glob\n"
367 "By default, Mercurial treats filenames as shell-style extended glob\n"
368 "patterns.\n"
368 "patterns.\n"
369 "\n"
369 "\n"
370 "Alternate pattern notations must be specified explicitly.\n"
370 "Alternate pattern notations must be specified explicitly.\n"
371 "\n"
371 "\n"
372 "To use a plain path name without any pattern matching, start it with\n"
372 "To use a plain path name without any pattern matching, start it with\n"
373 "``path:``. These path names must completely match starting at the\n"
373 "``path:``. These path names must completely match starting at the\n"
374 "current repository root.\n"
374 "current repository root.\n"
375 "\n"
375 "\n"
376 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
376 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
377 "at the current directory; a glob such as ``*.c`` will only match files\n"
377 "at the current directory; a glob such as ``*.c`` will only match files\n"
378 "in the current directory ending with ``.c``.\n"
378 "in the current directory ending with ``.c``.\n"
379 "\n"
379 "\n"
380 "The supported glob syntax extensions are ``**`` to match any string\n"
380 "The supported glob syntax extensions are ``**`` to match any string\n"
381 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
381 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
382 "\n"
382 "\n"
383 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
383 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
384 "Regexp pattern matching is anchored at the root of the repository.\n"
384 "Regexp pattern matching is anchored at the root of the repository.\n"
385 "\n"
385 "\n"
386 "Plain examples::\n"
386 "Plain examples::\n"
387 "\n"
387 "\n"
388 " path:foo/bar a name bar in a directory named foo in the root\n"
388 " path:foo/bar a name bar in a directory named foo in the root\n"
389 " of the repository\n"
389 " of the repository\n"
390 " path:path:name a file or directory named \"path:name\"\n"
390 " path:path:name a file or directory named \"path:name\"\n"
391 "\n"
391 "\n"
392 "Glob examples::\n"
392 "Glob examples::\n"
393 "\n"
393 "\n"
394 " glob:*.c any name ending in \".c\" in the current directory\n"
394 " glob:*.c any name ending in \".c\" in the current directory\n"
395 " *.c any name ending in \".c\" in the current directory\n"
395 " *.c any name ending in \".c\" in the current directory\n"
396 " **.c any name ending in \".c\" in any subdirectory of the\n"
396 " **.c any name ending in \".c\" in any subdirectory of the\n"
397 " current directory including itself.\n"
397 " current directory including itself.\n"
398 " foo/*.c any name ending in \".c\" in the directory foo\n"
398 " foo/*.c any name ending in \".c\" in the directory foo\n"
399 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
399 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
400 " including itself.\n"
400 " including itself.\n"
401 "\n"
401 "\n"
402 "Regexp examples::\n"
402 "Regexp examples::\n"
403 "\n"
403 "\n"
404 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
404 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
405 msgstr ""
405 msgstr ""
406
406
407 msgid ""
407 msgid ""
408 "Mercurial supports several ways to specify individual revisions.\n"
408 "Mercurial supports several ways to specify individual revisions.\n"
409 "\n"
409 "\n"
410 "A plain integer is treated as a revision number. Negative integers are\n"
410 "A plain integer is treated as a revision number. Negative integers are\n"
411 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
411 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
412 "-2 denoting the revision prior to the tip, and so forth.\n"
412 "-2 denoting the revision prior to the tip, and so forth.\n"
413 "\n"
413 "\n"
414 "A 40-digit hexadecimal string is treated as a unique revision\n"
414 "A 40-digit hexadecimal string is treated as a unique revision\n"
415 "identifier.\n"
415 "identifier.\n"
416 "\n"
416 "\n"
417 "A hexadecimal string less than 40 characters long is treated as a\n"
417 "A hexadecimal string less than 40 characters long is treated as a\n"
418 "unique revision identifier and is referred to as a short-form\n"
418 "unique revision identifier and is referred to as a short-form\n"
419 "identifier. A short-form identifier is only valid if it is the prefix\n"
419 "identifier. A short-form identifier is only valid if it is the prefix\n"
420 "of exactly one full-length identifier.\n"
420 "of exactly one full-length identifier.\n"
421 "\n"
421 "\n"
422 "Any other string is treated as a tag or branch name. A tag name is a\n"
422 "Any other string is treated as a tag or branch name. A tag name is a\n"
423 "symbolic name associated with a revision identifier. A branch name\n"
423 "symbolic name associated with a revision identifier. A branch name\n"
424 "denotes the tipmost revision of that branch. Tag and branch names must\n"
424 "denotes the tipmost revision of that branch. Tag and branch names must\n"
425 "not contain the \":\" character.\n"
425 "not contain the \":\" character.\n"
426 "\n"
426 "\n"
427 "The reserved name \"tip\" is a special tag that always identifies the\n"
427 "The reserved name \"tip\" is a special tag that always identifies the\n"
428 "most recent revision.\n"
428 "most recent revision.\n"
429 "\n"
429 "\n"
430 "The reserved name \"null\" indicates the null revision. This is the\n"
430 "The reserved name \"null\" indicates the null revision. This is the\n"
431 "revision of an empty repository, and the parent of revision 0.\n"
431 "revision of an empty repository, and the parent of revision 0.\n"
432 "\n"
432 "\n"
433 "The reserved name \".\" indicates the working directory parent. If no\n"
433 "The reserved name \".\" indicates the working directory parent. If no\n"
434 "working directory is checked out, it is equivalent to null. If an\n"
434 "working directory is checked out, it is equivalent to null. If an\n"
435 "uncommitted merge is in progress, \".\" is the revision of the first\n"
435 "uncommitted merge is in progress, \".\" is the revision of the first\n"
436 "parent.\n"
436 "parent.\n"
437 msgstr ""
437 msgstr ""
438
438
439 msgid ""
439 msgid ""
440 "Mercurial allows you to customize output of commands through\n"
440 "Mercurial allows you to customize output of commands through\n"
441 "templates. You can either pass in a template from the command\n"
441 "templates. You can either pass in a template from the command\n"
442 "line, via the --template option, or select an existing\n"
442 "line, via the --template option, or select an existing\n"
443 "template-style (--style).\n"
443 "template-style (--style).\n"
444 "\n"
444 "\n"
445 "You can customize output for any \"log-like\" command: log,\n"
445 "You can customize output for any \"log-like\" command: log,\n"
446 "outgoing, incoming, tip, parents, heads and glog.\n"
446 "outgoing, incoming, tip, parents, heads and glog.\n"
447 "\n"
447 "\n"
448 "Three styles are packaged with Mercurial: default (the style used\n"
448 "Three styles are packaged with Mercurial: default (the style used\n"
449 "when no explicit preference is passed), compact and changelog.\n"
449 "when no explicit preference is passed), compact and changelog.\n"
450 "Usage::\n"
450 "Usage::\n"
451 "\n"
451 "\n"
452 " $ hg log -r1 --style changelog\n"
452 " $ hg log -r1 --style changelog\n"
453 "\n"
453 "\n"
454 "A template is a piece of text, with markup to invoke variable\n"
454 "A template is a piece of text, with markup to invoke variable\n"
455 "expansion::\n"
455 "expansion::\n"
456 "\n"
456 "\n"
457 " $ hg log -r1 --template \"{node}\\n\"\n"
457 " $ hg log -r1 --template \"{node}\\n\"\\n b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
458 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
459 "\n"
458 "\n"
460 "Strings in curly braces are called keywords. The availability of\n"
459 "Strings in curly braces are called keywords. The availability of\n"
461 "keywords depends on the exact context of the templater. These\n"
460 "keywords depends on the exact context of the templater. These\n"
462 "keywords are usually available for templating a log-like command:\n"
461 "keywords are usually available for templating a log-like command:\n"
463 "\n"
462 "\n"
464 ":author: String. The unmodified author of the changeset.\n"
463 ":author: String. The unmodified author of the changeset.\n"
465 ":branches: String. The name of the branch on which the changeset\n"
464 ":branches: String. The name of the branch on which the changeset\n"
466 " was committed. Will be empty if the branch name was\n"
465 " was committed. Will be empty if the branch name was\n"
467 " default.\n"
466 " default.\n"
468 ":date: Date information. The date when the changeset was\n"
467 ":date: Date information. The date when the changeset was\n"
469 " committed.\n"
468 " committed.\n"
470 ":desc: String. The text of the changeset description.\n"
469 ":desc: String. The text of the changeset description.\n"
471 ":diffstat: String. Statistics of changes with the following\n"
470 ":diffstat: String. Statistics of changes with the following\n"
472 " format: \"modified files: +added/-removed lines\"\n"
471 " format: \"modified files: +added/-removed lines\"\n"
473 ":files: List of strings. All files modified, added, or removed\n"
472 ":files: List of strings. All files modified, added, or removed\n"
474 " by this changeset.\n"
473 " by this changeset.\n"
475 ":file_adds: List of strings. Files added by this changeset.\n"
474 ":file_adds: List of strings. Files added by this changeset.\n"
476 ":file_mods: List of strings. Files modified by this changeset.\n"
475 ":file_mods: List of strings. Files modified by this changeset.\n"
477 ":file_dels: List of strings. Files removed by this changeset.\n"
476 ":file_dels: List of strings. Files removed by this changeset.\n"
478 ":node: String. The changeset identification hash, as a\n"
477 ":node: String. The changeset identification hash, as a\n"
479 " 40-character hexadecimal string.\n"
478 " 40-character hexadecimal string.\n"
480 ":parents: List of strings. The parents of the changeset.\n"
479 ":parents: List of strings. The parents of the changeset.\n"
481 ":rev: Integer. The repository-local changeset revision\n"
480 ":rev: Integer. The repository-local changeset revision\n"
482 " number.\n"
481 " number.\n"
483 ":tags: List of strings. Any tags associated with the\n"
482 ":tags: List of strings. Any tags associated with the\n"
484 " changeset.\n"
483 " changeset.\n"
485 ":latesttag: String. Most recent global tag in the ancestors of this\n"
484 ":latesttag: String. Most recent global tag in the ancestors of this\n"
486 " changeset.\n"
485 " changeset.\n"
487 ":latesttagdistance: Integer. Longest path to the latest tag.\n"
486 ":latesttagdistance: Integer. Longest path to the latest tag.\n"
488 "\n"
487 "\n"
489 "The \"date\" keyword does not produce human-readable output. If you\n"
488 "The \"date\" keyword does not produce human-readable output. If you\n"
490 "want to use a date in your output, you can use a filter to process\n"
489 "want to use a date in your output, you can use a filter to process\n"
491 "it. Filters are functions which return a string based on the input\n"
490 "it. Filters are functions which return a string based on the input\n"
492 "variable. You can also use a chain of filters to get the desired\n"
491 "variable. You can also use a chain of filters to get the desired\n"
493 "output::\n"
492 "output::\n"
494 "\n"
493 "\n"
495 " $ hg tip --template \"{date|isodate}\\n\"\n"
494 " $ hg tip --template \"{date|isodate}\\n\"\\n 2008-08-21 18:22 +0000\n"
496 " 2008-08-21 18:22 +0000\n"
497 "\n"
495 "\n"
498 "List of filters:\n"
496 "List of filters:\n"
499 "\n"
497 "\n"
500 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
498 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
501 " every line except the last.\n"
499 " every line except the last.\n"
502 ":age: Date. Returns a human-readable date/time difference\n"
500 ":age: Date. Returns a human-readable date/time difference\n"
503 " between the given date/time and the current\n"
501 " between the given date/time and the current\n"
504 " date/time.\n"
502 " date/time.\n"
505 ":basename: Any text. Treats the text as a path, and returns the\n"
503 ":basename: Any text. Treats the text as a path, and returns the\n"
506 " last component of the path after splitting by the\n"
504 " last component of the path after splitting by the\n"
507 " path separator (ignoring trailing separators). For\n"
505 " path separator (ignoring trailing separators). For\n"
508 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
506 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
509 " becomes \"bar\".\n"
507 " becomes \"bar\".\n"
510 ":stripdir: Treat the text as path and strip a directory level,\n"
508 ":stripdir: Treat the text as path and strip a directory level,\n"
511 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
509 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
512 " \"foo\".\n"
510 " \"foo\".\n"
513 ":date: Date. Returns a date in a Unix date format, including\n"
511 ":date: Date. Returns a date in a Unix date format, including\n"
514 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
512 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
515 ":domain: Any text. Finds the first string that looks like an\n"
513 ":domain: Any text. Finds the first string that looks like an\n"
516 " email address, and extracts just the domain\n"
514 " email address, and extracts just the domain\n"
517 " component. Example: 'User <user@example.com>' becomes\n"
515 " component. Example: 'User <user@example.com>' becomes\n"
518 " 'example.com'.\n"
516 " 'example.com'.\n"
519 ":email: Any text. Extracts the first string that looks like\n"
517 ":email: Any text. Extracts the first string that looks like\n"
520 " an email address. Example: 'User <user@example.com>'\n"
518 " an email address. Example: 'User <user@example.com>'\n"
521 " becomes 'user@example.com'.\n"
519 " becomes 'user@example.com'.\n"
522 ":escape: Any text. Replaces the special XML/XHTML characters\n"
520 ":escape: Any text. Replaces the special XML/XHTML characters\n"
523 " \"&\", \"<\" and \">\" with XML entities.\n"
521 " \"&\", \"<\" and \">\" with XML entities.\n"
524 ":fill68: Any text. Wraps the text to fit in 68 columns.\n"
522 ":fill68: Any text. Wraps the text to fit in 68 columns.\n"
525 ":fill76: Any text. Wraps the text to fit in 76 columns.\n"
523 ":fill76: Any text. Wraps the text to fit in 76 columns.\n"
526 ":firstline: Any text. Returns the first line of text.\n"
524 ":firstline: Any text. Returns the first line of text.\n"
527 ":nonempty: Any text. Returns '(none)' if the string is empty.\n"
525 ":nonempty: Any text. Returns '(none)' if the string is empty.\n"
528 ":hgdate: Date. Returns the date as a pair of numbers:\n"
526 ":hgdate: Date. Returns the date as a pair of numbers:\n"
529 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
527 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
530 ":isodate: Date. Returns the date in ISO 8601 format:\n"
528 ":isodate: Date. Returns the date in ISO 8601 format:\n"
531 " \"2009-08-18 13:00 +0200\".\n"
529 " \"2009-08-18 13:00 +0200\".\n"
532 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
530 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
533 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
531 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
534 " rfc3339date filter.\n"
532 " rfc3339date filter.\n"
535 ":localdate: Date. Converts a date to local date.\n"
533 ":localdate: Date. Converts a date to local date.\n"
536 ":obfuscate: Any text. Returns the input text rendered as a\n"
534 ":obfuscate: Any text. Returns the input text rendered as a\n"
537 " sequence of XML entities.\n"
535 " sequence of XML entities.\n"
538 ":person: Any text. Returns the text before an email address.\n"
536 ":person: Any text. Returns the text before an email address.\n"
539 ":rfc822date: Date. Returns a date using the same format used in\n"
537 ":rfc822date: Date. Returns a date using the same format used in\n"
540 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
538 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
541 ":rfc3339date: Date. Returns a date using the Internet date format\n"
539 ":rfc3339date: Date. Returns a date using the Internet date format\n"
542 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
540 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
543 ":short: Changeset hash. Returns the short form of a changeset\n"
541 ":short: Changeset hash. Returns the short form of a changeset\n"
544 " hash, i.e. a 12-byte hexadecimal string.\n"
542 " hash, i.e. a 12-byte hexadecimal string.\n"
545 ":shortdate: Date. Returns a date like \"2006-09-18\".\n"
543 ":shortdate: Date. Returns a date like \"2006-09-18\".\n"
546 ":strip: Any text. Strips all leading and trailing whitespace.\n"
544 ":strip: Any text. Strips all leading and trailing whitespace.\n"
547 ":tabindent: Any text. Returns the text, with every line except\n"
545 ":tabindent: Any text. Returns the text, with every line except\n"
548 " the first starting with a tab character.\n"
546 " the first starting with a tab character.\n"
549 ":urlescape: Any text. Escapes all \"special\" characters. For\n"
547 ":urlescape: Any text. Escapes all \"special\" characters. For\n"
550 " example, \"foo bar\" becomes \"foo%20bar\".\n"
548 " example, \"foo bar\" becomes \"foo%20bar\".\n"
551 ":user: Any text. Returns the user portion of an email\n"
549 ":user: Any text. Returns the user portion of an email\n"
552 " address.\n"
550 " address.\n"
553 msgstr ""
551 msgstr ""
554
552
555 msgid ""
553 msgid ""
556 "Valid URLs are of the form::\n"
554 "Valid URLs are of the form::\n"
557 "\n"
555 "\n"
558 " local/filesystem/path[#revision]\n"
556 " local/filesystem/path[#revision]\n"
559 " file://local/filesystem/path[#revision]\n"
557 " file://local/filesystem/path[#revision]\n"
560 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
558 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
561 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
559 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
562 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
560 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
563 "\n"
561 "\n"
564 "Paths in the local filesystem can either point to Mercurial\n"
562 "Paths in the local filesystem can either point to Mercurial\n"
565 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
563 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
566 "incoming --bundle').\n"
564 "incoming --bundle').\n"
567 "\n"
565 "\n"
568 "An optional identifier after # indicates a particular branch, tag, or\n"
566 "An optional identifier after # indicates a particular branch, tag, or\n"
569 "changeset to use from the remote repository. See also 'hg help\n"
567 "changeset to use from the remote repository. See also 'hg help\n"
570 "revisions'.\n"
568 "revisions'.\n"
571 "\n"
569 "\n"
572 "Some features, such as pushing to http:// and https:// URLs are only\n"
570 "Some features, such as pushing to http:// and https:// URLs are only\n"
573 "possible if the feature is explicitly enabled on the remote Mercurial\n"
571 "possible if the feature is explicitly enabled on the remote Mercurial\n"
574 "server.\n"
572 "server.\n"
575 "\n"
573 "\n"
576 "Some notes about using SSH with Mercurial:\n"
574 "Some notes about using SSH with Mercurial:\n"
577 "\n"
575 "\n"
578 "- SSH requires an accessible shell account on the destination machine\n"
576 "- SSH requires an accessible shell account on the destination machine\n"
579 " and a copy of hg in the remote path or specified with as remotecmd.\n"
577 " and a copy of hg in the remote path or specified with as remotecmd.\n"
580 "- path is relative to the remote user's home directory by default. Use\n"
578 "- path is relative to the remote user's home directory by default. Use\n"
581 " an extra slash at the start of a path to specify an absolute path::\n"
579 " an extra slash at the start of a path to specify an absolute path::\n"
582 "\n"
580 "\n"
583 " ssh://example.com//tmp/repository\n"
581 " ssh://example.com//tmp/repository\n"
584 "\n"
582 "\n"
585 "- Mercurial doesn't use its own compression via SSH; the right thing\n"
583 "- Mercurial doesn't use its own compression via SSH; the right thing\n"
586 " to do is to configure it in your ~/.ssh/config, e.g.::\n"
584 " to do is to configure it in your ~/.ssh/config, e.g.::\n"
587 "\n"
585 "\n"
588 " Host *.mylocalnetwork.example.com\n"
586 " Host *.mylocalnetwork.example.com\n"
589 " Compression no\n"
587 " Compression no\n"
590 " Host *\n"
588 " Host *\n"
591 " Compression yes\n"
589 " Compression yes\n"
592 "\n"
590 "\n"
593 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
591 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
594 " with the --ssh command line option.\n"
592 " with the --ssh command line option.\n"
595 "\n"
593 "\n"
596 "These URLs can all be stored in your hgrc with path aliases under the\n"
594 "These URLs can all be stored in your hgrc with path aliases under the\n"
597 "[paths] section like so::\n"
595 "[paths] section like so::\n"
598 "\n"
596 "\n"
599 " [paths]\n"
597 " [paths]\n"
600 " alias1 = URL1\n"
598 " alias1 = URL1\n"
601 " alias2 = URL2\n"
599 " alias2 = URL2\n"
602 " ...\n"
600 " ...\n"
603 "\n"
601 "\n"
604 "You can then use the alias for any command that uses a URL (for\n"
602 "You can then use the alias for any command that uses a URL (for\n"
605 "example 'hg pull alias1' would pull from the 'alias1' path).\n"
603 "example 'hg pull alias1' would pull from the 'alias1' path).\n"
606 "\n"
604 "\n"
607 "Two path aliases are special because they are used as defaults when\n"
605 "Two path aliases are special because they are used as defaults when\n"
608 "you do not provide the URL to a command:\n"
606 "you do not provide the URL to a command:\n"
609 "\n"
607 "\n"
610 "default:\n"
608 "default:\n"
611 " When you create a repository with hg clone, the clone command saves\n"
609 " When you create a repository with hg clone, the clone command saves\n"
612 " the location of the source repository as the new repository's\n"
610 " the location of the source repository as the new repository's\n"
613 " 'default' path. This is then used when you omit path from push- and\n"
611 " 'default' path. This is then used when you omit path from push- and\n"
614 " pull-like commands (including incoming and outgoing).\n"
612 " pull-like commands (including incoming and outgoing).\n"
615 "\n"
613 "\n"
616 "default-push:\n"
614 "default-push:\n"
617 " The push command will look for a path named 'default-push', and\n"
615 " The push command will look for a path named 'default-push', and\n"
618 " prefer it over 'default' if both are defined.\n"
616 " prefer it over 'default' if both are defined.\n"
619 msgstr ""
617 msgstr ""
620
618
621 msgid ""
619 msgid ""
622 "hooks for controlling repository access\n"
620 "hooks for controlling repository access\n"
623 "\n"
621 "\n"
624 "This hook makes it possible to allow or deny write access to portions\n"
622 "This hook makes it possible to allow or deny write access to portions\n"
625 "of a repository when receiving incoming changesets.\n"
623 "of a repository when receiving incoming changesets.\n"
626 "\n"
624 "\n"
627 "The authorization is matched based on the local user name on the\n"
625 "The authorization is matched based on the local user name on the\n"
628 "system where the hook runs, and not the committer of the original\n"
626 "system where the hook runs, and not the committer of the original\n"
629 "changeset (since the latter is merely informative).\n"
627 "changeset (since the latter is merely informative).\n"
630 "\n"
628 "\n"
631 "The acl hook is best used along with a restricted shell like hgsh,\n"
629 "The acl hook is best used along with a restricted shell like hgsh,\n"
632 "preventing authenticating users from doing anything other than\n"
630 "preventing authenticating users from doing anything other than\n"
633 "pushing or pulling. The hook is not safe to use if users have\n"
631 "pushing or pulling. The hook is not safe to use if users have\n"
634 "interactive shell access, as they can then disable the hook.\n"
632 "interactive shell access, as they can then disable the hook.\n"
635 "Nor is it safe if remote users share an account, because then there\n"
633 "Nor is it safe if remote users share an account, because then there\n"
636 "is no way to distinguish them.\n"
634 "is no way to distinguish them.\n"
637 "\n"
635 "\n"
638 "To use this hook, configure the acl extension in your hgrc like this::\n"
636 "To use this hook, configure the acl extension in your hgrc like this::\n"
639 "\n"
637 "\n"
640 " [extensions]\n"
638 " [extensions]\n"
641 " acl =\n"
639 " acl =\n"
642 "\n"
640 "\n"
643 " [hooks]\n"
641 " [hooks]\n"
644 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
642 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
645 "\n"
643 "\n"
646 " [acl]\n"
644 " [acl]\n"
647 " # Check whether the source of incoming changes is in this list\n"
645 " # Check whether the source of incoming changes is in this list\n"
648 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
646 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
649 " sources = serve\n"
647 " sources = serve\n"
650 "\n"
648 "\n"
651 "The allow and deny sections take a subtree pattern as key (with a glob\n"
649 "The allow and deny sections take a subtree pattern as key (with a glob\n"
652 "syntax by default), and a comma separated list of users as the\n"
650 "syntax by default), and a comma separated list of users as the\n"
653 "corresponding value. The deny list is checked before the allow list\n"
651 "corresponding value. The deny list is checked before the allow list\n"
654 "is. ::\n"
652 "is. ::\n"
655 "\n"
653 "\n"
656 " [acl.allow]\n"
654 " [acl.allow]\n"
657 " # If acl.allow is not present, all users are allowed by default.\n"
655 " # If acl.allow is not present, all users are allowed by default.\n"
658 " # An empty acl.allow section means no users allowed.\n"
656 " # An empty acl.allow section means no users allowed.\n"
659 " docs/** = doc_writer\n"
657 " docs/** = doc_writer\n"
660 " .hgtags = release_engineer\n"
658 " .hgtags = release_engineer\n"
661 "\n"
659 "\n"
662 " [acl.deny]\n"
660 " [acl.deny]\n"
663 " # If acl.deny is not present, no users are refused by default.\n"
661 " # If acl.deny is not present, no users are refused by default.\n"
664 " # An empty acl.deny section means all users allowed.\n"
662 " # An empty acl.deny section means all users allowed.\n"
665 " glob pattern = user4, user5\n"
663 " glob pattern = user4, user5\n"
666 " ** = user6\n"
664 " ** = user6\n"
667 msgstr ""
665 msgstr ""
668
666
669 #, python-format
667 #, python-format
670 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
668 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
671 msgstr ""
669 msgstr ""
672
670
673 #, python-format
671 #, python-format
674 msgid "acl: access denied for changeset %s"
672 msgid "acl: access denied for changeset %s"
675 msgstr ""
673 msgstr ""
676
674
677 msgid ""
675 msgid ""
678 "track a line of development with movable markers\n"
676 "track a line of development with movable markers\n"
679 "\n"
677 "\n"
680 "Bookmarks are local movable markers to changesets. Every bookmark\n"
678 "Bookmarks are local movable markers to changesets. Every bookmark\n"
681 "points to a changeset identified by its hash. If you commit a\n"
679 "points to a changeset identified by its hash. If you commit a\n"
682 "changeset that is based on a changeset that has a bookmark on it, the\n"
680 "changeset that is based on a changeset that has a bookmark on it, the\n"
683 "bookmark shifts to the new changeset.\n"
681 "bookmark shifts to the new changeset.\n"
684 "\n"
682 "\n"
685 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
683 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
686 "merge, hg update).\n"
684 "merge, hg update).\n"
687 "\n"
685 "\n"
688 "By default, when several bookmarks point to the same changeset, they\n"
686 "By default, when several bookmarks point to the same changeset, they\n"
689 "will all move forward together. It is possible to obtain a more\n"
687 "will all move forward together. It is possible to obtain a more\n"
690 "git-like experience by adding the following configuration option to\n"
688 "git-like experience by adding the following configuration option to\n"
691 "your .hgrc::\n"
689 "your .hgrc::\n"
692 "\n"
690 "\n"
693 " [bookmarks]\n"
691 " [bookmarks]\n"
694 " track.current = True\n"
692 " track.current = True\n"
695 "\n"
693 "\n"
696 "This will cause Mercurial to track the bookmark that you are currently\n"
694 "This will cause Mercurial to track the bookmark that you are currently\n"
697 "using, and only update it. This is similar to git's approach to\n"
695 "using, and only update it. This is similar to git's approach to\n"
698 "branching.\n"
696 "branching.\n"
699 msgstr ""
697 msgstr ""
700
698
701 msgid ""
699 msgid ""
702 "track a line of development with movable markers\n"
700 "track a line of development with movable markers\n"
703 "\n"
701 "\n"
704 " Bookmarks are pointers to certain commits that move when\n"
702 " Bookmarks are pointers to certain commits that move when\n"
705 " committing. Bookmarks are local. They can be renamed, copied and\n"
703 " committing. Bookmarks are local. They can be renamed, copied and\n"
706 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
704 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
707 " 'hg update' to merge and update respectively to a given bookmark.\n"
705 " 'hg update' to merge and update respectively to a given bookmark.\n"
708 "\n"
706 "\n"
709 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
707 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
710 " directory's parent revision with the given name. If you specify\n"
708 " directory's parent revision with the given name. If you specify\n"
711 " a revision using -r REV (where REV may be an existing bookmark),\n"
709 " a revision using -r REV (where REV may be an existing bookmark),\n"
712 " the bookmark is assigned to that revision.\n"
710 " the bookmark is assigned to that revision.\n"
713 " "
711 " "
714 msgstr ""
712 msgstr ""
715
713
714 #, fuzzy
716 msgid "a bookmark of this name does not exist"
715 msgid "a bookmark of this name does not exist"
717 msgstr ""
716 msgstr "un signet de ce nom n'existe pas"
718
717
719 msgid "a bookmark of the same name already exists"
718 msgid "a bookmark of the same name already exists"
720 msgstr ""
719 msgstr ""
721
720
722 msgid "new bookmark name required"
721 msgid "new bookmark name required"
723 msgstr ""
722 msgstr ""
724
723
725 msgid "bookmark name required"
724 msgid "bookmark name required"
726 msgstr ""
725 msgstr ""
727
726
728 msgid "bookmark name cannot contain newlines"
727 msgid "bookmark name cannot contain newlines"
729 msgstr ""
728 msgstr ""
730
729
731 msgid "a bookmark cannot have the name of an existing branch"
730 msgid "a bookmark cannot have the name of an existing branch"
732 msgstr ""
731 msgstr ""
733
732
734 msgid "force"
733 msgid "force"
735 msgstr ""
734 msgstr ""
736
735
737 msgid "revision"
736 msgid "revision"
738 msgstr ""
737 msgstr ""
739
738
740 msgid "delete a given bookmark"
739 msgid "delete a given bookmark"
741 msgstr ""
740 msgstr "Supprimer un signet donné"
742
741
743 msgid "rename a given bookmark"
742 msgid "rename a given bookmark"
744 msgstr ""
743 msgstr "Renommer un signet donné"
745
744
746 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
745 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
747 msgstr ""
746 msgstr ""
748
747
749 msgid ""
748 msgid ""
750 "hooks for integrating with the Bugzilla bug tracker\n"
749 "hooks for integrating with the Bugzilla bug tracker\n"
751 "\n"
750 "\n"
752 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
751 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
753 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
752 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
754 "bug status.\n"
753 "bug status.\n"
755 "\n"
754 "\n"
756 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
755 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
757 "installations using MySQL are supported.\n"
756 "installations using MySQL are supported.\n"
758 "\n"
757 "\n"
759 "The hook relies on a Bugzilla script to send bug change notification\n"
758 "The hook relies on a Bugzilla script to send bug change notification\n"
760 "emails. That script changes between Bugzilla versions; the\n"
759 "emails. That script changes between Bugzilla versions; the\n"
761 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
760 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
762 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
761 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
763 "be run by Mercurial as the user pushing the change; you will need to\n"
762 "be run by Mercurial as the user pushing the change; you will need to\n"
764 "ensure the Bugzilla install file permissions are set appropriately.\n"
763 "ensure the Bugzilla install file permissions are set appropriately.\n"
765 "\n"
764 "\n"
766 "The extension is configured through three different configuration\n"
765 "The extension is configured through three different configuration\n"
767 "sections. These keys are recognized in the [bugzilla] section:\n"
766 "sections. These keys are recognized in the [bugzilla] section:\n"
768 "\n"
767 "\n"
769 "host\n"
768 "host\n"
770 " Hostname of the MySQL server holding the Bugzilla database.\n"
769 " Hostname of the MySQL server holding the Bugzilla database.\n"
771 "\n"
770 "\n"
772 "db\n"
771 "db\n"
773 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
772 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
774 "\n"
773 "\n"
775 "user\n"
774 "user\n"
776 " Username to use to access MySQL server. Default 'bugs'.\n"
775 " Username to use to access MySQL server. Default 'bugs'.\n"
777 "\n"
776 "\n"
778 "password\n"
777 "password\n"
779 " Password to use to access MySQL server.\n"
778 " Password to use to access MySQL server.\n"
780 "\n"
779 "\n"
781 "timeout\n"
780 "timeout\n"
782 " Database connection timeout (seconds). Default 5.\n"
781 " Database connection timeout (seconds). Default 5.\n"
783 "\n"
782 "\n"
784 "version\n"
783 "version\n"
785 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
784 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
786 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
785 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
787 " to 2.18.\n"
786 " to 2.18.\n"
788 "\n"
787 "\n"
789 "bzuser\n"
788 "bzuser\n"
790 " Fallback Bugzilla user name to record comments with, if changeset\n"
789 " Fallback Bugzilla user name to record comments with, if changeset\n"
791 " committer cannot be found as a Bugzilla user.\n"
790 " committer cannot be found as a Bugzilla user.\n"
792 "\n"
791 "\n"
793 "bzdir\n"
792 "bzdir\n"
794 " Bugzilla install directory. Used by default notify. Default\n"
793 " Bugzilla install directory. Used by default notify. Default\n"
795 " '/var/www/html/bugzilla'.\n"
794 " '/var/www/html/bugzilla'.\n"
796 "\n"
795 "\n"
797 "notify\n"
796 "notify\n"
798 " The command to run to get Bugzilla to send bug change notification\n"
797 " The command to run to get Bugzilla to send bug change notification\n"
799 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
798 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
800 " and 'user' (committer bugzilla email). Default depends on version;\n"
799 " and 'user' (committer bugzilla email). Default depends on version;\n"
801 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
800 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
802 " %(id)s %(user)s\".\n"
801 " %(id)s %(user)s\".\n"
803 "\n"
802 "\n"
804 "regexp\n"
803 "regexp\n"
805 " Regular expression to match bug IDs in changeset commit message.\n"
804 " Regular expression to match bug IDs in changeset commit message.\n"
806 " Must contain one \"()\" group. The default expression matches 'Bug\n"
805 " Must contain one \"()\" group. The default expression matches 'Bug\n"
807 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
806 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
808 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
807 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
809 "\n"
808 "\n"
810 "style\n"
809 "style\n"
811 " The style file to use when formatting comments.\n"
810 " The style file to use when formatting comments.\n"
812 "\n"
811 "\n"
813 "template\n"
812 "template\n"
814 " Template to use when formatting comments. Overrides style if\n"
813 " Template to use when formatting comments. Overrides style if\n"
815 " specified. In addition to the usual Mercurial keywords, the\n"
814 " specified. In addition to the usual Mercurial keywords, the\n"
816 " extension specifies::\n"
815 " extension specifies::\n"
817 "\n"
816 "\n"
818 " {bug} The Bugzilla bug ID.\n"
817 " {bug} The Bugzilla bug ID.\n"
819 " {root} The full pathname of the Mercurial repository.\n"
818 " {root} The full pathname of the Mercurial repository.\n"
820 " {webroot} Stripped pathname of the Mercurial repository.\n"
819 " {webroot} Stripped pathname of the Mercurial repository.\n"
821 " {hgweb} Base URL for browsing Mercurial repositories.\n"
820 " {hgweb} Base URL for browsing Mercurial repositories.\n"
822 "\n"
821 "\n"
823 " Default 'changeset {node|short} in repo {root} refers '\n"
822 " Default 'changeset {node|short} in repo {root} refers '\n"
824 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
823 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\\n\n"
825 "\n"
826 "strip\n"
824 "strip\n"
827 " The number of slashes to strip from the front of {root} to produce\n"
825 " The number of slashes to strip from the front of {root} to produce\n"
828 " {webroot}. Default 0.\n"
826 " {webroot}. Default 0.\n"
829 "\n"
827 "\n"
830 "usermap\n"
828 "usermap\n"
831 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
829 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
832 " mappings. If specified, the file should contain one mapping per\n"
830 " mappings. If specified, the file should contain one mapping per\n"
833 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
831 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
834 "\n"
832 "\n"
835 "The [usermap] section is used to specify mappings of Mercurial\n"
833 "The [usermap] section is used to specify mappings of Mercurial\n"
836 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
834 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
837 "\"committer\"=\"Bugzilla user\"\n"
835 "\"committer\"=\"Bugzilla user\"\n"
838 "\n"
836 "\n"
839 "Finally, the [web] section supports one entry:\n"
837 "Finally, the [web] section supports one entry:\n"
840 "\n"
838 "\n"
841 "baseurl\n"
839 "baseurl\n"
842 " Base URL for browsing Mercurial repositories. Reference from\n"
840 " Base URL for browsing Mercurial repositories. Reference from\n"
843 " templates as {hgweb}.\n"
841 " templates as {hgweb}.\n"
844 "\n"
842 "\n"
845 "Activating the extension::\n"
843 "Activating the extension::\n"
846 "\n"
844 "\n"
847 " [extensions]\n"
845 " [extensions]\n"
848 " bugzilla =\n"
846 " bugzilla =\n"
849 "\n"
847 "\n"
850 " [hooks]\n"
848 " [hooks]\n"
851 " # run bugzilla hook on every change pulled or pushed in here\n"
849 " # run bugzilla hook on every change pulled or pushed in here\n"
852 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
850 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
853 "\n"
851 "\n"
854 "Example configuration:\n"
852 "Example configuration:\n"
855 "\n"
853 "\n"
856 "This example configuration is for a collection of Mercurial\n"
854 "This example configuration is for a collection of Mercurial\n"
857 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
855 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
858 "installation in /opt/bugzilla-3.2. ::\n"
856 "installation in /opt/bugzilla-3.2. ::\n"
859 "\n"
857 "\n"
860 " [bugzilla]\n"
858 " [bugzilla]\n"
861 " host=localhost\n"
859 " host=localhost\n"
862 " password=XYZZY\n"
860 " password=XYZZY\n"
863 " version=3.0\n"
861 " version=3.0\n"
864 " bzuser=unknown@domain.com\n"
862 " bzuser=unknown@domain.com\n"
865 " bzdir=/opt/bugzilla-3.2\n"
863 " bzdir=/opt/bugzilla-3.2\n"
866 " template=Changeset {node|short} in {root|basename}.\n"
864 " template=Changeset {node|short} in {root|basename}.\n"
867 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
865 " {hgweb}/{webroot}/rev/{node|short}\\n\\n {desc}\\n\\n strip=5\n"
868 " {desc}\\n\n"
869 " strip=5\n"
870 "\n"
866 "\n"
871 " [web]\n"
867 " [web]\n"
872 " baseurl=http://dev.domain.com/hg\n"
868 " baseurl=http://dev.domain.com/hg\n"
873 "\n"
869 "\n"
874 " [usermap]\n"
870 " [usermap]\n"
875 " user@emaildomain.com=user.name@bugzilladomain.com\n"
871 " user@emaildomain.com=user.name@bugzilladomain.com\n"
876 "\n"
872 "\n"
877 "Commits add a comment to the Bugzilla bug record of the form::\n"
873 "Commits add a comment to the Bugzilla bug record of the form::\n"
878 "\n"
874 "\n"
879 " Changeset 3b16791d6642 in repository-name.\n"
875 " Changeset 3b16791d6642 in repository-name.\n"
880 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
876 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
881 "\n"
877 "\n"
882 " Changeset commit comment. Bug 1234.\n"
878 " Changeset commit comment. Bug 1234.\n"
883 msgstr ""
879 msgstr ""
884
880
885 #, python-format
881 #, python-format
886 msgid "connecting to %s:%s as %s, password %s\n"
882 msgid "connecting to %s:%s as %s, password %s\n"
887 msgstr ""
883 msgstr ""
888
884
889 #, python-format
885 #, python-format
890 msgid "query: %s %s\n"
886 msgid "query: %s %s\n"
891 msgstr ""
887 msgstr ""
892
888
893 #, python-format
889 #, python-format
894 msgid "failed query: %s %s\n"
890 msgid "failed query: %s %s\n"
895 msgstr ""
891 msgstr ""
896
892
897 msgid "unknown database schema"
893 msgid "unknown database schema"
898 msgstr ""
894 msgstr ""
899
895
900 #, python-format
896 #, python-format
901 msgid "bug %d already knows about changeset %s\n"
897 msgid "bug %d already knows about changeset %s\n"
902 msgstr ""
898 msgstr ""
903
899
904 msgid "telling bugzilla to send mail:\n"
900 msgid "telling bugzilla to send mail:\n"
905 msgstr ""
901 msgstr ""
906
902
907 #, python-format
903 #, python-format
908 msgid " bug %s\n"
904 msgid " bug %s\n"
909 msgstr ""
905 msgstr ""
910
906
911 #, python-format
907 #, python-format
912 msgid "running notify command %s\n"
908 msgid "running notify command %s\n"
913 msgstr ""
909 msgstr ""
914
910
915 #, python-format
911 #, python-format
916 msgid "bugzilla notify command %s"
912 msgid "bugzilla notify command %s"
917 msgstr ""
913 msgstr ""
918
914
919 msgid "done\n"
915 msgid "done\n"
920 msgstr "effectué\n"
916 msgstr "effectué\n"
921
917
922 #, python-format
918 #, python-format
923 msgid "looking up user %s\n"
919 msgid "looking up user %s\n"
924 msgstr ""
920 msgstr ""
925
921
926 #, python-format
922 #, python-format
927 msgid "cannot find bugzilla user id for %s"
923 msgid "cannot find bugzilla user id for %s"
928 msgstr ""
924 msgstr ""
929
925
930 #, python-format
926 #, python-format
931 msgid "cannot find bugzilla user id for %s or %s"
927 msgid "cannot find bugzilla user id for %s or %s"
932 msgstr ""
928 msgstr ""
933
929
934 #, python-format
930 #, python-format
935 msgid "bugzilla version %s not supported"
931 msgid "bugzilla version %s not supported"
936 msgstr ""
932 msgstr ""
937
933
938 msgid ""
934 msgid ""
939 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
935 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
940 "details:\n"
936 "details:\n"
941 "\t{desc|tabindent}"
937 "\t{desc|tabindent}"
942 msgstr ""
938 msgstr ""
943
939
944 #, python-format
940 #, python-format
945 msgid "python mysql support not available: %s"
941 msgid "python mysql support not available: %s"
946 msgstr ""
942 msgstr ""
947
943
948 #, python-format
944 #, python-format
949 msgid "hook type %s does not pass a changeset id"
945 msgid "hook type %s does not pass a changeset id"
950 msgstr ""
946 msgstr ""
951
947
952 #, python-format
948 #, python-format
953 msgid "database error: %s"
949 msgid "database error: %s"
954 msgstr ""
950 msgstr ""
955
951
956 msgid "command to display child changesets"
952 msgid "command to display child changesets"
957 msgstr ""
953 msgstr ""
958
954
959 msgid ""
955 msgid ""
960 "show the children of the given or working directory revision\n"
956 "show the children of the given or working directory revision\n"
961 "\n"
957 "\n"
962 " Print the children of the working directory's revisions. If a\n"
958 " Print the children of the working directory's revisions. If a\n"
963 " revision is given via -r/--rev, the children of that revision will\n"
959 " revision is given via -r/--rev, the children of that revision will\n"
964 " be printed. If a file argument is given, revision in which the\n"
960 " be printed. If a file argument is given, revision in which the\n"
965 " file was last changed (after the working directory revision or the\n"
961 " file was last changed (after the working directory revision or the\n"
966 " argument to --rev if given) is printed.\n"
962 " argument to --rev if given) is printed.\n"
967 " "
963 " "
968 msgstr ""
964 msgstr ""
969
965
970 msgid "show children of the specified revision"
966 msgid "show children of the specified revision"
971 msgstr ""
967 msgstr ""
972
968
973 msgid "hg children [-r REV] [FILE]"
969 msgid "hg children [-r REV] [FILE]"
974 msgstr ""
970 msgstr ""
975
971
972 #, fuzzy
976 msgid "command to display statistics about repository history"
973 msgid "command to display statistics about repository history"
977 msgstr ""
974 msgstr "Commande pour afficher les statistiques de l'historique du repository"
978
975
979 #, python-format
976 #, python-format
980 msgid "Revision %d is a merge, ignoring...\n"
977 msgid "Revision %d is a merge, ignoring...\n"
981 msgstr ""
978 msgstr ""
982
979
983 #, python-format
980 #, python-format
984 msgid "generating stats: %d%%"
981 msgid "generating stats: %d%%"
985 msgstr ""
982 msgstr ""
986
983
987 msgid ""
984 msgid ""
988 "histogram of changes to the repository\n"
985 "histogram of changes to the repository\n"
989 "\n"
986 "\n"
990 " This command will display a histogram representing the number\n"
987 " This command will display a histogram representing the number\n"
991 " of changed lines or revisions, grouped according to the given\n"
988 " of changed lines or revisions, grouped according to the given\n"
992 " template. The default template will group changes by author.\n"
989 " template. The default template will group changes by author.\n"
993 " The --dateformat option may be used to group the results by\n"
990 " The --dateformat option may be used to group the results by\n"
994 " date instead.\n"
991 " date instead.\n"
995 "\n"
992 "\n"
996 " Statistics are based on the number of changed lines, or\n"
993 " Statistics are based on the number of changed lines, or\n"
997 " alternatively the number of matching revisions if the\n"
994 " alternatively the number of matching revisions if the\n"
998 " --changesets option is specified.\n"
995 " --changesets option is specified.\n"
999 "\n"
996 "\n"
1000 " Examples::\n"
997 " Examples::\n"
1001 "\n"
998 "\n"
1002 " # display count of changed lines for every committer\n"
999 " # display count of changed lines for every committer\n"
1003 " hg churn -t '{author|email}'\n"
1000 " hg churn -t '{author|email}'\n"
1004 "\n"
1001 "\n"
1005 " # display daily activity graph\n"
1002 " # display daily activity graph\n"
1006 " hg churn -f '%H' -s -c\n"
1003 " hg churn -f '%H' -s -c\n"
1007 "\n"
1004 "\n"
1008 " # display activity of developers by month\n"
1005 " # display activity of developers by month\n"
1009 " hg churn -f '%Y-%m' -s -c\n"
1006 " hg churn -f '%Y-%m' -s -c\n"
1010 "\n"
1007 "\n"
1011 " # display count of lines changed in every year\n"
1008 " # display count of lines changed in every year\n"
1012 " hg churn -f '%Y' -s\n"
1009 " hg churn -f '%Y' -s\n"
1013 "\n"
1010 "\n"
1014 " It is possible to map alternate email addresses to a main address\n"
1011 " It is possible to map alternate email addresses to a main address\n"
1015 " by providing a file using the following format::\n"
1012 " by providing a file using the following format::\n"
1016 "\n"
1013 "\n"
1017 " <alias email> <actual email>\n"
1014 " <alias email> <actual email>\n"
1018 "\n"
1015 "\n"
1019 " Such a file may be specified with the --aliases option, otherwise\n"
1016 " Such a file may be specified with the --aliases option, otherwise\n"
1020 " a .hgchurn file will be looked for in the working directory root.\n"
1017 " a .hgchurn file will be looked for in the working directory root.\n"
1021 " "
1018 " "
1022 msgstr ""
1019 msgstr ""
1023
1020
1024 msgid "count rate for the specified revision or range"
1021 msgid "count rate for the specified revision or range"
1025 msgstr ""
1022 msgstr ""
1026
1023
1027 msgid "count rate for revisions matching date spec"
1024 msgid "count rate for revisions matching date spec"
1028 msgstr ""
1025 msgstr ""
1029
1026
1030 msgid "template to group changesets"
1027 msgid "template to group changesets"
1031 msgstr ""
1028 msgstr ""
1032
1029
1033 msgid "strftime-compatible format for grouping by date"
1030 msgid "strftime-compatible format for grouping by date"
1034 msgstr ""
1031 msgstr ""
1035
1032
1036 msgid "count rate by number of changesets"
1033 msgid "count rate by number of changesets"
1037 msgstr ""
1034 msgstr ""
1038
1035
1039 msgid "sort by key (default: sort by count)"
1036 msgid "sort by key (default: sort by count)"
1040 msgstr ""
1037 msgstr ""
1041
1038
1042 msgid "file with email aliases"
1039 msgid "file with email aliases"
1043 msgstr ""
1040 msgstr ""
1044
1041
1045 msgid "show progress"
1042 msgid "show progress"
1046 msgstr ""
1043 msgstr ""
1047
1044
1048 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
1045 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
1049 msgstr ""
1046 msgstr ""
1050
1047
1051 msgid ""
1048 msgid ""
1052 "colorize output from some commands\n"
1049 "colorize output from some commands\n"
1053 "\n"
1050 "\n"
1054 "This extension modifies the status command to add color to its output\n"
1051 "This extension modifies the status command to add color to its output\n"
1055 "to reflect file status, the qseries command to add color to reflect\n"
1052 "to reflect file status, the qseries command to add color to reflect\n"
1056 "patch status (applied, unapplied, missing), and to diff-related\n"
1053 "patch status (applied, unapplied, missing), and to diff-related\n"
1057 "commands to highlight additions, removals, diff headers, and trailing\n"
1054 "commands to highlight additions, removals, diff headers, and trailing\n"
1058 "whitespace.\n"
1055 "whitespace.\n"
1059 "\n"
1056 "\n"
1060 "Other effects in addition to color, like bold and underlined text, are\n"
1057 "Other effects in addition to color, like bold and underlined text, are\n"
1061 "also available. Effects are rendered with the ECMA-48 SGR control\n"
1058 "also available. Effects are rendered with the ECMA-48 SGR control\n"
1062 "function (aka ANSI escape codes). This module also provides the\n"
1059 "function (aka ANSI escape codes). This module also provides the\n"
1063 "render_text function, which can be used to add effects to any text.\n"
1060 "render_text function, which can be used to add effects to any text.\n"
1064 "\n"
1061 "\n"
1065 "Default effects may be overridden from the .hgrc file::\n"
1062 "Default effects may be overridden from the .hgrc file::\n"
1066 "\n"
1063 "\n"
1067 " [color]\n"
1064 " [color]\n"
1068 " status.modified = blue bold underline red_background\n"
1065 " status.modified = blue bold underline red_background\n"
1069 " status.added = green bold\n"
1066 " status.added = green bold\n"
1070 " status.removed = red bold blue_background\n"
1067 " status.removed = red bold blue_background\n"
1071 " status.deleted = cyan bold underline\n"
1068 " status.deleted = cyan bold underline\n"
1072 " status.unknown = magenta bold underline\n"
1069 " status.unknown = magenta bold underline\n"
1073 " status.ignored = black bold\n"
1070 " status.ignored = black bold\n"
1074 "\n"
1071 "\n"
1075 " # 'none' turns off all effects\n"
1072 " # 'none' turns off all effects\n"
1076 " status.clean = none\n"
1073 " status.clean = none\n"
1077 " status.copied = none\n"
1074 " status.copied = none\n"
1078 "\n"
1075 "\n"
1079 " qseries.applied = blue bold underline\n"
1076 " qseries.applied = blue bold underline\n"
1080 " qseries.unapplied = black bold\n"
1077 " qseries.unapplied = black bold\n"
1081 " qseries.missing = red bold\n"
1078 " qseries.missing = red bold\n"
1082 "\n"
1079 "\n"
1083 " diff.diffline = bold\n"
1080 " diff.diffline = bold\n"
1084 " diff.extended = cyan bold\n"
1081 " diff.extended = cyan bold\n"
1085 " diff.file_a = red bold\n"
1082 " diff.file_a = red bold\n"
1086 " diff.file_b = green bold\n"
1083 " diff.file_b = green bold\n"
1087 " diff.hunk = magenta\n"
1084 " diff.hunk = magenta\n"
1088 " diff.deleted = red\n"
1085 " diff.deleted = red\n"
1089 " diff.inserted = green\n"
1086 " diff.inserted = green\n"
1090 " diff.changed = white\n"
1087 " diff.changed = white\n"
1091 " diff.trailingwhitespace = bold red_background\n"
1088 " diff.trailingwhitespace = bold red_background\n"
1092 msgstr ""
1089 msgstr ""
1093
1090
1094 msgid "when to colorize (always, auto, or never)"
1091 msgid "when to colorize (always, auto, or never)"
1095 msgstr ""
1092 msgstr ""
1096
1093
1097 msgid "don't colorize output (DEPRECATED)"
1094 msgid "don't colorize output (DEPRECATED)"
1098 msgstr ""
1095 msgstr ""
1099
1096
1100 #, python-format
1097 #, python-format
1101 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
1098 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
1102 msgstr ""
1099 msgstr ""
1103
1100
1104 msgid "import revisions from foreign VCS repositories into Mercurial"
1101 msgid "import revisions from foreign VCS repositories into Mercurial"
1105 msgstr ""
1102 msgstr ""
1106
1103
1107 msgid ""
1104 msgid ""
1108 "convert a foreign SCM repository to a Mercurial one.\n"
1105 "convert a foreign SCM repository to a Mercurial one.\n"
1109 "\n"
1106 "\n"
1110 " Accepted source formats [identifiers]:\n"
1107 " Accepted source formats [identifiers]:\n"
1111 "\n"
1108 "\n"
1112 " - Mercurial [hg]\n"
1109 " - Mercurial [hg]\n"
1113 " - CVS [cvs]\n"
1110 " - CVS [cvs]\n"
1114 " - Darcs [darcs]\n"
1111 " - Darcs [darcs]\n"
1115 " - git [git]\n"
1112 " - git [git]\n"
1116 " - Subversion [svn]\n"
1113 " - Subversion [svn]\n"
1117 " - Monotone [mtn]\n"
1114 " - Monotone [mtn]\n"
1118 " - GNU Arch [gnuarch]\n"
1115 " - GNU Arch [gnuarch]\n"
1119 " - Bazaar [bzr]\n"
1116 " - Bazaar [bzr]\n"
1120 " - Perforce [p4]\n"
1117 " - Perforce [p4]\n"
1121 "\n"
1118 "\n"
1122 " Accepted destination formats [identifiers]:\n"
1119 " Accepted destination formats [identifiers]:\n"
1123 "\n"
1120 "\n"
1124 " - Mercurial [hg]\n"
1121 " - Mercurial [hg]\n"
1125 " - Subversion [svn] (history on branches is not preserved)\n"
1122 " - Subversion [svn] (history on branches is not preserved)\n"
1126 "\n"
1123 "\n"
1127 " If no revision is given, all revisions will be converted.\n"
1124 " If no revision is given, all revisions will be converted.\n"
1128 " Otherwise, convert will only import up to the named revision\n"
1125 " Otherwise, convert will only import up to the named revision\n"
1129 " (given in a format understood by the source).\n"
1126 " (given in a format understood by the source).\n"
1130 "\n"
1127 "\n"
1131 " If no destination directory name is specified, it defaults to the\n"
1128 " If no destination directory name is specified, it defaults to the\n"
1132 " basename of the source with '-hg' appended. If the destination\n"
1129 " basename of the source with '-hg' appended. If the destination\n"
1133 " repository doesn't exist, it will be created.\n"
1130 " repository doesn't exist, it will be created.\n"
1134 "\n"
1131 "\n"
1135 " By default, all sources except Mercurial will use --branchsort.\n"
1132 " By default, all sources except Mercurial will use --branchsort.\n"
1136 " Mercurial uses --sourcesort to preserve original revision numbers\n"
1133 " Mercurial uses --sourcesort to preserve original revision numbers\n"
1137 " order. Sort modes have the following effects:\n"
1134 " order. Sort modes have the following effects:\n"
1138 "\n"
1135 "\n"
1139 " --branchsort convert from parent to child revision when possible,\n"
1136 " --branchsort convert from parent to child revision when possible,\n"
1140 " which means branches are usually converted one after\n"
1137 " which means branches are usually converted one after\n"
1141 " the other. It generates more compact repositories.\n"
1138 " the other. It generates more compact repositories.\n"
1142 "\n"
1139 "\n"
1143 " --datesort sort revisions by date. Converted repositories have\n"
1140 " --datesort sort revisions by date. Converted repositories have\n"
1144 " good-looking changelogs but are often an order of\n"
1141 " good-looking changelogs but are often an order of\n"
1145 " magnitude larger than the same ones generated by\n"
1142 " magnitude larger than the same ones generated by\n"
1146 " --branchsort.\n"
1143 " --branchsort.\n"
1147 "\n"
1144 "\n"
1148 " --sourcesort try to preserve source revisions order, only\n"
1145 " --sourcesort try to preserve source revisions order, only\n"
1149 " supported by Mercurial sources.\n"
1146 " supported by Mercurial sources.\n"
1150 "\n"
1147 "\n"
1151 " If <REVMAP> isn't given, it will be put in a default location\n"
1148 " If <REVMAP> isn't given, it will be put in a default location\n"
1152 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
1149 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
1153 " that maps each source commit ID to the destination ID for that\n"
1150 " that maps each source commit ID to the destination ID for that\n"
1154 " revision, like so::\n"
1151 " revision, like so::\n"
1155 "\n"
1152 "\n"
1156 " <source ID> <destination ID>\n"
1153 " <source ID> <destination ID>\n"
1157 "\n"
1154 "\n"
1158 " If the file doesn't exist, it's automatically created. It's\n"
1155 " If the file doesn't exist, it's automatically created. It's\n"
1159 " updated on each commit copied, so convert-repo can be interrupted\n"
1156 " updated on each commit copied, so convert-repo can be interrupted\n"
1160 " and can be run repeatedly to copy new commits.\n"
1157 " and can be run repeatedly to copy new commits.\n"
1161 "\n"
1158 "\n"
1162 " The [username mapping] file is a simple text file that maps each\n"
1159 " The [username mapping] file is a simple text file that maps each\n"
1163 " source commit author to a destination commit author. It is handy\n"
1160 " source commit author to a destination commit author. It is handy\n"
1164 " for source SCMs that use unix logins to identify authors (eg:\n"
1161 " for source SCMs that use unix logins to identify authors (eg:\n"
1165 " CVS). One line per author mapping and the line format is:\n"
1162 " CVS). One line per author mapping and the line format is:\n"
1166 " srcauthor=whatever string you want\n"
1163 " srcauthor=whatever string you want\n"
1167 "\n"
1164 "\n"
1168 " The filemap is a file that allows filtering and remapping of files\n"
1165 " The filemap is a file that allows filtering and remapping of files\n"
1169 " and directories. Comment lines start with '#'. Each line can\n"
1166 " and directories. Comment lines start with '#'. Each line can\n"
1170 " contain one of the following directives::\n"
1167 " contain one of the following directives::\n"
1171 "\n"
1168 "\n"
1172 " include path/to/file\n"
1169 " include path/to/file\n"
1173 "\n"
1170 "\n"
1174 " exclude path/to/file\n"
1171 " exclude path/to/file\n"
1175 "\n"
1172 "\n"
1176 " rename from/file to/file\n"
1173 " rename from/file to/file\n"
1177 "\n"
1174 "\n"
1178 " The 'include' directive causes a file, or all files under a\n"
1175 " The 'include' directive causes a file, or all files under a\n"
1179 " directory, to be included in the destination repository, and the\n"
1176 " directory, to be included in the destination repository, and the\n"
1180 " exclusion of all other files and directories not explicitly\n"
1177 " exclusion of all other files and directories not explicitly\n"
1181 " included. The 'exclude' directive causes files or directories to\n"
1178 " included. The 'exclude' directive causes files or directories to\n"
1182 " be omitted. The 'rename' directive renames a file or directory. To\n"
1179 " be omitted. The 'rename' directive renames a file or directory. To\n"
1183 " rename from a subdirectory into the root of the repository, use\n"
1180 " rename from a subdirectory into the root of the repository, use\n"
1184 " '.' as the path to rename to.\n"
1181 " '.' as the path to rename to.\n"
1185 "\n"
1182 "\n"
1186 " The splicemap is a file that allows insertion of synthetic\n"
1183 " The splicemap is a file that allows insertion of synthetic\n"
1187 " history, letting you specify the parents of a revision. This is\n"
1184 " history, letting you specify the parents of a revision. This is\n"
1188 " useful if you want to e.g. give a Subversion merge two parents, or\n"
1185 " useful if you want to e.g. give a Subversion merge two parents, or\n"
1189 " graft two disconnected series of history together. Each entry\n"
1186 " graft two disconnected series of history together. Each entry\n"
1190 " contains a key, followed by a space, followed by one or two\n"
1187 " contains a key, followed by a space, followed by one or two\n"
1191 " comma-separated values. The key is the revision ID in the source\n"
1188 " comma-separated values. The key is the revision ID in the source\n"
1192 " revision control system whose parents should be modified (same\n"
1189 " revision control system whose parents should be modified (same\n"
1193 " format as a key in .hg/shamap). The values are the revision IDs\n"
1190 " format as a key in .hg/shamap). The values are the revision IDs\n"
1194 " (in either the source or destination revision control system) that\n"
1191 " (in either the source or destination revision control system) that\n"
1195 " should be used as the new parents for that node.\n"
1192 " should be used as the new parents for that node.\n"
1196 "\n"
1193 "\n"
1197 " The branchmap is a file that allows you to rename a branch when it is\n"
1194 " The branchmap is a file that allows you to rename a branch when it is\n"
1198 " being brought in from whatever external repository. When used in\n"
1195 " being brought in from whatever external repository. When used in\n"
1199 " conjunction with a splicemap, it allows for a powerful combination\n"
1196 " conjunction with a splicemap, it allows for a powerful combination\n"
1200 " to help fix even the most badly mismanaged repositories and turn them\n"
1197 " to help fix even the most badly mismanaged repositories and turn them\n"
1201 " into nicely structured Mercurial repositories. The branchmap contains\n"
1198 " into nicely structured Mercurial repositories. The branchmap contains\n"
1202 " lines of the form \"original_branch_name new_branch_name\".\n"
1199 " lines of the form \"original_branch_name new_branch_name\".\n"
1203 " \"original_branch_name\" is the name of the branch in the source\n"
1200 " \"original_branch_name\" is the name of the branch in the source\n"
1204 " repository, and \"new_branch_name\" is the name of the branch is the\n"
1201 " repository, and \"new_branch_name\" is the name of the branch is the\n"
1205 " destination repository. This can be used to (for instance) move code\n"
1202 " destination repository. This can be used to (for instance) move code\n"
1206 " in one repository from \"default\" to a named branch.\n"
1203 " in one repository from \"default\" to a named branch.\n"
1207 "\n"
1204 "\n"
1208 " Mercurial Source\n"
1205 " Mercurial Source\n"
1209 " ----------------\n"
1206 " ----------------\n"
1210 "\n"
1207 "\n"
1211 " --config convert.hg.ignoreerrors=False (boolean)\n"
1208 " --config convert.hg.ignoreerrors=False (boolean)\n"
1212 " ignore integrity errors when reading. Use it to fix Mercurial\n"
1209 " ignore integrity errors when reading. Use it to fix Mercurial\n"
1213 " repositories with missing revlogs, by converting from and to\n"
1210 " repositories with missing revlogs, by converting from and to\n"
1214 " Mercurial.\n"
1211 " Mercurial.\n"
1215 " --config convert.hg.saverev=False (boolean)\n"
1212 " --config convert.hg.saverev=False (boolean)\n"
1216 " store original revision ID in changeset (forces target IDs to\n"
1213 " store original revision ID in changeset (forces target IDs to\n"
1217 " change)\n"
1214 " change)\n"
1218 " --config convert.hg.startrev=0 (hg revision identifier)\n"
1215 " --config convert.hg.startrev=0 (hg revision identifier)\n"
1219 " convert start revision and its descendants\n"
1216 " convert start revision and its descendants\n"
1220 "\n"
1217 "\n"
1221 " CVS Source\n"
1218 " CVS Source\n"
1222 " ----------\n"
1219 " ----------\n"
1223 "\n"
1220 "\n"
1224 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
1221 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
1225 " to indicate the starting point of what will be converted. Direct\n"
1222 " to indicate the starting point of what will be converted. Direct\n"
1226 " access to the repository files is not needed, unless of course the\n"
1223 " access to the repository files is not needed, unless of course the\n"
1227 " repository is :local:. The conversion uses the top level directory\n"
1224 " repository is :local:. The conversion uses the top level directory\n"
1228 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
1225 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
1229 " commands to find files to convert. This means that unless a\n"
1226 " commands to find files to convert. This means that unless a\n"
1230 " filemap is given, all files under the starting directory will be\n"
1227 " filemap is given, all files under the starting directory will be\n"
1231 " converted, and that any directory reorganization in the CVS\n"
1228 " converted, and that any directory reorganization in the CVS\n"
1232 " sandbox is ignored.\n"
1229 " sandbox is ignored.\n"
1233 "\n"
1230 "\n"
1234 " The options shown are the defaults.\n"
1231 " The options shown are the defaults.\n"
1235 "\n"
1232 "\n"
1236 " --config convert.cvsps.cache=True (boolean)\n"
1233 " --config convert.cvsps.cache=True (boolean)\n"
1237 " Set to False to disable remote log caching, for testing and\n"
1234 " Set to False to disable remote log caching, for testing and\n"
1238 " debugging purposes.\n"
1235 " debugging purposes.\n"
1239 " --config convert.cvsps.fuzz=60 (integer)\n"
1236 " --config convert.cvsps.fuzz=60 (integer)\n"
1240 " Specify the maximum time (in seconds) that is allowed between\n"
1237 " Specify the maximum time (in seconds) that is allowed between\n"
1241 " commits with identical user and log message in a single\n"
1238 " commits with identical user and log message in a single\n"
1242 " changeset. When very large files were checked in as part of a\n"
1239 " changeset. When very large files were checked in as part of a\n"
1243 " changeset then the default may not be long enough.\n"
1240 " changeset then the default may not be long enough.\n"
1244 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
1241 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
1245 " Specify a regular expression to which commit log messages are\n"
1242 " Specify a regular expression to which commit log messages are\n"
1246 " matched. If a match occurs, then the conversion process will\n"
1243 " matched. If a match occurs, then the conversion process will\n"
1247 " insert a dummy revision merging the branch on which this log\n"
1244 " insert a dummy revision merging the branch on which this log\n"
1248 " message occurs to the branch indicated in the regex.\n"
1245 " message occurs to the branch indicated in the regex.\n"
1249 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
1246 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
1250 " Specify a regular expression to which commit log messages are\n"
1247 " Specify a regular expression to which commit log messages are\n"
1251 " matched. If a match occurs, then the conversion process will\n"
1248 " matched. If a match occurs, then the conversion process will\n"
1252 " add the most recent revision on the branch indicated in the\n"
1249 " add the most recent revision on the branch indicated in the\n"
1253 " regex as the second parent of the changeset.\n"
1250 " regex as the second parent of the changeset.\n"
1254 "\n"
1251 "\n"
1255 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
1252 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
1256 " changeset merging code to be run without doing a conversion. Its\n"
1253 " changeset merging code to be run without doing a conversion. Its\n"
1257 " parameters and output are similar to that of cvsps 2.1. Please see\n"
1254 " parameters and output are similar to that of cvsps 2.1. Please see\n"
1258 " the command help for more details.\n"
1255 " the command help for more details.\n"
1259 "\n"
1256 "\n"
1260 " Subversion Source\n"
1257 " Subversion Source\n"
1261 " -----------------\n"
1258 " -----------------\n"
1262 "\n"
1259 "\n"
1263 " Subversion source detects classical trunk/branches/tags layouts.\n"
1260 " Subversion source detects classical trunk/branches/tags layouts.\n"
1264 " By default, the supplied \"svn://repo/path/\" source URL is\n"
1261 " By default, the supplied \"svn://repo/path/\" source URL is\n"
1265 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
1262 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
1266 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
1263 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
1267 " its subdirectories are listed as possible branches. If\n"
1264 " its subdirectories are listed as possible branches. If\n"
1268 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
1265 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
1269 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
1266 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
1270 " can be overridden with following options. Set them to paths\n"
1267 " can be overridden with following options. Set them to paths\n"
1271 " relative to the source URL, or leave them blank to disable auto\n"
1268 " relative to the source URL, or leave them blank to disable auto\n"
1272 " detection.\n"
1269 " detection.\n"
1273 "\n"
1270 "\n"
1274 " --config convert.svn.branches=branches (directory name)\n"
1271 " --config convert.svn.branches=branches (directory name)\n"
1275 " specify the directory containing branches\n"
1272 " specify the directory containing branches\n"
1276 " --config convert.svn.tags=tags (directory name)\n"
1273 " --config convert.svn.tags=tags (directory name)\n"
1277 " specify the directory containing tags\n"
1274 " specify the directory containing tags\n"
1278 " --config convert.svn.trunk=trunk (directory name)\n"
1275 " --config convert.svn.trunk=trunk (directory name)\n"
1279 " specify the name of the trunk branch\n"
1276 " specify the name of the trunk branch\n"
1280 "\n"
1277 "\n"
1281 " Source history can be retrieved starting at a specific revision,\n"
1278 " Source history can be retrieved starting at a specific revision,\n"
1282 " instead of being integrally converted. Only single branch\n"
1279 " instead of being integrally converted. Only single branch\n"
1283 " conversions are supported.\n"
1280 " conversions are supported.\n"
1284 "\n"
1281 "\n"
1285 " --config convert.svn.startrev=0 (svn revision number)\n"
1282 " --config convert.svn.startrev=0 (svn revision number)\n"
1286 " specify start Subversion revision.\n"
1283 " specify start Subversion revision.\n"
1287 "\n"
1284 "\n"
1288 " Perforce Source\n"
1285 " Perforce Source\n"
1289 " ---------------\n"
1286 " ---------------\n"
1290 "\n"
1287 "\n"
1291 " The Perforce (P4) importer can be given a p4 depot path or a\n"
1288 " The Perforce (P4) importer can be given a p4 depot path or a\n"
1292 " client specification as source. It will convert all files in the\n"
1289 " client specification as source. It will convert all files in the\n"
1293 " source to a flat Mercurial repository, ignoring labels, branches\n"
1290 " source to a flat Mercurial repository, ignoring labels, branches\n"
1294 " and integrations. Note that when a depot path is given you then\n"
1291 " and integrations. Note that when a depot path is given you then\n"
1295 " usually should specify a target directory, because otherwise the\n"
1292 " usually should specify a target directory, because otherwise the\n"
1296 " target may be named ...-hg.\n"
1293 " target may be named ...-hg.\n"
1297 "\n"
1294 "\n"
1298 " It is possible to limit the amount of source history to be\n"
1295 " It is possible to limit the amount of source history to be\n"
1299 " converted by specifying an initial Perforce revision.\n"
1296 " converted by specifying an initial Perforce revision.\n"
1300 "\n"
1297 "\n"
1301 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1298 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1302 " specify initial Perforce revision.\n"
1299 " specify initial Perforce revision.\n"
1303 "\n"
1300 "\n"
1304 " Mercurial Destination\n"
1301 " Mercurial Destination\n"
1305 " ---------------------\n"
1302 " ---------------------\n"
1306 "\n"
1303 "\n"
1307 " --config convert.hg.clonebranches=False (boolean)\n"
1304 " --config convert.hg.clonebranches=False (boolean)\n"
1308 " dispatch source branches in separate clones.\n"
1305 " dispatch source branches in separate clones.\n"
1309 " --config convert.hg.tagsbranch=default (branch name)\n"
1306 " --config convert.hg.tagsbranch=default (branch name)\n"
1310 " tag revisions branch name\n"
1307 " tag revisions branch name\n"
1311 " --config convert.hg.usebranchnames=True (boolean)\n"
1308 " --config convert.hg.usebranchnames=True (boolean)\n"
1312 " preserve branch names\n"
1309 " preserve branch names\n"
1313 "\n"
1310 "\n"
1314 " "
1311 " "
1315 msgstr ""
1312 msgstr ""
1316
1313
1317 msgid ""
1314 msgid ""
1318 "create changeset information from CVS\n"
1315 "create changeset information from CVS\n"
1319 "\n"
1316 "\n"
1320 " This command is intended as a debugging tool for the CVS to\n"
1317 " This command is intended as a debugging tool for the CVS to\n"
1321 " Mercurial converter, and can be used as a direct replacement for\n"
1318 " Mercurial converter, and can be used as a direct replacement for\n"
1322 " cvsps.\n"
1319 " cvsps.\n"
1323 "\n"
1320 "\n"
1324 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1321 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1325 " named directory) in the CVS repository, and converts the log to a\n"
1322 " named directory) in the CVS repository, and converts the log to a\n"
1326 " series of changesets based on matching commit log entries and\n"
1323 " series of changesets based on matching commit log entries and\n"
1327 " dates."
1324 " dates."
1328 msgstr ""
1325 msgstr ""
1329
1326
1330 msgid "username mapping filename"
1327 msgid "username mapping filename"
1331 msgstr ""
1328 msgstr ""
1332
1329
1333 msgid "destination repository type"
1330 msgid "destination repository type"
1334 msgstr ""
1331 msgstr ""
1335
1332
1336 msgid "remap file names using contents of file"
1333 msgid "remap file names using contents of file"
1337 msgstr ""
1334 msgstr ""
1338
1335
1339 msgid "import up to target revision REV"
1336 msgid "import up to target revision REV"
1340 msgstr ""
1337 msgstr ""
1341
1338
1342 msgid "source repository type"
1339 msgid "source repository type"
1343 msgstr ""
1340 msgstr ""
1344
1341
1345 msgid "splice synthesized history into place"
1342 msgid "splice synthesized history into place"
1346 msgstr ""
1343 msgstr ""
1347
1344
1348 msgid "change branch names while converting"
1345 msgid "change branch names while converting"
1349 msgstr ""
1346 msgstr ""
1350
1347
1351 msgid "try to sort changesets by branches"
1348 msgid "try to sort changesets by branches"
1352 msgstr ""
1349 msgstr ""
1353
1350
1354 msgid "try to sort changesets by date"
1351 msgid "try to sort changesets by date"
1355 msgstr ""
1352 msgstr ""
1356
1353
1357 msgid "preserve source changesets order"
1354 msgid "preserve source changesets order"
1358 msgstr ""
1355 msgstr ""
1359
1356
1360 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1357 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1361 msgstr ""
1358 msgstr ""
1362
1359
1363 msgid "only return changes on specified branches"
1360 msgid "only return changes on specified branches"
1364 msgstr ""
1361 msgstr ""
1365
1362
1366 msgid "prefix to remove from file names"
1363 msgid "prefix to remove from file names"
1367 msgstr ""
1364 msgstr ""
1368
1365
1369 msgid "only return changes after or between specified tags"
1366 msgid "only return changes after or between specified tags"
1370 msgstr ""
1367 msgstr ""
1371
1368
1372 msgid "update cvs log cache"
1369 msgid "update cvs log cache"
1373 msgstr ""
1370 msgstr ""
1374
1371
1375 msgid "create new cvs log cache"
1372 msgid "create new cvs log cache"
1376 msgstr ""
1373 msgstr ""
1377
1374
1378 msgid "set commit time fuzz in seconds"
1375 msgid "set commit time fuzz in seconds"
1379 msgstr ""
1376 msgstr ""
1380
1377
1381 msgid "specify cvsroot"
1378 msgid "specify cvsroot"
1382 msgstr ""
1379 msgstr ""
1383
1380
1384 msgid "show parent changesets"
1381 msgid "show parent changesets"
1385 msgstr ""
1382 msgstr ""
1386
1383
1387 msgid "show current changeset in ancestor branches"
1384 msgid "show current changeset in ancestor branches"
1388 msgstr ""
1385 msgstr ""
1389
1386
1390 msgid "ignored for compatibility"
1387 msgid "ignored for compatibility"
1391 msgstr ""
1388 msgstr ""
1392
1389
1393 msgid "hg debugcvsps [OPTION]... [PATH]..."
1390 msgid "hg debugcvsps [OPTION]... [PATH]..."
1394 msgstr ""
1391 msgstr ""
1395
1392
1396 msgid ""
1393 msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
1397 "warning: lightweight checkouts may cause conversion failures, try with a "
1398 "regular branch instead.\n"
1399 msgstr ""
1394 msgstr ""
1400
1395
1401 msgid "bzr source type could not be determined\n"
1396 msgid "bzr source type could not be determined\n"
1402 msgstr ""
1397 msgstr ""
1403
1398
1404 #, python-format
1399 #, python-format
1405 msgid "%s is not a valid revision in current branch"
1400 msgid "%s is not a valid revision in current branch"
1406 msgstr ""
1401 msgstr ""
1407
1402
1408 #, python-format
1403 #, python-format
1409 msgid "%s is not available in %s anymore"
1404 msgid "%s is not available in %s anymore"
1410 msgstr ""
1405 msgstr ""
1411
1406
1412 #, python-format
1407 #, python-format
1413 msgid "%s.%s symlink has no target"
1408 msgid "%s.%s symlink has no target"
1414 msgstr ""
1409 msgstr ""
1415
1410
1416 #, python-format
1411 #, python-format
1417 msgid "cannot find required \"%s\" tool"
1412 msgid "cannot find required \"%s\" tool"
1418 msgstr ""
1413 msgstr ""
1419
1414
1420 #, python-format
1415 #, python-format
1421 msgid "%s error:\n"
1416 msgid "%s error:\n"
1422 msgstr ""
1417 msgstr ""
1423
1418
1424 #, python-format
1419 #, python-format
1425 msgid "syntax error in %s(%d): key/value pair expected"
1420 msgid "syntax error in %s(%d): key/value pair expected"
1426 msgstr ""
1421 msgstr ""
1427
1422
1428 #, python-format
1423 #, python-format
1429 msgid "could not open map file %r: %s"
1424 msgid "could not open map file %r: %s"
1430 msgstr ""
1425 msgstr ""
1431
1426
1432 #, python-format
1427 #, python-format
1433 msgid "%s: missing or unsupported repository"
1428 msgid "%s: missing or unsupported repository"
1434 msgstr ""
1429 msgstr ""
1435
1430
1436 #, python-format
1431 #, python-format
1437 msgid "convert: %s\n"
1432 msgid "convert: %s\n"
1438 msgstr ""
1433 msgstr ""
1439
1434
1440 #, python-format
1435 #, python-format
1441 msgid "%s: unknown repository type"
1436 msgid "%s: unknown repository type"
1442 msgstr ""
1437 msgstr "%s : type de dépôt inconnu"
1443
1438
1444 #, python-format
1439 #, python-format
1445 msgid "unknown sort mode: %s"
1440 msgid "unknown sort mode: %s"
1446 msgstr ""
1441 msgstr "mode de tri inconnu: %s"
1447
1442
1448 #, python-format
1443 #, python-format
1449 msgid "cycle detected between %s and %s"
1444 msgid "cycle detected between %s and %s"
1450 msgstr ""
1445 msgstr "cycle détecté entre %s et %s"
1451
1446
1447 #, fuzzy
1452 msgid "not all revisions were sorted"
1448 msgid "not all revisions were sorted"
1453 msgstr ""
1449 msgstr "Touts les révisions n'ont pas été triées"
1454
1450
1455 #, python-format
1451 #, python-format
1456 msgid "Writing author map file %s\n"
1452 msgid "Writing author map file %s\n"
1457 msgstr ""
1453 msgstr ""
1458
1454
1459 #, python-format
1455 #, python-format
1460 msgid "Ignoring bad line in author map file %s: %s\n"
1456 msgid "Ignoring bad line in author map file %s: %s\n"
1461 msgstr ""
1457 msgstr ""
1462
1458
1463 #, python-format
1459 #, python-format
1464 msgid "mapping author %s to %s\n"
1460 msgid "mapping author %s to %s\n"
1465 msgstr ""
1461 msgstr ""
1466
1462
1467 #, python-format
1463 #, python-format
1468 msgid "overriding mapping for author %s, was %s, will be %s\n"
1464 msgid "overriding mapping for author %s, was %s, will be %s\n"
1469 msgstr ""
1465 msgstr ""
1470
1466
1471 #, python-format
1467 #, python-format
1472 msgid "spliced in %s as parents of %s\n"
1468 msgid "spliced in %s as parents of %s\n"
1473 msgstr ""
1469 msgstr ""
1474
1470
1475 msgid "scanning source...\n"
1471 msgid "scanning source...\n"
1476 msgstr ""
1472 msgstr ""
1477
1473
1474 #, fuzzy
1478 msgid "sorting...\n"
1475 msgid "sorting...\n"
1479 msgstr ""
1476 msgstr "tri en cours...\n"
1480
1477
1478 #, fuzzy
1481 msgid "converting...\n"
1479 msgid "converting...\n"
1482 msgstr ""
1480 msgstr "conversion en cours...\n"
1483
1481
1484 #, python-format
1482 #, python-format
1485 msgid "source: %s\n"
1483 msgid "source: %s\n"
1486 msgstr ""
1484 msgstr "source: %s\n"
1487
1485
1488 #, python-format
1486 #, python-format
1489 msgid "assuming destination %s\n"
1487 msgid "assuming destination %s\n"
1490 msgstr ""
1488 msgstr ""
1491
1489
1492 msgid "more than one sort mode specified"
1490 msgid "more than one sort mode specified"
1493 msgstr ""
1491 msgstr "plus d'un mode de tri specifié"
1494
1492
1495 msgid "--sourcesort is not supported by this data source"
1493 msgid "--sourcesort is not supported by this data source"
1496 msgstr ""
1494 msgstr ""
1497
1495
1498 #, fuzzy, python-format
1496 #, fuzzy, python-format
1499 msgid "revision %s is not a patchset number"
1497 msgid "revision %s is not a patchset number"
1500 msgstr "la révision %d n'est pas parente de la pile"
1498 msgstr "la révision %d n'est pas parente de la pile"
1501
1499
1502 #, python-format
1500 #, python-format
1503 msgid "connecting to %s\n"
1501 msgid "connecting to %s\n"
1504 msgstr ""
1502 msgstr "connexion à %s\n"
1505
1503
1506 msgid "CVS pserver authentication failed"
1504 msgid "CVS pserver authentication failed"
1507 msgstr ""
1505 msgstr "l'authentification au serveur CVS a échoué"
1508
1506
1509 #, python-format
1507 #, python-format, fuzzy
1510 msgid ""
1508 msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1511 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1509 msgstr "réponse innatendue du serveur CVS (\\'Valid-requests\" attendue, mais %r reçue)"
1512 msgstr ""
1513
1510
1514 #, python-format
1511 #, python-format
1515 msgid "%d bytes missing from remote file"
1512 msgid "%d bytes missing from remote file"
1516 msgstr ""
1513 msgstr "%d bytes manquants dans le fichier distant"
1517
1514
1518 #, python-format
1515 #, python-format
1519 msgid "cvs server: %s\n"
1516 msgid "cvs server: %s\n"
1520 msgstr ""
1517 msgstr "serveur cvs : %s\n"
1521
1518
1522 #, python-format
1519 #, python-format
1523 msgid "unknown CVS response: %s"
1520 msgid "unknown CVS response: %s"
1524 msgstr ""
1521 msgstr "Réponse CVS inconnue : %s"
1525
1522
1523 #, fuzzy
1526 msgid "collecting CVS rlog\n"
1524 msgid "collecting CVS rlog\n"
1527 msgstr ""
1525 msgstr "récupération des rlog CVS\n"
1528
1526
1529 #, python-format
1527 #, python-format
1530 msgid "reading cvs log cache %s\n"
1528 msgid "reading cvs log cache %s\n"
1531 msgstr ""
1529 msgstr ""
1532
1530
1533 #, python-format
1531 #, python-format, fuzzy
1534 msgid "cache has %d log entries\n"
1532 msgid "cache has %d log entries\n"
1535 msgstr ""
1533 msgstr "le cache a %d entrées de log\n"
1536
1534
1537 #, python-format
1535 #, python-format
1538 msgid "error reading cache: %r\n"
1536 msgid "error reading cache: %r\n"
1539 msgstr ""
1537 msgstr "erreur lors de la lecture du cache : %r\n"
1540
1538
1541 #, python-format
1539 #, python-format
1542 msgid "running %s\n"
1540 msgid "running %s\n"
1543 msgstr ""
1541 msgstr ""
1544
1542
1543 #, fuzzy
1545 msgid "RCS file must be followed by working file"
1544 msgid "RCS file must be followed by working file"
1546 msgstr ""
1545 msgstr "le fichier RCS doit être suivi par le fichier de travail"
1547
1546
1548 msgid "must have at least some revisions"
1547 msgid "must have at least some revisions"
1549 msgstr ""
1548 msgstr ""
1550
1549
1551 msgid "expected revision number"
1550 msgid "expected revision number"
1552 msgstr ""
1551 msgstr "numéro de révision attendu"
1553
1552
1554 msgid "revision must be followed by date line"
1553 msgid "revision must be followed by date line"
1555 msgstr ""
1554 msgstr ""
1556
1555
1557 #, python-format
1556 #, python-format
1558 msgid "writing cvs log cache %s\n"
1557 msgid "writing cvs log cache %s\n"
1559 msgstr ""
1558 msgstr ""
1560
1559
1561 #, python-format
1560 #, python-format, fuzzy
1562 msgid "%d log entries\n"
1561 msgid "%d log entries\n"
1563 msgstr ""
1562 msgstr "%d entrées dans les log\n"
1564
1563
1565 msgid "creating changesets\n"
1564 msgid "creating changesets\n"
1566 msgstr ""
1565 msgstr ""
1567
1566
1568 msgid "synthetic changeset cannot have multiple parents"
1567 msgid "synthetic changeset cannot have multiple parents"
1569 msgstr ""
1568 msgstr ""
1570
1569
1571 #, python-format
1570 #, python-format
1572 msgid ""
1571 msgid ""
1573 "warning: CVS commit message references non-existent branch %r:\n"
1572 "warning: CVS commit message references non-existent branch %r:\n"
1574 "%s\n"
1573 "%s\n"
1575 msgstr ""
1574 msgstr ""
1576
1575
1577 #, python-format
1576 #, python-format
1578 msgid "%d changeset entries\n"
1577 msgid "%d changeset entries\n"
1579 msgstr ""
1578 msgstr ""
1580
1579
1581 #, python-format
1580 #, python-format
1582 msgid "darcs version 2.1 or newer needed (found %r)"
1581 msgid "darcs version 2.1 or newer needed (found %r)"
1583 msgstr ""
1582 msgstr "darcs version 2.1 ou supérieur nécessaire (trouvé %r)"
1584
1583
1585 msgid "Python ElementTree module is not available"
1584 msgid "Python ElementTree module is not available"
1586 msgstr ""
1585 msgstr "Le module Python ElementTree n'est pas disponible"
1587
1586
1588 msgid "internal calling inconsistency"
1587 msgid "internal calling inconsistency"
1589 msgstr ""
1588 msgstr ""
1590
1589
1591 msgid "errors in filemap"
1590 msgid "errors in filemap"
1592 msgstr ""
1591 msgstr ""
1593
1592
1594 #, python-format
1593 #, python-format
1595 msgid "%s:%d: %r already in %s list\n"
1594 msgid "%s:%d: %r already in %s list\n"
1596 msgstr ""
1595 msgstr ""
1597
1596
1598 #, python-format
1597 #, python-format
1599 msgid "%s:%d: unknown directive %r\n"
1598 msgid "%s:%d: unknown directive %r\n"
1600 msgstr ""
1599 msgstr ""
1601
1600
1602 msgid "source repository doesn't support --filemap"
1601 msgid "source repository doesn't support --filemap"
1603 msgstr ""
1602 msgstr ""
1604
1603
1605 #, python-format
1604 #, python-format
1606 msgid "%s does not look like a GNU Arch repo"
1605 msgid "%s does not look like a GNU Arch repo"
1607 msgstr ""
1606 msgstr ""
1608
1607
1609 msgid "cannot find a GNU Arch tool"
1608 msgid "cannot find a GNU Arch tool"
1610 msgstr ""
1609 msgstr ""
1611
1610
1612 #, python-format
1611 #, python-format
1613 msgid "analyzing tree version %s...\n"
1612 msgid "analyzing tree version %s...\n"
1614 msgstr ""
1613 msgstr ""
1615
1614
1616 #, python-format
1615 #, python-format
1617 msgid ""
1616 msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
1618 "tree analysis stopped because it points to an unregistered archive %s...\n"
1619 msgstr ""
1617 msgstr ""
1620
1618
1621 #, python-format
1619 #, python-format
1622 msgid "could not parse cat-log of %s"
1620 msgid "could not parse cat-log of %s"
1623 msgstr ""
1621 msgstr ""
1624
1622
1625 #, python-format
1623 #, python-format
1626 msgid "%s is not a local Mercurial repo"
1624 msgid "%s is not a local Mercurial repo"
1627 msgstr ""
1625 msgstr "%s n'est pas un dépôt local de Mercurial"
1628
1626
1629 #, python-format
1627 #, python-format
1630 msgid "initializing destination %s repository\n"
1628 msgid "initializing destination %s repository\n"
1631 msgstr ""
1629 msgstr ""
1632
1630
1633 #, python-format
1631 #, python-format
1634 msgid "pulling from %s into %s\n"
1632 msgid "pulling from %s into %s\n"
1635 msgstr ""
1633 msgstr ""
1636
1634
1637 msgid "filtering out empty revision\n"
1635 msgid "filtering out empty revision\n"
1638 msgstr ""
1636 msgstr ""
1639
1637
1640 msgid "updating tags\n"
1638 msgid "updating tags\n"
1641 msgstr ""
1639 msgstr "mise à jour des tags\n"
1642
1640
1643 #, python-format
1641 #, python-format
1644 msgid "%s is not a valid start revision"
1642 msgid "%s is not a valid start revision"
1645 msgstr ""
1643 msgstr ""
1646
1644
1647 #, python-format
1645 #, python-format
1648 msgid "ignoring: %s\n"
1646 msgid "ignoring: %s\n"
1649 msgstr ""
1647 msgstr ""
1650
1648
1651 #, python-format
1649 #, python-format
1652 msgid "%s does not look like a monotone repo"
1650 msgid "%s does not look like a monotone repo"
1653 msgstr ""
1651 msgstr ""
1654
1652
1655 #, python-format
1653 #, python-format
1656 msgid "copying file in renamed directory from '%s' to '%s'"
1654 msgid "copying file in renamed directory from '%s' to '%s'"
1657 msgstr ""
1655 msgstr ""
1658
1656
1659 msgid "reading p4 views\n"
1657 msgid "reading p4 views\n"
1660 msgstr ""
1658 msgstr ""
1661
1659
1662 msgid "collecting p4 changelists\n"
1660 msgid "collecting p4 changelists\n"
1663 msgstr ""
1661 msgstr ""
1664
1662
1665 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1663 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1666 msgstr ""
1664 msgstr ""
1667
1665
1668 msgid "Subversion python bindings could not be loaded"
1666 msgid "Subversion python bindings could not be loaded"
1669 msgstr ""
1667 msgstr ""
1670
1668
1671 #, python-format
1669 #, python-format
1672 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1670 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1673 msgstr ""
1671 msgstr ""
1674
1672
1675 msgid "Subversion python bindings are too old, 1.4 or later required"
1673 msgid "Subversion python bindings are too old, 1.4 or later required"
1676 msgstr ""
1674 msgstr ""
1677
1675
1678 #, python-format
1676 #, python-format, fuzzy
1679 msgid "svn: revision %s is not an integer"
1677 msgid "svn: revision %s is not an integer"
1680 msgstr ""
1678 msgstr "svn : la révision %s n'est pas un entier"
1681
1679
1682 #, python-format
1680 #, python-format
1683 msgid "svn: start revision %s is not an integer"
1681 msgid "svn: start revision %s is not an integer"
1684 msgstr ""
1682 msgstr ""
1685
1683
1686 #, python-format
1684 #, python-format
1687 msgid "no revision found in module %s"
1685 msgid "no revision found in module %s"
1688 msgstr ""
1686 msgstr ""
1689
1687
1690 #, python-format
1688 #, python-format
1691 msgid "expected %s to be at %r, but not found"
1689 msgid "expected %s to be at %r, but not found"
1692 msgstr ""
1690 msgstr ""
1693
1691
1694 #, python-format
1692 #, python-format
1695 msgid "found %s at %r\n"
1693 msgid "found %s at %r\n"
1696 msgstr ""
1694 msgstr ""
1697
1695
1698 #, python-format
1696 #, python-format
1699 msgid "ignoring empty branch %s\n"
1697 msgid "ignoring empty branch %s\n"
1700 msgstr ""
1698 msgstr ""
1701
1699
1702 #, python-format
1700 #, python-format
1703 msgid "found branch %s at %d\n"
1701 msgid "found branch %s at %d\n"
1704 msgstr ""
1702 msgstr ""
1705
1703
1706 msgid "svn: start revision is not supported with more than one branch"
1704 msgid "svn: start revision is not supported with more than one branch"
1707 msgstr ""
1705 msgstr ""
1708
1706
1709 #, python-format
1707 #, python-format
1710 msgid "svn: no revision found after start revision %d"
1708 msgid "svn: no revision found after start revision %d"
1711 msgstr ""
1709 msgstr ""
1712
1710
1713 #, python-format
1711 #, python-format
1714 msgid "no tags found at revision %d\n"
1712 msgid "no tags found at revision %d\n"
1715 msgstr ""
1713 msgstr "aucun tag trouvé dans la révision %d\n"
1716
1714
1717 #, python-format
1715 #, python-format
1718 msgid "%s not found up to revision %d"
1716 msgid "%s not found up to revision %d"
1719 msgstr ""
1717 msgstr ""
1720
1718
1721 #, python-format
1719 #, python-format
1722 msgid "found parent of branch %s at %d: %s\n"
1720 msgid "found parent of branch %s at %d: %s\n"
1723 msgstr ""
1721 msgstr ""
1724
1722
1725 #, python-format
1723 #, python-format
1726 msgid "fetching revision log for \"%s\" from %d to %d\n"
1724 msgid "fetching revision log for \"%s\" from %d to %d\n"
1727 msgstr ""
1725 msgstr ""
1728
1726
1729 #, python-format
1727 #, python-format
1730 msgid "svn: branch has no revision %s"
1728 msgid "svn: branch has no revision %s"
1731 msgstr ""
1729 msgstr ""
1732
1730
1733 #, python-format
1731 #, python-format
1734 msgid "initializing svn repo %r\n"
1732 msgid "initializing svn repo %r\n"
1735 msgstr ""
1733 msgstr "initialisation du dépôt svn %r\n"
1736
1734
1737 #, python-format
1735 #, python-format
1738 msgid "initializing svn wc %r\n"
1736 msgid "initializing svn wc %r\n"
1739 msgstr ""
1737 msgstr ""
1740
1738
1741 msgid "unexpected svn output:\n"
1739 msgid "unexpected svn output:\n"
1742 msgstr ""
1740 msgstr ""
1743
1741
1744 msgid "unable to cope with svn output"
1742 msgid "unable to cope with svn output"
1745 msgstr ""
1743 msgstr ""
1746
1744
1747 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1745 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1748 msgstr ""
1746 msgstr "XXX TAGS PAS ENCORE IMPLÉMENTÉ\n"
1749
1747
1750 msgid ""
1748 msgid ""
1751 "command to allow external programs to compare revisions\n"
1749 "command to allow external programs to compare revisions\n"
1752 "\n"
1750 "\n"
1753 "The extdiff Mercurial extension allows you to use external programs\n"
1751 "The extdiff Mercurial extension allows you to use external programs\n"
1754 "to compare revisions, or revision with working directory. The external\n"
1752 "to compare revisions, or revision with working directory. The external\n"
1755 "diff programs are called with a configurable set of options and two\n"
1753 "diff programs are called with a configurable set of options and two\n"
1756 "non-option arguments: paths to directories containing snapshots of\n"
1754 "non-option arguments: paths to directories containing snapshots of\n"
1757 "files to compare.\n"
1755 "files to compare.\n"
1758 "\n"
1756 "\n"
1759 "The extdiff extension also allows to configure new diff commands, so\n"
1757 "The extdiff extension also allows to configure new diff commands, so\n"
1760 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1758 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1761 "\n"
1759 "\n"
1762 " [extdiff]\n"
1760 " [extdiff]\n"
1763 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1761 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1764 " cdiff = gdiff -Nprc5\n"
1762 " cdiff = gdiff -Nprc5\n"
1765 " ## or the old way:\n"
1763 " ## or the old way:\n"
1766 " #cmd.cdiff = gdiff\n"
1764 " #cmd.cdiff = gdiff\n"
1767 " #opts.cdiff = -Nprc5\n"
1765 " #opts.cdiff = -Nprc5\n"
1768 "\n"
1766 "\n"
1769 " # add new command called vdiff, runs kdiff3\n"
1767 " # add new command called vdiff, runs kdiff3\n"
1770 " vdiff = kdiff3\n"
1768 " vdiff = kdiff3\n"
1771 "\n"
1769 "\n"
1772 " # add new command called meld, runs meld (no need to name twice)\n"
1770 " # add new command called meld, runs meld (no need to name twice)\n"
1773 " meld =\n"
1771 " meld =\n"
1774 "\n"
1772 "\n"
1775 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1773 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1776 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1774 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1777 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1775 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1778 " # your .vimrc\n"
1776 " # your .vimrc\n"
1779 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1777 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1780 "\n"
1778 "\n"
1781 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1779 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1782 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1780 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1783 "files, so running the external diff program will actually be pretty\n"
1781 "files, so running the external diff program will actually be pretty\n"
1784 "fast (at least faster than having to compare the entire tree).\n"
1782 "fast (at least faster than having to compare the entire tree).\n"
1785 msgstr ""
1783 msgstr ""
1786
1784
1787 #, python-format
1785 #, python-format
1788 msgid "making snapshot of %d files from rev %s\n"
1786 msgid "making snapshot of %d files from rev %s\n"
1789 msgstr ""
1787 msgstr ""
1790
1788
1791 #, python-format
1789 #, python-format
1792 msgid "making snapshot of %d files from working directory\n"
1790 msgid "making snapshot of %d files from working directory\n"
1793 msgstr ""
1791 msgstr ""
1794
1792
1795 msgid "cannot specify --rev and --change at the same time"
1793 msgid "cannot specify --rev and --change at the same time"
1796 msgstr ""
1794 msgstr ""
1797
1795
1798 msgid "cleaning up temp directory\n"
1796 msgid "cleaning up temp directory\n"
1799 msgstr ""
1797 msgstr "nettoyage du dossier temporaire\n"
1800
1798
1801 msgid ""
1799 msgid ""
1802 "use external program to diff repository (or selected files)\n"
1800 "use external program to diff repository (or selected files)\n"
1803 "\n"
1801 "\n"
1804 " Show differences between revisions for the specified files, using\n"
1802 " Show differences between revisions for the specified files, using\n"
1805 " an external program. The default program used is diff, with\n"
1803 " an external program. The default program used is diff, with\n"
1806 " default options \"-Npru\".\n"
1804 " default options \"-Npru\".\n"
1807 "\n"
1805 "\n"
1808 " To select a different program, use the -p/--program option. The\n"
1806 " To select a different program, use the -p/--program option. The\n"
1809 " program will be passed the names of two directories to compare. To\n"
1807 " program will be passed the names of two directories to compare. To\n"
1810 " pass additional options to the program, use -o/--option. These\n"
1808 " pass additional options to the program, use -o/--option. These\n"
1811 " will be passed before the names of the directories to compare.\n"
1809 " will be passed before the names of the directories to compare.\n"
1812 "\n"
1810 "\n"
1813 " When two revision arguments are given, then changes are shown\n"
1811 " When two revision arguments are given, then changes are shown\n"
1814 " between those revisions. If only one revision is specified then\n"
1812 " between those revisions. If only one revision is specified then\n"
1815 " that revision is compared to the working directory, and, when no\n"
1813 " that revision is compared to the working directory, and, when no\n"
1816 " revisions are specified, the working directory files are compared\n"
1814 " revisions are specified, the working directory files are compared\n"
1817 " to its parent."
1815 " to its parent."
1818 msgstr ""
1816 msgstr ""
1819
1817
1820 msgid "comparison program to run"
1818 msgid "comparison program to run"
1821 msgstr ""
1819 msgstr ""
1822
1820
1823 msgid "pass option to comparison program"
1821 msgid "pass option to comparison program"
1824 msgstr ""
1822 msgstr ""
1825
1823
1826 msgid "change made by revision"
1824 msgid "change made by revision"
1827 msgstr ""
1825 msgstr ""
1828
1826
1829 msgid "hg extdiff [OPT]... [FILE]..."
1827 msgid "hg extdiff [OPT]... [FILE]..."
1830 msgstr ""
1828 msgstr ""
1831
1829
1832 #, python-format
1830 #, python-format
1833 msgid ""
1831 msgid ""
1834 "use %(path)s to diff repository (or selected files)\n"
1832 "use %(path)s to diff repository (or selected files)\n"
1835 "\n"
1833 "\n"
1836 " Show differences between revisions for the specified files, using the\n"
1834 " Show differences between revisions for the specified files, using the\n"
1837 " %(path)s program.\n"
1835 " %(path)s program.\n"
1838 "\n"
1836 "\n"
1839 " When two revision arguments are given, then changes are shown between\n"
1837 " When two revision arguments are given, then changes are shown between\n"
1840 " those revisions. If only one revision is specified then that revision "
1838 " those revisions. If only one revision is specified then that revision is\n"
1841 "is\n"
1839 " compared to the working directory, and, when no revisions are specified,\n"
1842 " compared to the working directory, and, when no revisions are "
1843 "specified,\n"
1844 " the working directory files are compared to its parent."
1840 " the working directory files are compared to its parent."
1845 msgstr ""
1841 msgstr ""
1846
1842
1847 #, python-format
1843 #, python-format
1848 msgid "hg %s [OPTION]... [FILE]..."
1844 msgid "hg %s [OPTION]... [FILE]..."
1849 msgstr ""
1845 msgstr ""
1850
1846
1851 msgid "pull, update and merge in one command"
1847 msgid "pull, update and merge in one command"
1852 msgstr ""
1848 msgstr ""
1853
1849
1854 msgid ""
1850 msgid ""
1855 "pull changes from a remote repository, merge new changes if needed.\n"
1851 "pull changes from a remote repository, merge new changes if needed.\n"
1856 "\n"
1852 "\n"
1857 " This finds all changes from the repository at the specified path\n"
1853 " This finds all changes from the repository at the specified path\n"
1858 " or URL and adds them to the local repository.\n"
1854 " or URL and adds them to the local repository.\n"
1859 "\n"
1855 "\n"
1860 " If the pulled changes add a new branch head, the head is\n"
1856 " If the pulled changes add a new branch head, the head is\n"
1861 " automatically merged, and the result of the merge is committed.\n"
1857 " automatically merged, and the result of the merge is committed.\n"
1862 " Otherwise, the working directory is updated to include the new\n"
1858 " Otherwise, the working directory is updated to include the new\n"
1863 " changes.\n"
1859 " changes.\n"
1864 "\n"
1860 "\n"
1865 " When a merge occurs, the newly pulled changes are assumed to be\n"
1861 " When a merge occurs, the newly pulled changes are assumed to be\n"
1866 " \"authoritative\". The head of the new changes is used as the first\n"
1862 " \"authoritative\". The head of the new changes is used as the first\n"
1867 " parent, with local changes as the second. To switch the merge\n"
1863 " parent, with local changes as the second. To switch the merge\n"
1868 " order, use --switch-parent.\n"
1864 " order, use --switch-parent.\n"
1869 "\n"
1865 "\n"
1870 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1866 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1871 " "
1867 " "
1872 msgstr ""
1868 msgstr ""
1873
1869
1874 msgid ""
1870 msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1875 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1876 msgstr ""
1871 msgstr ""
1877
1872
1878 msgid "outstanding uncommitted merge"
1873 msgid "outstanding uncommitted merge"
1879 msgstr ""
1874 msgstr ""
1880
1875
1881 msgid "outstanding uncommitted changes"
1876 msgid "outstanding uncommitted changes"
1882 msgstr ""
1877 msgstr ""
1883
1878
1884 msgid "working directory is missing some files"
1879 msgid "working directory is missing some files"
1885 msgstr ""
1880 msgstr ""
1886
1881
1887 msgid ""
1882 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1888 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1889 msgstr ""
1883 msgstr ""
1890
1884
1891 #, python-format
1885 #, python-format
1892 msgid "pulling from %s\n"
1886 msgid "pulling from %s\n"
1893 msgstr ""
1887 msgstr ""
1894
1888
1895 msgid ""
1889 msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
1896 "Other repository doesn't support revision lookup, so a rev cannot be "
1890 msgstr ""
1897 "specified."
1891
1898 msgstr ""
1892 #, python-format
1899
1893 msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
1900 #, python-format
1901 msgid ""
1902 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1903 "\" to merge them)\n"
1904 msgstr ""
1894 msgstr ""
1905
1895
1906 #, python-format
1896 #, python-format
1907 msgid "updating to %d:%s\n"
1897 msgid "updating to %d:%s\n"
1908 msgstr ""
1898 msgstr ""
1909
1899
1910 #, python-format
1900 #, python-format
1911 msgid "merging with %d:%s\n"
1901 msgid "merging with %d:%s\n"
1912 msgstr ""
1902 msgstr ""
1913
1903
1914 #, python-format
1904 #, python-format
1915 msgid "new changeset %d:%s merges remote changes with local\n"
1905 msgid "new changeset %d:%s merges remote changes with local\n"
1916 msgstr ""
1906 msgstr ""
1917
1907
1918 msgid "a specific revision you would like to pull"
1908 msgid "a specific revision you would like to pull"
1919 msgstr ""
1909 msgstr ""
1920
1910
1921 msgid "edit commit message"
1911 msgid "edit commit message"
1922 msgstr ""
1912 msgstr ""
1923
1913
1924 msgid "edit commit message (DEPRECATED)"
1914 msgid "edit commit message (DEPRECATED)"
1925 msgstr ""
1915 msgstr ""
1926
1916
1927 msgid "switch parents when merging"
1917 msgid "switch parents when merging"
1928 msgstr ""
1918 msgstr ""
1929
1919
1930 msgid "hg fetch [SOURCE]"
1920 msgid "hg fetch [SOURCE]"
1931 msgstr ""
1921 msgstr ""
1932
1922
1933 msgid "commands to sign and verify changesets"
1923 msgid "commands to sign and verify changesets"
1934 msgstr ""
1924 msgstr ""
1935
1925
1936 msgid "error while verifying signature"
1926 msgid "error while verifying signature"
1937 msgstr ""
1927 msgstr "erreur lors de la vérification de la signature"
1938
1928
1939 #, python-format
1929 #, python-format
1940 msgid "%s Bad signature from \"%s\"\n"
1930 msgid "%s Bad signature from \"%s\"\n"
1941 msgstr ""
1931 msgstr ""
1942
1932
1943 #, python-format
1933 #, python-format
1944 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1934 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1945 msgstr ""
1935 msgstr ""
1946
1936
1947 #, python-format
1937 #, python-format
1948 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1938 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1949 msgstr ""
1939 msgstr ""
1950
1940
1951 msgid "list signed changesets"
1941 msgid "list signed changesets"
1952 msgstr ""
1942 msgstr ""
1953
1943
1954 #, python-format
1944 #, python-format, fuzzy
1955 msgid "%s:%d node does not exist\n"
1945 msgid "%s:%d node does not exist\n"
1956 msgstr ""
1946 msgstr "%s: le noeud %d n'existe pas\n"
1957
1947
1958 msgid "verify all the signatures there may be for a particular revision"
1948 msgid "verify all the signatures there may be for a particular revision"
1959 msgstr ""
1949 msgstr ""
1960
1950
1961 #, python-format
1951 #, python-format
1962 msgid "No valid signature for %s\n"
1952 msgid "No valid signature for %s\n"
1963 msgstr ""
1953 msgstr "Signature invalide pour %s\n"
1964
1954
1965 msgid ""
1955 msgid ""
1966 "add a signature for the current or given revision\n"
1956 "add a signature for the current or given revision\n"
1967 "\n"
1957 "\n"
1968 " If no revision is given, the parent of the working directory is used,\n"
1958 " If no revision is given, the parent of the working directory is used,\n"
1969 " or tip if no revision is checked out.\n"
1959 " or tip if no revision is checked out.\n"
1970 "\n"
1960 "\n"
1971 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1961 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1972 " "
1962 " "
1973 msgstr ""
1963 msgstr ""
1974
1964
1975 msgid "uncommitted merge - please provide a specific revision"
1965 msgid "uncommitted merge - please provide a specific revision"
1976 msgstr ""
1966 msgstr ""
1977
1967
1978 msgid "Error while signing"
1968 msgid "Error while signing"
1979 msgstr ""
1969 msgstr ""
1980
1970
1981 msgid ""
1971 msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
1982 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1983 "force)"
1984 msgstr ""
1972 msgstr ""
1985
1973
1986 msgid "unknown signature version"
1974 msgid "unknown signature version"
1987 msgstr ""
1975 msgstr ""
1988
1976
1989 msgid "make the signature local"
1977 msgid "make the signature local"
1990 msgstr ""
1978 msgstr ""
1991
1979
1992 msgid "sign even if the sigfile is modified"
1980 msgid "sign even if the sigfile is modified"
1993 msgstr ""
1981 msgstr ""
1994
1982
1995 msgid "do not commit the sigfile after signing"
1983 msgid "do not commit the sigfile after signing"
1996 msgstr ""
1984 msgstr ""
1997
1985
1998 msgid "the key id to sign with"
1986 msgid "the key id to sign with"
1999 msgstr ""
1987 msgstr ""
2000
1988
2001 msgid "commit message"
1989 msgid "commit message"
2002 msgstr ""
1990 msgstr ""
2003
1991
2004 msgid "hg sign [OPTION]... [REVISION]..."
1992 msgid "hg sign [OPTION]... [REVISION]..."
2005 msgstr ""
1993 msgstr ""
2006
1994
2007 msgid "hg sigcheck REVISION"
1995 msgid "hg sigcheck REVISION"
2008 msgstr ""
1996 msgstr ""
2009
1997
2010 msgid "hg sigs"
1998 msgid "hg sigs"
2011 msgstr ""
1999 msgstr ""
2012
2000
2013 msgid ""
2001 msgid ""
2014 "command to view revision graphs from a shell\n"
2002 "command to view revision graphs from a shell\n"
2015 "\n"
2003 "\n"
2016 "This extension adds a --graph option to the incoming, outgoing and log\n"
2004 "This extension adds a --graph option to the incoming, outgoing and log\n"
2017 "commands. When this options is given, an ASCII representation of the\n"
2005 "commands. When this options is given, an ASCII representation of the\n"
2018 "revision graph is also shown.\n"
2006 "revision graph is also shown.\n"
2019 msgstr ""
2007 msgstr ""
2020
2008
2021 #, python-format
2009 #, python-format
2022 msgid "--graph option is incompatible with --%s"
2010 msgid "--graph option is incompatible with --%s"
2023 msgstr ""
2011 msgstr ""
2024
2012
2025 msgid ""
2013 msgid ""
2026 "show revision history alongside an ASCII revision graph\n"
2014 "show revision history alongside an ASCII revision graph\n"
2027 "\n"
2015 "\n"
2028 " Print a revision history alongside a revision graph drawn with\n"
2016 " Print a revision history alongside a revision graph drawn with\n"
2029 " ASCII characters.\n"
2017 " ASCII characters.\n"
2030 "\n"
2018 "\n"
2031 " Nodes printed as an @ character are parents of the working\n"
2019 " Nodes printed as an @ character are parents of the working\n"
2032 " directory.\n"
2020 " directory.\n"
2033 " "
2021 " "
2034 msgstr ""
2022 msgstr ""
2035
2023
2036 #, python-format
2024 #, python-format
2037 msgid "comparing with %s\n"
2025 msgid "comparing with %s\n"
2038 msgstr "comparaison avec %s\n"
2026 msgstr "comparaison avec %s\n"
2039
2027
2040 msgid "no changes found\n"
2028 msgid "no changes found\n"
2041 msgstr "aucun changement trouvé\n"
2029 msgstr "aucun changement trouvé\n"
2042
2030
2043 msgid "show the revision DAG"
2031 msgid "show the revision DAG"
2044 msgstr ""
2032 msgstr ""
2045
2033
2046 msgid "limit number of changes displayed"
2034 msgid "limit number of changes displayed"
2047 msgstr ""
2035 msgstr ""
2048
2036
2049 msgid "show patch"
2037 msgid "show patch"
2050 msgstr ""
2038 msgstr ""
2051
2039
2052 msgid "show the specified revision or range"
2040 msgid "show the specified revision or range"
2053 msgstr ""
2041 msgstr ""
2054
2042
2055 msgid "hg glog [OPTION]... [FILE]"
2043 msgid "hg glog [OPTION]... [FILE]"
2056 msgstr ""
2044 msgstr ""
2057
2045
2058 msgid ""
2046 msgid ""
2059 "hooks for integrating with the CIA.vc notification service\n"
2047 "hooks for integrating with the CIA.vc notification service\n"
2060 "\n"
2048 "\n"
2061 "This is meant to be run as a changegroup or incoming hook. To\n"
2049 "This is meant to be run as a changegroup or incoming hook. To\n"
2062 "configure it, set the following options in your hgrc::\n"
2050 "configure it, set the following options in your hgrc::\n"
2063 "\n"
2051 "\n"
2064 " [cia]\n"
2052 " [cia]\n"
2065 " # your registered CIA user name\n"
2053 " # your registered CIA user name\n"
2066 " user = foo\n"
2054 " user = foo\n"
2067 " # the name of the project in CIA\n"
2055 " # the name of the project in CIA\n"
2068 " project = foo\n"
2056 " project = foo\n"
2069 " # the module (subproject) (optional)\n"
2057 " # the module (subproject) (optional)\n"
2070 " #module = foo\n"
2058 " #module = foo\n"
2071 " # Append a diffstat to the log message (optional)\n"
2059 " # Append a diffstat to the log message (optional)\n"
2072 " #diffstat = False\n"
2060 " #diffstat = False\n"
2073 " # Template to use for log messages (optional)\n"
2061 " # Template to use for log messages (optional)\n"
2074 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
2062 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\\n # Style to use (optional)\n"
2075 " # Style to use (optional)\n"
2076 " #style = foo\n"
2063 " #style = foo\n"
2077 " # The URL of the CIA notification service (optional)\n"
2064 " # The URL of the CIA notification service (optional)\n"
2078 " # You can use mailto: URLs to send by email, eg\n"
2065 " # You can use mailto: URLs to send by email, eg\n"
2079 " # mailto:cia@cia.vc\n"
2066 " # mailto:cia@cia.vc\n"
2080 " # Make sure to set email.from if you do this.\n"
2067 " # Make sure to set email.from if you do this.\n"
2081 " #url = http://cia.vc/\n"
2068 " #url = http://cia.vc/\n"
2082 " # print message instead of sending it (optional)\n"
2069 " # print message instead of sending it (optional)\n"
2083 " #test = False\n"
2070 " #test = False\n"
2084 "\n"
2071 "\n"
2085 " [hooks]\n"
2072 " [hooks]\n"
2086 " # one of these:\n"
2073 " # one of these:\n"
2087 " changegroup.cia = python:hgcia.hook\n"
2074 " changegroup.cia = python:hgcia.hook\n"
2088 " #incoming.cia = python:hgcia.hook\n"
2075 " #incoming.cia = python:hgcia.hook\n"
2089 "\n"
2076 "\n"
2090 " [web]\n"
2077 " [web]\n"
2091 " # If you want hyperlinks (optional)\n"
2078 " # If you want hyperlinks (optional)\n"
2092 " baseurl = http://server/path/to/repo\n"
2079 " baseurl = http://server/path/to/repo\n"
2093 msgstr ""
2080 msgstr ""
2094
2081
2095 #, python-format
2082 #, python-format
2096 msgid "hgcia: sending update to %s\n"
2083 msgid "hgcia: sending update to %s\n"
2097 msgstr ""
2084 msgstr ""
2098
2085
2099 msgid "email.from must be defined when sending by email"
2086 msgid "email.from must be defined when sending by email"
2100 msgstr ""
2087 msgstr ""
2101
2088
2102 msgid ""
2089 msgid ""
2103 "browse the repository in a graphical way\n"
2090 "browse the repository in a graphical way\n"
2104 "\n"
2091 "\n"
2105 "The hgk extension allows browsing the history of a repository in a\n"
2092 "The hgk extension allows browsing the history of a repository in a\n"
2106 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
2093 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
2107 "distributed with Mercurial.)\n"
2094 "distributed with Mercurial.)\n"
2108 "\n"
2095 "\n"
2109 "hgk consists of two parts: a Tcl script that does the displaying and\n"
2096 "hgk consists of two parts: a Tcl script that does the displaying and\n"
2110 "querying of information, and an extension to Mercurial named hgk.py,\n"
2097 "querying of information, and an extension to Mercurial named hgk.py,\n"
2111 "which provides hooks for hgk to get information. hgk can be found in\n"
2098 "which provides hooks for hgk to get information. hgk can be found in\n"
2112 "the contrib directory, and the extension is shipped in the hgext\n"
2099 "the contrib directory, and the extension is shipped in the hgext\n"
2113 "repository, and needs to be enabled.\n"
2100 "repository, and needs to be enabled.\n"
2114 "\n"
2101 "\n"
2115 "The hg view command will launch the hgk Tcl script. For this command\n"
2102 "The hg view command will launch the hgk Tcl script. For this command\n"
2116 "to work, hgk must be in your search path. Alternately, you can specify\n"
2103 "to work, hgk must be in your search path. Alternately, you can specify\n"
2117 "the path to hgk in your .hgrc file::\n"
2104 "the path to hgk in your .hgrc file::\n"
2118 "\n"
2105 "\n"
2119 " [hgk]\n"
2106 " [hgk]\n"
2120 " path=/location/of/hgk\n"
2107 " path=/location/of/hgk\n"
2121 "\n"
2108 "\n"
2122 "hgk can make use of the extdiff extension to visualize revisions.\n"
2109 "hgk can make use of the extdiff extension to visualize revisions.\n"
2123 "Assuming you had already configured extdiff vdiff command, just add::\n"
2110 "Assuming you had already configured extdiff vdiff command, just add::\n"
2124 "\n"
2111 "\n"
2125 " [hgk]\n"
2112 " [hgk]\n"
2126 " vdiff=vdiff\n"
2113 " vdiff=vdiff\n"
2127 "\n"
2114 "\n"
2128 "Revisions context menu will now display additional entries to fire\n"
2115 "Revisions context menu will now display additional entries to fire\n"
2129 "vdiff on hovered and selected revisions.\n"
2116 "vdiff on hovered and selected revisions.\n"
2130 msgstr ""
2117 msgstr ""
2131
2118
2132 msgid "diff trees from two commits"
2119 msgid "diff trees from two commits"
2133 msgstr ""
2120 msgstr ""
2134
2121
2135 msgid "output common ancestor information"
2122 msgid "output common ancestor information"
2136 msgstr ""
2123 msgstr ""
2137
2124
2138 msgid "cat a specific revision"
2125 msgid "cat a specific revision"
2139 msgstr ""
2126 msgstr ""
2140
2127
2141 msgid "cat-file: type or revision not supplied\n"
2128 msgid "cat-file: type or revision not supplied\n"
2142 msgstr ""
2129 msgstr ""
2143
2130
2144 msgid "aborting hg cat-file only understands commits\n"
2131 msgid "aborting hg cat-file only understands commits\n"
2145 msgstr ""
2132 msgstr ""
2146
2133
2147 msgid "parse given revisions"
2134 msgid "parse given revisions"
2148 msgstr ""
2135 msgstr ""
2149
2136
2150 msgid "print revisions"
2137 msgid "print revisions"
2151 msgstr ""
2138 msgstr ""
2152
2139
2153 msgid "print extension options"
2140 msgid "print extension options"
2154 msgstr ""
2141 msgstr ""
2155
2142
2156 msgid "start interactive history viewer"
2143 msgid "start interactive history viewer"
2157 msgstr ""
2144 msgstr ""
2158
2145
2159 msgid "hg view [-l LIMIT] [REVRANGE]"
2146 msgid "hg view [-l LIMIT] [REVRANGE]"
2160 msgstr ""
2147 msgstr ""
2161
2148
2162 msgid "generate patch"
2149 msgid "generate patch"
2163 msgstr ""
2150 msgstr ""
2164
2151
2165 msgid "recursive"
2152 msgid "recursive"
2166 msgstr ""
2153 msgstr "récursif"
2167
2154
2168 msgid "pretty"
2155 msgid "pretty"
2169 msgstr ""
2156 msgstr ""
2170
2157
2171 msgid "stdin"
2158 msgid "stdin"
2172 msgstr ""
2159 msgstr ""
2173
2160
2174 msgid "detect copies"
2161 msgid "detect copies"
2175 msgstr ""
2162 msgstr ""
2176
2163
2177 msgid "search"
2164 msgid "search"
2178 msgstr ""
2165 msgstr "recherche"
2179
2166
2180 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2167 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2181 msgstr ""
2168 msgstr ""
2182
2169
2183 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2170 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2184 msgstr ""
2171 msgstr ""
2185
2172
2186 msgid "hg debug-config"
2173 msgid "hg debug-config"
2187 msgstr ""
2174 msgstr ""
2188
2175
2189 msgid "hg debug-merge-base REV REV"
2176 msgid "hg debug-merge-base REV REV"
2190 msgstr ""
2177 msgstr ""
2191
2178
2192 msgid "ignored"
2179 msgid "ignored"
2193 msgstr ""
2180 msgstr "ignoré"
2194
2181
2195 msgid "hg debug-rev-parse REV"
2182 msgid "hg debug-rev-parse REV"
2196 msgstr ""
2183 msgstr ""
2197
2184
2198 msgid "header"
2185 msgid "header"
2199 msgstr ""
2186 msgstr "en-tête"
2200
2187
2201 msgid "topo-order"
2188 msgid "topo-order"
2202 msgstr ""
2189 msgstr ""
2203
2190
2204 msgid "parents"
2191 msgid "parents"
2205 msgstr ""
2192 msgstr "parent"
2206
2193
2207 msgid "max-count"
2194 msgid "max-count"
2208 msgstr ""
2195 msgstr ""
2209
2196
2210 msgid "hg debug-rev-list [OPTION]... REV..."
2197 msgid "hg debug-rev-list [OPTION]... REV..."
2211 msgstr "hg debug-rev-list [OPTION]... REV..."
2198 msgstr "hg debug-rev-list [OPTION]... REV..."
2212
2199
2213 msgid ""
2200 msgid ""
2214 "syntax highlighting for hgweb (requires Pygments)\n"
2201 "syntax highlighting for hgweb (requires Pygments)\n"
2215 "\n"
2202 "\n"
2216 "It depends on the Pygments syntax highlighting library:\n"
2203 "It depends on the Pygments syntax highlighting library:\n"
2217 "http://pygments.org/\n"
2204 "http://pygments.org/\n"
2218 "\n"
2205 "\n"
2219 "There is a single configuration option::\n"
2206 "There is a single configuration option::\n"
2220 "\n"
2207 "\n"
2221 " [web]\n"
2208 " [web]\n"
2222 " pygments_style = <style>\n"
2209 " pygments_style = <style>\n"
2223 "\n"
2210 "\n"
2224 "The default is 'colorful'.\n"
2211 "The default is 'colorful'.\n"
2225 msgstr ""
2212 msgstr ""
2226
2213
2227 msgid "accelerate status report using Linux's inotify service"
2214 msgid "accelerate status report using Linux's inotify service"
2228 msgstr ""
2215 msgstr ""
2229
2216
2230 msgid "start an inotify server for this repository"
2217 msgid "start an inotify server for this repository"
2231 msgstr ""
2218 msgstr ""
2232
2219
2233 msgid ""
2220 msgid ""
2234 "debugging information for inotify extension\n"
2221 "debugging information for inotify extension\n"
2235 "\n"
2222 "\n"
2236 " Prints the list of directories being watched by the inotify server.\n"
2223 " Prints the list of directories being watched by the inotify server.\n"
2237 " "
2224 " "
2238 msgstr ""
2225 msgstr ""
2239
2226
2240 msgid "directories being watched:\n"
2227 msgid "directories being watched:\n"
2241 msgstr ""
2228 msgstr ""
2242
2229
2243 msgid "run server in background"
2230 msgid "run server in background"
2244 msgstr ""
2231 msgstr ""
2245
2232
2246 msgid "used internally by daemon mode"
2233 msgid "used internally by daemon mode"
2247 msgstr ""
2234 msgstr ""
2248
2235
2249 msgid "minutes to sit idle before exiting"
2236 msgid "minutes to sit idle before exiting"
2250 msgstr ""
2237 msgstr ""
2251
2238
2252 msgid "name of file to write process ID to"
2239 msgid "name of file to write process ID to"
2253 msgstr ""
2240 msgstr ""
2254
2241
2255 msgid "hg inserve [OPTION]..."
2242 msgid "hg inserve [OPTION]..."
2256 msgstr "hg inserve [OPTION]..."
2243 msgstr "hg inserve [OPTION]..."
2257
2244
2258 msgid "(found dead inotify server socket; removing it)\n"
2245 msgid "(found dead inotify server socket; removing it)\n"
2259 msgstr ""
2246 msgstr ""
2260
2247
2261 #, python-format
2248 #, python-format
2262 msgid "could not start inotify server: %s\n"
2249 msgid "could not start inotify server: %s\n"
2263 msgstr ""
2250 msgstr ""
2264
2251
2265 #, python-format
2252 #, python-format
2266 msgid "could not talk to new inotify server: %s\n"
2253 msgid "could not talk to new inotify server: %s\n"
2267 msgstr ""
2254 msgstr ""
2268
2255
2269 #, python-format
2256 #, python-format
2270 msgid "failed to contact inotify server: %s\n"
2257 msgid "failed to contact inotify server: %s\n"
2271 msgstr ""
2258 msgstr ""
2272
2259
2273 msgid "received empty answer from inotify server"
2260 msgid "received empty answer from inotify server"
2274 msgstr ""
2261 msgstr ""
2275
2262
2276 #, python-format
2263 #, python-format
2277 msgid "(inotify: received response from incompatible server version %d)\n"
2264 msgid "(inotify: received response from incompatible server version %d)\n"
2278 msgstr ""
2265 msgstr ""
2279
2266
2280 #, python-format
2267 #, python-format
2281 msgid "(inotify: received '%s' response when expecting '%s')\n"
2268 msgid "(inotify: received '%s' response when expecting '%s')\n"
2282 msgstr ""
2269 msgstr ""
2283
2270
2284 msgid "this system does not seem to support inotify"
2271 msgid "this system does not seem to support inotify"
2285 msgstr ""
2272 msgstr ""
2286
2273
2287 #, python-format
2274 #, python-format
2288 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2275 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2289 msgstr ""
2276 msgstr ""
2290
2277
2291 msgid "*** this limit is too low to watch every directory in this repository\n"
2278 msgid "*** this limit is too low to watch every directory in this repository\n"
2292 msgstr ""
2279 msgstr ""
2293
2280
2294 msgid "*** counting directories: "
2281 msgid "*** counting directories: "
2295 msgstr ""
2282 msgstr ""
2296
2283
2297 #, python-format
2284 #, python-format
2298 msgid "found %d\n"
2285 msgid "found %d\n"
2299 msgstr ""
2286 msgstr "trouvé %d\n"
2300
2287
2301 #, python-format
2288 #, python-format
2302 msgid "*** to raise the limit from %d to %d (run as root):\n"
2289 msgid "*** to raise the limit from %d to %d (run as root):\n"
2303 msgstr ""
2290 msgstr ""
2304
2291
2305 #, python-format
2292 #, python-format
2306 msgid "*** echo %d > %s\n"
2293 msgid "*** echo %d > %s\n"
2307 msgstr ""
2294 msgstr ""
2308
2295
2309 #, python-format
2296 #, python-format
2310 msgid "cannot watch %s until inotify watch limit is raised"
2297 msgid "cannot watch %s until inotify watch limit is raised"
2311 msgstr ""
2298 msgstr ""
2312
2299
2313 #, python-format
2300 #, python-format
2314 msgid "inotify service not available: %s"
2301 msgid "inotify service not available: %s"
2315 msgstr ""
2302 msgstr ""
2316
2303
2317 #, python-format
2304 #, python-format
2318 msgid "watching %r\n"
2305 msgid "watching %r\n"
2319 msgstr ""
2306 msgstr ""
2320
2307
2321 #, python-format
2308 #, python-format
2322 msgid "watching directories under %r\n"
2309 msgid "watching directories under %r\n"
2323 msgstr ""
2310 msgstr ""
2324
2311
2325 #, python-format
2312 #, python-format
2326 msgid "status: %r %s -> %s\n"
2313 msgid "status: %r %s -> %s\n"
2327 msgstr ""
2314 msgstr ""
2328
2315
2329 #, python-format
2316 #, python-format
2330 msgid "%s dirstate reload\n"
2317 msgid "%s dirstate reload\n"
2331 msgstr ""
2318 msgstr ""
2332
2319
2333 #, python-format
2320 #, python-format
2334 msgid "%s end dirstate reload\n"
2321 msgid "%s end dirstate reload\n"
2335 msgstr ""
2322 msgstr ""
2336
2323
2337 msgid "rescanning due to .hgignore change\n"
2324 msgid "rescanning due to .hgignore change\n"
2338 msgstr ""
2325 msgstr ""
2339
2326
2340 #, python-format
2327 #, python-format
2341 msgid "%s event: created %s\n"
2328 msgid "%s event: created %s\n"
2342 msgstr ""
2329 msgstr ""
2343
2330
2344 #, python-format
2331 #, python-format
2345 msgid "%s event: deleted %s\n"
2332 msgid "%s event: deleted %s\n"
2346 msgstr ""
2333 msgstr ""
2347
2334
2348 #, python-format
2335 #, python-format
2349 msgid "%s event: modified %s\n"
2336 msgid "%s event: modified %s\n"
2350 msgstr ""
2337 msgstr ""
2351
2338
2352 #, python-format
2339 #, python-format
2353 msgid "filesystem containing %s was unmounted\n"
2340 msgid "filesystem containing %s was unmounted\n"
2354 msgstr ""
2341 msgstr ""
2355
2342
2356 #, python-format
2343 #, python-format
2357 msgid "%s readable: %d bytes\n"
2344 msgid "%s readable: %d bytes\n"
2358 msgstr ""
2345 msgstr ""
2359
2346
2360 #, python-format
2347 #, python-format
2361 msgid "%s below threshold - unhooking\n"
2348 msgid "%s below threshold - unhooking\n"
2362 msgstr ""
2349 msgstr ""
2363
2350
2364 #, python-format
2351 #, python-format
2365 msgid "%s reading %d events\n"
2352 msgid "%s reading %d events\n"
2366 msgstr ""
2353 msgstr ""
2367
2354
2368 #, python-format
2355 #, python-format
2369 msgid "%s hooking back up with %d bytes readable\n"
2356 msgid "%s hooking back up with %d bytes readable\n"
2370 msgstr ""
2357 msgstr ""
2371
2358
2372 #, python-format
2359 #, python-format
2373 msgid "could not start server: %s"
2360 msgid "could not start server: %s"
2374 msgstr ""
2361 msgstr ""
2375
2362
2376 #, python-format
2363 #, python-format
2377 msgid "answering query for %r\n"
2364 msgid "answering query for %r\n"
2378 msgstr ""
2365 msgstr ""
2379
2366
2380 #, python-format
2367 #, python-format
2381 msgid "received query from incompatible client version %d\n"
2368 msgid "received query from incompatible client version %d\n"
2382 msgstr ""
2369 msgstr ""
2383
2370
2384 #, python-format
2371 #, python-format
2385 msgid "unrecognized query type: %s\n"
2372 msgid "unrecognized query type: %s\n"
2386 msgstr ""
2373 msgstr ""
2387
2374
2388 msgid "finished setup\n"
2375 msgid "finished setup\n"
2389 msgstr ""
2376 msgstr ""
2390
2377
2391 msgid ""
2378 msgid ""
2392 "expand expressions into changelog and summaries\n"
2379 "expand expressions into changelog and summaries\n"
2393 "\n"
2380 "\n"
2394 "This extension allows the use of a special syntax in summaries, which\n"
2381 "This extension allows the use of a special syntax in summaries, which\n"
2395 "will be automatically expanded into links or any other arbitrary\n"
2382 "will be automatically expanded into links or any other arbitrary\n"
2396 "expression, much like InterWiki does.\n"
2383 "expression, much like InterWiki does.\n"
2397 "\n"
2384 "\n"
2398 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2385 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2399 "in your hgrc::\n"
2386 "in your hgrc::\n"
2400 "\n"
2387 "\n"
2401 " [interhg]\n"
2388 " [interhg]\n"
2402 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2389 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2403 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2390 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
2404 "i\n"
2405 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2391 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2406 msgstr ""
2392 msgstr ""
2407
2393
2408 #, python-format
2394 #, python-format
2409 msgid "interhg: invalid pattern for %s: %s\n"
2395 msgid "interhg: invalid pattern for %s: %s\n"
2410 msgstr ""
2396 msgstr ""
2411
2397
2412 #, python-format
2398 #, python-format
2413 msgid "interhg: invalid regexp for %s: %s\n"
2399 msgid "interhg: invalid regexp for %s: %s\n"
2414 msgstr ""
2400 msgstr ""
2415
2401
2416 msgid ""
2402 msgid ""
2417 "expand keywords in tracked files\n"
2403 "expand keywords in tracked files\n"
2418 "\n"
2404 "\n"
2419 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2405 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2420 "tracked text files selected by your configuration.\n"
2406 "tracked text files selected by your configuration.\n"
2421 "\n"
2407 "\n"
2422 "Keywords are only expanded in local repositories and not stored in the\n"
2408 "Keywords are only expanded in local repositories and not stored in the\n"
2423 "change history. The mechanism can be regarded as a convenience for the\n"
2409 "change history. The mechanism can be regarded as a convenience for the\n"
2424 "current user or for archive distribution.\n"
2410 "current user or for archive distribution.\n"
2425 "\n"
2411 "\n"
2426 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2412 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2427 "hgrc files.\n"
2413 "hgrc files.\n"
2428 "\n"
2414 "\n"
2429 "Example::\n"
2415 "Example::\n"
2430 "\n"
2416 "\n"
2431 " [keyword]\n"
2417 " [keyword]\n"
2432 " # expand keywords in every python file except those matching \"x*\"\n"
2418 " # expand keywords in every python file except those matching \"x*\"\n"
2433 " **.py =\n"
2419 " **.py =\n"
2434 " x* = ignore\n"
2420 " x* = ignore\n"
2435 "\n"
2421 "\n"
2436 "NOTE: the more specific you are in your filename patterns the less you\n"
2422 "NOTE: the more specific you are in your filename patterns the less you\n"
2437 "lose speed in huge repositories.\n"
2423 "lose speed in huge repositories.\n"
2438 "\n"
2424 "\n"
2439 "For [keywordmaps] template mapping and expansion demonstration and\n"
2425 "For [keywordmaps] template mapping and expansion demonstration and\n"
2440 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2426 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2441 "available templates and filters.\n"
2427 "available templates and filters.\n"
2442 "\n"
2428 "\n"
2443 "An additional date template filter {date|utcdate} is provided. It\n"
2429 "An additional date template filter {date|utcdate} is provided. It\n"
2444 "returns a date like \"2006/09/18 15:13:13\".\n"
2430 "returns a date like \"2006/09/18 15:13:13\".\n"
2445 "\n"
2431 "\n"
2446 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2432 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2447 "replaced with customized keywords and templates. Again, run \"hg\n"
2433 "replaced with customized keywords and templates. Again, run \"hg\n"
2448 "kwdemo\" to control the results of your config changes.\n"
2434 "kwdemo\" to control the results of your config changes.\n"
2449 "\n"
2435 "\n"
2450 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2436 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2451 "the risk of inadvertently storing expanded keywords in the change\n"
2437 "the risk of inadvertently storing expanded keywords in the change\n"
2452 "history.\n"
2438 "history.\n"
2453 "\n"
2439 "\n"
2454 "To force expansion after enabling it, or a configuration change, run\n"
2440 "To force expansion after enabling it, or a configuration change, run\n"
2455 "\"hg kwexpand\".\n"
2441 "\"hg kwexpand\".\n"
2456 "\n"
2442 "\n"
2457 "Also, when committing with the record extension or using mq's qrecord,\n"
2443 "Also, when committing with the record extension or using mq's qrecord,\n"
2458 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2444 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2459 "the files in question to update keyword expansions after all changes\n"
2445 "the files in question to update keyword expansions after all changes\n"
2460 "have been checked in.\n"
2446 "have been checked in.\n"
2461 "\n"
2447 "\n"
2462 "Expansions spanning more than one line and incremental expansions,\n"
2448 "Expansions spanning more than one line and incremental expansions,\n"
2463 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2449 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2464 "{desc}\" expands to the first line of the changeset description.\n"
2450 "{desc}\" expands to the first line of the changeset description.\n"
2465 msgstr ""
2451 msgstr ""
2466
2452
2467 #, python-format
2453 #, python-format
2468 msgid "overwriting %s expanding keywords\n"
2454 msgid "overwriting %s expanding keywords\n"
2469 msgstr ""
2455 msgstr ""
2470
2456
2471 #, python-format
2457 #, python-format
2472 msgid "overwriting %s shrinking keywords\n"
2458 msgid "overwriting %s shrinking keywords\n"
2473 msgstr ""
2459 msgstr ""
2474
2460
2475 msgid "[keyword] patterns cannot match"
2461 msgid "[keyword] patterns cannot match"
2476 msgstr ""
2462 msgstr ""
2477
2463
2478 msgid "no [keyword] patterns configured"
2464 msgid "no [keyword] patterns configured"
2479 msgstr ""
2465 msgstr ""
2480
2466
2481 msgid ""
2467 msgid ""
2482 "print [keywordmaps] configuration and an expansion example\n"
2468 "print [keywordmaps] configuration and an expansion example\n"
2483 "\n"
2469 "\n"
2484 " Show current, custom, or default keyword template maps and their\n"
2470 " Show current, custom, or default keyword template maps and their\n"
2485 " expansions.\n"
2471 " expansions.\n"
2486 "\n"
2472 "\n"
2487 " Extend the current configuration by specifying maps as arguments\n"
2473 " Extend the current configuration by specifying maps as arguments\n"
2488 " and using -f/--rcfile to source an external hgrc file.\n"
2474 " and using -f/--rcfile to source an external hgrc file.\n"
2489 "\n"
2475 "\n"
2490 " Use -d/--default to disable current configuration.\n"
2476 " Use -d/--default to disable current configuration.\n"
2491 "\n"
2477 "\n"
2492 " See \"hg help templates\" for information on templates and filters.\n"
2478 " See \"hg help templates\" for information on templates and filters.\n"
2493 " "
2479 " "
2494 msgstr ""
2480 msgstr ""
2495
2481
2496 #, python-format
2482 #, python-format
2497 msgid "creating temporary repository at %s\n"
2483 msgid "creating temporary repository at %s\n"
2498 msgstr ""
2484 msgstr ""
2499
2485
2500 msgid ""
2486 msgid ""
2501 "\n"
2487 "\n"
2502 "\tconfiguration using custom keyword template maps\n"
2488 "\tconfiguration using custom keyword template maps\n"
2503 msgstr ""
2489 msgstr ""
2504
2490
2505 msgid "\textending current template maps\n"
2491 msgid "\textending current template maps\n"
2506 msgstr ""
2492 msgstr ""
2507
2493
2508 msgid "\toverriding default template maps\n"
2494 msgid "\toverriding default template maps\n"
2509 msgstr ""
2495 msgstr ""
2510
2496
2511 msgid ""
2497 msgid ""
2512 "\n"
2498 "\n"
2513 "\tconfiguration using default keyword template maps\n"
2499 "\tconfiguration using default keyword template maps\n"
2514 msgstr ""
2500 msgstr ""
2515
2501
2516 msgid "\tdisabling current template maps\n"
2502 msgid "\tdisabling current template maps\n"
2517 msgstr ""
2503 msgstr ""
2518
2504
2519 msgid ""
2505 msgid ""
2520 "\n"
2506 "\n"
2521 "\tconfiguration using current keyword template maps\n"
2507 "\tconfiguration using current keyword template maps\n"
2522 msgstr ""
2508 msgstr ""
2523
2509
2524 #, python-format
2510 #, python-format
2525 msgid ""
2511 msgid ""
2526 "\n"
2512 "\n"
2527 "keywords written to %s:\n"
2513 "keywords written to %s:\n"
2528 msgstr ""
2514 msgstr ""
2529
2515
2530 msgid "unhooked all commit hooks\n"
2516 msgid "unhooked all commit hooks\n"
2531 msgstr ""
2517 msgstr ""
2532
2518
2533 msgid ""
2519 msgid ""
2534 "\n"
2520 "\n"
2535 "\tkeywords expanded\n"
2521 "\tkeywords expanded\n"
2536 msgstr ""
2522 msgstr ""
2537
2523
2538 msgid ""
2524 msgid ""
2539 "expand keywords in the working directory\n"
2525 "expand keywords in the working directory\n"
2540 "\n"
2526 "\n"
2541 " Run after (re)enabling keyword expansion.\n"
2527 " Run after (re)enabling keyword expansion.\n"
2542 "\n"
2528 "\n"
2543 " kwexpand refuses to run if given files contain local changes.\n"
2529 " kwexpand refuses to run if given files contain local changes.\n"
2544 " "
2530 " "
2545 msgstr ""
2531 msgstr ""
2546
2532
2547 msgid ""
2533 msgid ""
2548 "show files configured for keyword expansion\n"
2534 "show files configured for keyword expansion\n"
2549 "\n"
2535 "\n"
2550 " List which files in the working directory are matched by the\n"
2536 " List which files in the working directory are matched by the\n"
2551 " [keyword] configuration patterns.\n"
2537 " [keyword] configuration patterns.\n"
2552 "\n"
2538 "\n"
2553 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2539 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2554 " execution by including only files that are actual candidates for\n"
2540 " execution by including only files that are actual candidates for\n"
2555 " expansion.\n"
2541 " expansion.\n"
2556 "\n"
2542 "\n"
2557 " See \"hg help keyword\" on how to construct patterns both for\n"
2543 " See \"hg help keyword\" on how to construct patterns both for\n"
2558 " inclusion and exclusion of files.\n"
2544 " inclusion and exclusion of files.\n"
2559 "\n"
2545 "\n"
2560 " With -A/--all and -v/--verbose the codes used to show the status\n"
2546 " With -A/--all and -v/--verbose the codes used to show the status\n"
2561 " of files are::\n"
2547 " of files are::\n"
2562 "\n"
2548 "\n"
2563 " K = keyword expansion candidate\n"
2549 " K = keyword expansion candidate\n"
2564 " k = keyword expansion candidate (not tracked)\n"
2550 " k = keyword expansion candidate (not tracked)\n"
2565 " I = ignored\n"
2551 " I = ignored\n"
2566 " i = ignored (not tracked)\n"
2552 " i = ignored (not tracked)\n"
2567 " "
2553 " "
2568 msgstr ""
2554 msgstr ""
2569
2555
2570 msgid ""
2556 msgid ""
2571 "revert expanded keywords in the working directory\n"
2557 "revert expanded keywords in the working directory\n"
2572 "\n"
2558 "\n"
2573 " Run before changing/disabling active keywords or if you experience\n"
2559 " Run before changing/disabling active keywords or if you experience\n"
2574 " problems with \"hg import\" or \"hg merge\".\n"
2560 " problems with \"hg import\" or \"hg merge\".\n"
2575 "\n"
2561 "\n"
2576 " kwshrink refuses to run if given files contain local changes.\n"
2562 " kwshrink refuses to run if given files contain local changes.\n"
2577 " "
2563 " "
2578 msgstr ""
2564 msgstr ""
2579
2565
2580 msgid "show default keyword template maps"
2566 msgid "show default keyword template maps"
2581 msgstr ""
2567 msgstr ""
2582
2568
2583 msgid "read maps from rcfile"
2569 msgid "read maps from rcfile"
2584 msgstr ""
2570 msgstr ""
2585
2571
2586 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2572 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2587 msgstr ""
2573 msgstr ""
2588
2574
2589 msgid "hg kwexpand [OPTION]... [FILE]..."
2575 msgid "hg kwexpand [OPTION]... [FILE]..."
2590 msgstr ""
2576 msgstr ""
2591
2577
2592 msgid "show keyword status flags of all files"
2578 msgid "show keyword status flags of all files"
2593 msgstr ""
2579 msgstr ""
2594
2580
2595 msgid "show files excluded from expansion"
2581 msgid "show files excluded from expansion"
2596 msgstr ""
2582 msgstr ""
2597
2583
2598 msgid "only show unknown (not tracked) files"
2584 msgid "only show unknown (not tracked) files"
2599 msgstr ""
2585 msgstr ""
2600
2586
2601 msgid "show keyword status flags of all files (DEPRECATED)"
2587 msgid "show keyword status flags of all files (DEPRECATED)"
2602 msgstr ""
2588 msgstr ""
2603
2589
2604 msgid "only show untracked files (DEPRECATED)"
2590 msgid "only show untracked files (DEPRECATED)"
2605 msgstr ""
2591 msgstr ""
2606
2592
2607 msgid "hg kwfiles [OPTION]... [FILE]..."
2593 msgid "hg kwfiles [OPTION]... [FILE]..."
2608 msgstr ""
2594 msgstr ""
2609
2595
2610 msgid "hg kwshrink [OPTION]... [FILE]..."
2596 msgid "hg kwshrink [OPTION]... [FILE]..."
2611 msgstr ""
2597 msgstr ""
2612
2598
2613 #, fuzzy
2599 #, fuzzy
2614 msgid ""
2600 msgid ""
2615 "manage a stack of patches\n"
2601 "manage a stack of patches\n"
2616 "\n"
2602 "\n"
2617 "This extension lets you work with a stack of patches in a Mercurial\n"
2603 "This extension lets you work with a stack of patches in a Mercurial\n"
2618 "repository. It manages two stacks of patches - all known patches, and\n"
2604 "repository. It manages two stacks of patches - all known patches, and\n"
2619 "applied patches (subset of known patches).\n"
2605 "applied patches (subset of known patches).\n"
2620 "\n"
2606 "\n"
2621 "Known patches are represented as patch files in the .hg/patches\n"
2607 "Known patches are represented as patch files in the .hg/patches\n"
2622 "directory. Applied patches are both patch files and changesets.\n"
2608 "directory. Applied patches are both patch files and changesets.\n"
2623 "\n"
2609 "\n"
2624 "Common tasks (use \"hg help command\" for more details)::\n"
2610 "Common tasks (use \"hg help command\" for more details)::\n"
2625 "\n"
2611 "\n"
2626 " prepare repository to work with patches qinit\n"
2612 " prepare repository to work with patches qinit\n"
2627 " create new patch qnew\n"
2613 " create new patch qnew\n"
2628 " import existing patch qimport\n"
2614 " import existing patch qimport\n"
2629 "\n"
2615 "\n"
2630 " print patch series qseries\n"
2616 " print patch series qseries\n"
2631 " print applied patches qapplied\n"
2617 " print applied patches qapplied\n"
2632 "\n"
2618 "\n"
2633 " add known patch to applied stack qpush\n"
2619 " add known patch to applied stack qpush\n"
2634 " remove patch from applied stack qpop\n"
2620 " remove patch from applied stack qpop\n"
2635 " refresh contents of top applied patch qrefresh\n"
2621 " refresh contents of top applied patch qrefresh\n"
2636 msgstr ""
2622 msgstr ""
2637 "gestion et utilisation d'une pile de patchs\n"
2623 "gestion et utilisation d'une pile de patchs\n"
2638 "\n"
2624 "\n"
2639 "Cette extension permet de travailler avec une pile de patchs au\n"
2625 "Cette extension permet de travailler avec une pile de patchs au\n"
2640 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
2626 "dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n"
2641 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2627 "l'ensemble des patchs référencés, et le sous-ensemble des patchs\n"
2642 "qui ont été appliqués.\n"
2628 "qui ont été appliqués.\n"
2643 "\n"
2629 "\n"
2644 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2630 "Les patchs référencés sont stockés en tant que fichiers au format\n"
2645 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
2631 "patch au sein du répertoire .hg/patches, tandis que les patchs\n"
2646 "appliqués sont présents à la fois sous forme de fichier et de\n"
2632 "appliqués sont présents à la fois sous forme de fichier et de\n"
2647 "\"changesets\".\n"
2633 "\"changesets\".\n"
2648 "\n"
2634 "\n"
2649 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2635 "Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n"
2650 "\n"
2636 "\n"
2651 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2637 "préparer un dépôt pour utilisation avec des patchs qinit\n"
2652 "créer un nouveau patch qnew\n"
2638 "créer un nouveau patch qnew\n"
2653 "importer un patch existant qimport\n"
2639 "importer un patch existant qimport\n"
2654 "\n"
2640 "\n"
2655 "afficher la série de patchs complète qseries\n"
2641 "afficher la série de patchs complète qseries\n"
2656 "afficher les patchs appliqués qapplied\n"
2642 "afficher les patchs appliqués qapplied\n"
2657 "afficher le nom du dernier patch appliqué qtop\n"
2643 "afficher le nom du dernier patch appliqué qtop\n"
2658 "\n"
2644 "\n"
2659 "empiler/appliquer un patch référencé sur la pile qpush\n"
2645 "empiler/appliquer un patch référencé sur la pile qpush\n"
2660 "dépiler/ôter un patch de la pile qpop\n"
2646 "dépiler/ôter un patch de la pile qpop\n"
2661 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2647 "rafraîchir le contenu du dernier patch appliqué qrefresh\n"
2662
2648
2663 #, python-format
2649 #, python-format
2664 msgid "%s appears more than once in %s"
2650 msgid "%s appears more than once in %s"
2665 msgstr "%s apparaît plus d'une fois dans %s"
2651 msgstr "%s apparaît plus d'une fois dans %s"
2666
2652
2667 msgid "guard cannot be an empty string"
2653 msgid "guard cannot be an empty string"
2668 msgstr ""
2654 msgstr ""
2669
2655
2670 #, python-format
2656 #, python-format
2671 msgid "guard %r starts with invalid character: %r"
2657 msgid "guard %r starts with invalid character: %r"
2672 msgstr ""
2658 msgstr ""
2673
2659
2674 #, python-format
2660 #, python-format
2675 msgid "invalid character in guard %r: %r"
2661 msgid "invalid character in guard %r: %r"
2676 msgstr ""
2662 msgstr ""
2677
2663
2678 #, python-format
2664 #, python-format
2679 msgid "guard %r too short"
2665 msgid "guard %r too short"
2680 msgstr ""
2666 msgstr ""
2681
2667
2682 #, python-format
2668 #, python-format
2683 msgid "guard %r starts with invalid char"
2669 msgid "guard %r starts with invalid char"
2684 msgstr ""
2670 msgstr ""
2685
2671
2686 #, python-format
2672 #, python-format
2687 msgid "allowing %s - no guards in effect\n"
2673 msgid "allowing %s - no guards in effect\n"
2688 msgstr ""
2674 msgstr ""
2689
2675
2690 #, python-format
2676 #, python-format
2691 msgid "allowing %s - no matching negative guards\n"
2677 msgid "allowing %s - no matching negative guards\n"
2692 msgstr ""
2678 msgstr ""
2693
2679
2694 #, python-format
2680 #, python-format
2695 msgid "allowing %s - guarded by %r\n"
2681 msgid "allowing %s - guarded by %r\n"
2696 msgstr ""
2682 msgstr ""
2697
2683
2698 #, python-format
2684 #, python-format
2699 msgid "skipping %s - guarded by %r\n"
2685 msgid "skipping %s - guarded by %r\n"
2700 msgstr ""
2686 msgstr ""
2701
2687
2702 #, python-format
2688 #, python-format
2703 msgid "skipping %s - no matching guards\n"
2689 msgid "skipping %s - no matching guards\n"
2704 msgstr ""
2690 msgstr ""
2705
2691
2706 #, python-format
2692 #, python-format
2707 msgid "error removing undo: %s\n"
2693 msgid "error removing undo: %s\n"
2708 msgstr ""
2694 msgstr ""
2709
2695
2710 #, python-format
2696 #, python-format
2711 msgid "apply failed for patch %s"
2697 msgid "apply failed for patch %s"
2712 msgstr "l'application du patch %s a échoué"
2698 msgstr "l'application du patch %s a échoué"
2713
2699
2714 #, python-format
2700 #, python-format
2715 msgid "patch didn't work out, merging %s\n"
2701 msgid "patch didn't work out, merging %s\n"
2716 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2702 msgstr "l'application simple du patch a échoué, fusion de %s\n"
2717
2703
2718 #, python-format
2704 #, python-format
2719 msgid "update returned %d"
2705 msgid "update returned %d"
2720 msgstr ""
2706 msgstr ""
2721
2707
2722 msgid "repo commit failed"
2708 msgid "repo commit failed"
2723 msgstr ""
2709 msgstr ""
2724
2710
2725 #, python-format
2711 #, python-format
2726 msgid "unable to read %s"
2712 msgid "unable to read %s"
2727 msgstr "impossible de lire %s"
2713 msgstr "impossible de lire %s"
2728
2714
2729 #, python-format
2715 #, python-format
2730 msgid "patch %s does not exist\n"
2716 msgid "patch %s does not exist\n"
2731 msgstr "le patch %s n'existe pas\n"
2717 msgstr "le patch %s n'existe pas\n"
2732
2718
2733 #, python-format
2719 #, python-format
2734 msgid "patch %s is not applied\n"
2720 msgid "patch %s is not applied\n"
2735 msgstr "le patch %s n'est pas appliqué\n"
2721 msgstr "le patch %s n'est pas appliqué\n"
2736
2722
2737 msgid "patch failed, unable to continue (try -v)\n"
2723 msgid "patch failed, unable to continue (try -v)\n"
2738 msgstr ""
2724 msgstr "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2739 "l'application du patch a échoué, impossible de continuer (essayez avec -v)\n"
2740
2725
2741 #, python-format
2726 #, python-format
2742 msgid "applying %s\n"
2727 msgid "applying %s\n"
2743 msgstr "application de %s\n"
2728 msgstr "application de %s\n"
2744
2729
2745 #, python-format
2730 #, python-format
2746 msgid "unable to read %s\n"
2731 msgid "unable to read %s\n"
2747 msgstr "impossible de lire %s\n"
2732 msgstr "impossible de lire %s\n"
2748
2733
2749 #, python-format
2734 #, python-format
2750 msgid "imported patch %s\n"
2735 msgid "imported patch %s\n"
2751 msgstr "le patch %s a été importé\n"
2736 msgstr "le patch %s a été importé\n"
2752
2737
2753 #, python-format
2738 #, python-format
2754 msgid ""
2739 msgid ""
2755 "\n"
2740 "\n"
2756 "imported patch %s"
2741 "imported patch %s"
2757 msgstr ""
2742 msgstr ""
2758 "\n"
2743 "\n"
2759 "le patch %s a été importé"
2744 "le patch %s a été importé"
2760
2745
2761 #, python-format
2746 #, python-format
2762 msgid "patch %s is empty\n"
2747 msgid "patch %s is empty\n"
2763 msgstr "le patch %s est vide\n"
2748 msgstr "le patch %s est vide\n"
2764
2749
2765 msgid "patch failed, rejects left in working dir\n"
2750 msgid "patch failed, rejects left in working dir\n"
2766 msgstr ""
2751 msgstr ""
2767
2752
2768 msgid "fuzz found when applying patch, stopping\n"
2753 msgid "fuzz found when applying patch, stopping\n"
2769 msgstr ""
2754 msgstr ""
2770
2755
2771 #, python-format
2756 #, python-format
2772 msgid "revision %d is not managed"
2757 msgid "revision %d is not managed"
2773 msgstr "la révision %d n'est pas gérée"
2758 msgstr "la révision %d n'est pas gérée"
2774
2759
2775 #, python-format
2760 #, python-format
2776 msgid "cannot delete revision %d above applied patches"
2761 msgid "cannot delete revision %d above applied patches"
2777 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2762 msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués"
2778
2763
2779 #, python-format
2764 #, python-format
2780 msgid "patch %s finalized without changeset message\n"
2765 msgid "patch %s finalized without changeset message\n"
2781 msgstr ""
2766 msgstr ""
2782
2767
2783 msgid "qdelete requires at least one revision or patch name"
2768 msgid "qdelete requires at least one revision or patch name"
2784 msgstr "qdelete requiert au moins une révision ou le nom d'un patch"
2769 msgstr "qdelete requiert au moins une révision ou le nom d'un patch"
2785
2770
2786 #, python-format
2771 #, python-format
2787 msgid "cannot delete applied patch %s"
2772 msgid "cannot delete applied patch %s"
2788 msgstr "impossible de supprimer le patch appliqué %s"
2773 msgstr "impossible de supprimer le patch appliqué %s"
2789
2774
2790 #, python-format
2775 #, python-format
2791 msgid "patch %s not in series file"
2776 msgid "patch %s not in series file"
2792 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2777 msgstr "le patch %s n'est pas listé (fichier \"series\")"
2793
2778
2794 msgid "no patches applied"
2779 msgid "no patches applied"
2795 msgstr "pas de patchs appliqués"
2780 msgstr "pas de patchs appliqués"
2796
2781
2797 msgid "working directory revision is not qtip"
2782 msgid "working directory revision is not qtip"
2798 msgstr "le répertoire de travail n'est pas à la révision qtip"
2783 msgstr "le répertoire de travail n'est pas à la révision qtip"
2799
2784
2800 msgid "local changes found, refresh first"
2785 msgid "local changes found, refresh first"
2801 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2786 msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch"
2802
2787
2803 msgid "local changes found"
2788 msgid "local changes found"
2804 msgstr "modifications locales trouvées"
2789 msgstr "modifications locales trouvées"
2805
2790
2806 #, python-format
2791 #, python-format
2807 msgid "\"%s\" cannot be used as the name of a patch"
2792 msgid "\"%s\" cannot be used as the name of a patch"
2808 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2793 msgstr "\"%s\" ne peut être utilisé comme nom de patch"
2809
2794
2810 #, python-format
2795 #, python-format
2811 msgid "patch \"%s\" already exists"
2796 msgid "patch \"%s\" already exists"
2812 msgstr "le patch \"%s\" existe déjà"
2797 msgstr "le patch \"%s\" existe déjà"
2813
2798
2814 #, python-format
2799 #, python-format
2815 msgid "error unlinking %s\n"
2800 msgid "error unlinking %s\n"
2816 msgstr "erreur lors de la suppression de %s\n"
2801 msgstr "erreur lors de la suppression de %s\n"
2817
2802
2818 #, python-format
2803 #, python-format
2819 msgid "patch name \"%s\" is ambiguous:\n"
2804 msgid "patch name \"%s\" is ambiguous:\n"
2820 msgstr "\"%s\" est un nom de patch ambigu :\n"
2805 msgstr "\"%s\" est un nom de patch ambigu :\n"
2821
2806
2822 #, python-format
2807 #, python-format
2823 msgid "patch %s not in series"
2808 msgid "patch %s not in series"
2824 msgstr "le patch %s ne figure pas dans la série"
2809 msgstr "le patch %s ne figure pas dans la série"
2825
2810
2826 #, fuzzy
2811 #, fuzzy
2827 msgid "(working directory not at a head)\n"
2812 msgid "(working directory not at a head)\n"
2828 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2813 msgstr "(le répertoire de travail est à une révision différente de tip)\n"
2829
2814
2830 msgid "no patches in series\n"
2815 msgid "no patches in series\n"
2831 msgstr "pas de patchs dans la série\n"
2816 msgstr "pas de patchs dans la série\n"
2832
2817
2833 #, python-format
2818 #, python-format
2834 msgid "cannot push to a previous patch: %s"
2819 msgid "cannot push to a previous patch: %s"
2835 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2820 msgstr "impossible d'empiler un patch déjà appliqué : %s"
2836
2821
2837 #, python-format
2822 #, python-format
2838 msgid "qpush: %s is already at the top\n"
2823 msgid "qpush: %s is already at the top\n"
2839 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2824 msgstr "qpush: %s est déjà le dernier patch appliqué\n"
2840
2825
2841 #, python-format
2826 #, python-format
2842 msgid "guarded by %r"
2827 msgid "guarded by %r"
2843 msgstr ""
2828 msgstr ""
2844
2829
2845 msgid "no matching guards"
2830 msgid "no matching guards"
2846 msgstr ""
2831 msgstr ""
2847
2832
2848 #, python-format
2833 #, python-format
2849 msgid "cannot push '%s' - %s\n"
2834 msgid "cannot push '%s' - %s\n"
2850 msgstr "impossible d'empiler '%s' - %s\n"
2835 msgstr "impossible d'empiler '%s' - %s\n"
2851
2836
2852 msgid "all patches are currently applied\n"
2837 msgid "all patches are currently applied\n"
2853 msgstr "tous les patchs sont actuellement appliqués\n"
2838 msgstr "tous les patchs sont actuellement appliqués\n"
2854
2839
2855 msgid "patch series already fully applied\n"
2840 msgid "patch series already fully applied\n"
2856 msgstr "la série de patchs est déjà complètement appliquée\n"
2841 msgstr "la série de patchs est déjà complètement appliquée\n"
2857
2842
2858 msgid "cleaning up working directory..."
2843 msgid "cleaning up working directory..."
2859 msgstr "nettoyage du répertoire de travail..."
2844 msgstr "nettoyage du répertoire de travail..."
2860
2845
2861 #, python-format
2846 #, python-format
2862 msgid "errors during apply, please fix and refresh %s\n"
2847 msgid "errors during apply, please fix and refresh %s\n"
2863 msgstr ""
2848 msgstr "des erreurs se sont produites durant l'application, veuillez corriger puis rafraîchir %s\n"
2864 "des erreurs se sont produites durant l'application, veuillez corriger puis "
2865 "rafraîchir %s\n"
2866
2849
2867 #, python-format
2850 #, python-format
2868 msgid "now at: %s\n"
2851 msgid "now at: %s\n"
2869 msgstr "actuellement à : %s\n"
2852 msgstr "actuellement à : %s\n"
2870
2853
2871 #, python-format
2854 #, python-format
2872 msgid "patch %s is not applied"
2855 msgid "patch %s is not applied"
2873 msgstr "le patch %s n'est pas appliqué"
2856 msgstr "le patch %s n'est pas appliqué"
2874
2857
2875 msgid "no patches applied\n"
2858 msgid "no patches applied\n"
2876 msgstr "aucun patch appliqué\n"
2859 msgstr "aucun patch appliqué\n"
2877
2860
2878 #, python-format
2861 #, python-format
2879 msgid "qpop: %s is already at the top\n"
2862 msgid "qpop: %s is already at the top\n"
2880 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2863 msgstr "qpop: %s est déjà le dernier patch appliqué\n"
2881
2864
2882 msgid "qpop: forcing dirstate update\n"
2865 msgid "qpop: forcing dirstate update\n"
2883 msgstr ""
2866 msgstr "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2884 "qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n"
2885
2867
2886 #, python-format
2868 #, python-format
2887 msgid "trying to pop unknown node %s"
2869 msgid "trying to pop unknown node %s"
2888 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2870 msgstr "tentative de dépilement d'un nœud inconnu : %s"
2889
2871
2890 msgid "popping would remove a revision not managed by this patch queue"
2872 msgid "popping would remove a revision not managed by this patch queue"
2891 msgstr ""
2873 msgstr "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2892 "le dépilement enlèverait une révision non gérée par cette pile de patchs"
2893
2874
2894 msgid "deletions found between repo revs"
2875 msgid "deletions found between repo revs"
2895 msgstr "suppressions trouvées entre des révisions du dépôt"
2876 msgstr "suppressions trouvées entre des révisions du dépôt"
2896
2877
2897 #, fuzzy, python-format
2878 #, fuzzy, python-format
2898 msgid "popping %s\n"
2879 msgid "popping %s\n"
2899 msgstr "application de %s\n"
2880 msgstr "application de %s\n"
2900
2881
2901 msgid "patch queue now empty\n"
2882 msgid "patch queue now empty\n"
2902 msgstr "la pile de patchs est maintenant vide\n"
2883 msgstr "la pile de patchs est maintenant vide\n"
2903
2884
2904 msgid "cannot refresh a revision with children"
2885 msgid "cannot refresh a revision with children"
2905 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2886 msgstr "impossible de rafraîchir une révision possédant des révisions filles"
2906
2887
2907 # restaurer/récupérer ? pas satisfait...
2888 # restaurer/récupérer ? pas satisfait...
2908 msgid ""
2889 msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2909 "refresh interrupted while patch was popped! (revert --all, qpush to "
2890 msgstr "rafraîchissement interrompu alors qu'un patch était en cours de dépilement (utiliser revert --all, ou qpush pour restaurer l'état)\n"
2910 "recover)\n"
2911 msgstr ""
2912 "rafraîchissement interrompu alors qu'un patch était en cours de dépilement "
2913 "(utiliser revert --all, ou qpush pour restaurer l'état)\n"
2914
2891
2915 msgid "patch queue directory already exists"
2892 msgid "patch queue directory already exists"
2916 msgstr "la pile de patchs existe déjà"
2893 msgstr "la pile de patchs existe déjà"
2917
2894
2918 #, python-format
2895 #, python-format
2919 msgid "patch %s is not in series file"
2896 msgid "patch %s is not in series file"
2920 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2897 msgstr "le patch %s n'est pas dans la liste (fichier \"series\")"
2921
2898
2922 msgid "No saved patch data found\n"
2899 msgid "No saved patch data found\n"
2923 msgstr ""
2900 msgstr ""
2924
2901
2925 #, python-format
2902 #, python-format
2926 msgid "restoring status: %s\n"
2903 msgid "restoring status: %s\n"
2927 msgstr "rétablissement de l'état : %s\n"
2904 msgstr "rétablissement de l'état : %s\n"
2928
2905
2929 msgid "save entry has children, leaving it alone\n"
2906 msgid "save entry has children, leaving it alone\n"
2930 msgstr ""
2907 msgstr ""
2931
2908
2932 #, python-format
2909 #, python-format
2933 msgid "removing save entry %s\n"
2910 msgid "removing save entry %s\n"
2934 msgstr ""
2911 msgstr ""
2935
2912
2936 #, python-format
2913 #, python-format
2937 msgid "saved queue repository parents: %s %s\n"
2914 msgid "saved queue repository parents: %s %s\n"
2938 msgstr ""
2915 msgstr ""
2939
2916
2940 msgid "queue directory updating\n"
2917 msgid "queue directory updating\n"
2941 msgstr "mise à jour du répertoire de patchs\n"
2918 msgstr "mise à jour du répertoire de patchs\n"
2942
2919
2943 msgid "Unable to load queue repository\n"
2920 msgid "Unable to load queue repository\n"
2944 msgstr "Impossible de charger le dépôt de patchs\n"
2921 msgstr "Impossible de charger le dépôt de patchs\n"
2945
2922
2946 msgid "save: no patches applied, exiting\n"
2923 msgid "save: no patches applied, exiting\n"
2947 msgstr ""
2924 msgstr ""
2948
2925
2949 msgid "status is already saved\n"
2926 msgid "status is already saved\n"
2950 msgstr "l'état a déjà été sauvegardé\n"
2927 msgstr "l'état a déjà été sauvegardé\n"
2951
2928
2952 msgid "hg patches saved state"
2929 msgid "hg patches saved state"
2953 msgstr ""
2930 msgstr ""
2954
2931
2955 msgid "repo commit failed\n"
2932 msgid "repo commit failed\n"
2956 msgstr ""
2933 msgstr ""
2957
2934
2958 #, python-format
2935 #, python-format
2959 msgid "patch %s is already in the series file"
2936 msgid "patch %s is already in the series file"
2960 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2937 msgstr "le patch %s est déjà dans la liste (fichier \"series\")"
2961
2938
2962 msgid "option \"-r\" not valid when importing files"
2939 msgid "option \"-r\" not valid when importing files"
2963 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2940 msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers"
2964
2941
2965 msgid "option \"-n\" not valid when importing multiple patches"
2942 msgid "option \"-n\" not valid when importing multiple patches"
2966 msgstr ""
2943 msgstr "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs patchs"
2967 "l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs "
2968 "patchs"
2969
2944
2970 # origine/base/racine ?
2945 # origine/base/racine ?
2971 #, python-format
2946 #, python-format
2972 msgid "revision %d is the root of more than one branch"
2947 msgid "revision %d is the root of more than one branch"
2973 msgstr "la révision %d est à l'origine de plus d'une branche"
2948 msgstr "la révision %d est à l'origine de plus d'une branche"
2974
2949
2975 #, python-format
2950 #, python-format
2976 msgid "revision %d is already managed"
2951 msgid "revision %d is already managed"
2977 msgstr "la révision %d est déjà gérée"
2952 msgstr "la révision %d est déjà gérée"
2978
2953
2979 #, python-format
2954 #, python-format
2980 msgid "revision %d is not the parent of the queue"
2955 msgid "revision %d is not the parent of the queue"
2981 msgstr "la révision %d n'est pas parente de la pile"
2956 msgstr "la révision %d n'est pas parente de la pile"
2982
2957
2983 #, python-format
2958 #, python-format
2984 msgid "revision %d has unmanaged children"
2959 msgid "revision %d has unmanaged children"
2985 msgstr "la révision %d possède des révisions filles non gérées"
2960 msgstr "la révision %d possède des révisions filles non gérées"
2986
2961
2987 #, python-format
2962 #, python-format
2988 msgid "cannot import merge revision %d"
2963 msgid "cannot import merge revision %d"
2989 msgstr "impossible d'importer la révision fusionnée %d"
2964 msgstr "impossible d'importer la révision fusionnée %d"
2990
2965
2991 #, python-format
2966 #, python-format
2992 msgid "revision %d is not the parent of %d"
2967 msgid "revision %d is not the parent of %d"
2993 msgstr "%d n'est pas la révision parente de %d"
2968 msgstr "%d n'est pas la révision parente de %d"
2994
2969
2995 msgid "-e is incompatible with import from -"
2970 msgid "-e is incompatible with import from -"
2996 msgstr "-e n'est pas compatible avec l'importation depuis -"
2971 msgstr "-e n'est pas compatible avec l'importation depuis -"
2997
2972
2998 #, python-format
2973 #, python-format
2999 msgid "patch %s does not exist"
2974 msgid "patch %s does not exist"
3000 msgstr "le patch %s n'existe pas"
2975 msgstr "le patch %s n'existe pas"
3001
2976
3002 msgid "need --name to import a patch from -"
2977 msgid "need --name to import a patch from -"
3003 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
2978 msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -"
3004
2979
3005 #, python-format
2980 #, python-format
3006 msgid "adding %s to series file\n"
2981 msgid "adding %s to series file\n"
3007 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
2982 msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n"
3008
2983
3009 msgid ""
2984 msgid ""
3010 "remove patches from queue\n"
2985 "remove patches from queue\n"
3011 "\n"
2986 "\n"
3012 " The patches must not be applied, and at least one patch is required. "
2987 " The patches must not be applied, and at least one patch is required. With\n"
3013 "With\n"
3014 " -k/--keep, the patch files are preserved in the patch directory.\n"
2988 " -k/--keep, the patch files are preserved in the patch directory.\n"
3015 "\n"
2989 "\n"
3016 " To stop managing a patch and move it into permanent history,\n"
2990 " To stop managing a patch and move it into permanent history,\n"
3017 " use the qfinish command."
2991 " use the qfinish command."
3018 msgstr ""
2992 msgstr ""
3019 "supprime des patchs de la pile\n"
2993 "supprime des patchs de la pile\n"
3020 "\n"
2994 "\n"
3021 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
2995 " Les patchs ne doivent pas avoir été appliqués, et il est\n"
3022 " nécessaire de fournir au moins un patch.\n"
2996 " nécessaire de fournir au moins un patch.\n"
3023 "\n"
2997 "\n"
3024 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
2998 " Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n"
3025 " de patchs.\n"
2999 " de patchs.\n"
3026 "\n"
3000 "\n"
3027 " Pour arrêter de gérer un patch et le déplacer de manière\n"
3001 " Pour arrêter de gérer un patch et le déplacer de manière\n"
3028 " permanente vers l'historique du dépôt, utilisez la commande\n"
3002 " permanente vers l'historique du dépôt, utilisez la commande\n"
3029 " qfinish."
3003 " qfinish."
3030
3004
3031 msgid "print the patches already applied"
3005 msgid "print the patches already applied"
3032 msgstr "affiche les patchs déjà appliqués"
3006 msgstr "affiche les patchs déjà appliqués"
3033
3007
3034 msgid "only one patch applied\n"
3008 msgid "only one patch applied\n"
3035 msgstr "un seul patch d'appliqué\n"
3009 msgstr "un seul patch d'appliqué\n"
3036
3010
3037 msgid "print the patches not yet applied"
3011 msgid "print the patches not yet applied"
3038 msgstr "affiche les patchs non encore appliqués"
3012 msgstr "affiche les patchs non encore appliqués"
3039
3013
3040 msgid "all patches applied\n"
3014 msgid "all patches applied\n"
3041 msgstr "tous les patchs ont été appliqués\n"
3015 msgstr "tous les patchs ont été appliqués\n"
3042
3016
3043 msgid ""
3017 msgid ""
3044 "import a patch\n"
3018 "import a patch\n"
3045 "\n"
3019 "\n"
3046 " The patch is inserted into the series after the last applied\n"
3020 " The patch is inserted into the series after the last applied\n"
3047 " patch. If no patches have been applied, qimport prepends the patch\n"
3021 " patch. If no patches have been applied, qimport prepends the patch\n"
3048 " to the series.\n"
3022 " to the series.\n"
3049 "\n"
3023 "\n"
3050 " The patch will have the same name as its source file unless you\n"
3024 " The patch will have the same name as its source file unless you\n"
3051 " give it a new one with -n/--name.\n"
3025 " give it a new one with -n/--name.\n"
3052 "\n"
3026 "\n"
3053 " You can register an existing patch inside the patch directory with\n"
3027 " You can register an existing patch inside the patch directory with\n"
3054 " the -e/--existing flag.\n"
3028 " the -e/--existing flag.\n"
3055 "\n"
3029 "\n"
3056 " With -f/--force, an existing patch of the same name will be\n"
3030 " With -f/--force, an existing patch of the same name will be\n"
3057 " overwritten.\n"
3031 " overwritten.\n"
3058 "\n"
3032 "\n"
3059 " An existing changeset may be placed under mq control with -r/--rev\n"
3033 " An existing changeset may be placed under mq control with -r/--rev\n"
3060 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
3034 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
3061 " With -g/--git, patches imported with --rev will use the git diff\n"
3035 " With -g/--git, patches imported with --rev will use the git diff\n"
3062 " format. See the diffs help topic for information on why this is\n"
3036 " format. See the diffs help topic for information on why this is\n"
3063 " important for preserving rename/copy information and permission\n"
3037 " important for preserving rename/copy information and permission\n"
3064 " changes.\n"
3038 " changes.\n"
3065 "\n"
3039 "\n"
3066 " To import a patch from standard input, pass - as the patch file.\n"
3040 " To import a patch from standard input, pass - as the patch file.\n"
3067 " When importing from standard input, a patch name must be specified\n"
3041 " When importing from standard input, a patch name must be specified\n"
3068 " using the --name flag.\n"
3042 " using the --name flag.\n"
3069 " "
3043 " "
3070 msgstr ""
3044 msgstr ""
3071 "importe un patch\n"
3045 "importe un patch\n"
3072 "\n"
3046 "\n"
3073 " Le patch est inséré dans la série à la suite du dernier patch\n"
3047 " Le patch est inséré dans la série à la suite du dernier patch\n"
3074 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
3048 " appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n"
3075 " ajouté en tête de série.\n"
3049 " ajouté en tête de série.\n"
3076 "\n"
3050 "\n"
3077 " Le patch portera le même nom que le fichier dont il provient,\n"
3051 " Le patch portera le même nom que le fichier dont il provient,\n"
3078 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
3052 " à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n"
3079 "\n"
3053 "\n"
3080 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
3054 " Vous pouvez enregistrer un patch déjà présent dans le répertoire\n"
3081 " de patchs à l'aide de l'option -e/--existing.\n"
3055 " de patchs à l'aide de l'option -e/--existing.\n"
3082 "\n"
3056 "\n"
3083 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
3057 " Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n"
3084 "\n"
3058 "\n"
3085 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
3059 " Un \"changeset\" existant peut-être placé sous le contrôle de mq\n"
3086 " à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n"
3060 " à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n"
3087 " placera la révision tip sous le contrôle de mq).\n"
3061 " placera la révision tip sous le contrôle de mq).\n"
3088 " Avec -g/--git, les patchs importés à l'aide de --rev seront\n"
3062 " Avec -g/--git, les patchs importés à l'aide de --rev seront\n"
3089 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
3063 " enregistrés au format \"git diff\". La section \"diffs\" de\n"
3090 " l'aide explique l'importance de cette option pour la\n"
3064 " l'aide explique l'importance de cette option pour la\n"
3091 " préservation des informations de copie/renommage et des\n"
3065 " préservation des informations de copie/renommage et des\n"
3092 " modifications de permissions.\n"
3066 " modifications de permissions.\n"
3093 "\n"
3067 "\n"
3094 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
3068 " Pour importer un patch depuis l'entrée standard, utilisez -\n"
3095 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
3069 " comme nom de fichier. Il sera alors nécessaire de nommer le\n"
3096 " patch à l'aide de l'option --name.\n"
3070 " patch à l'aide de l'option --name.\n"
3097 " "
3071 " "
3098
3072
3099 msgid ""
3073 msgid ""
3100 "init a new queue repository\n"
3074 "init a new queue repository\n"
3101 "\n"
3075 "\n"
3102 " The queue repository is unversioned by default. If\n"
3076 " The queue repository is unversioned by default. If\n"
3103 " -c/--create-repo is specified, qinit will create a separate nested\n"
3077 " -c/--create-repo is specified, qinit will create a separate nested\n"
3104 " repository for patches (qinit -c may also be run later to convert\n"
3078 " repository for patches (qinit -c may also be run later to convert\n"
3105 " an unversioned patch repository into a versioned one). You can use\n"
3079 " an unversioned patch repository into a versioned one). You can use\n"
3106 " qcommit to commit changes to this queue repository."
3080 " qcommit to commit changes to this queue repository."
3107 msgstr ""
3081 msgstr ""
3108
3082
3109 msgid ""
3083 msgid ""
3110 "clone main and patch repository at same time\n"
3084 "clone main and patch repository at same time\n"
3111 "\n"
3085 "\n"
3112 " If source is local, destination will have no patches applied. If\n"
3086 " If source is local, destination will have no patches applied. If\n"
3113 " source is remote, this command can not check if patches are\n"
3087 " source is remote, this command can not check if patches are\n"
3114 " applied in source, so cannot guarantee that patches are not\n"
3088 " applied in source, so cannot guarantee that patches are not\n"
3115 " applied in destination. If you clone remote repository, be sure\n"
3089 " applied in destination. If you clone remote repository, be sure\n"
3116 " before that it has no patches applied.\n"
3090 " before that it has no patches applied.\n"
3117 "\n"
3091 "\n"
3118 " Source patch repository is looked for in <src>/.hg/patches by\n"
3092 " Source patch repository is looked for in <src>/.hg/patches by\n"
3119 " default. Use -p <url> to change.\n"
3093 " default. Use -p <url> to change.\n"
3120 "\n"
3094 "\n"
3121 " The patch directory must be a nested Mercurial repository, as\n"
3095 " The patch directory must be a nested Mercurial repository, as\n"
3122 " would be created by qinit -c.\n"
3096 " would be created by qinit -c.\n"
3123 " "
3097 " "
3124 msgstr ""
3098 msgstr ""
3125 "clône simultanément le dépôt principal et le dépôt des patchs\n"
3099 "clône simultanément le dépôt principal et le dépôt des patchs\n"
3126 "\n"
3100 "\n"
3127 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
3101 " Si la source est locale, aucun patch ne sera appliqué sur la\n"
3128 " cible. En revanche, si la source est distante, cette commande\n"
3102 " cible. En revanche, si la source est distante, cette commande\n"
3129 " n'est pas en mesure de vérifier si des patchs y ont été\n"
3103 " n'est pas en mesure de vérifier si des patchs y ont été\n"
3130 " empilés, et par conséquent ne peut garantir qu'aucun patch\n"
3104 " empilés, et par conséquent ne peut garantir qu'aucun patch\n"
3131 " ne sera appliqué au dessus de la cible. Autrement dit, si vous\n"
3105 " ne sera appliqué au dessus de la cible. Autrement dit, si vous\n"
3132 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
3106 " clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n"
3133 " aucun patch d'appliqué.\n"
3107 " aucun patch d'appliqué.\n"
3134 "\n"
3108 "\n"
3135 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
3109 " Le dépôt de patchs est recherché dans <src>/.hg/patches par\n"
3136 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
3110 " défaut, à moins que -p <url> ne soit utilisé pour spécifier\n"
3137 " un chemin différent.\n"
3111 " un chemin différent.\n"
3138 "\n"
3112 "\n"
3139 " Le répertoire de patchs doit être contenu dans le dépôt\n"
3113 " Le répertoire de patchs doit être contenu dans le dépôt\n"
3140 " principal, tel que créé par qinit -c.\n"
3114 " principal, tel que créé par qinit -c.\n"
3141 " "
3115 " "
3142
3116
3143 msgid "versioned patch repository not found (see qinit -c)"
3117 msgid "versioned patch repository not found (see qinit -c)"
3144 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
3118 msgstr "aucun dépôt de patch trouvé (voir qinit -c)"
3145
3119
3146 msgid "cloning main repository\n"
3120 msgid "cloning main repository\n"
3147 msgstr "clônage du dépôt principal\n"
3121 msgstr "clônage du dépôt principal\n"
3148
3122
3149 msgid "cloning patch repository\n"
3123 msgid "cloning patch repository\n"
3150 msgstr "clônage du dépôt des patchs\n"
3124 msgstr "clônage du dépôt des patchs\n"
3151
3125
3152 msgid "stripping applied patches from destination repository\n"
3126 msgid "stripping applied patches from destination repository\n"
3153 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
3127 msgstr "enlèvement des patchs appliqués du dépôt cible\n"
3154
3128
3155 msgid "updating destination repository\n"
3129 msgid "updating destination repository\n"
3156 msgstr "mise à jour du dépôt cible\n"
3130 msgstr "mise à jour du dépôt cible\n"
3157
3131
3158 msgid "commit changes in the queue repository"
3132 msgid "commit changes in the queue repository"
3159 msgstr ""
3133 msgstr ""
3160
3134
3161 msgid "print the entire series file"
3135 msgid "print the entire series file"
3162 msgstr "afficher la liste complète de patchs (fichier \"series\")"
3136 msgstr "afficher la liste complète de patchs (fichier \"series\")"
3163
3137
3164 msgid "print the name of the current patch"
3138 msgid "print the name of the current patch"
3165 msgstr "affiche le nom du dernier patch appliqué"
3139 msgstr "affiche le nom du dernier patch appliqué"
3166
3140
3167 msgid "print the name of the next patch"
3141 msgid "print the name of the next patch"
3168 msgstr "affiche le nom du prochain patch"
3142 msgstr "affiche le nom du prochain patch"
3169
3143
3170 msgid "print the name of the previous patch"
3144 msgid "print the name of the previous patch"
3171 msgstr "affiche le nom du patch précédent"
3145 msgstr "affiche le nom du patch précédent"
3172
3146
3173 msgid ""
3147 msgid ""
3174 "create a new patch\n"
3148 "create a new patch\n"
3175 "\n"
3149 "\n"
3176 " qnew creates a new patch on top of the currently-applied patch (if\n"
3150 " qnew creates a new patch on top of the currently-applied patch (if\n"
3177 " any). It will refuse to run if there are any outstanding changes\n"
3151 " any). It will refuse to run if there are any outstanding changes\n"
3178 " unless -f/--force is specified, in which case the patch will be\n"
3152 " unless -f/--force is specified, in which case the patch will be\n"
3179 " initialized with them. You may also use -I/--include,\n"
3153 " initialized with them. You may also use -I/--include,\n"
3180 " -X/--exclude, and/or a list of files after the patch name to add\n"
3154 " -X/--exclude, and/or a list of files after the patch name to add\n"
3181 " only changes to matching files to the new patch, leaving the rest\n"
3155 " only changes to matching files to the new patch, leaving the rest\n"
3182 " as uncommitted modifications.\n"
3156 " as uncommitted modifications.\n"
3183 "\n"
3157 "\n"
3184 " -u/--user and -d/--date can be used to set the (given) user and\n"
3158 " -u/--user and -d/--date can be used to set the (given) user and\n"
3185 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3159 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3186 " to current user and date to current date.\n"
3160 " to current user and date to current date.\n"
3187 "\n"
3161 "\n"
3188 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3162 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3189 " well as the commit message. If none is specified, the header is\n"
3163 " well as the commit message. If none is specified, the header is\n"
3190 " empty and the commit message is '[mq]: PATCH'.\n"
3164 " empty and the commit message is '[mq]: PATCH'.\n"
3191 "\n"
3165 "\n"
3192 " Use the -g/--git option to keep the patch in the git extended diff\n"
3166 " Use the -g/--git option to keep the patch in the git extended diff\n"
3193 " format. Read the diffs help topic for more information on why this\n"
3167 " format. Read the diffs help topic for more information on why this\n"
3194 " is important for preserving permission changes and copy/rename\n"
3168 " is important for preserving permission changes and copy/rename\n"
3195 " information.\n"
3169 " information.\n"
3196 " "
3170 " "
3197 msgstr ""
3171 msgstr ""
3198 "crée un nouveau patch\n"
3172 "crée un nouveau patch\n"
3199 "\n"
3173 "\n"
3200 " qnew crée un nouveau patch au-dessus du dernier patch\n"
3174 " qnew crée un nouveau patch au-dessus du dernier patch\n"
3201 " actuellement appliqué, le cas échéant. Si le répertoire\n"
3175 " actuellement appliqué, le cas échéant. Si le répertoire\n"
3202 " de travail comporte des modifications non enregistrées,\n"
3176 " de travail comporte des modifications non enregistrées,\n"
3203 " la création du patch sera refusée, à moins d'utiliser\n"
3177 " la création du patch sera refusée, à moins d'utiliser\n"
3204 " -f/--force auquel cas le contenu du nouveau patch sera\n"
3178 " -f/--force auquel cas le contenu du nouveau patch sera\n"
3205 " initialisé avec ces modifications. Il est également\n"
3179 " initialisé avec ces modifications. Il est également\n"
3206 " possible d'utiliser -I/--include, -X/--exclude ou une liste\n"
3180 " possible d'utiliser -I/--include, -X/--exclude ou une liste\n"
3207 " de noms de fichiers après le nom du patch, afin de n'inclure\n"
3181 " de noms de fichiers après le nom du patch, afin de n'inclure\n"
3208 " que les changements des fichiers concernés, et laisser le\n"
3182 " que les changements des fichiers concernés, et laisser le\n"
3209 " reste dans le répertoire de travail en tant que modifications\n"
3183 " reste dans le répertoire de travail en tant que modifications\n"
3210 " non enregistrées.\n"
3184 " non enregistrées.\n"
3211 "\n"
3185 "\n"
3212 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
3186 " Le nom d'utilisateur et la date peuvent être spécifiés à\n"
3213 " l'aide de -u/--user et -d/--date respectivement.\n"
3187 " l'aide de -u/--user et -d/--date respectivement.\n"
3214 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
3188 " -U/--currentuser et -D/--currentdate positionnent le nom\n"
3215 " d'utilisateur et la date à leur valeur actuelle.\n"
3189 " d'utilisateur et la date à leur valeur actuelle.\n"
3216 "\n"
3190 "\n"
3217 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
3191 " L'en-tête du patch et le message de \"commit\" peuvent être\n"
3218 " spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n"
3192 " spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n"
3219 " Si aucune de ces options n'est utilisée, l'en-tête restera\n"
3193 " Si aucune de ces options n'est utilisée, l'en-tête restera\n"
3220 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
3194 " vierge et le message de \"commit\" sera '[mq]: PATCH'.\n"
3221 "\n"
3195 "\n"
3222 " Utilisez -g/--git pour garder le patch au format étendu de\n"
3196 " Utilisez -g/--git pour garder le patch au format étendu de\n"
3223 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
3197 " \"git\". La section \"diffs\" de l'aide explique l'importance\n"
3224 " de cette option pour la préservation des informations de\n"
3198 " de cette option pour la préservation des informations de\n"
3225 " copie/renommage et des modifications de permissions.\n"
3199 " copie/renommage et des modifications de permissions.\n"
3226 " "
3200 " "
3227
3201
3228 msgid ""
3202 msgid ""
3229 "update the current patch\n"
3203 "update the current patch\n"
3230 "\n"
3204 "\n"
3231 " If any file patterns are provided, the refreshed patch will\n"
3205 " If any file patterns are provided, the refreshed patch will\n"
3232 " contain only the modifications that match those patterns; the\n"
3206 " contain only the modifications that match those patterns; the\n"
3233 " remaining modifications will remain in the working directory.\n"
3207 " remaining modifications will remain in the working directory.\n"
3234 "\n"
3208 "\n"
3235 " If -s/--short is specified, files currently included in the patch\n"
3209 " If -s/--short is specified, files currently included in the patch\n"
3236 " will be refreshed just like matched files and remain in the patch.\n"
3210 " will be refreshed just like matched files and remain in the patch.\n"
3237 "\n"
3211 "\n"
3238 " hg add/remove/copy/rename work as usual, though you might want to\n"
3212 " hg add/remove/copy/rename work as usual, though you might want to\n"
3239 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3213 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3240 " and renames. See the diffs help topic for more information on the\n"
3214 " and renames. See the diffs help topic for more information on the\n"
3241 " git diff format.\n"
3215 " git diff format.\n"
3242 " "
3216 " "
3243 msgstr ""
3217 msgstr ""
3244
3218
3245 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3219 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3246 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
3220 msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\""
3247
3221
3248 msgid ""
3222 msgid ""
3249 "diff of the current patch and subsequent modifications\n"
3223 "diff of the current patch and subsequent modifications\n"
3250 "\n"
3224 "\n"
3251 " Shows a diff which includes the current patch as well as any\n"
3225 " Shows a diff which includes the current patch as well as any\n"
3252 " changes which have been made in the working directory since the\n"
3226 " changes which have been made in the working directory since the\n"
3253 " last refresh (thus showing what the current patch would become\n"
3227 " last refresh (thus showing what the current patch would become\n"
3254 " after a qrefresh).\n"
3228 " after a qrefresh).\n"
3255 "\n"
3229 "\n"
3256 " Use 'hg diff' if you only want to see the changes made since the\n"
3230 " Use 'hg diff' if you only want to see the changes made since the\n"
3257 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3231 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3258 " by the current patch without including changes made since the\n"
3232 " by the current patch without including changes made since the\n"
3259 " qrefresh.\n"
3233 " qrefresh.\n"
3260 " "
3234 " "
3261 msgstr ""
3235 msgstr ""
3262
3236
3263 msgid ""
3237 msgid ""
3264 "fold the named patches into the current patch\n"
3238 "fold the named patches into the current patch\n"
3265 "\n"
3239 "\n"
3266 " Patches must not yet be applied. Each patch will be successively\n"
3240 " Patches must not yet be applied. Each patch will be successively\n"
3267 " applied to the current patch in the order given. If all the\n"
3241 " applied to the current patch in the order given. If all the\n"
3268 " patches apply successfully, the current patch will be refreshed\n"
3242 " patches apply successfully, the current patch will be refreshed\n"
3269 " with the new cumulative patch, and the folded patches will be\n"
3243 " with the new cumulative patch, and the folded patches will be\n"
3270 " deleted. With -k/--keep, the folded patch files will not be\n"
3244 " deleted. With -k/--keep, the folded patch files will not be\n"
3271 " removed afterwards.\n"
3245 " removed afterwards.\n"
3272 "\n"
3246 "\n"
3273 " The header for each folded patch will be concatenated with the\n"
3247 " The header for each folded patch will be concatenated with the\n"
3274 " current patch header, separated by a line of '* * *'."
3248 " current patch header, separated by a line of '* * *'."
3275 msgstr ""
3249 msgstr ""
3276
3250
3277 msgid "qfold requires at least one patch name"
3251 msgid "qfold requires at least one patch name"
3278 msgstr "qfold a besoin au minimum du nom d'un patch"
3252 msgstr "qfold a besoin au minimum du nom d'un patch"
3279
3253
3280 msgid "No patches applied"
3254 msgid "No patches applied"
3281 msgstr "Aucun patch d'appliqué"
3255 msgstr "Aucun patch d'appliqué"
3282
3256
3283 #, python-format
3257 #, python-format
3284 msgid "Skipping already folded patch %s"
3258 msgid "Skipping already folded patch %s"
3285 msgstr ""
3259 msgstr ""
3286
3260
3287 #, python-format
3261 #, python-format
3288 msgid "qfold cannot fold already applied patch %s"
3262 msgid "qfold cannot fold already applied patch %s"
3289 msgstr ""
3263 msgstr ""
3290
3264
3291 #, python-format
3265 #, python-format
3292 msgid "Error folding patch %s"
3266 msgid "Error folding patch %s"
3293 msgstr ""
3267 msgstr ""
3294
3268
3295 msgid "push or pop patches until named patch is at top of stack"
3269 msgid "push or pop patches until named patch is at top of stack"
3296 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
3270 msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué"
3297
3271
3298 msgid ""
3272 msgid ""
3299 "set or print guards for a patch\n"
3273 "set or print guards for a patch\n"
3300 "\n"
3274 "\n"
3301 " Guards control whether a patch can be pushed. A patch with no\n"
3275 " Guards control whether a patch can be pushed. A patch with no\n"
3302 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3276 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3303 " pushed only if the qselect command has activated it. A patch with\n"
3277 " pushed only if the qselect command has activated it. A patch with\n"
3304 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3278 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3305 " has activated it.\n"
3279 " has activated it.\n"
3306 "\n"
3280 "\n"
3307 " With no arguments, print the currently active guards.\n"
3281 " With no arguments, print the currently active guards.\n"
3308 " With arguments, set guards for the named patch.\n"
3282 " With arguments, set guards for the named patch.\n"
3309 " NOTE: Specifying negative guards now requires '--'.\n"
3283 " NOTE: Specifying negative guards now requires '--'.\n"
3310 "\n"
3284 "\n"
3311 " To set guards on another patch:\n"
3285 " To set guards on another patch:\n"
3312 " hg qguard -- other.patch +2.6.17 -stable\n"
3286 " hg qguard -- other.patch +2.6.17 -stable\n"
3313 " "
3287 " "
3314 msgstr ""
3288 msgstr ""
3315
3289
3316 msgid "cannot mix -l/--list with options or arguments"
3290 msgid "cannot mix -l/--list with options or arguments"
3317 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
3291 msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres"
3318
3292
3319 msgid "no patch to work with"
3293 msgid "no patch to work with"
3320 msgstr "aucun patch avec lequel travailler"
3294 msgstr "aucun patch avec lequel travailler"
3321
3295
3322 #, python-format
3296 #, python-format
3323 msgid "no patch named %s"
3297 msgid "no patch named %s"
3324 msgstr "aucun patch du nom de %s"
3298 msgstr "aucun patch du nom de %s"
3325
3299
3326 msgid "print the header of the topmost or specified patch"
3300 msgid "print the header of the topmost or specified patch"
3327 msgstr "affiche l'en-tête du dernier patch appliqué"
3301 msgstr "affiche l'en-tête du dernier patch appliqué"
3328
3302
3329 msgid ""
3303 msgid ""
3330 "push the next patch onto the stack\n"
3304 "push the next patch onto the stack\n"
3331 "\n"
3305 "\n"
3332 " When -f/--force is applied, all local changes in patched files\n"
3306 " When -f/--force is applied, all local changes in patched files\n"
3333 " will be lost.\n"
3307 " will be lost.\n"
3334 " "
3308 " "
3335 msgstr ""
3309 msgstr ""
3336 "applique le patch suivant sur la pile\n"
3310 "applique le patch suivant sur la pile\n"
3337 "\n"
3311 "\n"
3338 " Si -f/--force est utilisé, tout changement local dans les\n"
3312 " Si -f/--force est utilisé, tout changement local dans les\n"
3339 " fichiers concernés par le patch seront perdus.\n"
3313 " fichiers concernés par le patch seront perdus.\n"
3340 " "
3314 " "
3341
3315
3342 msgid "no saved queues found, please use -n\n"
3316 msgid "no saved queues found, please use -n\n"
3343 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
3317 msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n"
3344
3318
3345 #, python-format
3319 #, python-format
3346 msgid "merging with queue at: %s\n"
3320 msgid "merging with queue at: %s\n"
3347 msgstr "fusion avec la pile située à %s\n"
3321 msgstr "fusion avec la pile située à %s\n"
3348
3322
3349 msgid ""
3323 msgid ""
3350 "pop the current patch off the stack\n"
3324 "pop the current patch off the stack\n"
3351 "\n"
3325 "\n"
3352 " By default, pops off the top of the patch stack. If given a patch\n"
3326 " By default, pops off the top of the patch stack. If given a patch\n"
3353 " name, keeps popping off patches until the named patch is at the\n"
3327 " name, keeps popping off patches until the named patch is at the\n"
3354 " top of the stack.\n"
3328 " top of the stack.\n"
3355 " "
3329 " "
3356 msgstr ""
3330 msgstr ""
3357 "dépile le dernier patch appliqué\n"
3331 "dépile le dernier patch appliqué\n"
3358 "\n"
3332 "\n"
3359 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
3333 " Par défaut, le dernier patch appliqué est ôté de la pile. Si\n"
3360 " un nom de patch est fourni, les patchs seront dépilés en\n"
3334 " un nom de patch est fourni, les patchs seront dépilés en\n"
3361 " séquence jusqu'à arriver au patch demandé.\n"
3335 " séquence jusqu'à arriver au patch demandé.\n"
3362 " "
3336 " "
3363
3337
3364 #, python-format
3338 #, python-format
3365 msgid "using patch queue: %s\n"
3339 msgid "using patch queue: %s\n"
3366 msgstr "utilisation de la pile de patchs %s\n"
3340 msgstr "utilisation de la pile de patchs %s\n"
3367
3341
3368 msgid ""
3342 msgid ""
3369 "rename a patch\n"
3343 "rename a patch\n"
3370 "\n"
3344 "\n"
3371 " With one argument, renames the current patch to PATCH1.\n"
3345 " With one argument, renames the current patch to PATCH1.\n"
3372 " With two arguments, renames PATCH1 to PATCH2."
3346 " With two arguments, renames PATCH1 to PATCH2."
3373 msgstr ""
3347 msgstr ""
3374 "renomme un patch\n"
3348 "renomme un patch\n"
3375 "\n"
3349 "\n"
3376 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
3350 " Avec un seul argument, le patch actuel est renommé PATCH1.\n"
3377 " Avec deux arguments, PATCH1 devient PATCH2."
3351 " Avec deux arguments, PATCH1 devient PATCH2."
3378
3352
3379 #, python-format
3353 #, python-format
3380 msgid "%s already exists"
3354 msgid "%s already exists"
3381 msgstr "%s existe déjà"
3355 msgstr "%s existe déjà"
3382
3356
3383 #, python-format
3357 #, python-format
3384 msgid "A patch named %s already exists in the series file"
3358 msgid "A patch named %s already exists in the series file"
3385 msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")"
3359 msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")"
3386
3360
3387 msgid "restore the queue state saved by a revision"
3361 msgid "restore the queue state saved by a revision"
3388 msgstr "rétablissement d'un état sauvegardé de la pile"
3362 msgstr "rétablissement d'un état sauvegardé de la pile"
3389
3363
3390 msgid "save current queue state"
3364 msgid "save current queue state"
3391 msgstr "sauvegarde de l'étatt de la pile de patchs"
3365 msgstr "sauvegarde de l'étatt de la pile de patchs"
3392
3366
3393 #, python-format
3367 #, python-format
3394 msgid "destination %s exists and is not a directory"
3368 msgid "destination %s exists and is not a directory"
3395 msgstr "%s: la cible existe et n'est pas un répertoire"
3369 msgstr "%s: la cible existe et n'est pas un répertoire"
3396
3370
3397 #, python-format
3371 #, python-format
3398 msgid "destination %s exists, use -f to force"
3372 msgid "destination %s exists, use -f to force"
3399 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
3373 msgstr "%s: la cible existe, utilisez -f pour forcer l'action"
3400
3374
3401 #, python-format
3375 #, python-format
3402 msgid "copy %s to %s\n"
3376 msgid "copy %s to %s\n"
3403 msgstr "copie de %s vers %s\n"
3377 msgstr "copie de %s vers %s\n"
3404
3378
3405 msgid ""
3379 msgid ""
3406 "strip a revision and all its descendants from the repository\n"
3380 "strip a revision and all its descendants from the repository\n"
3407 "\n"
3381 "\n"
3408 " If one of the working directory's parent revisions is stripped, the\n"
3382 " If one of the working directory's parent revisions is stripped, the\n"
3409 " working directory will be updated to the parent of the stripped\n"
3383 " working directory will be updated to the parent of the stripped\n"
3410 " revision.\n"
3384 " revision.\n"
3411 " "
3385 " "
3412 msgstr ""
3386 msgstr ""
3413
3387
3414 msgid ""
3388 msgid ""
3415 "set or print guarded patches to push\n"
3389 "set or print guarded patches to push\n"
3416 "\n"
3390 "\n"
3417 " Use the qguard command to set or print guards on patch, then use\n"
3391 " Use the qguard command to set or print guards on patch, then use\n"
3418 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3392 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3419 " it has no guards or any positive guards match the currently\n"
3393 " it has no guards or any positive guards match the currently\n"
3420 " selected guard, but will not be pushed if any negative guards\n"
3394 " selected guard, but will not be pushed if any negative guards\n"
3421 " match the current guard. For example:\n"
3395 " match the current guard. For example:\n"
3422 "\n"
3396 "\n"
3423 " qguard foo.patch -stable (negative guard)\n"
3397 " qguard foo.patch -stable (negative guard)\n"
3424 " qguard bar.patch +stable (positive guard)\n"
3398 " qguard bar.patch +stable (positive guard)\n"
3425 " qselect stable\n"
3399 " qselect stable\n"
3426 "\n"
3400 "\n"
3427 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3401 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3428 " it has a negative match) but push bar.patch (because it has a\n"
3402 " it has a negative match) but push bar.patch (because it has a\n"
3429 " positive match).\n"
3403 " positive match).\n"
3430 "\n"
3404 "\n"
3431 " With no arguments, prints the currently active guards.\n"
3405 " With no arguments, prints the currently active guards.\n"
3432 " With one argument, sets the active guard.\n"
3406 " With one argument, sets the active guard.\n"
3433 "\n"
3407 "\n"
3434 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3408 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3435 " When no guards are active, patches with positive guards are\n"
3409 " When no guards are active, patches with positive guards are\n"
3436 " skipped and patches with negative guards are pushed.\n"
3410 " skipped and patches with negative guards are pushed.\n"
3437 "\n"
3411 "\n"
3438 " qselect can change the guards on applied patches. It does not pop\n"
3412 " qselect can change the guards on applied patches. It does not pop\n"
3439 " guarded patches by default. Use --pop to pop back to the last\n"
3413 " guarded patches by default. Use --pop to pop back to the last\n"
3440 " applied patch that is not guarded. Use --reapply (which implies\n"
3414 " applied patch that is not guarded. Use --reapply (which implies\n"
3441 " --pop) to push back to the current patch afterwards, but skip\n"
3415 " --pop) to push back to the current patch afterwards, but skip\n"
3442 " guarded patches.\n"
3416 " guarded patches.\n"
3443 "\n"
3417 "\n"
3444 " Use -s/--series to print a list of all guards in the series file\n"
3418 " Use -s/--series to print a list of all guards in the series file\n"
3445 " (no other arguments needed). Use -v for more information."
3419 " (no other arguments needed). Use -v for more information."
3446 msgstr ""
3420 msgstr ""
3447
3421
3448 msgid "guards deactivated\n"
3422 msgid "guards deactivated\n"
3449 msgstr ""
3423 msgstr ""
3450
3424
3451 #, python-format
3425 #, python-format
3452 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3426 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3453 msgstr ""
3427 msgstr ""
3454
3428
3455 #, python-format
3429 #, python-format
3456 msgid "number of guarded, applied patches has changed from %d to %d\n"
3430 msgid "number of guarded, applied patches has changed from %d to %d\n"
3457 msgstr ""
3431 msgstr ""
3458
3432
3459 msgid "guards in series file:\n"
3433 msgid "guards in series file:\n"
3460 msgstr ""
3434 msgstr ""
3461
3435
3462 msgid "no guards in series file\n"
3436 msgid "no guards in series file\n"
3463 msgstr ""
3437 msgstr ""
3464
3438
3465 msgid "active guards:\n"
3439 msgid "active guards:\n"
3466 msgstr ""
3440 msgstr ""
3467
3441
3468 msgid "no active guards\n"
3442 msgid "no active guards\n"
3469 msgstr ""
3443 msgstr ""
3470
3444
3471 msgid "popping guarded patches\n"
3445 msgid "popping guarded patches\n"
3472 msgstr ""
3446 msgstr ""
3473
3447
3474 msgid "reapplying unguarded patches\n"
3448 msgid "reapplying unguarded patches\n"
3475 msgstr ""
3449 msgstr ""
3476
3450
3477 msgid ""
3451 msgid ""
3478 "move applied patches into repository history\n"
3452 "move applied patches into repository history\n"
3479 "\n"
3453 "\n"
3480 " Finishes the specified revisions (corresponding to applied\n"
3454 " Finishes the specified revisions (corresponding to applied\n"
3481 " patches) by moving them out of mq control into regular repository\n"
3455 " patches) by moving them out of mq control into regular repository\n"
3482 " history.\n"
3456 " history.\n"
3483 "\n"
3457 "\n"
3484 " Accepts a revision range or the -a/--applied option. If --applied\n"
3458 " Accepts a revision range or the -a/--applied option. If --applied\n"
3485 " is specified, all applied mq revisions are removed from mq\n"
3459 " is specified, all applied mq revisions are removed from mq\n"
3486 " control. Otherwise, the given revisions must be at the base of the\n"
3460 " control. Otherwise, the given revisions must be at the base of the\n"
3487 " stack of applied patches.\n"
3461 " stack of applied patches.\n"
3488 "\n"
3462 "\n"
3489 " This can be especially useful if your changes have been applied to\n"
3463 " This can be especially useful if your changes have been applied to\n"
3490 " an upstream repository, or if you are about to push your changes\n"
3464 " an upstream repository, or if you are about to push your changes\n"
3491 " to upstream.\n"
3465 " to upstream.\n"
3492 " "
3466 " "
3493 msgstr ""
3467 msgstr ""
3494 "déplacement des patchs vers l'historique du dépôt\n"
3468 "déplacement des patchs vers l'historique du dépôt\n"
3495 "\n"
3469 "\n"
3496 " Achève le développement des révisions spécifiées (qui doivent\n"
3470 " Achève le développement des révisions spécifiées (qui doivent\n"
3497 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3471 " correspondre à des patch appliqués) en les retirant du contrôle\n"
3498 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3472 " de mq, pour les transformer en \"changeset\" ordinaires dans\n"
3499 " l'historique du dépôt.\n"
3473 " l'historique du dépôt.\n"
3500 "\n"
3474 "\n"
3501 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3475 " Il est possible d'utiliser l'option -a/--applied, ou de fournir\n"
3502 " une plage de révisions. Avec --applied, tous les patchs\n"
3476 " une plage de révisions. Avec --applied, tous les patchs\n"
3503 " appliqués seront retirés du contrôle de mq. Autrement, les\n"
3477 " appliqués seront retirés du contrôle de mq. Autrement, les\n"
3504 " révisions fournies doivent être situées à la base de la pile de\n"
3478 " révisions fournies doivent être situées à la base de la pile de\n"
3505 " patchs appliqués.\n"
3479 " patchs appliqués.\n"
3506 "\n"
3480 "\n"
3507 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3481 " Ceci est utile en particulier si vos changements ont été adoptés\n"
3508 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3482 " dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n"
3509 " "
3483 " "
3510
3484
3511 msgid "no revisions specified"
3485 msgid "no revisions specified"
3512 msgstr "aucune révision spécifiée"
3486 msgstr "aucune révision spécifiée"
3513
3487
3514 msgid "cannot commit over an applied mq patch"
3488 msgid "cannot commit over an applied mq patch"
3515 msgstr ""
3489 msgstr ""
3516
3490
3517 msgid "source has mq patches applied"
3491 msgid "source has mq patches applied"
3518 msgstr ""
3492 msgstr ""
3519
3493
3520 #, python-format
3494 #, python-format
3521 msgid "mq status file refers to unknown node %s\n"
3495 msgid "mq status file refers to unknown node %s\n"
3522 msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n"
3496 msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n"
3523
3497
3524 #, python-format
3498 #, python-format
3525 msgid "Tag %s overrides mq patch of the same name\n"
3499 msgid "Tag %s overrides mq patch of the same name\n"
3526 msgstr ""
3500 msgstr ""
3527
3501
3528 msgid "cannot import over an applied patch"
3502 msgid "cannot import over an applied patch"
3529 msgstr "impossible d'importer au-dessus d'un patch appliqué"
3503 msgstr "impossible d'importer au-dessus d'un patch appliqué"
3530
3504
3531 msgid "print first line of patch header"
3505 msgid "print first line of patch header"
3532 msgstr "affiche la première ligne de l'en-tête d'un patch"
3506 msgstr "affiche la première ligne de l'en-tête d'un patch"
3533
3507
3534 msgid "show only the last patch"
3508 msgid "show only the last patch"
3535 msgstr ""
3509 msgstr ""
3536
3510
3537 #, fuzzy
3511 #, fuzzy
3538 msgid "hg qapplied [-1] [-s] [PATCH]"
3512 msgid "hg qapplied [-1] [-s] [PATCH]"
3539 msgstr "hg qapplied [-s] [PATCH]"
3513 msgstr "hg qapplied [-s] [PATCH]"
3540
3514
3541 msgid "use pull protocol to copy metadata"
3515 msgid "use pull protocol to copy metadata"
3542 msgstr ""
3516 msgstr ""
3543
3517
3544 msgid "do not update the new working directories"
3518 msgid "do not update the new working directories"
3545 msgstr "ne pas mettre à jour le répertoire de travail"
3519 msgstr "ne pas mettre à jour le répertoire de travail"
3546
3520
3547 msgid "use uncompressed transfer (fast over LAN)"
3521 msgid "use uncompressed transfer (fast over LAN)"
3548 msgstr "transférer sans compression (rapide sur un réseau local)"
3522 msgstr "transférer sans compression (rapide sur un réseau local)"
3549
3523
3550 msgid "location of source patch repository"
3524 msgid "location of source patch repository"
3551 msgstr "emplacement du dépôt de patchs"
3525 msgstr "emplacement du dépôt de patchs"
3552
3526
3553 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3527 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3554 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
3528 msgstr "hg qclone [OPTION]... SOURCE [DEST]"
3555
3529
3556 msgid "hg qcommit [OPTION]... [FILE]..."
3530 msgid "hg qcommit [OPTION]... [FILE]..."
3557 msgstr "hg qcommit [OPTION]... [FICHIER]..."
3531 msgstr "hg qcommit [OPTION]... [FICHIER]..."
3558
3532
3559 msgid "hg qdiff [OPTION]... [FILE]..."
3533 msgid "hg qdiff [OPTION]... [FILE]..."
3560 msgstr "hg qdiff [OPTION]... [FICHIER]..."
3534 msgstr "hg qdiff [OPTION]... [FICHIER]..."
3561
3535
3562 msgid "keep patch file"
3536 msgid "keep patch file"
3563 msgstr "garder le fichier du patch"
3537 msgstr "garder le fichier du patch"
3564
3538
3565 msgid "stop managing a revision (DEPRECATED)"
3539 msgid "stop managing a revision (DEPRECATED)"
3566 msgstr "arrêter de gérer une révision"
3540 msgstr "arrêter de gérer une révision"
3567
3541
3568 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3542 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3569 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3543 msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
3570
3544
3571 msgid "edit patch header"
3545 msgid "edit patch header"
3572 msgstr "éditer l'en-tête du patch"
3546 msgstr "éditer l'en-tête du patch"
3573
3547
3574 msgid "keep folded patch files"
3548 msgid "keep folded patch files"
3575 msgstr ""
3549 msgstr ""
3576
3550
3577 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3551 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3578 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3552 msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..."
3579
3553
3580 msgid "overwrite any local changes"
3554 msgid "overwrite any local changes"
3581 msgstr "écraser tout modification locale"
3555 msgstr "écraser tout modification locale"
3582
3556
3583 msgid "hg qgoto [OPTION]... PATCH"
3557 msgid "hg qgoto [OPTION]... PATCH"
3584 msgstr "hg qgoto [OPTION]... PATCH"
3558 msgstr "hg qgoto [OPTION]... PATCH"
3585
3559
3586 msgid "list all patches and guards"
3560 msgid "list all patches and guards"
3587 msgstr ""
3561 msgstr ""
3588
3562
3589 msgid "drop all guards"
3563 msgid "drop all guards"
3590 msgstr ""
3564 msgstr ""
3591
3565
3592 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3566 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3593 msgstr ""
3567 msgstr ""
3594
3568
3595 msgid "hg qheader [PATCH]"
3569 msgid "hg qheader [PATCH]"
3596 msgstr "hg qheader [PATCH]"
3570 msgstr "hg qheader [PATCH]"
3597
3571
3598 msgid "import file in patch directory"
3572 msgid "import file in patch directory"
3599 msgstr "importer un fichier résidant dans le répertoire de patchs"
3573 msgstr "importer un fichier résidant dans le répertoire de patchs"
3600
3574
3601 msgid "name of patch file"
3575 msgid "name of patch file"
3602 msgstr "nom du fichier de patch"
3576 msgstr "nom du fichier de patch"
3603
3577
3604 msgid "overwrite existing files"
3578 msgid "overwrite existing files"
3605 msgstr "écraser les fichiers existant"
3579 msgstr "écraser les fichiers existant"
3606
3580
3607 msgid "place existing revisions under mq control"
3581 msgid "place existing revisions under mq control"
3608 msgstr "placer des révisions existantes sous le contrôle de mq"
3582 msgstr "placer des révisions existantes sous le contrôle de mq"
3609
3583
3610 msgid "use git extended diff format"
3584 msgid "use git extended diff format"
3611 msgstr "utiliser le format de patch étendu de git"
3585 msgstr "utiliser le format de patch étendu de git"
3612
3586
3613 msgid "qpush after importing"
3587 msgid "qpush after importing"
3614 msgstr "qpush après l'importation"
3588 msgstr "qpush après l'importation"
3615
3589
3616 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3590 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3617 msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..."
3591 msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..."
3618
3592
3619 msgid "create queue repository"
3593 msgid "create queue repository"
3620 msgstr "crée un dépôt de patchs"
3594 msgstr "crée un dépôt de patchs"
3621
3595
3622 msgid "hg qinit [-c]"
3596 msgid "hg qinit [-c]"
3623 msgstr "hg qinit [-c]"
3597 msgstr "hg qinit [-c]"
3624
3598
3625 msgid "import uncommitted changes into patch"
3599 msgid "import uncommitted changes into patch"
3626 msgstr "importer les modifications locales dans le patch"
3600 msgstr "importer les modifications locales dans le patch"
3627
3601
3628 msgid "add \"From: <current user>\" to patch"
3602 msgid "add \"From: <current user>\" to patch"
3629 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3603 msgstr "ajout de \"From: <utilisateur actuel>\" au patch"
3630
3604
3631 msgid "add \"From: <given user>\" to patch"
3605 msgid "add \"From: <given user>\" to patch"
3632 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3606 msgstr "ajout de \"From: <utilisateur spécifié>\" au patch"
3633
3607
3634 msgid "add \"Date: <current date>\" to patch"
3608 msgid "add \"Date: <current date>\" to patch"
3635 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3609 msgstr "ajout de \"Date: <date actuelle>\" au patch"
3636
3610
3637 msgid "add \"Date: <given date>\" to patch"
3611 msgid "add \"Date: <given date>\" to patch"
3638 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3612 msgstr "ajout de \"Date: <date spécifiée>\" au patch"
3639
3613
3640 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3614 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3641 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3615 msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..."
3642
3616
3643 msgid "hg qnext [-s]"
3617 msgid "hg qnext [-s]"
3644 msgstr "hg qnext [-s]"
3618 msgstr "hg qnext [-s]"
3645
3619
3646 msgid "hg qprev [-s]"
3620 msgid "hg qprev [-s]"
3647 msgstr "hg qprev [-s]"
3621 msgstr "hg qprev [-s]"
3648
3622
3649 msgid "pop all patches"
3623 msgid "pop all patches"
3650 msgstr "dépiler tous les patchs"
3624 msgstr "dépiler tous les patchs"
3651
3625
3652 msgid "queue name to pop"
3626 msgid "queue name to pop"
3653 msgstr "nom de la pile à dépiler"
3627 msgstr "nom de la pile à dépiler"
3654
3628
3655 #, fuzzy
3629 #, fuzzy
3656 msgid "forget any local changes to patched files"
3630 msgid "forget any local changes to patched files"
3657 msgstr "oublier toute modification locale"
3631 msgstr "oublier toute modification locale"
3658
3632
3659 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3633 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3660 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3634 msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]"
3661
3635
3662 msgid "apply if the patch has rejects"
3636 msgid "apply if the patch has rejects"
3663 msgstr ""
3637 msgstr ""
3664
3638
3665 msgid "list patch name in commit text"
3639 msgid "list patch name in commit text"
3666 msgstr ""
3640 msgstr ""
3667
3641
3668 msgid "apply all patches"
3642 msgid "apply all patches"
3669 msgstr "appliquer tous les patchs"
3643 msgstr "appliquer tous les patchs"
3670
3644
3671 msgid "merge from another queue"
3645 msgid "merge from another queue"
3672 msgstr "fusionner avec une autre pile de patchs"
3646 msgstr "fusionner avec une autre pile de patchs"
3673
3647
3674 msgid "merge queue name"
3648 msgid "merge queue name"
3675 msgstr "nom de la pile à fusionner"
3649 msgstr "nom de la pile à fusionner"
3676
3650
3677 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3651 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3678 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3652 msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]"
3679
3653
3680 msgid "refresh only files already in the patch and specified files"
3654 msgid "refresh only files already in the patch and specified files"
3681 msgstr ""
3655 msgstr "ne rafraîchir que les fichiers déjà présent dans le patch et ceux explicitement spécifiés"
3682 "ne rafraîchir que les fichiers déjà présent dans le patch et ceux "
3683 "explicitement spécifiés"
3684
3656
3685 msgid "add/update author field in patch with current user"
3657 msgid "add/update author field in patch with current user"
3686 msgstr ""
3658 msgstr ""
3687
3659
3688 msgid "add/update author field in patch with given user"
3660 msgid "add/update author field in patch with given user"
3689 msgstr ""
3661 msgstr ""
3690
3662
3691 #, fuzzy
3663 #, fuzzy
3692 msgid "add/update date field in patch with current date"
3664 msgid "add/update date field in patch with current date"
3693 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3665 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3694
3666
3695 #, fuzzy
3667 #, fuzzy
3696 msgid "add/update date field in patch with given date"
3668 msgid "add/update date field in patch with given date"
3697 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3669 msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)"
3698
3670
3699 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3671 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3700 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..."
3672 msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..."
3701
3673
3702 msgid "hg qrename PATCH1 [PATCH2]"
3674 msgid "hg qrename PATCH1 [PATCH2]"
3703 msgstr "hg qrename PATCH1 [PATCH2]"
3675 msgstr "hg qrename PATCH1 [PATCH2]"
3704
3676
3705 msgid "delete save entry"
3677 msgid "delete save entry"
3706 msgstr ""
3678 msgstr ""
3707
3679
3708 msgid "update queue working directory"
3680 msgid "update queue working directory"
3709 msgstr ""
3681 msgstr ""
3710
3682
3711 msgid "hg qrestore [-d] [-u] REV"
3683 msgid "hg qrestore [-d] [-u] REV"
3712 msgstr ""
3684 msgstr ""
3713
3685
3714 msgid "copy patch directory"
3686 msgid "copy patch directory"
3715 msgstr ""
3687 msgstr ""
3716
3688
3717 msgid "copy directory name"
3689 msgid "copy directory name"
3718 msgstr ""
3690 msgstr ""
3719
3691
3720 msgid "clear queue status file"
3692 msgid "clear queue status file"
3721 msgstr ""
3693 msgstr ""
3722
3694
3723 msgid "force copy"
3695 msgid "force copy"
3724 msgstr ""
3696 msgstr ""
3725
3697
3726 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3698 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3727 msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]"
3699 msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]"
3728
3700
3729 msgid "disable all guards"
3701 msgid "disable all guards"
3730 msgstr ""
3702 msgstr ""
3731
3703
3732 msgid "list all guards in series file"
3704 msgid "list all guards in series file"
3733 msgstr ""
3705 msgstr ""
3734
3706
3735 msgid "pop to before first guarded applied patch"
3707 msgid "pop to before first guarded applied patch"
3736 msgstr ""
3708 msgstr ""
3737
3709
3738 msgid "pop, then reapply patches"
3710 msgid "pop, then reapply patches"
3739 msgstr "dépiler, puis appliquer à nouveau les patchs"
3711 msgstr "dépiler, puis appliquer à nouveau les patchs"
3740
3712
3741 msgid "hg qselect [OPTION]... [GUARD]..."
3713 msgid "hg qselect [OPTION]... [GUARD]..."
3742 msgstr ""
3714 msgstr ""
3743
3715
3744 msgid "print patches not in series"
3716 msgid "print patches not in series"
3745 msgstr "afficher les patchs absents de la série"
3717 msgstr "afficher les patchs absents de la série"
3746
3718
3747 msgid "hg qseries [-ms]"
3719 msgid "hg qseries [-ms]"
3748 msgstr "hg qseries [-ms]"
3720 msgstr "hg qseries [-ms]"
3749
3721
3750 msgid "force removal with local changes"
3722 msgid "force removal with local changes"
3751 msgstr "forcer la suppression malgré les modifications locales"
3723 msgstr "forcer la suppression malgré les modifications locales"
3752
3724
3753 msgid "bundle unrelated changesets"
3725 msgid "bundle unrelated changesets"
3754 msgstr ""
3726 msgstr ""
3755
3727
3756 msgid "no backups"
3728 msgid "no backups"
3757 msgstr ""
3729 msgstr ""
3758
3730
3759 msgid "hg strip [-f] [-b] [-n] REV"
3731 msgid "hg strip [-f] [-b] [-n] REV"
3760 msgstr "hg strip [-f] [-b] [-n] REV"
3732 msgstr "hg strip [-f] [-b] [-n] REV"
3761
3733
3762 msgid "hg qtop [-s]"
3734 msgid "hg qtop [-s]"
3763 msgstr "hg qtop [-s]"
3735 msgstr "hg qtop [-s]"
3764
3736
3765 msgid "show only the first patch"
3737 msgid "show only the first patch"
3766 msgstr ""
3738 msgstr ""
3767
3739
3768 #, fuzzy
3740 #, fuzzy
3769 msgid "hg qunapplied [-1] [-s] [PATCH]"
3741 msgid "hg qunapplied [-1] [-s] [PATCH]"
3770 msgstr "hg qunapplied [-s] [PATCH]"
3742 msgstr "hg qunapplied [-s] [PATCH]"
3771
3743
3772 msgid "finish all applied changesets"
3744 msgid "finish all applied changesets"
3773 msgstr ""
3745 msgstr ""
3774
3746
3775 msgid "hg qfinish [-a] [REV]..."
3747 msgid "hg qfinish [-a] [REV]..."
3776 msgstr "hg qfinish [-a] [REV]..."
3748 msgstr "hg qfinish [-a] [REV]..."
3777
3749
3778 msgid ""
3750 msgid ""
3779 "hooks for sending email notifications at commit/push time\n"
3751 "hooks for sending email notifications at commit/push time\n"
3780 "\n"
3752 "\n"
3781 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3753 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3782 "print messages to stdout, for testing and configuring.\n"
3754 "print messages to stdout, for testing and configuring.\n"
3783 "\n"
3755 "\n"
3784 "To use, configure the notify extension and enable it in hgrc like\n"
3756 "To use, configure the notify extension and enable it in hgrc like\n"
3785 "this::\n"
3757 "this::\n"
3786 "\n"
3758 "\n"
3787 " [extensions]\n"
3759 " [extensions]\n"
3788 " notify =\n"
3760 " notify =\n"
3789 "\n"
3761 "\n"
3790 " [hooks]\n"
3762 " [hooks]\n"
3791 " # one email for each incoming changeset\n"
3763 " # one email for each incoming changeset\n"
3792 " incoming.notify = python:hgext.notify.hook\n"
3764 " incoming.notify = python:hgext.notify.hook\n"
3793 " # batch emails when many changesets incoming at one time\n"
3765 " # batch emails when many changesets incoming at one time\n"
3794 " changegroup.notify = python:hgext.notify.hook\n"
3766 " changegroup.notify = python:hgext.notify.hook\n"
3795 "\n"
3767 "\n"
3796 " [notify]\n"
3768 " [notify]\n"
3797 " # config items go here\n"
3769 " # config items go here\n"
3798 "\n"
3770 "\n"
3799 "Required configuration items::\n"
3771 "Required configuration items::\n"
3800 "\n"
3772 "\n"
3801 " config = /path/to/file # file containing subscriptions\n"
3773 " config = /path/to/file # file containing subscriptions\n"
3802 "\n"
3774 "\n"
3803 "Optional configuration items::\n"
3775 "Optional configuration items::\n"
3804 "\n"
3776 "\n"
3805 " test = True # print messages to stdout for testing\n"
3777 " test = True # print messages to stdout for testing\n"
3806 " strip = 3 # number of slashes to strip for url paths\n"
3778 " strip = 3 # number of slashes to strip for url paths\n"
3807 " domain = example.com # domain to use if committer missing domain\n"
3779 " domain = example.com # domain to use if committer missing domain\n"
3808 " style = ... # style file to use when formatting email\n"
3780 " style = ... # style file to use when formatting email\n"
3809 " template = ... # template to use when formatting email\n"
3781 " template = ... # template to use when formatting email\n"
3810 " incoming = ... # template to use when run as incoming hook\n"
3782 " incoming = ... # template to use when run as incoming hook\n"
3811 " changegroup = ... # template when run as changegroup hook\n"
3783 " changegroup = ... # template when run as changegroup hook\n"
3812 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3784 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3813 " maxsubject = 67 # truncate subject line longer than this\n"
3785 " maxsubject = 67 # truncate subject line longer than this\n"
3814 " diffstat = True # add a diffstat before the diff content\n"
3786 " diffstat = True # add a diffstat before the diff content\n"
3815 " sources = serve # notify if source of incoming changes in this "
3787 " sources = serve # notify if source of incoming changes in this list\n"
3816 "list\n"
3817 " # (serve == ssh or http, push, pull, bundle)\n"
3788 " # (serve == ssh or http, push, pull, bundle)\n"
3818 " merge = False # send notification for merges (default True)\n"
3789 " merge = False # send notification for merges (default True)\n"
3819 " [email]\n"
3790 " [email]\n"
3820 " from = user@host.com # email address to send as if none given\n"
3791 " from = user@host.com # email address to send as if none given\n"
3821 " [web]\n"
3792 " [web]\n"
3822 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3793 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3823 "\n"
3794 "\n"
3824 "The notify config file has same format as a regular hgrc file. It has\n"
3795 "The notify config file has same format as a regular hgrc file. It has\n"
3825 "two sections so you can express subscriptions in whatever way is\n"
3796 "two sections so you can express subscriptions in whatever way is\n"
3826 "handier for you.\n"
3797 "handier for you.\n"
3827 "\n"
3798 "\n"
3828 "::\n"
3799 "::\n"
3829 "\n"
3800 "\n"
3830 " [usersubs]\n"
3801 " [usersubs]\n"
3831 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3802 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3832 " user@host = pattern\n"
3803 " user@host = pattern\n"
3833 "\n"
3804 "\n"
3834 " [reposubs]\n"
3805 " [reposubs]\n"
3835 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3806 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3836 " pattern = user@host\n"
3807 " pattern = user@host\n"
3837 "\n"
3808 "\n"
3838 "Glob patterns are matched against path to repository root.\n"
3809 "Glob patterns are matched against path to repository root.\n"
3839 "\n"
3810 "\n"
3840 "If you like, you can put notify config file in repository that users\n"
3811 "If you like, you can put notify config file in repository that users\n"
3841 "can push changes to, they can manage their own subscriptions.\n"
3812 "can push changes to, they can manage their own subscriptions.\n"
3842 msgstr ""
3813 msgstr ""
3843
3814
3844 #, python-format
3815 #, python-format
3845 msgid "%s: %d new changesets"
3816 msgid "%s: %d new changesets"
3846 msgstr ""
3817 msgstr ""
3847
3818
3848 #, python-format
3819 #, python-format
3849 msgid "notify: sending %d subscribers %d changes\n"
3820 msgid "notify: sending %d subscribers %d changes\n"
3850 msgstr ""
3821 msgstr ""
3851
3822
3852 #, python-format
3823 #, python-format
3853 msgid ""
3824 msgid ""
3854 "\n"
3825 "\n"
3855 "diffs (truncated from %d to %d lines):\n"
3826 "diffs (truncated from %d to %d lines):\n"
3856 "\n"
3827 "\n"
3857 msgstr ""
3828 msgstr ""
3858
3829
3859 #, python-format
3830 #, python-format
3860 msgid ""
3831 msgid ""
3861 "\n"
3832 "\n"
3862 "diffs (%d lines):\n"
3833 "diffs (%d lines):\n"
3863 "\n"
3834 "\n"
3864 msgstr ""
3835 msgstr ""
3865
3836
3866 #, python-format
3837 #, python-format
3867 msgid "notify: suppressing notification for merge %d:%s\n"
3838 msgid "notify: suppressing notification for merge %d:%s\n"
3868 msgstr ""
3839 msgstr ""
3869
3840
3870 msgid ""
3841 msgid ""
3871 "browse command output with an external pager\n"
3842 "browse command output with an external pager\n"
3872 "\n"
3843 "\n"
3873 "To set the pager that should be used, set the application variable::\n"
3844 "To set the pager that should be used, set the application variable::\n"
3874 "\n"
3845 "\n"
3875 " [pager]\n"
3846 " [pager]\n"
3876 " pager = LESS='FSRX' less\n"
3847 " pager = LESS='FSRX' less\n"
3877 "\n"
3848 "\n"
3878 "If no pager is set, the pager extensions uses the environment variable\n"
3849 "If no pager is set, the pager extensions uses the environment variable\n"
3879 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3850 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3880 "\n"
3851 "\n"
3881 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3852 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3882 "setting::\n"
3853 "setting::\n"
3883 "\n"
3854 "\n"
3884 " [pager]\n"
3855 " [pager]\n"
3885 " quiet = True\n"
3856 " quiet = True\n"
3886 "\n"
3857 "\n"
3887 "You can disable the pager for certain commands by adding them to the\n"
3858 "You can disable the pager for certain commands by adding them to the\n"
3888 "pager.ignore list::\n"
3859 "pager.ignore list::\n"
3889 "\n"
3860 "\n"
3890 " [pager]\n"
3861 " [pager]\n"
3891 " ignore = version, help, update\n"
3862 " ignore = version, help, update\n"
3892 "\n"
3863 "\n"
3893 "You can also enable the pager only for certain commands using\n"
3864 "You can also enable the pager only for certain commands using\n"
3894 "pager.attend::\n"
3865 "pager.attend::\n"
3895 "\n"
3866 "\n"
3896 " [pager]\n"
3867 " [pager]\n"
3897 " attend = log\n"
3868 " attend = log\n"
3898 "\n"
3869 "\n"
3899 "If pager.attend is present, pager.ignore will be ignored.\n"
3870 "If pager.attend is present, pager.ignore will be ignored.\n"
3900 "\n"
3871 "\n"
3901 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3872 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3902 "specify them in the global .hgrc\n"
3873 "specify them in the global .hgrc\n"
3903 msgstr ""
3874 msgstr ""
3904
3875
3905 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3876 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3906 # sera capable de replier automatiquement la première ligne d'aide)
3877 # sera capable de replier automatiquement la première ligne d'aide)
3907 #, fuzzy
3878 #, fuzzy
3908 msgid ""
3879 msgid ""
3909 "interpret suffixes to refer to ancestor revisions\n"
3880 "interpret suffixes to refer to ancestor revisions\n"
3910 "\n"
3881 "\n"
3911 "This extension allows you to use git-style suffixes to refer to the\n"
3882 "This extension allows you to use git-style suffixes to refer to the\n"
3912 "ancestors of a specific revision.\n"
3883 "ancestors of a specific revision.\n"
3913 "\n"
3884 "\n"
3914 "For example, if you can refer to a revision as \"foo\", then::\n"
3885 "For example, if you can refer to a revision as \"foo\", then::\n"
3915 "\n"
3886 "\n"
3916 " foo^N = Nth parent of foo\n"
3887 " foo^N = Nth parent of foo\n"
3917 " foo^0 = foo\n"
3888 " foo^0 = foo\n"
3918 " foo^1 = first parent of foo\n"
3889 " foo^1 = first parent of foo\n"
3919 " foo^2 = second parent of foo\n"
3890 " foo^2 = second parent of foo\n"
3920 " foo^ = foo^1\n"
3891 " foo^ = foo^1\n"
3921 "\n"
3892 "\n"
3922 " foo~N = Nth first grandparent of foo\n"
3893 " foo~N = Nth first grandparent of foo\n"
3923 " foo~0 = foo\n"
3894 " foo~0 = foo\n"
3924 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3895 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3925 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3896 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3926 msgstr ""
3897 msgstr ""
3927 "suffixes faisant référence à des révisions antérieures\n"
3898 "suffixes faisant référence à des révisions antérieures\n"
3928 "\n"
3899 "\n"
3929 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3900 "Cette extension permet d'utiliser des suffixes à la mode git pour\n"
3930 "faire référence aux ancêtres d'une révision donnée.\n"
3901 "faire référence aux ancêtres d'une révision donnée.\n"
3931 "\n"
3902 "\n"
3932 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3903 "Par exemple, si \"foo\" désigne une révision, alors :\n"
3933 "\n"
3904 "\n"
3934 "- foo^N = Nième parent de foo\n"
3905 "- foo^N = Nième parent de foo\n"
3935 " foo^0 = foo\n"
3906 " foo^0 = foo\n"
3936 " foo^1 = premier parent de foo\n"
3907 " foo^1 = premier parent de foo\n"
3937 " foo^2 = second parent de foo\n"
3908 " foo^2 = second parent de foo\n"
3938 " foo^ = foo^1\n"
3909 " foo^ = foo^1\n"
3939 "\n"
3910 "\n"
3940 "- foo~N = Nième premier grand-parent de foo\n"
3911 "- foo~N = Nième premier grand-parent de foo\n"
3941 " foo~0 = foo\n"
3912 " foo~0 = foo\n"
3942 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3913 " foo~1 = foo^1 = foo^ = premier parent de foo\n"
3943 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3914 " foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n"
3944
3915
3945 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3916 # première ligne trop longue -> traduction abrégée (à retraduire quand hg
3946 # sera capable de replier automatiquement la première ligne d'aide)
3917 # sera capable de replier automatiquement la première ligne d'aide)
3947 #, fuzzy
3918 #, fuzzy
3948 msgid ""
3919 msgid ""
3949 "command to send changesets as (a series of) patch emails\n"
3920 "command to send changesets as (a series of) patch emails\n"
3950 "\n"
3921 "\n"
3951 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3922 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3952 "describes the series as a whole.\n"
3923 "describes the series as a whole.\n"
3953 "\n"
3924 "\n"
3954 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3925 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3955 "first line of the changeset description as the subject text. The\n"
3926 "first line of the changeset description as the subject text. The\n"
3956 "message contains two or three body parts:\n"
3927 "message contains two or three body parts:\n"
3957 "\n"
3928 "\n"
3958 "- The changeset description.\n"
3929 "- The changeset description.\n"
3959 "- [Optional] The result of running diffstat on the patch.\n"
3930 "- [Optional] The result of running diffstat on the patch.\n"
3960 "- The patch itself, as generated by \"hg export\".\n"
3931 "- The patch itself, as generated by \"hg export\".\n"
3961 "\n"
3932 "\n"
3962 "Each message refers to the first in the series using the In-Reply-To\n"
3933 "Each message refers to the first in the series using the In-Reply-To\n"
3963 "and References headers, so they will show up as a sequence in threaded\n"
3934 "and References headers, so they will show up as a sequence in threaded\n"
3964 "mail and news readers, and in mail archives.\n"
3935 "mail and news readers, and in mail archives.\n"
3965 "\n"
3936 "\n"
3966 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3937 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3967 "with a diffstat summary and the changeset summary, so you can be sure\n"
3938 "with a diffstat summary and the changeset summary, so you can be sure\n"
3968 "you are sending the right changes.\n"
3939 "you are sending the right changes.\n"
3969 "\n"
3940 "\n"
3970 "To configure other defaults, add a section like this to your hgrc\n"
3941 "To configure other defaults, add a section like this to your hgrc\n"
3971 "file::\n"
3942 "file::\n"
3972 "\n"
3943 "\n"
3973 " [email]\n"
3944 " [email]\n"
3974 " from = My Name <my@email>\n"
3945 " from = My Name <my@email>\n"
3975 " to = recipient1, recipient2, ...\n"
3946 " to = recipient1, recipient2, ...\n"
3976 " cc = cc1, cc2, ...\n"
3947 " cc = cc1, cc2, ...\n"
3977 " bcc = bcc1, bcc2, ...\n"
3948 " bcc = bcc1, bcc2, ...\n"
3978 "\n"
3949 "\n"
3979 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3950 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3980 "as a patchbomb.\n"
3951 "as a patchbomb.\n"
3981 "\n"
3952 "\n"
3982 "To avoid sending patches prematurely, it is a good idea to first run\n"
3953 "To avoid sending patches prematurely, it is a good idea to first run\n"
3983 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3954 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3984 "prompted for an email recipient address, a subject and an introductory\n"
3955 "prompted for an email recipient address, a subject and an introductory\n"
3985 "message describing the patches of your patchbomb. Then when all is\n"
3956 "message describing the patches of your patchbomb. Then when all is\n"
3986 "done, patchbomb messages are displayed. If the PAGER environment\n"
3957 "done, patchbomb messages are displayed. If the PAGER environment\n"
3987 "variable is set, your pager will be fired up once for each patchbomb\n"
3958 "variable is set, your pager will be fired up once for each patchbomb\n"
3988 "message, so you can verify everything is alright.\n"
3959 "message, so you can verify everything is alright.\n"
3989 "\n"
3960 "\n"
3990 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3961 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3991 "patchbomb message in a pager or sending the messages directly, it will\n"
3962 "patchbomb message in a pager or sending the messages directly, it will\n"
3992 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3963 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3993 "can be previewed with any mail user agent which supports UNIX mbox\n"
3964 "can be previewed with any mail user agent which supports UNIX mbox\n"
3994 "files, e.g. with mutt::\n"
3965 "files, e.g. with mutt::\n"
3995 "\n"
3966 "\n"
3996 " % mutt -R -f mbox\n"
3967 " % mutt -R -f mbox\n"
3997 "\n"
3968 "\n"
3998 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3969 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3999 "(a utility that is commonly installed as part of the procmail\n"
3970 "(a utility that is commonly installed as part of the procmail\n"
4000 "package), to send each message out::\n"
3971 "package), to send each message out::\n"
4001 "\n"
3972 "\n"
4002 " % formail -s sendmail -bm -t < mbox\n"
3973 " % formail -s sendmail -bm -t < mbox\n"
4003 "\n"
3974 "\n"
4004 "That should be all. Now your patchbomb is on its way out.\n"
3975 "That should be all. Now your patchbomb is on its way out.\n"
4005 "\n"
3976 "\n"
4006 "You can also either configure the method option in the email section\n"
3977 "You can also either configure the method option in the email section\n"
4007 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3978 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
4008 "that the patchbomb extension can automatically send patchbombs\n"
3979 "that the patchbomb extension can automatically send patchbombs\n"
4009 "directly from the commandline. See the [email] and [smtp] sections in\n"
3980 "directly from the commandline. See the [email] and [smtp] sections in\n"
4010 "hgrc(5) for details.\n"
3981 "hgrc(5) for details.\n"
4011 msgstr ""
3982 msgstr ""
4012 "envoi d'une série de \"changesets\" par courrier électronique\n"
3983 "envoi d'une série de \"changesets\" par courrier électronique\n"
4013 "\n"
3984 "\n"
4014 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
3985 "La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n"
4015 "décrivant dans son ensemble.\n"
3986 "décrivant dans son ensemble.\n"
4016 "\n"
3987 "\n"
4017 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
3988 "Ensuite, pour chaque patch est créé un courriel dont le sujet est\n"
4018 "la première ligne du commentaire du \"changeset\", préfixée par\n"
3989 "la première ligne du commentaire du \"changeset\", préfixée par\n"
4019 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
3990 "\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n"
4020 "parties :\n"
3991 "parties :\n"
4021 "\n"
3992 "\n"
4022 " La description du \"changeset\".\n"
3993 " La description du \"changeset\".\n"
4023 "\n"
3994 "\n"
4024 " Optionnellement, un résumé des modifications généré par le\n"
3995 " Optionnellement, un résumé des modifications généré par le\n"
4025 " programme diffstat.\n"
3996 " programme diffstat.\n"
4026 "\n"
3997 "\n"
4027 " Le patch proprement dit, tel que généré par \"hg export\".\n"
3998 " Le patch proprement dit, tel que généré par \"hg export\".\n"
4028 "\n"
3999 "\n"
4029 "Chaque message fait référence au premier de la série (à l'aide\n"
4000 "Chaque message fait référence au premier de la série (à l'aide\n"
4030 "des en-têtes de message In-Reply-To et References) de manière à\n"
4001 "des en-têtes de message In-Reply-To et References) de manière à\n"
4031 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4002 "apparaître comme un fil de discussion dans les lecteurs de courrier\n"
4032 "électronique et de nouvelles, ainsi que dans les archives de\n"
4003 "électronique et de nouvelles, ainsi que dans les archives de\n"
4033 "messagerie.\n"
4004 "messagerie.\n"
4034 "\n"
4005 "\n"
4035 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4006 "Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n"
4036 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4007 "\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n"
4037 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4008 "modifications (par diffstat) et le commentaire associé ; ceci afin\n"
4038 "d'être certain de bien envoyer les bonnes modifications.\n"
4009 "d'être certain de bien envoyer les bonnes modifications.\n"
4039 "\n"
4010 "\n"
4040 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4011 "Pour configurer les valeurs par défaut d'autres options d'envoi,\n"
4041 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4012 "ajoutez à votre fichier hgrc une section telle ci-dessous :\n"
4042 "\n"
4013 "\n"
4043 " [email]\n"
4014 " [email]\n"
4044 " from = Mon Nom <mon@adresse_de_courriel>\n"
4015 " from = Mon Nom <mon@adresse_de_courriel>\n"
4045 " to = destinataire1, destinataire2, ...\n"
4016 " to = destinataire1, destinataire2, ...\n"
4046 " cc = cc1, cc2, ...\n"
4017 " cc = cc1, cc2, ...\n"
4047 " bcc = bcc1, bcc2, ...\n"
4018 " bcc = bcc1, bcc2, ...\n"
4048 "\n"
4019 "\n"
4049 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4020 "Après cela il vous sera possible d'utiliser la commande \"hg email\"\n"
4050 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4021 "pour envoyer par courrier électronique une série de \"changesets\".\n"
4051 "\n"
4022 "\n"
4052 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4023 "Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n"
4053 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4024 "l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n"
4054 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4025 "sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n"
4055 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4026 "message d'introduction pour la série de patchs. Lorsque tout est\n"
4056 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4027 "prêt, les messages seront affichés. Si la variable d'environnement\n"
4057 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4028 "PAGER a été définie, le programme qu'elle indique sera utilisé pour\n"
4058 "l'affichage chaque message, permettant de vérifier que tout est\n"
4029 "l'affichage chaque message, permettant de vérifier que tout est\n"
4059 "correct.\n"
4030 "correct.\n"
4060 "\n"
4031 "\n"
4061 "L'option -m/--mbox est également très utile : au lieu que les\n"
4032 "L'option -m/--mbox est également très utile : au lieu que les\n"
4062 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4033 "messages soient affichés ou envoyés directement, ils seront écrits\n"
4063 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4034 "dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n"
4064 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4035 "aux lettres peut alors être consultée pour vérification par n'importe\n"
4065 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4036 "quel lecteur de courrier électronique comprenant le format UNIX mbox,\n"
4066 "comme par exemple mutt :\n"
4037 "comme par exemple mutt :\n"
4067 "\n"
4038 "\n"
4068 " % mutt -R -f mbox\n"
4039 " % mutt -R -f mbox\n"
4069 "\n"
4040 "\n"
4070 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4041 "Lors de votre vérification, vous pouvez envoyer chaque message en\n"
4071 "utilisant formail (un outil généralement installé en même temps que\n"
4042 "utilisant formail (un outil généralement installé en même temps que\n"
4072 "procmail) :\n"
4043 "procmail) :\n"
4073 "\n"
4044 "\n"
4074 " % formail -s sendmail -bm -t < mbox\n"
4045 " % formail -s sendmail -bm -t < mbox\n"
4075 "\n"
4046 "\n"
4076 "Et voilà, vos patchs sont en route vers leur destination.\n"
4047 "Et voilà, vos patchs sont en route vers leur destination.\n"
4077 "\n"
4048 "\n"
4078 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4049 "Vous pouvez aussi configurer l'option \"method\" de la section\n"
4079 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4050 "[email] pour utiliser un programme compatible avec sendmail, ou\n"
4080 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4051 "alors remplir la section [smtp] de telle sorte que l'extension\n"
4081 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4052 "patchbomb puisse automatiquement envoyer les messages depuis la\n"
4082 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4053 "ligne de commande. Consulter les sections [email] et [smtp] dans la\n"
4083 "page de manuel hgrc(5) pour plus de détails."
4054 "page de manuel hgrc(5) pour plus de détails."
4084
4055
4085 #, fuzzy, python-format
4056 #, fuzzy, python-format
4086 msgid "%sPlease enter a valid value"
4057 msgid "%sPlease enter a valid value"
4087 msgstr "Veuillez fournir une valeur valide.\n"
4058 msgstr "Veuillez fournir une valeur valide.\n"
4088
4059
4089 msgid "Please enter a valid value.\n"
4060 msgid "Please enter a valid value.\n"
4090 msgstr "Veuillez fournir une valeur valide.\n"
4061 msgstr "Veuillez fournir une valeur valide.\n"
4091
4062
4092 msgid "does the diffstat above look okay? "
4063 msgid "does the diffstat above look okay? "
4093 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
4064 msgstr "le résumé des modifications ci-dessus semble-t-il correct ?"
4094
4065
4095 msgid "diffstat rejected"
4066 msgid "diffstat rejected"
4096 msgstr "résumé des modifications rejeté"
4067 msgstr "résumé des modifications rejeté"
4097
4068
4098 #, fuzzy
4069 #, fuzzy
4099 msgid ""
4070 msgid ""
4100 "send changesets by email\n"
4071 "send changesets by email\n"
4101 "\n"
4072 "\n"
4102 " By default, diffs are sent in the format generated by hg export,\n"
4073 " By default, diffs are sent in the format generated by hg export,\n"
4103 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
4074 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
4104 " introduction, which describes the series as a whole.\n"
4075 " introduction, which describes the series as a whole.\n"
4105 "\n"
4076 "\n"
4106 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
4077 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
4107 " the first line of the changeset description as the subject text.\n"
4078 " the first line of the changeset description as the subject text.\n"
4108 " The message contains two or three parts. First, the changeset\n"
4079 " The message contains two or three parts. First, the changeset\n"
4109 " description. Next, (optionally) if the diffstat program is\n"
4080 " description. Next, (optionally) if the diffstat program is\n"
4110 " installed and -d/--diffstat is used, the result of running\n"
4081 " installed and -d/--diffstat is used, the result of running\n"
4111 " diffstat on the patch. Finally, the patch itself, as generated by\n"
4082 " diffstat on the patch. Finally, the patch itself, as generated by\n"
4112 " \"hg export\".\n"
4083 " \"hg export\".\n"
4113 "\n"
4084 "\n"
4114 " By default the patch is included as text in the email body for\n"
4085 " By default the patch is included as text in the email body for\n"
4115 " easy reviewing. Using the -a/--attach option will instead create\n"
4086 " easy reviewing. Using the -a/--attach option will instead create\n"
4116 " an attachment for the patch. With -i/--inline an inline attachment\n"
4087 " an attachment for the patch. With -i/--inline an inline attachment\n"
4117 " will be created.\n"
4088 " will be created.\n"
4118 "\n"
4089 "\n"
4119 " With -o/--outgoing, emails will be generated for patches not found\n"
4090 " With -o/--outgoing, emails will be generated for patches not found\n"
4120 " in the destination repository (or only those which are ancestors\n"
4091 " in the destination repository (or only those which are ancestors\n"
4121 " of the specified revisions if any are provided)\n"
4092 " of the specified revisions if any are provided)\n"
4122 "\n"
4093 "\n"
4123 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
4094 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
4124 " single email containing a binary Mercurial bundle as an attachment\n"
4095 " single email containing a binary Mercurial bundle as an attachment\n"
4125 " will be sent.\n"
4096 " will be sent.\n"
4126 "\n"
4097 "\n"
4127 " Examples::\n"
4098 " Examples::\n"
4128 "\n"
4099 "\n"
4129 " hg email -r 3000 # send patch 3000 only\n"
4100 " hg email -r 3000 # send patch 3000 only\n"
4130 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
4101 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
4131 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
4102 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
4132 " hg email 3000 # send patch 3000 (deprecated)\n"
4103 " hg email 3000 # send patch 3000 (deprecated)\n"
4133 "\n"
4104 "\n"
4134 " hg email -o # send all patches not in default\n"
4105 " hg email -o # send all patches not in default\n"
4135 " hg email -o DEST # send all patches not in DEST\n"
4106 " hg email -o DEST # send all patches not in DEST\n"
4136 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
4107 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
4137 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
4108 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
4138 "\n"
4109 "\n"
4139 " hg email -b # send bundle of all patches not in default\n"
4110 " hg email -b # send bundle of all patches not in default\n"
4140 " hg email -b DEST # send bundle of all patches not in DEST\n"
4111 " hg email -b DEST # send bundle of all patches not in DEST\n"
4141 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
4112 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
4142 "default\n"
4113 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
4143 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
4144 "DEST\n"
4145 "\n"
4114 "\n"
4146 " Before using this command, you will need to enable email in your\n"
4115 " Before using this command, you will need to enable email in your\n"
4147 " hgrc. See the [email] section in hgrc(5) for details.\n"
4116 " hgrc. See the [email] section in hgrc(5) for details.\n"
4148 " "
4117 " "
4149 msgstr ""
4118 msgstr ""
4150 "envoi de \"changesets\" par courrier électronique\n"
4119 "envoi de \"changesets\" par courrier électronique\n"
4151 "\n"
4120 "\n"
4152 " Par défaut, les modifications sont envoyées au format généré par\n"
4121 " Par défaut, les modifications sont envoyées au format généré par\n"
4153 " \"hg export\", une par message. La série débute par un message\n"
4122 " \"hg export\", une par message. La série débute par un message\n"
4154 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
4123 " la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n"
4155 "\n"
4124 "\n"
4156 " Chaque courriel a pour sujet un résumé des modifications\n"
4125 " Chaque courriel a pour sujet un résumé des modifications\n"
4157 " apportées par le patch (pris en première ligne de la description\n"
4126 " apportées par le patch (pris en première ligne de la description\n"
4158 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
4127 " du \"changeset\"), préfixé par \"[PATCH M of N] \".\n"
4159 " Le message est constitué de deux ou trois parties. D'abord,\n"
4128 " Le message est constitué de deux ou trois parties. D'abord,\n"
4160 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
4129 " le texte décrivant le \"changeset\". Puis, (optionnellement)\n"
4161 " un résumé des modifications généré par le programme diffstat si\n"
4130 " un résumé des modifications généré par le programme diffstat si\n"
4162 " celui-ci est installé et que l'option -d/--diffstat a été\n"
4131 " celui-ci est installé et que l'option -d/--diffstat a été\n"
4163 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
4132 " spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n"
4164 "\n"
4133 "\n"
4165 " Par défaut le patch est inclus textuellement dans le corps du\n"
4134 " Par défaut le patch est inclus textuellement dans le corps du\n"
4166 " message afin de faciliter les relectures et commentaires.\n"
4135 " message afin de faciliter les relectures et commentaires.\n"
4167 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
4136 " Cela peut être changé avec l'option -a/--attach qui crée une\n"
4168 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
4137 " pièce jointe séparée pour le patch, ou avec -i/--inline qui\n"
4169 " insère celle-ci dans le corps.\n"
4138 " insère celle-ci dans le corps.\n"
4170 "\n"
4139 "\n"
4171 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
4140 " Avec -o/--outgoing, des courriels seront générés pour chaque\n"
4172 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
4141 " révision non trouvée dans le dépôt cible (ou seulement pour les\n"
4173 " ancêtres des révisions spécifiées, le cas échéant).\n"
4142 " ancêtres des révisions spécifiées, le cas échéant).\n"
4174 "\n"
4143 "\n"
4175 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
4144 " Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n"
4176 " même manière que pour --outgoing, mais il seront envoyés via\n"
4145 " même manière que pour --outgoing, mais il seront envoyés via\n"
4177 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
4146 " un unique courriel dans un \"bundle\" Mercurial binaire joint.\n"
4178 "\n"
4147 "\n"
4179 " Exemples :\n"
4148 " Exemples :\n"
4180 "\n"
4149 "\n"
4181 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
4150 " hg email -r 3000 # envoyer uniquement le patch 3000\n"
4182 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
4151 " hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n"
4183 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
4152 " hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n"
4184 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
4153 " hg email 3000 # envoyer le patch 3000 (déprécié)\n"
4185 "\n"
4154 "\n"
4186 " hg email -o # envoyer les patchs absents de la\n"
4155 " hg email -o # envoyer les patchs absents de la\n"
4187 " destination par défaut\n"
4156 " destination par défaut\n"
4188 " hg email -o DEST # envoyer les patchs absents de DEST\n"
4157 " hg email -o DEST # envoyer les patchs absents de DEST\n"
4189 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
4158 " hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n"
4190 " de la destination par défaut\n"
4159 " de la destination par défaut\n"
4191 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
4160 " hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n"
4192 " de DEST\n"
4161 " de DEST\n"
4193 "\n"
4162 "\n"
4194 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
4163 " Afin de pouvoir utiliser cette commande, il est nécessaire\n"
4195 " d'activer préalablement l'envoi de courriel dans le fichier\n"
4164 " d'activer préalablement l'envoi de courriel dans le fichier\n"
4196 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
4165 " de configuration (hgrc). Consulter hgrc(5) à la section\n"
4197 " [email] pour plus de détails.\n"
4166 " [email] pour plus de détails.\n"
4198 " "
4167 " "
4199
4168
4200 msgid "specify at least one changeset with -r or -o"
4169 msgid "specify at least one changeset with -r or -o"
4201 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
4170 msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o"
4202
4171
4203 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
4172 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
4204 msgstr ""
4173 msgstr "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --bundle est utilisé"
4205 "ne pas spécifier --outgoing, qui est systématiquement activé lorsque --"
4206 "bundle est utilisé"
4207
4174
4208 msgid "too many destinations"
4175 msgid "too many destinations"
4209 msgstr "trop de destinations"
4176 msgstr "trop de destinations"
4210
4177
4211 msgid "use only one form to specify the revision"
4178 msgid "use only one form to specify the revision"
4212 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
4179 msgstr "veuillez ne spécifier les révisions que d'une seule manière"
4213
4180
4214 msgid ""
4181 msgid ""
4215 "\n"
4182 "\n"
4216 "Write the introductory message for the patch series.\n"
4183 "Write the introductory message for the patch series.\n"
4217 "\n"
4184 "\n"
4218 msgstr ""
4185 msgstr ""
4219 "\n"
4186 "\n"
4220 "Veuillez écrire le message d'introduction de la série de patchs.\n"
4187 "Veuillez écrire le message d'introduction de la série de patchs.\n"
4221 "\n"
4188 "\n"
4222
4189
4223 #, python-format
4190 #, python-format
4224 msgid ""
4191 msgid ""
4225 "This patch series consists of %d patches.\n"
4192 "This patch series consists of %d patches.\n"
4226 "\n"
4193 "\n"
4227 msgstr ""
4194 msgstr ""
4228 "Cette série comporte %d patchs.\n"
4195 "Cette série comporte %d patchs.\n"
4229 "\n"
4196 "\n"
4230
4197
4231 # diffstat sur l'ensemble des patchs
4198 # diffstat sur l'ensemble des patchs
4232 msgid "Final summary:\n"
4199 msgid "Final summary:\n"
4233 msgstr "Résumé complet des modifications :\n"
4200 msgstr "Résumé complet des modifications :\n"
4234
4201
4235 # mode --test
4202 # mode --test
4236 msgid "Displaying "
4203 msgid "Displaying "
4237 msgstr "Affichage de "
4204 msgstr "Affichage de "
4238
4205
4239 # mode --mbox
4206 # mode --mbox
4240 msgid "Writing "
4207 msgid "Writing "
4241 msgstr "Écriture de "
4208 msgstr "Écriture de "
4242
4209
4243 # mode d'envoi par défaut
4210 # mode d'envoi par défaut
4244 msgid "Sending "
4211 msgid "Sending "
4245 msgstr "Envoi de "
4212 msgstr "Envoi de "
4246
4213
4247 msgid "send patches as attachments"
4214 msgid "send patches as attachments"
4248 msgstr "envoyer les patchs en tant que pièces jointes"
4215 msgstr "envoyer les patchs en tant que pièces jointes"
4249
4216
4250 msgid "send patches as inline attachments"
4217 msgid "send patches as inline attachments"
4251 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
4218 msgstr "envoyer les patchs comme pièces insérées dans le corps du message"
4252
4219
4253 msgid "email addresses of blind carbon copy recipients"
4220 msgid "email addresses of blind carbon copy recipients"
4254 msgstr "adresses électroniques des destinataires en copie carbone invisible"
4221 msgstr "adresses électroniques des destinataires en copie carbone invisible"
4255
4222
4256 msgid "email addresses of copy recipients"
4223 msgid "email addresses of copy recipients"
4257 msgstr "adresses électroniques des destinataires en copie carbone"
4224 msgstr "adresses électroniques des destinataires en copie carbone"
4258
4225
4259 msgid "add diffstat output to messages"
4226 msgid "add diffstat output to messages"
4260 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
4227 msgstr "ajouter un résumé des modifications avec diffstat dans les messages"
4261
4228
4262 msgid "use the given date as the sending date"
4229 msgid "use the given date as the sending date"
4263 msgstr "utiliser la date fournie comme date d'envoi"
4230 msgstr "utiliser la date fournie comme date d'envoi"
4264
4231
4265 msgid "use the given file as the series description"
4232 msgid "use the given file as the series description"
4266 msgstr "lire le message d'introduction à la série dans le fichier fourni"
4233 msgstr "lire le message d'introduction à la série dans le fichier fourni"
4267
4234
4268 msgid "email address of sender"
4235 msgid "email address of sender"
4269 msgstr "adresse électronique de l'expéditeur"
4236 msgstr "adresse électronique de l'expéditeur"
4270
4237
4271 msgid "print messages that would be sent"
4238 msgid "print messages that would be sent"
4272 msgstr "afficher les messages tels qu'ils seraient envoyés"
4239 msgstr "afficher les messages tels qu'ils seraient envoyés"
4273
4240
4274 msgid "write messages to mbox file instead of sending them"
4241 msgid "write messages to mbox file instead of sending them"
4275 msgstr ""
4242 msgstr "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
4276 "écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer"
4277
4243
4278 msgid "subject of first message (intro or single patch)"
4244 msgid "subject of first message (intro or single patch)"
4279 msgstr "sujet du premier message (intro ou patch unique)"
4245 msgstr "sujet du premier message (intro ou patch unique)"
4280
4246
4281 msgid "message identifier to reply to"
4247 msgid "message identifier to reply to"
4282 msgstr "identifiant du message auquel répondre"
4248 msgstr "identifiant du message auquel répondre"
4283
4249
4284 msgid "flags to add in subject prefixes"
4250 msgid "flags to add in subject prefixes"
4285 msgstr ""
4251 msgstr ""
4286
4252
4287 msgid "email addresses of recipients"
4253 msgid "email addresses of recipients"
4288 msgstr "adresses électroniques des destinataires"
4254 msgstr "adresses électroniques des destinataires"
4289
4255
4290 msgid "omit hg patch header"
4256 msgid "omit hg patch header"
4291 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
4257 msgstr "omettre l'en-tête de patch spécifique à Mercurial"
4292
4258
4293 msgid "send changes not found in the target repository"
4259 msgid "send changes not found in the target repository"
4294 msgstr "envoyer les modifications non présentes dans le dépôt cible"
4260 msgstr "envoyer les modifications non présentes dans le dépôt cible"
4295
4261
4296 msgid "send changes not in target as a binary bundle"
4262 msgid "send changes not in target as a binary bundle"
4297 msgstr ""
4263 msgstr "envoyer les modifications non présentes dans le dépôt cible sous forme de \"bundle\" binaire"
4298 "envoyer les modifications non présentes dans le dépôt cible sous forme de "
4299 "\"bundle\" binaire"
4300
4264
4301 msgid "name of the bundle attachment file"
4265 msgid "name of the bundle attachment file"
4302 msgstr "nom à donner au fichier \"bundle\" envoyé"
4266 msgstr "nom à donner au fichier \"bundle\" envoyé"
4303
4267
4304 msgid "a revision to send"
4268 msgid "a revision to send"
4305 msgstr "une révision à envoyer"
4269 msgstr "une révision à envoyer"
4306
4270
4307 msgid "run even when remote repository is unrelated (with -b/--bundle)"
4271 msgid "run even when remote repository is unrelated (with -b/--bundle)"
4308 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
4272 msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)"
4309
4273
4310 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
4274 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
4311 msgstr ""
4275 msgstr "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination (avec -b/--bundle)"
4312 "un \"changeset\" à utiliser comme point de départ, au lieu d'une destination "
4313 "(avec -b/--bundle)"
4314
4276
4315 msgid "send an introduction email for a single patch"
4277 msgid "send an introduction email for a single patch"
4316 msgstr "envoyer un courriel d'introduction pour un patch seul"
4278 msgstr "envoyer un courriel d'introduction pour un patch seul"
4317
4279
4318 msgid "hg email [OPTION]... [DEST]..."
4280 msgid "hg email [OPTION]... [DEST]..."
4319 msgstr "hg email [OPTION]... [DEST]..."
4281 msgstr "hg email [OPTION]... [DEST]..."
4320
4282
4321 msgid "command to delete untracked files from the working directory"
4283 msgid "command to delete untracked files from the working directory"
4322 msgstr ""
4284 msgstr ""
4323
4285
4324 #, fuzzy
4286 #, fuzzy
4325 msgid ""
4287 msgid ""
4326 "removes files not tracked by Mercurial\n"
4288 "removes files not tracked by Mercurial\n"
4327 "\n"
4289 "\n"
4328 " Delete files not known to Mercurial. This is useful to test local\n"
4290 " Delete files not known to Mercurial. This is useful to test local\n"
4329 " and uncommitted changes in an otherwise-clean source tree.\n"
4291 " and uncommitted changes in an otherwise-clean source tree.\n"
4330 "\n"
4292 "\n"
4331 " This means that purge will delete:\n"
4293 " This means that purge will delete:\n"
4332 "\n"
4294 "\n"
4333 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
4295 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
4334 " - Empty directories: in fact Mercurial ignores directories unless\n"
4296 " - Empty directories: in fact Mercurial ignores directories unless\n"
4335 " they contain files under source control management\n"
4297 " they contain files under source control management\n"
4336 "\n"
4298 "\n"
4337 " But it will leave untouched:\n"
4299 " But it will leave untouched:\n"
4338 "\n"
4300 "\n"
4339 " - Modified and unmodified tracked files\n"
4301 " - Modified and unmodified tracked files\n"
4340 " - Ignored files (unless --all is specified)\n"
4302 " - Ignored files (unless --all is specified)\n"
4341 " - New files added to the repository (with \"hg add\")\n"
4303 " - New files added to the repository (with \"hg add\")\n"
4342 "\n"
4304 "\n"
4343 " If directories are given on the command line, only files in these\n"
4305 " If directories are given on the command line, only files in these\n"
4344 " directories are considered.\n"
4306 " directories are considered.\n"
4345 "\n"
4307 "\n"
4346 " Be careful with purge, as you could irreversibly delete some files\n"
4308 " Be careful with purge, as you could irreversibly delete some files\n"
4347 " you forgot to add to the repository. If you only want to print the\n"
4309 " you forgot to add to the repository. If you only want to print the\n"
4348 " list of files that this program would delete, use the --print\n"
4310 " list of files that this program would delete, use the --print\n"
4349 " option.\n"
4311 " option.\n"
4350 " "
4312 " "
4351 msgstr ""
4313 msgstr ""
4352 "retire les fichiers non suivis par Mercurial\n"
4314 "retire les fichiers non suivis par Mercurial\n"
4353 "\n"
4315 "\n"
4354 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
4316 " Supprime les fichiers non connus de Mercurial, ce qui peut être\n"
4355 " utile pour tester des changements locaux non enregistrés à\n"
4317 " utile pour tester des changements locaux non enregistrés à\n"
4356 " l'intérieur d'une arborescence de sources propre.\n"
4318 " l'intérieur d'une arborescence de sources propre.\n"
4357 "\n"
4319 "\n"
4358 " Ainsi, purge effacera :\n"
4320 " Ainsi, purge effacera :\n"
4359 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
4321 " - les fichiers inconnus : fichiers que \"hg status\" indique\n"
4360 " par un point d'interrogation\n"
4322 " par un point d'interrogation\n"
4361 " - les répertoires vides : en fait Mercurial ignore complètement\n"
4323 " - les répertoires vides : en fait Mercurial ignore complètement\n"
4362 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
4324 " les répertoires, à moins qu'ils ne contiennent des fichiers\n"
4363 " sous son contrôle\n"
4325 " sous son contrôle\n"
4364 " Seront par contre laissés intacts :\n"
4326 " Seront par contre laissés intacts :\n"
4365 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
4327 " - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n"
4366 " ou non\n"
4328 " ou non\n"
4367 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
4329 " - Les fichiers ignorés (sauf si --all est utilisé)\n"
4368 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
4330 " - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n"
4369 "\n"
4331 "\n"
4370 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
4332 " Si des répertoires sont spécifiés sur la ligne de commande,\n"
4371 " seuls les fichiers qu'ils contiennent seront considérés.\n"
4333 " seuls les fichiers qu'ils contiennent seront considérés.\n"
4372 "\n"
4334 "\n"
4373 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
4335 " Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n"
4374 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
4336 " des fichiers au dépôt, ils seront perdus irrémédiablement.\n"
4375 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
4337 " Si vous souhaitez seulement afficher la liste des fichiers qui\n"
4376 " seraient effacés par purge, utilisez l'option --print.\n"
4338 " seraient effacés par purge, utilisez l'option --print.\n"
4377 " "
4339 " "
4378
4340
4379 #, python-format
4341 #, python-format
4380 msgid "%s cannot be removed"
4342 msgid "%s cannot be removed"
4381 msgstr "%s ne peut être supprimé"
4343 msgstr "%s ne peut être supprimé"
4382
4344
4383 #, python-format
4345 #, python-format
4384 msgid "warning: %s\n"
4346 msgid "warning: %s\n"
4385 msgstr "attention: %s\n"
4347 msgstr "attention: %s\n"
4386
4348
4387 #, python-format
4349 #, python-format
4388 msgid "Removing file %s\n"
4350 msgid "Removing file %s\n"
4389 msgstr "Suppression du fichier %s\n"
4351 msgstr "Suppression du fichier %s\n"
4390
4352
4391 #, python-format
4353 #, python-format
4392 msgid "Removing directory %s\n"
4354 msgid "Removing directory %s\n"
4393 msgstr "Suppression du répertoire %s\n"
4355 msgstr "Suppression du répertoire %s\n"
4394
4356
4395 msgid "abort if an error occurs"
4357 msgid "abort if an error occurs"
4396 msgstr "abandonner en cas d'erreur"
4358 msgstr "abandonner en cas d'erreur"
4397
4359
4398 msgid "purge ignored files too"
4360 msgid "purge ignored files too"
4399 msgstr "supprimer également les fichiers ignorés"
4361 msgstr "supprimer également les fichiers ignorés"
4400
4362
4401 msgid "print filenames instead of deleting them"
4363 msgid "print filenames instead of deleting them"
4402 msgstr "afficher les nom des fichiers au lieu de les supprimer"
4364 msgstr "afficher les nom des fichiers au lieu de les supprimer"
4403
4365
4404 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
4366 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
4405 msgstr ""
4367 msgstr "terminer les noms de fichiers par un caractère nul, pour utilisation avec xargs (implique -p/--print)"
4406 "terminer les noms de fichiers par un caractère nul, pour utilisation avec "
4407 "xargs (implique -p/--print)"
4408
4368
4409 msgid "hg purge [OPTION]... [DIR]..."
4369 msgid "hg purge [OPTION]... [DIR]..."
4410 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
4370 msgstr "hg purge [OPTION]... [RÉPERTOIRE]..."
4411
4371
4412 msgid ""
4372 msgid ""
4413 "command to move sets of revisions to a different ancestor\n"
4373 "command to move sets of revisions to a different ancestor\n"
4414 "\n"
4374 "\n"
4415 "This extension lets you rebase changesets in an existing Mercurial\n"
4375 "This extension lets you rebase changesets in an existing Mercurial\n"
4416 "repository.\n"
4376 "repository.\n"
4417 "\n"
4377 "\n"
4418 "For more information:\n"
4378 "For more information:\n"
4419 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
4379 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
4420 msgstr ""
4380 msgstr ""
4421
4381
4422 msgid ""
4382 msgid ""
4423 "move changeset (and descendants) to a different branch\n"
4383 "move changeset (and descendants) to a different branch\n"
4424 "\n"
4384 "\n"
4425 " Rebase uses repeated merging to graft changesets from one part of\n"
4385 " Rebase uses repeated merging to graft changesets from one part of\n"
4426 " history onto another. This can be useful for linearizing local\n"
4386 " history onto another. This can be useful for linearizing local\n"
4427 " changes relative to a master development tree.\n"
4387 " changes relative to a master development tree.\n"
4428 "\n"
4388 "\n"
4429 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4389 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4430 " continued with --continue/-c or aborted with --abort/-a.\n"
4390 " continued with --continue/-c or aborted with --abort/-a.\n"
4431 " "
4391 " "
4432 msgstr ""
4392 msgstr ""
4433
4393
4434 msgid "cannot use both abort and continue"
4394 msgid "cannot use both abort and continue"
4435 msgstr ""
4395 msgstr ""
4436
4396
4437 msgid "cannot use collapse with continue or abort"
4397 msgid "cannot use collapse with continue or abort"
4438 msgstr ""
4398 msgstr ""
4439
4399
4440 msgid "abort and continue do not allow specifying revisions"
4400 msgid "abort and continue do not allow specifying revisions"
4441 msgstr ""
4401 msgstr ""
4442
4402
4443 msgid "cannot specify both a revision and a base"
4403 msgid "cannot specify both a revision and a base"
4444 msgstr ""
4404 msgstr ""
4445
4405
4446 msgid "nothing to rebase\n"
4406 msgid "nothing to rebase\n"
4447 msgstr ""
4407 msgstr ""
4448
4408
4449 msgid "cannot use both keepbranches and extrafn"
4409 msgid "cannot use both keepbranches and extrafn"
4450 msgstr ""
4410 msgstr ""
4451
4411
4452 msgid "rebase merging completed\n"
4412 msgid "rebase merging completed\n"
4453 msgstr ""
4413 msgstr ""
4454
4414
4455 msgid "warning: new changesets detected on source branch, not stripping\n"
4415 msgid "warning: new changesets detected on source branch, not stripping\n"
4456 msgstr ""
4416 msgstr ""
4457
4417
4458 msgid "rebase completed\n"
4418 msgid "rebase completed\n"
4459 msgstr ""
4419 msgstr ""
4460
4420
4461 #, python-format
4421 #, python-format
4462 msgid "%d revisions have been skipped\n"
4422 msgid "%d revisions have been skipped\n"
4463 msgstr ""
4423 msgstr ""
4464
4424
4465 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4425 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4466 msgstr ""
4426 msgstr ""
4467
4427
4468 #, python-format
4428 #, python-format
4469 msgid "no changes, revision %d skipped\n"
4429 msgid "no changes, revision %d skipped\n"
4470 msgstr ""
4430 msgstr ""
4471
4431
4472 #, python-format
4432 #, python-format
4473 msgid "cannot use revision %d as base, result would have 3 parents"
4433 msgid "cannot use revision %d as base, result would have 3 parents"
4474 msgstr ""
4434 msgstr ""
4475
4435
4476 msgid "no rebase in progress"
4436 msgid "no rebase in progress"
4477 msgstr ""
4437 msgstr ""
4478
4438
4479 msgid "warning: new changesets detected on target branch, not stripping\n"
4439 msgid "warning: new changesets detected on target branch, not stripping\n"
4480 msgstr ""
4440 msgstr ""
4481
4441
4482 msgid "rebase aborted\n"
4442 msgid "rebase aborted\n"
4483 msgstr ""
4443 msgstr ""
4484
4444
4485 msgid "cannot rebase onto an applied mq patch"
4445 msgid "cannot rebase onto an applied mq patch"
4486 msgstr ""
4446 msgstr ""
4487
4447
4488 #, fuzzy
4448 #, fuzzy
4489 msgid "source is ancestor of destination"
4449 msgid "source is ancestor of destination"
4490 msgstr "le répertoire racine ne peut servir de destination"
4450 msgstr "le répertoire racine ne peut servir de destination"
4491
4451
4492 #, fuzzy
4452 #, fuzzy
4493 msgid "source is descendant of destination"
4453 msgid "source is descendant of destination"
4494 msgstr "le répertoire racine ne peut servir de destination"
4454 msgstr "le répertoire racine ne peut servir de destination"
4495
4455
4496 msgid "unable to collapse, there is more than one external parent"
4456 msgid "unable to collapse, there is more than one external parent"
4497 msgstr ""
4457 msgstr ""
4498
4458
4499 msgid "rebase working directory to branch head"
4459 msgid "rebase working directory to branch head"
4500 msgstr ""
4460 msgstr ""
4501
4461
4502 msgid "rebase from a given revision"
4462 msgid "rebase from a given revision"
4503 msgstr ""
4463 msgstr ""
4504
4464
4505 msgid "rebase from the base of a given revision"
4465 msgid "rebase from the base of a given revision"
4506 msgstr ""
4466 msgstr ""
4507
4467
4508 msgid "rebase onto a given revision"
4468 msgid "rebase onto a given revision"
4509 msgstr ""
4469 msgstr ""
4510
4470
4511 msgid "collapse the rebased changesets"
4471 msgid "collapse the rebased changesets"
4512 msgstr ""
4472 msgstr ""
4513
4473
4514 #, fuzzy
4474 #, fuzzy
4515 msgid "keep original changesets"
4475 msgid "keep original changesets"
4516 msgstr "ne pas considérer la révision"
4476 msgstr "ne pas considérer la révision"
4517
4477
4518 msgid "keep original branch names"
4478 msgid "keep original branch names"
4519 msgstr ""
4479 msgstr ""
4520
4480
4521 msgid "continue an interrupted rebase"
4481 msgid "continue an interrupted rebase"
4522 msgstr ""
4482 msgstr ""
4523
4483
4524 msgid "abort an interrupted rebase"
4484 msgid "abort an interrupted rebase"
4525 msgstr ""
4485 msgstr ""
4526
4486
4527 msgid ""
4487 msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
4528 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4529 "| [-c] | [-a]"
4530 msgstr ""
4488 msgstr ""
4531
4489
4532 msgid "commands to interactively select changes for commit/qrefresh"
4490 msgid "commands to interactively select changes for commit/qrefresh"
4533 msgstr ""
4491 msgstr ""
4534
4492
4535 msgid "this modifies a binary file (all or nothing)\n"
4493 msgid "this modifies a binary file (all or nothing)\n"
4536 msgstr ""
4494 msgstr ""
4537
4495
4538 msgid "this is a binary file\n"
4496 msgid "this is a binary file\n"
4539 msgstr ""
4497 msgstr ""
4540
4498
4541 #, python-format
4499 #, python-format
4542 msgid "%d hunks, %d lines changed\n"
4500 msgid "%d hunks, %d lines changed\n"
4543 msgstr ""
4501 msgstr ""
4544
4502
4545 msgid "[Ynsfdaq?]"
4503 msgid "[Ynsfdaq?]"
4546 msgstr ""
4504 msgstr ""
4547
4505
4548 msgid "&Yes, record this change"
4506 msgid "&Yes, record this change"
4549 msgstr ""
4507 msgstr ""
4550
4508
4551 msgid "&No, skip this change"
4509 msgid "&No, skip this change"
4552 msgstr ""
4510 msgstr ""
4553
4511
4554 msgid "&Skip remaining changes to this file"
4512 msgid "&Skip remaining changes to this file"
4555 msgstr ""
4513 msgstr ""
4556
4514
4557 msgid "Record remaining changes to this &file"
4515 msgid "Record remaining changes to this &file"
4558 msgstr ""
4516 msgstr ""
4559
4517
4560 msgid "&Done, skip remaining changes and files"
4518 msgid "&Done, skip remaining changes and files"
4561 msgstr ""
4519 msgstr ""
4562
4520
4563 msgid "Record &all changes to all remaining files"
4521 msgid "Record &all changes to all remaining files"
4564 msgstr ""
4522 msgstr ""
4565
4523
4566 msgid "&Quit, recording no changes"
4524 msgid "&Quit, recording no changes"
4567 msgstr ""
4525 msgstr ""
4568
4526
4569 msgid "&?"
4527 msgid "&?"
4570 msgstr ""
4528 msgstr ""
4571
4529
4572 msgid "y - record this change"
4530 msgid "y - record this change"
4573 msgstr ""
4531 msgstr ""
4574
4532
4575 msgid "user quit"
4533 msgid "user quit"
4576 msgstr ""
4534 msgstr ""
4577
4535
4578 #, python-format
4536 #, python-format
4579 msgid "examine changes to %s?"
4537 msgid "examine changes to %s?"
4580 msgstr ""
4538 msgstr ""
4581
4539
4582 msgid " and "
4540 msgid " and "
4583 msgstr ""
4541 msgstr ""
4584
4542
4585 msgid "y"
4543 msgid "y"
4586 msgstr ""
4544 msgstr ""
4587
4545
4588 #, python-format
4546 #, python-format
4589 msgid "record this change to %r?"
4547 msgid "record this change to %r?"
4590 msgstr ""
4548 msgstr ""
4591
4549
4592 #, python-format
4550 #, python-format
4593 msgid "record change %d/%d to %r?"
4551 msgid "record change %d/%d to %r?"
4594 msgstr ""
4552 msgstr ""
4595
4553
4596 msgid ""
4554 msgid ""
4597 "interactively select changes to commit\n"
4555 "interactively select changes to commit\n"
4598 "\n"
4556 "\n"
4599 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4557 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4600 " will be candidates for recording.\n"
4558 " will be candidates for recording.\n"
4601 "\n"
4559 "\n"
4602 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4560 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4603 "\n"
4561 "\n"
4604 " You will be prompted for whether to record changes to each\n"
4562 " You will be prompted for whether to record changes to each\n"
4605 " modified file, and for files with multiple changes, for each\n"
4563 " modified file, and for files with multiple changes, for each\n"
4606 " change to use. For each query, the following responses are\n"
4564 " change to use. For each query, the following responses are\n"
4607 " possible::\n"
4565 " possible::\n"
4608 "\n"
4566 "\n"
4609 " y - record this change\n"
4567 " y - record this change\n"
4610 " n - skip this change\n"
4568 " n - skip this change\n"
4611 "\n"
4569 "\n"
4612 " s - skip remaining changes to this file\n"
4570 " s - skip remaining changes to this file\n"
4613 " f - record remaining changes to this file\n"
4571 " f - record remaining changes to this file\n"
4614 "\n"
4572 "\n"
4615 " d - done, skip remaining changes and files\n"
4573 " d - done, skip remaining changes and files\n"
4616 " a - record all changes to all remaining files\n"
4574 " a - record all changes to all remaining files\n"
4617 " q - quit, recording no changes\n"
4575 " q - quit, recording no changes\n"
4618 "\n"
4576 "\n"
4619 " ? - display help"
4577 " ? - display help"
4620 msgstr ""
4578 msgstr ""
4621
4579
4622 msgid "'mq' extension not loaded"
4580 msgid "'mq' extension not loaded"
4623 msgstr ""
4581 msgstr ""
4624
4582
4625 msgid "running non-interactively, use commit instead"
4583 msgid "running non-interactively, use commit instead"
4626 msgstr ""
4584 msgstr ""
4627
4585
4628 msgid "no changes to record\n"
4586 msgid "no changes to record\n"
4629 msgstr ""
4587 msgstr ""
4630
4588
4631 msgid "patch failed to apply"
4589 msgid "patch failed to apply"
4632 msgstr ""
4590 msgstr ""
4633
4591
4634 msgid "hg record [OPTION]... [FILE]..."
4592 msgid "hg record [OPTION]... [FILE]..."
4635 msgstr ""
4593 msgstr ""
4636
4594
4637 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4595 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4638 msgstr ""
4596 msgstr ""
4639
4597
4640 msgid "share a common history between several working directories"
4598 msgid "share a common history between several working directories"
4641 msgstr ""
4599 msgstr ""
4642
4600
4643 msgid ""
4601 msgid ""
4644 "create a new shared repository (experimental)\n"
4602 "create a new shared repository (experimental)\n"
4645 "\n"
4603 "\n"
4646 " Initialize a new repository and working directory that shares its\n"
4604 " Initialize a new repository and working directory that shares its\n"
4647 " history with another repository.\n"
4605 " history with another repository.\n"
4648 "\n"
4606 "\n"
4649 " NOTE: actions that change history such as rollback or moving the\n"
4607 " NOTE: actions that change history such as rollback or moving the\n"
4650 " source may confuse sharers.\n"
4608 " source may confuse sharers.\n"
4651 " "
4609 " "
4652 msgstr ""
4610 msgstr ""
4653
4611
4654 msgid "do not create a working copy"
4612 msgid "do not create a working copy"
4655 msgstr ""
4613 msgstr ""
4656
4614
4657 msgid "[-U] SOURCE [DEST]"
4615 msgid "[-U] SOURCE [DEST]"
4658 msgstr ""
4616 msgstr ""
4659
4617
4660 msgid ""
4618 msgid ""
4661 "command to transplant changesets from another branch\n"
4619 "command to transplant changesets from another branch\n"
4662 "\n"
4620 "\n"
4663 "This extension allows you to transplant patches from another branch.\n"
4621 "This extension allows you to transplant patches from another branch.\n"
4664 "\n"
4622 "\n"
4665 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4623 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4666 "map from a changeset hash to its hash in the source repository.\n"
4624 "map from a changeset hash to its hash in the source repository.\n"
4667 msgstr ""
4625 msgstr ""
4668
4626
4669 #, python-format
4627 #, python-format
4670 msgid "skipping already applied revision %s\n"
4628 msgid "skipping already applied revision %s\n"
4671 msgstr ""
4629 msgstr ""
4672
4630
4673 #, python-format
4631 #, python-format
4674 msgid "skipping merge changeset %s:%s\n"
4632 msgid "skipping merge changeset %s:%s\n"
4675 msgstr ""
4633 msgstr ""
4676
4634
4677 #, python-format
4635 #, python-format
4678 msgid "%s merged at %s\n"
4636 msgid "%s merged at %s\n"
4679 msgstr ""
4637 msgstr ""
4680
4638
4681 #, python-format
4639 #, python-format
4682 msgid "%s transplanted to %s\n"
4640 msgid "%s transplanted to %s\n"
4683 msgstr ""
4641 msgstr ""
4684
4642
4685 #, python-format
4643 #, python-format
4686 msgid "filtering %s\n"
4644 msgid "filtering %s\n"
4687 msgstr ""
4645 msgstr ""
4688
4646
4689 msgid "filter failed"
4647 msgid "filter failed"
4690 msgstr ""
4648 msgstr ""
4691
4649
4692 msgid "can only omit patchfile if merging"
4650 msgid "can only omit patchfile if merging"
4693 msgstr ""
4651 msgstr ""
4694
4652
4695 #, python-format
4653 #, python-format
4696 msgid "%s: empty changeset"
4654 msgid "%s: empty changeset"
4697 msgstr ""
4655 msgstr ""
4698
4656
4699 msgid "Fix up the merge and run hg transplant --continue"
4657 msgid "Fix up the merge and run hg transplant --continue"
4700 msgstr ""
4658 msgstr ""
4701
4659
4702 #, python-format
4660 #, python-format
4703 msgid "%s transplanted as %s\n"
4661 msgid "%s transplanted as %s\n"
4704 msgstr ""
4662 msgstr ""
4705
4663
4706 msgid "transplant log file is corrupt"
4664 msgid "transplant log file is corrupt"
4707 msgstr ""
4665 msgstr ""
4708
4666
4709 #, python-format
4667 #, python-format
4710 msgid "working dir not at transplant parent %s"
4668 msgid "working dir not at transplant parent %s"
4711 msgstr ""
4669 msgstr ""
4712
4670
4713 msgid "commit failed"
4671 msgid "commit failed"
4714 msgstr ""
4672 msgstr ""
4715
4673
4716 msgid "apply changeset? [ynmpcq?]:"
4674 msgid "apply changeset? [ynmpcq?]:"
4717 msgstr ""
4675 msgstr ""
4718
4676
4719 msgid ""
4677 msgid ""
4720 "transplant changesets from another branch\n"
4678 "transplant changesets from another branch\n"
4721 "\n"
4679 "\n"
4722 " Selected changesets will be applied on top of the current working\n"
4680 " Selected changesets will be applied on top of the current working\n"
4723 " directory with the log of the original changeset. If --log is\n"
4681 " directory with the log of the original changeset. If --log is\n"
4724 " specified, log messages will have a comment appended of the form::\n"
4682 " specified, log messages will have a comment appended of the form::\n"
4725 "\n"
4683 "\n"
4726 " (transplanted from CHANGESETHASH)\n"
4684 " (transplanted from CHANGESETHASH)\n"
4727 "\n"
4685 "\n"
4728 " You can rewrite the changelog message with the --filter option.\n"
4686 " You can rewrite the changelog message with the --filter option.\n"
4729 " Its argument will be invoked with the current changelog message as\n"
4687 " Its argument will be invoked with the current changelog message as\n"
4730 " $1 and the patch as $2.\n"
4688 " $1 and the patch as $2.\n"
4731 "\n"
4689 "\n"
4732 " If --source/-s is specified, selects changesets from the named\n"
4690 " If --source/-s is specified, selects changesets from the named\n"
4733 " repository. If --branch/-b is specified, selects changesets from\n"
4691 " repository. If --branch/-b is specified, selects changesets from\n"
4734 " the branch holding the named revision, up to that revision. If\n"
4692 " the branch holding the named revision, up to that revision. If\n"
4735 " --all/-a is specified, all changesets on the branch will be\n"
4693 " --all/-a is specified, all changesets on the branch will be\n"
4736 " transplanted, otherwise you will be prompted to select the\n"
4694 " transplanted, otherwise you will be prompted to select the\n"
4737 " changesets you want.\n"
4695 " changesets you want.\n"
4738 "\n"
4696 "\n"
4739 " hg transplant --branch REVISION --all will rebase the selected\n"
4697 " hg transplant --branch REVISION --all will rebase the selected\n"
4740 " branch (up to the named revision) onto your current working\n"
4698 " branch (up to the named revision) onto your current working\n"
4741 " directory.\n"
4699 " directory.\n"
4742 "\n"
4700 "\n"
4743 " You can optionally mark selected transplanted changesets as merge\n"
4701 " You can optionally mark selected transplanted changesets as merge\n"
4744 " changesets. You will not be prompted to transplant any ancestors\n"
4702 " changesets. You will not be prompted to transplant any ancestors\n"
4745 " of a merged transplant, and you can merge descendants of them\n"
4703 " of a merged transplant, and you can merge descendants of them\n"
4746 " normally instead of transplanting them.\n"
4704 " normally instead of transplanting them.\n"
4747 "\n"
4705 "\n"
4748 " If no merges or revisions are provided, hg transplant will start\n"
4706 " If no merges or revisions are provided, hg transplant will start\n"
4749 " an interactive changeset browser.\n"
4707 " an interactive changeset browser.\n"
4750 "\n"
4708 "\n"
4751 " If a changeset application fails, you can fix the merge by hand\n"
4709 " If a changeset application fails, you can fix the merge by hand\n"
4752 " and then resume where you left off by calling hg transplant\n"
4710 " and then resume where you left off by calling hg transplant\n"
4753 " --continue/-c.\n"
4711 " --continue/-c.\n"
4754 " "
4712 " "
4755 msgstr ""
4713 msgstr ""
4756
4714
4757 msgid "--continue is incompatible with branch, all or merge"
4715 msgid "--continue is incompatible with branch, all or merge"
4758 msgstr ""
4716 msgstr ""
4759
4717
4760 msgid "no source URL, branch tag or revision list provided"
4718 msgid "no source URL, branch tag or revision list provided"
4761 msgstr ""
4719 msgstr ""
4762
4720
4763 msgid "--all requires a branch revision"
4721 msgid "--all requires a branch revision"
4764 msgstr ""
4722 msgstr ""
4765
4723
4766 msgid "--all is incompatible with a revision list"
4724 msgid "--all is incompatible with a revision list"
4767 msgstr ""
4725 msgstr ""
4768
4726
4769 msgid "no revision checked out"
4727 msgid "no revision checked out"
4770 msgstr ""
4728 msgstr ""
4771
4729
4772 msgid "outstanding uncommitted merges"
4730 msgid "outstanding uncommitted merges"
4773 msgstr ""
4731 msgstr ""
4774
4732
4775 msgid "outstanding local changes"
4733 msgid "outstanding local changes"
4776 msgstr ""
4734 msgstr ""
4777
4735
4778 msgid "pull patches from REPOSITORY"
4736 msgid "pull patches from REPOSITORY"
4779 msgstr ""
4737 msgstr ""
4780
4738
4781 msgid "pull patches from branch BRANCH"
4739 msgid "pull patches from branch BRANCH"
4782 msgstr ""
4740 msgstr ""
4783
4741
4784 msgid "pull all changesets up to BRANCH"
4742 msgid "pull all changesets up to BRANCH"
4785 msgstr ""
4743 msgstr ""
4786
4744
4787 msgid "skip over REV"
4745 msgid "skip over REV"
4788 msgstr ""
4746 msgstr ""
4789
4747
4790 msgid "merge at REV"
4748 msgid "merge at REV"
4791 msgstr ""
4749 msgstr ""
4792
4750
4793 msgid "append transplant info to log message"
4751 msgid "append transplant info to log message"
4794 msgstr ""
4752 msgstr ""
4795
4753
4796 msgid "continue last transplant session after repair"
4754 msgid "continue last transplant session after repair"
4797 msgstr ""
4755 msgstr ""
4798
4756
4799 msgid "filter changesets through FILTER"
4757 msgid "filter changesets through FILTER"
4800 msgstr ""
4758 msgstr ""
4801
4759
4802 msgid ""
4760 msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4803 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4804 msgstr ""
4761 msgstr ""
4805
4762
4806 msgid ""
4763 msgid ""
4807 "allow the use of MBCS paths with problematic encodings\n"
4764 "allow the use of MBCS paths with problematic encodings\n"
4808 "\n"
4765 "\n"
4809 "Some MBCS encodings are not good for some path operations (i.e.\n"
4766 "Some MBCS encodings are not good for some path operations (i.e.\n"
4810 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4767 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4811 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4768 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4812 "This extension can be used to fix the issue with those encodings by\n"
4769 "This extension can be used to fix the issue with those encodings by\n"
4813 "wrapping some functions to convert to Unicode string before path\n"
4770 "wrapping some functions to convert to Unicode string before path\n"
4814 "operation.\n"
4771 "operation.\n"
4815 "\n"
4772 "\n"
4816 "This extension is useful for:\n"
4773 "This extension is useful for:\n"
4817 "\n"
4774 "\n"
4818 "- Japanese Windows users using shift_jis encoding.\n"
4775 "- Japanese Windows users using shift_jis encoding.\n"
4819 "- Chinese Windows users using big5 encoding.\n"
4776 "- Chinese Windows users using big5 encoding.\n"
4820 "- All users who use a repository with one of problematic encodings on\n"
4777 "- All users who use a repository with one of problematic encodings on\n"
4821 " case-insensitive file system.\n"
4778 " case-insensitive file system.\n"
4822 "\n"
4779 "\n"
4823 "This extension is not needed for:\n"
4780 "This extension is not needed for:\n"
4824 "\n"
4781 "\n"
4825 "- Any user who use only ASCII chars in path.\n"
4782 "- Any user who use only ASCII chars in path.\n"
4826 "- Any user who do not use any of problematic encodings.\n"
4783 "- Any user who do not use any of problematic encodings.\n"
4827 "\n"
4784 "\n"
4828 "Note that there are some limitations on using this extension:\n"
4785 "Note that there are some limitations on using this extension:\n"
4829 "\n"
4786 "\n"
4830 "- You should use single encoding in one repository.\n"
4787 "- You should use single encoding in one repository.\n"
4831 "- You should set same encoding for the repository by locale or\n"
4788 "- You should set same encoding for the repository by locale or\n"
4832 " HGENCODING.\n"
4789 " HGENCODING.\n"
4833 "\n"
4790 "\n"
4834 "Path encoding conversion are done between Unicode and\n"
4791 "Path encoding conversion are done between Unicode and\n"
4835 "encoding.encoding which is decided by Mercurial from current locale\n"
4792 "encoding.encoding which is decided by Mercurial from current locale\n"
4836 "setting or HGENCODING.\n"
4793 "setting or HGENCODING.\n"
4837 msgstr ""
4794 msgstr ""
4838
4795
4839 #, python-format
4796 #, python-format
4840 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4797 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4841 msgstr ""
4798 msgstr ""
4842
4799
4843 msgid "[win32mbcs] cannot activate on this platform.\n"
4800 msgid "[win32mbcs] cannot activate on this platform.\n"
4844 msgstr ""
4801 msgstr ""
4845
4802
4846 msgid ""
4803 msgid ""
4847 "perform automatic newline conversion\n"
4804 "perform automatic newline conversion\n"
4848 "\n"
4805 "\n"
4849 "To perform automatic newline conversion, use::\n"
4806 "To perform automatic newline conversion, use::\n"
4850 "\n"
4807 "\n"
4851 " [extensions]\n"
4808 " [extensions]\n"
4852 " win32text =\n"
4809 " win32text =\n"
4853 " [encode]\n"
4810 " [encode]\n"
4854 " ** = cleverencode:\n"
4811 " ** = cleverencode:\n"
4855 " # or ** = macencode:\n"
4812 " # or ** = macencode:\n"
4856 "\n"
4813 "\n"
4857 " [decode]\n"
4814 " [decode]\n"
4858 " ** = cleverdecode:\n"
4815 " ** = cleverdecode:\n"
4859 " # or ** = macdecode:\n"
4816 " # or ** = macdecode:\n"
4860 "\n"
4817 "\n"
4861 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4818 "If not doing conversion, to make sure you do not commit CRLF/CR by accident::\n"
4862 "accident::\n"
4863 "\n"
4819 "\n"
4864 " [hooks]\n"
4820 " [hooks]\n"
4865 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4821 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4866 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4822 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4867 "\n"
4823 "\n"
4868 "To do the same check on a server to prevent CRLF/CR from being\n"
4824 "To do the same check on a server to prevent CRLF/CR from being\n"
4869 "pushed or pulled::\n"
4825 "pushed or pulled::\n"
4870 "\n"
4826 "\n"
4871 " [hooks]\n"
4827 " [hooks]\n"
4872 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4828 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4873 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4829 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4874 msgstr ""
4830 msgstr ""
4875
4831
4876 #, python-format
4832 #, python-format
4877 msgid ""
4833 msgid ""
4878 "WARNING: %s already has %s line endings\n"
4834 "WARNING: %s already has %s line endings\n"
4879 "and does not need EOL conversion by the win32text plugin.\n"
4835 "and does not need EOL conversion by the win32text plugin.\n"
4880 "Before your next commit, please reconsider your encode/decode settings in \n"
4836 "Before your next commit, please reconsider your encode/decode settings in \n"
4881 "Mercurial.ini or %s.\n"
4837 "Mercurial.ini or %s.\n"
4882 msgstr ""
4838 msgstr ""
4883
4839
4884 #, python-format
4840 #, python-format
4885 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4841 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4886 msgstr ""
4842 msgstr ""
4887
4843
4888 #, python-format
4844 #, python-format
4889 msgid "in %s: %s\n"
4845 msgid "in %s: %s\n"
4890 msgstr ""
4846 msgstr ""
4891
4847
4892 #, python-format
4848 #, python-format
4893 msgid ""
4849 msgid ""
4894 "\n"
4850 "\n"
4895 "To prevent this mistake in your local repository,\n"
4851 "To prevent this mistake in your local repository,\n"
4896 "add to Mercurial.ini or .hg/hgrc:\n"
4852 "add to Mercurial.ini or .hg/hgrc:\n"
4897 "\n"
4853 "\n"
4898 "[hooks]\n"
4854 "[hooks]\n"
4899 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4855 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4900 "\n"
4856 "\n"
4901 "and also consider adding:\n"
4857 "and also consider adding:\n"
4902 "\n"
4858 "\n"
4903 "[extensions]\n"
4859 "[extensions]\n"
4904 "win32text =\n"
4860 "win32text =\n"
4905 "[encode]\n"
4861 "[encode]\n"
4906 "** = %sencode:\n"
4862 "** = %sencode:\n"
4907 "[decode]\n"
4863 "[decode]\n"
4908 "** = %sdecode:\n"
4864 "** = %sdecode:\n"
4909 msgstr ""
4865 msgstr ""
4910
4866
4911 #, fuzzy
4867 #, fuzzy
4912 msgid ""
4868 msgid ""
4913 "discover and advertise repositories on the local network\n"
4869 "discover and advertise repositories on the local network\n"
4914 "\n"
4870 "\n"
4915 "Zeroconf enabled repositories will be announced in a network without\n"
4871 "Zeroconf enabled repositories will be announced in a network without\n"
4916 "the need to configure a server or a service. They can be discovered\n"
4872 "the need to configure a server or a service. They can be discovered\n"
4917 "without knowing their actual IP address.\n"
4873 "without knowing their actual IP address.\n"
4918 "\n"
4874 "\n"
4919 "To allow other people to discover your repository using run \"hg serve\"\n"
4875 "To allow other people to discover your repository using run \"hg serve\"\n"
4920 "in your repository::\n"
4876 "in your repository::\n"
4921 "\n"
4877 "\n"
4922 " $ cd test\n"
4878 " $ cd test\n"
4923 " $ hg serve\n"
4879 " $ hg serve\n"
4924 "\n"
4880 "\n"
4925 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4881 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4926 "\n"
4882 "\n"
4927 " $ hg paths\n"
4883 " $ hg paths\n"
4928 " zc-test = http://example.com:8000/test\n"
4884 " zc-test = http://example.com:8000/test\n"
4929 msgstr ""
4885 msgstr ""
4930 "découverte et annonce de dépôts sur le réseau local\n"
4886 "découverte et annonce de dépôts sur le réseau local\n"
4931 "\n"
4887 "\n"
4932 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4888 "Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n"
4933 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4889 "qu'il n'y ait besoin de configurer un serveur ou service\n"
4934 "particuliers, et ils peuvent être accédés simplement, sans\n"
4890 "particuliers, et ils peuvent être accédés simplement, sans\n"
4935 "connaissance de leur adresse IP.\n"
4891 "connaissance de leur adresse IP.\n"
4936 "\n"
4892 "\n"
4937 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4893 "Pour permettre à d'autres personnes de découvrir votre dépôt,\n"
4938 "lancez-y la commande \"hg serve\" :\n"
4894 "lancez-y la commande \"hg serve\" :\n"
4939 "\n"
4895 "\n"
4940 " $ cd test\n"
4896 " $ cd test\n"
4941 " $ hg serve\n"
4897 " $ hg serve\n"
4942 "\n"
4898 "\n"
4943 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4899 "Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n"
4944 "la commande \"hg paths\", par exemple :\n"
4900 "la commande \"hg paths\", par exemple :\n"
4945 "\n"
4901 "\n"
4946 " $ hg paths\n"
4902 " $ hg paths\n"
4947 " zc-test = http://example.com:8000/test\n"
4903 " zc-test = http://example.com:8000/test\n"
4948
4904
4949 msgid "archive prefix contains illegal components"
4905 msgid "archive prefix contains illegal components"
4950 msgstr "le préfixe donné pour l'archive contient des composants non autorisés"
4906 msgstr "le préfixe donné pour l'archive contient des composants non autorisés"
4951
4907
4952 msgid "cannot give prefix when archiving to files"
4908 msgid "cannot give prefix when archiving to files"
4953 msgstr ""
4909 msgstr "impossible de donner un préfixe pour une création d'archive vers un répertoire (de type \"files\")"
4954 "impossible de donner un préfixe pour une création d'archive vers un "
4955 "répertoire (de type \"files\")"
4956
4910
4957 #, python-format
4911 #, python-format
4958 msgid "unknown archive type '%s'"
4912 msgid "unknown archive type '%s'"
4959 msgstr "type d'archive inconnu : '%s'"
4913 msgstr "type d'archive inconnu : '%s'"
4960
4914
4961 msgid "invalid changegroup"
4915 msgid "invalid changegroup"
4962 msgstr ""
4916 msgstr ""
4963
4917
4964 msgid "unknown parent"
4918 msgid "unknown parent"
4965 msgstr ""
4919 msgstr ""
4966
4920
4967 #, python-format
4921 #, python-format
4968 msgid "integrity check failed on %s:%d"
4922 msgid "integrity check failed on %s:%d"
4969 msgstr ""
4923 msgstr ""
4970
4924
4971 #, python-format
4925 #, python-format
4972 msgid "%s: not a Mercurial bundle file"
4926 msgid "%s: not a Mercurial bundle file"
4973 msgstr ""
4927 msgstr ""
4974
4928
4975 #, python-format
4929 #, python-format
4976 msgid "%s: unknown bundle version"
4930 msgid "%s: unknown bundle version"
4977 msgstr ""
4931 msgstr ""
4978
4932
4979 #, python-format
4933 #, python-format
4980 msgid "%s: unknown bundle compression type"
4934 msgid "%s: unknown bundle compression type"
4981 msgstr ""
4935 msgstr ""
4982
4936
4983 msgid "cannot create new bundle repository"
4937 msgid "cannot create new bundle repository"
4984 msgstr ""
4938 msgstr ""
4985
4939
4986 #, python-format
4940 #, python-format
4987 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4941 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4988 msgstr ""
4942 msgstr ""
4989
4943
4990 msgid "empty username"
4944 msgid "empty username"
4991 msgstr "le nom d'utilisateur est vide"
4945 msgstr "le nom d'utilisateur est vide"
4992
4946
4993 #, python-format
4947 #, python-format
4994 msgid "username %s contains a newline"
4948 msgid "username %s contains a newline"
4995 msgstr "le nom d'utilisateur %s contient un saut de ligne"
4949 msgstr "le nom d'utilisateur %s contient un saut de ligne"
4996
4950
4997 msgid "options --message and --logfile are mutually exclusive"
4951 msgid "options --message and --logfile are mutually exclusive"
4998 msgstr "les options --message et --logfile s'excluent mutuellement"
4952 msgstr "les options --message et --logfile s'excluent mutuellement"
4999
4953
5000 #, python-format
4954 #, python-format
5001 msgid "can't read commit message '%s': %s"
4955 msgid "can't read commit message '%s': %s"
5002 msgstr ""
4956 msgstr ""
5003
4957
5004 msgid "limit must be a positive integer"
4958 msgid "limit must be a positive integer"
5005 msgstr "la limite spécifiée doit être un entier positif"
4959 msgstr "la limite spécifiée doit être un entier positif"
5006
4960
5007 msgid "limit must be positive"
4961 msgid "limit must be positive"
5008 msgstr "la limite doit être positive"
4962 msgstr "la limite doit être positive"
5009
4963
5010 msgid "too many revisions specified"
4964 msgid "too many revisions specified"
5011 msgstr "trop de révisions spécifiées"
4965 msgstr "trop de révisions spécifiées"
5012
4966
5013 #, python-format
4967 #, python-format
5014 msgid "invalid format spec '%%%s' in output filename"
4968 msgid "invalid format spec '%%%s' in output filename"
5015 msgstr ""
4969 msgstr "'%%%s'spécification de format invalide dans le nom du fichier de sortie"
5016 "'%%%s'spécification de format invalide dans le nom du fichier de sortie"
5017
4970
5018 #, python-format
4971 #, python-format
5019 msgid "adding %s\n"
4972 msgid "adding %s\n"
5020 msgstr "ajout de %s\n"
4973 msgstr "ajout de %s\n"
5021
4974
5022 #, python-format
4975 #, python-format
5023 msgid "removing %s\n"
4976 msgid "removing %s\n"
5024 msgstr "suppression de %s\n"
4977 msgstr "suppression de %s\n"
5025
4978
5026 #, python-format
4979 #, python-format
5027 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4980 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
5028 msgstr ""
4981 msgstr "suppression de %s plannifiée, en tant que renommage de %s (similaire à %d%%)\n"
5029 "suppression de %s plannifiée, en tant que renommage de %s (similaire à %d%"
5030 "%)\n"
5031
4982
5032 #, python-format
4983 #, python-format
5033 msgid "%s: not copying - file is not managed\n"
4984 msgid "%s: not copying - file is not managed\n"
5034 msgstr "%s: le fichier n'est pas suivi, pas de copie\n"
4985 msgstr "%s: le fichier n'est pas suivi, pas de copie\n"
5035
4986
5036 #, python-format
4987 #, python-format
5037 msgid "%s: not copying - file has been marked for remove\n"
4988 msgid "%s: not copying - file has been marked for remove\n"
5038 msgstr "%s: le fichier a été marqué pour suppression, pas de copie\n"
4989 msgstr "%s: le fichier a été marqué pour suppression, pas de copie\n"
5039
4990
5040 #, python-format
4991 #, python-format
5041 msgid "%s: not overwriting - %s collides with %s\n"
4992 msgid "%s: not overwriting - %s collides with %s\n"
5042 msgstr "%s: %s entre en collision avec %s, pas d'écrasement\n"
4993 msgstr "%s: %s entre en collision avec %s, pas d'écrasement\n"
5043
4994
5044 #, python-format
4995 #, python-format
5045 msgid "%s: not overwriting - file exists\n"
4996 msgid "%s: not overwriting - file exists\n"
5046 msgstr "%s: le fichier existe, pas d'écrasement\n"
4997 msgstr "%s: le fichier existe, pas d'écrasement\n"
5047
4998
5048 #, python-format
4999 #, python-format
5049 msgid "%s: deleted in working copy\n"
5000 msgid "%s: deleted in working copy\n"
5050 msgstr "%s: supprimé dans la copie de travail\n"
5001 msgstr "%s: supprimé dans la copie de travail\n"
5051
5002
5052 #, python-format
5003 #, python-format
5053 msgid "%s: cannot copy - %s\n"
5004 msgid "%s: cannot copy - %s\n"
5054 msgstr "%s: impossible de copier - %s\n"
5005 msgstr "%s: impossible de copier - %s\n"
5055
5006
5056 #, python-format
5007 #, python-format
5057 msgid "moving %s to %s\n"
5008 msgid "moving %s to %s\n"
5058 msgstr "déplacement de %s vers %s\n"
5009 msgstr "déplacement de %s vers %s\n"
5059
5010
5060 #, python-format
5011 #, python-format
5061 msgid "copying %s to %s\n"
5012 msgid "copying %s to %s\n"
5062 msgstr "copie de %s vers %s\n"
5013 msgstr "copie de %s vers %s\n"
5063
5014
5064 #, python-format
5015 #, python-format
5065 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
5016 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
5066 msgstr ""
5017 msgstr ""
5067
5018
5068 msgid "no source or destination specified"
5019 msgid "no source or destination specified"
5069 msgstr ""
5020 msgstr ""
5070
5021
5071 msgid "no destination specified"
5022 msgid "no destination specified"
5072 msgstr ""
5023 msgstr ""
5073
5024
5074 msgid "with multiple sources, destination must be an existing directory"
5025 msgid "with multiple sources, destination must be an existing directory"
5075 msgstr ""
5026 msgstr ""
5076
5027
5077 #, python-format
5028 #, python-format
5078 msgid "destination %s is not a directory"
5029 msgid "destination %s is not a directory"
5079 msgstr ""
5030 msgstr ""
5080
5031
5081 msgid "no files to copy"
5032 msgid "no files to copy"
5082 msgstr ""
5033 msgstr ""
5083
5034
5084 msgid "(consider using --after)\n"
5035 msgid "(consider using --after)\n"
5085 msgstr ""
5036 msgstr ""
5086
5037
5087 #, python-format
5038 #, python-format
5088 msgid "changeset: %d:%s\n"
5039 msgid "changeset: %d:%s\n"
5089 msgstr ""
5040 msgstr ""
5090
5041
5091 #, python-format
5042 #, python-format
5092 msgid "branch: %s\n"
5043 msgid "branch: %s\n"
5093 msgstr ""
5044 msgstr ""
5094
5045
5095 #, python-format
5046 #, python-format
5096 msgid "tag: %s\n"
5047 msgid "tag: %s\n"
5097 msgstr ""
5048 msgstr ""
5098
5049
5099 #, python-format
5050 #, python-format
5100 msgid "parent: %d:%s\n"
5051 msgid "parent: %d:%s\n"
5101 msgstr ""
5052 msgstr ""
5102
5053
5103 #, python-format
5054 #, python-format
5104 msgid "manifest: %d:%s\n"
5055 msgid "manifest: %d:%s\n"
5105 msgstr ""
5056 msgstr ""
5106
5057
5107 #, python-format
5058 #, python-format
5108 msgid "user: %s\n"
5059 msgid "user: %s\n"
5109 msgstr ""
5060 msgstr ""
5110
5061
5111 #, python-format
5062 #, python-format
5112 msgid "date: %s\n"
5063 msgid "date: %s\n"
5113 msgstr ""
5064 msgstr ""
5114
5065
5115 msgid "files+:"
5066 msgid "files+:"
5116 msgstr ""
5067 msgstr ""
5117
5068
5118 msgid "files-:"
5069 msgid "files-:"
5119 msgstr ""
5070 msgstr ""
5120
5071
5121 msgid "files:"
5072 msgid "files:"
5122 msgstr ""
5073 msgstr ""
5123
5074
5124 #, python-format
5075 #, python-format
5125 msgid "files: %s\n"
5076 msgid "files: %s\n"
5126 msgstr ""
5077 msgstr ""
5127
5078
5128 #, python-format
5079 #, python-format
5129 msgid "copies: %s\n"
5080 msgid "copies: %s\n"
5130 msgstr ""
5081 msgstr ""
5131
5082
5132 #, python-format
5083 #, python-format
5133 msgid "extra: %s=%s\n"
5084 msgid "extra: %s=%s\n"
5134 msgstr ""
5085 msgstr ""
5135
5086
5136 msgid "description:\n"
5087 msgid "description:\n"
5137 msgstr ""
5088 msgstr ""
5138
5089
5139 #, python-format
5090 #, python-format
5140 msgid "summary: %s\n"
5091 msgid "summary: %s\n"
5141 msgstr ""
5092 msgstr ""
5142
5093
5143 #, python-format
5094 #, python-format
5144 msgid "%s: no key named '%s'"
5095 msgid "%s: no key named '%s'"
5145 msgstr ""
5096 msgstr ""
5146
5097
5147 #, python-format
5098 #, python-format
5148 msgid "%s: %s"
5099 msgid "%s: %s"
5149 msgstr ""
5100 msgstr ""
5150
5101
5151 #, python-format
5102 #, python-format
5152 msgid "Found revision %s from %s\n"
5103 msgid "Found revision %s from %s\n"
5153 msgstr ""
5104 msgstr ""
5154
5105
5155 msgid "revision matching date not found"
5106 msgid "revision matching date not found"
5156 msgstr ""
5107 msgstr ""
5157
5108
5158 #, python-format
5109 #, python-format
5159 msgid "cannot follow nonexistent file: \"%s\""
5110 msgid "cannot follow nonexistent file: \"%s\""
5160 msgstr ""
5111 msgstr ""
5161
5112
5162 #, python-format
5113 #, python-format
5163 msgid "%s:%s copy source revision cannot be found!\n"
5114 msgid "%s:%s copy source revision cannot be found!\n"
5164 msgstr ""
5115 msgstr ""
5165
5116
5166 msgid "can only follow copies/renames for explicit filenames"
5117 msgid "can only follow copies/renames for explicit filenames"
5167 msgstr ""
5118 msgstr ""
5168
5119
5169 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
5120 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
5170 msgstr ""
5121 msgstr ""
5171
5122
5172 msgid "HG: Leave message empty to abort commit."
5123 msgid "HG: Leave message empty to abort commit."
5173 msgstr ""
5124 msgstr ""
5174
5125
5175 #, python-format
5126 #, python-format
5176 msgid "HG: user: %s"
5127 msgid "HG: user: %s"
5177 msgstr ""
5128 msgstr ""
5178
5129
5179 msgid "HG: branch merge"
5130 msgid "HG: branch merge"
5180 msgstr ""
5131 msgstr ""
5181
5132
5182 #, python-format
5133 #, python-format
5183 msgid "HG: branch '%s'"
5134 msgid "HG: branch '%s'"
5184 msgstr ""
5135 msgstr ""
5185
5136
5186 #, python-format
5137 #, python-format
5187 msgid "HG: subrepo %s"
5138 msgid "HG: subrepo %s"
5188 msgstr ""
5139 msgstr ""
5189
5140
5190 #, python-format
5141 #, python-format
5191 msgid "HG: added %s"
5142 msgid "HG: added %s"
5192 msgstr ""
5143 msgstr ""
5193
5144
5194 #, python-format
5145 #, python-format
5195 msgid "HG: changed %s"
5146 msgid "HG: changed %s"
5196 msgstr ""
5147 msgstr ""
5197
5148
5198 #, python-format
5149 #, python-format
5199 msgid "HG: removed %s"
5150 msgid "HG: removed %s"
5200 msgstr ""
5151 msgstr ""
5201
5152
5202 msgid "HG: no files changed"
5153 msgid "HG: no files changed"
5203 msgstr ""
5154 msgstr ""
5204
5155
5205 msgid "empty commit message"
5156 msgid "empty commit message"
5206 msgstr ""
5157 msgstr ""
5207
5158
5208 msgid ""
5159 msgid ""
5209 "add the specified files on the next commit\n"
5160 "add the specified files on the next commit\n"
5210 "\n"
5161 "\n"
5211 " Schedule files to be version controlled and added to the\n"
5162 " Schedule files to be version controlled and added to the\n"
5212 " repository.\n"
5163 " repository.\n"
5213 "\n"
5164 "\n"
5214 " The files will be added to the repository at the next commit. To\n"
5165 " The files will be added to the repository at the next commit. To\n"
5215 " undo an add before that, see hg forget.\n"
5166 " undo an add before that, see hg forget.\n"
5216 "\n"
5167 "\n"
5217 " If no names are given, add all files to the repository.\n"
5168 " If no names are given, add all files to the repository.\n"
5218 " "
5169 " "
5219 msgstr ""
5170 msgstr ""
5220
5171
5221 msgid ""
5172 msgid ""
5222 "add all new files, delete all missing files\n"
5173 "add all new files, delete all missing files\n"
5223 "\n"
5174 "\n"
5224 " Add all new files and remove all missing files from the\n"
5175 " Add all new files and remove all missing files from the\n"
5225 " repository.\n"
5176 " repository.\n"
5226 "\n"
5177 "\n"
5227 " New files are ignored if they match any of the patterns in\n"
5178 " New files are ignored if they match any of the patterns in\n"
5228 " .hgignore. As with add, these changes take effect at the next\n"
5179 " .hgignore. As with add, these changes take effect at the next\n"
5229 " commit.\n"
5180 " commit.\n"
5230 "\n"
5181 "\n"
5231 " Use the -s/--similarity option to detect renamed files. With a\n"
5182 " Use the -s/--similarity option to detect renamed files. With a\n"
5232 " parameter greater than 0, this compares every removed file with\n"
5183 " parameter greater than 0, this compares every removed file with\n"
5233 " every added file and records those similar enough as renames. This\n"
5184 " every added file and records those similar enough as renames. This\n"
5234 " option takes a percentage between 0 (disabled) and 100 (files must\n"
5185 " option takes a percentage between 0 (disabled) and 100 (files must\n"
5235 " be identical) as its parameter. Detecting renamed files this way\n"
5186 " be identical) as its parameter. Detecting renamed files this way\n"
5236 " can be expensive.\n"
5187 " can be expensive.\n"
5237 " "
5188 " "
5238 msgstr ""
5189 msgstr ""
5239
5190
5240 msgid "similarity must be a number"
5191 msgid "similarity must be a number"
5241 msgstr ""
5192 msgstr ""
5242
5193
5243 msgid "similarity must be between 0 and 100"
5194 msgid "similarity must be between 0 and 100"
5244 msgstr ""
5195 msgstr ""
5245
5196
5246 msgid ""
5197 msgid ""
5247 "show changeset information by line for each file\n"
5198 "show changeset information by line for each file\n"
5248 "\n"
5199 "\n"
5249 " List changes in files, showing the revision id responsible for\n"
5200 " List changes in files, showing the revision id responsible for\n"
5250 " each line\n"
5201 " each line\n"
5251 "\n"
5202 "\n"
5252 " This command is useful for discovering when a change was made and\n"
5203 " This command is useful for discovering when a change was made and\n"
5253 " by whom.\n"
5204 " by whom.\n"
5254 "\n"
5205 "\n"
5255 " Without the -a/--text option, annotate will avoid processing files\n"
5206 " Without the -a/--text option, annotate will avoid processing files\n"
5256 " it detects as binary. With -a, annotate will annotate the file\n"
5207 " it detects as binary. With -a, annotate will annotate the file\n"
5257 " anyway, although the results will probably be neither useful\n"
5208 " anyway, although the results will probably be neither useful\n"
5258 " nor desirable.\n"
5209 " nor desirable.\n"
5259 " "
5210 " "
5260 msgstr ""
5211 msgstr ""
5261
5212
5262 msgid "at least one filename or pattern is required"
5213 msgid "at least one filename or pattern is required"
5263 msgstr ""
5214 msgstr ""
5264
5215
5265 msgid "at least one of -n/-c is required for -l"
5216 msgid "at least one of -n/-c is required for -l"
5266 msgstr ""
5217 msgstr ""
5267
5218
5268 #, python-format
5219 #, python-format
5269 msgid "%s: binary file\n"
5220 msgid "%s: binary file\n"
5270 msgstr ""
5221 msgstr ""
5271
5222
5272 #, fuzzy
5223 #, fuzzy
5273 msgid ""
5224 msgid ""
5274 "create an unversioned archive of a repository revision\n"
5225 "create an unversioned archive of a repository revision\n"
5275 "\n"
5226 "\n"
5276 " By default, the revision used is the parent of the working\n"
5227 " By default, the revision used is the parent of the working\n"
5277 " directory; use -r/--rev to specify a different revision.\n"
5228 " directory; use -r/--rev to specify a different revision.\n"
5278 "\n"
5229 "\n"
5279 " To specify the type of archive to create, use -t/--type. Valid\n"
5230 " To specify the type of archive to create, use -t/--type. Valid\n"
5280 " types are::\n"
5231 " types are::\n"
5281 "\n"
5232 "\n"
5282 " \"files\" (default): a directory full of files\n"
5233 " \"files\" (default): a directory full of files\n"
5283 " \"tar\": tar archive, uncompressed\n"
5234 " \"tar\": tar archive, uncompressed\n"
5284 " \"tbz2\": tar archive, compressed using bzip2\n"
5235 " \"tbz2\": tar archive, compressed using bzip2\n"
5285 " \"tgz\": tar archive, compressed using gzip\n"
5236 " \"tgz\": tar archive, compressed using gzip\n"
5286 " \"uzip\": zip archive, uncompressed\n"
5237 " \"uzip\": zip archive, uncompressed\n"
5287 " \"zip\": zip archive, compressed using deflate\n"
5238 " \"zip\": zip archive, compressed using deflate\n"
5288 "\n"
5239 "\n"
5289 " The exact name of the destination archive or directory is given\n"
5240 " The exact name of the destination archive or directory is given\n"
5290 " using a format string; see 'hg help export' for details.\n"
5241 " using a format string; see 'hg help export' for details.\n"
5291 "\n"
5242 "\n"
5292 " Each member added to an archive file has a directory prefix\n"
5243 " Each member added to an archive file has a directory prefix\n"
5293 " prepended. Use -p/--prefix to specify a format string for the\n"
5244 " prepended. Use -p/--prefix to specify a format string for the\n"
5294 " prefix. The default is the basename of the archive, with suffixes\n"
5245 " prefix. The default is the basename of the archive, with suffixes\n"
5295 " removed.\n"
5246 " removed.\n"
5296 " "
5247 " "
5297 msgstr ""
5248 msgstr ""
5298 "crée une archive du dépôt à une révision donnée, sans conserver "
5249 "crée une archive du dépôt à une révision donnée, sans conserver l'historique\n"
5299 "l'historique\n"
5300 "\n"
5250 "\n"
5301 " Par défaut l'archive est créée à partir de la révision parente\n"
5251 " Par défaut l'archive est créée à partir de la révision parente\n"
5302 " du répertoire de travail. Une autre révision peut être spécifiée\n"
5252 " du répertoire de travail. Une autre révision peut être spécifiée\n"
5303 " à l'aide de -r/--rev.\n"
5253 " à l'aide de -r/--rev.\n"
5304 "\n"
5254 "\n"
5305 " -t/--type permet de spécifier le type d'archive à créer, parmi :\n"
5255 " -t/--type permet de spécifier le type d'archive à créer, parmi :\n"
5306 "\n"
5256 "\n"
5307 " \"files\" (par défaut) : un répertoire rempli de fichiers\n"
5257 " \"files\" (par défaut) : un répertoire rempli de fichiers\n"
5308 " \"tar\" : une archive tar non compressée\n"
5258 " \"tar\" : une archive tar non compressée\n"
5309 " \"tbz2\" : une archive tar compressée avec bzip2\n"
5259 " \"tbz2\" : une archive tar compressée avec bzip2\n"
5310 " \"tgz\" : une archive tar compressée avec gzip\n"
5260 " \"tgz\" : une archive tar compressée avec gzip\n"
5311 " \"uzip\" : une archive zip non compressée\n"
5261 " \"uzip\" : une archive zip non compressée\n"
5312 " \"zip\" : une archive zip compressée avec l'algorithme deflate\n"
5262 " \"zip\" : une archive zip compressée avec l'algorithme deflate\n"
5313 "\n"
5263 "\n"
5314 " Le nom exact de l'archive ou du répertoire de destination est\n"
5264 " Le nom exact de l'archive ou du répertoire de destination est\n"
5315 " donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n"
5265 " donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n"
5316 " pour plus de détails.\n"
5266 " pour plus de détails.\n"
5317 "\n"
5267 "\n"
5318 " Un chemin relatif est ajouté devant chaque membre de l'archive,\n"
5268 " Un chemin relatif est ajouté devant chaque membre de l'archive,\n"
5319 " par défaut le nom du fichier d'archive (sans répertoires ni\n"
5269 " par défaut le nom du fichier d'archive (sans répertoires ni\n"
5320 " suffixes). Un préfixe différent peut être spécifié avec\n"
5270 " suffixes). Un préfixe différent peut être spécifié avec\n"
5321 " -p/--prefix.\n"
5271 " -p/--prefix.\n"
5322 " "
5272 " "
5323
5273
5324 msgid "no working directory: please specify a revision"
5274 msgid "no working directory: please specify a revision"
5325 msgstr "pas de répertoire de travail, veuillez spécifier une révision"
5275 msgstr "pas de répertoire de travail, veuillez spécifier une révision"
5326
5276
5327 msgid "repository root cannot be destination"
5277 msgid "repository root cannot be destination"
5328 msgstr "le répertoire racine ne peut servir de destination"
5278 msgstr "le répertoire racine ne peut servir de destination"
5329
5279
5330 msgid "cannot archive plain files to stdout"
5280 msgid "cannot archive plain files to stdout"
5331 msgstr ""
5281 msgstr "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
5332 "impossible d'envoyer une archive de simples fichiers vers la sortie standard"
5333
5282
5334 msgid ""
5283 msgid ""
5335 "reverse effect of earlier changeset\n"
5284 "reverse effect of earlier changeset\n"
5336 "\n"
5285 "\n"
5337 " Commit the backed out changes as a new changeset. The new\n"
5286 " Commit the backed out changes as a new changeset. The new\n"
5338 " changeset is a child of the backed out changeset.\n"
5287 " changeset is a child of the backed out changeset.\n"
5339 "\n"
5288 "\n"
5340 " If you backout a changeset other than the tip, a new head is\n"
5289 " If you backout a changeset other than the tip, a new head is\n"
5341 " created. This head will be the new tip and you should merge this\n"
5290 " created. This head will be the new tip and you should merge this\n"
5342 " backout changeset with another head.\n"
5291 " backout changeset with another head.\n"
5343 "\n"
5292 "\n"
5344 " The --merge option remembers the parent of the working directory\n"
5293 " The --merge option remembers the parent of the working directory\n"
5345 " before starting the backout, then merges the new head with that\n"
5294 " before starting the backout, then merges the new head with that\n"
5346 " changeset afterwards. This saves you from doing the merge by hand.\n"
5295 " changeset afterwards. This saves you from doing the merge by hand.\n"
5347 " The result of this merge is not committed, as with a normal merge.\n"
5296 " The result of this merge is not committed, as with a normal merge.\n"
5348 "\n"
5297 "\n"
5349 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5298 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5350 " "
5299 " "
5351 msgstr ""
5300 msgstr ""
5352
5301
5353 msgid "please specify just one revision"
5302 msgid "please specify just one revision"
5354 msgstr ""
5303 msgstr ""
5355
5304
5356 msgid "please specify a revision to backout"
5305 msgid "please specify a revision to backout"
5357 msgstr ""
5306 msgstr ""
5358
5307
5359 msgid "cannot backout change on a different branch"
5308 msgid "cannot backout change on a different branch"
5360 msgstr ""
5309 msgstr ""
5361
5310
5362 msgid "cannot backout a change with no parents"
5311 msgid "cannot backout a change with no parents"
5363 msgstr ""
5312 msgstr ""
5364
5313
5365 msgid "cannot backout a merge changeset without --parent"
5314 msgid "cannot backout a merge changeset without --parent"
5366 msgstr ""
5315 msgstr ""
5367
5316
5368 #, python-format
5317 #, python-format
5369 msgid "%s is not a parent of %s"
5318 msgid "%s is not a parent of %s"
5370 msgstr ""
5319 msgstr ""
5371
5320
5372 msgid "cannot use --parent on non-merge changeset"
5321 msgid "cannot use --parent on non-merge changeset"
5373 msgstr ""
5322 msgstr ""
5374
5323
5375 #, python-format
5324 #, python-format
5376 msgid "changeset %s backs out changeset %s\n"
5325 msgid "changeset %s backs out changeset %s\n"
5377 msgstr ""
5326 msgstr ""
5378
5327
5379 #, python-format
5328 #, python-format
5380 msgid "merging with changeset %s\n"
5329 msgid "merging with changeset %s\n"
5381 msgstr ""
5330 msgstr ""
5382
5331
5383 msgid "the backout changeset is a new head - do not forget to merge\n"
5332 msgid "the backout changeset is a new head - do not forget to merge\n"
5384 msgstr ""
5333 msgstr ""
5385
5334
5386 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5335 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5387 msgstr ""
5336 msgstr ""
5388
5337
5389 msgid ""
5338 msgid ""
5390 "subdivision search of changesets\n"
5339 "subdivision search of changesets\n"
5391 "\n"
5340 "\n"
5392 " This command helps to find changesets which introduce problems. To\n"
5341 " This command helps to find changesets which introduce problems. To\n"
5393 " use, mark the earliest changeset you know exhibits the problem as\n"
5342 " use, mark the earliest changeset you know exhibits the problem as\n"
5394 " bad, then mark the latest changeset which is free from the problem\n"
5343 " bad, then mark the latest changeset which is free from the problem\n"
5395 " as good. Bisect will update your working directory to a revision\n"
5344 " as good. Bisect will update your working directory to a revision\n"
5396 " for testing (unless the -U/--noupdate option is specified). Once\n"
5345 " for testing (unless the -U/--noupdate option is specified). Once\n"
5397 " you have performed tests, mark the working directory as good or\n"
5346 " you have performed tests, mark the working directory as good or\n"
5398 " bad, and bisect will either update to another candidate changeset\n"
5347 " bad, and bisect will either update to another candidate changeset\n"
5399 " or announce that it has found the bad revision.\n"
5348 " or announce that it has found the bad revision.\n"
5400 "\n"
5349 "\n"
5401 " As a shortcut, you can also use the revision argument to mark a\n"
5350 " As a shortcut, you can also use the revision argument to mark a\n"
5402 " revision as good or bad without checking it out first.\n"
5351 " revision as good or bad without checking it out first.\n"
5403 "\n"
5352 "\n"
5404 " If you supply a command, it will be used for automatic bisection.\n"
5353 " If you supply a command, it will be used for automatic bisection.\n"
5405 " Its exit status will be used to mark revisions as good or bad:\n"
5354 " Its exit status will be used to mark revisions as good or bad:\n"
5406 " status 0 means good, 125 means to skip the revision, 127\n"
5355 " status 0 means good, 125 means to skip the revision, 127\n"
5407 " (command not found) will abort the bisection, and any other\n"
5356 " (command not found) will abort the bisection, and any other\n"
5408 " non-zero exit status means the revision is bad.\n"
5357 " non-zero exit status means the revision is bad.\n"
5409 " "
5358 " "
5410 msgstr ""
5359 msgstr ""
5411 "recherche de \"changesets\" par dichotomie\n"
5360 "recherche de \"changesets\" par dichotomie\n"
5412 "\n"
5361 "\n"
5413 " Cette commande aide à trouver les \"changesets\" étant à\n"
5362 " Cette commande aide à trouver les \"changesets\" étant à\n"
5414 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5363 " l'origine de problèmes. Pour l'utiliser, marquez comme étant\n"
5415 " mauvaise la première révision pour laquelle vous avez relevé les\n"
5364 " mauvaise la première révision pour laquelle vous avez relevé les\n"
5416 " symptômes, puis comme bonne la dernière révision connue pour\n"
5365 " symptômes, puis comme bonne la dernière révision connue pour\n"
5417 " être exempte du problème. Bisect va alors mettre à jour votre\n"
5366 " être exempte du problème. Bisect va alors mettre à jour votre\n"
5418 " répertoire de travail à une révision à tester (à moins que\n"
5367 " répertoire de travail à une révision à tester (à moins que\n"
5419 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5368 " -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n"
5420 " indiquez si le problème était présent ou non. Bisect\n"
5369 " indiquez si le problème était présent ou non. Bisect\n"
5421 " recommencera alors pour une autre révision candidate jusqu'à\n"
5370 " recommencera alors pour une autre révision candidate jusqu'à\n"
5422 " être en mesure d'annoncer la révision fautive.\n"
5371 " être en mesure d'annoncer la révision fautive.\n"
5423 "\n"
5372 "\n"
5424 " Vous pouvez aussi passer une révision en argument lors du\n"
5373 " Vous pouvez aussi passer une révision en argument lors du\n"
5425 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5374 " marquage afin d'éviter l'étape manuelle de mise à jour du\n"
5426 " répertoire de travail à cette révision.\n"
5375 " répertoire de travail à cette révision.\n"
5427 "\n"
5376 "\n"
5428 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5377 " Vous pouvez fournir une commande pour automatiser la recherche\n"
5429 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5378 " par dichotomie. Son code de retour sera utilisé pour marquer les\n"
5430 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
5379 " révisions : 0 indique une révision sans problème, 125 qu'il ne\n"
5431 " faut pas prendre cette révision en compte, 127 (commande\n"
5380 " faut pas prendre cette révision en compte, 127 (commande\n"
5432 " introuvable) cause l'abandon du processus de recherche, et tout\n"
5381 " introuvable) cause l'abandon du processus de recherche, et tout\n"
5433 " autre code de retour non nul désigne une révision affectée par\n"
5382 " autre code de retour non nul désigne une révision affectée par\n"
5434 " le problème.\n"
5383 " le problème.\n"
5435 " "
5384 " "
5436
5385
5437 msgid "The first good revision is:\n"
5386 msgid "The first good revision is:\n"
5438 msgstr "La première révision exempte du problème est :\n"
5387 msgstr "La première révision exempte du problème est :\n"
5439
5388
5440 msgid "The first bad revision is:\n"
5389 msgid "The first bad revision is:\n"
5441 msgstr "La première révision présentant le problème est :\n"
5390 msgstr "La première révision présentant le problème est :\n"
5442
5391
5443 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5392 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5444 msgstr ""
5393 msgstr ""
5445 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5394 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5446 "exempte du problème pourrait être parmi :\n"
5395 "exempte du problème pourrait être parmi :\n"
5447
5396
5448 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5397 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5449 msgstr ""
5398 msgstr ""
5450 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5399 "Certaines révisions n'ayant pas été considérées, la première révision\n"
5451 "présentant le problème pourrait être parmi :\n"
5400 "présentant le problème pourrait être parmi :\n"
5452
5401
5453 msgid "cannot bisect (no known good revisions)"
5402 msgid "cannot bisect (no known good revisions)"
5454 msgstr "dichotomie impossible (pas de bonne révision connue)"
5403 msgstr "dichotomie impossible (pas de bonne révision connue)"
5455
5404
5456 msgid "cannot bisect (no known bad revisions)"
5405 msgid "cannot bisect (no known bad revisions)"
5457 msgstr "dichotomie impossible (pas de mauvaise révision connue)"
5406 msgstr "dichotomie impossible (pas de mauvaise révision connue)"
5458
5407
5459 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5408 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5460 msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n"
5409 msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n"
5461
5410
5462 msgid "incompatible arguments"
5411 msgid "incompatible arguments"
5463 msgstr "arguments incompatibles"
5412 msgstr "arguments incompatibles"
5464
5413
5465 #, python-format
5414 #, python-format
5466 msgid "failed to execute %s"
5415 msgid "failed to execute %s"
5467 msgstr "impossible d'exécuter %s"
5416 msgstr "impossible d'exécuter %s"
5468
5417
5469 #, python-format
5418 #, python-format
5470 msgid "%s killed"
5419 msgid "%s killed"
5471 msgstr "%s a été tué"
5420 msgstr "%s a été tué"
5472
5421
5473 #, python-format
5422 #, python-format
5474 msgid "Changeset %d:%s: %s\n"
5423 msgid "Changeset %d:%s: %s\n"
5475 msgstr "\"Changeset\" %d:%s: %s\n"
5424 msgstr "\"Changeset\" %d:%s: %s\n"
5476
5425
5477 #, fuzzy, python-format
5426 #, fuzzy, python-format
5478 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
5427 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
5479 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5428 msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n"
5480
5429
5481 msgid ""
5430 msgid ""
5482 "set or show the current branch name\n"
5431 "set or show the current branch name\n"
5483 "\n"
5432 "\n"
5484 " With no argument, show the current branch name. With one argument,\n"
5433 " With no argument, show the current branch name. With one argument,\n"
5485 " set the working directory branch name (the branch will not exist\n"
5434 " set the working directory branch name (the branch will not exist\n"
5486 " in the repository until the next commit). Standard practice\n"
5435 " in the repository until the next commit). Standard practice\n"
5487 " recommends that primary development take place on the 'default'\n"
5436 " recommends that primary development take place on the 'default'\n"
5488 " branch.\n"
5437 " branch.\n"
5489 "\n"
5438 "\n"
5490 " Unless -f/--force is specified, branch will not let you set a\n"
5439 " Unless -f/--force is specified, branch will not let you set a\n"
5491 " branch name that already exists, even if it's inactive.\n"
5440 " branch name that already exists, even if it's inactive.\n"
5492 "\n"
5441 "\n"
5493 " Use -C/--clean to reset the working directory branch to that of\n"
5442 " Use -C/--clean to reset the working directory branch to that of\n"
5494 " the parent of the working directory, negating a previous branch\n"
5443 " the parent of the working directory, negating a previous branch\n"
5495 " change.\n"
5444 " change.\n"
5496 "\n"
5445 "\n"
5497 " Use the command 'hg update' to switch to an existing branch. Use\n"
5446 " Use the command 'hg update' to switch to an existing branch. Use\n"
5498 " 'hg commit --close-branch' to mark this branch as closed.\n"
5447 " 'hg commit --close-branch' to mark this branch as closed.\n"
5499 " "
5448 " "
5500 msgstr ""
5449 msgstr ""
5501
5450
5502 #, python-format
5451 #, python-format
5503 msgid "reset working directory to branch %s\n"
5452 msgid "reset working directory to branch %s\n"
5504 msgstr ""
5453 msgstr ""
5505
5454
5506 msgid "a branch of the same name already exists (use --force to override)"
5455 msgid "a branch of the same name already exists (use --force to override)"
5507 msgstr ""
5456 msgstr ""
5508
5457
5509 #, python-format
5458 #, python-format
5510 msgid "marked working directory as branch %s\n"
5459 msgid "marked working directory as branch %s\n"
5511 msgstr ""
5460 msgstr ""
5512
5461
5513 msgid ""
5462 msgid ""
5514 "list repository named branches\n"
5463 "list repository named branches\n"
5515 "\n"
5464 "\n"
5516 " List the repository's named branches, indicating which ones are\n"
5465 " List the repository's named branches, indicating which ones are\n"
5517 " inactive. If -c/--closed is specified, also list branches which have\n"
5466 " inactive. If -c/--closed is specified, also list branches which have\n"
5518 " been marked closed (see hg commit --close-branch).\n"
5467 " been marked closed (see hg commit --close-branch).\n"
5519 "\n"
5468 "\n"
5520 " If -a/--active is specified, only show active branches. A branch\n"
5469 " If -a/--active is specified, only show active branches. A branch\n"
5521 " is considered active if it contains repository heads.\n"
5470 " is considered active if it contains repository heads.\n"
5522 "\n"
5471 "\n"
5523 " Use the command 'hg update' to switch to an existing branch.\n"
5472 " Use the command 'hg update' to switch to an existing branch.\n"
5524 " "
5473 " "
5525 msgstr ""
5474 msgstr ""
5526
5475
5527 msgid ""
5476 msgid ""
5528 "create a changegroup file\n"
5477 "create a changegroup file\n"
5529 "\n"
5478 "\n"
5530 " Generate a compressed changegroup file collecting changesets not\n"
5479 " Generate a compressed changegroup file collecting changesets not\n"
5531 " known to be in another repository.\n"
5480 " known to be in another repository.\n"
5532 "\n"
5481 "\n"
5533 " If no destination repository is specified the destination is\n"
5482 " If no destination repository is specified the destination is\n"
5534 " assumed to have all the nodes specified by one or more --base\n"
5483 " assumed to have all the nodes specified by one or more --base\n"
5535 " parameters. To create a bundle containing all changesets, use\n"
5484 " parameters. To create a bundle containing all changesets, use\n"
5536 " -a/--all (or --base null).\n"
5485 " -a/--all (or --base null).\n"
5537 "\n"
5486 "\n"
5538 " You can change compression method with the -t/--type option.\n"
5487 " You can change compression method with the -t/--type option.\n"
5539 " The available compression methods are: none, bzip2, and\n"
5488 " The available compression methods are: none, bzip2, and\n"
5540 " gzip (by default, bundles are compressed using bzip2).\n"
5489 " gzip (by default, bundles are compressed using bzip2).\n"
5541 "\n"
5490 "\n"
5542 " The bundle file can then be transferred using conventional means\n"
5491 " The bundle file can then be transferred using conventional means\n"
5543 " and applied to another repository with the unbundle or pull\n"
5492 " and applied to another repository with the unbundle or pull\n"
5544 " command. This is useful when direct push and pull are not\n"
5493 " command. This is useful when direct push and pull are not\n"
5545 " available or when exporting an entire repository is undesirable.\n"
5494 " available or when exporting an entire repository is undesirable.\n"
5546 "\n"
5495 "\n"
5547 " Applying bundles preserves all changeset contents including\n"
5496 " Applying bundles preserves all changeset contents including\n"
5548 " permissions, copy/rename information, and revision history.\n"
5497 " permissions, copy/rename information, and revision history.\n"
5549 " "
5498 " "
5550 msgstr ""
5499 msgstr ""
5551
5500
5552 msgid "--base is incompatible with specifying a destination"
5501 msgid "--base is incompatible with specifying a destination"
5553 msgstr ""
5502 msgstr ""
5554
5503
5555 msgid "unknown bundle type specified with --type"
5504 msgid "unknown bundle type specified with --type"
5556 msgstr ""
5505 msgstr ""
5557
5506
5558 msgid ""
5507 msgid ""
5559 "output the current or given revision of files\n"
5508 "output the current or given revision of files\n"
5560 "\n"
5509 "\n"
5561 " Print the specified files as they were at the given revision. If\n"
5510 " Print the specified files as they were at the given revision. If\n"
5562 " no revision is given, the parent of the working directory is used,\n"
5511 " no revision is given, the parent of the working directory is used,\n"
5563 " or tip if no revision is checked out.\n"
5512 " or tip if no revision is checked out.\n"
5564 "\n"
5513 "\n"
5565 " Output may be to a file, in which case the name of the file is\n"
5514 " Output may be to a file, in which case the name of the file is\n"
5566 " given using a format string. The formatting rules are the same as\n"
5515 " given using a format string. The formatting rules are the same as\n"
5567 " for the export command, with the following additions::\n"
5516 " for the export command, with the following additions::\n"
5568 "\n"
5517 "\n"
5569 " %s basename of file being printed\n"
5518 " %s basename of file being printed\n"
5570 " %d dirname of file being printed, or '.' if in repository root\n"
5519 " %d dirname of file being printed, or '.' if in repository root\n"
5571 " %p root-relative path name of file being printed\n"
5520 " %p root-relative path name of file being printed\n"
5572 " "
5521 " "
5573 msgstr ""
5522 msgstr ""
5574
5523
5575 msgid ""
5524 msgid ""
5576 "make a copy of an existing repository\n"
5525 "make a copy of an existing repository\n"
5577 "\n"
5526 "\n"
5578 " Create a copy of an existing repository in a new directory.\n"
5527 " Create a copy of an existing repository in a new directory.\n"
5579 "\n"
5528 "\n"
5580 " If no destination directory name is specified, it defaults to the\n"
5529 " If no destination directory name is specified, it defaults to the\n"
5581 " basename of the source.\n"
5530 " basename of the source.\n"
5582 "\n"
5531 "\n"
5583 " The location of the source is added to the new repository's\n"
5532 " The location of the source is added to the new repository's\n"
5584 " .hg/hgrc file, as the default to be used for future pulls.\n"
5533 " .hg/hgrc file, as the default to be used for future pulls.\n"
5585 "\n"
5534 "\n"
5586 " If you use the -r/--rev option to clone up to a specific revision,\n"
5535 " If you use the -r/--rev option to clone up to a specific revision,\n"
5587 " no subsequent revisions (including subsequent tags) will be\n"
5536 " no subsequent revisions (including subsequent tags) will be\n"
5588 " present in the cloned repository. This option implies --pull, even\n"
5537 " present in the cloned repository. This option implies --pull, even\n"
5589 " on local repositories.\n"
5538 " on local repositories.\n"
5590 "\n"
5539 "\n"
5591 " By default, clone will check out the head of the 'default' branch.\n"
5540 " By default, clone will check out the head of the 'default' branch.\n"
5592 " If the -U/--noupdate option is used, the new clone will contain\n"
5541 " If the -U/--noupdate option is used, the new clone will contain\n"
5593 " only a repository (.hg) and no working copy (the working copy\n"
5542 " only a repository (.hg) and no working copy (the working copy\n"
5594 " parent is the null revision).\n"
5543 " parent is the null revision).\n"
5595 "\n"
5544 "\n"
5596 " See 'hg help urls' for valid source format details.\n"
5545 " See 'hg help urls' for valid source format details.\n"
5597 "\n"
5546 "\n"
5598 " It is possible to specify an ssh:// URL as the destination, but no\n"
5547 " It is possible to specify an ssh:// URL as the destination, but no\n"
5599 " .hg/hgrc and working directory will be created on the remote side.\n"
5548 " .hg/hgrc and working directory will be created on the remote side.\n"
5600 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5549 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5601 "\n"
5550 "\n"
5602 " For efficiency, hardlinks are used for cloning whenever the source\n"
5551 " For efficiency, hardlinks are used for cloning whenever the source\n"
5603 " and destination are on the same filesystem (note this applies only\n"
5552 " and destination are on the same filesystem (note this applies only\n"
5604 " to the repository data, not to the checked out files). Some\n"
5553 " to the repository data, not to the checked out files). Some\n"
5605 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5554 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5606 " do not report errors. In these cases, use the --pull option to\n"
5555 " do not report errors. In these cases, use the --pull option to\n"
5607 " avoid hardlinking.\n"
5556 " avoid hardlinking.\n"
5608 "\n"
5557 "\n"
5609 " In some cases, you can clone repositories and checked out files\n"
5558 " In some cases, you can clone repositories and checked out files\n"
5610 " using full hardlinks with ::\n"
5559 " using full hardlinks with ::\n"
5611 "\n"
5560 "\n"
5612 " $ cp -al REPO REPOCLONE\n"
5561 " $ cp -al REPO REPOCLONE\n"
5613 "\n"
5562 "\n"
5614 " This is the fastest way to clone, but it is not always safe. The\n"
5563 " This is the fastest way to clone, but it is not always safe. The\n"
5615 " operation is not atomic (making sure REPO is not modified during\n"
5564 " operation is not atomic (making sure REPO is not modified during\n"
5616 " the operation is up to you) and you have to make sure your editor\n"
5565 " the operation is up to you) and you have to make sure your editor\n"
5617 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5566 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5618 " this is not compatible with certain extensions that place their\n"
5567 " this is not compatible with certain extensions that place their\n"
5619 " metadata under the .hg directory, such as mq.\n"
5568 " metadata under the .hg directory, such as mq.\n"
5620 " "
5569 " "
5621 msgstr ""
5570 msgstr ""
5622
5571
5623 msgid ""
5572 msgid ""
5624 "commit the specified files or all outstanding changes\n"
5573 "commit the specified files or all outstanding changes\n"
5625 "\n"
5574 "\n"
5626 " Commit changes to the given files into the repository. Unlike a\n"
5575 " Commit changes to the given files into the repository. Unlike a\n"
5627 " centralized RCS, this operation is a local operation. See hg push\n"
5576 " centralized RCS, this operation is a local operation. See hg push\n"
5628 " for a way to actively distribute your changes.\n"
5577 " for a way to actively distribute your changes.\n"
5629 "\n"
5578 "\n"
5630 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5579 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5631 " will be committed.\n"
5580 " will be committed.\n"
5632 "\n"
5581 "\n"
5633 " If you are committing the result of a merge, do not provide any\n"
5582 " If you are committing the result of a merge, do not provide any\n"
5634 " filenames or -I/-X filters.\n"
5583 " filenames or -I/-X filters.\n"
5635 "\n"
5584 "\n"
5636 " If no commit message is specified, the configured editor is\n"
5585 " If no commit message is specified, the configured editor is\n"
5637 " started to prompt you for a message.\n"
5586 " started to prompt you for a message.\n"
5638 "\n"
5587 "\n"
5639 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5588 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5640 " "
5589 " "
5641 msgstr ""
5590 msgstr ""
5642
5591
5643 msgid "nothing changed\n"
5592 msgid "nothing changed\n"
5644 msgstr ""
5593 msgstr ""
5645
5594
5646 msgid "created new head\n"
5595 msgid "created new head\n"
5647 msgstr ""
5596 msgstr ""
5648
5597
5649 #, python-format
5598 #, python-format
5650 msgid "committed changeset %d:%s\n"
5599 msgid "committed changeset %d:%s\n"
5651 msgstr ""
5600 msgstr ""
5652
5601
5653 msgid ""
5602 msgid ""
5654 "mark files as copied for the next commit\n"
5603 "mark files as copied for the next commit\n"
5655 "\n"
5604 "\n"
5656 " Mark dest as having copies of source files. If dest is a\n"
5605 " Mark dest as having copies of source files. If dest is a\n"
5657 " directory, copies are put in that directory. If dest is a file,\n"
5606 " directory, copies are put in that directory. If dest is a file,\n"
5658 " the source must be a single file.\n"
5607 " the source must be a single file.\n"
5659 "\n"
5608 "\n"
5660 " By default, this command copies the contents of files as they\n"
5609 " By default, this command copies the contents of files as they\n"
5661 " exist in the working directory. If invoked with -A/--after, the\n"
5610 " exist in the working directory. If invoked with -A/--after, the\n"
5662 " operation is recorded, but no copying is performed.\n"
5611 " operation is recorded, but no copying is performed.\n"
5663 "\n"
5612 "\n"
5664 " This command takes effect with the next commit. To undo a copy\n"
5613 " This command takes effect with the next commit. To undo a copy\n"
5665 " before that, see hg revert.\n"
5614 " before that, see hg revert.\n"
5666 " "
5615 " "
5667 msgstr ""
5616 msgstr ""
5668
5617
5669 msgid "find the ancestor revision of two revisions in a given index"
5618 msgid "find the ancestor revision of two revisions in a given index"
5670 msgstr ""
5619 msgstr ""
5671
5620
5672 msgid "There is no Mercurial repository here (.hg not found)"
5621 msgid "There is no Mercurial repository here (.hg not found)"
5673 msgstr ""
5622 msgstr ""
5674
5623
5675 msgid "either two or three arguments required"
5624 msgid "either two or three arguments required"
5676 msgstr ""
5625 msgstr ""
5677
5626
5678 msgid "returns the completion list associated with the given command"
5627 msgid "returns the completion list associated with the given command"
5679 msgstr ""
5628 msgstr ""
5680
5629
5681 msgid "rebuild the dirstate as it would look like for the given revision"
5630 msgid "rebuild the dirstate as it would look like for the given revision"
5682 msgstr ""
5631 msgstr ""
5683
5632
5684 msgid "validate the correctness of the current dirstate"
5633 msgid "validate the correctness of the current dirstate"
5685 msgstr ""
5634 msgstr ""
5686
5635
5687 #, python-format
5636 #, python-format
5688 msgid "%s in state %s, but not in manifest1\n"
5637 msgid "%s in state %s, but not in manifest1\n"
5689 msgstr ""
5638 msgstr ""
5690
5639
5691 #, python-format
5640 #, python-format
5692 msgid "%s in state %s, but also in manifest1\n"
5641 msgid "%s in state %s, but also in manifest1\n"
5693 msgstr ""
5642 msgstr ""
5694
5643
5695 #, python-format
5644 #, python-format
5696 msgid "%s in state %s, but not in either manifest\n"
5645 msgid "%s in state %s, but not in either manifest\n"
5697 msgstr ""
5646 msgstr ""
5698
5647
5699 #, python-format
5648 #, python-format
5700 msgid "%s in manifest1, but listed as state %s"
5649 msgid "%s in manifest1, but listed as state %s"
5701 msgstr ""
5650 msgstr ""
5702
5651
5703 msgid ".hg/dirstate inconsistent with current parent's manifest"
5652 msgid ".hg/dirstate inconsistent with current parent's manifest"
5704 msgstr ""
5653 msgstr ""
5705
5654
5706 msgid ""
5655 msgid ""
5707 "show combined config settings from all hgrc files\n"
5656 "show combined config settings from all hgrc files\n"
5708 "\n"
5657 "\n"
5709 " With no arguments, print names and values of all config items.\n"
5658 " With no arguments, print names and values of all config items.\n"
5710 "\n"
5659 "\n"
5711 " With one argument of the form section.name, print just the value\n"
5660 " With one argument of the form section.name, print just the value\n"
5712 " of that config item.\n"
5661 " of that config item.\n"
5713 "\n"
5662 "\n"
5714 " With multiple arguments, print names and values of all config\n"
5663 " With multiple arguments, print names and values of all config\n"
5715 " items with matching section names.\n"
5664 " items with matching section names.\n"
5716 "\n"
5665 "\n"
5717 " With --debug, the source (filename and line number) is printed\n"
5666 " With --debug, the source (filename and line number) is printed\n"
5718 " for each config item.\n"
5667 " for each config item.\n"
5719 " "
5668 " "
5720 msgstr ""
5669 msgstr ""
5721
5670
5722 msgid "only one config item permitted"
5671 msgid "only one config item permitted"
5723 msgstr ""
5672 msgstr ""
5724
5673
5725 msgid ""
5674 msgid ""
5726 "manually set the parents of the current working directory\n"
5675 "manually set the parents of the current working directory\n"
5727 "\n"
5676 "\n"
5728 " This is useful for writing repository conversion tools, but should\n"
5677 " This is useful for writing repository conversion tools, but should\n"
5729 " be used with care.\n"
5678 " be used with care.\n"
5730 " "
5679 " "
5731 msgstr ""
5680 msgstr ""
5732
5681
5733 msgid "show the contents of the current dirstate"
5682 msgid "show the contents of the current dirstate"
5734 msgstr ""
5683 msgstr ""
5735
5684
5736 #, python-format
5685 #, python-format
5737 msgid "copy: %s -> %s\n"
5686 msgid "copy: %s -> %s\n"
5738 msgstr ""
5687 msgstr ""
5739
5688
5740 msgid "dump the contents of a data file revision"
5689 msgid "dump the contents of a data file revision"
5741 msgstr ""
5690 msgstr ""
5742
5691
5743 #, python-format
5692 #, python-format
5744 msgid "invalid revision identifier %s"
5693 msgid "invalid revision identifier %s"
5745 msgstr ""
5694 msgstr ""
5746
5695
5747 msgid "parse and display a date"
5696 msgid "parse and display a date"
5748 msgstr ""
5697 msgstr ""
5749
5698
5750 msgid "dump the contents of an index file"
5699 msgid "dump the contents of an index file"
5751 msgstr ""
5700 msgstr ""
5752
5701
5753 msgid "dump an index DAG as a graphviz dot file"
5702 msgid "dump an index DAG as a graphviz dot file"
5754 msgstr ""
5703 msgstr ""
5755
5704
5756 msgid "test Mercurial installation"
5705 msgid "test Mercurial installation"
5757 msgstr ""
5706 msgstr ""
5758
5707
5759 #, python-format
5708 #, python-format
5760 msgid "Checking encoding (%s)...\n"
5709 msgid "Checking encoding (%s)...\n"
5761 msgstr ""
5710 msgstr ""
5762
5711
5763 msgid " (check that your locale is properly set)\n"
5712 msgid " (check that your locale is properly set)\n"
5764 msgstr ""
5713 msgstr ""
5765
5714
5766 msgid "Checking extensions...\n"
5715 msgid "Checking extensions...\n"
5767 msgstr ""
5716 msgstr ""
5768
5717
5769 msgid " One or more extensions could not be found"
5718 msgid " One or more extensions could not be found"
5770 msgstr ""
5719 msgstr ""
5771
5720
5772 msgid " (check that you compiled the extensions)\n"
5721 msgid " (check that you compiled the extensions)\n"
5773 msgstr ""
5722 msgstr ""
5774
5723
5775 msgid "Checking templates...\n"
5724 msgid "Checking templates...\n"
5776 msgstr ""
5725 msgstr ""
5777
5726
5778 msgid " (templates seem to have been installed incorrectly)\n"
5727 msgid " (templates seem to have been installed incorrectly)\n"
5779 msgstr ""
5728 msgstr ""
5780
5729
5781 msgid "Checking patch...\n"
5730 msgid "Checking patch...\n"
5782 msgstr ""
5731 msgstr ""
5783
5732
5784 msgid " patch call failed:\n"
5733 msgid " patch call failed:\n"
5785 msgstr ""
5734 msgstr ""
5786
5735
5787 msgid " unexpected patch output!\n"
5736 msgid " unexpected patch output!\n"
5788 msgstr ""
5737 msgstr ""
5789
5738
5790 msgid " patch test failed!\n"
5739 msgid " patch test failed!\n"
5791 msgstr ""
5740 msgstr ""
5792
5741
5793 msgid ""
5742 msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
5794 " (Current patch tool may be incompatible with patch, or misconfigured. "
5743 msgstr ""
5795 "Please check your .hgrc file)\n"
5744
5796 msgstr ""
5745 msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
5797
5798 msgid ""
5799 " Internal patcher failure, please report this error to http://mercurial."
5800 "selenic.com/bts/\n"
5801 msgstr ""
5746 msgstr ""
5802
5747
5803 msgid "Checking commit editor...\n"
5748 msgid "Checking commit editor...\n"
5804 msgstr ""
5749 msgstr ""
5805
5750
5806 msgid " No commit editor set and can't find vi in PATH\n"
5751 msgid " No commit editor set and can't find vi in PATH\n"
5807 msgstr ""
5752 msgstr ""
5808
5753
5809 msgid " (specify a commit editor in your .hgrc file)\n"
5754 msgid " (specify a commit editor in your .hgrc file)\n"
5810 msgstr ""
5755 msgstr ""
5811
5756
5812 #, python-format
5757 #, python-format
5813 msgid " Can't find editor '%s' in PATH\n"
5758 msgid " Can't find editor '%s' in PATH\n"
5814 msgstr ""
5759 msgstr ""
5815
5760
5816 msgid "Checking username...\n"
5761 msgid "Checking username...\n"
5817 msgstr ""
5762 msgstr ""
5818
5763
5819 msgid " (specify a username in your .hgrc file)\n"
5764 msgid " (specify a username in your .hgrc file)\n"
5820 msgstr ""
5765 msgstr ""
5821
5766
5822 msgid "No problems detected\n"
5767 msgid "No problems detected\n"
5823 msgstr ""
5768 msgstr ""
5824
5769
5825 #, python-format
5770 #, python-format
5826 msgid "%s problems detected, please check your install!\n"
5771 msgid "%s problems detected, please check your install!\n"
5827 msgstr ""
5772 msgstr ""
5828
5773
5829 msgid "dump rename information"
5774 msgid "dump rename information"
5830 msgstr ""
5775 msgstr ""
5831
5776
5832 #, python-format
5777 #, python-format
5833 msgid "%s renamed from %s:%s\n"
5778 msgid "%s renamed from %s:%s\n"
5834 msgstr ""
5779 msgstr ""
5835
5780
5836 #, python-format
5781 #, python-format
5837 msgid "%s not renamed\n"
5782 msgid "%s not renamed\n"
5838 msgstr ""
5783 msgstr ""
5839
5784
5840 msgid "show how files match on given patterns"
5785 msgid "show how files match on given patterns"
5841 msgstr ""
5786 msgstr ""
5842
5787
5843 msgid ""
5788 msgid ""
5844 "diff repository (or selected files)\n"
5789 "diff repository (or selected files)\n"
5845 "\n"
5790 "\n"
5846 " Show differences between revisions for the specified files.\n"
5791 " Show differences between revisions for the specified files.\n"
5847 "\n"
5792 "\n"
5848 " Differences between files are shown using the unified diff format.\n"
5793 " Differences between files are shown using the unified diff format.\n"
5849 "\n"
5794 "\n"
5850 " NOTE: diff may generate unexpected results for merges, as it will\n"
5795 " NOTE: diff may generate unexpected results for merges, as it will\n"
5851 " default to comparing against the working directory's first parent\n"
5796 " default to comparing against the working directory's first parent\n"
5852 " changeset if no revisions are specified.\n"
5797 " changeset if no revisions are specified.\n"
5853 "\n"
5798 "\n"
5854 " When two revision arguments are given, then changes are shown\n"
5799 " When two revision arguments are given, then changes are shown\n"
5855 " between those revisions. If only one revision is specified then\n"
5800 " between those revisions. If only one revision is specified then\n"
5856 " that revision is compared to the working directory, and, when no\n"
5801 " that revision is compared to the working directory, and, when no\n"
5857 " revisions are specified, the working directory files are compared\n"
5802 " revisions are specified, the working directory files are compared\n"
5858 " to its parent.\n"
5803 " to its parent.\n"
5859 "\n"
5804 "\n"
5860 " Without the -a/--text option, diff will avoid generating diffs of\n"
5805 " Without the -a/--text option, diff will avoid generating diffs of\n"
5861 " files it detects as binary. With -a, diff will generate a diff\n"
5806 " files it detects as binary. With -a, diff will generate a diff\n"
5862 " anyway, probably with undesirable results.\n"
5807 " anyway, probably with undesirable results.\n"
5863 "\n"
5808 "\n"
5864 " Use the -g/--git option to generate diffs in the git extended diff\n"
5809 " Use the -g/--git option to generate diffs in the git extended diff\n"
5865 " format. For more information, read 'hg help diffs'.\n"
5810 " format. For more information, read 'hg help diffs'.\n"
5866 " "
5811 " "
5867 msgstr ""
5812 msgstr ""
5868
5813
5869 msgid ""
5814 msgid ""
5870 "dump the header and diffs for one or more changesets\n"
5815 "dump the header and diffs for one or more changesets\n"
5871 "\n"
5816 "\n"
5872 " Print the changeset header and diffs for one or more revisions.\n"
5817 " Print the changeset header and diffs for one or more revisions.\n"
5873 "\n"
5818 "\n"
5874 " The information shown in the changeset header is: author,\n"
5819 " The information shown in the changeset header is: author,\n"
5875 " changeset hash, parent(s) and commit comment.\n"
5820 " changeset hash, parent(s) and commit comment.\n"
5876 "\n"
5821 "\n"
5877 " NOTE: export may generate unexpected diff output for merge\n"
5822 " NOTE: export may generate unexpected diff output for merge\n"
5878 " changesets, as it will compare the merge changeset against its\n"
5823 " changesets, as it will compare the merge changeset against its\n"
5879 " first parent only.\n"
5824 " first parent only.\n"
5880 "\n"
5825 "\n"
5881 " Output may be to a file, in which case the name of the file is\n"
5826 " Output may be to a file, in which case the name of the file is\n"
5882 " given using a format string. The formatting rules are as follows::\n"
5827 " given using a format string. The formatting rules are as follows::\n"
5883 "\n"
5828 "\n"
5884 " %% literal \"%\" character\n"
5829 " %% literal \"%\" character\n"
5885 " %H changeset hash (40 bytes of hexadecimal)\n"
5830 " %H changeset hash (40 bytes of hexadecimal)\n"
5886 " %N number of patches being generated\n"
5831 " %N number of patches being generated\n"
5887 " %R changeset revision number\n"
5832 " %R changeset revision number\n"
5888 " %b basename of the exporting repository\n"
5833 " %b basename of the exporting repository\n"
5889 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5834 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5890 " %n zero-padded sequence number, starting at 1\n"
5835 " %n zero-padded sequence number, starting at 1\n"
5891 " %r zero-padded changeset revision number\n"
5836 " %r zero-padded changeset revision number\n"
5892 "\n"
5837 "\n"
5893 " Without the -a/--text option, export will avoid generating diffs\n"
5838 " Without the -a/--text option, export will avoid generating diffs\n"
5894 " of files it detects as binary. With -a, export will generate a\n"
5839 " of files it detects as binary. With -a, export will generate a\n"
5895 " diff anyway, probably with undesirable results.\n"
5840 " diff anyway, probably with undesirable results.\n"
5896 "\n"
5841 "\n"
5897 " Use the -g/--git option to generate diffs in the git extended diff\n"
5842 " Use the -g/--git option to generate diffs in the git extended diff\n"
5898 " format. See 'hg help diffs' for more information.\n"
5843 " format. See 'hg help diffs' for more information.\n"
5899 "\n"
5844 "\n"
5900 " With the --switch-parent option, the diff will be against the\n"
5845 " With the --switch-parent option, the diff will be against the\n"
5901 " second parent. It can be useful to review a merge.\n"
5846 " second parent. It can be useful to review a merge.\n"
5902 " "
5847 " "
5903 msgstr ""
5848 msgstr ""
5904
5849
5905 msgid "export requires at least one changeset"
5850 msgid "export requires at least one changeset"
5906 msgstr ""
5851 msgstr ""
5907
5852
5908 msgid "exporting patches:\n"
5853 msgid "exporting patches:\n"
5909 msgstr ""
5854 msgstr ""
5910
5855
5911 msgid "exporting patch:\n"
5856 msgid "exporting patch:\n"
5912 msgstr ""
5857 msgstr ""
5913
5858
5914 msgid ""
5859 msgid ""
5915 "forget the specified files on the next commit\n"
5860 "forget the specified files on the next commit\n"
5916 "\n"
5861 "\n"
5917 " Mark the specified files so they will no longer be tracked\n"
5862 " Mark the specified files so they will no longer be tracked\n"
5918 " after the next commit.\n"
5863 " after the next commit.\n"
5919 "\n"
5864 "\n"
5920 " This only removes files from the current branch, not from the\n"
5865 " This only removes files from the current branch, not from the\n"
5921 " entire project history, and it does not delete them from the\n"
5866 " entire project history, and it does not delete them from the\n"
5922 " working directory.\n"
5867 " working directory.\n"
5923 "\n"
5868 "\n"
5924 " To undo a forget before the next commit, see hg add.\n"
5869 " To undo a forget before the next commit, see hg add.\n"
5925 " "
5870 " "
5926 msgstr ""
5871 msgstr ""
5927
5872
5928 msgid "no files specified"
5873 msgid "no files specified"
5929 msgstr ""
5874 msgstr ""
5930
5875
5931 #, python-format
5876 #, python-format
5932 msgid "not removing %s: file is already untracked\n"
5877 msgid "not removing %s: file is already untracked\n"
5933 msgstr ""
5878 msgstr ""
5934
5879
5935 msgid ""
5880 msgid ""
5936 "search for a pattern in specified files and revisions\n"
5881 "search for a pattern in specified files and revisions\n"
5937 "\n"
5882 "\n"
5938 " Search revisions of files for a regular expression.\n"
5883 " Search revisions of files for a regular expression.\n"
5939 "\n"
5884 "\n"
5940 " This command behaves differently than Unix grep. It only accepts\n"
5885 " This command behaves differently than Unix grep. It only accepts\n"
5941 " Python/Perl regexps. It searches repository history, not the\n"
5886 " Python/Perl regexps. It searches repository history, not the\n"
5942 " working directory. It always prints the revision number in which a\n"
5887 " working directory. It always prints the revision number in which a\n"
5943 " match appears.\n"
5888 " match appears.\n"
5944 "\n"
5889 "\n"
5945 " By default, grep only prints output for the first revision of a\n"
5890 " By default, grep only prints output for the first revision of a\n"
5946 " file in which it finds a match. To get it to print every revision\n"
5891 " file in which it finds a match. To get it to print every revision\n"
5947 " that contains a change in match status (\"-\" for a match that\n"
5892 " that contains a change in match status (\"-\" for a match that\n"
5948 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5893 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5949 " use the --all flag.\n"
5894 " use the --all flag.\n"
5950 " "
5895 " "
5951 msgstr ""
5896 msgstr ""
5952
5897
5953 #, python-format
5898 #, python-format
5954 msgid "grep: invalid match pattern: %s\n"
5899 msgid "grep: invalid match pattern: %s\n"
5955 msgstr ""
5900 msgstr ""
5956
5901
5957 msgid ""
5902 msgid ""
5958 "show current repository heads or show branch heads\n"
5903 "show current repository heads or show branch heads\n"
5959 "\n"
5904 "\n"
5960 " With no arguments, show all repository head changesets.\n"
5905 " With no arguments, show all repository head changesets.\n"
5961 "\n"
5906 "\n"
5962 " Repository \"heads\" are changesets with no child changesets. They are\n"
5907 " Repository \"heads\" are changesets with no child changesets. They are\n"
5963 " where development generally takes place and are the usual targets\n"
5908 " where development generally takes place and are the usual targets\n"
5964 " for update and merge operations.\n"
5909 " for update and merge operations.\n"
5965 "\n"
5910 "\n"
5966 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5911 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5967 " the named branch associated with the specified changeset(s).\n"
5912 " the named branch associated with the specified changeset(s).\n"
5968 "\n"
5913 "\n"
5969 " Branch heads are changesets on a named branch with no descendants on\n"
5914 " Branch heads are changesets on a named branch with no descendants on\n"
5970 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5915 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5971 " or it could be the last changeset on that branch before it was\n"
5916 " or it could be the last changeset on that branch before it was\n"
5972 " merged into another branch, or it could be the last changeset on the\n"
5917 " merged into another branch, or it could be the last changeset on the\n"
5973 " branch before a new branch was created. If none of the branch heads\n"
5918 " branch before a new branch was created. If none of the branch heads\n"
5974 " are true heads, the branch is considered inactive.\n"
5919 " are true heads, the branch is considered inactive.\n"
5975 "\n"
5920 "\n"
5976 " If -c/--closed is specified, also show branch heads marked closed\n"
5921 " If -c/--closed is specified, also show branch heads marked closed\n"
5977 " (see hg commit --close-branch).\n"
5922 " (see hg commit --close-branch).\n"
5978 "\n"
5923 "\n"
5979 " If STARTREV is specified, only those heads that are descendants of\n"
5924 " If STARTREV is specified, only those heads that are descendants of\n"
5980 " STARTREV will be displayed.\n"
5925 " STARTREV will be displayed.\n"
5981 " "
5926 " "
5982 msgstr ""
5927 msgstr ""
5983
5928
5984 msgid "you must specify a branch to use --closed"
5929 msgid "you must specify a branch to use --closed"
5985 msgstr ""
5930 msgstr ""
5986
5931
5987 #, python-format
5932 #, python-format
5988 msgid "no open branch heads on branch %s\n"
5933 msgid "no open branch heads on branch %s\n"
5989 msgstr ""
5934 msgstr ""
5990
5935
5991 #, python-format
5936 #, python-format
5992 msgid "no changes on branch %s containing %s are reachable from %s\n"
5937 msgid "no changes on branch %s containing %s are reachable from %s\n"
5993 msgstr ""
5938 msgstr ""
5994
5939
5995 #, python-format
5940 #, python-format
5996 msgid "no changes on branch %s are reachable from %s\n"
5941 msgid "no changes on branch %s are reachable from %s\n"
5997 msgstr ""
5942 msgstr ""
5998
5943
5999 msgid ""
5944 msgid ""
6000 "show help for a given topic or a help overview\n"
5945 "show help for a given topic or a help overview\n"
6001 "\n"
5946 "\n"
6002 " With no arguments, print a list of commands with short help messages.\n"
5947 " With no arguments, print a list of commands with short help messages.\n"
6003 "\n"
5948 "\n"
6004 " Given a topic, extension, or command name, print help for that\n"
5949 " Given a topic, extension, or command name, print help for that\n"
6005 " topic."
5950 " topic."
6006 msgstr ""
5951 msgstr ""
6007
5952
6008 msgid "global options:"
5953 msgid "global options:"
6009 msgstr "options globales :"
5954 msgstr "options globales :"
6010
5955
6011 msgid "use \"hg help\" for the full list of commands"
5956 msgid "use \"hg help\" for the full list of commands"
6012 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
5957 msgstr "utiliser \"hg help\" pour la liste complète des commandes"
6013
5958
6014 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5959 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
6015 msgstr ""
5960 msgstr "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour plus de détails"
6016 "utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour "
6017 "plus de détails"
6018
5961
6019 # la chaîne passée est préfixée par un espace
5962 # la chaîne passée est préfixée par un espace
6020 #, python-format
5963 #, python-format
6021 msgid "use \"hg -v help%s\" to show aliases and global options"
5964 msgid "use \"hg -v help%s\" to show aliases and global options"
6022 msgstr ""
5965 msgstr "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
6023 "utiliser \"hg -v help%s\" pour afficher les alias et les options globales"
6024
5966
6025 #, python-format
5967 #, python-format
6026 msgid "use \"hg -v help %s\" to show global options"
5968 msgid "use \"hg -v help %s\" to show global options"
6027 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
5969 msgstr "utiliser \"hg -v help %s\" pour afficher les options globales"
6028
5970
6029 msgid ""
5971 msgid ""
6030 "list of commands:\n"
5972 "list of commands:\n"
6031 "\n"
5973 "\n"
6032 msgstr ""
5974 msgstr ""
6033 "liste des commandes :\n"
5975 "liste des commandes :\n"
6034 "\n"
5976 "\n"
6035
5977
6036 #, python-format
5978 #, python-format
6037 msgid ""
5979 msgid ""
6038 "\n"
5980 "\n"
6039 "aliases: %s\n"
5981 "aliases: %s\n"
6040 msgstr ""
5982 msgstr ""
6041 "\n"
5983 "\n"
6042 "alias : %s\n"
5984 "alias : %s\n"
6043
5985
6044 msgid "(no help text available)"
5986 msgid "(no help text available)"
6045 msgstr "(pas d'aide disponible)"
5987 msgstr "(pas d'aide disponible)"
6046
5988
6047 msgid "options:\n"
5989 msgid "options:\n"
6048 msgstr "options :\n"
5990 msgstr "options :\n"
6049
5991
6050 msgid "no commands defined\n"
5992 msgid "no commands defined\n"
6051 msgstr "pas de commandes définies\n"
5993 msgstr "pas de commandes définies\n"
6052
5994
6053 msgid "enabled extensions:"
5995 msgid "enabled extensions:"
6054 msgstr "extensions activées :"
5996 msgstr "extensions activées :"
6055
5997
6056 msgid "no help text available"
5998 msgid "no help text available"
6057 msgstr "pas d'aide disponible"
5999 msgstr "pas d'aide disponible"
6058
6000
6059 #, fuzzy, python-format
6001 #, fuzzy, python-format
6060 msgid ""
6002 msgid ""
6061 "%s extension - %s\n"
6003 "%s extension - %s\n"
6062 "\n"
6004 "\n"
6063 msgstr "extension %s - %s\n"
6005 msgstr "extension %s - %s\n"
6064
6006
6065 msgid "Mercurial Distributed SCM\n"
6007 msgid "Mercurial Distributed SCM\n"
6066 msgstr "Mercurial, système de gestion de sources distribué\n"
6008 msgstr "Mercurial, système de gestion de sources distribué\n"
6067
6009
6068 msgid ""
6010 msgid ""
6069 "basic commands:\n"
6011 "basic commands:\n"
6070 "\n"
6012 "\n"
6071 msgstr ""
6013 msgstr ""
6072 "commandes de base :\n"
6014 "commandes de base :\n"
6073 "\n"
6015 "\n"
6074
6016
6075 msgid ""
6017 msgid ""
6076 "\n"
6018 "\n"
6077 "additional help topics:\n"
6019 "additional help topics:\n"
6078 "\n"
6020 "\n"
6079 msgstr ""
6021 msgstr ""
6080 "\n"
6022 "\n"
6081 "sujets d'aide supplémentaires :\n"
6023 "sujets d'aide supplémentaires :\n"
6082 "\n"
6024 "\n"
6083
6025
6084 msgid ""
6026 msgid ""
6085 "identify the working copy or specified revision\n"
6027 "identify the working copy or specified revision\n"
6086 "\n"
6028 "\n"
6087 " With no revision, print a summary of the current state of the\n"
6029 " With no revision, print a summary of the current state of the\n"
6088 " repository.\n"
6030 " repository.\n"
6089 "\n"
6031 "\n"
6090 " Specifying a path to a repository root or Mercurial bundle will\n"
6032 " Specifying a path to a repository root or Mercurial bundle will\n"
6091 " cause lookup to operate on that repository/bundle.\n"
6033 " cause lookup to operate on that repository/bundle.\n"
6092 "\n"
6034 "\n"
6093 " This summary identifies the repository state using one or two\n"
6035 " This summary identifies the repository state using one or two\n"
6094 " parent hash identifiers, followed by a \"+\" if there are\n"
6036 " parent hash identifiers, followed by a \"+\" if there are\n"
6095 " uncommitted changes in the working directory, a list of tags for\n"
6037 " uncommitted changes in the working directory, a list of tags for\n"
6096 " this revision and a branch name for non-default branches.\n"
6038 " this revision and a branch name for non-default branches.\n"
6097 " "
6039 " "
6098 msgstr ""
6040 msgstr ""
6099
6041
6100 msgid ""
6042 msgid ""
6101 "import an ordered set of patches\n"
6043 "import an ordered set of patches\n"
6102 "\n"
6044 "\n"
6103 " Import a list of patches and commit them individually.\n"
6045 " Import a list of patches and commit them individually.\n"
6104 "\n"
6046 "\n"
6105 " If there are outstanding changes in the working directory, import\n"
6047 " If there are outstanding changes in the working directory, import\n"
6106 " will abort unless given the -f/--force flag.\n"
6048 " will abort unless given the -f/--force flag.\n"
6107 "\n"
6049 "\n"
6108 " You can import a patch straight from a mail message. Even patches\n"
6050 " You can import a patch straight from a mail message. Even patches\n"
6109 " as attachments work (to use the body part, it must have type\n"
6051 " as attachments work (to use the body part, it must have type\n"
6110 " text/plain or text/x-patch). From and Subject headers of email\n"
6052 " text/plain or text/x-patch). From and Subject headers of email\n"
6111 " message are used as default committer and commit message. All\n"
6053 " message are used as default committer and commit message. All\n"
6112 " text/plain body parts before first diff are added to commit\n"
6054 " text/plain body parts before first diff are added to commit\n"
6113 " message.\n"
6055 " message.\n"
6114 "\n"
6056 "\n"
6115 " If the imported patch was generated by hg export, user and\n"
6057 " If the imported patch was generated by hg export, user and\n"
6116 " description from patch override values from message headers and\n"
6058 " description from patch override values from message headers and\n"
6117 " body. Values given on command line with -m/--message and -u/--user\n"
6059 " body. Values given on command line with -m/--message and -u/--user\n"
6118 " override these.\n"
6060 " override these.\n"
6119 "\n"
6061 "\n"
6120 " If --exact is specified, import will set the working directory to\n"
6062 " If --exact is specified, import will set the working directory to\n"
6121 " the parent of each patch before applying it, and will abort if the\n"
6063 " the parent of each patch before applying it, and will abort if the\n"
6122 " resulting changeset has a different ID than the one recorded in\n"
6064 " resulting changeset has a different ID than the one recorded in\n"
6123 " the patch. This may happen due to character set problems or other\n"
6065 " the patch. This may happen due to character set problems or other\n"
6124 " deficiencies in the text patch format.\n"
6066 " deficiencies in the text patch format.\n"
6125 "\n"
6067 "\n"
6126 " With -s/--similarity, hg will attempt to discover renames and\n"
6068 " With -s/--similarity, hg will attempt to discover renames and\n"
6127 " copies in the patch in the same way as 'addremove'.\n"
6069 " copies in the patch in the same way as 'addremove'.\n"
6128 "\n"
6070 "\n"
6129 " To read a patch from standard input, use \"-\" as the patch name. If\n"
6071 " To read a patch from standard input, use \"-\" as the patch name. If\n"
6130 " a URL is specified, the patch will be downloaded from it.\n"
6072 " a URL is specified, the patch will be downloaded from it.\n"
6131 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6073 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6132 " "
6074 " "
6133 msgstr ""
6075 msgstr ""
6134
6076
6135 msgid "applying patch from stdin\n"
6077 msgid "applying patch from stdin\n"
6136 msgstr ""
6078 msgstr ""
6137
6079
6138 msgid "no diffs found"
6080 msgid "no diffs found"
6139 msgstr ""
6081 msgstr ""
6140
6082
6141 msgid "not a Mercurial patch"
6083 msgid "not a Mercurial patch"
6142 msgstr ""
6084 msgstr ""
6143
6085
6144 msgid "patch is damaged or loses information"
6086 msgid "patch is damaged or loses information"
6145 msgstr ""
6087 msgstr ""
6146
6088
6147 msgid ""
6089 msgid ""
6148 "show new changesets found in source\n"
6090 "show new changesets found in source\n"
6149 "\n"
6091 "\n"
6150 " Show new changesets found in the specified path/URL or the default\n"
6092 " Show new changesets found in the specified path/URL or the default\n"
6151 " pull location. These are the changesets that would have been pulled\n"
6093 " pull location. These are the changesets that would have been pulled\n"
6152 " if a pull at the time you issued this command.\n"
6094 " if a pull at the time you issued this command.\n"
6153 "\n"
6095 "\n"
6154 " For remote repository, using --bundle avoids downloading the\n"
6096 " For remote repository, using --bundle avoids downloading the\n"
6155 " changesets twice if the incoming is followed by a pull.\n"
6097 " changesets twice if the incoming is followed by a pull.\n"
6156 "\n"
6098 "\n"
6157 " See pull for valid source format details.\n"
6099 " See pull for valid source format details.\n"
6158 " "
6100 " "
6159 msgstr ""
6101 msgstr ""
6160
6102
6161 msgid ""
6103 msgid ""
6162 "create a new repository in the given directory\n"
6104 "create a new repository in the given directory\n"
6163 "\n"
6105 "\n"
6164 " Initialize a new repository in the given directory. If the given\n"
6106 " Initialize a new repository in the given directory. If the given\n"
6165 " directory does not exist, it will be created.\n"
6107 " directory does not exist, it will be created.\n"
6166 "\n"
6108 "\n"
6167 " If no directory is given, the current directory is used.\n"
6109 " If no directory is given, the current directory is used.\n"
6168 "\n"
6110 "\n"
6169 " It is possible to specify an ssh:// URL as the destination.\n"
6111 " It is possible to specify an ssh:// URL as the destination.\n"
6170 " See 'hg help urls' for more information.\n"
6112 " See 'hg help urls' for more information.\n"
6171 " "
6113 " "
6172 msgstr ""
6114 msgstr ""
6173
6115
6174 msgid ""
6116 msgid ""
6175 "locate files matching specific patterns\n"
6117 "locate files matching specific patterns\n"
6176 "\n"
6118 "\n"
6177 " Print files under Mercurial control in the working directory whose\n"
6119 " Print files under Mercurial control in the working directory whose\n"
6178 " names match the given patterns.\n"
6120 " names match the given patterns.\n"
6179 "\n"
6121 "\n"
6180 " By default, this command searches all directories in the working\n"
6122 " By default, this command searches all directories in the working\n"
6181 " directory. To search just the current directory and its\n"
6123 " directory. To search just the current directory and its\n"
6182 " subdirectories, use \"--include .\".\n"
6124 " subdirectories, use \"--include .\".\n"
6183 "\n"
6125 "\n"
6184 " If no patterns are given to match, this command prints the names\n"
6126 " If no patterns are given to match, this command prints the names\n"
6185 " of all files under Mercurial control in the working directory.\n"
6127 " of all files under Mercurial control in the working directory.\n"
6186 "\n"
6128 "\n"
6187 " If you want to feed the output of this command into the \"xargs\"\n"
6129 " If you want to feed the output of this command into the \"xargs\"\n"
6188 " command, use the -0 option to both this command and \"xargs\". This\n"
6130 " command, use the -0 option to both this command and \"xargs\". This\n"
6189 " will avoid the problem of \"xargs\" treating single filenames that\n"
6131 " will avoid the problem of \"xargs\" treating single filenames that\n"
6190 " contain whitespace as multiple filenames.\n"
6132 " contain whitespace as multiple filenames.\n"
6191 " "
6133 " "
6192 msgstr ""
6134 msgstr ""
6193
6135
6194 msgid ""
6136 msgid ""
6195 "show revision history of entire repository or files\n"
6137 "show revision history of entire repository or files\n"
6196 "\n"
6138 "\n"
6197 " Print the revision history of the specified files or the entire\n"
6139 " Print the revision history of the specified files or the entire\n"
6198 " project.\n"
6140 " project.\n"
6199 "\n"
6141 "\n"
6200 " File history is shown without following rename or copy history of\n"
6142 " File history is shown without following rename or copy history of\n"
6201 " files. Use -f/--follow with a filename to follow history across\n"
6143 " files. Use -f/--follow with a filename to follow history across\n"
6202 " renames and copies. --follow without a filename will only show\n"
6144 " renames and copies. --follow without a filename will only show\n"
6203 " ancestors or descendants of the starting revision. --follow-first\n"
6145 " ancestors or descendants of the starting revision. --follow-first\n"
6204 " only follows the first parent of merge revisions.\n"
6146 " only follows the first parent of merge revisions.\n"
6205 "\n"
6147 "\n"
6206 " If no revision range is specified, the default is tip:0 unless\n"
6148 " If no revision range is specified, the default is tip:0 unless\n"
6207 " --follow is set, in which case the working directory parent is\n"
6149 " --follow is set, in which case the working directory parent is\n"
6208 " used as the starting revision.\n"
6150 " used as the starting revision.\n"
6209 "\n"
6151 "\n"
6210 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6152 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6211 "\n"
6153 "\n"
6212 " By default this command prints revision number and changeset id,\n"
6154 " By default this command prints revision number and changeset id,\n"
6213 " tags, non-trivial parents, user, date and time, and a summary for\n"
6155 " tags, non-trivial parents, user, date and time, and a summary for\n"
6214 " each commit. When the -v/--verbose switch is used, the list of\n"
6156 " each commit. When the -v/--verbose switch is used, the list of\n"
6215 " changed files and full commit message are shown.\n"
6157 " changed files and full commit message are shown.\n"
6216 "\n"
6158 "\n"
6217 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6159 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6218 " changesets, as it will only compare the merge changeset against\n"
6160 " changesets, as it will only compare the merge changeset against\n"
6219 " its first parent. Also, only files different from BOTH parents\n"
6161 " its first parent. Also, only files different from BOTH parents\n"
6220 " will appear in files:.\n"
6162 " will appear in files:.\n"
6221 " "
6163 " "
6222 msgstr ""
6164 msgstr ""
6223
6165
6224 msgid ""
6166 msgid ""
6225 "output the current or given revision of the project manifest\n"
6167 "output the current or given revision of the project manifest\n"
6226 "\n"
6168 "\n"
6227 " Print a list of version controlled files for the given revision.\n"
6169 " Print a list of version controlled files for the given revision.\n"
6228 " If no revision is given, the first parent of the working directory\n"
6170 " If no revision is given, the first parent of the working directory\n"
6229 " is used, or the null revision if no revision is checked out.\n"
6171 " is used, or the null revision if no revision is checked out.\n"
6230 "\n"
6172 "\n"
6231 " With -v, print file permissions, symlink and executable bits.\n"
6173 " With -v, print file permissions, symlink and executable bits.\n"
6232 " With --debug, print file revision hashes.\n"
6174 " With --debug, print file revision hashes.\n"
6233 " "
6175 " "
6234 msgstr ""
6176 msgstr ""
6235
6177
6236 msgid ""
6178 msgid ""
6237 "merge working directory with another revision\n"
6179 "merge working directory with another revision\n"
6238 "\n"
6180 "\n"
6239 " The current working directory is updated with all changes made in\n"
6181 " The current working directory is updated with all changes made in\n"
6240 " the requested revision since the last common predecessor revision.\n"
6182 " the requested revision since the last common predecessor revision.\n"
6241 "\n"
6183 "\n"
6242 " Files that changed between either parent are marked as changed for\n"
6184 " Files that changed between either parent are marked as changed for\n"
6243 " the next commit and a commit must be performed before any further\n"
6185 " the next commit and a commit must be performed before any further\n"
6244 " updates to the repository are allowed. The next commit will have\n"
6186 " updates to the repository are allowed. The next commit will have\n"
6245 " two parents.\n"
6187 " two parents.\n"
6246 "\n"
6188 "\n"
6247 " If no revision is specified, the working directory's parent is a\n"
6189 " If no revision is specified, the working directory's parent is a\n"
6248 " head revision, and the current branch contains exactly one other\n"
6190 " head revision, and the current branch contains exactly one other\n"
6249 " head, the other head is merged with by default. Otherwise, an\n"
6191 " head, the other head is merged with by default. Otherwise, an\n"
6250 " explicit revision with which to merge with must be provided.\n"
6192 " explicit revision with which to merge with must be provided.\n"
6251 " "
6193 " "
6252 msgstr ""
6194 msgstr ""
6253
6195
6254 #, python-format
6196 #, python-format
6255 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6197 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6256 msgstr ""
6198 msgstr ""
6257
6199
6258 #, python-format
6200 #, python-format
6259 msgid "branch '%s' has one head - please merge with an explicit rev"
6201 msgid "branch '%s' has one head - please merge with an explicit rev"
6260 msgstr ""
6202 msgstr ""
6261
6203
6262 msgid "there is nothing to merge"
6204 msgid "there is nothing to merge"
6263 msgstr ""
6205 msgstr ""
6264
6206
6265 #, python-format
6207 #, python-format
6266 msgid "%s - use \"hg update\" instead"
6208 msgid "%s - use \"hg update\" instead"
6267 msgstr ""
6209 msgstr ""
6268
6210
6269 msgid ""
6211 msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
6270 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
6271 "rev"
6272 msgstr ""
6212 msgstr ""
6273
6213
6274 msgid ""
6214 msgid ""
6275 "show changesets not found in destination\n"
6215 "show changesets not found in destination\n"
6276 "\n"
6216 "\n"
6277 " Show changesets not found in the specified destination repository\n"
6217 " Show changesets not found in the specified destination repository\n"
6278 " or the default push location. These are the changesets that would\n"
6218 " or the default push location. These are the changesets that would\n"
6279 " be pushed if a push was requested.\n"
6219 " be pushed if a push was requested.\n"
6280 "\n"
6220 "\n"
6281 " See pull for valid destination format details.\n"
6221 " See pull for valid destination format details.\n"
6282 " "
6222 " "
6283 msgstr ""
6223 msgstr ""
6284
6224
6285 msgid ""
6225 msgid ""
6286 "show the parents of the working directory or revision\n"
6226 "show the parents of the working directory or revision\n"
6287 "\n"
6227 "\n"
6288 " Print the working directory's parent revisions. If a revision is\n"
6228 " Print the working directory's parent revisions. If a revision is\n"
6289 " given via -r/--rev, the parent of that revision will be printed.\n"
6229 " given via -r/--rev, the parent of that revision will be printed.\n"
6290 " If a file argument is given, the revision in which the file was\n"
6230 " If a file argument is given, the revision in which the file was\n"
6291 " last changed (before the working directory revision or the\n"
6231 " last changed (before the working directory revision or the\n"
6292 " argument to --rev if given) is printed.\n"
6232 " argument to --rev if given) is printed.\n"
6293 " "
6233 " "
6294 msgstr ""
6234 msgstr ""
6295
6235
6296 msgid "can only specify an explicit filename"
6236 msgid "can only specify an explicit filename"
6297 msgstr ""
6237 msgstr ""
6298
6238
6299 #, python-format
6239 #, python-format
6300 msgid "'%s' not found in manifest!"
6240 msgid "'%s' not found in manifest!"
6301 msgstr ""
6241 msgstr ""
6302
6242
6303 msgid ""
6243 msgid ""
6304 "show aliases for remote repositories\n"
6244 "show aliases for remote repositories\n"
6305 "\n"
6245 "\n"
6306 " Show definition of symbolic path name NAME. If no name is given,\n"
6246 " Show definition of symbolic path name NAME. If no name is given,\n"
6307 " show definition of all available names.\n"
6247 " show definition of all available names.\n"
6308 "\n"
6248 "\n"
6309 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6249 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6310 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6250 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6311 "\n"
6251 "\n"
6312 " See 'hg help urls' for more information.\n"
6252 " See 'hg help urls' for more information.\n"
6313 " "
6253 " "
6314 msgstr ""
6254 msgstr ""
6315
6255
6316 msgid "not found!\n"
6256 msgid "not found!\n"
6317 msgstr ""
6257 msgstr ""
6318
6258
6319 msgid "not updating, since new heads added\n"
6259 msgid "not updating, since new heads added\n"
6320 msgstr ""
6260 msgstr ""
6321
6261
6322 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6262 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6323 msgstr ""
6263 msgstr ""
6324
6264
6325 msgid "(run 'hg update' to get a working copy)\n"
6265 msgid "(run 'hg update' to get a working copy)\n"
6326 msgstr ""
6266 msgstr ""
6327
6267
6328 msgid ""
6268 msgid ""
6329 "pull changes from the specified source\n"
6269 "pull changes from the specified source\n"
6330 "\n"
6270 "\n"
6331 " Pull changes from a remote repository to a local one.\n"
6271 " Pull changes from a remote repository to a local one.\n"
6332 "\n"
6272 "\n"
6333 " This finds all changes from the repository at the specified path\n"
6273 " This finds all changes from the repository at the specified path\n"
6334 " or URL and adds them to a local repository (the current one unless\n"
6274 " or URL and adds them to a local repository (the current one unless\n"
6335 " -R is specified). By default, this does not update the copy of the\n"
6275 " -R is specified). By default, this does not update the copy of the\n"
6336 " project in the working directory.\n"
6276 " project in the working directory.\n"
6337 "\n"
6277 "\n"
6338 " Use hg incoming if you want to see what would have been added by a\n"
6278 " Use hg incoming if you want to see what would have been added by a\n"
6339 " pull at the time you issued this command. If you then decide to\n"
6279 " pull at the time you issued this command. If you then decide to\n"
6340 " added those changes to the repository, you should use pull -r X\n"
6280 " added those changes to the repository, you should use pull -r X\n"
6341 " where X is the last changeset listed by hg incoming.\n"
6281 " where X is the last changeset listed by hg incoming.\n"
6342 "\n"
6282 "\n"
6343 " If SOURCE is omitted, the 'default' path will be used.\n"
6283 " If SOURCE is omitted, the 'default' path will be used.\n"
6344 " See 'hg help urls' for more information.\n"
6284 " See 'hg help urls' for more information.\n"
6345 " "
6285 " "
6346 msgstr ""
6286 msgstr ""
6347
6287
6348 msgid ""
6288 msgid ""
6349 "push changes to the specified destination\n"
6289 "push changes to the specified destination\n"
6350 "\n"
6290 "\n"
6351 " Push changes from the local repository to the given destination.\n"
6291 " Push changes from the local repository to the given destination.\n"
6352 "\n"
6292 "\n"
6353 " This is the symmetrical operation for pull. It moves changes from\n"
6293 " This is the symmetrical operation for pull. It moves changes from\n"
6354 " the current repository to a different one. If the destination is\n"
6294 " the current repository to a different one. If the destination is\n"
6355 " local this is identical to a pull in that directory from the\n"
6295 " local this is identical to a pull in that directory from the\n"
6356 " current one.\n"
6296 " current one.\n"
6357 "\n"
6297 "\n"
6358 " By default, push will refuse to run if it detects the result would\n"
6298 " By default, push will refuse to run if it detects the result would\n"
6359 " increase the number of remote heads. This generally indicates the\n"
6299 " increase the number of remote heads. This generally indicates the\n"
6360 " user forgot to pull and merge before pushing.\n"
6300 " user forgot to pull and merge before pushing.\n"
6361 "\n"
6301 "\n"
6362 " If -r/--rev is used, the named revision and all its ancestors will\n"
6302 " If -r/--rev is used, the named revision and all its ancestors will\n"
6363 " be pushed to the remote repository.\n"
6303 " be pushed to the remote repository.\n"
6364 "\n"
6304 "\n"
6365 " Please see 'hg help urls' for important details about ssh://\n"
6305 " Please see 'hg help urls' for important details about ssh://\n"
6366 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6306 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6367 " "
6307 " "
6368 msgstr ""
6308 msgstr ""
6369
6309
6370 #, python-format
6310 #, python-format
6371 msgid "pushing to %s\n"
6311 msgid "pushing to %s\n"
6372 msgstr ""
6312 msgstr ""
6373
6313
6374 msgid ""
6314 msgid ""
6375 "roll back an interrupted transaction\n"
6315 "roll back an interrupted transaction\n"
6376 "\n"
6316 "\n"
6377 " Recover from an interrupted commit or pull.\n"
6317 " Recover from an interrupted commit or pull.\n"
6378 "\n"
6318 "\n"
6379 " This command tries to fix the repository status after an\n"
6319 " This command tries to fix the repository status after an\n"
6380 " interrupted operation. It should only be necessary when Mercurial\n"
6320 " interrupted operation. It should only be necessary when Mercurial\n"
6381 " suggests it.\n"
6321 " suggests it.\n"
6382 " "
6322 " "
6383 msgstr ""
6323 msgstr ""
6384
6324
6385 msgid ""
6325 msgid ""
6386 "remove the specified files on the next commit\n"
6326 "remove the specified files on the next commit\n"
6387 "\n"
6327 "\n"
6388 " Schedule the indicated files for removal from the repository.\n"
6328 " Schedule the indicated files for removal from the repository.\n"
6389 "\n"
6329 "\n"
6390 " This only removes files from the current branch, not from the\n"
6330 " This only removes files from the current branch, not from the\n"
6391 " entire project history. -A/--after can be used to remove only\n"
6331 " entire project history. -A/--after can be used to remove only\n"
6392 " files that have already been deleted, -f/--force can be used to\n"
6332 " files that have already been deleted, -f/--force can be used to\n"
6393 " force deletion, and -Af can be used to remove files from the next\n"
6333 " force deletion, and -Af can be used to remove files from the next\n"
6394 " revision without deleting them from the working directory.\n"
6334 " revision without deleting them from the working directory.\n"
6395 "\n"
6335 "\n"
6396 " The following table details the behavior of remove for different\n"
6336 " The following table details the behavior of remove for different\n"
6397 " file states (columns) and option combinations (rows). The file\n"
6337 " file states (columns) and option combinations (rows). The file\n"
6398 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6338 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6399 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6339 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6400 " and Delete (from disk)::\n"
6340 " and Delete (from disk)::\n"
6401 "\n"
6341 "\n"
6402 " A C M !\n"
6342 " A C M !\n"
6403 " none W RD W R\n"
6343 " none W RD W R\n"
6404 " -f R RD RD R\n"
6344 " -f R RD RD R\n"
6405 " -A W W W R\n"
6345 " -A W W W R\n"
6406 " -Af R R R R\n"
6346 " -Af R R R R\n"
6407 "\n"
6347 "\n"
6408 " This command schedules the files to be removed at the next commit.\n"
6348 " This command schedules the files to be removed at the next commit.\n"
6409 " To undo a remove before that, see hg revert.\n"
6349 " To undo a remove before that, see hg revert.\n"
6410 " "
6350 " "
6411 msgstr ""
6351 msgstr ""
6412
6352
6413 #, python-format
6353 #, python-format
6414 msgid "not removing %s: file is untracked\n"
6354 msgid "not removing %s: file is untracked\n"
6415 msgstr ""
6355 msgstr ""
6416
6356
6417 #, python-format
6357 #, python-format
6418 msgid "not removing %s: file %s (use -f to force removal)\n"
6358 msgid "not removing %s: file %s (use -f to force removal)\n"
6419 msgstr ""
6359 msgstr ""
6420
6360
6421 msgid "still exists"
6361 msgid "still exists"
6422 msgstr ""
6362 msgstr ""
6423
6363
6424 msgid "is modified"
6364 msgid "is modified"
6425 msgstr ""
6365 msgstr ""
6426
6366
6427 msgid "has been marked for add"
6367 msgid "has been marked for add"
6428 msgstr ""
6368 msgstr ""
6429
6369
6430 msgid ""
6370 msgid ""
6431 "rename files; equivalent of copy + remove\n"
6371 "rename files; equivalent of copy + remove\n"
6432 "\n"
6372 "\n"
6433 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6373 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6434 " is a directory, copies are put in that directory. If dest is a\n"
6374 " is a directory, copies are put in that directory. If dest is a\n"
6435 " file, there can only be one source.\n"
6375 " file, there can only be one source.\n"
6436 "\n"
6376 "\n"
6437 " By default, this command copies the contents of files as they\n"
6377 " By default, this command copies the contents of files as they\n"
6438 " exist in the working directory. If invoked with -A/--after, the\n"
6378 " exist in the working directory. If invoked with -A/--after, the\n"
6439 " operation is recorded, but no copying is performed.\n"
6379 " operation is recorded, but no copying is performed.\n"
6440 "\n"
6380 "\n"
6441 " This command takes effect at the next commit. To undo a rename\n"
6381 " This command takes effect at the next commit. To undo a rename\n"
6442 " before that, see hg revert.\n"
6382 " before that, see hg revert.\n"
6443 " "
6383 " "
6444 msgstr ""
6384 msgstr ""
6445
6385
6446 msgid ""
6386 msgid ""
6447 "retry file merges from a merge or update\n"
6387 "retry file merges from a merge or update\n"
6448 "\n"
6388 "\n"
6449 " This command will cleanly retry unresolved file merges using file\n"
6389 " This command will cleanly retry unresolved file merges using file\n"
6450 " revisions preserved from the last update or merge. To attempt to\n"
6390 " revisions preserved from the last update or merge. To attempt to\n"
6451 " resolve all unresolved files, use the -a/--all switch.\n"
6391 " resolve all unresolved files, use the -a/--all switch.\n"
6452 "\n"
6392 "\n"
6453 " If a conflict is resolved manually, please note that the changes\n"
6393 " If a conflict is resolved manually, please note that the changes\n"
6454 " will be overwritten if the merge is retried with resolve. The\n"
6394 " will be overwritten if the merge is retried with resolve. The\n"
6455 " -m/--mark switch should be used to mark the file as resolved.\n"
6395 " -m/--mark switch should be used to mark the file as resolved.\n"
6456 "\n"
6396 "\n"
6457 " This command also allows listing resolved files and manually\n"
6397 " This command also allows listing resolved files and manually\n"
6458 " indicating whether or not files are resolved. All files must be\n"
6398 " indicating whether or not files are resolved. All files must be\n"
6459 " marked as resolved before a commit is permitted.\n"
6399 " marked as resolved before a commit is permitted.\n"
6460 "\n"
6400 "\n"
6461 " The codes used to show the status of files are::\n"
6401 " The codes used to show the status of files are::\n"
6462 "\n"
6402 "\n"
6463 " U = unresolved\n"
6403 " U = unresolved\n"
6464 " R = resolved\n"
6404 " R = resolved\n"
6465 " "
6405 " "
6466 msgstr ""
6406 msgstr ""
6467
6407
6468 msgid "too many options specified"
6408 msgid "too many options specified"
6469 msgstr ""
6409 msgstr ""
6470
6410
6471 msgid "can't specify --all and patterns"
6411 msgid "can't specify --all and patterns"
6472 msgstr ""
6412 msgstr ""
6473
6413
6474 msgid "no files or directories specified; use --all to remerge all files"
6414 msgid "no files or directories specified; use --all to remerge all files"
6475 msgstr ""
6415 msgstr ""
6476
6416
6477 msgid ""
6417 msgid ""
6478 "restore individual files or directories to an earlier state\n"
6418 "restore individual files or directories to an earlier state\n"
6479 "\n"
6419 "\n"
6480 " (Use update -r to check out earlier revisions, revert does not\n"
6420 " (Use update -r to check out earlier revisions, revert does not\n"
6481 " change the working directory parents.)\n"
6421 " change the working directory parents.)\n"
6482 "\n"
6422 "\n"
6483 " With no revision specified, revert the named files or directories\n"
6423 " With no revision specified, revert the named files or directories\n"
6484 " to the contents they had in the parent of the working directory.\n"
6424 " to the contents they had in the parent of the working directory.\n"
6485 " This restores the contents of the affected files to an unmodified\n"
6425 " This restores the contents of the affected files to an unmodified\n"
6486 " state and unschedules adds, removes, copies, and renames. If the\n"
6426 " state and unschedules adds, removes, copies, and renames. If the\n"
6487 " working directory has two parents, you must explicitly specify the\n"
6427 " working directory has two parents, you must explicitly specify the\n"
6488 " revision to revert to.\n"
6428 " revision to revert to.\n"
6489 "\n"
6429 "\n"
6490 " Using the -r/--rev option, revert the given files or directories\n"
6430 " Using the -r/--rev option, revert the given files or directories\n"
6491 " to their contents as of a specific revision. This can be helpful\n"
6431 " to their contents as of a specific revision. This can be helpful\n"
6492 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6432 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6493 " dates' for a list of formats valid for -d/--date.\n"
6433 " dates' for a list of formats valid for -d/--date.\n"
6494 "\n"
6434 "\n"
6495 " Revert modifies the working directory. It does not commit any\n"
6435 " Revert modifies the working directory. It does not commit any\n"
6496 " changes, or change the parent of the working directory. If you\n"
6436 " changes, or change the parent of the working directory. If you\n"
6497 " revert to a revision other than the parent of the working\n"
6437 " revert to a revision other than the parent of the working\n"
6498 " directory, the reverted files will thus appear modified\n"
6438 " directory, the reverted files will thus appear modified\n"
6499 " afterwards.\n"
6439 " afterwards.\n"
6500 "\n"
6440 "\n"
6501 " If a file has been deleted, it is restored. If the executable mode\n"
6441 " If a file has been deleted, it is restored. If the executable mode\n"
6502 " of a file was changed, it is reset.\n"
6442 " of a file was changed, it is reset.\n"
6503 "\n"
6443 "\n"
6504 " If names are given, all files matching the names are reverted.\n"
6444 " If names are given, all files matching the names are reverted.\n"
6505 " If no arguments are given, no files are reverted.\n"
6445 " If no arguments are given, no files are reverted.\n"
6506 "\n"
6446 "\n"
6507 " Modified files are saved with a .orig suffix before reverting.\n"
6447 " Modified files are saved with a .orig suffix before reverting.\n"
6508 " To disable these backups, use --no-backup.\n"
6448 " To disable these backups, use --no-backup.\n"
6509 " "
6449 " "
6510 msgstr ""
6450 msgstr ""
6511
6451
6512 msgid "you can't specify a revision and a date"
6452 msgid "you can't specify a revision and a date"
6513 msgstr ""
6453 msgstr ""
6514
6454
6515 msgid "no files or directories specified; use --all to revert the whole repo"
6455 msgid "no files or directories specified; use --all to revert the whole repo"
6516 msgstr ""
6456 msgstr ""
6517
6457
6518 #, python-format
6458 #, python-format
6519 msgid "forgetting %s\n"
6459 msgid "forgetting %s\n"
6520 msgstr ""
6460 msgstr ""
6521
6461
6522 #, python-format
6462 #, python-format
6523 msgid "reverting %s\n"
6463 msgid "reverting %s\n"
6524 msgstr ""
6464 msgstr ""
6525
6465
6526 #, python-format
6466 #, python-format
6527 msgid "undeleting %s\n"
6467 msgid "undeleting %s\n"
6528 msgstr ""
6468 msgstr ""
6529
6469
6530 #, python-format
6470 #, python-format
6531 msgid "saving current version of %s as %s\n"
6471 msgid "saving current version of %s as %s\n"
6532 msgstr ""
6472 msgstr ""
6533
6473
6534 #, python-format
6474 #, python-format
6535 msgid "file not managed: %s\n"
6475 msgid "file not managed: %s\n"
6536 msgstr ""
6476 msgstr ""
6537
6477
6538 #, python-format
6478 #, python-format
6539 msgid "no changes needed to %s\n"
6479 msgid "no changes needed to %s\n"
6540 msgstr ""
6480 msgstr ""
6541
6481
6542 msgid ""
6482 msgid ""
6543 "roll back the last transaction\n"
6483 "roll back the last transaction\n"
6544 "\n"
6484 "\n"
6545 " This command should be used with care. There is only one level of\n"
6485 " This command should be used with care. There is only one level of\n"
6546 " rollback, and there is no way to undo a rollback. It will also\n"
6486 " rollback, and there is no way to undo a rollback. It will also\n"
6547 " restore the dirstate at the time of the last transaction, losing\n"
6487 " restore the dirstate at the time of the last transaction, losing\n"
6548 " any dirstate changes since that time. This command does not alter\n"
6488 " any dirstate changes since that time. This command does not alter\n"
6549 " the working directory.\n"
6489 " the working directory.\n"
6550 "\n"
6490 "\n"
6551 " Transactions are used to encapsulate the effects of all commands\n"
6491 " Transactions are used to encapsulate the effects of all commands\n"
6552 " that create new changesets or propagate existing changesets into a\n"
6492 " that create new changesets or propagate existing changesets into a\n"
6553 " repository. For example, the following commands are transactional,\n"
6493 " repository. For example, the following commands are transactional,\n"
6554 " and their effects can be rolled back::\n"
6494 " and their effects can be rolled back::\n"
6555 "\n"
6495 "\n"
6556 " commit\n"
6496 " commit\n"
6557 " import\n"
6497 " import\n"
6558 " pull\n"
6498 " pull\n"
6559 " push (with this repository as destination)\n"
6499 " push (with this repository as destination)\n"
6560 " unbundle\n"
6500 " unbundle\n"
6561 "\n"
6501 "\n"
6562 " This command is not intended for use on public repositories. Once\n"
6502 " This command is not intended for use on public repositories. Once\n"
6563 " changes are visible for pull by other users, rolling a transaction\n"
6503 " changes are visible for pull by other users, rolling a transaction\n"
6564 " back locally is ineffective (someone else may already have pulled\n"
6504 " back locally is ineffective (someone else may already have pulled\n"
6565 " the changes). Furthermore, a race is possible with readers of the\n"
6505 " the changes). Furthermore, a race is possible with readers of the\n"
6566 " repository; for example an in-progress pull from the repository\n"
6506 " repository; for example an in-progress pull from the repository\n"
6567 " may fail if a rollback is performed.\n"
6507 " may fail if a rollback is performed.\n"
6568 " "
6508 " "
6569 msgstr ""
6509 msgstr ""
6570
6510
6571 msgid ""
6511 msgid ""
6572 "print the root (top) of the current working directory\n"
6512 "print the root (top) of the current working directory\n"
6573 "\n"
6513 "\n"
6574 " Print the root directory of the current repository.\n"
6514 " Print the root directory of the current repository.\n"
6575 " "
6515 " "
6576 msgstr ""
6516 msgstr ""
6577
6517
6578 msgid ""
6518 msgid ""
6579 "export the repository via HTTP\n"
6519 "export the repository via HTTP\n"
6580 "\n"
6520 "\n"
6581 " Start a local HTTP repository browser and pull server.\n"
6521 " Start a local HTTP repository browser and pull server.\n"
6582 "\n"
6522 "\n"
6583 " By default, the server logs accesses to stdout and errors to\n"
6523 " By default, the server logs accesses to stdout and errors to\n"
6584 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6524 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6585 " files.\n"
6525 " files.\n"
6586 " "
6526 " "
6587 msgstr ""
6527 msgstr ""
6588
6528
6589 #, python-format
6529 #, python-format
6590 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6530 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6591 msgstr ""
6531 msgstr ""
6592
6532
6593 msgid ""
6533 msgid ""
6594 "show changed files in the working directory\n"
6534 "show changed files in the working directory\n"
6595 "\n"
6535 "\n"
6596 " Show status of files in the repository. If names are given, only\n"
6536 " Show status of files in the repository. If names are given, only\n"
6597 " files that match are shown. Files that are clean or ignored or\n"
6537 " files that match are shown. Files that are clean or ignored or\n"
6598 " the source of a copy/move operation, are not listed unless\n"
6538 " the source of a copy/move operation, are not listed unless\n"
6599 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6539 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6600 " Unless options described with \"show only ...\" are given, the\n"
6540 " Unless options described with \"show only ...\" are given, the\n"
6601 " options -mardu are used.\n"
6541 " options -mardu are used.\n"
6602 "\n"
6542 "\n"
6603 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6543 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6604 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6544 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6605 "\n"
6545 "\n"
6606 " NOTE: status may appear to disagree with diff if permissions have\n"
6546 " NOTE: status may appear to disagree with diff if permissions have\n"
6607 " changed or a merge has occurred. The standard diff format does not\n"
6547 " changed or a merge has occurred. The standard diff format does not\n"
6608 " report permission changes and diff only reports changes relative\n"
6548 " report permission changes and diff only reports changes relative\n"
6609 " to one merge parent.\n"
6549 " to one merge parent.\n"
6610 "\n"
6550 "\n"
6611 " If one revision is given, it is used as the base revision.\n"
6551 " If one revision is given, it is used as the base revision.\n"
6612 " If two revisions are given, the differences between them are\n"
6552 " If two revisions are given, the differences between them are\n"
6613 " shown.\n"
6553 " shown.\n"
6614 "\n"
6554 "\n"
6615 " The codes used to show the status of files are::\n"
6555 " The codes used to show the status of files are::\n"
6616 "\n"
6556 "\n"
6617 " M = modified\n"
6557 " M = modified\n"
6618 " A = added\n"
6558 " A = added\n"
6619 " R = removed\n"
6559 " R = removed\n"
6620 " C = clean\n"
6560 " C = clean\n"
6621 " ! = missing (deleted by non-hg command, but still tracked)\n"
6561 " ! = missing (deleted by non-hg command, but still tracked)\n"
6622 " ? = not tracked\n"
6562 " ? = not tracked\n"
6623 " I = ignored\n"
6563 " I = ignored\n"
6624 " = origin of the previous file listed as A (added)\n"
6564 " = origin of the previous file listed as A (added)\n"
6625 " "
6565 " "
6626 msgstr ""
6566 msgstr ""
6627
6567
6628 msgid ""
6568 msgid ""
6629 "summarize working directory state\n"
6569 "summarize working directory state\n"
6630 "\n"
6570 "\n"
6631 " This generates a brief summary of the working directory state,\n"
6571 " This generates a brief summary of the working directory state,\n"
6632 " including parents, branch, commit status, and available updates.\n"
6572 " including parents, branch, commit status, and available updates.\n"
6633 "\n"
6573 "\n"
6634 " With the --remote option, this will check the default paths for\n"
6574 " With the --remote option, this will check the default paths for\n"
6635 " incoming and outgoing changes. This can be time-consuming.\n"
6575 " incoming and outgoing changes. This can be time-consuming.\n"
6636 " "
6576 " "
6637 msgstr ""
6577 msgstr ""
6638
6578
6639 #, fuzzy
6579 #, fuzzy
6640 msgid " (empty repository)"
6580 msgid " (empty repository)"
6641 msgstr "clônage du dépôt des patchs\n"
6581 msgstr "clônage du dépôt des patchs\n"
6642
6582
6643 #, fuzzy
6583 #, fuzzy
6644 msgid " (no revision checked out)"
6584 msgid " (no revision checked out)"
6645 msgstr "aucune révision spécifiée"
6585 msgstr "aucune révision spécifiée"
6646
6586
6647 #, fuzzy, python-format
6587 #, fuzzy, python-format
6648 msgid "parent: %d:%s %s\n"
6588 msgid "parent: %d:%s %s\n"
6649 msgstr "abandon : %s : %s\n"
6589 msgstr "abandon : %s : %s\n"
6650
6590
6651 #, fuzzy, python-format
6591 #, fuzzy, python-format
6652 msgid "branch: %s\n"
6592 msgid "branch: %s\n"
6653 msgstr "abandon : %s\n"
6593 msgstr "abandon : %s\n"
6654
6594
6655 #, python-format
6595 #, python-format
6656 msgid "%d added"
6596 msgid "%d added"
6657 msgstr ""
6597 msgstr ""
6658
6598
6659 #, python-format
6599 #, python-format
6660 msgid "%d modified"
6600 msgid "%d modified"
6661 msgstr ""
6601 msgstr ""
6662
6602
6663 #, fuzzy, python-format
6603 #, fuzzy, python-format
6664 msgid "%d removed"
6604 msgid "%d removed"
6665 msgstr "%s ne peut être supprimé"
6605 msgstr "%s ne peut être supprimé"
6666
6606
6667 #, python-format
6607 #, python-format
6668 msgid "%d deleted"
6608 msgid "%d deleted"
6669 msgstr ""
6609 msgstr ""
6670
6610
6671 #, python-format
6611 #, python-format
6672 msgid "%d ignored"
6612 msgid "%d ignored"
6673 msgstr ""
6613 msgstr ""
6674
6614
6675 #, python-format
6615 #, python-format
6676 msgid "%d unknown"
6616 msgid "%d unknown"
6677 msgstr ""
6617 msgstr ""
6678
6618
6679 #, python-format
6619 #, python-format
6680 msgid "%d unresolved"
6620 msgid "%d unresolved"
6681 msgstr ""
6621 msgstr ""
6682
6622
6683 msgid " (merge)"
6623 msgid " (merge)"
6684 msgstr ""
6624 msgstr ""
6685
6625
6686 msgid " (new branch)"
6626 msgid " (new branch)"
6687 msgstr ""
6627 msgstr ""
6688
6628
6689 msgid " (clean)"
6629 msgid " (clean)"
6690 msgstr ""
6630 msgstr ""
6691
6631
6692 msgid " (new branch head)"
6632 msgid " (new branch head)"
6693 msgstr ""
6633 msgstr ""
6694
6634
6695 #, fuzzy, python-format
6635 #, fuzzy, python-format
6696 msgid "commit: %s\n"
6636 msgid "commit: %s\n"
6697 msgstr "abandon : %s\n"
6637 msgstr "abandon : %s\n"
6698
6638
6699 msgid "update: (current)\n"
6639 msgid "update: (current)\n"
6700 msgstr ""
6640 msgstr ""
6701
6641
6702 #, python-format
6642 #, python-format
6703 msgid "update: %d new changesets (update)\n"
6643 msgid "update: %d new changesets (update)\n"
6704 msgstr ""
6644 msgstr ""
6705
6645
6706 #, python-format
6646 #, python-format
6707 msgid "update: %d new changesets, %d branch heads (merge)\n"
6647 msgid "update: %d new changesets, %d branch heads (merge)\n"
6708 msgstr ""
6648 msgstr ""
6709
6649
6710 msgid "1 or more incoming"
6650 msgid "1 or more incoming"
6711 msgstr ""
6651 msgstr ""
6712
6652
6713 #, python-format
6653 #, python-format
6714 msgid "%d outgoing"
6654 msgid "%d outgoing"
6715 msgstr ""
6655 msgstr ""
6716
6656
6717 #, fuzzy, python-format
6657 #, fuzzy, python-format
6718 msgid "remote: %s\n"
6658 msgid "remote: %s\n"
6719 msgstr "suppression de %s\n"
6659 msgstr "suppression de %s\n"
6720
6660
6721 msgid "remote: (synced)\n"
6661 msgid "remote: (synced)\n"
6722 msgstr ""
6662 msgstr ""
6723
6663
6724 msgid ""
6664 msgid ""
6725 "add one or more tags for the current or given revision\n"
6665 "add one or more tags for the current or given revision\n"
6726 "\n"
6666 "\n"
6727 " Name a particular revision using <name>.\n"
6667 " Name a particular revision using <name>.\n"
6728 "\n"
6668 "\n"
6729 " Tags are used to name particular revisions of the repository and are\n"
6669 " Tags are used to name particular revisions of the repository and are\n"
6730 " very useful to compare different revisions, to go back to significant\n"
6670 " very useful to compare different revisions, to go back to significant\n"
6731 " earlier versions or to mark branch points as releases, etc.\n"
6671 " earlier versions or to mark branch points as releases, etc.\n"
6732 "\n"
6672 "\n"
6733 " If no revision is given, the parent of the working directory is\n"
6673 " If no revision is given, the parent of the working directory is\n"
6734 " used, or tip if no revision is checked out.\n"
6674 " used, or tip if no revision is checked out.\n"
6735 "\n"
6675 "\n"
6736 " To facilitate version control, distribution, and merging of tags,\n"
6676 " To facilitate version control, distribution, and merging of tags,\n"
6737 " they are stored as a file named \".hgtags\" which is managed\n"
6677 " they are stored as a file named \".hgtags\" which is managed\n"
6738 " similarly to other project files and can be hand-edited if\n"
6678 " similarly to other project files and can be hand-edited if\n"
6739 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6679 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6740 " shared among repositories).\n"
6680 " shared among repositories).\n"
6741 "\n"
6681 "\n"
6742 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6682 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6743 " "
6683 " "
6744 msgstr ""
6684 msgstr ""
6745
6685
6746 msgid "tag names must be unique"
6686 msgid "tag names must be unique"
6747 msgstr ""
6687 msgstr ""
6748
6688
6749 #, python-format
6689 #, python-format
6750 msgid "the name '%s' is reserved"
6690 msgid "the name '%s' is reserved"
6751 msgstr ""
6691 msgstr ""
6752
6692
6753 msgid "--rev and --remove are incompatible"
6693 msgid "--rev and --remove are incompatible"
6754 msgstr ""
6694 msgstr ""
6755
6695
6756 #, python-format
6696 #, python-format
6757 msgid "tag '%s' does not exist"
6697 msgid "tag '%s' does not exist"
6758 msgstr ""
6698 msgstr ""
6759
6699
6760 #, python-format
6700 #, python-format
6761 msgid "tag '%s' is not a global tag"
6701 msgid "tag '%s' is not a global tag"
6762 msgstr ""
6702 msgstr ""
6763
6703
6764 #, python-format
6704 #, python-format
6765 msgid "tag '%s' is not a local tag"
6705 msgid "tag '%s' is not a local tag"
6766 msgstr ""
6706 msgstr ""
6767
6707
6768 #, python-format
6708 #, python-format
6769 msgid "tag '%s' already exists (use -f to force)"
6709 msgid "tag '%s' already exists (use -f to force)"
6770 msgstr ""
6710 msgstr ""
6771
6711
6772 msgid ""
6712 msgid ""
6773 "list repository tags\n"
6713 "list repository tags\n"
6774 "\n"
6714 "\n"
6775 " This lists both regular and local tags. When the -v/--verbose\n"
6715 " This lists both regular and local tags. When the -v/--verbose\n"
6776 " switch is used, a third column \"local\" is printed for local tags.\n"
6716 " switch is used, a third column \"local\" is printed for local tags.\n"
6777 " "
6717 " "
6778 msgstr ""
6718 msgstr ""
6779
6719
6780 msgid ""
6720 msgid ""
6781 "show the tip revision\n"
6721 "show the tip revision\n"
6782 "\n"
6722 "\n"
6783 " The tip revision (usually just called the tip) is the changeset\n"
6723 " The tip revision (usually just called the tip) is the changeset\n"
6784 " most recently added to the repository (and therefore the most\n"
6724 " most recently added to the repository (and therefore the most\n"
6785 " recently changed head).\n"
6725 " recently changed head).\n"
6786 "\n"
6726 "\n"
6787 " If you have just made a commit, that commit will be the tip. If\n"
6727 " If you have just made a commit, that commit will be the tip. If\n"
6788 " you have just pulled changes from another repository, the tip of\n"
6728 " you have just pulled changes from another repository, the tip of\n"
6789 " that repository becomes the current tip. The \"tip\" tag is special\n"
6729 " that repository becomes the current tip. The \"tip\" tag is special\n"
6790 " and cannot be renamed or assigned to a different changeset.\n"
6730 " and cannot be renamed or assigned to a different changeset.\n"
6791 " "
6731 " "
6792 msgstr ""
6732 msgstr ""
6793
6733
6794 msgid ""
6734 msgid ""
6795 "apply one or more changegroup files\n"
6735 "apply one or more changegroup files\n"
6796 "\n"
6736 "\n"
6797 " Apply one or more compressed changegroup files generated by the\n"
6737 " Apply one or more compressed changegroup files generated by the\n"
6798 " bundle command.\n"
6738 " bundle command.\n"
6799 " "
6739 " "
6800 msgstr ""
6740 msgstr ""
6801
6741
6802 msgid ""
6742 msgid ""
6803 "update working directory\n"
6743 "update working directory\n"
6804 "\n"
6744 "\n"
6805 " Update the repository's working directory to the specified\n"
6745 " Update the repository's working directory to the specified\n"
6806 " revision, or the tip of the current branch if none is specified.\n"
6746 " revision, or the tip of the current branch if none is specified.\n"
6807 " Use null as the revision to remove the working copy (like 'hg\n"
6747 " Use null as the revision to remove the working copy (like 'hg\n"
6808 " clone -U').\n"
6748 " clone -U').\n"
6809 "\n"
6749 "\n"
6810 " When the working directory contains no uncommitted changes, it\n"
6750 " When the working directory contains no uncommitted changes, it\n"
6811 " will be replaced by the state of the requested revision from the\n"
6751 " will be replaced by the state of the requested revision from the\n"
6812 " repository. When the requested revision is on a different branch,\n"
6752 " repository. When the requested revision is on a different branch,\n"
6813 " the working directory will additionally be switched to that\n"
6753 " the working directory will additionally be switched to that\n"
6814 " branch.\n"
6754 " branch.\n"
6815 "\n"
6755 "\n"
6816 " When there are uncommitted changes, use option -C/--clean to\n"
6756 " When there are uncommitted changes, use option -C/--clean to\n"
6817 " discard them, forcibly replacing the state of the working\n"
6757 " discard them, forcibly replacing the state of the working\n"
6818 " directory with the requested revision. Alternately, use -c/--check\n"
6758 " directory with the requested revision. Alternately, use -c/--check\n"
6819 " to abort.\n"
6759 " to abort.\n"
6820 "\n"
6760 "\n"
6821 " When there are uncommitted changes and option -C/--clean is not\n"
6761 " When there are uncommitted changes and option -C/--clean is not\n"
6822 " used, and the parent revision and requested revision are on the\n"
6762 " used, and the parent revision and requested revision are on the\n"
6823 " same branch, and one of them is an ancestor of the other, then the\n"
6763 " same branch, and one of them is an ancestor of the other, then the\n"
6824 " new working directory will contain the requested revision merged\n"
6764 " new working directory will contain the requested revision merged\n"
6825 " with the uncommitted changes. Otherwise, the update will fail with\n"
6765 " with the uncommitted changes. Otherwise, the update will fail with\n"
6826 " a suggestion to use 'merge' or 'update -C' instead.\n"
6766 " a suggestion to use 'merge' or 'update -C' instead.\n"
6827 "\n"
6767 "\n"
6828 " If you want to update just one file to an older revision, use\n"
6768 " If you want to update just one file to an older revision, use\n"
6829 " revert.\n"
6769 " revert.\n"
6830 "\n"
6770 "\n"
6831 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6771 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6832 " "
6772 " "
6833 msgstr ""
6773 msgstr ""
6834
6774
6835 msgid "cannot specify both -c/--check and -C/--clean"
6775 msgid "cannot specify both -c/--check and -C/--clean"
6836 msgstr ""
6776 msgstr ""
6837
6777
6838 msgid "uncommitted local changes"
6778 msgid "uncommitted local changes"
6839 msgstr ""
6779 msgstr ""
6840
6780
6841 msgid ""
6781 msgid ""
6842 "verify the integrity of the repository\n"
6782 "verify the integrity of the repository\n"
6843 "\n"
6783 "\n"
6844 " Verify the integrity of the current repository.\n"
6784 " Verify the integrity of the current repository.\n"
6845 "\n"
6785 "\n"
6846 " This will perform an extensive check of the repository's\n"
6786 " This will perform an extensive check of the repository's\n"
6847 " integrity, validating the hashes and checksums of each entry in\n"
6787 " integrity, validating the hashes and checksums of each entry in\n"
6848 " the changelog, manifest, and tracked files, as well as the\n"
6788 " the changelog, manifest, and tracked files, as well as the\n"
6849 " integrity of their crosslinks and indices.\n"
6789 " integrity of their crosslinks and indices.\n"
6850 " "
6790 " "
6851 msgstr ""
6791 msgstr ""
6852
6792
6853 msgid "output version and copyright information"
6793 msgid "output version and copyright information"
6854 msgstr ""
6794 msgstr ""
6855
6795
6856 #, python-format
6796 #, python-format
6857 msgid "Mercurial Distributed SCM (version %s)\n"
6797 msgid "Mercurial Distributed SCM (version %s)\n"
6858 msgstr ""
6798 msgstr ""
6859
6799
6860 msgid ""
6800 msgid ""
6861 "\n"
6801 "\n"
6862 "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
6802 "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
6863 "This is free software; see the source for copying conditions. There is NO\n"
6803 "This is free software; see the source for copying conditions. There is NO\n"
6864 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6804 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6865 msgstr ""
6805 msgstr ""
6866
6806
6867 msgid "repository root directory or name of overlay bundle file"
6807 msgid "repository root directory or name of overlay bundle file"
6868 msgstr ""
6808 msgstr ""
6869
6809
6870 msgid "change working directory"
6810 msgid "change working directory"
6871 msgstr ""
6811 msgstr ""
6872
6812
6873 msgid "do not prompt, assume 'yes' for any required answers"
6813 msgid "do not prompt, assume 'yes' for any required answers"
6874 msgstr ""
6814 msgstr ""
6875
6815
6876 msgid "suppress output"
6816 msgid "suppress output"
6877 msgstr ""
6817 msgstr ""
6878
6818
6879 msgid "enable additional output"
6819 msgid "enable additional output"
6880 msgstr ""
6820 msgstr ""
6881
6821
6882 msgid "set/override config option"
6822 msgid "set/override config option"
6883 msgstr ""
6823 msgstr ""
6884
6824
6885 msgid "enable debugging output"
6825 msgid "enable debugging output"
6886 msgstr ""
6826 msgstr ""
6887
6827
6888 msgid "start debugger"
6828 msgid "start debugger"
6889 msgstr ""
6829 msgstr ""
6890
6830
6891 msgid "set the charset encoding"
6831 msgid "set the charset encoding"
6892 msgstr ""
6832 msgstr ""
6893
6833
6894 msgid "set the charset encoding mode"
6834 msgid "set the charset encoding mode"
6895 msgstr ""
6835 msgstr ""
6896
6836
6897 msgid "print traceback on exception"
6837 msgid "print traceback on exception"
6898 msgstr ""
6838 msgstr ""
6899
6839
6900 msgid "time how long the command takes"
6840 msgid "time how long the command takes"
6901 msgstr ""
6841 msgstr ""
6902
6842
6903 msgid "print command execution profile"
6843 msgid "print command execution profile"
6904 msgstr ""
6844 msgstr ""
6905
6845
6906 msgid "output version information and exit"
6846 msgid "output version information and exit"
6907 msgstr ""
6847 msgstr ""
6908
6848
6909 msgid "display help and exit"
6849 msgid "display help and exit"
6910 msgstr ""
6850 msgstr ""
6911
6851
6912 msgid "do not perform actions, just print output"
6852 msgid "do not perform actions, just print output"
6913 msgstr ""
6853 msgstr ""
6914
6854
6915 msgid "specify ssh command to use"
6855 msgid "specify ssh command to use"
6916 msgstr ""
6856 msgstr ""
6917
6857
6918 msgid "specify hg command to run on the remote side"
6858 msgid "specify hg command to run on the remote side"
6919 msgstr ""
6859 msgstr ""
6920
6860
6921 msgid "include names matching the given patterns"
6861 msgid "include names matching the given patterns"
6922 msgstr ""
6862 msgstr ""
6923
6863
6924 msgid "exclude names matching the given patterns"
6864 msgid "exclude names matching the given patterns"
6925 msgstr ""
6865 msgstr ""
6926
6866
6927 msgid "use <text> as commit message"
6867 msgid "use <text> as commit message"
6928 msgstr ""
6868 msgstr ""
6929
6869
6930 msgid "read commit message from <file>"
6870 msgid "read commit message from <file>"
6931 msgstr ""
6871 msgstr ""
6932
6872
6933 msgid "record datecode as commit date"
6873 msgid "record datecode as commit date"
6934 msgstr ""
6874 msgstr ""
6935
6875
6936 msgid "record the specified user as committer"
6876 msgid "record the specified user as committer"
6937 msgstr ""
6877 msgstr ""
6938
6878
6939 msgid "display using template map file"
6879 msgid "display using template map file"
6940 msgstr ""
6880 msgstr ""
6941
6881
6942 msgid "display with template"
6882 msgid "display with template"
6943 msgstr ""
6883 msgstr ""
6944
6884
6945 msgid "do not show merges"
6885 msgid "do not show merges"
6946 msgstr ""
6886 msgstr ""
6947
6887
6948 msgid "treat all files as text"
6888 msgid "treat all files as text"
6949 msgstr ""
6889 msgstr ""
6950
6890
6951 msgid "don't include dates in diff headers"
6891 msgid "don't include dates in diff headers"
6952 msgstr ""
6892 msgstr ""
6953
6893
6954 msgid "show which function each change is in"
6894 msgid "show which function each change is in"
6955 msgstr ""
6895 msgstr ""
6956
6896
6957 msgid "ignore white space when comparing lines"
6897 msgid "ignore white space when comparing lines"
6958 msgstr ""
6898 msgstr ""
6959
6899
6960 msgid "ignore changes in the amount of white space"
6900 msgid "ignore changes in the amount of white space"
6961 msgstr ""
6901 msgstr ""
6962
6902
6963 msgid "ignore changes whose lines are all blank"
6903 msgid "ignore changes whose lines are all blank"
6964 msgstr ""
6904 msgstr ""
6965
6905
6966 msgid "number of lines of context to show"
6906 msgid "number of lines of context to show"
6967 msgstr ""
6907 msgstr ""
6968
6908
6969 msgid "guess renamed files by similarity (0<=s<=100)"
6909 msgid "guess renamed files by similarity (0<=s<=100)"
6970 msgstr ""
6910 msgstr ""
6971
6911
6972 msgid "[OPTION]... [FILE]..."
6912 msgid "[OPTION]... [FILE]..."
6973 msgstr ""
6913 msgstr ""
6974
6914
6975 msgid "annotate the specified revision"
6915 msgid "annotate the specified revision"
6976 msgstr ""
6916 msgstr ""
6977
6917
6978 msgid "follow file copies and renames"
6918 msgid "follow file copies and renames"
6979 msgstr ""
6919 msgstr ""
6980
6920
6981 msgid "list the author (long with -v)"
6921 msgid "list the author (long with -v)"
6982 msgstr ""
6922 msgstr ""
6983
6923
6984 msgid "list the date (short with -q)"
6924 msgid "list the date (short with -q)"
6985 msgstr ""
6925 msgstr ""
6986
6926
6987 msgid "list the revision number (default)"
6927 msgid "list the revision number (default)"
6988 msgstr ""
6928 msgstr ""
6989
6929
6990 msgid "list the changeset"
6930 msgid "list the changeset"
6991 msgstr ""
6931 msgstr ""
6992
6932
6993 msgid "show line number at the first appearance"
6933 msgid "show line number at the first appearance"
6994 msgstr ""
6934 msgstr ""
6995
6935
6996 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6936 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6997 msgstr ""
6937 msgstr ""
6998
6938
6999 msgid "do not pass files through decoders"
6939 msgid "do not pass files through decoders"
7000 msgstr ""
6940 msgstr ""
7001
6941
7002 msgid "directory prefix for files in archive"
6942 msgid "directory prefix for files in archive"
7003 msgstr "chemin préfixé aux fichiers de l'archive"
6943 msgstr "chemin préfixé aux fichiers de l'archive"
7004
6944
7005 msgid "revision to distribute"
6945 msgid "revision to distribute"
7006 msgstr "révision à distribuer"
6946 msgstr "révision à distribuer"
7007
6947
7008 msgid "type of distribution to create"
6948 msgid "type of distribution to create"
7009 msgstr "type de distribution à créer"
6949 msgstr "type de distribution à créer"
7010
6950
7011 msgid "[OPTION]... DEST"
6951 msgid "[OPTION]... DEST"
7012 msgstr "[OPTION]... DEST"
6952 msgstr "[OPTION]... DEST"
7013
6953
7014 msgid "merge with old dirstate parent after backout"
6954 msgid "merge with old dirstate parent after backout"
7015 msgstr ""
6955 msgstr ""
7016
6956
7017 msgid "parent to choose when backing out merge"
6957 msgid "parent to choose when backing out merge"
7018 msgstr ""
6958 msgstr ""
7019
6959
7020 msgid "revision to backout"
6960 msgid "revision to backout"
7021 msgstr ""
6961 msgstr ""
7022
6962
7023 msgid "[OPTION]... [-r] REV"
6963 msgid "[OPTION]... [-r] REV"
7024 msgstr ""
6964 msgstr ""
7025
6965
7026 msgid "reset bisect state"
6966 msgid "reset bisect state"
7027 msgstr "réinitialiser l'état de la recherche par dichotomie"
6967 msgstr "réinitialiser l'état de la recherche par dichotomie"
7028
6968
7029 msgid "mark changeset good"
6969 msgid "mark changeset good"
7030 msgstr "marquer la révision comme \"bonne\""
6970 msgstr "marquer la révision comme \"bonne\""
7031
6971
7032 msgid "mark changeset bad"
6972 msgid "mark changeset bad"
7033 msgstr "marquer la révision comme \"mauvaise\""
6973 msgstr "marquer la révision comme \"mauvaise\""
7034
6974
7035 msgid "skip testing changeset"
6975 msgid "skip testing changeset"
7036 msgstr "ne pas considérer la révision"
6976 msgstr "ne pas considérer la révision"
7037
6977
7038 msgid "use command to check changeset state"
6978 msgid "use command to check changeset state"
7039 msgstr "utiliser une commande pour tester l'état des révisions"
6979 msgstr "utiliser une commande pour tester l'état des révisions"
7040
6980
7041 msgid "do not update to target"
6981 msgid "do not update to target"
7042 msgstr "ne pas mettre à jour à la révision cible"
6982 msgstr "ne pas mettre à jour à la révision cible"
7043
6983
7044 msgid "[-gbsr] [-c CMD] [REV]"
6984 msgid "[-gbsr] [-c CMD] [REV]"
7045 msgstr "[-gbsr] [-c CMD] [REV]"
6985 msgstr "[-gbsr] [-c CMD] [REV]"
7046
6986
7047 msgid "set branch name even if it shadows an existing branch"
6987 msgid "set branch name even if it shadows an existing branch"
7048 msgstr ""
6988 msgstr ""
7049
6989
7050 msgid "reset branch name to parent branch name"
6990 msgid "reset branch name to parent branch name"
7051 msgstr ""
6991 msgstr ""
7052
6992
7053 msgid "[-fC] [NAME]"
6993 msgid "[-fC] [NAME]"
7054 msgstr ""
6994 msgstr ""
7055
6995
7056 msgid "show only branches that have unmerged heads"
6996 msgid "show only branches that have unmerged heads"
7057 msgstr ""
6997 msgstr ""
7058
6998
7059 msgid "show normal and closed branches"
6999 msgid "show normal and closed branches"
7060 msgstr ""
7000 msgstr ""
7061
7001
7062 msgid "[-a]"
7002 msgid "[-a]"
7063 msgstr ""
7003 msgstr ""
7064
7004
7065 msgid "run even when remote repository is unrelated"
7005 msgid "run even when remote repository is unrelated"
7066 msgstr ""
7006 msgstr ""
7067
7007
7068 msgid "a changeset up to which you would like to bundle"
7008 msgid "a changeset up to which you would like to bundle"
7069 msgstr ""
7009 msgstr ""
7070
7010
7071 msgid "a base changeset to specify instead of a destination"
7011 msgid "a base changeset to specify instead of a destination"
7072 msgstr ""
7012 msgstr ""
7073
7013
7074 msgid "bundle all changesets in the repository"
7014 msgid "bundle all changesets in the repository"
7075 msgstr ""
7015 msgstr ""
7076
7016
7077 msgid "bundle compression type to use"
7017 msgid "bundle compression type to use"
7078 msgstr ""
7018 msgstr ""
7079
7019
7080 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7020 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7081 msgstr ""
7021 msgstr ""
7082
7022
7083 msgid "print output to file with formatted name"
7023 msgid "print output to file with formatted name"
7084 msgstr ""
7024 msgstr ""
7085
7025
7086 msgid "print the given revision"
7026 msgid "print the given revision"
7087 msgstr ""
7027 msgstr ""
7088
7028
7089 msgid "apply any matching decode filter"
7029 msgid "apply any matching decode filter"
7090 msgstr ""
7030 msgstr ""
7091
7031
7092 msgid "[OPTION]... FILE..."
7032 msgid "[OPTION]... FILE..."
7093 msgstr ""
7033 msgstr ""
7094
7034
7095 msgid "the clone will only contain a repository (no working copy)"
7035 msgid "the clone will only contain a repository (no working copy)"
7096 msgstr ""
7036 msgstr ""
7097
7037
7098 msgid "a changeset you would like to have after cloning"
7038 msgid "a changeset you would like to have after cloning"
7099 msgstr ""
7039 msgstr ""
7100
7040
7101 msgid "[OPTION]... SOURCE [DEST]"
7041 msgid "[OPTION]... SOURCE [DEST]"
7102 msgstr ""
7042 msgstr ""
7103
7043
7104 msgid "mark new/missing files as added/removed before committing"
7044 msgid "mark new/missing files as added/removed before committing"
7105 msgstr ""
7045 msgstr ""
7106
7046
7107 msgid "mark a branch as closed, hiding it from the branch list"
7047 msgid "mark a branch as closed, hiding it from the branch list"
7108 msgstr ""
7048 msgstr ""
7109
7049
7110 msgid "record a copy that has already occurred"
7050 msgid "record a copy that has already occurred"
7111 msgstr ""
7051 msgstr ""
7112
7052
7113 msgid "forcibly copy over an existing managed file"
7053 msgid "forcibly copy over an existing managed file"
7114 msgstr ""
7054 msgstr ""
7115
7055
7116 msgid "[OPTION]... [SOURCE]... DEST"
7056 msgid "[OPTION]... [SOURCE]... DEST"
7117 msgstr ""
7057 msgstr ""
7118
7058
7119 msgid "[INDEX] REV1 REV2"
7059 msgid "[INDEX] REV1 REV2"
7120 msgstr ""
7060 msgstr ""
7121
7061
7122 msgid "[COMMAND]"
7062 msgid "[COMMAND]"
7123 msgstr ""
7063 msgstr ""
7124
7064
7125 msgid "show the command options"
7065 msgid "show the command options"
7126 msgstr ""
7066 msgstr ""
7127
7067
7128 msgid "[-o] CMD"
7068 msgid "[-o] CMD"
7129 msgstr ""
7069 msgstr ""
7130
7070
7131 msgid "try extended date formats"
7071 msgid "try extended date formats"
7132 msgstr ""
7072 msgstr ""
7133
7073
7134 msgid "[-e] DATE [RANGE]"
7074 msgid "[-e] DATE [RANGE]"
7135 msgstr ""
7075 msgstr ""
7136
7076
7137 msgid "FILE REV"
7077 msgid "FILE REV"
7138 msgstr ""
7078 msgstr ""
7139
7079
7140 msgid "[PATH]"
7080 msgid "[PATH]"
7141 msgstr ""
7081 msgstr ""
7142
7082
7143 msgid "FILE"
7083 msgid "FILE"
7144 msgstr ""
7084 msgstr ""
7145
7085
7146 msgid "revision to rebuild to"
7086 msgid "revision to rebuild to"
7147 msgstr ""
7087 msgstr ""
7148
7088
7149 msgid "[-r REV] [REV]"
7089 msgid "[-r REV] [REV]"
7150 msgstr ""
7090 msgstr ""
7151
7091
7152 msgid "revision to debug"
7092 msgid "revision to debug"
7153 msgstr ""
7093 msgstr ""
7154
7094
7155 msgid "[-r REV] FILE"
7095 msgid "[-r REV] FILE"
7156 msgstr ""
7096 msgstr ""
7157
7097
7158 msgid "REV1 [REV2]"
7098 msgid "REV1 [REV2]"
7159 msgstr ""
7099 msgstr ""
7160
7100
7161 msgid "do not display the saved mtime"
7101 msgid "do not display the saved mtime"
7162 msgstr ""
7102 msgstr ""
7163
7103
7164 msgid "[OPTION]..."
7104 msgid "[OPTION]..."
7165 msgstr ""
7105 msgstr ""
7166
7106
7167 msgid "revision to check"
7107 msgid "revision to check"
7168 msgstr ""
7108 msgstr ""
7169
7109
7170 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7110 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7171 msgstr ""
7111 msgstr ""
7172
7112
7173 msgid "diff against the second parent"
7113 msgid "diff against the second parent"
7174 msgstr ""
7114 msgstr ""
7175
7115
7176 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7116 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7177 msgstr ""
7117 msgstr ""
7178
7118
7179 msgid "end fields with NUL"
7119 msgid "end fields with NUL"
7180 msgstr ""
7120 msgstr ""
7181
7121
7182 msgid "print all revisions that match"
7122 msgid "print all revisions that match"
7183 msgstr ""
7123 msgstr ""
7184
7124
7185 msgid "follow changeset history, or file history across copies and renames"
7125 msgid "follow changeset history, or file history across copies and renames"
7186 msgstr ""
7126 msgstr ""
7187
7127
7188 msgid "ignore case when matching"
7128 msgid "ignore case when matching"
7189 msgstr ""
7129 msgstr ""
7190
7130
7191 msgid "print only filenames and revisions that match"
7131 msgid "print only filenames and revisions that match"
7192 msgstr ""
7132 msgstr ""
7193
7133
7194 msgid "print matching line numbers"
7134 msgid "print matching line numbers"
7195 msgstr ""
7135 msgstr ""
7196
7136
7197 msgid "search in given revision range"
7137 msgid "search in given revision range"
7198 msgstr ""
7138 msgstr ""
7199
7139
7200 msgid "[OPTION]... PATTERN [FILE]..."
7140 msgid "[OPTION]... PATTERN [FILE]..."
7201 msgstr ""
7141 msgstr ""
7202
7142
7203 msgid "show only heads which are descendants of REV"
7143 msgid "show only heads which are descendants of REV"
7204 msgstr ""
7144 msgstr ""
7205
7145
7206 msgid "show only the active branch heads from open branches"
7146 msgid "show only the active branch heads from open branches"
7207 msgstr ""
7147 msgstr ""
7208
7148
7209 msgid "show normal and closed branch heads"
7149 msgid "show normal and closed branch heads"
7210 msgstr ""
7150 msgstr ""
7211
7151
7212 msgid "[-r STARTREV] [REV]..."
7152 msgid "[-r STARTREV] [REV]..."
7213 msgstr ""
7153 msgstr ""
7214
7154
7215 msgid "[TOPIC]"
7155 msgid "[TOPIC]"
7216 msgstr ""
7156 msgstr ""
7217
7157
7218 msgid "identify the specified revision"
7158 msgid "identify the specified revision"
7219 msgstr ""
7159 msgstr ""
7220
7160
7221 msgid "show local revision number"
7161 msgid "show local revision number"
7222 msgstr ""
7162 msgstr ""
7223
7163
7224 msgid "show global revision id"
7164 msgid "show global revision id"
7225 msgstr ""
7165 msgstr ""
7226
7166
7227 msgid "show branch"
7167 msgid "show branch"
7228 msgstr ""
7168 msgstr ""
7229
7169
7230 msgid "show tags"
7170 msgid "show tags"
7231 msgstr ""
7171 msgstr ""
7232
7172
7233 msgid "[-nibt] [-r REV] [SOURCE]"
7173 msgid "[-nibt] [-r REV] [SOURCE]"
7234 msgstr ""
7174 msgstr ""
7235
7175
7236 msgid ""
7176 msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
7237 "directory strip option for patch. This has the same meaning as the "
7238 "corresponding patch option"
7239 msgstr ""
7177 msgstr ""
7240
7178
7241 msgid "base path"
7179 msgid "base path"
7242 msgstr ""
7180 msgstr ""
7243
7181
7244 msgid "skip check for outstanding uncommitted changes"
7182 msgid "skip check for outstanding uncommitted changes"
7245 msgstr ""
7183 msgstr ""
7246
7184
7247 msgid "don't commit, just update the working directory"
7185 msgid "don't commit, just update the working directory"
7248 msgstr ""
7186 msgstr ""
7249
7187
7250 msgid "apply patch to the nodes from which it was generated"
7188 msgid "apply patch to the nodes from which it was generated"
7251 msgstr ""
7189 msgstr ""
7252
7190
7253 msgid "use any branch information in patch (implied by --exact)"
7191 msgid "use any branch information in patch (implied by --exact)"
7254 msgstr ""
7192 msgstr ""
7255
7193
7256 msgid "[OPTION]... PATCH..."
7194 msgid "[OPTION]... PATCH..."
7257 msgstr ""
7195 msgstr ""
7258
7196
7259 msgid "show newest record first"
7197 msgid "show newest record first"
7260 msgstr ""
7198 msgstr ""
7261
7199
7262 msgid "file to store the bundles into"
7200 msgid "file to store the bundles into"
7263 msgstr ""
7201 msgstr ""
7264
7202
7265 msgid "a specific revision up to which you would like to pull"
7203 msgid "a specific revision up to which you would like to pull"
7266 msgstr ""
7204 msgstr ""
7267
7205
7268 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7206 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7269 msgstr ""
7207 msgstr ""
7270
7208
7271 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7209 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7272 msgstr ""
7210 msgstr ""
7273
7211
7274 msgid "search the repository as it stood at REV"
7212 msgid "search the repository as it stood at REV"
7275 msgstr ""
7213 msgstr ""
7276
7214
7277 msgid "end filenames with NUL, for use with xargs"
7215 msgid "end filenames with NUL, for use with xargs"
7278 msgstr ""
7216 msgstr ""
7279
7217
7280 msgid "print complete paths from the filesystem root"
7218 msgid "print complete paths from the filesystem root"
7281 msgstr ""
7219 msgstr ""
7282
7220
7283 msgid "[OPTION]... [PATTERN]..."
7221 msgid "[OPTION]... [PATTERN]..."
7284 msgstr ""
7222 msgstr ""
7285
7223
7286 msgid "only follow the first parent of merge changesets"
7224 msgid "only follow the first parent of merge changesets"
7287 msgstr ""
7225 msgstr ""
7288
7226
7289 msgid "show revisions matching date spec"
7227 msgid "show revisions matching date spec"
7290 msgstr ""
7228 msgstr ""
7291
7229
7292 msgid "show copied files"
7230 msgid "show copied files"
7293 msgstr ""
7231 msgstr ""
7294
7232
7295 msgid "do case-insensitive search for a keyword"
7233 msgid "do case-insensitive search for a keyword"
7296 msgstr ""
7234 msgstr ""
7297
7235
7298 msgid "include revisions where files were removed"
7236 msgid "include revisions where files were removed"
7299 msgstr ""
7237 msgstr ""
7300
7238
7301 msgid "show only merges"
7239 msgid "show only merges"
7302 msgstr ""
7240 msgstr ""
7303
7241
7304 msgid "revisions committed by user"
7242 msgid "revisions committed by user"
7305 msgstr ""
7243 msgstr ""
7306
7244
7307 msgid "show only changesets within the given named branch"
7245 msgid "show only changesets within the given named branch"
7308 msgstr ""
7246 msgstr ""
7309
7247
7310 msgid "do not display revision or any of its ancestors"
7248 msgid "do not display revision or any of its ancestors"
7311 msgstr ""
7249 msgstr ""
7312
7250
7313 msgid "[OPTION]... [FILE]"
7251 msgid "[OPTION]... [FILE]"
7314 msgstr ""
7252 msgstr ""
7315
7253
7316 msgid "revision to display"
7254 msgid "revision to display"
7317 msgstr ""
7255 msgstr ""
7318
7256
7319 msgid "[-r REV]"
7257 msgid "[-r REV]"
7320 msgstr ""
7258 msgstr ""
7321
7259
7322 msgid "force a merge with outstanding changes"
7260 msgid "force a merge with outstanding changes"
7323 msgstr ""
7261 msgstr ""
7324
7262
7325 msgid "revision to merge"
7263 msgid "revision to merge"
7326 msgstr ""
7264 msgstr ""
7327
7265
7328 msgid "review revisions to merge (no merge is performed)"
7266 msgid "review revisions to merge (no merge is performed)"
7329 msgstr ""
7267 msgstr ""
7330
7268
7331 msgid "[-f] [[-r] REV]"
7269 msgid "[-f] [[-r] REV]"
7332 msgstr ""
7270 msgstr ""
7333
7271
7334 msgid "a specific revision up to which you would like to push"
7272 msgid "a specific revision up to which you would like to push"
7335 msgstr ""
7273 msgstr ""
7336
7274
7337 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7275 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7338 msgstr ""
7276 msgstr ""
7339
7277
7340 msgid "show parents from the specified revision"
7278 msgid "show parents from the specified revision"
7341 msgstr ""
7279 msgstr ""
7342
7280
7343 msgid "[-r REV] [FILE]"
7281 msgid "[-r REV] [FILE]"
7344 msgstr ""
7282 msgstr ""
7345
7283
7346 msgid "[NAME]"
7284 msgid "[NAME]"
7347 msgstr ""
7285 msgstr ""
7348
7286
7349 msgid "update to new tip if changesets were pulled"
7287 msgid "update to new tip if changesets were pulled"
7350 msgstr ""
7288 msgstr ""
7351
7289
7352 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7290 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7353 msgstr ""
7291 msgstr ""
7354
7292
7355 msgid "force push"
7293 msgid "force push"
7356 msgstr ""
7294 msgstr ""
7357
7295
7358 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7296 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7359 msgstr ""
7297 msgstr ""
7360
7298
7361 msgid "record delete for missing files"
7299 msgid "record delete for missing files"
7362 msgstr ""
7300 msgstr ""
7363
7301
7364 msgid "remove (and delete) file even if added or modified"
7302 msgid "remove (and delete) file even if added or modified"
7365 msgstr ""
7303 msgstr ""
7366
7304
7367 msgid "record a rename that has already occurred"
7305 msgid "record a rename that has already occurred"
7368 msgstr ""
7306 msgstr ""
7369
7307
7370 msgid "[OPTION]... SOURCE... DEST"
7308 msgid "[OPTION]... SOURCE... DEST"
7371 msgstr ""
7309 msgstr ""
7372
7310
7373 msgid "remerge all unresolved files"
7311 msgid "remerge all unresolved files"
7374 msgstr ""
7312 msgstr ""
7375
7313
7376 msgid "list state of files needing merge"
7314 msgid "list state of files needing merge"
7377 msgstr ""
7315 msgstr ""
7378
7316
7379 msgid "mark files as resolved"
7317 msgid "mark files as resolved"
7380 msgstr ""
7318 msgstr ""
7381
7319
7382 msgid "unmark files as resolved"
7320 msgid "unmark files as resolved"
7383 msgstr ""
7321 msgstr ""
7384
7322
7385 msgid "revert all changes when no arguments given"
7323 msgid "revert all changes when no arguments given"
7386 msgstr ""
7324 msgstr ""
7387
7325
7388 msgid "tipmost revision matching date"
7326 msgid "tipmost revision matching date"
7389 msgstr ""
7327 msgstr ""
7390
7328
7391 msgid "revision to revert to"
7329 msgid "revision to revert to"
7392 msgstr ""
7330 msgstr ""
7393
7331
7394 msgid "do not save backup copies of files"
7332 msgid "do not save backup copies of files"
7395 msgstr ""
7333 msgstr ""
7396
7334
7397 msgid "[OPTION]... [-r REV] [NAME]..."
7335 msgid "[OPTION]... [-r REV] [NAME]..."
7398 msgstr ""
7336 msgstr ""
7399
7337
7400 msgid "name of access log file to write to"
7338 msgid "name of access log file to write to"
7401 msgstr ""
7339 msgstr ""
7402
7340
7403 msgid "name of error log file to write to"
7341 msgid "name of error log file to write to"
7404 msgstr ""
7342 msgstr ""
7405
7343
7406 msgid "port to listen on (default: 8000)"
7344 msgid "port to listen on (default: 8000)"
7407 msgstr ""
7345 msgstr ""
7408
7346
7409 msgid "address to listen on (default: all interfaces)"
7347 msgid "address to listen on (default: all interfaces)"
7410 msgstr ""
7348 msgstr ""
7411
7349
7412 msgid "prefix path to serve from (default: server root)"
7350 msgid "prefix path to serve from (default: server root)"
7413 msgstr ""
7351 msgstr ""
7414
7352
7415 msgid "name to show in web pages (default: working directory)"
7353 msgid "name to show in web pages (default: working directory)"
7416 msgstr ""
7354 msgstr ""
7417
7355
7418 msgid "name of the webdir config file (serve more than one repository)"
7356 msgid "name of the webdir config file (serve more than one repository)"
7419 msgstr ""
7357 msgstr ""
7420
7358
7421 msgid "for remote clients"
7359 msgid "for remote clients"
7422 msgstr ""
7360 msgstr ""
7423
7361
7424 msgid "web templates to use"
7362 msgid "web templates to use"
7425 msgstr ""
7363 msgstr ""
7426
7364
7427 msgid "template style to use"
7365 msgid "template style to use"
7428 msgstr ""
7366 msgstr ""
7429
7367
7430 msgid "use IPv6 in addition to IPv4"
7368 msgid "use IPv6 in addition to IPv4"
7431 msgstr ""
7369 msgstr ""
7432
7370
7433 msgid "SSL certificate file"
7371 msgid "SSL certificate file"
7434 msgstr ""
7372 msgstr ""
7435
7373
7436 msgid "show untrusted configuration options"
7374 msgid "show untrusted configuration options"
7437 msgstr ""
7375 msgstr ""
7438
7376
7439 msgid "[-u] [NAME]..."
7377 msgid "[-u] [NAME]..."
7440 msgstr ""
7378 msgstr ""
7441
7379
7442 msgid "check for push and pull"
7380 msgid "check for push and pull"
7443 msgstr ""
7381 msgstr ""
7444
7382
7445 msgid "show status of all files"
7383 msgid "show status of all files"
7446 msgstr ""
7384 msgstr ""
7447
7385
7448 msgid "show only modified files"
7386 msgid "show only modified files"
7449 msgstr ""
7387 msgstr ""
7450
7388
7451 msgid "show only added files"
7389 msgid "show only added files"
7452 msgstr ""
7390 msgstr ""
7453
7391
7454 msgid "show only removed files"
7392 msgid "show only removed files"
7455 msgstr ""
7393 msgstr ""
7456
7394
7457 msgid "show only deleted (but tracked) files"
7395 msgid "show only deleted (but tracked) files"
7458 msgstr ""
7396 msgstr ""
7459
7397
7460 msgid "show only files without changes"
7398 msgid "show only files without changes"
7461 msgstr ""
7399 msgstr ""
7462
7400
7463 msgid "show only unknown (not tracked) files"
7401 msgid "show only unknown (not tracked) files"
7464 msgstr ""
7402 msgstr ""
7465
7403
7466 msgid "show only ignored files"
7404 msgid "show only ignored files"
7467 msgstr ""
7405 msgstr ""
7468
7406
7469 msgid "hide status prefix"
7407 msgid "hide status prefix"
7470 msgstr ""
7408 msgstr ""
7471
7409
7472 msgid "show source of copied files"
7410 msgid "show source of copied files"
7473 msgstr ""
7411 msgstr ""
7474
7412
7475 msgid "show difference from revision"
7413 msgid "show difference from revision"
7476 msgstr ""
7414 msgstr ""
7477
7415
7478 msgid "replace existing tag"
7416 msgid "replace existing tag"
7479 msgstr ""
7417 msgstr ""
7480
7418
7481 msgid "make the tag local"
7419 msgid "make the tag local"
7482 msgstr ""
7420 msgstr ""
7483
7421
7484 msgid "revision to tag"
7422 msgid "revision to tag"
7485 msgstr ""
7423 msgstr ""
7486
7424
7487 msgid "remove a tag"
7425 msgid "remove a tag"
7488 msgstr ""
7426 msgstr ""
7489
7427
7490 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7428 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7491 msgstr ""
7429 msgstr ""
7492
7430
7493 msgid "[-p]"
7431 msgid "[-p]"
7494 msgstr ""
7432 msgstr ""
7495
7433
7496 msgid "update to new tip if changesets were unbundled"
7434 msgid "update to new tip if changesets were unbundled"
7497 msgstr ""
7435 msgstr ""
7498
7436
7499 msgid "[-u] FILE..."
7437 msgid "[-u] FILE..."
7500 msgstr ""
7438 msgstr ""
7501
7439
7502 msgid "overwrite locally modified files (no backup)"
7440 msgid "overwrite locally modified files (no backup)"
7503 msgstr ""
7441 msgstr ""
7504
7442
7505 msgid "check for uncommitted changes"
7443 msgid "check for uncommitted changes"
7506 msgstr ""
7444 msgstr ""
7507
7445
7508 msgid "[-C] [-d DATE] [[-r] REV]"
7446 msgid "[-C] [-d DATE] [[-r] REV]"
7509 msgstr ""
7447 msgstr ""
7510
7448
7511 #, python-format
7449 #, python-format
7512 msgid "config error at %s:%d: '%s'"
7450 msgid "config error at %s:%d: '%s'"
7513 msgstr "erreur de configuration à %s:%d : '%s'"
7451 msgstr "erreur de configuration à %s:%d : '%s'"
7514
7452
7515 msgid "not found in manifest"
7453 msgid "not found in manifest"
7516 msgstr ""
7454 msgstr ""
7517
7455
7518 msgid "branch name not in UTF-8!"
7456 msgid "branch name not in UTF-8!"
7519 msgstr "le nom de la branche n'est pas en UTF-8 !"
7457 msgstr "le nom de la branche n'est pas en UTF-8 !"
7520
7458
7521 msgid "working directory state appears damaged!"
7459 msgid "working directory state appears damaged!"
7522 msgstr ""
7460 msgstr ""
7523
7461
7524 #, python-format
7462 #, python-format
7525 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7463 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7526 msgstr ""
7464 msgstr ""
7527
7465
7528 #, python-format
7466 #, python-format
7529 msgid "directory %r already in dirstate"
7467 msgid "directory %r already in dirstate"
7530 msgstr ""
7468 msgstr ""
7531
7469
7532 #, python-format
7470 #, python-format
7533 msgid "file %r in dirstate clashes with %r"
7471 msgid "file %r in dirstate clashes with %r"
7534 msgstr ""
7472 msgstr ""
7535
7473
7536 #, python-format
7474 #, python-format
7537 msgid "not in dirstate: %s\n"
7475 msgid "not in dirstate: %s\n"
7538 msgstr ""
7476 msgstr ""
7539
7477
7540 msgid "unknown"
7478 msgid "unknown"
7541 msgstr ""
7479 msgstr ""
7542
7480
7543 msgid "character device"
7481 msgid "character device"
7544 msgstr ""
7482 msgstr ""
7545
7483
7546 msgid "block device"
7484 msgid "block device"
7547 msgstr ""
7485 msgstr ""
7548
7486
7549 msgid "fifo"
7487 msgid "fifo"
7550 msgstr ""
7488 msgstr ""
7551
7489
7552 msgid "socket"
7490 msgid "socket"
7553 msgstr ""
7491 msgstr ""
7554
7492
7555 msgid "directory"
7493 msgid "directory"
7556 msgstr ""
7494 msgstr ""
7557
7495
7558 #, python-format
7496 #, python-format
7559 msgid "unsupported file type (type is %s)"
7497 msgid "unsupported file type (type is %s)"
7560 msgstr ""
7498 msgstr ""
7561
7499
7562 #, python-format
7500 #, python-format
7563 msgid "abort: %s\n"
7501 msgid "abort: %s\n"
7564 msgstr "abandon : %s\n"
7502 msgstr "abandon : %s\n"
7565
7503
7566 #, python-format
7504 #, python-format
7567 msgid "hg: %s\n"
7505 msgid "hg: %s\n"
7568 msgstr "hg: %s\n"
7506 msgstr "hg: %s\n"
7569
7507
7570 #, python-format
7508 #, python-format
7571 msgid ""
7509 msgid ""
7572 "hg: command '%s' is ambiguous:\n"
7510 "hg: command '%s' is ambiguous:\n"
7573 " %s\n"
7511 " %s\n"
7574 msgstr ""
7512 msgstr ""
7575 "hg: la commande '%s' est ambiguë :\n"
7513 "hg: la commande '%s' est ambiguë :\n"
7576 " %s\n"
7514 " %s\n"
7577
7515
7578 #, python-format
7516 #, python-format
7579 msgid "timed out waiting for lock held by %s"
7517 msgid "timed out waiting for lock held by %s"
7580 msgstr "attendu trop longtemps le verrou détenu par %s"
7518 msgstr "attendu trop longtemps le verrou détenu par %s"
7581
7519
7582 #, python-format
7520 #, python-format
7583 msgid "lock held by %s"
7521 msgid "lock held by %s"
7584 msgstr ""
7522 msgstr ""
7585
7523
7586 #, python-format
7524 #, python-format
7587 msgid "abort: %s: %s\n"
7525 msgid "abort: %s: %s\n"
7588 msgstr "abandon : %s : %s\n"
7526 msgstr "abandon : %s : %s\n"
7589
7527
7590 #, python-format
7528 #, python-format
7591 msgid "abort: could not lock %s: %s\n"
7529 msgid "abort: could not lock %s: %s\n"
7592 msgstr "abandon : impossible de verrouiller %s : %s\n"
7530 msgstr "abandon : impossible de verrouiller %s : %s\n"
7593
7531
7594 #, python-format
7532 #, python-format
7595 msgid "hg %s: %s\n"
7533 msgid "hg %s: %s\n"
7596 msgstr "hg %s: %s\n"
7534 msgstr "hg %s: %s\n"
7597
7535
7598 #, python-format
7536 #, python-format
7599 msgid "abort: %s!\n"
7537 msgid "abort: %s!\n"
7600 msgstr "abandon : %s !\n"
7538 msgstr "abandon : %s !\n"
7601
7539
7602 #, python-format
7540 #, python-format
7603 msgid "abort: %s"
7541 msgid "abort: %s"
7604 msgstr "abandon : %s"
7542 msgstr "abandon : %s"
7605
7543
7606 msgid " empty string\n"
7544 msgid " empty string\n"
7607 msgstr " chaîne vide\n"
7545 msgstr " chaîne vide\n"
7608
7546
7609 msgid "killed!\n"
7547 msgid "killed!\n"
7610 msgstr "tué !\n"
7548 msgstr "tué !\n"
7611
7549
7612 #, python-format
7550 #, python-format
7613 msgid "hg: unknown command '%s'\n"
7551 msgid "hg: unknown command '%s'\n"
7614 msgstr "hg: commande inconnue : '%s'\n"
7552 msgstr "hg: commande inconnue : '%s'\n"
7615
7553
7616 #, python-format
7554 #, python-format
7617 msgid "abort: could not import module %s!\n"
7555 msgid "abort: could not import module %s!\n"
7618 msgstr "abandon : impossible d'importer le module %s !\n"
7556 msgstr "abandon : impossible d'importer le module %s !\n"
7619
7557
7620 msgid "(did you forget to compile extensions?)\n"
7558 msgid "(did you forget to compile extensions?)\n"
7621 msgstr "(avez-vous oublié de compiler les extensions ?)\n"
7559 msgstr "(avez-vous oublié de compiler les extensions ?)\n"
7622
7560
7623 msgid "(is your Python install correct?)\n"
7561 msgid "(is your Python install correct?)\n"
7624 msgstr "(votre installation de Python est-elle correcte ?)\n"
7562 msgstr "(votre installation de Python est-elle correcte ?)\n"
7625
7563
7626 #, python-format
7564 #, python-format
7627 msgid "abort: error: %s\n"
7565 msgid "abort: error: %s\n"
7628 msgstr "abandon : erreur : %s\n"
7566 msgstr "abandon : erreur : %s\n"
7629
7567
7630 # traduction utilisée par la glibc...
7568 # traduction utilisée par la glibc...
7631 msgid "broken pipe\n"
7569 msgid "broken pipe\n"
7632 msgstr "relais brisé (pipe)\n"
7570 msgstr "relais brisé (pipe)\n"
7633
7571
7634 msgid "interrupted!\n"
7572 msgid "interrupted!\n"
7635 msgstr "interrompu !\n"
7573 msgstr "interrompu !\n"
7636
7574
7637 # traduction utilisée par la glibc...
7575 # traduction utilisée par la glibc...
7638 msgid ""
7576 msgid ""
7639 "\n"
7577 "\n"
7640 "broken pipe\n"
7578 "broken pipe\n"
7641 msgstr ""
7579 msgstr ""
7642 "\n"
7580 "\n"
7643 "relais brisé (pipe)\n"
7581 "relais brisé (pipe)\n"
7644
7582
7645 msgid "abort: out of memory\n"
7583 msgid "abort: out of memory\n"
7646 msgstr "abandon : plus de mémoire libre\n"
7584 msgstr "abandon : plus de mémoire libre\n"
7647
7585
7648 msgid "** unknown exception encountered, details follow\n"
7586 msgid "** unknown exception encountered, details follow\n"
7649 msgstr "** exception inconnue rencontrée, détails ci-dessous\n"
7587 msgstr "** exception inconnue rencontrée, détails ci-dessous\n"
7650
7588
7651 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7589 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7652 msgstr ""
7590 msgstr "** veuillez signaler le problème en détails sur http://www.selenic.com/mercurial/bts\n"
7653 "** veuillez signaler le problème en détails sur http://www.selenic.com/"
7654 "mercurial/bts\n"
7655
7591
7656 msgid "** or mercurial@selenic.com\n"
7592 msgid "** or mercurial@selenic.com\n"
7657 msgstr "** ou mercurial@selenic.com\n"
7593 msgstr "** ou mercurial@selenic.com\n"
7658
7594
7659 #, python-format
7595 #, python-format
7660 msgid "** Mercurial Distributed SCM (version %s)\n"
7596 msgid "** Mercurial Distributed SCM (version %s)\n"
7661 msgstr "** Mercurial version %s, système de gestion de sources distribué\n"
7597 msgstr "** Mercurial version %s, système de gestion de sources distribué\n"
7662
7598
7663 #, python-format
7599 #, python-format
7664 msgid "** Extensions loaded: %s\n"
7600 msgid "** Extensions loaded: %s\n"
7665 msgstr "** Extensions chargées : %s\n"
7601 msgstr "** Extensions chargées : %s\n"
7666
7602
7667 #, python-format
7603 #, python-format
7668 msgid "no definition for alias '%s'\n"
7604 msgid "no definition for alias '%s'\n"
7669 msgstr ""
7605 msgstr ""
7670
7606
7671 #, python-format
7607 #, python-format
7672 msgid "alias '%s' resolves to unknown command '%s'\n"
7608 msgid "alias '%s' resolves to unknown command '%s'\n"
7673 msgstr ""
7609 msgstr ""
7674
7610
7675 #, python-format
7611 #, python-format
7676 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7612 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7677 msgstr ""
7613 msgstr ""
7678
7614
7679 #, python-format
7615 #, python-format
7680 msgid "malformed --config option: %s"
7616 msgid "malformed --config option: %s"
7681 msgstr "option incorrecte pour --config : %s"
7617 msgstr "option incorrecte pour --config : %s"
7682
7618
7683 #, python-format
7619 #, python-format
7684 msgid "extension '%s' overrides commands: %s\n"
7620 msgid "extension '%s' overrides commands: %s\n"
7685 msgstr "l'extension '%s' redéfinit ces commandes : %s\n"
7621 msgstr "l'extension '%s' redéfinit ces commandes : %s\n"
7686
7622
7687 msgid "Option --config may not be abbreviated!"
7623 msgid "Option --config may not be abbreviated!"
7688 msgstr "L'option --config ne peut être abrégée !"
7624 msgstr "L'option --config ne peut être abrégée !"
7689
7625
7690 msgid "Option --cwd may not be abbreviated!"
7626 msgid "Option --cwd may not be abbreviated!"
7691 msgstr "L'option --cwd ne peut être abrégée !"
7627 msgstr "L'option --cwd ne peut être abrégée !"
7692
7628
7693 msgid ""
7629 msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
7694 "Option -R has to be separated from other options (e.g. not -qR) and --"
7630 msgstr "L'option -R doit être séparée des autres options (autrement dit -qR est invalide) et --repository ne peut être abrégé qu'en --repo !"
7695 "repository may only be abbreviated as --repo!"
7696 msgstr ""
7697 "L'option -R doit être séparée des autres options (autrement dit -qR est "
7698 "invalide) et --repository ne peut être abrégé qu'en --repo !"
7699
7631
7700 #, python-format
7632 #, python-format
7701 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7633 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7702 msgstr ""
7634 msgstr ""
7703
7635
7704 #, python-format
7636 #, python-format
7705 msgid "repository '%s' is not local"
7637 msgid "repository '%s' is not local"
7706 msgstr "le dépôt '%s' n'est pas local"
7638 msgstr "le dépôt '%s' n'est pas local"
7707
7639
7708 msgid "invalid arguments"
7640 msgid "invalid arguments"
7709 msgstr "arguments invalides"
7641 msgstr "arguments invalides"
7710
7642
7711 #, python-format
7643 #, python-format
7712 msgid "unrecognized profiling format '%s' - Ignored\n"
7644 msgid "unrecognized profiling format '%s' - Ignored\n"
7713 msgstr ""
7645 msgstr ""
7714
7646
7715 msgid ""
7647 msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
7716 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7717 "misc/lsprof/"
7718 msgstr ""
7648 msgstr ""
7719
7649
7720 #, python-format
7650 #, python-format
7721 msgid "*** failed to import extension %s from %s: %s\n"
7651 msgid "*** failed to import extension %s from %s: %s\n"
7722 msgstr ""
7652 msgstr ""
7723
7653
7724 #, python-format
7654 #, python-format
7725 msgid "*** failed to import extension %s: %s\n"
7655 msgid "*** failed to import extension %s: %s\n"
7726 msgstr ""
7656 msgstr ""
7727
7657
7728 #, python-format
7658 #, python-format
7729 msgid "couldn't find merge tool %s\n"
7659 msgid "couldn't find merge tool %s\n"
7730 msgstr ""
7660 msgstr ""
7731
7661
7732 #, python-format
7662 #, python-format
7733 msgid "tool %s can't handle symlinks\n"
7663 msgid "tool %s can't handle symlinks\n"
7734 msgstr ""
7664 msgstr ""
7735
7665
7736 #, python-format
7666 #, python-format
7737 msgid "tool %s can't handle binary\n"
7667 msgid "tool %s can't handle binary\n"
7738 msgstr ""
7668 msgstr ""
7739
7669
7740 #, python-format
7670 #, python-format
7741 msgid "tool %s requires a GUI\n"
7671 msgid "tool %s requires a GUI\n"
7742 msgstr ""
7672 msgstr ""
7743
7673
7744 #, python-format
7674 #, python-format
7745 msgid ""
7675 msgid ""
7746 " no tool found to merge %s\n"
7676 " no tool found to merge %s\n"
7747 "keep (l)ocal or take (o)ther?"
7677 "keep (l)ocal or take (o)ther?"
7748 msgstr ""
7678 msgstr ""
7749
7679
7750 msgid "&Local"
7680 msgid "&Local"
7751 msgstr ""
7681 msgstr ""
7752
7682
7753 msgid "&Other"
7683 msgid "&Other"
7754 msgstr ""
7684 msgstr ""
7755
7685
7756 #, python-format
7686 #, python-format
7757 msgid "merging %s and %s to %s\n"
7687 msgid "merging %s and %s to %s\n"
7758 msgstr ""
7688 msgstr ""
7759
7689
7760 #, python-format
7690 #, python-format
7761 msgid "merging %s\n"
7691 msgid "merging %s\n"
7762 msgstr ""
7692 msgstr ""
7763
7693
7764 #, python-format
7694 #, python-format
7765 msgid ""
7695 msgid ""
7766 " output file %s appears unchanged\n"
7696 " output file %s appears unchanged\n"
7767 "was merge successful (yn)?"
7697 "was merge successful (yn)?"
7768 msgstr ""
7698 msgstr ""
7769
7699
7770 msgid "&No"
7700 msgid "&No"
7771 msgstr ""
7701 msgstr ""
7772
7702
7773 msgid "&Yes"
7703 msgid "&Yes"
7774 msgstr ""
7704 msgstr ""
7775
7705
7776 #, python-format
7706 #, python-format
7777 msgid "merging %s failed!\n"
7707 msgid "merging %s failed!\n"
7778 msgstr ""
7708 msgstr ""
7779
7709
7780 #, python-format
7710 #, python-format
7781 msgid "Inconsistent state, %s:%s is good and bad"
7711 msgid "Inconsistent state, %s:%s is good and bad"
7782 msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\""
7712 msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\""
7783
7713
7784 #, python-format
7714 #, python-format
7785 msgid "unknown bisect kind %s"
7715 msgid "unknown bisect kind %s"
7786 msgstr "type inconnu pour dichotomie : %s"
7716 msgstr "type inconnu pour dichotomie : %s"
7787
7717
7788 msgid "disabled extensions:"
7718 msgid "disabled extensions:"
7789 msgstr "extensions désactivées :"
7719 msgstr "extensions désactivées :"
7790
7720
7791 msgid "Date Formats"
7721 msgid "Date Formats"
7792 msgstr ""
7722 msgstr ""
7793
7723
7794 msgid "File Name Patterns"
7724 msgid "File Name Patterns"
7795 msgstr ""
7725 msgstr ""
7796
7726
7797 msgid "Environment Variables"
7727 msgid "Environment Variables"
7798 msgstr ""
7728 msgstr ""
7799
7729
7800 msgid "Specifying Single Revisions"
7730 msgid "Specifying Single Revisions"
7801 msgstr ""
7731 msgstr ""
7802
7732
7803 msgid "Specifying Multiple Revisions"
7733 msgid "Specifying Multiple Revisions"
7804 msgstr ""
7734 msgstr ""
7805
7735
7806 msgid "Diff Formats"
7736 msgid "Diff Formats"
7807 msgstr ""
7737 msgstr ""
7808
7738
7809 msgid "Template Usage"
7739 msgid "Template Usage"
7810 msgstr ""
7740 msgstr ""
7811
7741
7812 msgid "URL Paths"
7742 msgid "URL Paths"
7813 msgstr ""
7743 msgstr ""
7814
7744
7815 msgid "Using additional features"
7745 msgid "Using additional features"
7816 msgstr ""
7746 msgstr ""
7817
7747
7818 msgid "can only share local repositories"
7748 msgid "can only share local repositories"
7819 msgstr ""
7749 msgstr ""
7820
7750
7821 msgid "destination already exists"
7751 msgid "destination already exists"
7822 msgstr ""
7752 msgstr ""
7823
7753
7824 msgid "updating working directory\n"
7754 msgid "updating working directory\n"
7825 msgstr ""
7755 msgstr ""
7826
7756
7827 #, python-format
7757 #, python-format
7828 msgid "destination directory: %s\n"
7758 msgid "destination directory: %s\n"
7829 msgstr ""
7759 msgstr ""
7830
7760
7831 #, python-format
7761 #, python-format
7832 msgid "destination '%s' already exists"
7762 msgid "destination '%s' already exists"
7833 msgstr ""
7763 msgstr ""
7834
7764
7835 #, python-format
7765 #, python-format
7836 msgid "destination '%s' is not empty"
7766 msgid "destination '%s' is not empty"
7837 msgstr ""
7767 msgstr ""
7838
7768
7839 msgid ""
7769 msgid "src repository does not support revision lookup and so doesn't support clone by revision"
7840 "src repository does not support revision lookup and so doesn't support clone "
7841 "by revision"
7842 msgstr ""
7770 msgstr ""
7843
7771
7844 msgid "clone from remote to remote not supported"
7772 msgid "clone from remote to remote not supported"
7845 msgstr ""
7773 msgstr ""
7846
7774
7847 #, fuzzy, python-format
7775 #, fuzzy, python-format
7848 msgid "updating to branch %s\n"
7776 msgid "updating to branch %s\n"
7849 msgstr "comparaison avec %s\n"
7777 msgstr "comparaison avec %s\n"
7850
7778
7851 #, python-format
7779 #, python-format
7852 msgid ""
7780 msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
7853 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
7854 msgstr ""
7781 msgstr ""
7855
7782
7856 msgid "use 'hg resolve' to retry unresolved file merges\n"
7783 msgid "use 'hg resolve' to retry unresolved file merges\n"
7857 msgstr ""
7784 msgstr ""
7858
7785
7859 msgid ""
7786 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n"
7860 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
7861 "abandon\n"
7862 msgstr ""
7787 msgstr ""
7863
7788
7864 msgid "(branch merge, don't forget to commit)\n"
7789 msgid "(branch merge, don't forget to commit)\n"
7865 msgstr ""
7790 msgstr ""
7866
7791
7867 #, python-format
7792 #, python-format
7868 msgid "error reading %s/.hg/hgrc: %s\n"
7793 msgid "error reading %s/.hg/hgrc: %s\n"
7869 msgstr ""
7794 msgstr ""
7870
7795
7871 msgid "SSL support is unavailable"
7796 msgid "SSL support is unavailable"
7872 msgstr ""
7797 msgstr ""
7873
7798
7874 msgid "IPv6 is not available on this system"
7799 msgid "IPv6 is not available on this system"
7875 msgstr ""
7800 msgstr ""
7876
7801
7877 #, python-format
7802 #, python-format
7878 msgid "cannot start server at '%s:%d': %s"
7803 msgid "cannot start server at '%s:%d': %s"
7879 msgstr ""
7804 msgstr ""
7880
7805
7881 #, python-format
7806 #, python-format
7882 msgid "calling hook %s: %s\n"
7807 msgid "calling hook %s: %s\n"
7883 msgstr ""
7808 msgstr ""
7884
7809
7885 #, python-format
7810 #, python-format
7886 msgid "%s hook is invalid (\"%s\" not in a module)"
7811 msgid "%s hook is invalid (\"%s\" not in a module)"
7887 msgstr ""
7812 msgstr ""
7888
7813
7889 #, python-format
7814 #, python-format
7890 msgid "%s hook is invalid (import of \"%s\" failed)"
7815 msgid "%s hook is invalid (import of \"%s\" failed)"
7891 msgstr ""
7816 msgstr ""
7892
7817
7893 #, python-format
7818 #, python-format
7894 msgid "%s hook is invalid (\"%s\" is not defined)"
7819 msgid "%s hook is invalid (\"%s\" is not defined)"
7895 msgstr ""
7820 msgstr ""
7896
7821
7897 #, python-format
7822 #, python-format
7898 msgid "%s hook is invalid (\"%s\" is not callable)"
7823 msgid "%s hook is invalid (\"%s\" is not callable)"
7899 msgstr ""
7824 msgstr ""
7900
7825
7901 #, python-format
7826 #, python-format
7902 msgid "error: %s hook failed: %s\n"
7827 msgid "error: %s hook failed: %s\n"
7903 msgstr ""
7828 msgstr ""
7904
7829
7905 #, python-format
7830 #, python-format
7906 msgid "error: %s hook raised an exception: %s\n"
7831 msgid "error: %s hook raised an exception: %s\n"
7907 msgstr ""
7832 msgstr ""
7908
7833
7909 #, python-format
7834 #, python-format
7910 msgid "%s hook failed"
7835 msgid "%s hook failed"
7911 msgstr ""
7836 msgstr ""
7912
7837
7913 #, python-format
7838 #, python-format
7914 msgid "warning: %s hook failed\n"
7839 msgid "warning: %s hook failed\n"
7915 msgstr ""
7840 msgstr ""
7916
7841
7917 #, python-format
7842 #, python-format
7918 msgid "running hook %s: %s\n"
7843 msgid "running hook %s: %s\n"
7919 msgstr ""
7844 msgstr ""
7920
7845
7921 #, python-format
7846 #, python-format
7922 msgid "%s hook %s"
7847 msgid "%s hook %s"
7923 msgstr ""
7848 msgstr ""
7924
7849
7925 #, python-format
7850 #, python-format
7926 msgid "warning: %s hook %s\n"
7851 msgid "warning: %s hook %s\n"
7927 msgstr ""
7852 msgstr ""
7928
7853
7929 msgid "connection ended unexpectedly"
7854 msgid "connection ended unexpectedly"
7930 msgstr ""
7855 msgstr ""
7931
7856
7932 #, python-format
7857 #, python-format
7933 msgid "unsupported URL component: \"%s\""
7858 msgid "unsupported URL component: \"%s\""
7934 msgstr ""
7859 msgstr ""
7935
7860
7936 msgid "operation not supported over http"
7861 msgid "operation not supported over http"
7937 msgstr ""
7862 msgstr ""
7938
7863
7939 msgid "authorization failed"
7864 msgid "authorization failed"
7940 msgstr ""
7865 msgstr ""
7941
7866
7942 msgid "http error, possibly caused by proxy setting"
7867 msgid "http error, possibly caused by proxy setting"
7943 msgstr ""
7868 msgstr ""
7944
7869
7945 #, python-format
7870 #, python-format
7946 msgid "real URL is %s\n"
7871 msgid "real URL is %s\n"
7947 msgstr ""
7872 msgstr ""
7948
7873
7949 #, python-format
7874 #, python-format
7950 msgid "'%s' does not appear to be an hg repository"
7875 msgid "'%s' does not appear to be an hg repository"
7951 msgstr ""
7876 msgstr ""
7952
7877
7953 #, python-format
7878 #, python-format
7954 msgid "'%s' sent a broken Content-Type header (%s)"
7879 msgid "'%s' sent a broken Content-Type header (%s)"
7955 msgstr ""
7880 msgstr ""
7956
7881
7957 #, python-format
7882 #, python-format
7958 msgid "'%s' uses newer protocol %s"
7883 msgid "'%s' uses newer protocol %s"
7959 msgstr ""
7884 msgstr ""
7960
7885
7961 msgid "look up remote revision"
7886 msgid "look up remote revision"
7962 msgstr ""
7887 msgstr ""
7963
7888
7964 msgid "unexpected response:"
7889 msgid "unexpected response:"
7965 msgstr ""
7890 msgstr ""
7966
7891
7967 msgid "look up remote changes"
7892 msgid "look up remote changes"
7968 msgstr ""
7893 msgstr ""
7969
7894
7970 msgid "push failed (unexpected response):"
7895 msgid "push failed (unexpected response):"
7971 msgstr ""
7896 msgstr ""
7972
7897
7973 #, python-format
7898 #, python-format
7974 msgid "push failed: %s"
7899 msgid "push failed: %s"
7975 msgstr ""
7900 msgstr ""
7976
7901
7977 msgid "Python support for SSL and HTTPS is not installed"
7902 msgid "Python support for SSL and HTTPS is not installed"
7978 msgstr ""
7903 msgstr ""
7979
7904
7980 msgid "cannot create new http repository"
7905 msgid "cannot create new http repository"
7981 msgstr ""
7906 msgstr ""
7982
7907
7983 #, python-format
7908 #, python-format
7984 msgid "ignoring invalid syntax '%s'"
7909 msgid "ignoring invalid syntax '%s'"
7985 msgstr ""
7910 msgstr ""
7986
7911
7987 #, python-format
7912 #, python-format
7988 msgid "skipping unreadable ignore file '%s': %s\n"
7913 msgid "skipping unreadable ignore file '%s': %s\n"
7989 msgstr ""
7914 msgstr ""
7990
7915
7991 #, python-format
7916 #, python-format
7992 msgid "repository %s not found"
7917 msgid "repository %s not found"
7993 msgstr ""
7918 msgstr ""
7994
7919
7995 #, python-format
7920 #, python-format
7996 msgid "repository %s already exists"
7921 msgid "repository %s already exists"
7997 msgstr ""
7922 msgstr ""
7998
7923
7999 #, python-format
7924 #, python-format
8000 msgid "requirement '%s' not supported"
7925 msgid "requirement '%s' not supported"
8001 msgstr ""
7926 msgstr ""
8002
7927
8003 #, python-format
7928 #, python-format
8004 msgid ".hg/sharedpath points to nonexistent directory %s"
7929 msgid ".hg/sharedpath points to nonexistent directory %s"
8005 msgstr ""
7930 msgstr ""
8006
7931
8007 #, python-format
7932 #, python-format
8008 msgid "%r cannot be used in a tag name"
7933 msgid "%r cannot be used in a tag name"
8009 msgstr ""
7934 msgstr ""
8010
7935
8011 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7936 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8012 msgstr ""
7937 msgstr ""
8013
7938
8014 #, python-format
7939 #, python-format
8015 msgid "working directory has unknown parent '%s'!"
7940 msgid "working directory has unknown parent '%s'!"
8016 msgstr ""
7941 msgstr ""
8017
7942
8018 #, python-format
7943 #, python-format
8019 msgid "unknown revision '%s'"
7944 msgid "unknown revision '%s'"
8020 msgstr ""
7945 msgstr ""
8021
7946
8022 msgid "journal already exists - run hg recover"
7947 msgid "journal already exists - run hg recover"
8023 msgstr ""
7948 msgstr ""
8024
7949
8025 msgid "rolling back interrupted transaction\n"
7950 msgid "rolling back interrupted transaction\n"
8026 msgstr ""
7951 msgstr ""
8027
7952
8028 msgid "no interrupted transaction available\n"
7953 msgid "no interrupted transaction available\n"
8029 msgstr ""
7954 msgstr ""
8030
7955
8031 msgid "rolling back last transaction\n"
7956 msgid "rolling back last transaction\n"
8032 msgstr ""
7957 msgstr ""
8033
7958
8034 #, python-format
7959 #, python-format
8035 msgid "Named branch could not be reset, current branch still is: %s\n"
7960 msgid "Named branch could not be reset, current branch still is: %s\n"
8036 msgstr ""
7961 msgstr ""
8037
7962
8038 msgid "no rollback information available\n"
7963 msgid "no rollback information available\n"
8039 msgstr ""
7964 msgstr ""
8040
7965
8041 #, python-format
7966 #, python-format
8042 msgid "waiting for lock on %s held by %r\n"
7967 msgid "waiting for lock on %s held by %r\n"
8043 msgstr ""
7968 msgstr ""
8044
7969
8045 #, python-format
7970 #, python-format
8046 msgid "repository %s"
7971 msgid "repository %s"
8047 msgstr ""
7972 msgstr ""
8048
7973
8049 #, python-format
7974 #, python-format
8050 msgid "working directory of %s"
7975 msgid "working directory of %s"
8051 msgstr ""
7976 msgstr ""
8052
7977
8053 msgid "cannot partially commit a merge (do not specify files or patterns)"
7978 msgid "cannot partially commit a merge (do not specify files or patterns)"
8054 msgstr ""
7979 msgstr ""
8055
7980
8056 msgid "file not found!"
7981 msgid "file not found!"
8057 msgstr ""
7982 msgstr ""
8058
7983
8059 msgid "no match under directory!"
7984 msgid "no match under directory!"
8060 msgstr ""
7985 msgstr ""
8061
7986
8062 msgid "file not tracked!"
7987 msgid "file not tracked!"
8063 msgstr ""
7988 msgstr ""
8064
7989
8065 msgid "unresolved merge conflicts (see hg resolve)"
7990 msgid "unresolved merge conflicts (see hg resolve)"
8066 msgstr ""
7991 msgstr ""
8067
7992
8068 #, python-format
7993 #, python-format
8069 msgid "committing subrepository %s\n"
7994 msgid "committing subrepository %s\n"
8070 msgstr ""
7995 msgstr ""
8071
7996
8072 #, python-format
7997 #, python-format
8073 msgid "trouble committing %s!\n"
7998 msgid "trouble committing %s!\n"
8074 msgstr ""
7999 msgstr ""
8075
8000
8076 #, python-format
8001 #, python-format
8077 msgid "%s does not exist!\n"
8002 msgid "%s does not exist!\n"
8078 msgstr ""
8003 msgstr ""
8079
8004
8080 #, python-format
8005 #, python-format
8081 msgid ""
8006 msgid ""
8082 "%s: files over 10MB may cause memory and performance problems\n"
8007 "%s: files over 10MB may cause memory and performance problems\n"
8083 "(use 'hg revert %s' to unadd the file)\n"
8008 "(use 'hg revert %s' to unadd the file)\n"
8084 msgstr ""
8009 msgstr ""
8085
8010
8086 #, python-format
8011 #, python-format
8087 msgid "%s not added: only files and symlinks supported currently\n"
8012 msgid "%s not added: only files and symlinks supported currently\n"
8088 msgstr ""
8013 msgstr ""
8089
8014
8090 #, python-format
8015 #, python-format
8091 msgid "%s already tracked!\n"
8016 msgid "%s already tracked!\n"
8092 msgstr ""
8017 msgstr ""
8093
8018
8094 #, python-format
8019 #, python-format
8095 msgid "%s not added!\n"
8020 msgid "%s not added!\n"
8096 msgstr ""
8021 msgstr ""
8097
8022
8098 #, python-format
8023 #, python-format
8099 msgid "%s still exists!\n"
8024 msgid "%s still exists!\n"
8100 msgstr ""
8025 msgstr ""
8101
8026
8102 #, python-format
8027 #, python-format
8103 msgid "%s not tracked!\n"
8028 msgid "%s not tracked!\n"
8104 msgstr ""
8029 msgstr ""
8105
8030
8106 #, python-format
8031 #, python-format
8107 msgid "%s not removed!\n"
8032 msgid "%s not removed!\n"
8108 msgstr ""
8033 msgstr ""
8109
8034
8110 #, python-format
8035 #, python-format
8111 msgid "copy failed: %s is not a file or a symbolic link\n"
8036 msgid "copy failed: %s is not a file or a symbolic link\n"
8112 msgstr ""
8037 msgstr ""
8113
8038
8114 msgid "searching for changes\n"
8039 msgid "searching for changes\n"
8115 msgstr ""
8040 msgstr ""
8116
8041
8117 msgid "already have changeset "
8042 msgid "already have changeset "
8118 msgstr ""
8043 msgstr ""
8119
8044
8120 msgid "warning: repository is unrelated\n"
8045 msgid "warning: repository is unrelated\n"
8121 msgstr ""
8046 msgstr ""
8122
8047
8123 msgid "repository is unrelated"
8048 msgid "repository is unrelated"
8124 msgstr ""
8049 msgstr ""
8125
8050
8126 msgid "requesting all changes\n"
8051 msgid "requesting all changes\n"
8127 msgstr ""
8052 msgstr ""
8128
8053
8129 msgid ""
8054 msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
8130 "Partial pull cannot be done because other repository doesn't support "
8131 "changegroupsubset."
8132 msgstr ""
8055 msgstr ""
8133
8056
8134 #, python-format
8057 #, python-format
8135 msgid "abort: push creates new remote branch '%s'!\n"
8058 msgid "abort: push creates new remote branch '%s'!\n"
8136 msgstr ""
8059 msgstr ""
8137
8060
8138 msgid "abort: push creates new remote heads!\n"
8061 msgid "abort: push creates new remote heads!\n"
8139 msgstr ""
8062 msgstr ""
8140
8063
8141 msgid "(did you forget to merge? use push -f to force)\n"
8064 msgid "(did you forget to merge? use push -f to force)\n"
8142 msgstr ""
8065 msgstr ""
8143
8066
8144 msgid "note: unsynced remote changes!\n"
8067 msgid "note: unsynced remote changes!\n"
8145 msgstr ""
8068 msgstr ""
8146
8069
8147 #, python-format
8070 #, python-format
8148 msgid "%d changesets found\n"
8071 msgid "%d changesets found\n"
8149 msgstr ""
8072 msgstr ""
8150
8073
8151 #, python-format
8074 #, python-format
8152 msgid "empty or missing revlog for %s"
8075 msgid "empty or missing revlog for %s"
8153 msgstr ""
8076 msgstr ""
8154
8077
8155 msgid "adding changesets\n"
8078 msgid "adding changesets\n"
8156 msgstr ""
8079 msgstr ""
8157
8080
8158 msgid "received changelog group is empty"
8081 msgid "received changelog group is empty"
8159 msgstr ""
8082 msgstr ""
8160
8083
8161 msgid "adding manifests\n"
8084 msgid "adding manifests\n"
8162 msgstr ""
8085 msgstr ""
8163
8086
8164 msgid "adding file changes\n"
8087 msgid "adding file changes\n"
8165 msgstr ""
8088 msgstr ""
8166
8089
8167 msgid "received file revlog group is empty"
8090 msgid "received file revlog group is empty"
8168 msgstr ""
8091 msgstr ""
8169
8092
8170 #, python-format
8093 #, python-format
8171 msgid " (%+d heads)"
8094 msgid " (%+d heads)"
8172 msgstr ""
8095 msgstr ""
8173
8096
8174 #, python-format
8097 #, python-format
8175 msgid "added %d changesets with %d changes to %d files%s\n"
8098 msgid "added %d changesets with %d changes to %d files%s\n"
8176 msgstr ""
8099 msgstr ""
8177
8100
8178 msgid "Unexpected response from remote server:"
8101 msgid "Unexpected response from remote server:"
8179 msgstr ""
8102 msgstr ""
8180
8103
8181 msgid "operation forbidden by server"
8104 msgid "operation forbidden by server"
8182 msgstr ""
8105 msgstr ""
8183
8106
8184 msgid "locking the remote repository failed"
8107 msgid "locking the remote repository failed"
8185 msgstr ""
8108 msgstr ""
8186
8109
8187 msgid "the server sent an unknown error code"
8110 msgid "the server sent an unknown error code"
8188 msgstr ""
8111 msgstr ""
8189
8112
8190 msgid "streaming all changes\n"
8113 msgid "streaming all changes\n"
8191 msgstr ""
8114 msgstr ""
8192
8115
8193 #, python-format
8116 #, python-format
8194 msgid "%d files to transfer, %s of data\n"
8117 msgid "%d files to transfer, %s of data\n"
8195 msgstr ""
8118 msgstr ""
8196
8119
8197 #, python-format
8120 #, python-format
8198 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8121 msgid "transferred %s in %.1f seconds (%s/sec)\n"
8199 msgstr ""
8122 msgstr ""
8200
8123
8201 msgid "no [smtp]host in hgrc - cannot send mail"
8124 msgid "no [smtp]host in hgrc - cannot send mail"
8202 msgstr ""
8125 msgstr ""
8203
8126
8204 #, python-format
8127 #, python-format
8205 msgid "sending mail: smtp host %s, port %s\n"
8128 msgid "sending mail: smtp host %s, port %s\n"
8206 msgstr ""
8129 msgstr ""
8207
8130
8208 msgid "can't use TLS: Python SSL support not installed"
8131 msgid "can't use TLS: Python SSL support not installed"
8209 msgstr ""
8132 msgstr ""
8210
8133
8211 msgid "(using tls)\n"
8134 msgid "(using tls)\n"
8212 msgstr ""
8135 msgstr ""
8213
8136
8214 #, python-format
8137 #, python-format
8215 msgid "(authenticating to mail server as %s)\n"
8138 msgid "(authenticating to mail server as %s)\n"
8216 msgstr ""
8139 msgstr ""
8217
8140
8218 #, python-format
8141 #, python-format
8219 msgid "sending mail: %s\n"
8142 msgid "sending mail: %s\n"
8220 msgstr ""
8143 msgstr ""
8221
8144
8222 msgid "smtp specified as email transport, but no smtp host configured"
8145 msgid "smtp specified as email transport, but no smtp host configured"
8223 msgstr ""
8146 msgstr ""
8224
8147
8225 #, python-format
8148 #, python-format
8226 msgid "%r specified as email transport, but not in PATH"
8149 msgid "%r specified as email transport, but not in PATH"
8227 msgstr ""
8150 msgstr ""
8228
8151
8229 #, python-format
8152 #, python-format
8230 msgid "ignoring invalid sendcharset: %s\n"
8153 msgid "ignoring invalid sendcharset: %s\n"
8231 msgstr ""
8154 msgstr ""
8232
8155
8233 #, python-format
8156 #, python-format
8234 msgid "invalid email address: %s"
8157 msgid "invalid email address: %s"
8235 msgstr ""
8158 msgstr ""
8236
8159
8237 #, python-format
8160 #, python-format
8238 msgid "invalid local address: %s"
8161 msgid "invalid local address: %s"
8239 msgstr ""
8162 msgstr ""
8240
8163
8241 #, python-format
8164 #, python-format
8242 msgid "failed to remove %s from manifest"
8165 msgid "failed to remove %s from manifest"
8243 msgstr ""
8166 msgstr ""
8244
8167
8245 #, python-format
8168 #, python-format
8246 msgid "diff context lines count must be an integer, not %r"
8169 msgid "diff context lines count must be an integer, not %r"
8247 msgstr ""
8170 msgstr ""
8248
8171
8249 #, python-format
8172 #, python-format
8250 msgid ""
8173 msgid "untracked file in working directory differs from file in requested revision: '%s'"
8251 "untracked file in working directory differs from file in requested revision: "
8252 "'%s'"
8253 msgstr ""
8174 msgstr ""
8254
8175
8255 #, python-format
8176 #, python-format
8256 msgid "case-folding collision between %s and %s"
8177 msgid "case-folding collision between %s and %s"
8257 msgstr ""
8178 msgstr ""
8258
8179
8259 #, python-format
8180 #, python-format
8260 msgid ""
8181 msgid ""
8261 " conflicting flags for %s\n"
8182 " conflicting flags for %s\n"
8262 "(n)one, e(x)ec or sym(l)ink?"
8183 "(n)one, e(x)ec or sym(l)ink?"
8263 msgstr ""
8184 msgstr ""
8264
8185
8265 msgid "&None"
8186 msgid "&None"
8266 msgstr ""
8187 msgstr ""
8267
8188
8268 msgid "E&xec"
8189 msgid "E&xec"
8269 msgstr ""
8190 msgstr ""
8270
8191
8271 msgid "Sym&link"
8192 msgid "Sym&link"
8272 msgstr ""
8193 msgstr ""
8273
8194
8274 msgid "resolving manifests\n"
8195 msgid "resolving manifests\n"
8275 msgstr ""
8196 msgstr ""
8276
8197
8277 #, python-format
8198 #, python-format
8278 msgid ""
8199 msgid ""
8279 " local changed %s which remote deleted\n"
8200 " local changed %s which remote deleted\n"
8280 "use (c)hanged version or (d)elete?"
8201 "use (c)hanged version or (d)elete?"
8281 msgstr ""
8202 msgstr ""
8282
8203
8283 msgid "&Changed"
8204 msgid "&Changed"
8284 msgstr ""
8205 msgstr ""
8285
8206
8286 msgid "&Delete"
8207 msgid "&Delete"
8287 msgstr ""
8208 msgstr ""
8288
8209
8289 #, python-format
8210 #, python-format
8290 msgid ""
8211 msgid ""
8291 "remote changed %s which local deleted\n"
8212 "remote changed %s which local deleted\n"
8292 "use (c)hanged version or leave (d)eleted?"
8213 "use (c)hanged version or leave (d)eleted?"
8293 msgstr ""
8214 msgstr ""
8294
8215
8295 msgid "&Deleted"
8216 msgid "&Deleted"
8296 msgstr ""
8217 msgstr ""
8297
8218
8298 #, python-format
8219 #, python-format
8299 msgid "update failed to remove %s: %s!\n"
8220 msgid "update failed to remove %s: %s!\n"
8300 msgstr ""
8221 msgstr ""
8301
8222
8302 #, python-format
8223 #, python-format
8303 msgid "getting %s\n"
8224 msgid "getting %s\n"
8304 msgstr ""
8225 msgstr ""
8305
8226
8306 #, python-format
8227 #, python-format
8307 msgid "getting %s to %s\n"
8228 msgid "getting %s to %s\n"
8308 msgstr ""
8229 msgstr ""
8309
8230
8310 #, python-format
8231 #, python-format
8311 msgid "warning: detected divergent renames of %s to:\n"
8232 msgid "warning: detected divergent renames of %s to:\n"
8312 msgstr ""
8233 msgstr ""
8313
8234
8314 #, python-format
8235 #, python-format
8315 msgid "branch %s not found"
8236 msgid "branch %s not found"
8316 msgstr ""
8237 msgstr ""
8317
8238
8318 msgid "can't merge with ancestor"
8239 msgid "can't merge with ancestor"
8319 msgstr ""
8240 msgstr ""
8320
8241
8321 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8242 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8322 msgstr ""
8243 msgstr ""
8323
8244
8324 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8245 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8325 msgstr ""
8246 msgstr ""
8326
8247
8327 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8248 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8328 msgstr ""
8249 msgstr ""
8329
8250
8330 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8251 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8331 msgstr ""
8252 msgstr ""
8332
8253
8333 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8254 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8334 msgstr ""
8255 msgstr ""
8335
8256
8336 #, python-format
8257 #, python-format
8337 msgid "cannot create %s: destination already exists"
8258 msgid "cannot create %s: destination already exists"
8338 msgstr ""
8259 msgstr ""
8339
8260
8340 #, python-format
8261 #, python-format
8341 msgid "cannot create %s: unable to create destination directory"
8262 msgid "cannot create %s: unable to create destination directory"
8342 msgstr ""
8263 msgstr ""
8343
8264
8344 #, python-format
8265 #, python-format
8345 msgid "unable to find '%s' for patching\n"
8266 msgid "unable to find '%s' for patching\n"
8346 msgstr ""
8267 msgstr ""
8347
8268
8348 #, python-format
8269 #, python-format
8349 msgid "patching file %s\n"
8270 msgid "patching file %s\n"
8350 msgstr ""
8271 msgstr ""
8351
8272
8352 #, python-format
8273 #, python-format
8353 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8274 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8354 msgstr ""
8275 msgstr ""
8355
8276
8356 #, python-format
8277 #, python-format
8357 msgid "bad hunk #%d %s (%d %d %d %d)"
8278 msgid "bad hunk #%d %s (%d %d %d %d)"
8358 msgstr ""
8279 msgstr ""
8359
8280
8360 #, python-format
8281 #, python-format
8361 msgid "file %s already exists\n"
8282 msgid "file %s already exists\n"
8362 msgstr ""
8283 msgstr ""
8363
8284
8364 #, python-format
8285 #, python-format
8365 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8286 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8366 msgstr ""
8287 msgstr ""
8367
8288
8368 #, python-format
8289 #, python-format
8369 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8290 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8370 msgstr ""
8291 msgstr ""
8371
8292
8372 #, python-format
8293 #, python-format
8373 msgid "Hunk #%d FAILED at %d\n"
8294 msgid "Hunk #%d FAILED at %d\n"
8374 msgstr ""
8295 msgstr ""
8375
8296
8376 #, python-format
8297 #, python-format
8377 msgid "bad hunk #%d"
8298 msgid "bad hunk #%d"
8378 msgstr ""
8299 msgstr ""
8379
8300
8380 #, python-format
8301 #, python-format
8381 msgid "bad hunk #%d old text line %d"
8302 msgid "bad hunk #%d old text line %d"
8382 msgstr ""
8303 msgstr ""
8383
8304
8384 msgid "could not extract binary patch"
8305 msgid "could not extract binary patch"
8385 msgstr ""
8306 msgstr ""
8386
8307
8387 #, python-format
8308 #, python-format
8388 msgid "binary patch is %d bytes, not %d"
8309 msgid "binary patch is %d bytes, not %d"
8389 msgstr ""
8310 msgstr ""
8390
8311
8391 #, python-format
8312 #, python-format
8392 msgid "unable to strip away %d dirs from %s"
8313 msgid "unable to strip away %d dirs from %s"
8393 msgstr ""
8314 msgstr ""
8394
8315
8395 msgid "undefined source and destination files"
8316 msgid "undefined source and destination files"
8396 msgstr ""
8317 msgstr ""
8397
8318
8398 #, python-format
8319 #, python-format
8399 msgid "malformed patch %s %s"
8320 msgid "malformed patch %s %s"
8400 msgstr ""
8321 msgstr ""
8401
8322
8402 #, python-format
8323 #, python-format
8403 msgid "unsupported parser state: %s"
8324 msgid "unsupported parser state: %s"
8404 msgstr ""
8325 msgstr ""
8405
8326
8406 #, python-format
8327 #, python-format
8407 msgid "patch command failed: %s"
8328 msgid "patch command failed: %s"
8408 msgstr ""
8329 msgstr ""
8409
8330
8410 #, python-format
8331 #, python-format
8411 msgid "Unsupported line endings type: %s"
8332 msgid "Unsupported line endings type: %s"
8412 msgstr ""
8333 msgstr ""
8413
8334
8414 #, python-format
8335 #, python-format
8415 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
8336 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
8416 msgstr ""
8337 msgstr ""
8417
8338
8418 #, python-format
8339 #, python-format
8419 msgid "exited with status %d"
8340 msgid "exited with status %d"
8420 msgstr ""
8341 msgstr ""
8421
8342
8422 #, python-format
8343 #, python-format
8423 msgid "killed by signal %d"
8344 msgid "killed by signal %d"
8424 msgstr ""
8345 msgstr ""
8425
8346
8426 #, python-format
8347 #, python-format
8427 msgid "saving bundle to %s\n"
8348 msgid "saving bundle to %s\n"
8428 msgstr ""
8349 msgstr ""
8429
8350
8430 msgid "adding branch\n"
8351 msgid "adding branch\n"
8431 msgstr ""
8352 msgstr ""
8432
8353
8433 #, python-format
8354 #, python-format
8434 msgid "cannot %s; remote repository does not support the %r capability"
8355 msgid "cannot %s; remote repository does not support the %r capability"
8435 msgstr ""
8356 msgstr ""
8436
8357
8437 #, python-format
8358 #, python-format
8438 msgid "unknown compression type %r"
8359 msgid "unknown compression type %r"
8439 msgstr ""
8360 msgstr ""
8440
8361
8441 #, python-format
8362 #, python-format
8442 msgid "index %s unknown flags %#04x for format v0"
8363 msgid "index %s unknown flags %#04x for format v0"
8443 msgstr ""
8364 msgstr ""
8444
8365
8445 #, python-format
8366 #, python-format
8446 msgid "index %s unknown flags %#04x for revlogng"
8367 msgid "index %s unknown flags %#04x for revlogng"
8447 msgstr ""
8368 msgstr ""
8448
8369
8449 #, python-format
8370 #, python-format
8450 msgid "index %s unknown format %d"
8371 msgid "index %s unknown format %d"
8451 msgstr ""
8372 msgstr ""
8452
8373
8453 #, python-format
8374 #, python-format
8454 msgid "index %s is corrupted"
8375 msgid "index %s is corrupted"
8455 msgstr ""
8376 msgstr ""
8456
8377
8457 msgid "no node"
8378 msgid "no node"
8458 msgstr ""
8379 msgstr ""
8459
8380
8460 msgid "ambiguous identifier"
8381 msgid "ambiguous identifier"
8461 msgstr ""
8382 msgstr ""
8462
8383
8463 msgid "no match found"
8384 msgid "no match found"
8464 msgstr ""
8385 msgstr ""
8465
8386
8466 #, python-format
8387 #, python-format
8467 msgid "incompatible revision flag %x"
8388 msgid "incompatible revision flag %x"
8468 msgstr ""
8389 msgstr ""
8469
8390
8470 #, python-format
8391 #, python-format
8471 msgid "%s not found in the transaction"
8392 msgid "%s not found in the transaction"
8472 msgstr ""
8393 msgstr ""
8473
8394
8474 msgid "unknown base"
8395 msgid "unknown base"
8475 msgstr ""
8396 msgstr ""
8476
8397
8477 msgid "consistency error adding group"
8398 msgid "consistency error adding group"
8478 msgstr ""
8399 msgstr ""
8479
8400
8480 #, python-format
8401 #, python-format
8481 msgid "%s looks like a binary file."
8402 msgid "%s looks like a binary file."
8482 msgstr ""
8403 msgstr ""
8483
8404
8484 msgid "can only specify two labels."
8405 msgid "can only specify two labels."
8485 msgstr ""
8406 msgstr ""
8486
8407
8487 msgid "warning: conflicts during merge.\n"
8408 msgid "warning: conflicts during merge.\n"
8488 msgstr ""
8409 msgstr ""
8489
8410
8490 #, python-format
8411 #, python-format
8491 msgid "couldn't parse location %s"
8412 msgid "couldn't parse location %s"
8492 msgstr ""
8413 msgstr ""
8493
8414
8494 msgid "could not create remote repo"
8415 msgid "could not create remote repo"
8495 msgstr ""
8416 msgstr ""
8496
8417
8497 msgid "no suitable response from remote hg"
8418 msgid "no suitable response from remote hg"
8498 msgstr ""
8419 msgstr ""
8499
8420
8500 msgid "remote: "
8421 msgid "remote: "
8501 msgstr ""
8422 msgstr ""
8502
8423
8503 #, python-format
8424 #, python-format
8504 msgid "push refused: %s"
8425 msgid "push refused: %s"
8505 msgstr ""
8426 msgstr ""
8506
8427
8507 msgid "unsynced changes"
8428 msgid "unsynced changes"
8508 msgstr ""
8429 msgstr ""
8509
8430
8510 msgid "cannot lock static-http repository"
8431 msgid "cannot lock static-http repository"
8511 msgstr ""
8432 msgstr ""
8512
8433
8513 msgid "cannot create new static-http repository"
8434 msgid "cannot create new static-http repository"
8514 msgstr ""
8435 msgstr ""
8515
8436
8516 #, python-format
8437 #, python-format
8517 msgid "invalid entry in fncache, line %s"
8438 msgid "invalid entry in fncache, line %s"
8518 msgstr ""
8439 msgstr ""
8519
8440
8520 #, python-format
8441 #, python-format
8521 msgid ""
8442 msgid ""
8522 " subrepository sources for %s differ\n"
8443 " subrepository sources for %s differ\n"
8523 "use (l)ocal source (%s) or (r)emote source (%s)?"
8444 "use (l)ocal source (%s) or (r)emote source (%s)?"
8524 msgstr ""
8445 msgstr ""
8525
8446
8526 msgid "&Remote"
8447 msgid "&Remote"
8527 msgstr ""
8448 msgstr ""
8528
8449
8529 #, python-format
8450 #, python-format
8530 msgid ""
8451 msgid ""
8531 " local changed subrepository %s which remote removed\n"
8452 " local changed subrepository %s which remote removed\n"
8532 "use (c)hanged version or (d)elete?"
8453 "use (c)hanged version or (d)elete?"
8533 msgstr ""
8454 msgstr ""
8534
8455
8535 #, python-format
8456 #, python-format
8536 msgid ""
8457 msgid ""
8537 " remote changed subrepository %s which local removed\n"
8458 " remote changed subrepository %s which local removed\n"
8538 "use (c)hanged version or (d)elete?"
8459 "use (c)hanged version or (d)elete?"
8539 msgstr ""
8460 msgstr ""
8540
8461
8541 #, python-format
8462 #, python-format
8542 msgid "removing subrepo %s\n"
8463 msgid "removing subrepo %s\n"
8543 msgstr ""
8464 msgstr ""
8544
8465
8545 #, python-format
8466 #, python-format
8546 msgid "pulling subrepo %s\n"
8467 msgid "pulling subrepo %s\n"
8547 msgstr ""
8468 msgstr ""
8548
8469
8549 #, python-format
8470 #, python-format
8550 msgid "pushing subrepo %s\n"
8471 msgid "pushing subrepo %s\n"
8551 msgstr ""
8472 msgstr ""
8552
8473
8553 #, python-format
8474 #, python-format
8554 msgid "%s, line %s: %s\n"
8475 msgid "%s, line %s: %s\n"
8555 msgstr ""
8476 msgstr ""
8556
8477
8557 msgid "cannot parse entry"
8478 msgid "cannot parse entry"
8558 msgstr ""
8479 msgstr ""
8559
8480
8560 #, python-format
8481 #, python-format
8561 msgid "node '%s' is not well formed"
8482 msgid "node '%s' is not well formed"
8562 msgstr ""
8483 msgstr ""
8563
8484
8564 msgid "unmatched quotes"
8485 msgid "unmatched quotes"
8565 msgstr ""
8486 msgstr ""
8566
8487
8567 #, python-format
8488 #, python-format
8568 msgid "error expanding '%s%%%s'"
8489 msgid "error expanding '%s%%%s'"
8569 msgstr ""
8490 msgstr ""
8570
8491
8571 #, python-format
8492 #, python-format
8572 msgid "unknown filter '%s'"
8493 msgid "unknown filter '%s'"
8573 msgstr ""
8494 msgstr ""
8574
8495
8575 #, python-format
8496 #, python-format
8576 msgid "style not found: %s"
8497 msgid "style not found: %s"
8577 msgstr ""
8498 msgstr ""
8578
8499
8579 #, python-format
8500 #, python-format
8580 msgid "template file %s: %s"
8501 msgid "template file %s: %s"
8581 msgstr ""
8502 msgstr ""
8582
8503
8583 msgid "cannot use transaction when it is already committed/aborted"
8504 msgid "cannot use transaction when it is already committed/aborted"
8584 msgstr ""
8505 msgstr ""
8585
8506
8586 #, python-format
8507 #, python-format
8587 msgid "failed to truncate %s\n"
8508 msgid "failed to truncate %s\n"
8588 msgstr ""
8509 msgstr ""
8589
8510
8590 msgid "transaction abort!\n"
8511 msgid "transaction abort!\n"
8591 msgstr ""
8512 msgstr ""
8592
8513
8593 msgid "rollback completed\n"
8514 msgid "rollback completed\n"
8594 msgstr ""
8515 msgstr ""
8595
8516
8596 msgid "rollback failed - please run hg recover\n"
8517 msgid "rollback failed - please run hg recover\n"
8597 msgstr ""
8518 msgstr ""
8598
8519
8599 #, python-format
8520 #, python-format
8600 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8521 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8601 msgstr ""
8522 msgstr ""
8602
8523
8603 #, python-format
8524 #, python-format
8604 msgid "Ignored: %s\n"
8525 msgid "Ignored: %s\n"
8605 msgstr ""
8526 msgstr ""
8606
8527
8607 #, python-format
8528 #, python-format
8608 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8529 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8609 msgstr ""
8530 msgstr ""
8610
8531
8611 #, python-format
8532 #, python-format
8612 msgid "%s.%s not a boolean ('%s')"
8533 msgid "%s.%s not a boolean ('%s')"
8613 msgstr ""
8534 msgstr ""
8614
8535
8615 msgid "enter a commit username:"
8536 msgid "enter a commit username:"
8616 msgstr ""
8537 msgstr ""
8617
8538
8618 #, python-format
8539 #, python-format
8619 msgid "No username found, using '%s' instead\n"
8540 msgid "No username found, using '%s' instead\n"
8620 msgstr ""
8541 msgstr ""
8621
8542
8622 msgid "Please specify a username."
8543 msgid "Please specify a username."
8623 msgstr ""
8544 msgstr ""
8624
8545
8625 #, python-format
8546 #, python-format
8626 msgid "username %s contains a newline\n"
8547 msgid "username %s contains a newline\n"
8627 msgstr ""
8548 msgstr ""
8628
8549
8629 msgid "response expected"
8550 msgid "response expected"
8630 msgstr ""
8551 msgstr ""
8631
8552
8632 msgid "unrecognized response\n"
8553 msgid "unrecognized response\n"
8633 msgstr ""
8554 msgstr ""
8634
8555
8635 msgid "password: "
8556 msgid "password: "
8636 msgstr ""
8557 msgstr ""
8637
8558
8638 msgid "edit failed"
8559 msgid "edit failed"
8639 msgstr ""
8560 msgstr ""
8640
8561
8641 msgid "http authorization required"
8562 msgid "http authorization required"
8642 msgstr ""
8563 msgstr ""
8643
8564
8644 msgid "http authorization required\n"
8565 msgid "http authorization required\n"
8645 msgstr ""
8566 msgstr ""
8646
8567
8647 #, python-format
8568 #, python-format
8648 msgid "realm: %s\n"
8569 msgid "realm: %s\n"
8649 msgstr ""
8570 msgstr ""
8650
8571
8651 #, python-format
8572 #, python-format
8652 msgid "user: %s\n"
8573 msgid "user: %s\n"
8653 msgstr ""
8574 msgstr ""
8654
8575
8655 msgid "user:"
8576 msgid "user:"
8656 msgstr ""
8577 msgstr ""
8657
8578
8658 #, python-format
8579 #, python-format
8659 msgid "http auth: user %s, password %s\n"
8580 msgid "http auth: user %s, password %s\n"
8660 msgstr ""
8581 msgstr ""
8661
8582
8662 #, python-format
8583 #, python-format
8663 msgid "command '%s' failed: %s"
8584 msgid "command '%s' failed: %s"
8664 msgstr ""
8585 msgstr ""
8665
8586
8666 #, python-format
8587 #, python-format
8667 msgid "path contains illegal component: %s"
8588 msgid "path contains illegal component: %s"
8668 msgstr ""
8589 msgstr ""
8669
8590
8670 #, python-format
8591 #, python-format
8671 msgid "path %r is inside repo %r"
8592 msgid "path %r is inside repo %r"
8672 msgstr ""
8593 msgstr ""
8673
8594
8674 #, python-format
8595 #, python-format
8675 msgid "path %r traverses symbolic link %r"
8596 msgid "path %r traverses symbolic link %r"
8676 msgstr ""
8597 msgstr ""
8677
8598
8678 msgid "Hardlinks not supported"
8599 msgid "Hardlinks not supported"
8679 msgstr ""
8600 msgstr ""
8680
8601
8681 #, python-format
8602 #, python-format
8682 msgid "could not symlink to %r: %s"
8603 msgid "could not symlink to %r: %s"
8683 msgstr ""
8604 msgstr ""
8684
8605
8685 #, python-format
8606 #, python-format
8686 msgid "invalid date: %r "
8607 msgid "invalid date: %r "
8687 msgstr ""
8608 msgstr ""
8688
8609
8689 #, python-format
8610 #, python-format
8690 msgid "date exceeds 32 bits: %d"
8611 msgid "date exceeds 32 bits: %d"
8691 msgstr ""
8612 msgstr ""
8692
8613
8693 #, python-format
8614 #, python-format
8694 msgid "impossible time zone offset: %d"
8615 msgid "impossible time zone offset: %d"
8695 msgstr ""
8616 msgstr ""
8696
8617
8697 #, python-format
8618 #, python-format
8698 msgid "invalid day spec: %s"
8619 msgid "invalid day spec: %s"
8699 msgstr ""
8620 msgstr ""
8700
8621
8701 #, python-format
8622 #, python-format
8702 msgid "%.0f GB"
8623 msgid "%.0f GB"
8703 msgstr ""
8624 msgstr ""
8704
8625
8705 #, python-format
8626 #, python-format
8706 msgid "%.1f GB"
8627 msgid "%.1f GB"
8707 msgstr ""
8628 msgstr ""
8708
8629
8709 #, python-format
8630 #, python-format
8710 msgid "%.2f GB"
8631 msgid "%.2f GB"
8711 msgstr ""
8632 msgstr ""
8712
8633
8713 #, python-format
8634 #, python-format
8714 msgid "%.0f MB"
8635 msgid "%.0f MB"
8715 msgstr ""
8636 msgstr ""
8716
8637
8717 #, python-format
8638 #, python-format
8718 msgid "%.1f MB"
8639 msgid "%.1f MB"
8719 msgstr ""
8640 msgstr ""
8720
8641
8721 #, python-format
8642 #, python-format
8722 msgid "%.2f MB"
8643 msgid "%.2f MB"
8723 msgstr ""
8644 msgstr ""
8724
8645
8725 #, python-format
8646 #, python-format
8726 msgid "%.0f KB"
8647 msgid "%.0f KB"
8727 msgstr ""
8648 msgstr ""
8728
8649
8729 #, python-format
8650 #, python-format
8730 msgid "%.1f KB"
8651 msgid "%.1f KB"
8731 msgstr ""
8652 msgstr ""
8732
8653
8733 #, python-format
8654 #, python-format
8734 msgid "%.2f KB"
8655 msgid "%.2f KB"
8735 msgstr ""
8656 msgstr ""
8736
8657
8737 #, python-format
8658 #, python-format
8738 msgid "%.0f bytes"
8659 msgid "%.0f bytes"
8739 msgstr ""
8660 msgstr ""
8740
8661
8741 msgid "cannot verify bundle or remote repos"
8662 msgid "cannot verify bundle or remote repos"
8742 msgstr ""
8663 msgstr ""
8743
8664
8744 msgid "interrupted"
8665 msgid "interrupted"
8745 msgstr ""
8666 msgstr ""
8746
8667
8747 #, python-format
8668 #, python-format
8748 msgid "empty or missing %s"
8669 msgid "empty or missing %s"
8749 msgstr ""
8670 msgstr ""
8750
8671
8751 #, python-format
8672 #, python-format
8752 msgid "data length off by %d bytes"
8673 msgid "data length off by %d bytes"
8753 msgstr ""
8674 msgstr ""
8754
8675
8755 #, python-format
8676 #, python-format
8756 msgid "index contains %d extra bytes"
8677 msgid "index contains %d extra bytes"
8757 msgstr ""
8678 msgstr ""
8758
8679
8759 #, python-format
8680 #, python-format
8760 msgid "warning: `%s' uses revlog format 1"
8681 msgid "warning: `%s' uses revlog format 1"
8761 msgstr ""
8682 msgstr ""
8762
8683
8763 #, python-format
8684 #, python-format
8764 msgid "warning: `%s' uses revlog format 0"
8685 msgid "warning: `%s' uses revlog format 0"
8765 msgstr ""
8686 msgstr ""
8766
8687
8767 #, python-format
8688 #, python-format
8768 msgid "rev %d points to nonexistent changeset %d"
8689 msgid "rev %d points to nonexistent changeset %d"
8769 msgstr ""
8690 msgstr ""
8770
8691
8771 #, python-format
8692 #, python-format
8772 msgid "rev %d points to unexpected changeset %d"
8693 msgid "rev %d points to unexpected changeset %d"
8773 msgstr ""
8694 msgstr ""
8774
8695
8775 #, python-format
8696 #, python-format
8776 msgid " (expected %s)"
8697 msgid " (expected %s)"
8777 msgstr ""
8698 msgstr ""
8778
8699
8779 #, python-format
8700 #, python-format
8780 msgid "unknown parent 1 %s of %s"
8701 msgid "unknown parent 1 %s of %s"
8781 msgstr ""
8702 msgstr ""
8782
8703
8783 #, python-format
8704 #, python-format
8784 msgid "unknown parent 2 %s of %s"
8705 msgid "unknown parent 2 %s of %s"
8785 msgstr ""
8706 msgstr ""
8786
8707
8787 #, python-format
8708 #, python-format
8788 msgid "checking parents of %s"
8709 msgid "checking parents of %s"
8789 msgstr ""
8710 msgstr ""
8790
8711
8791 #, python-format
8712 #, python-format
8792 msgid "duplicate revision %d (%d)"
8713 msgid "duplicate revision %d (%d)"
8793 msgstr ""
8714 msgstr ""
8794
8715
8795 #, python-format
8716 #, python-format
8796 msgid "repository uses revlog format %d\n"
8717 msgid "repository uses revlog format %d\n"
8797 msgstr ""
8718 msgstr ""
8798
8719
8799 msgid "checking changesets\n"
8720 msgid "checking changesets\n"
8800 msgstr ""
8721 msgstr ""
8801
8722
8802 #, python-format
8723 #, python-format
8803 msgid "unpacking changeset %s"
8724 msgid "unpacking changeset %s"
8804 msgstr ""
8725 msgstr ""
8805
8726
8806 msgid "checking manifests\n"
8727 msgid "checking manifests\n"
8807 msgstr ""
8728 msgstr ""
8808
8729
8809 #, python-format
8730 #, python-format
8810 msgid "%s not in changesets"
8731 msgid "%s not in changesets"
8811 msgstr ""
8732 msgstr ""
8812
8733
8813 msgid "file without name in manifest"
8734 msgid "file without name in manifest"
8814 msgstr ""
8735 msgstr ""
8815
8736
8816 #, python-format
8737 #, python-format
8817 msgid "reading manifest delta %s"
8738 msgid "reading manifest delta %s"
8818 msgstr ""
8739 msgstr ""
8819
8740
8820 msgid "crosschecking files in changesets and manifests\n"
8741 msgid "crosschecking files in changesets and manifests\n"
8821 msgstr ""
8742 msgstr ""
8822
8743
8823 #, python-format
8744 #, python-format
8824 msgid "changeset refers to unknown manifest %s"
8745 msgid "changeset refers to unknown manifest %s"
8825 msgstr ""
8746 msgstr ""
8826
8747
8827 msgid "in changeset but not in manifest"
8748 msgid "in changeset but not in manifest"
8828 msgstr ""
8749 msgstr ""
8829
8750
8830 msgid "in manifest but not in changeset"
8751 msgid "in manifest but not in changeset"
8831 msgstr ""
8752 msgstr ""
8832
8753
8833 msgid "checking files\n"
8754 msgid "checking files\n"
8834 msgstr ""
8755 msgstr ""
8835
8756
8836 #, python-format
8757 #, python-format
8837 msgid "cannot decode filename '%s'"
8758 msgid "cannot decode filename '%s'"
8838 msgstr ""
8759 msgstr ""
8839
8760
8840 #, python-format
8761 #, python-format
8841 msgid "broken revlog! (%s)"
8762 msgid "broken revlog! (%s)"
8842 msgstr ""
8763 msgstr ""
8843
8764
8844 msgid "missing revlog!"
8765 msgid "missing revlog!"
8845 msgstr ""
8766 msgstr ""
8846
8767
8847 #, python-format
8768 #, python-format
8848 msgid "%s not in manifests"
8769 msgid "%s not in manifests"
8849 msgstr ""
8770 msgstr ""
8850
8771
8851 #, python-format
8772 #, python-format
8852 msgid "unpacked size is %s, %s expected"
8773 msgid "unpacked size is %s, %s expected"
8853 msgstr ""
8774 msgstr ""
8854
8775
8855 #, python-format
8776 #, python-format
8856 msgid "unpacking %s"
8777 msgid "unpacking %s"
8857 msgstr ""
8778 msgstr ""
8858
8779
8859 #, python-format
8780 #, python-format
8860 msgid "warning: copy source of '%s' not in parents of %s"
8781 msgid "warning: copy source of '%s' not in parents of %s"
8861 msgstr ""
8782 msgstr ""
8862
8783
8863 #, python-format
8784 #, python-format
8864 msgid "empty or missing copy source revlog %s:%s"
8785 msgid "empty or missing copy source revlog %s:%s"
8865 msgstr ""
8786 msgstr ""
8866
8787
8867 #, python-format
8788 #, python-format
8868 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
8789 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
8869 msgstr ""
8790 msgstr ""
8870
8791
8871 #, python-format
8792 #, python-format
8872 msgid "checking rename of %s"
8793 msgid "checking rename of %s"
8873 msgstr ""
8794 msgstr ""
8874
8795
8875 #, python-format
8796 #, python-format
8876 msgid "%s in manifests not found"
8797 msgid "%s in manifests not found"
8877 msgstr ""
8798 msgstr ""
8878
8799
8879 #, python-format
8800 #, python-format
8880 msgid "warning: orphan revlog '%s'"
8801 msgid "warning: orphan revlog '%s'"
8881 msgstr ""
8802 msgstr ""
8882
8803
8883 #, python-format
8804 #, python-format
8884 msgid "%d files, %d changesets, %d total revisions\n"
8805 msgid "%d files, %d changesets, %d total revisions\n"
8885 msgstr ""
8806 msgstr ""
8886
8807
8887 #, python-format
8808 #, python-format
8888 msgid "%d warnings encountered!\n"
8809 msgid "%d warnings encountered!\n"
8889 msgstr ""
8810 msgstr ""
8890
8811
8891 #, python-format
8812 #, python-format
8892 msgid "%d integrity errors encountered!\n"
8813 msgid "%d integrity errors encountered!\n"
8893 msgstr ""
8814 msgstr ""
8894
8815
8895 #, python-format
8816 #, python-format
8896 msgid "(first damaged changeset appears to be %d)\n"
8817 msgid "(first damaged changeset appears to be %d)\n"
8897 msgstr ""
8818 msgstr ""
8898
8819
8899 msgid "user name not available - set USERNAME environment variable"
8820 msgid "user name not available - set USERNAME environment variable"
8900 msgstr ""
8821 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now