##// END OF EJS Templates
i18n-sv: split messages into paragraphs
Martin Geisler -
r11399:0ebc8be6 default
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (6478 lines changed) Show them Hide them
@@ -31,62 +31,72 b' msgstr "Flaggor"'
31 31 msgid "Commands"
32 32 msgstr "Kommandon"
33 33
34 msgid ""
35 " options:\n"
36 "\n"
37 msgstr ""
38 " flaggor:\n"
39 "\n"
40
41 #, python-format
42 msgid ""
43 " aliases: %s\n"
44 "\n"
45 msgstr ""
46 " alias: %s\n"
47 "\n"
48
49 msgid ""
50 "hooks for controlling repository access\n"
51 "\n"
34 msgid " options:"
35 msgstr " flaggor:"
36
37 #, python-format
38 msgid " aliases: %s"
39 msgstr " alias: %s"
40
41 msgid "hooks for controlling repository access"
42 msgstr ""
43
44 msgid ""
52 45 "This hook makes it possible to allow or deny write access to portions\n"
53 "of a repository when receiving incoming changesets.\n"
54 "\n"
46 "of a repository when receiving incoming changesets."
47 msgstr ""
48
49 msgid ""
55 50 "The authorization is matched based on the local user name on the\n"
56 51 "system where the hook runs, and not the committer of the original\n"
57 "changeset (since the latter is merely informative).\n"
58 "\n"
52 "changeset (since the latter is merely informative)."
53 msgstr ""
54
55 msgid ""
59 56 "The acl hook is best used along with a restricted shell like hgsh,\n"
60 57 "preventing authenticating users from doing anything other than\n"
61 58 "pushing or pulling. The hook is not safe to use if users have\n"
62 59 "interactive shell access, as they can then disable the hook.\n"
63 60 "Nor is it safe if remote users share an account, because then there\n"
64 "is no way to distinguish them.\n"
65 "\n"
66 "To use this hook, configure the acl extension in your hgrc like this::\n"
67 "\n"
61 "is no way to distinguish them."
62 msgstr ""
63
64 msgid "To use this hook, configure the acl extension in your hgrc like this::"
65 msgstr ""
66
67 msgid ""
68 68 " [extensions]\n"
69 " acl =\n"
70 "\n"
69 " acl ="
70 msgstr ""
71
72 msgid ""
71 73 " [hooks]\n"
72 " pretxnchangegroup.acl = python:hgext.acl.hook\n"
73 "\n"
74 " pretxnchangegroup.acl = python:hgext.acl.hook"
75 msgstr ""
76
77 msgid ""
74 78 " [acl]\n"
75 79 " # Check whether the source of incoming changes is in this list\n"
76 80 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
77 " sources = serve\n"
78 "\n"
81 " sources = serve"
82 msgstr ""
83
84 msgid ""
79 85 "The allow and deny sections take a subtree pattern as key (with a glob\n"
80 86 "syntax by default), and a comma separated list of users as the\n"
81 87 "corresponding value. The deny list is checked before the allow list\n"
82 "is. ::\n"
83 "\n"
88 "is. ::"
89 msgstr ""
90
91 msgid ""
84 92 " [acl.allow]\n"
85 93 " # If acl.allow is not present, all users are allowed by default.\n"
86 94 " # An empty acl.allow section means no users allowed.\n"
87 95 " docs/** = doc_writer\n"
88 " .hgtags = release_engineer\n"
89 "\n"
96 " .hgtags = release_engineer"
97 msgstr ""
98
99 msgid ""
90 100 " [acl.deny]\n"
91 101 " # If acl.deny is not present, no users are refused by default.\n"
92 102 " # An empty acl.deny section means all users allowed.\n"
@@ -102,38 +112,47 b' msgstr ""'
102 112 msgid "acl: access denied for changeset %s"
103 113 msgstr ""
104 114
105 msgid ""
106 "track a line of development with movable markers\n"
107 "\n"
115 msgid "track a line of development with movable markers"
116 msgstr ""
117
118 msgid ""
108 119 "Bookmarks are local movable markers to changesets. Every bookmark\n"
109 120 "points to a changeset identified by its hash. If you commit a\n"
110 121 "changeset that is based on a changeset that has a bookmark on it, the\n"
111 "bookmark shifts to the new changeset.\n"
112 "\n"
122 "bookmark shifts to the new changeset."
123 msgstr ""
124
125 msgid ""
113 126 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
114 "merge, hg update).\n"
115 "\n"
127 "merge, hg update)."
128 msgstr ""
129
130 msgid ""
116 131 "By default, when several bookmarks point to the same changeset, they\n"
117 132 "will all move forward together. It is possible to obtain a more\n"
118 133 "git-like experience by adding the following configuration option to\n"
119 "your .hgrc::\n"
120 "\n"
134 "your .hgrc::"
135 msgstr ""
136
137 msgid ""
121 138 " [bookmarks]\n"
122 " track.current = True\n"
123 "\n"
139 " track.current = True"
140 msgstr ""
141
142 msgid ""
124 143 "This will cause Mercurial to track the bookmark that you are currently\n"
125 144 "using, and only update it. This is similar to git's approach to\n"
126 145 "branching.\n"
127 146 msgstr ""
128 147
129 148 msgid ""
130 "track a line of development with movable markers\n"
131 "\n"
132 149 " Bookmarks are pointers to certain commits that move when\n"
133 150 " committing. Bookmarks are local. They can be renamed, copied and\n"
134 151 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
135 " 'hg update' to merge and update respectively to a given bookmark.\n"
136 "\n"
152 " 'hg update' to merge and update respectively to a given bookmark."
153 msgstr ""
154
155 msgid ""
137 156 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
138 157 " directory's parent revision with the given name. If you specify\n"
139 158 " a revision using -r REV (where REV may be an existing bookmark),\n"
@@ -177,117 +196,171 b' msgstr ""'
177 196 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
178 197 msgstr ""
179 198
180 msgid ""
181 "hooks for integrating with the Bugzilla bug tracker\n"
182 "\n"
199 msgid "hooks for integrating with the Bugzilla bug tracker"
200 msgstr ""
201
202 msgid ""
183 203 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
184 204 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
185 "bug status.\n"
186 "\n"
205 "bug status."
206 msgstr ""
207
208 msgid ""
187 209 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
188 "installations using MySQL are supported.\n"
189 "\n"
210 "installations using MySQL are supported."
211 msgstr ""
212
213 msgid ""
190 214 "The hook relies on a Bugzilla script to send bug change notification\n"
191 215 "emails. That script changes between Bugzilla versions; the\n"
192 216 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
193 217 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
194 218 "be run by Mercurial as the user pushing the change; you will need to\n"
195 "ensure the Bugzilla install file permissions are set appropriately.\n"
196 "\n"
219 "ensure the Bugzilla install file permissions are set appropriately."
220 msgstr ""
221
222 msgid ""
197 223 "The extension is configured through three different configuration\n"
198 "sections. These keys are recognized in the [bugzilla] section:\n"
199 "\n"
224 "sections. These keys are recognized in the [bugzilla] section:"
225 msgstr ""
226
227 msgid ""
200 228 "host\n"
201 " Hostname of the MySQL server holding the Bugzilla database.\n"
202 "\n"
229 " Hostname of the MySQL server holding the Bugzilla database."
230 msgstr ""
231
232 msgid ""
203 233 "db\n"
204 " Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
205 "\n"
234 " Name of the Bugzilla database in MySQL. Default 'bugs'."
235 msgstr ""
236
237 msgid ""
206 238 "user\n"
207 " Username to use to access MySQL server. Default 'bugs'.\n"
208 "\n"
239 " Username to use to access MySQL server. Default 'bugs'."
240 msgstr ""
241
242 msgid ""
209 243 "password\n"
210 " Password to use to access MySQL server.\n"
211 "\n"
244 " Password to use to access MySQL server."
245 msgstr ""
246
247 msgid ""
212 248 "timeout\n"
213 " Database connection timeout (seconds). Default 5.\n"
214 "\n"
249 " Database connection timeout (seconds). Default 5."
250 msgstr ""
251
252 msgid ""
215 253 "version\n"
216 254 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
217 255 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
218 " to 2.18.\n"
219 "\n"
256 " to 2.18."
257 msgstr ""
258
259 msgid ""
220 260 "bzuser\n"
221 261 " Fallback Bugzilla user name to record comments with, if changeset\n"
222 " committer cannot be found as a Bugzilla user.\n"
223 "\n"
262 " committer cannot be found as a Bugzilla user."
263 msgstr ""
264
265 msgid ""
224 266 "bzdir\n"
225 267 " Bugzilla install directory. Used by default notify. Default\n"
226 " '/var/www/html/bugzilla'.\n"
227 "\n"
268 " '/var/www/html/bugzilla'."
269 msgstr ""
270
271 msgid ""
228 272 "notify\n"
229 273 " The command to run to get Bugzilla to send bug change notification\n"
230 274 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
231 275 " and 'user' (committer bugzilla email). Default depends on version;\n"
232 276 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
233 " %(id)s %(user)s\".\n"
234 "\n"
277 " %(id)s %(user)s\"."
278 msgstr ""
279
280 msgid ""
235 281 "regexp\n"
236 282 " Regular expression to match bug IDs in changeset commit message.\n"
237 283 " Must contain one \"()\" group. The default expression matches 'Bug\n"
238 284 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
239 " 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
240 "\n"
285 " 1234 and 5678' and variations thereof. Matching is case insensitive."
286 msgstr ""
287
288 msgid ""
241 289 "style\n"
242 " The style file to use when formatting comments.\n"
243 "\n"
290 " The style file to use when formatting comments."
291 msgstr ""
292
293 msgid ""
244 294 "template\n"
245 295 " Template to use when formatting comments. Overrides style if\n"
246 296 " specified. In addition to the usual Mercurial keywords, the\n"
247 " extension specifies::\n"
248 "\n"
297 " extension specifies::"
298 msgstr ""
299
300 msgid ""
249 301 " {bug} The Bugzilla bug ID.\n"
250 302 " {root} The full pathname of the Mercurial repository.\n"
251 303 " {webroot} Stripped pathname of the Mercurial repository.\n"
252 " {hgweb} Base URL for browsing Mercurial repositories.\n"
253 "\n"
304 " {hgweb} Base URL for browsing Mercurial repositories."
305 msgstr ""
306
307 msgid ""
254 308 " Default 'changeset {node|short} in repo {root} refers '\n"
255 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
256 "\n"
309 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
310 msgstr ""
311
312 msgid ""
257 313 "strip\n"
258 314 " The number of slashes to strip from the front of {root} to produce\n"
259 " {webroot}. Default 0.\n"
260 "\n"
315 " {webroot}. Default 0."
316 msgstr ""
317
318 msgid ""
261 319 "usermap\n"
262 320 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
263 321 " mappings. If specified, the file should contain one mapping per\n"
264 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
265 "\n"
322 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
323 msgstr ""
324
325 msgid ""
266 326 "The [usermap] section is used to specify mappings of Mercurial\n"
267 327 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
268 "\"committer\"=\"Bugzilla user\"\n"
269 "\n"
270 "Finally, the [web] section supports one entry:\n"
271 "\n"
328 "\"committer\"=\"Bugzilla user\""
329 msgstr ""
330
331 msgid "Finally, the [web] section supports one entry:"
332 msgstr ""
333
334 msgid ""
272 335 "baseurl\n"
273 336 " Base URL for browsing Mercurial repositories. Reference from\n"
274 " templates as {hgweb}.\n"
275 "\n"
276 "Activating the extension::\n"
277 "\n"
337 " templates as {hgweb}."
338 msgstr ""
339
340 msgid "Activating the extension::"
341 msgstr ""
342
343 msgid ""
278 344 " [extensions]\n"
279 " bugzilla =\n"
280 "\n"
345 " bugzilla ="
346 msgstr ""
347
348 msgid ""
281 349 " [hooks]\n"
282 350 " # run bugzilla hook on every change pulled or pushed in here\n"
283 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
284 "\n"
285 "Example configuration:\n"
286 "\n"
351 " incoming.bugzilla = python:hgext.bugzilla.hook"
352 msgstr ""
353
354 msgid "Example configuration:"
355 msgstr ""
356
357 msgid ""
287 358 "This example configuration is for a collection of Mercurial\n"
288 359 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
289 "installation in /opt/bugzilla-3.2. ::\n"
290 "\n"
360 "installation in /opt/bugzilla-3.2. ::"
361 msgstr ""
362
363 msgid ""
291 364 " [bugzilla]\n"
292 365 " host=localhost\n"
293 366 " password=XYZZY\n"
@@ -297,20 +370,28 b' msgid ""'
297 370 " template=Changeset {node|short} in {root|basename}.\n"
298 371 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
299 372 " {desc}\\n\n"
300 " strip=5\n"
301 "\n"
373 " strip=5"
374 msgstr ""
375
376 msgid ""
302 377 " [web]\n"
303 " baseurl=http://dev.domain.com/hg\n"
304 "\n"
378 " baseurl=http://dev.domain.com/hg"
379 msgstr ""
380
381 msgid ""
305 382 " [usermap]\n"
306 " user@emaildomain.com=user.name@bugzilladomain.com\n"
307 "\n"
308 "Commits add a comment to the Bugzilla bug record of the form::\n"
309 "\n"
383 " user@emaildomain.com=user.name@bugzilladomain.com"
384 msgstr ""
385
386 msgid "Commits add a comment to the Bugzilla bug record of the form::"
387 msgstr ""
388
389 msgid ""
310 390 " Changeset 3b16791d6642 in repository-name.\n"
311 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
312 "\n"
313 " Changeset commit comment. Bug 1234.\n"
391 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
392 msgstr ""
393
394 msgid " Changeset commit comment. Bug 1234.\n"
314 395 msgstr ""
315 396
316 397 #, python-format
@@ -387,9 +468,10 b' msgstr ""'
387 468 msgid "command to display child changesets"
388 469 msgstr ""
389 470
390 msgid ""
391 "show the children of the given or working directory revision\n"
392 "\n"
471 msgid "show the children of the given or working directory revision"
472 msgstr ""
473
474 msgid ""
393 475 " Print the children of the working directory's revisions. If a\n"
394 476 " revision is given via -r/--rev, the children of that revision will\n"
395 477 " be printed. If a file argument is given, revision in which the\n"
@@ -414,38 +496,55 b' msgstr ""'
414 496 msgid "analyzing"
415 497 msgstr "analyserar"
416 498
417 msgid ""
418 "histogram of changes to the repository\n"
419 "\n"
499 msgid "histogram of changes to the repository"
500 msgstr ""
501
502 msgid ""
420 503 " This command will display a histogram representing the number\n"
421 504 " of changed lines or revisions, grouped according to the given\n"
422 505 " template. The default template will group changes by author.\n"
423 506 " The --dateformat option may be used to group the results by\n"
424 " date instead.\n"
425 "\n"
507 " date instead."
508 msgstr ""
509
510 msgid ""
426 511 " Statistics are based on the number of changed lines, or\n"
427 512 " alternatively the number of matching revisions if the\n"
428 " --changesets option is specified.\n"
429 "\n"
430 " Examples::\n"
431 "\n"
513 " --changesets option is specified."
514 msgstr ""
515
516 msgid " Examples::"
517 msgstr ""
518
519 msgid ""
432 520 " # display count of changed lines for every committer\n"
433 " hg churn -t '{author|email}'\n"
434 "\n"
521 " hg churn -t '{author|email}'"
522 msgstr ""
523
524 msgid ""
435 525 " # display daily activity graph\n"
436 " hg churn -f '%H' -s -c\n"
437 "\n"
526 " hg churn -f '%H' -s -c"
527 msgstr ""
528
529 msgid ""
438 530 " # display activity of developers by month\n"
439 " hg churn -f '%Y-%m' -s -c\n"
440 "\n"
531 " hg churn -f '%Y-%m' -s -c"
532 msgstr ""
533
534 msgid ""
441 535 " # display count of lines changed in every year\n"
442 " hg churn -f '%Y' -s\n"
443 "\n"
536 " hg churn -f '%Y' -s"
537 msgstr ""
538
539 msgid ""
444 540 " It is possible to map alternate email addresses to a main address\n"
445 " by providing a file using the following format::\n"
446 "\n"
447 " <alias email> <actual email>\n"
448 "\n"
541 " by providing a file using the following format::"
542 msgstr ""
543
544 msgid " <alias email> <actual email>"
545 msgstr ""
546
547 msgid ""
449 548 " Such a file may be specified with the --aliases option, otherwise\n"
450 549 " a .hgchurn file will be looked for in the working directory root.\n"
451 550 " "
@@ -478,39 +577,72 b' msgstr ""'
478 577 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]"
479 578 msgstr "hg churn [-d DATUM] [-r REV] [--aliases FIL] [FIL]"
480 579
481 msgid ""
482 "colorize output from some commands\n"
483 "\n"
484 "This extension modifies the status and resolve commands to add color to "
485 "their\n"
580 msgid "colorize output from some commands"
581 msgstr "färglägg utmatning från vissa kommandon"
582
583 msgid ""
584 "This extension modifies the status and resolve commands to add color to their\n"
486 585 "output to reflect file status, the qseries command to add color to reflect\n"
487 586 "patch status (applied, unapplied, missing), and to diff-related\n"
488 587 "commands to highlight additions, removals, diff headers, and trailing\n"
489 "whitespace.\n"
490 "\n"
588 "whitespace."
589 msgstr ""
590 "Denna utökning modifierar kommandona status och resolve för att färglägga\n"
591 "deras utmaning för att spegla filstatus, qseries-kommandon för att\n"
592 "färglägga patchstatus (applicerad, oapplicerad, saknad), och till\n"
593 "diff-relaterade kommandon för att framhäva additioner, borttagningar,\n"
594 "diffhuvuden, och eftersläpande blanktecken."
595
596 msgid ""
491 597 "Other effects in addition to color, like bold and underlined text, are\n"
492 598 "also available. Effects are rendered with the ECMA-48 SGR control\n"
493 599 "function (aka ANSI escape codes). This module also provides the\n"
494 "render_text function, which can be used to add effects to any text.\n"
495 "\n"
496 "Default effects may be overridden from the .hgrc file::\n"
497 "\n"
600 "render_text function, which can be used to add effects to any text."
601 msgstr ""
602 "Andra effekter förutom färg, såsom fet och understryken text, är också\n"
603 "tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n"
604 "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n"
605 "render_text, som kan användas för att lägga till effekter på valfri text."
606
607 msgid "Default effects may be overridden from the .hgrc file::"
608 msgstr "Standardeffekter kan ersättas från .hgrc-filen::"
609
610 msgid ""
498 611 " [color]\n"
499 612 " status.modified = blue bold underline red_background\n"
500 613 " status.added = green bold\n"
501 614 " status.removed = red bold blue_background\n"
502 615 " status.deleted = cyan bold underline\n"
503 616 " status.unknown = magenta bold underline\n"
504 " status.ignored = black bold\n"
505 "\n"
617 " status.ignored = black bold"
618 msgstr ""
619 " [color]\n"
620 " status.modified = blue bold underline red_background\n"
621 " status.added = green bold\n"
622 " status.removed = red bold blue_background\n"
623 " status.deleted = cyan bold underline\n"
624 " status.unknown = magenta bold underline\n"
625 " status.ignored = black bold"
626
627 msgid ""
506 628 " # 'none' turns off all effects\n"
507 629 " status.clean = none\n"
508 " status.copied = none\n"
509 "\n"
630 " status.copied = none"
631 msgstr ""
632 " # 'none' stänger av alla effekter\n"
633 " status.clean = none\n"
634 " status.copied = none"
635
636 msgid ""
510 637 " qseries.applied = blue bold underline\n"
511 638 " qseries.unapplied = black bold\n"
512 " qseries.missing = red bold\n"
513 "\n"
639 " qseries.missing = red bold"
640 msgstr ""
641 " qseries.applied = blue bold underline\n"
642 " qseries.unapplied = black bold\n"
643 " qseries.missing = red bold"
644
645 msgid ""
514 646 " diff.diffline = bold\n"
515 647 " diff.extended = cyan bold\n"
516 648 " diff.file_a = red bold\n"
@@ -519,53 +651,8 b' msgid ""'
519 651 " diff.deleted = red\n"
520 652 " diff.inserted = green\n"
521 653 " diff.changed = white\n"
522 " diff.trailingwhitespace = bold red_background\n"
523 "\n"
524 " resolve.unresolved = red bold\n"
525 " resolve.resolved = green bold\n"
526 "\n"
527 " bookmarks.current = green\n"
528 "\n"
529 "The color extension will try to detect whether to use ANSI codes or\n"
530 "Win32 console APIs, unless it is made explicit::\n"
531 "\n"
532 " [color]\n"
533 " mode = ansi\n"
534 "\n"
535 "Any value other than 'ansi', 'win32', or 'auto' will disable color.\n"
536 "\n"
537 msgstr ""
538 "färglägg utmatning från vissa kommandon\n"
539 "\n"
540 "Denna utökning modifierar kommandona status och resolve för att färglägga\n"
541 "deras utmaning för att spegla filstatus, qseries-kommandon för att\n"
542 "färglägga patchstatus (applicerad, oapplicerad, saknad), och till\n"
543 "diff-relaterade kommandon för att framhäva additioner, borttagningar,\n"
544 "diffhuvuden, och eftersläpande blanktecken.\n"
545 "\n"
546 "Andra effekter förutom färg, såsom fet och understryken text, är också\n"
547 "tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n"
548 "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n"
549 "render_text, som kan användas för att lägga till effekter på valfri text.\n"
550 "\n"
551 "Standardeffekter kan ersättas från .hgrc-filen::\n"
552 "\n"
553 " [color]\n"
554 " status.modified = blue bold underline red_background\n"
555 " status.added = green bold\n"
556 " status.removed = red bold blue_background\n"
557 " status.deleted = cyan bold underline\n"
558 " status.unknown = magenta bold underline\n"
559 " status.ignored = black bold\n"
560 "\n"
561 " # 'none' stänger av alla effekter\n"
562 " status.clean = none\n"
563 " status.copied = none\n"
564 "\n"
565 " qseries.applied = blue bold underline\n"
566 " qseries.unapplied = black bold\n"
567 " qseries.missing = red bold\n"
568 "\n"
654 " diff.trailingwhitespace = bold red_background"
655 msgstr ""
569 656 " diff.diffline = bold\n"
570 657 " diff.extended = cyan bold\n"
571 658 " diff.file_a = red bold\n"
@@ -574,21 +661,34 b' msgstr ""'
574 661 " diff.deleted = red\n"
575 662 " diff.inserted = green\n"
576 663 " diff.changed = white\n"
577 " diff.trailingwhitespace = bold red_background\n"
578 "\n"
664 " diff.trailingwhitespace = bold red_background"
665
666 msgid ""
667 " resolve.unresolved = red bold\n"
668 " resolve.resolved = green bold"
669 msgstr ""
579 670 " resolve.unresolved = red bold\n"
580 " resolve.resolved = green bold\n"
581 "\n"
582 " bookmarks.current = green\n"
583 "\n"
671 " resolve.resolved = green bold"
672
673 msgid " bookmarks.current = green"
674 msgstr " bookmarks.current = green"
675
676 msgid ""
677 "The color extension will try to detect whether to use ANSI codes or\n"
678 "Win32 console APIs, unless it is made explicit::"
679 msgstr ""
584 680 "Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n"
585 "konsolen i Win32 om det inte anges explicit::\n"
586 "\n"
681 "konsolen i Win32 om det inte anges explicit::"
682
683 msgid ""
587 684 " [color]\n"
588 " mode = ansi\n"
589 "\n"
590 "Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg.\n"
591 "\n"
685 " mode = ansi"
686 msgstr ""
687 " [color]\n"
688 " mode = ansi"
689
690 msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
691 msgstr "Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg."
592 692
593 693 #, python-format
594 694 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
@@ -603,11 +703,13 b' msgstr "n\xc3\xa4r f\xc3\xa4rgl\xc3\xa4ggning ska ske (always, auto eller never)"'
603 703 msgid "import revisions from foreign VCS repositories into Mercurial"
604 704 msgstr ""
605 705
606 msgid ""
607 "convert a foreign SCM repository to a Mercurial one.\n"
608 "\n"
609 " Accepted source formats [identifiers]:\n"
610 "\n"
706 msgid "convert a foreign SCM repository to a Mercurial one."
707 msgstr ""
708
709 msgid " Accepted source formats [identifiers]:"
710 msgstr ""
711
712 msgid ""
611 713 " - Mercurial [hg]\n"
612 714 " - CVS [cvs]\n"
613 715 " - Darcs [darcs]\n"
@@ -616,72 +718,103 b' msgid ""'
616 718 " - Monotone [mtn]\n"
617 719 " - GNU Arch [gnuarch]\n"
618 720 " - Bazaar [bzr]\n"
619 " - Perforce [p4]\n"
620 "\n"
621 " Accepted destination formats [identifiers]:\n"
622 "\n"
721 " - Perforce [p4]"
722 msgstr ""
723
724 msgid " Accepted destination formats [identifiers]:"
725 msgstr ""
726
727 msgid ""
623 728 " - Mercurial [hg]\n"
624 " - Subversion [svn] (history on branches is not preserved)\n"
625 "\n"
729 " - Subversion [svn] (history on branches is not preserved)"
730 msgstr ""
731
732 msgid ""
626 733 " If no revision is given, all revisions will be converted.\n"
627 734 " Otherwise, convert will only import up to the named revision\n"
628 " (given in a format understood by the source).\n"
629 "\n"
735 " (given in a format understood by the source)."
736 msgstr ""
737
738 msgid ""
630 739 " If no destination directory name is specified, it defaults to the\n"
631 740 " basename of the source with '-hg' appended. If the destination\n"
632 " repository doesn't exist, it will be created.\n"
633 "\n"
741 " repository doesn't exist, it will be created."
742 msgstr ""
743
744 msgid ""
634 745 " By default, all sources except Mercurial will use --branchsort.\n"
635 746 " Mercurial uses --sourcesort to preserve original revision numbers\n"
636 " order. Sort modes have the following effects:\n"
637 "\n"
747 " order. Sort modes have the following effects:"
748 msgstr ""
749
750 msgid ""
638 751 " --branchsort convert from parent to child revision when possible,\n"
639 752 " which means branches are usually converted one after\n"
640 " the other. It generates more compact repositories.\n"
641 "\n"
753 " the other. It generates more compact repositories."
754 msgstr ""
755
756 msgid ""
642 757 " --datesort sort revisions by date. Converted repositories have\n"
643 758 " good-looking changelogs but are often an order of\n"
644 759 " magnitude larger than the same ones generated by\n"
645 " --branchsort.\n"
646 "\n"
760 " --branchsort."
761 msgstr ""
762
763 msgid ""
647 764 " --sourcesort try to preserve source revisions order, only\n"
648 " supported by Mercurial sources.\n"
649 "\n"
765 " supported by Mercurial sources."
766 msgstr ""
767
768 msgid ""
650 769 " If <REVMAP> isn't given, it will be put in a default location\n"
651 770 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
652 771 " that maps each source commit ID to the destination ID for that\n"
653 " revision, like so::\n"
654 "\n"
655 " <source ID> <destination ID>\n"
656 "\n"
772 " revision, like so::"
773 msgstr ""
774
775 msgid " <source ID> <destination ID>"
776 msgstr ""
777
778 msgid ""
657 779 " If the file doesn't exist, it's automatically created. It's\n"
658 780 " updated on each commit copied, so convert-repo can be interrupted\n"
659 " and can be run repeatedly to copy new commits.\n"
660 "\n"
781 " and can be run repeatedly to copy new commits."
782 msgstr ""
783
784 msgid ""
661 785 " The [username mapping] file is a simple text file that maps each\n"
662 786 " source commit author to a destination commit author. It is handy\n"
663 787 " for source SCMs that use unix logins to identify authors (eg:\n"
664 788 " CVS). One line per author mapping and the line format is:\n"
665 " srcauthor=whatever string you want\n"
666 "\n"
789 " srcauthor=whatever string you want"
790 msgstr ""
791
792 msgid ""
667 793 " The filemap is a file that allows filtering and remapping of files\n"
668 794 " and directories. Comment lines start with '#'. Each line can\n"
669 " contain one of the following directives::\n"
670 "\n"
671 " include path/to/file\n"
672 "\n"
673 " exclude path/to/file\n"
674 "\n"
675 " rename from/file to/file\n"
676 "\n"
795 " contain one of the following directives::"
796 msgstr ""
797
798 msgid " include path/to/file"
799 msgstr ""
800
801 msgid " exclude path/to/file"
802 msgstr ""
803
804 msgid " rename from/file to/file"
805 msgstr ""
806
807 msgid ""
677 808 " The 'include' directive causes a file, or all files under a\n"
678 809 " directory, to be included in the destination repository, and the\n"
679 810 " exclusion of all other files and directories not explicitly\n"
680 811 " included. The 'exclude' directive causes files or directories to\n"
681 812 " be omitted. The 'rename' directive renames a file or directory. To\n"
682 813 " rename from a subdirectory into the root of the repository, use\n"
683 " '.' as the path to rename to.\n"
684 "\n"
814 " '.' as the path to rename to."
815 msgstr ""
816
817 msgid ""
685 818 " The splicemap is a file that allows insertion of synthetic\n"
686 819 " history, letting you specify the parents of a revision. This is\n"
687 820 " useful if you want to e.g. give a Subversion merge two parents, or\n"
@@ -694,8 +827,10 b' msgid ""'
694 827 " should be used as the new parents for that node. For example, if\n"
695 828 " you have merged \"release-1.0\" into \"trunk\", then you should\n"
696 829 " specify the revision on \"trunk\" as the first parent and the one on\n"
697 " the \"release-1.0\" branch as the second.\n"
698 "\n"
830 " the \"release-1.0\" branch as the second."
831 msgstr ""
832
833 msgid ""
699 834 " The branchmap is a file that allows you to rename a branch when it is\n"
700 835 " being brought in from whatever external repository. When used in\n"
701 836 " conjunction with a splicemap, it allows for a powerful combination\n"
@@ -705,11 +840,15 b' msgid ""'
705 840 " \"original_branch_name\" is the name of the branch in the source\n"
706 841 " repository, and \"new_branch_name\" is the name of the branch is the\n"
707 842 " destination repository. This can be used to (for instance) move code\n"
708 " in one repository from \"default\" to a named branch.\n"
709 "\n"
843 " in one repository from \"default\" to a named branch."
844 msgstr ""
845
846 msgid ""
710 847 " Mercurial Source\n"
711 " ----------------\n"
712 "\n"
848 " ----------------"
849 msgstr ""
850
851 msgid ""
713 852 " --config convert.hg.ignoreerrors=False (boolean)\n"
714 853 " ignore integrity errors when reading. Use it to fix Mercurial\n"
715 854 " repositories with missing revlogs, by converting from and to\n"
@@ -718,11 +857,15 b' msgid ""'
718 857 " store original revision ID in changeset (forces target IDs to\n"
719 858 " change)\n"
720 859 " --config convert.hg.startrev=0 (hg revision identifier)\n"
721 " convert start revision and its descendants\n"
722 "\n"
860 " convert start revision and its descendants"
861 msgstr ""
862
863 msgid ""
723 864 " CVS Source\n"
724 " ----------\n"
725 "\n"
865 " ----------"
866 msgstr ""
867
868 msgid ""
726 869 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
727 870 " to indicate the starting point of what will be converted. Direct\n"
728 871 " access to the repository files is not needed, unless of course the\n"
@@ -731,10 +874,13 b' msgid ""'
731 874 " commands to find files to convert. This means that unless a\n"
732 875 " filemap is given, all files under the starting directory will be\n"
733 876 " converted, and that any directory reorganization in the CVS\n"
734 " sandbox is ignored.\n"
735 "\n"
736 " The options shown are the defaults.\n"
737 "\n"
877 " sandbox is ignored."
878 msgstr ""
879
880 msgid " The options shown are the defaults."
881 msgstr ""
882
883 msgid ""
738 884 " --config convert.cvsps.cache=True (boolean)\n"
739 885 " Set to False to disable remote log caching, for testing and\n"
740 886 " debugging purposes.\n"
@@ -761,16 +907,22 b' msgid ""'
761 907 " Specify a Python function to be called after the changesets\n"
762 908 " are calculated from the the CVS log. The function is passed\n"
763 909 " a list with the changeset entries, and can modify the changesets\n"
764 " in-place, or add or delete them.\n"
765 "\n"
910 " in-place, or add or delete them."
911 msgstr ""
912
913 msgid ""
766 914 " An additional \"debugcvsps\" Mercurial command allows the builtin\n"
767 915 " changeset merging code to be run without doing a conversion. Its\n"
768 916 " parameters and output are similar to that of cvsps 2.1. Please see\n"
769 " the command help for more details.\n"
770 "\n"
917 " the command help for more details."
918 msgstr ""
919
920 msgid ""
771 921 " Subversion Source\n"
772 " -----------------\n"
773 "\n"
922 " -----------------"
923 msgstr ""
924
925 msgid ""
774 926 " Subversion source detects classical trunk/branches/tags layouts.\n"
775 927 " By default, the supplied \"svn://repo/path/\" source URL is\n"
776 928 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
@@ -780,58 +932,80 b' msgid ""'
780 932 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
781 933 " can be overridden with following options. Set them to paths\n"
782 934 " relative to the source URL, or leave them blank to disable auto\n"
783 " detection.\n"
784 "\n"
935 " detection."
936 msgstr ""
937
938 msgid ""
785 939 " --config convert.svn.branches=branches (directory name)\n"
786 940 " specify the directory containing branches\n"
787 941 " --config convert.svn.tags=tags (directory name)\n"
788 942 " specify the directory containing tags\n"
789 943 " --config convert.svn.trunk=trunk (directory name)\n"
790 " specify the name of the trunk branch\n"
791 "\n"
944 " specify the name of the trunk branch"
945 msgstr ""
946
947 msgid ""
792 948 " Source history can be retrieved starting at a specific revision,\n"
793 949 " instead of being integrally converted. Only single branch\n"
794 " conversions are supported.\n"
795 "\n"
950 " conversions are supported."
951 msgstr ""
952
953 msgid ""
796 954 " --config convert.svn.startrev=0 (svn revision number)\n"
797 " specify start Subversion revision.\n"
798 "\n"
955 " specify start Subversion revision."
956 msgstr ""
957
958 msgid ""
799 959 " Perforce Source\n"
800 " ---------------\n"
801 "\n"
960 " ---------------"
961 msgstr ""
962
963 msgid ""
802 964 " The Perforce (P4) importer can be given a p4 depot path or a\n"
803 965 " client specification as source. It will convert all files in the\n"
804 966 " source to a flat Mercurial repository, ignoring labels, branches\n"
805 967 " and integrations. Note that when a depot path is given you then\n"
806 968 " usually should specify a target directory, because otherwise the\n"
807 " target may be named ...-hg.\n"
808 "\n"
969 " target may be named ...-hg."
970 msgstr ""
971
972 msgid ""
809 973 " It is possible to limit the amount of source history to be\n"
810 " converted by specifying an initial Perforce revision.\n"
811 "\n"
974 " converted by specifying an initial Perforce revision."
975 msgstr ""
976
977 msgid ""
812 978 " --config convert.p4.startrev=0 (perforce changelist number)\n"
813 " specify initial Perforce revision.\n"
814 "\n"
979 " specify initial Perforce revision."
980 msgstr ""
981
982 msgid ""
815 983 " Mercurial Destination\n"
816 " ---------------------\n"
817 "\n"
984 " ---------------------"
985 msgstr ""
986
987 msgid ""
818 988 " --config convert.hg.clonebranches=False (boolean)\n"
819 989 " dispatch source branches in separate clones.\n"
820 990 " --config convert.hg.tagsbranch=default (branch name)\n"
821 991 " tag revisions branch name\n"
822 992 " --config convert.hg.usebranchnames=True (boolean)\n"
823 " preserve branch names\n"
824 "\n"
825 " "
826 msgstr ""
827
828 msgid ""
829 "create changeset information from CVS\n"
830 "\n"
993 " preserve branch names"
994 msgstr ""
995
996 msgid " "
997 msgstr ""
998
999 msgid "create changeset information from CVS"
1000 msgstr ""
1001
1002 msgid ""
831 1003 " This command is intended as a debugging tool for the CVS to\n"
832 1004 " Mercurial converter, and can be used as a direct replacement for\n"
833 " cvsps.\n"
834 "\n"
1005 " cvsps."
1006 msgstr ""
1007
1008 msgid ""
835 1009 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
836 1010 " named directory) in the CVS repository, and converts the log to a\n"
837 1011 " series of changesets based on matching commit log entries and\n"
@@ -904,9 +1078,7 b' msgstr ""'
904 1078 msgid "hg debugcvsps [OPTION]... [PATH]..."
905 1079 msgstr ""
906 1080
907 msgid ""
908 "warning: lightweight checkouts may cause conversion failures, try with a "
909 "regular branch instead.\n"
1081 msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
910 1082 msgstr ""
911 1083
912 1084 msgid "bzr source type could not be determined\n"
@@ -1026,8 +1198,7 b' msgid "CVS pserver authentication failed'
1026 1198 msgstr ""
1027 1199
1028 1200 #, python-format
1029 msgid ""
1030 "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1201 msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1031 1202 msgstr ""
1032 1203
1033 1204 #, python-format
@@ -1136,8 +1307,7 b' msgid "analyzing tree version %s...\\n"'
1136 1307 msgstr ""
1137 1308
1138 1309 #, python-format
1139 msgid ""
1140 "tree analysis stopped because it points to an unregistered archive %s...\n"
1310 msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
1141 1311 msgstr ""
1142 1312
1143 1313 #, python-format
@@ -1187,9 +1357,7 b' msgstr ""'
1187 1357 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1188 1358 msgstr ""
1189 1359
1190 msgid ""
1191 "svn: cannot probe remote repository, assume it could be a subversion "
1192 "repository. Use --source-type if you know better.\n"
1360 msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n"
1193 1361 msgstr ""
1194 1362
1195 1363 msgid "Subversion python bindings could not be loaded"
@@ -1274,37 +1442,50 b' msgstr ""'
1274 1442 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1275 1443 msgstr ""
1276 1444
1277 msgid ""
1278 "command to allow external programs to compare revisions\n"
1279 "\n"
1445 msgid "command to allow external programs to compare revisions"
1446 msgstr ""
1447
1448 msgid ""
1280 1449 "The extdiff Mercurial extension allows you to use external programs\n"
1281 1450 "to compare revisions, or revision with working directory. The external\n"
1282 1451 "diff programs are called with a configurable set of options and two\n"
1283 1452 "non-option arguments: paths to directories containing snapshots of\n"
1284 "files to compare.\n"
1285 "\n"
1453 "files to compare."
1454 msgstr ""
1455
1456 msgid ""
1286 1457 "The extdiff extension also allows to configure new diff commands, so\n"
1287 "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
1288 "\n"
1458 "you do not need to type \"hg extdiff -p kdiff3\" always. ::"
1459 msgstr ""
1460
1461 msgid ""
1289 1462 " [extdiff]\n"
1290 1463 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1291 1464 " cdiff = gdiff -Nprc5\n"
1292 1465 " ## or the old way:\n"
1293 1466 " #cmd.cdiff = gdiff\n"
1294 " #opts.cdiff = -Nprc5\n"
1295 "\n"
1467 " #opts.cdiff = -Nprc5"
1468 msgstr ""
1469
1470 msgid ""
1296 1471 " # add new command called vdiff, runs kdiff3\n"
1297 " vdiff = kdiff3\n"
1298 "\n"
1472 " vdiff = kdiff3"
1473 msgstr ""
1474
1475 msgid ""
1299 1476 " # add new command called meld, runs meld (no need to name twice)\n"
1300 " meld =\n"
1301 "\n"
1477 " meld ="
1478 msgstr ""
1479
1480 msgid ""
1302 1481 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1303 1482 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1304 1483 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1305 1484 " # your .vimrc\n"
1306 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1307 "\n"
1485 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
1486 msgstr ""
1487
1488 msgid ""
1308 1489 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1309 1490 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1310 1491 "files, so running the external diff program will actually be pretty\n"
@@ -1325,18 +1506,23 b' msgstr ""'
1325 1506 msgid "cleaning up temp directory\n"
1326 1507 msgstr ""
1327 1508
1328 msgid ""
1329 "use external program to diff repository (or selected files)\n"
1330 "\n"
1509 msgid "use external program to diff repository (or selected files)"
1510 msgstr ""
1511
1512 msgid ""
1331 1513 " Show differences between revisions for the specified files, using\n"
1332 1514 " an external program. The default program used is diff, with\n"
1333 " default options \"-Npru\".\n"
1334 "\n"
1515 " default options \"-Npru\"."
1516 msgstr ""
1517
1518 msgid ""
1335 1519 " To select a different program, use the -p/--program option. The\n"
1336 1520 " program will be passed the names of two directories to compare. To\n"
1337 1521 " pass additional options to the program, use -o/--option. These\n"
1338 " will be passed before the names of the directories to compare.\n"
1339 "\n"
1522 " will be passed before the names of the directories to compare."
1523 msgstr ""
1524
1525 msgid ""
1340 1526 " When two revision arguments are given, then changes are shown\n"
1341 1527 " between those revisions. If only one revision is specified then\n"
1342 1528 " that revision is compared to the working directory, and, when no\n"
@@ -1357,17 +1543,13 b' msgid "hg extdiff [OPT]... [FILE]..."'
1357 1543 msgstr ""
1358 1544
1359 1545 #, python-format
1360 msgid ""
1361 "use %(path)s to diff repository (or selected files)\n"
1362 "\n"
1546 msgid "use %(path)s to diff repository (or selected files)"
1547 msgstr ""
1548
1549 #, python-format
1550 msgid ""
1363 1551 " Show differences between revisions for the specified files, using\n"
1364 " the %(path)s program.\n"
1365 "\n"
1366 " When two revision arguments are given, then changes are shown\n"
1367 " between those revisions. If only one revision is specified then\n"
1368 " that revision is compared to the working directory, and, when no\n"
1369 " revisions are specified, the working directory files are compared\n"
1370 " to its parent."
1552 " the %(path)s program."
1371 1553 msgstr ""
1372 1554
1373 1555 #, python-format
@@ -1377,28 +1559,34 b' msgstr ""'
1377 1559 msgid "pull, update and merge in one command"
1378 1560 msgstr ""
1379 1561
1380 msgid ""
1381 "pull changes from a remote repository, merge new changes if needed.\n"
1382 "\n"
1562 msgid "pull changes from a remote repository, merge new changes if needed."
1563 msgstr ""
1564
1565 msgid ""
1383 1566 " This finds all changes from the repository at the specified path\n"
1384 " or URL and adds them to the local repository.\n"
1385 "\n"
1567 " or URL and adds them to the local repository."
1568 msgstr ""
1569
1570 msgid ""
1386 1571 " If the pulled changes add a new branch head, the head is\n"
1387 1572 " automatically merged, and the result of the merge is committed.\n"
1388 1573 " Otherwise, the working directory is updated to include the new\n"
1389 " changes.\n"
1390 "\n"
1574 " changes."
1575 msgstr ""
1576
1577 msgid ""
1391 1578 " When a merge occurs, the newly pulled changes are assumed to be\n"
1392 1579 " \"authoritative\". The head of the new changes is used as the first\n"
1393 1580 " parent, with local changes as the second. To switch the merge\n"
1394 " order, use --switch-parent.\n"
1395 "\n"
1581 " order, use --switch-parent."
1582 msgstr ""
1583
1584 msgid ""
1396 1585 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1397 1586 " "
1398 1587 msgstr ""
1399 1588
1400 msgid ""
1401 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1589 msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1402 1590 msgstr ""
1403 1591
1404 1592 msgid "outstanding uncommitted merge"
@@ -1410,23 +1598,18 b' msgstr ""'
1410 1598 msgid "working directory is missing some files"
1411 1599 msgstr ""
1412 1600
1413 msgid ""
1414 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1601 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1415 1602 msgstr ""
1416 1603
1417 1604 #, python-format
1418 1605 msgid "pulling from %s\n"
1419 1606 msgstr "drar från %s\n"
1420 1607
1421 msgid ""
1422 "Other repository doesn't support revision lookup, so a rev cannot be "
1423 "specified."
1424 msgstr ""
1425
1426 #, python-format
1427 msgid ""
1428 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1429 "\" to merge them)\n"
1608 msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
1609 msgstr ""
1610
1611 #, python-format
1612 msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
1430 1613 msgstr ""
1431 1614
1432 1615 #, python-format
@@ -1488,14 +1671,12 b' msgstr ""'
1488 1671 msgid "No valid signature for %s\n"
1489 1672 msgstr ""
1490 1673
1491 msgid ""
1492 "add a signature for the current or given revision\n"
1493 "\n"
1674 msgid "add a signature for the current or given revision"
1675 msgstr ""
1676
1677 msgid ""
1494 1678 " If no revision is given, the parent of the working directory is used,\n"
1495 " or tip if no revision is checked out.\n"
1496 "\n"
1497 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1498 " "
1679 " or tip if no revision is checked out."
1499 1680 msgstr ""
1500 1681
1501 1682 msgid "uncommitted merge - please provide a specific revision"
@@ -1508,9 +1689,7 b' msgstr "Signerar %d:%s\\n"'
1508 1689 msgid "Error while signing"
1509 1690 msgstr ""
1510 1691
1511 msgid ""
1512 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1513 "force)"
1692 msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
1514 1693 msgstr ""
1515 1694
1516 1695 msgid "unknown signature version"
@@ -1540,15 +1719,14 b' msgstr ""'
1540 1719 msgid "hg sigs"
1541 1720 msgstr ""
1542 1721
1543 msgid ""
1544 "command to view revision graphs from a shell\n"
1545 "\n"
1722 msgid "command to view revision graphs from a shell"
1723 msgstr "kommando för att se revisionsgrafer i ett skal"
1724
1725 msgid ""
1546 1726 "This extension adds a --graph option to the incoming, outgoing and log\n"
1547 1727 "commands. When this options is given, an ASCII representation of the\n"
1548 1728 "revision graph is also shown.\n"
1549 1729 msgstr ""
1550 "kommando för att se revisionsgrafer i ett skal\n"
1551 "\n"
1552 1730 "Denna utökning lägger till flaggan --graph till kommandona incoming,\n"
1553 1731 "outgoing och log. När flaggan anges, visas också en ASCII-version av\n"
1554 1732 "revisionsgrafen.\n"
@@ -1557,21 +1735,21 b' msgstr ""'
1557 1735 msgid "--graph option is incompatible with --%s"
1558 1736 msgstr "flaggan --graph är inkompatibel med --%s"
1559 1737
1560 msgid ""
1561 "show revision history alongside an ASCII revision graph\n"
1562 "\n"
1738 msgid "show revision history alongside an ASCII revision graph"
1739 msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf"
1740
1741 msgid ""
1563 1742 " Print a revision history alongside a revision graph drawn with\n"
1564 " ASCII characters.\n"
1565 "\n"
1743 " ASCII characters."
1744 msgstr ""
1745 " Visa en revisionshistorik bredvid en revisionsgraf ritad med\n"
1746 " ASCII-tecken."
1747
1748 msgid ""
1566 1749 " Nodes printed as an @ character are parents of the working\n"
1567 1750 " directory.\n"
1568 1751 " "
1569 1752 msgstr ""
1570 "visa revisionshistorik vid sidan av en ASCII-revisionsgraf\n"
1571 "\n"
1572 " Visa en revisionshistorik bredvid en revisionsgraf ritad med\n"
1573 " ASCII-tecken.\n"
1574 "\n"
1575 1753 " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n"
1576 1754 " "
1577 1755
@@ -1597,12 +1775,15 b' msgstr "visa den specifika revisionen el'
1597 1775 msgid "hg glog [OPTION]... [FILE]"
1598 1776 msgstr "hg glog [FLAGGA]... [FIL]"
1599 1777
1600 msgid ""
1601 "hooks for integrating with the CIA.vc notification service\n"
1602 "\n"
1778 msgid "hooks for integrating with the CIA.vc notification service"
1779 msgstr ""
1780
1781 msgid ""
1603 1782 "This is meant to be run as a changegroup or incoming hook. To\n"
1604 "configure it, set the following options in your hgrc::\n"
1605 "\n"
1783 "configure it, set the following options in your hgrc::"
1784 msgstr ""
1785
1786 msgid ""
1606 1787 " [cia]\n"
1607 1788 " # your registered CIA user name\n"
1608 1789 " user = foo\n"
@@ -1622,13 +1803,17 b' msgid ""'
1622 1803 " # Make sure to set email.from if you do this.\n"
1623 1804 " #url = http://cia.vc/\n"
1624 1805 " # print message instead of sending it (optional)\n"
1625 " #test = False\n"
1626 "\n"
1806 " #test = False"
1807 msgstr ""
1808
1809 msgid ""
1627 1810 " [hooks]\n"
1628 1811 " # one of these:\n"
1629 1812 " changegroup.cia = python:hgcia.hook\n"
1630 " #incoming.cia = python:hgcia.hook\n"
1631 "\n"
1813 " #incoming.cia = python:hgcia.hook"
1814 msgstr ""
1815
1816 msgid ""
1632 1817 " [web]\n"
1633 1818 " # If you want hyperlinks (optional)\n"
1634 1819 " baseurl = http://server/path/to/repo\n"
@@ -1645,32 +1830,45 b' msgstr ""'
1645 1830 msgid "email.from must be defined when sending by email"
1646 1831 msgstr ""
1647 1832
1648 msgid ""
1649 "browse the repository in a graphical way\n"
1650 "\n"
1833 msgid "browse the repository in a graphical way"
1834 msgstr ""
1835
1836 msgid ""
1651 1837 "The hgk extension allows browsing the history of a repository in a\n"
1652 1838 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1653 "distributed with Mercurial.)\n"
1654 "\n"
1839 "distributed with Mercurial.)"
1840 msgstr ""
1841
1842 msgid ""
1655 1843 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1656 1844 "querying of information, and an extension to Mercurial named hgk.py,\n"
1657 1845 "which provides hooks for hgk to get information. hgk can be found in\n"
1658 1846 "the contrib directory, and the extension is shipped in the hgext\n"
1659 "repository, and needs to be enabled.\n"
1660 "\n"
1847 "repository, and needs to be enabled."
1848 msgstr ""
1849
1850 msgid ""
1661 1851 "The hg view command will launch the hgk Tcl script. For this command\n"
1662 1852 "to work, hgk must be in your search path. Alternately, you can specify\n"
1663 "the path to hgk in your .hgrc file::\n"
1664 "\n"
1853 "the path to hgk in your .hgrc file::"
1854 msgstr ""
1855
1856 msgid ""
1665 1857 " [hgk]\n"
1666 " path=/location/of/hgk\n"
1667 "\n"
1858 " path=/location/of/hgk"
1859 msgstr ""
1860
1861 msgid ""
1668 1862 "hgk can make use of the extdiff extension to visualize revisions.\n"
1669 "Assuming you had already configured extdiff vdiff command, just add::\n"
1670 "\n"
1863 "Assuming you had already configured extdiff vdiff command, just add::"
1864 msgstr ""
1865
1866 msgid ""
1671 1867 " [hgk]\n"
1672 " vdiff=vdiff\n"
1673 "\n"
1868 " vdiff=vdiff"
1869 msgstr ""
1870
1871 msgid ""
1674 1872 "Revisions context menu will now display additional entries to fire\n"
1675 1873 "vdiff on hovered and selected revisions.\n"
1676 1874 msgstr ""
@@ -1756,18 +1954,23 b' msgstr ""'
1756 1954 msgid "hg debug-rev-list [OPTION]... REV..."
1757 1955 msgstr ""
1758 1956
1759 msgid ""
1760 "syntax highlighting for hgweb (requires Pygments)\n"
1761 "\n"
1957 msgid "syntax highlighting for hgweb (requires Pygments)"
1958 msgstr ""
1959
1960 msgid ""
1762 1961 "It depends on the Pygments syntax highlighting library:\n"
1763 "http://pygments.org/\n"
1764 "\n"
1765 "There is a single configuration option::\n"
1766 "\n"
1962 "http://pygments.org/"
1963 msgstr ""
1964
1965 msgid "There is a single configuration option::"
1966 msgstr ""
1967
1968 msgid ""
1767 1969 " [web]\n"
1768 " pygments_style = <style>\n"
1769 "\n"
1770 "The default is 'colorful'.\n"
1970 " pygments_style = <style>"
1971 msgstr ""
1972
1973 msgid "The default is 'colorful'.\n"
1771 1974 msgstr ""
1772 1975
1773 1976 msgid "accelerate status report using Linux's inotify service"
@@ -1776,9 +1979,10 b' msgstr ""'
1776 1979 msgid "start an inotify server for this repository"
1777 1980 msgstr ""
1778 1981
1779 msgid ""
1780 "debugging information for inotify extension\n"
1781 "\n"
1982 msgid "debugging information for inotify extension"
1983 msgstr ""
1984
1985 msgid ""
1782 1986 " Prints the list of directories being watched by the inotify server.\n"
1783 1987 " "
1784 1988 msgstr ""
@@ -1913,9 +2117,7 b' msgstr ""'
1913 2117 msgid "cannot start: socket is already bound"
1914 2118 msgstr ""
1915 2119
1916 msgid ""
1917 "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/"
1918 "inotify.sock already exists"
2120 msgid "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists"
1919 2121 msgstr ""
1920 2122
1921 2123 #, python-format
@@ -1930,20 +2132,24 b' msgstr ""'
1930 2132 msgid "unrecognized query type: %s\n"
1931 2133 msgstr ""
1932 2134
1933 msgid ""
1934 "expand expressions into changelog and summaries\n"
1935 "\n"
2135 msgid "expand expressions into changelog and summaries"
2136 msgstr ""
2137
2138 msgid ""
1936 2139 "This extension allows the use of a special syntax in summaries, which\n"
1937 2140 "will be automatically expanded into links or any other arbitrary\n"
1938 "expression, much like InterWiki does.\n"
1939 "\n"
2141 "expression, much like InterWiki does."
2142 msgstr ""
2143
2144 msgid ""
1940 2145 "A few example patterns (link to bug tracking, etc.) that may be used\n"
1941 "in your hgrc::\n"
1942 "\n"
2146 "in your hgrc::"
2147 msgstr ""
2148
2149 msgid ""
1943 2150 " [interhg]\n"
1944 2151 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
1945 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
1946 "i\n"
2152 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
1947 2153 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
1948 2154 msgstr ""
1949 2155
@@ -1955,52 +2161,76 b' msgstr ""'
1955 2161 msgid "interhg: invalid regexp for %s: %s\n"
1956 2162 msgstr ""
1957 2163
1958 msgid ""
1959 "expand keywords in tracked files\n"
1960 "\n"
2164 msgid "expand keywords in tracked files"
2165 msgstr ""
2166
2167 msgid ""
1961 2168 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
1962 "tracked text files selected by your configuration.\n"
1963 "\n"
2169 "tracked text files selected by your configuration."
2170 msgstr ""
2171
2172 msgid ""
1964 2173 "Keywords are only expanded in local repositories and not stored in the\n"
1965 2174 "change history. The mechanism can be regarded as a convenience for the\n"
1966 "current user or for archive distribution.\n"
1967 "\n"
2175 "current user or for archive distribution."
2176 msgstr ""
2177
2178 msgid ""
1968 2179 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
1969 "hgrc files.\n"
1970 "\n"
1971 "Example::\n"
1972 "\n"
2180 "hgrc files."
2181 msgstr ""
2182
2183 msgid "Example::"
2184 msgstr ""
2185
2186 msgid ""
1973 2187 " [keyword]\n"
1974 2188 " # expand keywords in every python file except those matching \"x*\"\n"
1975 2189 " **.py =\n"
1976 " x* = ignore\n"
1977 "\n"
2190 " x* = ignore"
2191 msgstr ""
2192
2193 msgid ""
1978 2194 "NOTE: the more specific you are in your filename patterns the less you\n"
1979 "lose speed in huge repositories.\n"
1980 "\n"
2195 "lose speed in huge repositories."
2196 msgstr ""
2197
2198 msgid ""
1981 2199 "For [keywordmaps] template mapping and expansion demonstration and\n"
1982 2200 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
1983 "available templates and filters.\n"
1984 "\n"
2201 "available templates and filters."
2202 msgstr ""
2203
2204 msgid ""
1985 2205 "An additional date template filter {date|utcdate} is provided. It\n"
1986 "returns a date like \"2006/09/18 15:13:13\".\n"
1987 "\n"
2206 "returns a date like \"2006/09/18 15:13:13\"."
2207 msgstr ""
2208
2209 msgid ""
1988 2210 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
1989 2211 "replaced with customized keywords and templates. Again, run \"hg\n"
1990 "kwdemo\" to control the results of your config changes.\n"
1991 "\n"
2212 "kwdemo\" to control the results of your config changes."
2213 msgstr ""
2214
2215 msgid ""
1992 2216 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
1993 2217 "the risk of inadvertently storing expanded keywords in the change\n"
1994 "history.\n"
1995 "\n"
2218 "history."
2219 msgstr ""
2220
2221 msgid ""
1996 2222 "To force expansion after enabling it, or a configuration change, run\n"
1997 "\"hg kwexpand\".\n"
1998 "\n"
2223 "\"hg kwexpand\"."
2224 msgstr ""
2225
2226 msgid ""
1999 2227 "Also, when committing with the record extension or using mq's qrecord,\n"
2000 2228 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2001 2229 "the files in question to update keyword expansions after all changes\n"
2002 "have been checked in.\n"
2003 "\n"
2230 "have been checked in."
2231 msgstr ""
2232
2233 msgid ""
2004 2234 "Expansions spanning more than one line and incremental expansions,\n"
2005 2235 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2006 2236 "{desc}\" expands to the first line of the changeset description.\n"
@@ -2020,17 +2250,23 b' msgstr ""'
2020 2250 msgid "no [keyword] patterns configured"
2021 2251 msgstr ""
2022 2252
2023 msgid ""
2024 "print [keywordmaps] configuration and an expansion example\n"
2025 "\n"
2253 msgid "print [keywordmaps] configuration and an expansion example"
2254 msgstr ""
2255
2256 msgid ""
2026 2257 " Show current, custom, or default keyword template maps and their\n"
2027 " expansions.\n"
2028 "\n"
2258 " expansions."
2259 msgstr ""
2260
2261 msgid ""
2029 2262 " Extend the current configuration by specifying maps as arguments\n"
2030 " and using -f/--rcfile to source an external hgrc file.\n"
2031 "\n"
2032 " Use -d/--default to disable current configuration.\n"
2033 "\n"
2263 " and using -f/--rcfile to source an external hgrc file."
2264 msgstr ""
2265
2266 msgid " Use -d/--default to disable current configuration."
2267 msgstr ""
2268
2269 msgid ""
2034 2270 " See \"hg help templates\" for information on templates and filters.\n"
2035 2271 " "
2036 2272 msgstr ""
@@ -2077,31 +2313,42 b' msgid ""'
2077 2313 "\tkeywords expanded\n"
2078 2314 msgstr ""
2079 2315
2080 msgid ""
2081 "expand keywords in the working directory\n"
2082 "\n"
2083 " Run after (re)enabling keyword expansion.\n"
2084 "\n"
2316 msgid "expand keywords in the working directory"
2317 msgstr ""
2318
2319 msgid " Run after (re)enabling keyword expansion."
2320 msgstr ""
2321
2322 msgid ""
2085 2323 " kwexpand refuses to run if given files contain local changes.\n"
2086 2324 " "
2087 2325 msgstr ""
2088 2326
2089 msgid ""
2090 "show files configured for keyword expansion\n"
2091 "\n"
2327 msgid "show files configured for keyword expansion"
2328 msgstr ""
2329
2330 msgid ""
2092 2331 " List which files in the working directory are matched by the\n"
2093 " [keyword] configuration patterns.\n"
2094 "\n"
2332 " [keyword] configuration patterns."
2333 msgstr ""
2334
2335 msgid ""
2095 2336 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2096 2337 " execution by including only files that are actual candidates for\n"
2097 " expansion.\n"
2098 "\n"
2338 " expansion."
2339 msgstr ""
2340
2341 msgid ""
2099 2342 " See \"hg help keyword\" on how to construct patterns both for\n"
2100 " inclusion and exclusion of files.\n"
2101 "\n"
2343 " inclusion and exclusion of files."
2344 msgstr ""
2345
2346 msgid ""
2102 2347 " With -A/--all and -v/--verbose the codes used to show the status\n"
2103 " of files are::\n"
2104 "\n"
2348 " of files are::"
2349 msgstr ""
2350
2351 msgid ""
2105 2352 " K = keyword expansion candidate\n"
2106 2353 " k = keyword expansion candidate (not tracked)\n"
2107 2354 " I = ignored\n"
@@ -2109,12 +2356,15 b' msgid ""'
2109 2356 " "
2110 2357 msgstr ""
2111 2358
2112 msgid ""
2113 "revert expanded keywords in the working directory\n"
2114 "\n"
2359 msgid "revert expanded keywords in the working directory"
2360 msgstr ""
2361
2362 msgid ""
2115 2363 " Run before changing/disabling active keywords or if you experience\n"
2116 " problems with \"hg import\" or \"hg merge\".\n"
2117 "\n"
2364 " problems with \"hg import\" or \"hg merge\"."
2365 msgstr ""
2366
2367 msgid ""
2118 2368 " kwshrink refuses to run if given files contain local changes.\n"
2119 2369 " "
2120 2370 msgstr ""
@@ -2146,35 +2396,51 b' msgstr ""'
2146 2396 msgid "hg kwshrink [OPTION]... [FILE]..."
2147 2397 msgstr ""
2148 2398
2149 msgid ""
2150 "manage a stack of patches\n"
2151 "\n"
2399 msgid "manage a stack of patches"
2400 msgstr ""
2401
2402 msgid ""
2152 2403 "This extension lets you work with a stack of patches in a Mercurial\n"
2153 2404 "repository. It manages two stacks of patches - all known patches, and\n"
2154 "applied patches (subset of known patches).\n"
2155 "\n"
2405 "applied patches (subset of known patches)."
2406 msgstr ""
2407
2408 msgid ""
2156 2409 "Known patches are represented as patch files in the .hg/patches\n"
2157 "directory. Applied patches are both patch files and changesets.\n"
2158 "\n"
2159 "Common tasks (use \"hg help command\" for more details)::\n"
2160 "\n"
2410 "directory. Applied patches are both patch files and changesets."
2411 msgstr ""
2412
2413 msgid "Common tasks (use \"hg help command\" for more details)::"
2414 msgstr ""
2415
2416 msgid ""
2161 2417 " create new patch qnew\n"
2162 " import existing patch qimport\n"
2163 "\n"
2418 " import existing patch qimport"
2419 msgstr ""
2420
2421 msgid ""
2164 2422 " print patch series qseries\n"
2165 " print applied patches qapplied\n"
2166 "\n"
2423 " print applied patches qapplied"
2424 msgstr ""
2425
2426 msgid ""
2167 2427 " add known patch to applied stack qpush\n"
2168 2428 " remove patch from applied stack qpop\n"
2169 " refresh contents of top applied patch qrefresh\n"
2170 "\n"
2429 " refresh contents of top applied patch qrefresh"
2430 msgstr ""
2431
2432 msgid ""
2171 2433 "By default, mq will automatically use git patches when required to\n"
2172 2434 "avoid losing file mode changes, copy records, binary files or empty\n"
2173 "files creations or deletions. This behaviour can be configured with::\n"
2174 "\n"
2435 "files creations or deletions. This behaviour can be configured with::"
2436 msgstr ""
2437
2438 msgid ""
2175 2439 " [mq]\n"
2176 " git = auto/keep/yes/no\n"
2177 "\n"
2440 " git = auto/keep/yes/no"
2441 msgstr ""
2442
2443 msgid ""
2178 2444 "If set to 'keep', mq will obey the [diff] section configuration while\n"
2179 2445 "preserving existing git patches upon qrefresh. If set to 'yes' or\n"
2180 2446 "'no', mq will override the [diff] section and always generate git or\n"
@@ -2414,9 +2680,7 b' msgstr ""'
2414 2680 msgid "cannot refresh a revision with children"
2415 2681 msgstr ""
2416 2682
2417 msgid ""
2418 "refresh interrupted while patch was popped! (revert --all, qpush to "
2419 "recover)\n"
2683 msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2420 2684 msgstr ""
2421 2685
2422 2686 msgid "patch queue directory already exists"
@@ -2510,13 +2774,15 b' msgstr ""'
2510 2774 msgid "adding %s to series file\n"
2511 2775 msgstr ""
2512 2776
2513 msgid ""
2514 "remove patches from queue\n"
2515 "\n"
2516 " The patches must not be applied, and at least one patch is required. "
2517 "With\n"
2518 " -k/--keep, the patch files are preserved in the patch directory.\n"
2519 "\n"
2777 msgid "remove patches from queue"
2778 msgstr ""
2779
2780 msgid ""
2781 " The patches must not be applied, and at least one patch is required. With\n"
2782 " -k/--keep, the patch files are preserved in the patch directory."
2783 msgstr ""
2784
2785 msgid ""
2520 2786 " To stop managing a patch and move it into permanent history,\n"
2521 2787 " use the qfinish command."
2522 2788 msgstr ""
@@ -2533,60 +2799,79 b' msgstr ""'
2533 2799 msgid "all patches applied\n"
2534 2800 msgstr ""
2535 2801
2536 msgid ""
2537 "import a patch\n"
2538 "\n"
2802 msgid "import a patch"
2803 msgstr ""
2804
2805 msgid ""
2539 2806 " The patch is inserted into the series after the last applied\n"
2540 2807 " patch. If no patches have been applied, qimport prepends the patch\n"
2541 " to the series.\n"
2542 "\n"
2808 " to the series."
2809 msgstr ""
2810
2811 msgid ""
2543 2812 " The patch will have the same name as its source file unless you\n"
2544 " give it a new one with -n/--name.\n"
2545 "\n"
2813 " give it a new one with -n/--name."
2814 msgstr ""
2815
2816 msgid ""
2546 2817 " You can register an existing patch inside the patch directory with\n"
2547 " the -e/--existing flag.\n"
2548 "\n"
2818 " the -e/--existing flag."
2819 msgstr ""
2820
2821 msgid ""
2549 2822 " With -f/--force, an existing patch of the same name will be\n"
2550 " overwritten.\n"
2551 "\n"
2823 " overwritten."
2824 msgstr ""
2825
2826 msgid ""
2552 2827 " An existing changeset may be placed under mq control with -r/--rev\n"
2553 2828 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2554 2829 " With -g/--git, patches imported with --rev will use the git diff\n"
2555 2830 " format. See the diffs help topic for information on why this is\n"
2556 2831 " important for preserving rename/copy information and permission\n"
2557 " changes.\n"
2558 "\n"
2832 " changes."
2833 msgstr ""
2834
2835 msgid ""
2559 2836 " To import a patch from standard input, pass - as the patch file.\n"
2560 2837 " When importing from standard input, a patch name must be specified\n"
2561 2838 " using the --name flag.\n"
2562 2839 " "
2563 2840 msgstr ""
2564 2841
2565 msgid ""
2566 "init a new queue repository (DEPRECATED)\n"
2567 "\n"
2842 msgid "init a new queue repository (DEPRECATED)"
2843 msgstr ""
2844
2845 msgid ""
2568 2846 " The queue repository is unversioned by default. If\n"
2569 2847 " -c/--create-repo is specified, qinit will create a separate nested\n"
2570 2848 " repository for patches (qinit -c may also be run later to convert\n"
2571 2849 " an unversioned patch repository into a versioned one). You can use\n"
2572 " qcommit to commit changes to this queue repository.\n"
2573 "\n"
2850 " qcommit to commit changes to this queue repository."
2851 msgstr ""
2852
2853 msgid ""
2574 2854 " This command is deprecated. Without -c, it's implied by other relevant\n"
2575 2855 " commands. With -c, use hg init --mq instead."
2576 2856 msgstr ""
2577 2857
2578 msgid ""
2579 "clone main and patch repository at same time\n"
2580 "\n"
2858 msgid "clone main and patch repository at same time"
2859 msgstr ""
2860
2861 msgid ""
2581 2862 " If source is local, destination will have no patches applied. If\n"
2582 2863 " source is remote, this command can not check if patches are\n"
2583 2864 " applied in source, so cannot guarantee that patches are not\n"
2584 2865 " applied in destination. If you clone remote repository, be sure\n"
2585 " before that it has no patches applied.\n"
2586 "\n"
2866 " before that it has no patches applied."
2867 msgstr ""
2868
2869 msgid ""
2587 2870 " Source patch repository is looked for in <src>/.hg/patches by\n"
2588 " default. Use -p <url> to change.\n"
2589 "\n"
2871 " default. Use -p <url> to change."
2872 msgstr ""
2873
2874 msgid ""
2590 2875 " The patch directory must be a nested Mercurial repository, as\n"
2591 2876 " would be created by init --mq.\n"
2592 2877 " "
@@ -2607,14 +2892,11 b' msgstr ""'
2607 2892 msgid "updating destination repository\n"
2608 2893 msgstr ""
2609 2894
2610 msgid ""
2611 "commit changes in the queue repository (DEPRECATED)\n"
2612 "\n"
2613 " This command is deprecated; use hg commit --mq instead."
2614 msgstr ""
2615 "arkivera ändringar i köarkivet (FÖRÅLDRAD)\n"
2616 "\n"
2617 " Detta är ett föråldrat kommando; använd hg commit --mq istället."
2895 msgid "commit changes in the queue repository (DEPRECATED)"
2896 msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)"
2897
2898 msgid " This command is deprecated; use hg commit --mq instead."
2899 msgstr " Detta är ett föråldrat kommando; använd hg commit --mq istället."
2618 2900
2619 2901 msgid "print the entire series file"
2620 2902 msgstr ""
@@ -2628,24 +2910,31 b' msgstr ""'
2628 2910 msgid "print the name of the previous patch"
2629 2911 msgstr ""
2630 2912
2631 msgid ""
2632 "create a new patch\n"
2633 "\n"
2913 msgid "create a new patch"
2914 msgstr ""
2915
2916 msgid ""
2634 2917 " qnew creates a new patch on top of the currently-applied patch (if\n"
2635 2918 " any). The patch will be initialized with any outstanding changes\n"
2636 2919 " in the working directory. You may also use -I/--include,\n"
2637 2920 " -X/--exclude, and/or a list of files after the patch name to add\n"
2638 2921 " only changes to matching files to the new patch, leaving the rest\n"
2639 " as uncommitted modifications.\n"
2640 "\n"
2922 " as uncommitted modifications."
2923 msgstr ""
2924
2925 msgid ""
2641 2926 " -u/--user and -d/--date can be used to set the (given) user and\n"
2642 2927 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
2643 " to current user and date to current date.\n"
2644 "\n"
2928 " to current user and date to current date."
2929 msgstr ""
2930
2931 msgid ""
2645 2932 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
2646 2933 " well as the commit message. If none is specified, the header is\n"
2647 " empty and the commit message is '[mq]: PATCH'.\n"
2648 "\n"
2934 " empty and the commit message is '[mq]: PATCH'."
2935 msgstr ""
2936
2937 msgid ""
2649 2938 " Use the -g/--git option to keep the patch in the git extended diff\n"
2650 2939 " format. Read the diffs help topic for more information on why this\n"
2651 2940 " is important for preserving permission changes and copy/rename\n"
@@ -2653,16 +2942,21 b' msgid ""'
2653 2942 " "
2654 2943 msgstr ""
2655 2944
2656 msgid ""
2657 "update the current patch\n"
2658 "\n"
2945 msgid "update the current patch"
2946 msgstr ""
2947
2948 msgid ""
2659 2949 " If any file patterns are provided, the refreshed patch will\n"
2660 2950 " contain only the modifications that match those patterns; the\n"
2661 " remaining modifications will remain in the working directory.\n"
2662 "\n"
2951 " remaining modifications will remain in the working directory."
2952 msgstr ""
2953
2954 msgid ""
2663 2955 " If -s/--short is specified, files currently included in the patch\n"
2664 " will be refreshed just like matched files and remain in the patch.\n"
2665 "\n"
2956 " will be refreshed just like matched files and remain in the patch."
2957 msgstr ""
2958
2959 msgid ""
2666 2960 " hg add/remove/copy/rename work as usual, though you might want to\n"
2667 2961 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
2668 2962 " and renames. See the diffs help topic for more information on the\n"
@@ -2673,14 +2967,17 b' msgstr ""'
2673 2967 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2674 2968 msgstr ""
2675 2969
2676 msgid ""
2677 "diff of the current patch and subsequent modifications\n"
2678 "\n"
2970 msgid "diff of the current patch and subsequent modifications"
2971 msgstr ""
2972
2973 msgid ""
2679 2974 " Shows a diff which includes the current patch as well as any\n"
2680 2975 " changes which have been made in the working directory since the\n"
2681 2976 " last refresh (thus showing what the current patch would become\n"
2682 " after a qrefresh).\n"
2683 "\n"
2977 " after a qrefresh)."
2978 msgstr ""
2979
2980 msgid ""
2684 2981 " Use 'hg diff' if you only want to see the changes made since the\n"
2685 2982 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
2686 2983 " by the current patch without including changes made since the\n"
@@ -2688,16 +2985,19 b' msgid ""'
2688 2985 " "
2689 2986 msgstr ""
2690 2987
2691 msgid ""
2692 "fold the named patches into the current patch\n"
2693 "\n"
2988 msgid "fold the named patches into the current patch"
2989 msgstr ""
2990
2991 msgid ""
2694 2992 " Patches must not yet be applied. Each patch will be successively\n"
2695 2993 " applied to the current patch in the order given. If all the\n"
2696 2994 " patches apply successfully, the current patch will be refreshed\n"
2697 2995 " with the new cumulative patch, and the folded patches will be\n"
2698 2996 " deleted. With -k/--keep, the folded patch files will not be\n"
2699 " removed afterwards.\n"
2700 "\n"
2997 " removed afterwards."
2998 msgstr ""
2999
3000 msgid ""
2701 3001 " The header for each folded patch will be concatenated with the\n"
2702 3002 " current patch header, separated by a line of '* * *'."
2703 3003 msgstr ""
@@ -2723,21 +3023,27 b' msgstr ""'
2723 3023 msgid "push or pop patches until named patch is at top of stack"
2724 3024 msgstr ""
2725 3025
2726 msgid ""
2727 "set or print guards for a patch\n"
2728 "\n"
3026 msgid "set or print guards for a patch"
3027 msgstr ""
3028
3029 msgid ""
2729 3030 " Guards control whether a patch can be pushed. A patch with no\n"
2730 3031 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
2731 3032 " pushed only if the qselect command has activated it. A patch with\n"
2732 3033 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
2733 " has activated it.\n"
2734 "\n"
3034 " has activated it."
3035 msgstr ""
3036
3037 msgid ""
2735 3038 " With no arguments, print the currently active guards.\n"
2736 3039 " With arguments, set guards for the named patch.\n"
2737 " NOTE: Specifying negative guards now requires '--'.\n"
2738 "\n"
2739 " To set guards on another patch::\n"
2740 "\n"
3040 " NOTE: Specifying negative guards now requires '--'."
3041 msgstr ""
3042
3043 msgid " To set guards on another patch::"
3044 msgstr ""
3045
3046 msgid ""
2741 3047 " hg qguard other.patch -- +2.6.17 -stable\n"
2742 3048 " "
2743 3049 msgstr ""
@@ -2755,9 +3061,10 b' msgstr ""'
2755 3061 msgid "print the header of the topmost or specified patch"
2756 3062 msgstr ""
2757 3063
2758 msgid ""
2759 "push the next patch onto the stack\n"
2760 "\n"
3064 msgid "push the next patch onto the stack"
3065 msgstr ""
3066
3067 msgid ""
2761 3068 " When -f/--force is applied, all local changes in patched files\n"
2762 3069 " will be lost.\n"
2763 3070 " "
@@ -2770,9 +3077,10 b' msgstr ""'
2770 3077 msgid "merging with queue at: %s\n"
2771 3078 msgstr ""
2772 3079
2773 msgid ""
2774 "pop the current patch off the stack\n"
2775 "\n"
3080 msgid "pop the current patch off the stack"
3081 msgstr ""
3082
3083 msgid ""
2776 3084 " By default, pops off the top of the patch stack. If given a patch\n"
2777 3085 " name, keeps popping off patches until the named patch is at the\n"
2778 3086 " top of the stack.\n"
@@ -2783,9 +3091,10 b' msgstr ""'
2783 3091 msgid "using patch queue: %s\n"
2784 3092 msgstr ""
2785 3093
2786 msgid ""
2787 "rename a patch\n"
2788 "\n"
3094 msgid "rename a patch"
3095 msgstr ""
3096
3097 msgid ""
2789 3098 " With one argument, renames the current patch to PATCH1.\n"
2790 3099 " With two arguments, renames PATCH1 to PATCH2."
2791 3100 msgstr ""
@@ -2802,16 +3111,13 b' msgstr ""'
2802 3111 msgid "renaming %s to %s\n"
2803 3112 msgstr "döper om %s till %s\n"
2804 3113
2805 msgid ""
2806 "restore the queue state saved by a revision (DEPRECATED)\n"
2807 "\n"
2808 " This command is deprecated, use rebase --mq instead."
2809 msgstr ""
2810
2811 msgid ""
2812 "save current queue state (DEPRECATED)\n"
2813 "\n"
2814 " This command is deprecated, use rebase --mq instead."
3114 msgid "restore the queue state saved by a revision (DEPRECATED)"
3115 msgstr ""
3116
3117 msgid " This command is deprecated, use rebase --mq instead."
3118 msgstr ""
3119
3120 msgid "save current queue state (DEPRECATED)"
2815 3121 msgstr ""
2816 3122
2817 3123 #, python-format
@@ -2826,45 +3132,59 b' msgstr ""'
2826 3132 msgid "copy %s to %s\n"
2827 3133 msgstr ""
2828 3134
2829 msgid ""
2830 "strip a revision and all its descendants from the repository\n"
2831 "\n"
3135 msgid "strip a revision and all its descendants from the repository"
3136 msgstr ""
3137
3138 msgid ""
2832 3139 " If one of the working directory's parent revisions is stripped, the\n"
2833 3140 " working directory will be updated to the parent of the stripped\n"
2834 3141 " revision.\n"
2835 3142 " "
2836 3143 msgstr ""
2837 3144
2838 msgid ""
2839 "set or print guarded patches to push\n"
2840 "\n"
3145 msgid "set or print guarded patches to push"
3146 msgstr ""
3147
3148 msgid ""
2841 3149 " Use the qguard command to set or print guards on patch, then use\n"
2842 3150 " qselect to tell mq which guards to use. A patch will be pushed if\n"
2843 3151 " it has no guards or any positive guards match the currently\n"
2844 3152 " selected guard, but will not be pushed if any negative guards\n"
2845 " match the current guard. For example::\n"
2846 "\n"
3153 " match the current guard. For example::"
3154 msgstr ""
3155
3156 msgid ""
2847 3157 " qguard foo.patch -stable (negative guard)\n"
2848 3158 " qguard bar.patch +stable (positive guard)\n"
2849 " qselect stable\n"
2850 "\n"
3159 " qselect stable"
3160 msgstr ""
3161
3162 msgid ""
2851 3163 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
2852 3164 " it has a negative match) but push bar.patch (because it has a\n"
2853 " positive match).\n"
2854 "\n"
3165 " positive match)."
3166 msgstr ""
3167
3168 msgid ""
2855 3169 " With no arguments, prints the currently active guards.\n"
2856 " With one argument, sets the active guard.\n"
2857 "\n"
3170 " With one argument, sets the active guard."
3171 msgstr ""
3172
3173 msgid ""
2858 3174 " Use -n/--none to deactivate guards (no other arguments needed).\n"
2859 3175 " When no guards are active, patches with positive guards are\n"
2860 " skipped and patches with negative guards are pushed.\n"
2861 "\n"
3176 " skipped and patches with negative guards are pushed."
3177 msgstr ""
3178
3179 msgid ""
2862 3180 " qselect can change the guards on applied patches. It does not pop\n"
2863 3181 " guarded patches by default. Use --pop to pop back to the last\n"
2864 3182 " applied patch that is not guarded. Use --reapply (which implies\n"
2865 3183 " --pop) to push back to the current patch afterwards, but skip\n"
2866 " guarded patches.\n"
2867 "\n"
3184 " guarded patches."
3185 msgstr ""
3186
3187 msgid ""
2868 3188 " Use -s/--series to print a list of all guards in the series file\n"
2869 3189 " (no other arguments needed). Use -v for more information."
2870 3190 msgstr ""
@@ -2898,18 +3218,23 b' msgstr ""'
2898 3218 msgid "reapplying unguarded patches\n"
2899 3219 msgstr ""
2900 3220
2901 msgid ""
2902 "move applied patches into repository history\n"
2903 "\n"
3221 msgid "move applied patches into repository history"
3222 msgstr ""
3223
3224 msgid ""
2904 3225 " Finishes the specified revisions (corresponding to applied\n"
2905 3226 " patches) by moving them out of mq control into regular repository\n"
2906 " history.\n"
2907 "\n"
3227 " history."
3228 msgstr ""
3229
3230 msgid ""
2908 3231 " Accepts a revision range or the -a/--applied option. If --applied\n"
2909 3232 " is specified, all applied mq revisions are removed from mq\n"
2910 3233 " control. Otherwise, the given revisions must be at the base of the\n"
2911 " stack of applied patches.\n"
2912 "\n"
3234 " stack of applied patches."
3235 msgstr ""
3236
3237 msgid ""
2913 3238 " This can be especially useful if your changes have been applied to\n"
2914 3239 " an upstream repository, or if you are about to push your changes\n"
2915 3240 " to upstream.\n"
@@ -3185,33 +3510,47 b' msgstr ""'
3185 3510 msgid "hg qfinish [-a] [REV]..."
3186 3511 msgstr ""
3187 3512
3188 msgid ""
3189 "hooks for sending email notifications at commit/push time\n"
3190 "\n"
3513 msgid "hooks for sending email notifications at commit/push time"
3514 msgstr ""
3515
3516 msgid ""
3191 3517 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3192 "print messages to stdout, for testing and configuring.\n"
3193 "\n"
3518 "print messages to stdout, for testing and configuring."
3519 msgstr ""
3520
3521 msgid ""
3194 3522 "To use, configure the notify extension and enable it in hgrc like\n"
3195 "this::\n"
3196 "\n"
3523 "this::"
3524 msgstr ""
3525
3526 msgid ""
3197 3527 " [extensions]\n"
3198 " notify =\n"
3199 "\n"
3528 " notify ="
3529 msgstr ""
3530
3531 msgid ""
3200 3532 " [hooks]\n"
3201 3533 " # one email for each incoming changeset\n"
3202 3534 " incoming.notify = python:hgext.notify.hook\n"
3203 3535 " # batch emails when many changesets incoming at one time\n"
3204 " changegroup.notify = python:hgext.notify.hook\n"
3205 "\n"
3536 " changegroup.notify = python:hgext.notify.hook"
3537 msgstr ""
3538
3539 msgid ""
3206 3540 " [notify]\n"
3207 " # config items go here\n"
3208 "\n"
3209 "Required configuration items::\n"
3210 "\n"
3211 " config = /path/to/file # file containing subscriptions\n"
3212 "\n"
3213 "Optional configuration items::\n"
3214 "\n"
3541 " # config items go here"
3542 msgstr ""
3543
3544 msgid "Required configuration items::"
3545 msgstr ""
3546
3547 msgid " config = /path/to/file # file containing subscriptions"
3548 msgstr ""
3549
3550 msgid "Optional configuration items::"
3551 msgstr ""
3552
3553 msgid ""
3215 3554 " test = True # print messages to stdout for testing\n"
3216 3555 " strip = 3 # number of slashes to strip for url paths\n"
3217 3556 " domain = example.com # domain to use if committer missing domain\n"
@@ -3222,31 +3561,40 b' msgid ""'
3222 3561 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3223 3562 " maxsubject = 67 # truncate subject line longer than this\n"
3224 3563 " diffstat = True # add a diffstat before the diff content\n"
3225 " sources = serve # notify if source of incoming changes in this "
3226 "list\n"
3564 " sources = serve # notify if source of incoming changes in this list\n"
3227 3565 " # (serve == ssh or http, push, pull, bundle)\n"
3228 3566 " merge = False # send notification for merges (default True)\n"
3229 3567 " [email]\n"
3230 3568 " from = user@host.com # email address to send as if none given\n"
3231 3569 " [web]\n"
3232 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3233 "\n"
3570 " baseurl = http://hgserver/... # root of hg web site for browsing commits"
3571 msgstr ""
3572
3573 msgid ""
3234 3574 "The notify config file has same format as a regular hgrc file. It has\n"
3235 3575 "two sections so you can express subscriptions in whatever way is\n"
3236 "handier for you.\n"
3237 "\n"
3238 "::\n"
3239 "\n"
3576 "handier for you."
3577 msgstr ""
3578
3579 msgid "::"
3580 msgstr ""
3581
3582 msgid ""
3240 3583 " [usersubs]\n"
3241 3584 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3242 " user@host = pattern\n"
3243 "\n"
3585 " user@host = pattern"
3586 msgstr ""
3587
3588 msgid ""
3244 3589 " [reposubs]\n"
3245 3590 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3246 " pattern = user@host\n"
3247 "\n"
3248 "Glob patterns are matched against path to repository root.\n"
3249 "\n"
3591 " pattern = user@host"
3592 msgstr ""
3593
3594 msgid "Glob patterns are matched against path to repository root."
3595 msgstr ""
3596
3597 msgid ""
3250 3598 "If you like, you can put notify config file in repository that users\n"
3251 3599 "can push changes to, they can manage their own subscriptions.\n"
3252 3600 msgstr ""
@@ -3262,140 +3610,193 b' msgstr ""'
3262 3610 #, python-format
3263 3611 msgid ""
3264 3612 "\n"
3265 "diffs (truncated from %d to %d lines):\n"
3266 "\n"
3267 msgstr ""
3268
3269 #, python-format
3270 msgid ""
3271 "\n"
3272 "diffs (%d lines):\n"
3273 "\n"
3613 "diffs (truncated from %d to %d lines):"
3614 msgstr ""
3615
3616 #, python-format
3617 msgid ""
3618 "\n"
3619 "diffs (%d lines):"
3274 3620 msgstr ""
3275 3621
3276 3622 #, python-format
3277 3623 msgid "notify: suppressing notification for merge %d:%s\n"
3278 3624 msgstr ""
3279 3625
3280 msgid ""
3281 "browse command output with an external pager\n"
3282 "\n"
3283 "To set the pager that should be used, set the application variable::\n"
3284 "\n"
3626 msgid "browse command output with an external pager"
3627 msgstr ""
3628
3629 msgid "To set the pager that should be used, set the application variable::"
3630 msgstr ""
3631
3632 msgid ""
3285 3633 " [pager]\n"
3286 " pager = LESS='FSRX' less\n"
3287 "\n"
3634 " pager = LESS='FSRX' less"
3635 msgstr ""
3636
3637 msgid ""
3288 3638 "If no pager is set, the pager extensions uses the environment variable\n"
3289 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
3290 "\n"
3639 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
3640 msgstr ""
3641
3642 msgid ""
3291 3643 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3292 "setting::\n"
3293 "\n"
3644 "setting::"
3645 msgstr ""
3646
3647 msgid ""
3294 3648 " [pager]\n"
3295 " quiet = True\n"
3296 "\n"
3649 " quiet = True"
3650 msgstr ""
3651
3652 msgid ""
3297 3653 "You can disable the pager for certain commands by adding them to the\n"
3298 "pager.ignore list::\n"
3299 "\n"
3654 "pager.ignore list::"
3655 msgstr ""
3656
3657 msgid ""
3300 3658 " [pager]\n"
3301 " ignore = version, help, update\n"
3302 "\n"
3659 " ignore = version, help, update"
3660 msgstr ""
3661
3662 msgid ""
3303 3663 "You can also enable the pager only for certain commands using\n"
3304 "pager.attend. Below is the default list of commands to be paged::\n"
3305 "\n"
3664 "pager.attend. Below is the default list of commands to be paged::"
3665 msgstr ""
3666
3667 msgid ""
3306 3668 " [pager]\n"
3307 " attend = annotate, cat, diff, export, glog, log, qdiff\n"
3308 "\n"
3669 " attend = annotate, cat, diff, export, glog, log, qdiff"
3670 msgstr ""
3671
3672 msgid ""
3309 3673 "Setting pager.attend to an empty value will cause all commands to be\n"
3310 "paged.\n"
3311 "\n"
3312 "If pager.attend is present, pager.ignore will be ignored.\n"
3313 "\n"
3674 "paged."
3675 msgstr ""
3676
3677 msgid "If pager.attend is present, pager.ignore will be ignored."
3678 msgstr ""
3679
3680 msgid ""
3314 3681 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3315 3682 "specify them in the global .hgrc\n"
3316 3683 msgstr ""
3317 3684
3318 msgid ""
3319 "interpret suffixes to refer to ancestor revisions\n"
3320 "\n"
3685 msgid "interpret suffixes to refer to ancestor revisions"
3686 msgstr ""
3687
3688 msgid ""
3321 3689 "This extension allows you to use git-style suffixes to refer to the\n"
3322 "ancestors of a specific revision.\n"
3323 "\n"
3324 "For example, if you can refer to a revision as \"foo\", then::\n"
3325 "\n"
3690 "ancestors of a specific revision."
3691 msgstr ""
3692
3693 msgid "For example, if you can refer to a revision as \"foo\", then::"
3694 msgstr ""
3695
3696 msgid ""
3326 3697 " foo^N = Nth parent of foo\n"
3327 3698 " foo^0 = foo\n"
3328 3699 " foo^1 = first parent of foo\n"
3329 3700 " foo^2 = second parent of foo\n"
3330 " foo^ = foo^1\n"
3331 "\n"
3701 " foo^ = foo^1"
3702 msgstr ""
3703
3704 msgid ""
3332 3705 " foo~N = Nth first grandparent of foo\n"
3333 3706 " foo~0 = foo\n"
3334 3707 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3335 3708 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3336 3709 msgstr ""
3337 3710
3338 msgid ""
3339 "command to send changesets as (a series of) patch emails\n"
3340 "\n"
3711 msgid "command to send changesets as (a series of) patch emails"
3712 msgstr ""
3713
3714 msgid ""
3341 3715 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3342 "describes the series as a whole.\n"
3343 "\n"
3716 "describes the series as a whole."
3717 msgstr ""
3718
3719 msgid ""
3344 3720 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3345 3721 "first line of the changeset description as the subject text. The\n"
3346 "message contains two or three body parts:\n"
3347 "\n"
3722 "message contains two or three body parts:"
3723 msgstr ""
3724
3725 msgid ""
3348 3726 "- The changeset description.\n"
3349 3727 "- [Optional] The result of running diffstat on the patch.\n"
3350 "- The patch itself, as generated by \"hg export\".\n"
3351 "\n"
3728 "- The patch itself, as generated by \"hg export\"."
3729 msgstr ""
3730
3731 msgid ""
3352 3732 "Each message refers to the first in the series using the In-Reply-To\n"
3353 3733 "and References headers, so they will show up as a sequence in threaded\n"
3354 "mail and news readers, and in mail archives.\n"
3355 "\n"
3734 "mail and news readers, and in mail archives."
3735 msgstr ""
3736
3737 msgid ""
3356 3738 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3357 3739 "with a diffstat summary and the changeset summary, so you can be sure\n"
3358 "you are sending the right changes.\n"
3359 "\n"
3740 "you are sending the right changes."
3741 msgstr ""
3742
3743 msgid ""
3360 3744 "To configure other defaults, add a section like this to your hgrc\n"
3361 "file::\n"
3362 "\n"
3745 "file::"
3746 msgstr ""
3747
3748 msgid ""
3363 3749 " [email]\n"
3364 3750 " from = My Name <my@email>\n"
3365 3751 " to = recipient1, recipient2, ...\n"
3366 3752 " cc = cc1, cc2, ...\n"
3367 " bcc = bcc1, bcc2, ...\n"
3368 "\n"
3753 " bcc = bcc1, bcc2, ..."
3754 msgstr ""
3755
3756 msgid ""
3369 3757 "Use ``[patchbomb]`` as configuration section name if you need to\n"
3370 "override global ``[email]`` address settings.\n"
3371 "\n"
3758 "override global ``[email]`` address settings."
3759 msgstr ""
3760
3761 msgid ""
3372 3762 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3373 "as a patchbomb.\n"
3374 "\n"
3763 "as a patchbomb."
3764 msgstr ""
3765
3766 msgid ""
3375 3767 "To avoid sending patches prematurely, it is a good idea to first run\n"
3376 3768 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3377 3769 "prompted for an email recipient address, a subject and an introductory\n"
3378 3770 "message describing the patches of your patchbomb. Then when all is\n"
3379 3771 "done, patchbomb messages are displayed. If the PAGER environment\n"
3380 3772 "variable is set, your pager will be fired up once for each patchbomb\n"
3381 "message, so you can verify everything is alright.\n"
3382 "\n"
3773 "message, so you can verify everything is alright."
3774 msgstr ""
3775
3776 msgid ""
3383 3777 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3384 3778 "patchbomb message in a pager or sending the messages directly, it will\n"
3385 3779 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3386 3780 "can be previewed with any mail user agent which supports UNIX mbox\n"
3387 "files, e.g. with mutt::\n"
3388 "\n"
3389 " % mutt -R -f mbox\n"
3390 "\n"
3781 "files, e.g. with mutt::"
3782 msgstr ""
3783
3784 msgid " % mutt -R -f mbox"
3785 msgstr ""
3786
3787 msgid ""
3391 3788 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3392 3789 "(a utility that is commonly installed as part of the procmail\n"
3393 "package), to send each message out::\n"
3394 "\n"
3395 " % formail -s sendmail -bm -t < mbox\n"
3396 "\n"
3397 "That should be all. Now your patchbomb is on its way out.\n"
3398 "\n"
3790 "package), to send each message out::"
3791 msgstr ""
3792
3793 msgid " % formail -s sendmail -bm -t < mbox"
3794 msgstr ""
3795
3796 msgid "That should be all. Now your patchbomb is on its way out."
3797 msgstr ""
3798
3799 msgid ""
3399 3800 "You can also either configure the method option in the email section\n"
3400 3801 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3401 3802 "that the patchbomb extension can automatically send patchbombs\n"
@@ -3416,53 +3817,66 b' msgstr "ser diffstaten ovanf\xc3\xb6r okej ut?"'
3416 3817 msgid "diffstat rejected"
3417 3818 msgstr "diffstat avvisad"
3418 3819
3419 msgid ""
3420 "send changesets by email\n"
3421 "\n"
3820 msgid "send changesets by email"
3821 msgstr ""
3822
3823 msgid ""
3422 3824 " By default, diffs are sent in the format generated by hg export,\n"
3423 3825 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3424 " introduction, which describes the series as a whole.\n"
3425 "\n"
3826 " introduction, which describes the series as a whole."
3827 msgstr ""
3828
3829 msgid ""
3426 3830 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3427 3831 " the first line of the changeset description as the subject text.\n"
3428 3832 " The message contains two or three parts. First, the changeset\n"
3429 3833 " description. Next, (optionally) if the diffstat program is\n"
3430 3834 " installed and -d/--diffstat is used, the result of running\n"
3431 3835 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3432 " \"hg export\".\n"
3433 "\n"
3836 " \"hg export\"."
3837 msgstr ""
3838
3839 msgid ""
3434 3840 " By default the patch is included as text in the email body for\n"
3435 3841 " easy reviewing. Using the -a/--attach option will instead create\n"
3436 3842 " an attachment for the patch. With -i/--inline an inline attachment\n"
3437 " will be created.\n"
3438 "\n"
3843 " will be created."
3844 msgstr ""
3845
3846 msgid ""
3439 3847 " With -o/--outgoing, emails will be generated for patches not found\n"
3440 3848 " in the destination repository (or only those which are ancestors\n"
3441 " of the specified revisions if any are provided)\n"
3442 "\n"
3849 " of the specified revisions if any are provided)"
3850 msgstr ""
3851
3852 msgid ""
3443 3853 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
3444 3854 " single email containing a binary Mercurial bundle as an attachment\n"
3445 " will be sent.\n"
3446 "\n"
3447 " Examples::\n"
3448 "\n"
3855 " will be sent."
3856 msgstr ""
3857
3858 msgid ""
3449 3859 " hg email -r 3000 # send patch 3000 only\n"
3450 3860 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3451 3861 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3452 " hg email 3000 # send patch 3000 (deprecated)\n"
3453 "\n"
3862 " hg email 3000 # send patch 3000 (deprecated)"
3863 msgstr ""
3864
3865 msgid ""
3454 3866 " hg email -o # send all patches not in default\n"
3455 3867 " hg email -o DEST # send all patches not in DEST\n"
3456 3868 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3457 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3458 "\n"
3869 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST"
3870 msgstr ""
3871
3872 msgid ""
3459 3873 " hg email -b # send bundle of all patches not in default\n"
3460 3874 " hg email -b DEST # send bundle of all patches not in DEST\n"
3461 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3462 "default\n"
3463 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
3464 "DEST\n"
3465 "\n"
3875 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
3876 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST"
3877 msgstr ""
3878
3879 msgid ""
3466 3880 " Before using this command, you will need to enable email in your\n"
3467 3881 " hgrc. See the [email] section in hgrc(5) for details.\n"
3468 3882 " "
@@ -3482,14 +3896,11 b' msgstr ""'
3482 3896
3483 3897 msgid ""
3484 3898 "\n"
3485 "Write the introductory message for the patch series.\n"
3486 "\n"
3487 msgstr ""
3488
3489 #, python-format
3490 msgid ""
3491 "This patch series consists of %d patches.\n"
3492 "\n"
3899 "Write the introductory message for the patch series."
3900 msgstr ""
3901
3902 #, python-format
3903 msgid "This patch series consists of %d patches."
3493 3904 msgstr ""
3494 3905
3495 3906 msgid "Final summary:\n"
@@ -3573,16 +3984,20 b' msgstr ""'
3573 3984 msgid "hg email [OPTION]... [DEST]..."
3574 3985 msgstr ""
3575 3986
3576 msgid ""
3577 "show progress bars for some actions\n"
3578 "\n"
3987 msgid "show progress bars for some actions"
3988 msgstr ""
3989
3990 msgid ""
3579 3991 "This extension uses the progress information logged by hg commands\n"
3580 3992 "to draw progress bars that are as informative as possible. Some progress\n"
3581 3993 "bars only offer indeterminate information, while others have a definite\n"
3582 "end point.\n"
3583 "\n"
3584 "The following settings are available::\n"
3585 "\n"
3994 "end point."
3995 msgstr ""
3996
3997 msgid "The following settings are available::"
3998 msgstr ""
3999
4000 msgid ""
3586 4001 " [progress]\n"
3587 4002 " delay = 3 # number of seconds (float) before showing the progress bar\n"
3588 4003 " refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
@@ -3592,8 +4007,10 b' msgid ""'
3592 4007 " clear-complete = True # clear the progress bar after it's done\n"
3593 4008 " disable = False # if true, don't show a progress bar\n"
3594 4009 " assume-tty = False # if true, ALWAYS show a progress bar, unless\n"
3595 " # disable is given\n"
3596 "\n"
4010 " # disable is given"
4011 msgstr ""
4012
4013 msgid ""
3597 4014 "Valid entries for the format field are topic, bar, number, unit, and\n"
3598 4015 "item. item defaults to the last 20 characters of the item, but this\n"
3599 4016 "can be changed by adding either ``-<num>`` which would take the last\n"
@@ -3603,27 +4020,38 b' msgstr ""'
3603 4020 msgid "command to delete untracked files from the working directory"
3604 4021 msgstr ""
3605 4022
3606 msgid ""
3607 "removes files not tracked by Mercurial\n"
3608 "\n"
4023 msgid "removes files not tracked by Mercurial"
4024 msgstr ""
4025
4026 msgid ""
3609 4027 " Delete files not known to Mercurial. This is useful to test local\n"
3610 " and uncommitted changes in an otherwise-clean source tree.\n"
3611 "\n"
3612 " This means that purge will delete:\n"
3613 "\n"
4028 " and uncommitted changes in an otherwise-clean source tree."
4029 msgstr ""
4030
4031 msgid " This means that purge will delete:"
4032 msgstr ""
4033
4034 msgid ""
3614 4035 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3615 4036 " - Empty directories: in fact Mercurial ignores directories unless\n"
3616 " they contain files under source control management\n"
3617 "\n"
3618 " But it will leave untouched:\n"
3619 "\n"
4037 " they contain files under source control management"
4038 msgstr ""
4039
4040 msgid " But it will leave untouched:"
4041 msgstr ""
4042
4043 msgid ""
3620 4044 " - Modified and unmodified tracked files\n"
3621 4045 " - Ignored files (unless --all is specified)\n"
3622 " - New files added to the repository (with \"hg add\")\n"
3623 "\n"
4046 " - New files added to the repository (with \"hg add\")"
4047 msgstr ""
4048
4049 msgid ""
3624 4050 " If directories are given on the command line, only files in these\n"
3625 " directories are considered.\n"
3626 "\n"
4051 " directories are considered."
4052 msgstr ""
4053
4054 msgid ""
3627 4055 " Be careful with purge, as you could irreversibly delete some files\n"
3628 4056 " you forgot to add to the repository. If you only want to print the\n"
3629 4057 " list of files that this program would delete, use the --print\n"
@@ -3662,29 +4090,37 b' msgstr ""'
3662 4090 msgid "hg purge [OPTION]... [DIR]..."
3663 4091 msgstr ""
3664 4092
3665 msgid ""
3666 "command to move sets of revisions to a different ancestor\n"
3667 "\n"
4093 msgid "command to move sets of revisions to a different ancestor"
4094 msgstr ""
4095
4096 msgid ""
3668 4097 "This extension lets you rebase changesets in an existing Mercurial\n"
3669 "repository.\n"
3670 "\n"
4098 "repository."
4099 msgstr ""
4100
4101 msgid ""
3671 4102 "For more information:\n"
3672 4103 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
3673 4104 msgstr ""
3674 4105
3675 msgid ""
3676 "move changeset (and descendants) to a different branch\n"
3677 "\n"
4106 msgid "move changeset (and descendants) to a different branch"
4107 msgstr ""
4108
4109 msgid ""
3678 4110 " Rebase uses repeated merging to graft changesets from one part of\n"
3679 4111 " history (the source) onto another (the destination). This can be\n"
3680 4112 " useful for linearizing local changes relative to a master\n"
3681 " development tree.\n"
3682 "\n"
4113 " development tree."
4114 msgstr ""
4115
4116 msgid ""
3683 4117 " If you don't specify a destination changeset (``-d/--dest``),\n"
3684 4118 " rebase uses the tipmost head of the current named branch as the\n"
3685 4119 " destination. (The destination changeset is not modified by\n"
3686 " rebasing, but new changesets are added as its descendants.)\n"
3687 "\n"
4120 " rebasing, but new changesets are added as its descendants.)"
4121 msgstr ""
4122
4123 msgid ""
3688 4124 " You can specify which changesets to rebase in two ways: as a\n"
3689 4125 " \"source\" changeset or as a \"base\" changeset. Both are shorthand\n"
3690 4126 " for a topologically related set of changesets (the \"source\n"
@@ -3695,21 +4131,27 b' msgid ""'
3695 4131 " ``-b`` is less precise but more convenient than ``-s``: you can\n"
3696 4132 " specify any changeset in the source branch, and rebase will select\n"
3697 4133 " the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n"
3698 " uses the parent of the working directory as the base.\n"
3699 "\n"
4134 " uses the parent of the working directory as the base."
4135 msgstr ""
4136
4137 msgid ""
3700 4138 " By default, rebase recreates the changesets in the source branch\n"
3701 4139 " as descendants of dest and then destroys the originals. Use\n"
3702 4140 " ``--keep`` to preserve the original source changesets. Some\n"
3703 4141 " changesets in the source branch (e.g. merges from the destination\n"
3704 " branch) may be dropped if they no longer contribute any change.\n"
3705 "\n"
4142 " branch) may be dropped if they no longer contribute any change."
4143 msgstr ""
4144
4145 msgid ""
3706 4146 " One result of the rules for selecting the destination changeset\n"
3707 4147 " and source branch is that, unlike ``merge``, rebase will do\n"
3708 4148 " nothing if you are at the latest (tipmost) head of a named branch\n"
3709 4149 " with two heads. You need to explicitly specify source and/or\n"
3710 4150 " destination (or ``update`` to the other head, if it's the head of\n"
3711 " the intended source branch).\n"
3712 "\n"
4151 " the intended source branch)."
4152 msgstr ""
4153
4154 msgid ""
3713 4155 " If a rebase is interrupted to manually resolve a merge, it can be\n"
3714 4156 " continued with --continue/-c or aborted with --abort/-a.\n"
3715 4157 " "
@@ -3793,9 +4235,7 b' msgstr ""'
3793 4235 msgid "rebase from the specified changeset"
3794 4236 msgstr ""
3795 4237
3796 msgid ""
3797 "rebase from the base of the specified changeset (up to greatest common "
3798 "ancestor of base and dest)"
4238 msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)"
3799 4239 msgstr ""
3800 4240
3801 4241 msgid "rebase onto the specified changeset"
@@ -3885,30 +4325,41 b' msgstr ""'
3885 4325 msgid "record change %d/%d to %r?"
3886 4326 msgstr ""
3887 4327
3888 msgid ""
3889 "interactively select changes to commit\n"
3890 "\n"
4328 msgid "interactively select changes to commit"
4329 msgstr ""
4330
4331 msgid ""
3891 4332 " If a list of files is omitted, all changes reported by \"hg status\"\n"
3892 " will be candidates for recording.\n"
3893 "\n"
3894 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
3895 "\n"
4333 " will be candidates for recording."
4334 msgstr ""
4335
4336 msgid " See 'hg help dates' for a list of formats valid for -d/--date."
4337 msgstr ""
4338
4339 msgid ""
3896 4340 " You will be prompted for whether to record changes to each\n"
3897 4341 " modified file, and for files with multiple changes, for each\n"
3898 4342 " change to use. For each query, the following responses are\n"
3899 " possible::\n"
3900 "\n"
4343 " possible::"
4344 msgstr ""
4345
4346 msgid ""
3901 4347 " y - record this change\n"
3902 " n - skip this change\n"
3903 "\n"
4348 " n - skip this change"
4349 msgstr ""
4350
4351 msgid ""
3904 4352 " s - skip remaining changes to this file\n"
3905 " f - record remaining changes to this file\n"
3906 "\n"
4353 " f - record remaining changes to this file"
4354 msgstr ""
4355
4356 msgid ""
3907 4357 " d - done, skip remaining changes and files\n"
3908 4358 " a - record all changes to all remaining files\n"
3909 " q - quit, recording no changes\n"
3910 "\n"
3911 " ? - display help"
4359 " q - quit, recording no changes"
4360 msgstr ""
4361
4362 msgid " ? - display help"
3912 4363 msgstr ""
3913 4364
3914 4365 msgid "'mq' extension not loaded"
@@ -3932,27 +4383,38 b' msgstr ""'
3932 4383 msgid "recreates hardlinks between repository clones"
3933 4384 msgstr ""
3934 4385
3935 msgid ""
3936 "recreate hardlinks between two repositories\n"
3937 "\n"
4386 msgid "recreate hardlinks between two repositories"
4387 msgstr ""
4388
4389 msgid ""
3938 4390 " When repositories are cloned locally, their data files will be\n"
3939 " hardlinked so that they only use the space of a single repository.\n"
3940 "\n"
4391 " hardlinked so that they only use the space of a single repository."
4392 msgstr ""
4393
4394 msgid ""
3941 4395 " Unfortunately, subsequent pulls into either repository will break\n"
3942 4396 " hardlinks for any files touched by the new changesets, even if\n"
3943 " both repositories end up pulling the same changes.\n"
3944 "\n"
4397 " both repositories end up pulling the same changes."
4398 msgstr ""
4399
4400 msgid ""
3945 4401 " Similarly, passing --rev to \"hg clone\" will fail to use any\n"
3946 4402 " hardlinks, falling back to a complete copy of the source\n"
3947 " repository.\n"
3948 "\n"
4403 " repository."
4404 msgstr ""
4405
4406 msgid ""
3949 4407 " This command lets you recreate those hardlinks and reclaim that\n"
3950 " wasted space.\n"
3951 "\n"
4408 " wasted space."
4409 msgstr ""
4410
4411 msgid ""
3952 4412 " This repository will be relinked to share space with ORIGIN, which\n"
3953 4413 " must be on the same local disk. If ORIGIN is omitted, looks for\n"
3954 " \"default-relink\", then \"default\", in [paths].\n"
3955 "\n"
4414 " \"default-relink\", then \"default\", in [paths]."
4415 msgstr ""
4416
4417 msgid ""
3956 4418 " Do not attempt any read operations on this repository while the\n"
3957 4419 " command is running. (Both repositories will be locked against\n"
3958 4420 " writes.)\n"
@@ -3994,40 +4456,56 b' msgstr ""'
3994 4456 msgid "[ORIGIN]"
3995 4457 msgstr ""
3996 4458
3997 msgid ""
3998 "extend schemes with shortcuts to repository swarms\n"
3999 "\n"
4459 msgid "extend schemes with shortcuts to repository swarms"
4460 msgstr ""
4461
4462 msgid ""
4000 4463 "This extension allows you to specify shortcuts for parent URLs with a\n"
4001 "lot of repositories to act like a scheme, for example::\n"
4002 "\n"
4464 "lot of repositories to act like a scheme, for example::"
4465 msgstr ""
4466
4467 msgid ""
4003 4468 " [schemes]\n"
4004 " py = http://code.python.org/hg/\n"
4005 "\n"
4006 "After that you can use it like::\n"
4007 "\n"
4008 " hg clone py://trunk/\n"
4009 "\n"
4469 " py = http://code.python.org/hg/"
4470 msgstr ""
4471
4472 msgid "After that you can use it like::"
4473 msgstr ""
4474
4475 msgid " hg clone py://trunk/"
4476 msgstr ""
4477
4478 msgid ""
4010 4479 "Additionally there is support for some more complex schemas, for\n"
4011 "example used by Google Code::\n"
4012 "\n"
4480 "example used by Google Code::"
4481 msgstr ""
4482
4483 msgid ""
4013 4484 " [schemes]\n"
4014 " gcode = http://{1}.googlecode.com/hg/\n"
4015 "\n"
4485 " gcode = http://{1}.googlecode.com/hg/"
4486 msgstr ""
4487
4488 msgid ""
4016 4489 "The syntax is taken from Mercurial templates, and you have unlimited\n"
4017 4490 "number of variables, starting with ``{1}`` and continuing with\n"
4018 4491 "``{2}``, ``{3}`` and so on. This variables will receive parts of URL\n"
4019 4492 "supplied, split by ``/``. Anything not specified as ``{part}`` will be\n"
4020 "just appended to an URL.\n"
4021 "\n"
4022 "For convenience, the extension adds these schemes by default::\n"
4023 "\n"
4493 "just appended to an URL."
4494 msgstr ""
4495
4496 msgid "For convenience, the extension adds these schemes by default::"
4497 msgstr ""
4498
4499 msgid ""
4024 4500 " [schemes]\n"
4025 4501 " py = http://hg.python.org/\n"
4026 4502 " bb = https://bitbucket.org/\n"
4027 4503 " bb+ssh = ssh://hg@bitbucket.org/\n"
4028 4504 " gcode = https://{1}.googlecode.com/hg/\n"
4029 " kiln = https://{1}.kilnhg.com/Repo/\n"
4030 "\n"
4505 " kiln = https://{1}.kilnhg.com/Repo/"
4506 msgstr ""
4507
4508 msgid ""
4031 4509 "You can override a predefined scheme by defining a new scheme with the\n"
4032 4510 "same name.\n"
4033 4511 msgstr ""
@@ -4035,12 +4513,15 b' msgstr ""'
4035 4513 msgid "share a common history between several working directories"
4036 4514 msgstr ""
4037 4515
4038 msgid ""
4039 "create a new shared repository\n"
4040 "\n"
4516 msgid "create a new shared repository"
4517 msgstr ""
4518
4519 msgid ""
4041 4520 " Initialize a new repository and working directory that shares its\n"
4042 " history with another repository.\n"
4043 "\n"
4521 " history with another repository."
4522 msgstr ""
4523
4524 msgid ""
4044 4525 " NOTE: using rollback or extensions that destroy/modify history\n"
4045 4526 " (mq, rebase, etc.) can cause considerable confusion with shared\n"
4046 4527 " clones. In particular, if two shared clones are both updated to\n"
@@ -4059,11 +4540,13 b' msgstr ""'
4059 4540 msgid "[-U] SOURCE [DEST]"
4060 4541 msgstr ""
4061 4542
4062 msgid ""
4063 "command to transplant changesets from another branch\n"
4064 "\n"
4065 "This extension allows you to transplant patches from another branch.\n"
4066 "\n"
4543 msgid "command to transplant changesets from another branch"
4544 msgstr ""
4545
4546 msgid "This extension allows you to transplant patches from another branch."
4547 msgstr ""
4548
4549 msgid ""
4067 4550 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4068 4551 "map from a changeset hash to its hash in the source repository.\n"
4069 4552 msgstr ""
@@ -4138,38 +4621,52 b' msgstr "applicera \xc3\xa4ndring? [ynmpcq?]:"'
4138 4621 msgid "no such option\n"
4139 4622 msgstr "inget sådant alternativ\n"
4140 4623
4141 msgid ""
4142 "transplant changesets from another branch\n"
4143 "\n"
4624 msgid "transplant changesets from another branch"
4625 msgstr ""
4626
4627 msgid ""
4144 4628 " Selected changesets will be applied on top of the current working\n"
4145 4629 " directory with the log of the original changeset. If --log is\n"
4146 " specified, log messages will have a comment appended of the form::\n"
4147 "\n"
4148 " (transplanted from CHANGESETHASH)\n"
4149 "\n"
4630 " specified, log messages will have a comment appended of the form::"
4631 msgstr ""
4632
4633 msgid " (transplanted from CHANGESETHASH)"
4634 msgstr ""
4635
4636 msgid ""
4150 4637 " You can rewrite the changelog message with the --filter option.\n"
4151 4638 " Its argument will be invoked with the current changelog message as\n"
4152 " $1 and the patch as $2.\n"
4153 "\n"
4639 " $1 and the patch as $2."
4640 msgstr ""
4641
4642 msgid ""
4154 4643 " If --source/-s is specified, selects changesets from the named\n"
4155 4644 " repository. If --branch/-b is specified, selects changesets from\n"
4156 4645 " the branch holding the named revision, up to that revision. If\n"
4157 4646 " --all/-a is specified, all changesets on the branch will be\n"
4158 4647 " transplanted, otherwise you will be prompted to select the\n"
4159 " changesets you want.\n"
4160 "\n"
4648 " changesets you want."
4649 msgstr ""
4650
4651 msgid ""
4161 4652 " hg transplant --branch REVISION --all will rebase the selected\n"
4162 4653 " branch (up to the named revision) onto your current working\n"
4163 " directory.\n"
4164 "\n"
4654 " directory."
4655 msgstr ""
4656
4657 msgid ""
4165 4658 " You can optionally mark selected transplanted changesets as merge\n"
4166 4659 " changesets. You will not be prompted to transplant any ancestors\n"
4167 4660 " of a merged transplant, and you can merge descendants of them\n"
4168 " normally instead of transplanting them.\n"
4169 "\n"
4661 " normally instead of transplanting them."
4662 msgstr ""
4663
4664 msgid ""
4170 4665 " If no merges or revisions are provided, hg transplant will start\n"
4171 " an interactive changeset browser.\n"
4172 "\n"
4666 " an interactive changeset browser."
4667 msgstr ""
4668
4669 msgid ""
4173 4670 " If a changeset application fails, you can fix the merge by hand\n"
4174 4671 " and then resume where you left off by calling hg transplant\n"
4175 4672 " --continue/-c.\n"
@@ -4221,44 +4718,57 b' msgstr ""'
4221 4718 msgid "filter changesets through FILTER"
4222 4719 msgstr ""
4223 4720
4224 msgid ""
4225 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4226 msgstr ""
4227
4228 msgid ""
4229 "allow the use of MBCS paths with problematic encodings\n"
4230 "\n"
4721 msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4722 msgstr ""
4723
4724 msgid "allow the use of MBCS paths with problematic encodings"
4725 msgstr ""
4726
4727 msgid ""
4231 4728 "Some MBCS encodings are not good for some path operations (i.e.\n"
4232 4729 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4233 4730 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4234 4731 "This extension can be used to fix the issue with those encodings by\n"
4235 4732 "wrapping some functions to convert to Unicode string before path\n"
4236 "operation.\n"
4237 "\n"
4238 "This extension is useful for:\n"
4239 "\n"
4733 "operation."
4734 msgstr ""
4735
4736 msgid "This extension is useful for:"
4737 msgstr ""
4738
4739 msgid ""
4240 4740 "- Japanese Windows users using shift_jis encoding.\n"
4241 4741 "- Chinese Windows users using big5 encoding.\n"
4242 4742 "- All users who use a repository with one of problematic encodings on\n"
4243 " case-insensitive file system.\n"
4244 "\n"
4245 "This extension is not needed for:\n"
4246 "\n"
4743 " case-insensitive file system."
4744 msgstr ""
4745
4746 msgid "This extension is not needed for:"
4747 msgstr ""
4748
4749 msgid ""
4247 4750 "- Any user who use only ASCII chars in path.\n"
4248 "- Any user who do not use any of problematic encodings.\n"
4249 "\n"
4250 "Note that there are some limitations on using this extension:\n"
4251 "\n"
4252 "- You should use single encoding in one repository.\n"
4253 "\n"
4751 "- Any user who do not use any of problematic encodings."
4752 msgstr ""
4753
4754 msgid "Note that there are some limitations on using this extension:"
4755 msgstr ""
4756
4757 msgid "- You should use single encoding in one repository."
4758 msgstr ""
4759
4760 msgid ""
4254 4761 "\n"
4255 4762 "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n"
4256 "You can specify the encoding by config option::\n"
4257 "\n"
4763 "You can specify the encoding by config option::"
4764 msgstr ""
4765
4766 msgid ""
4258 4767 " [win32mbcs]\n"
4259 " encoding = sjis\n"
4260 "\n"
4261 "It is useful for the users who want to commit with UTF-8 log message.\n"
4768 " encoding = sjis"
4769 msgstr ""
4770
4771 msgid "It is useful for the users who want to commit with UTF-8 log message.\n"
4262 4772 msgstr ""
4263 4773
4264 4774 #, python-format
@@ -4268,31 +4778,41 b' msgstr ""'
4268 4778 msgid "[win32mbcs] cannot activate on this platform.\n"
4269 4779 msgstr ""
4270 4780
4271 msgid ""
4272 "perform automatic newline conversion\n"
4273 "\n"
4274 "To perform automatic newline conversion, use::\n"
4275 "\n"
4781 msgid "perform automatic newline conversion"
4782 msgstr ""
4783
4784 msgid "To perform automatic newline conversion, use::"
4785 msgstr ""
4786
4787 msgid ""
4276 4788 " [extensions]\n"
4277 4789 " win32text =\n"
4278 4790 " [encode]\n"
4279 4791 " ** = cleverencode:\n"
4280 " # or ** = macencode:\n"
4281 "\n"
4792 " # or ** = macencode:"
4793 msgstr ""
4794
4795 msgid ""
4282 4796 " [decode]\n"
4283 4797 " ** = cleverdecode:\n"
4284 " # or ** = macdecode:\n"
4285 "\n"
4286 "If not doing conversion, to make sure you do not commit CRLF/CR by "
4287 "accident::\n"
4288 "\n"
4798 " # or ** = macdecode:"
4799 msgstr ""
4800
4801 msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
4802 msgstr ""
4803
4804 msgid ""
4289 4805 " [hooks]\n"
4290 4806 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4291 " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
4292 "\n"
4807 " # or pretxncommit.cr = python:hgext.win32text.forbidcr"
4808 msgstr ""
4809
4810 msgid ""
4293 4811 "To do the same check on a server to prevent CRLF/CR from being\n"
4294 "pushed or pulled::\n"
4295 "\n"
4812 "pushed or pulled::"
4813 msgstr ""
4814
4815 msgid ""
4296 4816 " [hooks]\n"
4297 4817 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4298 4818 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
@@ -4318,13 +4838,21 b' msgstr ""'
4318 4838 msgid ""
4319 4839 "\n"
4320 4840 "To prevent this mistake in your local repository,\n"
4321 "add to Mercurial.ini or .hg/hgrc:\n"
4322 "\n"
4841 "add to Mercurial.ini or .hg/hgrc:"
4842 msgstr ""
4843
4844 #, python-format
4845 msgid ""
4323 4846 "[hooks]\n"
4324 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4325 "\n"
4326 "and also consider adding:\n"
4327 "\n"
4847 "pretxncommit.%s = python:hgext.win32text.forbid%s"
4848 msgstr ""
4849
4850 #, python-format
4851 msgid "and also consider adding:"
4852 msgstr ""
4853
4854 #, python-format
4855 msgid ""
4328 4856 "[extensions]\n"
4329 4857 "win32text =\n"
4330 4858 "[encode]\n"
@@ -4333,21 +4861,29 b' msgid ""'
4333 4861 "** = %sdecode:\n"
4334 4862 msgstr ""
4335 4863
4336 msgid ""
4337 "discover and advertise repositories on the local network\n"
4338 "\n"
4864 msgid "discover and advertise repositories on the local network"
4865 msgstr ""
4866
4867 msgid ""
4339 4868 "Zeroconf enabled repositories will be announced in a network without\n"
4340 4869 "the need to configure a server or a service. They can be discovered\n"
4341 "without knowing their actual IP address.\n"
4342 "\n"
4870 "without knowing their actual IP address."
4871 msgstr ""
4872
4873 msgid ""
4343 4874 "To allow other people to discover your repository using run \"hg serve\"\n"
4344 "in your repository::\n"
4345 "\n"
4875 "in your repository::"
4876 msgstr ""
4877
4878 msgid ""
4346 4879 " $ cd test\n"
4347 " $ hg serve\n"
4348 "\n"
4349 "You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
4350 "\n"
4880 " $ hg serve"
4881 msgstr ""
4882
4883 msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
4884 msgstr ""
4885
4886 msgid ""
4351 4887 " $ hg paths\n"
4352 4888 " zc-test = http://example.com:8000/test\n"
4353 4889 msgstr ""
@@ -4608,22 +5144,36 b' msgstr ""'
4608 5144 msgid "empty commit message"
4609 5145 msgstr ""
4610 5146
4611 msgid ""
4612 "add the specified files on the next commit\n"
4613 "\n"
5147 msgid "add the specified files on the next commit"
5148 msgstr "lägg till de specificerade filerna i nästa arkivering"
5149
5150 msgid ""
4614 5151 " Schedule files to be version controlled and added to the\n"
4615 " repository.\n"
4616 "\n"
5152 " repository."
5153 msgstr " Schemalägg filer att versionshanteras och läggas till i arkivet."
5154
5155 msgid ""
4617 5156 " The files will be added to the repository at the next commit. To\n"
4618 " undo an add before that, see hg forget.\n"
4619 "\n"
4620 " If no names are given, add all files to the repository.\n"
4621 "\n"
4622 " .. container:: verbose\n"
4623 "\n"
5157 " undo an add before that, see hg forget."
5158 msgstr ""
5159 " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n"
5160 " ångra en addering innan dess, se hg forget."
5161
5162 msgid " If no names are given, add all files to the repository."
5163 msgstr " Om inga namn anges, läggs alla filer till i arkivet."
5164
5165 msgid " .. container:: verbose"
5166 msgstr " .. container:: verbose"
5167
5168 msgid ""
4624 5169 " An example showing how new (unknown) files are added\n"
4625 " automatically by ``hg add``::\n"
4626 "\n"
5170 " automatically by ``hg add``::"
5171 msgstr ""
5172 " An example showing how new (unknown) files are added\n"
5173 " Ett exempel som visar hur nya (okända) filer läggs\n"
5174 " till automatiskt av ``hg add``::"
5175
5176 msgid ""
4627 5177 " $ ls\n"
4628 5178 " foo.c\n"
4629 5179 " $ hg status\n"
@@ -4634,21 +5184,6 b' msgid ""'
4634 5184 " A foo.c\n"
4635 5185 " "
4636 5186 msgstr ""
4637 "lägg till de specificerade filerna i nästa arkivering\n"
4638 "\n"
4639 " Schemalägg filer att versionshanteras och läggas till i arkivet.\n"
4640 "\n"
4641 " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n"
4642 " ångra en addering innan dess, se hg forget.\n"
4643 "\n"
4644 " Om inga namn anges, läggs alla filer till i arkivet.\n"
4645 "\n"
4646 " .. container:: verbose\n"
4647 "\n"
4648 " An example showing how new (unknown) files are added\n"
4649 " Ett exempel som visar hur nya (okända) filer läggs\n"
4650 " till automatiskt av ``hg add``::\n"
4651 "\n"
4652 5187 " $ ls\n"
4653 5188 " foo.c\n"
4654 5189 " $ hg status\n"
@@ -4659,16 +5194,24 b' msgstr ""'
4659 5194 " A foo.c\n"
4660 5195 " "
4661 5196
4662 msgid ""
4663 "add all new files, delete all missing files\n"
4664 "\n"
5197 msgid "add all new files, delete all missing files"
5198 msgstr "lägg till alla nya nya filer, radera alla saknade filer"
5199
5200 msgid ""
4665 5201 " Add all new files and remove all missing files from the\n"
4666 " repository.\n"
4667 "\n"
5202 " repository."
5203 msgstr " Lägg till alla nya filer och radera alla saknade filer från arkivet."
5204
5205 msgid ""
4668 5206 " New files are ignored if they match any of the patterns in\n"
4669 5207 " .hgignore. As with add, these changes take effect at the next\n"
4670 " commit.\n"
4671 "\n"
5208 " commit."
5209 msgstr ""
5210 " Nya filer ignoreras om de överrensstämmer något av mönstren i\n"
5211 " .hgignore. Precis som med add, kommer ändringarna att träda i kraft vid\n"
5212 " nästa arkivering."
5213
5214 msgid ""
4672 5215 " Use the -s/--similarity option to detect renamed files. With a\n"
4673 5216 " parameter greater than 0, this compares every removed file with\n"
4674 5217 " every added file and records those similar enough as renames. This\n"
@@ -4677,14 +5220,6 b' msgid ""'
4677 5220 " can be expensive.\n"
4678 5221 " "
4679 5222 msgstr ""
4680 "lägg till alla nya nya filer, radera alla saknade filer\n"
4681 "\n"
4682 " Lägg till alla nya filer och radera alla saknade filer från arkivet.\n"
4683 "\n"
4684 " Nya filer ignoreras om de överrensstämmer något av mönstren i\n"
4685 " .hgignore. Precis som med add, kommer ändringarna att träda i kraft vid\n"
4686 " nästa arkivering.\n"
4687 "\n"
4688 5223 " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n"
4689 5224 " parameter större än 0, kommer varje borttagen fil att jämföras med\n"
4690 5225 " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n"
@@ -4699,28 +5234,28 b' msgstr "likhet m\xc3\xa5ste vara ett nummer"'
4699 5234 msgid "similarity must be between 0 and 100"
4700 5235 msgstr "likhet måste vara mellan 0 och 100"
4701 5236
4702 msgid ""
4703 "show changeset information by line for each file\n"
4704 "\n"
5237 msgid "show changeset information by line for each file"
5238 msgstr "visa ändringsinformation för varje rad i filer"
5239
5240 msgid ""
4705 5241 " List changes in files, showing the revision id responsible for\n"
4706 " each line\n"
4707 "\n"
5242 " each line"
5243 msgstr " Visa ändringar i filer, och ansvarigt revisions-ID för varje rad"
5244
5245 msgid ""
4708 5246 " This command is useful for discovering when a change was made and\n"
4709 " by whom.\n"
4710 "\n"
5247 " by whom."
5248 msgstr ""
5249 " Detta kommando är användbart för att upptäcka när en ändring gjordes\n"
5250 " och av vem."
5251
5252 msgid ""
4711 5253 " Without the -a/--text option, annotate will avoid processing files\n"
4712 5254 " it detects as binary. With -a, annotate will annotate the file\n"
4713 5255 " anyway, although the results will probably be neither useful\n"
4714 5256 " nor desirable.\n"
4715 5257 " "
4716 5258 msgstr ""
4717 "visa ändringsinformation för varje rad i filer\n"
4718 "\n"
4719 " Visa ändringar i filer, och ansvarigt revisions-ID för varje rad\n"
4720 "\n"
4721 " Detta kommando är användbart för att upptäcka när en ändring gjordes\n"
4722 " och av vem.\n"
4723 "\n"
4724 5259 " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n"
4725 5260 " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n"
4726 5261 " om resultatet antagligen inte kommer att vara användbart.\n"
@@ -4736,53 +5271,55 b' msgstr ""'
4736 5271 msgid "%s: binary file\n"
4737 5272 msgstr ""
4738 5273
4739 msgid ""
4740 "create an unversioned archive of a repository revision\n"
4741 "\n"
5274 msgid "create an unversioned archive of a repository revision"
5275 msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision"
5276
5277 msgid ""
4742 5278 " By default, the revision used is the parent of the working\n"
4743 " directory; use -r/--rev to specify a different revision.\n"
4744 "\n"
5279 " directory; use -r/--rev to specify a different revision."
5280 msgstr ""
5281 " Som standard används revisonen för arbetskatalogens förälder; använd\n"
5282 " -r/--rev för att specificera en annan revision."
5283
5284 msgid ""
4745 5285 " The archive type is automatically detected based on file\n"
4746 " extension (or override using -t/--type).\n"
4747 "\n"
4748 " Valid types are:\n"
4749 "\n"
5286 " extension (or override using -t/--type)."
5287 msgstr ""
5288 " Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n"
5289 " med hjälp av -t/--type)."
5290
5291 msgid " Valid types are:"
5292 msgstr " Giltiga typer är:"
5293
5294 msgid ""
4750 5295 " :``files``: a directory full of files (default)\n"
4751 5296 " :``tar``: tar archive, uncompressed\n"
4752 5297 " :``tbz2``: tar archive, compressed using bzip2\n"
4753 5298 " :``tgz``: tar archive, compressed using gzip\n"
4754 5299 " :``uzip``: zip archive, uncompressed\n"
4755 " :``zip``: zip archive, compressed using deflate\n"
4756 "\n"
4757 " The exact name of the destination archive or directory is given\n"
4758 " using a format string; see 'hg help export' for details.\n"
4759 "\n"
4760 " Each member added to an archive file has a directory prefix\n"
4761 " prepended. Use -p/--prefix to specify a format string for the\n"
4762 " prefix. The default is the basename of the archive, with suffixes\n"
4763 " removed.\n"
4764 " "
4765 msgstr ""
4766 "skapa ett icke versionshanterat arkiv från en arkivrevision\n"
4767 "\n"
4768 " Som standard används revisonen för arbetskatalogens förälder; använd\n"
4769 " -r/--rev för att specificera en annan revision.\n"
4770 "\n"
4771 " Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n"
4772 " med hjälp av -t/--type).\n"
4773 "\n"
4774 " Giltiga typer är:\n"
4775 "\n"
5300 " :``zip``: zip archive, compressed using deflate"
5301 msgstr ""
4776 5302 " :``files``: en katalog fylld med filer (standard)\n"
4777 5303 " :``tar``: tar-arkiv, okomprimerad\n"
4778 5304 " :``tbz2``: tar-arkiv, komprimerad med bzip2\n"
4779 5305 " :``tgz``: tar-arkiv, komprimerad med gzip\n"
4780 5306 " :``uzip``: zip-arkiv, okomprimerad\n"
4781 " :``zip``: zip-arkiv, komprimerad med deflate\n"
4782 "\n"
5307 " :``zip``: zip-arkiv, komprimerad med deflate"
5308
5309 msgid ""
5310 " The exact name of the destination archive or directory is given\n"
5311 " using a format string; see 'hg help export' for details."
5312 msgstr ""
4783 5313 " Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n"
4784 " formatsträng; se 'hg help export' för detaljer.\n"
4785 "\n"
5314 " formatsträng; se 'hg help export' för detaljer."
5315
5316 msgid ""
5317 " Each member added to an archive file has a directory prefix\n"
5318 " prepended. Use -p/--prefix to specify a format string for the\n"
5319 " prefix. The default is the basename of the archive, with suffixes\n"
5320 " removed.\n"
5321 " "
5322 msgstr ""
4786 5323 " Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n"
4787 5324 " -p/--prefix för att specificera en formatsträn för prefixet. Som\n"
4788 5325 " standard används basnamnet för arkivet, med suffix borttagna.\n"
@@ -4797,41 +5334,36 b' msgstr "arkivroten kan inte vara destina'
4797 5334 msgid "cannot archive plain files to stdout"
4798 5335 msgstr "kan inte arkivera rena filer till stdout"
4799 5336
4800 msgid ""
4801 "reverse effect of earlier changeset\n"
4802 "\n"
5337 msgid "reverse effect of earlier changeset"
5338 msgstr "omvänd effekten från en tidigare ändring"
5339
5340 msgid ""
4803 5341 " Commit the backed out changes as a new changeset. The new\n"
4804 " changeset is a child of the backed out changeset.\n"
4805 "\n"
5342 " changeset is a child of the backed out changeset."
5343 msgstr ""
5344 " Arkivera de återkallade ändringarna som en ny ändring. Den nya\n"
5345 " ändringen är ett barn till den återkallade ändringen."
5346
5347 msgid ""
4806 5348 " If you backout a changeset other than the tip, a new head is\n"
4807 5349 " created. This head will be the new tip and you should merge this\n"
4808 " backout changeset with another head.\n"
4809 "\n"
5350 " backout changeset with another head."
5351 msgstr ""
5352 " Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n"
5353 " Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n"
5354 " ett annat huvud."
5355
5356 msgid ""
4810 5357 " The --merge option remembers the parent of the working directory\n"
4811 5358 " before starting the backout, then merges the new head with that\n"
4812 5359 " changeset afterwards. This saves you from doing the merge by hand.\n"
4813 " The result of this merge is not committed, as with a normal merge.\n"
4814 "\n"
4815 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4816 " "
4817 msgstr ""
4818 "omvänd effekten från en tidigare ändring\n"
4819 "\n"
4820 " Arkivera de återkallade ändringarna som en ny ändring. Den nya\n"
4821 " ändringen är ett barn till den återkallade ändringen.\n"
4822 "\n"
4823 " Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n"
4824 " Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n"
4825 " ett annat huvud.\n"
4826 "\n"
5360 " The result of this merge is not committed, as with a normal merge."
5361 msgstr ""
4827 5362 " Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n"
4828 5363 " återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n"
4829 5364 " ändringen efteråt. Detta gör att du inte behöver göra sammanfogningen\n"
4830 5365 " manuellt. Resultatet av sammanfogningen arkiveras inte, precis som en\n"
4831 " vanlig sammanfogning.\n"
4832 "\n"
4833 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
4834 " "
5366 " vanlig sammanfogning."
4835 5367
4836 5368 msgid "please specify just one revision"
4837 5369 msgstr "specificera bara en revision"
@@ -4869,9 +5401,10 b' msgstr "\xc3\xa5terkallnings\xc3\xa4ndringen \xc3\xa4r ett nytt huvud - gl\xc3\xb6m inte att sammanfoga\\n"'
4869 5401 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
4870 5402 msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n"
4871 5403
4872 msgid ""
4873 "subdivision search of changesets\n"
4874 "\n"
5404 msgid "subdivision search of changesets"
5405 msgstr "genomsökning av ändringar med halveringsmetoden"
5406
5407 msgid ""
4875 5408 " This command helps to find changesets which introduce problems. To\n"
4876 5409 " use, mark the earliest changeset you know exhibits the problem as\n"
4877 5410 " bad, then mark the latest changeset which is free from the problem\n"
@@ -4879,31 +5412,31 b' msgid ""'
4879 5412 " for testing (unless the -U/--noupdate option is specified). Once\n"
4880 5413 " you have performed tests, mark the working directory as good or\n"
4881 5414 " bad, and bisect will either update to another candidate changeset\n"
4882 " or announce that it has found the bad revision.\n"
4883 "\n"
4884 " As a shortcut, you can also use the revision argument to mark a\n"
4885 " revision as good or bad without checking it out first.\n"
4886 "\n"
4887 " If you supply a command, it will be used for automatic bisection.\n"
4888 " Its exit status will be used to mark revisions as good or bad:\n"
4889 " status 0 means good, 125 means to skip the revision, 127\n"
4890 " (command not found) will abort the bisection, and any other\n"
4891 " non-zero exit status means the revision is bad.\n"
4892 " "
4893 msgstr ""
4894 "genomsökning av ändringar med halveringsmetoden\n"
4895 "\n"
5415 " or announce that it has found the bad revision."
5416 msgstr ""
4896 5417 " Detta kommando hjälper till att hitta ändringar som skapar problem. För\n"
4897 5418 " att använda, markera den tidigaste ändringen du vet har problemet som\n"
4898 5419 " dålig, och markera sedan den senaste problemfria ändringen som bra.\n"
4899 5420 " Bisect uppdaterar din arbetskatalog till en revision för testning (om\n"
4900 5421 " inte -U/--noupdate anges). När du har testat, markera arbetskatalogen\n"
4901 5422 " som bra eller dålig, och bisect kommer endera att uppdatera till en\n"
4902 " annan kandidat eller meddela att den dåliga revisionen har hittats.\n"
4903 "\n"
5423 " annan kandidat eller meddela att den dåliga revisionen har hittats."
5424
5425 msgid ""
5426 " As a shortcut, you can also use the revision argument to mark a\n"
5427 " revision as good or bad without checking it out first."
5428 msgstr ""
4904 5429 " Som en genväg kan du också använda revisionsargumentet för att markera\n"
4905 " en revision som bra eller dålig utan att kontrollera den först.\n"
4906 "\n"
5430 " en revision som bra eller dålig utan att kontrollera den först."
5431
5432 msgid ""
5433 " If you supply a command, it will be used for automatic bisection.\n"
5434 " Its exit status will be used to mark revisions as good or bad:\n"
5435 " status 0 means good, 125 means to skip the revision, 127\n"
5436 " (command not found) will abort the bisection, and any other\n"
5437 " non-zero exit status means the revision is bad.\n"
5438 " "
5439 msgstr ""
4907 5440 " Om du tillhandahåller ett kommando, kommer det att användas för\n"
4908 5441 " automatisk genomsökning. Dess returkod kommer att användas för att ange\n"
4909 5442 " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n"
@@ -4918,12 +5451,10 b' msgid "The first bad revision is:\\n"'
4918 5451 msgstr "Den första dåliga revisionen är:\n"
4919 5452
4920 5453 msgid "Due to skipped revisions, the first good revision could be any of:\n"
4921 msgstr ""
4922 "Tack vare skippade revisioner, är den första bra revisionen någon av:\n"
5454 msgstr "Tack vare skippade revisioner, är den första bra revisionen någon av:\n"
4923 5455
4924 5456 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
4925 msgstr ""
4926 "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n"
5457 msgstr "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n"
4927 5458
4928 5459 msgid "cannot bisect (no known good revisions)"
4929 5460 msgstr "kan inte genomsöka (inga kända bra revisioner)"
@@ -4953,41 +5484,43 b' msgstr "\xc3\x84ndring %d:%s: %s\\n"'
4953 5484 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
4954 5485 msgstr "Testar ändring %d:%s (%d ändringar kvar, ~%d test)\n"
4955 5486
4956 msgid ""
4957 "set or show the current branch name\n"
4958 "\n"
5487 msgid "set or show the current branch name"
5488 msgstr "sätt eller visa det aktuella grennamnet"
5489
5490 msgid ""
4959 5491 " With no argument, show the current branch name. With one argument,\n"
4960 5492 " set the working directory branch name (the branch will not exist\n"
4961 5493 " in the repository until the next commit). Standard practice\n"
4962 5494 " recommends that primary development take place on the 'default'\n"
4963 " branch.\n"
4964 "\n"
4965 " 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"
4967 "\n"
4968 " 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"
4970 " change.\n"
4971 "\n"
4972 " 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"
4974 " "
4975 msgstr ""
4976 "sätt eller visa det aktuella grennamnet\n"
4977 "\n"
5495 " branch."
5496 msgstr ""
4978 5497 " Utan arguments visas det aktuella grennamnet. Med ett argument\n"
4979 5498 " sätts arbetskatalogens grennamn (grenen existerar inte i arkivet\n"
4980 5499 " förrän nästa arkivering). Standardförfarandet är att all primär\n"
4981 " utveckling sker i grenen 'default'.\n"
4982 "\n"
5500 " utveckling sker i grenen 'default'."
5501
5502 msgid ""
5503 " Unless -f/--force is specified, branch will not let you set a\n"
5504 " branch name that already exists, even if it's inactive."
5505 msgstr ""
4983 5506 " Om inte -f/--force är specificerad, kommer branch inte att tillåta\n"
4984 5507 " dig att sätta ett grennamn som redan existerar, även om den är\n"
4985 " inaktiv.\n"
4986 "\n"
5508 " inaktiv."
5509
5510 msgid ""
5511 " Use -C/--clean to reset the working directory branch to that of\n"
5512 " the parent of the working directory, negating a previous branch\n"
5513 " change."
5514 msgstr ""
4987 5515 " Använd -C/--clean för att återställa arbetskatalogens gren till\n"
4988 5516 " samma som förälderns arbetskatalog, och återställer ett tidigare\n"
4989 " grenbyte.\n"
4990 "\n"
5517 " grenbyte."
5518
5519 msgid ""
5520 " Use the command 'hg update' to switch to an existing branch. Use\n"
5521 " 'hg commit --close-branch' to mark this branch as closed.\n"
5522 " "
5523 msgstr ""
4991 5524 " Använd kommandot 'hg update' för att byta till en existerande gren.\n"
4992 5525 " Använd 'hg commit --close-branch' för att markera grenen som stängd.\n"
4993 5526 " "
@@ -4996,37 +5529,36 b' msgstr ""'
4996 5529 msgid "reset working directory to branch %s\n"
4997 5530 msgstr "återställ arbetskatalogen till grenen %s\n"
4998 5531
4999 msgid ""
5000 "a branch of the same name already exists (use 'hg update' to switch to it)"
5001 msgstr ""
5002 "en gren med samma namn finns redan (kör 'hg update' för att byta till den)"
5532 msgid "a branch of the same name already exists (use 'hg update' to switch to it)"
5533 msgstr "en gren med samma namn finns redan (kör 'hg update' för att byta till den)"
5003 5534
5004 5535 #, python-format
5005 5536 msgid "marked working directory as branch %s\n"
5006 5537 msgstr "markerade arbetskatalogen som grenen %s\n"
5007 5538
5008 msgid ""
5009 "list repository named branches\n"
5010 "\n"
5539 msgid "list repository named branches"
5540 msgstr "visa namngivna grenar i arkivet"
5541
5542 msgid ""
5011 5543 " List the repository's named branches, indicating which ones are\n"
5012 5544 " inactive. If -c/--closed is specified, also list branches which have\n"
5013 " been marked closed (see hg commit --close-branch).\n"
5014 "\n"
5015 " If -a/--active is specified, only show active branches. A branch\n"
5016 " is considered active if it contains repository heads.\n"
5017 "\n"
5018 " Use the command 'hg update' to switch to an existing branch.\n"
5019 " "
5020 msgstr ""
5021 "visa namngivna grenar i arkivet\n"
5022 "\n"
5545 " been marked closed (see hg commit --close-branch)."
5546 msgstr ""
5023 5547 " Visa alla namngivna grenar i arkivet, och indikera vilka som är\n"
5024 5548 " inaktiva. Om -c/--closed anges, visas också grenar som har markerats\n"
5025 " som stängda (se hg commit --close-branch).\n"
5026 "\n"
5549 " som stängda (se hg commit --close-branch)."
5550
5551 msgid ""
5552 " If -a/--active is specified, only show active branches. A branch\n"
5553 " is considered active if it contains repository heads."
5554 msgstr ""
5027 5555 " Om -a/--acive anges, visas bara aktiva grenar. En gren anses aktiv om\n"
5028 " den innehåller arkivhuvuden.\n"
5029 "\n"
5556 " den innehåller arkivhuvuden."
5557
5558 msgid ""
5559 " Use the command 'hg update' to switch to an existing branch.\n"
5560 " "
5561 msgstr ""
5030 5562 " Använd kommandot 'hg update' för att byta till en existerande gren.\n"
5031 5563 " "
5032 5564
@@ -5036,48 +5568,51 b' msgstr " (st\xc3\xa4ngd)"'
5036 5568 msgid " (inactive)"
5037 5569 msgstr " (inaktiv)"
5038 5570
5039 msgid ""
5040 "create a changegroup file\n"
5041 "\n"
5571 msgid "create a changegroup file"
5572 msgstr "skapa en ändringsgruppsfil"
5573
5574 msgid ""
5042 5575 " Generate a compressed changegroup file collecting changesets not\n"
5043 " known to be in another repository.\n"
5044 "\n"
5576 " known to be in another repository."
5577 msgstr ""
5578 " Skapa en komprimerad ändringsgruppfil genom att samla ihop ändringar\n"
5579 " som inte finns i ett annat arkiv."
5580
5581 msgid ""
5045 5582 " If you omit the destination repository, then hg assumes the\n"
5046 5583 " destination will have all the nodes you specify with --base\n"
5047 5584 " parameters. To create a bundle containing all changesets, use\n"
5048 " -a/--all (or --base null).\n"
5049 "\n"
5585 " -a/--all (or --base null)."
5586 msgstr ""
5587 " Om inget destinationsarkiv anges, så antar hg att destinationen har\n"
5588 " alla noder du anger med parametrar av typen --base. För att skapa en\n"
5589 " bunt med alla ändringar, använd -a/--all (eller --base null)."
5590
5591 msgid ""
5050 5592 " You can change compression method with the -t/--type option.\n"
5051 5593 " The available compression methods are: none, bzip2, and\n"
5052 " gzip (by default, bundles are compressed using bzip2).\n"
5053 "\n"
5594 " gzip (by default, bundles are compressed using bzip2)."
5595 msgstr ""
5596 " Du kan ändra kompressionsmetod med flaggan -t/--type. De tillgänliga\n"
5597 " kompressionsmetoderna är: none, bzip2, och gzip (som standard\n"
5598 " komprimeras buntar med bzip2)."
5599
5600 msgid ""
5054 5601 " The bundle file can then be transferred using conventional means\n"
5055 5602 " and applied to another repository with the unbundle or pull\n"
5056 5603 " command. This is useful when direct push and pull are not\n"
5057 " available or when exporting an entire repository is undesirable.\n"
5058 "\n"
5059 " Applying bundles preserves all changeset contents including\n"
5060 " permissions, copy/rename information, and revision history.\n"
5061 " "
5062 msgstr ""
5063 "skapa en ändringsgruppsfil\n"
5064 "\n"
5065 " Skapa en komprimerad ändringsgruppfil genom att samla ihop ändringar\n"
5066 " som inte finns i ett annat arkiv.\n"
5067 "\n"
5068 " Om inget destinationsarkiv anges, så antar hg att destinationen har\n"
5069 " alla noder du anger med parametrar av typen --base. För att skapa en\n"
5070 " bunt med alla ändringar, använd -a/--all (eller --base null).\n"
5071 "\n"
5072 " Du kan ändra kompressionsmetod med flaggan -t/--type. De tillgänliga\n"
5073 " kompressionsmetoderna är: none, bzip2, och gzip (som standard\n"
5074 " komprimeras buntar med bzip2).\n"
5075 "\n"
5604 " available or when exporting an entire repository is undesirable."
5605 msgstr ""
5076 5606 " Buntfilen kan överföras med konventionella metoder och appliceras i\n"
5077 5607 " ett annat arkiv med kommandot unbundle eller pull. Detta är\n"
5078 5608 " användbart när en direkt push och pull inte är tillgängliga eller\n"
5079 " när export av ett helt arkiv inte är intressant.\n"
5080 "\n"
5609 " när export av ett helt arkiv inte är intressant."
5610
5611 msgid ""
5612 " Applying bundles preserves all changeset contents including\n"
5613 " permissions, copy/rename information, and revision history.\n"
5614 " "
5615 msgstr ""
5081 5616 " Applicering av buntar bevarar all ändringsinnehåll inklusive\n"
5082 5617 " tillstånd, information om kopior/namnbyte, och revisionshistorik.\n"
5083 5618 " "
@@ -5088,54 +5623,419 b' msgstr "--base \xc3\xa4r inkompatibel med specificering av destination"'
5088 5623 msgid "unknown bundle type specified with --type"
5089 5624 msgstr "okänd bunttyp specificerad med --type"
5090 5625
5091 msgid ""
5092 "output the current or given revision of files\n"
5093 "\n"
5626 msgid "output the current or given revision of files"
5627 msgstr "visa den aktuella eller angivna revisionen för filer"
5628
5629 msgid ""
5094 5630 " Print the specified files as they were at the given revision. If\n"
5095 5631 " no revision is given, the parent of the working directory is used,\n"
5096 " or tip if no revision is checked out.\n"
5097 "\n"
5632 " or tip if no revision is checked out."
5633 msgstr ""
5634 " Visa de angivna filerna som de ser ut i den angivna revisionen. Om\n"
5635 " ingen revision anges, så används arbetskatalogens förälder, eller tip\n"
5636 " om ingen revision är uthämtad."
5637
5638 msgid ""
5098 5639 " Output may be to a file, in which case the name of the file is\n"
5099 5640 " given using a format string. The formatting rules are the same as\n"
5100 " for the export command, with the following additions:\n"
5101 "\n"
5641 " for the export command, with the following additions:"
5642 msgstr ""
5643 " Utmatning kan vara till en fil, och då anges filnamnet med en\n"
5644 " formatsträng. Formatteringsreglerna är samma som för kommandot\n"
5645 " export, med följande tillägg:"
5646
5647 msgid ""
5102 5648 " :``%s``: basename of file being printed\n"
5103 5649 " :``%d``: dirname of file being printed, or '.' if in repository root\n"
5104 5650 " :``%p``: root-relative path name of file being printed\n"
5105 5651 " "
5106 5652 msgstr ""
5107 "visa den aktuella eller angivna revisionen för filer\n"
5108 "\n"
5109 " Visa de angivna filerna som de ser ut i den angivna revisionen. Om\n"
5110 " ingen revision anges, så används arbetskatalogens förälder, eller tip\n"
5111 " om ingen revision är uthämtad.\n"
5112 "\n"
5113 " Utmatning kan vara till en fil, och då anges filnamnet med en\n"
5114 " formatsträng. Formatteringsreglerna är samma som för kommandot\n"
5115 " export, med följande tillägg:\n"
5116 "\n"
5117 5653 " :``%s``: basnamn på den visade filen\n"
5118 5654 " :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n"
5119 5655 " :``%p``: rotrelativ sökvägsnamn för den visade filen\n"
5120 5656 " "
5121 5657
5122 msgid ""
5123 "make a copy of an existing repository\n"
5124 "\n"
5125 " Create a copy of an existing repository in a new directory.\n"
5126 "\n"
5658 #, fuzzy
5659 msgid "make a copy of an existing repository"
5660 msgstr ""
5661 "gör en kopia av ett existerande arkiv\n"
5662 "\n"
5663 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5664 "\n"
5665 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5666 " källan att användas.\n"
5667 "\n"
5668 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5669 " som standardplats att användas för framtida dragningar.\n"
5670 "\n"
5671 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5672 "\n"
5673 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
5674 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
5675 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
5676 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
5677 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
5678 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
5679 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
5680 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
5681 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
5682 " att finnas i destinationen.\n"
5683 "\n"
5684 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
5685 " --pull, även för lokala arkiv.\n"
5686 "\n"
5687 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5688 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5689 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
5690 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5691 " för att undvika användning av hårda länkar.\n"
5692 "\n"
5693 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
5694 " hårdlänkade, med ::\n"
5695 "\n"
5696 " $ cp -al ARKIV ARKIVKLON\n"
5697 "\n"
5698 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5699 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5700 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5701 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5702 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5703 " under katalogen .hg, som mq.\n"
5704 "\n"
5705 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
5706 " revisionen från den här listan:\n"
5707 "\n"
5708 " a) null med -U eller källarkivet inte har några ändringar\n"
5709 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
5710 " arbetskatalog\n"
5711 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
5712 " huvudet på den grenen)\n"
5713 " d) ändringen angiven med -r\n"
5714 " e) det högsta huvudet angivet med -b\n"
5715 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
5716 " g) det högsta huvudet på default-grenen\n"
5717 " h) tip\n"
5718 " "
5719
5720 #, fuzzy
5721 msgid " Create a copy of an existing repository in a new directory."
5722 msgstr ""
5723 "gör en kopia av ett existerande arkiv\n"
5724 "\n"
5725 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5726 "\n"
5727 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5728 " källan att användas.\n"
5729 "\n"
5730 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5731 " som standardplats att användas för framtida dragningar.\n"
5732 "\n"
5733 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5734 "\n"
5735 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
5736 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
5737 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
5738 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
5739 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
5740 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
5741 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
5742 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
5743 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
5744 " att finnas i destinationen.\n"
5745 "\n"
5746 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
5747 " --pull, även för lokala arkiv.\n"
5748 "\n"
5749 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5750 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5751 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
5752 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5753 " för att undvika användning av hårda länkar.\n"
5754 "\n"
5755 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
5756 " hårdlänkade, med ::\n"
5757 "\n"
5758 " $ cp -al ARKIV ARKIVKLON\n"
5759 "\n"
5760 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5761 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5762 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5763 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5764 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5765 " under katalogen .hg, som mq.\n"
5766 "\n"
5767 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
5768 " revisionen från den här listan:\n"
5769 "\n"
5770 " a) null med -U eller källarkivet inte har några ändringar\n"
5771 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
5772 " arbetskatalog\n"
5773 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
5774 " huvudet på den grenen)\n"
5775 " d) ändringen angiven med -r\n"
5776 " e) det högsta huvudet angivet med -b\n"
5777 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
5778 " g) det högsta huvudet på default-grenen\n"
5779 " h) tip\n"
5780 " "
5781
5782 #, fuzzy
5783 msgid ""
5127 5784 " If no destination directory name is specified, it defaults to the\n"
5128 " basename of the source.\n"
5129 "\n"
5785 " basename of the source."
5786 msgstr ""
5787 "gör en kopia av ett existerande arkiv\n"
5788 "\n"
5789 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5790 "\n"
5791 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5792 " källan att användas.\n"
5793 "\n"
5794 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5795 " som standardplats att användas för framtida dragningar.\n"
5796 "\n"
5797 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5798 "\n"
5799 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
5800 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
5801 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
5802 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
5803 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
5804 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
5805 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
5806 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
5807 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
5808 " att finnas i destinationen.\n"
5809 "\n"
5810 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
5811 " --pull, även för lokala arkiv.\n"
5812 "\n"
5813 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5814 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5815 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
5816 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5817 " för att undvika användning av hårda länkar.\n"
5818 "\n"
5819 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
5820 " hårdlänkade, med ::\n"
5821 "\n"
5822 " $ cp -al ARKIV ARKIVKLON\n"
5823 "\n"
5824 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5825 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5826 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5827 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5828 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5829 " under katalogen .hg, som mq.\n"
5830 "\n"
5831 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
5832 " revisionen från den här listan:\n"
5833 "\n"
5834 " a) null med -U eller källarkivet inte har några ändringar\n"
5835 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
5836 " arbetskatalog\n"
5837 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
5838 " huvudet på den grenen)\n"
5839 " d) ändringen angiven med -r\n"
5840 " e) det högsta huvudet angivet med -b\n"
5841 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
5842 " g) det högsta huvudet på default-grenen\n"
5843 " h) tip\n"
5844 " "
5845
5846 #, fuzzy
5847 msgid ""
5130 5848 " The location of the source is added to the new repository's\n"
5131 " .hg/hgrc file, as the default to be used for future pulls.\n"
5132 "\n"
5133 " See 'hg help urls' for valid source format details.\n"
5134 "\n"
5849 " .hg/hgrc file, as the default to be used for future pulls."
5850 msgstr ""
5851 "gör en kopia av ett existerande arkiv\n"
5852 "\n"
5853 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5854 "\n"
5855 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5856 " källan att användas.\n"
5857 "\n"
5858 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5859 " som standardplats att användas för framtida dragningar.\n"
5860 "\n"
5861 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5862 "\n"
5863 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
5864 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
5865 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
5866 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
5867 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
5868 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
5869 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
5870 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
5871 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
5872 " att finnas i destinationen.\n"
5873 "\n"
5874 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
5875 " --pull, även för lokala arkiv.\n"
5876 "\n"
5877 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5878 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5879 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
5880 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5881 " för att undvika användning av hårda länkar.\n"
5882 "\n"
5883 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
5884 " hårdlänkade, med ::\n"
5885 "\n"
5886 " $ cp -al ARKIV ARKIVKLON\n"
5887 "\n"
5888 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5889 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5890 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5891 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5892 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5893 " under katalogen .hg, som mq.\n"
5894 "\n"
5895 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
5896 " revisionen från den här listan:\n"
5897 "\n"
5898 " a) null med -U eller källarkivet inte har några ändringar\n"
5899 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
5900 " arbetskatalog\n"
5901 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
5902 " huvudet på den grenen)\n"
5903 " d) ändringen angiven med -r\n"
5904 " e) det högsta huvudet angivet med -b\n"
5905 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
5906 " g) det högsta huvudet på default-grenen\n"
5907 " h) tip\n"
5908 " "
5909
5910 #, fuzzy
5911 msgid " See 'hg help urls' for valid source format details."
5912 msgstr ""
5913 "gör en kopia av ett existerande arkiv\n"
5914 "\n"
5915 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5916 "\n"
5917 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5918 " källan att användas.\n"
5919 "\n"
5920 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5921 " som standardplats att användas för framtida dragningar.\n"
5922 "\n"
5923 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5924 "\n"
5925 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
5926 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
5927 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
5928 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
5929 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
5930 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
5931 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
5932 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
5933 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
5934 " att finnas i destinationen.\n"
5935 "\n"
5936 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
5937 " --pull, även för lokala arkiv.\n"
5938 "\n"
5939 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
5940 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
5941 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
5942 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
5943 " för att undvika användning av hårda länkar.\n"
5944 "\n"
5945 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
5946 " hårdlänkade, med ::\n"
5947 "\n"
5948 " $ cp -al ARKIV ARKIVKLON\n"
5949 "\n"
5950 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
5951 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
5952 " operationen är upp till dig) och du måste se till att din editor bryter\n"
5953 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
5954 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
5955 " under katalogen .hg, som mq.\n"
5956 "\n"
5957 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
5958 " revisionen från den här listan:\n"
5959 "\n"
5960 " a) null med -U eller källarkivet inte har några ändringar\n"
5961 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
5962 " arbetskatalog\n"
5963 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
5964 " huvudet på den grenen)\n"
5965 " d) ändringen angiven med -r\n"
5966 " e) det högsta huvudet angivet med -b\n"
5967 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
5968 " g) det högsta huvudet på default-grenen\n"
5969 " h) tip\n"
5970 " "
5971
5972 #, fuzzy
5973 msgid ""
5135 5974 " It is possible to specify an ``ssh://`` URL as the destination, but no\n"
5136 5975 " .hg/hgrc and working directory will be created on the remote side.\n"
5137 " Please see 'hg help urls' for important details about ``ssh://`` URLs.\n"
5138 "\n"
5976 " Please see 'hg help urls' for important details about ``ssh://`` URLs."
5977 msgstr ""
5978 "gör en kopia av ett existerande arkiv\n"
5979 "\n"
5980 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
5981 "\n"
5982 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
5983 " källan att användas.\n"
5984 "\n"
5985 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
5986 " som standardplats att användas för framtida dragningar.\n"
5987 "\n"
5988 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
5989 "\n"
5990 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
5991 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
5992 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
5993 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
5994 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
5995 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
5996 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
5997 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
5998 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
5999 " att finnas i destinationen.\n"
6000 "\n"
6001 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6002 " --pull, även för lokala arkiv.\n"
6003 "\n"
6004 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6005 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6006 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6007 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6008 " för att undvika användning av hårda länkar.\n"
6009 "\n"
6010 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6011 " hårdlänkade, med ::\n"
6012 "\n"
6013 " $ cp -al ARKIV ARKIVKLON\n"
6014 "\n"
6015 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6016 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6017 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6018 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6019 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6020 " under katalogen .hg, som mq.\n"
6021 "\n"
6022 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6023 " revisionen från den här listan:\n"
6024 "\n"
6025 " a) null med -U eller källarkivet inte har några ändringar\n"
6026 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6027 " arbetskatalog\n"
6028 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6029 " huvudet på den grenen)\n"
6030 " d) ändringen angiven med -r\n"
6031 " e) det högsta huvudet angivet med -b\n"
6032 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6033 " g) det högsta huvudet på default-grenen\n"
6034 " h) tip\n"
6035 " "
6036
6037 #, fuzzy
6038 msgid ""
5139 6039 " A set of changesets (tags, or branch names) to pull may be specified\n"
5140 6040 " by listing each changeset (tag, or branch name) with -r/--rev.\n"
5141 6041 " If -r/--rev is used, the cloned repository will contain only a subset\n"
@@ -5143,33 +6043,459 b' msgid ""'
5143 6043 " defined by all -r/--rev options (including all their ancestors)\n"
5144 6044 " will be pulled into the destination repository.\n"
5145 6045 " No subsequent changesets (including subsequent tags) will be present\n"
5146 " in the destination.\n"
5147 "\n"
6046 " in the destination."
6047 msgstr ""
6048 "gör en kopia av ett existerande arkiv\n"
6049 "\n"
6050 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6051 "\n"
6052 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6053 " källan att användas.\n"
6054 "\n"
6055 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6056 " som standardplats att användas för framtida dragningar.\n"
6057 "\n"
6058 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6059 "\n"
6060 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6061 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6062 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6063 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6064 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6065 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6066 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6067 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6068 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6069 " att finnas i destinationen.\n"
6070 "\n"
6071 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6072 " --pull, även för lokala arkiv.\n"
6073 "\n"
6074 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6075 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6076 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6077 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6078 " för att undvika användning av hårda länkar.\n"
6079 "\n"
6080 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6081 " hårdlänkade, med ::\n"
6082 "\n"
6083 " $ cp -al ARKIV ARKIVKLON\n"
6084 "\n"
6085 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6086 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6087 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6088 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6089 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6090 " under katalogen .hg, som mq.\n"
6091 "\n"
6092 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6093 " revisionen från den här listan:\n"
6094 "\n"
6095 " a) null med -U eller källarkivet inte har några ändringar\n"
6096 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6097 " arbetskatalog\n"
6098 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6099 " huvudet på den grenen)\n"
6100 " d) ändringen angiven med -r\n"
6101 " e) det högsta huvudet angivet med -b\n"
6102 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6103 " g) det högsta huvudet på default-grenen\n"
6104 " h) tip\n"
6105 " "
6106
6107 #, fuzzy
6108 msgid ""
5148 6109 " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
5149 " local source repositories.\n"
5150 "\n"
6110 " local source repositories."
6111 msgstr ""
6112 "gör en kopia av ett existerande arkiv\n"
6113 "\n"
6114 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6115 "\n"
6116 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6117 " källan att användas.\n"
6118 "\n"
6119 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6120 " som standardplats att användas för framtida dragningar.\n"
6121 "\n"
6122 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6123 "\n"
6124 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6125 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6126 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6127 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6128 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6129 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6130 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6131 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6132 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6133 " att finnas i destinationen.\n"
6134 "\n"
6135 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6136 " --pull, även för lokala arkiv.\n"
6137 "\n"
6138 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6139 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6140 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6141 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6142 " för att undvika användning av hårda länkar.\n"
6143 "\n"
6144 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6145 " hårdlänkade, med ::\n"
6146 "\n"
6147 " $ cp -al ARKIV ARKIVKLON\n"
6148 "\n"
6149 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6150 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6151 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6152 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6153 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6154 " under katalogen .hg, som mq.\n"
6155 "\n"
6156 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6157 " revisionen från den här listan:\n"
6158 "\n"
6159 " a) null med -U eller källarkivet inte har några ändringar\n"
6160 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6161 " arbetskatalog\n"
6162 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6163 " huvudet på den grenen)\n"
6164 " d) ändringen angiven med -r\n"
6165 " e) det högsta huvudet angivet med -b\n"
6166 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6167 " g) det högsta huvudet på default-grenen\n"
6168 " h) tip\n"
6169 " "
6170
6171 #, fuzzy
6172 msgid ""
5151 6173 " For efficiency, hardlinks are used for cloning whenever the source\n"
5152 6174 " and destination are on the same filesystem (note this applies only\n"
5153 6175 " to the repository data, not to the working directory). Some\n"
5154 6176 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5155 6177 " do not report errors. In these cases, use the --pull option to\n"
5156 " avoid hardlinking.\n"
5157 "\n"
6178 " avoid hardlinking."
6179 msgstr ""
6180 "gör en kopia av ett existerande arkiv\n"
6181 "\n"
6182 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6183 "\n"
6184 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6185 " källan att användas.\n"
6186 "\n"
6187 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6188 " som standardplats att användas för framtida dragningar.\n"
6189 "\n"
6190 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6191 "\n"
6192 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6193 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6194 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6195 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6196 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6197 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6198 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6199 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6200 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6201 " att finnas i destinationen.\n"
6202 "\n"
6203 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6204 " --pull, även för lokala arkiv.\n"
6205 "\n"
6206 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6207 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6208 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6209 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6210 " för att undvika användning av hårda länkar.\n"
6211 "\n"
6212 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6213 " hårdlänkade, med ::\n"
6214 "\n"
6215 " $ cp -al ARKIV ARKIVKLON\n"
6216 "\n"
6217 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6218 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6219 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6220 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6221 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6222 " under katalogen .hg, som mq.\n"
6223 "\n"
6224 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6225 " revisionen från den här listan:\n"
6226 "\n"
6227 " a) null med -U eller källarkivet inte har några ändringar\n"
6228 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6229 " arbetskatalog\n"
6230 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6231 " huvudet på den grenen)\n"
6232 " d) ändringen angiven med -r\n"
6233 " e) det högsta huvudet angivet med -b\n"
6234 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6235 " g) det högsta huvudet på default-grenen\n"
6236 " h) tip\n"
6237 " "
6238
6239 #, fuzzy
6240 msgid ""
5158 6241 " In some cases, you can clone repositories and the working directory\n"
5159 " using full hardlinks with ::\n"
5160 "\n"
5161 " $ cp -al REPO REPOCLONE\n"
5162 "\n"
6242 " using full hardlinks with ::"
6243 msgstr ""
6244 "gör en kopia av ett existerande arkiv\n"
6245 "\n"
6246 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6247 "\n"
6248 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6249 " källan att användas.\n"
6250 "\n"
6251 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6252 " som standardplats att användas för framtida dragningar.\n"
6253 "\n"
6254 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6255 "\n"
6256 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6257 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6258 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6259 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6260 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6261 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6262 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6263 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6264 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6265 " att finnas i destinationen.\n"
6266 "\n"
6267 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6268 " --pull, även för lokala arkiv.\n"
6269 "\n"
6270 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6271 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6272 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6273 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6274 " för att undvika användning av hårda länkar.\n"
6275 "\n"
6276 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6277 " hårdlänkade, med ::\n"
6278 "\n"
6279 " $ cp -al ARKIV ARKIVKLON\n"
6280 "\n"
6281 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6282 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6283 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6284 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6285 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6286 " under katalogen .hg, som mq.\n"
6287 "\n"
6288 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6289 " revisionen från den här listan:\n"
6290 "\n"
6291 " a) null med -U eller källarkivet inte har några ändringar\n"
6292 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6293 " arbetskatalog\n"
6294 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6295 " huvudet på den grenen)\n"
6296 " d) ändringen angiven med -r\n"
6297 " e) det högsta huvudet angivet med -b\n"
6298 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6299 " g) det högsta huvudet på default-grenen\n"
6300 " h) tip\n"
6301 " "
6302
6303 #, fuzzy
6304 msgid " $ cp -al REPO REPOCLONE"
6305 msgstr ""
6306 "gör en kopia av ett existerande arkiv\n"
6307 "\n"
6308 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6309 "\n"
6310 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6311 " källan att användas.\n"
6312 "\n"
6313 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6314 " som standardplats att användas för framtida dragningar.\n"
6315 "\n"
6316 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6317 "\n"
6318 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6319 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6320 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6321 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6322 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6323 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6324 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6325 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6326 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6327 " att finnas i destinationen.\n"
6328 "\n"
6329 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6330 " --pull, även för lokala arkiv.\n"
6331 "\n"
6332 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6333 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6334 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6335 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6336 " för att undvika användning av hårda länkar.\n"
6337 "\n"
6338 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6339 " hårdlänkade, med ::\n"
6340 "\n"
6341 " $ cp -al ARKIV ARKIVKLON\n"
6342 "\n"
6343 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6344 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6345 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6346 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6347 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6348 " under katalogen .hg, som mq.\n"
6349 "\n"
6350 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6351 " revisionen från den här listan:\n"
6352 "\n"
6353 " a) null med -U eller källarkivet inte har några ändringar\n"
6354 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6355 " arbetskatalog\n"
6356 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6357 " huvudet på den grenen)\n"
6358 " d) ändringen angiven med -r\n"
6359 " e) det högsta huvudet angivet med -b\n"
6360 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6361 " g) det högsta huvudet på default-grenen\n"
6362 " h) tip\n"
6363 " "
6364
6365 #, fuzzy
6366 msgid ""
5163 6367 " This is the fastest way to clone, but it is not always safe. The\n"
5164 6368 " operation is not atomic (making sure REPO is not modified during\n"
5165 6369 " the operation is up to you) and you have to make sure your editor\n"
5166 6370 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5167 6371 " this is not compatible with certain extensions that place their\n"
5168 " metadata under the .hg directory, such as mq.\n"
5169 "\n"
6372 " metadata under the .hg directory, such as mq."
6373 msgstr ""
6374 "gör en kopia av ett existerande arkiv\n"
6375 "\n"
6376 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6377 "\n"
6378 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6379 " källan att användas.\n"
6380 "\n"
6381 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6382 " som standardplats att användas för framtida dragningar.\n"
6383 "\n"
6384 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6385 "\n"
6386 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6387 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6388 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6389 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6390 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6391 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6392 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6393 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6394 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6395 " att finnas i destinationen.\n"
6396 "\n"
6397 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6398 " --pull, även för lokala arkiv.\n"
6399 "\n"
6400 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6401 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6402 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6403 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6404 " för att undvika användning av hårda länkar.\n"
6405 "\n"
6406 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6407 " hårdlänkade, med ::\n"
6408 "\n"
6409 " $ cp -al ARKIV ARKIVKLON\n"
6410 "\n"
6411 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6412 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6413 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6414 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6415 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6416 " under katalogen .hg, som mq.\n"
6417 "\n"
6418 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6419 " revisionen från den här listan:\n"
6420 "\n"
6421 " a) null med -U eller källarkivet inte har några ändringar\n"
6422 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6423 " arbetskatalog\n"
6424 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6425 " huvudet på den grenen)\n"
6426 " d) ändringen angiven med -r\n"
6427 " e) det högsta huvudet angivet med -b\n"
6428 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6429 " g) det högsta huvudet på default-grenen\n"
6430 " h) tip\n"
6431 " "
6432
6433 #, fuzzy
6434 msgid ""
5170 6435 " Mercurial will update the working directory to the first applicable\n"
5171 " revision from this list:\n"
5172 "\n"
6436 " revision from this list:"
6437 msgstr ""
6438 "gör en kopia av ett existerande arkiv\n"
6439 "\n"
6440 " Skapa en kopia av ett existerande arkiv i en ny katalog.\n"
6441 "\n"
6442 " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n"
6443 " källan att användas.\n"
6444 "\n"
6445 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n"
6446 " som standardplats att användas för framtida dragningar.\n"
6447 "\n"
6448 " Se 'hg help urls' för detaljer om giltiga källformat.\n"
6449 "\n"
6450 " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
6451 " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
6452 " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
6453 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
6454 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
6455 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
6456 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
6457 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
6458 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
6459 " att finnas i destinationen.\n"
6460 "\n"
6461 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
6462 " --pull, även för lokala arkiv.\n"
6463 "\n"
6464 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
6465 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
6466 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
6467 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
6468 " för att undvika användning av hårda länkar.\n"
6469 "\n"
6470 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
6471 " hårdlänkade, med ::\n"
6472 "\n"
6473 " $ cp -al ARKIV ARKIVKLON\n"
6474 "\n"
6475 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
6476 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
6477 " operationen är upp till dig) och du måste se till att din editor bryter\n"
6478 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
6479 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
6480 " under katalogen .hg, som mq.\n"
6481 "\n"
6482 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
6483 " revisionen från den här listan:\n"
6484 "\n"
6485 " a) null med -U eller källarkivet inte har några ändringar\n"
6486 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
6487 " arbetskatalog\n"
6488 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
6489 " huvudet på den grenen)\n"
6490 " d) ändringen angiven med -r\n"
6491 " e) det högsta huvudet angivet med -b\n"
6492 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
6493 " g) det högsta huvudet på default-grenen\n"
6494 " h) tip\n"
6495 " "
6496
6497 #, fuzzy
6498 msgid ""
5173 6499 " a) null if -U or the source repository has no changesets\n"
5174 6500 " b) if -u . and the source repository is local, the first parent of\n"
5175 6501 " the source repository's working directory\n"
@@ -5244,42 +6570,38 b' msgstr ""'
5244 6570 msgid "cannot specify both --noupdate and --updaterev"
5245 6571 msgstr "kan inte ange både --noupdate och --updaterev"
5246 6572
5247 msgid ""
5248 "commit the specified files or all outstanding changes\n"
5249 "\n"
6573 msgid "commit the specified files or all outstanding changes"
6574 msgstr "arkivera de angivna filerna eller alla ändringar"
6575
6576 msgid ""
5250 6577 " Commit changes to the given files into the repository. Unlike a\n"
5251 6578 " centralized RCS, this operation is a local operation. See hg push\n"
5252 " for a way to actively distribute your changes.\n"
5253 "\n"
5254 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5255 " will be committed.\n"
5256 "\n"
5257 " If you are committing the result of a merge, do not provide any\n"
5258 " filenames or -I/-X filters.\n"
5259 "\n"
5260 " If no commit message is specified, the configured editor is\n"
5261 " started to prompt you for a message.\n"
5262 "\n"
5263 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5264 " "
5265 msgstr ""
5266 "arkivera de angivna filerna eller alla ändringar\n"
5267 "\n"
6579 " for a way to actively distribute your changes."
6580 msgstr ""
5268 6581 " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n"
5269 6582 " från ett centralicerat RCS, är detta en lokal operation. Se hg push\n"
5270 " för ett sätt att aktivt distribuera dina ändringar.\n"
5271 "\n"
6583 " för ett sätt att aktivt distribuera dina ändringar."
6584
6585 msgid ""
6586 " If a list of files is omitted, all changes reported by \"hg status\"\n"
6587 " will be committed."
6588 msgstr ""
5272 6589 " Om filer inte anges, kommer alla ändringar som \"hg status\"\n"
5273 " rapporterar att arkiveras.\n"
5274 "\n"
6590 " rapporterar att arkiveras."
6591
6592 msgid ""
6593 " If you are committing the result of a merge, do not provide any\n"
6594 " filenames or -I/-X filters."
6595 msgstr ""
5275 6596 " Om du arkiverar resultatet av en sammanfogning, ange inga filnamn\n"
5276 " eller flaggorna -I/-X.\n"
5277 "\n"
6597 " eller flaggorna -I/-X."
6598
6599 msgid ""
6600 " If no commit message is specified, the configured editor is\n"
6601 " started to prompt you for a message."
6602 msgstr ""
5278 6603 " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n"
5279 " att startas och fråga om meddelandet.\n"
5280 "\n"
5281 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
5282 " "
6604 " att startas och fråga om meddelandet."
5283 6605
5284 6606 msgid "nothing changed\n"
5285 6607 msgstr "inget ändrat\n"
@@ -5291,31 +6613,32 b' msgstr "skapade ett nytt huvud\\n"'
5291 6613 msgid "committed changeset %d:%s\n"
5292 6614 msgstr "arkiverade ändringen %d:%s\n"
5293 6615
5294 msgid ""
5295 "mark files as copied for the next commit\n"
5296 "\n"
6616 msgid "mark files as copied for the next commit"
6617 msgstr "markera filer som kopierade vid nästa arkivering"
6618
6619 msgid ""
5297 6620 " Mark dest as having copies of source files. If dest is a\n"
5298 6621 " directory, copies are put in that directory. If dest is a file,\n"
5299 " the source must be a single file.\n"
5300 "\n"
6622 " the source must be a single file."
6623 msgstr ""
6624 " Markera dest som kopia av källfilerna. Om dest är en katalog,\n"
6625 " placeras kopiorna i den katalogen. Om dest är en fil, måste källan\n"
6626 " vara en enda fil."
6627
6628 msgid ""
5301 6629 " By default, this command copies the contents of files as they\n"
5302 6630 " exist in the working directory. If invoked with -A/--after, the\n"
5303 " operation is recorded, but no copying is performed.\n"
5304 "\n"
6631 " operation is recorded, but no copying is performed."
6632 msgstr ""
6633 " Som standard kopierar detta kommando filinnehållet som det ser ut i\n"
6634 " arbetskatalogen. Om det aktiveras med -A/--after, sparas operationen\n"
6635 " men ingen kopiering utförs."
6636
6637 msgid ""
5305 6638 " This command takes effect with the next commit. To undo a copy\n"
5306 6639 " before that, see hg revert.\n"
5307 6640 " "
5308 6641 msgstr ""
5309 "markera filer som kopierade vid nästa arkivering\n"
5310 "\n"
5311 " Markera dest som kopia av källfilerna. Om dest är en katalog,\n"
5312 " placeras kopiorna i den katalogen. Om dest är en fil, måste källan\n"
5313 " vara en enda fil.\n"
5314 "\n"
5315 " Som standard kopierar detta kommando filinnehållet som det ser ut i\n"
5316 " arbetskatalogen. Om det aktiveras med -A/--after, sparas operationen\n"
5317 " men ingen kopiering utförs.\n"
5318 "\n"
5319 6642 " Kommandot slår igenom vid nästa arkivering. För att ångra en\n"
5320 6643 " kopiering innan dess, se hg revert.\n"
5321 6644 " "
@@ -5354,31 +6677,31 b' msgstr "%s i manifest1, men listad med s'
5354 6677 msgid ".hg/dirstate inconsistent with current parent's manifest"
5355 6678 msgstr ".hg/dirstate överrensstämmer inte med nuvarande förälders manifest"
5356 6679
5357 msgid ""
5358 "show combined config settings from all hgrc files\n"
5359 "\n"
5360 " With no arguments, print names and values of all config items.\n"
5361 "\n"
6680 msgid "show combined config settings from all hgrc files"
6681 msgstr "visa kombinerade konfigurationsalternativ från alla hgrc-filer"
6682
6683 msgid " With no arguments, print names and values of all config items."
6684 msgstr " Utan argument, skrivs namn och värden för alla alternativ."
6685
6686 msgid ""
5362 6687 " With one argument of the form section.name, print just the value\n"
5363 " of that config item.\n"
5364 "\n"
6688 " of that config item."
6689 msgstr ""
6690 " Med ett argument i formen sektion.namn, visas bara värdet för det\n"
6691 " konfigurationsalternativet."
6692
6693 msgid ""
5365 6694 " With multiple arguments, print names and values of all config\n"
5366 " items with matching section names.\n"
5367 "\n"
6695 " items with matching section names."
6696 msgstr ""
6697 " Med flera argument, visas namn och värden för alla alternativ med\n"
6698 " överrensstämmande sektionsnamn."
6699
6700 msgid ""
5368 6701 " With --debug, the source (filename and line number) is printed\n"
5369 6702 " for each config item.\n"
5370 6703 " "
5371 6704 msgstr ""
5372 "visa kombinerade konfigurationsalternativ från alla hgrc-filer\n"
5373 "\n"
5374 " Utan argument, skrivs namn och värden för alla alternativ.\n"
5375 "\n"
5376 " Med ett argument i formen sektion.namn, visas bara värdet för det\n"
5377 " konfigurationsalternativet.\n"
5378 "\n"
5379 " Med flera argument, visas namn och värden för alla alternativ med\n"
5380 " överrensstämmande sektionsnamn.\n"
5381 "\n"
5382 6705 " Med --debug, visas källan (filnamn och radnummer) för varje\n"
5383 6706 " alternativ.\n"
5384 6707 " "
@@ -5386,9 +6709,10 b' msgstr ""'
5386 6709 msgid "only one config item permitted"
5387 6710 msgstr "bara ett konfigurationsalternativ tillåts"
5388 6711
5389 msgid ""
5390 "manually set the parents of the current working directory\n"
5391 "\n"
6712 msgid "manually set the parents of the current working directory"
6713 msgstr ""
6714
6715 msgid ""
5392 6716 " This is useful for writing repository conversion tools, but should\n"
5393 6717 " be used with care.\n"
5394 6718 " "
@@ -5454,14 +6778,10 b' msgstr ""'
5454 6778 msgid " patch test failed!\n"
5455 6779 msgstr ""
5456 6780
5457 msgid ""
5458 " (Current patch tool may be incompatible with patch, or misconfigured. "
5459 "Please check your .hgrc file)\n"
5460 msgstr ""
5461
5462 msgid ""
5463 " Internal patcher failure, please report this error to http://mercurial."
5464 "selenic.com/bts/\n"
6781 msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
6782 msgstr ""
6783
6784 msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
5465 6785 msgstr ""
5466 6786
5467 6787 msgid "Checking commit editor...\n"
@@ -5504,76 +6824,81 b' msgstr ""'
5504 6824 msgid "show how files match on given patterns"
5505 6825 msgstr ""
5506 6826
5507 msgid ""
5508 "diff repository (or selected files)\n"
5509 "\n"
5510 " Show differences between revisions for the specified files.\n"
5511 "\n"
5512 " Differences between files are shown using the unified diff format.\n"
5513 "\n"
6827 msgid "diff repository (or selected files)"
6828 msgstr "visa skillnader i arkivet (eller på valda filer)"
6829
6830 msgid " Show differences between revisions for the specified files."
6831 msgstr " Visa skillnader mellan revisioner för specificerade filer."
6832
6833 msgid " Differences between files are shown using the unified diff format."
6834 msgstr " Skillnaderna mellan filerna visas i unified diff-format."
6835
6836 msgid ""
5514 6837 " NOTE: diff may generate unexpected results for merges, as it will\n"
5515 6838 " default to comparing against the working directory's first parent\n"
5516 " changeset if no revisions are specified.\n"
5517 "\n"
5518 " When two revision arguments are given, then changes are shown\n"
5519 " between those revisions. If only one revision is specified then\n"
5520 " that revision is compared to the working directory, and, when no\n"
5521 " revisions are specified, the working directory files are compared\n"
5522 " to its parent.\n"
5523 "\n"
6839 " changeset if no revisions are specified."
6840 msgstr ""
6841 " NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n"
6842 " eftersom den som standard kommer att jämföra mot arbetskatalogens\n"
6843 " tidigare ändring om ingen revision anges."
6844
6845 msgid ""
5524 6846 " Alternatively you can specify -c/--change with a revision to see\n"
5525 " the changes in that changeset relative to its first parent.\n"
5526 "\n"
6847 " the changes in that changeset relative to its first parent."
6848 msgstr ""
6849 " Alternativt så kan du ange -c/--change med en revision för att se\n"
6850 " modifikationerna i den ändringen relativt till dess första förälder."
6851
6852 msgid ""
5527 6853 " Without the -a/--text option, diff will avoid generating diffs of\n"
5528 6854 " files it detects as binary. With -a, diff will generate a diff\n"
5529 " anyway, probably with undesirable results.\n"
5530 "\n"
6855 " anyway, probably with undesirable results."
6856 msgstr ""
6857 " Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n"
6858 " skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n"
6859 " troligtvis med oönskade resultat."
6860
6861 msgid ""
5531 6862 " Use the -g/--git option to generate diffs in the git extended diff\n"
5532 6863 " format. For more information, read 'hg help diffs'.\n"
5533 6864 " "
5534 6865 msgstr ""
5535 "visa skillnader i arkivet (eller på valda filer)\n"
5536 "\n"
5537 " Visa skillnader mellan revisioner för specificerade filer.\n"
5538 "\n"
5539 " Skillnaderna mellan filerna visas i unified diff-format.\n"
5540 "\n"
5541 " NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n"
5542 " eftersom den som standard kommer att jämföra mot arbetskatalogens\n"
5543 " tidigare ändring om ingen revision anges.\n"
5544 "\n"
5545 " När två revisioner anges, visas ändringarna mellan dessa två\n"
5546 " revisioner. Om bara en revision anges kommer den att jämföras med\n"
5547 " arbetskatalogen, och om ingen revision anges, jämförs arbetskatalogens\n"
5548 " filer med dess förälder.\n"
5549 "\n"
5550 " Alternativt så kan du ange -c/--change med en revision för att se\n"
5551 " modifikationerna i den ändringen relativt till dess första förälder.\n"
5552 "\n"
5553 " Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n"
5554 " skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n"
5555 " troligtvis med oönskade resultat.\n"
5556 "\n"
5557 6866 " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
5558 6867 " mer information, läs 'hg help diffs'.\n"
5559 6868 " "
5560 6869
5561 msgid ""
5562 "dump the header and diffs for one or more changesets\n"
5563 "\n"
5564 " Print the changeset header and diffs for one or more revisions.\n"
5565 "\n"
6870 msgid "dump the header and diffs for one or more changesets"
6871 msgstr "dumpa rubrik och diff för en eller fler ändringar"
6872
6873 msgid " Print the changeset header and diffs for one or more revisions."
6874 msgstr " Skriv ändringsrubriken och diffen för en eller fler revisioner."
6875
6876 msgid ""
5566 6877 " The information shown in the changeset header is: author, date,\n"
5567 6878 " branch name (if non-default), changeset hash, parent(s) and commit\n"
5568 " comment.\n"
5569 "\n"
6879 " comment."
6880 msgstr ""
6881 " Informationen som visas i ändringsheadern är: författare, datum,\n"
6882 " grenens namn (om inte default), ändringens hash, föräldrar och\n"
6883 " arkiveringskommentar."
6884
6885 msgid ""
5570 6886 " NOTE: export may generate unexpected diff output for merge\n"
5571 6887 " changesets, as it will compare the merge changeset against its\n"
5572 " first parent only.\n"
5573 "\n"
6888 " first parent only."
6889 msgstr ""
6890 " NOTERA: export kan generera oväntade resultat för sammanfogningar,\n"
6891 " eftersom den som standard bara kommer att jämföra mot den första\n"
6892 " föräldern."
6893
6894 msgid ""
5574 6895 " Output may be to a file, in which case the name of the file is\n"
5575 " given using a format string. The formatting rules are as follows:\n"
5576 "\n"
6896 " given using a format string. The formatting rules are as follows:"
6897 msgstr ""
6898 " Utmatning kan vara till en fil, och då anges namnet på filen med en\n"
6899 " formatsträng. Formateringsreglerna är som följer::"
6900
6901 msgid ""
5577 6902 " :``%%``: literal \"%\" character\n"
5578 6903 " :``%H``: changeset hash (40 bytes of hexadecimal)\n"
5579 6904 " :``%N``: number of patches being generated\n"
@@ -5581,34 +6906,8 b' msgid ""'
5581 6906 " :``%b``: basename of the exporting repository\n"
5582 6907 " :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
5583 6908 " :``%n``: zero-padded sequence number, starting at 1\n"
5584 " :``%r``: zero-padded changeset revision number\n"
5585 "\n"
5586 " Without the -a/--text option, export will avoid generating diffs\n"
5587 " of files it detects as binary. With -a, export will generate a\n"
5588 " diff anyway, probably with undesirable results.\n"
5589 "\n"
5590 " Use the -g/--git option to generate diffs in the git extended diff\n"
5591 " format. See 'hg help diffs' for more information.\n"
5592 "\n"
5593 " With the --switch-parent option, the diff will be against the\n"
5594 " second parent. It can be useful to review a merge.\n"
5595 " "
5596 msgstr ""
5597 "dumpa rubrik och diff för en eller fler ändringar\n"
5598 "\n"
5599 " Skriv ändringsrubriken och diffen för en eller fler revisioner.\n"
5600 "\n"
5601 " Informationen som visas i ändringsheadern är: författare, datum,\n"
5602 " grenens namn (om inte default), ändringens hash, föräldrar och\n"
5603 " arkiveringskommentar.\n"
5604 "\n"
5605 " NOTERA: export kan generera oväntade resultat för sammanfogningar,\n"
5606 " eftersom den som standard bara kommer att jämföra mot den första\n"
5607 " föräldern.\n"
5608 "\n"
5609 " Utmatning kan vara till en fil, och då anges namnet på filen med en\n"
5610 " formatsträng. Formateringsreglerna är som följer::\n"
5611 "\n"
6909 " :``%r``: zero-padded changeset revision number"
6910 msgstr ""
5612 6911 " :``%%``: ett \"%\"-tecken\n"
5613 6912 " :``%H``: ändringshash (40 hexadecimala bytes)\n"
5614 6913 " :``%N``: antal genererade patchar\n"
@@ -5616,15 +6915,29 b' msgstr ""'
5616 6915 " :``%b``: basnamn för det exporterande arkivet\n"
5617 6916 " :``%h``: kort ändringshash (12 hexadecimala bytes)\n"
5618 6917 " :``%n``: nollpaddat sekvensnummer, börjar med 1\n"
5619 " :``%r``: nollpaddat ändringsrevisionsnummer\n"
5620 "\n"
6918 " :``%r``: nollpaddat ändringsrevisionsnummer"
6919
6920 msgid ""
6921 " Without the -a/--text option, export will avoid generating diffs\n"
6922 " of files it detects as binary. With -a, export will generate a\n"
6923 " diff anyway, probably with undesirable results."
6924 msgstr ""
5621 6925 " Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n"
5622 6926 " av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n"
5623 " ändå, även om resultatet antagligen inte kommer att vara användbart.\n"
5624 "\n"
6927 " ändå, även om resultatet antagligen inte kommer att vara användbart."
6928
6929 msgid ""
6930 " Use the -g/--git option to generate diffs in the git extended diff\n"
6931 " format. See 'hg help diffs' for more information."
6932 msgstr ""
5625 6933 " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n"
5626 " Se 'hg help diffs' för mer information.\n"
5627 "\n"
6934 " Se 'hg help diffs' för mer information."
6935
6936 msgid ""
6937 " With the --switch-parent option, the diff will be against the\n"
6938 " second parent. It can be useful to review a merge.\n"
6939 " "
6940 msgstr ""
5628 6941 " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n"
5629 6942 " föräldern. Det kan vara användbart för att granska en sammanfogning.\n"
5630 6943 " "
@@ -5638,27 +6951,28 b' msgstr ""'
5638 6951 msgid "exporting patch:\n"
5639 6952 msgstr ""
5640 6953
5641 msgid ""
5642 "forget the specified files on the next commit\n"
5643 "\n"
6954 msgid "forget the specified files on the next commit"
6955 msgstr "glöm de specificerade filerna vid nästa arkivering"
6956
6957 msgid ""
5644 6958 " Mark the specified files so they will no longer be tracked\n"
5645 " after the next commit.\n"
5646 "\n"
6959 " after the next commit."
6960 msgstr ""
6961 " Märk de specificerade filerna så att de inte längre kommer att spåras\n"
6962 " efter nästa arkivering."
6963
6964 msgid ""
5647 6965 " This only removes files from the current branch, not from the\n"
5648 6966 " entire project history, and it does not delete them from the\n"
5649 " working directory.\n"
5650 "\n"
6967 " working directory."
6968 msgstr ""
6969 " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n"
6970 " projekthistoriken, och det raderar dem inte från arbetskatalogen."
6971
6972 msgid ""
5651 6973 " To undo a forget before the next commit, see hg add.\n"
5652 6974 " "
5653 6975 msgstr ""
5654 "glöm de specificerade filerna vid nästa arkivering\n"
5655 "\n"
5656 " Märk de specificerade filerna så att de inte längre kommer att spåras\n"
5657 " efter nästa arkivering.\n"
5658 "\n"
5659 " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n"
5660 " projekthistoriken, och det raderar dem inte från arbetskatalogen.\n"
5661 "\n"
5662 6976 " För att ångra en forget innan nästa arkivering, se hg add.\n"
5663 6977 " "
5664 6978
@@ -5669,16 +6983,23 b' msgstr ""'
5669 6983 msgid "not removing %s: file is already untracked\n"
5670 6984 msgstr ""
5671 6985
5672 msgid ""
5673 "search for a pattern in specified files and revisions\n"
5674 "\n"
5675 " Search revisions of files for a regular expression.\n"
5676 "\n"
6986 msgid "search for a pattern in specified files and revisions"
6987 msgstr "sök efter ett mänster i specificerade filer och revisioner"
6988
6989 msgid " Search revisions of files for a regular expression."
6990 msgstr " Söker igenom revisioner och filer med reguljära uttryck."
6991
6992 msgid ""
5677 6993 " This command behaves differently than Unix grep. It only accepts\n"
5678 6994 " Python/Perl regexps. It searches repository history, not the\n"
5679 6995 " working directory. It always prints the revision number in which a\n"
5680 " match appears.\n"
5681 "\n"
6996 " match appears."
6997 msgstr ""
6998 " Det här kommandot beter sig annorlunda jämfört med grep i Unix. Det\n"
6999 " accepterar bara Python/Perl-regexps. Det söker arkivhistorik, inte\n"
7000 " arbetskatalogen. Det visar också revisionsnumret där en träff finns."
7001
7002 msgid ""
5682 7003 " By default, grep only prints output for the first revision of a\n"
5683 7004 " file in which it finds a match. To get it to print every revision\n"
5684 7005 " that contains a change in match status (\"-\" for a match that\n"
@@ -5686,14 +7007,6 b' msgid ""'
5686 7007 " use the --all flag.\n"
5687 7008 " "
5688 7009 msgstr ""
5689 "sök efter ett mänster i specificerade filer och revisioner\n"
5690 "\n"
5691 " Söker igenom revisioner och filer med reguljära uttryck.\n"
5692 "\n"
5693 " Det här kommandot beter sig annorlunda jämfört med grep i Unix. Det\n"
5694 " accepterar bara Python/Perl-regexps. Det söker arkivhistorik, inte\n"
5695 " arbetskatalogen. Det visar också revisionsnumret där en träff finns.\n"
5696 "\n"
5697 7010 " Som standard visar grep bara utmatningen från den första revisionen\n"
5698 7011 " av en matchande fil. För att visa varje revision som innehåller en\n"
5699 7012 " ändring i träffstatus (\"-\" för en träff som blir en icke-träff,\n"
@@ -5705,48 +7018,49 b' msgstr ""'
5705 7018 msgid "grep: invalid match pattern: %s\n"
5706 7019 msgstr "grep: ogiltigt träffmönster: %s\n"
5707 7020
5708 msgid ""
5709 "show current repository heads or show branch heads\n"
5710 "\n"
5711 " With no arguments, show all repository branch heads.\n"
5712 "\n"
7021 msgid "show current repository heads or show branch heads"
7022 msgstr "visa aktuella arkivhuvuden och visar grenhuvuden"
7023
7024 msgid " With no arguments, show all repository branch heads."
7025 msgstr " Utan några argument visas alla ändringar som är grenhuvuden."
7026
7027 msgid ""
5713 7028 " Repository \"heads\" are changesets with no child changesets. They are\n"
5714 7029 " where development generally takes place and are the usual targets\n"
5715 7030 " for update and merge operations. Branch heads are changesets that have\n"
5716 " no child changeset on the same branch.\n"
5717 "\n"
5718 " If one or more REVs are given, only branch heads on the branches\n"
5719 " associated with the specified changesets are shown.\n"
5720 "\n"
5721 " If -c/--closed is specified, also show branch heads marked closed\n"
5722 " (see hg commit --close-branch).\n"
5723 "\n"
5724 " If STARTREV is specified, only those heads that are descendants of\n"
5725 " STARTREV will be displayed.\n"
5726 "\n"
5727 " If -t/--topo is specified, named branch mechanics will be ignored and "
5728 "only\n"
5729 " changesets without children will be shown.\n"
5730 " "
5731 msgstr ""
5732 "visa aktuella arkivhuvuden och visar grenhuvuden\n"
5733 "\n"
5734 " Utan några argument visas alla ändringar som är grenhuvuden.\n"
5735 "\n"
7031 " no child changeset on the same branch."
7032 msgstr ""
5736 7033 " Arkiv-\"huvuden\" är ändringar utan barnändringar. Det är vanligtvis\n"
5737 7034 " där som utveckling sker och är de vanligaste målen för update- och\n"
5738 7035 " merge-operationer. Grenhuvuden är ändringar som inte har några\n"
5739 " barnändringar på samma gren.\n"
5740 "\n"
7036 " barnändringar på samma gren."
7037
7038 msgid ""
7039 " If one or more REVs are given, only branch heads on the branches\n"
7040 " associated with the specified changesets are shown."
7041 msgstr ""
5741 7042 " Om en eller flera REV anges, kommer bara grenhuvuden på grenar\n"
5742 " som är associerade med de angivna ändringarna att visas.\n"
5743 "\n"
7043 " som är associerade med de angivna ändringarna att visas."
7044
7045 msgid ""
7046 " If -c/--closed is specified, also show branch heads marked closed\n"
7047 " (see hg commit --close-branch)."
7048 msgstr ""
5744 7049 " Om -c/--closed anges, visas också grenvhuvuden som markerats som\n"
5745 " stängda (se hg commit --close-branch).\n"
5746 "\n"
7050 " stängda (se hg commit --close-branch)."
7051
7052 msgid ""
7053 " If STARTREV is specified, only those heads that are descendants of\n"
7054 " STARTREV will be displayed."
7055 msgstr ""
5747 7056 " Om STARTREV anges, visas bara de huvuden som har STARTREV som\n"
5748 " anfader.\n"
5749 "\n"
7057 " anfader."
7058
7059 msgid ""
7060 " If -t/--topo is specified, named branch mechanics will be ignored and only\n"
7061 " changesets without children will be shown.\n"
7062 " "
7063 msgstr ""
5750 7064 " Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n"
5751 7065 " ändringar utan barn kommer att visas.\n"
5752 7066 " "
@@ -5759,18 +7073,16 b' msgstr "inga \xc3\xb6ppna grenhuvuden hittades p\xc3\xa5 grenarna %s"'
5759 7073 msgid " (started at %s)"
5760 7074 msgstr " (började som %s)"
5761 7075
5762 msgid ""
5763 "show help for a given topic or a help overview\n"
5764 "\n"
5765 " With no arguments, print a list of commands with short help messages.\n"
5766 "\n"
7076 msgid "show help for a given topic or a help overview"
7077 msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt"
7078
7079 msgid " With no arguments, print a list of commands with short help messages."
7080 msgstr " Utan argument visas en kommandolista med korta hjälpmeddelanden."
7081
7082 msgid ""
5767 7083 " Given a topic, extension, or command name, print help for that\n"
5768 7084 " topic."
5769 7085 msgstr ""
5770 "visa hjälp för ett givet ämne eller en hjälpöversikt\n"
5771 "\n"
5772 " Utan argument visas en kommandolista med korta hjälpmeddelanden.\n"
5773 "\n"
5774 7086 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n"
5775 7087 " "
5776 7088
@@ -5781,8 +7093,7 b' msgid "use \\"hg help\\" for the full list'
5781 7093 msgstr "använd \"hg help\" för den fulla kommandolistan"
5782 7094
5783 7095 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5784 msgstr ""
5785 "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
7096 msgstr "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
5786 7097
5787 7098 #, python-format
5788 7099 msgid "use \"hg -v help%s\" to show aliases and global options"
@@ -5792,12 +7103,8 b' msgstr "anv\xc3\xa4nd \\"hg -v help%s\\" f\xc3\xb6r att visa alias och globala flaggor"'
5792 7103 msgid "use \"hg -v help %s\" to show global options"
5793 7104 msgstr "använd \"hg -v help %s\" för att visa globala flaggor"
5794 7105
5795 msgid ""
5796 "list of commands:\n"
5797 "\n"
5798 msgstr ""
5799 "kommandolista:\n"
5800 "\n"
7106 msgid "list of commands:"
7107 msgstr "kommandolista:"
5801 7108
5802 7109 #, python-format
5803 7110 msgid ""
@@ -5811,14 +7118,12 b' msgid "(no help text available)"'
5811 7118 msgstr "(ingen hjälptext tillgänglig)"
5812 7119
5813 7120 #, python-format
5814 msgid ""
5815 "alias for: hg %s\n"
5816 "\n"
5817 "%s"
5818 msgstr ""
5819 "alias för: hg %s\n"
5820 "\n"
5821 "%s"
7121 msgid "alias for: hg %s"
7122 msgstr "alias för: hg %s"
7123
7124 #, python-format
7125 msgid "%s"
7126 msgstr "%s"
5822 7127
5823 7128 #, python-format
5824 7129 msgid ""
@@ -5838,16 +7143,11 b' msgid "no help text available"'
5838 7143 msgstr "ingen hjälptext tillgänglig"
5839 7144
5840 7145 #, python-format
5841 msgid ""
5842 "%s extension - %s\n"
5843 "\n"
5844 msgstr ""
5845 "%s-utökning - %s\n"
5846 "\n"
7146 msgid "%s extension - %s"
7147 msgstr "%s-utökning - %s"
5847 7148
5848 7149 msgid "use \"hg help extensions\" for information on enabling extensions\n"
5849 msgstr ""
5850 "använd \"hg help extensions\" för information om aktivering av utökningar\n"
7150 msgstr "använd \"hg help extensions\" för information om aktivering av utökningar\n"
5851 7151
5852 7152 #, python-format
5853 7153 msgid "'%s' is provided by the following extension:"
@@ -5856,12 +7156,8 b' msgstr "\'%s\' tillhandah\xc3\xa5lls av f\xc3\xb6ljande ut\xc3\xb6kning:"'
5856 7156 msgid "Mercurial Distributed SCM\n"
5857 7157 msgstr "Mercurial Distribuerad SCM\n"
5858 7158
5859 msgid ""
5860 "basic commands:\n"
5861 "\n"
5862 msgstr ""
5863 "grundläggande kommandon:\n"
5864 "\n"
7159 msgid "basic commands:"
7160 msgstr "grundläggande kommandon:"
5865 7161
5866 7162 msgid "enabled extensions:"
5867 7163 msgstr "aktiverade utökningar:"
@@ -5871,72 +7167,84 b' msgstr "F\xc3\x96RLEGAD"'
5871 7167
5872 7168 msgid ""
5873 7169 "\n"
5874 "additional help topics:\n"
5875 "\n"
5876 msgstr ""
5877 "\n"
5878 "ytterligare hjälpämnen:\n"
5879 "\n"
5880
5881 msgid ""
5882 "identify the working copy or specified revision\n"
5883 "\n"
7170 "additional help topics:"
7171 msgstr ""
7172 "\n"
7173 "ytterligare hjälpämnen:"
7174
7175 msgid "identify the working copy or specified revision"
7176 msgstr "identifiera arbetskopian eller angivna revisioner"
7177
7178 msgid ""
5884 7179 " With no revision, print a summary of the current state of the\n"
5885 " repository.\n"
5886 "\n"
7180 " repository."
7181 msgstr ""
7182 " Utan någon revision, visas en sammanfattning av den aktuella\n"
7183 " statusen för arkivet."
7184
7185 msgid ""
5887 7186 " Specifying a path to a repository root or Mercurial bundle will\n"
5888 " cause lookup to operate on that repository/bundle.\n"
5889 "\n"
7187 " cause lookup to operate on that repository/bundle."
7188 msgstr ""
7189 " Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n"
7190 " gör att kommandot jobbar mot arkivet/bunten som är angiven."
7191
7192 msgid ""
5890 7193 " This summary identifies the repository state using one or two\n"
5891 7194 " parent hash identifiers, followed by a \"+\" if there are\n"
5892 7195 " uncommitted changes in the working directory, a list of tags for\n"
5893 7196 " this revision and a branch name for non-default branches.\n"
5894 7197 " "
5895 7198 msgstr ""
5896 "identifiera arbetskopian eller angivna revisioner\n"
5897 "\n"
5898 " Utan någon revision, visas en sammanfattning av den aktuella\n"
5899 " statusen för arkivet.\n"
5900 "\n"
5901 " Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n"
5902 " gör att kommandot jobbar mot arkivet/bunten som är angiven.\n"
5903 "\n"
5904 7199 " Sammanfattningen identifierar arkivstatusen med en eller två\n"
5905 7200 " föräldrars hash-identifierare, följt av ett \"+\" om det finns\n"
5906 7201 " oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n"
5907 7202 " här revisionen och ett grennamn för grenar som inte är default.\n"
5908 7203 " "
5909 7204
5910 msgid ""
5911 "import an ordered set of patches\n"
5912 "\n"
7205 msgid "import an ordered set of patches"
7206 msgstr ""
7207
7208 msgid ""
5913 7209 " Import a list of patches and commit them individually (unless\n"
5914 " --no-commit is specified).\n"
5915 "\n"
7210 " --no-commit is specified)."
7211 msgstr ""
7212
7213 msgid ""
5916 7214 " If there are outstanding changes in the working directory, import\n"
5917 " will abort unless given the -f/--force flag.\n"
5918 "\n"
7215 " will abort unless given the -f/--force flag."
7216 msgstr ""
7217
7218 msgid ""
5919 7219 " You can import a patch straight from a mail message. Even patches\n"
5920 7220 " as attachments work (to use the body part, it must have type\n"
5921 7221 " text/plain or text/x-patch). From and Subject headers of email\n"
5922 7222 " message are used as default committer and commit message. All\n"
5923 7223 " text/plain body parts before first diff are added to commit\n"
5924 " message.\n"
5925 "\n"
7224 " message."
7225 msgstr ""
7226
7227 msgid ""
5926 7228 " If the imported patch was generated by hg export, user and\n"
5927 7229 " description from patch override values from message headers and\n"
5928 7230 " body. Values given on command line with -m/--message and -u/--user\n"
5929 " override these.\n"
5930 "\n"
7231 " override these."
7232 msgstr ""
7233
7234 msgid ""
5931 7235 " If --exact is specified, import will set the working directory to\n"
5932 7236 " the parent of each patch before applying it, and will abort if the\n"
5933 7237 " resulting changeset has a different ID than the one recorded in\n"
5934 7238 " the patch. This may happen due to character set problems or other\n"
5935 " deficiencies in the text patch format.\n"
5936 "\n"
7239 " deficiencies in the text patch format."
7240 msgstr ""
7241
7242 msgid ""
5937 7243 " With -s/--similarity, hg will attempt to discover renames and\n"
5938 " copies in the patch in the same way as 'addremove'.\n"
5939 "\n"
7244 " copies in the patch in the same way as 'addremove'."
7245 msgstr ""
7246
7247 msgid ""
5940 7248 " To read a patch from standard input, use \"-\" as the patch name. If\n"
5941 7249 " a URL is specified, the patch will be downloaded from it.\n"
5942 7250 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
@@ -5962,196 +7270,198 b' msgstr "applicerade %s\\n"'
5962 7270 msgid "no diffs found"
5963 7271 msgstr ""
5964 7272
5965 msgid ""
5966 "show new changesets found in source\n"
5967 "\n"
7273 msgid "show new changesets found in source"
7274 msgstr "visa nya ändringar som hittas i källan"
7275
7276 msgid ""
5968 7277 " Show new changesets found in the specified path/URL or the default\n"
5969 7278 " pull location. These are the changesets that would have been pulled\n"
5970 " if a pull at the time you issued this command.\n"
5971 "\n"
5972 " For remote repository, using --bundle avoids downloading the\n"
5973 " changesets twice if the incoming is followed by a pull.\n"
5974 "\n"
5975 " See pull for valid source format details.\n"
5976 " "
5977 msgstr ""
5978 "visa nya ändringar som hittas i källan\n"
5979 "\n"
7279 " if a pull at the time you issued this command."
7280 msgstr ""
5980 7281 " Visa nya ändringar som hittas i den specificerade sökvägen/URL:en\n"
5981 7282 " eller den vanliga pull-platsen. Dessa ändringar skulle ha dragits om\n"
5982 " du använt pull-kommandot.\n"
5983 "\n"
7283 " du använt pull-kommandot."
7284
7285 msgid ""
7286 " For remote repository, using --bundle avoids downloading the\n"
7287 " changesets twice if the incoming is followed by a pull."
7288 msgstr ""
5984 7289 " För fjärrarkiv, använd --bundle för att slippa ladda ner\n"
5985 " ändringarna två gånger om incoming följs av pull.\n"
5986 "\n"
7290 " ändringarna två gånger om incoming följs av pull."
7291
7292 msgid ""
7293 " See pull for valid source format details.\n"
7294 " "
7295 msgstr ""
5987 7296 " Se pull för detaljer om giltiga källformat.\n"
5988 7297 " "
5989 7298
5990 msgid ""
5991 "create a new repository in the given directory\n"
5992 "\n"
7299 msgid "create a new repository in the given directory"
7300 msgstr "skapa ett nytt arkiv i den angivna katalogen"
7301
7302 msgid ""
5993 7303 " Initialize a new repository in the given directory. If the given\n"
5994 " directory does not exist, it will be created.\n"
5995 "\n"
5996 " If no directory is given, the current directory is used.\n"
5997 "\n"
7304 " directory does not exist, it will be created."
7305 msgstr ""
7306 " Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n"
7307 " katalogen inte existerar, kommer den att skapas."
7308
7309 msgid " If no directory is given, the current directory is used."
7310 msgstr " Om ingen katalog anges, används den nuvarande katalogen."
7311
7312 msgid ""
5998 7313 " It is possible to specify an ``ssh://`` URL as the destination.\n"
5999 7314 " See 'hg help urls' for more information.\n"
6000 7315 " "
6001 7316 msgstr ""
6002 "skapa ett nytt arkiv i den angivna katalogen\n"
6003 "\n"
6004 " Initialisera ett nytt arkiv i den angivna katalogen. Om den angivna\n"
6005 " katalogen inte existerar, kommer den att skapas.\n"
6006 "\n"
6007 " Om ingen katalog anges, används den nuvarande katalogen.\n"
6008 "\n"
6009 7317 " Det är möjligt att specificera en URL med ``ssh://`` som destination.\n"
6010 7318 " Se 'hg help urls' för mer information.\n"
6011 7319 " "
6012 7320
6013 msgid ""
6014 "locate files matching specific patterns\n"
6015 "\n"
7321 msgid "locate files matching specific patterns"
7322 msgstr "hitta filer som matchar givna mönster"
7323
7324 msgid ""
6016 7325 " Print files under Mercurial control in the working directory whose\n"
6017 " names match the given patterns.\n"
6018 "\n"
7326 " names match the given patterns."
7327 msgstr ""
7328 " Visa filer som är under Mercurials kontroll i arbetskatalogen vars\n"
7329 " namn matchar givna mönster."
7330
7331 msgid ""
6019 7332 " By default, this command searches all directories in the working\n"
6020 7333 " directory. To search just the current directory and its\n"
6021 " subdirectories, use \"--include .\".\n"
6022 "\n"
7334 " subdirectories, use \"--include .\"."
7335 msgstr ""
7336 " Som standard söker det här kommandot i alla kataloger inuti\n"
7337 " arbetskatalogen. För att bara söka den aktuella katalogen och dess\n"
7338 " underkataloger, använd \"--include .\"."
7339
7340 msgid ""
6023 7341 " If no patterns are given to match, this command prints the names\n"
6024 " of all files under Mercurial control in the working directory.\n"
6025 "\n"
7342 " of all files under Mercurial control in the working directory."
7343 msgstr ""
7344 " Om inga mönster anges för matching, visar det här kommantod namnen på\n"
7345 " alla filer under Mercurials kontroll i arbetskatalogen."
7346
7347 msgid ""
6026 7348 " If you want to feed the output of this command into the \"xargs\"\n"
6027 7349 " command, use the -0 option to both this command and \"xargs\". This\n"
6028 7350 " will avoid the problem of \"xargs\" treating single filenames that\n"
6029 7351 " contain whitespace as multiple filenames.\n"
6030 7352 " "
6031 7353 msgstr ""
6032 "hitta filer som matchar givna mönster\n"
6033 "\n"
6034 " Visa filer som är under Mercurials kontroll i arbetskatalogen vars\n"
6035 " namn matchar givna mönster.\n"
6036 "\n"
6037 " Som standard söker det här kommandot i alla kataloger inuti\n"
6038 " arbetskatalogen. För att bara söka den aktuella katalogen och dess\n"
6039 " underkataloger, använd \"--include .\".\n"
6040 "\n"
6041 " Om inga mönster anges för matching, visar det här kommantod namnen på\n"
6042 " alla filer under Mercurials kontroll i arbetskatalogen.\n"
6043 "\n"
6044 7354 " Om du vill skicka utmatningen från detta kommando till kommandot\n"
6045 7355 " \"xargs\", använd flaggan -O till både detta kommando och \"xargs\".\n"
6046 7356 " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n"
6047 7357 " innehåller blanktecken som multipla filnamn.\n"
6048 7358 " "
6049 7359
6050 msgid ""
6051 "show revision history of entire repository or files\n"
6052 "\n"
7360 msgid "show revision history of entire repository or files"
7361 msgstr "visa revisionshistorik för hela arkivet eller filer"
7362
7363 msgid ""
6053 7364 " Print the revision history of the specified files or the entire\n"
6054 " project.\n"
6055 "\n"
7365 " project."
7366 msgstr ""
7367 " Skriv ut revisionshistoriken för de specificerade filerna eller hela\n"
7368 " projektet."
7369
7370 msgid ""
6056 7371 " File history is shown without following rename or copy history of\n"
6057 7372 " files. Use -f/--follow with a filename to follow history across\n"
6058 7373 " renames and copies. --follow without a filename will only show\n"
6059 7374 " ancestors or descendants of the starting revision. --follow-first\n"
6060 " only follows the first parent of merge revisions.\n"
6061 "\n"
7375 " only follows the first parent of merge revisions."
7376 msgstr ""
7377 " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
7378 " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
7379 " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
7380 " visa föräldrar eller ättlingar från startrevisionen. --follow-first\n"
7381 " följer bara den första föräldern i revisoner med sammanfogningar."
7382
7383 msgid ""
6062 7384 " If no revision range is specified, the default is tip:0 unless\n"
6063 7385 " --follow is set, in which case the working directory parent is\n"
6064 " used as the starting revision.\n"
6065 "\n"
6066 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6067 "\n"
7386 " used as the starting revision."
7387 msgstr ""
7388 " Om ingen revisionsserie specificeras, används tip:0 som standard om\n"
7389 " inte --follow är satt, då arbetskatalogens förälder används som första\n"
7390 " revision."
7391
7392 msgid ""
6068 7393 " By default this command prints revision number and changeset id,\n"
6069 7394 " tags, non-trivial parents, user, date and time, and a summary for\n"
6070 7395 " each commit. When the -v/--verbose switch is used, the list of\n"
6071 " changed files and full commit message are shown.\n"
6072 "\n"
7396 " changed files and full commit message are shown."
7397 msgstr ""
7398 " Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n"
7399 " märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n"
7400 " sammandrag för varje arkivering. När flaggan -v/--verbose används,\n"
7401 " visas listan med ändrade filer och fullständigt arkiveringsmeddelande."
7402
7403 msgid ""
6073 7404 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6074 7405 " changesets, as it will only compare the merge changeset against\n"
6075 7406 " its first parent. Also, only files different from BOTH parents\n"
6076 7407 " will appear in files:.\n"
6077 7408 " "
6078 7409 msgstr ""
6079 "visa revisionshistorik för hela arkivet eller filer\n"
6080 "\n"
6081 " Skriv ut revisionshistoriken för de specificerade filerna eller hela\n"
6082 " projektet.\n"
6083 "\n"
6084 " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
6085 " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
6086 " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
6087 " visa föräldrar eller ättlingar från startrevisionen. --follow-first\n"
6088 " följer bara den första föräldern i revisoner med sammanfogningar.\n"
6089 "\n"
6090 " Om ingen revisionsserie specificeras, används tip:0 som standard om\n"
6091 " inte --follow är satt, då arbetskatalogens förälder används som första\n"
6092 " revision.\n"
6093 "\n"
6094 " Se 'hg help dates' för giltiga format till -d/--date.\n"
6095 "\n"
6096 " Som standard skriver detta kommando ut revisionsnummer och ändrings-id,\n"
6097 " märken, icke-triviala föräldrar, användare, datum och tid, samt ett\n"
6098 " sammandrag för varje arkivering. När flaggan -v/--verbose används,\n"
6099 " visas listan med ändrade filer och fullständigt arkiveringsmeddelande.\n"
6100 "\n"
6101 7410 " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n"
6102 7411 " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n"
6103 7412 " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n"
6104 7413 " föräldrarna att visas i filer:.\n"
6105 7414 " "
6106 7415
6107 msgid ""
6108 "output the current or given revision of the project manifest\n"
6109 "\n"
7416 msgid "output the current or given revision of the project manifest"
7417 msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet"
7418
7419 msgid ""
6110 7420 " Print a list of version controlled files for the given revision.\n"
6111 7421 " If no revision is given, the first parent of the working directory\n"
6112 " is used, or the null revision if no revision is checked out.\n"
6113 "\n"
7422 " is used, or the null revision if no revision is checked out."
7423 msgstr ""
7424 " Visa en lista med versionshanterade filer för den angivna revisionen.\n"
7425 " Om ingen revision anges, används arbetskatalogens första föräldern,\n"
7426 " eller null-revisionen om ingen revision är uthämtad."
7427
7428 msgid ""
6114 7429 " With -v, print file permissions, symlink and executable bits.\n"
6115 7430 " With --debug, print file revision hashes.\n"
6116 7431 " "
6117 7432 msgstr ""
6118 "visa den nuvarande eller angivna revisionen av projektmanifestet\n"
6119 "\n"
6120 " Visa en lista med versionshanterade filer för den angivna revisionen.\n"
6121 " Om ingen revision anges, används arbetskatalogens första föräldern,\n"
6122 " eller null-revisionen om ingen revision är uthämtad.\n"
6123 "\n"
6124 7433 " Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n"
6125 7434 " Med --debug visas filrevisionhashar.\n"
6126 7435 " "
6127 7436
6128 msgid ""
6129 "merge working directory with another revision\n"
6130 "\n"
7437 msgid "merge working directory with another revision"
7438 msgstr "sammanfoga arbetskatalogen med en annan revision"
7439
7440 msgid ""
6131 7441 " The current working directory is updated with all changes made in\n"
6132 " the requested revision since the last common predecessor revision.\n"
6133 "\n"
7442 " the requested revision since the last common predecessor revision."
7443 msgstr ""
7444 " Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n"
7445 " den efterfrågade revisionen sedan den senaste gemensamma revisionen."
7446
7447 msgid ""
6134 7448 " Files that changed between either parent are marked as changed for\n"
6135 7449 " the next commit and a commit must be performed before any further\n"
6136 7450 " updates to the repository are allowed. The next commit will have\n"
6137 " two parents.\n"
6138 "\n"
7451 " two parents."
7452 msgstr ""
7453 " Filerna som ändrats mellan föräldrarna markeras som förändrade till\n"
7454 " nästa arkivering och en arkivering måste utföras innan några andra\n"
7455 " arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n"
7456 " föräldrar."
7457
7458 msgid ""
6139 7459 " If no revision is specified, the working directory's parent is a\n"
6140 7460 " head revision, and the current branch contains exactly one other\n"
6141 7461 " head, the other head is merged with by default. Otherwise, an\n"
6142 7462 " explicit revision with which to merge with must be provided.\n"
6143 7463 " "
6144 7464 msgstr ""
6145 "sammanfoga arbetskatalogen med en annan revision\n"
6146 "\n"
6147 " Den aktuella arbetskatalogen uppdateras med alla ändringar som gjorts i\n"
6148 " den efterfrågade revisionen sedan den senaste gemensamma revisionen.\n"
6149 "\n"
6150 " Filerna som ändrats mellan föräldrarna markeras som förändrade till\n"
6151 " nästa arkivering och en arkivering måste utföras innan några andra\n"
6152 " arkivuppdateringar tillåts. Nästa arkivering kommer att ha två\n"
6153 " föräldrar.\n"
6154 "\n"
6155 7465 " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n"
6156 7466 " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n"
6157 7467 " det andra huvudet som standard. Om inte, måste en explicit revision\n"
@@ -6160,8 +7470,7 b' msgstr ""'
6160 7470
6161 7471 #, python-format
6162 7472 msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n"
6163 msgstr ""
6164 "avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n"
7473 msgstr "avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n"
6165 7474
6166 7475 msgid "(run 'hg heads .' to see heads)\n"
6167 7476 msgstr "(kör 'hg heads .' för att se huvuden)\n"
@@ -6180,35 +7489,32 b' msgstr "det finns inget att sammanfoga"'
6180 7489 msgid "%s - use \"hg update\" instead"
6181 7490 msgstr "%s - använd \"hg update\" istället"
6182 7491
6183 msgid ""
6184 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
6185 "rev"
6186 msgstr ""
6187 "arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller "
6188 "sammanfoga med en speficik rev"
6189
6190 msgid ""
6191 "show changesets not found in the destination\n"
6192 "\n"
7492 msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
7493 msgstr "arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller sammanfoga med en speficik rev"
7494
7495 msgid "show changesets not found in the destination"
7496 msgstr "visa ändringar som inte hittas i destinationen"
7497
7498 msgid ""
6193 7499 " Show changesets not found in the specified destination repository\n"
6194 7500 " or the default push location. These are the changesets that would\n"
6195 " be pushed if a push was requested.\n"
6196 "\n"
6197 " See pull for details of valid destination formats.\n"
6198 " "
6199 msgstr ""
6200 "visa ändringar som inte hittas i destinationen\n"
6201 "\n"
7501 " be pushed if a push was requested."
7502 msgstr ""
6202 7503 " Visa ändringar som inte hittas i det angivna destionationsarkivet\n"
6203 7504 " eller den vanliga push-platsen. Detta är de ändringar som skulle\n"
6204 " tryckas om push genomfördes.\n"
6205 "\n"
7505 " tryckas om push genomfördes."
7506
7507 msgid ""
7508 " See pull for details of valid destination formats.\n"
7509 " "
7510 msgstr ""
6206 7511 " Se pull för information om giltiga destinationsformat.\n"
6207 7512 " "
6208 7513
6209 msgid ""
6210 "show the parents of the working directory or revision\n"
6211 "\n"
7514 msgid "show the parents of the working directory or revision"
7515 msgstr "visa föräldrar till arbetskatalogen eller revision"
7516
7517 msgid ""
6212 7518 " Print the working directory's parent revisions. If a revision is\n"
6213 7519 " given via -r/--rev, the parent of that revision will be printed.\n"
6214 7520 " If a file argument is given, the revision in which the file was\n"
@@ -6216,8 +7522,6 b' msgid ""'
6216 7522 " argument to --rev if given) is printed.\n"
6217 7523 " "
6218 7524 msgstr ""
6219 "visa föräldrar till arbetskatalogen eller revision\n"
6220 "\n"
6221 7525 " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n"
6222 7526 " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n"
6223 7527 " anges, kommer revisionen då den filen sist ändrades (innan\n"
@@ -6231,35 +7535,37 b' msgstr "kan bara specificera ett explici'
6231 7535 msgid "'%s' not found in manifest!"
6232 7536 msgstr "'%s' hittades inte i manifestet!"
6233 7537
6234 msgid ""
6235 "show aliases for remote repositories\n"
6236 "\n"
7538 msgid "show aliases for remote repositories"
7539 msgstr "visa aliases för fjärrarkiv"
7540
7541 msgid ""
6237 7542 " Show definition of symbolic path name NAME. If no name is given,\n"
6238 " show definition of all available names.\n"
6239 "\n"
7543 " show definition of all available names."
7544 msgstr ""
7545 " Visa definitioner för sökvägen NAME. Om inget namn anges, visas\n"
7546 " definitionen för alla tillgängliga namn."
7547
7548 msgid ""
6240 7549 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6241 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6242 "\n"
7550 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
7551 msgstr ""
7552 " Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n"
7553 " $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också."
7554
7555 msgid ""
6243 7556 " The names 'default' and 'default-push' have a special meaning.\n"
6244 7557 " They are the locations used when pulling and pushing respectively\n"
6245 7558 " unless a location is specified. When cloning a repository, the\n"
6246 " clone source is written as 'default' in .hg/hgrc.\n"
6247 "\n"
6248 " See 'hg help urls' for more information.\n"
6249 " "
6250 msgstr ""
6251 "visa aliases för fjärrarkiv\n"
6252 "\n"
6253 " Visa definitioner för sökvägen NAME. Om inget namn anges, visas\n"
6254 " definitionen för alla tillgängliga namn.\n"
6255 "\n"
6256 " Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n"
6257 " $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också.\n"
6258 "\n"
7559 " clone source is written as 'default' in .hg/hgrc."
7560 msgstr ""
6259 7561 " Namnen 'default' och 'default-push' har en särskild innebörd. De är\n"
6260 7562 " platserna som används vid push eller pull om ingen plats anges. När\n"
6261 " ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc.\n"
6262 "\n"
7563 " ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc."
7564
7565 msgid ""
7566 " See 'hg help urls' for more information.\n"
7567 " "
7568 msgstr ""
6263 7569 " Se 'hg help urls' för mer information.\n"
6264 7570 " "
6265 7571
@@ -6270,85 +7576,85 b' msgid "not updating, since new heads add'
6270 7576 msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n"
6271 7577
6272 7578 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6273 msgstr ""
6274 "(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n"
7579 msgstr "(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n"
6275 7580
6276 7581 msgid "(run 'hg update' to get a working copy)\n"
6277 7582 msgstr "(kör 'hg update' för att få en arbetskopia)\n"
6278 7583
6279 msgid ""
6280 "pull changes from the specified source\n"
6281 "\n"
6282 " Pull changes from a remote repository to a local one.\n"
6283 "\n"
7584 msgid "pull changes from the specified source"
7585 msgstr "dra ändringar från den specificerade källan"
7586
7587 msgid " Pull changes from a remote repository to a local one."
7588 msgstr " Drar ändringar från ett annat arkiv till ett lokalt."
7589
7590 msgid ""
6284 7591 " This finds all changes from the repository at the specified path\n"
6285 7592 " or URL and adds them to a local repository (the current one unless\n"
6286 7593 " -R is specified). By default, this does not update the copy of the\n"
6287 " project in the working directory.\n"
6288 "\n"
7594 " project in the working directory."
7595 msgstr ""
7596 " Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n"
7597 " URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n"
7598 " -R är angivet). Som standard uppdaterar detta inte projektkopian i\n"
7599 " arbetskatalogen."
7600
7601 msgid ""
6289 7602 " Use hg incoming if you want to see what would have been added by a\n"
6290 7603 " pull at the time you issued this command. If you then decide to\n"
6291 7604 " added those changes to the repository, you should use pull -r X\n"
6292 " where X is the last changeset listed by hg incoming.\n"
6293 "\n"
6294 " If SOURCE is omitted, the 'default' path will be used.\n"
6295 " See 'hg help urls' for more information.\n"
6296 " "
6297 msgstr ""
6298 "dra ändringar från den specificerade källan\n"
6299 "\n"
6300 " Drar ändringar från ett annat arkiv till ett lokalt.\n"
6301 "\n"
6302 " Hittar alla ändringar från arkivet i den specificerade sökvägen eller\n"
6303 " URL:en och lägger till dem i det lokala arkivet (det nuvarande om inte\n"
6304 " -R är angivet). Som standard uppdaterar detta inte projektkopian i\n"
6305 " arbetskatalogen.\n"
6306 "\n"
7605 " where X is the last changeset listed by hg incoming."
7606 msgstr ""
6307 7607 " Använd hg incoming om du vill se vad som skulle ha lagts till av en\n"
6308 7608 " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n"
6309 7609 " att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n"
6310 " sista ändringen listad av hg incoming.\n"
6311 "\n"
7610 " sista ändringen listad av hg incoming."
7611
7612 msgid ""
7613 " If SOURCE is omitted, the 'default' path will be used.\n"
7614 " See 'hg help urls' for more information.\n"
7615 " "
7616 msgstr ""
6312 7617 " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n"
6313 7618 " Se 'hg help urls' för mer information.\n"
6314 7619 " "
6315 7620
6316 msgid ""
6317 "push changes to the specified destination\n"
6318 "\n"
6319 " Push changes from the local repository to the specified destination.\n"
6320 "\n"
7621 msgid "push changes to the specified destination"
7622 msgstr "tryck ändringar till den specificerade destinationen"
7623
7624 msgid " Push changes from the local repository to the specified destination."
7625 msgstr " Trycker ändringar från det lokala arkivet till angiven destination."
7626
7627 msgid ""
6321 7628 " This is the symmetrical operation for pull. It moves changes from\n"
6322 7629 " the current repository to a different one. If the destination is\n"
6323 7630 " local this is identical to a pull in that directory from the\n"
6324 " current one.\n"
6325 "\n"
7631 " current one."
7632 msgstr ""
7633 " Detta är en symmetriska operationen för pull. Den flyttar ändringar\n"
7634 " från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n"
7635 " är detta identiskt med en dragning i den katalogen från den nuvarande."
7636
7637 msgid ""
6326 7638 " By default, push will refuse to run if it detects the result would\n"
6327 7639 " increase the number of remote heads. This generally indicates the\n"
6328 " user forgot to pull and merge before pushing.\n"
6329 "\n"
7640 " user forgot to pull and merge before pushing."
7641 msgstr ""
7642 " Som standard vägrar push att utföra något om det upptäcks att antalet\n"
7643 " huvuden i destinationen ökar. Det brukar generellt sett indikera att\n"
7644 " användaren glömt att dra och sammanfoga innan tryckning."
7645
7646 msgid ""
6330 7647 " If -r/--rev is used, the named revision and all its ancestors will\n"
6331 " be pushed to the remote repository.\n"
6332 "\n"
7648 " be pushed to the remote repository."
7649 msgstr ""
7650 " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n"
7651 " tryckas till det andra arkivet."
7652
7653 msgid ""
6333 7654 " Please see 'hg help urls' for important details about ``ssh://``\n"
6334 7655 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6335 7656 " "
6336 7657 msgstr ""
6337 "tryck ändringar till den specificerade destinationen\n"
6338 "\n"
6339 " Trycker ändringar från det lokala arkivet till angiven destination.\n"
6340 "\n"
6341 " Detta är en symmetriska operationen för pull. Den flyttar ändringar\n"
6342 " från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n"
6343 " är detta identiskt med en dragning i den katalogen från den nuvarande.\n"
6344 "\n"
6345 " Som standard vägrar push att utföra något om det upptäcks att antalet\n"
6346 " huvuden i destinationen ökar. Det brukar generellt sett indikera att\n"
6347 " användaren glömt att dra och sammanfoga innan tryckning.\n"
6348 "\n"
6349 " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n"
6350 " tryckas till det andra arkivet.\n"
6351 "\n"
6352 7658 " Se 'hg help urls' för viktiga detaljer om URL:er med ``ssh://``. Om\n"
6353 7659 " DESTINATION inte är angivet, används standardsökvägen."
6354 7660
@@ -6356,74 +7662,71 b' msgstr ""'
6356 7662 msgid "pushing to %s\n"
6357 7663 msgstr "trycker till %s\n"
6358 7664
6359 msgid ""
6360 "roll back an interrupted transaction\n"
6361 "\n"
6362 " Recover from an interrupted commit or pull.\n"
6363 "\n"
7665 msgid "roll back an interrupted transaction"
7666 msgstr "ångra en avbruten transaktion"
7667
7668 msgid " Recover from an interrupted commit or pull."
7669 msgstr " Återställ från en avbruten commit eller pull."
7670
7671 msgid ""
6364 7672 " This command tries to fix the repository status after an\n"
6365 7673 " interrupted operation. It should only be necessary when Mercurial\n"
6366 7674 " suggests it.\n"
6367 7675 " "
6368 7676 msgstr ""
6369 "ångra en avbruten transaktion\n"
6370 "\n"
6371 " Återställ från en avbruten commit eller pull.\n"
6372 "\n"
6373 7677 " Kommandot försöker att fixa arkivstatusen efter en avbruten operation.\n"
6374 7678 " Det bör bara användas när Mercurial föreslår det.\n"
6375 7679 " "
6376 7680
6377 msgid ""
6378 "remove the specified files on the next commit\n"
6379 "\n"
6380 " Schedule the indicated files for removal from the repository.\n"
6381 "\n"
7681 msgid "remove the specified files on the next commit"
7682 msgstr "ta bort de specificerade filerna vid nästa arkivering"
7683
7684 msgid " Schedule the indicated files for removal from the repository."
7685 msgstr " Markera de indikerade filerna för borttagning från arkivet."
7686
7687 msgid ""
6382 7688 " This only removes files from the current branch, not from the\n"
6383 7689 " entire project history. -A/--after can be used to remove only\n"
6384 7690 " files that have already been deleted, -f/--force can be used to\n"
6385 7691 " force deletion, and -Af can be used to remove files from the next\n"
6386 " revision without deleting them from the working directory.\n"
6387 "\n"
7692 " revision without deleting them from the working directory."
7693 msgstr ""
7694 " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
7695 " projektets historik. -A/--after kan användas för att bara ta bort filer\n"
7696 " som redan raderats, -f/--force kan användas för att tvinga radering, och\n"
7697 " -Af kan ta bort filer från nästa revision utan att radera dem från\n"
7698 " arbetskopian."
7699
7700 msgid ""
6388 7701 " The following table details the behavior of remove for different\n"
6389 7702 " file states (columns) and option combinations (rows). The file\n"
6390 7703 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6391 7704 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6392 " and Delete (from disk)::\n"
6393 "\n"
7705 " and Delete (from disk)::"
7706 msgstr ""
7707 " Följande tabell visar hur remove uppför sig för olika filstatus\n"
7708 " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
7709 " Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n"
7710 " är Varna, Radera (från gren) och Ta bort (från disk)::"
7711
7712 msgid ""
6394 7713 " A C M !\n"
6395 7714 " none W RD W R\n"
6396 7715 " -f R RD RD R\n"
6397 7716 " -A W W W R\n"
6398 " -Af R R R R\n"
6399 "\n"
6400 " This command schedules the files to be removed at the next commit.\n"
6401 " To undo a remove before that, see hg revert.\n"
6402 " "
6403 msgstr ""
6404 "ta bort de specificerade filerna vid nästa arkivering\n"
6405 "\n"
6406 " Markera de indikerade filerna för borttagning från arkivet.\n"
6407 "\n"
6408 " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
6409 " projektets historik. -A/--after kan användas för att bara ta bort filer\n"
6410 " som redan raderats, -f/--force kan användas för att tvinga radering, "
6411 "och\n"
6412 " -Af kan ta bort filer från nästa revision utan att radera dem från\n"
6413 " arbetskopian.\n"
6414 "\n"
6415 " Följande tabell visar hur remove uppför sig för olika filstatus\n"
6416 " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
6417 " Modifierad [M] och Saknad [!] (som rapporteras av hg status). "
6418 "Aktionerna\n"
6419 " är Varna, Radera (från gren) och Ta bort (från disk)::\n"
6420 "\n"
7717 " -Af R R R R"
7718 msgstr ""
6421 7719 " A C M !\n"
6422 7720 " ingen V RT V R\n"
6423 7721 " -f R RT RT R\n"
6424 7722 " -A V V V R\n"
6425 " -Af R R R R\n"
6426 "\n"
7723 " -Af R R R R"
7724
7725 msgid ""
7726 " This command schedules the files to be removed at the next commit.\n"
7727 " To undo a remove before that, see hg revert.\n"
7728 " "
7729 msgstr ""
6427 7730 " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
6428 7731 " att ångra en remove innan dess, se hg revert.\n"
6429 7732 " "
@@ -6445,47 +7748,49 b' msgstr "\xc3\xa4r modifierad"'
6445 7748 msgid "has been marked for add"
6446 7749 msgstr "har markerats för addering"
6447 7750
6448 msgid ""
6449 "rename files; equivalent of copy + remove\n"
6450 "\n"
7751 msgid "rename files; equivalent of copy + remove"
7752 msgstr "döp om filer; likvärdig med kopiering + radering"
7753
7754 msgid ""
6451 7755 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6452 7756 " is a directory, copies are put in that directory. If dest is a\n"
6453 " file, there can only be one source.\n"
6454 "\n"
6455 " By default, this command copies the contents of files as they\n"
6456 " exist in the working directory. If invoked with -A/--after, the\n"
6457 " operation is recorded, but no copying is performed.\n"
6458 "\n"
7757 " file, there can only be one source."
7758 msgstr ""
7759 " Markera dest som kopior av källorna; markera källorna för radering.\n"
7760 " Om dest är en katalog, placeras kopiorna i den katalogen. Om dest är\n"
7761 " en fil, kan det bara finnas en källa."
7762
7763 msgid ""
6459 7764 " This command takes effect at the next commit. To undo a rename\n"
6460 7765 " before that, see hg revert.\n"
6461 7766 " "
6462 7767 msgstr ""
6463 "döp om filer; likvärdig med kopiering + radering\n"
6464 "\n"
6465 " Markera dest som kopior av källorna; markera källorna för radering.\n"
6466 " Om dest är en katalog, placeras kopiorna i den katalogen. Om dest är\n"
6467 " en fil, kan det bara finnas en källa.\n"
6468 "\n"
6469 " Som standard kopierar detta kommando innehållet i filerna som de ser\n"
6470 " ut i arbetskopian. Om det utförs med -A/--after, så sparas\n"
6471 " operationen, men ingen kopiering utförs.\n"
6472 "\n"
6473 7768 " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n"
6474 7769 " namnbyte innan det, se hg revert.\n"
6475 7770 " "
6476 7771
6477 msgid ""
6478 "various operations to help finish a merge\n"
6479 "\n"
7772 msgid "various operations to help finish a merge"
7773 msgstr "diverse operationer för att slutföra sammanfogningar"
7774
7775 msgid ""
6480 7776 " This command includes several actions that are often useful while\n"
6481 7777 " performing a merge, after running ``merge`` but before running\n"
6482 7778 " ``commit``. (It is only meaningful if your working directory has\n"
6483 7779 " two parents.) It is most relevant for merges with unresolved\n"
6484 7780 " conflicts, which are typically a result of non-interactive merging with\n"
6485 " ``internal:merge`` or a command-line merge tool like ``diff3``.\n"
6486 "\n"
6487 " The available actions are:\n"
6488 "\n"
7781 " ``internal:merge`` or a command-line merge tool like ``diff3``."
7782 msgstr ""
7783 " Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n"
7784 " en sammanfogning utförs, efter att ``merge`` körts men innan\n"
7785 " ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n"
7786 " föräldrar.) Det är mest relevant för sammanfogningar med olösta\n"
7787 " konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n"
7788 " med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``."
7789
7790 msgid " The available actions are:"
7791 msgstr " Tillgängliga handlingar är:"
7792
7793 msgid ""
6489 7794 " 1) list files that were merged with conflicts (U, for unresolved)\n"
6490 7795 " and without conflicts (R, for resolved): ``hg resolve -l``\n"
6491 7796 " (this is like ``status`` for merges)\n"
@@ -6495,24 +7800,8 b' msgid ""'
6495 7800 " ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
6496 7801 " 4) discard your current attempt(s) at resolving conflicts and\n"
6497 7802 " restart the merge from scratch: ``hg resolve file...``\n"
6498 " (or ``-a`` for all unresolved files)\n"
6499 "\n"
6500 " Note that Mercurial will not let you commit files with unresolved merge\n"
6501 " conflicts. You must use ``hg resolve -m ...`` before you can commit\n"
6502 " after a conflicting merge.\n"
6503 " "
6504 msgstr ""
6505 "diverse operationer för att slutföra sammanfogningar\n"
6506 "\n"
6507 " Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n"
6508 " en sammanfogning utförs, efter att ``merge`` körts men innan\n"
6509 " ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n"
6510 " föräldrar.) Det är mest relevant för sammanfogningar med olösta\n"
6511 " konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n"
6512 " med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``.\n"
6513 "\n"
6514 " Tillgängliga handlingar är:\n"
6515 "\n"
7803 " (or ``-a`` for all unresolved files)"
7804 msgstr ""
6516 7805 " 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n"
6517 7806 " utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n"
6518 7807 " ``status`` för sammanfogningar)\n"
@@ -6522,8 +7811,14 b' msgstr ""'
6522 7811 " ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n"
6523 7812 " 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n"
6524 7813 " sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n"
6525 " för alla olösta filer)\n"
6526 "\n"
7814 " för alla olösta filer)"
7815
7816 msgid ""
7817 " Note that Mercurial will not let you commit files with unresolved merge\n"
7818 " conflicts. You must use ``hg resolve -m ...`` before you can commit\n"
7819 " after a conflicting merge.\n"
7820 " "
7821 msgstr ""
6527 7822 " Notera att Mercurial inte låter dig arkivera filer med olösta\n"
6528 7823 " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n"
6529 7824 " innan du kan arkivera efter en sammanfogning med konflikter.\n"
@@ -6536,71 +7831,74 b' msgid "can\'t specify --all and patterns"'
6536 7831 msgstr "kan inte specificera --all och mönster"
6537 7832
6538 7833 msgid "no files or directories specified; use --all to remerge all files"
6539 msgstr ""
6540 "inga filer eller kataloger specificerade; använd --all för att "
6541 "återsammanfoga alla filer"
6542
6543 msgid ""
6544 "restore individual files or directories to an earlier state\n"
6545 "\n"
7834 msgstr "inga filer eller kataloger specificerade; använd --all för att återsammanfoga alla filer"
7835
7836 msgid "restore individual files or directories to an earlier state"
7837 msgstr "återställ filer eller kataloger till ett tidigare tillstånd"
7838
7839 msgid ""
6546 7840 " (Use update -r to check out earlier revisions, revert does not\n"
6547 " change the working directory parents.)\n"
6548 "\n"
7841 " change the working directory parents.)"
7842 msgstr ""
7843 " (Använd update -r för att hämta ut tidigare revisioner, revert ändrar\n"
7844 " inte arbetskatalogens föräldrar.)"
7845
7846 msgid ""
6549 7847 " With no revision specified, revert the named files or directories\n"
6550 7848 " to the contents they had in the parent of the working directory.\n"
6551 7849 " This restores the contents of the affected files to an unmodified\n"
6552 7850 " state and unschedules adds, removes, copies, and renames. If the\n"
6553 7851 " working directory has two parents, you must explicitly specify a\n"
6554 " revision.\n"
6555 "\n"
7852 " revision."
7853 msgstr ""
7854 " Om ingen revision anges, så återställs de givna filerna eller\n"
7855 " katalogerna till innehållet de hade i arbetskatalogens förälder. Det\n"
7856 " sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
7857 " raderingar, kopior och namnbyten. Om arbetskatalogen har två\n"
7858 " föräldrar, så måste du ange en revision."
7859
7860 msgid ""
6556 7861 " Using the -r/--rev option, revert the given files or directories\n"
6557 7862 " to their contents as of a specific revision. This can be helpful\n"
6558 7863 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6559 " dates' for a list of formats valid for -d/--date.\n"
6560 "\n"
7864 " dates' for a list of formats valid for -d/--date."
7865 msgstr ""
7866 " Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n"
7867 " till innehållet i den specifika revisionen. Detta kan användas för\n"
7868 " att ångra delar av eller hela tidigare ändringar. Se 'hg help dates'\n"
7869 " för en lista med giltiga format för -d/--date."
7870
7871 msgid ""
6561 7872 " Revert modifies the working directory. It does not commit any\n"
6562 7873 " changes, or change the parent of the working directory. If you\n"
6563 7874 " revert to a revision other than the parent of the working\n"
6564 7875 " directory, the reverted files will thus appear modified\n"
6565 " afterwards.\n"
6566 "\n"
6567 " If a file has been deleted, it is restored. If the executable mode\n"
6568 " of a file was changed, it is reset.\n"
6569 "\n"
6570 " If names are given, all files matching the names are reverted.\n"
6571 " If no arguments are given, no files are reverted.\n"
6572 "\n"
6573 " Modified files are saved with a .orig suffix before reverting.\n"
6574 " To disable these backups, use --no-backup.\n"
6575 " "
6576 msgstr ""
6577 "återställ filer eller kataloger till ett tidigare tillstånd\n"
6578 "\n"
6579 " (Använd update -r för att hämta ut tidigare revisioner, revert ändrar\n"
6580 " inte arbetskatalogens föräldrar.)\n"
6581 "\n"
6582 " Om ingen revision anges, så återställs de givna filerna eller\n"
6583 " katalogerna till innehållet de hade i arbetskatalogens förälder. Det\n"
6584 " sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
6585 " raderingar, kopior och namnbyten. Om arbetskatalogen har två\n"
6586 " föräldrar, så måste du ange en revision.\n"
6587 "\n"
6588 " Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n"
6589 " till innehållet i den specifika revisionen. Detta kan användas för\n"
6590 " att ångra delar av eller hela tidigare ändringar. Se 'hg help dates'\n"
6591 " för en lista med giltiga format för -d/--date.\n"
6592 "\n"
7876 " afterwards."
7877 msgstr ""
6593 7878 " Revert modifierar arbetskatalogen. Det arkiverar inga ändringar, och\n"
6594 7879 " ändrar inte arbetskatalogens förälder. Om du återgår till en revision\n"
6595 7880 " som inte är arbetskatalogens förälder, kommer den återställda filen\n"
6596 " att visas som modifierad.\n"
6597 "\n"
7881 " att visas som modifierad."
7882
7883 msgid ""
7884 " If a file has been deleted, it is restored. If the executable mode\n"
7885 " of a file was changed, it is reset."
7886 msgstr ""
6598 7887 " Om en fil har raderas, så återställs den. Om läget för exekverbarhet\n"
6599 " har ändrats för en fil, så återställs det.\n"
6600 "\n"
7888 " har ändrats för en fil, så återställs det."
7889
7890 msgid ""
7891 " If names are given, all files matching the names are reverted.\n"
7892 " If no arguments are given, no files are reverted."
7893 msgstr ""
6601 7894 " Om namn anges, så återställs alla filer med överrensstämmande namn.\n"
6602 " Om inga argument ges, återställs inga filer.\n"
6603 "\n"
7895 " Om inga argument ges, återställs inga filer."
7896
7897 msgid ""
7898 " Modified files are saved with a .orig suffix before reverting.\n"
7899 " To disable these backups, use --no-backup.\n"
7900 " "
7901 msgstr ""
6604 7902 " Modifierade filer sparas med suffixet .orig innan återställning.\n"
6605 7903 " För att deaktivera dessa säkerhetskopior, använd --no-backup.\n"
6606 7904 " "
@@ -6609,9 +7907,7 b' msgid "you can\'t specify a revision and '
6609 7907 msgstr "du kan inte specificera en revision och ett datum"
6610 7908
6611 7909 msgid "no files or directories specified; use --all to revert the whole repo"
6612 msgstr ""
6613 "inga filer eller kataloger angivna; använd --all för att återställa hela "
6614 "arkivet"
7910 msgstr "inga filer eller kataloger angivna; använd --all för att återställa hela arkivet"
6615 7911
6616 7912 #, python-format
6617 7913 msgid "forgetting %s\n"
@@ -6637,26 +7933,47 b' msgstr "filen hanteras inte: %s\\n"'
6637 7933 msgid "no changes needed to %s\n"
6638 7934 msgstr "inga ändringar behövs för %s\n"
6639 7935
6640 msgid ""
6641 "roll back the last transaction (dangerous)\n"
6642 "\n"
7936 msgid "roll back the last transaction (dangerous)"
7937 msgstr "återgång från den senaste transaktionen (farligt)"
7938
7939 msgid ""
6643 7940 " This command should be used with care. There is only one level of\n"
6644 7941 " rollback, and there is no way to undo a rollback. It will also\n"
6645 7942 " restore the dirstate at the time of the last transaction, losing\n"
6646 7943 " any dirstate changes since that time. This command does not alter\n"
6647 " the working directory.\n"
6648 "\n"
7944 " the working directory."
7945 msgstr ""
7946 " Detta kommando bör användas med försiktighet. Det finns bara en nivå\n"
7947 " av återgång, och det finns inget sätt att ångra en återgång.\n"
7948 " Det återställer också katalogstatusen till tillståndet vid den\n"
7949 " senaste transaktionen, så dessa förloras. Kommandot ändrar inte\n"
7950 " arbetskatalogen."
7951
7952 msgid ""
6649 7953 " Transactions are used to encapsulate the effects of all commands\n"
6650 7954 " that create new changesets or propagate existing changesets into a\n"
6651 7955 " repository. For example, the following commands are transactional,\n"
6652 " and their effects can be rolled back:\n"
6653 "\n"
7956 " and their effects can be rolled back:"
7957 msgstr ""
7958 " Transaktioner används för att kapsla in alla kommandon som skapar nya\n"
7959 " ändringar eller sprider existerade ändringar till ett arkiv.\n"
7960 " Exempelvis skapar de följande kommandona transaktioner, och deras\n"
7961 " ändringar kan återkallas:"
7962
7963 msgid ""
6654 7964 " - commit\n"
6655 7965 " - import\n"
6656 7966 " - pull\n"
6657 7967 " - push (with this repository as the destination)\n"
6658 " - unbundle\n"
6659 "\n"
7968 " - unbundle"
7969 msgstr ""
7970 " - commit\n"
7971 " - import\n"
7972 " - pull\n"
7973 " - push (med det här arkivet som destination)\n"
7974 " - unbundle"
7975
7976 msgid ""
6660 7977 " This command is not intended for use on public repositories. Once\n"
6661 7978 " changes are visible for pull by other users, rolling a transaction\n"
6662 7979 " back locally is ineffective (someone else may already have pulled\n"
@@ -6665,25 +7982,6 b' msgid ""'
6665 7982 " may fail if a rollback is performed.\n"
6666 7983 " "
6667 7984 msgstr ""
6668 "återgång från den senaste transaktionen (farligt)\n"
6669 "\n"
6670 " Detta kommando bör användas med försiktighet. Det finns bara en nivå\n"
6671 " av återgång, och det finns inget sätt att ångra en återgång.\n"
6672 " Det återställer också katalogstatusen till tillståndet vid den\n"
6673 " senaste transaktionen, så dessa förloras. Kommandot ändrar inte\n"
6674 " arbetskatalogen.\n"
6675 "\n"
6676 " Transaktioner används för att kapsla in alla kommandon som skapar nya\n"
6677 " ändringar eller sprider existerade ändringar till ett arkiv.\n"
6678 " Exempelvis skapar de följande kommandona transaktioner, och deras\n"
6679 " ändringar kan återkallas:\n"
6680 "\n"
6681 " - commit\n"
6682 " - import\n"
6683 " - pull\n"
6684 " - push (med det här arkivet som destination)\n"
6685 " - unbundle\n"
6686 "\n"
6687 7985 " Detta kommando är inte tänkt att användas i offentliga arkiv. När\n"
6688 7986 " ändringar är tillgängliga att dras av andra användare, så är en\n"
6689 7987 " lokal återgång ineffektivt (någon annan kan redan ha dragit\n"
@@ -6692,39 +7990,37 b' msgstr ""'
6692 7990 " utförs.\n"
6693 7991 " "
6694 7992
6695 msgid ""
6696 "print the root (top) of the current working directory\n"
6697 "\n"
7993 msgid "print the root (top) of the current working directory"
7994 msgstr "visa roten för den aktuella arbetskatalogen"
7995
7996 msgid ""
6698 7997 " Print the root directory of the current repository.\n"
6699 7998 " "
6700 7999 msgstr ""
6701 "visa roten för den aktuella arbetskatalogen\n"
6702 "\n"
6703 8000 " Visa rotkatalogen för det aktuella arkivet.\n"
6704 8001 " "
6705 8002
6706 msgid ""
6707 "start stand-alone webserver\n"
6708 "\n"
6709 " Start a local HTTP repository browser and pull server.\n"
6710 "\n"
8003 msgid "start stand-alone webserver"
8004 msgstr "starta fristående webbserver"
8005
8006 msgid " Start a local HTTP repository browser and pull server."
8007 msgstr " Startar en lokal HTTP-arkivbläddrare och pull-server."
8008
8009 msgid ""
6711 8010 " By default, the server logs accesses to stdout and errors to\n"
6712 8011 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
6713 " files.\n"
6714 "\n"
8012 " files."
8013 msgstr ""
8014 " Som standard loggar servern anslutningar till stdout och fel till\n"
8015 " stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n"
8016 " till filer."
8017
8018 msgid ""
6715 8019 " To have the server choose a free port number to listen on, specify\n"
6716 8020 " a port number of 0; in this case, the server will print the port\n"
6717 8021 " number it uses.\n"
6718 8022 " "
6719 8023 msgstr ""
6720 "starta fristående webbserver\n"
6721 "\n"
6722 " Startar en lokal HTTP-arkivbläddrare och pull-server.\n"
6723 "\n"
6724 " Som standard loggar servern anslutningar till stdout och fel till\n"
6725 " stderr. Använd flaggorna -A/--accesslog och -E/--errorlog för att logga\n"
6726 " till filer.\n"
6727 "\n"
6728 8024 " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n"
6729 8025 " som portnummer; då visar servern det portnummer som används.\n"
6730 8026 " "
@@ -6733,31 +8029,56 b' msgstr ""'
6733 8029 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6734 8030 msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n"
6735 8031
6736 msgid ""
6737 "show changed files in the working directory\n"
6738 "\n"
8032 msgid "show changed files in the working directory"
8033 msgstr "visa ändrade filer i arbetskatalogen"
8034
8035 msgid ""
6739 8036 " Show status of files in the repository. If names are given, only\n"
6740 8037 " files that match are shown. Files that are clean or ignored or\n"
6741 8038 " the source of a copy/move operation, are not listed unless\n"
6742 8039 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
6743 8040 " Unless options described with \"show only ...\" are given, the\n"
6744 " options -mardu are used.\n"
6745 "\n"
8041 " options -mardu are used."
8042 msgstr ""
8043 " Visa status för filer i arkivet. Om namn anges, visas bara filer som\n"
8044 " matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n"
8045 " eller kopieringsoperation, visas inte om förrän -c/--clean,\n"
8046 " -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n"
8047 " beskrivningen \"visa bara ...\" anges, så används flaggorna -mardu."
8048
8049 msgid ""
6746 8050 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6747 " unless explicitly requested with -u/--unknown or -i/--ignored.\n"
6748 "\n"
8051 " unless explicitly requested with -u/--unknown or -i/--ignored."
8052 msgstr ""
8053 " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n"
8054 " inte bes om explicit med -u/--unknown eller -i/--ignored."
8055
8056 msgid ""
6749 8057 " NOTE: status may appear to disagree with diff if permissions have\n"
6750 8058 " changed or a merge has occurred. The standard diff format does not\n"
6751 8059 " report permission changes and diff only reports changes relative\n"
6752 " to one merge parent.\n"
6753 "\n"
8060 " to one merge parent."
8061 msgstr ""
8062 " NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n"
8063 " en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n"
8064 " inte förändringar av tillstånd och diff rapporterar bara ändringar\n"
8065 " relativt till en förälder vid sammanfogningar."
8066
8067 msgid ""
6754 8068 " If one revision is given, it is used as the base revision.\n"
6755 8069 " If two revisions are given, the differences between them are\n"
6756 8070 " shown. The --change option can also be used as a shortcut to list\n"
6757 " the changed files of a revision from its first parent.\n"
6758 "\n"
6759 " The codes used to show the status of files are::\n"
6760 "\n"
8071 " the changed files of a revision from its first parent."
8072 msgstr ""
8073 " Om en revision anges, används den som basrevision. Om två revisioner\n"
8074 " anges, visas skillnaderna mellan dem. Flaggan --change kan också\n"
8075 " användas som en genväg för att visa de ändrade filerna i en revision\n"
8076 " från dess första förälder."
8077
8078 msgid " The codes used to show the status of files are::"
8079 msgstr " Koderna som används för att visa filstatus är::"
8080
8081 msgid ""
6761 8082 " M = modified\n"
6762 8083 " A = added\n"
6763 8084 " R = removed\n"
@@ -6768,29 +8089,6 b' msgid ""'
6768 8089 " = origin of the previous file listed as A (added)\n"
6769 8090 " "
6770 8091 msgstr ""
6771 "visa ändrade filer i arbetskatalogen\n"
6772 "\n"
6773 " Visa status för filer i arkivet. Om namn anges, visas bara filer som\n"
6774 " matchar. FIler som är rena eller ignorerade eller källan för en flytt-\n"
6775 " eller kopieringsoperation, visas inte om förrän -c/--clean,\n"
6776 " -i/--ignored, -C/--copies eller -A/--all anges. Om inte flaggor med\n"
6777 " beskrivningen \"visa bara ...\" anges, så används flaggorna -mardu.\n"
6778 "\n"
6779 " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n"
6780 " inte bes om explicit med -u/--unknown eller -i/--ignored.\n"
6781 "\n"
6782 " NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n"
6783 " en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n"
6784 " inte förändringar av tillstånd och diff rapporterar bara ändringar\n"
6785 " relativt till en förälder vid sammanfogningar.\n"
6786 "\n"
6787 " Om en revision anges, används den som basrevision. Om två revisioner\n"
6788 " anges, visas skillnaderna mellan dem. Flaggan --change kan också\n"
6789 " användas som en genväg för att visa de ändrade filerna i en revision\n"
6790 " från dess första förälder.\n"
6791 "\n"
6792 " Koderna som används för att visa filstatus är::\n"
6793 "\n"
6794 8092 " M = modifierad\n"
6795 8093 " A = adderad\n"
6796 8094 " R = raderad\n"
@@ -6801,21 +8099,21 b' msgstr ""'
6801 8099 " = källa för den tidigare filen listad som A (adderad)\n"
6802 8100 " "
6803 8101
6804 msgid ""
6805 "summarize working directory state\n"
6806 "\n"
8102 msgid "summarize working directory state"
8103 msgstr "sammanfatta arbetskatalogens tillstånd"
8104
8105 msgid ""
6807 8106 " This generates a brief summary of the working directory state,\n"
6808 " including parents, branch, commit status, and available updates.\n"
6809 "\n"
8107 " including parents, branch, commit status, and available updates."
8108 msgstr ""
8109 " Detta skapar en kort sammanfattning av arbetskatalogens tillstånd,\n"
8110 " inklusive föräldrar, gren, arkivstatus, och tillgängliga uppdateringar."
8111
8112 msgid ""
6810 8113 " With the --remote option, this will check the default paths for\n"
6811 8114 " incoming and outgoing changes. This can be time-consuming.\n"
6812 8115 " "
6813 8116 msgstr ""
6814 "sammanfatta arbetskatalogens tillstånd\n"
6815 "\n"
6816 " Detta skapar en kort sammanfattning av arbetskatalogens tillstånd,\n"
6817 " inklusive föräldrar, gren, arkivstatus, och tillgängliga uppdateringar.\n"
6818 "\n"
6819 8117 " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n"
6820 8118 " för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n"
6821 8119 " "
@@ -6903,46 +8201,40 b' msgstr "fj\xc3\xa4rran: %s\\n"'
6903 8201 msgid "remote: (synced)\n"
6904 8202 msgstr "fjärran: (synkad)\n"
6905 8203
6906 msgid ""
6907 "add one or more tags for the current or given revision\n"
6908 "\n"
6909 " Name a particular revision using <name>.\n"
6910 "\n"
8204 msgid "add one or more tags for the current or given revision"
8205 msgstr "lägg till en eller fler märken för en revision"
8206
8207 msgid " Name a particular revision using <name>."
8208 msgstr " Namnge en specifik revision med <namn>."
8209
8210 msgid ""
6911 8211 " Tags are used to name particular revisions of the repository and are\n"
6912 8212 " very useful to compare different revisions, to go back to significant\n"
6913 " earlier versions or to mark branch points as releases, etc.\n"
6914 "\n"
8213 " earlier versions or to mark branch points as releases, etc."
8214 msgstr ""
8215 " Märken används för att namnge specifika revisioner i arkivet och är\n"
8216 " väldigt användbara för at jämföra olika revisioner, för att gå\n"
8217 " tillbaka till tidigare versioner eller för att markera förgreningar\n"
8218 " som releaser, osv."
8219
8220 msgid ""
6915 8221 " If no revision is given, the parent of the working directory is\n"
6916 " used, or tip if no revision is checked out.\n"
6917 "\n"
8222 " used, or tip if no revision is checked out."
8223 msgstr ""
8224 " Om ingen revision anges, används föräldern för arbetskatalogen, eller\n"
8225 " toppen om ingen revision är uthämtad."
8226
8227 msgid ""
6918 8228 " To facilitate version control, distribution, and merging of tags,\n"
6919 8229 " they are stored as a file named \".hgtags\" which is managed\n"
6920 8230 " similarly to other project files and can be hand-edited if\n"
6921 8231 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6922 " shared among repositories).\n"
6923 "\n"
6924 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6925 " "
6926 msgstr ""
6927 "lägg till en eller fler märken för en revision\n"
6928 "\n"
6929 " Namnge en specifik revision med <namn>.\n"
6930 "\n"
6931 " Märken används för att namnge specifika revisioner i arkivet och är\n"
6932 " väldigt användbara för at jämföra olika revisioner, för att gå\n"
6933 " tillbaka till tidigare versioner eller för att markera förgreningar\n"
6934 " som releaser, osv.\n"
6935 "\n"
6936 " Om ingen revision anges, används föräldern för arbetskatalogen, eller\n"
6937 " toppen om ingen revision är uthämtad.\n"
6938 "\n"
8232 " shared among repositories)."
8233 msgstr ""
6939 8234 " För att underlätta versionshantering, distribution, och sammanfogning\n"
6940 8235 " av märken, lagras de som en fil vid namn \".hgtags\" som hanteras på\n"
6941 8236 " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n"
6942 " Filen '.hg/localtags' används för lokala märken (ej delad i arkiv).\n"
6943 "\n"
6944 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
6945 " "
8237 " Filen '.hg/localtags' används för lokala märken (ej delad i arkiv)."
6946 8238
6947 8239 msgid "tag names must be unique"
6948 8240 msgstr "märkesnamn måste vara unika"
@@ -6966,69 +8258,79 b' msgstr "m\xc3\xa4rket \'%s\' \xc3\xa4r inte ett lokalt m\xc3\xa4rke"'
6966 8258 msgid "tag '%s' already exists (use -f to force)"
6967 8259 msgstr "märket '%s' existerar redan (använd -f för att tvinga)"
6968 8260
6969 msgid ""
6970 "list repository tags\n"
6971 "\n"
8261 msgid "list repository tags"
8262 msgstr "lista arkivmärken"
8263
8264 msgid ""
6972 8265 " This lists both regular and local tags. When the -v/--verbose\n"
6973 8266 " switch is used, a third column \"local\" is printed for local tags.\n"
6974 8267 " "
6975 8268 msgstr ""
6976 "lista arkivmärken\n"
6977 "\n"
6978 8269 " Listar både vanliga och lokala märken. När flaggan -v/--verbose\n"
6979 8270 " används, visas en tredje kolumn med namnet \"local\" för lokala märken.\n"
6980 8271 " "
6981 8272
6982 msgid ""
6983 "show the tip revision\n"
6984 "\n"
8273 msgid "show the tip revision"
8274 msgstr "visa topprevisionen"
8275
8276 msgid ""
6985 8277 " The tip revision (usually just called the tip) is the changeset\n"
6986 8278 " most recently added to the repository (and therefore the most\n"
6987 " recently changed head).\n"
6988 "\n"
8279 " recently changed head)."
8280 msgstr ""
8281 " Topprevisionen (kallas tip av Mercurial) är den senast tillagda\n"
8282 " ändringen i arkivet (och därför det senast tillagda huvudet)."
8283
8284 msgid ""
6989 8285 " If you have just made a commit, that commit will be the tip. If\n"
6990 8286 " you have just pulled changes from another repository, the tip of\n"
6991 8287 " that repository becomes the current tip. The \"tip\" tag is special\n"
6992 8288 " and cannot be renamed or assigned to a different changeset.\n"
6993 8289 " "
6994 8290 msgstr ""
6995 "visa topprevisionen\n"
6996 "\n"
6997 " Topprevisionen (kallas tip av Mercurial) är den senast tillagda\n"
6998 " ändringen i arkivet (och därför det senast tillagda huvudet).\n"
6999 "\n"
7000 8291 " Om du precis har gjort en arkivering, kommer den att vara toppen. Om\n"
7001 8292 " du har dragit ändringar från ett annat arkiv, så blir toppen för det\n"
7002 8293 " arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n"
7003 8294 " döpas om eller tilldelas en annan ändring.\n"
7004 8295 " "
7005 8296
7006 msgid ""
7007 "apply one or more changegroup files\n"
7008 "\n"
8297 msgid "apply one or more changegroup files"
8298 msgstr "applicera en eller flera filer med ändringar"
8299
8300 msgid ""
7009 8301 " Apply one or more compressed changegroup files generated by the\n"
7010 8302 " bundle command.\n"
7011 8303 " "
7012 8304 msgstr ""
7013 "applicera en eller flera filer med ändringar\n"
7014 "\n"
7015 8305 " Applicera en eller flera komprimerade filer med ändringar genererade\n"
7016 8306 " av bundle-kommandot.\n"
7017 8307 " "
7018 8308
7019 msgid ""
7020 "update working directory (or switch revisions)\n"
7021 "\n"
8309 msgid "update working directory (or switch revisions)"
8310 msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)"
8311
8312 msgid ""
7022 8313 " Update the repository's working directory to the specified\n"
7023 " changeset.\n"
7024 "\n"
8314 " changeset."
8315 msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen."
8316
8317 msgid ""
7025 8318 " If no changeset is specified, attempt to update to the head of the\n"
7026 8319 " current branch. If this head is a descendant of the working\n"
7027 " directory's parent, update to it, otherwise abort.\n"
7028 "\n"
8320 " directory's parent, update to it, otherwise abort."
8321 msgstr ""
8322 " Om ingen ändring specificeras, kommer ett försök att göras för att\n"
8323 " hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n"
8324 " den nuvarande grenen, uppdatera till det, annars avbryt."
8325
8326 msgid ""
7029 8327 " The following rules apply when the working directory contains\n"
7030 " uncommitted changes:\n"
7031 "\n"
8328 " uncommitted changes:"
8329 msgstr ""
8330 " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n"
8331 " ändringar:"
8332
8333 msgid ""
7032 8334 " 1. If neither -c/--check nor -C/--clean is specified, and if\n"
7033 8335 " the requested changeset is an ancestor or descendant of\n"
7034 8336 " the working directory's parent, the uncommitted changes\n"
@@ -7036,56 +8338,41 b' msgid ""'
7036 8338 " result is left uncommitted. If the requested changeset is\n"
7037 8339 " not an ancestor or descendant (that is, it is on another\n"
7038 8340 " branch), the update is aborted and the uncommitted changes\n"
7039 " are preserved.\n"
7040 "\n"
7041 " 2. With the -c/--check option, the update is aborted and the\n"
7042 " uncommitted changes are preserved.\n"
7043 "\n"
7044 " 3. With the -C/--clean option, uncommitted changes are discarded and\n"
7045 " the working directory is updated to the requested changeset.\n"
7046 "\n"
7047 " Use null as the changeset to remove the working directory (like 'hg\n"
7048 " clone -U').\n"
7049 "\n"
7050 " If you want to update just one file to an older changeset, use 'hg "
7051 "revert'.\n"
7052 "\n"
7053 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
7054 " "
7055 msgstr ""
7056 "uppdatera arbetskatalogen (eller växla mellan revisioner)\n"
7057 "\n"
7058 " Uppdatera arkivets arbetskatalog till den specificerade ändringen.\n"
7059 "\n"
7060 " Om ingen ändring specificeras, kommer ett försök att göras för att\n"
7061 " hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n"
7062 " den nuvarande grenen, uppdatera till det, annars avbryt.\n"
7063 "\n"
7064 " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n"
7065 " ändringar:\n"
7066 "\n"
8341 " are preserved."
8342 msgstr ""
7067 8343 " 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n"
7068 8344 " begärda ändringen är en anfader eller ättling till arbetskatalogens\n"
7069 8345 " förälder, kommer oarkiverade ändringar att sammanfogas med den\n"
7070 8346 " begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n"
7071 8347 " Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n"
7072 8348 " en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n"
7073 " bevaras.\n"
7074 "\n"
8349 " bevaras."
8350
8351 msgid ""
8352 " 2. With the -c/--check option, the update is aborted and the\n"
8353 " uncommitted changes are preserved."
8354 msgstr ""
7075 8355 " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n"
7076 " ändringarna lämnas.\n"
7077 "\n"
8356 " ändringarna lämnas."
8357
8358 msgid ""
8359 " 3. With the -C/--clean option, uncommitted changes are discarded and\n"
8360 " the working directory is updated to the requested changeset."
8361 msgstr ""
7078 8362 " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n"
7079 " arbetskatalogen uppdateras till den begärda ändringen.\n"
7080 "\n"
8363 " arbetskatalogen uppdateras till den begärda ändringen."
8364
8365 msgid ""
8366 " Use null as the changeset to remove the working directory (like 'hg\n"
8367 " clone -U')."
8368 msgstr ""
7081 8369 " Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n"
7082 " -U').\n"
7083 "\n"
8370 " -U')."
8371
8372 msgid " If you want to update just one file to an older changeset, use 'hg revert'."
8373 msgstr ""
7084 8374 " Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n"
7085 " revert'.\n"
7086 "\n"
7087 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n"
7088 " "
8375 " revert'."
7089 8376
7090 8377 msgid "cannot specify both -c/--check and -C/--clean"
7091 8378 msgstr ""
@@ -7093,21 +8380,19 b' msgstr ""'
7093 8380 msgid "uncommitted local changes"
7094 8381 msgstr ""
7095 8382
7096 msgid ""
7097 "verify the integrity of the repository\n"
7098 "\n"
7099 " Verify the integrity of the current repository.\n"
7100 "\n"
8383 msgid "verify the integrity of the repository"
8384 msgstr "verifiera arkivets integritet"
8385
8386 msgid " Verify the integrity of the current repository."
8387 msgstr " Verifiera det aktuella arkivets integritet."
8388
8389 msgid ""
7101 8390 " This will perform an extensive check of the repository's\n"
7102 8391 " integrity, validating the hashes and checksums of each entry in\n"
7103 8392 " the changelog, manifest, and tracked files, as well as the\n"
7104 8393 " integrity of their crosslinks and indices.\n"
7105 8394 " "
7106 8395 msgstr ""
7107 "verifiera arkivets integritet\n"
7108 "\n"
7109 " Verifiera det aktuella arkivets integritet.\n"
7110 "\n"
7111 8396 " Detta genomför en omfattande kontroll av arkivets integritet, validerar\n"
7112 8397 " hash- och checksummor för varje notering i ändringsloggen, manifestet,\n"
7113 8398 " och spårade filer, såväl som integriteten av korslänkar och indexar.\n"
@@ -7474,8 +8759,7 b' msgid "print all revisions that match"'
7474 8759 msgstr "visa alla revisioner som matchar"
7475 8760
7476 8761 msgid "follow changeset history, or file history across copies and renames"
7477 msgstr ""
7478 "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
8762 msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
7479 8763
7480 8764 msgid "ignore case when matching"
7481 8765 msgstr "ignorera versaler/gemener vid matchning"
@@ -7528,9 +8812,7 b' msgstr "visa m\xc3\xa4rken"'
7528 8812 msgid "[-nibt] [-r REV] [SOURCE]"
7529 8813 msgstr "[-nibt] [-r REV] [KÄLLA]"
7530 8814
7531 msgid ""
7532 "directory strip option for patch. This has the same meaning as the "
7533 "corresponding patch option"
8815 msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
7534 8816 msgstr ""
7535 8817
7536 8818 msgid "base path"
@@ -7996,9 +9278,7 b' msgstr ""'
7996 9278 msgid "Option --cwd may not be abbreviated!"
7997 9279 msgstr ""
7998 9280
7999 msgid ""
8000 "Option -R has to be separated from other options (e.g. not -qR) and --"
8001 "repository may only be abbreviated as --repo!"
9281 msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
8002 9282 msgstr ""
8003 9283
8004 9284 #, python-format
@@ -8016,9 +9296,7 b' msgstr ""'
8016 9296 msgid "unrecognized profiling format '%s' - Ignored\n"
8017 9297 msgstr ""
8018 9298
8019 msgid ""
8020 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
8021 "misc/lsprof/"
9299 msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
8022 9300 msgstr ""
8023 9301
8024 9302 #, python-format
@@ -8124,10 +9402,15 b' msgstr "Anv\xc3\xa4nda ytterligare funktioner"'
8124 9402
8125 9403 msgid ""
8126 9404 "Mercurial reads configuration data from several files, if they exist.\n"
8127 "Below we list the most specific file first.\n"
8128 "\n"
8129 "On Windows, these configuration files are read:\n"
8130 "\n"
9405 "Below we list the most specific file first."
9406 msgstr ""
9407 "Mercurial läser konfigurationsdata från flera filer, om de existerar.\n"
9408 "Nedan listar vi den mest specifika filen först."
9409
9410 msgid "On Windows, these configuration files are read:"
9411 msgstr "Under Windows läses dessa konfigurationsfiler:"
9412
9413 msgid ""
8131 9414 "- ``<repo>\\.hg\\hgrc``\n"
8132 9415 "- ``%USERPROFILE%\\.hgrc``\n"
8133 9416 "- ``%USERPROFILE%\\Mercurial.ini``\n"
@@ -8135,37 +9418,8 b' msgid ""'
8135 9418 "- ``%HOME%\\Mercurial.ini``\n"
8136 9419 "- ``C:\\Mercurial\\Mercurial.ini``\n"
8137 9420 "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n"
8138 "- ``<install-dir>\\Mercurial.ini``\n"
8139 "\n"
8140 "On Unix, these files are read:\n"
8141 "\n"
8142 "- ``<repo>/.hg/hgrc``\n"
8143 "- ``$HOME/.hgrc``\n"
8144 "- ``/etc/mercurial/hgrc``\n"
8145 "- ``/etc/mercurial/hgrc.d/*.rc``\n"
8146 "- ``<install-root>/etc/mercurial/hgrc``\n"
8147 "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``\n"
8148 "\n"
8149 "The configuration files for Mercurial use a simple ini-file format. A\n"
8150 "configuration file consists of sections, led by a ``[section]`` header\n"
8151 "and followed by ``name = value`` entries::\n"
8152 "\n"
8153 " [ui]\n"
8154 " username = Firstname Lastname <firstname.lastname@example.net>\n"
8155 " verbose = True\n"
8156 "\n"
8157 "This above entries will be referred to as ``ui.username`` and\n"
8158 "``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
8159 "description of the possible configuration values:\n"
8160 "\n"
8161 "- on Unix-like systems: ``man hgrc``\n"
8162 "- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
8163 msgstr ""
8164 "Mercurial läser konfigurationsdata från flera filer, om de existerar.\n"
8165 "Nedan listar vi den mest specifika filen först.\n"
8166 "\n"
8167 "Under Windows läses dessa konfigurationsfiler:\n"
8168 "\n"
9421 "- ``<install-dir>\\Mercurial.ini``"
9422 msgstr ""
8169 9423 "- ``<arkiv>\\.hg\\hgrc``\n"
8170 9424 "- ``%USERPROFILE%\\.hgrc``\n"
8171 9425 "- ``%USERPROFILE%\\Mercurial.ini``\n"
@@ -8173,40 +9427,74 b' msgstr ""'
8173 9427 "- ``%HOME%\\Mercurial.ini``\n"
8174 9428 "- ``C:\\Mercurial\\Mercurial.ini``\n"
8175 9429 "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n"
8176 "- ``<installationskatalog>\\Mercurial.ini``\n"
8177 "\n"
8178 "Under Unix läses dessa filer:\n"
8179 "\n"
9430 "- ``<installationskatalog>\\Mercurial.ini``"
9431
9432 msgid "On Unix, these files are read:"
9433 msgstr "Under Unix läses dessa filer:"
9434
9435 msgid ""
9436 "- ``<repo>/.hg/hgrc``\n"
9437 "- ``$HOME/.hgrc``\n"
9438 "- ``/etc/mercurial/hgrc``\n"
9439 "- ``/etc/mercurial/hgrc.d/*.rc``\n"
9440 "- ``<install-root>/etc/mercurial/hgrc``\n"
9441 "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
9442 msgstr ""
8180 9443 "- ``<arkiv>/.hg/hgrc``\n"
8181 9444 "- ``$HOME/.hgrc``\n"
8182 9445 "- ``/etc/mercurial/hgrc``\n"
8183 9446 "- ``/etc/mercurial/hgrc.d/*.rc``\n"
8184 9447 "- ``<installationsrot>/etc/mercurial/hgrc``\n"
8185 "- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``\n"
8186 "\n"
9448 "- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``"
9449
9450 msgid ""
9451 "The configuration files for Mercurial use a simple ini-file format. A\n"
9452 "configuration file consists of sections, led by a ``[section]`` header\n"
9453 "and followed by ``name = value`` entries::"
9454 msgstr ""
8187 9455 "Konfigurationsfilerna för Mercurial använder ett enkelt ini-filformat. En\n"
8188 9456 "file består av sektioner, som inleds av en rubrik (ex ``[sektion]``) och\n"
8189 "följs av rader med ``namn = värde``::\n"
8190 "\n"
9457 "följs av rader med ``namn = värde``::"
9458
9459 msgid ""
9460 " [ui]\n"
9461 " username = Firstname Lastname <firstname.lastname@example.net>\n"
9462 " verbose = True"
9463 msgstr ""
8191 9464 " [ui]\n"
8192 9465 " username = Förnamn Efternamn <fornamn.efternamn@example.net>\n"
8193 " verbose = True\n"
8194 "\n"
9466 " verbose = True"
9467
9468 msgid ""
9469 "This above entries will be referred to as ``ui.username`` and\n"
9470 "``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
9471 "description of the possible configuration values:"
9472 msgstr ""
8195 9473 "Raderna ovanför refereras till som ``ui.username`` och\n"
8196 9474 "``ui.verbose``. Läs man-sidan för hgrc för en full beskrivning av alla\n"
8197 "möjliga konfigurationsvärden:\n"
8198 "\n"
9475 "möjliga konfigurationsvärden:"
9476
9477 msgid ""
9478 "- on Unix-like systems: ``man hgrc``\n"
9479 "- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
9480 msgstr ""
8199 9481 "- under Unix-liknande system: ``man hgrc``\n"
8200 9482 "- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
8201 9483
8202 msgid ""
8203 "Some commands allow the user to specify a date, e.g.:\n"
8204 "\n"
9484 msgid "Some commands allow the user to specify a date, e.g.:"
9485 msgstr "Vissa kommandon tillåter att användare anger ett datum, bland dom:"
9486
9487 msgid ""
8205 9488 "- backout, commit, import, tag: Specify the commit date.\n"
8206 "- log, revert, update: Select revision(s) by date.\n"
8207 "\n"
8208 "Many date formats are valid. Here are some examples:\n"
8209 "\n"
9489 "- log, revert, update: Select revision(s) by date."
9490 msgstr ""
9491 "- backout, commit, import, tag: Ange arkiveringsdatum.\n"
9492 "- log, revert, update: Välj revision(er) med hjälp av datum."
9493
9494 msgid "Many date formats are valid. Here are some examples:"
9495 msgstr "Många datumformat är giltiga. Här är några exempel:"
9496
9497 msgid ""
8210 9498 "- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n"
8211 9499 "- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n"
8212 9500 "- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n"
@@ -8219,31 +9507,8 b' msgid ""'
8219 9507 "- ``2006-12-6``\n"
8220 9508 "- ``12-6``\n"
8221 9509 "- ``12/6``\n"
8222 "- ``12/6/6`` (Dec 6 2006)\n"
8223 "\n"
8224 "Lastly, there is Mercurial's internal format:\n"
8225 "\n"
8226 "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)\n"
8227 "\n"
8228 "This is the internal representation format for dates. unixtime is the\n"
8229 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
8230 "the offset of the local timezone, in seconds west of UTC (negative if\n"
8231 "the timezone is east of UTC).\n"
8232 "\n"
8233 "The log command also accepts date ranges:\n"
8234 "\n"
8235 "- ``<{datetime}`` - at or before a given date/time\n"
8236 "- ``>{datetime}`` - on or after a given date/time\n"
8237 "- ``{datetime} to {datetime}`` - a date range, inclusive\n"
8238 "- ``-{days}`` - within a given number of days of today\n"
8239 msgstr ""
8240 "Vissa kommandon tillåter att användare anger ett datum, bland dom:\n"
8241 "\n"
8242 "- backout, commit, import, tag: Ange arkiveringsdatum.\n"
8243 "- log, revert, update: Välj revision(er) med hjälp av datum.\n"
8244 "\n"
8245 "Många datumformat är giltiga. Här är några exempel:\n"
8246 "\n"
9510 "- ``12/6/6`` (Dec 6 2006)"
9511 msgstr ""
8247 9512 "- ``Wed Dec 6 13:18:29 2006`` (lokal tidszon antas)\n"
8248 9513 "- ``Dec 6 13:18 -0600`` (året antas, tidsoffset anges)\n"
8249 9514 "- ``Dec 6 13:18 UTC`` (UTC och GMT är alias för +0000)\n"
@@ -8256,19 +9521,34 b' msgstr ""'
8256 9521 "- ``2006-12-6``\n"
8257 9522 "- ``12-6``\n"
8258 9523 "- ``12/6``\n"
8259 "- ``12/6/6`` (Dec 6 2006)\n"
8260 "\n"
8261 "Till sist, så finns även Mercurial's interna format:\n"
8262 "\n"
8263 "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)\n"
8264 "\n"
9524 "- ``12/6/6`` (Dec 6 2006)"
9525
9526 msgid "Lastly, there is Mercurial's internal format:"
9527 msgstr "Till sist, så finns även Mercurial's interna format:"
9528
9529 msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
9530 msgstr "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
9531
9532 msgid ""
9533 "This is the internal representation format for dates. unixtime is the\n"
9534 "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
9535 "the offset of the local timezone, in seconds west of UTC (negative if\n"
9536 "the timezone is east of UTC)."
9537 msgstr ""
8265 9538 "Detta är det interna representationsformatet för datum. unixtime är antalet\n"
8266 9539 "sekunder sedan epoken(1970-01-01 00:00 UTC). offset är offseten till den\n"
8267 9540 "lokala tidszonen, i sekunder väst om UTC (negativ om tidszonen är öst om\n"
8268 "UTC).\n"
8269 "\n"
8270 "Kommandot log accepterar också datumintervall:\n"
8271 "\n"
9541 "UTC)."
9542
9543 msgid "The log command also accepts date ranges:"
9544 msgstr "Kommandot log accepterar också datumintervall:"
9545
9546 msgid ""
9547 "- ``<{datetime}`` - at or before a given date/time\n"
9548 "- ``>{datetime}`` - on or after a given date/time\n"
9549 "- ``{datetime} to {datetime}`` - a date range, inclusive\n"
9550 "- ``-{days}`` - within a given number of days of today\n"
9551 msgstr ""
8272 9552 "- ``<{datumtid}`` - på eller innan datum/tid\n"
8273 9553 "- ``>{datumtid}`` - på eller efter datum/tid\n"
8274 9554 "- ``{datumtid} to {datumtid}`` - ett datumintervall, inklusivt\n"
@@ -8277,29 +9557,39 b' msgstr ""'
8277 9557 msgid ""
8278 9558 "Mercurial's default format for showing changes between two versions of\n"
8279 9559 "a file is compatible with the unified format of GNU diff, which can be\n"
8280 "used by GNU patch and many other standard tools.\n"
8281 "\n"
9560 "used by GNU patch and many other standard tools."
9561 msgstr ""
9562
9563 msgid ""
8282 9564 "While this standard format is often enough, it does not encode the\n"
8283 "following information:\n"
8284 "\n"
9565 "following information:"
9566 msgstr ""
9567
9568 msgid ""
8285 9569 "- executable status and other permission bits\n"
8286 9570 "- copy or rename information\n"
8287 9571 "- changes in binary files\n"
8288 "- creation or deletion of empty files\n"
8289 "\n"
9572 "- creation or deletion of empty files"
9573 msgstr ""
9574
9575 msgid ""
8290 9576 "Mercurial also supports the extended diff format from the git VCS\n"
8291 9577 "which addresses these limitations. The git diff format is not produced\n"
8292 9578 "by default because a few widespread tools still do not understand this\n"
8293 "format.\n"
8294 "\n"
9579 "format."
9580 msgstr ""
9581
9582 msgid ""
8295 9583 "This means that when generating diffs from a Mercurial repository\n"
8296 9584 "(e.g. with \"hg export\"), you should be careful about things like file\n"
8297 9585 "copies and renames or other things mentioned above, because when\n"
8298 9586 "applying a standard diff to a different repository, this extra\n"
8299 9587 "information is lost. Mercurial's internal operations (like push and\n"
8300 9588 "pull) are not affected by this, because they use an internal binary\n"
8301 "format for communicating changes.\n"
8302 "\n"
9589 "format for communicating changes."
9590 msgstr ""
9591
9592 msgid ""
8303 9593 "To make Mercurial produce the git extended diff format, use the --git\n"
8304 9594 "option available for many commands, or set 'git = True' in the [diff]\n"
8305 9595 "section of your hgrc. You do not need to set this option when\n"
@@ -8312,84 +9602,112 b' msgid ""'
8312 9602 " hooks, extensions or external tools. If unset or empty, this is\n"
8313 9603 " the hg executable's name if it's frozen, or an executable named\n"
8314 9604 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
8315 " Windows) is searched.\n"
8316 "\n"
9605 " Windows) is searched."
9606 msgstr ""
9607
9608 msgid ""
8317 9609 "HGEDITOR\n"
8318 " This is the name of the editor to run when committing. See EDITOR.\n"
8319 "\n"
8320 " (deprecated, use .hgrc)\n"
8321 "\n"
9610 " This is the name of the editor to run when committing. See EDITOR."
9611 msgstr ""
9612
9613 msgid " (deprecated, use .hgrc)"
9614 msgstr ""
9615
9616 msgid ""
8322 9617 "HGENCODING\n"
8323 9618 " This overrides the default locale setting detected by Mercurial.\n"
8324 9619 " This setting is used to convert data including usernames,\n"
8325 9620 " changeset descriptions, tag names, and branches. This setting can\n"
8326 " be overridden with the --encoding command-line option.\n"
8327 "\n"
9621 " be overridden with the --encoding command-line option."
9622 msgstr ""
9623
9624 msgid ""
8328 9625 "HGENCODINGMODE\n"
8329 9626 " This sets Mercurial's behavior for handling unknown characters\n"
8330 9627 " while transcoding user input. The default is \"strict\", which\n"
8331 9628 " causes Mercurial to abort if it can't map a character. Other\n"
8332 9629 " settings include \"replace\", which replaces unknown characters, and\n"
8333 9630 " \"ignore\", which drops them. This setting can be overridden with\n"
8334 " the --encodingmode command-line option.\n"
8335 "\n"
9631 " the --encodingmode command-line option."
9632 msgstr ""
9633
9634 msgid ""
8336 9635 "HGMERGE\n"
8337 9636 " An executable to use for resolving merge conflicts. The program\n"
8338 9637 " will be executed with three arguments: local file, remote file,\n"
8339 " ancestor file.\n"
8340 "\n"
8341 " (deprecated, use .hgrc)\n"
8342 "\n"
9638 " ancestor file."
9639 msgstr ""
9640
9641 msgid ""
8343 9642 "HGRCPATH\n"
8344 9643 " A list of files or directories to search for hgrc files. Item\n"
8345 9644 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
8346 9645 " platform default search path is used. If empty, only the .hg/hgrc\n"
8347 " from the current repository is read.\n"
8348 "\n"
8349 " For each element in HGRCPATH:\n"
8350 "\n"
9646 " from the current repository is read."
9647 msgstr ""
9648
9649 msgid " For each element in HGRCPATH:"
9650 msgstr ""
9651
9652 msgid ""
8351 9653 " - if it's a directory, all files ending with .rc are added\n"
8352 " - otherwise, the file itself will be added\n"
8353 "\n"
9654 " - otherwise, the file itself will be added"
9655 msgstr ""
9656
9657 msgid ""
8354 9658 "HGPLAIN\n"
8355 9659 " When set, this disables any options in .hgrc that might change\n"
8356 9660 " Mercurial's default output. This includes encoding, defaults,\n"
8357 9661 " verbose mode, debug mode, quiet mode, tracebacks, and\n"
8358 9662 " localization. This can be useful when scripting against Mercurial\n"
8359 " in the face of existing user configuration.\n"
8360 "\n"
9663 " in the face of existing user configuration."
9664 msgstr ""
9665
9666 msgid ""
8361 9667 " Equivalent options set via command line flags or environment\n"
8362 " variables are not overridden.\n"
8363 "\n"
9668 " variables are not overridden."
9669 msgstr ""
9670
9671 msgid ""
8364 9672 "HGUSER\n"
8365 9673 " This is the string used as the author of a commit. If not set,\n"
8366 " available values will be considered in this order:\n"
8367 "\n"
9674 " available values will be considered in this order:"
9675 msgstr ""
9676
9677 msgid ""
8368 9678 " - HGUSER (deprecated)\n"
8369 9679 " - hgrc files from the HGRCPATH\n"
8370 9680 " - EMAIL\n"
8371 9681 " - interactive prompt\n"
8372 " - LOGNAME (with ``@hostname`` appended)\n"
8373 "\n"
8374 " (deprecated, use .hgrc)\n"
8375 "\n"
9682 " - LOGNAME (with ``@hostname`` appended)"
9683 msgstr ""
9684
9685 msgid ""
8376 9686 "EMAIL\n"
8377 " May be used as the author of a commit; see HGUSER.\n"
8378 "\n"
9687 " May be used as the author of a commit; see HGUSER."
9688 msgstr ""
9689
9690 msgid ""
8379 9691 "LOGNAME\n"
8380 " May be used as the author of a commit; see HGUSER.\n"
8381 "\n"
9692 " May be used as the author of a commit; see HGUSER."
9693 msgstr ""
9694
9695 msgid ""
8382 9696 "VISUAL\n"
8383 " This is the name of the editor to use when committing. See EDITOR.\n"
8384 "\n"
9697 " This is the name of the editor to use when committing. See EDITOR."
9698 msgstr ""
9699
9700 msgid ""
8385 9701 "EDITOR\n"
8386 9702 " Sometimes Mercurial needs to open a text file in an editor for a\n"
8387 9703 " user to modify, for example when writing commit messages. The\n"
8388 9704 " editor it uses is determined by looking at the environment\n"
8389 9705 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
8390 9706 " non-empty one is chosen. If all of them are empty, the editor\n"
8391 " defaults to 'vi'.\n"
8392 "\n"
9707 " defaults to 'vi'."
9708 msgstr ""
9709
9710 msgid ""
8393 9711 "PYTHONPATH\n"
8394 9712 " This is used by Python to find imported modules and may need to be\n"
8395 9713 " set appropriately if this Mercurial is not installed system-wide.\n"
@@ -8399,31 +9717,44 b' msgid ""'
8399 9717 "Mercurial has the ability to add new features through the use of\n"
8400 9718 "extensions. Extensions may add new commands, add options to\n"
8401 9719 "existing commands, change the default behavior of commands, or\n"
8402 "implement hooks.\n"
8403 "\n"
9720 "implement hooks."
9721 msgstr ""
9722
9723 msgid ""
8404 9724 "Extensions are not loaded by default for a variety of reasons:\n"
8405 9725 "they can increase startup overhead; they may be meant for advanced\n"
8406 9726 "usage only; they may provide potentially dangerous abilities (such\n"
8407 9727 "as letting you destroy or modify history); they might not be ready\n"
8408 9728 "for prime time; or they may alter some usual behaviors of stock\n"
8409 9729 "Mercurial. It is thus up to the user to activate extensions as\n"
8410 "needed.\n"
8411 "\n"
9730 "needed."
9731 msgstr ""
9732
9733 msgid ""
8412 9734 "To enable the \"foo\" extension, either shipped with Mercurial or in\n"
8413 9735 "the Python search path, create an entry for it in your hgrc, like\n"
8414 "this::\n"
8415 "\n"
9736 "this::"
9737 msgstr ""
9738
9739 msgid ""
8416 9740 " [extensions]\n"
8417 " foo =\n"
8418 "\n"
8419 "You may also specify the full path to an extension::\n"
8420 "\n"
9741 " foo ="
9742 msgstr ""
9743
9744 msgid "You may also specify the full path to an extension::"
9745 msgstr ""
9746
9747 msgid ""
8421 9748 " [extensions]\n"
8422 " myfeature = ~/.hgext/myfeature.py\n"
8423 "\n"
9749 " myfeature = ~/.hgext/myfeature.py"
9750 msgstr ""
9751
9752 msgid ""
8424 9753 "To explicitly disable an extension enabled in an hgrc of broader\n"
8425 "scope, prepend its path with !::\n"
8426 "\n"
9754 "scope, prepend its path with !::"
9755 msgstr ""
9756
9757 msgid ""
8427 9758 " [extensions]\n"
8428 9759 " # disabling extension bar residing in /path/to/extension/bar.py\n"
8429 9760 " bar = !/path/to/extension/bar.py\n"
@@ -8434,159 +9765,171 b' msgstr ""'
8434 9765 msgid ""
8435 9766 "When Mercurial accepts more than one revision, they may be specified\n"
8436 9767 "individually, or provided as a topologically continuous range,\n"
8437 "separated by the \":\" character.\n"
8438 "\n"
9768 "separated by the \":\" character."
9769 msgstr ""
9770
9771 msgid ""
8439 9772 "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
8440 9773 "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
8441 9774 "specified, it defaults to revision number 0. If END is not specified,\n"
8442 "it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
8443 "\n"
8444 "If BEGIN is greater than END, revisions are treated in reverse order.\n"
8445 "\n"
9775 "it defaults to the tip. The range \":\" thus means \"all revisions\"."
9776 msgstr ""
9777
9778 msgid "If BEGIN is greater than END, revisions are treated in reverse order."
9779 msgstr ""
9780
9781 msgid ""
8446 9782 "A range acts as a closed interval. This means that a range of 3:5\n"
8447 9783 "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
8448 9784 msgstr ""
8449 9785
8450 9786 msgid ""
8451 9787 "Mercurial accepts several notations for identifying one or more files\n"
8452 "at a time.\n"
8453 "\n"
9788 "at a time."
9789 msgstr ""
9790 "Mercurial acceptera flera notationer för att identifiera en eller flera\n"
9791 "filer samma gång."
9792
9793 msgid ""
8454 9794 "By default, Mercurial treats filenames as shell-style extended glob\n"
8455 "patterns.\n"
8456 "\n"
8457 "Alternate pattern notations must be specified explicitly.\n"
8458 "\n"
9795 "patterns."
9796 msgstr ""
9797 "Som standard behandlar Mercurial filnamn som ett utökat glob-mönster i\n"
9798 "skalstil."
9799
9800 msgid "Alternate pattern notations must be specified explicitly."
9801 msgstr "Alternativa mönsternotationer måste anges explicit."
9802
9803 msgid ""
8459 9804 "To use a plain path name without any pattern matching, start it with\n"
8460 9805 "``path:``. These path names must completely match starting at the\n"
8461 "current repository root.\n"
8462 "\n"
9806 "current repository root."
9807 msgstr ""
9808 "För att använda en enkel sökväg utan någon mönstermatching, börja den med\n"
9809 "``path:``. Dessa sökvägar måste överrensstämma helt från det nuvarande\n"
9810 "arkivroten."
9811
9812 msgid ""
8463 9813 "To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
8464 9814 "at the current directory; a glob such as ``*.c`` will only match files\n"
8465 "in the current directory ending with ``.c``.\n"
8466 "\n"
9815 "in the current directory ending with ``.c``."
9816 msgstr ""
9817 "För att använda utökad glob, börja ett namn med ``glob:``. Globs har sin\n"
9818 "rot i den aktuella katalogen; en glob som ``*.c`` kommer bara att matcha\n"
9819 "filer i den aktuella katalogen som slutar med ``.c``."
9820
9821 msgid ""
8467 9822 "The supported glob syntax extensions are ``**`` to match any string\n"
8468 "across path separators and ``{a,b}`` to mean \"a or b\".\n"
8469 "\n"
9823 "across path separators and ``{a,b}`` to mean \"a or b\"."
9824 msgstr ""
9825 "Den utökade glob-syntaxen är ``**`` för att matcha alla strängar i sökvägen\n"
9826 "och ``{a,b}`` som innebär \"a eller b\"."
9827
9828 msgid ""
8470 9829 "To use a Perl/Python regular expression, start a name with ``re:``.\n"
8471 "Regexp pattern matching is anchored at the root of the repository.\n"
8472 "\n"
8473 "Plain examples::\n"
8474 "\n"
9830 "Regexp pattern matching is anchored at the root of the repository."
9831 msgstr ""
9832 "För att använda reguljära uttryck från Perl/Python, börja ett namn med\n"
9833 "``re:``. Regexp-mönstermatchning har sin början i arkivroten."
9834
9835 msgid "Plain examples::"
9836 msgstr "Råa exempel::"
9837
9838 msgid ""
8475 9839 " path:foo/bar a name bar in a directory named foo in the root\n"
8476 9840 " of the repository\n"
8477 " path:path:name a file or directory named \"path:name\"\n"
8478 "\n"
8479 "Glob examples::\n"
8480 "\n"
9841 " path:path:name a file or directory named \"path:name\""
9842 msgstr ""
9843 " path:foo/bar namnet bar i en katalog med namnet foo i arkivroten\n"
9844 " path:path:name en fil eller katalog med namnet \"path:name\""
9845
9846 msgid "Glob examples::"
9847 msgstr "Glob-exempel::"
9848
9849 msgid ""
8481 9850 " glob:*.c any name ending in \".c\" in the current directory\n"
8482 9851 " *.c any name ending in \".c\" in the current directory\n"
8483 9852 " **.c any name ending in \".c\" in any subdirectory of the\n"
8484 9853 " current directory including itself.\n"
8485 9854 " foo/*.c any name ending in \".c\" in the directory foo\n"
8486 9855 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
8487 " including itself.\n"
8488 "\n"
8489 "Regexp examples::\n"
8490 "\n"
8491 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
8492 msgstr ""
8493 "Mercurial acceptera flera notationer för att identifiera en eller flera\n"
8494 "filer samma gång.\n"
8495 "\n"
8496 "Som standard behandlar Mercurial filnamn som ett utökat glob-mönster i\n"
8497 "skalstil.\n"
8498 "\n"
8499 "Alternativa mönsternotationer måste anges explicit.\n"
8500 "\n"
8501 "För att använda en enkel sökväg utan någon mönstermatching, börja den med\n"
8502 "``path:``. Dessa sökvägar måste överrensstämma helt från det nuvarande\n"
8503 "arkivroten.\n"
8504 "\n"
8505 "För att använda utökad glob, börja ett namn med ``glob:``. Globs har sin\n"
8506 "rot i den aktuella katalogen; en glob som ``*.c`` kommer bara att matcha\n"
8507 "filer i den aktuella katalogen som slutar med ``.c``.\n"
8508 "\n"
8509 "Den utökade glob-syntaxen är ``**`` för att matcha alla strängar i sökvägen\n"
8510 "och ``{a,b}`` som innebär \"a eller b\".\n"
8511 "\n"
8512 "För att använda reguljära uttryck från Perl/Python, börja ett namn med\n"
8513 "``re:``. Regexp-mönstermatchning har sin början i arkivroten.\n"
8514 "\n"
8515 "Råa exempel::\n"
8516 "\n"
8517 " path:foo/bar namnet bar i en katalog med namnet foo i arkivroten\n"
8518 " path:path:name en fil eller katalog med namnet \"path:name\"\n"
8519 "\n"
8520 "Glob-exempel::\n"
8521 "\n"
9856 " including itself."
9857 msgstr ""
8522 9858 " glob:*.c alla namn som slutar på \".c\" i den nuvarande katalogen\n"
8523 9859 " *.c alla namn som slutar på \".c\" i den nuvarande katalogen\n"
8524 9860 " **.c alla namn som slutar på \".c\" i alla underkataloger från\n"
8525 9861 " den nuvarande katalogen inklusive sig själv.\n"
8526 9862 " foo/*.c alla namn som slutar på \".c\" i katalogen foo\n"
8527 9863 " foo/**.c alla namn som slutar på \".c\" i alla underkataloger från\n"
8528 " foo inklusive sig själv.\n"
8529 "\n"
8530 "Regexp-exempel::\n"
8531 "\n"
8532 " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n"
8533
8534 msgid ""
8535 "Mercurial supports several ways to specify individual revisions.\n"
8536 "\n"
9864 " foo inklusive sig själv."
9865
9866 msgid "Regexp examples::"
9867 msgstr "Regexp-exempel::"
9868
9869 msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
9870 msgstr " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n"
9871
9872 msgid "Mercurial supports several ways to specify individual revisions."
9873 msgstr "Mercurial stöder flera sött att ange individuella revisioner."
9874
9875 msgid ""
8537 9876 "A plain integer is treated as a revision number. Negative integers are\n"
8538 9877 "treated as sequential offsets from the tip, with -1 denoting the tip,\n"
8539 "-2 denoting the revision prior to the tip, and so forth.\n"
8540 "\n"
9878 "-2 denoting the revision prior to the tip, and so forth."
9879 msgstr ""
9880 "Ett heltal behandlas som ett revisionsnummer. Negativa heltal behandlas som\n"
9881 "sekventiell offset från toppen, där -1 är tippen, -2 revisionen innan\n"
9882 "toppen, och så vidare."
9883
9884 msgid ""
8541 9885 "A 40-digit hexadecimal string is treated as a unique revision\n"
8542 "identifier.\n"
8543 "\n"
9886 "identifier."
9887 msgstr ""
9888 "En 40-siffrig hexadecimal sträng behandlas som en unik\n"
9889 "revisionsidentifierare."
9890
9891 msgid ""
8544 9892 "A hexadecimal string less than 40 characters long is treated as a\n"
8545 9893 "unique revision identifier and is referred to as a short-form\n"
8546 9894 "identifier. A short-form identifier is only valid if it is the prefix\n"
8547 "of exactly one full-length identifier.\n"
8548 "\n"
9895 "of exactly one full-length identifier."
9896 msgstr ""
9897 "En hexadecimal sträng med mindre än 40 tecken behandlas som en unik\n"
9898 "revisionsidentifierare och refereras till som en kort identifierare. En\n"
9899 "kort identifierare är bara giltig om det är prefixet för exakt en\n"
9900 "fullängdsidentifierare."
9901
9902 msgid ""
8549 9903 "Any other string is treated as a tag or branch name. A tag name is a\n"
8550 9904 "symbolic name associated with a revision identifier. A branch name\n"
8551 9905 "denotes the tipmost revision of that branch. Tag and branch names must\n"
8552 "not contain the \":\" character.\n"
8553 "\n"
9906 "not contain the \":\" character."
9907 msgstr ""
9908 "Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n"
9909 "ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n"
9910 "anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n"
9911 "innehålla tecknet \":\"."
9912
9913 msgid ""
8554 9914 "The reserved name \"tip\" is a special tag that always identifies the\n"
8555 "most recent revision.\n"
8556 "\n"
9915 "most recent revision."
9916 msgstr ""
9917 "Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n"
9918 "identifierar den senaste revisionen."
9919
9920 msgid ""
8557 9921 "The reserved name \"null\" indicates the null revision. This is the\n"
8558 "revision of an empty repository, and the parent of revision 0.\n"
8559 "\n"
9922 "revision of an empty repository, and the parent of revision 0."
9923 msgstr ""
9924 "Det reserverade namnet \"null\" indikerar null-revisionen. Detta är\n"
9925 "revisionen i ett tomt arkiv, och är förälder till revision 0."
9926
9927 msgid ""
8560 9928 "The reserved name \".\" indicates the working directory parent. If no\n"
8561 9929 "working directory is checked out, it is equivalent to null. If an\n"
8562 9930 "uncommitted merge is in progress, \".\" is the revision of the first\n"
8563 9931 "parent.\n"
8564 9932 msgstr ""
8565 "Mercurial stöder flera sött att ange individuella revisioner.\n"
8566 "\n"
8567 "Ett heltal behandlas som ett revisionsnummer. Negativa heltal behandlas som\n"
8568 "sekventiell offset från toppen, där -1 är tippen, -2 revisionen innan\n"
8569 "toppen, och så vidare.\n"
8570 "\n"
8571 "En 40-siffrig hexadecimal sträng behandlas som en unik\n"
8572 "revisionsidentifierare.\n"
8573 "\n"
8574 "En hexadecimal sträng med mindre än 40 tecken behandlas som en unik\n"
8575 "revisionsidentifierare och refereras till som en kort identifierare. En\n"
8576 "kort identifierare är bara giltig om det är prefixet för exakt en\n"
8577 "fullängdsidentifierare.\n"
8578 "\n"
8579 "Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n"
8580 "ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n"
8581 "anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n"
8582 "innehålla tecknet \":\".\n"
8583 "\n"
8584 "Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n"
8585 "identifierar den senaste revisionen.\n"
8586 "\n"
8587 "Det reserverade namnet \"null\" indikerar null-revisionen. Detta är\n"
8588 "revisionen i ett tomt arkiv, och är förälder till revision 0.\n"
8589 "\n"
8590 9933 "Det reserverade namnet \".\" indikerar arbetskatalogens förälder. Om ingen\n"
8591 9934 "arbetskatalog är uthämtad, är den ekvivalent med null. Om en oarkiverad\n"
8592 9935 "sammanfogning pågår, så är \".\" den första förälderns revision.\n"
@@ -8595,216 +9938,328 b' msgid ""'
8595 9938 "Mercurial allows you to customize output of commands through\n"
8596 9939 "templates. You can either pass in a template from the command\n"
8597 9940 "line, via the --template option, or select an existing\n"
8598 "template-style (--style).\n"
8599 "\n"
9941 "template-style (--style)."
9942 msgstr ""
9943
9944 msgid ""
8600 9945 "You can customize output for any \"log-like\" command: log,\n"
8601 "outgoing, incoming, tip, parents, heads and glog.\n"
8602 "\n"
9946 "outgoing, incoming, tip, parents, heads and glog."
9947 msgstr ""
9948
9949 msgid ""
8603 9950 "Three styles are packaged with Mercurial: default (the style used\n"
8604 9951 "when no explicit preference is passed), compact and changelog.\n"
8605 "Usage::\n"
8606 "\n"
8607 " $ hg log -r1 --style changelog\n"
8608 "\n"
9952 "Usage::"
9953 msgstr ""
9954
9955 msgid " $ hg log -r1 --style changelog"
9956 msgstr ""
9957
9958 msgid ""
8609 9959 "A template is a piece of text, with markup to invoke variable\n"
8610 "expansion::\n"
8611 "\n"
9960 "expansion::"
9961 msgstr ""
9962
9963 msgid ""
8612 9964 " $ hg log -r1 --template \"{node}\\n\"\n"
8613 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
8614 "\n"
9965 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
9966 msgstr ""
9967
9968 msgid ""
8615 9969 "Strings in curly braces are called keywords. The availability of\n"
8616 9970 "keywords depends on the exact context of the templater. These\n"
8617 "keywords are usually available for templating a log-like command:\n"
8618 "\n"
8619 ":author: String. The unmodified author of the changeset.\n"
8620 "\n"
9971 "keywords are usually available for templating a log-like command:"
9972 msgstr ""
9973
9974 msgid ":author: String. The unmodified author of the changeset."
9975 msgstr ""
9976
9977 msgid ""
8621 9978 ":branches: String. The name of the branch on which the changeset was\n"
8622 " committed. Will be empty if the branch name was default.\n"
8623 "\n"
8624 ":date: Date information. The date when the changeset was committed.\n"
8625 "\n"
8626 ":desc: String. The text of the changeset description.\n"
8627 "\n"
9979 " committed. Will be empty if the branch name was default."
9980 msgstr ""
9981
9982 msgid ":date: Date information. The date when the changeset was committed."
9983 msgstr ""
9984
9985 msgid ":desc: String. The text of the changeset description."
9986 msgstr ""
9987
9988 msgid ""
8628 9989 ":diffstat: String. Statistics of changes with the following format:\n"
8629 " \"modified files: +added/-removed lines\"\n"
8630 "\n"
9990 " \"modified files: +added/-removed lines\""
9991 msgstr ""
9992
9993 msgid ""
8631 9994 ":files: List of strings. All files modified, added, or removed by this\n"
8632 " changeset.\n"
8633 "\n"
8634 ":file_adds: List of strings. Files added by this changeset.\n"
8635 "\n"
9995 " changeset."
9996 msgstr ""
9997
9998 msgid ":file_adds: List of strings. Files added by this changeset."
9999 msgstr ""
10000
10001 msgid ""
8636 10002 ":file_copies: List of strings. Files copied in this changeset with\n"
8637 " their sources.\n"
8638 "\n"
10003 " their sources."
10004 msgstr ""
10005
10006 msgid ""
8639 10007 ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
8640 " only if the --copied switch is set.\n"
8641 "\n"
8642 ":file_mods: List of strings. Files modified by this changeset.\n"
8643 "\n"
8644 ":file_dels: List of strings. Files removed by this changeset.\n"
8645 "\n"
10008 " only if the --copied switch is set."
10009 msgstr ""
10010
10011 msgid ":file_mods: List of strings. Files modified by this changeset."
10012 msgstr ""
10013
10014 msgid ":file_dels: List of strings. Files removed by this changeset."
10015 msgstr ""
10016
10017 msgid ""
8646 10018 ":node: String. The changeset identification hash, as a 40-character\n"
8647 " hexadecimal string.\n"
8648 "\n"
8649 ":parents: List of strings. The parents of the changeset.\n"
8650 "\n"
8651 ":rev: Integer. The repository-local changeset revision number.\n"
8652 "\n"
8653 ":tags: List of strings. Any tags associated with the changeset.\n"
8654 "\n"
10019 " hexadecimal string."
10020 msgstr ""
10021
10022 msgid ":parents: List of strings. The parents of the changeset."
10023 msgstr ""
10024
10025 msgid ":rev: Integer. The repository-local changeset revision number."
10026 msgstr ""
10027
10028 msgid ":tags: List of strings. Any tags associated with the changeset."
10029 msgstr ""
10030
10031 msgid ""
8655 10032 ":latesttag: String. Most recent global tag in the ancestors of this\n"
8656 " changeset.\n"
8657 "\n"
8658 ":latesttagdistance: Integer. Longest path to the latest tag.\n"
8659 "\n"
10033 " changeset."
10034 msgstr ""
10035
10036 msgid ":latesttagdistance: Integer. Longest path to the latest tag."
10037 msgstr ""
10038
10039 msgid ""
8660 10040 "The \"date\" keyword does not produce human-readable output. If you\n"
8661 10041 "want to use a date in your output, you can use a filter to process\n"
8662 10042 "it. Filters are functions which return a string based on the input\n"
8663 10043 "variable. Be sure to use the stringify filter first when you're\n"
8664 10044 "applying a string-input filter to a list-like input variable.\n"
8665 "You can also use a chain of filters to get the desired output::\n"
8666 "\n"
10045 "You can also use a chain of filters to get the desired output::"
10046 msgstr ""
10047
10048 msgid ""
8667 10049 " $ hg tip --template \"{date|isodate}\\n\"\n"
8668 " 2008-08-21 18:22 +0000\n"
8669 "\n"
8670 "List of filters:\n"
8671 "\n"
10050 " 2008-08-21 18:22 +0000"
10051 msgstr ""
10052
10053 msgid "List of filters:"
10054 msgstr ""
10055
10056 msgid ""
8672 10057 ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
8673 " every line except the last.\n"
8674 "\n"
10058 " every line except the last."
10059 msgstr ""
10060
10061 msgid ""
8675 10062 ":age: Date. Returns a human-readable date/time difference between the\n"
8676 " given date/time and the current date/time.\n"
8677 "\n"
10063 " given date/time and the current date/time."
10064 msgstr ""
10065
10066 msgid ""
8678 10067 ":basename: Any text. Treats the text as a path, and returns the last\n"
8679 10068 " component of the path after splitting by the path separator\n"
8680 10069 " (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
8681 " \"baz\" and \"foo/bar//\" becomes \"bar\".\n"
8682 "\n"
10070 " \"baz\" and \"foo/bar//\" becomes \"bar\"."
10071 msgstr ""
10072
10073 msgid ""
8683 10074 ":stripdir: Treat the text as path and strip a directory level, if\n"
8684 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
8685 "\n"
10075 " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
10076 msgstr ""
10077
10078 msgid ""
8686 10079 ":date: Date. Returns a date in a Unix date format, including the\n"
8687 " timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
8688 "\n"
10080 " timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
10081 msgstr ""
10082
10083 msgid ""
8689 10084 ":domain: Any text. Finds the first string that looks like an email\n"
8690 10085 " address, and extracts just the domain component. Example: ``User\n"
8691 " <user@example.com>`` becomes ``example.com``.\n"
8692 "\n"
10086 " <user@example.com>`` becomes ``example.com``."
10087 msgstr ""
10088
10089 msgid ""
8693 10090 ":email: Any text. Extracts the first string that looks like an email\n"
8694 10091 " address. Example: ``User <user@example.com>`` becomes\n"
8695 " ``user@example.com``.\n"
8696 "\n"
10092 " ``user@example.com``."
10093 msgstr ""
10094
10095 msgid ""
8697 10096 ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
8698 " and \">\" with XML entities.\n"
8699 "\n"
8700 ":fill68: Any text. Wraps the text to fit in 68 columns.\n"
8701 "\n"
8702 ":fill76: Any text. Wraps the text to fit in 76 columns.\n"
8703 "\n"
8704 ":firstline: Any text. Returns the first line of text.\n"
8705 "\n"
8706 ":nonempty: Any text. Returns '(none)' if the string is empty.\n"
8707 "\n"
10097 " and \">\" with XML entities."
10098 msgstr ""
10099
10100 msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
10101 msgstr ""
10102
10103 msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
10104 msgstr ""
10105
10106 msgid ":firstline: Any text. Returns the first line of text."
10107 msgstr ""
10108
10109 msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
10110 msgstr ""
10111
10112 msgid ""
8708 10113 ":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
8709 " 25200\" (Unix timestamp, timezone offset).\n"
8710 "\n"
10114 " 25200\" (Unix timestamp, timezone offset)."
10115 msgstr ""
10116
10117 msgid ""
8711 10118 ":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
8712 " +0200\".\n"
8713 "\n"
10119 " +0200\"."
10120 msgstr ""
10121
10122 msgid ""
8714 10123 ":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
8715 10124 " seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
8716 " filter.\n"
8717 "\n"
8718 ":localdate: Date. Converts a date to local date.\n"
8719 "\n"
10125 " filter."
10126 msgstr ""
10127
10128 msgid ":localdate: Date. Converts a date to local date."
10129 msgstr ""
10130
10131 msgid ""
8720 10132 ":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
8721 " XML entities.\n"
8722 "\n"
8723 ":person: Any text. Returns the text before an email address.\n"
8724 "\n"
10133 " XML entities."
10134 msgstr ""
10135
10136 msgid ":person: Any text. Returns the text before an email address."
10137 msgstr ""
10138
10139 msgid ""
8725 10140 ":rfc822date: Date. Returns a date using the same format used in email\n"
8726 " headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
8727 "\n"
10141 " headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
10142 msgstr ""
10143
10144 msgid ""
8728 10145 ":rfc3339date: Date. Returns a date using the Internet date format\n"
8729 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
8730 "\n"
10146 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
10147 msgstr ""
10148
10149 msgid ""
8731 10150 ":short: Changeset hash. Returns the short form of a changeset hash,\n"
8732 " i.e. a 12-byte hexadecimal string.\n"
8733 "\n"
8734 ":shortdate: Date. Returns a date like \"2006-09-18\".\n"
8735 "\n"
8736 ":strip: Any text. Strips all leading and trailing whitespace.\n"
8737 "\n"
10151 " i.e. a 12-byte hexadecimal string."
10152 msgstr ""
10153
10154 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
10155 msgstr ""
10156
10157 msgid ":strip: Any text. Strips all leading and trailing whitespace."
10158 msgstr ""
10159
10160 msgid ""
8738 10161 ":tabindent: Any text. Returns the text, with every line except the\n"
8739 " first starting with a tab character.\n"
8740 "\n"
10162 " first starting with a tab character."
10163 msgstr ""
10164
10165 msgid ""
8741 10166 ":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
8742 " \"foo bar\" becomes \"foo%20bar\".\n"
8743 "\n"
8744 ":user: Any text. Returns the user portion of an email address.\n"
8745 msgstr ""
8746
8747 msgid ""
8748 "Valid URLs are of the form::\n"
8749 "\n"
10167 " \"foo bar\" becomes \"foo%20bar\"."
10168 msgstr ""
10169
10170 msgid ":user: Any text. Returns the user portion of an email address.\n"
10171 msgstr ""
10172
10173 msgid "Valid URLs are of the form::"
10174 msgstr ""
10175
10176 msgid ""
8750 10177 " local/filesystem/path[#revision]\n"
8751 10178 " file://local/filesystem/path[#revision]\n"
8752 10179 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
8753 10180 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
8754 " ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
8755 "\n"
10181 " ssh://[user[:pass]@]host[:port]/[path][#revision]"
10182 msgstr ""
10183
10184 msgid ""
8756 10185 "Paths in the local filesystem can either point to Mercurial\n"
8757 10186 "repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
8758 "incoming --bundle').\n"
8759 "\n"
10187 "incoming --bundle')."
10188 msgstr ""
10189
10190 msgid ""
8760 10191 "An optional identifier after # indicates a particular branch, tag, or\n"
8761 10192 "changeset to use from the remote repository. See also 'hg help\n"
8762 "revisions'.\n"
8763 "\n"
10193 "revisions'."
10194 msgstr ""
10195
10196 msgid ""
8764 10197 "Some features, such as pushing to http:// and https:// URLs are only\n"
8765 10198 "possible if the feature is explicitly enabled on the remote Mercurial\n"
8766 "server.\n"
8767 "\n"
8768 "Some notes about using SSH with Mercurial:\n"
8769 "\n"
10199 "server."
10200 msgstr ""
10201
10202 msgid "Some notes about using SSH with Mercurial:"
10203 msgstr ""
10204
10205 msgid ""
8770 10206 "- SSH requires an accessible shell account on the destination machine\n"
8771 10207 " and a copy of hg in the remote path or specified with as remotecmd.\n"
8772 10208 "- path is relative to the remote user's home directory by default. Use\n"
8773 " an extra slash at the start of a path to specify an absolute path::\n"
8774 "\n"
8775 " ssh://example.com//tmp/repository\n"
8776 "\n"
10209 " an extra slash at the start of a path to specify an absolute path::"
10210 msgstr ""
10211
10212 msgid " ssh://example.com//tmp/repository"
10213 msgstr ""
10214
10215 msgid ""
8777 10216 "- Mercurial doesn't use its own compression via SSH; the right thing\n"
8778 " to do is to configure it in your ~/.ssh/config, e.g.::\n"
8779 "\n"
10217 " to do is to configure it in your ~/.ssh/config, e.g.::"
10218 msgstr ""
10219
10220 msgid ""
8780 10221 " Host *.mylocalnetwork.example.com\n"
8781 10222 " Compression no\n"
8782 10223 " Host *\n"
8783 " Compression yes\n"
8784 "\n"
10224 " Compression yes"
10225 msgstr ""
10226
10227 msgid ""
8785 10228 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
8786 " with the --ssh command line option.\n"
8787 "\n"
10229 " with the --ssh command line option."
10230 msgstr ""
10231
10232 msgid ""
8788 10233 "These URLs can all be stored in your hgrc with path aliases under the\n"
8789 "[paths] section like so::\n"
8790 "\n"
10234 "[paths] section like so::"
10235 msgstr ""
10236
10237 msgid ""
8791 10238 " [paths]\n"
8792 10239 " alias1 = URL1\n"
8793 10240 " alias2 = URL2\n"
8794 " ...\n"
8795 "\n"
10241 " ..."
10242 msgstr ""
10243
10244 msgid ""
8796 10245 "You can then use the alias for any command that uses a URL (for\n"
8797 "example 'hg pull alias1' will be treated as 'hg pull URL1').\n"
8798 "\n"
10246 "example 'hg pull alias1' will be treated as 'hg pull URL1')."
10247 msgstr ""
10248
10249 msgid ""
8799 10250 "Two path aliases are special because they are used as defaults when\n"
8800 "you do not provide the URL to a command:\n"
8801 "\n"
10251 "you do not provide the URL to a command:"
10252 msgstr ""
10253
10254 msgid ""
8802 10255 "default:\n"
8803 10256 " When you create a repository with hg clone, the clone command saves\n"
8804 10257 " the location of the source repository as the new repository's\n"
8805 10258 " 'default' path. This is then used when you omit path from push- and\n"
8806 " pull-like commands (including incoming and outgoing).\n"
8807 "\n"
10259 " pull-like commands (including incoming and outgoing)."
10260 msgstr ""
10261
10262 msgid ""
8808 10263 "default-push:\n"
8809 10264 " The push command will look for a path named 'default-push', and\n"
8810 10265 " prefer it over 'default' if both are defined.\n"
@@ -8834,12 +10289,8 b' msgstr "destinationen \'%s\' finns redan"'
8834 10289 msgid "destination '%s' is not empty"
8835 10290 msgstr "destinationen '%s är inte tom"
8836 10291
8837 msgid ""
8838 "src repository does not support revision lookup and so doesn't support clone "
8839 "by revision"
8840 msgstr ""
8841 "källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning "
8842 "av angivna revisioner"
10292 msgid "src repository does not support revision lookup and so doesn't support clone by revision"
10293 msgstr "källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning av angivna revisioner"
8843 10294
8844 10295 msgid "clone from remote to remote not supported"
8845 10296 msgstr "kloning från fjärr till fjärr stödjs inte"
@@ -8849,18 +10300,13 b' msgid "updating to branch %s\\n"'
8849 10300 msgstr "uppdaterar till grenen %s\n"
8850 10301
8851 10302 #, python-format
8852 msgid ""
8853 "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
8854 msgstr ""
8855 "%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer "
8856 "olösta\n"
10303 msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
10304 msgstr "%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer olösta\n"
8857 10305
8858 10306 msgid "use 'hg resolve' to retry unresolved file merges\n"
8859 10307 msgstr ""
8860 10308
8861 msgid ""
8862 "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
8863 "abandon\n"
10309 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n"
8864 10310 msgstr ""
8865 10311
8866 10312 msgid "(branch merge, don't forget to commit)\n"
@@ -9162,12 +10608,8 b' msgstr "arkivet \xc3\xa4r obesl\xc3\xa4ktat"'
9162 10608 msgid "requesting all changes\n"
9163 10609 msgstr "efterfrågar alla ändringar\n"
9164 10610
9165 msgid ""
9166 "Partial pull cannot be done because other repository doesn't support "
9167 "changegroupsubset."
9168 msgstr ""
9169 "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer "
9170 "changegroupsubset."
10611 msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
10612 msgstr "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer changegroupsubset."
9171 10613
9172 10614 #, python-format
9173 10615 msgid "abort: push creates new remote heads on branch '%s'!\n"
@@ -9320,9 +10762,7 b' msgid "diff context lines count must be '
9320 10762 msgstr ""
9321 10763
9322 10764 #, python-format
9323 msgid ""
9324 "untracked file in working directory differs from file in requested revision: "
9325 "'%s'"
10765 msgid "untracked file in working directory differs from file in requested revision: '%s'"
9326 10766 msgstr ""
9327 10767
9328 10768 #, python-format
@@ -9397,9 +10837,7 b' msgstr ""'
9397 10837 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
9398 10838 msgstr ""
9399 10839
9400 msgid ""
9401 "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
9402 "changes)"
10840 msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)"
9403 10841 msgstr ""
9404 10842
9405 10843 msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
General Comments 0
You need to be logged in to leave comments. Login now