##// END OF EJS Templates
i18n-sv: simple translation fixes...
Jens Bäckman -
r9776:f1ed441a default
parent child Browse files
Show More
@@ -1,8670 +1,8677 b''
1 # Swedish translation for Mercurial
1 # Swedish translation for Mercurial
2 # Svensk översättning för Mercurial
2 # Svensk översättning för Mercurial
3 # Copyright (C) 2009 Matt Mackall and others
3 # Copyright (C) 2009 Matt Mackall and others
4 #
4 #
5 # Translation dictionary:
5 # Translation dictionary:
6 #
6 #
7 # changeset ändring
7 # changeset ändring
8 # commit arkivera
8 # commit arkivera
9 # merge sammanfoga
9 # merge sammanfoga
10 # tag märke
10 # tag märke
11 #
11 #
12 msgid ""
12 msgid ""
13 msgstr ""
13 msgstr ""
14 "Project-Id-Version: Mercurial\n"
14 "Project-Id-Version: Mercurial\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
16 "POT-Creation-Date: 2009-10-25 12:38+0100\n"
16 "POT-Creation-Date: 2009-10-25 12:38+0100\n"
17 "PO-Revision-Date: 2009-08-21 19:38+0200\n"
17 "PO-Revision-Date: 2009-11-04 21:58+0200\n"
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
19 "Language-Team: Swedish\n"
19 "Language-Team: Swedish\n"
20 "MIME-Version: 1.0\n"
20 "MIME-Version: 1.0\n"
21 "Content-Type: text/plain; charset=utf-8\n"
21 "Content-Type: text/plain; charset=utf-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
22 "Content-Transfer-Encoding: 8bit\n"
23
23
24 #, python-format
24 #, python-format
25 msgid " (default: %s)"
25 msgid " (default: %s)"
26 msgstr ""
26 msgstr " (standard: %s)"
27
27
28 msgid "OPTIONS"
28 msgid "OPTIONS"
29 msgstr ""
29 msgstr "FLAGGOR"
30
30
31 msgid "COMMANDS"
31 msgid "COMMANDS"
32 msgstr ""
32 msgstr "KOMMANDON"
33
33
34 msgid ""
34 msgid ""
35 " options:\n"
35 " options:\n"
36 "\n"
36 "\n"
37 msgstr ""
37 msgstr ""
38 " flaggor:\n"
39 "\n"
38
40
39 #, python-format
41 #, python-format
40 msgid ""
42 msgid ""
41 " aliases: %s\n"
43 " aliases: %s\n"
42 "\n"
44 "\n"
43 msgstr ""
45 msgstr ""
46 " alias: %s\n"
47 "\n"
44
48
45 msgid ""
49 msgid ""
46 "Some commands allow the user to specify a date, e.g.:\n"
50 "Some commands allow the user to specify a date, e.g.:\n"
47 "\n"
51 "\n"
48 "- backout, commit, import, tag: Specify the commit date.\n"
52 "- backout, commit, import, tag: Specify the commit date.\n"
49 "- log, revert, update: Select revision(s) by date.\n"
53 "- log, revert, update: Select revision(s) by date.\n"
50 "\n"
54 "\n"
51 "Many date formats are valid. Here are some examples::\n"
55 "Many date formats are valid. Here are some examples::\n"
52 "\n"
56 "\n"
53 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
57 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
54 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
58 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
55 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
59 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
56 " \"Dec 6\" (midnight)\n"
60 " \"Dec 6\" (midnight)\n"
57 " \"13:18\" (today assumed)\n"
61 " \"13:18\" (today assumed)\n"
58 " \"3:39\" (3:39AM assumed)\n"
62 " \"3:39\" (3:39AM assumed)\n"
59 " \"3:39pm\" (15:39)\n"
63 " \"3:39pm\" (15:39)\n"
60 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
64 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
61 " \"2006-12-6 13:18\"\n"
65 " \"2006-12-6 13:18\"\n"
62 " \"2006-12-6\"\n"
66 " \"2006-12-6\"\n"
63 " \"12-6\"\n"
67 " \"12-6\"\n"
64 " \"12/6\"\n"
68 " \"12/6\"\n"
65 " \"12/6/6\" (Dec 6 2006)\n"
69 " \"12/6/6\" (Dec 6 2006)\n"
66 "\n"
70 "\n"
67 "Lastly, there is Mercurial's internal format::\n"
71 "Lastly, there is Mercurial's internal format::\n"
68 "\n"
72 "\n"
69 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
73 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
70 "\n"
74 "\n"
71 "This is the internal representation format for dates. unixtime is the\n"
75 "This is the internal representation format for dates. unixtime is the\n"
72 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
76 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
73 "the offset of the local timezone, in seconds west of UTC (negative if\n"
77 "the offset of the local timezone, in seconds west of UTC (negative if\n"
74 "the timezone is east of UTC).\n"
78 "the timezone is east of UTC).\n"
75 "\n"
79 "\n"
76 "The log command also accepts date ranges::\n"
80 "The log command also accepts date ranges::\n"
77 "\n"
81 "\n"
78 " \"<{datetime}\" - at or before a given date/time\n"
82 " \"<{datetime}\" - at or before a given date/time\n"
79 " \">{datetime}\" - on or after a given date/time\n"
83 " \">{datetime}\" - on or after a given date/time\n"
80 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
84 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
81 " \"-{days}\" - within a given number of days of today\n"
85 " \"-{days}\" - within a given number of days of today\n"
82 msgstr ""
86 msgstr ""
83
87
84 msgid ""
88 msgid ""
85 "Mercurial's default format for showing changes between two versions of\n"
89 "Mercurial's default format for showing changes between two versions of\n"
86 "a file is compatible with the unified format of GNU diff, which can be\n"
90 "a file is compatible with the unified format of GNU diff, which can be\n"
87 "used by GNU patch and many other standard tools.\n"
91 "used by GNU patch and many other standard tools.\n"
88 "\n"
92 "\n"
89 "While this standard format is often enough, it does not encode the\n"
93 "While this standard format is often enough, it does not encode the\n"
90 "following information:\n"
94 "following information:\n"
91 "\n"
95 "\n"
92 "- executable status and other permission bits\n"
96 "- executable status and other permission bits\n"
93 "- copy or rename information\n"
97 "- copy or rename information\n"
94 "- changes in binary files\n"
98 "- changes in binary files\n"
95 "- creation or deletion of empty files\n"
99 "- creation or deletion of empty files\n"
96 "\n"
100 "\n"
97 "Mercurial also supports the extended diff format from the git VCS\n"
101 "Mercurial also supports the extended diff format from the git VCS\n"
98 "which addresses these limitations. The git diff format is not produced\n"
102 "which addresses these limitations. The git diff format is not produced\n"
99 "by default because a few widespread tools still do not understand this\n"
103 "by default because a few widespread tools still do not understand this\n"
100 "format.\n"
104 "format.\n"
101 "\n"
105 "\n"
102 "This means that when generating diffs from a Mercurial repository\n"
106 "This means that when generating diffs from a Mercurial repository\n"
103 "(e.g. with \"hg export\"), you should be careful about things like file\n"
107 "(e.g. with \"hg export\"), you should be careful about things like file\n"
104 "copies and renames or other things mentioned above, because when\n"
108 "copies and renames or other things mentioned above, because when\n"
105 "applying a standard diff to a different repository, this extra\n"
109 "applying a standard diff to a different repository, this extra\n"
106 "information is lost. Mercurial's internal operations (like push and\n"
110 "information is lost. Mercurial's internal operations (like push and\n"
107 "pull) are not affected by this, because they use an internal binary\n"
111 "pull) are not affected by this, because they use an internal binary\n"
108 "format for communicating changes.\n"
112 "format for communicating changes.\n"
109 "\n"
113 "\n"
110 "To make Mercurial produce the git extended diff format, use the --git\n"
114 "To make Mercurial produce the git extended diff format, use the --git\n"
111 "option available for many commands, or set 'git = True' in the [diff]\n"
115 "option available for many commands, or set 'git = True' in the [diff]\n"
112 "section of your hgrc. You do not need to set this option when\n"
116 "section of your hgrc. You do not need to set this option when\n"
113 "importing diffs in this format or using them in the mq extension.\n"
117 "importing diffs in this format or using them in the mq extension.\n"
114 msgstr ""
118 msgstr ""
115
119
116 msgid ""
120 msgid ""
117 "HG\n"
121 "HG\n"
118 " Path to the 'hg' executable, automatically passed when running\n"
122 " Path to the 'hg' executable, automatically passed when running\n"
119 " hooks, extensions or external tools. If unset or empty, this is\n"
123 " hooks, extensions or external tools. If unset or empty, this is\n"
120 " the hg executable's name if it's frozen, or an executable named\n"
124 " the hg executable's name if it's frozen, or an executable named\n"
121 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
125 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
122 " Windows) is searched.\n"
126 " Windows) is searched.\n"
123 "\n"
127 "\n"
124 "HGEDITOR\n"
128 "HGEDITOR\n"
125 " This is the name of the editor to run when committing. See EDITOR.\n"
129 " This is the name of the editor to run when committing. See EDITOR.\n"
126 "\n"
130 "\n"
127 " (deprecated, use .hgrc)\n"
131 " (deprecated, use .hgrc)\n"
128 "\n"
132 "\n"
129 "HGENCODING\n"
133 "HGENCODING\n"
130 " This overrides the default locale setting detected by Mercurial.\n"
134 " This overrides the default locale setting detected by Mercurial.\n"
131 " This setting is used to convert data including usernames,\n"
135 " This setting is used to convert data including usernames,\n"
132 " changeset descriptions, tag names, and branches. This setting can\n"
136 " changeset descriptions, tag names, and branches. This setting can\n"
133 " be overridden with the --encoding command-line option.\n"
137 " be overridden with the --encoding command-line option.\n"
134 "\n"
138 "\n"
135 "HGENCODINGMODE\n"
139 "HGENCODINGMODE\n"
136 " This sets Mercurial's behavior for handling unknown characters\n"
140 " This sets Mercurial's behavior for handling unknown characters\n"
137 " while transcoding user input. The default is \"strict\", which\n"
141 " while transcoding user input. The default is \"strict\", which\n"
138 " causes Mercurial to abort if it can't map a character. Other\n"
142 " causes Mercurial to abort if it can't map a character. Other\n"
139 " settings include \"replace\", which replaces unknown characters, and\n"
143 " settings include \"replace\", which replaces unknown characters, and\n"
140 " \"ignore\", which drops them. This setting can be overridden with\n"
144 " \"ignore\", which drops them. This setting can be overridden with\n"
141 " the --encodingmode command-line option.\n"
145 " the --encodingmode command-line option.\n"
142 "\n"
146 "\n"
143 "HGMERGE\n"
147 "HGMERGE\n"
144 " An executable to use for resolving merge conflicts. The program\n"
148 " An executable to use for resolving merge conflicts. The program\n"
145 " will be executed with three arguments: local file, remote file,\n"
149 " will be executed with three arguments: local file, remote file,\n"
146 " ancestor file.\n"
150 " ancestor file.\n"
147 "\n"
151 "\n"
148 " (deprecated, use .hgrc)\n"
152 " (deprecated, use .hgrc)\n"
149 "\n"
153 "\n"
150 "HGRCPATH\n"
154 "HGRCPATH\n"
151 " A list of files or directories to search for hgrc files. Item\n"
155 " A list of files or directories to search for hgrc files. Item\n"
152 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
156 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
153 " platform default search path is used. If empty, only the .hg/hgrc\n"
157 " platform default search path is used. If empty, only the .hg/hgrc\n"
154 " from the current repository is read.\n"
158 " from the current repository is read.\n"
155 "\n"
159 "\n"
156 " For each element in HGRCPATH:\n"
160 " For each element in HGRCPATH:\n"
157 "\n"
161 "\n"
158 " - if it's a directory, all files ending with .rc are added\n"
162 " - if it's a directory, all files ending with .rc are added\n"
159 " - otherwise, the file itself will be added\n"
163 " - otherwise, the file itself will be added\n"
160 "\n"
164 "\n"
161 "HGUSER\n"
165 "HGUSER\n"
162 " This is the string used as the author of a commit. If not set,\n"
166 " This is the string used as the author of a commit. If not set,\n"
163 " available values will be considered in this order:\n"
167 " available values will be considered in this order:\n"
164 "\n"
168 "\n"
165 " - HGUSER (deprecated)\n"
169 " - HGUSER (deprecated)\n"
166 " - hgrc files from the HGRCPATH\n"
170 " - hgrc files from the HGRCPATH\n"
167 " - EMAIL\n"
171 " - EMAIL\n"
168 " - interactive prompt\n"
172 " - interactive prompt\n"
169 " - LOGNAME (with '@hostname' appended)\n"
173 " - LOGNAME (with '@hostname' appended)\n"
170 "\n"
174 "\n"
171 " (deprecated, use .hgrc)\n"
175 " (deprecated, use .hgrc)\n"
172 "\n"
176 "\n"
173 "EMAIL\n"
177 "EMAIL\n"
174 " May be used as the author of a commit; see HGUSER.\n"
178 " May be used as the author of a commit; see HGUSER.\n"
175 "\n"
179 "\n"
176 "LOGNAME\n"
180 "LOGNAME\n"
177 " May be used as the author of a commit; see HGUSER.\n"
181 " May be used as the author of a commit; see HGUSER.\n"
178 "\n"
182 "\n"
179 "VISUAL\n"
183 "VISUAL\n"
180 " This is the name of the editor to use when committing. See EDITOR.\n"
184 " This is the name of the editor to use when committing. See EDITOR.\n"
181 "\n"
185 "\n"
182 "EDITOR\n"
186 "EDITOR\n"
183 " Sometimes Mercurial needs to open a text file in an editor for a\n"
187 " Sometimes Mercurial needs to open a text file in an editor for a\n"
184 " user to modify, for example when writing commit messages. The\n"
188 " user to modify, for example when writing commit messages. The\n"
185 " editor it uses is determined by looking at the environment\n"
189 " editor it uses is determined by looking at the environment\n"
186 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
190 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
187 " non-empty one is chosen. If all of them are empty, the editor\n"
191 " non-empty one is chosen. If all of them are empty, the editor\n"
188 " defaults to 'vi'.\n"
192 " defaults to 'vi'.\n"
189 "\n"
193 "\n"
190 "PYTHONPATH\n"
194 "PYTHONPATH\n"
191 " This is used by Python to find imported modules and may need to be\n"
195 " This is used by Python to find imported modules and may need to be\n"
192 " set appropriately if this Mercurial is not installed system-wide.\n"
196 " set appropriately if this Mercurial is not installed system-wide.\n"
193 msgstr ""
197 msgstr ""
194
198
195 msgid ""
199 msgid ""
196 "Mercurial has the ability to add new features through the use of\n"
200 "Mercurial has the ability to add new features through the use of\n"
197 "extensions. Extensions may add new commands, add options to\n"
201 "extensions. Extensions may add new commands, add options to\n"
198 "existing commands, change the default behavior of commands, or\n"
202 "existing commands, change the default behavior of commands, or\n"
199 "implement hooks.\n"
203 "implement hooks.\n"
200 "\n"
204 "\n"
201 "Extensions are not loaded by default for a variety of reasons:\n"
205 "Extensions are not loaded by default for a variety of reasons:\n"
202 "they can increase startup overhead; they may be meant for advanced\n"
206 "they can increase startup overhead; they may be meant for advanced\n"
203 "usage only; they may provide potentially dangerous abilities (such\n"
207 "usage only; they may provide potentially dangerous abilities (such\n"
204 "as letting you destroy or modify history); they might not be ready\n"
208 "as letting you destroy or modify history); they might not be ready\n"
205 "for prime time; or they may alter some usual behaviors of stock\n"
209 "for prime time; or they may alter some usual behaviors of stock\n"
206 "Mercurial. It is thus up to the user to activate extensions as\n"
210 "Mercurial. It is thus up to the user to activate extensions as\n"
207 "needed.\n"
211 "needed.\n"
208 "\n"
212 "\n"
209 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
213 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
210 "the Python search path, create an entry for it in your hgrc, like\n"
214 "the Python search path, create an entry for it in your hgrc, like\n"
211 "this::\n"
215 "this::\n"
212 "\n"
216 "\n"
213 " [extensions]\n"
217 " [extensions]\n"
214 " foo =\n"
218 " foo =\n"
215 "\n"
219 "\n"
216 "You may also specify the full path to an extension::\n"
220 "You may also specify the full path to an extension::\n"
217 "\n"
221 "\n"
218 " [extensions]\n"
222 " [extensions]\n"
219 " myfeature = ~/.hgext/myfeature.py\n"
223 " myfeature = ~/.hgext/myfeature.py\n"
220 "\n"
224 "\n"
221 "To explicitly disable an extension enabled in an hgrc of broader\n"
225 "To explicitly disable an extension enabled in an hgrc of broader\n"
222 "scope, prepend its path with !::\n"
226 "scope, prepend its path with !::\n"
223 "\n"
227 "\n"
224 " [extensions]\n"
228 " [extensions]\n"
225 " # disabling extension bar residing in /path/to/extension/bar.py\n"
229 " # disabling extension bar residing in /path/to/extension/bar.py\n"
226 " hgext.bar = !/path/to/extension/bar.py\n"
230 " hgext.bar = !/path/to/extension/bar.py\n"
227 " # ditto, but no path was supplied for extension baz\n"
231 " # ditto, but no path was supplied for extension baz\n"
228 " hgext.baz = !\n"
232 " hgext.baz = !\n"
229 msgstr ""
233 msgstr ""
230
234
231 msgid ""
235 msgid ""
232 "When Mercurial accepts more than one revision, they may be specified\n"
236 "When Mercurial accepts more than one revision, they may be specified\n"
233 "individually, or provided as a topologically continuous range,\n"
237 "individually, or provided as a topologically continuous range,\n"
234 "separated by the \":\" character.\n"
238 "separated by the \":\" character.\n"
235 "\n"
239 "\n"
236 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
240 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
237 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
241 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
238 "specified, it defaults to revision number 0. If END is not specified,\n"
242 "specified, it defaults to revision number 0. If END is not specified,\n"
239 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
243 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
240 "\n"
244 "\n"
241 "If BEGIN is greater than END, revisions are treated in reverse order.\n"
245 "If BEGIN is greater than END, revisions are treated in reverse order.\n"
242 "\n"
246 "\n"
243 "A range acts as a closed interval. This means that a range of 3:5\n"
247 "A range acts as a closed interval. This means that a range of 3:5\n"
244 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
248 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
245 msgstr ""
249 msgstr ""
246
250
247 msgid ""
251 msgid ""
248 "Mercurial accepts several notations for identifying one or more files\n"
252 "Mercurial accepts several notations for identifying one or more files\n"
249 "at a time.\n"
253 "at a time.\n"
250 "\n"
254 "\n"
251 "By default, Mercurial treats filenames as shell-style extended glob\n"
255 "By default, Mercurial treats filenames as shell-style extended glob\n"
252 "patterns.\n"
256 "patterns.\n"
253 "\n"
257 "\n"
254 "Alternate pattern notations must be specified explicitly.\n"
258 "Alternate pattern notations must be specified explicitly.\n"
255 "\n"
259 "\n"
256 "To use a plain path name without any pattern matching, start it with\n"
260 "To use a plain path name without any pattern matching, start it with\n"
257 "``path:``. These path names must completely match starting at the\n"
261 "``path:``. These path names must completely match starting at the\n"
258 "current repository root.\n"
262 "current repository root.\n"
259 "\n"
263 "\n"
260 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
264 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
261 "at the current directory; a glob such as ``*.c`` will only match files\n"
265 "at the current directory; a glob such as ``*.c`` will only match files\n"
262 "in the current directory ending with ``.c``.\n"
266 "in the current directory ending with ``.c``.\n"
263 "\n"
267 "\n"
264 "The supported glob syntax extensions are ``**`` to match any string\n"
268 "The supported glob syntax extensions are ``**`` to match any string\n"
265 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
269 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
266 "\n"
270 "\n"
267 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
271 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
268 "Regexp pattern matching is anchored at the root of the repository.\n"
272 "Regexp pattern matching is anchored at the root of the repository.\n"
269 "\n"
273 "\n"
270 "Plain examples::\n"
274 "Plain examples::\n"
271 "\n"
275 "\n"
272 " path:foo/bar a name bar in a directory named foo in the root\n"
276 " path:foo/bar a name bar in a directory named foo in the root\n"
273 " of the repository\n"
277 " of the repository\n"
274 " path:path:name a file or directory named \"path:name\"\n"
278 " path:path:name a file or directory named \"path:name\"\n"
275 "\n"
279 "\n"
276 "Glob examples::\n"
280 "Glob examples::\n"
277 "\n"
281 "\n"
278 " glob:*.c any name ending in \".c\" in the current directory\n"
282 " glob:*.c any name ending in \".c\" in the current directory\n"
279 " *.c any name ending in \".c\" in the current directory\n"
283 " *.c any name ending in \".c\" in the current directory\n"
280 " **.c any name ending in \".c\" in any subdirectory of the\n"
284 " **.c any name ending in \".c\" in any subdirectory of the\n"
281 " current directory including itself.\n"
285 " current directory including itself.\n"
282 " foo/*.c any name ending in \".c\" in the directory foo\n"
286 " foo/*.c any name ending in \".c\" in the directory foo\n"
283 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
287 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
284 " including itself.\n"
288 " including itself.\n"
285 "\n"
289 "\n"
286 "Regexp examples::\n"
290 "Regexp examples::\n"
287 "\n"
291 "\n"
288 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
292 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
289 msgstr ""
293 msgstr ""
290
294
291 msgid ""
295 msgid ""
292 "Mercurial supports several ways to specify individual revisions.\n"
296 "Mercurial supports several ways to specify individual revisions.\n"
293 "\n"
297 "\n"
294 "A plain integer is treated as a revision number. Negative integers are\n"
298 "A plain integer is treated as a revision number. Negative integers are\n"
295 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
299 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
296 "-2 denoting the revision prior to the tip, and so forth.\n"
300 "-2 denoting the revision prior to the tip, and so forth.\n"
297 "\n"
301 "\n"
298 "A 40-digit hexadecimal string is treated as a unique revision\n"
302 "A 40-digit hexadecimal string is treated as a unique revision\n"
299 "identifier.\n"
303 "identifier.\n"
300 "\n"
304 "\n"
301 "A hexadecimal string less than 40 characters long is treated as a\n"
305 "A hexadecimal string less than 40 characters long is treated as a\n"
302 "unique revision identifier and is referred to as a short-form\n"
306 "unique revision identifier and is referred to as a short-form\n"
303 "identifier. A short-form identifier is only valid if it is the prefix\n"
307 "identifier. A short-form identifier is only valid if it is the prefix\n"
304 "of exactly one full-length identifier.\n"
308 "of exactly one full-length identifier.\n"
305 "\n"
309 "\n"
306 "Any other string is treated as a tag or branch name. A tag name is a\n"
310 "Any other string is treated as a tag or branch name. A tag name is a\n"
307 "symbolic name associated with a revision identifier. A branch name\n"
311 "symbolic name associated with a revision identifier. A branch name\n"
308 "denotes the tipmost revision of that branch. Tag and branch names must\n"
312 "denotes the tipmost revision of that branch. Tag and branch names must\n"
309 "not contain the \":\" character.\n"
313 "not contain the \":\" character.\n"
310 "\n"
314 "\n"
311 "The reserved name \"tip\" is a special tag that always identifies the\n"
315 "The reserved name \"tip\" is a special tag that always identifies the\n"
312 "most recent revision.\n"
316 "most recent revision.\n"
313 "\n"
317 "\n"
314 "The reserved name \"null\" indicates the null revision. This is the\n"
318 "The reserved name \"null\" indicates the null revision. This is the\n"
315 "revision of an empty repository, and the parent of revision 0.\n"
319 "revision of an empty repository, and the parent of revision 0.\n"
316 "\n"
320 "\n"
317 "The reserved name \".\" indicates the working directory parent. If no\n"
321 "The reserved name \".\" indicates the working directory parent. If no\n"
318 "working directory is checked out, it is equivalent to null. If an\n"
322 "working directory is checked out, it is equivalent to null. If an\n"
319 "uncommitted merge is in progress, \".\" is the revision of the first\n"
323 "uncommitted merge is in progress, \".\" is the revision of the first\n"
320 "parent.\n"
324 "parent.\n"
321 msgstr ""
325 msgstr ""
322
326
323 msgid ""
327 msgid ""
324 "Mercurial allows you to customize output of commands through\n"
328 "Mercurial allows you to customize output of commands through\n"
325 "templates. You can either pass in a template from the command\n"
329 "templates. You can either pass in a template from the command\n"
326 "line, via the --template option, or select an existing\n"
330 "line, via the --template option, or select an existing\n"
327 "template-style (--style).\n"
331 "template-style (--style).\n"
328 "\n"
332 "\n"
329 "You can customize output for any \"log-like\" command: log,\n"
333 "You can customize output for any \"log-like\" command: log,\n"
330 "outgoing, incoming, tip, parents, heads and glog.\n"
334 "outgoing, incoming, tip, parents, heads and glog.\n"
331 "\n"
335 "\n"
332 "Three styles are packaged with Mercurial: default (the style used\n"
336 "Three styles are packaged with Mercurial: default (the style used\n"
333 "when no explicit preference is passed), compact and changelog.\n"
337 "when no explicit preference is passed), compact and changelog.\n"
334 "Usage::\n"
338 "Usage::\n"
335 "\n"
339 "\n"
336 " $ hg log -r1 --style changelog\n"
340 " $ hg log -r1 --style changelog\n"
337 "\n"
341 "\n"
338 "A template is a piece of text, with markup to invoke variable\n"
342 "A template is a piece of text, with markup to invoke variable\n"
339 "expansion::\n"
343 "expansion::\n"
340 "\n"
344 "\n"
341 " $ hg log -r1 --template \"{node}\\n\"\n"
345 " $ hg log -r1 --template \"{node}\\n\"\n"
342 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
346 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
343 "\n"
347 "\n"
344 "Strings in curly braces are called keywords. The availability of\n"
348 "Strings in curly braces are called keywords. The availability of\n"
345 "keywords depends on the exact context of the templater. These\n"
349 "keywords depends on the exact context of the templater. These\n"
346 "keywords are usually available for templating a log-like command:\n"
350 "keywords are usually available for templating a log-like command:\n"
347 "\n"
351 "\n"
348 ":author: String. The unmodified author of the changeset.\n"
352 ":author: String. The unmodified author of the changeset.\n"
349 ":branches: String. The name of the branch on which the changeset\n"
353 ":branches: String. The name of the branch on which the changeset\n"
350 " was committed. Will be empty if the branch name was\n"
354 " was committed. Will be empty if the branch name was\n"
351 " default.\n"
355 " default.\n"
352 ":date: Date information. The date when the changeset was\n"
356 ":date: Date information. The date when the changeset was\n"
353 " committed.\n"
357 " committed.\n"
354 ":desc: String. The text of the changeset description.\n"
358 ":desc: String. The text of the changeset description.\n"
355 ":diffstat: String. Statistics of changes with the following\n"
359 ":diffstat: String. Statistics of changes with the following\n"
356 " format: \"modified files: +added/-removed lines\"\n"
360 " format: \"modified files: +added/-removed lines\"\n"
357 ":files: List of strings. All files modified, added, or removed\n"
361 ":files: List of strings. All files modified, added, or removed\n"
358 " by this changeset.\n"
362 " by this changeset.\n"
359 ":file_adds: List of strings. Files added by this changeset.\n"
363 ":file_adds: List of strings. Files added by this changeset.\n"
360 ":file_mods: List of strings. Files modified by this changeset.\n"
364 ":file_mods: List of strings. Files modified by this changeset.\n"
361 ":file_dels: List of strings. Files removed by this changeset.\n"
365 ":file_dels: List of strings. Files removed by this changeset.\n"
362 ":node: String. The changeset identification hash, as a\n"
366 ":node: String. The changeset identification hash, as a\n"
363 " 40-character hexadecimal string.\n"
367 " 40-character hexadecimal string.\n"
364 ":parents: List of strings. The parents of the changeset.\n"
368 ":parents: List of strings. The parents of the changeset.\n"
365 ":rev: Integer. The repository-local changeset revision\n"
369 ":rev: Integer. The repository-local changeset revision\n"
366 " number.\n"
370 " number.\n"
367 ":tags: List of strings. Any tags associated with the\n"
371 ":tags: List of strings. Any tags associated with the\n"
368 " changeset.\n"
372 " changeset.\n"
369 ":latesttag: String. Most recent global tag in the ancestors of this\n"
373 ":latesttag: String. Most recent global tag in the ancestors of this\n"
370 " changeset.\n"
374 " changeset.\n"
371 ":latesttagdistance: Integer. Longest path to the latest tag.\n"
375 ":latesttagdistance: Integer. Longest path to the latest tag.\n"
372 "\n"
376 "\n"
373 "The \"date\" keyword does not produce human-readable output. If you\n"
377 "The \"date\" keyword does not produce human-readable output. If you\n"
374 "want to use a date in your output, you can use a filter to process\n"
378 "want to use a date in your output, you can use a filter to process\n"
375 "it. Filters are functions which return a string based on the input\n"
379 "it. Filters are functions which return a string based on the input\n"
376 "variable. You can also use a chain of filters to get the desired\n"
380 "variable. You can also use a chain of filters to get the desired\n"
377 "output::\n"
381 "output::\n"
378 "\n"
382 "\n"
379 " $ hg tip --template \"{date|isodate}\\n\"\n"
383 " $ hg tip --template \"{date|isodate}\\n\"\n"
380 " 2008-08-21 18:22 +0000\n"
384 " 2008-08-21 18:22 +0000\n"
381 "\n"
385 "\n"
382 "List of filters:\n"
386 "List of filters:\n"
383 "\n"
387 "\n"
384 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
388 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
385 " every line except the last.\n"
389 " every line except the last.\n"
386 ":age: Date. Returns a human-readable date/time difference\n"
390 ":age: Date. Returns a human-readable date/time difference\n"
387 " between the given date/time and the current\n"
391 " between the given date/time and the current\n"
388 " date/time.\n"
392 " date/time.\n"
389 ":basename: Any text. Treats the text as a path, and returns the\n"
393 ":basename: Any text. Treats the text as a path, and returns the\n"
390 " last component of the path after splitting by the\n"
394 " last component of the path after splitting by the\n"
391 " path separator (ignoring trailing separators). For\n"
395 " path separator (ignoring trailing separators). For\n"
392 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
396 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
393 " becomes \"bar\".\n"
397 " becomes \"bar\".\n"
394 ":stripdir: Treat the text as path and strip a directory level,\n"
398 ":stripdir: Treat the text as path and strip a directory level,\n"
395 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
399 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
396 " \"foo\".\n"
400 " \"foo\".\n"
397 ":date: Date. Returns a date in a Unix date format, including\n"
401 ":date: Date. Returns a date in a Unix date format, including\n"
398 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
402 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
399 ":domain: Any text. Finds the first string that looks like an\n"
403 ":domain: Any text. Finds the first string that looks like an\n"
400 " email address, and extracts just the domain\n"
404 " email address, and extracts just the domain\n"
401 " component. Example: 'User <user@example.com>' becomes\n"
405 " component. Example: 'User <user@example.com>' becomes\n"
402 " 'example.com'.\n"
406 " 'example.com'.\n"
403 ":email: Any text. Extracts the first string that looks like\n"
407 ":email: Any text. Extracts the first string that looks like\n"
404 " an email address. Example: 'User <user@example.com>'\n"
408 " an email address. Example: 'User <user@example.com>'\n"
405 " becomes 'user@example.com'.\n"
409 " becomes 'user@example.com'.\n"
406 ":escape: Any text. Replaces the special XML/XHTML characters\n"
410 ":escape: Any text. Replaces the special XML/XHTML characters\n"
407 " \"&\", \"<\" and \">\" with XML entities.\n"
411 " \"&\", \"<\" and \">\" with XML entities.\n"
408 ":fill68: Any text. Wraps the text to fit in 68 columns.\n"
412 ":fill68: Any text. Wraps the text to fit in 68 columns.\n"
409 ":fill76: Any text. Wraps the text to fit in 76 columns.\n"
413 ":fill76: Any text. Wraps the text to fit in 76 columns.\n"
410 ":firstline: Any text. Returns the first line of text.\n"
414 ":firstline: Any text. Returns the first line of text.\n"
411 ":nonempty: Any text. Returns '(none)' if the string is empty.\n"
415 ":nonempty: Any text. Returns '(none)' if the string is empty.\n"
412 ":hgdate: Date. Returns the date as a pair of numbers:\n"
416 ":hgdate: Date. Returns the date as a pair of numbers:\n"
413 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
417 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
414 ":isodate: Date. Returns the date in ISO 8601 format:\n"
418 ":isodate: Date. Returns the date in ISO 8601 format:\n"
415 " \"2009-08-18 13:00 +0200\".\n"
419 " \"2009-08-18 13:00 +0200\".\n"
416 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
420 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
417 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
421 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
418 " rfc3339date filter.\n"
422 " rfc3339date filter.\n"
419 ":localdate: Date. Converts a date to local date.\n"
423 ":localdate: Date. Converts a date to local date.\n"
420 ":obfuscate: Any text. Returns the input text rendered as a\n"
424 ":obfuscate: Any text. Returns the input text rendered as a\n"
421 " sequence of XML entities.\n"
425 " sequence of XML entities.\n"
422 ":person: Any text. Returns the text before an email address.\n"
426 ":person: Any text. Returns the text before an email address.\n"
423 ":rfc822date: Date. Returns a date using the same format used in\n"
427 ":rfc822date: Date. Returns a date using the same format used in\n"
424 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
428 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
425 ":rfc3339date: Date. Returns a date using the Internet date format\n"
429 ":rfc3339date: Date. Returns a date using the Internet date format\n"
426 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
430 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
427 ":short: Changeset hash. Returns the short form of a changeset\n"
431 ":short: Changeset hash. Returns the short form of a changeset\n"
428 " hash, i.e. a 12-byte hexadecimal string.\n"
432 " hash, i.e. a 12-byte hexadecimal string.\n"
429 ":shortdate: Date. Returns a date like \"2006-09-18\".\n"
433 ":shortdate: Date. Returns a date like \"2006-09-18\".\n"
430 ":strip: Any text. Strips all leading and trailing whitespace.\n"
434 ":strip: Any text. Strips all leading and trailing whitespace.\n"
431 ":tabindent: Any text. Returns the text, with every line except\n"
435 ":tabindent: Any text. Returns the text, with every line except\n"
432 " the first starting with a tab character.\n"
436 " the first starting with a tab character.\n"
433 ":urlescape: Any text. Escapes all \"special\" characters. For\n"
437 ":urlescape: Any text. Escapes all \"special\" characters. For\n"
434 " example, \"foo bar\" becomes \"foo%20bar\".\n"
438 " example, \"foo bar\" becomes \"foo%20bar\".\n"
435 ":user: Any text. Returns the user portion of an email\n"
439 ":user: Any text. Returns the user portion of an email\n"
436 " address.\n"
440 " address.\n"
437 msgstr ""
441 msgstr ""
438
442
439 msgid ""
443 msgid ""
440 "Valid URLs are of the form::\n"
444 "Valid URLs are of the form::\n"
441 "\n"
445 "\n"
442 " local/filesystem/path[#revision]\n"
446 " local/filesystem/path[#revision]\n"
443 " file://local/filesystem/path[#revision]\n"
447 " file://local/filesystem/path[#revision]\n"
444 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
448 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
445 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
449 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
446 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
450 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
447 "\n"
451 "\n"
448 "Paths in the local filesystem can either point to Mercurial\n"
452 "Paths in the local filesystem can either point to Mercurial\n"
449 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
453 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
450 "incoming --bundle').\n"
454 "incoming --bundle').\n"
451 "\n"
455 "\n"
452 "An optional identifier after # indicates a particular branch, tag, or\n"
456 "An optional identifier after # indicates a particular branch, tag, or\n"
453 "changeset to use from the remote repository. See also 'hg help\n"
457 "changeset to use from the remote repository. See also 'hg help\n"
454 "revisions'.\n"
458 "revisions'.\n"
455 "\n"
459 "\n"
456 "Some features, such as pushing to http:// and https:// URLs are only\n"
460 "Some features, such as pushing to http:// and https:// URLs are only\n"
457 "possible if the feature is explicitly enabled on the remote Mercurial\n"
461 "possible if the feature is explicitly enabled on the remote Mercurial\n"
458 "server.\n"
462 "server.\n"
459 "\n"
463 "\n"
460 "Some notes about using SSH with Mercurial:\n"
464 "Some notes about using SSH with Mercurial:\n"
461 "\n"
465 "\n"
462 "- SSH requires an accessible shell account on the destination machine\n"
466 "- SSH requires an accessible shell account on the destination machine\n"
463 " and a copy of hg in the remote path or specified with as remotecmd.\n"
467 " and a copy of hg in the remote path or specified with as remotecmd.\n"
464 "- path is relative to the remote user's home directory by default. Use\n"
468 "- path is relative to the remote user's home directory by default. Use\n"
465 " an extra slash at the start of a path to specify an absolute path::\n"
469 " an extra slash at the start of a path to specify an absolute path::\n"
466 "\n"
470 "\n"
467 " ssh://example.com//tmp/repository\n"
471 " ssh://example.com//tmp/repository\n"
468 "\n"
472 "\n"
469 "- Mercurial doesn't use its own compression via SSH; the right thing\n"
473 "- Mercurial doesn't use its own compression via SSH; the right thing\n"
470 " to do is to configure it in your ~/.ssh/config, e.g.::\n"
474 " to do is to configure it in your ~/.ssh/config, e.g.::\n"
471 "\n"
475 "\n"
472 " Host *.mylocalnetwork.example.com\n"
476 " Host *.mylocalnetwork.example.com\n"
473 " Compression no\n"
477 " Compression no\n"
474 " Host *\n"
478 " Host *\n"
475 " Compression yes\n"
479 " Compression yes\n"
476 "\n"
480 "\n"
477 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
481 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
478 " with the --ssh command line option.\n"
482 " with the --ssh command line option.\n"
479 "\n"
483 "\n"
480 "These URLs can all be stored in your hgrc with path aliases under the\n"
484 "These URLs can all be stored in your hgrc with path aliases under the\n"
481 "[paths] section like so::\n"
485 "[paths] section like so::\n"
482 "\n"
486 "\n"
483 " [paths]\n"
487 " [paths]\n"
484 " alias1 = URL1\n"
488 " alias1 = URL1\n"
485 " alias2 = URL2\n"
489 " alias2 = URL2\n"
486 " ...\n"
490 " ...\n"
487 "\n"
491 "\n"
488 "You can then use the alias for any command that uses a URL (for\n"
492 "You can then use the alias for any command that uses a URL (for\n"
489 "example 'hg pull alias1' would pull from the 'alias1' path).\n"
493 "example 'hg pull alias1' would pull from the 'alias1' path).\n"
490 "\n"
494 "\n"
491 "Two path aliases are special because they are used as defaults when\n"
495 "Two path aliases are special because they are used as defaults when\n"
492 "you do not provide the URL to a command:\n"
496 "you do not provide the URL to a command:\n"
493 "\n"
497 "\n"
494 "default:\n"
498 "default:\n"
495 " When you create a repository with hg clone, the clone command saves\n"
499 " When you create a repository with hg clone, the clone command saves\n"
496 " the location of the source repository as the new repository's\n"
500 " the location of the source repository as the new repository's\n"
497 " 'default' path. This is then used when you omit path from push- and\n"
501 " 'default' path. This is then used when you omit path from push- and\n"
498 " pull-like commands (including incoming and outgoing).\n"
502 " pull-like commands (including incoming and outgoing).\n"
499 "\n"
503 "\n"
500 "default-push:\n"
504 "default-push:\n"
501 " The push command will look for a path named 'default-push', and\n"
505 " The push command will look for a path named 'default-push', and\n"
502 " prefer it over 'default' if both are defined.\n"
506 " prefer it over 'default' if both are defined.\n"
503 msgstr ""
507 msgstr ""
504
508
505 msgid ""
509 msgid ""
506 "hooks for controlling repository access\n"
510 "hooks for controlling repository access\n"
507 "\n"
511 "\n"
508 "This hook makes it possible to allow or deny write access to portions\n"
512 "This hook makes it possible to allow or deny write access to portions\n"
509 "of a repository when receiving incoming changesets.\n"
513 "of a repository when receiving incoming changesets.\n"
510 "\n"
514 "\n"
511 "The authorization is matched based on the local user name on the\n"
515 "The authorization is matched based on the local user name on the\n"
512 "system where the hook runs, and not the committer of the original\n"
516 "system where the hook runs, and not the committer of the original\n"
513 "changeset (since the latter is merely informative).\n"
517 "changeset (since the latter is merely informative).\n"
514 "\n"
518 "\n"
515 "The acl hook is best used along with a restricted shell like hgsh,\n"
519 "The acl hook is best used along with a restricted shell like hgsh,\n"
516 "preventing authenticating users from doing anything other than\n"
520 "preventing authenticating users from doing anything other than\n"
517 "pushing or pulling. The hook is not safe to use if users have\n"
521 "pushing or pulling. The hook is not safe to use if users have\n"
518 "interactive shell access, as they can then disable the hook.\n"
522 "interactive shell access, as they can then disable the hook.\n"
519 "Nor is it safe if remote users share an account, because then there\n"
523 "Nor is it safe if remote users share an account, because then there\n"
520 "is no way to distinguish them.\n"
524 "is no way to distinguish them.\n"
521 "\n"
525 "\n"
522 "To use this hook, configure the acl extension in your hgrc like this::\n"
526 "To use this hook, configure the acl extension in your hgrc like this::\n"
523 "\n"
527 "\n"
524 " [extensions]\n"
528 " [extensions]\n"
525 " hgext.acl =\n"
529 " hgext.acl =\n"
526 "\n"
530 "\n"
527 " [hooks]\n"
531 " [hooks]\n"
528 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
532 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
529 "\n"
533 "\n"
530 " [acl]\n"
534 " [acl]\n"
531 " # Check whether the source of incoming changes is in this list\n"
535 " # Check whether the source of incoming changes is in this list\n"
532 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
536 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
533 " sources = serve\n"
537 " sources = serve\n"
534 "\n"
538 "\n"
535 "The allow and deny sections take a subtree pattern as key (with a glob\n"
539 "The allow and deny sections take a subtree pattern as key (with a glob\n"
536 "syntax by default), and a comma separated list of users as the\n"
540 "syntax by default), and a comma separated list of users as the\n"
537 "corresponding value. The deny list is checked before the allow list\n"
541 "corresponding value. The deny list is checked before the allow list\n"
538 "is. ::\n"
542 "is. ::\n"
539 "\n"
543 "\n"
540 " [acl.allow]\n"
544 " [acl.allow]\n"
541 " # If acl.allow is not present, all users are allowed by default.\n"
545 " # If acl.allow is not present, all users are allowed by default.\n"
542 " # An empty acl.allow section means no users allowed.\n"
546 " # An empty acl.allow section means no users allowed.\n"
543 " docs/** = doc_writer\n"
547 " docs/** = doc_writer\n"
544 " .hgtags = release_engineer\n"
548 " .hgtags = release_engineer\n"
545 "\n"
549 "\n"
546 " [acl.deny]\n"
550 " [acl.deny]\n"
547 " # If acl.deny is not present, no users are refused by default.\n"
551 " # If acl.deny is not present, no users are refused by default.\n"
548 " # An empty acl.deny section means all users allowed.\n"
552 " # An empty acl.deny section means all users allowed.\n"
549 " glob pattern = user4, user5\n"
553 " glob pattern = user4, user5\n"
550 " ** = user6\n"
554 " ** = user6\n"
551 msgstr ""
555 msgstr ""
552
556
553 #, python-format
557 #, python-format
554 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
558 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
555 msgstr ""
559 msgstr ""
556
560
557 #, python-format
561 #, python-format
558 msgid "acl: access denied for changeset %s"
562 msgid "acl: access denied for changeset %s"
559 msgstr ""
563 msgstr ""
560
564
561 msgid ""
565 msgid ""
562 "track a line of development with movable markers\n"
566 "track a line of development with movable markers\n"
563 "\n"
567 "\n"
564 "Bookmarks are local movable markers to changesets. Every bookmark\n"
568 "Bookmarks are local movable markers to changesets. Every bookmark\n"
565 "points to a changeset identified by its hash. If you commit a\n"
569 "points to a changeset identified by its hash. If you commit a\n"
566 "changeset that is based on a changeset that has a bookmark on it, the\n"
570 "changeset that is based on a changeset that has a bookmark on it, the\n"
567 "bookmark shifts to the new changeset.\n"
571 "bookmark shifts to the new changeset.\n"
568 "\n"
572 "\n"
569 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
573 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
570 "merge, hg update).\n"
574 "merge, hg update).\n"
571 "\n"
575 "\n"
572 "By default, when several bookmarks point to the same changeset, they\n"
576 "By default, when several bookmarks point to the same changeset, they\n"
573 "will all move forward together. It is possible to obtain a more\n"
577 "will all move forward together. It is possible to obtain a more\n"
574 "git-like experience by adding the following configuration option to\n"
578 "git-like experience by adding the following configuration option to\n"
575 "your .hgrc::\n"
579 "your .hgrc::\n"
576 "\n"
580 "\n"
577 " [bookmarks]\n"
581 " [bookmarks]\n"
578 " track.current = True\n"
582 " track.current = True\n"
579 "\n"
583 "\n"
580 "This will cause Mercurial to track the bookmark that you are currently\n"
584 "This will cause Mercurial to track the bookmark that you are currently\n"
581 "using, and only update it. This is similar to git's approach to\n"
585 "using, and only update it. This is similar to git's approach to\n"
582 "branching.\n"
586 "branching.\n"
583 msgstr ""
587 msgstr ""
584
588
585 msgid ""
589 msgid ""
586 "track a line of development with movable markers\n"
590 "track a line of development with movable markers\n"
587 "\n"
591 "\n"
588 " Bookmarks are pointers to certain commits that move when\n"
592 " Bookmarks are pointers to certain commits that move when\n"
589 " committing. Bookmarks are local. They can be renamed, copied and\n"
593 " committing. Bookmarks are local. They can be renamed, copied and\n"
590 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
594 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
591 " 'hg update' to merge and update respectively to a given bookmark.\n"
595 " 'hg update' to merge and update respectively to a given bookmark.\n"
592 "\n"
596 "\n"
593 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
597 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
594 " directory's parent revision with the given name. If you specify\n"
598 " directory's parent revision with the given name. If you specify\n"
595 " a revision using -r REV (where REV may be an existing bookmark),\n"
599 " a revision using -r REV (where REV may be an existing bookmark),\n"
596 " the bookmark is assigned to that revision.\n"
600 " the bookmark is assigned to that revision.\n"
597 " "
601 " "
598 msgstr ""
602 msgstr ""
599
603
600 msgid "a bookmark of this name does not exist"
604 msgid "a bookmark of this name does not exist"
601 msgstr ""
605 msgstr ""
602
606
603 msgid "a bookmark of the same name already exists"
607 msgid "a bookmark of the same name already exists"
604 msgstr ""
608 msgstr ""
605
609
606 msgid "new bookmark name required"
610 msgid "new bookmark name required"
607 msgstr ""
611 msgstr ""
608
612
609 msgid "bookmark name required"
613 msgid "bookmark name required"
610 msgstr ""
614 msgstr ""
611
615
612 msgid "bookmark name cannot contain newlines"
616 msgid "bookmark name cannot contain newlines"
613 msgstr ""
617 msgstr ""
614
618
615 msgid "a bookmark cannot have the name of an existing branch"
619 msgid "a bookmark cannot have the name of an existing branch"
616 msgstr ""
620 msgstr ""
617
621
618 msgid "force"
622 msgid "force"
619 msgstr ""
623 msgstr ""
620
624
621 msgid "revision"
625 msgid "revision"
622 msgstr "revision"
626 msgstr "revision"
623
627
624 msgid "delete a given bookmark"
628 msgid "delete a given bookmark"
625 msgstr ""
629 msgstr ""
626
630
627 msgid "rename a given bookmark"
631 msgid "rename a given bookmark"
628 msgstr ""
632 msgstr ""
629
633
630 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
634 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
631 msgstr ""
635 msgstr ""
632
636
633 msgid ""
637 msgid ""
634 "hooks for integrating with the Bugzilla bug tracker\n"
638 "hooks for integrating with the Bugzilla bug tracker\n"
635 "\n"
639 "\n"
636 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
640 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
637 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
641 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
638 "bug status.\n"
642 "bug status.\n"
639 "\n"
643 "\n"
640 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
644 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
641 "installations using MySQL are supported.\n"
645 "installations using MySQL are supported.\n"
642 "\n"
646 "\n"
643 "The hook relies on a Bugzilla script to send bug change notification\n"
647 "The hook relies on a Bugzilla script to send bug change notification\n"
644 "emails. That script changes between Bugzilla versions; the\n"
648 "emails. That script changes between Bugzilla versions; the\n"
645 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
649 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
646 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
650 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
647 "be run by Mercurial as the user pushing the change; you will need to\n"
651 "be run by Mercurial as the user pushing the change; you will need to\n"
648 "ensure the Bugzilla install file permissions are set appropriately.\n"
652 "ensure the Bugzilla install file permissions are set appropriately.\n"
649 "\n"
653 "\n"
650 "The extension is configured through three different configuration\n"
654 "The extension is configured through three different configuration\n"
651 "sections. These keys are recognized in the [bugzilla] section:\n"
655 "sections. These keys are recognized in the [bugzilla] section:\n"
652 "\n"
656 "\n"
653 "host\n"
657 "host\n"
654 " Hostname of the MySQL server holding the Bugzilla database.\n"
658 " Hostname of the MySQL server holding the Bugzilla database.\n"
655 "\n"
659 "\n"
656 "db\n"
660 "db\n"
657 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
661 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
658 "\n"
662 "\n"
659 "user\n"
663 "user\n"
660 " Username to use to access MySQL server. Default 'bugs'.\n"
664 " Username to use to access MySQL server. Default 'bugs'.\n"
661 "\n"
665 "\n"
662 "password\n"
666 "password\n"
663 " Password to use to access MySQL server.\n"
667 " Password to use to access MySQL server.\n"
664 "\n"
668 "\n"
665 "timeout\n"
669 "timeout\n"
666 " Database connection timeout (seconds). Default 5.\n"
670 " Database connection timeout (seconds). Default 5.\n"
667 "\n"
671 "\n"
668 "version\n"
672 "version\n"
669 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
673 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
670 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
674 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
671 " to 2.18.\n"
675 " to 2.18.\n"
672 "\n"
676 "\n"
673 "bzuser\n"
677 "bzuser\n"
674 " Fallback Bugzilla user name to record comments with, if changeset\n"
678 " Fallback Bugzilla user name to record comments with, if changeset\n"
675 " committer cannot be found as a Bugzilla user.\n"
679 " committer cannot be found as a Bugzilla user.\n"
676 "\n"
680 "\n"
677 "bzdir\n"
681 "bzdir\n"
678 " Bugzilla install directory. Used by default notify. Default\n"
682 " Bugzilla install directory. Used by default notify. Default\n"
679 " '/var/www/html/bugzilla'.\n"
683 " '/var/www/html/bugzilla'.\n"
680 "\n"
684 "\n"
681 "notify\n"
685 "notify\n"
682 " The command to run to get Bugzilla to send bug change notification\n"
686 " The command to run to get Bugzilla to send bug change notification\n"
683 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
687 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
684 " and 'user' (committer bugzilla email). Default depends on version;\n"
688 " and 'user' (committer bugzilla email). Default depends on version;\n"
685 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
689 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
686 " %(id)s %(user)s\".\n"
690 " %(id)s %(user)s\".\n"
687 "\n"
691 "\n"
688 "regexp\n"
692 "regexp\n"
689 " Regular expression to match bug IDs in changeset commit message.\n"
693 " Regular expression to match bug IDs in changeset commit message.\n"
690 " Must contain one \"()\" group. The default expression matches 'Bug\n"
694 " Must contain one \"()\" group. The default expression matches 'Bug\n"
691 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
695 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
692 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
696 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
693 "\n"
697 "\n"
694 "style\n"
698 "style\n"
695 " The style file to use when formatting comments.\n"
699 " The style file to use when formatting comments.\n"
696 "\n"
700 "\n"
697 "template\n"
701 "template\n"
698 " Template to use when formatting comments. Overrides style if\n"
702 " Template to use when formatting comments. Overrides style if\n"
699 " specified. In addition to the usual Mercurial keywords, the\n"
703 " specified. In addition to the usual Mercurial keywords, the\n"
700 " extension specifies::\n"
704 " extension specifies::\n"
701 "\n"
705 "\n"
702 " {bug} The Bugzilla bug ID.\n"
706 " {bug} The Bugzilla bug ID.\n"
703 " {root} The full pathname of the Mercurial repository.\n"
707 " {root} The full pathname of the Mercurial repository.\n"
704 " {webroot} Stripped pathname of the Mercurial repository.\n"
708 " {webroot} Stripped pathname of the Mercurial repository.\n"
705 " {hgweb} Base URL for browsing Mercurial repositories.\n"
709 " {hgweb} Base URL for browsing Mercurial repositories.\n"
706 "\n"
710 "\n"
707 " Default 'changeset {node|short} in repo {root} refers '\n"
711 " Default 'changeset {node|short} in repo {root} refers '\n"
708 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
712 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
709 "\n"
713 "\n"
710 "strip\n"
714 "strip\n"
711 " The number of slashes to strip from the front of {root} to produce\n"
715 " The number of slashes to strip from the front of {root} to produce\n"
712 " {webroot}. Default 0.\n"
716 " {webroot}. Default 0.\n"
713 "\n"
717 "\n"
714 "usermap\n"
718 "usermap\n"
715 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
719 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
716 " mappings. If specified, the file should contain one mapping per\n"
720 " mappings. If specified, the file should contain one mapping per\n"
717 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
721 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
718 "\n"
722 "\n"
719 "The [usermap] section is used to specify mappings of Mercurial\n"
723 "The [usermap] section is used to specify mappings of Mercurial\n"
720 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
724 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
721 "\"committer\"=\"Bugzilla user\"\n"
725 "\"committer\"=\"Bugzilla user\"\n"
722 "\n"
726 "\n"
723 "Finally, the [web] section supports one entry:\n"
727 "Finally, the [web] section supports one entry:\n"
724 "\n"
728 "\n"
725 "baseurl\n"
729 "baseurl\n"
726 " Base URL for browsing Mercurial repositories. Reference from\n"
730 " Base URL for browsing Mercurial repositories. Reference from\n"
727 " templates as {hgweb}.\n"
731 " templates as {hgweb}.\n"
728 "\n"
732 "\n"
729 "Activating the extension::\n"
733 "Activating the extension::\n"
730 "\n"
734 "\n"
731 " [extensions]\n"
735 " [extensions]\n"
732 " hgext.bugzilla =\n"
736 " hgext.bugzilla =\n"
733 "\n"
737 "\n"
734 " [hooks]\n"
738 " [hooks]\n"
735 " # run bugzilla hook on every change pulled or pushed in here\n"
739 " # run bugzilla hook on every change pulled or pushed in here\n"
736 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
740 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
737 "\n"
741 "\n"
738 "Example configuration:\n"
742 "Example configuration:\n"
739 "\n"
743 "\n"
740 "This example configuration is for a collection of Mercurial\n"
744 "This example configuration is for a collection of Mercurial\n"
741 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
745 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
742 "installation in /opt/bugzilla-3.2. ::\n"
746 "installation in /opt/bugzilla-3.2. ::\n"
743 "\n"
747 "\n"
744 " [bugzilla]\n"
748 " [bugzilla]\n"
745 " host=localhost\n"
749 " host=localhost\n"
746 " password=XYZZY\n"
750 " password=XYZZY\n"
747 " version=3.0\n"
751 " version=3.0\n"
748 " bzuser=unknown@domain.com\n"
752 " bzuser=unknown@domain.com\n"
749 " bzdir=/opt/bugzilla-3.2\n"
753 " bzdir=/opt/bugzilla-3.2\n"
750 " template=Changeset {node|short} in {root|basename}.\n"
754 " template=Changeset {node|short} in {root|basename}.\n"
751 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
755 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
752 " {desc}\\n\n"
756 " {desc}\\n\n"
753 " strip=5\n"
757 " strip=5\n"
754 "\n"
758 "\n"
755 " [web]\n"
759 " [web]\n"
756 " baseurl=http://dev.domain.com/hg\n"
760 " baseurl=http://dev.domain.com/hg\n"
757 "\n"
761 "\n"
758 " [usermap]\n"
762 " [usermap]\n"
759 " user@emaildomain.com=user.name@bugzilladomain.com\n"
763 " user@emaildomain.com=user.name@bugzilladomain.com\n"
760 "\n"
764 "\n"
761 "Commits add a comment to the Bugzilla bug record of the form::\n"
765 "Commits add a comment to the Bugzilla bug record of the form::\n"
762 "\n"
766 "\n"
763 " Changeset 3b16791d6642 in repository-name.\n"
767 " Changeset 3b16791d6642 in repository-name.\n"
764 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
768 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
765 "\n"
769 "\n"
766 " Changeset commit comment. Bug 1234.\n"
770 " Changeset commit comment. Bug 1234.\n"
767 msgstr ""
771 msgstr ""
768
772
769 #, python-format
773 #, python-format
770 msgid "connecting to %s:%s as %s, password %s\n"
774 msgid "connecting to %s:%s as %s, password %s\n"
771 msgstr ""
775 msgstr ""
772
776
773 #, python-format
777 #, python-format
774 msgid "query: %s %s\n"
778 msgid "query: %s %s\n"
775 msgstr ""
779 msgstr ""
776
780
777 #, python-format
781 #, python-format
778 msgid "failed query: %s %s\n"
782 msgid "failed query: %s %s\n"
779 msgstr ""
783 msgstr ""
780
784
781 msgid "unknown database schema"
785 msgid "unknown database schema"
782 msgstr ""
786 msgstr ""
783
787
784 #, python-format
788 #, python-format
785 msgid "bug %d already knows about changeset %s\n"
789 msgid "bug %d already knows about changeset %s\n"
786 msgstr ""
790 msgstr ""
787
791
788 msgid "telling bugzilla to send mail:\n"
792 msgid "telling bugzilla to send mail:\n"
789 msgstr ""
793 msgstr ""
790
794
791 #, python-format
795 #, python-format
792 msgid " bug %s\n"
796 msgid " bug %s\n"
793 msgstr ""
797 msgstr ""
794
798
795 #, python-format
799 #, python-format
796 msgid "running notify command %s\n"
800 msgid "running notify command %s\n"
797 msgstr ""
801 msgstr ""
798
802
799 #, python-format
803 #, python-format
800 msgid "bugzilla notify command %s"
804 msgid "bugzilla notify command %s"
801 msgstr ""
805 msgstr ""
802
806
803 msgid "done\n"
807 msgid "done\n"
804 msgstr ""
808 msgstr ""
805
809
806 #, python-format
810 #, python-format
807 msgid "looking up user %s\n"
811 msgid "looking up user %s\n"
808 msgstr ""
812 msgstr ""
809
813
810 #, python-format
814 #, python-format
811 msgid "cannot find bugzilla user id for %s"
815 msgid "cannot find bugzilla user id for %s"
812 msgstr ""
816 msgstr ""
813
817
814 #, python-format
818 #, python-format
815 msgid "cannot find bugzilla user id for %s or %s"
819 msgid "cannot find bugzilla user id for %s or %s"
816 msgstr ""
820 msgstr ""
817
821
818 #, python-format
822 #, python-format
819 msgid "bugzilla version %s not supported"
823 msgid "bugzilla version %s not supported"
820 msgstr ""
824 msgstr ""
821
825
822 msgid ""
826 msgid ""
823 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
827 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
824 "details:\n"
828 "details:\n"
825 "\t{desc|tabindent}"
829 "\t{desc|tabindent}"
826 msgstr ""
830 msgstr ""
827
831
828 #, python-format
832 #, python-format
829 msgid "python mysql support not available: %s"
833 msgid "python mysql support not available: %s"
830 msgstr ""
834 msgstr ""
831
835
832 #, python-format
836 #, python-format
833 msgid "hook type %s does not pass a changeset id"
837 msgid "hook type %s does not pass a changeset id"
834 msgstr ""
838 msgstr ""
835
839
836 #, python-format
840 #, python-format
837 msgid "database error: %s"
841 msgid "database error: %s"
838 msgstr ""
842 msgstr ""
839
843
840 msgid "command to display child changesets"
844 msgid "command to display child changesets"
841 msgstr ""
845 msgstr ""
842
846
843 msgid ""
847 msgid ""
844 "show the children of the given or working directory revision\n"
848 "show the children of the given or working directory revision\n"
845 "\n"
849 "\n"
846 " Print the children of the working directory's revisions. If a\n"
850 " Print the children of the working directory's revisions. If a\n"
847 " revision is given via -r/--rev, the children of that revision will\n"
851 " revision is given via -r/--rev, the children of that revision will\n"
848 " be printed. If a file argument is given, revision in which the\n"
852 " be printed. If a file argument is given, revision in which the\n"
849 " file was last changed (after the working directory revision or the\n"
853 " file was last changed (after the working directory revision or the\n"
850 " argument to --rev if given) is printed.\n"
854 " argument to --rev if given) is printed.\n"
851 " "
855 " "
852 msgstr ""
856 msgstr ""
853
857
854 msgid "show children of the specified revision"
858 msgid "show children of the specified revision"
855 msgstr ""
859 msgstr ""
856
860
857 msgid "hg children [-r REV] [FILE]"
861 msgid "hg children [-r REV] [FILE]"
858 msgstr ""
862 msgstr ""
859
863
860 msgid "command to display statistics about repository history"
864 msgid "command to display statistics about repository history"
861 msgstr ""
865 msgstr ""
862
866
863 #, python-format
867 #, python-format
864 msgid "Revision %d is a merge, ignoring...\n"
868 msgid "Revision %d is a merge, ignoring...\n"
865 msgstr ""
869 msgstr ""
866
870
867 #, python-format
871 #, python-format
868 msgid "generating stats: %d%%"
872 msgid "generating stats: %d%%"
869 msgstr ""
873 msgstr ""
870
874
871 msgid ""
875 msgid ""
872 "histogram of changes to the repository\n"
876 "histogram of changes to the repository\n"
873 "\n"
877 "\n"
874 " This command will display a histogram representing the number\n"
878 " This command will display a histogram representing the number\n"
875 " of changed lines or revisions, grouped according to the given\n"
879 " of changed lines or revisions, grouped according to the given\n"
876 " template. The default template will group changes by author.\n"
880 " template. The default template will group changes by author.\n"
877 " The --dateformat option may be used to group the results by\n"
881 " The --dateformat option may be used to group the results by\n"
878 " date instead.\n"
882 " date instead.\n"
879 "\n"
883 "\n"
880 " Statistics are based on the number of changed lines, or\n"
884 " Statistics are based on the number of changed lines, or\n"
881 " alternatively the number of matching revisions if the\n"
885 " alternatively the number of matching revisions if the\n"
882 " --changesets option is specified.\n"
886 " --changesets option is specified.\n"
883 "\n"
887 "\n"
884 " Examples::\n"
888 " Examples::\n"
885 "\n"
889 "\n"
886 " # display count of changed lines for every committer\n"
890 " # display count of changed lines for every committer\n"
887 " hg churn -t '{author|email}'\n"
891 " hg churn -t '{author|email}'\n"
888 "\n"
892 "\n"
889 " # display daily activity graph\n"
893 " # display daily activity graph\n"
890 " hg churn -f '%H' -s -c\n"
894 " hg churn -f '%H' -s -c\n"
891 "\n"
895 "\n"
892 " # display activity of developers by month\n"
896 " # display activity of developers by month\n"
893 " hg churn -f '%Y-%m' -s -c\n"
897 " hg churn -f '%Y-%m' -s -c\n"
894 "\n"
898 "\n"
895 " # display count of lines changed in every year\n"
899 " # display count of lines changed in every year\n"
896 " hg churn -f '%Y' -s\n"
900 " hg churn -f '%Y' -s\n"
897 "\n"
901 "\n"
898 " It is possible to map alternate email addresses to a main address\n"
902 " It is possible to map alternate email addresses to a main address\n"
899 " by providing a file using the following format::\n"
903 " by providing a file using the following format::\n"
900 "\n"
904 "\n"
901 " <alias email> <actual email>\n"
905 " <alias email> <actual email>\n"
902 "\n"
906 "\n"
903 " Such a file may be specified with the --aliases option, otherwise\n"
907 " Such a file may be specified with the --aliases option, otherwise\n"
904 " a .hgchurn file will be looked for in the working directory root.\n"
908 " a .hgchurn file will be looked for in the working directory root.\n"
905 " "
909 " "
906 msgstr ""
910 msgstr ""
907
911
908 msgid "count rate for the specified revision or range"
912 msgid "count rate for the specified revision or range"
909 msgstr ""
913 msgstr ""
910
914
911 msgid "count rate for revisions matching date spec"
915 msgid "count rate for revisions matching date spec"
912 msgstr ""
916 msgstr ""
913
917
914 msgid "template to group changesets"
918 msgid "template to group changesets"
915 msgstr ""
919 msgstr ""
916
920
917 msgid "strftime-compatible format for grouping by date"
921 msgid "strftime-compatible format for grouping by date"
918 msgstr ""
922 msgstr ""
919
923
920 msgid "count rate by number of changesets"
924 msgid "count rate by number of changesets"
921 msgstr ""
925 msgstr ""
922
926
923 msgid "sort by key (default: sort by count)"
927 msgid "sort by key (default: sort by count)"
924 msgstr ""
928 msgstr ""
925
929
926 msgid "file with email aliases"
930 msgid "file with email aliases"
927 msgstr ""
931 msgstr ""
928
932
929 msgid "show progress"
933 msgid "show progress"
930 msgstr ""
934 msgstr ""
931
935
932 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
936 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
933 msgstr ""
937 msgstr ""
934
938
935 msgid ""
939 msgid ""
936 "colorize output from some commands\n"
940 "colorize output from some commands\n"
937 "\n"
941 "\n"
938 "This extension modifies the status command to add color to its output\n"
942 "This extension modifies the status command to add color to its output\n"
939 "to reflect file status, the qseries command to add color to reflect\n"
943 "to reflect file status, the qseries command to add color to reflect\n"
940 "patch status (applied, unapplied, missing), and to diff-related\n"
944 "patch status (applied, unapplied, missing), and to diff-related\n"
941 "commands to highlight additions, removals, diff headers, and trailing\n"
945 "commands to highlight additions, removals, diff headers, and trailing\n"
942 "whitespace.\n"
946 "whitespace.\n"
943 "\n"
947 "\n"
944 "Other effects in addition to color, like bold and underlined text, are\n"
948 "Other effects in addition to color, like bold and underlined text, are\n"
945 "also available. Effects are rendered with the ECMA-48 SGR control\n"
949 "also available. Effects are rendered with the ECMA-48 SGR control\n"
946 "function (aka ANSI escape codes). This module also provides the\n"
950 "function (aka ANSI escape codes). This module also provides the\n"
947 "render_text function, which can be used to add effects to any text.\n"
951 "render_text function, which can be used to add effects to any text.\n"
948 "\n"
952 "\n"
949 "Default effects may be overridden from the .hgrc file::\n"
953 "Default effects may be overridden from the .hgrc file::\n"
950 "\n"
954 "\n"
951 " [color]\n"
955 " [color]\n"
952 " status.modified = blue bold underline red_background\n"
956 " status.modified = blue bold underline red_background\n"
953 " status.added = green bold\n"
957 " status.added = green bold\n"
954 " status.removed = red bold blue_background\n"
958 " status.removed = red bold blue_background\n"
955 " status.deleted = cyan bold underline\n"
959 " status.deleted = cyan bold underline\n"
956 " status.unknown = magenta bold underline\n"
960 " status.unknown = magenta bold underline\n"
957 " status.ignored = black bold\n"
961 " status.ignored = black bold\n"
958 "\n"
962 "\n"
959 " # 'none' turns off all effects\n"
963 " # 'none' turns off all effects\n"
960 " status.clean = none\n"
964 " status.clean = none\n"
961 " status.copied = none\n"
965 " status.copied = none\n"
962 "\n"
966 "\n"
963 " qseries.applied = blue bold underline\n"
967 " qseries.applied = blue bold underline\n"
964 " qseries.unapplied = black bold\n"
968 " qseries.unapplied = black bold\n"
965 " qseries.missing = red bold\n"
969 " qseries.missing = red bold\n"
966 "\n"
970 "\n"
967 " diff.diffline = bold\n"
971 " diff.diffline = bold\n"
968 " diff.extended = cyan bold\n"
972 " diff.extended = cyan bold\n"
969 " diff.file_a = red bold\n"
973 " diff.file_a = red bold\n"
970 " diff.file_b = green bold\n"
974 " diff.file_b = green bold\n"
971 " diff.hunk = magenta\n"
975 " diff.hunk = magenta\n"
972 " diff.deleted = red\n"
976 " diff.deleted = red\n"
973 " diff.inserted = green\n"
977 " diff.inserted = green\n"
974 " diff.changed = white\n"
978 " diff.changed = white\n"
975 " diff.trailingwhitespace = bold red_background\n"
979 " diff.trailingwhitespace = bold red_background\n"
976 msgstr ""
980 msgstr ""
977
981
978 msgid "when to colorize (always, auto, or never)"
982 msgid "when to colorize (always, auto, or never)"
979 msgstr "när färgläggning ska ske (always, auto eller never)"
983 msgstr "när färgläggning ska ske (always, auto eller never)"
980
984
981 #, fuzzy
982 msgid "don't colorize output (DEPRECATED)"
985 msgid "don't colorize output (DEPRECATED)"
983 msgstr "färglägg inte utmatning"
986 msgstr "färglägg inte utmatning (FÖRLEGAD)"
984
987
985 #, python-format
988 #, python-format
986 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
989 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
987 msgstr ""
990 msgstr ""
988
991
989 msgid "import revisions from foreign VCS repositories into Mercurial"
992 msgid "import revisions from foreign VCS repositories into Mercurial"
990 msgstr ""
993 msgstr ""
991
994
992 msgid ""
995 msgid ""
993 "convert a foreign SCM repository to a Mercurial one.\n"
996 "convert a foreign SCM repository to a Mercurial one.\n"
994 "\n"
997 "\n"
995 " Accepted source formats [identifiers]:\n"
998 " Accepted source formats [identifiers]:\n"
996 "\n"
999 "\n"
997 " - Mercurial [hg]\n"
1000 " - Mercurial [hg]\n"
998 " - CVS [cvs]\n"
1001 " - CVS [cvs]\n"
999 " - Darcs [darcs]\n"
1002 " - Darcs [darcs]\n"
1000 " - git [git]\n"
1003 " - git [git]\n"
1001 " - Subversion [svn]\n"
1004 " - Subversion [svn]\n"
1002 " - Monotone [mtn]\n"
1005 " - Monotone [mtn]\n"
1003 " - GNU Arch [gnuarch]\n"
1006 " - GNU Arch [gnuarch]\n"
1004 " - Bazaar [bzr]\n"
1007 " - Bazaar [bzr]\n"
1005 " - Perforce [p4]\n"
1008 " - Perforce [p4]\n"
1006 "\n"
1009 "\n"
1007 " Accepted destination formats [identifiers]:\n"
1010 " Accepted destination formats [identifiers]:\n"
1008 "\n"
1011 "\n"
1009 " - Mercurial [hg]\n"
1012 " - Mercurial [hg]\n"
1010 " - Subversion [svn] (history on branches is not preserved)\n"
1013 " - Subversion [svn] (history on branches is not preserved)\n"
1011 "\n"
1014 "\n"
1012 " If no revision is given, all revisions will be converted.\n"
1015 " If no revision is given, all revisions will be converted.\n"
1013 " Otherwise, convert will only import up to the named revision\n"
1016 " Otherwise, convert will only import up to the named revision\n"
1014 " (given in a format understood by the source).\n"
1017 " (given in a format understood by the source).\n"
1015 "\n"
1018 "\n"
1016 " If no destination directory name is specified, it defaults to the\n"
1019 " If no destination directory name is specified, it defaults to the\n"
1017 " basename of the source with '-hg' appended. If the destination\n"
1020 " basename of the source with '-hg' appended. If the destination\n"
1018 " repository doesn't exist, it will be created.\n"
1021 " repository doesn't exist, it will be created.\n"
1019 "\n"
1022 "\n"
1020 " By default, all sources except Mercurial will use --branchsort.\n"
1023 " By default, all sources except Mercurial will use --branchsort.\n"
1021 " Mercurial uses --sourcesort to preserve original revision numbers\n"
1024 " Mercurial uses --sourcesort to preserve original revision numbers\n"
1022 " order. Sort modes have the following effects:\n"
1025 " order. Sort modes have the following effects:\n"
1023 "\n"
1026 "\n"
1024 " --branchsort convert from parent to child revision when possible,\n"
1027 " --branchsort convert from parent to child revision when possible,\n"
1025 " which means branches are usually converted one after\n"
1028 " which means branches are usually converted one after\n"
1026 " the other. It generates more compact repositories.\n"
1029 " the other. It generates more compact repositories.\n"
1027 "\n"
1030 "\n"
1028 " --datesort sort revisions by date. Converted repositories have\n"
1031 " --datesort sort revisions by date. Converted repositories have\n"
1029 " good-looking changelogs but are often an order of\n"
1032 " good-looking changelogs but are often an order of\n"
1030 " magnitude larger than the same ones generated by\n"
1033 " magnitude larger than the same ones generated by\n"
1031 " --branchsort.\n"
1034 " --branchsort.\n"
1032 "\n"
1035 "\n"
1033 " --sourcesort try to preserve source revisions order, only\n"
1036 " --sourcesort try to preserve source revisions order, only\n"
1034 " supported by Mercurial sources.\n"
1037 " supported by Mercurial sources.\n"
1035 "\n"
1038 "\n"
1036 " If <REVMAP> isn't given, it will be put in a default location\n"
1039 " If <REVMAP> isn't given, it will be put in a default location\n"
1037 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
1040 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
1038 " that maps each source commit ID to the destination ID for that\n"
1041 " that maps each source commit ID to the destination ID for that\n"
1039 " revision, like so::\n"
1042 " revision, like so::\n"
1040 "\n"
1043 "\n"
1041 " <source ID> <destination ID>\n"
1044 " <source ID> <destination ID>\n"
1042 "\n"
1045 "\n"
1043 " If the file doesn't exist, it's automatically created. It's\n"
1046 " If the file doesn't exist, it's automatically created. It's\n"
1044 " updated on each commit copied, so convert-repo can be interrupted\n"
1047 " updated on each commit copied, so convert-repo can be interrupted\n"
1045 " and can be run repeatedly to copy new commits.\n"
1048 " and can be run repeatedly to copy new commits.\n"
1046 "\n"
1049 "\n"
1047 " The [username mapping] file is a simple text file that maps each\n"
1050 " The [username mapping] file is a simple text file that maps each\n"
1048 " source commit author to a destination commit author. It is handy\n"
1051 " source commit author to a destination commit author. It is handy\n"
1049 " for source SCMs that use unix logins to identify authors (eg:\n"
1052 " for source SCMs that use unix logins to identify authors (eg:\n"
1050 " CVS). One line per author mapping and the line format is:\n"
1053 " CVS). One line per author mapping and the line format is:\n"
1051 " srcauthor=whatever string you want\n"
1054 " srcauthor=whatever string you want\n"
1052 "\n"
1055 "\n"
1053 " The filemap is a file that allows filtering and remapping of files\n"
1056 " The filemap is a file that allows filtering and remapping of files\n"
1054 " and directories. Comment lines start with '#'. Each line can\n"
1057 " and directories. Comment lines start with '#'. Each line can\n"
1055 " contain one of the following directives::\n"
1058 " contain one of the following directives::\n"
1056 "\n"
1059 "\n"
1057 " include path/to/file\n"
1060 " include path/to/file\n"
1058 "\n"
1061 "\n"
1059 " exclude path/to/file\n"
1062 " exclude path/to/file\n"
1060 "\n"
1063 "\n"
1061 " rename from/file to/file\n"
1064 " rename from/file to/file\n"
1062 "\n"
1065 "\n"
1063 " The 'include' directive causes a file, or all files under a\n"
1066 " The 'include' directive causes a file, or all files under a\n"
1064 " directory, to be included in the destination repository, and the\n"
1067 " directory, to be included in the destination repository, and the\n"
1065 " exclusion of all other files and directories not explicitly\n"
1068 " exclusion of all other files and directories not explicitly\n"
1066 " included. The 'exclude' directive causes files or directories to\n"
1069 " included. The 'exclude' directive causes files or directories to\n"
1067 " be omitted. The 'rename' directive renames a file or directory. To\n"
1070 " be omitted. The 'rename' directive renames a file or directory. To\n"
1068 " rename from a subdirectory into the root of the repository, use\n"
1071 " rename from a subdirectory into the root of the repository, use\n"
1069 " '.' as the path to rename to.\n"
1072 " '.' as the path to rename to.\n"
1070 "\n"
1073 "\n"
1071 " The splicemap is a file that allows insertion of synthetic\n"
1074 " The splicemap is a file that allows insertion of synthetic\n"
1072 " history, letting you specify the parents of a revision. This is\n"
1075 " history, letting you specify the parents of a revision. This is\n"
1073 " useful if you want to e.g. give a Subversion merge two parents, or\n"
1076 " useful if you want to e.g. give a Subversion merge two parents, or\n"
1074 " graft two disconnected series of history together. Each entry\n"
1077 " graft two disconnected series of history together. Each entry\n"
1075 " contains a key, followed by a space, followed by one or two\n"
1078 " contains a key, followed by a space, followed by one or two\n"
1076 " comma-separated values. The key is the revision ID in the source\n"
1079 " comma-separated values. The key is the revision ID in the source\n"
1077 " revision control system whose parents should be modified (same\n"
1080 " revision control system whose parents should be modified (same\n"
1078 " format as a key in .hg/shamap). The values are the revision IDs\n"
1081 " format as a key in .hg/shamap). The values are the revision IDs\n"
1079 " (in either the source or destination revision control system) that\n"
1082 " (in either the source or destination revision control system) that\n"
1080 " should be used as the new parents for that node.\n"
1083 " should be used as the new parents for that node.\n"
1081 "\n"
1084 "\n"
1082 " The branchmap is a file that allows you to rename a branch when it is\n"
1085 " The branchmap is a file that allows you to rename a branch when it is\n"
1083 " being brought in from whatever external repository. When used in\n"
1086 " being brought in from whatever external repository. When used in\n"
1084 " conjunction with a splicemap, it allows for a powerful combination\n"
1087 " conjunction with a splicemap, it allows for a powerful combination\n"
1085 " to help fix even the most badly mismanaged repositories and turn them\n"
1088 " to help fix even the most badly mismanaged repositories and turn them\n"
1086 " into nicely structured Mercurial repositories. The branchmap contains\n"
1089 " into nicely structured Mercurial repositories. The branchmap contains\n"
1087 " lines of the form \"original_branch_name new_branch_name\".\n"
1090 " lines of the form \"original_branch_name new_branch_name\".\n"
1088 " \"original_branch_name\" is the name of the branch in the source\n"
1091 " \"original_branch_name\" is the name of the branch in the source\n"
1089 " repository, and \"new_branch_name\" is the name of the branch is the\n"
1092 " repository, and \"new_branch_name\" is the name of the branch is the\n"
1090 " destination repository. This can be used to (for instance) move code\n"
1093 " destination repository. This can be used to (for instance) move code\n"
1091 " in one repository from \"default\" to a named branch.\n"
1094 " in one repository from \"default\" to a named branch.\n"
1092 "\n"
1095 "\n"
1093 " Mercurial Source\n"
1096 " Mercurial Source\n"
1094 " ----------------\n"
1097 " ----------------\n"
1095 "\n"
1098 "\n"
1096 " --config convert.hg.ignoreerrors=False (boolean)\n"
1099 " --config convert.hg.ignoreerrors=False (boolean)\n"
1097 " ignore integrity errors when reading. Use it to fix Mercurial\n"
1100 " ignore integrity errors when reading. Use it to fix Mercurial\n"
1098 " repositories with missing revlogs, by converting from and to\n"
1101 " repositories with missing revlogs, by converting from and to\n"
1099 " Mercurial.\n"
1102 " Mercurial.\n"
1100 " --config convert.hg.saverev=False (boolean)\n"
1103 " --config convert.hg.saverev=False (boolean)\n"
1101 " store original revision ID in changeset (forces target IDs to\n"
1104 " store original revision ID in changeset (forces target IDs to\n"
1102 " change)\n"
1105 " change)\n"
1103 " --config convert.hg.startrev=0 (hg revision identifier)\n"
1106 " --config convert.hg.startrev=0 (hg revision identifier)\n"
1104 " convert start revision and its descendants\n"
1107 " convert start revision and its descendants\n"
1105 "\n"
1108 "\n"
1106 " CVS Source\n"
1109 " CVS Source\n"
1107 " ----------\n"
1110 " ----------\n"
1108 "\n"
1111 "\n"
1109 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
1112 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
1110 " to indicate the starting point of what will be converted. Direct\n"
1113 " to indicate the starting point of what will be converted. Direct\n"
1111 " access to the repository files is not needed, unless of course the\n"
1114 " access to the repository files is not needed, unless of course the\n"
1112 " repository is :local:. The conversion uses the top level directory\n"
1115 " repository is :local:. The conversion uses the top level directory\n"
1113 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
1116 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
1114 " commands to find files to convert. This means that unless a\n"
1117 " commands to find files to convert. This means that unless a\n"
1115 " filemap is given, all files under the starting directory will be\n"
1118 " filemap is given, all files under the starting directory will be\n"
1116 " converted, and that any directory reorganization in the CVS\n"
1119 " converted, and that any directory reorganization in the CVS\n"
1117 " sandbox is ignored.\n"
1120 " sandbox is ignored.\n"
1118 "\n"
1121 "\n"
1119 " The options shown are the defaults.\n"
1122 " The options shown are the defaults.\n"
1120 "\n"
1123 "\n"
1121 " --config convert.cvsps.cache=True (boolean)\n"
1124 " --config convert.cvsps.cache=True (boolean)\n"
1122 " Set to False to disable remote log caching, for testing and\n"
1125 " Set to False to disable remote log caching, for testing and\n"
1123 " debugging purposes.\n"
1126 " debugging purposes.\n"
1124 " --config convert.cvsps.fuzz=60 (integer)\n"
1127 " --config convert.cvsps.fuzz=60 (integer)\n"
1125 " Specify the maximum time (in seconds) that is allowed between\n"
1128 " Specify the maximum time (in seconds) that is allowed between\n"
1126 " commits with identical user and log message in a single\n"
1129 " commits with identical user and log message in a single\n"
1127 " changeset. When very large files were checked in as part of a\n"
1130 " changeset. When very large files were checked in as part of a\n"
1128 " changeset then the default may not be long enough.\n"
1131 " changeset then the default may not be long enough.\n"
1129 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
1132 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
1130 " Specify a regular expression to which commit log messages are\n"
1133 " Specify a regular expression to which commit log messages are\n"
1131 " matched. If a match occurs, then the conversion process will\n"
1134 " matched. If a match occurs, then the conversion process will\n"
1132 " insert a dummy revision merging the branch on which this log\n"
1135 " insert a dummy revision merging the branch on which this log\n"
1133 " message occurs to the branch indicated in the regex.\n"
1136 " message occurs to the branch indicated in the regex.\n"
1134 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
1137 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
1135 " Specify a regular expression to which commit log messages are\n"
1138 " Specify a regular expression to which commit log messages are\n"
1136 " matched. If a match occurs, then the conversion process will\n"
1139 " matched. If a match occurs, then the conversion process will\n"
1137 " add the most recent revision on the branch indicated in the\n"
1140 " add the most recent revision on the branch indicated in the\n"
1138 " regex as the second parent of the changeset.\n"
1141 " regex as the second parent of the changeset.\n"
1139 "\n"
1142 "\n"
1140 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
1143 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
1141 " changeset merging code to be run without doing a conversion. Its\n"
1144 " changeset merging code to be run without doing a conversion. Its\n"
1142 " parameters and output are similar to that of cvsps 2.1. Please see\n"
1145 " parameters and output are similar to that of cvsps 2.1. Please see\n"
1143 " the command help for more details.\n"
1146 " the command help for more details.\n"
1144 "\n"
1147 "\n"
1145 " Subversion Source\n"
1148 " Subversion Source\n"
1146 " -----------------\n"
1149 " -----------------\n"
1147 "\n"
1150 "\n"
1148 " Subversion source detects classical trunk/branches/tags layouts.\n"
1151 " Subversion source detects classical trunk/branches/tags layouts.\n"
1149 " By default, the supplied \"svn://repo/path/\" source URL is\n"
1152 " By default, the supplied \"svn://repo/path/\" source URL is\n"
1150 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
1153 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
1151 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
1154 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
1152 " its subdirectories are listed as possible branches. If\n"
1155 " its subdirectories are listed as possible branches. If\n"
1153 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
1156 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
1154 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
1157 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
1155 " can be overridden with following options. Set them to paths\n"
1158 " can be overridden with following options. Set them to paths\n"
1156 " relative to the source URL, or leave them blank to disable auto\n"
1159 " relative to the source URL, or leave them blank to disable auto\n"
1157 " detection.\n"
1160 " detection.\n"
1158 "\n"
1161 "\n"
1159 " --config convert.svn.branches=branches (directory name)\n"
1162 " --config convert.svn.branches=branches (directory name)\n"
1160 " specify the directory containing branches\n"
1163 " specify the directory containing branches\n"
1161 " --config convert.svn.tags=tags (directory name)\n"
1164 " --config convert.svn.tags=tags (directory name)\n"
1162 " specify the directory containing tags\n"
1165 " specify the directory containing tags\n"
1163 " --config convert.svn.trunk=trunk (directory name)\n"
1166 " --config convert.svn.trunk=trunk (directory name)\n"
1164 " specify the name of the trunk branch\n"
1167 " specify the name of the trunk branch\n"
1165 "\n"
1168 "\n"
1166 " Source history can be retrieved starting at a specific revision,\n"
1169 " Source history can be retrieved starting at a specific revision,\n"
1167 " instead of being integrally converted. Only single branch\n"
1170 " instead of being integrally converted. Only single branch\n"
1168 " conversions are supported.\n"
1171 " conversions are supported.\n"
1169 "\n"
1172 "\n"
1170 " --config convert.svn.startrev=0 (svn revision number)\n"
1173 " --config convert.svn.startrev=0 (svn revision number)\n"
1171 " specify start Subversion revision.\n"
1174 " specify start Subversion revision.\n"
1172 "\n"
1175 "\n"
1173 " Perforce Source\n"
1176 " Perforce Source\n"
1174 " ---------------\n"
1177 " ---------------\n"
1175 "\n"
1178 "\n"
1176 " The Perforce (P4) importer can be given a p4 depot path or a\n"
1179 " The Perforce (P4) importer can be given a p4 depot path or a\n"
1177 " client specification as source. It will convert all files in the\n"
1180 " client specification as source. It will convert all files in the\n"
1178 " source to a flat Mercurial repository, ignoring labels, branches\n"
1181 " source to a flat Mercurial repository, ignoring labels, branches\n"
1179 " and integrations. Note that when a depot path is given you then\n"
1182 " and integrations. Note that when a depot path is given you then\n"
1180 " usually should specify a target directory, because otherwise the\n"
1183 " usually should specify a target directory, because otherwise the\n"
1181 " target may be named ...-hg.\n"
1184 " target may be named ...-hg.\n"
1182 "\n"
1185 "\n"
1183 " It is possible to limit the amount of source history to be\n"
1186 " It is possible to limit the amount of source history to be\n"
1184 " converted by specifying an initial Perforce revision.\n"
1187 " converted by specifying an initial Perforce revision.\n"
1185 "\n"
1188 "\n"
1186 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1189 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1187 " specify initial Perforce revision.\n"
1190 " specify initial Perforce revision.\n"
1188 "\n"
1191 "\n"
1189 " Mercurial Destination\n"
1192 " Mercurial Destination\n"
1190 " ---------------------\n"
1193 " ---------------------\n"
1191 "\n"
1194 "\n"
1192 " --config convert.hg.clonebranches=False (boolean)\n"
1195 " --config convert.hg.clonebranches=False (boolean)\n"
1193 " dispatch source branches in separate clones.\n"
1196 " dispatch source branches in separate clones.\n"
1194 " --config convert.hg.tagsbranch=default (branch name)\n"
1197 " --config convert.hg.tagsbranch=default (branch name)\n"
1195 " tag revisions branch name\n"
1198 " tag revisions branch name\n"
1196 " --config convert.hg.usebranchnames=True (boolean)\n"
1199 " --config convert.hg.usebranchnames=True (boolean)\n"
1197 " preserve branch names\n"
1200 " preserve branch names\n"
1198 "\n"
1201 "\n"
1199 " "
1202 " "
1200 msgstr ""
1203 msgstr ""
1201
1204
1202 msgid ""
1205 msgid ""
1203 "create changeset information from CVS\n"
1206 "create changeset information from CVS\n"
1204 "\n"
1207 "\n"
1205 " This command is intended as a debugging tool for the CVS to\n"
1208 " This command is intended as a debugging tool for the CVS to\n"
1206 " Mercurial converter, and can be used as a direct replacement for\n"
1209 " Mercurial converter, and can be used as a direct replacement for\n"
1207 " cvsps.\n"
1210 " cvsps.\n"
1208 "\n"
1211 "\n"
1209 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1212 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1210 " named directory) in the CVS repository, and converts the log to a\n"
1213 " named directory) in the CVS repository, and converts the log to a\n"
1211 " series of changesets based on matching commit log entries and\n"
1214 " series of changesets based on matching commit log entries and\n"
1212 " dates."
1215 " dates."
1213 msgstr ""
1216 msgstr ""
1214
1217
1215 msgid "username mapping filename"
1218 msgid "username mapping filename"
1216 msgstr ""
1219 msgstr ""
1217
1220
1218 msgid "destination repository type"
1221 msgid "destination repository type"
1219 msgstr ""
1222 msgstr ""
1220
1223
1221 msgid "remap file names using contents of file"
1224 msgid "remap file names using contents of file"
1222 msgstr ""
1225 msgstr ""
1223
1226
1224 msgid "import up to target revision REV"
1227 msgid "import up to target revision REV"
1225 msgstr ""
1228 msgstr ""
1226
1229
1227 msgid "source repository type"
1230 msgid "source repository type"
1228 msgstr ""
1231 msgstr ""
1229
1232
1230 msgid "splice synthesized history into place"
1233 msgid "splice synthesized history into place"
1231 msgstr ""
1234 msgstr ""
1232
1235
1233 msgid "change branch names while converting"
1236 msgid "change branch names while converting"
1234 msgstr ""
1237 msgstr ""
1235
1238
1236 msgid "try to sort changesets by branches"
1239 msgid "try to sort changesets by branches"
1237 msgstr ""
1240 msgstr ""
1238
1241
1239 msgid "try to sort changesets by date"
1242 msgid "try to sort changesets by date"
1240 msgstr ""
1243 msgstr ""
1241
1244
1242 msgid "preserve source changesets order"
1245 msgid "preserve source changesets order"
1243 msgstr ""
1246 msgstr ""
1244
1247
1245 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1248 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1246 msgstr ""
1249 msgstr ""
1247
1250
1248 msgid "only return changes on specified branches"
1251 msgid "only return changes on specified branches"
1249 msgstr ""
1252 msgstr ""
1250
1253
1251 msgid "prefix to remove from file names"
1254 msgid "prefix to remove from file names"
1252 msgstr ""
1255 msgstr ""
1253
1256
1254 msgid "only return changes after or between specified tags"
1257 msgid "only return changes after or between specified tags"
1255 msgstr ""
1258 msgstr ""
1256
1259
1257 msgid "update cvs log cache"
1260 msgid "update cvs log cache"
1258 msgstr ""
1261 msgstr ""
1259
1262
1260 msgid "create new cvs log cache"
1263 msgid "create new cvs log cache"
1261 msgstr ""
1264 msgstr ""
1262
1265
1263 msgid "set commit time fuzz in seconds"
1266 msgid "set commit time fuzz in seconds"
1264 msgstr ""
1267 msgstr ""
1265
1268
1266 msgid "specify cvsroot"
1269 msgid "specify cvsroot"
1267 msgstr ""
1270 msgstr ""
1268
1271
1269 msgid "show parent changesets"
1272 msgid "show parent changesets"
1270 msgstr ""
1273 msgstr ""
1271
1274
1272 msgid "show current changeset in ancestor branches"
1275 msgid "show current changeset in ancestor branches"
1273 msgstr ""
1276 msgstr ""
1274
1277
1275 msgid "ignored for compatibility"
1278 msgid "ignored for compatibility"
1276 msgstr ""
1279 msgstr ""
1277
1280
1278 msgid "hg debugcvsps [OPTION]... [PATH]..."
1281 msgid "hg debugcvsps [OPTION]... [PATH]..."
1279 msgstr ""
1282 msgstr ""
1280
1283
1281 msgid ""
1284 msgid ""
1282 "warning: lightweight checkouts may cause conversion failures, try with a "
1285 "warning: lightweight checkouts may cause conversion failures, try with a "
1283 "regular branch instead.\n"
1286 "regular branch instead.\n"
1284 msgstr ""
1287 msgstr ""
1285
1288
1286 msgid "bzr source type could not be determined\n"
1289 msgid "bzr source type could not be determined\n"
1287 msgstr ""
1290 msgstr ""
1288
1291
1289 #, python-format
1292 #, python-format
1290 msgid "%s is not a valid revision in current branch"
1293 msgid "%s is not a valid revision in current branch"
1291 msgstr ""
1294 msgstr ""
1292
1295
1293 #, python-format
1296 #, python-format
1294 msgid "%s is not available in %s anymore"
1297 msgid "%s is not available in %s anymore"
1295 msgstr ""
1298 msgstr ""
1296
1299
1297 #, python-format
1300 #, python-format
1298 msgid "%s.%s symlink has no target"
1301 msgid "%s.%s symlink has no target"
1299 msgstr ""
1302 msgstr ""
1300
1303
1301 #, python-format
1304 #, python-format
1302 msgid "cannot find required \"%s\" tool"
1305 msgid "cannot find required \"%s\" tool"
1303 msgstr ""
1306 msgstr ""
1304
1307
1305 #, python-format
1308 #, python-format
1306 msgid "%s error:\n"
1309 msgid "%s error:\n"
1307 msgstr ""
1310 msgstr ""
1308
1311
1309 #, python-format
1312 #, python-format
1310 msgid "syntax error in %s(%d): key/value pair expected"
1313 msgid "syntax error in %s(%d): key/value pair expected"
1311 msgstr ""
1314 msgstr ""
1312
1315
1313 #, python-format
1316 #, python-format
1314 msgid "could not open map file %r: %s"
1317 msgid "could not open map file %r: %s"
1315 msgstr ""
1318 msgstr ""
1316
1319
1317 #, python-format
1320 #, python-format
1318 msgid "%s: missing or unsupported repository"
1321 msgid "%s: missing or unsupported repository"
1319 msgstr ""
1322 msgstr ""
1320
1323
1321 #, python-format
1324 #, python-format
1322 msgid "convert: %s\n"
1325 msgid "convert: %s\n"
1323 msgstr ""
1326 msgstr ""
1324
1327
1325 #, python-format
1328 #, python-format
1326 msgid "%s: unknown repository type"
1329 msgid "%s: unknown repository type"
1327 msgstr ""
1330 msgstr ""
1328
1331
1329 #, python-format
1332 #, python-format
1330 msgid "unknown sort mode: %s"
1333 msgid "unknown sort mode: %s"
1331 msgstr ""
1334 msgstr ""
1332
1335
1333 #, python-format
1336 #, python-format
1334 msgid "cycle detected between %s and %s"
1337 msgid "cycle detected between %s and %s"
1335 msgstr ""
1338 msgstr ""
1336
1339
1337 msgid "not all revisions were sorted"
1340 msgid "not all revisions were sorted"
1338 msgstr ""
1341 msgstr ""
1339
1342
1340 #, python-format
1343 #, python-format
1341 msgid "Writing author map file %s\n"
1344 msgid "Writing author map file %s\n"
1342 msgstr ""
1345 msgstr ""
1343
1346
1344 #, python-format
1347 #, python-format
1345 msgid "Ignoring bad line in author map file %s: %s\n"
1348 msgid "Ignoring bad line in author map file %s: %s\n"
1346 msgstr ""
1349 msgstr ""
1347
1350
1348 #, python-format
1351 #, python-format
1349 msgid "mapping author %s to %s\n"
1352 msgid "mapping author %s to %s\n"
1350 msgstr ""
1353 msgstr ""
1351
1354
1352 #, python-format
1355 #, python-format
1353 msgid "overriding mapping for author %s, was %s, will be %s\n"
1356 msgid "overriding mapping for author %s, was %s, will be %s\n"
1354 msgstr ""
1357 msgstr ""
1355
1358
1356 #, python-format
1359 #, python-format
1357 msgid "spliced in %s as parents of %s\n"
1360 msgid "spliced in %s as parents of %s\n"
1358 msgstr ""
1361 msgstr ""
1359
1362
1360 msgid "scanning source...\n"
1363 msgid "scanning source...\n"
1361 msgstr ""
1364 msgstr ""
1362
1365
1363 msgid "sorting...\n"
1366 msgid "sorting...\n"
1364 msgstr ""
1367 msgstr ""
1365
1368
1366 msgid "converting...\n"
1369 msgid "converting...\n"
1367 msgstr ""
1370 msgstr ""
1368
1371
1369 #, python-format
1372 #, python-format
1370 msgid "source: %s\n"
1373 msgid "source: %s\n"
1371 msgstr ""
1374 msgstr ""
1372
1375
1373 #, python-format
1376 #, python-format
1374 msgid "assuming destination %s\n"
1377 msgid "assuming destination %s\n"
1375 msgstr ""
1378 msgstr ""
1376
1379
1377 msgid "more than one sort mode specified"
1380 msgid "more than one sort mode specified"
1378 msgstr ""
1381 msgstr ""
1379
1382
1380 msgid "--sourcesort is not supported by this data source"
1383 msgid "--sourcesort is not supported by this data source"
1381 msgstr ""
1384 msgstr ""
1382
1385
1383 #, python-format
1386 #, python-format
1384 msgid "revision %s is not a patchset number"
1387 msgid "revision %s is not a patchset number"
1385 msgstr ""
1388 msgstr ""
1386
1389
1387 #, python-format
1390 #, python-format
1388 msgid "connecting to %s\n"
1391 msgid "connecting to %s\n"
1389 msgstr ""
1392 msgstr ""
1390
1393
1391 msgid "CVS pserver authentication failed"
1394 msgid "CVS pserver authentication failed"
1392 msgstr ""
1395 msgstr ""
1393
1396
1394 #, python-format
1397 #, python-format
1395 msgid ""
1398 msgid ""
1396 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1399 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1397 msgstr ""
1400 msgstr ""
1398
1401
1399 #, python-format
1402 #, python-format
1400 msgid "%d bytes missing from remote file"
1403 msgid "%d bytes missing from remote file"
1401 msgstr ""
1404 msgstr ""
1402
1405
1403 #, python-format
1406 #, python-format
1404 msgid "cvs server: %s\n"
1407 msgid "cvs server: %s\n"
1405 msgstr ""
1408 msgstr ""
1406
1409
1407 #, python-format
1410 #, python-format
1408 msgid "unknown CVS response: %s"
1411 msgid "unknown CVS response: %s"
1409 msgstr ""
1412 msgstr ""
1410
1413
1411 msgid "collecting CVS rlog\n"
1414 msgid "collecting CVS rlog\n"
1412 msgstr ""
1415 msgstr ""
1413
1416
1414 #, python-format
1417 #, python-format
1415 msgid "reading cvs log cache %s\n"
1418 msgid "reading cvs log cache %s\n"
1416 msgstr ""
1419 msgstr ""
1417
1420
1418 #, python-format
1421 #, python-format
1419 msgid "cache has %d log entries\n"
1422 msgid "cache has %d log entries\n"
1420 msgstr ""
1423 msgstr ""
1421
1424
1422 #, python-format
1425 #, python-format
1423 msgid "error reading cache: %r\n"
1426 msgid "error reading cache: %r\n"
1424 msgstr ""
1427 msgstr ""
1425
1428
1426 #, python-format
1429 #, python-format
1427 msgid "running %s\n"
1430 msgid "running %s\n"
1428 msgstr ""
1431 msgstr ""
1429
1432
1430 msgid "RCS file must be followed by working file"
1433 msgid "RCS file must be followed by working file"
1431 msgstr ""
1434 msgstr ""
1432
1435
1433 msgid "must have at least some revisions"
1436 msgid "must have at least some revisions"
1434 msgstr ""
1437 msgstr ""
1435
1438
1436 msgid "expected revision number"
1439 msgid "expected revision number"
1437 msgstr ""
1440 msgstr ""
1438
1441
1439 msgid "revision must be followed by date line"
1442 msgid "revision must be followed by date line"
1440 msgstr ""
1443 msgstr ""
1441
1444
1442 #, python-format
1445 #, python-format
1443 msgid "writing cvs log cache %s\n"
1446 msgid "writing cvs log cache %s\n"
1444 msgstr ""
1447 msgstr ""
1445
1448
1446 #, python-format
1449 #, python-format
1447 msgid "%d log entries\n"
1450 msgid "%d log entries\n"
1448 msgstr ""
1451 msgstr ""
1449
1452
1450 msgid "creating changesets\n"
1453 msgid "creating changesets\n"
1451 msgstr ""
1454 msgstr ""
1452
1455
1453 msgid "synthetic changeset cannot have multiple parents"
1456 msgid "synthetic changeset cannot have multiple parents"
1454 msgstr ""
1457 msgstr ""
1455
1458
1456 #, python-format
1459 #, python-format
1457 msgid ""
1460 msgid ""
1458 "warning: CVS commit message references non-existent branch %r:\n"
1461 "warning: CVS commit message references non-existent branch %r:\n"
1459 "%s\n"
1462 "%s\n"
1460 msgstr ""
1463 msgstr ""
1461
1464
1462 #, python-format
1465 #, python-format
1463 msgid "%d changeset entries\n"
1466 msgid "%d changeset entries\n"
1464 msgstr ""
1467 msgstr ""
1465
1468
1466 #, python-format
1469 #, python-format
1467 msgid "darcs version 2.1 or newer needed (found %r)"
1470 msgid "darcs version 2.1 or newer needed (found %r)"
1468 msgstr ""
1471 msgstr ""
1469
1472
1470 msgid "Python ElementTree module is not available"
1473 msgid "Python ElementTree module is not available"
1471 msgstr ""
1474 msgstr ""
1472
1475
1473 msgid "internal calling inconsistency"
1476 msgid "internal calling inconsistency"
1474 msgstr ""
1477 msgstr ""
1475
1478
1476 msgid "errors in filemap"
1479 msgid "errors in filemap"
1477 msgstr ""
1480 msgstr ""
1478
1481
1479 #, python-format
1482 #, python-format
1480 msgid "%s:%d: %r already in %s list\n"
1483 msgid "%s:%d: %r already in %s list\n"
1481 msgstr ""
1484 msgstr ""
1482
1485
1483 #, python-format
1486 #, python-format
1484 msgid "%s:%d: unknown directive %r\n"
1487 msgid "%s:%d: unknown directive %r\n"
1485 msgstr ""
1488 msgstr ""
1486
1489
1487 msgid "source repository doesn't support --filemap"
1490 msgid "source repository doesn't support --filemap"
1488 msgstr ""
1491 msgstr ""
1489
1492
1490 #, python-format
1493 #, python-format
1491 msgid "%s does not look like a GNU Arch repo"
1494 msgid "%s does not look like a GNU Arch repo"
1492 msgstr ""
1495 msgstr ""
1493
1496
1494 msgid "cannot find a GNU Arch tool"
1497 msgid "cannot find a GNU Arch tool"
1495 msgstr ""
1498 msgstr ""
1496
1499
1497 #, python-format
1500 #, python-format
1498 msgid "analyzing tree version %s...\n"
1501 msgid "analyzing tree version %s...\n"
1499 msgstr ""
1502 msgstr ""
1500
1503
1501 #, python-format
1504 #, python-format
1502 msgid ""
1505 msgid ""
1503 "tree analysis stopped because it points to an unregistered archive %s...\n"
1506 "tree analysis stopped because it points to an unregistered archive %s...\n"
1504 msgstr ""
1507 msgstr ""
1505
1508
1506 #, python-format
1509 #, python-format
1507 msgid "could not parse cat-log of %s"
1510 msgid "could not parse cat-log of %s"
1508 msgstr ""
1511 msgstr ""
1509
1512
1510 #, python-format
1513 #, python-format
1511 msgid "%s is not a local Mercurial repo"
1514 msgid "%s is not a local Mercurial repo"
1512 msgstr ""
1515 msgstr ""
1513
1516
1514 #, python-format
1517 #, python-format
1515 msgid "initializing destination %s repository\n"
1518 msgid "initializing destination %s repository\n"
1516 msgstr ""
1519 msgstr ""
1517
1520
1518 #, python-format
1521 #, python-format
1519 msgid "pulling from %s into %s\n"
1522 msgid "pulling from %s into %s\n"
1520 msgstr ""
1523 msgstr ""
1521
1524
1522 msgid "filtering out empty revision\n"
1525 msgid "filtering out empty revision\n"
1523 msgstr ""
1526 msgstr ""
1524
1527
1525 msgid "updating tags\n"
1528 msgid "updating tags\n"
1526 msgstr ""
1529 msgstr ""
1527
1530
1528 #, python-format
1531 #, python-format
1529 msgid "%s is not a valid start revision"
1532 msgid "%s is not a valid start revision"
1530 msgstr ""
1533 msgstr ""
1531
1534
1532 #, python-format
1535 #, python-format
1533 msgid "ignoring: %s\n"
1536 msgid "ignoring: %s\n"
1534 msgstr ""
1537 msgstr ""
1535
1538
1536 #, python-format
1539 #, python-format
1537 msgid "%s does not look like a monotone repo"
1540 msgid "%s does not look like a monotone repo"
1538 msgstr ""
1541 msgstr ""
1539
1542
1540 #, python-format
1543 #, python-format
1541 msgid "copying file in renamed directory from '%s' to '%s'"
1544 msgid "copying file in renamed directory from '%s' to '%s'"
1542 msgstr ""
1545 msgstr ""
1543
1546
1544 msgid "reading p4 views\n"
1547 msgid "reading p4 views\n"
1545 msgstr ""
1548 msgstr ""
1546
1549
1547 msgid "collecting p4 changelists\n"
1550 msgid "collecting p4 changelists\n"
1548 msgstr ""
1551 msgstr ""
1549
1552
1550 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1553 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1551 msgstr ""
1554 msgstr ""
1552
1555
1553 msgid "Subversion python bindings could not be loaded"
1556 msgid "Subversion python bindings could not be loaded"
1554 msgstr ""
1557 msgstr ""
1555
1558
1556 #, python-format
1559 #, python-format
1557 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1560 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1558 msgstr ""
1561 msgstr ""
1559
1562
1560 msgid "Subversion python bindings are too old, 1.4 or later required"
1563 msgid "Subversion python bindings are too old, 1.4 or later required"
1561 msgstr ""
1564 msgstr ""
1562
1565
1563 #, python-format
1566 #, python-format
1564 msgid "svn: revision %s is not an integer"
1567 msgid "svn: revision %s is not an integer"
1565 msgstr ""
1568 msgstr ""
1566
1569
1567 #, python-format
1570 #, python-format
1568 msgid "svn: start revision %s is not an integer"
1571 msgid "svn: start revision %s is not an integer"
1569 msgstr ""
1572 msgstr ""
1570
1573
1571 #, python-format
1574 #, python-format
1572 msgid "no revision found in module %s"
1575 msgid "no revision found in module %s"
1573 msgstr ""
1576 msgstr ""
1574
1577
1575 #, python-format
1578 #, python-format
1576 msgid "expected %s to be at %r, but not found"
1579 msgid "expected %s to be at %r, but not found"
1577 msgstr ""
1580 msgstr ""
1578
1581
1579 #, python-format
1582 #, python-format
1580 msgid "found %s at %r\n"
1583 msgid "found %s at %r\n"
1581 msgstr ""
1584 msgstr ""
1582
1585
1583 #, python-format
1586 #, python-format
1584 msgid "ignoring empty branch %s\n"
1587 msgid "ignoring empty branch %s\n"
1585 msgstr ""
1588 msgstr ""
1586
1589
1587 #, python-format
1590 #, python-format
1588 msgid "found branch %s at %d\n"
1591 msgid "found branch %s at %d\n"
1589 msgstr ""
1592 msgstr ""
1590
1593
1591 msgid "svn: start revision is not supported with more than one branch"
1594 msgid "svn: start revision is not supported with more than one branch"
1592 msgstr ""
1595 msgstr ""
1593
1596
1594 #, python-format
1597 #, python-format
1595 msgid "svn: no revision found after start revision %d"
1598 msgid "svn: no revision found after start revision %d"
1596 msgstr ""
1599 msgstr ""
1597
1600
1598 #, python-format
1601 #, python-format
1599 msgid "no tags found at revision %d\n"
1602 msgid "no tags found at revision %d\n"
1600 msgstr ""
1603 msgstr ""
1601
1604
1602 #, python-format
1605 #, python-format
1603 msgid "%s not found up to revision %d"
1606 msgid "%s not found up to revision %d"
1604 msgstr ""
1607 msgstr ""
1605
1608
1606 #, python-format
1609 #, python-format
1607 msgid "found parent of branch %s at %d: %s\n"
1610 msgid "found parent of branch %s at %d: %s\n"
1608 msgstr ""
1611 msgstr ""
1609
1612
1610 #, python-format
1613 #, python-format
1611 msgid "fetching revision log for \"%s\" from %d to %d\n"
1614 msgid "fetching revision log for \"%s\" from %d to %d\n"
1612 msgstr ""
1615 msgstr ""
1613
1616
1614 #, python-format
1617 #, python-format
1615 msgid "svn: branch has no revision %s"
1618 msgid "svn: branch has no revision %s"
1616 msgstr ""
1619 msgstr ""
1617
1620
1618 #, python-format
1621 #, python-format
1619 msgid "initializing svn repo %r\n"
1622 msgid "initializing svn repo %r\n"
1620 msgstr ""
1623 msgstr ""
1621
1624
1622 #, python-format
1625 #, python-format
1623 msgid "initializing svn wc %r\n"
1626 msgid "initializing svn wc %r\n"
1624 msgstr ""
1627 msgstr ""
1625
1628
1626 msgid "unexpected svn output:\n"
1629 msgid "unexpected svn output:\n"
1627 msgstr ""
1630 msgstr ""
1628
1631
1629 msgid "unable to cope with svn output"
1632 msgid "unable to cope with svn output"
1630 msgstr ""
1633 msgstr ""
1631
1634
1632 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1635 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1633 msgstr ""
1636 msgstr ""
1634
1637
1635 msgid ""
1638 msgid ""
1636 "command to allow external programs to compare revisions\n"
1639 "command to allow external programs to compare revisions\n"
1637 "\n"
1640 "\n"
1638 "The extdiff Mercurial extension allows you to use external programs\n"
1641 "The extdiff Mercurial extension allows you to use external programs\n"
1639 "to compare revisions, or revision with working directory. The external\n"
1642 "to compare revisions, or revision with working directory. The external\n"
1640 "diff programs are called with a configurable set of options and two\n"
1643 "diff programs are called with a configurable set of options and two\n"
1641 "non-option arguments: paths to directories containing snapshots of\n"
1644 "non-option arguments: paths to directories containing snapshots of\n"
1642 "files to compare.\n"
1645 "files to compare.\n"
1643 "\n"
1646 "\n"
1644 "The extdiff extension also allows to configure new diff commands, so\n"
1647 "The extdiff extension also allows to configure new diff commands, so\n"
1645 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1648 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1646 "\n"
1649 "\n"
1647 " [extdiff]\n"
1650 " [extdiff]\n"
1648 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1651 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1649 " cdiff = gdiff -Nprc5\n"
1652 " cdiff = gdiff -Nprc5\n"
1650 " ## or the old way:\n"
1653 " ## or the old way:\n"
1651 " #cmd.cdiff = gdiff\n"
1654 " #cmd.cdiff = gdiff\n"
1652 " #opts.cdiff = -Nprc5\n"
1655 " #opts.cdiff = -Nprc5\n"
1653 "\n"
1656 "\n"
1654 " # add new command called vdiff, runs kdiff3\n"
1657 " # add new command called vdiff, runs kdiff3\n"
1655 " vdiff = kdiff3\n"
1658 " vdiff = kdiff3\n"
1656 "\n"
1659 "\n"
1657 " # add new command called meld, runs meld (no need to name twice)\n"
1660 " # add new command called meld, runs meld (no need to name twice)\n"
1658 " meld =\n"
1661 " meld =\n"
1659 "\n"
1662 "\n"
1660 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1663 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1661 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1664 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1662 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1665 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1663 " # your .vimrc\n"
1666 " # your .vimrc\n"
1664 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1667 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1665 "\n"
1668 "\n"
1666 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1669 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1667 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1670 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1668 "files, so running the external diff program will actually be pretty\n"
1671 "files, so running the external diff program will actually be pretty\n"
1669 "fast (at least faster than having to compare the entire tree).\n"
1672 "fast (at least faster than having to compare the entire tree).\n"
1670 msgstr ""
1673 msgstr ""
1671
1674
1672 #, python-format
1675 #, python-format
1673 msgid "making snapshot of %d files from rev %s\n"
1676 msgid "making snapshot of %d files from rev %s\n"
1674 msgstr ""
1677 msgstr ""
1675
1678
1676 #, python-format
1679 #, python-format
1677 msgid "making snapshot of %d files from working directory\n"
1680 msgid "making snapshot of %d files from working directory\n"
1678 msgstr ""
1681 msgstr ""
1679
1682
1680 msgid "cannot specify --rev and --change at the same time"
1683 msgid "cannot specify --rev and --change at the same time"
1681 msgstr ""
1684 msgstr ""
1682
1685
1683 msgid "cleaning up temp directory\n"
1686 msgid "cleaning up temp directory\n"
1684 msgstr ""
1687 msgstr ""
1685
1688
1686 msgid ""
1689 msgid ""
1687 "use external program to diff repository (or selected files)\n"
1690 "use external program to diff repository (or selected files)\n"
1688 "\n"
1691 "\n"
1689 " Show differences between revisions for the specified files, using\n"
1692 " Show differences between revisions for the specified files, using\n"
1690 " an external program. The default program used is diff, with\n"
1693 " an external program. The default program used is diff, with\n"
1691 " default options \"-Npru\".\n"
1694 " default options \"-Npru\".\n"
1692 "\n"
1695 "\n"
1693 " To select a different program, use the -p/--program option. The\n"
1696 " To select a different program, use the -p/--program option. The\n"
1694 " program will be passed the names of two directories to compare. To\n"
1697 " program will be passed the names of two directories to compare. To\n"
1695 " pass additional options to the program, use -o/--option. These\n"
1698 " pass additional options to the program, use -o/--option. These\n"
1696 " will be passed before the names of the directories to compare.\n"
1699 " will be passed before the names of the directories to compare.\n"
1697 "\n"
1700 "\n"
1698 " When two revision arguments are given, then changes are shown\n"
1701 " When two revision arguments are given, then changes are shown\n"
1699 " between those revisions. If only one revision is specified then\n"
1702 " between those revisions. If only one revision is specified then\n"
1700 " that revision is compared to the working directory, and, when no\n"
1703 " that revision is compared to the working directory, and, when no\n"
1701 " revisions are specified, the working directory files are compared\n"
1704 " revisions are specified, the working directory files are compared\n"
1702 " to its parent."
1705 " to its parent."
1703 msgstr ""
1706 msgstr ""
1704
1707
1705 msgid "comparison program to run"
1708 msgid "comparison program to run"
1706 msgstr ""
1709 msgstr ""
1707
1710
1708 msgid "pass option to comparison program"
1711 msgid "pass option to comparison program"
1709 msgstr ""
1712 msgstr ""
1710
1713
1711 msgid "change made by revision"
1714 msgid "change made by revision"
1712 msgstr "ändring gjord av revision"
1715 msgstr "ändring gjord av revision"
1713
1716
1714 msgid "hg extdiff [OPT]... [FILE]..."
1717 msgid "hg extdiff [OPT]... [FILE]..."
1715 msgstr ""
1718 msgstr ""
1716
1719
1717 #, python-format
1720 #, python-format
1718 msgid ""
1721 msgid ""
1719 "use %(path)s to diff repository (or selected files)\n"
1722 "use %(path)s to diff repository (or selected files)\n"
1720 "\n"
1723 "\n"
1721 " Show differences between revisions for the specified files, using the\n"
1724 " Show differences between revisions for the specified files, using the\n"
1722 " %(path)s program.\n"
1725 " %(path)s program.\n"
1723 "\n"
1726 "\n"
1724 " When two revision arguments are given, then changes are shown between\n"
1727 " When two revision arguments are given, then changes are shown between\n"
1725 " those revisions. If only one revision is specified then that revision "
1728 " those revisions. If only one revision is specified then that revision "
1726 "is\n"
1729 "is\n"
1727 " compared to the working directory, and, when no revisions are "
1730 " compared to the working directory, and, when no revisions are "
1728 "specified,\n"
1731 "specified,\n"
1729 " the working directory files are compared to its parent."
1732 " the working directory files are compared to its parent."
1730 msgstr ""
1733 msgstr ""
1731
1734
1732 #, python-format
1735 #, python-format
1733 msgid "hg %s [OPTION]... [FILE]..."
1736 msgid "hg %s [OPTION]... [FILE]..."
1734 msgstr ""
1737 msgstr ""
1735
1738
1736 msgid "pull, update and merge in one command"
1739 msgid "pull, update and merge in one command"
1737 msgstr ""
1740 msgstr ""
1738
1741
1739 msgid ""
1742 msgid ""
1740 "pull changes from a remote repository, merge new changes if needed.\n"
1743 "pull changes from a remote repository, merge new changes if needed.\n"
1741 "\n"
1744 "\n"
1742 " This finds all changes from the repository at the specified path\n"
1745 " This finds all changes from the repository at the specified path\n"
1743 " or URL and adds them to the local repository.\n"
1746 " or URL and adds them to the local repository.\n"
1744 "\n"
1747 "\n"
1745 " If the pulled changes add a new branch head, the head is\n"
1748 " If the pulled changes add a new branch head, the head is\n"
1746 " automatically merged, and the result of the merge is committed.\n"
1749 " automatically merged, and the result of the merge is committed.\n"
1747 " Otherwise, the working directory is updated to include the new\n"
1750 " Otherwise, the working directory is updated to include the new\n"
1748 " changes.\n"
1751 " changes.\n"
1749 "\n"
1752 "\n"
1750 " When a merge occurs, the newly pulled changes are assumed to be\n"
1753 " When a merge occurs, the newly pulled changes are assumed to be\n"
1751 " \"authoritative\". The head of the new changes is used as the first\n"
1754 " \"authoritative\". The head of the new changes is used as the first\n"
1752 " parent, with local changes as the second. To switch the merge\n"
1755 " parent, with local changes as the second. To switch the merge\n"
1753 " order, use --switch-parent.\n"
1756 " order, use --switch-parent.\n"
1754 "\n"
1757 "\n"
1755 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1758 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1756 " "
1759 " "
1757 msgstr ""
1760 msgstr ""
1758
1761
1759 msgid ""
1762 msgid ""
1760 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1763 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1761 msgstr ""
1764 msgstr ""
1762
1765
1763 msgid "outstanding uncommitted merge"
1766 msgid "outstanding uncommitted merge"
1764 msgstr ""
1767 msgstr ""
1765
1768
1766 msgid "outstanding uncommitted changes"
1769 msgid "outstanding uncommitted changes"
1767 msgstr ""
1770 msgstr ""
1768
1771
1769 msgid "working directory is missing some files"
1772 msgid "working directory is missing some files"
1770 msgstr ""
1773 msgstr ""
1771
1774
1772 msgid ""
1775 msgid ""
1773 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1776 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1774 msgstr ""
1777 msgstr ""
1775
1778
1776 #, python-format
1779 #, python-format
1777 msgid "pulling from %s\n"
1780 msgid "pulling from %s\n"
1778 msgstr ""
1781 msgstr ""
1779
1782
1780 msgid ""
1783 msgid ""
1781 "Other repository doesn't support revision lookup, so a rev cannot be "
1784 "Other repository doesn't support revision lookup, so a rev cannot be "
1782 "specified."
1785 "specified."
1783 msgstr ""
1786 msgstr ""
1784
1787
1785 #, python-format
1788 #, python-format
1786 msgid ""
1789 msgid ""
1787 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1790 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1788 "\" to merge them)\n"
1791 "\" to merge them)\n"
1789 msgstr ""
1792 msgstr ""
1790
1793
1791 #, python-format
1794 #, python-format
1792 msgid "updating to %d:%s\n"
1795 msgid "updating to %d:%s\n"
1793 msgstr ""
1796 msgstr ""
1794
1797
1795 #, python-format
1798 #, python-format
1796 msgid "merging with %d:%s\n"
1799 msgid "merging with %d:%s\n"
1797 msgstr ""
1800 msgstr ""
1798
1801
1799 #, python-format
1802 #, python-format
1800 msgid "new changeset %d:%s merges remote changes with local\n"
1803 msgid "new changeset %d:%s merges remote changes with local\n"
1801 msgstr ""
1804 msgstr ""
1802
1805
1803 msgid "a specific revision you would like to pull"
1806 msgid "a specific revision you would like to pull"
1804 msgstr ""
1807 msgstr ""
1805
1808
1806 msgid "edit commit message"
1809 msgid "edit commit message"
1807 msgstr ""
1810 msgstr ""
1808
1811
1809 msgid "edit commit message (DEPRECATED)"
1812 msgid "edit commit message (DEPRECATED)"
1810 msgstr ""
1813 msgstr ""
1811
1814
1812 msgid "switch parents when merging"
1815 msgid "switch parents when merging"
1813 msgstr ""
1816 msgstr ""
1814
1817
1815 msgid "hg fetch [SOURCE]"
1818 msgid "hg fetch [SOURCE]"
1816 msgstr ""
1819 msgstr ""
1817
1820
1818 msgid "commands to sign and verify changesets"
1821 msgid "commands to sign and verify changesets"
1819 msgstr ""
1822 msgstr ""
1820
1823
1821 msgid "error while verifying signature"
1824 msgid "error while verifying signature"
1822 msgstr ""
1825 msgstr ""
1823
1826
1824 #, python-format
1827 #, python-format
1825 msgid "%s Bad signature from \"%s\"\n"
1828 msgid "%s Bad signature from \"%s\"\n"
1826 msgstr ""
1829 msgstr ""
1827
1830
1828 #, python-format
1831 #, python-format
1829 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1832 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1830 msgstr ""
1833 msgstr ""
1831
1834
1832 #, python-format
1835 #, python-format
1833 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1836 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1834 msgstr ""
1837 msgstr ""
1835
1838
1836 msgid "list signed changesets"
1839 msgid "list signed changesets"
1837 msgstr ""
1840 msgstr ""
1838
1841
1839 #, python-format
1842 #, python-format
1840 msgid "%s:%d node does not exist\n"
1843 msgid "%s:%d node does not exist\n"
1841 msgstr ""
1844 msgstr ""
1842
1845
1843 msgid "verify all the signatures there may be for a particular revision"
1846 msgid "verify all the signatures there may be for a particular revision"
1844 msgstr ""
1847 msgstr ""
1845
1848
1846 #, python-format
1849 #, python-format
1847 msgid "No valid signature for %s\n"
1850 msgid "No valid signature for %s\n"
1848 msgstr ""
1851 msgstr ""
1849
1852
1850 msgid ""
1853 msgid ""
1851 "add a signature for the current or given revision\n"
1854 "add a signature for the current or given revision\n"
1852 "\n"
1855 "\n"
1853 " If no revision is given, the parent of the working directory is used,\n"
1856 " If no revision is given, the parent of the working directory is used,\n"
1854 " or tip if no revision is checked out.\n"
1857 " or tip if no revision is checked out.\n"
1855 "\n"
1858 "\n"
1856 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1859 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1857 " "
1860 " "
1858 msgstr ""
1861 msgstr ""
1859
1862
1860 msgid "uncommitted merge - please provide a specific revision"
1863 msgid "uncommitted merge - please provide a specific revision"
1861 msgstr ""
1864 msgstr ""
1862
1865
1863 msgid "Error while signing"
1866 msgid "Error while signing"
1864 msgstr ""
1867 msgstr ""
1865
1868
1866 msgid ""
1869 msgid ""
1867 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1870 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1868 "force)"
1871 "force)"
1869 msgstr ""
1872 msgstr ""
1870
1873
1871 msgid "unknown signature version"
1874 msgid "unknown signature version"
1872 msgstr ""
1875 msgstr ""
1873
1876
1874 msgid "make the signature local"
1877 msgid "make the signature local"
1875 msgstr ""
1878 msgstr ""
1876
1879
1877 msgid "sign even if the sigfile is modified"
1880 msgid "sign even if the sigfile is modified"
1878 msgstr ""
1881 msgstr ""
1879
1882
1880 msgid "do not commit the sigfile after signing"
1883 msgid "do not commit the sigfile after signing"
1881 msgstr ""
1884 msgstr ""
1882
1885
1883 msgid "the key id to sign with"
1886 msgid "the key id to sign with"
1884 msgstr ""
1887 msgstr ""
1885
1888
1886 msgid "commit message"
1889 msgid "commit message"
1887 msgstr ""
1890 msgstr ""
1888
1891
1889 msgid "hg sign [OPTION]... [REVISION]..."
1892 msgid "hg sign [OPTION]... [REVISION]..."
1890 msgstr ""
1893 msgstr ""
1891
1894
1892 msgid "hg sigcheck REVISION"
1895 msgid "hg sigcheck REVISION"
1893 msgstr ""
1896 msgstr ""
1894
1897
1895 msgid "hg sigs"
1898 msgid "hg sigs"
1896 msgstr ""
1899 msgstr ""
1897
1900
1898 msgid ""
1901 msgid ""
1899 "command to view revision graphs from a shell\n"
1902 "command to view revision graphs from a shell\n"
1900 "\n"
1903 "\n"
1901 "This extension adds a --graph option to the incoming, outgoing and log\n"
1904 "This extension adds a --graph option to the incoming, outgoing and log\n"
1902 "commands. When this options is given, an ASCII representation of the\n"
1905 "commands. When this options is given, an ASCII representation of the\n"
1903 "revision graph is also shown.\n"
1906 "revision graph is also shown.\n"
1904 msgstr ""
1907 msgstr ""
1905
1908
1906 #, python-format
1909 #, python-format
1907 msgid "--graph option is incompatible with --%s"
1910 msgid "--graph option is incompatible with --%s"
1908 msgstr ""
1911 msgstr ""
1909
1912
1910 msgid ""
1913 msgid ""
1911 "show revision history alongside an ASCII revision graph\n"
1914 "show revision history alongside an ASCII revision graph\n"
1912 "\n"
1915 "\n"
1913 " Print a revision history alongside a revision graph drawn with\n"
1916 " Print a revision history alongside a revision graph drawn with\n"
1914 " ASCII characters.\n"
1917 " ASCII characters.\n"
1915 "\n"
1918 "\n"
1916 " Nodes printed as an @ character are parents of the working\n"
1919 " Nodes printed as an @ character are parents of the working\n"
1917 " directory.\n"
1920 " directory.\n"
1918 " "
1921 " "
1919 msgstr ""
1922 msgstr ""
1920
1923
1921 #, python-format
1924 #, python-format
1922 msgid "comparing with %s\n"
1925 msgid "comparing with %s\n"
1923 msgstr ""
1926 msgstr "jämför med %s\n"
1924
1927
1925 msgid "no changes found\n"
1928 msgid "no changes found\n"
1926 msgstr ""
1929 msgstr "inga ändringar hittades\n"
1927
1930
1928 msgid "show the revision DAG"
1931 msgid "show the revision DAG"
1929 msgstr ""
1932 msgstr ""
1930
1933
1931 msgid "limit number of changes displayed"
1934 msgid "limit number of changes displayed"
1932 msgstr "begränsa antalet visade ändringar"
1935 msgstr "begränsa antalet visade ändringar"
1933
1936
1934 msgid "show patch"
1937 msgid "show patch"
1935 msgstr "visa patch"
1938 msgstr "visa patch"
1936
1939
1937 msgid "show the specified revision or range"
1940 msgid "show the specified revision or range"
1938 msgstr "visa den specifika revisionen eller serien"
1941 msgstr "visa den specifika revisionen eller serien"
1939
1942
1940 msgid "hg glog [OPTION]... [FILE]"
1943 msgid "hg glog [OPTION]... [FILE]"
1941 msgstr ""
1944 msgstr ""
1942
1945
1943 msgid ""
1946 msgid ""
1944 "hooks for integrating with the CIA.vc notification service\n"
1947 "hooks for integrating with the CIA.vc notification service\n"
1945 "\n"
1948 "\n"
1946 "This is meant to be run as a changegroup or incoming hook. To\n"
1949 "This is meant to be run as a changegroup or incoming hook. To\n"
1947 "configure it, set the following options in your hgrc::\n"
1950 "configure it, set the following options in your hgrc::\n"
1948 "\n"
1951 "\n"
1949 " [cia]\n"
1952 " [cia]\n"
1950 " # your registered CIA user name\n"
1953 " # your registered CIA user name\n"
1951 " user = foo\n"
1954 " user = foo\n"
1952 " # the name of the project in CIA\n"
1955 " # the name of the project in CIA\n"
1953 " project = foo\n"
1956 " project = foo\n"
1954 " # the module (subproject) (optional)\n"
1957 " # the module (subproject) (optional)\n"
1955 " #module = foo\n"
1958 " #module = foo\n"
1956 " # Append a diffstat to the log message (optional)\n"
1959 " # Append a diffstat to the log message (optional)\n"
1957 " #diffstat = False\n"
1960 " #diffstat = False\n"
1958 " # Template to use for log messages (optional)\n"
1961 " # Template to use for log messages (optional)\n"
1959 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1962 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1960 " # Style to use (optional)\n"
1963 " # Style to use (optional)\n"
1961 " #style = foo\n"
1964 " #style = foo\n"
1962 " # The URL of the CIA notification service (optional)\n"
1965 " # The URL of the CIA notification service (optional)\n"
1963 " # You can use mailto: URLs to send by email, eg\n"
1966 " # You can use mailto: URLs to send by email, eg\n"
1964 " # mailto:cia@cia.vc\n"
1967 " # mailto:cia@cia.vc\n"
1965 " # Make sure to set email.from if you do this.\n"
1968 " # Make sure to set email.from if you do this.\n"
1966 " #url = http://cia.vc/\n"
1969 " #url = http://cia.vc/\n"
1967 " # print message instead of sending it (optional)\n"
1970 " # print message instead of sending it (optional)\n"
1968 " #test = False\n"
1971 " #test = False\n"
1969 "\n"
1972 "\n"
1970 " [hooks]\n"
1973 " [hooks]\n"
1971 " # one of these:\n"
1974 " # one of these:\n"
1972 " changegroup.cia = python:hgcia.hook\n"
1975 " changegroup.cia = python:hgcia.hook\n"
1973 " #incoming.cia = python:hgcia.hook\n"
1976 " #incoming.cia = python:hgcia.hook\n"
1974 "\n"
1977 "\n"
1975 " [web]\n"
1978 " [web]\n"
1976 " # If you want hyperlinks (optional)\n"
1979 " # If you want hyperlinks (optional)\n"
1977 " baseurl = http://server/path/to/repo\n"
1980 " baseurl = http://server/path/to/repo\n"
1978 msgstr ""
1981 msgstr ""
1979
1982
1980 #, python-format
1983 #, python-format
1981 msgid "hgcia: sending update to %s\n"
1984 msgid "hgcia: sending update to %s\n"
1982 msgstr ""
1985 msgstr ""
1983
1986
1984 msgid "email.from must be defined when sending by email"
1987 msgid "email.from must be defined when sending by email"
1985 msgstr ""
1988 msgstr ""
1986
1989
1987 msgid ""
1990 msgid ""
1988 "browse the repository in a graphical way\n"
1991 "browse the repository in a graphical way\n"
1989 "\n"
1992 "\n"
1990 "The hgk extension allows browsing the history of a repository in a\n"
1993 "The hgk extension allows browsing the history of a repository in a\n"
1991 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1994 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1992 "distributed with Mercurial.)\n"
1995 "distributed with Mercurial.)\n"
1993 "\n"
1996 "\n"
1994 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1997 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1995 "querying of information, and an extension to Mercurial named hgk.py,\n"
1998 "querying of information, and an extension to Mercurial named hgk.py,\n"
1996 "which provides hooks for hgk to get information. hgk can be found in\n"
1999 "which provides hooks for hgk to get information. hgk can be found in\n"
1997 "the contrib directory, and the extension is shipped in the hgext\n"
2000 "the contrib directory, and the extension is shipped in the hgext\n"
1998 "repository, and needs to be enabled.\n"
2001 "repository, and needs to be enabled.\n"
1999 "\n"
2002 "\n"
2000 "The hg view command will launch the hgk Tcl script. For this command\n"
2003 "The hg view command will launch the hgk Tcl script. For this command\n"
2001 "to work, hgk must be in your search path. Alternately, you can specify\n"
2004 "to work, hgk must be in your search path. Alternately, you can specify\n"
2002 "the path to hgk in your .hgrc file::\n"
2005 "the path to hgk in your .hgrc file::\n"
2003 "\n"
2006 "\n"
2004 " [hgk]\n"
2007 " [hgk]\n"
2005 " path=/location/of/hgk\n"
2008 " path=/location/of/hgk\n"
2006 "\n"
2009 "\n"
2007 "hgk can make use of the extdiff extension to visualize revisions.\n"
2010 "hgk can make use of the extdiff extension to visualize revisions.\n"
2008 "Assuming you had already configured extdiff vdiff command, just add::\n"
2011 "Assuming you had already configured extdiff vdiff command, just add::\n"
2009 "\n"
2012 "\n"
2010 " [hgk]\n"
2013 " [hgk]\n"
2011 " vdiff=vdiff\n"
2014 " vdiff=vdiff\n"
2012 "\n"
2015 "\n"
2013 "Revisions context menu will now display additional entries to fire\n"
2016 "Revisions context menu will now display additional entries to fire\n"
2014 "vdiff on hovered and selected revisions.\n"
2017 "vdiff on hovered and selected revisions.\n"
2015 msgstr ""
2018 msgstr ""
2016
2019
2017 msgid "diff trees from two commits"
2020 msgid "diff trees from two commits"
2018 msgstr ""
2021 msgstr ""
2019
2022
2020 msgid "output common ancestor information"
2023 msgid "output common ancestor information"
2021 msgstr ""
2024 msgstr ""
2022
2025
2023 msgid "cat a specific revision"
2026 msgid "cat a specific revision"
2024 msgstr ""
2027 msgstr ""
2025
2028
2026 msgid "cat-file: type or revision not supplied\n"
2029 msgid "cat-file: type or revision not supplied\n"
2027 msgstr ""
2030 msgstr ""
2028
2031
2029 msgid "aborting hg cat-file only understands commits\n"
2032 msgid "aborting hg cat-file only understands commits\n"
2030 msgstr ""
2033 msgstr ""
2031
2034
2032 msgid "parse given revisions"
2035 msgid "parse given revisions"
2033 msgstr ""
2036 msgstr ""
2034
2037
2035 msgid "print revisions"
2038 msgid "print revisions"
2036 msgstr ""
2039 msgstr ""
2037
2040
2038 msgid "print extension options"
2041 msgid "print extension options"
2039 msgstr ""
2042 msgstr ""
2040
2043
2041 msgid "start interactive history viewer"
2044 msgid "start interactive history viewer"
2042 msgstr ""
2045 msgstr ""
2043
2046
2044 msgid "hg view [-l LIMIT] [REVRANGE]"
2047 msgid "hg view [-l LIMIT] [REVRANGE]"
2045 msgstr ""
2048 msgstr ""
2046
2049
2047 msgid "generate patch"
2050 msgid "generate patch"
2048 msgstr ""
2051 msgstr ""
2049
2052
2050 msgid "recursive"
2053 msgid "recursive"
2051 msgstr ""
2054 msgstr ""
2052
2055
2053 msgid "pretty"
2056 msgid "pretty"
2054 msgstr ""
2057 msgstr ""
2055
2058
2056 msgid "stdin"
2059 msgid "stdin"
2057 msgstr ""
2060 msgstr ""
2058
2061
2059 msgid "detect copies"
2062 msgid "detect copies"
2060 msgstr ""
2063 msgstr ""
2061
2064
2062 msgid "search"
2065 msgid "search"
2063 msgstr ""
2066 msgstr ""
2064
2067
2065 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2068 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2066 msgstr ""
2069 msgstr ""
2067
2070
2068 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2071 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2069 msgstr ""
2072 msgstr ""
2070
2073
2071 msgid "hg debug-config"
2074 msgid "hg debug-config"
2072 msgstr ""
2075 msgstr ""
2073
2076
2074 msgid "hg debug-merge-base REV REV"
2077 msgid "hg debug-merge-base REV REV"
2075 msgstr ""
2078 msgstr ""
2076
2079
2077 msgid "ignored"
2080 msgid "ignored"
2078 msgstr ""
2081 msgstr ""
2079
2082
2080 msgid "hg debug-rev-parse REV"
2083 msgid "hg debug-rev-parse REV"
2081 msgstr ""
2084 msgstr ""
2082
2085
2083 msgid "header"
2086 msgid "header"
2084 msgstr ""
2087 msgstr ""
2085
2088
2086 msgid "topo-order"
2089 msgid "topo-order"
2087 msgstr ""
2090 msgstr ""
2088
2091
2089 msgid "parents"
2092 msgid "parents"
2090 msgstr ""
2093 msgstr ""
2091
2094
2092 msgid "max-count"
2095 msgid "max-count"
2093 msgstr ""
2096 msgstr ""
2094
2097
2095 msgid "hg debug-rev-list [OPTION]... REV..."
2098 msgid "hg debug-rev-list [OPTION]... REV..."
2096 msgstr ""
2099 msgstr ""
2097
2100
2098 msgid ""
2101 msgid ""
2099 "syntax highlighting for hgweb (requires Pygments)\n"
2102 "syntax highlighting for hgweb (requires Pygments)\n"
2100 "\n"
2103 "\n"
2101 "It depends on the Pygments syntax highlighting library:\n"
2104 "It depends on the Pygments syntax highlighting library:\n"
2102 "http://pygments.org/\n"
2105 "http://pygments.org/\n"
2103 "\n"
2106 "\n"
2104 "There is a single configuration option::\n"
2107 "There is a single configuration option::\n"
2105 "\n"
2108 "\n"
2106 " [web]\n"
2109 " [web]\n"
2107 " pygments_style = <style>\n"
2110 " pygments_style = <style>\n"
2108 "\n"
2111 "\n"
2109 "The default is 'colorful'.\n"
2112 "The default is 'colorful'.\n"
2110 msgstr ""
2113 msgstr ""
2111
2114
2112 msgid "accelerate status report using Linux's inotify service"
2115 msgid "accelerate status report using Linux's inotify service"
2113 msgstr ""
2116 msgstr ""
2114
2117
2115 msgid "start an inotify server for this repository"
2118 msgid "start an inotify server for this repository"
2116 msgstr ""
2119 msgstr ""
2117
2120
2118 msgid ""
2121 msgid ""
2119 "debugging information for inotify extension\n"
2122 "debugging information for inotify extension\n"
2120 "\n"
2123 "\n"
2121 " Prints the list of directories being watched by the inotify server.\n"
2124 " Prints the list of directories being watched by the inotify server.\n"
2122 " "
2125 " "
2123 msgstr ""
2126 msgstr ""
2124
2127
2125 msgid "directories being watched:\n"
2128 msgid "directories being watched:\n"
2126 msgstr ""
2129 msgstr ""
2127
2130
2128 msgid "run server in background"
2131 msgid "run server in background"
2129 msgstr "kör servern i bakgrunden"
2132 msgstr "kör servern i bakgrunden"
2130
2133
2131 msgid "used internally by daemon mode"
2134 msgid "used internally by daemon mode"
2132 msgstr "används internt av daemon-läget"
2135 msgstr "används internt av daemon-läget"
2133
2136
2134 msgid "minutes to sit idle before exiting"
2137 msgid "minutes to sit idle before exiting"
2135 msgstr ""
2138 msgstr ""
2136
2139
2137 msgid "name of file to write process ID to"
2140 msgid "name of file to write process ID to"
2138 msgstr "filnamn att skriva process-ID till"
2141 msgstr "filnamn att skriva process-ID till"
2139
2142
2140 msgid "hg inserve [OPTION]..."
2143 msgid "hg inserve [OPTION]..."
2141 msgstr ""
2144 msgstr ""
2142
2145
2143 msgid "(found dead inotify server socket; removing it)\n"
2146 msgid "(found dead inotify server socket; removing it)\n"
2144 msgstr ""
2147 msgstr ""
2145
2148
2146 #, python-format
2149 #, python-format
2147 msgid "could not start inotify server: %s\n"
2150 msgid "could not start inotify server: %s\n"
2148 msgstr ""
2151 msgstr ""
2149
2152
2150 #, python-format
2153 #, python-format
2151 msgid "could not talk to new inotify server: %s\n"
2154 msgid "could not talk to new inotify server: %s\n"
2152 msgstr ""
2155 msgstr ""
2153
2156
2154 #, python-format
2157 #, python-format
2155 msgid "failed to contact inotify server: %s\n"
2158 msgid "failed to contact inotify server: %s\n"
2156 msgstr ""
2159 msgstr ""
2157
2160
2158 msgid "received empty answer from inotify server"
2161 msgid "received empty answer from inotify server"
2159 msgstr ""
2162 msgstr ""
2160
2163
2161 #, python-format
2164 #, python-format
2162 msgid "(inotify: received response from incompatible server version %d)\n"
2165 msgid "(inotify: received response from incompatible server version %d)\n"
2163 msgstr ""
2166 msgstr ""
2164
2167
2165 #, python-format
2168 #, python-format
2166 msgid "(inotify: received '%s' response when expecting '%s')\n"
2169 msgid "(inotify: received '%s' response when expecting '%s')\n"
2167 msgstr ""
2170 msgstr ""
2168
2171
2169 msgid "this system does not seem to support inotify"
2172 msgid "this system does not seem to support inotify"
2170 msgstr ""
2173 msgstr ""
2171
2174
2172 #, python-format
2175 #, python-format
2173 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2176 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2174 msgstr ""
2177 msgstr ""
2175
2178
2176 msgid "*** this limit is too low to watch every directory in this repository\n"
2179 msgid "*** this limit is too low to watch every directory in this repository\n"
2177 msgstr ""
2180 msgstr ""
2178
2181
2179 msgid "*** counting directories: "
2182 msgid "*** counting directories: "
2180 msgstr ""
2183 msgstr ""
2181
2184
2182 #, python-format
2185 #, python-format
2183 msgid "found %d\n"
2186 msgid "found %d\n"
2184 msgstr ""
2187 msgstr ""
2185
2188
2186 #, python-format
2189 #, python-format
2187 msgid "*** to raise the limit from %d to %d (run as root):\n"
2190 msgid "*** to raise the limit from %d to %d (run as root):\n"
2188 msgstr ""
2191 msgstr ""
2189
2192
2190 #, python-format
2193 #, python-format
2191 msgid "*** echo %d > %s\n"
2194 msgid "*** echo %d > %s\n"
2192 msgstr ""
2195 msgstr ""
2193
2196
2194 #, python-format
2197 #, python-format
2195 msgid "cannot watch %s until inotify watch limit is raised"
2198 msgid "cannot watch %s until inotify watch limit is raised"
2196 msgstr ""
2199 msgstr ""
2197
2200
2198 #, python-format
2201 #, python-format
2199 msgid "inotify service not available: %s"
2202 msgid "inotify service not available: %s"
2200 msgstr ""
2203 msgstr ""
2201
2204
2202 #, python-format
2205 #, python-format
2203 msgid "watching %r\n"
2206 msgid "watching %r\n"
2204 msgstr ""
2207 msgstr ""
2205
2208
2206 #, python-format
2209 #, python-format
2207 msgid "watching directories under %r\n"
2210 msgid "watching directories under %r\n"
2208 msgstr ""
2211 msgstr ""
2209
2212
2210 #, python-format
2213 #, python-format
2211 msgid "status: %r %s -> %s\n"
2214 msgid "status: %r %s -> %s\n"
2212 msgstr ""
2215 msgstr ""
2213
2216
2214 #, python-format
2217 #, python-format
2215 msgid "%s dirstate reload\n"
2218 msgid "%s dirstate reload\n"
2216 msgstr ""
2219 msgstr ""
2217
2220
2218 #, python-format
2221 #, python-format
2219 msgid "%s end dirstate reload\n"
2222 msgid "%s end dirstate reload\n"
2220 msgstr ""
2223 msgstr ""
2221
2224
2222 msgid "rescanning due to .hgignore change\n"
2225 msgid "rescanning due to .hgignore change\n"
2223 msgstr ""
2226 msgstr ""
2224
2227
2225 #, python-format
2228 #, python-format
2226 msgid "%s event: created %s\n"
2229 msgid "%s event: created %s\n"
2227 msgstr ""
2230 msgstr ""
2228
2231
2229 #, python-format
2232 #, python-format
2230 msgid "%s event: deleted %s\n"
2233 msgid "%s event: deleted %s\n"
2231 msgstr ""
2234 msgstr ""
2232
2235
2233 #, python-format
2236 #, python-format
2234 msgid "%s event: modified %s\n"
2237 msgid "%s event: modified %s\n"
2235 msgstr ""
2238 msgstr ""
2236
2239
2237 #, python-format
2240 #, python-format
2238 msgid "filesystem containing %s was unmounted\n"
2241 msgid "filesystem containing %s was unmounted\n"
2239 msgstr ""
2242 msgstr ""
2240
2243
2241 #, python-format
2244 #, python-format
2242 msgid "%s readable: %d bytes\n"
2245 msgid "%s readable: %d bytes\n"
2243 msgstr ""
2246 msgstr ""
2244
2247
2245 #, python-format
2248 #, python-format
2246 msgid "%s below threshold - unhooking\n"
2249 msgid "%s below threshold - unhooking\n"
2247 msgstr ""
2250 msgstr ""
2248
2251
2249 #, python-format
2252 #, python-format
2250 msgid "%s reading %d events\n"
2253 msgid "%s reading %d events\n"
2251 msgstr ""
2254 msgstr ""
2252
2255
2253 #, python-format
2256 #, python-format
2254 msgid "%s hooking back up with %d bytes readable\n"
2257 msgid "%s hooking back up with %d bytes readable\n"
2255 msgstr ""
2258 msgstr ""
2256
2259
2257 #, python-format
2260 #, python-format
2258 msgid "could not start server: %s"
2261 msgid "could not start server: %s"
2259 msgstr ""
2262 msgstr ""
2260
2263
2261 #, python-format
2264 #, python-format
2262 msgid "answering query for %r\n"
2265 msgid "answering query for %r\n"
2263 msgstr ""
2266 msgstr ""
2264
2267
2265 #, python-format
2268 #, python-format
2266 msgid "received query from incompatible client version %d\n"
2269 msgid "received query from incompatible client version %d\n"
2267 msgstr ""
2270 msgstr ""
2268
2271
2269 #, python-format
2272 #, python-format
2270 msgid "unrecognized query type: %s\n"
2273 msgid "unrecognized query type: %s\n"
2271 msgstr ""
2274 msgstr ""
2272
2275
2273 msgid "finished setup\n"
2276 msgid "finished setup\n"
2274 msgstr ""
2277 msgstr ""
2275
2278
2276 msgid ""
2279 msgid ""
2277 "expand expressions into changelog and summaries\n"
2280 "expand expressions into changelog and summaries\n"
2278 "\n"
2281 "\n"
2279 "This extension allows the use of a special syntax in summaries, which\n"
2282 "This extension allows the use of a special syntax in summaries, which\n"
2280 "will be automatically expanded into links or any other arbitrary\n"
2283 "will be automatically expanded into links or any other arbitrary\n"
2281 "expression, much like InterWiki does.\n"
2284 "expression, much like InterWiki does.\n"
2282 "\n"
2285 "\n"
2283 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2286 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2284 "in your hgrc::\n"
2287 "in your hgrc::\n"
2285 "\n"
2288 "\n"
2286 " [interhg]\n"
2289 " [interhg]\n"
2287 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2290 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2288 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2291 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
2289 "i\n"
2292 "i\n"
2290 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2293 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2291 msgstr ""
2294 msgstr ""
2292
2295
2293 #, python-format
2296 #, python-format
2294 msgid "interhg: invalid pattern for %s: %s\n"
2297 msgid "interhg: invalid pattern for %s: %s\n"
2295 msgstr ""
2298 msgstr ""
2296
2299
2297 #, python-format
2300 #, python-format
2298 msgid "interhg: invalid regexp for %s: %s\n"
2301 msgid "interhg: invalid regexp for %s: %s\n"
2299 msgstr ""
2302 msgstr ""
2300
2303
2301 msgid ""
2304 msgid ""
2302 "expand keywords in tracked files\n"
2305 "expand keywords in tracked files\n"
2303 "\n"
2306 "\n"
2304 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2307 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2305 "tracked text files selected by your configuration.\n"
2308 "tracked text files selected by your configuration.\n"
2306 "\n"
2309 "\n"
2307 "Keywords are only expanded in local repositories and not stored in the\n"
2310 "Keywords are only expanded in local repositories and not stored in the\n"
2308 "change history. The mechanism can be regarded as a convenience for the\n"
2311 "change history. The mechanism can be regarded as a convenience for the\n"
2309 "current user or for archive distribution.\n"
2312 "current user or for archive distribution.\n"
2310 "\n"
2313 "\n"
2311 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2314 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2312 "hgrc files.\n"
2315 "hgrc files.\n"
2313 "\n"
2316 "\n"
2314 "Example::\n"
2317 "Example::\n"
2315 "\n"
2318 "\n"
2316 " [keyword]\n"
2319 " [keyword]\n"
2317 " # expand keywords in every python file except those matching \"x*\"\n"
2320 " # expand keywords in every python file except those matching \"x*\"\n"
2318 " **.py =\n"
2321 " **.py =\n"
2319 " x* = ignore\n"
2322 " x* = ignore\n"
2320 "\n"
2323 "\n"
2321 "NOTE: the more specific you are in your filename patterns the less you\n"
2324 "NOTE: the more specific you are in your filename patterns the less you\n"
2322 "lose speed in huge repositories.\n"
2325 "lose speed in huge repositories.\n"
2323 "\n"
2326 "\n"
2324 "For [keywordmaps] template mapping and expansion demonstration and\n"
2327 "For [keywordmaps] template mapping and expansion demonstration and\n"
2325 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2328 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2326 "available templates and filters.\n"
2329 "available templates and filters.\n"
2327 "\n"
2330 "\n"
2328 "An additional date template filter {date|utcdate} is provided. It\n"
2331 "An additional date template filter {date|utcdate} is provided. It\n"
2329 "returns a date like \"2006/09/18 15:13:13\".\n"
2332 "returns a date like \"2006/09/18 15:13:13\".\n"
2330 "\n"
2333 "\n"
2331 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2334 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2332 "replaced with customized keywords and templates. Again, run \"hg\n"
2335 "replaced with customized keywords and templates. Again, run \"hg\n"
2333 "kwdemo\" to control the results of your config changes.\n"
2336 "kwdemo\" to control the results of your config changes.\n"
2334 "\n"
2337 "\n"
2335 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2338 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2336 "the risk of inadvertently storing expanded keywords in the change\n"
2339 "the risk of inadvertently storing expanded keywords in the change\n"
2337 "history.\n"
2340 "history.\n"
2338 "\n"
2341 "\n"
2339 "To force expansion after enabling it, or a configuration change, run\n"
2342 "To force expansion after enabling it, or a configuration change, run\n"
2340 "\"hg kwexpand\".\n"
2343 "\"hg kwexpand\".\n"
2341 "\n"
2344 "\n"
2342 "Also, when committing with the record extension or using mq's qrecord,\n"
2345 "Also, when committing with the record extension or using mq's qrecord,\n"
2343 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2346 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2344 "the files in question to update keyword expansions after all changes\n"
2347 "the files in question to update keyword expansions after all changes\n"
2345 "have been checked in.\n"
2348 "have been checked in.\n"
2346 "\n"
2349 "\n"
2347 "Expansions spanning more than one line and incremental expansions,\n"
2350 "Expansions spanning more than one line and incremental expansions,\n"
2348 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2351 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2349 "{desc}\" expands to the first line of the changeset description.\n"
2352 "{desc}\" expands to the first line of the changeset description.\n"
2350 msgstr ""
2353 msgstr ""
2351
2354
2352 #, python-format
2355 #, python-format
2353 msgid "overwriting %s expanding keywords\n"
2356 msgid "overwriting %s expanding keywords\n"
2354 msgstr ""
2357 msgstr ""
2355
2358
2356 #, python-format
2359 #, python-format
2357 msgid "overwriting %s shrinking keywords\n"
2360 msgid "overwriting %s shrinking keywords\n"
2358 msgstr ""
2361 msgstr ""
2359
2362
2360 msgid "[keyword] patterns cannot match"
2363 msgid "[keyword] patterns cannot match"
2361 msgstr ""
2364 msgstr ""
2362
2365
2363 msgid "no [keyword] patterns configured"
2366 msgid "no [keyword] patterns configured"
2364 msgstr ""
2367 msgstr ""
2365
2368
2366 msgid ""
2369 msgid ""
2367 "print [keywordmaps] configuration and an expansion example\n"
2370 "print [keywordmaps] configuration and an expansion example\n"
2368 "\n"
2371 "\n"
2369 " Show current, custom, or default keyword template maps and their\n"
2372 " Show current, custom, or default keyword template maps and their\n"
2370 " expansions.\n"
2373 " expansions.\n"
2371 "\n"
2374 "\n"
2372 " Extend the current configuration by specifying maps as arguments\n"
2375 " Extend the current configuration by specifying maps as arguments\n"
2373 " and using -f/--rcfile to source an external hgrc file.\n"
2376 " and using -f/--rcfile to source an external hgrc file.\n"
2374 "\n"
2377 "\n"
2375 " Use -d/--default to disable current configuration.\n"
2378 " Use -d/--default to disable current configuration.\n"
2376 "\n"
2379 "\n"
2377 " See \"hg help templates\" for information on templates and filters.\n"
2380 " See \"hg help templates\" for information on templates and filters.\n"
2378 " "
2381 " "
2379 msgstr ""
2382 msgstr ""
2380
2383
2381 #, python-format
2384 #, python-format
2382 msgid "creating temporary repository at %s\n"
2385 msgid "creating temporary repository at %s\n"
2383 msgstr ""
2386 msgstr ""
2384
2387
2385 msgid ""
2388 msgid ""
2386 "\n"
2389 "\n"
2387 "\tconfiguration using custom keyword template maps\n"
2390 "\tconfiguration using custom keyword template maps\n"
2388 msgstr ""
2391 msgstr ""
2389
2392
2390 msgid "\textending current template maps\n"
2393 msgid "\textending current template maps\n"
2391 msgstr ""
2394 msgstr ""
2392
2395
2393 msgid "\toverriding default template maps\n"
2396 msgid "\toverriding default template maps\n"
2394 msgstr ""
2397 msgstr ""
2395
2398
2396 msgid ""
2399 msgid ""
2397 "\n"
2400 "\n"
2398 "\tconfiguration using default keyword template maps\n"
2401 "\tconfiguration using default keyword template maps\n"
2399 msgstr ""
2402 msgstr ""
2400
2403
2401 msgid "\tdisabling current template maps\n"
2404 msgid "\tdisabling current template maps\n"
2402 msgstr ""
2405 msgstr ""
2403
2406
2404 msgid ""
2407 msgid ""
2405 "\n"
2408 "\n"
2406 "\tconfiguration using current keyword template maps\n"
2409 "\tconfiguration using current keyword template maps\n"
2407 msgstr ""
2410 msgstr ""
2408
2411
2409 #, python-format
2412 #, python-format
2410 msgid ""
2413 msgid ""
2411 "\n"
2414 "\n"
2412 "keywords written to %s:\n"
2415 "keywords written to %s:\n"
2413 msgstr ""
2416 msgstr ""
2414
2417
2415 msgid "unhooked all commit hooks\n"
2418 msgid "unhooked all commit hooks\n"
2416 msgstr ""
2419 msgstr ""
2417
2420
2418 msgid ""
2421 msgid ""
2419 "\n"
2422 "\n"
2420 "\tkeywords expanded\n"
2423 "\tkeywords expanded\n"
2421 msgstr ""
2424 msgstr ""
2422
2425
2423 msgid ""
2426 msgid ""
2424 "expand keywords in the working directory\n"
2427 "expand keywords in the working directory\n"
2425 "\n"
2428 "\n"
2426 " Run after (re)enabling keyword expansion.\n"
2429 " Run after (re)enabling keyword expansion.\n"
2427 "\n"
2430 "\n"
2428 " kwexpand refuses to run if given files contain local changes.\n"
2431 " kwexpand refuses to run if given files contain local changes.\n"
2429 " "
2432 " "
2430 msgstr ""
2433 msgstr ""
2431
2434
2432 msgid ""
2435 msgid ""
2433 "show files configured for keyword expansion\n"
2436 "show files configured for keyword expansion\n"
2434 "\n"
2437 "\n"
2435 " List which files in the working directory are matched by the\n"
2438 " List which files in the working directory are matched by the\n"
2436 " [keyword] configuration patterns.\n"
2439 " [keyword] configuration patterns.\n"
2437 "\n"
2440 "\n"
2438 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2441 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2439 " execution by including only files that are actual candidates for\n"
2442 " execution by including only files that are actual candidates for\n"
2440 " expansion.\n"
2443 " expansion.\n"
2441 "\n"
2444 "\n"
2442 " See \"hg help keyword\" on how to construct patterns both for\n"
2445 " See \"hg help keyword\" on how to construct patterns both for\n"
2443 " inclusion and exclusion of files.\n"
2446 " inclusion and exclusion of files.\n"
2444 "\n"
2447 "\n"
2445 " With -A/--all and -v/--verbose the codes used to show the status\n"
2448 " With -A/--all and -v/--verbose the codes used to show the status\n"
2446 " of files are::\n"
2449 " of files are::\n"
2447 "\n"
2450 "\n"
2448 " K = keyword expansion candidate\n"
2451 " K = keyword expansion candidate\n"
2449 " k = keyword expansion candidate (not tracked)\n"
2452 " k = keyword expansion candidate (not tracked)\n"
2450 " I = ignored\n"
2453 " I = ignored\n"
2451 " i = ignored (not tracked)\n"
2454 " i = ignored (not tracked)\n"
2452 " "
2455 " "
2453 msgstr ""
2456 msgstr ""
2454
2457
2455 msgid ""
2458 msgid ""
2456 "revert expanded keywords in the working directory\n"
2459 "revert expanded keywords in the working directory\n"
2457 "\n"
2460 "\n"
2458 " Run before changing/disabling active keywords or if you experience\n"
2461 " Run before changing/disabling active keywords or if you experience\n"
2459 " problems with \"hg import\" or \"hg merge\".\n"
2462 " problems with \"hg import\" or \"hg merge\".\n"
2460 "\n"
2463 "\n"
2461 " kwshrink refuses to run if given files contain local changes.\n"
2464 " kwshrink refuses to run if given files contain local changes.\n"
2462 " "
2465 " "
2463 msgstr ""
2466 msgstr ""
2464
2467
2465 msgid "show default keyword template maps"
2468 msgid "show default keyword template maps"
2466 msgstr ""
2469 msgstr ""
2467
2470
2468 msgid "read maps from rcfile"
2471 msgid "read maps from rcfile"
2469 msgstr ""
2472 msgstr ""
2470
2473
2471 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2474 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2472 msgstr ""
2475 msgstr ""
2473
2476
2474 msgid "hg kwexpand [OPTION]... [FILE]..."
2477 msgid "hg kwexpand [OPTION]... [FILE]..."
2475 msgstr ""
2478 msgstr ""
2476
2479
2477 msgid "show keyword status flags of all files"
2480 msgid "show keyword status flags of all files"
2478 msgstr ""
2481 msgstr ""
2479
2482
2480 msgid "show files excluded from expansion"
2483 msgid "show files excluded from expansion"
2481 msgstr ""
2484 msgstr ""
2482
2485
2483 #, fuzzy
2484 msgid "only show unknown (not tracked) files"
2486 msgid "only show unknown (not tracked) files"
2485 msgstr "visa bara okända (ospårade) filer"
2487 msgstr "visa bara okända (ospårade) filer"
2486
2488
2487 #, fuzzy
2488 msgid "show keyword status flags of all files (DEPRECATED)"
2489 msgid "show keyword status flags of all files (DEPRECATED)"
2489 msgstr "visa status för alla filer"
2490 msgstr "visa statusflaggor för alla filer (FÖRLEGAD)"
2490
2491
2491 msgid "only show untracked files (DEPRECATED)"
2492 msgid "only show untracked files (DEPRECATED)"
2492 msgstr ""
2493 msgstr "visa bara ospårade filer (FÖRLEGAD)"
2493
2494
2494 msgid "hg kwfiles [OPTION]... [FILE]..."
2495 msgid "hg kwfiles [OPTION]... [FILE]..."
2495 msgstr ""
2496 msgstr ""
2496
2497
2497 msgid "hg kwshrink [OPTION]... [FILE]..."
2498 msgid "hg kwshrink [OPTION]... [FILE]..."
2498 msgstr ""
2499 msgstr ""
2499
2500
2500 msgid ""
2501 msgid ""
2501 "manage a stack of patches\n"
2502 "manage a stack of patches\n"
2502 "\n"
2503 "\n"
2503 "This extension lets you work with a stack of patches in a Mercurial\n"
2504 "This extension lets you work with a stack of patches in a Mercurial\n"
2504 "repository. It manages two stacks of patches - all known patches, and\n"
2505 "repository. It manages two stacks of patches - all known patches, and\n"
2505 "applied patches (subset of known patches).\n"
2506 "applied patches (subset of known patches).\n"
2506 "\n"
2507 "\n"
2507 "Known patches are represented as patch files in the .hg/patches\n"
2508 "Known patches are represented as patch files in the .hg/patches\n"
2508 "directory. Applied patches are both patch files and changesets.\n"
2509 "directory. Applied patches are both patch files and changesets.\n"
2509 "\n"
2510 "\n"
2510 "Common tasks (use \"hg help command\" for more details)::\n"
2511 "Common tasks (use \"hg help command\" for more details)::\n"
2511 "\n"
2512 "\n"
2512 " prepare repository to work with patches qinit\n"
2513 " prepare repository to work with patches qinit\n"
2513 " create new patch qnew\n"
2514 " create new patch qnew\n"
2514 " import existing patch qimport\n"
2515 " import existing patch qimport\n"
2515 "\n"
2516 "\n"
2516 " print patch series qseries\n"
2517 " print patch series qseries\n"
2517 " print applied patches qapplied\n"
2518 " print applied patches qapplied\n"
2518 "\n"
2519 "\n"
2519 " add known patch to applied stack qpush\n"
2520 " add known patch to applied stack qpush\n"
2520 " remove patch from applied stack qpop\n"
2521 " remove patch from applied stack qpop\n"
2521 " refresh contents of top applied patch qrefresh\n"
2522 " refresh contents of top applied patch qrefresh\n"
2522 msgstr ""
2523 msgstr ""
2523
2524
2524 #, python-format
2525 #, python-format
2525 msgid "%s appears more than once in %s"
2526 msgid "%s appears more than once in %s"
2526 msgstr ""
2527 msgstr ""
2527
2528
2528 msgid "guard cannot be an empty string"
2529 msgid "guard cannot be an empty string"
2529 msgstr ""
2530 msgstr ""
2530
2531
2531 #, python-format
2532 #, python-format
2532 msgid "guard %r starts with invalid character: %r"
2533 msgid "guard %r starts with invalid character: %r"
2533 msgstr ""
2534 msgstr ""
2534
2535
2535 #, python-format
2536 #, python-format
2536 msgid "invalid character in guard %r: %r"
2537 msgid "invalid character in guard %r: %r"
2537 msgstr ""
2538 msgstr ""
2538
2539
2539 #, python-format
2540 #, python-format
2540 msgid "guard %r too short"
2541 msgid "guard %r too short"
2541 msgstr ""
2542 msgstr ""
2542
2543
2543 #, python-format
2544 #, python-format
2544 msgid "guard %r starts with invalid char"
2545 msgid "guard %r starts with invalid char"
2545 msgstr ""
2546 msgstr ""
2546
2547
2547 #, python-format
2548 #, python-format
2548 msgid "allowing %s - no guards in effect\n"
2549 msgid "allowing %s - no guards in effect\n"
2549 msgstr ""
2550 msgstr ""
2550
2551
2551 #, python-format
2552 #, python-format
2552 msgid "allowing %s - no matching negative guards\n"
2553 msgid "allowing %s - no matching negative guards\n"
2553 msgstr ""
2554 msgstr ""
2554
2555
2555 #, python-format
2556 #, python-format
2556 msgid "allowing %s - guarded by %r\n"
2557 msgid "allowing %s - guarded by %r\n"
2557 msgstr ""
2558 msgstr ""
2558
2559
2559 #, python-format
2560 #, python-format
2560 msgid "skipping %s - guarded by %r\n"
2561 msgid "skipping %s - guarded by %r\n"
2561 msgstr ""
2562 msgstr ""
2562
2563
2563 #, python-format
2564 #, python-format
2564 msgid "skipping %s - no matching guards\n"
2565 msgid "skipping %s - no matching guards\n"
2565 msgstr ""
2566 msgstr ""
2566
2567
2567 #, python-format
2568 #, python-format
2568 msgid "error removing undo: %s\n"
2569 msgid "error removing undo: %s\n"
2569 msgstr ""
2570 msgstr ""
2570
2571
2571 #, python-format
2572 #, python-format
2572 msgid "apply failed for patch %s"
2573 msgid "apply failed for patch %s"
2573 msgstr ""
2574 msgstr ""
2574
2575
2575 #, python-format
2576 #, python-format
2576 msgid "patch didn't work out, merging %s\n"
2577 msgid "patch didn't work out, merging %s\n"
2577 msgstr ""
2578 msgstr ""
2578
2579
2579 #, python-format
2580 #, python-format
2580 msgid "update returned %d"
2581 msgid "update returned %d"
2581 msgstr ""
2582 msgstr ""
2582
2583
2583 msgid "repo commit failed"
2584 msgid "repo commit failed"
2584 msgstr ""
2585 msgstr ""
2585
2586
2586 #, python-format
2587 #, python-format
2587 msgid "unable to read %s"
2588 msgid "unable to read %s"
2588 msgstr ""
2589 msgstr ""
2589
2590
2590 #, python-format
2591 #, python-format
2591 msgid "patch %s does not exist\n"
2592 msgid "patch %s does not exist\n"
2592 msgstr ""
2593 msgstr ""
2593
2594
2594 #, python-format
2595 #, python-format
2595 msgid "patch %s is not applied\n"
2596 msgid "patch %s is not applied\n"
2596 msgstr ""
2597 msgstr ""
2597
2598
2598 msgid "patch failed, unable to continue (try -v)\n"
2599 msgid "patch failed, unable to continue (try -v)\n"
2599 msgstr ""
2600 msgstr ""
2600
2601
2601 #, python-format
2602 #, python-format
2602 msgid "applying %s\n"
2603 msgid "applying %s\n"
2603 msgstr ""
2604 msgstr ""
2604
2605
2605 #, python-format
2606 #, python-format
2606 msgid "unable to read %s\n"
2607 msgid "unable to read %s\n"
2607 msgstr ""
2608 msgstr ""
2608
2609
2609 #, python-format
2610 #, python-format
2610 msgid "imported patch %s\n"
2611 msgid "imported patch %s\n"
2611 msgstr ""
2612 msgstr ""
2612
2613
2613 #, python-format
2614 #, python-format
2614 msgid ""
2615 msgid ""
2615 "\n"
2616 "\n"
2616 "imported patch %s"
2617 "imported patch %s"
2617 msgstr ""
2618 msgstr ""
2618
2619
2619 #, python-format
2620 #, python-format
2620 msgid "patch %s is empty\n"
2621 msgid "patch %s is empty\n"
2621 msgstr ""
2622 msgstr ""
2622
2623
2623 msgid "patch failed, rejects left in working dir\n"
2624 msgid "patch failed, rejects left in working dir\n"
2624 msgstr ""
2625 msgstr ""
2625
2626
2626 msgid "fuzz found when applying patch, stopping\n"
2627 msgid "fuzz found when applying patch, stopping\n"
2627 msgstr ""
2628 msgstr ""
2628
2629
2629 #, python-format
2630 #, python-format
2630 msgid "revision %d is not managed"
2631 msgid "revision %d is not managed"
2631 msgstr ""
2632 msgstr ""
2632
2633
2633 #, python-format
2634 #, python-format
2634 msgid "cannot delete revision %d above applied patches"
2635 msgid "cannot delete revision %d above applied patches"
2635 msgstr ""
2636 msgstr ""
2636
2637
2637 #, python-format
2638 #, python-format
2638 msgid "patch %s finalized without changeset message\n"
2639 msgid "patch %s finalized without changeset message\n"
2639 msgstr ""
2640 msgstr ""
2640
2641
2641 msgid "qdelete requires at least one revision or patch name"
2642 msgid "qdelete requires at least one revision or patch name"
2642 msgstr ""
2643 msgstr ""
2643
2644
2644 #, python-format
2645 #, python-format
2645 msgid "cannot delete applied patch %s"
2646 msgid "cannot delete applied patch %s"
2646 msgstr ""
2647 msgstr ""
2647
2648
2648 #, python-format
2649 #, python-format
2649 msgid "patch %s not in series file"
2650 msgid "patch %s not in series file"
2650 msgstr ""
2651 msgstr ""
2651
2652
2652 msgid "no patches applied"
2653 msgid "no patches applied"
2653 msgstr ""
2654 msgstr ""
2654
2655
2655 msgid "working directory revision is not qtip"
2656 msgid "working directory revision is not qtip"
2656 msgstr ""
2657 msgstr ""
2657
2658
2658 msgid "local changes found, refresh first"
2659 msgid "local changes found, refresh first"
2659 msgstr ""
2660 msgstr ""
2660
2661
2661 msgid "local changes found"
2662 msgid "local changes found"
2662 msgstr ""
2663 msgstr ""
2663
2664
2664 #, python-format
2665 #, python-format
2665 msgid "\"%s\" cannot be used as the name of a patch"
2666 msgid "\"%s\" cannot be used as the name of a patch"
2666 msgstr ""
2667 msgstr ""
2667
2668
2668 #, python-format
2669 #, python-format
2669 msgid "patch \"%s\" already exists"
2670 msgid "patch \"%s\" already exists"
2670 msgstr ""
2671 msgstr ""
2671
2672
2672 #, python-format
2673 #, python-format
2673 msgid "error unlinking %s\n"
2674 msgid "error unlinking %s\n"
2674 msgstr ""
2675 msgstr ""
2675
2676
2676 #, python-format
2677 #, python-format
2677 msgid "patch name \"%s\" is ambiguous:\n"
2678 msgid "patch name \"%s\" is ambiguous:\n"
2678 msgstr ""
2679 msgstr ""
2679
2680
2680 #, python-format
2681 #, python-format
2681 msgid "patch %s not in series"
2682 msgid "patch %s not in series"
2682 msgstr ""
2683 msgstr ""
2683
2684
2684 msgid "(working directory not at a head)\n"
2685 msgid "(working directory not at a head)\n"
2685 msgstr ""
2686 msgstr ""
2686
2687
2687 msgid "no patches in series\n"
2688 msgid "no patches in series\n"
2688 msgstr ""
2689 msgstr ""
2689
2690
2690 #, python-format
2691 #, python-format
2691 msgid "cannot push to a previous patch: %s"
2692 msgid "cannot push to a previous patch: %s"
2692 msgstr ""
2693 msgstr ""
2693
2694
2694 #, python-format
2695 #, python-format
2695 msgid "qpush: %s is already at the top\n"
2696 msgid "qpush: %s is already at the top\n"
2696 msgstr ""
2697 msgstr ""
2697
2698
2698 #, python-format
2699 #, python-format
2699 msgid "guarded by %r"
2700 msgid "guarded by %r"
2700 msgstr ""
2701 msgstr ""
2701
2702
2702 msgid "no matching guards"
2703 msgid "no matching guards"
2703 msgstr ""
2704 msgstr ""
2704
2705
2705 #, python-format
2706 #, python-format
2706 msgid "cannot push '%s' - %s\n"
2707 msgid "cannot push '%s' - %s\n"
2707 msgstr ""
2708 msgstr ""
2708
2709
2709 msgid "all patches are currently applied\n"
2710 msgid "all patches are currently applied\n"
2710 msgstr ""
2711 msgstr ""
2711
2712
2712 msgid "patch series already fully applied\n"
2713 msgid "patch series already fully applied\n"
2713 msgstr ""
2714 msgstr ""
2714
2715
2715 msgid "cleaning up working directory..."
2716 msgid "cleaning up working directory..."
2716 msgstr ""
2717 msgstr ""
2717
2718
2718 #, python-format
2719 #, python-format
2719 msgid "errors during apply, please fix and refresh %s\n"
2720 msgid "errors during apply, please fix and refresh %s\n"
2720 msgstr ""
2721 msgstr ""
2721
2722
2722 #, python-format
2723 #, python-format
2723 msgid "now at: %s\n"
2724 msgid "now at: %s\n"
2724 msgstr ""
2725 msgstr ""
2725
2726
2726 #, python-format
2727 #, python-format
2727 msgid "patch %s is not applied"
2728 msgid "patch %s is not applied"
2728 msgstr ""
2729 msgstr ""
2729
2730
2730 msgid "no patches applied\n"
2731 msgid "no patches applied\n"
2731 msgstr ""
2732 msgstr ""
2732
2733
2733 #, python-format
2734 #, python-format
2734 msgid "qpop: %s is already at the top\n"
2735 msgid "qpop: %s is already at the top\n"
2735 msgstr ""
2736 msgstr ""
2736
2737
2737 msgid "qpop: forcing dirstate update\n"
2738 msgid "qpop: forcing dirstate update\n"
2738 msgstr ""
2739 msgstr ""
2739
2740
2740 #, python-format
2741 #, python-format
2741 msgid "trying to pop unknown node %s"
2742 msgid "trying to pop unknown node %s"
2742 msgstr ""
2743 msgstr ""
2743
2744
2744 msgid "popping would remove a revision not managed by this patch queue"
2745 msgid "popping would remove a revision not managed by this patch queue"
2745 msgstr ""
2746 msgstr ""
2746
2747
2747 msgid "deletions found between repo revs"
2748 msgid "deletions found between repo revs"
2748 msgstr ""
2749 msgstr ""
2749
2750
2750 #, python-format
2751 #, python-format
2751 msgid "popping %s\n"
2752 msgid "popping %s\n"
2752 msgstr ""
2753 msgstr ""
2753
2754
2754 msgid "patch queue now empty\n"
2755 msgid "patch queue now empty\n"
2755 msgstr ""
2756 msgstr ""
2756
2757
2757 msgid "cannot refresh a revision with children"
2758 msgid "cannot refresh a revision with children"
2758 msgstr ""
2759 msgstr ""
2759
2760
2760 msgid ""
2761 msgid ""
2761 "refresh interrupted while patch was popped! (revert --all, qpush to "
2762 "refresh interrupted while patch was popped! (revert --all, qpush to "
2762 "recover)\n"
2763 "recover)\n"
2763 msgstr ""
2764 msgstr ""
2764
2765
2765 msgid "patch queue directory already exists"
2766 msgid "patch queue directory already exists"
2766 msgstr ""
2767 msgstr ""
2767
2768
2768 #, python-format
2769 #, python-format
2769 msgid "patch %s is not in series file"
2770 msgid "patch %s is not in series file"
2770 msgstr ""
2771 msgstr ""
2771
2772
2772 msgid "No saved patch data found\n"
2773 msgid "No saved patch data found\n"
2773 msgstr ""
2774 msgstr ""
2774
2775
2775 #, python-format
2776 #, python-format
2776 msgid "restoring status: %s\n"
2777 msgid "restoring status: %s\n"
2777 msgstr ""
2778 msgstr ""
2778
2779
2779 msgid "save entry has children, leaving it alone\n"
2780 msgid "save entry has children, leaving it alone\n"
2780 msgstr ""
2781 msgstr ""
2781
2782
2782 #, python-format
2783 #, python-format
2783 msgid "removing save entry %s\n"
2784 msgid "removing save entry %s\n"
2784 msgstr ""
2785 msgstr ""
2785
2786
2786 #, python-format
2787 #, python-format
2787 msgid "saved queue repository parents: %s %s\n"
2788 msgid "saved queue repository parents: %s %s\n"
2788 msgstr ""
2789 msgstr ""
2789
2790
2790 msgid "queue directory updating\n"
2791 msgid "queue directory updating\n"
2791 msgstr ""
2792 msgstr ""
2792
2793
2793 msgid "Unable to load queue repository\n"
2794 msgid "Unable to load queue repository\n"
2794 msgstr ""
2795 msgstr ""
2795
2796
2796 msgid "save: no patches applied, exiting\n"
2797 msgid "save: no patches applied, exiting\n"
2797 msgstr ""
2798 msgstr ""
2798
2799
2799 msgid "status is already saved\n"
2800 msgid "status is already saved\n"
2800 msgstr ""
2801 msgstr ""
2801
2802
2802 msgid "hg patches saved state"
2803 msgid "hg patches saved state"
2803 msgstr ""
2804 msgstr ""
2804
2805
2805 msgid "repo commit failed\n"
2806 msgid "repo commit failed\n"
2806 msgstr ""
2807 msgstr ""
2807
2808
2808 #, python-format
2809 #, python-format
2809 msgid "patch %s is already in the series file"
2810 msgid "patch %s is already in the series file"
2810 msgstr ""
2811 msgstr ""
2811
2812
2812 msgid "option \"-r\" not valid when importing files"
2813 msgid "option \"-r\" not valid when importing files"
2813 msgstr ""
2814 msgstr ""
2814
2815
2815 msgid "option \"-n\" not valid when importing multiple patches"
2816 msgid "option \"-n\" not valid when importing multiple patches"
2816 msgstr ""
2817 msgstr ""
2817
2818
2818 #, python-format
2819 #, python-format
2819 msgid "revision %d is the root of more than one branch"
2820 msgid "revision %d is the root of more than one branch"
2820 msgstr ""
2821 msgstr ""
2821
2822
2822 #, python-format
2823 #, python-format
2823 msgid "revision %d is already managed"
2824 msgid "revision %d is already managed"
2824 msgstr ""
2825 msgstr ""
2825
2826
2826 #, python-format
2827 #, python-format
2827 msgid "revision %d is not the parent of the queue"
2828 msgid "revision %d is not the parent of the queue"
2828 msgstr ""
2829 msgstr ""
2829
2830
2830 #, python-format
2831 #, python-format
2831 msgid "revision %d has unmanaged children"
2832 msgid "revision %d has unmanaged children"
2832 msgstr ""
2833 msgstr ""
2833
2834
2834 #, python-format
2835 #, python-format
2835 msgid "cannot import merge revision %d"
2836 msgid "cannot import merge revision %d"
2836 msgstr ""
2837 msgstr ""
2837
2838
2838 #, python-format
2839 #, python-format
2839 msgid "revision %d is not the parent of %d"
2840 msgid "revision %d is not the parent of %d"
2840 msgstr ""
2841 msgstr ""
2841
2842
2842 msgid "-e is incompatible with import from -"
2843 msgid "-e is incompatible with import from -"
2843 msgstr ""
2844 msgstr ""
2844
2845
2845 #, python-format
2846 #, python-format
2846 msgid "patch %s does not exist"
2847 msgid "patch %s does not exist"
2847 msgstr ""
2848 msgstr ""
2848
2849
2849 msgid "need --name to import a patch from -"
2850 msgid "need --name to import a patch from -"
2850 msgstr ""
2851 msgstr ""
2851
2852
2852 #, python-format
2853 #, python-format
2853 msgid "adding %s to series file\n"
2854 msgid "adding %s to series file\n"
2854 msgstr ""
2855 msgstr ""
2855
2856
2856 msgid ""
2857 msgid ""
2857 "remove patches from queue\n"
2858 "remove patches from queue\n"
2858 "\n"
2859 "\n"
2859 " The patches must not be applied, and at least one patch is required. "
2860 " The patches must not be applied, and at least one patch is required. "
2860 "With\n"
2861 "With\n"
2861 " -k/--keep, the patch files are preserved in the patch directory.\n"
2862 " -k/--keep, the patch files are preserved in the patch directory.\n"
2862 "\n"
2863 "\n"
2863 " To stop managing a patch and move it into permanent history,\n"
2864 " To stop managing a patch and move it into permanent history,\n"
2864 " use the qfinish command."
2865 " use the qfinish command."
2865 msgstr ""
2866 msgstr ""
2866
2867
2867 msgid "print the patches already applied"
2868 msgid "print the patches already applied"
2868 msgstr ""
2869 msgstr ""
2869
2870
2870 msgid "only one patch applied\n"
2871 msgid "only one patch applied\n"
2871 msgstr ""
2872 msgstr ""
2872
2873
2873 msgid "print the patches not yet applied"
2874 msgid "print the patches not yet applied"
2874 msgstr ""
2875 msgstr ""
2875
2876
2876 msgid "all patches applied\n"
2877 msgid "all patches applied\n"
2877 msgstr ""
2878 msgstr ""
2878
2879
2879 msgid ""
2880 msgid ""
2880 "import a patch\n"
2881 "import a patch\n"
2881 "\n"
2882 "\n"
2882 " The patch is inserted into the series after the last applied\n"
2883 " The patch is inserted into the series after the last applied\n"
2883 " patch. If no patches have been applied, qimport prepends the patch\n"
2884 " patch. If no patches have been applied, qimport prepends the patch\n"
2884 " to the series.\n"
2885 " to the series.\n"
2885 "\n"
2886 "\n"
2886 " The patch will have the same name as its source file unless you\n"
2887 " The patch will have the same name as its source file unless you\n"
2887 " give it a new one with -n/--name.\n"
2888 " give it a new one with -n/--name.\n"
2888 "\n"
2889 "\n"
2889 " You can register an existing patch inside the patch directory with\n"
2890 " You can register an existing patch inside the patch directory with\n"
2890 " the -e/--existing flag.\n"
2891 " the -e/--existing flag.\n"
2891 "\n"
2892 "\n"
2892 " With -f/--force, an existing patch of the same name will be\n"
2893 " With -f/--force, an existing patch of the same name will be\n"
2893 " overwritten.\n"
2894 " overwritten.\n"
2894 "\n"
2895 "\n"
2895 " An existing changeset may be placed under mq control with -r/--rev\n"
2896 " An existing changeset may be placed under mq control with -r/--rev\n"
2896 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2897 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2897 " With -g/--git, patches imported with --rev will use the git diff\n"
2898 " With -g/--git, patches imported with --rev will use the git diff\n"
2898 " format. See the diffs help topic for information on why this is\n"
2899 " format. See the diffs help topic for information on why this is\n"
2899 " important for preserving rename/copy information and permission\n"
2900 " important for preserving rename/copy information and permission\n"
2900 " changes.\n"
2901 " changes.\n"
2901 "\n"
2902 "\n"
2902 " To import a patch from standard input, pass - as the patch file.\n"
2903 " To import a patch from standard input, pass - as the patch file.\n"
2903 " When importing from standard input, a patch name must be specified\n"
2904 " When importing from standard input, a patch name must be specified\n"
2904 " using the --name flag.\n"
2905 " using the --name flag.\n"
2905 " "
2906 " "
2906 msgstr ""
2907 msgstr ""
2907
2908
2908 msgid ""
2909 msgid ""
2909 "init a new queue repository\n"
2910 "init a new queue repository\n"
2910 "\n"
2911 "\n"
2911 " The queue repository is unversioned by default. If\n"
2912 " The queue repository is unversioned by default. If\n"
2912 " -c/--create-repo is specified, qinit will create a separate nested\n"
2913 " -c/--create-repo is specified, qinit will create a separate nested\n"
2913 " repository for patches (qinit -c may also be run later to convert\n"
2914 " repository for patches (qinit -c may also be run later to convert\n"
2914 " an unversioned patch repository into a versioned one). You can use\n"
2915 " an unversioned patch repository into a versioned one). You can use\n"
2915 " qcommit to commit changes to this queue repository."
2916 " qcommit to commit changes to this queue repository."
2916 msgstr ""
2917 msgstr ""
2917
2918
2918 msgid ""
2919 msgid ""
2919 "clone main and patch repository at same time\n"
2920 "clone main and patch repository at same time\n"
2920 "\n"
2921 "\n"
2921 " If source is local, destination will have no patches applied. If\n"
2922 " If source is local, destination will have no patches applied. If\n"
2922 " source is remote, this command can not check if patches are\n"
2923 " source is remote, this command can not check if patches are\n"
2923 " applied in source, so cannot guarantee that patches are not\n"
2924 " applied in source, so cannot guarantee that patches are not\n"
2924 " applied in destination. If you clone remote repository, be sure\n"
2925 " applied in destination. If you clone remote repository, be sure\n"
2925 " before that it has no patches applied.\n"
2926 " before that it has no patches applied.\n"
2926 "\n"
2927 "\n"
2927 " Source patch repository is looked for in <src>/.hg/patches by\n"
2928 " Source patch repository is looked for in <src>/.hg/patches by\n"
2928 " default. Use -p <url> to change.\n"
2929 " default. Use -p <url> to change.\n"
2929 "\n"
2930 "\n"
2930 " The patch directory must be a nested Mercurial repository, as\n"
2931 " The patch directory must be a nested Mercurial repository, as\n"
2931 " would be created by qinit -c.\n"
2932 " would be created by qinit -c.\n"
2932 " "
2933 " "
2933 msgstr ""
2934 msgstr ""
2934
2935
2935 msgid "versioned patch repository not found (see qinit -c)"
2936 msgid "versioned patch repository not found (see qinit -c)"
2936 msgstr ""
2937 msgstr ""
2937
2938
2938 msgid "cloning main repository\n"
2939 msgid "cloning main repository\n"
2939 msgstr ""
2940 msgstr ""
2940
2941
2941 msgid "cloning patch repository\n"
2942 msgid "cloning patch repository\n"
2942 msgstr ""
2943 msgstr ""
2943
2944
2944 msgid "stripping applied patches from destination repository\n"
2945 msgid "stripping applied patches from destination repository\n"
2945 msgstr ""
2946 msgstr ""
2946
2947
2947 msgid "updating destination repository\n"
2948 msgid "updating destination repository\n"
2948 msgstr ""
2949 msgstr ""
2949
2950
2950 msgid "commit changes in the queue repository"
2951 msgid "commit changes in the queue repository"
2951 msgstr ""
2952 msgstr ""
2952
2953
2953 msgid "print the entire series file"
2954 msgid "print the entire series file"
2954 msgstr ""
2955 msgstr ""
2955
2956
2956 msgid "print the name of the current patch"
2957 msgid "print the name of the current patch"
2957 msgstr ""
2958 msgstr ""
2958
2959
2959 msgid "print the name of the next patch"
2960 msgid "print the name of the next patch"
2960 msgstr ""
2961 msgstr ""
2961
2962
2962 msgid "print the name of the previous patch"
2963 msgid "print the name of the previous patch"
2963 msgstr ""
2964 msgstr ""
2964
2965
2965 msgid ""
2966 msgid ""
2966 "create a new patch\n"
2967 "create a new patch\n"
2967 "\n"
2968 "\n"
2968 " qnew creates a new patch on top of the currently-applied patch (if\n"
2969 " qnew creates a new patch on top of the currently-applied patch (if\n"
2969 " any). It will refuse to run if there are any outstanding changes\n"
2970 " any). It will refuse to run if there are any outstanding changes\n"
2970 " unless -f/--force is specified, in which case the patch will be\n"
2971 " unless -f/--force is specified, in which case the patch will be\n"
2971 " initialized with them. You may also use -I/--include,\n"
2972 " initialized with them. You may also use -I/--include,\n"
2972 " -X/--exclude, and/or a list of files after the patch name to add\n"
2973 " -X/--exclude, and/or a list of files after the patch name to add\n"
2973 " only changes to matching files to the new patch, leaving the rest\n"
2974 " only changes to matching files to the new patch, leaving the rest\n"
2974 " as uncommitted modifications.\n"
2975 " as uncommitted modifications.\n"
2975 "\n"
2976 "\n"
2976 " -u/--user and -d/--date can be used to set the (given) user and\n"
2977 " -u/--user and -d/--date can be used to set the (given) user and\n"
2977 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2978 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2978 " to current user and date to current date.\n"
2979 " to current user and date to current date.\n"
2979 "\n"
2980 "\n"
2980 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2981 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2981 " well as the commit message. If none is specified, the header is\n"
2982 " well as the commit message. If none is specified, the header is\n"
2982 " empty and the commit message is '[mq]: PATCH'.\n"
2983 " empty and the commit message is '[mq]: PATCH'.\n"
2983 "\n"
2984 "\n"
2984 " Use the -g/--git option to keep the patch in the git extended diff\n"
2985 " Use the -g/--git option to keep the patch in the git extended diff\n"
2985 " format. Read the diffs help topic for more information on why this\n"
2986 " format. Read the diffs help topic for more information on why this\n"
2986 " is important for preserving permission changes and copy/rename\n"
2987 " is important for preserving permission changes and copy/rename\n"
2987 " information.\n"
2988 " information.\n"
2988 " "
2989 " "
2989 msgstr ""
2990 msgstr ""
2990
2991
2991 msgid ""
2992 msgid ""
2992 "update the current patch\n"
2993 "update the current patch\n"
2993 "\n"
2994 "\n"
2994 " If any file patterns are provided, the refreshed patch will\n"
2995 " If any file patterns are provided, the refreshed patch will\n"
2995 " contain only the modifications that match those patterns; the\n"
2996 " contain only the modifications that match those patterns; the\n"
2996 " remaining modifications will remain in the working directory.\n"
2997 " remaining modifications will remain in the working directory.\n"
2997 "\n"
2998 "\n"
2998 " If -s/--short is specified, files currently included in the patch\n"
2999 " If -s/--short is specified, files currently included in the patch\n"
2999 " will be refreshed just like matched files and remain in the patch.\n"
3000 " will be refreshed just like matched files and remain in the patch.\n"
3000 "\n"
3001 "\n"
3001 " hg add/remove/copy/rename work as usual, though you might want to\n"
3002 " hg add/remove/copy/rename work as usual, though you might want to\n"
3002 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3003 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3003 " and renames. See the diffs help topic for more information on the\n"
3004 " and renames. See the diffs help topic for more information on the\n"
3004 " git diff format.\n"
3005 " git diff format.\n"
3005 " "
3006 " "
3006 msgstr ""
3007 msgstr ""
3007
3008
3008 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3009 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3009 msgstr ""
3010 msgstr ""
3010
3011
3011 msgid ""
3012 msgid ""
3012 "diff of the current patch and subsequent modifications\n"
3013 "diff of the current patch and subsequent modifications\n"
3013 "\n"
3014 "\n"
3014 " Shows a diff which includes the current patch as well as any\n"
3015 " Shows a diff which includes the current patch as well as any\n"
3015 " changes which have been made in the working directory since the\n"
3016 " changes which have been made in the working directory since the\n"
3016 " last refresh (thus showing what the current patch would become\n"
3017 " last refresh (thus showing what the current patch would become\n"
3017 " after a qrefresh).\n"
3018 " after a qrefresh).\n"
3018 "\n"
3019 "\n"
3019 " Use 'hg diff' if you only want to see the changes made since the\n"
3020 " Use 'hg diff' if you only want to see the changes made since the\n"
3020 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3021 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3021 " by the current patch without including changes made since the\n"
3022 " by the current patch without including changes made since the\n"
3022 " qrefresh.\n"
3023 " qrefresh.\n"
3023 " "
3024 " "
3024 msgstr ""
3025 msgstr ""
3025
3026
3026 msgid ""
3027 msgid ""
3027 "fold the named patches into the current patch\n"
3028 "fold the named patches into the current patch\n"
3028 "\n"
3029 "\n"
3029 " Patches must not yet be applied. Each patch will be successively\n"
3030 " Patches must not yet be applied. Each patch will be successively\n"
3030 " applied to the current patch in the order given. If all the\n"
3031 " applied to the current patch in the order given. If all the\n"
3031 " patches apply successfully, the current patch will be refreshed\n"
3032 " patches apply successfully, the current patch will be refreshed\n"
3032 " with the new cumulative patch, and the folded patches will be\n"
3033 " with the new cumulative patch, and the folded patches will be\n"
3033 " deleted. With -k/--keep, the folded patch files will not be\n"
3034 " deleted. With -k/--keep, the folded patch files will not be\n"
3034 " removed afterwards.\n"
3035 " removed afterwards.\n"
3035 "\n"
3036 "\n"
3036 " The header for each folded patch will be concatenated with the\n"
3037 " The header for each folded patch will be concatenated with the\n"
3037 " current patch header, separated by a line of '* * *'."
3038 " current patch header, separated by a line of '* * *'."
3038 msgstr ""
3039 msgstr ""
3039
3040
3040 msgid "qfold requires at least one patch name"
3041 msgid "qfold requires at least one patch name"
3041 msgstr ""
3042 msgstr ""
3042
3043
3043 msgid "No patches applied"
3044 msgid "No patches applied"
3044 msgstr ""
3045 msgstr ""
3045
3046
3046 #, python-format
3047 #, python-format
3047 msgid "Skipping already folded patch %s"
3048 msgid "Skipping already folded patch %s"
3048 msgstr ""
3049 msgstr ""
3049
3050
3050 #, python-format
3051 #, python-format
3051 msgid "qfold cannot fold already applied patch %s"
3052 msgid "qfold cannot fold already applied patch %s"
3052 msgstr ""
3053 msgstr ""
3053
3054
3054 #, python-format
3055 #, python-format
3055 msgid "Error folding patch %s"
3056 msgid "Error folding patch %s"
3056 msgstr ""
3057 msgstr ""
3057
3058
3058 msgid "push or pop patches until named patch is at top of stack"
3059 msgid "push or pop patches until named patch is at top of stack"
3059 msgstr ""
3060 msgstr ""
3060
3061
3061 msgid ""
3062 msgid ""
3062 "set or print guards for a patch\n"
3063 "set or print guards for a patch\n"
3063 "\n"
3064 "\n"
3064 " Guards control whether a patch can be pushed. A patch with no\n"
3065 " Guards control whether a patch can be pushed. A patch with no\n"
3065 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3066 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3066 " pushed only if the qselect command has activated it. A patch with\n"
3067 " pushed only if the qselect command has activated it. A patch with\n"
3067 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3068 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3068 " has activated it.\n"
3069 " has activated it.\n"
3069 "\n"
3070 "\n"
3070 " With no arguments, print the currently active guards.\n"
3071 " With no arguments, print the currently active guards.\n"
3071 " With arguments, set guards for the named patch.\n"
3072 " With arguments, set guards for the named patch.\n"
3072 " NOTE: Specifying negative guards now requires '--'.\n"
3073 " NOTE: Specifying negative guards now requires '--'.\n"
3073 "\n"
3074 "\n"
3074 " To set guards on another patch:\n"
3075 " To set guards on another patch:\n"
3075 " hg qguard -- other.patch +2.6.17 -stable\n"
3076 " hg qguard -- other.patch +2.6.17 -stable\n"
3076 " "
3077 " "
3077 msgstr ""
3078 msgstr ""
3078
3079
3079 msgid "cannot mix -l/--list with options or arguments"
3080 msgid "cannot mix -l/--list with options or arguments"
3080 msgstr ""
3081 msgstr ""
3081
3082
3082 msgid "no patch to work with"
3083 msgid "no patch to work with"
3083 msgstr ""
3084 msgstr ""
3084
3085
3085 #, python-format
3086 #, python-format
3086 msgid "no patch named %s"
3087 msgid "no patch named %s"
3087 msgstr ""
3088 msgstr ""
3088
3089
3089 msgid "print the header of the topmost or specified patch"
3090 msgid "print the header of the topmost or specified patch"
3090 msgstr ""
3091 msgstr ""
3091
3092
3092 msgid ""
3093 msgid ""
3093 "push the next patch onto the stack\n"
3094 "push the next patch onto the stack\n"
3094 "\n"
3095 "\n"
3095 " When -f/--force is applied, all local changes in patched files\n"
3096 " When -f/--force is applied, all local changes in patched files\n"
3096 " will be lost.\n"
3097 " will be lost.\n"
3097 " "
3098 " "
3098 msgstr ""
3099 msgstr ""
3099
3100
3100 msgid "no saved queues found, please use -n\n"
3101 msgid "no saved queues found, please use -n\n"
3101 msgstr ""
3102 msgstr ""
3102
3103
3103 #, python-format
3104 #, python-format
3104 msgid "merging with queue at: %s\n"
3105 msgid "merging with queue at: %s\n"
3105 msgstr ""
3106 msgstr ""
3106
3107
3107 msgid ""
3108 msgid ""
3108 "pop the current patch off the stack\n"
3109 "pop the current patch off the stack\n"
3109 "\n"
3110 "\n"
3110 " By default, pops off the top of the patch stack. If given a patch\n"
3111 " By default, pops off the top of the patch stack. If given a patch\n"
3111 " name, keeps popping off patches until the named patch is at the\n"
3112 " name, keeps popping off patches until the named patch is at the\n"
3112 " top of the stack.\n"
3113 " top of the stack.\n"
3113 " "
3114 " "
3114 msgstr ""
3115 msgstr ""
3115
3116
3116 #, python-format
3117 #, python-format
3117 msgid "using patch queue: %s\n"
3118 msgid "using patch queue: %s\n"
3118 msgstr ""
3119 msgstr ""
3119
3120
3120 msgid ""
3121 msgid ""
3121 "rename a patch\n"
3122 "rename a patch\n"
3122 "\n"
3123 "\n"
3123 " With one argument, renames the current patch to PATCH1.\n"
3124 " With one argument, renames the current patch to PATCH1.\n"
3124 " With two arguments, renames PATCH1 to PATCH2."
3125 " With two arguments, renames PATCH1 to PATCH2."
3125 msgstr ""
3126 msgstr ""
3126
3127
3127 #, python-format
3128 #, python-format
3128 msgid "%s already exists"
3129 msgid "%s already exists"
3129 msgstr ""
3130 msgstr ""
3130
3131
3131 #, python-format
3132 #, python-format
3132 msgid "A patch named %s already exists in the series file"
3133 msgid "A patch named %s already exists in the series file"
3133 msgstr ""
3134 msgstr ""
3134
3135
3135 msgid "restore the queue state saved by a revision"
3136 msgid "restore the queue state saved by a revision"
3136 msgstr ""
3137 msgstr ""
3137
3138
3138 msgid "save current queue state"
3139 msgid "save current queue state"
3139 msgstr ""
3140 msgstr ""
3140
3141
3141 #, python-format
3142 #, python-format
3142 msgid "destination %s exists and is not a directory"
3143 msgid "destination %s exists and is not a directory"
3143 msgstr ""
3144 msgstr ""
3144
3145
3145 #, python-format
3146 #, python-format
3146 msgid "destination %s exists, use -f to force"
3147 msgid "destination %s exists, use -f to force"
3147 msgstr ""
3148 msgstr ""
3148
3149
3149 #, python-format
3150 #, python-format
3150 msgid "copy %s to %s\n"
3151 msgid "copy %s to %s\n"
3151 msgstr ""
3152 msgstr ""
3152
3153
3153 msgid ""
3154 msgid ""
3154 "strip a revision and all its descendants from the repository\n"
3155 "strip a revision and all its descendants from the repository\n"
3155 "\n"
3156 "\n"
3156 " If one of the working directory's parent revisions is stripped, the\n"
3157 " If one of the working directory's parent revisions is stripped, the\n"
3157 " working directory will be updated to the parent of the stripped\n"
3158 " working directory will be updated to the parent of the stripped\n"
3158 " revision.\n"
3159 " revision.\n"
3159 " "
3160 " "
3160 msgstr ""
3161 msgstr ""
3161
3162
3162 msgid ""
3163 msgid ""
3163 "set or print guarded patches to push\n"
3164 "set or print guarded patches to push\n"
3164 "\n"
3165 "\n"
3165 " Use the qguard command to set or print guards on patch, then use\n"
3166 " Use the qguard command to set or print guards on patch, then use\n"
3166 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3167 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3167 " it has no guards or any positive guards match the currently\n"
3168 " it has no guards or any positive guards match the currently\n"
3168 " selected guard, but will not be pushed if any negative guards\n"
3169 " selected guard, but will not be pushed if any negative guards\n"
3169 " match the current guard. For example:\n"
3170 " match the current guard. For example:\n"
3170 "\n"
3171 "\n"
3171 " qguard foo.patch -stable (negative guard)\n"
3172 " qguard foo.patch -stable (negative guard)\n"
3172 " qguard bar.patch +stable (positive guard)\n"
3173 " qguard bar.patch +stable (positive guard)\n"
3173 " qselect stable\n"
3174 " qselect stable\n"
3174 "\n"
3175 "\n"
3175 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3176 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3176 " it has a negative match) but push bar.patch (because it has a\n"
3177 " it has a negative match) but push bar.patch (because it has a\n"
3177 " positive match).\n"
3178 " positive match).\n"
3178 "\n"
3179 "\n"
3179 " With no arguments, prints the currently active guards.\n"
3180 " With no arguments, prints the currently active guards.\n"
3180 " With one argument, sets the active guard.\n"
3181 " With one argument, sets the active guard.\n"
3181 "\n"
3182 "\n"
3182 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3183 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3183 " When no guards are active, patches with positive guards are\n"
3184 " When no guards are active, patches with positive guards are\n"
3184 " skipped and patches with negative guards are pushed.\n"
3185 " skipped and patches with negative guards are pushed.\n"
3185 "\n"
3186 "\n"
3186 " qselect can change the guards on applied patches. It does not pop\n"
3187 " qselect can change the guards on applied patches. It does not pop\n"
3187 " guarded patches by default. Use --pop to pop back to the last\n"
3188 " guarded patches by default. Use --pop to pop back to the last\n"
3188 " applied patch that is not guarded. Use --reapply (which implies\n"
3189 " applied patch that is not guarded. Use --reapply (which implies\n"
3189 " --pop) to push back to the current patch afterwards, but skip\n"
3190 " --pop) to push back to the current patch afterwards, but skip\n"
3190 " guarded patches.\n"
3191 " guarded patches.\n"
3191 "\n"
3192 "\n"
3192 " Use -s/--series to print a list of all guards in the series file\n"
3193 " Use -s/--series to print a list of all guards in the series file\n"
3193 " (no other arguments needed). Use -v for more information."
3194 " (no other arguments needed). Use -v for more information."
3194 msgstr ""
3195 msgstr ""
3195
3196
3196 msgid "guards deactivated\n"
3197 msgid "guards deactivated\n"
3197 msgstr ""
3198 msgstr ""
3198
3199
3199 #, python-format
3200 #, python-format
3200 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3201 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3201 msgstr ""
3202 msgstr ""
3202
3203
3203 #, python-format
3204 #, python-format
3204 msgid "number of guarded, applied patches has changed from %d to %d\n"
3205 msgid "number of guarded, applied patches has changed from %d to %d\n"
3205 msgstr ""
3206 msgstr ""
3206
3207
3207 msgid "guards in series file:\n"
3208 msgid "guards in series file:\n"
3208 msgstr ""
3209 msgstr ""
3209
3210
3210 msgid "no guards in series file\n"
3211 msgid "no guards in series file\n"
3211 msgstr ""
3212 msgstr ""
3212
3213
3213 msgid "active guards:\n"
3214 msgid "active guards:\n"
3214 msgstr ""
3215 msgstr ""
3215
3216
3216 msgid "no active guards\n"
3217 msgid "no active guards\n"
3217 msgstr ""
3218 msgstr ""
3218
3219
3219 msgid "popping guarded patches\n"
3220 msgid "popping guarded patches\n"
3220 msgstr ""
3221 msgstr ""
3221
3222
3222 msgid "reapplying unguarded patches\n"
3223 msgid "reapplying unguarded patches\n"
3223 msgstr ""
3224 msgstr ""
3224
3225
3225 msgid ""
3226 msgid ""
3226 "move applied patches into repository history\n"
3227 "move applied patches into repository history\n"
3227 "\n"
3228 "\n"
3228 " Finishes the specified revisions (corresponding to applied\n"
3229 " Finishes the specified revisions (corresponding to applied\n"
3229 " patches) by moving them out of mq control into regular repository\n"
3230 " patches) by moving them out of mq control into regular repository\n"
3230 " history.\n"
3231 " history.\n"
3231 "\n"
3232 "\n"
3232 " Accepts a revision range or the -a/--applied option. If --applied\n"
3233 " Accepts a revision range or the -a/--applied option. If --applied\n"
3233 " is specified, all applied mq revisions are removed from mq\n"
3234 " is specified, all applied mq revisions are removed from mq\n"
3234 " control. Otherwise, the given revisions must be at the base of the\n"
3235 " control. Otherwise, the given revisions must be at the base of the\n"
3235 " stack of applied patches.\n"
3236 " stack of applied patches.\n"
3236 "\n"
3237 "\n"
3237 " This can be especially useful if your changes have been applied to\n"
3238 " This can be especially useful if your changes have been applied to\n"
3238 " an upstream repository, or if you are about to push your changes\n"
3239 " an upstream repository, or if you are about to push your changes\n"
3239 " to upstream.\n"
3240 " to upstream.\n"
3240 " "
3241 " "
3241 msgstr ""
3242 msgstr ""
3242
3243
3243 msgid "no revisions specified"
3244 msgid "no revisions specified"
3244 msgstr ""
3245 msgstr ""
3245
3246
3246 msgid "cannot commit over an applied mq patch"
3247 msgid "cannot commit over an applied mq patch"
3247 msgstr ""
3248 msgstr ""
3248
3249
3249 msgid "source has mq patches applied"
3250 msgid "source has mq patches applied"
3250 msgstr ""
3251 msgstr ""
3251
3252
3252 #, python-format
3253 #, python-format
3253 msgid "mq status file refers to unknown node %s\n"
3254 msgid "mq status file refers to unknown node %s\n"
3254 msgstr ""
3255 msgstr ""
3255
3256
3256 #, python-format
3257 #, python-format
3257 msgid "Tag %s overrides mq patch of the same name\n"
3258 msgid "Tag %s overrides mq patch of the same name\n"
3258 msgstr ""
3259 msgstr ""
3259
3260
3260 msgid "cannot import over an applied patch"
3261 msgid "cannot import over an applied patch"
3261 msgstr ""
3262 msgstr ""
3262
3263
3263 msgid "print first line of patch header"
3264 msgid "print first line of patch header"
3264 msgstr ""
3265 msgstr ""
3265
3266
3266 #, fuzzy
3267 msgid "show only the last patch"
3267 msgid "show only the last patch"
3268 msgstr "visa bara adderade filer"
3268 msgstr "visa bara den sista patchen"
3269
3269
3270 msgid "hg qapplied [-1] [-s] [PATCH]"
3270 msgid "hg qapplied [-1] [-s] [PATCH]"
3271 msgstr ""
3271 msgstr ""
3272
3272
3273 msgid "use pull protocol to copy metadata"
3273 msgid "use pull protocol to copy metadata"
3274 msgstr "använd pull-protokollet för att kopiera metadata"
3274 msgstr "använd pull-protokollet för att kopiera metadata"
3275
3275
3276 msgid "do not update the new working directories"
3276 msgid "do not update the new working directories"
3277 msgstr ""
3277 msgstr ""
3278
3278
3279 msgid "use uncompressed transfer (fast over LAN)"
3279 msgid "use uncompressed transfer (fast over LAN)"
3280 msgstr "använd okomprimerad överföring (snabbt över LAN)"
3280 msgstr "använd okomprimerad överföring (snabbt över LAN)"
3281
3281
3282 msgid "location of source patch repository"
3282 msgid "location of source patch repository"
3283 msgstr ""
3283 msgstr ""
3284
3284
3285 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3285 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3286 msgstr ""
3286 msgstr ""
3287
3287
3288 msgid "hg qcommit [OPTION]... [FILE]..."
3288 msgid "hg qcommit [OPTION]... [FILE]..."
3289 msgstr ""
3289 msgstr ""
3290
3290
3291 msgid "hg qdiff [OPTION]... [FILE]..."
3291 msgid "hg qdiff [OPTION]... [FILE]..."
3292 msgstr ""
3292 msgstr ""
3293
3293
3294 msgid "keep patch file"
3294 msgid "keep patch file"
3295 msgstr ""
3295 msgstr ""
3296
3296
3297 msgid "stop managing a revision (DEPRECATED)"
3297 msgid "stop managing a revision (DEPRECATED)"
3298 msgstr ""
3298 msgstr ""
3299
3299
3300 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3300 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3301 msgstr ""
3301 msgstr ""
3302
3302
3303 msgid "edit patch header"
3303 msgid "edit patch header"
3304 msgstr ""
3304 msgstr ""
3305
3305
3306 msgid "keep folded patch files"
3306 msgid "keep folded patch files"
3307 msgstr ""
3307 msgstr ""
3308
3308
3309 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3309 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3310 msgstr ""
3310 msgstr ""
3311
3311
3312 msgid "overwrite any local changes"
3312 msgid "overwrite any local changes"
3313 msgstr ""
3313 msgstr ""
3314
3314
3315 msgid "hg qgoto [OPTION]... PATCH"
3315 msgid "hg qgoto [OPTION]... PATCH"
3316 msgstr ""
3316 msgstr ""
3317
3317
3318 msgid "list all patches and guards"
3318 msgid "list all patches and guards"
3319 msgstr ""
3319 msgstr ""
3320
3320
3321 msgid "drop all guards"
3321 msgid "drop all guards"
3322 msgstr ""
3322 msgstr ""
3323
3323
3324 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3324 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3325 msgstr ""
3325 msgstr ""
3326
3326
3327 msgid "hg qheader [PATCH]"
3327 msgid "hg qheader [PATCH]"
3328 msgstr ""
3328 msgstr ""
3329
3329
3330 msgid "import file in patch directory"
3330 msgid "import file in patch directory"
3331 msgstr ""
3331 msgstr ""
3332
3332
3333 msgid "name of patch file"
3333 msgid "name of patch file"
3334 msgstr ""
3334 msgstr ""
3335
3335
3336 msgid "overwrite existing files"
3336 msgid "overwrite existing files"
3337 msgstr ""
3337 msgstr ""
3338
3338
3339 msgid "place existing revisions under mq control"
3339 msgid "place existing revisions under mq control"
3340 msgstr ""
3340 msgstr ""
3341
3341
3342 msgid "use git extended diff format"
3342 msgid "use git extended diff format"
3343 msgstr "använd gits utökade diff-format"
3343 msgstr "använd gits utökade diff-format"
3344
3344
3345 msgid "qpush after importing"
3345 msgid "qpush after importing"
3346 msgstr ""
3346 msgstr ""
3347
3347
3348 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3348 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3349 msgstr ""
3349 msgstr ""
3350
3350
3351 msgid "create queue repository"
3351 msgid "create queue repository"
3352 msgstr ""
3352 msgstr ""
3353
3353
3354 msgid "hg qinit [-c]"
3354 msgid "hg qinit [-c]"
3355 msgstr ""
3355 msgstr ""
3356
3356
3357 msgid "import uncommitted changes into patch"
3357 msgid "import uncommitted changes into patch"
3358 msgstr ""
3358 msgstr ""
3359
3359
3360 msgid "add \"From: <current user>\" to patch"
3360 msgid "add \"From: <current user>\" to patch"
3361 msgstr ""
3361 msgstr ""
3362
3362
3363 msgid "add \"From: <given user>\" to patch"
3363 msgid "add \"From: <given user>\" to patch"
3364 msgstr ""
3364 msgstr ""
3365
3365
3366 msgid "add \"Date: <current date>\" to patch"
3366 msgid "add \"Date: <current date>\" to patch"
3367 msgstr ""
3367 msgstr ""
3368
3368
3369 msgid "add \"Date: <given date>\" to patch"
3369 msgid "add \"Date: <given date>\" to patch"
3370 msgstr ""
3370 msgstr ""
3371
3371
3372 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3372 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3373 msgstr ""
3373 msgstr ""
3374
3374
3375 msgid "hg qnext [-s]"
3375 msgid "hg qnext [-s]"
3376 msgstr ""
3376 msgstr ""
3377
3377
3378 msgid "hg qprev [-s]"
3378 msgid "hg qprev [-s]"
3379 msgstr ""
3379 msgstr ""
3380
3380
3381 msgid "pop all patches"
3381 msgid "pop all patches"
3382 msgstr ""
3382 msgstr ""
3383
3383
3384 msgid "queue name to pop"
3384 msgid "queue name to pop"
3385 msgstr ""
3385 msgstr ""
3386
3386
3387 msgid "forget any local changes to patched files"
3387 msgid "forget any local changes to patched files"
3388 msgstr ""
3388 msgstr ""
3389
3389
3390 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3390 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3391 msgstr ""
3391 msgstr ""
3392
3392
3393 msgid "apply if the patch has rejects"
3393 msgid "apply if the patch has rejects"
3394 msgstr ""
3394 msgstr ""
3395
3395
3396 msgid "list patch name in commit text"
3396 msgid "list patch name in commit text"
3397 msgstr ""
3397 msgstr ""
3398
3398
3399 msgid "apply all patches"
3399 msgid "apply all patches"
3400 msgstr ""
3400 msgstr ""
3401
3401
3402 msgid "merge from another queue"
3402 msgid "merge from another queue"
3403 msgstr ""
3403 msgstr ""
3404
3404
3405 msgid "merge queue name"
3405 msgid "merge queue name"
3406 msgstr ""
3406 msgstr ""
3407
3407
3408 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3408 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3409 msgstr ""
3409 msgstr ""
3410
3410
3411 msgid "refresh only files already in the patch and specified files"
3411 msgid "refresh only files already in the patch and specified files"
3412 msgstr ""
3412 msgstr ""
3413
3413
3414 msgid "add/update author field in patch with current user"
3414 msgid "add/update author field in patch with current user"
3415 msgstr ""
3415 msgstr ""
3416
3416
3417 msgid "add/update author field in patch with given user"
3417 msgid "add/update author field in patch with given user"
3418 msgstr ""
3418 msgstr ""
3419
3419
3420 msgid "add/update date field in patch with current date"
3420 msgid "add/update date field in patch with current date"
3421 msgstr ""
3421 msgstr ""
3422
3422
3423 msgid "add/update date field in patch with given date"
3423 msgid "add/update date field in patch with given date"
3424 msgstr ""
3424 msgstr ""
3425
3425
3426 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3426 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3427 msgstr ""
3427 msgstr ""
3428
3428
3429 msgid "hg qrename PATCH1 [PATCH2]"
3429 msgid "hg qrename PATCH1 [PATCH2]"
3430 msgstr ""
3430 msgstr ""
3431
3431
3432 msgid "delete save entry"
3432 msgid "delete save entry"
3433 msgstr ""
3433 msgstr ""
3434
3434
3435 msgid "update queue working directory"
3435 msgid "update queue working directory"
3436 msgstr ""
3436 msgstr ""
3437
3437
3438 msgid "hg qrestore [-d] [-u] REV"
3438 msgid "hg qrestore [-d] [-u] REV"
3439 msgstr ""
3439 msgstr ""
3440
3440
3441 msgid "copy patch directory"
3441 msgid "copy patch directory"
3442 msgstr ""
3442 msgstr ""
3443
3443
3444 msgid "copy directory name"
3444 msgid "copy directory name"
3445 msgstr ""
3445 msgstr ""
3446
3446
3447 msgid "clear queue status file"
3447 msgid "clear queue status file"
3448 msgstr ""
3448 msgstr ""
3449
3449
3450 msgid "force copy"
3450 msgid "force copy"
3451 msgstr ""
3451 msgstr ""
3452
3452
3453 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3453 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3454 msgstr ""
3454 msgstr ""
3455
3455
3456 msgid "disable all guards"
3456 msgid "disable all guards"
3457 msgstr ""
3457 msgstr ""
3458
3458
3459 msgid "list all guards in series file"
3459 msgid "list all guards in series file"
3460 msgstr ""
3460 msgstr ""
3461
3461
3462 msgid "pop to before first guarded applied patch"
3462 msgid "pop to before first guarded applied patch"
3463 msgstr ""
3463 msgstr ""
3464
3464
3465 msgid "pop, then reapply patches"
3465 msgid "pop, then reapply patches"
3466 msgstr ""
3466 msgstr ""
3467
3467
3468 msgid "hg qselect [OPTION]... [GUARD]..."
3468 msgid "hg qselect [OPTION]... [GUARD]..."
3469 msgstr ""
3469 msgstr ""
3470
3470
3471 msgid "print patches not in series"
3471 msgid "print patches not in series"
3472 msgstr ""
3472 msgstr ""
3473
3473
3474 msgid "hg qseries [-ms]"
3474 msgid "hg qseries [-ms]"
3475 msgstr ""
3475 msgstr ""
3476
3476
3477 msgid "force removal with local changes"
3477 msgid "force removal with local changes"
3478 msgstr ""
3478 msgstr ""
3479
3479
3480 msgid "bundle unrelated changesets"
3480 msgid "bundle unrelated changesets"
3481 msgstr ""
3481 msgstr ""
3482
3482
3483 msgid "no backups"
3483 msgid "no backups"
3484 msgstr ""
3484 msgstr ""
3485
3485
3486 msgid "hg strip [-f] [-b] [-n] REV"
3486 msgid "hg strip [-f] [-b] [-n] REV"
3487 msgstr ""
3487 msgstr ""
3488
3488
3489 msgid "hg qtop [-s]"
3489 msgid "hg qtop [-s]"
3490 msgstr ""
3490 msgstr ""
3491
3491
3492 #, fuzzy
3493 msgid "show only the first patch"
3492 msgid "show only the first patch"
3494 msgstr "visa bara adderade filer"
3493 msgstr "visa bara den första patchen"
3495
3494
3496 msgid "hg qunapplied [-1] [-s] [PATCH]"
3495 msgid "hg qunapplied [-1] [-s] [PATCH]"
3497 msgstr ""
3496 msgstr ""
3498
3497
3499 msgid "finish all applied changesets"
3498 msgid "finish all applied changesets"
3500 msgstr ""
3499 msgstr ""
3501
3500
3502 msgid "hg qfinish [-a] [REV]..."
3501 msgid "hg qfinish [-a] [REV]..."
3503 msgstr ""
3502 msgstr ""
3504
3503
3505 msgid ""
3504 msgid ""
3506 "hooks for sending email notifications at commit/push time\n"
3505 "hooks for sending email notifications at commit/push time\n"
3507 "\n"
3506 "\n"
3508 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3507 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3509 "print messages to stdout, for testing and configuring.\n"
3508 "print messages to stdout, for testing and configuring.\n"
3510 "\n"
3509 "\n"
3511 "To use, configure the notify extension and enable it in hgrc like\n"
3510 "To use, configure the notify extension and enable it in hgrc like\n"
3512 "this::\n"
3511 "this::\n"
3513 "\n"
3512 "\n"
3514 " [extensions]\n"
3513 " [extensions]\n"
3515 " hgext.notify =\n"
3514 " hgext.notify =\n"
3516 "\n"
3515 "\n"
3517 " [hooks]\n"
3516 " [hooks]\n"
3518 " # one email for each incoming changeset\n"
3517 " # one email for each incoming changeset\n"
3519 " incoming.notify = python:hgext.notify.hook\n"
3518 " incoming.notify = python:hgext.notify.hook\n"
3520 " # batch emails when many changesets incoming at one time\n"
3519 " # batch emails when many changesets incoming at one time\n"
3521 " changegroup.notify = python:hgext.notify.hook\n"
3520 " changegroup.notify = python:hgext.notify.hook\n"
3522 "\n"
3521 "\n"
3523 " [notify]\n"
3522 " [notify]\n"
3524 " # config items go here\n"
3523 " # config items go here\n"
3525 "\n"
3524 "\n"
3526 "Required configuration items::\n"
3525 "Required configuration items::\n"
3527 "\n"
3526 "\n"
3528 " config = /path/to/file # file containing subscriptions\n"
3527 " config = /path/to/file # file containing subscriptions\n"
3529 "\n"
3528 "\n"
3530 "Optional configuration items::\n"
3529 "Optional configuration items::\n"
3531 "\n"
3530 "\n"
3532 " test = True # print messages to stdout for testing\n"
3531 " test = True # print messages to stdout for testing\n"
3533 " strip = 3 # number of slashes to strip for url paths\n"
3532 " strip = 3 # number of slashes to strip for url paths\n"
3534 " domain = example.com # domain to use if committer missing domain\n"
3533 " domain = example.com # domain to use if committer missing domain\n"
3535 " style = ... # style file to use when formatting email\n"
3534 " style = ... # style file to use when formatting email\n"
3536 " template = ... # template to use when formatting email\n"
3535 " template = ... # template to use when formatting email\n"
3537 " incoming = ... # template to use when run as incoming hook\n"
3536 " incoming = ... # template to use when run as incoming hook\n"
3538 " changegroup = ... # template when run as changegroup hook\n"
3537 " changegroup = ... # template when run as changegroup hook\n"
3539 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3538 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3540 " maxsubject = 67 # truncate subject line longer than this\n"
3539 " maxsubject = 67 # truncate subject line longer than this\n"
3541 " diffstat = True # add a diffstat before the diff content\n"
3540 " diffstat = True # add a diffstat before the diff content\n"
3542 " sources = serve # notify if source of incoming changes in this "
3541 " sources = serve # notify if source of incoming changes in this "
3543 "list\n"
3542 "list\n"
3544 " # (serve == ssh or http, push, pull, bundle)\n"
3543 " # (serve == ssh or http, push, pull, bundle)\n"
3545 " merge = False # send notification for merges (default True)\n"
3544 " merge = False # send notification for merges (default True)\n"
3546 " [email]\n"
3545 " [email]\n"
3547 " from = user@host.com # email address to send as if none given\n"
3546 " from = user@host.com # email address to send as if none given\n"
3548 " [web]\n"
3547 " [web]\n"
3549 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3548 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3550 "\n"
3549 "\n"
3551 "The notify config file has same format as a regular hgrc file. It has\n"
3550 "The notify config file has same format as a regular hgrc file. It has\n"
3552 "two sections so you can express subscriptions in whatever way is\n"
3551 "two sections so you can express subscriptions in whatever way is\n"
3553 "handier for you.\n"
3552 "handier for you.\n"
3554 "\n"
3553 "\n"
3555 "::\n"
3554 "::\n"
3556 "\n"
3555 "\n"
3557 " [usersubs]\n"
3556 " [usersubs]\n"
3558 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3557 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3559 " user@host = pattern\n"
3558 " user@host = pattern\n"
3560 "\n"
3559 "\n"
3561 " [reposubs]\n"
3560 " [reposubs]\n"
3562 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3561 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3563 " pattern = user@host\n"
3562 " pattern = user@host\n"
3564 "\n"
3563 "\n"
3565 "Glob patterns are matched against path to repository root.\n"
3564 "Glob patterns are matched against path to repository root.\n"
3566 "\n"
3565 "\n"
3567 "If you like, you can put notify config file in repository that users\n"
3566 "If you like, you can put notify config file in repository that users\n"
3568 "can push changes to, they can manage their own subscriptions.\n"
3567 "can push changes to, they can manage their own subscriptions.\n"
3569 msgstr ""
3568 msgstr ""
3570
3569
3571 #, python-format
3570 #, python-format
3572 msgid "%s: %d new changesets"
3571 msgid "%s: %d new changesets"
3573 msgstr ""
3572 msgstr ""
3574
3573
3575 #, python-format
3574 #, python-format
3576 msgid "notify: sending %d subscribers %d changes\n"
3575 msgid "notify: sending %d subscribers %d changes\n"
3577 msgstr ""
3576 msgstr ""
3578
3577
3579 #, python-format
3578 #, python-format
3580 msgid ""
3579 msgid ""
3581 "\n"
3580 "\n"
3582 "diffs (truncated from %d to %d lines):\n"
3581 "diffs (truncated from %d to %d lines):\n"
3583 "\n"
3582 "\n"
3584 msgstr ""
3583 msgstr ""
3585
3584
3586 #, python-format
3585 #, python-format
3587 msgid ""
3586 msgid ""
3588 "\n"
3587 "\n"
3589 "diffs (%d lines):\n"
3588 "diffs (%d lines):\n"
3590 "\n"
3589 "\n"
3591 msgstr ""
3590 msgstr ""
3592
3591
3593 #, python-format
3592 #, python-format
3594 msgid "notify: suppressing notification for merge %d:%s\n"
3593 msgid "notify: suppressing notification for merge %d:%s\n"
3595 msgstr ""
3594 msgstr ""
3596
3595
3597 msgid ""
3596 msgid ""
3598 "browse command output with an external pager\n"
3597 "browse command output with an external pager\n"
3599 "\n"
3598 "\n"
3600 "To set the pager that should be used, set the application variable::\n"
3599 "To set the pager that should be used, set the application variable::\n"
3601 "\n"
3600 "\n"
3602 " [pager]\n"
3601 " [pager]\n"
3603 " pager = LESS='FSRX' less\n"
3602 " pager = LESS='FSRX' less\n"
3604 "\n"
3603 "\n"
3605 "If no pager is set, the pager extensions uses the environment variable\n"
3604 "If no pager is set, the pager extensions uses the environment variable\n"
3606 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3605 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3607 "\n"
3606 "\n"
3608 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3607 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3609 "setting::\n"
3608 "setting::\n"
3610 "\n"
3609 "\n"
3611 " [pager]\n"
3610 " [pager]\n"
3612 " quiet = True\n"
3611 " quiet = True\n"
3613 "\n"
3612 "\n"
3614 "You can disable the pager for certain commands by adding them to the\n"
3613 "You can disable the pager for certain commands by adding them to the\n"
3615 "pager.ignore list::\n"
3614 "pager.ignore list::\n"
3616 "\n"
3615 "\n"
3617 " [pager]\n"
3616 " [pager]\n"
3618 " ignore = version, help, update\n"
3617 " ignore = version, help, update\n"
3619 "\n"
3618 "\n"
3620 "You can also enable the pager only for certain commands using\n"
3619 "You can also enable the pager only for certain commands using\n"
3621 "pager.attend::\n"
3620 "pager.attend::\n"
3622 "\n"
3621 "\n"
3623 " [pager]\n"
3622 " [pager]\n"
3624 " attend = log\n"
3623 " attend = log\n"
3625 "\n"
3624 "\n"
3626 "If pager.attend is present, pager.ignore will be ignored.\n"
3625 "If pager.attend is present, pager.ignore will be ignored.\n"
3627 "\n"
3626 "\n"
3628 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3627 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3629 "specify them in the global .hgrc\n"
3628 "specify them in the global .hgrc\n"
3630 msgstr ""
3629 msgstr ""
3631
3630
3632 msgid ""
3631 msgid ""
3633 "interpret suffixes to refer to ancestor revisions\n"
3632 "interpret suffixes to refer to ancestor revisions\n"
3634 "\n"
3633 "\n"
3635 "This extension allows you to use git-style suffixes to refer to the\n"
3634 "This extension allows you to use git-style suffixes to refer to the\n"
3636 "ancestors of a specific revision.\n"
3635 "ancestors of a specific revision.\n"
3637 "\n"
3636 "\n"
3638 "For example, if you can refer to a revision as \"foo\", then::\n"
3637 "For example, if you can refer to a revision as \"foo\", then::\n"
3639 "\n"
3638 "\n"
3640 " foo^N = Nth parent of foo\n"
3639 " foo^N = Nth parent of foo\n"
3641 " foo^0 = foo\n"
3640 " foo^0 = foo\n"
3642 " foo^1 = first parent of foo\n"
3641 " foo^1 = first parent of foo\n"
3643 " foo^2 = second parent of foo\n"
3642 " foo^2 = second parent of foo\n"
3644 " foo^ = foo^1\n"
3643 " foo^ = foo^1\n"
3645 "\n"
3644 "\n"
3646 " foo~N = Nth first grandparent of foo\n"
3645 " foo~N = Nth first grandparent of foo\n"
3647 " foo~0 = foo\n"
3646 " foo~0 = foo\n"
3648 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3647 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3649 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3648 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3650 msgstr ""
3649 msgstr ""
3651
3650
3652 msgid ""
3651 msgid ""
3653 "command to send changesets as (a series of) patch emails\n"
3652 "command to send changesets as (a series of) patch emails\n"
3654 "\n"
3653 "\n"
3655 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3654 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3656 "describes the series as a whole.\n"
3655 "describes the series as a whole.\n"
3657 "\n"
3656 "\n"
3658 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3657 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3659 "first line of the changeset description as the subject text. The\n"
3658 "first line of the changeset description as the subject text. The\n"
3660 "message contains two or three body parts:\n"
3659 "message contains two or three body parts:\n"
3661 "\n"
3660 "\n"
3662 "- The changeset description.\n"
3661 "- The changeset description.\n"
3663 "- [Optional] The result of running diffstat on the patch.\n"
3662 "- [Optional] The result of running diffstat on the patch.\n"
3664 "- The patch itself, as generated by \"hg export\".\n"
3663 "- The patch itself, as generated by \"hg export\".\n"
3665 "\n"
3664 "\n"
3666 "Each message refers to the first in the series using the In-Reply-To\n"
3665 "Each message refers to the first in the series using the In-Reply-To\n"
3667 "and References headers, so they will show up as a sequence in threaded\n"
3666 "and References headers, so they will show up as a sequence in threaded\n"
3668 "mail and news readers, and in mail archives.\n"
3667 "mail and news readers, and in mail archives.\n"
3669 "\n"
3668 "\n"
3670 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3669 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3671 "with a diffstat summary and the changeset summary, so you can be sure\n"
3670 "with a diffstat summary and the changeset summary, so you can be sure\n"
3672 "you are sending the right changes.\n"
3671 "you are sending the right changes.\n"
3673 "\n"
3672 "\n"
3674 "To configure other defaults, add a section like this to your hgrc\n"
3673 "To configure other defaults, add a section like this to your hgrc\n"
3675 "file::\n"
3674 "file::\n"
3676 "\n"
3675 "\n"
3677 " [email]\n"
3676 " [email]\n"
3678 " from = My Name <my@email>\n"
3677 " from = My Name <my@email>\n"
3679 " to = recipient1, recipient2, ...\n"
3678 " to = recipient1, recipient2, ...\n"
3680 " cc = cc1, cc2, ...\n"
3679 " cc = cc1, cc2, ...\n"
3681 " bcc = bcc1, bcc2, ...\n"
3680 " bcc = bcc1, bcc2, ...\n"
3682 "\n"
3681 "\n"
3683 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3682 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3684 "as a patchbomb.\n"
3683 "as a patchbomb.\n"
3685 "\n"
3684 "\n"
3686 "To avoid sending patches prematurely, it is a good idea to first run\n"
3685 "To avoid sending patches prematurely, it is a good idea to first run\n"
3687 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3686 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3688 "prompted for an email recipient address, a subject and an introductory\n"
3687 "prompted for an email recipient address, a subject and an introductory\n"
3689 "message describing the patches of your patchbomb. Then when all is\n"
3688 "message describing the patches of your patchbomb. Then when all is\n"
3690 "done, patchbomb messages are displayed. If the PAGER environment\n"
3689 "done, patchbomb messages are displayed. If the PAGER environment\n"
3691 "variable is set, your pager will be fired up once for each patchbomb\n"
3690 "variable is set, your pager will be fired up once for each patchbomb\n"
3692 "message, so you can verify everything is alright.\n"
3691 "message, so you can verify everything is alright.\n"
3693 "\n"
3692 "\n"
3694 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3693 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3695 "patchbomb message in a pager or sending the messages directly, it will\n"
3694 "patchbomb message in a pager or sending the messages directly, it will\n"
3696 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3695 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3697 "can be previewed with any mail user agent which supports UNIX mbox\n"
3696 "can be previewed with any mail user agent which supports UNIX mbox\n"
3698 "files, e.g. with mutt::\n"
3697 "files, e.g. with mutt::\n"
3699 "\n"
3698 "\n"
3700 " % mutt -R -f mbox\n"
3699 " % mutt -R -f mbox\n"
3701 "\n"
3700 "\n"
3702 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3701 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3703 "(a utility that is commonly installed as part of the procmail\n"
3702 "(a utility that is commonly installed as part of the procmail\n"
3704 "package), to send each message out::\n"
3703 "package), to send each message out::\n"
3705 "\n"
3704 "\n"
3706 " % formail -s sendmail -bm -t < mbox\n"
3705 " % formail -s sendmail -bm -t < mbox\n"
3707 "\n"
3706 "\n"
3708 "That should be all. Now your patchbomb is on its way out.\n"
3707 "That should be all. Now your patchbomb is on its way out.\n"
3709 "\n"
3708 "\n"
3710 "You can also either configure the method option in the email section\n"
3709 "You can also either configure the method option in the email section\n"
3711 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3710 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3712 "that the patchbomb extension can automatically send patchbombs\n"
3711 "that the patchbomb extension can automatically send patchbombs\n"
3713 "directly from the commandline. See the [email] and [smtp] sections in\n"
3712 "directly from the commandline. See the [email] and [smtp] sections in\n"
3714 "hgrc(5) for details.\n"
3713 "hgrc(5) for details.\n"
3715 msgstr ""
3714 msgstr ""
3716
3715
3717 #, python-format
3716 #, python-format
3718 msgid "%sPlease enter a valid value"
3717 msgid "%sPlease enter a valid value"
3719 msgstr ""
3718 msgstr ""
3720
3719
3721 msgid "Please enter a valid value.\n"
3720 msgid "Please enter a valid value.\n"
3722 msgstr ""
3721 msgstr ""
3723
3722
3724 msgid "does the diffstat above look okay? "
3723 msgid "does the diffstat above look okay? "
3725 msgstr ""
3724 msgstr ""
3726
3725
3727 msgid "diffstat rejected"
3726 msgid "diffstat rejected"
3728 msgstr ""
3727 msgstr ""
3729
3728
3730 msgid ""
3729 msgid ""
3731 "send changesets by email\n"
3730 "send changesets by email\n"
3732 "\n"
3731 "\n"
3733 " By default, diffs are sent in the format generated by hg export,\n"
3732 " By default, diffs are sent in the format generated by hg export,\n"
3734 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3733 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3735 " introduction, which describes the series as a whole.\n"
3734 " introduction, which describes the series as a whole.\n"
3736 "\n"
3735 "\n"
3737 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3736 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3738 " the first line of the changeset description as the subject text.\n"
3737 " the first line of the changeset description as the subject text.\n"
3739 " The message contains two or three parts. First, the changeset\n"
3738 " The message contains two or three parts. First, the changeset\n"
3740 " description. Next, (optionally) if the diffstat program is\n"
3739 " description. Next, (optionally) if the diffstat program is\n"
3741 " installed and -d/--diffstat is used, the result of running\n"
3740 " installed and -d/--diffstat is used, the result of running\n"
3742 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3741 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3743 " \"hg export\".\n"
3742 " \"hg export\".\n"
3744 "\n"
3743 "\n"
3745 " By default the patch is included as text in the email body for\n"
3744 " By default the patch is included as text in the email body for\n"
3746 " easy reviewing. Using the -a/--attach option will instead create\n"
3745 " easy reviewing. Using the -a/--attach option will instead create\n"
3747 " an attachment for the patch. With -i/--inline an inline attachment\n"
3746 " an attachment for the patch. With -i/--inline an inline attachment\n"
3748 " will be created.\n"
3747 " will be created.\n"
3749 "\n"
3748 "\n"
3750 " With -o/--outgoing, emails will be generated for patches not found\n"
3749 " With -o/--outgoing, emails will be generated for patches not found\n"
3751 " in the destination repository (or only those which are ancestors\n"
3750 " in the destination repository (or only those which are ancestors\n"
3752 " of the specified revisions if any are provided)\n"
3751 " of the specified revisions if any are provided)\n"
3753 "\n"
3752 "\n"
3754 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3753 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3755 " single email containing a binary Mercurial bundle as an attachment\n"
3754 " single email containing a binary Mercurial bundle as an attachment\n"
3756 " will be sent.\n"
3755 " will be sent.\n"
3757 "\n"
3756 "\n"
3758 " Examples::\n"
3757 " Examples::\n"
3759 "\n"
3758 "\n"
3760 " hg email -r 3000 # send patch 3000 only\n"
3759 " hg email -r 3000 # send patch 3000 only\n"
3761 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3760 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3762 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3761 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3763 " hg email 3000 # send patch 3000 (deprecated)\n"
3762 " hg email 3000 # send patch 3000 (deprecated)\n"
3764 "\n"
3763 "\n"
3765 " hg email -o # send all patches not in default\n"
3764 " hg email -o # send all patches not in default\n"
3766 " hg email -o DEST # send all patches not in DEST\n"
3765 " hg email -o DEST # send all patches not in DEST\n"
3767 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3766 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3768 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3767 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3769 "\n"
3768 "\n"
3770 " hg email -b # send bundle of all patches not in default\n"
3769 " hg email -b # send bundle of all patches not in default\n"
3771 " hg email -b DEST # send bundle of all patches not in DEST\n"
3770 " hg email -b DEST # send bundle of all patches not in DEST\n"
3772 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3771 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3773 "default\n"
3772 "default\n"
3774 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
3773 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
3775 "DEST\n"
3774 "DEST\n"
3776 "\n"
3775 "\n"
3777 " Before using this command, you will need to enable email in your\n"
3776 " Before using this command, you will need to enable email in your\n"
3778 " hgrc. See the [email] section in hgrc(5) for details.\n"
3777 " hgrc. See the [email] section in hgrc(5) for details.\n"
3779 " "
3778 " "
3780 msgstr ""
3779 msgstr ""
3781
3780
3782 msgid "specify at least one changeset with -r or -o"
3781 msgid "specify at least one changeset with -r or -o"
3783 msgstr ""
3782 msgstr ""
3784
3783
3785 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3784 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3786 msgstr ""
3785 msgstr ""
3787
3786
3788 msgid "too many destinations"
3787 msgid "too many destinations"
3789 msgstr ""
3788 msgstr ""
3790
3789
3791 msgid "use only one form to specify the revision"
3790 msgid "use only one form to specify the revision"
3792 msgstr ""
3791 msgstr ""
3793
3792
3794 msgid ""
3793 msgid ""
3795 "\n"
3794 "\n"
3796 "Write the introductory message for the patch series.\n"
3795 "Write the introductory message for the patch series.\n"
3797 "\n"
3796 "\n"
3798 msgstr ""
3797 msgstr ""
3799
3798
3800 #, python-format
3799 #, python-format
3801 msgid ""
3800 msgid ""
3802 "This patch series consists of %d patches.\n"
3801 "This patch series consists of %d patches.\n"
3803 "\n"
3802 "\n"
3804 msgstr ""
3803 msgstr ""
3805
3804
3806 msgid "Final summary:\n"
3805 msgid "Final summary:\n"
3807 msgstr ""
3806 msgstr ""
3808
3807
3809 msgid "Displaying "
3808 msgid "Displaying "
3810 msgstr ""
3809 msgstr ""
3811
3810
3812 msgid "Writing "
3811 msgid "Writing "
3813 msgstr ""
3812 msgstr ""
3814
3813
3815 msgid "Sending "
3814 msgid "Sending "
3816 msgstr ""
3815 msgstr ""
3817
3816
3818 msgid "send patches as attachments"
3817 msgid "send patches as attachments"
3819 msgstr ""
3818 msgstr ""
3820
3819
3821 msgid "send patches as inline attachments"
3820 msgid "send patches as inline attachments"
3822 msgstr ""
3821 msgstr ""
3823
3822
3824 msgid "email addresses of blind carbon copy recipients"
3823 msgid "email addresses of blind carbon copy recipients"
3825 msgstr ""
3824 msgstr ""
3826
3825
3827 msgid "email addresses of copy recipients"
3826 msgid "email addresses of copy recipients"
3828 msgstr ""
3827 msgstr ""
3829
3828
3830 msgid "add diffstat output to messages"
3829 msgid "add diffstat output to messages"
3831 msgstr ""
3830 msgstr ""
3832
3831
3833 msgid "use the given date as the sending date"
3832 msgid "use the given date as the sending date"
3834 msgstr ""
3833 msgstr ""
3835
3834
3836 msgid "use the given file as the series description"
3835 msgid "use the given file as the series description"
3837 msgstr ""
3836 msgstr ""
3838
3837
3839 msgid "email address of sender"
3838 msgid "email address of sender"
3840 msgstr ""
3839 msgstr ""
3841
3840
3842 msgid "print messages that would be sent"
3841 msgid "print messages that would be sent"
3843 msgstr ""
3842 msgstr ""
3844
3843
3845 msgid "write messages to mbox file instead of sending them"
3844 msgid "write messages to mbox file instead of sending them"
3846 msgstr ""
3845 msgstr ""
3847
3846
3848 msgid "subject of first message (intro or single patch)"
3847 msgid "subject of first message (intro or single patch)"
3849 msgstr ""
3848 msgstr ""
3850
3849
3851 msgid "message identifier to reply to"
3850 msgid "message identifier to reply to"
3852 msgstr ""
3851 msgstr ""
3853
3852
3854 msgid "flags to add in subject prefixes"
3853 msgid "flags to add in subject prefixes"
3855 msgstr ""
3854 msgstr ""
3856
3855
3857 msgid "email addresses of recipients"
3856 msgid "email addresses of recipients"
3858 msgstr ""
3857 msgstr ""
3859
3858
3860 msgid "omit hg patch header"
3859 msgid "omit hg patch header"
3861 msgstr ""
3860 msgstr ""
3862
3861
3863 msgid "send changes not found in the target repository"
3862 msgid "send changes not found in the target repository"
3864 msgstr ""
3863 msgstr ""
3865
3864
3866 msgid "send changes not in target as a binary bundle"
3865 msgid "send changes not in target as a binary bundle"
3867 msgstr ""
3866 msgstr ""
3868
3867
3869 msgid "name of the bundle attachment file"
3868 msgid "name of the bundle attachment file"
3870 msgstr ""
3869 msgstr ""
3871
3870
3872 msgid "a revision to send"
3871 msgid "a revision to send"
3873 msgstr ""
3872 msgstr ""
3874
3873
3875 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3874 msgid "run even when remote repository is unrelated (with -b/--bundle)"
3876 msgstr ""
3875 msgstr ""
3877
3876
3878 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3877 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
3879 msgstr ""
3878 msgstr ""
3880
3879
3881 msgid "send an introduction email for a single patch"
3880 msgid "send an introduction email for a single patch"
3882 msgstr ""
3881 msgstr ""
3883
3882
3884 msgid "hg email [OPTION]... [DEST]..."
3883 msgid "hg email [OPTION]... [DEST]..."
3885 msgstr ""
3884 msgstr ""
3886
3885
3887 msgid "command to delete untracked files from the working directory"
3886 msgid "command to delete untracked files from the working directory"
3888 msgstr ""
3887 msgstr ""
3889
3888
3890 msgid ""
3889 msgid ""
3891 "removes files not tracked by Mercurial\n"
3890 "removes files not tracked by Mercurial\n"
3892 "\n"
3891 "\n"
3893 " Delete files not known to Mercurial. This is useful to test local\n"
3892 " Delete files not known to Mercurial. This is useful to test local\n"
3894 " and uncommitted changes in an otherwise-clean source tree.\n"
3893 " and uncommitted changes in an otherwise-clean source tree.\n"
3895 "\n"
3894 "\n"
3896 " This means that purge will delete:\n"
3895 " This means that purge will delete:\n"
3897 "\n"
3896 "\n"
3898 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3897 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3899 " - Empty directories: in fact Mercurial ignores directories unless\n"
3898 " - Empty directories: in fact Mercurial ignores directories unless\n"
3900 " they contain files under source control management\n"
3899 " they contain files under source control management\n"
3901 "\n"
3900 "\n"
3902 " But it will leave untouched:\n"
3901 " But it will leave untouched:\n"
3903 "\n"
3902 "\n"
3904 " - Modified and unmodified tracked files\n"
3903 " - Modified and unmodified tracked files\n"
3905 " - Ignored files (unless --all is specified)\n"
3904 " - Ignored files (unless --all is specified)\n"
3906 " - New files added to the repository (with \"hg add\")\n"
3905 " - New files added to the repository (with \"hg add\")\n"
3907 "\n"
3906 "\n"
3908 " If directories are given on the command line, only files in these\n"
3907 " If directories are given on the command line, only files in these\n"
3909 " directories are considered.\n"
3908 " directories are considered.\n"
3910 "\n"
3909 "\n"
3911 " Be careful with purge, as you could irreversibly delete some files\n"
3910 " Be careful with purge, as you could irreversibly delete some files\n"
3912 " you forgot to add to the repository. If you only want to print the\n"
3911 " you forgot to add to the repository. If you only want to print the\n"
3913 " list of files that this program would delete, use the --print\n"
3912 " list of files that this program would delete, use the --print\n"
3914 " option.\n"
3913 " option.\n"
3915 " "
3914 " "
3916 msgstr ""
3915 msgstr ""
3917
3916
3918 #, python-format
3917 #, python-format
3919 msgid "%s cannot be removed"
3918 msgid "%s cannot be removed"
3920 msgstr ""
3919 msgstr ""
3921
3920
3922 #, python-format
3921 #, python-format
3923 msgid "warning: %s\n"
3922 msgid "warning: %s\n"
3924 msgstr ""
3923 msgstr ""
3925
3924
3926 #, python-format
3925 #, python-format
3927 msgid "Removing file %s\n"
3926 msgid "Removing file %s\n"
3928 msgstr ""
3927 msgstr ""
3929
3928
3930 #, python-format
3929 #, python-format
3931 msgid "Removing directory %s\n"
3930 msgid "Removing directory %s\n"
3932 msgstr ""
3931 msgstr ""
3933
3932
3934 msgid "abort if an error occurs"
3933 msgid "abort if an error occurs"
3935 msgstr ""
3934 msgstr ""
3936
3935
3937 msgid "purge ignored files too"
3936 msgid "purge ignored files too"
3938 msgstr ""
3937 msgstr ""
3939
3938
3940 msgid "print filenames instead of deleting them"
3939 msgid "print filenames instead of deleting them"
3941 msgstr ""
3940 msgstr ""
3942
3941
3943 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3942 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
3944 msgstr ""
3943 msgstr ""
3945
3944
3946 msgid "hg purge [OPTION]... [DIR]..."
3945 msgid "hg purge [OPTION]... [DIR]..."
3947 msgstr ""
3946 msgstr ""
3948
3947
3949 msgid ""
3948 msgid ""
3950 "command to move sets of revisions to a different ancestor\n"
3949 "command to move sets of revisions to a different ancestor\n"
3951 "\n"
3950 "\n"
3952 "This extension lets you rebase changesets in an existing Mercurial\n"
3951 "This extension lets you rebase changesets in an existing Mercurial\n"
3953 "repository.\n"
3952 "repository.\n"
3954 "\n"
3953 "\n"
3955 "For more information:\n"
3954 "For more information:\n"
3956 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
3955 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
3957 msgstr ""
3956 msgstr ""
3958
3957
3959 msgid ""
3958 msgid ""
3960 "move changeset (and descendants) to a different branch\n"
3959 "move changeset (and descendants) to a different branch\n"
3961 "\n"
3960 "\n"
3962 " Rebase uses repeated merging to graft changesets from one part of\n"
3961 " Rebase uses repeated merging to graft changesets from one part of\n"
3963 " history onto another. This can be useful for linearizing local\n"
3962 " history onto another. This can be useful for linearizing local\n"
3964 " changes relative to a master development tree.\n"
3963 " changes relative to a master development tree.\n"
3965 "\n"
3964 "\n"
3966 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3965 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3967 " continued with --continue/-c or aborted with --abort/-a.\n"
3966 " continued with --continue/-c or aborted with --abort/-a.\n"
3968 " "
3967 " "
3969 msgstr ""
3968 msgstr ""
3970
3969
3971 msgid "cannot use both abort and continue"
3970 msgid "cannot use both abort and continue"
3972 msgstr ""
3971 msgstr ""
3973
3972
3974 msgid "cannot use collapse with continue or abort"
3973 msgid "cannot use collapse with continue or abort"
3975 msgstr ""
3974 msgstr ""
3976
3975
3977 msgid "abort and continue do not allow specifying revisions"
3976 msgid "abort and continue do not allow specifying revisions"
3978 msgstr ""
3977 msgstr ""
3979
3978
3980 msgid "cannot specify both a revision and a base"
3979 msgid "cannot specify both a revision and a base"
3981 msgstr ""
3980 msgstr ""
3982
3981
3983 msgid "nothing to rebase\n"
3982 msgid "nothing to rebase\n"
3984 msgstr ""
3983 msgstr ""
3985
3984
3986 msgid "cannot use both keepbranches and extrafn"
3985 msgid "cannot use both keepbranches and extrafn"
3987 msgstr ""
3986 msgstr ""
3988
3987
3989 msgid "rebase merging completed\n"
3988 msgid "rebase merging completed\n"
3990 msgstr ""
3989 msgstr ""
3991
3990
3992 msgid "warning: new changesets detected on source branch, not stripping\n"
3991 msgid "warning: new changesets detected on source branch, not stripping\n"
3993 msgstr ""
3992 msgstr ""
3994
3993
3995 msgid "rebase completed\n"
3994 msgid "rebase completed\n"
3996 msgstr ""
3995 msgstr ""
3997
3996
3998 #, python-format
3997 #, python-format
3999 msgid "%d revisions have been skipped\n"
3998 msgid "%d revisions have been skipped\n"
4000 msgstr ""
3999 msgstr ""
4001
4000
4002 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4001 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4003 msgstr ""
4002 msgstr ""
4004
4003
4005 #, python-format
4004 #, python-format
4006 msgid "no changes, revision %d skipped\n"
4005 msgid "no changes, revision %d skipped\n"
4007 msgstr ""
4006 msgstr ""
4008
4007
4009 #, python-format
4008 #, python-format
4010 msgid "cannot use revision %d as base, result would have 3 parents"
4009 msgid "cannot use revision %d as base, result would have 3 parents"
4011 msgstr ""
4010 msgstr ""
4012
4011
4013 msgid "no rebase in progress"
4012 msgid "no rebase in progress"
4014 msgstr ""
4013 msgstr ""
4015
4014
4016 msgid "warning: new changesets detected on target branch, not stripping\n"
4015 msgid "warning: new changesets detected on target branch, not stripping\n"
4017 msgstr ""
4016 msgstr ""
4018
4017
4019 msgid "rebase aborted\n"
4018 msgid "rebase aborted\n"
4020 msgstr ""
4019 msgstr ""
4021
4020
4022 msgid "cannot rebase onto an applied mq patch"
4021 msgid "cannot rebase onto an applied mq patch"
4023 msgstr ""
4022 msgstr ""
4024
4023
4025 msgid "source is ancestor of destination"
4024 msgid "source is ancestor of destination"
4026 msgstr ""
4025 msgstr ""
4027
4026
4028 msgid "source is descendant of destination"
4027 msgid "source is descendant of destination"
4029 msgstr ""
4028 msgstr ""
4030
4029
4031 msgid "unable to collapse, there is more than one external parent"
4030 msgid "unable to collapse, there is more than one external parent"
4032 msgstr ""
4031 msgstr ""
4033
4032
4034 msgid "rebase working directory to branch head"
4033 msgid "rebase working directory to branch head"
4035 msgstr ""
4034 msgstr ""
4036
4035
4037 msgid "rebase from a given revision"
4036 msgid "rebase from a given revision"
4038 msgstr ""
4037 msgstr ""
4039
4038
4040 msgid "rebase from the base of a given revision"
4039 msgid "rebase from the base of a given revision"
4041 msgstr ""
4040 msgstr ""
4042
4041
4043 msgid "rebase onto a given revision"
4042 msgid "rebase onto a given revision"
4044 msgstr ""
4043 msgstr ""
4045
4044
4046 #, fuzzy
4047 msgid "collapse the rebased changesets"
4045 msgid "collapse the rebased changesets"
4048 msgstr "visa ändring"
4046 msgstr ""
4049
4047
4050 msgid "keep original changesets"
4048 msgid "keep original changesets"
4051 msgstr ""
4049 msgstr ""
4052
4050
4053 msgid "keep original branch names"
4051 msgid "keep original branch names"
4054 msgstr ""
4052 msgstr ""
4055
4053
4056 msgid "continue an interrupted rebase"
4054 msgid "continue an interrupted rebase"
4057 msgstr ""
4055 msgstr ""
4058
4056
4059 msgid "abort an interrupted rebase"
4057 msgid "abort an interrupted rebase"
4060 msgstr ""
4058 msgstr ""
4061
4059
4062 msgid ""
4060 msgid ""
4063 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4061 "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
4064 "| [-c] | [-a]"
4062 "| [-c] | [-a]"
4065 msgstr ""
4063 msgstr ""
4066
4064
4067 msgid "commands to interactively select changes for commit/qrefresh"
4065 msgid "commands to interactively select changes for commit/qrefresh"
4068 msgstr ""
4066 msgstr ""
4069
4067
4070 msgid "this modifies a binary file (all or nothing)\n"
4068 msgid "this modifies a binary file (all or nothing)\n"
4071 msgstr ""
4069 msgstr ""
4072
4070
4073 msgid "this is a binary file\n"
4071 msgid "this is a binary file\n"
4074 msgstr ""
4072 msgstr ""
4075
4073
4076 #, python-format
4074 #, python-format
4077 msgid "%d hunks, %d lines changed\n"
4075 msgid "%d hunks, %d lines changed\n"
4078 msgstr ""
4076 msgstr ""
4079
4077
4080 msgid "[Ynsfdaq?]"
4078 msgid "[Ynsfdaq?]"
4081 msgstr ""
4079 msgstr ""
4082
4080
4083 msgid "&Yes, record this change"
4081 msgid "&Yes, record this change"
4084 msgstr ""
4082 msgstr ""
4085
4083
4086 msgid "&No, skip this change"
4084 msgid "&No, skip this change"
4087 msgstr ""
4085 msgstr ""
4088
4086
4089 msgid "&Skip remaining changes to this file"
4087 msgid "&Skip remaining changes to this file"
4090 msgstr ""
4088 msgstr ""
4091
4089
4092 msgid "Record remaining changes to this &file"
4090 msgid "Record remaining changes to this &file"
4093 msgstr ""
4091 msgstr ""
4094
4092
4095 msgid "&Done, skip remaining changes and files"
4093 msgid "&Done, skip remaining changes and files"
4096 msgstr ""
4094 msgstr ""
4097
4095
4098 msgid "Record &all changes to all remaining files"
4096 msgid "Record &all changes to all remaining files"
4099 msgstr ""
4097 msgstr ""
4100
4098
4101 msgid "&Quit, recording no changes"
4099 msgid "&Quit, recording no changes"
4102 msgstr ""
4100 msgstr ""
4103
4101
4104 msgid "&?"
4102 msgid "&?"
4105 msgstr ""
4103 msgstr ""
4106
4104
4107 msgid "y - record this change"
4105 msgid "y - record this change"
4108 msgstr ""
4106 msgstr ""
4109
4107
4110 msgid "user quit"
4108 msgid "user quit"
4111 msgstr ""
4109 msgstr ""
4112
4110
4113 #, python-format
4111 #, python-format
4114 msgid "examine changes to %s?"
4112 msgid "examine changes to %s?"
4115 msgstr ""
4113 msgstr ""
4116
4114
4117 msgid " and "
4115 msgid " and "
4118 msgstr ""
4116 msgstr ""
4119
4117
4120 msgid "y"
4118 msgid "y"
4121 msgstr ""
4119 msgstr ""
4122
4120
4123 #, python-format
4121 #, python-format
4124 msgid "record this change to %r?"
4122 msgid "record this change to %r?"
4125 msgstr ""
4123 msgstr ""
4126
4124
4127 #, python-format
4125 #, python-format
4128 msgid "record change %d/%d to %r?"
4126 msgid "record change %d/%d to %r?"
4129 msgstr ""
4127 msgstr ""
4130
4128
4131 msgid ""
4129 msgid ""
4132 "interactively select changes to commit\n"
4130 "interactively select changes to commit\n"
4133 "\n"
4131 "\n"
4134 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4132 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4135 " will be candidates for recording.\n"
4133 " will be candidates for recording.\n"
4136 "\n"
4134 "\n"
4137 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4135 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4138 "\n"
4136 "\n"
4139 " You will be prompted for whether to record changes to each\n"
4137 " You will be prompted for whether to record changes to each\n"
4140 " modified file, and for files with multiple changes, for each\n"
4138 " modified file, and for files with multiple changes, for each\n"
4141 " change to use. For each query, the following responses are\n"
4139 " change to use. For each query, the following responses are\n"
4142 " possible::\n"
4140 " possible::\n"
4143 "\n"
4141 "\n"
4144 " y - record this change\n"
4142 " y - record this change\n"
4145 " n - skip this change\n"
4143 " n - skip this change\n"
4146 "\n"
4144 "\n"
4147 " s - skip remaining changes to this file\n"
4145 " s - skip remaining changes to this file\n"
4148 " f - record remaining changes to this file\n"
4146 " f - record remaining changes to this file\n"
4149 "\n"
4147 "\n"
4150 " d - done, skip remaining changes and files\n"
4148 " d - done, skip remaining changes and files\n"
4151 " a - record all changes to all remaining files\n"
4149 " a - record all changes to all remaining files\n"
4152 " q - quit, recording no changes\n"
4150 " q - quit, recording no changes\n"
4153 "\n"
4151 "\n"
4154 " ? - display help"
4152 " ? - display help"
4155 msgstr ""
4153 msgstr ""
4156
4154
4157 msgid "'mq' extension not loaded"
4155 msgid "'mq' extension not loaded"
4158 msgstr ""
4156 msgstr ""
4159
4157
4160 msgid "running non-interactively, use commit instead"
4158 msgid "running non-interactively, use commit instead"
4161 msgstr ""
4159 msgstr ""
4162
4160
4163 msgid "no changes to record\n"
4161 msgid "no changes to record\n"
4164 msgstr ""
4162 msgstr ""
4165
4163
4166 msgid "patch failed to apply"
4164 msgid "patch failed to apply"
4167 msgstr ""
4165 msgstr ""
4168
4166
4169 msgid "hg record [OPTION]... [FILE]..."
4167 msgid "hg record [OPTION]... [FILE]..."
4170 msgstr ""
4168 msgstr ""
4171
4169
4172 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4170 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4173 msgstr ""
4171 msgstr ""
4174
4172
4175 msgid "share a common history between several working directories"
4173 msgid "share a common history between several working directories"
4176 msgstr ""
4174 msgstr ""
4177
4175
4178 msgid ""
4176 msgid ""
4179 "create a new shared repository (experimental)\n"
4177 "create a new shared repository (experimental)\n"
4180 "\n"
4178 "\n"
4181 " Initialize a new repository and working directory that shares its\n"
4179 " Initialize a new repository and working directory that shares its\n"
4182 " history with another repository.\n"
4180 " history with another repository.\n"
4183 "\n"
4181 "\n"
4184 " NOTE: actions that change history such as rollback or moving the\n"
4182 " NOTE: actions that change history such as rollback or moving the\n"
4185 " source may confuse sharers.\n"
4183 " source may confuse sharers.\n"
4186 " "
4184 " "
4187 msgstr ""
4185 msgstr ""
4188
4186
4189 msgid "do not create a working copy"
4187 msgid "do not create a working copy"
4190 msgstr ""
4188 msgstr ""
4191
4189
4192 msgid "[-U] SOURCE [DEST]"
4190 msgid "[-U] SOURCE [DEST]"
4193 msgstr ""
4191 msgstr ""
4194
4192
4195 msgid ""
4193 msgid ""
4196 "command to transplant changesets from another branch\n"
4194 "command to transplant changesets from another branch\n"
4197 "\n"
4195 "\n"
4198 "This extension allows you to transplant patches from another branch.\n"
4196 "This extension allows you to transplant patches from another branch.\n"
4199 "\n"
4197 "\n"
4200 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4198 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4201 "map from a changeset hash to its hash in the source repository.\n"
4199 "map from a changeset hash to its hash in the source repository.\n"
4202 msgstr ""
4200 msgstr ""
4203
4201
4204 #, python-format
4202 #, python-format
4205 msgid "skipping already applied revision %s\n"
4203 msgid "skipping already applied revision %s\n"
4206 msgstr ""
4204 msgstr ""
4207
4205
4208 #, python-format
4206 #, python-format
4209 msgid "skipping merge changeset %s:%s\n"
4207 msgid "skipping merge changeset %s:%s\n"
4210 msgstr ""
4208 msgstr ""
4211
4209
4212 #, python-format
4210 #, python-format
4213 msgid "%s merged at %s\n"
4211 msgid "%s merged at %s\n"
4214 msgstr ""
4212 msgstr ""
4215
4213
4216 #, python-format
4214 #, python-format
4217 msgid "%s transplanted to %s\n"
4215 msgid "%s transplanted to %s\n"
4218 msgstr ""
4216 msgstr ""
4219
4217
4220 #, python-format
4218 #, python-format
4221 msgid "filtering %s\n"
4219 msgid "filtering %s\n"
4222 msgstr ""
4220 msgstr ""
4223
4221
4224 msgid "filter failed"
4222 msgid "filter failed"
4225 msgstr ""
4223 msgstr ""
4226
4224
4227 msgid "can only omit patchfile if merging"
4225 msgid "can only omit patchfile if merging"
4228 msgstr ""
4226 msgstr ""
4229
4227
4230 #, python-format
4228 #, python-format
4231 msgid "%s: empty changeset"
4229 msgid "%s: empty changeset"
4232 msgstr ""
4230 msgstr ""
4233
4231
4234 msgid "Fix up the merge and run hg transplant --continue"
4232 msgid "Fix up the merge and run hg transplant --continue"
4235 msgstr ""
4233 msgstr ""
4236
4234
4237 #, python-format
4235 #, python-format
4238 msgid "%s transplanted as %s\n"
4236 msgid "%s transplanted as %s\n"
4239 msgstr ""
4237 msgstr ""
4240
4238
4241 msgid "transplant log file is corrupt"
4239 msgid "transplant log file is corrupt"
4242 msgstr ""
4240 msgstr ""
4243
4241
4244 #, python-format
4242 #, python-format
4245 msgid "working dir not at transplant parent %s"
4243 msgid "working dir not at transplant parent %s"
4246 msgstr ""
4244 msgstr ""
4247
4245
4248 msgid "commit failed"
4246 msgid "commit failed"
4249 msgstr ""
4247 msgstr ""
4250
4248
4251 msgid "apply changeset? [ynmpcq?]:"
4249 msgid "apply changeset? [ynmpcq?]:"
4252 msgstr ""
4250 msgstr ""
4253
4251
4254 msgid ""
4252 msgid ""
4255 "transplant changesets from another branch\n"
4253 "transplant changesets from another branch\n"
4256 "\n"
4254 "\n"
4257 " Selected changesets will be applied on top of the current working\n"
4255 " Selected changesets will be applied on top of the current working\n"
4258 " directory with the log of the original changeset. If --log is\n"
4256 " directory with the log of the original changeset. If --log is\n"
4259 " specified, log messages will have a comment appended of the form::\n"
4257 " specified, log messages will have a comment appended of the form::\n"
4260 "\n"
4258 "\n"
4261 " (transplanted from CHANGESETHASH)\n"
4259 " (transplanted from CHANGESETHASH)\n"
4262 "\n"
4260 "\n"
4263 " You can rewrite the changelog message with the --filter option.\n"
4261 " You can rewrite the changelog message with the --filter option.\n"
4264 " Its argument will be invoked with the current changelog message as\n"
4262 " Its argument will be invoked with the current changelog message as\n"
4265 " $1 and the patch as $2.\n"
4263 " $1 and the patch as $2.\n"
4266 "\n"
4264 "\n"
4267 " If --source/-s is specified, selects changesets from the named\n"
4265 " If --source/-s is specified, selects changesets from the named\n"
4268 " repository. If --branch/-b is specified, selects changesets from\n"
4266 " repository. If --branch/-b is specified, selects changesets from\n"
4269 " the branch holding the named revision, up to that revision. If\n"
4267 " the branch holding the named revision, up to that revision. If\n"
4270 " --all/-a is specified, all changesets on the branch will be\n"
4268 " --all/-a is specified, all changesets on the branch will be\n"
4271 " transplanted, otherwise you will be prompted to select the\n"
4269 " transplanted, otherwise you will be prompted to select the\n"
4272 " changesets you want.\n"
4270 " changesets you want.\n"
4273 "\n"
4271 "\n"
4274 " hg transplant --branch REVISION --all will rebase the selected\n"
4272 " hg transplant --branch REVISION --all will rebase the selected\n"
4275 " branch (up to the named revision) onto your current working\n"
4273 " branch (up to the named revision) onto your current working\n"
4276 " directory.\n"
4274 " directory.\n"
4277 "\n"
4275 "\n"
4278 " You can optionally mark selected transplanted changesets as merge\n"
4276 " You can optionally mark selected transplanted changesets as merge\n"
4279 " changesets. You will not be prompted to transplant any ancestors\n"
4277 " changesets. You will not be prompted to transplant any ancestors\n"
4280 " of a merged transplant, and you can merge descendants of them\n"
4278 " of a merged transplant, and you can merge descendants of them\n"
4281 " normally instead of transplanting them.\n"
4279 " normally instead of transplanting them.\n"
4282 "\n"
4280 "\n"
4283 " If no merges or revisions are provided, hg transplant will start\n"
4281 " If no merges or revisions are provided, hg transplant will start\n"
4284 " an interactive changeset browser.\n"
4282 " an interactive changeset browser.\n"
4285 "\n"
4283 "\n"
4286 " If a changeset application fails, you can fix the merge by hand\n"
4284 " If a changeset application fails, you can fix the merge by hand\n"
4287 " and then resume where you left off by calling hg transplant\n"
4285 " and then resume where you left off by calling hg transplant\n"
4288 " --continue/-c.\n"
4286 " --continue/-c.\n"
4289 " "
4287 " "
4290 msgstr ""
4288 msgstr ""
4291
4289
4292 msgid "--continue is incompatible with branch, all or merge"
4290 msgid "--continue is incompatible with branch, all or merge"
4293 msgstr ""
4291 msgstr ""
4294
4292
4295 msgid "no source URL, branch tag or revision list provided"
4293 msgid "no source URL, branch tag or revision list provided"
4296 msgstr ""
4294 msgstr ""
4297
4295
4298 msgid "--all requires a branch revision"
4296 msgid "--all requires a branch revision"
4299 msgstr ""
4297 msgstr ""
4300
4298
4301 msgid "--all is incompatible with a revision list"
4299 msgid "--all is incompatible with a revision list"
4302 msgstr ""
4300 msgstr ""
4303
4301
4304 msgid "no revision checked out"
4302 msgid "no revision checked out"
4305 msgstr ""
4303 msgstr ""
4306
4304
4307 msgid "outstanding uncommitted merges"
4305 msgid "outstanding uncommitted merges"
4308 msgstr ""
4306 msgstr ""
4309
4307
4310 msgid "outstanding local changes"
4308 msgid "outstanding local changes"
4311 msgstr ""
4309 msgstr ""
4312
4310
4313 msgid "pull patches from REPOSITORY"
4311 msgid "pull patches from REPOSITORY"
4314 msgstr ""
4312 msgstr ""
4315
4313
4316 msgid "pull patches from branch BRANCH"
4314 msgid "pull patches from branch BRANCH"
4317 msgstr ""
4315 msgstr ""
4318
4316
4319 msgid "pull all changesets up to BRANCH"
4317 msgid "pull all changesets up to BRANCH"
4320 msgstr ""
4318 msgstr ""
4321
4319
4322 msgid "skip over REV"
4320 msgid "skip over REV"
4323 msgstr ""
4321 msgstr ""
4324
4322
4325 msgid "merge at REV"
4323 msgid "merge at REV"
4326 msgstr ""
4324 msgstr ""
4327
4325
4328 msgid "append transplant info to log message"
4326 msgid "append transplant info to log message"
4329 msgstr ""
4327 msgstr ""
4330
4328
4331 msgid "continue last transplant session after repair"
4329 msgid "continue last transplant session after repair"
4332 msgstr ""
4330 msgstr ""
4333
4331
4334 msgid "filter changesets through FILTER"
4332 msgid "filter changesets through FILTER"
4335 msgstr ""
4333 msgstr ""
4336
4334
4337 msgid ""
4335 msgid ""
4338 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4336 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4339 msgstr ""
4337 msgstr ""
4340
4338
4341 msgid ""
4339 msgid ""
4342 "allow the use of MBCS paths with problematic encodings\n"
4340 "allow the use of MBCS paths with problematic encodings\n"
4343 "\n"
4341 "\n"
4344 "Some MBCS encodings are not good for some path operations (i.e.\n"
4342 "Some MBCS encodings are not good for some path operations (i.e.\n"
4345 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4343 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4346 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4344 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4347 "This extension can be used to fix the issue with those encodings by\n"
4345 "This extension can be used to fix the issue with those encodings by\n"
4348 "wrapping some functions to convert to Unicode string before path\n"
4346 "wrapping some functions to convert to Unicode string before path\n"
4349 "operation.\n"
4347 "operation.\n"
4350 "\n"
4348 "\n"
4351 "This extension is useful for:\n"
4349 "This extension is useful for:\n"
4352 "\n"
4350 "\n"
4353 "- Japanese Windows users using shift_jis encoding.\n"
4351 "- Japanese Windows users using shift_jis encoding.\n"
4354 "- Chinese Windows users using big5 encoding.\n"
4352 "- Chinese Windows users using big5 encoding.\n"
4355 "- All users who use a repository with one of problematic encodings on\n"
4353 "- All users who use a repository with one of problematic encodings on\n"
4356 " case-insensitive file system.\n"
4354 " case-insensitive file system.\n"
4357 "\n"
4355 "\n"
4358 "This extension is not needed for:\n"
4356 "This extension is not needed for:\n"
4359 "\n"
4357 "\n"
4360 "- Any user who use only ASCII chars in path.\n"
4358 "- Any user who use only ASCII chars in path.\n"
4361 "- Any user who do not use any of problematic encodings.\n"
4359 "- Any user who do not use any of problematic encodings.\n"
4362 "\n"
4360 "\n"
4363 "Note that there are some limitations on using this extension:\n"
4361 "Note that there are some limitations on using this extension:\n"
4364 "\n"
4362 "\n"
4365 "- You should use single encoding in one repository.\n"
4363 "- You should use single encoding in one repository.\n"
4366 "- You should set same encoding for the repository by locale or\n"
4364 "- You should set same encoding for the repository by locale or\n"
4367 " HGENCODING.\n"
4365 " HGENCODING.\n"
4368 "\n"
4366 "\n"
4369 "Path encoding conversion are done between Unicode and\n"
4367 "Path encoding conversion are done between Unicode and\n"
4370 "encoding.encoding which is decided by Mercurial from current locale\n"
4368 "encoding.encoding which is decided by Mercurial from current locale\n"
4371 "setting or HGENCODING.\n"
4369 "setting or HGENCODING.\n"
4372 msgstr ""
4370 msgstr ""
4373
4371
4374 #, python-format
4372 #, python-format
4375 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4373 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4376 msgstr ""
4374 msgstr ""
4377
4375
4378 msgid "[win32mbcs] cannot activate on this platform.\n"
4376 msgid "[win32mbcs] cannot activate on this platform.\n"
4379 msgstr ""
4377 msgstr ""
4380
4378
4381 msgid ""
4379 msgid ""
4382 "perform automatic newline conversion\n"
4380 "perform automatic newline conversion\n"
4383 "\n"
4381 "\n"
4384 "To perform automatic newline conversion, use::\n"
4382 "To perform automatic newline conversion, use::\n"
4385 "\n"
4383 "\n"
4386 " [extensions]\n"
4384 " [extensions]\n"
4387 " hgext.win32text =\n"
4385 " hgext.win32text =\n"
4388 " [encode]\n"
4386 " [encode]\n"
4389 " ** = cleverencode:\n"
4387 " ** = cleverencode:\n"
4390 " # or ** = macencode:\n"
4388 " # or ** = macencode:\n"
4391 "\n"
4389 "\n"
4392 " [decode]\n"
4390 " [decode]\n"
4393 " ** = cleverdecode:\n"
4391 " ** = cleverdecode:\n"
4394 " # or ** = macdecode:\n"
4392 " # or ** = macdecode:\n"
4395 "\n"
4393 "\n"
4396 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4394 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4397 "accident::\n"
4395 "accident::\n"
4398 "\n"
4396 "\n"
4399 " [hooks]\n"
4397 " [hooks]\n"
4400 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4398 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4401 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4399 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4402 "\n"
4400 "\n"
4403 "To do the same check on a server to prevent CRLF/CR from being\n"
4401 "To do the same check on a server to prevent CRLF/CR from being\n"
4404 "pushed or pulled::\n"
4402 "pushed or pulled::\n"
4405 "\n"
4403 "\n"
4406 " [hooks]\n"
4404 " [hooks]\n"
4407 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4405 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4408 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4406 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4409 msgstr ""
4407 msgstr ""
4410
4408
4411 #, python-format
4409 #, python-format
4412 msgid ""
4410 msgid ""
4413 "WARNING: %s already has %s line endings\n"
4411 "WARNING: %s already has %s line endings\n"
4414 "and does not need EOL conversion by the win32text plugin.\n"
4412 "and does not need EOL conversion by the win32text plugin.\n"
4415 "Before your next commit, please reconsider your encode/decode settings in \n"
4413 "Before your next commit, please reconsider your encode/decode settings in \n"
4416 "Mercurial.ini or %s.\n"
4414 "Mercurial.ini or %s.\n"
4417 msgstr ""
4415 msgstr ""
4418
4416
4419 #, python-format
4417 #, python-format
4420 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4418 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4421 msgstr ""
4419 msgstr ""
4422
4420
4423 #, python-format
4421 #, python-format
4424 msgid "in %s: %s\n"
4422 msgid "in %s: %s\n"
4425 msgstr ""
4423 msgstr ""
4426
4424
4427 #, python-format
4425 #, python-format
4428 msgid ""
4426 msgid ""
4429 "\n"
4427 "\n"
4430 "To prevent this mistake in your local repository,\n"
4428 "To prevent this mistake in your local repository,\n"
4431 "add to Mercurial.ini or .hg/hgrc:\n"
4429 "add to Mercurial.ini or .hg/hgrc:\n"
4432 "\n"
4430 "\n"
4433 "[hooks]\n"
4431 "[hooks]\n"
4434 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4432 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4435 "\n"
4433 "\n"
4436 "and also consider adding:\n"
4434 "and also consider adding:\n"
4437 "\n"
4435 "\n"
4438 "[extensions]\n"
4436 "[extensions]\n"
4439 "hgext.win32text =\n"
4437 "hgext.win32text =\n"
4440 "[encode]\n"
4438 "[encode]\n"
4441 "** = %sencode:\n"
4439 "** = %sencode:\n"
4442 "[decode]\n"
4440 "[decode]\n"
4443 "** = %sdecode:\n"
4441 "** = %sdecode:\n"
4444 msgstr ""
4442 msgstr ""
4445
4443
4446 msgid ""
4444 msgid ""
4447 "discover and advertise repositories on the local network\n"
4445 "discover and advertise repositories on the local network\n"
4448 "\n"
4446 "\n"
4449 "Zeroconf enabled repositories will be announced in a network without\n"
4447 "Zeroconf enabled repositories will be announced in a network without\n"
4450 "the need to configure a server or a service. They can be discovered\n"
4448 "the need to configure a server or a service. They can be discovered\n"
4451 "without knowing their actual IP address.\n"
4449 "without knowing their actual IP address.\n"
4452 "\n"
4450 "\n"
4453 "To allow other people to discover your repository using run \"hg serve\"\n"
4451 "To allow other people to discover your repository using run \"hg serve\"\n"
4454 "in your repository::\n"
4452 "in your repository::\n"
4455 "\n"
4453 "\n"
4456 " $ cd test\n"
4454 " $ cd test\n"
4457 " $ hg serve\n"
4455 " $ hg serve\n"
4458 "\n"
4456 "\n"
4459 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4457 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4460 "\n"
4458 "\n"
4461 " $ hg paths\n"
4459 " $ hg paths\n"
4462 " zc-test = http://example.com:8000/test\n"
4460 " zc-test = http://example.com:8000/test\n"
4463 msgstr ""
4461 msgstr ""
4464
4462
4465 msgid "archive prefix contains illegal components"
4463 msgid "archive prefix contains illegal components"
4466 msgstr ""
4464 msgstr ""
4467
4465
4468 msgid "cannot give prefix when archiving to files"
4466 msgid "cannot give prefix when archiving to files"
4469 msgstr ""
4467 msgstr ""
4470
4468
4471 #, python-format
4469 #, python-format
4472 msgid "unknown archive type '%s'"
4470 msgid "unknown archive type '%s'"
4473 msgstr ""
4471 msgstr ""
4474
4472
4475 msgid "invalid changegroup"
4473 msgid "invalid changegroup"
4476 msgstr ""
4474 msgstr ""
4477
4475
4478 msgid "unknown parent"
4476 msgid "unknown parent"
4479 msgstr ""
4477 msgstr ""
4480
4478
4481 #, python-format
4479 #, python-format
4482 msgid "integrity check failed on %s:%d"
4480 msgid "integrity check failed on %s:%d"
4483 msgstr ""
4481 msgstr ""
4484
4482
4485 #, python-format
4483 #, python-format
4486 msgid "%s: not a Mercurial bundle file"
4484 msgid "%s: not a Mercurial bundle file"
4487 msgstr ""
4485 msgstr ""
4488
4486
4489 #, python-format
4487 #, python-format
4490 msgid "%s: unknown bundle version"
4488 msgid "%s: unknown bundle version"
4491 msgstr ""
4489 msgstr ""
4492
4490
4493 #, python-format
4491 #, python-format
4494 msgid "%s: unknown bundle compression type"
4492 msgid "%s: unknown bundle compression type"
4495 msgstr ""
4493 msgstr ""
4496
4494
4497 msgid "cannot create new bundle repository"
4495 msgid "cannot create new bundle repository"
4498 msgstr ""
4496 msgstr ""
4499
4497
4500 #, python-format
4498 #, python-format
4501 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4499 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4502 msgstr ""
4500 msgstr ""
4503
4501
4504 msgid "empty username"
4502 msgid "empty username"
4505 msgstr ""
4503 msgstr ""
4506
4504
4507 #, python-format
4505 #, python-format
4508 msgid "username %s contains a newline"
4506 msgid "username %s contains a newline"
4509 msgstr ""
4507 msgstr ""
4510
4508
4511 msgid "options --message and --logfile are mutually exclusive"
4509 msgid "options --message and --logfile are mutually exclusive"
4512 msgstr ""
4510 msgstr ""
4513
4511
4514 #, python-format
4512 #, python-format
4515 msgid "can't read commit message '%s': %s"
4513 msgid "can't read commit message '%s': %s"
4516 msgstr ""
4514 msgstr ""
4517
4515
4518 msgid "limit must be a positive integer"
4516 msgid "limit must be a positive integer"
4519 msgstr ""
4517 msgstr ""
4520
4518
4521 msgid "limit must be positive"
4519 msgid "limit must be positive"
4522 msgstr ""
4520 msgstr ""
4523
4521
4524 msgid "too many revisions specified"
4522 msgid "too many revisions specified"
4525 msgstr ""
4523 msgstr ""
4526
4524
4527 #, python-format
4525 #, python-format
4528 msgid "invalid format spec '%%%s' in output filename"
4526 msgid "invalid format spec '%%%s' in output filename"
4529 msgstr ""
4527 msgstr ""
4530
4528
4531 #, python-format
4529 #, python-format
4532 msgid "adding %s\n"
4530 msgid "adding %s\n"
4533 msgstr ""
4531 msgstr ""
4534
4532
4535 #, python-format
4533 #, python-format
4536 msgid "removing %s\n"
4534 msgid "removing %s\n"
4537 msgstr ""
4535 msgstr ""
4538
4536
4539 #, python-format
4537 #, python-format
4540 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4538 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4541 msgstr ""
4539 msgstr ""
4542
4540
4543 #, python-format
4541 #, python-format
4544 msgid "%s: not copying - file is not managed\n"
4542 msgid "%s: not copying - file is not managed\n"
4545 msgstr ""
4543 msgstr ""
4546
4544
4547 #, python-format
4545 #, python-format
4548 msgid "%s: not copying - file has been marked for remove\n"
4546 msgid "%s: not copying - file has been marked for remove\n"
4549 msgstr ""
4547 msgstr ""
4550
4548
4551 #, python-format
4549 #, python-format
4552 msgid "%s: not overwriting - %s collides with %s\n"
4550 msgid "%s: not overwriting - %s collides with %s\n"
4553 msgstr ""
4551 msgstr ""
4554
4552
4555 #, python-format
4553 #, python-format
4556 msgid "%s: not overwriting - file exists\n"
4554 msgid "%s: not overwriting - file exists\n"
4557 msgstr ""
4555 msgstr ""
4558
4556
4559 #, python-format
4557 #, python-format
4560 msgid "%s: deleted in working copy\n"
4558 msgid "%s: deleted in working copy\n"
4561 msgstr ""
4559 msgstr ""
4562
4560
4563 #, python-format
4561 #, python-format
4564 msgid "%s: cannot copy - %s\n"
4562 msgid "%s: cannot copy - %s\n"
4565 msgstr ""
4563 msgstr ""
4566
4564
4567 #, python-format
4565 #, python-format
4568 msgid "moving %s to %s\n"
4566 msgid "moving %s to %s\n"
4569 msgstr ""
4567 msgstr ""
4570
4568
4571 #, python-format
4569 #, python-format
4572 msgid "copying %s to %s\n"
4570 msgid "copying %s to %s\n"
4573 msgstr ""
4571 msgstr ""
4574
4572
4575 #, python-format
4573 #, python-format
4576 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4574 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4577 msgstr ""
4575 msgstr ""
4578
4576
4579 msgid "no source or destination specified"
4577 msgid "no source or destination specified"
4580 msgstr ""
4578 msgstr ""
4581
4579
4582 msgid "no destination specified"
4580 msgid "no destination specified"
4583 msgstr ""
4581 msgstr ""
4584
4582
4585 msgid "with multiple sources, destination must be an existing directory"
4583 msgid "with multiple sources, destination must be an existing directory"
4586 msgstr ""
4584 msgstr ""
4587
4585
4588 #, python-format
4586 #, python-format
4589 msgid "destination %s is not a directory"
4587 msgid "destination %s is not a directory"
4590 msgstr ""
4588 msgstr ""
4591
4589
4592 msgid "no files to copy"
4590 msgid "no files to copy"
4593 msgstr ""
4591 msgstr ""
4594
4592
4595 msgid "(consider using --after)\n"
4593 msgid "(consider using --after)\n"
4596 msgstr ""
4594 msgstr ""
4597
4595
4598 #, python-format
4596 #, python-format
4599 msgid "changeset: %d:%s\n"
4597 msgid "changeset: %d:%s\n"
4600 msgstr ""
4598 msgstr "ändring: %d:%s\n"
4601
4599
4602 #, python-format
4600 #, python-format
4603 msgid "branch: %s\n"
4601 msgid "branch: %s\n"
4604 msgstr ""
4602 msgstr "gren: %s\n"
4605
4603
4606 #, python-format
4604 #, python-format
4607 msgid "tag: %s\n"
4605 msgid "tag: %s\n"
4608 msgstr ""
4606 msgstr "märke: %s\n"
4609
4607
4610 #, python-format
4608 #, python-format
4611 msgid "parent: %d:%s\n"
4609 msgid "parent: %d:%s\n"
4612 msgstr ""
4610 msgstr "förälder: %d:%s\n"
4613
4611
4614 #, python-format
4612 #, python-format
4615 msgid "manifest: %d:%s\n"
4613 msgid "manifest: %d:%s\n"
4616 msgstr ""
4614 msgstr "manifest: %d:%s\n"
4617
4615
4618 #, python-format
4616 #, python-format
4619 msgid "user: %s\n"
4617 msgid "user: %s\n"
4620 msgstr ""
4618 msgstr "användare: %s\n"
4621
4619
4622 #, python-format
4620 #, python-format
4623 msgid "date: %s\n"
4621 msgid "date: %s\n"
4624 msgstr ""
4622 msgstr "datum: %s\n"
4625
4623
4626 msgid "files+:"
4624 msgid "files+:"
4627 msgstr ""
4625 msgstr ""
4628
4626
4629 msgid "files-:"
4627 msgid "files-:"
4630 msgstr ""
4628 msgstr ""
4631
4629
4632 msgid "files:"
4630 msgid "files:"
4633 msgstr ""
4631 msgstr ""
4634
4632
4635 #, python-format
4633 #, python-format
4636 msgid "files: %s\n"
4634 msgid "files: %s\n"
4637 msgstr ""
4635 msgstr "filer: %s\n"
4638
4636
4639 #, python-format
4637 #, python-format
4640 msgid "copies: %s\n"
4638 msgid "copies: %s\n"
4641 msgstr ""
4639 msgstr "kopior: %s\n"
4642
4640
4643 #, python-format
4641 #, python-format
4644 msgid "extra: %s=%s\n"
4642 msgid "extra: %s=%s\n"
4645 msgstr ""
4643 msgstr ""
4646
4644
4647 msgid "description:\n"
4645 msgid "description:\n"
4648 msgstr ""
4646 msgstr "beskrivning:\n"
4649
4647
4650 #, python-format
4648 #, python-format
4651 msgid "summary: %s\n"
4649 msgid "summary: %s\n"
4652 msgstr ""
4650 msgstr "kortfattat: %s\n"
4653
4651
4654 #, python-format
4652 #, python-format
4655 msgid "%s: no key named '%s'"
4653 msgid "%s: no key named '%s'"
4656 msgstr ""
4654 msgstr ""
4657
4655
4658 #, python-format
4656 #, python-format
4659 msgid "%s: %s"
4657 msgid "%s: %s"
4660 msgstr ""
4658 msgstr ""
4661
4659
4662 #, python-format
4660 #, python-format
4663 msgid "Found revision %s from %s\n"
4661 msgid "Found revision %s from %s\n"
4664 msgstr ""
4662 msgstr ""
4665
4663
4666 msgid "revision matching date not found"
4664 msgid "revision matching date not found"
4667 msgstr ""
4665 msgstr ""
4668
4666
4669 #, python-format
4667 #, python-format
4670 msgid "cannot follow nonexistent file: \"%s\""
4668 msgid "cannot follow nonexistent file: \"%s\""
4671 msgstr ""
4669 msgstr ""
4672
4670
4673 #, python-format
4671 #, python-format
4674 msgid "%s:%s copy source revision cannot be found!\n"
4672 msgid "%s:%s copy source revision cannot be found!\n"
4675 msgstr ""
4673 msgstr ""
4676
4674
4677 msgid "can only follow copies/renames for explicit filenames"
4675 msgid "can only follow copies/renames for explicit filenames"
4678 msgstr ""
4676 msgstr ""
4679
4677
4680 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4678 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
4681 msgstr ""
4679 msgstr ""
4682
4680
4683 msgid "HG: Leave message empty to abort commit."
4681 msgid "HG: Leave message empty to abort commit."
4684 msgstr ""
4682 msgstr ""
4685
4683
4686 #, python-format
4684 #, python-format
4687 msgid "HG: user: %s"
4685 msgid "HG: user: %s"
4688 msgstr ""
4686 msgstr ""
4689
4687
4690 msgid "HG: branch merge"
4688 msgid "HG: branch merge"
4691 msgstr ""
4689 msgstr ""
4692
4690
4693 #, python-format
4691 #, python-format
4694 msgid "HG: branch '%s'"
4692 msgid "HG: branch '%s'"
4695 msgstr ""
4693 msgstr ""
4696
4694
4697 #, python-format
4695 #, python-format
4698 msgid "HG: subrepo %s"
4696 msgid "HG: subrepo %s"
4699 msgstr ""
4697 msgstr ""
4700
4698
4701 #, python-format
4699 #, python-format
4702 msgid "HG: added %s"
4700 msgid "HG: added %s"
4703 msgstr ""
4701 msgstr ""
4704
4702
4705 #, python-format
4703 #, python-format
4706 msgid "HG: changed %s"
4704 msgid "HG: changed %s"
4707 msgstr ""
4705 msgstr ""
4708
4706
4709 #, python-format
4707 #, python-format
4710 msgid "HG: removed %s"
4708 msgid "HG: removed %s"
4711 msgstr ""
4709 msgstr ""
4712
4710
4713 msgid "HG: no files changed"
4711 msgid "HG: no files changed"
4714 msgstr ""
4712 msgstr ""
4715
4713
4716 msgid "empty commit message"
4714 msgid "empty commit message"
4717 msgstr ""
4715 msgstr ""
4718
4716
4719 msgid ""
4717 msgid ""
4720 "add the specified files on the next commit\n"
4718 "add the specified files on the next commit\n"
4721 "\n"
4719 "\n"
4722 " Schedule files to be version controlled and added to the\n"
4720 " Schedule files to be version controlled and added to the\n"
4723 " repository.\n"
4721 " repository.\n"
4724 "\n"
4722 "\n"
4725 " The files will be added to the repository at the next commit. To\n"
4723 " The files will be added to the repository at the next commit. To\n"
4726 " undo an add before that, see hg forget.\n"
4724 " undo an add before that, see hg forget.\n"
4727 "\n"
4725 "\n"
4728 " If no names are given, add all files to the repository.\n"
4726 " If no names are given, add all files to the repository.\n"
4729 " "
4727 " "
4730 msgstr ""
4728 msgstr ""
4731 "lägg till de specificerade filerna i nästa arkivering\n"
4729 "lägg till de specificerade filerna i nästa arkivering\n"
4732 "\n"
4730 "\n"
4733 " Schemalägg filer att versionshanteras och läggas till i arkivet.\n"
4731 " Schemalägg filer att versionshanteras och läggas till i arkivet.\n"
4734 "\n"
4732 "\n"
4735 " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n"
4733 " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n"
4736 " ångra en addering innan dess, se hg forget.\n"
4734 " ångra en addering innan dess, se hg forget.\n"
4737 "\n"
4735 "\n"
4738 " Om inga namn anges, läggs alla filer till i arkivet.\n"
4736 " Om inga namn anges, läggs alla filer till i arkivet.\n"
4739 " "
4737 " "
4740
4738
4741 msgid ""
4739 msgid ""
4742 "add all new files, delete all missing files\n"
4740 "add all new files, delete all missing files\n"
4743 "\n"
4741 "\n"
4744 " Add all new files and remove all missing files from the\n"
4742 " Add all new files and remove all missing files from the\n"
4745 " repository.\n"
4743 " repository.\n"
4746 "\n"
4744 "\n"
4747 " New files are ignored if they match any of the patterns in\n"
4745 " New files are ignored if they match any of the patterns in\n"
4748 " .hgignore. As with add, these changes take effect at the next\n"
4746 " .hgignore. As with add, these changes take effect at the next\n"
4749 " commit.\n"
4747 " commit.\n"
4750 "\n"
4748 "\n"
4751 " Use the -s/--similarity option to detect renamed files. With a\n"
4749 " Use the -s/--similarity option to detect renamed files. With a\n"
4752 " parameter greater than 0, this compares every removed file with\n"
4750 " parameter greater than 0, this compares every removed file with\n"
4753 " every added file and records those similar enough as renames. This\n"
4751 " every added file and records those similar enough as renames. This\n"
4754 " option takes a percentage between 0 (disabled) and 100 (files must\n"
4752 " option takes a percentage between 0 (disabled) and 100 (files must\n"
4755 " be identical) as its parameter. Detecting renamed files this way\n"
4753 " be identical) as its parameter. Detecting renamed files this way\n"
4756 " can be expensive.\n"
4754 " can be expensive.\n"
4757 " "
4755 " "
4758 msgstr ""
4756 msgstr ""
4759
4757
4760 msgid "similarity must be a number"
4758 msgid "similarity must be a number"
4761 msgstr ""
4759 msgstr ""
4762
4760
4763 msgid "similarity must be between 0 and 100"
4761 msgid "similarity must be between 0 and 100"
4764 msgstr ""
4762 msgstr ""
4765
4763
4766 msgid ""
4764 msgid ""
4767 "show changeset information by line for each file\n"
4765 "show changeset information by line for each file\n"
4768 "\n"
4766 "\n"
4769 " List changes in files, showing the revision id responsible for\n"
4767 " List changes in files, showing the revision id responsible for\n"
4770 " each line\n"
4768 " each line\n"
4771 "\n"
4769 "\n"
4772 " This command is useful for discovering when a change was made and\n"
4770 " This command is useful for discovering when a change was made and\n"
4773 " by whom.\n"
4771 " by whom.\n"
4774 "\n"
4772 "\n"
4775 " Without the -a/--text option, annotate will avoid processing files\n"
4773 " Without the -a/--text option, annotate will avoid processing files\n"
4776 " it detects as binary. With -a, annotate will annotate the file\n"
4774 " it detects as binary. With -a, annotate will annotate the file\n"
4777 " anyway, although the results will probably be neither useful\n"
4775 " anyway, although the results will probably be neither useful\n"
4778 " nor desirable.\n"
4776 " nor desirable.\n"
4779 " "
4777 " "
4780 msgstr ""
4778 msgstr ""
4781 "visa ändringsinformation för varje rad i filer\n"
4779 "visa ändringsinformation för varje rad i filer\n"
4782 "\n"
4780 "\n"
4783 " Visa ändringar i filer, och ansvarigt revisions-ID för varje rad\n"
4781 " Visa ändringar i filer, och ansvarigt revisions-ID för varje rad\n"
4784 "\n"
4782 "\n"
4785 " Detta kommando är användbart för att upptäcka när en ändring gjordes\n"
4783 " Detta kommando är användbart för att upptäcka när en ändring gjordes\n"
4786 " och av vem.\n"
4784 " och av vem.\n"
4787 "\n"
4785 "\n"
4788 " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n"
4786 " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n"
4789 " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n"
4787 " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n"
4790 " om resultatet antagligen inte kommer att vara användbart.\n"
4788 " om resultatet antagligen inte kommer att vara användbart.\n"
4791 " "
4789 " "
4792
4790
4793 msgid "at least one filename or pattern is required"
4791 msgid "at least one filename or pattern is required"
4794 msgstr ""
4792 msgstr ""
4795
4793
4796 msgid "at least one of -n/-c is required for -l"
4794 msgid "at least one of -n/-c is required for -l"
4797 msgstr ""
4795 msgstr ""
4798
4796
4799 #, python-format
4797 #, python-format
4800 msgid "%s: binary file\n"
4798 msgid "%s: binary file\n"
4801 msgstr ""
4799 msgstr ""
4802
4800
4803 msgid ""
4801 msgid ""
4804 "create an unversioned archive of a repository revision\n"
4802 "create an unversioned archive of a repository revision\n"
4805 "\n"
4803 "\n"
4806 " By default, the revision used is the parent of the working\n"
4804 " By default, the revision used is the parent of the working\n"
4807 " directory; use -r/--rev to specify a different revision.\n"
4805 " directory; use -r/--rev to specify a different revision.\n"
4808 "\n"
4806 "\n"
4809 " To specify the type of archive to create, use -t/--type. Valid\n"
4807 " To specify the type of archive to create, use -t/--type. Valid\n"
4810 " types are::\n"
4808 " types are::\n"
4811 "\n"
4809 "\n"
4812 " \"files\" (default): a directory full of files\n"
4810 " \"files\" (default): a directory full of files\n"
4813 " \"tar\": tar archive, uncompressed\n"
4811 " \"tar\": tar archive, uncompressed\n"
4814 " \"tbz2\": tar archive, compressed using bzip2\n"
4812 " \"tbz2\": tar archive, compressed using bzip2\n"
4815 " \"tgz\": tar archive, compressed using gzip\n"
4813 " \"tgz\": tar archive, compressed using gzip\n"
4816 " \"uzip\": zip archive, uncompressed\n"
4814 " \"uzip\": zip archive, uncompressed\n"
4817 " \"zip\": zip archive, compressed using deflate\n"
4815 " \"zip\": zip archive, compressed using deflate\n"
4818 "\n"
4816 "\n"
4819 " The exact name of the destination archive or directory is given\n"
4817 " The exact name of the destination archive or directory is given\n"
4820 " using a format string; see 'hg help export' for details.\n"
4818 " using a format string; see 'hg help export' for details.\n"
4821 "\n"
4819 "\n"
4822 " Each member added to an archive file has a directory prefix\n"
4820 " Each member added to an archive file has a directory prefix\n"
4823 " prepended. Use -p/--prefix to specify a format string for the\n"
4821 " prepended. Use -p/--prefix to specify a format string for the\n"
4824 " prefix. The default is the basename of the archive, with suffixes\n"
4822 " prefix. The default is the basename of the archive, with suffixes\n"
4825 " removed.\n"
4823 " removed.\n"
4826 " "
4824 " "
4827 msgstr ""
4825 msgstr ""
4828
4826
4829 msgid "no working directory: please specify a revision"
4827 msgid "no working directory: please specify a revision"
4830 msgstr ""
4828 msgstr ""
4831
4829
4832 msgid "repository root cannot be destination"
4830 msgid "repository root cannot be destination"
4833 msgstr ""
4831 msgstr ""
4834
4832
4835 msgid "cannot archive plain files to stdout"
4833 msgid "cannot archive plain files to stdout"
4836 msgstr ""
4834 msgstr ""
4837
4835
4838 msgid ""
4836 msgid ""
4839 "reverse effect of earlier changeset\n"
4837 "reverse effect of earlier changeset\n"
4840 "\n"
4838 "\n"
4841 " Commit the backed out changes as a new changeset. The new\n"
4839 " Commit the backed out changes as a new changeset. The new\n"
4842 " changeset is a child of the backed out changeset.\n"
4840 " changeset is a child of the backed out changeset.\n"
4843 "\n"
4841 "\n"
4844 " If you backout a changeset other than the tip, a new head is\n"
4842 " If you backout a changeset other than the tip, a new head is\n"
4845 " created. This head will be the new tip and you should merge this\n"
4843 " created. This head will be the new tip and you should merge this\n"
4846 " backout changeset with another head.\n"
4844 " backout changeset with another head.\n"
4847 "\n"
4845 "\n"
4848 " The --merge option remembers the parent of the working directory\n"
4846 " The --merge option remembers the parent of the working directory\n"
4849 " before starting the backout, then merges the new head with that\n"
4847 " before starting the backout, then merges the new head with that\n"
4850 " changeset afterwards. This saves you from doing the merge by hand.\n"
4848 " changeset afterwards. This saves you from doing the merge by hand.\n"
4851 " The result of this merge is not committed, as with a normal merge.\n"
4849 " The result of this merge is not committed, as with a normal merge.\n"
4852 "\n"
4850 "\n"
4853 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4851 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4854 " "
4852 " "
4855 msgstr ""
4853 msgstr ""
4856
4854
4857 msgid "please specify just one revision"
4855 msgid "please specify just one revision"
4858 msgstr ""
4856 msgstr ""
4859
4857
4860 msgid "please specify a revision to backout"
4858 msgid "please specify a revision to backout"
4861 msgstr ""
4859 msgstr ""
4862
4860
4863 msgid "cannot backout change on a different branch"
4861 msgid "cannot backout change on a different branch"
4864 msgstr ""
4862 msgstr ""
4865
4863
4866 msgid "cannot backout a change with no parents"
4864 msgid "cannot backout a change with no parents"
4867 msgstr ""
4865 msgstr ""
4868
4866
4869 msgid "cannot backout a merge changeset without --parent"
4867 msgid "cannot backout a merge changeset without --parent"
4870 msgstr ""
4868 msgstr ""
4871
4869
4872 #, python-format
4870 #, python-format
4873 msgid "%s is not a parent of %s"
4871 msgid "%s is not a parent of %s"
4874 msgstr ""
4872 msgstr ""
4875
4873
4876 msgid "cannot use --parent on non-merge changeset"
4874 msgid "cannot use --parent on non-merge changeset"
4877 msgstr ""
4875 msgstr ""
4878
4876
4879 #, python-format
4877 #, python-format
4880 msgid "changeset %s backs out changeset %s\n"
4878 msgid "changeset %s backs out changeset %s\n"
4881 msgstr ""
4879 msgstr ""
4882
4880
4883 #, python-format
4881 #, python-format
4884 msgid "merging with changeset %s\n"
4882 msgid "merging with changeset %s\n"
4885 msgstr ""
4883 msgstr ""
4886
4884
4887 msgid "the backout changeset is a new head - do not forget to merge\n"
4885 msgid "the backout changeset is a new head - do not forget to merge\n"
4888 msgstr ""
4886 msgstr ""
4889
4887
4890 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4888 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4891 msgstr ""
4889 msgstr ""
4892
4890
4893 msgid ""
4891 msgid ""
4894 "subdivision search of changesets\n"
4892 "subdivision search of changesets\n"
4895 "\n"
4893 "\n"
4896 " This command helps to find changesets which introduce problems. To\n"
4894 " This command helps to find changesets which introduce problems. To\n"
4897 " use, mark the earliest changeset you know exhibits the problem as\n"
4895 " use, mark the earliest changeset you know exhibits the problem as\n"
4898 " bad, then mark the latest changeset which is free from the problem\n"
4896 " bad, then mark the latest changeset which is free from the problem\n"
4899 " as good. Bisect will update your working directory to a revision\n"
4897 " as good. Bisect will update your working directory to a revision\n"
4900 " for testing (unless the -U/--noupdate option is specified). Once\n"
4898 " for testing (unless the -U/--noupdate option is specified). Once\n"
4901 " you have performed tests, mark the working directory as good or\n"
4899 " you have performed tests, mark the working directory as good or\n"
4902 " bad, and bisect will either update to another candidate changeset\n"
4900 " bad, and bisect will either update to another candidate changeset\n"
4903 " or announce that it has found the bad revision.\n"
4901 " or announce that it has found the bad revision.\n"
4904 "\n"
4902 "\n"
4905 " As a shortcut, you can also use the revision argument to mark a\n"
4903 " As a shortcut, you can also use the revision argument to mark a\n"
4906 " revision as good or bad without checking it out first.\n"
4904 " revision as good or bad without checking it out first.\n"
4907 "\n"
4905 "\n"
4908 " If you supply a command, it will be used for automatic bisection.\n"
4906 " If you supply a command, it will be used for automatic bisection.\n"
4909 " Its exit status will be used to mark revisions as good or bad:\n"
4907 " Its exit status will be used to mark revisions as good or bad:\n"
4910 " status 0 means good, 125 means to skip the revision, 127\n"
4908 " status 0 means good, 125 means to skip the revision, 127\n"
4911 " (command not found) will abort the bisection, and any other\n"
4909 " (command not found) will abort the bisection, and any other\n"
4912 " non-zero exit status means the revision is bad.\n"
4910 " non-zero exit status means the revision is bad.\n"
4913 " "
4911 " "
4914 msgstr ""
4912 msgstr ""
4915
4913
4916 msgid "The first good revision is:\n"
4914 msgid "The first good revision is:\n"
4917 msgstr ""
4915 msgstr ""
4918
4916
4919 msgid "The first bad revision is:\n"
4917 msgid "The first bad revision is:\n"
4920 msgstr ""
4918 msgstr ""
4921
4919
4922 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4920 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4923 msgstr ""
4921 msgstr ""
4924
4922
4925 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4923 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4926 msgstr ""
4924 msgstr ""
4927
4925
4928 msgid "cannot bisect (no known good revisions)"
4926 msgid "cannot bisect (no known good revisions)"
4929 msgstr ""
4927 msgstr ""
4930
4928
4931 msgid "cannot bisect (no known bad revisions)"
4929 msgid "cannot bisect (no known bad revisions)"
4932 msgstr ""
4930 msgstr ""
4933
4931
4934 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4932 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
4935 msgstr ""
4933 msgstr ""
4936
4934
4937 msgid "incompatible arguments"
4935 msgid "incompatible arguments"
4938 msgstr ""
4936 msgstr ""
4939
4937
4940 #, python-format
4938 #, python-format
4941 msgid "failed to execute %s"
4939 msgid "failed to execute %s"
4942 msgstr ""
4940 msgstr ""
4943
4941
4944 #, python-format
4942 #, python-format
4945 msgid "%s killed"
4943 msgid "%s killed"
4946 msgstr ""
4944 msgstr ""
4947
4945
4948 #, python-format
4946 #, python-format
4949 msgid "Changeset %d:%s: %s\n"
4947 msgid "Changeset %d:%s: %s\n"
4950 msgstr ""
4948 msgstr ""
4951
4949
4952 #, python-format
4950 #, python-format
4953 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
4951 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
4954 msgstr ""
4952 msgstr ""
4955
4953
4956 msgid ""
4954 msgid ""
4957 "set or show the current branch name\n"
4955 "set or show the current branch name\n"
4958 "\n"
4956 "\n"
4959 " With no argument, show the current branch name. With one argument,\n"
4957 " With no argument, show the current branch name. With one argument,\n"
4960 " set the working directory branch name (the branch will not exist\n"
4958 " set the working directory branch name (the branch will not exist\n"
4961 " in the repository until the next commit). Standard practice\n"
4959 " in the repository until the next commit). Standard practice\n"
4962 " recommends that primary development take place on the 'default'\n"
4960 " recommends that primary development take place on the 'default'\n"
4963 " branch.\n"
4961 " branch.\n"
4964 "\n"
4962 "\n"
4965 " Unless -f/--force is specified, branch will not let you set a\n"
4963 " Unless -f/--force is specified, branch will not let you set a\n"
4966 " branch name that already exists, even if it's inactive.\n"
4964 " branch name that already exists, even if it's inactive.\n"
4967 "\n"
4965 "\n"
4968 " Use -C/--clean to reset the working directory branch to that of\n"
4966 " Use -C/--clean to reset the working directory branch to that of\n"
4969 " the parent of the working directory, negating a previous branch\n"
4967 " the parent of the working directory, negating a previous branch\n"
4970 " change.\n"
4968 " change.\n"
4971 "\n"
4969 "\n"
4972 " Use the command 'hg update' to switch to an existing branch. Use\n"
4970 " Use the command 'hg update' to switch to an existing branch. Use\n"
4973 " 'hg commit --close-branch' to mark this branch as closed.\n"
4971 " 'hg commit --close-branch' to mark this branch as closed.\n"
4974 " "
4972 " "
4975 msgstr ""
4973 msgstr ""
4976
4974
4977 #, python-format
4975 #, python-format
4978 msgid "reset working directory to branch %s\n"
4976 msgid "reset working directory to branch %s\n"
4979 msgstr ""
4977 msgstr ""
4980
4978
4981 msgid "a branch of the same name already exists (use --force to override)"
4979 msgid "a branch of the same name already exists (use --force to override)"
4982 msgstr ""
4980 msgstr ""
4983
4981
4984 #, python-format
4982 #, python-format
4985 msgid "marked working directory as branch %s\n"
4983 msgid "marked working directory as branch %s\n"
4986 msgstr ""
4984 msgstr ""
4987
4985
4988 msgid ""
4986 msgid ""
4989 "list repository named branches\n"
4987 "list repository named branches\n"
4990 "\n"
4988 "\n"
4991 " List the repository's named branches, indicating which ones are\n"
4989 " List the repository's named branches, indicating which ones are\n"
4992 " inactive. If -c/--closed is specified, also list branches which have\n"
4990 " inactive. If -c/--closed is specified, also list branches which have\n"
4993 " been marked closed (see hg commit --close-branch).\n"
4991 " been marked closed (see hg commit --close-branch).\n"
4994 "\n"
4992 "\n"
4995 " If -a/--active is specified, only show active branches. A branch\n"
4993 " If -a/--active is specified, only show active branches. A branch\n"
4996 " is considered active if it contains repository heads.\n"
4994 " is considered active if it contains repository heads.\n"
4997 "\n"
4995 "\n"
4998 " Use the command 'hg update' to switch to an existing branch.\n"
4996 " Use the command 'hg update' to switch to an existing branch.\n"
4999 " "
4997 " "
5000 msgstr ""
4998 msgstr ""
5001
4999
5002 msgid ""
5000 msgid ""
5003 "create a changegroup file\n"
5001 "create a changegroup file\n"
5004 "\n"
5002 "\n"
5005 " Generate a compressed changegroup file collecting changesets not\n"
5003 " Generate a compressed changegroup file collecting changesets not\n"
5006 " known to be in another repository.\n"
5004 " known to be in another repository.\n"
5007 "\n"
5005 "\n"
5008 " If no destination repository is specified the destination is\n"
5006 " If no destination repository is specified the destination is\n"
5009 " assumed to have all the nodes specified by one or more --base\n"
5007 " assumed to have all the nodes specified by one or more --base\n"
5010 " parameters. To create a bundle containing all changesets, use\n"
5008 " parameters. To create a bundle containing all changesets, use\n"
5011 " -a/--all (or --base null).\n"
5009 " -a/--all (or --base null).\n"
5012 "\n"
5010 "\n"
5013 " You can change compression method with the -t/--type option.\n"
5011 " You can change compression method with the -t/--type option.\n"
5014 " The available compression methods are: none, bzip2, and\n"
5012 " The available compression methods are: none, bzip2, and\n"
5015 " gzip (by default, bundles are compressed using bzip2).\n"
5013 " gzip (by default, bundles are compressed using bzip2).\n"
5016 "\n"
5014 "\n"
5017 " The bundle file can then be transferred using conventional means\n"
5015 " The bundle file can then be transferred using conventional means\n"
5018 " and applied to another repository with the unbundle or pull\n"
5016 " and applied to another repository with the unbundle or pull\n"
5019 " command. This is useful when direct push and pull are not\n"
5017 " command. This is useful when direct push and pull are not\n"
5020 " available or when exporting an entire repository is undesirable.\n"
5018 " available or when exporting an entire repository is undesirable.\n"
5021 "\n"
5019 "\n"
5022 " Applying bundles preserves all changeset contents including\n"
5020 " Applying bundles preserves all changeset contents including\n"
5023 " permissions, copy/rename information, and revision history.\n"
5021 " permissions, copy/rename information, and revision history.\n"
5024 " "
5022 " "
5025 msgstr ""
5023 msgstr ""
5026
5024
5027 msgid "--base is incompatible with specifying a destination"
5025 msgid "--base is incompatible with specifying a destination"
5028 msgstr ""
5026 msgstr ""
5029
5027
5030 msgid "unknown bundle type specified with --type"
5028 msgid "unknown bundle type specified with --type"
5031 msgstr ""
5029 msgstr ""
5032
5030
5033 msgid ""
5031 msgid ""
5034 "output the current or given revision of files\n"
5032 "output the current or given revision of files\n"
5035 "\n"
5033 "\n"
5036 " Print the specified files as they were at the given revision. If\n"
5034 " Print the specified files as they were at the given revision. If\n"
5037 " no revision is given, the parent of the working directory is used,\n"
5035 " no revision is given, the parent of the working directory is used,\n"
5038 " or tip if no revision is checked out.\n"
5036 " or tip if no revision is checked out.\n"
5039 "\n"
5037 "\n"
5040 " Output may be to a file, in which case the name of the file is\n"
5038 " Output may be to a file, in which case the name of the file is\n"
5041 " given using a format string. The formatting rules are the same as\n"
5039 " given using a format string. The formatting rules are the same as\n"
5042 " for the export command, with the following additions::\n"
5040 " for the export command, with the following additions::\n"
5043 "\n"
5041 "\n"
5044 " %s basename of file being printed\n"
5042 " %s basename of file being printed\n"
5045 " %d dirname of file being printed, or '.' if in repository root\n"
5043 " %d dirname of file being printed, or '.' if in repository root\n"
5046 " %p root-relative path name of file being printed\n"
5044 " %p root-relative path name of file being printed\n"
5047 " "
5045 " "
5048 msgstr ""
5046 msgstr ""
5049
5047
5050 msgid ""
5048 msgid ""
5051 "make a copy of an existing repository\n"
5049 "make a copy of an existing repository\n"
5052 "\n"
5050 "\n"
5053 " Create a copy of an existing repository in a new directory.\n"
5051 " Create a copy of an existing repository in a new directory.\n"
5054 "\n"
5052 "\n"
5055 " If no destination directory name is specified, it defaults to the\n"
5053 " If no destination directory name is specified, it defaults to the\n"
5056 " basename of the source.\n"
5054 " basename of the source.\n"
5057 "\n"
5055 "\n"
5058 " The location of the source is added to the new repository's\n"
5056 " The location of the source is added to the new repository's\n"
5059 " .hg/hgrc file, as the default to be used for future pulls.\n"
5057 " .hg/hgrc file, as the default to be used for future pulls.\n"
5060 "\n"
5058 "\n"
5061 " If you use the -r/--rev option to clone up to a specific revision,\n"
5059 " If you use the -r/--rev option to clone up to a specific revision,\n"
5062 " no subsequent revisions (including subsequent tags) will be\n"
5060 " no subsequent revisions (including subsequent tags) will be\n"
5063 " present in the cloned repository. This option implies --pull, even\n"
5061 " present in the cloned repository. This option implies --pull, even\n"
5064 " on local repositories.\n"
5062 " on local repositories.\n"
5065 "\n"
5063 "\n"
5066 " By default, clone will check out the head of the 'default' branch.\n"
5064 " By default, clone will check out the head of the 'default' branch.\n"
5067 " If the -U/--noupdate option is used, the new clone will contain\n"
5065 " If the -U/--noupdate option is used, the new clone will contain\n"
5068 " only a repository (.hg) and no working copy (the working copy\n"
5066 " only a repository (.hg) and no working copy (the working copy\n"
5069 " parent is the null revision).\n"
5067 " parent is the null revision).\n"
5070 "\n"
5068 "\n"
5071 " See 'hg help urls' for valid source format details.\n"
5069 " See 'hg help urls' for valid source format details.\n"
5072 "\n"
5070 "\n"
5073 " It is possible to specify an ssh:// URL as the destination, but no\n"
5071 " It is possible to specify an ssh:// URL as the destination, but no\n"
5074 " .hg/hgrc and working directory will be created on the remote side.\n"
5072 " .hg/hgrc and working directory will be created on the remote side.\n"
5075 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5073 " Please see 'hg help urls' for important details about ssh:// URLs.\n"
5076 "\n"
5074 "\n"
5077 " For efficiency, hardlinks are used for cloning whenever the source\n"
5075 " For efficiency, hardlinks are used for cloning whenever the source\n"
5078 " and destination are on the same filesystem (note this applies only\n"
5076 " and destination are on the same filesystem (note this applies only\n"
5079 " to the repository data, not to the checked out files). Some\n"
5077 " to the repository data, not to the checked out files). Some\n"
5080 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5078 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5081 " do not report errors. In these cases, use the --pull option to\n"
5079 " do not report errors. In these cases, use the --pull option to\n"
5082 " avoid hardlinking.\n"
5080 " avoid hardlinking.\n"
5083 "\n"
5081 "\n"
5084 " In some cases, you can clone repositories and checked out files\n"
5082 " In some cases, you can clone repositories and checked out files\n"
5085 " using full hardlinks with ::\n"
5083 " using full hardlinks with ::\n"
5086 "\n"
5084 "\n"
5087 " $ cp -al REPO REPOCLONE\n"
5085 " $ cp -al REPO REPOCLONE\n"
5088 "\n"
5086 "\n"
5089 " This is the fastest way to clone, but it is not always safe. The\n"
5087 " This is the fastest way to clone, but it is not always safe. The\n"
5090 " operation is not atomic (making sure REPO is not modified during\n"
5088 " operation is not atomic (making sure REPO is not modified during\n"
5091 " the operation is up to you) and you have to make sure your editor\n"
5089 " the operation is up to you) and you have to make sure your editor\n"
5092 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5090 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5093 " this is not compatible with certain extensions that place their\n"
5091 " this is not compatible with certain extensions that place their\n"
5094 " metadata under the .hg directory, such as mq.\n"
5092 " metadata under the .hg directory, such as mq.\n"
5095 " "
5093 " "
5096 msgstr ""
5094 msgstr ""
5097 "gör en kopia av ett existerande arkiv\n"
5095 "gör en kopia av ett existerande arkiv\n"
5098 "\n"
5096 "\n"
5099 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5097 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5100 "\n"
5098 "\n"
5101 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5099 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5102 " källan att användas.\n"
5100 " källan att användas.\n"
5103 "\n"
5101 "\n"
5104 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5102 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5105 " som standardplats att användas för framtida dragningar.\n"
5103 " som standardplats att användas för framtida dragningar.\n"
5106 "\n"
5104 "\n"
5107 " Om du använder flaggan -r/--rev för att klona fram till en specifik\n"
5105 " Om du använder flaggan -r/--rev för att klona fram till en specifik\n"
5108 " revision, kommer inga efterföljande revisioner (inklusive efterföljande\n"
5106 " revision, kommer inga efterföljande revisioner (inklusive efterföljande\n"
5109 " märken) att finnas i det klonade arkivet. Denna flagga använder\n"
5107 " märken) att finnas i det klonade arkivet. Denna flagga använder\n"
5110 " automatiskt --pull, även för lokala arkiv.\n"
5108 " automatiskt --pull, även för lokala arkiv.\n"
5111 "\n"
5109 "\n"
5112 " Som standard kommer clone att hämta ut toppen i grenen 'default'. Om\n"
5110 " Som standard kommer clone att hämta ut toppen i grenen 'default'. Om\n"
5113 " flaggan -U/--noupdate används, kommer den nya klonen bara att innehålla\n"
5111 " flaggan -U/--noupdate används, kommer den nya klonen bara att innehålla\n"
5114 " ett arkiv (.hg) och igen arbetskopia (arbetskopians förälder är\n"
5112 " ett arkiv (.hg) och igen arbetskopia (arbetskopians förälder är\n"
5115 " null-revisionen.\n"
5113 " null-revisionen.\n"
5116 "\n"
5114 "\n"
5117 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5115 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5118 "\n"
5116 "\n"
5119 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5117 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5120 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5118 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5121 " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n"
5119 " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n"
5122 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5120 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5123 " för att undvika användning av hårda länkar.\n"
5121 " för att undvika användning av hårda länkar.\n"
5124 "\n"
5122 "\n"
5125 " I vissa fall kan du klona både arkiv och uthämtade filer, alla\n"
5123 " I vissa fall kan du klona både arkiv och uthämtade filer, alla\n"
5126 " hårdlänkade, med ::\n"
5124 " hårdlänkade, med ::\n"
5127 "\n"
5125 "\n"
5128 " $ cp -al ARKIV ARKIVKLON\n"
5126 " $ cp -al ARKIV ARKIVKLON\n"
5129 "\n"
5127 "\n"
5130 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5128 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5131 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5129 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5132 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5130 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5133 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5131 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5134 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5132 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5135 " under katalogen .hg, som mq.\n"
5133 " under katalogen .hg, som mq.\n"
5136 " "
5134 " "
5137
5135
5138 msgid ""
5136 msgid ""
5139 "commit the specified files or all outstanding changes\n"
5137 "commit the specified files or all outstanding changes\n"
5140 "\n"
5138 "\n"
5141 " Commit changes to the given files into the repository. Unlike a\n"
5139 " Commit changes to the given files into the repository. Unlike a\n"
5142 " centralized RCS, this operation is a local operation. See hg push\n"
5140 " centralized RCS, this operation is a local operation. See hg push\n"
5143 " for a way to actively distribute your changes.\n"
5141 " for a way to actively distribute your changes.\n"
5144 "\n"
5142 "\n"
5145 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5143 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5146 " will be committed.\n"
5144 " will be committed.\n"
5147 "\n"
5145 "\n"
5148 " If you are committing the result of a merge, do not provide any\n"
5146 " If you are committing the result of a merge, do not provide any\n"
5149 " filenames or -I/-X filters.\n"
5147 " filenames or -I/-X filters.\n"
5150 "\n"
5148 "\n"
5151 " If no commit message is specified, the configured editor is\n"
5149 " If no commit message is specified, the configured editor is\n"
5152 " started to prompt you for a message.\n"
5150 " started to prompt you for a message.\n"
5153 "\n"
5151 "\n"
5154 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5152 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5155 " "
5153 " "
5156 msgstr ""
5154 msgstr ""
5157 "arkivera de angivna filerna eller alla ändringar\n"
5155 "arkivera de angivna filerna eller alla ändringar\n"
5158 "\n"
5156 "\n"
5159 " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n"
5157 " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n"
5160 " från ett centralicerat RCS, är detta en lokal operation. Se hg push\n"
5158 " från ett centralicerat RCS, är detta en lokal operation. Se hg push\n"
5161 " för ett sätt att aktivt distribuera dina ändringar.\n"
5159 " för ett sätt att aktivt distribuera dina ändringar.\n"
5162 "\n"
5160 "\n"
5163 " Om filer inte anges, kommer alla ändringar som \"hg status\"\n"
5161 " Om filer inte anges, kommer alla ändringar som \"hg status\"\n"
5164 " rapporterar att arkiveras.\n"
5162 " rapporterar att arkiveras.\n"
5165 "\n"
5163 "\n"
5166 " Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n"
5164 " Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n"
5167 " eller flaggorna -I/-X.\n"
5165 " eller flaggorna -I/-X.\n"
5168 "\n"
5166 "\n"
5169 " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n"
5167 " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n"
5170 " att startas och fråga om meddelandet.\n"
5168 " att startas och fråga om meddelandet.\n"
5171 "\n"
5169 "\n"
5172 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
5170 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
5173 " "
5171 " "
5174
5172
5175 msgid "nothing changed\n"
5173 msgid "nothing changed\n"
5176 msgstr ""
5174 msgstr ""
5177
5175
5178 msgid "created new head\n"
5176 msgid "created new head\n"
5179 msgstr ""
5177 msgstr ""
5180
5178
5181 #, python-format
5179 #, python-format
5182 msgid "committed changeset %d:%s\n"
5180 msgid "committed changeset %d:%s\n"
5183 msgstr ""
5181 msgstr ""
5184
5182
5185 msgid ""
5183 msgid ""
5186 "mark files as copied for the next commit\n"
5184 "mark files as copied for the next commit\n"
5187 "\n"
5185 "\n"
5188 " Mark dest as having copies of source files. If dest is a\n"
5186 " Mark dest as having copies of source files. If dest is a\n"
5189 " directory, copies are put in that directory. If dest is a file,\n"
5187 " directory, copies are put in that directory. If dest is a file,\n"
5190 " the source must be a single file.\n"
5188 " the source must be a single file.\n"
5191 "\n"
5189 "\n"
5192 " By default, this command copies the contents of files as they\n"
5190 " By default, this command copies the contents of files as they\n"
5193 " exist in the working directory. If invoked with -A/--after, the\n"
5191 " exist in the working directory. If invoked with -A/--after, the\n"
5194 " operation is recorded, but no copying is performed.\n"
5192 " operation is recorded, but no copying is performed.\n"
5195 "\n"
5193 "\n"
5196 " This command takes effect with the next commit. To undo a copy\n"
5194 " This command takes effect with the next commit. To undo a copy\n"
5197 " before that, see hg revert.\n"
5195 " before that, see hg revert.\n"
5198 " "
5196 " "
5199 msgstr ""
5197 msgstr ""
5200
5198
5201 msgid "find the ancestor revision of two revisions in a given index"
5199 msgid "find the ancestor revision of two revisions in a given index"
5202 msgstr ""
5200 msgstr ""
5203
5201
5204 msgid "There is no Mercurial repository here (.hg not found)"
5202 msgid "There is no Mercurial repository here (.hg not found)"
5205 msgstr ""
5203 msgstr ""
5206
5204
5207 msgid "either two or three arguments required"
5205 msgid "either two or three arguments required"
5208 msgstr ""
5206 msgstr ""
5209
5207
5210 msgid "returns the completion list associated with the given command"
5208 msgid "returns the completion list associated with the given command"
5211 msgstr ""
5209 msgstr ""
5212
5210
5213 msgid "rebuild the dirstate as it would look like for the given revision"
5211 msgid "rebuild the dirstate as it would look like for the given revision"
5214 msgstr ""
5212 msgstr ""
5215
5213
5216 msgid "validate the correctness of the current dirstate"
5214 msgid "validate the correctness of the current dirstate"
5217 msgstr ""
5215 msgstr ""
5218
5216
5219 #, python-format
5217 #, python-format
5220 msgid "%s in state %s, but not in manifest1\n"
5218 msgid "%s in state %s, but not in manifest1\n"
5221 msgstr ""
5219 msgstr ""
5222
5220
5223 #, python-format
5221 #, python-format
5224 msgid "%s in state %s, but also in manifest1\n"
5222 msgid "%s in state %s, but also in manifest1\n"
5225 msgstr ""
5223 msgstr ""
5226
5224
5227 #, python-format
5225 #, python-format
5228 msgid "%s in state %s, but not in either manifest\n"
5226 msgid "%s in state %s, but not in either manifest\n"
5229 msgstr ""
5227 msgstr ""
5230
5228
5231 #, python-format
5229 #, python-format
5232 msgid "%s in manifest1, but listed as state %s"
5230 msgid "%s in manifest1, but listed as state %s"
5233 msgstr ""
5231 msgstr ""
5234
5232
5235 msgid ".hg/dirstate inconsistent with current parent's manifest"
5233 msgid ".hg/dirstate inconsistent with current parent's manifest"
5236 msgstr ""
5234 msgstr ""
5237
5235
5238 msgid ""
5236 msgid ""
5239 "show combined config settings from all hgrc files\n"
5237 "show combined config settings from all hgrc files\n"
5240 "\n"
5238 "\n"
5241 " With no arguments, print names and values of all config items.\n"
5239 " With no arguments, print names and values of all config items.\n"
5242 "\n"
5240 "\n"
5243 " With one argument of the form section.name, print just the value\n"
5241 " With one argument of the form section.name, print just the value\n"
5244 " of that config item.\n"
5242 " of that config item.\n"
5245 "\n"
5243 "\n"
5246 " With multiple arguments, print names and values of all config\n"
5244 " With multiple arguments, print names and values of all config\n"
5247 " items with matching section names.\n"
5245 " items with matching section names.\n"
5248 "\n"
5246 "\n"
5249 " With --debug, the source (filename and line number) is printed\n"
5247 " With --debug, the source (filename and line number) is printed\n"
5250 " for each config item.\n"
5248 " for each config item.\n"
5251 " "
5249 " "
5252 msgstr ""
5250 msgstr ""
5253
5251
5254 msgid "only one config item permitted"
5252 msgid "only one config item permitted"
5255 msgstr ""
5253 msgstr ""
5256
5254
5257 msgid ""
5255 msgid ""
5258 "manually set the parents of the current working directory\n"
5256 "manually set the parents of the current working directory\n"
5259 "\n"
5257 "\n"
5260 " This is useful for writing repository conversion tools, but should\n"
5258 " This is useful for writing repository conversion tools, but should\n"
5261 " be used with care.\n"
5259 " be used with care.\n"
5262 " "
5260 " "
5263 msgstr ""
5261 msgstr ""
5264
5262
5265 msgid "show the contents of the current dirstate"
5263 msgid "show the contents of the current dirstate"
5266 msgstr ""
5264 msgstr ""
5267
5265
5268 #, python-format
5266 #, python-format
5269 msgid "copy: %s -> %s\n"
5267 msgid "copy: %s -> %s\n"
5270 msgstr ""
5268 msgstr ""
5271
5269
5272 msgid "dump the contents of a data file revision"
5270 msgid "dump the contents of a data file revision"
5273 msgstr ""
5271 msgstr ""
5274
5272
5275 #, python-format
5273 #, python-format
5276 msgid "invalid revision identifier %s"
5274 msgid "invalid revision identifier %s"
5277 msgstr ""
5275 msgstr ""
5278
5276
5279 msgid "parse and display a date"
5277 msgid "parse and display a date"
5280 msgstr ""
5278 msgstr ""
5281
5279
5282 msgid "dump the contents of an index file"
5280 msgid "dump the contents of an index file"
5283 msgstr ""
5281 msgstr ""
5284
5282
5285 msgid "dump an index DAG as a graphviz dot file"
5283 msgid "dump an index DAG as a graphviz dot file"
5286 msgstr ""
5284 msgstr ""
5287
5285
5288 msgid "test Mercurial installation"
5286 msgid "test Mercurial installation"
5289 msgstr ""
5287 msgstr ""
5290
5288
5291 #, python-format
5289 #, python-format
5292 msgid "Checking encoding (%s)...\n"
5290 msgid "Checking encoding (%s)...\n"
5293 msgstr ""
5291 msgstr ""
5294
5292
5295 msgid " (check that your locale is properly set)\n"
5293 msgid " (check that your locale is properly set)\n"
5296 msgstr ""
5294 msgstr ""
5297
5295
5298 msgid "Checking extensions...\n"
5296 msgid "Checking extensions...\n"
5299 msgstr ""
5297 msgstr ""
5300
5298
5301 msgid " One or more extensions could not be found"
5299 msgid " One or more extensions could not be found"
5302 msgstr ""
5300 msgstr ""
5303
5301
5304 msgid " (check that you compiled the extensions)\n"
5302 msgid " (check that you compiled the extensions)\n"
5305 msgstr ""
5303 msgstr ""
5306
5304
5307 msgid "Checking templates...\n"
5305 msgid "Checking templates...\n"
5308 msgstr ""
5306 msgstr ""
5309
5307
5310 msgid " (templates seem to have been installed incorrectly)\n"
5308 msgid " (templates seem to have been installed incorrectly)\n"
5311 msgstr ""
5309 msgstr ""
5312
5310
5313 msgid "Checking patch...\n"
5311 msgid "Checking patch...\n"
5314 msgstr ""
5312 msgstr ""
5315
5313
5316 msgid " patch call failed:\n"
5314 msgid " patch call failed:\n"
5317 msgstr ""
5315 msgstr ""
5318
5316
5319 msgid " unexpected patch output!\n"
5317 msgid " unexpected patch output!\n"
5320 msgstr ""
5318 msgstr ""
5321
5319
5322 msgid " patch test failed!\n"
5320 msgid " patch test failed!\n"
5323 msgstr ""
5321 msgstr ""
5324
5322
5325 msgid ""
5323 msgid ""
5326 " (Current patch tool may be incompatible with patch, or misconfigured. "
5324 " (Current patch tool may be incompatible with patch, or misconfigured. "
5327 "Please check your .hgrc file)\n"
5325 "Please check your .hgrc file)\n"
5328 msgstr ""
5326 msgstr ""
5329
5327
5330 msgid ""
5328 msgid ""
5331 " Internal patcher failure, please report this error to http://mercurial."
5329 " Internal patcher failure, please report this error to http://mercurial."
5332 "selenic.com/bts/\n"
5330 "selenic.com/bts/\n"
5333 msgstr ""
5331 msgstr ""
5334
5332
5335 msgid "Checking commit editor...\n"
5333 msgid "Checking commit editor...\n"
5336 msgstr ""
5334 msgstr ""
5337
5335
5338 msgid " No commit editor set and can't find vi in PATH\n"
5336 msgid " No commit editor set and can't find vi in PATH\n"
5339 msgstr ""
5337 msgstr ""
5340
5338
5341 msgid " (specify a commit editor in your .hgrc file)\n"
5339 msgid " (specify a commit editor in your .hgrc file)\n"
5342 msgstr ""
5340 msgstr ""
5343
5341
5344 #, python-format
5342 #, python-format
5345 msgid " Can't find editor '%s' in PATH\n"
5343 msgid " Can't find editor '%s' in PATH\n"
5346 msgstr ""
5344 msgstr ""
5347
5345
5348 msgid "Checking username...\n"
5346 msgid "Checking username...\n"
5349 msgstr ""
5347 msgstr ""
5350
5348
5351 msgid " (specify a username in your .hgrc file)\n"
5349 msgid " (specify a username in your .hgrc file)\n"
5352 msgstr ""
5350 msgstr ""
5353
5351
5354 msgid "No problems detected\n"
5352 msgid "No problems detected\n"
5355 msgstr ""
5353 msgstr ""
5356
5354
5357 #, python-format
5355 #, python-format
5358 msgid "%s problems detected, please check your install!\n"
5356 msgid "%s problems detected, please check your install!\n"
5359 msgstr ""
5357 msgstr ""
5360
5358
5361 msgid "dump rename information"
5359 msgid "dump rename information"
5362 msgstr ""
5360 msgstr ""
5363
5361
5364 #, python-format
5362 #, python-format
5365 msgid "%s renamed from %s:%s\n"
5363 msgid "%s renamed from %s:%s\n"
5366 msgstr ""
5364 msgstr ""
5367
5365
5368 #, python-format
5366 #, python-format
5369 msgid "%s not renamed\n"
5367 msgid "%s not renamed\n"
5370 msgstr ""
5368 msgstr ""
5371
5369
5372 msgid "show how files match on given patterns"
5370 msgid "show how files match on given patterns"
5373 msgstr ""
5371 msgstr ""
5374
5372
5375 msgid ""
5373 msgid ""
5376 "diff repository (or selected files)\n"
5374 "diff repository (or selected files)\n"
5377 "\n"
5375 "\n"
5378 " Show differences between revisions for the specified files.\n"
5376 " Show differences between revisions for the specified files.\n"
5379 "\n"
5377 "\n"
5380 " Differences between files are shown using the unified diff format.\n"
5378 " Differences between files are shown using the unified diff format.\n"
5381 "\n"
5379 "\n"
5382 " NOTE: diff may generate unexpected results for merges, as it will\n"
5380 " NOTE: diff may generate unexpected results for merges, as it will\n"
5383 " default to comparing against the working directory's first parent\n"
5381 " default to comparing against the working directory's first parent\n"
5384 " changeset if no revisions are specified.\n"
5382 " changeset if no revisions are specified.\n"
5385 "\n"
5383 "\n"
5386 " When two revision arguments are given, then changes are shown\n"
5384 " When two revision arguments are given, then changes are shown\n"
5387 " between those revisions. If only one revision is specified then\n"
5385 " between those revisions. If only one revision is specified then\n"
5388 " that revision is compared to the working directory, and, when no\n"
5386 " that revision is compared to the working directory, and, when no\n"
5389 " revisions are specified, the working directory files are compared\n"
5387 " revisions are specified, the working directory files are compared\n"
5390 " to its parent.\n"
5388 " to its parent.\n"
5391 "\n"
5389 "\n"
5392 " Without the -a/--text option, diff will avoid generating diffs of\n"
5390 " Without the -a/--text option, diff will avoid generating diffs of\n"
5393 " files it detects as binary. With -a, diff will generate a diff\n"
5391 " files it detects as binary. With -a, diff will generate a diff\n"
5394 " anyway, probably with undesirable results.\n"
5392 " anyway, probably with undesirable results.\n"
5395 "\n"
5393 "\n"
5396 " Use the -g/--git option to generate diffs in the git extended diff\n"
5394 " Use the -g/--git option to generate diffs in the git extended diff\n"
5397 " format. For more information, read 'hg help diffs'.\n"
5395 " format. For more information, read 'hg help diffs'.\n"
5398 " "
5396 " "
5399 msgstr ""
5397 msgstr ""
5400 "visa skillnader i arkivet (eller på valda filer)\n"
5398 "visa skillnader i arkivet (eller på valda filer)\n"
5401 "\n"
5399 "\n"
5402 " Visa skillnader mellan revisioner för specificerade filer.\n"
5400 " Visa skillnader mellan revisioner för specificerade filer.\n"
5403 "\n"
5401 "\n"
5404 " Skillnaderna mellan filerna visas i unified diff-format.\n"
5402 " Skillnaderna mellan filerna visas i unified diff-format.\n"
5405 "\n"
5403 "\n"
5406 " NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n"
5404 " NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n"
5407 " eftersom den som standard kommer att jämföra mot arbetskatalogens\n"
5405 " eftersom den som standard kommer att jämföra mot arbetskatalogens\n"
5408 " tidigare ändring om ingen revision anges.\n"
5406 " tidigare ändring om ingen revision anges.\n"
5409 "\n"
5407 "\n"
5410 " När två revisioner anges, visas ändringarna mellan dessa två\n"
5408 " När två revisioner anges, visas ändringarna mellan dessa två\n"
5411 " revisioner. Om bara en revision anges kommer den att jämföras med\n"
5409 " revisioner. Om bara en revision anges kommer den att jämföras med\n"
5412 " arbetskatalogen, och om ingen revision anges, jämförs arbetskatalogens\n"
5410 " arbetskatalogen, och om ingen revision anges, jämförs arbetskatalogens\n"
5413 " filer med dess förälder.\n"
5411 " filer med dess förälder.\n"
5414 "\n"
5412 "\n"
5415 " Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n"
5413 " Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n"
5416 " skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n"
5414 " skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n"
5417 " troligtvis med oönskade resultat.\n"
5415 " troligtvis med oönskade resultat.\n"
5418 "\n"
5416 "\n"
5419 " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
5417 " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
5420 " mer information, läs 'hg help diffs'.\n"
5418 " mer information, läs 'hg help diffs'.\n"
5421 " "
5419 " "
5422
5420
5423 msgid ""
5421 msgid ""
5424 "dump the header and diffs for one or more changesets\n"
5422 "dump the header and diffs for one or more changesets\n"
5425 "\n"
5423 "\n"
5426 " Print the changeset header and diffs for one or more revisions.\n"
5424 " Print the changeset header and diffs for one or more revisions.\n"
5427 "\n"
5425 "\n"
5428 " The information shown in the changeset header is: author,\n"
5426 " The information shown in the changeset header is: author,\n"
5429 " changeset hash, parent(s) and commit comment.\n"
5427 " changeset hash, parent(s) and commit comment.\n"
5430 "\n"
5428 "\n"
5431 " NOTE: export may generate unexpected diff output for merge\n"
5429 " NOTE: export may generate unexpected diff output for merge\n"
5432 " changesets, as it will compare the merge changeset against its\n"
5430 " changesets, as it will compare the merge changeset against its\n"
5433 " first parent only.\n"
5431 " first parent only.\n"
5434 "\n"
5432 "\n"
5435 " Output may be to a file, in which case the name of the file is\n"
5433 " Output may be to a file, in which case the name of the file is\n"
5436 " given using a format string. The formatting rules are as follows::\n"
5434 " given using a format string. The formatting rules are as follows::\n"
5437 "\n"
5435 "\n"
5438 " %% literal \"%\" character\n"
5436 " %% literal \"%\" character\n"
5439 " %H changeset hash (40 bytes of hexadecimal)\n"
5437 " %H changeset hash (40 bytes of hexadecimal)\n"
5440 " %N number of patches being generated\n"
5438 " %N number of patches being generated\n"
5441 " %R changeset revision number\n"
5439 " %R changeset revision number\n"
5442 " %b basename of the exporting repository\n"
5440 " %b basename of the exporting repository\n"
5443 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5441 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5444 " %n zero-padded sequence number, starting at 1\n"
5442 " %n zero-padded sequence number, starting at 1\n"
5445 " %r zero-padded changeset revision number\n"
5443 " %r zero-padded changeset revision number\n"
5446 "\n"
5444 "\n"
5447 " Without the -a/--text option, export will avoid generating diffs\n"
5445 " Without the -a/--text option, export will avoid generating diffs\n"
5448 " of files it detects as binary. With -a, export will generate a\n"
5446 " of files it detects as binary. With -a, export will generate a\n"
5449 " diff anyway, probably with undesirable results.\n"
5447 " diff anyway, probably with undesirable results.\n"
5450 "\n"
5448 "\n"
5451 " Use the -g/--git option to generate diffs in the git extended diff\n"
5449 " Use the -g/--git option to generate diffs in the git extended diff\n"
5452 " format. See 'hg help diffs' for more information.\n"
5450 " format. See 'hg help diffs' for more information.\n"
5453 "\n"
5451 "\n"
5454 " With the --switch-parent option, the diff will be against the\n"
5452 " With the --switch-parent option, the diff will be against the\n"
5455 " second parent. It can be useful to review a merge.\n"
5453 " second parent. It can be useful to review a merge.\n"
5456 " "
5454 " "
5457 msgstr ""
5455 msgstr ""
5458 "dumpa rubrik och diff för en eller fler ändringar\n"
5456 "dumpa rubrik och diff för en eller fler ändringar\n"
5459 "\n"
5457 "\n"
5460 " Skriv ändringsrubriken och diffen för en eller fler revisioner.\n"
5458 " Skriv ändringsrubriken och diffen för en eller fler revisioner.\n"
5461 "\n"
5459 "\n"
5462 " Informationen som visas i ändringsheadern är: författare, ändringens\n"
5460 " Informationen som visas i ändringsheadern är: författare, ändringens\n"
5463 " hash, föräldrar och arkiveringskommentar.\n"
5461 " hash, föräldrar och arkiveringskommentar.\n"
5464 "\n"
5462 "\n"
5465 " NOTERA: export kan generera oväntade resultat för sammanfogningar,\n"
5463 " NOTERA: export kan generera oväntade resultat för sammanfogningar,\n"
5466 " eftersom den som standard bara kommer att jämföra mot den första\n"
5464 " eftersom den som standard bara kommer att jämföra mot den första\n"
5467 " föräldern.\n"
5465 " föräldern.\n"
5468 "\n"
5466 "\n"
5469 " Utmatning kan vara till en fil, och då anges namnet på filen med en\n"
5467 " Utmatning kan vara till en fil, och då anges namnet på filen med en\n"
5470 " formatsträng. Formateringsreglerna är som följer::\n"
5468 " formatsträng. Formateringsreglerna är som följer::\n"
5471 "\n"
5469 "\n"
5472 " %% ett \"%\"-tecken\n"
5470 " %% ett \"%\"-tecken\n"
5473 " %H ändringshash (40 hexadecimala bytes)\n"
5471 " %H ändringshash (40 hexadecimala bytes)\n"
5474 " %N antal genererade patchar\n"
5472 " %N antal genererade patchar\n"
5475 " %R ändringens revisionsnummer\n"
5473 " %R ändringens revisionsnummer\n"
5476 " %b basnamn för det exporterande arkivet\n"
5474 " %b basnamn för det exporterande arkivet\n"
5477 " %h kort ändringshash (12 hexadecimala bytes)\n"
5475 " %h kort ändringshash (12 hexadecimala bytes)\n"
5478 " %n nollpaddat sekvensnummer, börjar med 1\n"
5476 " %n nollpaddat sekvensnummer, börjar med 1\n"
5479 " %r nollpaddat ändringsrevisionsnummer\n"
5477 " %r nollpaddat ändringsrevisionsnummer\n"
5480 "\n"
5478 "\n"
5481 " Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n"
5479 " Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n"
5482 " av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n"
5480 " av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n"
5483 " ändå, även om resultatet antagligen inte kommer att vara användbart.\n"
5481 " ändå, även om resultatet antagligen inte kommer att vara användbart.\n"
5484 "\n"
5482 "\n"
5485 " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n"
5483 " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n"
5486 " Se 'hg help diffs' för mer information.\n"
5484 " Se 'hg help diffs' för mer information.\n"
5487 "\n"
5485 "\n"
5488 " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n"
5486 " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n"
5489 " föräldern. Det kan vara användbart för att granska en sammanfogning.\n"
5487 " föräldern. Det kan vara användbart för att granska en sammanfogning.\n"
5490 " "
5488 " "
5491
5489
5492 msgid "export requires at least one changeset"
5490 msgid "export requires at least one changeset"
5493 msgstr ""
5491 msgstr ""
5494
5492
5495 msgid "exporting patches:\n"
5493 msgid "exporting patches:\n"
5496 msgstr ""
5494 msgstr ""
5497
5495
5498 msgid "exporting patch:\n"
5496 msgid "exporting patch:\n"
5499 msgstr ""
5497 msgstr ""
5500
5498
5501 msgid ""
5499 msgid ""
5502 "forget the specified files on the next commit\n"
5500 "forget the specified files on the next commit\n"
5503 "\n"
5501 "\n"
5504 " Mark the specified files so they will no longer be tracked\n"
5502 " Mark the specified files so they will no longer be tracked\n"
5505 " after the next commit.\n"
5503 " after the next commit.\n"
5506 "\n"
5504 "\n"
5507 " This only removes files from the current branch, not from the\n"
5505 " This only removes files from the current branch, not from the\n"
5508 " entire project history, and it does not delete them from the\n"
5506 " entire project history, and it does not delete them from the\n"
5509 " working directory.\n"
5507 " working directory.\n"
5510 "\n"
5508 "\n"
5511 " To undo a forget before the next commit, see hg add.\n"
5509 " To undo a forget before the next commit, see hg add.\n"
5512 " "
5510 " "
5513 msgstr ""
5511 msgstr ""
5514 "glöm de specificerade filerna vid nästa arkivering\n"
5512 "glöm de specificerade filerna vid nästa arkivering\n"
5515 "\n"
5513 "\n"
5516 " Märk de specificerade filerna så att de inte längre kommer att spåras\n"
5514 " Märk de specificerade filerna så att de inte längre kommer att spåras\n"
5517 " efter nästa arkivering.\n"
5515 " efter nästa arkivering.\n"
5518 "\n"
5516 "\n"
5519 " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n"
5517 " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n"
5520 " projekthistoriken, och det raderar dem inte från arbetskatalogen.\n"
5518 " projekthistoriken, och det raderar dem inte från arbetskatalogen.\n"
5521 "\n"
5519 "\n"
5522 " För att ångra en forget innan nästa arkivering, se hg add.\n"
5520 " För att ångra en forget innan nästa arkivering, se hg add.\n"
5523 " "
5521 " "
5524
5522
5525 msgid "no files specified"
5523 msgid "no files specified"
5526 msgstr ""
5524 msgstr ""
5527
5525
5528 #, python-format
5526 #, python-format
5529 msgid "not removing %s: file is already untracked\n"
5527 msgid "not removing %s: file is already untracked\n"
5530 msgstr ""
5528 msgstr ""
5531
5529
5532 msgid ""
5530 msgid ""
5533 "search for a pattern in specified files and revisions\n"
5531 "search for a pattern in specified files and revisions\n"
5534 "\n"
5532 "\n"
5535 " Search revisions of files for a regular expression.\n"
5533 " Search revisions of files for a regular expression.\n"
5536 "\n"
5534 "\n"
5537 " This command behaves differently than Unix grep. It only accepts\n"
5535 " This command behaves differently than Unix grep. It only accepts\n"
5538 " Python/Perl regexps. It searches repository history, not the\n"
5536 " Python/Perl regexps. It searches repository history, not the\n"
5539 " working directory. It always prints the revision number in which a\n"
5537 " working directory. It always prints the revision number in which a\n"
5540 " match appears.\n"
5538 " match appears.\n"
5541 "\n"
5539 "\n"
5542 " By default, grep only prints output for the first revision of a\n"
5540 " By default, grep only prints output for the first revision of a\n"
5543 " file in which it finds a match. To get it to print every revision\n"
5541 " file in which it finds a match. To get it to print every revision\n"
5544 " that contains a change in match status (\"-\" for a match that\n"
5542 " that contains a change in match status (\"-\" for a match that\n"
5545 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5543 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5546 " use the --all flag.\n"
5544 " use the --all flag.\n"
5547 " "
5545 " "
5548 msgstr ""
5546 msgstr ""
5549
5547
5550 #, python-format
5548 #, python-format
5551 msgid "grep: invalid match pattern: %s\n"
5549 msgid "grep: invalid match pattern: %s\n"
5552 msgstr ""
5550 msgstr ""
5553
5551
5554 msgid ""
5552 msgid ""
5555 "show current repository heads or show branch heads\n"
5553 "show current repository heads or show branch heads\n"
5556 "\n"
5554 "\n"
5557 " With no arguments, show all repository head changesets.\n"
5555 " With no arguments, show all repository head changesets.\n"
5558 "\n"
5556 "\n"
5559 " Repository \"heads\" are changesets with no child changesets. They are\n"
5557 " Repository \"heads\" are changesets with no child changesets. They are\n"
5560 " where development generally takes place and are the usual targets\n"
5558 " where development generally takes place and are the usual targets\n"
5561 " for update and merge operations.\n"
5559 " for update and merge operations.\n"
5562 "\n"
5560 "\n"
5563 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5561 " If one or more REV is given, the \"branch heads\" will be shown for\n"
5564 " the named branch associated with the specified changeset(s).\n"
5562 " the named branch associated with the specified changeset(s).\n"
5565 "\n"
5563 "\n"
5566 " Branch heads are changesets on a named branch with no descendants on\n"
5564 " Branch heads are changesets on a named branch with no descendants on\n"
5567 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5565 " the same branch. A branch head could be a \"true\" (repository) head,\n"
5568 " or it could be the last changeset on that branch before it was\n"
5566 " or it could be the last changeset on that branch before it was\n"
5569 " merged into another branch, or it could be the last changeset on the\n"
5567 " merged into another branch, or it could be the last changeset on the\n"
5570 " branch before a new branch was created. If none of the branch heads\n"
5568 " branch before a new branch was created. If none of the branch heads\n"
5571 " are true heads, the branch is considered inactive.\n"
5569 " are true heads, the branch is considered inactive.\n"
5572 "\n"
5570 "\n"
5573 " If -c/--closed is specified, also show branch heads marked closed\n"
5571 " If -c/--closed is specified, also show branch heads marked closed\n"
5574 " (see hg commit --close-branch).\n"
5572 " (see hg commit --close-branch).\n"
5575 "\n"
5573 "\n"
5576 " If STARTREV is specified, only those heads that are descendants of\n"
5574 " If STARTREV is specified, only those heads that are descendants of\n"
5577 " STARTREV will be displayed.\n"
5575 " STARTREV will be displayed.\n"
5578 " "
5576 " "
5579 msgstr ""
5577 msgstr ""
5580
5578
5581 msgid "you must specify a branch to use --closed"
5579 msgid "you must specify a branch to use --closed"
5582 msgstr ""
5580 msgstr ""
5583
5581
5584 #, python-format
5582 #, python-format
5585 msgid "no open branch heads on branch %s\n"
5583 msgid "no open branch heads on branch %s\n"
5586 msgstr ""
5584 msgstr ""
5587
5585
5588 #, python-format
5586 #, python-format
5589 msgid "no changes on branch %s containing %s are reachable from %s\n"
5587 msgid "no changes on branch %s containing %s are reachable from %s\n"
5590 msgstr ""
5588 msgstr ""
5591
5589
5592 #, python-format
5590 #, python-format
5593 msgid "no changes on branch %s are reachable from %s\n"
5591 msgid "no changes on branch %s are reachable from %s\n"
5594 msgstr ""
5592 msgstr ""
5595
5593
5596 msgid ""
5594 msgid ""
5597 "show help for a given topic or a help overview\n"
5595 "show help for a given topic or a help overview\n"
5598 "\n"
5596 "\n"
5599 " With no arguments, print a list of commands with short help messages.\n"
5597 " With no arguments, print a list of commands with short help messages.\n"
5600 "\n"
5598 "\n"
5601 " Given a topic, extension, or command name, print help for that\n"
5599 " Given a topic, extension, or command name, print help for that\n"
5602 " topic."
5600 " topic."
5603 msgstr ""
5601 msgstr ""
5604 "visa hjälp för ett givet ämne eller en hjälpöversikt\n"
5602 "visa hjälp för ett givet ämne eller en hjälpöversikt\n"
5605 "\n"
5603 "\n"
5606 " Utan argument visas en kommandolista med korta hjälpmeddelanden.\n"
5604 " Utan argument visas en kommandolista med korta hjälpmeddelanden.\n"
5607 "\n"
5605 "\n"
5608 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n"
5606 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n"
5609 " "
5607 " "
5610
5608
5611 msgid "global options:"
5609 msgid "global options:"
5612 msgstr "globala flaggor:"
5610 msgstr "globala flaggor:"
5613
5611
5614 msgid "use \"hg help\" for the full list of commands"
5612 msgid "use \"hg help\" for the full list of commands"
5615 msgstr "använd \"hg help\" för den fulla kommandolistan"
5613 msgstr "använd \"hg help\" för den fulla kommandolistan"
5616
5614
5617 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5615 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5618 msgstr ""
5616 msgstr ""
5619 "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
5617 "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
5620
5618
5621 #, python-format
5619 #, python-format
5622 msgid "use \"hg -v help%s\" to show aliases and global options"
5620 msgid "use \"hg -v help%s\" to show aliases and global options"
5623 msgstr "använd \"hg -v help%s\" för att visa alias och globala flaggor"
5621 msgstr "använd \"hg -v help%s\" för att visa alias och globala flaggor"
5624
5622
5625 #, python-format
5623 #, python-format
5626 msgid "use \"hg -v help %s\" to show global options"
5624 msgid "use \"hg -v help %s\" to show global options"
5627 msgstr "använd \"hg -v help %s\" för att visa globala flaggor"
5625 msgstr "använd \"hg -v help %s\" för att visa globala flaggor"
5628
5626
5629 msgid ""
5627 msgid ""
5630 "list of commands:\n"
5628 "list of commands:\n"
5631 "\n"
5629 "\n"
5632 msgstr ""
5630 msgstr ""
5633 "kommandolista:\n"
5631 "kommandolista:\n"
5634 "\n"
5632 "\n"
5635
5633
5636 #, python-format
5634 #, python-format
5637 msgid ""
5635 msgid ""
5638 "\n"
5636 "\n"
5639 "aliases: %s\n"
5637 "aliases: %s\n"
5640 msgstr ""
5638 msgstr ""
5641 "\n"
5639 "\n"
5642 "alias: %s\n"
5640 "alias: %s\n"
5643
5641
5644 msgid "(no help text available)"
5642 msgid "(no help text available)"
5645 msgstr ""
5643 msgstr ""
5646
5644
5647 msgid "options:\n"
5645 msgid "options:\n"
5648 msgstr "flaggor:\n"
5646 msgstr "flaggor:\n"
5649
5647
5650 msgid "no commands defined\n"
5648 msgid "no commands defined\n"
5651 msgstr ""
5649 msgstr ""
5652
5650
5653 msgid "enabled extensions:"
5651 msgid "enabled extensions:"
5654 msgstr "aktiverade utökningar:"
5652 msgstr "aktiverade utökningar:"
5655
5653
5656 msgid "no help text available"
5654 msgid "no help text available"
5657 msgstr ""
5655 msgstr ""
5658
5656
5659 #, python-format
5657 #, python-format
5660 msgid ""
5658 msgid ""
5661 "%s extension - %s\n"
5659 "%s extension - %s\n"
5662 "\n"
5660 "\n"
5663 msgstr ""
5661 msgstr ""
5664
5662
5665 msgid "Mercurial Distributed SCM\n"
5663 msgid "Mercurial Distributed SCM\n"
5666 msgstr "Mercurial Distribuerad SCM\n"
5664 msgstr "Mercurial Distribuerad SCM\n"
5667
5665
5668 msgid ""
5666 msgid ""
5669 "basic commands:\n"
5667 "basic commands:\n"
5670 "\n"
5668 "\n"
5671 msgstr ""
5669 msgstr ""
5672 "grundläggande kommandon:\n"
5670 "grundläggande kommandon:\n"
5673 "\n"
5671 "\n"
5674
5672
5675 msgid ""
5673 msgid ""
5676 "\n"
5674 "\n"
5677 "additional help topics:\n"
5675 "additional help topics:\n"
5678 "\n"
5676 "\n"
5679 msgstr ""
5677 msgstr ""
5680 "\n"
5678 "\n"
5681 "ytterligare hjälpämnen:\n"
5679 "ytterligare hjälpämnen:\n"
5682 "\n"
5680 "\n"
5683
5681
5684 msgid ""
5682 msgid ""
5685 "identify the working copy or specified revision\n"
5683 "identify the working copy or specified revision\n"
5686 "\n"
5684 "\n"
5687 " With no revision, print a summary of the current state of the\n"
5685 " With no revision, print a summary of the current state of the\n"
5688 " repository.\n"
5686 " repository.\n"
5689 "\n"
5687 "\n"
5690 " Specifying a path to a repository root or Mercurial bundle will\n"
5688 " Specifying a path to a repository root or Mercurial bundle will\n"
5691 " cause lookup to operate on that repository/bundle.\n"
5689 " cause lookup to operate on that repository/bundle.\n"
5692 "\n"
5690 "\n"
5693 " This summary identifies the repository state using one or two\n"
5691 " This summary identifies the repository state using one or two\n"
5694 " parent hash identifiers, followed by a \"+\" if there are\n"
5692 " parent hash identifiers, followed by a \"+\" if there are\n"
5695 " uncommitted changes in the working directory, a list of tags for\n"
5693 " uncommitted changes in the working directory, a list of tags for\n"
5696 " this revision and a branch name for non-default branches.\n"
5694 " this revision and a branch name for non-default branches.\n"
5697 " "
5695 " "
5698 msgstr ""
5696 msgstr ""
5699
5697
5700 msgid ""
5698 msgid ""
5701 "import an ordered set of patches\n"
5699 "import an ordered set of patches\n"
5702 "\n"
5700 "\n"
5703 " Import a list of patches and commit them individually.\n"
5701 " Import a list of patches and commit them individually.\n"
5704 "\n"
5702 "\n"
5705 " If there are outstanding changes in the working directory, import\n"
5703 " If there are outstanding changes in the working directory, import\n"
5706 " will abort unless given the -f/--force flag.\n"
5704 " will abort unless given the -f/--force flag.\n"
5707 "\n"
5705 "\n"
5708 " You can import a patch straight from a mail message. Even patches\n"
5706 " You can import a patch straight from a mail message. Even patches\n"
5709 " as attachments work (to use the body part, it must have type\n"
5707 " as attachments work (to use the body part, it must have type\n"
5710 " text/plain or text/x-patch). From and Subject headers of email\n"
5708 " text/plain or text/x-patch). From and Subject headers of email\n"
5711 " message are used as default committer and commit message. All\n"
5709 " message are used as default committer and commit message. All\n"
5712 " text/plain body parts before first diff are added to commit\n"
5710 " text/plain body parts before first diff are added to commit\n"
5713 " message.\n"
5711 " message.\n"
5714 "\n"
5712 "\n"
5715 " If the imported patch was generated by hg export, user and\n"
5713 " If the imported patch was generated by hg export, user and\n"
5716 " description from patch override values from message headers and\n"
5714 " description from patch override values from message headers and\n"
5717 " body. Values given on command line with -m/--message and -u/--user\n"
5715 " body. Values given on command line with -m/--message and -u/--user\n"
5718 " override these.\n"
5716 " override these.\n"
5719 "\n"
5717 "\n"
5720 " If --exact is specified, import will set the working directory to\n"
5718 " If --exact is specified, import will set the working directory to\n"
5721 " the parent of each patch before applying it, and will abort if the\n"
5719 " the parent of each patch before applying it, and will abort if the\n"
5722 " resulting changeset has a different ID than the one recorded in\n"
5720 " resulting changeset has a different ID than the one recorded in\n"
5723 " the patch. This may happen due to character set problems or other\n"
5721 " the patch. This may happen due to character set problems or other\n"
5724 " deficiencies in the text patch format.\n"
5722 " deficiencies in the text patch format.\n"
5725 "\n"
5723 "\n"
5726 " With -s/--similarity, hg will attempt to discover renames and\n"
5724 " With -s/--similarity, hg will attempt to discover renames and\n"
5727 " copies in the patch in the same way as 'addremove'.\n"
5725 " copies in the patch in the same way as 'addremove'.\n"
5728 "\n"
5726 "\n"
5729 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5727 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5730 " a URL is specified, the patch will be downloaded from it.\n"
5728 " a URL is specified, the patch will be downloaded from it.\n"
5731 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5729 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5732 " "
5730 " "
5733 msgstr ""
5731 msgstr ""
5734
5732
5735 msgid "applying patch from stdin\n"
5733 msgid "applying patch from stdin\n"
5736 msgstr ""
5734 msgstr ""
5737
5735
5738 msgid "no diffs found"
5736 msgid "no diffs found"
5739 msgstr ""
5737 msgstr ""
5740
5738
5741 msgid "not a Mercurial patch"
5739 msgid "not a Mercurial patch"
5742 msgstr ""
5740 msgstr ""
5743
5741
5744 msgid "patch is damaged or loses information"
5742 msgid "patch is damaged or loses information"
5745 msgstr ""
5743 msgstr ""
5746
5744
5747 msgid ""
5745 msgid ""
5748 "show new changesets found in source\n"
5746 "show new changesets found in source\n"
5749 "\n"
5747 "\n"
5750 " Show new changesets found in the specified path/URL or the default\n"
5748 " Show new changesets found in the specified path/URL or the default\n"
5751 " pull location. These are the changesets that would have been pulled\n"
5749 " pull location. These are the changesets that would have been pulled\n"
5752 " if a pull at the time you issued this command.\n"
5750 " if a pull at the time you issued this command.\n"
5753 "\n"
5751 "\n"
5754 " For remote repository, using --bundle avoids downloading the\n"
5752 " For remote repository, using --bundle avoids downloading the\n"
5755 " changesets twice if the incoming is followed by a pull.\n"
5753 " changesets twice if the incoming is followed by a pull.\n"
5756 "\n"
5754 "\n"
5757 " See pull for valid source format details.\n"
5755 " See pull for valid source format details.\n"
5758 " "
5756 " "
5759 msgstr ""
5757 msgstr ""
5760
5758
5761 msgid ""
5759 msgid ""
5762 "create a new repository in the given directory\n"
5760 "create a new repository in the given directory\n"
5763 "\n"
5761 "\n"
5764 " Initialize a new repository in the given directory. If the given\n"
5762 " Initialize a new repository in the given directory. If the given\n"
5765 " directory does not exist, it will be created.\n"
5763 " directory does not exist, it will be created.\n"
5766 "\n"
5764 "\n"
5767 " If no directory is given, the current directory is used.\n"
5765 " If no directory is given, the current directory is used.\n"
5768 "\n"
5766 "\n"
5769 " It is possible to specify an ssh:// URL as the destination.\n"
5767 " It is possible to specify an ssh:// URL as the destination.\n"
5770 " See 'hg help urls' for more information.\n"
5768 " See 'hg help urls' for more information.\n"
5771 " "
5769 " "
5772 msgstr ""
5770 msgstr ""
5773 "skapa ett nytt arkiv i den angivna katalogen\n"
5771 "skapa ett nytt arkiv i den angivna katalogen\n"
5774 "\n"
5772 "\n"
5775 " Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n"
5773 " Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n"
5776 " katalogen inte existerar, kommer den att skapas.\n"
5774 " katalogen inte existerar, kommer den att skapas.\n"
5777 "\n"
5775 "\n"
5778 " Om ingen katalog anges, används den nuvarande katalogen.\n"
5776 " Om ingen katalog anges, används den nuvarande katalogen.\n"
5779 "\n"
5777 "\n"
5780 " Det är möjligt att specificera en URL med ssh:// som destination. Se\n"
5778 " Det är möjligt att specificera en URL med ssh:// som destination. Se\n"
5781 " 'hg help urls' för mer information.\n"
5779 " 'hg help urls' för mer information.\n"
5782 " "
5780 " "
5783
5781
5784 msgid ""
5782 msgid ""
5785 "locate files matching specific patterns\n"
5783 "locate files matching specific patterns\n"
5786 "\n"
5784 "\n"
5787 " Print files under Mercurial control in the working directory whose\n"
5785 " Print files under Mercurial control in the working directory whose\n"
5788 " names match the given patterns.\n"
5786 " names match the given patterns.\n"
5789 "\n"
5787 "\n"
5790 " By default, this command searches all directories in the working\n"
5788 " By default, this command searches all directories in the working\n"
5791 " directory. To search just the current directory and its\n"
5789 " directory. To search just the current directory and its\n"
5792 " subdirectories, use \"--include .\".\n"
5790 " subdirectories, use \"--include .\".\n"
5793 "\n"
5791 "\n"
5794 " If no patterns are given to match, this command prints the names\n"
5792 " If no patterns are given to match, this command prints the names\n"
5795 " of all files under Mercurial control in the working directory.\n"
5793 " of all files under Mercurial control in the working directory.\n"
5796 "\n"
5794 "\n"
5797 " If you want to feed the output of this command into the \"xargs\"\n"
5795 " If you want to feed the output of this command into the \"xargs\"\n"
5798 " command, use the -0 option to both this command and \"xargs\". This\n"
5796 " command, use the -0 option to both this command and \"xargs\". This\n"
5799 " will avoid the problem of \"xargs\" treating single filenames that\n"
5797 " will avoid the problem of \"xargs\" treating single filenames that\n"
5800 " contain whitespace as multiple filenames.\n"
5798 " contain whitespace as multiple filenames.\n"
5801 " "
5799 " "
5802 msgstr ""
5800 msgstr ""
5803
5801
5804 msgid ""
5802 msgid ""
5805 "show revision history of entire repository or files\n"
5803 "show revision history of entire repository or files\n"
5806 "\n"
5804 "\n"
5807 " Print the revision history of the specified files or the entire\n"
5805 " Print the revision history of the specified files or the entire\n"
5808 " project.\n"
5806 " project.\n"
5809 "\n"
5807 "\n"
5810 " File history is shown without following rename or copy history of\n"
5808 " File history is shown without following rename or copy history of\n"
5811 " files. Use -f/--follow with a filename to follow history across\n"
5809 " files. Use -f/--follow with a filename to follow history across\n"
5812 " renames and copies. --follow without a filename will only show\n"
5810 " renames and copies. --follow without a filename will only show\n"
5813 " ancestors or descendants of the starting revision. --follow-first\n"
5811 " ancestors or descendants of the starting revision. --follow-first\n"
5814 " only follows the first parent of merge revisions.\n"
5812 " only follows the first parent of merge revisions.\n"
5815 "\n"
5813 "\n"
5816 " If no revision range is specified, the default is tip:0 unless\n"
5814 " If no revision range is specified, the default is tip:0 unless\n"
5817 " --follow is set, in which case the working directory parent is\n"
5815 " --follow is set, in which case the working directory parent is\n"
5818 " used as the starting revision.\n"
5816 " used as the starting revision.\n"
5819 "\n"
5817 "\n"
5820 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5818 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5821 "\n"
5819 "\n"
5822 " By default this command prints revision number and changeset id,\n"
5820 " By default this command prints revision number and changeset id,\n"
5823 " tags, non-trivial parents, user, date and time, and a summary for\n"
5821 " tags, non-trivial parents, user, date and time, and a summary for\n"
5824 " each commit. When the -v/--verbose switch is used, the list of\n"
5822 " each commit. When the -v/--verbose switch is used, the list of\n"
5825 " changed files and full commit message are shown.\n"
5823 " changed files and full commit message are shown.\n"
5826 "\n"
5824 "\n"
5827 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5825 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
5828 " changesets, as it will only compare the merge changeset against\n"
5826 " changesets, as it will only compare the merge changeset against\n"
5829 " its first parent. Also, only files different from BOTH parents\n"
5827 " its first parent. Also, only files different from BOTH parents\n"
5830 " will appear in files:.\n"
5828 " will appear in files:.\n"
5831 " "
5829 " "
5832 msgstr ""
5830 msgstr ""
5833 "visa revisionshistorik för hela arkivet eller filer\n"
5831 "visa revisionshistorik för hela arkivet eller filer\n"
5834 "\n"
5832 "\n"
5835 " Skriv ut revisionshistoriken för de specificerade filerna eller hela\n"
5833 " Skriv ut revisionshistoriken för de specificerade filerna eller hela\n"
5836 " projektet.\n"
5834 " projektet.\n"
5837 "\n"
5835 "\n"
5838 " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
5836 " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
5839 " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
5837 " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
5840 " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
5838 " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
5841 " visa föräldrar eller ättlingar från startrevisionen. --follow-first\n"
5839 " visa föräldrar eller ättlingar från startrevisionen. --follow-first\n"
5842 " följer bara den första föräldern i revisoner med sammanfogningar.\n"
5840 " följer bara den första föräldern i revisoner med sammanfogningar.\n"
5843 "\n"
5841 "\n"
5844 " Om ingen revisionsserie specificeras, används tip:0 som standard om\n"
5842 " Om ingen revisionsserie specificeras, används tip:0 som standard om\n"
5845 " inte --follow är satt, då arbetskatalogens förälder används som första\n"
5843 " inte --follow är satt, då arbetskatalogens förälder används som första\n"
5846 " revision.\n"
5844 " revision.\n"
5847 "\n"
5845 "\n"
5848 " Se 'hg help dates' för giltiga format till -d/--date.\n"
5846 " Se 'hg help dates' för giltiga format till -d/--date.\n"
5849 "\n"
5847 "\n"
5850 " Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n"
5848 " Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n"
5851 " märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n"
5849 " märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n"
5852 " sammandrag för varje arkivering. När flaggan -v/--verbose används,\n"
5850 " sammandrag för varje arkivering. När flaggan -v/--verbose används,\n"
5853 " visas listan med ändrade filer och fullständigt arkiveringsmeddelande.\n"
5851 " visas listan med ändrade filer och fullständigt arkiveringsmeddelande.\n"
5854 "\n"
5852 "\n"
5855 " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n"
5853 " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n"
5856 " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n"
5854 " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n"
5857 " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n"
5855 " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n"
5858 " föräldrarna att visas i filer:.\n"
5856 " föräldrarna att visas i filer:.\n"
5859 " "
5857 " "
5860
5858
5861 msgid ""
5859 msgid ""
5862 "output the current or given revision of the project manifest\n"
5860 "output the current or given revision of the project manifest\n"
5863 "\n"
5861 "\n"
5864 " Print a list of version controlled files for the given revision.\n"
5862 " Print a list of version controlled files for the given revision.\n"
5865 " If no revision is given, the first parent of the working directory\n"
5863 " If no revision is given, the first parent of the working directory\n"
5866 " is used, or the null revision if no revision is checked out.\n"
5864 " is used, or the null revision if no revision is checked out.\n"
5867 "\n"
5865 "\n"
5868 " With -v, print file permissions, symlink and executable bits.\n"
5866 " With -v, print file permissions, symlink and executable bits.\n"
5869 " With --debug, print file revision hashes.\n"
5867 " With --debug, print file revision hashes.\n"
5870 " "
5868 " "
5871 msgstr ""
5869 msgstr ""
5872
5870
5873 msgid ""
5871 msgid ""
5874 "merge working directory with another revision\n"
5872 "merge working directory with another revision\n"
5875 "\n"
5873 "\n"
5876 " The current working directory is updated with all changes made in\n"
5874 " The current working directory is updated with all changes made in\n"
5877 " the requested revision since the last common predecessor revision.\n"
5875 " the requested revision since the last common predecessor revision.\n"
5878 "\n"
5876 "\n"
5879 " Files that changed between either parent are marked as changed for\n"
5877 " Files that changed between either parent are marked as changed for\n"
5880 " the next commit and a commit must be performed before any further\n"
5878 " the next commit and a commit must be performed before any further\n"
5881 " updates to the repository are allowed. The next commit will have\n"
5879 " updates to the repository are allowed. The next commit will have\n"
5882 " two parents.\n"
5880 " two parents.\n"
5883 "\n"
5881 "\n"
5884 " If no revision is specified, the working directory's parent is a\n"
5882 " If no revision is specified, the working directory's parent is a\n"
5885 " head revision, and the current branch contains exactly one other\n"
5883 " head revision, and the current branch contains exactly one other\n"
5886 " head, the other head is merged with by default. Otherwise, an\n"
5884 " head, the other head is merged with by default. Otherwise, an\n"
5887 " explicit revision with which to merge with must be provided.\n"
5885 " explicit revision with which to merge with must be provided.\n"
5888 " "
5886 " "
5889 msgstr ""
5887 msgstr ""
5890 "sammanfoga arbetskatalogen med en annan revision\n"
5888 "sammanfoga arbetskatalogen med en annan revision\n"
5891 "\n"
5889 "\n"
5892 " Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n"
5890 " Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n"
5893 " den efterfrågade revisionen sedan den senaste gemensamma revisionen.\n"
5891 " den efterfrågade revisionen sedan den senaste gemensamma revisionen.\n"
5894 "\n"
5892 "\n"
5895 " Filerna som ändrats mellan föräldrarna markeras som förändrade till\n"
5893 " Filerna som ändrats mellan föräldrarna markeras som förändrade till\n"
5896 " nästa arkivering och en arkivering måste utföras innan några andra\n"
5894 " nästa arkivering och en arkivering måste utföras innan några andra\n"
5897 " arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n"
5895 " arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n"
5898 " föräldrar.\n"
5896 " föräldrar.\n"
5899 "\n"
5897 "\n"
5900 " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n"
5898 " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n"
5901 " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n"
5899 " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n"
5902 " det andra huvudet som standard. Om inte, måste en explicit revision\n"
5900 " det andra huvudet som standard. Om inte, måste en explicit revision\n"
5903 " anges.\n"
5901 " anges.\n"
5904 " "
5902 " "
5905
5903
5906 #, python-format
5904 #, python-format
5907 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5905 msgid "branch '%s' has %d heads - please merge with an explicit rev"
5908 msgstr ""
5906 msgstr ""
5909
5907
5910 #, python-format
5908 #, python-format
5911 msgid "branch '%s' has one head - please merge with an explicit rev"
5909 msgid "branch '%s' has one head - please merge with an explicit rev"
5912 msgstr ""
5910 msgstr ""
5913
5911
5914 msgid "there is nothing to merge"
5912 msgid "there is nothing to merge"
5915 msgstr ""
5913 msgstr ""
5916
5914
5917 #, python-format
5915 #, python-format
5918 msgid "%s - use \"hg update\" instead"
5916 msgid "%s - use \"hg update\" instead"
5919 msgstr ""
5917 msgstr ""
5920
5918
5921 msgid ""
5919 msgid ""
5922 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5920 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
5923 "rev"
5921 "rev"
5924 msgstr ""
5922 msgstr ""
5925
5923
5926 msgid ""
5924 msgid ""
5927 "show changesets not found in destination\n"
5925 "show changesets not found in destination\n"
5928 "\n"
5926 "\n"
5929 " Show changesets not found in the specified destination repository\n"
5927 " Show changesets not found in the specified destination repository\n"
5930 " or the default push location. These are the changesets that would\n"
5928 " or the default push location. These are the changesets that would\n"
5931 " be pushed if a push was requested.\n"
5929 " be pushed if a push was requested.\n"
5932 "\n"
5930 "\n"
5933 " See pull for valid destination format details.\n"
5931 " See pull for valid destination format details.\n"
5934 " "
5932 " "
5935 msgstr ""
5933 msgstr ""
5936
5934
5937 msgid ""
5935 msgid ""
5938 "show the parents of the working directory or revision\n"
5936 "show the parents of the working directory or revision\n"
5939 "\n"
5937 "\n"
5940 " Print the working directory's parent revisions. If a revision is\n"
5938 " Print the working directory's parent revisions. If a revision is\n"
5941 " given via -r/--rev, the parent of that revision will be printed.\n"
5939 " given via -r/--rev, the parent of that revision will be printed.\n"
5942 " If a file argument is given, the revision in which the file was\n"
5940 " If a file argument is given, the revision in which the file was\n"
5943 " last changed (before the working directory revision or the\n"
5941 " last changed (before the working directory revision or the\n"
5944 " argument to --rev if given) is printed.\n"
5942 " argument to --rev if given) is printed.\n"
5945 " "
5943 " "
5946 msgstr ""
5944 msgstr ""
5947 "visa föräldrar till arbetskatalogen eller revision\n"
5945 "visa föräldrar till arbetskatalogen eller revision\n"
5948 "\n"
5946 "\n"
5949 " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n"
5947 " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n"
5950 " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n"
5948 " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n"
5951 " anges, kommer revisionen då den filen sist ändrades (innan\n"
5949 " anges, kommer revisionen då den filen sist ändrades (innan\n"
5952 " arbetskatalogens revision eller innan --rev om angiven) att visas.\n"
5950 " arbetskatalogens revision eller innan --rev om angiven) att visas.\n"
5953 " "
5951 " "
5954
5952
5955 msgid "can only specify an explicit filename"
5953 msgid "can only specify an explicit filename"
5956 msgstr ""
5954 msgstr ""
5957
5955
5958 #, python-format
5956 #, python-format
5959 msgid "'%s' not found in manifest!"
5957 msgid "'%s' not found in manifest!"
5960 msgstr ""
5958 msgstr ""
5961
5959
5962 msgid ""
5960 msgid ""
5963 "show aliases for remote repositories\n"
5961 "show aliases for remote repositories\n"
5964 "\n"
5962 "\n"
5965 " Show definition of symbolic path name NAME. If no name is given,\n"
5963 " Show definition of symbolic path name NAME. If no name is given,\n"
5966 " show definition of all available names.\n"
5964 " show definition of all available names.\n"
5967 "\n"
5965 "\n"
5968 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5966 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
5969 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5967 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
5970 "\n"
5968 "\n"
5971 " See 'hg help urls' for more information.\n"
5969 " See 'hg help urls' for more information.\n"
5972 " "
5970 " "
5973 msgstr ""
5971 msgstr ""
5974
5972
5975 msgid "not found!\n"
5973 msgid "not found!\n"
5976 msgstr ""
5974 msgstr ""
5977
5975
5978 msgid "not updating, since new heads added\n"
5976 msgid "not updating, since new heads added\n"
5979 msgstr ""
5977 msgstr ""
5980
5978
5981 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5979 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
5982 msgstr ""
5980 msgstr ""
5983
5981
5984 msgid "(run 'hg update' to get a working copy)\n"
5982 msgid "(run 'hg update' to get a working copy)\n"
5985 msgstr ""
5983 msgstr ""
5986
5984
5987 msgid ""
5985 msgid ""
5988 "pull changes from the specified source\n"
5986 "pull changes from the specified source\n"
5989 "\n"
5987 "\n"
5990 " Pull changes from a remote repository to a local one.\n"
5988 " Pull changes from a remote repository to a local one.\n"
5991 "\n"
5989 "\n"
5992 " This finds all changes from the repository at the specified path\n"
5990 " This finds all changes from the repository at the specified path\n"
5993 " or URL and adds them to a local repository (the current one unless\n"
5991 " or URL and adds them to a local repository (the current one unless\n"
5994 " -R is specified). By default, this does not update the copy of the\n"
5992 " -R is specified). By default, this does not update the copy of the\n"
5995 " project in the working directory.\n"
5993 " project in the working directory.\n"
5996 "\n"
5994 "\n"
5997 " Use hg incoming if you want to see what would have been added by a\n"
5995 " Use hg incoming if you want to see what would have been added by a\n"
5998 " pull at the time you issued this command. If you then decide to\n"
5996 " pull at the time you issued this command. If you then decide to\n"
5999 " added those changes to the repository, you should use pull -r X\n"
5997 " added those changes to the repository, you should use pull -r X\n"
6000 " where X is the last changeset listed by hg incoming.\n"
5998 " where X is the last changeset listed by hg incoming.\n"
6001 "\n"
5999 "\n"
6002 " If SOURCE is omitted, the 'default' path will be used.\n"
6000 " If SOURCE is omitted, the 'default' path will be used.\n"
6003 " See 'hg help urls' for more information.\n"
6001 " See 'hg help urls' for more information.\n"
6004 " "
6002 " "
6005 msgstr ""
6003 msgstr ""
6006 "dra ändringar från den specificerade källan\n"
6004 "dra ändringar från den specificerade källan\n"
6005 "\n"
6007 " Drar ändringar från ett annat arkiv till ett lokalt.\n"
6006 " Drar ändringar från ett annat arkiv till ett lokalt.\n"
6008 "\n"
6007 "\n"
6009 " Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n"
6008 " Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n"
6010 " URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n"
6009 " URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n"
6011 " -R är angivet). Som standard uppdaterar detta inte projektkopian i\n"
6010 " -R är angivet). Som standard uppdaterar detta inte projektkopian i\n"
6012 " arbetskatalogen.\n"
6011 " arbetskatalogen.\n"
6013 "\n"
6012 "\n"
6014 " Använd hg incoming om du vill se vad som skulle ha lagts till av en\n"
6013 " Använd hg incoming om du vill se vad som skulle ha lagts till av en\n"
6015 " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n"
6014 " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n"
6016 " att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n"
6015 " att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n"
6017 " sista ändringen listad av hg incoming.\n"
6016 " sista ändringen listad av hg incoming.\n"
6018 "\n"
6017 "\n"
6019 " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n"
6018 " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n"
6020 " Se 'hg help urls' för mer information.\n"
6019 " Se 'hg help urls' för mer information.\n"
6021 " "
6020 " "
6022
6021
6023 msgid ""
6022 msgid ""
6024 "push changes to the specified destination\n"
6023 "push changes to the specified destination\n"
6025 "\n"
6024 "\n"
6026 " Push changes from the local repository to the given destination.\n"
6025 " Push changes from the local repository to the given destination.\n"
6027 "\n"
6026 "\n"
6028 " This is the symmetrical operation for pull. It moves changes from\n"
6027 " This is the symmetrical operation for pull. It moves changes from\n"
6029 " the current repository to a different one. If the destination is\n"
6028 " the current repository to a different one. If the destination is\n"
6030 " local this is identical to a pull in that directory from the\n"
6029 " local this is identical to a pull in that directory from the\n"
6031 " current one.\n"
6030 " current one.\n"
6032 "\n"
6031 "\n"
6033 " By default, push will refuse to run if it detects the result would\n"
6032 " By default, push will refuse to run if it detects the result would\n"
6034 " increase the number of remote heads. This generally indicates the\n"
6033 " increase the number of remote heads. This generally indicates the\n"
6035 " user forgot to pull and merge before pushing.\n"
6034 " user forgot to pull and merge before pushing.\n"
6036 "\n"
6035 "\n"
6037 " If -r/--rev is used, the named revision and all its ancestors will\n"
6036 " If -r/--rev is used, the named revision and all its ancestors will\n"
6038 " be pushed to the remote repository.\n"
6037 " be pushed to the remote repository.\n"
6039 "\n"
6038 "\n"
6040 " Please see 'hg help urls' for important details about ssh://\n"
6039 " Please see 'hg help urls' for important details about ssh://\n"
6041 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6040 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6042 " "
6041 " "
6043 msgstr ""
6042 msgstr ""
6044 "tryck ändringar till den specificerade destinationen\n"
6043 "tryck ändringar till den specificerade destinationen\n"
6044 "\n"
6045 " Trycker ändringar från det lokala arkivet till den givna destinationen.\n"
6045 " Trycker ändringar från det lokala arkivet till den givna destinationen.\n"
6046 "\n"
6046 "\n"
6047 " Detta är en symmetriska operationen för pull. Den flyttar ändringar\n"
6047 " Detta är en symmetriska operationen för pull. Den flyttar ändringar\n"
6048 " från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n"
6048 " från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n"
6049 " är detta identiskt med en dragning i den katalogen från den nuvarande.\n"
6049 " är detta identiskt med en dragning i den katalogen från den nuvarande.\n"
6050 "\n"
6050 "\n"
6051 " Som standard vägrar push att utföra något om det upptäcks att antalet\n"
6051 " Som standard vägrar push att utföra något om det upptäcks att antalet\n"
6052 " huvuden i destinationen ökar. Det brukar generellt sett indikera att\n"
6052 " huvuden i destinationen ökar. Det brukar generellt sett indikera att\n"
6053 " användaren glömt att dra och sammanfoga innan tryckning.\n"
6053 " användaren glömt att dra och sammanfoga innan tryckning.\n"
6054 "\n"
6054 "\n"
6055 " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n"
6055 " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n"
6056 " tryckas till det andra arkivet.\n"
6056 " tryckas till det andra arkivet.\n"
6057 "\n"
6057 "\n"
6058 " Se 'hg help urls' för viktiga detaljer om URL:er med ssh://. Om\n"
6058 " Se 'hg help urls' för viktiga detaljer om URL:er med ssh://. Om\n"
6059 " DESTINATION inte är angivet, används standardsökvägen."
6059 " DESTINATION inte är angivet, används standardsökvägen."
6060
6060
6061 #, python-format
6061 #, python-format
6062 msgid "pushing to %s\n"
6062 msgid "pushing to %s\n"
6063 msgstr ""
6063 msgstr ""
6064
6064
6065 msgid ""
6065 msgid ""
6066 "roll back an interrupted transaction\n"
6066 "roll back an interrupted transaction\n"
6067 "\n"
6067 "\n"
6068 " Recover from an interrupted commit or pull.\n"
6068 " Recover from an interrupted commit or pull.\n"
6069 "\n"
6069 "\n"
6070 " This command tries to fix the repository status after an\n"
6070 " This command tries to fix the repository status after an\n"
6071 " interrupted operation. It should only be necessary when Mercurial\n"
6071 " interrupted operation. It should only be necessary when Mercurial\n"
6072 " suggests it.\n"
6072 " suggests it.\n"
6073 " "
6073 " "
6074 msgstr ""
6074 msgstr ""
6075
6075
6076 msgid ""
6076 msgid ""
6077 "remove the specified files on the next commit\n"
6077 "remove the specified files on the next commit\n"
6078 "\n"
6078 "\n"
6079 " Schedule the indicated files for removal from the repository.\n"
6079 " Schedule the indicated files for removal from the repository.\n"
6080 "\n"
6080 "\n"
6081 " This only removes files from the current branch, not from the\n"
6081 " This only removes files from the current branch, not from the\n"
6082 " entire project history. -A/--after can be used to remove only\n"
6082 " entire project history. -A/--after can be used to remove only\n"
6083 " files that have already been deleted, -f/--force can be used to\n"
6083 " files that have already been deleted, -f/--force can be used to\n"
6084 " force deletion, and -Af can be used to remove files from the next\n"
6084 " force deletion, and -Af can be used to remove files from the next\n"
6085 " revision without deleting them from the working directory.\n"
6085 " revision without deleting them from the working directory.\n"
6086 "\n"
6086 "\n"
6087 " The following table details the behavior of remove for different\n"
6087 " The following table details the behavior of remove for different\n"
6088 " file states (columns) and option combinations (rows). The file\n"
6088 " file states (columns) and option combinations (rows). The file\n"
6089 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6089 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6090 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6090 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6091 " and Delete (from disk)::\n"
6091 " and Delete (from disk)::\n"
6092 "\n"
6092 "\n"
6093 " A C M !\n"
6093 " A C M !\n"
6094 " none W RD W R\n"
6094 " none W RD W R\n"
6095 " -f R RD RD R\n"
6095 " -f R RD RD R\n"
6096 " -A W W W R\n"
6096 " -A W W W R\n"
6097 " -Af R R R R\n"
6097 " -Af R R R R\n"
6098 "\n"
6098 "\n"
6099 " This command schedules the files to be removed at the next commit.\n"
6099 " This command schedules the files to be removed at the next commit.\n"
6100 " To undo a remove before that, see hg revert.\n"
6100 " To undo a remove before that, see hg revert.\n"
6101 " "
6101 " "
6102 msgstr ""
6102 msgstr ""
6103 "ta bort de specificerade filerna vid nästa arkivering\n"
6103 "ta bort de specificerade filerna vid nästa arkivering\n"
6104 "\n"
6104 "\n"
6105 " Markera de indikerade filerna för borttagning från arkivet.\n"
6105 " Markera de indikerade filerna för borttagning från arkivet.\n"
6106 "\n"
6106 "\n"
6107 " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
6107 " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
6108 " projektets historik. -A/--after kan användas för att bara ta bort filer\n"
6108 " projektets historik. -A/--after kan användas för att bara ta bort filer\n"
6109 " som redan raderats, -f/--force kan användas för att tvinga radering, "
6109 " som redan raderats, -f/--force kan användas för att tvinga radering, "
6110 "och\n"
6110 "och\n"
6111 " -Af kan ta bort filer från nästa revision utan att radera dem från\n"
6111 " -Af kan ta bort filer från nästa revision utan att radera dem från\n"
6112 " arbetskopian.\n"
6112 " arbetskopian.\n"
6113 "\n"
6113 "\n"
6114 " Följande tabell visar hur remove uppför sig för olika filstatus\n"
6114 " Följande tabell visar hur remove uppför sig för olika filstatus\n"
6115 " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
6115 " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
6116 " Modifierad [M] och Saknad [!] (som rapporteras av hg status). "
6116 " Modifierad [M] och Saknad [!] (som rapporteras av hg status). "
6117 "Aktionerna\n"
6117 "Aktionerna\n"
6118 " är Varna, Radera (från gren) och Ta bort (från disk)::\n"
6118 " är Varna, Radera (från gren) och Ta bort (från disk)::\n"
6119 "\n"
6119 "\n"
6120 " A C M !\n"
6120 " A C M !\n"
6121 " ingen V RT V R\n"
6121 " ingen V RT V R\n"
6122 " -f R RT RT R\n"
6122 " -f R RT RT R\n"
6123 " -A V V V R\n"
6123 " -A V V V R\n"
6124 " -Af R R R R\n"
6124 " -Af R R R R\n"
6125 "\n"
6125 "\n"
6126 " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
6126 " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
6127 " att ångra en remove innan dess, se hg revert.\n"
6127 " att ångra en remove innan dess, se hg revert.\n"
6128 " "
6128 " "
6129
6129
6130 #, python-format
6130 #, python-format
6131 msgid "not removing %s: file is untracked\n"
6131 msgid "not removing %s: file is untracked\n"
6132 msgstr ""
6132 msgstr ""
6133
6133
6134 #, python-format
6134 #, python-format
6135 msgid "not removing %s: file %s (use -f to force removal)\n"
6135 msgid "not removing %s: file %s (use -f to force removal)\n"
6136 msgstr ""
6136 msgstr ""
6137
6137
6138 msgid "still exists"
6138 msgid "still exists"
6139 msgstr ""
6139 msgstr ""
6140
6140
6141 msgid "is modified"
6141 msgid "is modified"
6142 msgstr ""
6142 msgstr ""
6143
6143
6144 msgid "has been marked for add"
6144 msgid "has been marked for add"
6145 msgstr ""
6145 msgstr ""
6146
6146
6147 msgid ""
6147 msgid ""
6148 "rename files; equivalent of copy + remove\n"
6148 "rename files; equivalent of copy + remove\n"
6149 "\n"
6149 "\n"
6150 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6150 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6151 " is a directory, copies are put in that directory. If dest is a\n"
6151 " is a directory, copies are put in that directory. If dest is a\n"
6152 " file, there can only be one source.\n"
6152 " file, there can only be one source.\n"
6153 "\n"
6153 "\n"
6154 " By default, this command copies the contents of files as they\n"
6154 " By default, this command copies the contents of files as they\n"
6155 " exist in the working directory. If invoked with -A/--after, the\n"
6155 " exist in the working directory. If invoked with -A/--after, the\n"
6156 " operation is recorded, but no copying is performed.\n"
6156 " operation is recorded, but no copying is performed.\n"
6157 "\n"
6157 "\n"
6158 " This command takes effect at the next commit. To undo a rename\n"
6158 " This command takes effect at the next commit. To undo a rename\n"
6159 " before that, see hg revert.\n"
6159 " before that, see hg revert.\n"
6160 " "
6160 " "
6161 msgstr ""
6161 msgstr ""
6162
6162
6163 msgid ""
6163 msgid ""
6164 "retry file merges from a merge or update\n"
6164 "retry file merges from a merge or update\n"
6165 "\n"
6165 "\n"
6166 " This command will cleanly retry unresolved file merges using file\n"
6166 " This command will cleanly retry unresolved file merges using file\n"
6167 " revisions preserved from the last update or merge. To attempt to\n"
6167 " revisions preserved from the last update or merge. To attempt to\n"
6168 " resolve all unresolved files, use the -a/--all switch.\n"
6168 " resolve all unresolved files, use the -a/--all switch.\n"
6169 "\n"
6169 "\n"
6170 " If a conflict is resolved manually, please note that the changes\n"
6170 " If a conflict is resolved manually, please note that the changes\n"
6171 " will be overwritten if the merge is retried with resolve. The\n"
6171 " will be overwritten if the merge is retried with resolve. The\n"
6172 " -m/--mark switch should be used to mark the file as resolved.\n"
6172 " -m/--mark switch should be used to mark the file as resolved.\n"
6173 "\n"
6173 "\n"
6174 " This command also allows listing resolved files and manually\n"
6174 " This command also allows listing resolved files and manually\n"
6175 " indicating whether or not files are resolved. All files must be\n"
6175 " indicating whether or not files are resolved. All files must be\n"
6176 " marked as resolved before a commit is permitted.\n"
6176 " marked as resolved before a commit is permitted.\n"
6177 "\n"
6177 "\n"
6178 " The codes used to show the status of files are::\n"
6178 " The codes used to show the status of files are::\n"
6179 "\n"
6179 "\n"
6180 " U = unresolved\n"
6180 " U = unresolved\n"
6181 " R = resolved\n"
6181 " R = resolved\n"
6182 " "
6182 " "
6183 msgstr ""
6183 msgstr ""
6184
6184
6185 msgid "too many options specified"
6185 msgid "too many options specified"
6186 msgstr ""
6186 msgstr ""
6187
6187
6188 msgid "can't specify --all and patterns"
6188 msgid "can't specify --all and patterns"
6189 msgstr ""
6189 msgstr ""
6190
6190
6191 msgid "no files or directories specified; use --all to remerge all files"
6191 msgid "no files or directories specified; use --all to remerge all files"
6192 msgstr ""
6192 msgstr ""
6193
6193
6194 msgid ""
6194 msgid ""
6195 "restore individual files or directories to an earlier state\n"
6195 "restore individual files or directories to an earlier state\n"
6196 "\n"
6196 "\n"
6197 " (Use update -r to check out earlier revisions, revert does not\n"
6197 " (Use update -r to check out earlier revisions, revert does not\n"
6198 " change the working directory parents.)\n"
6198 " change the working directory parents.)\n"
6199 "\n"
6199 "\n"
6200 " With no revision specified, revert the named files or directories\n"
6200 " With no revision specified, revert the named files or directories\n"
6201 " to the contents they had in the parent of the working directory.\n"
6201 " to the contents they had in the parent of the working directory.\n"
6202 " This restores the contents of the affected files to an unmodified\n"
6202 " This restores the contents of the affected files to an unmodified\n"
6203 " state and unschedules adds, removes, copies, and renames. If the\n"
6203 " state and unschedules adds, removes, copies, and renames. If the\n"
6204 " working directory has two parents, you must explicitly specify the\n"
6204 " working directory has two parents, you must explicitly specify the\n"
6205 " revision to revert to.\n"
6205 " revision to revert to.\n"
6206 "\n"
6206 "\n"
6207 " Using the -r/--rev option, revert the given files or directories\n"
6207 " Using the -r/--rev option, revert the given files or directories\n"
6208 " to their contents as of a specific revision. This can be helpful\n"
6208 " to their contents as of a specific revision. This can be helpful\n"
6209 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6209 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6210 " dates' for a list of formats valid for -d/--date.\n"
6210 " dates' for a list of formats valid for -d/--date.\n"
6211 "\n"
6211 "\n"
6212 " Revert modifies the working directory. It does not commit any\n"
6212 " Revert modifies the working directory. It does not commit any\n"
6213 " changes, or change the parent of the working directory. If you\n"
6213 " changes, or change the parent of the working directory. If you\n"
6214 " revert to a revision other than the parent of the working\n"
6214 " revert to a revision other than the parent of the working\n"
6215 " directory, the reverted files will thus appear modified\n"
6215 " directory, the reverted files will thus appear modified\n"
6216 " afterwards.\n"
6216 " afterwards.\n"
6217 "\n"
6217 "\n"
6218 " If a file has been deleted, it is restored. If the executable mode\n"
6218 " If a file has been deleted, it is restored. If the executable mode\n"
6219 " of a file was changed, it is reset.\n"
6219 " of a file was changed, it is reset.\n"
6220 "\n"
6220 "\n"
6221 " If names are given, all files matching the names are reverted.\n"
6221 " If names are given, all files matching the names are reverted.\n"
6222 " If no arguments are given, no files are reverted.\n"
6222 " If no arguments are given, no files are reverted.\n"
6223 "\n"
6223 "\n"
6224 " Modified files are saved with a .orig suffix before reverting.\n"
6224 " Modified files are saved with a .orig suffix before reverting.\n"
6225 " To disable these backups, use --no-backup.\n"
6225 " To disable these backups, use --no-backup.\n"
6226 " "
6226 " "
6227 msgstr ""
6227 msgstr ""
6228
6228
6229 msgid "you can't specify a revision and a date"
6229 msgid "you can't specify a revision and a date"
6230 msgstr ""
6230 msgstr ""
6231
6231
6232 msgid "no files or directories specified; use --all to revert the whole repo"
6232 msgid "no files or directories specified; use --all to revert the whole repo"
6233 msgstr ""
6233 msgstr ""
6234
6234
6235 #, python-format
6235 #, python-format
6236 msgid "forgetting %s\n"
6236 msgid "forgetting %s\n"
6237 msgstr ""
6237 msgstr ""
6238
6238
6239 #, python-format
6239 #, python-format
6240 msgid "reverting %s\n"
6240 msgid "reverting %s\n"
6241 msgstr ""
6241 msgstr ""
6242
6242
6243 #, python-format
6243 #, python-format
6244 msgid "undeleting %s\n"
6244 msgid "undeleting %s\n"
6245 msgstr ""
6245 msgstr ""
6246
6246
6247 #, python-format
6247 #, python-format
6248 msgid "saving current version of %s as %s\n"
6248 msgid "saving current version of %s as %s\n"
6249 msgstr ""
6249 msgstr ""
6250
6250
6251 #, python-format
6251 #, python-format
6252 msgid "file not managed: %s\n"
6252 msgid "file not managed: %s\n"
6253 msgstr ""
6253 msgstr ""
6254
6254
6255 #, python-format
6255 #, python-format
6256 msgid "no changes needed to %s\n"
6256 msgid "no changes needed to %s\n"
6257 msgstr ""
6257 msgstr ""
6258
6258
6259 msgid ""
6259 msgid ""
6260 "roll back the last transaction\n"
6260 "roll back the last transaction\n"
6261 "\n"
6261 "\n"
6262 " This command should be used with care. There is only one level of\n"
6262 " This command should be used with care. There is only one level of\n"
6263 " rollback, and there is no way to undo a rollback. It will also\n"
6263 " rollback, and there is no way to undo a rollback. It will also\n"
6264 " restore the dirstate at the time of the last transaction, losing\n"
6264 " restore the dirstate at the time of the last transaction, losing\n"
6265 " any dirstate changes since that time. This command does not alter\n"
6265 " any dirstate changes since that time. This command does not alter\n"
6266 " the working directory.\n"
6266 " the working directory.\n"
6267 "\n"
6267 "\n"
6268 " Transactions are used to encapsulate the effects of all commands\n"
6268 " Transactions are used to encapsulate the effects of all commands\n"
6269 " that create new changesets or propagate existing changesets into a\n"
6269 " that create new changesets or propagate existing changesets into a\n"
6270 " repository. For example, the following commands are transactional,\n"
6270 " repository. For example, the following commands are transactional,\n"
6271 " and their effects can be rolled back::\n"
6271 " and their effects can be rolled back::\n"
6272 "\n"
6272 "\n"
6273 " commit\n"
6273 " commit\n"
6274 " import\n"
6274 " import\n"
6275 " pull\n"
6275 " pull\n"
6276 " push (with this repository as destination)\n"
6276 " push (with this repository as destination)\n"
6277 " unbundle\n"
6277 " unbundle\n"
6278 "\n"
6278 "\n"
6279 " This command is not intended for use on public repositories. Once\n"
6279 " This command is not intended for use on public repositories. Once\n"
6280 " changes are visible for pull by other users, rolling a transaction\n"
6280 " changes are visible for pull by other users, rolling a transaction\n"
6281 " back locally is ineffective (someone else may already have pulled\n"
6281 " back locally is ineffective (someone else may already have pulled\n"
6282 " the changes). Furthermore, a race is possible with readers of the\n"
6282 " the changes). Furthermore, a race is possible with readers of the\n"
6283 " repository; for example an in-progress pull from the repository\n"
6283 " repository; for example an in-progress pull from the repository\n"
6284 " may fail if a rollback is performed.\n"
6284 " may fail if a rollback is performed.\n"
6285 " "
6285 " "
6286 msgstr ""
6286 msgstr ""
6287
6287
6288 msgid ""
6288 msgid ""
6289 "print the root (top) of the current working directory\n"
6289 "print the root (top) of the current working directory\n"
6290 "\n"
6290 "\n"
6291 " Print the root directory of the current repository.\n"
6291 " Print the root directory of the current repository.\n"
6292 " "
6292 " "
6293 msgstr ""
6293 msgstr ""
6294
6294
6295 msgid ""
6295 msgid ""
6296 "export the repository via HTTP\n"
6296 "export the repository via HTTP\n"
6297 "\n"
6297 "\n"
6298 " Start a local HTTP repository browser and pull server.\n"
6298 " Start a local HTTP repository browser and pull server.\n"
6299 "\n"
6299 "\n"
6300 " By default, the server logs accesses to stdout and errors to\n"
6300 " By default, the server logs accesses to stdout and errors to\n"
6301 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6301 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6302 " files.\n"
6302 " files.\n"
6303 " "
6303 " "
6304 msgstr ""
6304 msgstr ""
6305 "exportera arkivet via HTTP\n"
6305 "exportera arkivet via HTTP\n"
6306 "\n"
6306 "\n"
6307 " Startar en lokal HTTP-arkivbläddrare och pull-server.\n"
6307 " Startar en lokal HTTP-arkivbläddrare och pull-server.\n"
6308 "\n"
6308 "\n"
6309 " Som standard loggar servern anslutningar till stdout och fel till\n"
6309 " Som standard loggar servern anslutningar till stdout och fel till\n"
6310 " stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n"
6310 " stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n"
6311 " till filer.\n"
6311 " till filer.\n"
6312 " "
6312 " "
6313
6313
6314 #, python-format
6314 #, python-format
6315 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6315 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6316 msgstr ""
6316 msgstr ""
6317
6317
6318 msgid ""
6318 msgid ""
6319 "show changed files in the working directory\n"
6319 "show changed files in the working directory\n"
6320 "\n"
6320 "\n"
6321 " Show status of files in the repository. If names are given, only\n"
6321 " Show status of files in the repository. If names are given, only\n"
6322 " files that match are shown. Files that are clean or ignored or\n"
6322 " files that match are shown. Files that are clean or ignored or\n"
6323 " the source of a copy/move operation, are not listed unless\n"
6323 " the source of a copy/move operation, are not listed unless\n"
6324 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6324 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6325 " Unless options described with \"show only ...\" are given, the\n"
6325 " Unless options described with \"show only ...\" are given, the\n"
6326 " options -mardu are used.\n"
6326 " options -mardu are used.\n"
6327 "\n"
6327 "\n"
6328 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6328 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6329 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6329 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6330 "\n"
6330 "\n"
6331 " NOTE: status may appear to disagree with diff if permissions have\n"
6331 " NOTE: status may appear to disagree with diff if permissions have\n"
6332 " changed or a merge has occurred. The standard diff format does not\n"
6332 " changed or a merge has occurred. The standard diff format does not\n"
6333 " report permission changes and diff only reports changes relative\n"
6333 " report permission changes and diff only reports changes relative\n"
6334 " to one merge parent.\n"
6334 " to one merge parent.\n"
6335 "\n"
6335 "\n"
6336 " If one revision is given, it is used as the base revision.\n"
6336 " If one revision is given, it is used as the base revision.\n"
6337 " If two revisions are given, the differences between them are\n"
6337 " If two revisions are given, the differences between them are\n"
6338 " shown.\n"
6338 " shown.\n"
6339 "\n"
6339 "\n"
6340 " The codes used to show the status of files are::\n"
6340 " The codes used to show the status of files are::\n"
6341 "\n"
6341 "\n"
6342 " M = modified\n"
6342 " M = modified\n"
6343 " A = added\n"
6343 " A = added\n"
6344 " R = removed\n"
6344 " R = removed\n"
6345 " C = clean\n"
6345 " C = clean\n"
6346 " ! = missing (deleted by non-hg command, but still tracked)\n"
6346 " ! = missing (deleted by non-hg command, but still tracked)\n"
6347 " ? = not tracked\n"
6347 " ? = not tracked\n"
6348 " I = ignored\n"
6348 " I = ignored\n"
6349 " = origin of the previous file listed as A (added)\n"
6349 " = origin of the previous file listed as A (added)\n"
6350 " "
6350 " "
6351 msgstr ""
6351 msgstr ""
6352 "visa ändrade filer i arbetskatalogen\n"
6352 "visa ändrade filer i arbetskatalogen\n"
6353 "\n"
6353 "\n"
6354 " Visa status för filer i arkivet. Om namn anges, visas bara filer som\n"
6354 " Visa status för filer i arkivet. Om namn anges, visas bara filer som\n"
6355 " matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n"
6355 " matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n"
6356 " eller kopieringsoperation, visas inte om förrän -c/--clean,\n"
6356 " eller kopieringsoperation, visas inte om förrän -c/--clean,\n"
6357 " -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n"
6357 " -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n"
6358 " beskrivningen \"visa bara ...\" anges, används flaggorna -mardu.\n"
6358 " beskrivningen \"visa bara ...\" anges, används flaggorna -mardu.\n"
6359 "\n"
6359 "\n"
6360 " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n"
6360 " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n"
6361 " inte bes om explicit med -u/--unknown eller -i/--ignored.\n"
6361 " inte bes om explicit med -u/--unknown eller -i/--ignored.\n"
6362 "\n"
6362 "\n"
6363 " NOTERA: status kan verka osams med diff om tillstånd har ändrat eller "
6363 " NOTERA: status kan verka osams med diff om tillstånd har ändrat eller "
6364 "en\n"
6364 "en\n"
6365 " sammanfogning har utförts. Det vanliga diff-formatet rapporterar inte\n"
6365 " sammanfogning har utförts. Det vanliga diff-formatet rapporterar inte\n"
6366 " förändringar av tillstånd och diff rapporterar bara ändringar relativt\n"
6366 " förändringar av tillstånd och diff rapporterar bara ändringar relativt\n"
6367 " till en förälder vid sammanfogningar.\n"
6367 " till en förälder vid sammanfogningar.\n"
6368 "\n"
6368 "\n"
6369 " Koderna som används för att visa filstatus är::\n"
6369 " Koderna som används för att visa filstatus är::\n"
6370 "\n"
6370 "\n"
6371 " M = modifierad\n"
6371 " M = modifierad\n"
6372 " A = adderad\n"
6372 " A = adderad\n"
6373 " R = raderad\n"
6373 " R = raderad\n"
6374 " C = ren\n"
6374 " C = ren\n"
6375 " ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n"
6375 " ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n"
6376 " ? = inte spårad\n"
6376 " ? = inte spårad\n"
6377 " I = ignorerad\n"
6377 " I = ignorerad\n"
6378 " = källa för den tidigare filen listad som A (adderad)\n"
6378 " = källa för den tidigare filen listad som A (adderad)\n"
6379 " "
6379 " "
6380
6380
6381 msgid ""
6381 msgid ""
6382 "summarize working directory state\n"
6382 "summarize working directory state\n"
6383 "\n"
6383 "\n"
6384 " This generates a brief summary of the working directory state,\n"
6384 " This generates a brief summary of the working directory state,\n"
6385 " including parents, branch, commit status, and available updates.\n"
6385 " including parents, branch, commit status, and available updates.\n"
6386 "\n"
6386 "\n"
6387 " With the --remote option, this will check the default paths for\n"
6387 " With the --remote option, this will check the default paths for\n"
6388 " incoming and outgoing changes. This can be time-consuming.\n"
6388 " incoming and outgoing changes. This can be time-consuming.\n"
6389 " "
6389 " "
6390 msgstr ""
6390 msgstr ""
6391 "sammanfatta arbetskatalogens tillstånd\n"
6392 "\n"
6393 " Detta skapar en kort sammanfattning av arbetskatalogens tillstånd,\n"
6394 " inklusive föräldrar, gren, arkivstatus, och tillgängliga uppdateringar.\n"
6395 "\n"
6396 " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n"
6397 " för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n"
6398 " "
6391
6399
6392 msgid " (empty repository)"
6400 msgid " (empty repository)"
6393 msgstr ""
6401 msgstr " (tomt arkiv)"
6394
6402
6395 msgid " (no revision checked out)"
6403 msgid " (no revision checked out)"
6396 msgstr ""
6404 msgstr " (ingen revision uthämtad)"
6397
6405
6398 #, python-format
6406 #, python-format
6399 msgid "parent: %d:%s %s\n"
6407 msgid "parent: %d:%s %s\n"
6400 msgstr ""
6408 msgstr "förälder: %d:%s %s\n"
6401
6409
6402 #, python-format
6410 #, python-format
6403 msgid "branch: %s\n"
6411 msgid "branch: %s\n"
6404 msgstr ""
6412 msgstr "gren: %s\n"
6405
6413
6406 #, python-format
6414 #, python-format
6407 msgid "%d added"
6415 msgid "%d added"
6408 msgstr ""
6416 msgstr "%d tillagd"
6409
6417
6410 #, python-format
6418 #, python-format
6411 msgid "%d modified"
6419 msgid "%d modified"
6412 msgstr ""
6420 msgstr "%d modifierad"
6413
6421
6414 #, python-format
6422 #, python-format
6415 msgid "%d removed"
6423 msgid "%d removed"
6416 msgstr ""
6424 msgstr "%d borttagen"
6417
6425
6418 #, python-format
6426 #, python-format
6419 msgid "%d deleted"
6427 msgid "%d deleted"
6420 msgstr ""
6428 msgstr "%d raderad"
6421
6429
6422 #, python-format
6430 #, python-format
6423 msgid "%d ignored"
6431 msgid "%d ignored"
6424 msgstr ""
6432 msgstr "%d ignorerad"
6425
6433
6426 #, python-format
6434 #, python-format
6427 msgid "%d unknown"
6435 msgid "%d unknown"
6428 msgstr ""
6436 msgstr "%d okänd"
6429
6437
6430 #, python-format
6438 #, python-format
6431 msgid "%d unresolved"
6439 msgid "%d unresolved"
6432 msgstr ""
6440 msgstr "%d olöst"
6433
6441
6434 msgid " (merge)"
6442 msgid " (merge)"
6435 msgstr ""
6443 msgstr " (sammanfogning)"
6436
6444
6437 msgid " (new branch)"
6445 msgid " (new branch)"
6438 msgstr ""
6446 msgstr " (ny gren)"
6439
6447
6440 msgid " (clean)"
6448 msgid " (clean)"
6441 msgstr ""
6449 msgstr " (ren)"
6442
6450
6443 msgid " (new branch head)"
6451 msgid " (new branch head)"
6444 msgstr ""
6452 msgstr " (nytt grenhuvud)"
6445
6453
6446 #, python-format
6454 #, python-format
6447 msgid "commit: %s\n"
6455 msgid "commit: %s\n"
6448 msgstr ""
6456 msgstr "arkivera: %s"
6449
6457
6450 msgid "update: (current)\n"
6458 msgid "update: (current)\n"
6451 msgstr ""
6459 msgstr "uppdatera: (aktuell)"
6452
6460
6453 #, fuzzy, python-format
6461 #, python-format
6454 msgid "update: %d new changesets (update)\n"
6462 msgid "update: %d new changesets (update)\n"
6455 msgstr "uppdatera till ny topp om ändringar drogs"
6463 msgstr "uppdatera: %d nya ändringar (uppdatera)\n"
6456
6464
6457 #, python-format
6465 #, python-format
6458 msgid "update: %d new changesets, %d branch heads (merge)\n"
6466 msgid "update: %d new changesets, %d branch heads (merge)\n"
6459 msgstr ""
6467 msgstr "uppdatera: %d nya ändringar, %d grenhuvuden (sammanfoga)"
6460
6468
6461 msgid "1 or more incoming"
6469 msgid "1 or more incoming"
6462 msgstr ""
6470 msgstr "1 eller fler inkommande"
6463
6471
6464 #, python-format
6472 #, python-format
6465 msgid "%d outgoing"
6473 msgid "%d outgoing"
6466 msgstr ""
6474 msgstr "%d utgående"
6467
6475
6468 #, python-format
6476 #, python-format
6469 msgid "remote: %s\n"
6477 msgid "remote: %s\n"
6470 msgstr ""
6478 msgstr "fjärran: %s\n"
6471
6479
6472 msgid "remote: (synced)\n"
6480 msgid "remote: (synced)\n"
6473 msgstr ""
6481 msgstr "fjärran: (synkad)"
6474
6482
6475 msgid ""
6483 msgid ""
6476 "add one or more tags for the current or given revision\n"
6484 "add one or more tags for the current or given revision\n"
6477 "\n"
6485 "\n"
6478 " Name a particular revision using <name>.\n"
6486 " Name a particular revision using <name>.\n"
6479 "\n"
6487 "\n"
6480 " Tags are used to name particular revisions of the repository and are\n"
6488 " Tags are used to name particular revisions of the repository and are\n"
6481 " very useful to compare different revisions, to go back to significant\n"
6489 " very useful to compare different revisions, to go back to significant\n"
6482 " earlier versions or to mark branch points as releases, etc.\n"
6490 " earlier versions or to mark branch points as releases, etc.\n"
6483 "\n"
6491 "\n"
6484 " If no revision is given, the parent of the working directory is\n"
6492 " If no revision is given, the parent of the working directory is\n"
6485 " used, or tip if no revision is checked out.\n"
6493 " used, or tip if no revision is checked out.\n"
6486 "\n"
6494 "\n"
6487 " To facilitate version control, distribution, and merging of tags,\n"
6495 " To facilitate version control, distribution, and merging of tags,\n"
6488 " they are stored as a file named \".hgtags\" which is managed\n"
6496 " they are stored as a file named \".hgtags\" which is managed\n"
6489 " similarly to other project files and can be hand-edited if\n"
6497 " similarly to other project files and can be hand-edited if\n"
6490 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6498 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6491 " shared among repositories).\n"
6499 " shared among repositories).\n"
6492 "\n"
6500 "\n"
6493 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6501 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6494 " "
6502 " "
6495 msgstr ""
6503 msgstr ""
6496
6504
6497 msgid "tag names must be unique"
6505 msgid "tag names must be unique"
6498 msgstr ""
6506 msgstr ""
6499
6507
6500 #, python-format
6508 #, python-format
6501 msgid "the name '%s' is reserved"
6509 msgid "the name '%s' is reserved"
6502 msgstr ""
6510 msgstr ""
6503
6511
6504 msgid "--rev and --remove are incompatible"
6512 msgid "--rev and --remove are incompatible"
6505 msgstr ""
6513 msgstr ""
6506
6514
6507 #, python-format
6515 #, python-format
6508 msgid "tag '%s' does not exist"
6516 msgid "tag '%s' does not exist"
6509 msgstr ""
6517 msgstr ""
6510
6518
6511 #, python-format
6519 #, python-format
6512 msgid "tag '%s' is not a global tag"
6520 msgid "tag '%s' is not a global tag"
6513 msgstr ""
6521 msgstr ""
6514
6522
6515 #, python-format
6523 #, python-format
6516 msgid "tag '%s' is not a local tag"
6524 msgid "tag '%s' is not a local tag"
6517 msgstr ""
6525 msgstr ""
6518
6526
6519 #, python-format
6527 #, python-format
6520 msgid "tag '%s' already exists (use -f to force)"
6528 msgid "tag '%s' already exists (use -f to force)"
6521 msgstr ""
6529 msgstr ""
6522
6530
6523 msgid ""
6531 msgid ""
6524 "list repository tags\n"
6532 "list repository tags\n"
6525 "\n"
6533 "\n"
6526 " This lists both regular and local tags. When the -v/--verbose\n"
6534 " This lists both regular and local tags. When the -v/--verbose\n"
6527 " switch is used, a third column \"local\" is printed for local tags.\n"
6535 " switch is used, a third column \"local\" is printed for local tags.\n"
6528 " "
6536 " "
6529 msgstr ""
6537 msgstr ""
6530
6538
6531 msgid ""
6539 msgid ""
6532 "show the tip revision\n"
6540 "show the tip revision\n"
6533 "\n"
6541 "\n"
6534 " The tip revision (usually just called the tip) is the changeset\n"
6542 " The tip revision (usually just called the tip) is the changeset\n"
6535 " most recently added to the repository (and therefore the most\n"
6543 " most recently added to the repository (and therefore the most\n"
6536 " recently changed head).\n"
6544 " recently changed head).\n"
6537 "\n"
6545 "\n"
6538 " If you have just made a commit, that commit will be the tip. If\n"
6546 " If you have just made a commit, that commit will be the tip. If\n"
6539 " you have just pulled changes from another repository, the tip of\n"
6547 " you have just pulled changes from another repository, the tip of\n"
6540 " that repository becomes the current tip. The \"tip\" tag is special\n"
6548 " that repository becomes the current tip. The \"tip\" tag is special\n"
6541 " and cannot be renamed or assigned to a different changeset.\n"
6549 " and cannot be renamed or assigned to a different changeset.\n"
6542 " "
6550 " "
6543 msgstr ""
6551 msgstr ""
6544
6552
6545 msgid ""
6553 msgid ""
6546 "apply one or more changegroup files\n"
6554 "apply one or more changegroup files\n"
6547 "\n"
6555 "\n"
6548 " Apply one or more compressed changegroup files generated by the\n"
6556 " Apply one or more compressed changegroup files generated by the\n"
6549 " bundle command.\n"
6557 " bundle command.\n"
6550 " "
6558 " "
6551 msgstr ""
6559 msgstr ""
6552
6560
6553 msgid ""
6561 msgid ""
6554 "update working directory\n"
6562 "update working directory\n"
6555 "\n"
6563 "\n"
6556 " Update the repository's working directory to the specified\n"
6564 " Update the repository's working directory to the specified\n"
6557 " revision, or the tip of the current branch if none is specified.\n"
6565 " revision, or the tip of the current branch if none is specified.\n"
6558 " Use null as the revision to remove the working copy (like 'hg\n"
6566 " Use null as the revision to remove the working copy (like 'hg\n"
6559 " clone -U').\n"
6567 " clone -U').\n"
6560 "\n"
6568 "\n"
6561 " When the working directory contains no uncommitted changes, it\n"
6569 " When the working directory contains no uncommitted changes, it\n"
6562 " will be replaced by the state of the requested revision from the\n"
6570 " will be replaced by the state of the requested revision from the\n"
6563 " repository. When the requested revision is on a different branch,\n"
6571 " repository. When the requested revision is on a different branch,\n"
6564 " the working directory will additionally be switched to that\n"
6572 " the working directory will additionally be switched to that\n"
6565 " branch.\n"
6573 " branch.\n"
6566 "\n"
6574 "\n"
6567 " When there are uncommitted changes, use option -C/--clean to\n"
6575 " When there are uncommitted changes, use option -C/--clean to\n"
6568 " discard them, forcibly replacing the state of the working\n"
6576 " discard them, forcibly replacing the state of the working\n"
6569 " directory with the requested revision. Alternately, use -c/--check\n"
6577 " directory with the requested revision. Alternately, use -c/--check\n"
6570 " to abort.\n"
6578 " to abort.\n"
6571 "\n"
6579 "\n"
6572 " When there are uncommitted changes and option -C/--clean is not\n"
6580 " When there are uncommitted changes and option -C/--clean is not\n"
6573 " used, and the parent revision and requested revision are on the\n"
6581 " used, and the parent revision and requested revision are on the\n"
6574 " same branch, and one of them is an ancestor of the other, then the\n"
6582 " same branch, and one of them is an ancestor of the other, then the\n"
6575 " new working directory will contain the requested revision merged\n"
6583 " new working directory will contain the requested revision merged\n"
6576 " with the uncommitted changes. Otherwise, the update will fail with\n"
6584 " with the uncommitted changes. Otherwise, the update will fail with\n"
6577 " a suggestion to use 'merge' or 'update -C' instead.\n"
6585 " a suggestion to use 'merge' or 'update -C' instead.\n"
6578 "\n"
6586 "\n"
6579 " If you want to update just one file to an older revision, use\n"
6587 " If you want to update just one file to an older revision, use\n"
6580 " revert.\n"
6588 " revert.\n"
6581 "\n"
6589 "\n"
6582 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6590 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6583 " "
6591 " "
6584 msgstr ""
6592 msgstr ""
6585 "uppdatera arbetskatalog\n"
6593 "uppdatera arbetskatalog\n"
6586 "\n"
6594 "\n"
6587 " Uppdatera arkivets arbetskatalog till den specificerade revisionen\n"
6595 " Uppdatera arkivets arbetskatalog till den specificerade revisionen\n"
6588 " eller toppen av den nuvarande grenen om ingen anges. Använd null som\n"
6596 " eller toppen av den nuvarande grenen om ingen anges. Använd null som\n"
6589 " revision för att ta bort arbetskopian (som 'hg clone -U').\n"
6597 " revision för att ta bort arbetskopian (som 'hg clone -U').\n"
6590 "\n"
6598 "\n"
6591 " När arbetskatalogen inte innehåller oarkiverade ändringar, ersätts\n"
6599 " När arbetskatalogen inte innehåller oarkiverade ändringar, ersätts\n"
6592 " den med tillståndet för den begärda revisionen från arkivet. När den\n"
6600 " den med tillståndet för den begärda revisionen från arkivet. När den\n"
6593 " begärda revisionen är i en annan gren, kommer arbetskatalogen att växla\n"
6601 " begärda revisionen är i en annan gren, kommer arbetskatalogen att växla\n"
6594 " till den grenen.\n"
6602 " till den grenen.\n"
6595 "\n"
6603 "\n"
6596 " När det finns oarkiverade ändringar, använd flaggan -C/--clean för att\n"
6604 " När det finns oarkiverade ändringar, använd flaggan -C/--clean för att\n"
6597 " kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n"
6605 " kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n"
6598 " revisionen. Alternativt, använd -c/--check för att avbryta.\n"
6606 " revisionen. Alternativt, använd -c/--check för att avbryta.\n"
6599 "\n"
6607 "\n"
6600 " När det finns oarkiverade ändringar och flaggan -C/--clean inte "
6608 " När det finns oarkiverade ändringar och flaggan -C/--clean inte "
6601 "används,\n"
6609 "används,\n"
6602 " och föräldrarevisionen och den begärda revisionen är på samma gren, och\n"
6610 " och föräldrarevisionen och den begärda revisionen är på samma gren, och\n"
6603 " en av dem är en anfäder till den andre, kommer arbetskatalogen att\n"
6611 " en av dem är en anfäder till den andre, kommer arbetskatalogen att\n"
6604 " innehålla den begärda revisionen sammanfogad med de oarkiverade\n"
6612 " innehålla den begärda revisionen sammanfogad med de oarkiverade\n"
6605 " ändringarna. Om inte, kommer uppdateringen att misslyckas med ett\n"
6613 " ändringarna. Om inte, kommer uppdateringen att misslyckas med ett\n"
6606 " förslag att använda 'merge' eller 'update -C' istället.\n"
6614 " förslag att använda 'merge' eller 'update -C' istället.\n"
6607 "\n"
6615 "\n"
6608 " Om du vill uppdatera bara en fil till en äldre revision, använd revert.\n"
6616 " Om du vill uppdatera bara en fil till en äldre revision, använd revert.\n"
6609 "\n"
6617 "\n"
6610 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
6618 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
6611 " "
6619 " "
6612
6620
6613 msgid "cannot specify both -c/--check and -C/--clean"
6621 msgid "cannot specify both -c/--check and -C/--clean"
6614 msgstr ""
6622 msgstr ""
6615
6623
6616 msgid "uncommitted local changes"
6624 msgid "uncommitted local changes"
6617 msgstr ""
6625 msgstr ""
6618
6626
6619 msgid ""
6627 msgid ""
6620 "verify the integrity of the repository\n"
6628 "verify the integrity of the repository\n"
6621 "\n"
6629 "\n"
6622 " Verify the integrity of the current repository.\n"
6630 " Verify the integrity of the current repository.\n"
6623 "\n"
6631 "\n"
6624 " This will perform an extensive check of the repository's\n"
6632 " This will perform an extensive check of the repository's\n"
6625 " integrity, validating the hashes and checksums of each entry in\n"
6633 " integrity, validating the hashes and checksums of each entry in\n"
6626 " the changelog, manifest, and tracked files, as well as the\n"
6634 " the changelog, manifest, and tracked files, as well as the\n"
6627 " integrity of their crosslinks and indices.\n"
6635 " integrity of their crosslinks and indices.\n"
6628 " "
6636 " "
6629 msgstr ""
6637 msgstr ""
6630
6638
6631 msgid "output version and copyright information"
6639 msgid "output version and copyright information"
6632 msgstr ""
6640 msgstr ""
6633
6641
6634 #, python-format
6642 #, python-format
6635 msgid "Mercurial Distributed SCM (version %s)\n"
6643 msgid "Mercurial Distributed SCM (version %s)\n"
6636 msgstr ""
6644 msgstr ""
6637
6645
6638 msgid ""
6646 msgid ""
6639 "\n"
6647 "\n"
6640 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6648 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6641 "This is free software; see the source for copying conditions. There is NO\n"
6649 "This is free software; see the source for copying conditions. There is NO\n"
6642 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6650 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6643 msgstr ""
6651 msgstr ""
6644
6652
6645 #, fuzzy
6646 msgid "repository root directory or name of overlay bundle file"
6653 msgid "repository root directory or name of overlay bundle file"
6647 msgstr "arkivrotkatalog eller symbolisk sökväg"
6654 msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
6648
6655
6649 msgid "change working directory"
6656 msgid "change working directory"
6650 msgstr "ändra arbetskatalog"
6657 msgstr "ändra arbetskatalog"
6651
6658
6652 msgid "do not prompt, assume 'yes' for any required answers"
6659 msgid "do not prompt, assume 'yes' for any required answers"
6653 msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
6660 msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
6654
6661
6655 msgid "suppress output"
6662 msgid "suppress output"
6656 msgstr "förhindra utmatning"
6663 msgstr "förhindra utmatning"
6657
6664
6658 msgid "enable additional output"
6665 msgid "enable additional output"
6659 msgstr "aktivera ytterligare utmatning"
6666 msgstr "aktivera ytterligare utmatning"
6660
6667
6661 msgid "set/override config option"
6668 msgid "set/override config option"
6662 msgstr "sätt/upphäv konfigurationsflagga"
6669 msgstr "sätt/upphäv konfigurationsflagga"
6663
6670
6664 msgid "enable debugging output"
6671 msgid "enable debugging output"
6665 msgstr "aktivera debugutmatning"
6672 msgstr "aktivera debugutmatning"
6666
6673
6667 msgid "start debugger"
6674 msgid "start debugger"
6668 msgstr "starta debugger"
6675 msgstr "starta debugger"
6669
6676
6670 msgid "set the charset encoding"
6677 msgid "set the charset encoding"
6671 msgstr "sätt teckenkodning"
6678 msgstr "sätt teckenkodning"
6672
6679
6673 msgid "set the charset encoding mode"
6680 msgid "set the charset encoding mode"
6674 msgstr "sätt teckenkodningsläge"
6681 msgstr "sätt teckenkodningsläge"
6675
6682
6676 msgid "print traceback on exception"
6683 msgid "print traceback on exception"
6677 msgstr "visa bakåtspårning vid undantak"
6684 msgstr "visa bakåtspårning vid undantak"
6678
6685
6679 msgid "time how long the command takes"
6686 msgid "time how long the command takes"
6680 msgstr "ta tid på hud lång tid kommandot körs"
6687 msgstr "ta tid på hud lång tid kommandot körs"
6681
6688
6682 msgid "print command execution profile"
6689 msgid "print command execution profile"
6683 msgstr "visa kommandoexekveringens profil"
6690 msgstr "visa kommandoexekveringens profil"
6684
6691
6685 msgid "output version information and exit"
6692 msgid "output version information and exit"
6686 msgstr "skriv versionsinformation och avsluta"
6693 msgstr "skriv versionsinformation och avsluta"
6687
6694
6688 msgid "display help and exit"
6695 msgid "display help and exit"
6689 msgstr "visa hjälp och avsluta"
6696 msgstr "visa hjälp och avsluta"
6690
6697
6691 msgid "do not perform actions, just print output"
6698 msgid "do not perform actions, just print output"
6692 msgstr "utför inget, bara visa"
6699 msgstr "utför inget, bara visa"
6693
6700
6694 msgid "specify ssh command to use"
6701 msgid "specify ssh command to use"
6695 msgstr "specificera ssh-kommando att använda"
6702 msgstr "specificera ssh-kommando att använda"
6696
6703
6697 msgid "specify hg command to run on the remote side"
6704 msgid "specify hg command to run on the remote side"
6698 msgstr "specificera hg-kommando att köra på andra sidan"
6705 msgstr "specificera hg-kommando att köra på andra sidan"
6699
6706
6700 msgid "include names matching the given patterns"
6707 msgid "include names matching the given patterns"
6701 msgstr "inkludera namn som matchar de givna mönstren"
6708 msgstr "inkludera namn som matchar de givna mönstren"
6702
6709
6703 msgid "exclude names matching the given patterns"
6710 msgid "exclude names matching the given patterns"
6704 msgstr "exkludera namn som matchar de givna mönstren"
6711 msgstr "exkludera namn som matchar de givna mönstren"
6705
6712
6706 msgid "use <text> as commit message"
6713 msgid "use <text> as commit message"
6707 msgstr "använd <text> som arkiveringsmeddelande"
6714 msgstr "använd <text> som arkiveringsmeddelande"
6708
6715
6709 msgid "read commit message from <file>"
6716 msgid "read commit message from <file>"
6710 msgstr "läs arkiveringsmeddelandet från <fil>"
6717 msgstr "läs arkiveringsmeddelandet från <fil>"
6711
6718
6712 msgid "record datecode as commit date"
6719 msgid "record datecode as commit date"
6713 msgstr "lagra datumkod som arkiveringsdatum"
6720 msgstr "lagra datumkod som arkiveringsdatum"
6714
6721
6715 msgid "record the specified user as committer"
6722 msgid "record the specified user as committer"
6716 msgstr "lagra den specificerade användaren som arkiverare"
6723 msgstr "lagra den specificerade användaren som arkiverare"
6717
6724
6718 msgid "display using template map file"
6725 msgid "display using template map file"
6719 msgstr "visa med mallfil"
6726 msgstr "visa med mallfil"
6720
6727
6721 msgid "display with template"
6728 msgid "display with template"
6722 msgstr "visa med mall"
6729 msgstr "visa med mall"
6723
6730
6724 msgid "do not show merges"
6731 msgid "do not show merges"
6725 msgstr "visa inte sammanfogningar"
6732 msgstr "visa inte sammanfogningar"
6726
6733
6727 msgid "treat all files as text"
6734 msgid "treat all files as text"
6728 msgstr "behandla alla filer som text"
6735 msgstr "behandla alla filer som text"
6729
6736
6730 msgid "don't include dates in diff headers"
6737 msgid "don't include dates in diff headers"
6731 msgstr "inkludera inte datum i diff-rubriker"
6738 msgstr "inkludera inte datum i diff-rubriker"
6732
6739
6733 msgid "show which function each change is in"
6740 msgid "show which function each change is in"
6734 msgstr "visa vilken funktion varje ändring är i"
6741 msgstr "visa vilken funktion varje ändring är i"
6735
6742
6736 msgid "ignore white space when comparing lines"
6743 msgid "ignore white space when comparing lines"
6737 msgstr "ignorera blanktecken när rader jämförs"
6744 msgstr "ignorera blanktecken när rader jämförs"
6738
6745
6739 msgid "ignore changes in the amount of white space"
6746 msgid "ignore changes in the amount of white space"
6740 msgstr "ignorera ändringar av antalet blanktäcken"
6747 msgstr "ignorera ändringar av antalet blanktäcken"
6741
6748
6742 msgid "ignore changes whose lines are all blank"
6749 msgid "ignore changes whose lines are all blank"
6743 msgstr "ignorera ändringar vars rader är tomma"
6750 msgstr "ignorera ändringar vars rader är tomma"
6744
6751
6745 msgid "number of lines of context to show"
6752 msgid "number of lines of context to show"
6746 msgstr "antal sammanhangsrader att visa"
6753 msgstr "antal sammanhangsrader att visa"
6747
6754
6748 msgid "guess renamed files by similarity (0<=s<=100)"
6755 msgid "guess renamed files by similarity (0<=s<=100)"
6749 msgstr ""
6756 msgstr ""
6750
6757
6751 msgid "[OPTION]... [FILE]..."
6758 msgid "[OPTION]... [FILE]..."
6752 msgstr "[FLAGGA]... [FIL]..."
6759 msgstr "[FLAGGA]... [FIL]..."
6753
6760
6754 msgid "annotate the specified revision"
6761 msgid "annotate the specified revision"
6755 msgstr "annotera den specificerade revisionen"
6762 msgstr "annotera den specificerade revisionen"
6756
6763
6757 msgid "follow file copies and renames"
6764 msgid "follow file copies and renames"
6758 msgstr "följ filkopior och namnbyten"
6765 msgstr "följ filkopior och namnbyten"
6759
6766
6760 msgid "list the author (long with -v)"
6767 msgid "list the author (long with -v)"
6761 msgstr "visa skapare (lång med -v)"
6768 msgstr "visa skapare (lång med -v)"
6762
6769
6763 msgid "list the date (short with -q)"
6770 msgid "list the date (short with -q)"
6764 msgstr "visa datum (kort med -q)"
6771 msgstr "visa datum (kort med -q)"
6765
6772
6766 msgid "list the revision number (default)"
6773 msgid "list the revision number (default)"
6767 msgstr "visa revisionsnummer (standard)"
6774 msgstr "visa revisionsnummer (standard)"
6768
6775
6769 msgid "list the changeset"
6776 msgid "list the changeset"
6770 msgstr "visa ändring"
6777 msgstr "visa ändring"
6771
6778
6772 msgid "show line number at the first appearance"
6779 msgid "show line number at the first appearance"
6773 msgstr "visa radnummer för första förekomsten"
6780 msgstr "visa radnummer för första förekomsten"
6774
6781
6775 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6782 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
6776 msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
6783 msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
6777
6784
6778 msgid "do not pass files through decoders"
6785 msgid "do not pass files through decoders"
6779 msgstr ""
6786 msgstr ""
6780
6787
6781 msgid "directory prefix for files in archive"
6788 msgid "directory prefix for files in archive"
6782 msgstr ""
6789 msgstr ""
6783
6790
6784 msgid "revision to distribute"
6791 msgid "revision to distribute"
6785 msgstr ""
6792 msgstr ""
6786
6793
6787 msgid "type of distribution to create"
6794 msgid "type of distribution to create"
6788 msgstr ""
6795 msgstr ""
6789
6796
6790 msgid "[OPTION]... DEST"
6797 msgid "[OPTION]... DEST"
6791 msgstr ""
6798 msgstr ""
6792
6799
6793 msgid "merge with old dirstate parent after backout"
6800 msgid "merge with old dirstate parent after backout"
6794 msgstr ""
6801 msgstr ""
6795
6802
6796 msgid "parent to choose when backing out merge"
6803 msgid "parent to choose when backing out merge"
6797 msgstr ""
6804 msgstr ""
6798
6805
6799 msgid "revision to backout"
6806 msgid "revision to backout"
6800 msgstr ""
6807 msgstr ""
6801
6808
6802 msgid "[OPTION]... [-r] REV"
6809 msgid "[OPTION]... [-r] REV"
6803 msgstr ""
6810 msgstr ""
6804
6811
6805 msgid "reset bisect state"
6812 msgid "reset bisect state"
6806 msgstr ""
6813 msgstr ""
6807
6814
6808 msgid "mark changeset good"
6815 msgid "mark changeset good"
6809 msgstr ""
6816 msgstr ""
6810
6817
6811 msgid "mark changeset bad"
6818 msgid "mark changeset bad"
6812 msgstr ""
6819 msgstr ""
6813
6820
6814 msgid "skip testing changeset"
6821 msgid "skip testing changeset"
6815 msgstr ""
6822 msgstr ""
6816
6823
6817 msgid "use command to check changeset state"
6824 msgid "use command to check changeset state"
6818 msgstr ""
6825 msgstr ""
6819
6826
6820 msgid "do not update to target"
6827 msgid "do not update to target"
6821 msgstr ""
6828 msgstr ""
6822
6829
6823 msgid "[-gbsr] [-c CMD] [REV]"
6830 msgid "[-gbsr] [-c CMD] [REV]"
6824 msgstr ""
6831 msgstr ""
6825
6832
6826 msgid "set branch name even if it shadows an existing branch"
6833 msgid "set branch name even if it shadows an existing branch"
6827 msgstr ""
6834 msgstr ""
6828
6835
6829 msgid "reset branch name to parent branch name"
6836 msgid "reset branch name to parent branch name"
6830 msgstr ""
6837 msgstr ""
6831
6838
6832 msgid "[-fC] [NAME]"
6839 msgid "[-fC] [NAME]"
6833 msgstr ""
6840 msgstr ""
6834
6841
6835 msgid "show only branches that have unmerged heads"
6842 msgid "show only branches that have unmerged heads"
6836 msgstr ""
6843 msgstr ""
6837
6844
6838 msgid "show normal and closed branches"
6845 msgid "show normal and closed branches"
6839 msgstr ""
6846 msgstr ""
6840
6847
6841 msgid "[-a]"
6848 msgid "[-a]"
6842 msgstr ""
6849 msgstr ""
6843
6850
6844 msgid "run even when remote repository is unrelated"
6851 msgid "run even when remote repository is unrelated"
6845 msgstr "kör även när fjärrarkivet är orelaterat"
6852 msgstr "kör även när fjärrarkivet är orelaterat"
6846
6853
6847 msgid "a changeset up to which you would like to bundle"
6854 msgid "a changeset up to which you would like to bundle"
6848 msgstr ""
6855 msgstr ""
6849
6856
6850 msgid "a base changeset to specify instead of a destination"
6857 msgid "a base changeset to specify instead of a destination"
6851 msgstr ""
6858 msgstr ""
6852
6859
6853 msgid "bundle all changesets in the repository"
6860 msgid "bundle all changesets in the repository"
6854 msgstr ""
6861 msgstr ""
6855
6862
6856 msgid "bundle compression type to use"
6863 msgid "bundle compression type to use"
6857 msgstr ""
6864 msgstr ""
6858
6865
6859 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6866 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
6860 msgstr ""
6867 msgstr ""
6861
6868
6862 msgid "print output to file with formatted name"
6869 msgid "print output to file with formatted name"
6863 msgstr "skriv utmatning till fil med formatterat namn"
6870 msgstr "skriv utmatning till fil med formatterat namn"
6864
6871
6865 msgid "print the given revision"
6872 msgid "print the given revision"
6866 msgstr ""
6873 msgstr ""
6867
6874
6868 msgid "apply any matching decode filter"
6875 msgid "apply any matching decode filter"
6869 msgstr ""
6876 msgstr ""
6870
6877
6871 msgid "[OPTION]... FILE..."
6878 msgid "[OPTION]... FILE..."
6872 msgstr "[FLAGGA]... FIL..."
6879 msgstr "[FLAGGA]... FIL..."
6873
6880
6874 msgid "the clone will only contain a repository (no working copy)"
6881 msgid "the clone will only contain a repository (no working copy)"
6875 msgstr "klonen kommer bara att ha arkivet (ingen arbetskopia)"
6882 msgstr "klonen kommer bara att ha arkivet (ingen arbetskopia)"
6876
6883
6877 msgid "a changeset you would like to have after cloning"
6884 msgid "a changeset you would like to have after cloning"
6878 msgstr "en ändring du skulle vilja ha efter kloning"
6885 msgstr "en ändring du skulle vilja ha efter kloning"
6879
6886
6880 msgid "[OPTION]... SOURCE [DEST]"
6887 msgid "[OPTION]... SOURCE [DEST]"
6881 msgstr "[FLAGGA]... KÄLLA [DEST]"
6888 msgstr "[FLAGGA]... KÄLLA [DEST]"
6882
6889
6883 msgid "mark new/missing files as added/removed before committing"
6890 msgid "mark new/missing files as added/removed before committing"
6884 msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering"
6891 msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering"
6885
6892
6886 msgid "mark a branch as closed, hiding it from the branch list"
6893 msgid "mark a branch as closed, hiding it from the branch list"
6887 msgstr "markera en gren som stängd, och göm den från grenlistan"
6894 msgstr "markera en gren som stängd, och göm den från grenlistan"
6888
6895
6889 msgid "record a copy that has already occurred"
6896 msgid "record a copy that has already occurred"
6890 msgstr ""
6897 msgstr ""
6891
6898
6892 msgid "forcibly copy over an existing managed file"
6899 msgid "forcibly copy over an existing managed file"
6893 msgstr ""
6900 msgstr ""
6894
6901
6895 msgid "[OPTION]... [SOURCE]... DEST"
6902 msgid "[OPTION]... [SOURCE]... DEST"
6896 msgstr ""
6903 msgstr ""
6897
6904
6898 msgid "[INDEX] REV1 REV2"
6905 msgid "[INDEX] REV1 REV2"
6899 msgstr ""
6906 msgstr ""
6900
6907
6901 msgid "[COMMAND]"
6908 msgid "[COMMAND]"
6902 msgstr ""
6909 msgstr ""
6903
6910
6904 msgid "show the command options"
6911 msgid "show the command options"
6905 msgstr ""
6912 msgstr ""
6906
6913
6907 msgid "[-o] CMD"
6914 msgid "[-o] CMD"
6908 msgstr ""
6915 msgstr ""
6909
6916
6910 msgid "try extended date formats"
6917 msgid "try extended date formats"
6911 msgstr ""
6918 msgstr ""
6912
6919
6913 msgid "[-e] DATE [RANGE]"
6920 msgid "[-e] DATE [RANGE]"
6914 msgstr ""
6921 msgstr ""
6915
6922
6916 msgid "FILE REV"
6923 msgid "FILE REV"
6917 msgstr ""
6924 msgstr ""
6918
6925
6919 msgid "[PATH]"
6926 msgid "[PATH]"
6920 msgstr ""
6927 msgstr ""
6921
6928
6922 msgid "FILE"
6929 msgid "FILE"
6923 msgstr ""
6930 msgstr ""
6924
6931
6925 msgid "revision to rebuild to"
6932 msgid "revision to rebuild to"
6926 msgstr ""
6933 msgstr ""
6927
6934
6928 msgid "[-r REV] [REV]"
6935 msgid "[-r REV] [REV]"
6929 msgstr ""
6936 msgstr ""
6930
6937
6931 msgid "revision to debug"
6938 msgid "revision to debug"
6932 msgstr ""
6939 msgstr ""
6933
6940
6934 msgid "[-r REV] FILE"
6941 msgid "[-r REV] FILE"
6935 msgstr ""
6942 msgstr ""
6936
6943
6937 msgid "REV1 [REV2]"
6944 msgid "REV1 [REV2]"
6938 msgstr ""
6945 msgstr ""
6939
6946
6940 msgid "do not display the saved mtime"
6947 msgid "do not display the saved mtime"
6941 msgstr ""
6948 msgstr ""
6942
6949
6943 msgid "[OPTION]..."
6950 msgid "[OPTION]..."
6944 msgstr "[FLAGGA]..."
6951 msgstr "[FLAGGA]..."
6945
6952
6946 msgid "revision to check"
6953 msgid "revision to check"
6947 msgstr ""
6954 msgstr ""
6948
6955
6949 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6956 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
6950 msgstr "[FLAGGA]... [-r REV1 [-r REV2]] [FIL]..."
6957 msgstr "[FLAGGA]... [-r REV1 [-r REV2]] [FIL]..."
6951
6958
6952 msgid "diff against the second parent"
6959 msgid "diff against the second parent"
6953 msgstr "diffa mot den andra föräldern"
6960 msgstr "diffa mot den andra föräldern"
6954
6961
6955 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6962 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
6956 msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
6963 msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
6957
6964
6958 msgid "end fields with NUL"
6965 msgid "end fields with NUL"
6959 msgstr ""
6966 msgstr ""
6960
6967
6961 msgid "print all revisions that match"
6968 msgid "print all revisions that match"
6962 msgstr ""
6969 msgstr ""
6963
6970
6964 msgid "follow changeset history, or file history across copies and renames"
6971 msgid "follow changeset history, or file history across copies and renames"
6965 msgstr ""
6972 msgstr ""
6966 "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
6973 "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
6967
6974
6968 msgid "ignore case when matching"
6975 msgid "ignore case when matching"
6969 msgstr ""
6976 msgstr ""
6970
6977
6971 msgid "print only filenames and revisions that match"
6978 msgid "print only filenames and revisions that match"
6972 msgstr ""
6979 msgstr ""
6973
6980
6974 msgid "print matching line numbers"
6981 msgid "print matching line numbers"
6975 msgstr ""
6982 msgstr ""
6976
6983
6977 msgid "search in given revision range"
6984 msgid "search in given revision range"
6978 msgstr ""
6985 msgstr ""
6979
6986
6980 msgid "[OPTION]... PATTERN [FILE]..."
6987 msgid "[OPTION]... PATTERN [FILE]..."
6981 msgstr ""
6988 msgstr ""
6982
6989
6983 msgid "show only heads which are descendants of REV"
6990 msgid "show only heads which are descendants of REV"
6984 msgstr ""
6991 msgstr ""
6985
6992
6986 msgid "show only the active branch heads from open branches"
6993 msgid "show only the active branch heads from open branches"
6987 msgstr ""
6994 msgstr ""
6988
6995
6989 msgid "show normal and closed branch heads"
6996 msgid "show normal and closed branch heads"
6990 msgstr ""
6997 msgstr ""
6991
6998
6992 msgid "[-r STARTREV] [REV]..."
6999 msgid "[-r STARTREV] [REV]..."
6993 msgstr ""
7000 msgstr ""
6994
7001
6995 msgid "[TOPIC]"
7002 msgid "[TOPIC]"
6996 msgstr "[ÄMNE]"
7003 msgstr "[ÄMNE]"
6997
7004
6998 msgid "identify the specified revision"
7005 msgid "identify the specified revision"
6999 msgstr ""
7006 msgstr ""
7000
7007
7001 msgid "show local revision number"
7008 msgid "show local revision number"
7002 msgstr ""
7009 msgstr ""
7003
7010
7004 msgid "show global revision id"
7011 msgid "show global revision id"
7005 msgstr ""
7012 msgstr ""
7006
7013
7007 msgid "show branch"
7014 msgid "show branch"
7008 msgstr ""
7015 msgstr ""
7009
7016
7010 msgid "show tags"
7017 msgid "show tags"
7011 msgstr ""
7018 msgstr ""
7012
7019
7013 msgid "[-nibt] [-r REV] [SOURCE]"
7020 msgid "[-nibt] [-r REV] [SOURCE]"
7014 msgstr ""
7021 msgstr ""
7015
7022
7016 msgid ""
7023 msgid ""
7017 "directory strip option for patch. This has the same meaning as the "
7024 "directory strip option for patch. This has the same meaning as the "
7018 "corresponding patch option"
7025 "corresponding patch option"
7019 msgstr ""
7026 msgstr ""
7020
7027
7021 msgid "base path"
7028 msgid "base path"
7022 msgstr ""
7029 msgstr ""
7023
7030
7024 msgid "skip check for outstanding uncommitted changes"
7031 msgid "skip check for outstanding uncommitted changes"
7025 msgstr ""
7032 msgstr ""
7026
7033
7027 msgid "don't commit, just update the working directory"
7034 msgid "don't commit, just update the working directory"
7028 msgstr ""
7035 msgstr ""
7029
7036
7030 msgid "apply patch to the nodes from which it was generated"
7037 msgid "apply patch to the nodes from which it was generated"
7031 msgstr ""
7038 msgstr ""
7032
7039
7033 msgid "use any branch information in patch (implied by --exact)"
7040 msgid "use any branch information in patch (implied by --exact)"
7034 msgstr ""
7041 msgstr ""
7035
7042
7036 msgid "[OPTION]... PATCH..."
7043 msgid "[OPTION]... PATCH..."
7037 msgstr ""
7044 msgstr ""
7038
7045
7039 msgid "show newest record first"
7046 msgid "show newest record first"
7040 msgstr ""
7047 msgstr ""
7041
7048
7042 msgid "file to store the bundles into"
7049 msgid "file to store the bundles into"
7043 msgstr ""
7050 msgstr ""
7044
7051
7045 msgid "a specific revision up to which you would like to pull"
7052 msgid "a specific revision up to which you would like to pull"
7046 msgstr "en specifik revision upp till vilken du vill dra"
7053 msgstr "en specifik revision upp till vilken du vill dra"
7047
7054
7048 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7055 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7049 msgstr ""
7056 msgstr ""
7050
7057
7051 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7058 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7052 msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
7059 msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
7053
7060
7054 msgid "search the repository as it stood at REV"
7061 msgid "search the repository as it stood at REV"
7055 msgstr ""
7062 msgstr ""
7056
7063
7057 msgid "end filenames with NUL, for use with xargs"
7064 msgid "end filenames with NUL, for use with xargs"
7058 msgstr "filnamn slutar med NUL, för användning med xargs"
7065 msgstr "filnamn slutar med NUL, för användning med xargs"
7059
7066
7060 msgid "print complete paths from the filesystem root"
7067 msgid "print complete paths from the filesystem root"
7061 msgstr ""
7068 msgstr ""
7062
7069
7063 msgid "[OPTION]... [PATTERN]..."
7070 msgid "[OPTION]... [PATTERN]..."
7064 msgstr ""
7071 msgstr ""
7065
7072
7066 msgid "only follow the first parent of merge changesets"
7073 msgid "only follow the first parent of merge changesets"
7067 msgstr "följ bara den första föräldern vid sammanfogningar"
7074 msgstr "följ bara den första föräldern vid sammanfogningar"
7068
7075
7069 msgid "show revisions matching date spec"
7076 msgid "show revisions matching date spec"
7070 msgstr "visa revisioner som matchar datumspecen"
7077 msgstr "visa revisioner som matchar datumspecen"
7071
7078
7072 msgid "show copied files"
7079 msgid "show copied files"
7073 msgstr "visa kopierade filer"
7080 msgstr "visa kopierade filer"
7074
7081
7075 msgid "do case-insensitive search for a keyword"
7082 msgid "do case-insensitive search for a keyword"
7076 msgstr "gör versalokänslig sökning efter nyckelord"
7083 msgstr "gör versalokänslig sökning efter nyckelord"
7077
7084
7078 msgid "include revisions where files were removed"
7085 msgid "include revisions where files were removed"
7079 msgstr "inkludera revisioner där filer togs bort"
7086 msgstr "inkludera revisioner där filer togs bort"
7080
7087
7081 msgid "show only merges"
7088 msgid "show only merges"
7082 msgstr "visa bara sammanfogningar"
7089 msgstr "visa bara sammanfogningar"
7083
7090
7084 msgid "revisions committed by user"
7091 msgid "revisions committed by user"
7085 msgstr "revisioner arkiverade av användare"
7092 msgstr "revisioner arkiverade av användare"
7086
7093
7087 msgid "show only changesets within the given named branch"
7094 msgid "show only changesets within the given named branch"
7088 msgstr "visa bara ändringar i den namngivda grenen"
7095 msgstr "visa bara ändringar i den namngivda grenen"
7089
7096
7090 msgid "do not display revision or any of its ancestors"
7097 msgid "do not display revision or any of its ancestors"
7091 msgstr "visa inte revision eller någon av dess föräldrar"
7098 msgstr "visa inte revision eller någon av dess föräldrar"
7092
7099
7093 msgid "[OPTION]... [FILE]"
7100 msgid "[OPTION]... [FILE]"
7094 msgstr ""
7101 msgstr ""
7095
7102
7096 msgid "revision to display"
7103 msgid "revision to display"
7097 msgstr ""
7104 msgstr ""
7098
7105
7099 msgid "[-r REV]"
7106 msgid "[-r REV]"
7100 msgstr ""
7107 msgstr ""
7101
7108
7102 msgid "force a merge with outstanding changes"
7109 msgid "force a merge with outstanding changes"
7103 msgstr "tvinga en sammanfogning med utestående ändringar"
7110 msgstr "tvinga en sammanfogning med utestående ändringar"
7104
7111
7105 msgid "revision to merge"
7112 msgid "revision to merge"
7106 msgstr "revision att sammanfoga"
7113 msgstr "revision att sammanfoga"
7107
7114
7108 msgid "review revisions to merge (no merge is performed)"
7115 msgid "review revisions to merge (no merge is performed)"
7109 msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
7116 msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
7110
7117
7111 msgid "[-f] [[-r] REV]"
7118 msgid "[-f] [[-r] REV]"
7112 msgstr "[-f] [[-r] REV]"
7119 msgstr "[-f] [[-r] REV]"
7113
7120
7114 msgid "a specific revision up to which you would like to push"
7121 msgid "a specific revision up to which you would like to push"
7115 msgstr "en specifik revision upp till vilken du vill trycka"
7122 msgstr "en specifik revision upp till vilken du vill trycka"
7116
7123
7117 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7124 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7118 msgstr ""
7125 msgstr ""
7119
7126
7120 msgid "show parents from the specified revision"
7127 msgid "show parents from the specified revision"
7121 msgstr "visa föräldrar från den angivna revisionen"
7128 msgstr "visa föräldrar från den angivna revisionen"
7122
7129
7123 msgid "[-r REV] [FILE]"
7130 msgid "[-r REV] [FILE]"
7124 msgstr "[-r REV] [FIL]"
7131 msgstr "[-r REV] [FIL]"
7125
7132
7126 msgid "[NAME]"
7133 msgid "[NAME]"
7127 msgstr ""
7134 msgstr ""
7128
7135
7129 msgid "update to new tip if changesets were pulled"
7136 msgid "update to new tip if changesets were pulled"
7130 msgstr "uppdatera till ny topp om ändringar drogs"
7137 msgstr "uppdatera till ny topp om ändringar drogs"
7131
7138
7132 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7139 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7133 msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
7140 msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
7134
7141
7135 msgid "force push"
7142 msgid "force push"
7136 msgstr "tvinga tryckning"
7143 msgstr "tvinga tryckning"
7137
7144
7138 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7145 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7139 msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
7146 msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
7140
7147
7141 msgid "record delete for missing files"
7148 msgid "record delete for missing files"
7142 msgstr "markera saknade filer för radering"
7149 msgstr "markera saknade filer för radering"
7143
7150
7144 msgid "remove (and delete) file even if added or modified"
7151 msgid "remove (and delete) file even if added or modified"
7145 msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
7152 msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
7146
7153
7147 msgid "record a rename that has already occurred"
7154 msgid "record a rename that has already occurred"
7148 msgstr ""
7155 msgstr ""
7149
7156
7150 msgid "[OPTION]... SOURCE... DEST"
7157 msgid "[OPTION]... SOURCE... DEST"
7151 msgstr ""
7158 msgstr ""
7152
7159
7153 msgid "remerge all unresolved files"
7160 msgid "remerge all unresolved files"
7154 msgstr ""
7161 msgstr ""
7155
7162
7156 msgid "list state of files needing merge"
7163 msgid "list state of files needing merge"
7157 msgstr ""
7164 msgstr ""
7158
7165
7159 msgid "mark files as resolved"
7166 msgid "mark files as resolved"
7160 msgstr ""
7167 msgstr ""
7161
7168
7162 msgid "unmark files as resolved"
7169 msgid "unmark files as resolved"
7163 msgstr ""
7170 msgstr ""
7164
7171
7165 msgid "revert all changes when no arguments given"
7172 msgid "revert all changes when no arguments given"
7166 msgstr ""
7173 msgstr ""
7167
7174
7168 msgid "tipmost revision matching date"
7175 msgid "tipmost revision matching date"
7169 msgstr "senaste revision matchande datum"
7176 msgstr "senaste revision matchande datum"
7170
7177
7171 msgid "revision to revert to"
7178 msgid "revision to revert to"
7172 msgstr ""
7179 msgstr ""
7173
7180
7174 msgid "do not save backup copies of files"
7181 msgid "do not save backup copies of files"
7175 msgstr ""
7182 msgstr ""
7176
7183
7177 msgid "[OPTION]... [-r REV] [NAME]..."
7184 msgid "[OPTION]... [-r REV] [NAME]..."
7178 msgstr ""
7185 msgstr ""
7179
7186
7180 msgid "name of access log file to write to"
7187 msgid "name of access log file to write to"
7181 msgstr "namn på åtkomstlogg att skriva till"
7188 msgstr "namn på åtkomstlogg att skriva till"
7182
7189
7183 msgid "name of error log file to write to"
7190 msgid "name of error log file to write to"
7184 msgstr "namn på fellogg att skriva till"
7191 msgstr "namn på fellogg att skriva till"
7185
7192
7186 msgid "port to listen on (default: 8000)"
7193 msgid "port to listen on (default: 8000)"
7187 msgstr "port att lyssna på (standard: 8000)"
7194 msgstr "port att lyssna på (standard: 8000)"
7188
7195
7189 msgid "address to listen on (default: all interfaces)"
7196 msgid "address to listen on (default: all interfaces)"
7190 msgstr "adress att lyssna på (standard alla gränssnitt)"
7197 msgstr "adress att lyssna på (standard alla gränssnitt)"
7191
7198
7192 msgid "prefix path to serve from (default: server root)"
7199 msgid "prefix path to serve from (default: server root)"
7193 msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
7200 msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
7194
7201
7195 msgid "name to show in web pages (default: working directory)"
7202 msgid "name to show in web pages (default: working directory)"
7196 msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
7203 msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
7197
7204
7198 msgid "name of the webdir config file (serve more than one repository)"
7205 msgid "name of the webdir config file (serve more than one repository)"
7199 msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)"
7206 msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)"
7200
7207
7201 msgid "for remote clients"
7208 msgid "for remote clients"
7202 msgstr "för fjärrklienter"
7209 msgstr "för fjärrklienter"
7203
7210
7204 msgid "web templates to use"
7211 msgid "web templates to use"
7205 msgstr "webbmallar att använda"
7212 msgstr "webbmallar att använda"
7206
7213
7207 msgid "template style to use"
7214 msgid "template style to use"
7208 msgstr "mallstil att använda"
7215 msgstr "mallstil att använda"
7209
7216
7210 msgid "use IPv6 in addition to IPv4"
7217 msgid "use IPv6 in addition to IPv4"
7211 msgstr "använd IPv6 förutom IPv4"
7218 msgstr "använd IPv6 förutom IPv4"
7212
7219
7213 msgid "SSL certificate file"
7220 msgid "SSL certificate file"
7214 msgstr "SSL-certifikatsfil"
7221 msgstr "SSL-certifikatsfil"
7215
7222
7216 msgid "show untrusted configuration options"
7223 msgid "show untrusted configuration options"
7217 msgstr ""
7224 msgstr ""
7218
7225
7219 msgid "[-u] [NAME]..."
7226 msgid "[-u] [NAME]..."
7220 msgstr ""
7227 msgstr ""
7221
7228
7222 msgid "check for push and pull"
7229 msgid "check for push and pull"
7223 msgstr ""
7230 msgstr "sök efter inkommande och utgående ändringar"
7224
7231
7225 msgid "show status of all files"
7232 msgid "show status of all files"
7226 msgstr "visa status för alla filer"
7233 msgstr "visa status för alla filer"
7227
7234
7228 msgid "show only modified files"
7235 msgid "show only modified files"
7229 msgstr "visa bara modifierade filer"
7236 msgstr "visa bara modifierade filer"
7230
7237
7231 msgid "show only added files"
7238 msgid "show only added files"
7232 msgstr "visa bara adderade filer"
7239 msgstr "visa bara adderade filer"
7233
7240
7234 msgid "show only removed files"
7241 msgid "show only removed files"
7235 msgstr "visa bara raderade filer"
7242 msgstr "visa bara raderade filer"
7236
7243
7237 msgid "show only deleted (but tracked) files"
7244 msgid "show only deleted (but tracked) files"
7238 msgstr "visa bara borttagna (men spårade) filer"
7245 msgstr "visa bara borttagna (men spårade) filer"
7239
7246
7240 msgid "show only files without changes"
7247 msgid "show only files without changes"
7241 msgstr "visa bara filer utan ändringar"
7248 msgstr "visa bara filer utan ändringar"
7242
7249
7243 msgid "show only unknown (not tracked) files"
7250 msgid "show only unknown (not tracked) files"
7244 msgstr "visa bara okända (ospårade) filer"
7251 msgstr "visa bara okända (ospårade) filer"
7245
7252
7246 msgid "show only ignored files"
7253 msgid "show only ignored files"
7247 msgstr "visa bara ignorerade filer"
7254 msgstr "visa bara ignorerade filer"
7248
7255
7249 msgid "hide status prefix"
7256 msgid "hide status prefix"
7250 msgstr "göm statusprefix"
7257 msgstr "göm statusprefix"
7251
7258
7252 msgid "show source of copied files"
7259 msgid "show source of copied files"
7253 msgstr "visa källan för kopierade filer"
7260 msgstr "visa källan för kopierade filer"
7254
7261
7255 msgid "show difference from revision"
7262 msgid "show difference from revision"
7256 msgstr "visa differens från revision"
7263 msgstr "visa differens från revision"
7257
7264
7258 msgid "replace existing tag"
7265 msgid "replace existing tag"
7259 msgstr ""
7266 msgstr ""
7260
7267
7261 msgid "make the tag local"
7268 msgid "make the tag local"
7262 msgstr ""
7269 msgstr ""
7263
7270
7264 msgid "revision to tag"
7271 msgid "revision to tag"
7265 msgstr ""
7272 msgstr ""
7266
7273
7267 msgid "remove a tag"
7274 msgid "remove a tag"
7268 msgstr ""
7275 msgstr ""
7269
7276
7270 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7277 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7271 msgstr ""
7278 msgstr ""
7272
7279
7273 msgid "[-p]"
7280 msgid "[-p]"
7274 msgstr ""
7281 msgstr ""
7275
7282
7276 msgid "update to new tip if changesets were unbundled"
7283 msgid "update to new tip if changesets were unbundled"
7277 msgstr ""
7284 msgstr ""
7278
7285
7279 msgid "[-u] FILE..."
7286 msgid "[-u] FILE..."
7280 msgstr ""
7287 msgstr ""
7281
7288
7282 msgid "overwrite locally modified files (no backup)"
7289 msgid "overwrite locally modified files (no backup)"
7283 msgstr "skriv över lokalt modifierade filer (ingen backup)"
7290 msgstr "skriv över lokalt modifierade filer (ingen backup)"
7284
7291
7285 msgid "check for uncommitted changes"
7292 msgid "check for uncommitted changes"
7286 msgstr "leta efter icke arkiverade ändringar"
7293 msgstr "leta efter icke arkiverade ändringar"
7287
7294
7288 msgid "[-C] [-d DATE] [[-r] REV]"
7295 msgid "[-C] [-d DATE] [[-r] REV]"
7289 msgstr "[-C] [-d DATUM] [[-r] REV]"
7296 msgstr "[-C] [-d DATUM] [[-r] REV]"
7290
7297
7291 #, python-format
7298 #, python-format
7292 msgid "config error at %s:%d: '%s'"
7299 msgid "config error at %s:%d: '%s'"
7293 msgstr ""
7300 msgstr ""
7294
7301
7295 msgid "not found in manifest"
7302 msgid "not found in manifest"
7296 msgstr ""
7303 msgstr ""
7297
7304
7298 msgid "branch name not in UTF-8!"
7305 msgid "branch name not in UTF-8!"
7299 msgstr ""
7306 msgstr ""
7300
7307
7301 msgid "working directory state appears damaged!"
7308 msgid "working directory state appears damaged!"
7302 msgstr ""
7309 msgstr ""
7303
7310
7304 #, python-format
7311 #, python-format
7305 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7312 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7306 msgstr ""
7313 msgstr ""
7307
7314
7308 #, python-format
7315 #, python-format
7309 msgid "directory %r already in dirstate"
7316 msgid "directory %r already in dirstate"
7310 msgstr ""
7317 msgstr ""
7311
7318
7312 #, python-format
7319 #, python-format
7313 msgid "file %r in dirstate clashes with %r"
7320 msgid "file %r in dirstate clashes with %r"
7314 msgstr ""
7321 msgstr ""
7315
7322
7316 #, python-format
7323 #, python-format
7317 msgid "not in dirstate: %s\n"
7324 msgid "not in dirstate: %s\n"
7318 msgstr ""
7325 msgstr ""
7319
7326
7320 msgid "unknown"
7327 msgid "unknown"
7321 msgstr ""
7328 msgstr ""
7322
7329
7323 msgid "character device"
7330 msgid "character device"
7324 msgstr ""
7331 msgstr ""
7325
7332
7326 msgid "block device"
7333 msgid "block device"
7327 msgstr ""
7334 msgstr ""
7328
7335
7329 msgid "fifo"
7336 msgid "fifo"
7330 msgstr ""
7337 msgstr ""
7331
7338
7332 msgid "socket"
7339 msgid "socket"
7333 msgstr ""
7340 msgstr ""
7334
7341
7335 msgid "directory"
7342 msgid "directory"
7336 msgstr ""
7343 msgstr ""
7337
7344
7338 #, python-format
7345 #, python-format
7339 msgid "unsupported file type (type is %s)"
7346 msgid "unsupported file type (type is %s)"
7340 msgstr ""
7347 msgstr ""
7341
7348
7342 #, python-format
7349 #, python-format
7343 msgid "abort: %s\n"
7350 msgid "abort: %s\n"
7344 msgstr ""
7351 msgstr ""
7345
7352
7346 #, python-format
7353 #, python-format
7347 msgid "hg: %s\n"
7354 msgid "hg: %s\n"
7348 msgstr ""
7355 msgstr ""
7349
7356
7350 #, python-format
7357 #, python-format
7351 msgid ""
7358 msgid ""
7352 "hg: command '%s' is ambiguous:\n"
7359 "hg: command '%s' is ambiguous:\n"
7353 " %s\n"
7360 " %s\n"
7354 msgstr ""
7361 msgstr ""
7355
7362
7356 #, python-format
7363 #, python-format
7357 msgid "timed out waiting for lock held by %s"
7364 msgid "timed out waiting for lock held by %s"
7358 msgstr ""
7365 msgstr ""
7359
7366
7360 #, python-format
7367 #, python-format
7361 msgid "lock held by %s"
7368 msgid "lock held by %s"
7362 msgstr ""
7369 msgstr ""
7363
7370
7364 #, python-format
7371 #, python-format
7365 msgid "abort: %s: %s\n"
7372 msgid "abort: %s: %s\n"
7366 msgstr ""
7373 msgstr ""
7367
7374
7368 #, python-format
7375 #, python-format
7369 msgid "abort: could not lock %s: %s\n"
7376 msgid "abort: could not lock %s: %s\n"
7370 msgstr ""
7377 msgstr ""
7371
7378
7372 #, python-format
7379 #, python-format
7373 msgid "hg %s: %s\n"
7380 msgid "hg %s: %s\n"
7374 msgstr ""
7381 msgstr ""
7375
7382
7376 #, python-format
7383 #, python-format
7377 msgid "abort: %s!\n"
7384 msgid "abort: %s!\n"
7378 msgstr ""
7385 msgstr ""
7379
7386
7380 #, python-format
7387 #, python-format
7381 msgid "abort: %s"
7388 msgid "abort: %s"
7382 msgstr ""
7389 msgstr ""
7383
7390
7384 msgid " empty string\n"
7391 msgid " empty string\n"
7385 msgstr ""
7392 msgstr ""
7386
7393
7387 msgid "killed!\n"
7394 msgid "killed!\n"
7388 msgstr ""
7395 msgstr ""
7389
7396
7390 #, python-format
7397 #, python-format
7391 msgid "hg: unknown command '%s'\n"
7398 msgid "hg: unknown command '%s'\n"
7392 msgstr ""
7399 msgstr ""
7393
7400
7394 #, python-format
7401 #, python-format
7395 msgid "abort: could not import module %s!\n"
7402 msgid "abort: could not import module %s!\n"
7396 msgstr ""
7403 msgstr ""
7397
7404
7398 msgid "(did you forget to compile extensions?)\n"
7405 msgid "(did you forget to compile extensions?)\n"
7399 msgstr ""
7406 msgstr ""
7400
7407
7401 msgid "(is your Python install correct?)\n"
7408 msgid "(is your Python install correct?)\n"
7402 msgstr ""
7409 msgstr ""
7403
7410
7404 #, python-format
7411 #, python-format
7405 msgid "abort: error: %s\n"
7412 msgid "abort: error: %s\n"
7406 msgstr ""
7413 msgstr ""
7407
7414
7408 msgid "broken pipe\n"
7415 msgid "broken pipe\n"
7409 msgstr ""
7416 msgstr ""
7410
7417
7411 msgid "interrupted!\n"
7418 msgid "interrupted!\n"
7412 msgstr ""
7419 msgstr ""
7413
7420
7414 msgid ""
7421 msgid ""
7415 "\n"
7422 "\n"
7416 "broken pipe\n"
7423 "broken pipe\n"
7417 msgstr ""
7424 msgstr ""
7418
7425
7419 msgid "abort: out of memory\n"
7426 msgid "abort: out of memory\n"
7420 msgstr ""
7427 msgstr ""
7421
7428
7422 msgid "** unknown exception encountered, details follow\n"
7429 msgid "** unknown exception encountered, details follow\n"
7423 msgstr ""
7430 msgstr ""
7424
7431
7425 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7432 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
7426 msgstr ""
7433 msgstr ""
7427
7434
7428 msgid "** or mercurial@selenic.com\n"
7435 msgid "** or mercurial@selenic.com\n"
7429 msgstr ""
7436 msgstr ""
7430
7437
7431 #, python-format
7438 #, python-format
7432 msgid "** Mercurial Distributed SCM (version %s)\n"
7439 msgid "** Mercurial Distributed SCM (version %s)\n"
7433 msgstr ""
7440 msgstr ""
7434
7441
7435 #, python-format
7442 #, python-format
7436 msgid "** Extensions loaded: %s\n"
7443 msgid "** Extensions loaded: %s\n"
7437 msgstr ""
7444 msgstr ""
7438
7445
7439 #, python-format
7446 #, python-format
7440 msgid "no definition for alias '%s'\n"
7447 msgid "no definition for alias '%s'\n"
7441 msgstr ""
7448 msgstr ""
7442
7449
7443 #, python-format
7450 #, python-format
7444 msgid "alias '%s' resolves to unknown command '%s'\n"
7451 msgid "alias '%s' resolves to unknown command '%s'\n"
7445 msgstr ""
7452 msgstr ""
7446
7453
7447 #, python-format
7454 #, python-format
7448 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7455 msgid "alias '%s' resolves to ambiguous command '%s'\n"
7449 msgstr ""
7456 msgstr ""
7450
7457
7451 #, python-format
7458 #, python-format
7452 msgid "malformed --config option: %s"
7459 msgid "malformed --config option: %s"
7453 msgstr ""
7460 msgstr ""
7454
7461
7455 #, python-format
7462 #, python-format
7456 msgid "extension '%s' overrides commands: %s\n"
7463 msgid "extension '%s' overrides commands: %s\n"
7457 msgstr ""
7464 msgstr ""
7458
7465
7459 msgid "Option --config may not be abbreviated!"
7466 msgid "Option --config may not be abbreviated!"
7460 msgstr ""
7467 msgstr ""
7461
7468
7462 msgid "Option --cwd may not be abbreviated!"
7469 msgid "Option --cwd may not be abbreviated!"
7463 msgstr ""
7470 msgstr ""
7464
7471
7465 msgid ""
7472 msgid ""
7466 "Option -R has to be separated from other options (e.g. not -qR) and --"
7473 "Option -R has to be separated from other options (e.g. not -qR) and --"
7467 "repository may only be abbreviated as --repo!"
7474 "repository may only be abbreviated as --repo!"
7468 msgstr ""
7475 msgstr ""
7469
7476
7470 #, python-format
7477 #, python-format
7471 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7478 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7472 msgstr ""
7479 msgstr ""
7473
7480
7474 #, python-format
7481 #, python-format
7475 msgid "repository '%s' is not local"
7482 msgid "repository '%s' is not local"
7476 msgstr ""
7483 msgstr ""
7477
7484
7478 msgid "invalid arguments"
7485 msgid "invalid arguments"
7479 msgstr ""
7486 msgstr ""
7480
7487
7481 #, python-format
7488 #, python-format
7482 msgid "unrecognized profiling format '%s' - Ignored\n"
7489 msgid "unrecognized profiling format '%s' - Ignored\n"
7483 msgstr ""
7490 msgstr ""
7484
7491
7485 msgid ""
7492 msgid ""
7486 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7493 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7487 "misc/lsprof/"
7494 "misc/lsprof/"
7488 msgstr ""
7495 msgstr ""
7489
7496
7490 #, python-format
7497 #, python-format
7491 msgid "*** failed to import extension %s from %s: %s\n"
7498 msgid "*** failed to import extension %s from %s: %s\n"
7492 msgstr ""
7499 msgstr ""
7493
7500
7494 #, python-format
7501 #, python-format
7495 msgid "*** failed to import extension %s: %s\n"
7502 msgid "*** failed to import extension %s: %s\n"
7496 msgstr ""
7503 msgstr ""
7497
7504
7498 #, python-format
7505 #, python-format
7499 msgid "couldn't find merge tool %s\n"
7506 msgid "couldn't find merge tool %s\n"
7500 msgstr ""
7507 msgstr ""
7501
7508
7502 #, python-format
7509 #, python-format
7503 msgid "tool %s can't handle symlinks\n"
7510 msgid "tool %s can't handle symlinks\n"
7504 msgstr ""
7511 msgstr ""
7505
7512
7506 #, python-format
7513 #, python-format
7507 msgid "tool %s can't handle binary\n"
7514 msgid "tool %s can't handle binary\n"
7508 msgstr ""
7515 msgstr ""
7509
7516
7510 #, python-format
7517 #, python-format
7511 msgid "tool %s requires a GUI\n"
7518 msgid "tool %s requires a GUI\n"
7512 msgstr ""
7519 msgstr ""
7513
7520
7514 #, python-format
7521 #, python-format
7515 msgid ""
7522 msgid ""
7516 " no tool found to merge %s\n"
7523 " no tool found to merge %s\n"
7517 "keep (l)ocal or take (o)ther?"
7524 "keep (l)ocal or take (o)ther?"
7518 msgstr ""
7525 msgstr ""
7519
7526
7520 msgid "&Local"
7527 msgid "&Local"
7521 msgstr ""
7528 msgstr ""
7522
7529
7523 msgid "&Other"
7530 msgid "&Other"
7524 msgstr ""
7531 msgstr ""
7525
7532
7526 #, python-format
7533 #, python-format
7527 msgid "merging %s and %s to %s\n"
7534 msgid "merging %s and %s to %s\n"
7528 msgstr ""
7535 msgstr ""
7529
7536
7530 #, python-format
7537 #, python-format
7531 msgid "merging %s\n"
7538 msgid "merging %s\n"
7532 msgstr ""
7539 msgstr ""
7533
7540
7534 #, python-format
7541 #, python-format
7535 msgid ""
7542 msgid ""
7536 " output file %s appears unchanged\n"
7543 " output file %s appears unchanged\n"
7537 "was merge successful (yn)?"
7544 "was merge successful (yn)?"
7538 msgstr ""
7545 msgstr ""
7539
7546
7540 msgid "&No"
7547 msgid "&No"
7541 msgstr ""
7548 msgstr ""
7542
7549
7543 msgid "&Yes"
7550 msgid "&Yes"
7544 msgstr ""
7551 msgstr ""
7545
7552
7546 #, python-format
7553 #, python-format
7547 msgid "merging %s failed!\n"
7554 msgid "merging %s failed!\n"
7548 msgstr ""
7555 msgstr ""
7549
7556
7550 #, python-format
7557 #, python-format
7551 msgid "Inconsistent state, %s:%s is good and bad"
7558 msgid "Inconsistent state, %s:%s is good and bad"
7552 msgstr ""
7559 msgstr ""
7553
7560
7554 #, python-format
7561 #, python-format
7555 msgid "unknown bisect kind %s"
7562 msgid "unknown bisect kind %s"
7556 msgstr ""
7563 msgstr ""
7557
7564
7558 msgid "disabled extensions:"
7565 msgid "disabled extensions:"
7559 msgstr ""
7566 msgstr ""
7560
7567
7561 msgid "Date Formats"
7568 msgid "Date Formats"
7562 msgstr ""
7569 msgstr ""
7563
7570
7564 msgid "File Name Patterns"
7571 msgid "File Name Patterns"
7565 msgstr ""
7572 msgstr ""
7566
7573
7567 msgid "Environment Variables"
7574 msgid "Environment Variables"
7568 msgstr ""
7575 msgstr ""
7569
7576
7570 msgid "Specifying Single Revisions"
7577 msgid "Specifying Single Revisions"
7571 msgstr ""
7578 msgstr ""
7572
7579
7573 msgid "Specifying Multiple Revisions"
7580 msgid "Specifying Multiple Revisions"
7574 msgstr ""
7581 msgstr ""
7575
7582
7576 msgid "Diff Formats"
7583 msgid "Diff Formats"
7577 msgstr ""
7584 msgstr ""
7578
7585
7579 msgid "Template Usage"
7586 msgid "Template Usage"
7580 msgstr ""
7587 msgstr ""
7581
7588
7582 msgid "URL Paths"
7589 msgid "URL Paths"
7583 msgstr ""
7590 msgstr ""
7584
7591
7585 msgid "Using additional features"
7592 msgid "Using additional features"
7586 msgstr ""
7593 msgstr ""
7587
7594
7588 msgid "can only share local repositories"
7595 msgid "can only share local repositories"
7589 msgstr ""
7596 msgstr ""
7590
7597
7591 msgid "destination already exists"
7598 msgid "destination already exists"
7592 msgstr ""
7599 msgstr ""
7593
7600
7594 msgid "updating working directory\n"
7601 msgid "updating working directory\n"
7595 msgstr ""
7602 msgstr ""
7596
7603
7597 #, python-format
7604 #, python-format
7598 msgid "destination directory: %s\n"
7605 msgid "destination directory: %s\n"
7599 msgstr ""
7606 msgstr ""
7600
7607
7601 #, python-format
7608 #, python-format
7602 msgid "destination '%s' already exists"
7609 msgid "destination '%s' already exists"
7603 msgstr ""
7610 msgstr ""
7604
7611
7605 #, python-format
7612 #, python-format
7606 msgid "destination '%s' is not empty"
7613 msgid "destination '%s' is not empty"
7607 msgstr ""
7614 msgstr ""
7608
7615
7609 msgid ""
7616 msgid ""
7610 "src repository does not support revision lookup and so doesn't support clone "
7617 "src repository does not support revision lookup and so doesn't support clone "
7611 "by revision"
7618 "by revision"
7612 msgstr ""
7619 msgstr ""
7613
7620
7614 msgid "clone from remote to remote not supported"
7621 msgid "clone from remote to remote not supported"
7615 msgstr ""
7622 msgstr ""
7616
7623
7617 #, python-format
7624 #, python-format
7618 msgid "updating to branch %s\n"
7625 msgid "updating to branch %s\n"
7619 msgstr ""
7626 msgstr ""
7620
7627
7621 #, python-format
7628 #, python-format
7622 msgid ""
7629 msgid ""
7623 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
7630 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
7624 msgstr ""
7631 msgstr ""
7625
7632
7626 msgid "use 'hg resolve' to retry unresolved file merges\n"
7633 msgid "use 'hg resolve' to retry unresolved file merges\n"
7627 msgstr ""
7634 msgstr ""
7628
7635
7629 msgid ""
7636 msgid ""
7630 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
7637 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
7631 "abandon\n"
7638 "abandon\n"
7632 msgstr ""
7639 msgstr ""
7633
7640
7634 msgid "(branch merge, don't forget to commit)\n"
7641 msgid "(branch merge, don't forget to commit)\n"
7635 msgstr ""
7642 msgstr ""
7636
7643
7637 #, python-format
7644 #, python-format
7638 msgid "error reading %s/.hg/hgrc: %s\n"
7645 msgid "error reading %s/.hg/hgrc: %s\n"
7639 msgstr ""
7646 msgstr ""
7640
7647
7641 msgid "SSL support is unavailable"
7648 msgid "SSL support is unavailable"
7642 msgstr ""
7649 msgstr ""
7643
7650
7644 msgid "IPv6 is not available on this system"
7651 msgid "IPv6 is not available on this system"
7645 msgstr ""
7652 msgstr ""
7646
7653
7647 #, python-format
7654 #, python-format
7648 msgid "cannot start server at '%s:%d': %s"
7655 msgid "cannot start server at '%s:%d': %s"
7649 msgstr ""
7656 msgstr ""
7650
7657
7651 #, python-format
7658 #, python-format
7652 msgid "calling hook %s: %s\n"
7659 msgid "calling hook %s: %s\n"
7653 msgstr ""
7660 msgstr ""
7654
7661
7655 #, python-format
7662 #, python-format
7656 msgid "%s hook is invalid (\"%s\" not in a module)"
7663 msgid "%s hook is invalid (\"%s\" not in a module)"
7657 msgstr ""
7664 msgstr ""
7658
7665
7659 #, python-format
7666 #, python-format
7660 msgid "%s hook is invalid (import of \"%s\" failed)"
7667 msgid "%s hook is invalid (import of \"%s\" failed)"
7661 msgstr ""
7668 msgstr ""
7662
7669
7663 #, python-format
7670 #, python-format
7664 msgid "%s hook is invalid (\"%s\" is not defined)"
7671 msgid "%s hook is invalid (\"%s\" is not defined)"
7665 msgstr ""
7672 msgstr ""
7666
7673
7667 #, python-format
7674 #, python-format
7668 msgid "%s hook is invalid (\"%s\" is not callable)"
7675 msgid "%s hook is invalid (\"%s\" is not callable)"
7669 msgstr ""
7676 msgstr ""
7670
7677
7671 #, python-format
7678 #, python-format
7672 msgid "error: %s hook failed: %s\n"
7679 msgid "error: %s hook failed: %s\n"
7673 msgstr ""
7680 msgstr ""
7674
7681
7675 #, python-format
7682 #, python-format
7676 msgid "error: %s hook raised an exception: %s\n"
7683 msgid "error: %s hook raised an exception: %s\n"
7677 msgstr ""
7684 msgstr ""
7678
7685
7679 #, python-format
7686 #, python-format
7680 msgid "%s hook failed"
7687 msgid "%s hook failed"
7681 msgstr ""
7688 msgstr ""
7682
7689
7683 #, python-format
7690 #, python-format
7684 msgid "warning: %s hook failed\n"
7691 msgid "warning: %s hook failed\n"
7685 msgstr ""
7692 msgstr ""
7686
7693
7687 #, python-format
7694 #, python-format
7688 msgid "running hook %s: %s\n"
7695 msgid "running hook %s: %s\n"
7689 msgstr ""
7696 msgstr ""
7690
7697
7691 #, python-format
7698 #, python-format
7692 msgid "%s hook %s"
7699 msgid "%s hook %s"
7693 msgstr ""
7700 msgstr ""
7694
7701
7695 #, python-format
7702 #, python-format
7696 msgid "warning: %s hook %s\n"
7703 msgid "warning: %s hook %s\n"
7697 msgstr ""
7704 msgstr ""
7698
7705
7699 msgid "connection ended unexpectedly"
7706 msgid "connection ended unexpectedly"
7700 msgstr ""
7707 msgstr ""
7701
7708
7702 #, python-format
7709 #, python-format
7703 msgid "unsupported URL component: \"%s\""
7710 msgid "unsupported URL component: \"%s\""
7704 msgstr ""
7711 msgstr ""
7705
7712
7706 msgid "operation not supported over http"
7713 msgid "operation not supported over http"
7707 msgstr ""
7714 msgstr ""
7708
7715
7709 msgid "authorization failed"
7716 msgid "authorization failed"
7710 msgstr ""
7717 msgstr ""
7711
7718
7712 msgid "http error, possibly caused by proxy setting"
7719 msgid "http error, possibly caused by proxy setting"
7713 msgstr ""
7720 msgstr ""
7714
7721
7715 #, python-format
7722 #, python-format
7716 msgid "real URL is %s\n"
7723 msgid "real URL is %s\n"
7717 msgstr ""
7724 msgstr ""
7718
7725
7719 #, python-format
7726 #, python-format
7720 msgid "'%s' does not appear to be an hg repository"
7727 msgid "'%s' does not appear to be an hg repository"
7721 msgstr ""
7728 msgstr ""
7722
7729
7723 #, python-format
7730 #, python-format
7724 msgid "'%s' sent a broken Content-Type header (%s)"
7731 msgid "'%s' sent a broken Content-Type header (%s)"
7725 msgstr ""
7732 msgstr ""
7726
7733
7727 #, python-format
7734 #, python-format
7728 msgid "'%s' uses newer protocol %s"
7735 msgid "'%s' uses newer protocol %s"
7729 msgstr ""
7736 msgstr ""
7730
7737
7731 msgid "look up remote revision"
7738 msgid "look up remote revision"
7732 msgstr ""
7739 msgstr ""
7733
7740
7734 msgid "unexpected response:"
7741 msgid "unexpected response:"
7735 msgstr ""
7742 msgstr ""
7736
7743
7737 msgid "look up remote changes"
7744 msgid "look up remote changes"
7738 msgstr ""
7745 msgstr ""
7739
7746
7740 msgid "push failed (unexpected response):"
7747 msgid "push failed (unexpected response):"
7741 msgstr ""
7748 msgstr ""
7742
7749
7743 #, python-format
7750 #, python-format
7744 msgid "push failed: %s"
7751 msgid "push failed: %s"
7745 msgstr ""
7752 msgstr ""
7746
7753
7747 msgid "Python support for SSL and HTTPS is not installed"
7754 msgid "Python support for SSL and HTTPS is not installed"
7748 msgstr ""
7755 msgstr ""
7749
7756
7750 msgid "cannot create new http repository"
7757 msgid "cannot create new http repository"
7751 msgstr ""
7758 msgstr ""
7752
7759
7753 #, python-format
7760 #, python-format
7754 msgid "ignoring invalid syntax '%s'"
7761 msgid "ignoring invalid syntax '%s'"
7755 msgstr ""
7762 msgstr ""
7756
7763
7757 #, python-format
7764 #, python-format
7758 msgid "skipping unreadable ignore file '%s': %s\n"
7765 msgid "skipping unreadable ignore file '%s': %s\n"
7759 msgstr ""
7766 msgstr ""
7760
7767
7761 #, python-format
7768 #, python-format
7762 msgid "repository %s not found"
7769 msgid "repository %s not found"
7763 msgstr ""
7770 msgstr ""
7764
7771
7765 #, python-format
7772 #, python-format
7766 msgid "repository %s already exists"
7773 msgid "repository %s already exists"
7767 msgstr ""
7774 msgstr ""
7768
7775
7769 #, python-format
7776 #, python-format
7770 msgid "requirement '%s' not supported"
7777 msgid "requirement '%s' not supported"
7771 msgstr ""
7778 msgstr ""
7772
7779
7773 #, python-format
7780 #, python-format
7774 msgid ".hg/sharedpath points to nonexistent directory %s"
7781 msgid ".hg/sharedpath points to nonexistent directory %s"
7775 msgstr ""
7782 msgstr ""
7776
7783
7777 #, python-format
7784 #, python-format
7778 msgid "%r cannot be used in a tag name"
7785 msgid "%r cannot be used in a tag name"
7779 msgstr ""
7786 msgstr ""
7780
7787
7781 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7788 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
7782 msgstr ""
7789 msgstr ""
7783
7790
7784 #, python-format
7791 #, python-format
7785 msgid "working directory has unknown parent '%s'!"
7792 msgid "working directory has unknown parent '%s'!"
7786 msgstr ""
7793 msgstr ""
7787
7794
7788 #, python-format
7795 #, python-format
7789 msgid "unknown revision '%s'"
7796 msgid "unknown revision '%s'"
7790 msgstr ""
7797 msgstr ""
7791
7798
7792 msgid "journal already exists - run hg recover"
7799 msgid "journal already exists - run hg recover"
7793 msgstr ""
7800 msgstr ""
7794
7801
7795 msgid "rolling back interrupted transaction\n"
7802 msgid "rolling back interrupted transaction\n"
7796 msgstr ""
7803 msgstr ""
7797
7804
7798 msgid "no interrupted transaction available\n"
7805 msgid "no interrupted transaction available\n"
7799 msgstr ""
7806 msgstr ""
7800
7807
7801 msgid "rolling back last transaction\n"
7808 msgid "rolling back last transaction\n"
7802 msgstr ""
7809 msgstr ""
7803
7810
7804 #, python-format
7811 #, python-format
7805 msgid "Named branch could not be reset, current branch still is: %s\n"
7812 msgid "Named branch could not be reset, current branch still is: %s\n"
7806 msgstr ""
7813 msgstr ""
7807
7814
7808 msgid "no rollback information available\n"
7815 msgid "no rollback information available\n"
7809 msgstr ""
7816 msgstr ""
7810
7817
7811 #, python-format
7818 #, python-format
7812 msgid "waiting for lock on %s held by %r\n"
7819 msgid "waiting for lock on %s held by %r\n"
7813 msgstr ""
7820 msgstr ""
7814
7821
7815 #, python-format
7822 #, python-format
7816 msgid "repository %s"
7823 msgid "repository %s"
7817 msgstr ""
7824 msgstr ""
7818
7825
7819 #, python-format
7826 #, python-format
7820 msgid "working directory of %s"
7827 msgid "working directory of %s"
7821 msgstr ""
7828 msgstr ""
7822
7829
7823 msgid "cannot partially commit a merge (do not specify files or patterns)"
7830 msgid "cannot partially commit a merge (do not specify files or patterns)"
7824 msgstr ""
7831 msgstr ""
7825
7832
7826 msgid "file not found!"
7833 msgid "file not found!"
7827 msgstr ""
7834 msgstr ""
7828
7835
7829 msgid "no match under directory!"
7836 msgid "no match under directory!"
7830 msgstr ""
7837 msgstr ""
7831
7838
7832 msgid "file not tracked!"
7839 msgid "file not tracked!"
7833 msgstr ""
7840 msgstr ""
7834
7841
7835 msgid "unresolved merge conflicts (see hg resolve)"
7842 msgid "unresolved merge conflicts (see hg resolve)"
7836 msgstr ""
7843 msgstr ""
7837
7844
7838 #, python-format
7845 #, python-format
7839 msgid "committing subrepository %s\n"
7846 msgid "committing subrepository %s\n"
7840 msgstr ""
7847 msgstr ""
7841
7848
7842 #, python-format
7849 #, python-format
7843 msgid "trouble committing %s!\n"
7850 msgid "trouble committing %s!\n"
7844 msgstr ""
7851 msgstr ""
7845
7852
7846 #, python-format
7853 #, python-format
7847 msgid "%s does not exist!\n"
7854 msgid "%s does not exist!\n"
7848 msgstr ""
7855 msgstr ""
7849
7856
7850 #, python-format
7857 #, python-format
7851 msgid ""
7858 msgid ""
7852 "%s: files over 10MB may cause memory and performance problems\n"
7859 "%s: files over 10MB may cause memory and performance problems\n"
7853 "(use 'hg revert %s' to unadd the file)\n"
7860 "(use 'hg revert %s' to unadd the file)\n"
7854 msgstr ""
7861 msgstr ""
7855
7862
7856 #, python-format
7863 #, python-format
7857 msgid "%s not added: only files and symlinks supported currently\n"
7864 msgid "%s not added: only files and symlinks supported currently\n"
7858 msgstr ""
7865 msgstr ""
7859
7866
7860 #, python-format
7867 #, python-format
7861 msgid "%s already tracked!\n"
7868 msgid "%s already tracked!\n"
7862 msgstr ""
7869 msgstr ""
7863
7870
7864 #, python-format
7871 #, python-format
7865 msgid "%s not added!\n"
7872 msgid "%s not added!\n"
7866 msgstr ""
7873 msgstr ""
7867
7874
7868 #, python-format
7875 #, python-format
7869 msgid "%s still exists!\n"
7876 msgid "%s still exists!\n"
7870 msgstr ""
7877 msgstr ""
7871
7878
7872 #, python-format
7879 #, python-format
7873 msgid "%s not tracked!\n"
7880 msgid "%s not tracked!\n"
7874 msgstr ""
7881 msgstr ""
7875
7882
7876 #, python-format
7883 #, python-format
7877 msgid "%s not removed!\n"
7884 msgid "%s not removed!\n"
7878 msgstr ""
7885 msgstr ""
7879
7886
7880 #, python-format
7887 #, python-format
7881 msgid "copy failed: %s is not a file or a symbolic link\n"
7888 msgid "copy failed: %s is not a file or a symbolic link\n"
7882 msgstr ""
7889 msgstr ""
7883
7890
7884 msgid "searching for changes\n"
7891 msgid "searching for changes\n"
7885 msgstr ""
7892 msgstr "söker efter ändringar\n"
7886
7893
7887 msgid "already have changeset "
7894 msgid "already have changeset "
7888 msgstr ""
7895 msgstr ""
7889
7896
7890 msgid "warning: repository is unrelated\n"
7897 msgid "warning: repository is unrelated\n"
7891 msgstr ""
7898 msgstr ""
7892
7899
7893 msgid "repository is unrelated"
7900 msgid "repository is unrelated"
7894 msgstr ""
7901 msgstr ""
7895
7902
7896 msgid "requesting all changes\n"
7903 msgid "requesting all changes\n"
7897 msgstr ""
7904 msgstr ""
7898
7905
7899 msgid ""
7906 msgid ""
7900 "Partial pull cannot be done because other repository doesn't support "
7907 "Partial pull cannot be done because other repository doesn't support "
7901 "changegroupsubset."
7908 "changegroupsubset."
7902 msgstr ""
7909 msgstr ""
7903
7910
7904 #, python-format
7911 #, python-format
7905 msgid "abort: push creates new remote branch '%s'!\n"
7912 msgid "abort: push creates new remote branch '%s'!\n"
7906 msgstr ""
7913 msgstr ""
7907
7914
7908 msgid "abort: push creates new remote heads!\n"
7915 msgid "abort: push creates new remote heads!\n"
7909 msgstr ""
7916 msgstr ""
7910
7917
7911 msgid "(did you forget to merge? use push -f to force)\n"
7918 msgid "(did you forget to merge? use push -f to force)\n"
7912 msgstr ""
7919 msgstr ""
7913
7920
7914 msgid "note: unsynced remote changes!\n"
7921 msgid "note: unsynced remote changes!\n"
7915 msgstr ""
7922 msgstr ""
7916
7923
7917 #, python-format
7924 #, python-format
7918 msgid "%d changesets found\n"
7925 msgid "%d changesets found\n"
7919 msgstr ""
7926 msgstr ""
7920
7927
7921 #, python-format
7928 #, python-format
7922 msgid "empty or missing revlog for %s"
7929 msgid "empty or missing revlog for %s"
7923 msgstr ""
7930 msgstr ""
7924
7931
7925 msgid "adding changesets\n"
7932 msgid "adding changesets\n"
7926 msgstr ""
7933 msgstr ""
7927
7934
7928 msgid "received changelog group is empty"
7935 msgid "received changelog group is empty"
7929 msgstr ""
7936 msgstr ""
7930
7937
7931 msgid "adding manifests\n"
7938 msgid "adding manifests\n"
7932 msgstr ""
7939 msgstr ""
7933
7940
7934 msgid "adding file changes\n"
7941 msgid "adding file changes\n"
7935 msgstr ""
7942 msgstr ""
7936
7943
7937 msgid "received file revlog group is empty"
7944 msgid "received file revlog group is empty"
7938 msgstr ""
7945 msgstr ""
7939
7946
7940 #, python-format
7947 #, python-format
7941 msgid " (%+d heads)"
7948 msgid " (%+d heads)"
7942 msgstr ""
7949 msgstr ""
7943
7950
7944 #, python-format
7951 #, python-format
7945 msgid "added %d changesets with %d changes to %d files%s\n"
7952 msgid "added %d changesets with %d changes to %d files%s\n"
7946 msgstr ""
7953 msgstr ""
7947
7954
7948 msgid "Unexpected response from remote server:"
7955 msgid "Unexpected response from remote server:"
7949 msgstr ""
7956 msgstr ""
7950
7957
7951 msgid "operation forbidden by server"
7958 msgid "operation forbidden by server"
7952 msgstr ""
7959 msgstr ""
7953
7960
7954 msgid "locking the remote repository failed"
7961 msgid "locking the remote repository failed"
7955 msgstr ""
7962 msgstr ""
7956
7963
7957 msgid "the server sent an unknown error code"
7964 msgid "the server sent an unknown error code"
7958 msgstr ""
7965 msgstr ""
7959
7966
7960 msgid "streaming all changes\n"
7967 msgid "streaming all changes\n"
7961 msgstr ""
7968 msgstr ""
7962
7969
7963 #, python-format
7970 #, python-format
7964 msgid "%d files to transfer, %s of data\n"
7971 msgid "%d files to transfer, %s of data\n"
7965 msgstr ""
7972 msgstr ""
7966
7973
7967 #, python-format
7974 #, python-format
7968 msgid "transferred %s in %.1f seconds (%s/sec)\n"
7975 msgid "transferred %s in %.1f seconds (%s/sec)\n"
7969 msgstr ""
7976 msgstr ""
7970
7977
7971 msgid "no [smtp]host in hgrc - cannot send mail"
7978 msgid "no [smtp]host in hgrc - cannot send mail"
7972 msgstr ""
7979 msgstr ""
7973
7980
7974 #, python-format
7981 #, python-format
7975 msgid "sending mail: smtp host %s, port %s\n"
7982 msgid "sending mail: smtp host %s, port %s\n"
7976 msgstr ""
7983 msgstr ""
7977
7984
7978 msgid "can't use TLS: Python SSL support not installed"
7985 msgid "can't use TLS: Python SSL support not installed"
7979 msgstr ""
7986 msgstr ""
7980
7987
7981 msgid "(using tls)\n"
7988 msgid "(using tls)\n"
7982 msgstr ""
7989 msgstr ""
7983
7990
7984 #, python-format
7991 #, python-format
7985 msgid "(authenticating to mail server as %s)\n"
7992 msgid "(authenticating to mail server as %s)\n"
7986 msgstr ""
7993 msgstr ""
7987
7994
7988 #, python-format
7995 #, python-format
7989 msgid "sending mail: %s\n"
7996 msgid "sending mail: %s\n"
7990 msgstr ""
7997 msgstr ""
7991
7998
7992 msgid "smtp specified as email transport, but no smtp host configured"
7999 msgid "smtp specified as email transport, but no smtp host configured"
7993 msgstr ""
8000 msgstr ""
7994
8001
7995 #, python-format
8002 #, python-format
7996 msgid "%r specified as email transport, but not in PATH"
8003 msgid "%r specified as email transport, but not in PATH"
7997 msgstr ""
8004 msgstr ""
7998
8005
7999 #, python-format
8006 #, python-format
8000 msgid "ignoring invalid sendcharset: %s\n"
8007 msgid "ignoring invalid sendcharset: %s\n"
8001 msgstr ""
8008 msgstr ""
8002
8009
8003 #, python-format
8010 #, python-format
8004 msgid "invalid email address: %s"
8011 msgid "invalid email address: %s"
8005 msgstr ""
8012 msgstr ""
8006
8013
8007 #, python-format
8014 #, python-format
8008 msgid "invalid local address: %s"
8015 msgid "invalid local address: %s"
8009 msgstr ""
8016 msgstr ""
8010
8017
8011 #, python-format
8018 #, python-format
8012 msgid "failed to remove %s from manifest"
8019 msgid "failed to remove %s from manifest"
8013 msgstr ""
8020 msgstr ""
8014
8021
8015 #, python-format
8022 #, python-format
8016 msgid "diff context lines count must be an integer, not %r"
8023 msgid "diff context lines count must be an integer, not %r"
8017 msgstr ""
8024 msgstr ""
8018
8025
8019 #, python-format
8026 #, python-format
8020 msgid ""
8027 msgid ""
8021 "untracked file in working directory differs from file in requested revision: "
8028 "untracked file in working directory differs from file in requested revision: "
8022 "'%s'"
8029 "'%s'"
8023 msgstr ""
8030 msgstr ""
8024
8031
8025 #, python-format
8032 #, python-format
8026 msgid "case-folding collision between %s and %s"
8033 msgid "case-folding collision between %s and %s"
8027 msgstr ""
8034 msgstr ""
8028
8035
8029 #, python-format
8036 #, python-format
8030 msgid ""
8037 msgid ""
8031 " conflicting flags for %s\n"
8038 " conflicting flags for %s\n"
8032 "(n)one, e(x)ec or sym(l)ink?"
8039 "(n)one, e(x)ec or sym(l)ink?"
8033 msgstr ""
8040 msgstr ""
8034
8041
8035 msgid "&None"
8042 msgid "&None"
8036 msgstr ""
8043 msgstr ""
8037
8044
8038 msgid "E&xec"
8045 msgid "E&xec"
8039 msgstr ""
8046 msgstr ""
8040
8047
8041 msgid "Sym&link"
8048 msgid "Sym&link"
8042 msgstr ""
8049 msgstr ""
8043
8050
8044 msgid "resolving manifests\n"
8051 msgid "resolving manifests\n"
8045 msgstr ""
8052 msgstr ""
8046
8053
8047 #, python-format
8054 #, python-format
8048 msgid ""
8055 msgid ""
8049 " local changed %s which remote deleted\n"
8056 " local changed %s which remote deleted\n"
8050 "use (c)hanged version or (d)elete?"
8057 "use (c)hanged version or (d)elete?"
8051 msgstr ""
8058 msgstr ""
8052
8059
8053 msgid "&Changed"
8060 msgid "&Changed"
8054 msgstr ""
8061 msgstr ""
8055
8062
8056 msgid "&Delete"
8063 msgid "&Delete"
8057 msgstr ""
8064 msgstr ""
8058
8065
8059 #, python-format
8066 #, python-format
8060 msgid ""
8067 msgid ""
8061 "remote changed %s which local deleted\n"
8068 "remote changed %s which local deleted\n"
8062 "use (c)hanged version or leave (d)eleted?"
8069 "use (c)hanged version or leave (d)eleted?"
8063 msgstr ""
8070 msgstr ""
8064
8071
8065 msgid "&Deleted"
8072 msgid "&Deleted"
8066 msgstr ""
8073 msgstr ""
8067
8074
8068 #, python-format
8075 #, python-format
8069 msgid "update failed to remove %s: %s!\n"
8076 msgid "update failed to remove %s: %s!\n"
8070 msgstr ""
8077 msgstr ""
8071
8078
8072 #, python-format
8079 #, python-format
8073 msgid "getting %s\n"
8080 msgid "getting %s\n"
8074 msgstr ""
8081 msgstr ""
8075
8082
8076 #, python-format
8083 #, python-format
8077 msgid "getting %s to %s\n"
8084 msgid "getting %s to %s\n"
8078 msgstr ""
8085 msgstr ""
8079
8086
8080 #, python-format
8087 #, python-format
8081 msgid "warning: detected divergent renames of %s to:\n"
8088 msgid "warning: detected divergent renames of %s to:\n"
8082 msgstr ""
8089 msgstr ""
8083
8090
8084 #, python-format
8091 #, python-format
8085 msgid "branch %s not found"
8092 msgid "branch %s not found"
8086 msgstr ""
8093 msgstr ""
8087
8094
8088 msgid "can't merge with ancestor"
8095 msgid "can't merge with ancestor"
8089 msgstr ""
8096 msgstr ""
8090
8097
8091 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8098 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
8092 msgstr ""
8099 msgstr ""
8093
8100
8094 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8101 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
8095 msgstr ""
8102 msgstr ""
8096
8103
8097 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8104 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
8098 msgstr ""
8105 msgstr ""
8099
8106
8100 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8107 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
8101 msgstr ""
8108 msgstr ""
8102
8109
8103 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8110 msgid "crosses named branches (use 'hg update -C' to discard changes)"
8104 msgstr ""
8111 msgstr ""
8105
8112
8106 #, python-format
8113 #, python-format
8107 msgid "cannot create %s: destination already exists"
8114 msgid "cannot create %s: destination already exists"
8108 msgstr ""
8115 msgstr ""
8109
8116
8110 #, python-format
8117 #, python-format
8111 msgid "cannot create %s: unable to create destination directory"
8118 msgid "cannot create %s: unable to create destination directory"
8112 msgstr ""
8119 msgstr ""
8113
8120
8114 #, python-format
8121 #, python-format
8115 msgid "unable to find '%s' for patching\n"
8122 msgid "unable to find '%s' for patching\n"
8116 msgstr ""
8123 msgstr ""
8117
8124
8118 #, python-format
8125 #, python-format
8119 msgid "patching file %s\n"
8126 msgid "patching file %s\n"
8120 msgstr ""
8127 msgstr ""
8121
8128
8122 #, python-format
8129 #, python-format
8123 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8130 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
8124 msgstr ""
8131 msgstr ""
8125
8132
8126 #, python-format
8133 #, python-format
8127 msgid "bad hunk #%d %s (%d %d %d %d)"
8134 msgid "bad hunk #%d %s (%d %d %d %d)"
8128 msgstr ""
8135 msgstr ""
8129
8136
8130 #, python-format
8137 #, python-format
8131 msgid "file %s already exists\n"
8138 msgid "file %s already exists\n"
8132 msgstr ""
8139 msgstr ""
8133
8140
8134 #, python-format
8141 #, python-format
8135 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8142 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
8136 msgstr ""
8143 msgstr ""
8137
8144
8138 #, python-format
8145 #, python-format
8139 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8146 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
8140 msgstr ""
8147 msgstr ""
8141
8148
8142 #, python-format
8149 #, python-format
8143 msgid "Hunk #%d FAILED at %d\n"
8150 msgid "Hunk #%d FAILED at %d\n"
8144 msgstr ""
8151 msgstr ""
8145
8152
8146 #, python-format
8153 #, python-format
8147 msgid "bad hunk #%d"
8154 msgid "bad hunk #%d"
8148 msgstr ""
8155 msgstr ""
8149
8156
8150 #, python-format
8157 #, python-format
8151 msgid "bad hunk #%d old text line %d"
8158 msgid "bad hunk #%d old text line %d"
8152 msgstr ""
8159 msgstr ""
8153
8160
8154 msgid "could not extract binary patch"
8161 msgid "could not extract binary patch"
8155 msgstr ""
8162 msgstr ""
8156
8163
8157 #, python-format
8164 #, python-format
8158 msgid "binary patch is %d bytes, not %d"
8165 msgid "binary patch is %d bytes, not %d"
8159 msgstr ""
8166 msgstr ""
8160
8167
8161 #, python-format
8168 #, python-format
8162 msgid "unable to strip away %d dirs from %s"
8169 msgid "unable to strip away %d dirs from %s"
8163 msgstr ""
8170 msgstr ""
8164
8171
8165 msgid "undefined source and destination files"
8172 msgid "undefined source and destination files"
8166 msgstr ""
8173 msgstr ""
8167
8174
8168 #, python-format
8175 #, python-format
8169 msgid "malformed patch %s %s"
8176 msgid "malformed patch %s %s"
8170 msgstr ""
8177 msgstr ""
8171
8178
8172 #, python-format
8179 #, python-format
8173 msgid "unsupported parser state: %s"
8180 msgid "unsupported parser state: %s"
8174 msgstr ""
8181 msgstr ""
8175
8182
8176 #, python-format
8183 #, python-format
8177 msgid "patch command failed: %s"
8184 msgid "patch command failed: %s"
8178 msgstr ""
8185 msgstr ""
8179
8186
8180 #, python-format
8187 #, python-format
8181 msgid "Unsupported line endings type: %s"
8188 msgid "Unsupported line endings type: %s"
8182 msgstr ""
8189 msgstr ""
8183
8190
8184 #, python-format
8191 #, python-format
8185 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
8192 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
8186 msgstr ""
8193 msgstr ""
8187
8194
8188 #, python-format
8195 #, python-format
8189 msgid "exited with status %d"
8196 msgid "exited with status %d"
8190 msgstr ""
8197 msgstr ""
8191
8198
8192 #, python-format
8199 #, python-format
8193 msgid "killed by signal %d"
8200 msgid "killed by signal %d"
8194 msgstr ""
8201 msgstr ""
8195
8202
8196 #, python-format
8203 #, python-format
8197 msgid "saving bundle to %s\n"
8204 msgid "saving bundle to %s\n"
8198 msgstr ""
8205 msgstr ""
8199
8206
8200 msgid "adding branch\n"
8207 msgid "adding branch\n"
8201 msgstr ""
8208 msgstr ""
8202
8209
8203 #, python-format
8210 #, python-format
8204 msgid "cannot %s; remote repository does not support the %r capability"
8211 msgid "cannot %s; remote repository does not support the %r capability"
8205 msgstr ""
8212 msgstr ""
8206
8213
8207 #, python-format
8214 #, python-format
8208 msgid "unknown compression type %r"
8215 msgid "unknown compression type %r"
8209 msgstr ""
8216 msgstr ""
8210
8217
8211 #, python-format
8218 #, python-format
8212 msgid "index %s unknown flags %#04x for format v0"
8219 msgid "index %s unknown flags %#04x for format v0"
8213 msgstr ""
8220 msgstr ""
8214
8221
8215 #, python-format
8222 #, python-format
8216 msgid "index %s unknown flags %#04x for revlogng"
8223 msgid "index %s unknown flags %#04x for revlogng"
8217 msgstr ""
8224 msgstr ""
8218
8225
8219 #, python-format
8226 #, python-format
8220 msgid "index %s unknown format %d"
8227 msgid "index %s unknown format %d"
8221 msgstr ""
8228 msgstr ""
8222
8229
8223 #, python-format
8230 #, python-format
8224 msgid "index %s is corrupted"
8231 msgid "index %s is corrupted"
8225 msgstr ""
8232 msgstr ""
8226
8233
8227 msgid "no node"
8234 msgid "no node"
8228 msgstr ""
8235 msgstr ""
8229
8236
8230 msgid "ambiguous identifier"
8237 msgid "ambiguous identifier"
8231 msgstr ""
8238 msgstr ""
8232
8239
8233 msgid "no match found"
8240 msgid "no match found"
8234 msgstr ""
8241 msgstr ""
8235
8242
8236 #, python-format
8243 #, python-format
8237 msgid "incompatible revision flag %x"
8244 msgid "incompatible revision flag %x"
8238 msgstr ""
8245 msgstr ""
8239
8246
8240 #, python-format
8247 #, python-format
8241 msgid "%s not found in the transaction"
8248 msgid "%s not found in the transaction"
8242 msgstr ""
8249 msgstr ""
8243
8250
8244 msgid "unknown base"
8251 msgid "unknown base"
8245 msgstr ""
8252 msgstr ""
8246
8253
8247 msgid "consistency error adding group"
8254 msgid "consistency error adding group"
8248 msgstr ""
8255 msgstr ""
8249
8256
8250 #, python-format
8257 #, python-format
8251 msgid "%s looks like a binary file."
8258 msgid "%s looks like a binary file."
8252 msgstr ""
8259 msgstr ""
8253
8260
8254 msgid "can only specify two labels."
8261 msgid "can only specify two labels."
8255 msgstr ""
8262 msgstr ""
8256
8263
8257 msgid "warning: conflicts during merge.\n"
8264 msgid "warning: conflicts during merge.\n"
8258 msgstr ""
8265 msgstr ""
8259
8266
8260 #, python-format
8267 #, python-format
8261 msgid "couldn't parse location %s"
8268 msgid "couldn't parse location %s"
8262 msgstr ""
8269 msgstr ""
8263
8270
8264 msgid "could not create remote repo"
8271 msgid "could not create remote repo"
8265 msgstr ""
8272 msgstr ""
8266
8273
8267 msgid "no suitable response from remote hg"
8274 msgid "no suitable response from remote hg"
8268 msgstr ""
8275 msgstr ""
8269
8276
8270 msgid "remote: "
8277 msgid "remote: "
8271 msgstr ""
8278 msgstr ""
8272
8279
8273 #, python-format
8280 #, python-format
8274 msgid "push refused: %s"
8281 msgid "push refused: %s"
8275 msgstr ""
8282 msgstr ""
8276
8283
8277 msgid "unsynced changes"
8284 msgid "unsynced changes"
8278 msgstr ""
8285 msgstr ""
8279
8286
8280 msgid "cannot lock static-http repository"
8287 msgid "cannot lock static-http repository"
8281 msgstr ""
8288 msgstr ""
8282
8289
8283 msgid "cannot create new static-http repository"
8290 msgid "cannot create new static-http repository"
8284 msgstr ""
8291 msgstr ""
8285
8292
8286 #, python-format
8293 #, python-format
8287 msgid "invalid entry in fncache, line %s"
8294 msgid "invalid entry in fncache, line %s"
8288 msgstr ""
8295 msgstr ""
8289
8296
8290 #, python-format
8297 #, python-format
8291 msgid ""
8298 msgid ""
8292 " subrepository sources for %s differ\n"
8299 " subrepository sources for %s differ\n"
8293 "use (l)ocal source (%s) or (r)emote source (%s)?"
8300 "use (l)ocal source (%s) or (r)emote source (%s)?"
8294 msgstr ""
8301 msgstr ""
8295
8302
8296 msgid "&Remote"
8303 msgid "&Remote"
8297 msgstr ""
8304 msgstr ""
8298
8305
8299 #, python-format
8306 #, python-format
8300 msgid ""
8307 msgid ""
8301 " local changed subrepository %s which remote removed\n"
8308 " local changed subrepository %s which remote removed\n"
8302 "use (c)hanged version or (d)elete?"
8309 "use (c)hanged version or (d)elete?"
8303 msgstr ""
8310 msgstr ""
8304
8311
8305 #, python-format
8312 #, python-format
8306 msgid ""
8313 msgid ""
8307 " remote changed subrepository %s which local removed\n"
8314 " remote changed subrepository %s which local removed\n"
8308 "use (c)hanged version or (d)elete?"
8315 "use (c)hanged version or (d)elete?"
8309 msgstr ""
8316 msgstr ""
8310
8317
8311 #, python-format
8318 #, python-format
8312 msgid "removing subrepo %s\n"
8319 msgid "removing subrepo %s\n"
8313 msgstr ""
8320 msgstr ""
8314
8321
8315 #, python-format
8322 #, python-format
8316 msgid "pulling subrepo %s\n"
8323 msgid "pulling subrepo %s\n"
8317 msgstr ""
8324 msgstr ""
8318
8325
8319 #, python-format
8326 #, python-format
8320 msgid "pushing subrepo %s\n"
8327 msgid "pushing subrepo %s\n"
8321 msgstr ""
8328 msgstr ""
8322
8329
8323 #, python-format
8330 #, python-format
8324 msgid "%s, line %s: %s\n"
8331 msgid "%s, line %s: %s\n"
8325 msgstr ""
8332 msgstr ""
8326
8333
8327 msgid "cannot parse entry"
8334 msgid "cannot parse entry"
8328 msgstr ""
8335 msgstr ""
8329
8336
8330 #, python-format
8337 #, python-format
8331 msgid "node '%s' is not well formed"
8338 msgid "node '%s' is not well formed"
8332 msgstr ""
8339 msgstr ""
8333
8340
8334 msgid "unmatched quotes"
8341 msgid "unmatched quotes"
8335 msgstr ""
8342 msgstr ""
8336
8343
8337 #, python-format
8344 #, python-format
8338 msgid "error expanding '%s%%%s'"
8345 msgid "error expanding '%s%%%s'"
8339 msgstr ""
8346 msgstr ""
8340
8347
8341 #, python-format
8348 #, python-format
8342 msgid "unknown filter '%s'"
8349 msgid "unknown filter '%s'"
8343 msgstr ""
8350 msgstr ""
8344
8351
8345 #, python-format
8352 #, python-format
8346 msgid "style not found: %s"
8353 msgid "style not found: %s"
8347 msgstr ""
8354 msgstr ""
8348
8355
8349 #, python-format
8356 #, python-format
8350 msgid "template file %s: %s"
8357 msgid "template file %s: %s"
8351 msgstr ""
8358 msgstr ""
8352
8359
8353 msgid "cannot use transaction when it is already committed/aborted"
8360 msgid "cannot use transaction when it is already committed/aborted"
8354 msgstr ""
8361 msgstr ""
8355
8362
8356 #, python-format
8363 #, python-format
8357 msgid "failed to truncate %s\n"
8364 msgid "failed to truncate %s\n"
8358 msgstr ""
8365 msgstr ""
8359
8366
8360 msgid "transaction abort!\n"
8367 msgid "transaction abort!\n"
8361 msgstr ""
8368 msgstr ""
8362
8369
8363 msgid "rollback completed\n"
8370 msgid "rollback completed\n"
8364 msgstr ""
8371 msgstr ""
8365
8372
8366 msgid "rollback failed - please run hg recover\n"
8373 msgid "rollback failed - please run hg recover\n"
8367 msgstr ""
8374 msgstr ""
8368
8375
8369 #, python-format
8376 #, python-format
8370 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8377 msgid "Not trusting file %s from untrusted user %s, group %s\n"
8371 msgstr ""
8378 msgstr ""
8372
8379
8373 #, python-format
8380 #, python-format
8374 msgid "Ignored: %s\n"
8381 msgid "Ignored: %s\n"
8375 msgstr ""
8382 msgstr ""
8376
8383
8377 #, python-format
8384 #, python-format
8378 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8385 msgid "ignoring untrusted configuration option %s.%s = %s\n"
8379 msgstr ""
8386 msgstr ""
8380
8387
8381 #, python-format
8388 #, python-format
8382 msgid "%s.%s not a boolean ('%s')"
8389 msgid "%s.%s not a boolean ('%s')"
8383 msgstr ""
8390 msgstr ""
8384
8391
8385 msgid "enter a commit username:"
8392 msgid "enter a commit username:"
8386 msgstr ""
8393 msgstr ""
8387
8394
8388 #, python-format
8395 #, python-format
8389 msgid "No username found, using '%s' instead\n"
8396 msgid "No username found, using '%s' instead\n"
8390 msgstr ""
8397 msgstr ""
8391
8398
8392 msgid "Please specify a username."
8399 msgid "Please specify a username."
8393 msgstr ""
8400 msgstr ""
8394
8401
8395 #, python-format
8402 #, python-format
8396 msgid "username %s contains a newline\n"
8403 msgid "username %s contains a newline\n"
8397 msgstr ""
8404 msgstr ""
8398
8405
8399 msgid "response expected"
8406 msgid "response expected"
8400 msgstr ""
8407 msgstr ""
8401
8408
8402 msgid "unrecognized response\n"
8409 msgid "unrecognized response\n"
8403 msgstr ""
8410 msgstr ""
8404
8411
8405 msgid "password: "
8412 msgid "password: "
8406 msgstr ""
8413 msgstr ""
8407
8414
8408 msgid "edit failed"
8415 msgid "edit failed"
8409 msgstr ""
8416 msgstr ""
8410
8417
8411 msgid "http authorization required"
8418 msgid "http authorization required"
8412 msgstr ""
8419 msgstr ""
8413
8420
8414 msgid "http authorization required\n"
8421 msgid "http authorization required\n"
8415 msgstr ""
8422 msgstr ""
8416
8423
8417 #, python-format
8424 #, python-format
8418 msgid "realm: %s\n"
8425 msgid "realm: %s\n"
8419 msgstr ""
8426 msgstr ""
8420
8427
8421 #, python-format
8428 #, python-format
8422 msgid "user: %s\n"
8429 msgid "user: %s\n"
8423 msgstr ""
8430 msgstr ""
8424
8431
8425 msgid "user:"
8432 msgid "user:"
8426 msgstr ""
8433 msgstr ""
8427
8434
8428 #, python-format
8435 #, python-format
8429 msgid "http auth: user %s, password %s\n"
8436 msgid "http auth: user %s, password %s\n"
8430 msgstr ""
8437 msgstr ""
8431
8438
8432 #, python-format
8439 #, python-format
8433 msgid "command '%s' failed: %s"
8440 msgid "command '%s' failed: %s"
8434 msgstr ""
8441 msgstr ""
8435
8442
8436 #, python-format
8443 #, python-format
8437 msgid "path contains illegal component: %s"
8444 msgid "path contains illegal component: %s"
8438 msgstr ""
8445 msgstr ""
8439
8446
8440 #, python-format
8447 #, python-format
8441 msgid "path %r is inside repo %r"
8448 msgid "path %r is inside repo %r"
8442 msgstr ""
8449 msgstr ""
8443
8450
8444 #, python-format
8451 #, python-format
8445 msgid "path %r traverses symbolic link %r"
8452 msgid "path %r traverses symbolic link %r"
8446 msgstr ""
8453 msgstr ""
8447
8454
8448 msgid "Hardlinks not supported"
8455 msgid "Hardlinks not supported"
8449 msgstr ""
8456 msgstr ""
8450
8457
8451 #, python-format
8458 #, python-format
8452 msgid "could not symlink to %r: %s"
8459 msgid "could not symlink to %r: %s"
8453 msgstr ""
8460 msgstr ""
8454
8461
8455 #, python-format
8462 #, python-format
8456 msgid "invalid date: %r "
8463 msgid "invalid date: %r "
8457 msgstr ""
8464 msgstr ""
8458
8465
8459 #, python-format
8466 #, python-format
8460 msgid "date exceeds 32 bits: %d"
8467 msgid "date exceeds 32 bits: %d"
8461 msgstr ""
8468 msgstr ""
8462
8469
8463 #, python-format
8470 #, python-format
8464 msgid "impossible time zone offset: %d"
8471 msgid "impossible time zone offset: %d"
8465 msgstr ""
8472 msgstr ""
8466
8473
8467 #, python-format
8474 #, python-format
8468 msgid "invalid day spec: %s"
8475 msgid "invalid day spec: %s"
8469 msgstr ""
8476 msgstr ""
8470
8477
8471 #, python-format
8478 #, python-format
8472 msgid "%.0f GB"
8479 msgid "%.0f GB"
8473 msgstr ""
8480 msgstr ""
8474
8481
8475 #, python-format
8482 #, python-format
8476 msgid "%.1f GB"
8483 msgid "%.1f GB"
8477 msgstr ""
8484 msgstr ""
8478
8485
8479 #, python-format
8486 #, python-format
8480 msgid "%.2f GB"
8487 msgid "%.2f GB"
8481 msgstr ""
8488 msgstr ""
8482
8489
8483 #, python-format
8490 #, python-format
8484 msgid "%.0f MB"
8491 msgid "%.0f MB"
8485 msgstr ""
8492 msgstr ""
8486
8493
8487 #, python-format
8494 #, python-format
8488 msgid "%.1f MB"
8495 msgid "%.1f MB"
8489 msgstr ""
8496 msgstr ""
8490
8497
8491 #, python-format
8498 #, python-format
8492 msgid "%.2f MB"
8499 msgid "%.2f MB"
8493 msgstr ""
8500 msgstr ""
8494
8501
8495 #, python-format
8502 #, python-format
8496 msgid "%.0f KB"
8503 msgid "%.0f KB"
8497 msgstr ""
8504 msgstr ""
8498
8505
8499 #, python-format
8506 #, python-format
8500 msgid "%.1f KB"
8507 msgid "%.1f KB"
8501 msgstr ""
8508 msgstr ""
8502
8509
8503 #, python-format
8510 #, python-format
8504 msgid "%.2f KB"
8511 msgid "%.2f KB"
8505 msgstr ""
8512 msgstr ""
8506
8513
8507 #, python-format
8514 #, python-format
8508 msgid "%.0f bytes"
8515 msgid "%.0f bytes"
8509 msgstr ""
8516 msgstr ""
8510
8517
8511 msgid "cannot verify bundle or remote repos"
8518 msgid "cannot verify bundle or remote repos"
8512 msgstr ""
8519 msgstr ""
8513
8520
8514 msgid "interrupted"
8521 msgid "interrupted"
8515 msgstr ""
8522 msgstr ""
8516
8523
8517 #, python-format
8524 #, python-format
8518 msgid "empty or missing %s"
8525 msgid "empty or missing %s"
8519 msgstr ""
8526 msgstr ""
8520
8527
8521 #, python-format
8528 #, python-format
8522 msgid "data length off by %d bytes"
8529 msgid "data length off by %d bytes"
8523 msgstr ""
8530 msgstr ""
8524
8531
8525 #, python-format
8532 #, python-format
8526 msgid "index contains %d extra bytes"
8533 msgid "index contains %d extra bytes"
8527 msgstr ""
8534 msgstr ""
8528
8535
8529 #, python-format
8536 #, python-format
8530 msgid "warning: `%s' uses revlog format 1"
8537 msgid "warning: `%s' uses revlog format 1"
8531 msgstr ""
8538 msgstr ""
8532
8539
8533 #, python-format
8540 #, python-format
8534 msgid "warning: `%s' uses revlog format 0"
8541 msgid "warning: `%s' uses revlog format 0"
8535 msgstr ""
8542 msgstr ""
8536
8543
8537 #, python-format
8544 #, python-format
8538 msgid "rev %d points to nonexistent changeset %d"
8545 msgid "rev %d points to nonexistent changeset %d"
8539 msgstr ""
8546 msgstr ""
8540
8547
8541 #, python-format
8548 #, python-format
8542 msgid "rev %d points to unexpected changeset %d"
8549 msgid "rev %d points to unexpected changeset %d"
8543 msgstr ""
8550 msgstr ""
8544
8551
8545 #, python-format
8552 #, python-format
8546 msgid " (expected %s)"
8553 msgid " (expected %s)"
8547 msgstr ""
8554 msgstr ""
8548
8555
8549 #, python-format
8556 #, python-format
8550 msgid "unknown parent 1 %s of %s"
8557 msgid "unknown parent 1 %s of %s"
8551 msgstr ""
8558 msgstr ""
8552
8559
8553 #, python-format
8560 #, python-format
8554 msgid "unknown parent 2 %s of %s"
8561 msgid "unknown parent 2 %s of %s"
8555 msgstr ""
8562 msgstr ""
8556
8563
8557 #, python-format
8564 #, python-format
8558 msgid "checking parents of %s"
8565 msgid "checking parents of %s"
8559 msgstr ""
8566 msgstr ""
8560
8567
8561 #, python-format
8568 #, python-format
8562 msgid "duplicate revision %d (%d)"
8569 msgid "duplicate revision %d (%d)"
8563 msgstr ""
8570 msgstr ""
8564
8571
8565 #, python-format
8572 #, python-format
8566 msgid "repository uses revlog format %d\n"
8573 msgid "repository uses revlog format %d\n"
8567 msgstr ""
8574 msgstr "arkivet använder revlog-format %d\n"
8568
8575
8569 msgid "checking changesets\n"
8576 msgid "checking changesets\n"
8570 msgstr ""
8577 msgstr "kontrollerar ändringar\n"
8571
8578
8572 #, python-format
8579 #, python-format
8573 msgid "unpacking changeset %s"
8580 msgid "unpacking changeset %s"
8574 msgstr ""
8581 msgstr ""
8575
8582
8576 msgid "checking manifests\n"
8583 msgid "checking manifests\n"
8577 msgstr ""
8584 msgstr "kontrollerar manifest\n"
8578
8585
8579 #, python-format
8586 #, python-format
8580 msgid "%s not in changesets"
8587 msgid "%s not in changesets"
8581 msgstr ""
8588 msgstr ""
8582
8589
8583 msgid "file without name in manifest"
8590 msgid "file without name in manifest"
8584 msgstr ""
8591 msgstr ""
8585
8592
8586 #, python-format
8593 #, python-format
8587 msgid "reading manifest delta %s"
8594 msgid "reading manifest delta %s"
8588 msgstr ""
8595 msgstr ""
8589
8596
8590 msgid "crosschecking files in changesets and manifests\n"
8597 msgid "crosschecking files in changesets and manifests\n"
8591 msgstr ""
8598 msgstr "korskontrollerar filer i ändringar och manifest\n"
8592
8599
8593 #, python-format
8600 #, python-format
8594 msgid "changeset refers to unknown manifest %s"
8601 msgid "changeset refers to unknown manifest %s"
8595 msgstr ""
8602 msgstr ""
8596
8603
8597 msgid "in changeset but not in manifest"
8604 msgid "in changeset but not in manifest"
8598 msgstr ""
8605 msgstr ""
8599
8606
8600 msgid "in manifest but not in changeset"
8607 msgid "in manifest but not in changeset"
8601 msgstr ""
8608 msgstr ""
8602
8609
8603 msgid "checking files\n"
8610 msgid "checking files\n"
8604 msgstr ""
8611 msgstr "kontrollerar filer\n"
8605
8612
8606 #, python-format
8613 #, python-format
8607 msgid "cannot decode filename '%s'"
8614 msgid "cannot decode filename '%s'"
8608 msgstr ""
8615 msgstr ""
8609
8616
8610 #, python-format
8617 #, python-format
8611 msgid "broken revlog! (%s)"
8618 msgid "broken revlog! (%s)"
8612 msgstr ""
8619 msgstr ""
8613
8620
8614 msgid "missing revlog!"
8621 msgid "missing revlog!"
8615 msgstr ""
8622 msgstr ""
8616
8623
8617 #, python-format
8624 #, python-format
8618 msgid "%s not in manifests"
8625 msgid "%s not in manifests"
8619 msgstr ""
8626 msgstr ""
8620
8627
8621 #, python-format
8628 #, python-format
8622 msgid "unpacked size is %s, %s expected"
8629 msgid "unpacked size is %s, %s expected"
8623 msgstr ""
8630 msgstr ""
8624
8631
8625 #, python-format
8632 #, python-format
8626 msgid "unpacking %s"
8633 msgid "unpacking %s"
8627 msgstr ""
8634 msgstr ""
8628
8635
8629 #, python-format
8636 #, python-format
8630 msgid "warning: copy source of '%s' not in parents of %s"
8637 msgid "warning: copy source of '%s' not in parents of %s"
8631 msgstr ""
8638 msgstr ""
8632
8639
8633 #, python-format
8640 #, python-format
8634 msgid "empty or missing copy source revlog %s:%s"
8641 msgid "empty or missing copy source revlog %s:%s"
8635 msgstr ""
8642 msgstr ""
8636
8643
8637 #, python-format
8644 #, python-format
8638 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
8645 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
8639 msgstr ""
8646 msgstr ""
8640
8647
8641 #, python-format
8648 #, python-format
8642 msgid "checking rename of %s"
8649 msgid "checking rename of %s"
8643 msgstr ""
8650 msgstr ""
8644
8651
8645 #, python-format
8652 #, python-format
8646 msgid "%s in manifests not found"
8653 msgid "%s in manifests not found"
8647 msgstr ""
8654 msgstr ""
8648
8655
8649 #, python-format
8656 #, python-format
8650 msgid "warning: orphan revlog '%s'"
8657 msgid "warning: orphan revlog '%s'"
8651 msgstr ""
8658 msgstr ""
8652
8659
8653 #, python-format
8660 #, python-format
8654 msgid "%d files, %d changesets, %d total revisions\n"
8661 msgid "%d files, %d changesets, %d total revisions\n"
8655 msgstr ""
8662 msgstr "%d filer, %d ändringar, %d totala revisioner\n"
8656
8663
8657 #, python-format
8664 #, python-format
8658 msgid "%d warnings encountered!\n"
8665 msgid "%d warnings encountered!\n"
8659 msgstr ""
8666 msgstr ""
8660
8667
8661 #, python-format
8668 #, python-format
8662 msgid "%d integrity errors encountered!\n"
8669 msgid "%d integrity errors encountered!\n"
8663 msgstr ""
8670 msgstr ""
8664
8671
8665 #, python-format
8672 #, python-format
8666 msgid "(first damaged changeset appears to be %d)\n"
8673 msgid "(first damaged changeset appears to be %d)\n"
8667 msgstr ""
8674 msgstr ""
8668
8675
8669 msgid "user name not available - set USERNAME environment variable"
8676 msgid "user name not available - set USERNAME environment variable"
8670 msgstr ""
8677 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now