##// END OF EJS Templates
i18n-sv: synchronized with d1b49b02bc16
Jens Bäckman -
r17239:848a1c1e stable
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (3092 lines changed) Show them Hide them
@@ -4,17 +4,20 b''
4 4 #
5 5 # Translation dictionary:
6 6 #
7 # amend förändra
7 8 # changeset ändring
8 9 # commit arkivera
10 # graft ympa
9 11 # merge sammanfoga
12 # strip avlägsna
10 13 # tag märke
11 14 #
12 15 msgid ""
13 16 msgstr ""
14 17 "Project-Id-Version: Mercurial\n"
15 18 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
16 "POT-Creation-Date: 2012-01-30 16:25+0100\n"
17 "PO-Revision-Date: 2012-01-30 16:27+0100\n"
19 "POT-Creation-Date: 2012-07-23 20:26+0200\n"
20 "PO-Revision-Date: 2012-07-23 20:38+0200\n"
18 21 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
19 22 "Language-Team: Swedish\n"
20 23 "Language: Swedish\n"
@@ -113,6 +116,11 b' msgid ""'
113 116 msgstr ""
114 117
115 118 msgid ""
119 "You can add the \"!\" prefix to a user or group name to invert the sense\n"
120 "of the match."
121 msgstr ""
122
123 msgid ""
116 124 "Path-based Access Control\n"
117 125 "........................."
118 126 msgstr ""
@@ -262,15 +270,73 b' msgid ""'
262 270 msgstr ""
263 271
264 272 msgid ""
265 " # Everyone (except for \"user6\" - see acl.deny above) will have write\n"
266 " # access to any file under the \"resources\" folder (except for 1\n"
267 " # file. See acl.deny):\n"
273 " # Everyone (except for \"user6\" and \"@hg-denied\" - see acl.deny above)\n"
274 " # will have write access to any file under the \"resources\" folder\n"
275 " # (except for 1 file. See acl.deny):\n"
268 276 " src/main/resources/** = *"
269 277 msgstr ""
270 278
271 279 msgid " .hgtags = release_engineer"
272 280 msgstr ""
273 281
282 msgid ""
283 "Examples using the \"!\" prefix\n"
284 "............................."
285 msgstr ""
286
287 msgid ""
288 "Suppose there's a branch that only a given user (or group) should be able "
289 "to\n"
290 "push to, and you don't want to restrict access to any other branch that may\n"
291 "be created."
292 msgstr ""
293
294 msgid ""
295 "The \"!\" prefix allows you to prevent anyone except a given user or group "
296 "to\n"
297 "push changesets in a given branch or path."
298 msgstr ""
299
300 msgid ""
301 "In the examples below, we will:\n"
302 "1) Deny access to branch \"ring\" to anyone but user \"gollum\"\n"
303 "2) Deny access to branch \"lake\" to anyone but members of the group \"hobbit"
304 "\"\n"
305 "3) Deny access to a file to anyone but user \"gollum\""
306 msgstr ""
307
308 msgid ""
309 " [acl.allow.branches]\n"
310 " # Empty"
311 msgstr ""
312
313 msgid ""
314 " # 1) only 'gollum' can commit to branch 'ring';\n"
315 " # 'gollum' and anyone else can still commit to any other branch.\n"
316 " ring = !gollum"
317 msgstr ""
318
319 msgid ""
320 " # 2) only members of the group 'hobbit' can commit to branch 'lake';\n"
321 " # 'hobbit' members and anyone else can still commit to any other branch.\n"
322 " lake = !@hobbit"
323 msgstr ""
324
325 msgid " # You can also deny access based on file paths:"
326 msgstr ""
327
328 msgid ""
329 " [acl.allow]\n"
330 " # Empty"
331 msgstr ""
332
333 msgid ""
334 " [acl.deny]\n"
335 " # 3) only 'gollum' can change the file below;\n"
336 " # 'gollum' and anyone else can still change any other file.\n"
337 " /misty/mountains/cave/ring = !gollum"
338 msgstr ""
339
274 340 #, python-format
275 341 msgid "group '%s' is undefined"
276 342 msgstr ""
@@ -305,7 +371,9 b' msgid ""'
305 371 "the Mercurial template mechanism."
306 372 msgstr ""
307 373
308 msgid "The hook does not change bug status."
374 msgid ""
375 "The bug references can optionally include an update for Bugzilla of the\n"
376 "hours spent working on the bug. Bugs can also be marked fixed."
309 377 msgstr ""
310 378
311 379 msgid "Three basic modes of access to Bugzilla are provided:"
@@ -334,7 +402,7 b' msgid ""'
334 402 "MySQL user and password to have full access rights to the Bugzilla\n"
335 403 "database. For these reasons this access mode is now considered\n"
336 404 "deprecated, and will not be updated for new Bugzilla versions going\n"
337 "forward."
405 "forward. Only adding comments is supported in this access mode."
338 406 msgstr ""
339 407
340 408 msgid ""
@@ -342,7 +410,8 b' msgid ""'
342 410 "in the configuration. Comments are added under that username. Since the\n"
343 411 "configuration must be readable by all Mercurial users, it is recommended\n"
344 412 "that the rights of that user are restricted in Bugzilla to the minimum\n"
345 "necessary to add comments."
413 "necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and "
414 "later."
346 415 msgstr ""
347 416
348 417 msgid ""
@@ -352,7 +421,8 b' msgid ""'
352 421 "user, so the comment appears to come from the Mercurial user. In the event\n"
353 422 "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n"
354 423 "user, the email associated with the Bugzilla username used to log into\n"
355 "Bugzilla is used instead as the source of the comment."
424 "Bugzilla is used instead as the source of the comment. Marking bugs fixed\n"
425 "works on all supported Bugzilla versions."
356 426 msgstr ""
357 427
358 428 msgid "Configuration items common to all access modes:"
@@ -375,11 +445,43 b' msgstr ""'
375 445
376 446 msgid ""
377 447 "bugzilla.regexp\n"
378 " Regular expression to match bug IDs in changeset commit message.\n"
379 " Must contain one \"()\" group. The default expression matches ``Bug\n"
380 " 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n"
381 " ``Bug 1234 and 5678`` and variations thereof. Matching is case\n"
382 " insensitive."
448 " Regular expression to match bug IDs for update in changeset commit "
449 "message.\n"
450 " It must contain one \"()\" named group ``<ids>`` containing the bug\n"
451 " IDs separated by non-digit characters. It may also contain\n"
452 " a named group ``<hours>`` with a floating-point number giving the\n"
453 " hours worked on the bug. If no named groups are present, the first\n"
454 " \"()\" group is assumed to contain the bug IDs, and work time is not\n"
455 " updated. The default expression matches ``Bug 1234``, ``Bug no. 1234``,\n"
456 " ``Bug number 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` and\n"
457 " variations thereof, followed by an hours number prefixed by ``h`` or\n"
458 " ``hours``, e.g. ``hours 1.5``. Matching is case insensitive."
459 msgstr ""
460
461 msgid ""
462 "bugzilla.fixregexp\n"
463 " Regular expression to match bug IDs for marking fixed in changeset\n"
464 " commit message. This must contain a \"()\" named group ``<ids>` "
465 "containing\n"
466 " the bug IDs separated by non-digit characters. It may also contain\n"
467 " a named group ``<hours>`` with a floating-point number giving the\n"
468 " hours worked on the bug. If no named groups are present, the first\n"
469 " \"()\" group is assumed to contain the bug IDs, and work time is not\n"
470 " updated. The default expression matches ``Fixes 1234``, ``Fixes bug "
471 "1234``,\n"
472 " ``Fixes bugs 1234,5678``, ``Fixes 1234 and 5678`` and\n"
473 " variations thereof, followed by an hours number prefixed by ``h`` or\n"
474 " ``hours``, e.g. ``hours 1.5``. Matching is case insensitive."
475 msgstr ""
476
477 msgid ""
478 "bugzilla.fixstatus\n"
479 " The status to set a bug to when marking fixed. Default ``RESOLVED``."
480 msgstr ""
481
482 msgid ""
483 "bugzilla.fixresolution\n"
484 " The resolution to set a bug to when marking fixed. Default ``FIXED``."
383 485 msgstr ""
384 486
385 487 msgid ""
@@ -651,6 +753,10 b' msgid "unknown database schema"'
651 753 msgstr ""
652 754
653 755 #, python-format
756 msgid "bug %d does not exist\n"
757 msgstr "bugg %d existerar inte\n"
758
759 #, python-format
654 760 msgid "bug %d already knows about changeset %s\n"
655 761 msgstr ""
656 762
@@ -684,6 +790,12 b' msgstr ""'
684 790 msgid "cannot find bugzilla user id for %s or %s"
685 791 msgstr ""
686 792
793 msgid "Bugzilla/MySQL cannot update bug state\n"
794 msgstr ""
795
796 msgid "Bugzilla/XMLRPC needs Bugzilla 4.0 or later to mark bugs fixed\n"
797 msgstr ""
798
687 799 msgid "configuration 'bzemail' missing"
688 800 msgstr "'bzemail' inte konfigurerad"
689 801
@@ -695,6 +807,10 b' msgstr ""'
695 807 msgid "bugzilla version %s not supported"
696 808 msgstr "bugzilla version %s stöds inte"
697 809
810 #, python-format
811 msgid "%s: invalid hours\n"
812 msgstr "%s: ogiltiga timmar\n"
813
698 814 msgid ""
699 815 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
700 816 "details:\n"
@@ -709,8 +825,15 b' msgstr ""'
709 825 msgid "Bugzilla error: %s"
710 826 msgstr "Bugzilla-fel: %s"
711 827
712 msgid "command to display child changesets"
713 msgstr ""
828 msgid "command to display child changesets (DEPRECATED)"
829 msgstr "kommando för att visa barnändringar (FÖRLEGAD)"
830
831 msgid ""
832 "This extension is deprecated. You should use :hg:`log -r\n"
833 "\"children(REV)\"` instead.\n"
834 msgstr ""
835 "Detta är en förlegad utökning. Du kan avända :hg:`log -r\n"
836 "\"children(REV)\"` instead.\n"
714 837
715 838 msgid "show the children of the given or working directory revision"
716 839 msgstr ""
@@ -737,7 +860,7 b' msgid "command to display statistics abo'
737 860 msgstr ""
738 861
739 862 #, python-format
740 msgid "Revision %d is a merge, ignoring...\n"
863 msgid "revision %d is a merge, ignoring...\n"
741 864 msgstr ""
742 865
743 866 msgid "analyzing"
@@ -1547,8 +1670,8 b' msgid "bzr source type could not be dete'
1547 1670 msgstr ""
1548 1671
1549 1672 #, python-format
1550 msgid "%s is not a valid revision in current branch"
1551 msgstr ""
1673 msgid "%s is not a valid revision"
1674 msgstr "%s är inte en giltig revision"
1552 1675
1553 1676 #, python-format
1554 1677 msgid "%s is not available in %s anymore"
@@ -1575,6 +1698,10 b' msgid "could not open map file %r: %s"'
1575 1698 msgstr ""
1576 1699
1577 1700 #, python-format
1701 msgid "syntax error in %s(%d): child parent1[,parent2] expected"
1702 msgstr ""
1703
1704 #, python-format
1578 1705 msgid "%s: invalid source repository type"
1579 1706 msgstr "%s: ogiltig typ för källarkiv"
1580 1707
@@ -1604,6 +1731,14 b' msgid "scanning"'
1604 1731 msgstr "skannar"
1605 1732
1606 1733 #, python-format
1734 msgid "splice map revision %s is not being converted, ignoring\n"
1735 msgstr ""
1736
1737 #, python-format
1738 msgid "unknown splice map parent: %s"
1739 msgstr ""
1740
1741 #, python-format
1607 1742 msgid "unknown sort mode: %s"
1608 1743 msgstr ""
1609 1744
@@ -1615,11 +1750,11 b' msgid "not all revisions were sorted"'
1615 1750 msgstr ""
1616 1751
1617 1752 #, python-format
1618 msgid "Writing author map file %s\n"
1619 msgstr ""
1620
1621 #, python-format
1622 msgid "Ignoring bad line in author map file %s: %s\n"
1753 msgid "writing author map file %s\n"
1754 msgstr ""
1755
1756 #, python-format
1757 msgid "ignoring bad line in author map file %s: %s\n"
1623 1758 msgstr ""
1624 1759
1625 1760 #, python-format
@@ -1864,6 +1999,12 b' msgid "updating bookmarks\\n"'
1864 1999 msgstr "uppdaterar bokmärken\n"
1865 2000
1866 2001 #, python-format
2002 msgid ""
2003 "revision %s not found in destination repository (lookups with "
2004 "clonebranches=true are not implemented)"
2005 msgstr ""
2006
2007 #, python-format
1867 2008 msgid "%s is not a valid start revision"
1868 2009 msgstr ""
1869 2010
@@ -1924,6 +2065,9 b' msgstr ""'
1924 2065 msgid "collecting p4 changelists\n"
1925 2066 msgstr ""
1926 2067
2068 msgid "debugsvnlog could not load Subversion python bindings"
2069 msgstr ""
2070
1927 2071 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1928 2072 msgstr ""
1929 2073
@@ -1940,7 +2084,7 b' msgstr ""'
1940 2084 msgid "%s does not look like a Subversion repository"
1941 2085 msgstr "%s verkar inte vara ett Subversion-arkiv"
1942 2086
1943 msgid "Could not load Subversion python bindings"
2087 msgid "could not load Subversion python bindings"
1944 2088 msgstr ""
1945 2089
1946 2090 #, python-format
@@ -2025,6 +2169,12 b' msgstr ""'
2025 2169 msgid "writing Subversion tags is not yet implemented\n"
2026 2170 msgstr ""
2027 2171
2172 #, python-format
2173 msgid ""
2174 "splice map revision %s not found in subversion child map (revision lookups "
2175 "are not implemented)"
2176 msgstr ""
2177
2028 2178 msgid "automatically manage newlines in repository files"
2029 2179 msgstr ""
2030 2180
@@ -2211,7 +2361,8 b' msgid ""'
2211 2361 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
2212 2362 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
2213 2363 " # your .vimrc\n"
2214 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
2364 " vimdiff = gvim -f \"+next\" \\\n"
2365 " \"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))\""
2215 2366 msgstr ""
2216 2367
2217 2368 msgid "Tool arguments can include variables that are expanded at runtime::"
@@ -2324,7 +2475,56 b' msgstr ""'
2324 2475 msgid "hg %s [OPTION]... [FILE]..."
2325 2476 msgstr ""
2326 2477
2327 msgid "pull, update and merge in one command"
2478 msgid "http authentication with factotum"
2479 msgstr ""
2480
2481 msgid ""
2482 "This extension allows the factotum(4) facility on Plan 9 from Bell Labs\n"
2483 "platforms to provide authentication information for HTTP access. "
2484 "Configuration\n"
2485 "entries specified in the auth section as well as authentication information\n"
2486 "provided in the repository URL are fully supported. If no prefix is "
2487 "specified,\n"
2488 "a value of \"*\" will be assumed."
2489 msgstr ""
2490
2491 msgid "By default, keys are specified as::"
2492 msgstr ""
2493
2494 msgid ""
2495 " proto=pass service=hg prefix=<prefix> user=<username> !password=<password>"
2496 msgstr ""
2497
2498 msgid ""
2499 "If the factotum extension is unable to read the required key, one will be\n"
2500 "requested interactively."
2501 msgstr ""
2502
2503 msgid ""
2504 "A configuration section is available to customize runtime behavior. By\n"
2505 "default, these entries are::"
2506 msgstr ""
2507
2508 msgid ""
2509 " [factotum]\n"
2510 " executable = /bin/auth/factotum\n"
2511 " mountpoint = /mnt/factotum\n"
2512 " service = hg"
2513 msgstr ""
2514
2515 msgid ""
2516 "The executable entry defines the full path to the factotum binary. The\n"
2517 "mountpoint entry defines the path to the factotum file service. Lastly, the\n"
2518 "service entry controls the service name used when reading keys."
2519 msgstr ""
2520
2521 msgid "factotum not interactive"
2522 msgstr ""
2523
2524 msgid "factotum not responding"
2525 msgstr ""
2526
2527 msgid "pull, update and merge in one command (DEPRECATED)"
2328 2528 msgstr ""
2329 2529
2330 2530 msgid "pull changes from a remote repository, merge new changes if needed."
@@ -2343,10 +2543,9 b' msgid ""'
2343 2543 msgstr ""
2344 2544
2345 2545 msgid ""
2346 " When a merge occurs, the newly pulled changes are assumed to be\n"
2347 " \"authoritative\". The head of the new changes is used as the first\n"
2348 " parent, with local changes as the second. To switch the merge\n"
2349 " order, use --switch-parent."
2546 " When a merge is needed, the working directory is first updated to\n"
2547 " the newly pulled changes. Local changes are then merged into the\n"
2548 " pulled changes. To switch the merge order, use --switch-parent."
2350 2549 msgstr ""
2351 2550
2352 2551 msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
@@ -2385,10 +2584,10 b' msgid "pulling from %s\\n"'
2385 2584 msgstr "drar från %s\n"
2386 2585
2387 2586 msgid ""
2388 "Other repository doesn't support revision lookup, so a rev cannot be "
2587 "other repository doesn't support revision lookup, so a rev cannot be "
2389 2588 "specified."
2390 2589 msgstr ""
2391 "Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
2590 "det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
2392 2591 "anges."
2393 2592
2394 2593 #, python-format
@@ -2454,15 +2653,15 b' msgstr "visa signerade \xc3\xa4ndringar"'
2454 2653 msgid "%s:%d node does not exist\n"
2455 2654 msgstr "%s:%d noden existerar inte\n"
2456 2655
2457 msgid "hg sigcheck REVISION"
2458 msgstr "hg sigcheck REVISION"
2656 msgid "hg sigcheck REV"
2657 msgstr "hg sigcheck REV"
2459 2658
2460 2659 msgid "verify all the signatures there may be for a particular revision"
2461 2660 msgstr "verifiera alla signaturerna som finns för en viss revision"
2462 2661
2463 2662 #, python-format
2464 msgid "No valid signature for %s\n"
2465 msgstr "Ingen giltig signatur för %s\n"
2663 msgid "no valid signature for %s\n"
2664 msgstr "ingen giltig signatur för %s\n"
2466 2665
2467 2666 msgid "make the signature local"
2468 2667 msgstr "gör signaturen lokal"
@@ -2485,8 +2684,8 b' msgstr "TEXT"'
2485 2684 msgid "commit message"
2486 2685 msgstr "arkiveringsmeddelande"
2487 2686
2488 msgid "hg sign [OPTION]... [REVISION]..."
2489 msgstr "hg sign [FLAGGA]... [REVISION]..."
2687 msgid "hg sign [OPTION]... [REV]..."
2688 msgstr "hg sign [FLAGGA]... [REV]..."
2490 2689
2491 2690 msgid "add a signature for the current or given revision"
2492 2691 msgstr "lägg till en signatur för den aktuella eller angivna revisionen"
@@ -2509,8 +2708,8 b' msgid "uncommitted merge - please provid'
2509 2708 msgstr "oarkiverad sammanfogning - ange en specifik revision"
2510 2709
2511 2710 #, python-format
2512 msgid "Signing %d:%s\n"
2513 msgstr "Signerar %d:%s\n"
2711 msgid "signing %d:%s\n"
2712 msgstr "signerar %d:%s\n"
2514 2713
2515 2714 msgid "error while signing"
2516 2715 msgstr "fel vid signering"
@@ -2537,27 +2736,54 b' msgstr ""'
2537 2736 "outgoing och log. När flaggan anges, visas också en ASCII-version av\n"
2538 2737 "revisionsgrafen.\n"
2539 2738
2540 #, python-format
2541 msgid "-G/--graph option is incompatible with --%s"
2542 msgstr "flaggan -G/--graph är inkompatibel med --%s"
2543
2544 msgid "-G/--graph option is incompatible with --follow with file argument"
2545 msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument"
2546
2547 msgid "NUM"
2548 msgstr "NUM"
2549
2550 msgid "limit number of changes displayed"
2551 msgstr "begränsa antalet visade ändringar"
2552
2553 msgid "show patch"
2554 msgstr "visa patch"
2739 msgid "follow changeset history, or file history across copies and renames"
2740 msgstr ""
2741 "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
2742
2743 msgid "only follow the first parent of merge changesets (DEPRECATED)"
2744 msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)"
2745
2746 msgid "show revisions matching date spec"
2747 msgstr "visa revisioner som matchar datumspecen"
2748
2749 msgid "show copied files"
2750 msgstr "visa kopierade filer"
2751
2752 msgid "do case-insensitive search for a given text"
2753 msgstr "gör versalokänslig sökning efter en given text"
2555 2754
2556 2755 msgid "show the specified revision or range"
2557 2756 msgstr "visa den specifika revisionen eller serien"
2558 2757
2559 msgid "hg glog [OPTION]... [FILE]"
2560 msgstr "hg glog [FLAGGA]... [FIL]"
2758 msgid "include revisions where files were removed"
2759 msgstr "inkludera revisioner där filer togs bort"
2760
2761 msgid "show only merges (DEPRECATED)"
2762 msgstr "visa bara sammanfogningar (FÖRLEGAD)"
2763
2764 msgid "USER"
2765 msgstr "ANVÄNDARE"
2766
2767 msgid "revisions committed by user"
2768 msgstr "revisioner arkiverade av användare"
2769
2770 msgid "show only changesets within the given named branch (DEPRECATED)"
2771 msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)"
2772
2773 msgid "BRANCH"
2774 msgstr "GREN"
2775
2776 msgid "show changesets within the given named branch"
2777 msgstr "visa ändringar i den namngivna grenen"
2778
2779 msgid "do not display revision or any of its ancestors"
2780 msgstr "visa inte revision eller någon av dess föräldrar"
2781
2782 msgid "show hidden changesets (DEPRECATED)"
2783 msgstr "visa dolda ändringar (FÖRLEGAD)"
2784
2785 msgid "[OPTION]... [FILE]"
2786 msgstr "[FLAGGA]... [FIL]"
2561 2787
2562 2788 msgid "show revision history alongside an ASCII revision graph"
2563 2789 msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf"
@@ -2577,9 +2803,6 b' msgstr ""'
2577 2803 " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n"
2578 2804 " "
2579 2805
2580 msgid "show the revision DAG"
2581 msgstr "visa revisionsdiagram"
2582
2583 2806 msgid "hooks for integrating with the CIA.vc notification service"
2584 2807 msgstr ""
2585 2808
@@ -2707,6 +2930,12 b' msgstr ""'
2707 2930 msgid "start interactive history viewer"
2708 2931 msgstr ""
2709 2932
2933 msgid "NUM"
2934 msgstr "NUM"
2935
2936 msgid "limit number of changes displayed"
2937 msgstr "begränsa antalet visade ändringar"
2938
2710 2939 msgid "hg view [-l LIMIT] [REVRANGE]"
2711 2940 msgstr ""
2712 2941
@@ -2763,23 +2992,322 b' msgid "hg debug-rev-list [OPTION]... REV'
2763 2992 msgstr ""
2764 2993
2765 2994 msgid "syntax highlighting for hgweb (requires Pygments)"
2766 msgstr ""
2995 msgstr "syntaxfärgning för hgweb (kräver Pygments)"
2767 2996
2768 2997 msgid ""
2769 2998 "It depends on the Pygments syntax highlighting library:\n"
2770 2999 "http://pygments.org/"
2771 3000 msgstr ""
3001 "Den beror på syntaxfärgningsbiblioteket Pygments:\n"
3002 "http://pygments.org/"
2772 3003
2773 3004 msgid "There is a single configuration option::"
2774 msgstr ""
3005 msgstr "Det finns ett enda konfigurationsalternativ::"
2775 3006
2776 3007 msgid ""
2777 3008 " [web]\n"
2778 3009 " pygments_style = <style>"
2779 3010 msgstr ""
3011 " [web]\n"
3012 " pygments_style = <style>"
2780 3013
2781 3014 msgid "The default is 'colorful'.\n"
2782 msgstr ""
3015 msgstr "Som standard används 'colorful'.\n"
3016
3017 msgid "interactive history editing"
3018 msgstr "interaktiv historieredigering"
3019
3020 msgid ""
3021 "With this extension installed, Mercurial gains one new command: histedit. "
3022 "Usage\n"
3023 "is as follows, assuming the following history::"
3024 msgstr ""
3025 "Med denna utökning installerad, så får Mercurial ett nytt kommando: \n"
3026 "histedit. Det används som följer, förutsatt denna historia::"
3027
3028 msgid ""
3029 " @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42\n"
3030 " | Add delta\n"
3031 " |\n"
3032 " o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42\n"
3033 " | Add gamma\n"
3034 " |\n"
3035 " o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42\n"
3036 " | Add beta\n"
3037 " |\n"
3038 " o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n"
3039 " Add alpha"
3040 msgstr ""
3041 " @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42\n"
3042 " | Add delta\n"
3043 " |\n"
3044 " o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42\n"
3045 " | Add gamma\n"
3046 " |\n"
3047 " o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42\n"
3048 " | Add beta\n"
3049 " |\n"
3050 " o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n"
3051 " Add alpha"
3052
3053 msgid ""
3054 "If you were to run ``hg histedit c561b4e977df``, you would see the "
3055 "following\n"
3056 "file open in your editor::"
3057 msgstr ""
3058 "Om du skulle köra ``hg histedit c561b4e977df``, så skulle den följande \n"
3059 "filen öppnas i din editor::"
3060
3061 msgid ""
3062 " pick c561b4e977df Add beta\n"
3063 " pick 030b686bedc4 Add gamma\n"
3064 " pick 7c2fd3b9020c Add delta"
3065 msgstr ""
3066 " pick c561b4e977df Add beta\n"
3067 " pick 030b686bedc4 Add gamma\n"
3068 " pick 7c2fd3b9020c Add delta"
3069
3070 msgid ""
3071 " # Edit history between 633536316234 and 7c2fd3b9020c\n"
3072 " #\n"
3073 " # Commands:\n"
3074 " # p, pick = use commit\n"
3075 " # e, edit = use commit, but stop for amending\n"
3076 " # f, fold = use commit, but fold into previous commit\n"
3077 " # d, drop = remove commit from history\n"
3078 " # m, mess = edit message without changing commit content\n"
3079 " #\n"
3080 " 0 files updated, 0 files merged, 0 files removed, 0 files unresolved"
3081 msgstr ""
3082
3083 msgid ""
3084 "In this file, lines beginning with ``#`` are ignored. You must specify a "
3085 "rule\n"
3086 "for each revision in your history. For example, if you had meant to add "
3087 "gamma\n"
3088 "before beta, and then wanted to add delta in the same revision as beta, you\n"
3089 "would reorganize the file to look like this::"
3090 msgstr ""
3091
3092 msgid ""
3093 " pick 030b686bedc4 Add gamma\n"
3094 " pick c561b4e977df Add beta\n"
3095 " fold 7c2fd3b9020c Add delta"
3096 msgstr ""
3097 " pick 030b686bedc4 Add gamma\n"
3098 " pick c561b4e977df Add beta\n"
3099 " fold 7c2fd3b9020c Add delta"
3100
3101 msgid ""
3102 "At which point you close the editor and ``histedit`` starts working. When "
3103 "you\n"
3104 "specify a ``fold`` operation, ``histedit`` will open an editor when it "
3105 "folds\n"
3106 "those revisions together, offering you a chance to clean up the commit "
3107 "message::"
3108 msgstr ""
3109
3110 msgid ""
3111 " Add beta\n"
3112 " ***\n"
3113 " Add delta"
3114 msgstr ""
3115
3116 msgid ""
3117 "Edit the commit message to your liking, then close the editor. For\n"
3118 "this example, let's assume that the commit message was changed to\n"
3119 "``Add beta and delta.`` After histedit has run and had a chance to\n"
3120 "remove any old or temporary revisions it needed, the history looks\n"
3121 "like this::"
3122 msgstr ""
3123
3124 msgid ""
3125 " @ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42\n"
3126 " | Add beta and delta.\n"
3127 " |\n"
3128 " o 1 081603921c3f 2009-04-27 18:04 -0500 durin42\n"
3129 " | Add gamma\n"
3130 " |\n"
3131 " o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n"
3132 " Add alpha"
3133 msgstr ""
3134
3135 msgid ""
3136 "Note that ``histedit`` does *not* remove any revisions (even its own "
3137 "temporary\n"
3138 "ones) until after it has completed all the editing operations, so it will\n"
3139 "probably perform several strip operations when it's done. For the above "
3140 "example,\n"
3141 "it had to run strip twice. Strip can be slow depending on a variety of "
3142 "factors,\n"
3143 "so you might need to be a little patient. You can choose to keep the "
3144 "original\n"
3145 "revisions by passing the ``--keep`` flag."
3146 msgstr ""
3147
3148 msgid ""
3149 "The ``edit`` operation will drop you back to a command prompt,\n"
3150 "allowing you to edit files freely, or even use ``hg record`` to commit\n"
3151 "some changes as a separate commit. When you're done, any remaining\n"
3152 "uncommitted changes will be committed as well. When done, run ``hg\n"
3153 "histedit --continue`` to finish this step. You'll be prompted for a\n"
3154 "new commit message, but the default commit message will be the\n"
3155 "original message for the ``edit`` ed revision."
3156 msgstr ""
3157
3158 msgid ""
3159 "The ``message`` operation will give you a chance to revise a commit\n"
3160 "message without changing the contents. It's a shortcut for doing\n"
3161 "``edit`` immediately followed by `hg histedit --continue``."
3162 msgstr ""
3163
3164 msgid ""
3165 "If ``histedit`` encounters a conflict when moving a revision (while\n"
3166 "handling ``pick`` or ``fold``), it'll stop in a similar manner to\n"
3167 "``edit`` with the difference that it won't prompt you for a commit\n"
3168 "message when done. If you decide at this point that you don't like how\n"
3169 "much work it will be to rearrange history, or that you made a mistake,\n"
3170 "you can use ``hg histedit --abort`` to abandon the new changes you\n"
3171 "have made and return to the state before you attempted to edit your\n"
3172 "history."
3173 msgstr ""
3174
3175 msgid ""
3176 "If we clone the example repository above and add three more changes, such "
3177 "that\n"
3178 "we have the following history::"
3179 msgstr ""
3180
3181 msgid ""
3182 " @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan\n"
3183 " | Add theta\n"
3184 " |\n"
3185 " o 5 140988835471 2009-04-27 18:04 -0500 stefan\n"
3186 " | Add eta\n"
3187 " |\n"
3188 " o 4 122930637314 2009-04-27 18:04 -0500 stefan\n"
3189 " | Add zeta\n"
3190 " |\n"
3191 " o 3 836302820282 2009-04-27 18:04 -0500 stefan\n"
3192 " | Add epsilon\n"
3193 " |\n"
3194 " o 2 989b4d060121 2009-04-27 18:04 -0500 durin42\n"
3195 " | Add beta and delta.\n"
3196 " |\n"
3197 " o 1 081603921c3f 2009-04-27 18:04 -0500 durin42\n"
3198 " | Add gamma\n"
3199 " |\n"
3200 " o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n"
3201 " Add alpha"
3202 msgstr ""
3203
3204 msgid ""
3205 "If you run ``hg histedit --outgoing`` on the clone then it is the same\n"
3206 "as running ``hg histedit 836302820282``. If you need plan to push to a\n"
3207 "repository that Mercurial does not detect to be related to the source\n"
3208 "repo, you can add a ``--force`` option.\n"
3209 msgstr ""
3210
3211 msgid "cannot edit history that would orphan nodes"
3212 msgstr ""
3213
3214 msgid "can't edit history with merges"
3215 msgstr "kan inte redigera historik med sammanfogningar"
3216
3217 #, python-format
3218 msgid "%s: empty changeset"
3219 msgstr "%s: tom ändring"
3220
3221 msgid "Fix up the change and run hg histedit --continue"
3222 msgstr "Fixa ändringen och kör hg histedit --continue"
3223
3224 msgid ""
3225 "Make changes as needed, you may commit or record as needed now.\n"
3226 "When you are finished, run hg histedit --continue to resume."
3227 msgstr ""
3228
3229 msgid "Read history edits from the specified file."
3230 msgstr "Läs historieändringar från den angivna filen"
3231
3232 msgid "continue an edit already in progress"
3233 msgstr ""
3234
3235 msgid "don't strip old nodes after edit is complete"
3236 msgstr ""
3237
3238 msgid "abort an edit in progress"
3239 msgstr ""
3240
3241 msgid "changesets not found in destination"
3242 msgstr "visa ändringar som inte hittas i destinationen"
3243
3244 msgid "force outgoing even for unrelated repositories"
3245 msgstr ""
3246
3247 msgid "first revision to be edited"
3248 msgstr "första revision att redigera"
3249
3250 msgid "[PARENT]"
3251 msgstr "[FÖRÄLDER]"
3252
3253 msgid ""
3254 "interactively edit changeset history\n"
3255 " "
3256 msgstr ""
3257
3258 msgid "source has mq patches applied"
3259 msgstr ""
3260
3261 msgid "only one repo argument allowed with --outgoing"
3262 msgstr ""
3263
3264 #, python-format
3265 msgid "comparing with %s\n"
3266 msgstr "jämför med %s\n"
3267
3268 msgid "--force only allowed with --outgoing"
3269 msgstr ""
3270
3271 msgid "no arguments allowed with --continue"
3272 msgstr ""
3273
3274 msgid "no arguments allowed with --abort"
3275 msgstr ""
3276
3277 msgid "history edit already in progress, try --continue or --abort"
3278 msgstr ""
3279
3280 msgid "histedit requires exactly one parent revision"
3281 msgstr "histedit kräver exakt en förälderrevision"
3282
3283 msgid "histedit: Should update metadata for the following changes:\n"
3284 msgstr ""
3285
3286 #, python-format
3287 msgid "histedit: %s to %s\n"
3288 msgstr "histedit: %s till %s\n"
3289
3290 #, python-format
3291 msgid "histedit: moving bookmarks %s\n"
3292 msgstr "histedit: flyttar bokmärken %s\n"
3293
3294 msgid "must specify a rule for each changeset once"
3295 msgstr ""
3296
3297 #, python-format
3298 msgid "malformed line \"%s\""
3299 msgstr "defekt rad \"%s\""
3300
3301 msgid "may not use changesets other than the ones listed"
3302 msgstr ""
3303
3304 #, python-format
3305 msgid "unknown changeset %s listed"
3306 msgstr "okänd ändring %s angiven"
3307
3308 #, python-format
3309 msgid "unknown action \"%s\""
3310 msgstr "okänd handling \"%s\""
2783 3311
2784 3312 msgid "accelerate status report using Linux's inotify service"
2785 3313 msgstr ""
@@ -3425,11 +3953,23 b' msgstr ""'
3425 3953 msgid "largefile %s missing from store (needs to be uploaded)"
3426 3954 msgstr ""
3427 3955
3956 #, python-format
3957 msgid "%d additional largefiles cached\n"
3958 msgstr "%d ytterligare largefiles cachade\n"
3959
3960 #, python-format
3961 msgid "%d largefiles failed to download\n"
3962 msgstr "%d largefiles kunde inte hämtas\n"
3963
3428 3964 msgid "getting changed largefiles\n"
3429 msgstr ""
3965 msgstr "hämtar ändrade largefiles\n"
3430 3966
3431 3967 #, python-format
3432 3968 msgid "%d largefiles updated, %d removed\n"
3969 msgstr "%d largefiles uppdaterade, %d borttagna\n"
3970
3971 #, python-format
3972 msgid "largefile %s is not in cache and could not be downloaded"
3433 3973 msgstr ""
3434 3974
3435 3975 msgid "minimum size (MB) for files to be converted as largefiles"
@@ -3453,14 +3993,14 b' msgid "unknown operating system: %s\\n"'
3453 3993 msgstr "okänt operativsystem: %s\n"
3454 3994
3455 3995 #, python-format
3456 msgid "Found %s in store\n"
3457 msgstr ""
3458
3459 #, python-format
3460 msgid "Found %s in system cache\n"
3461 msgstr ""
3462
3463 msgid "Can't get file locally"
3996 msgid "found %s in store\n"
3997 msgstr ""
3998
3999 #, python-format
4000 msgid "found %s in system cache\n"
4001 msgstr ""
4002
4003 msgid "can't get file locally"
3464 4004 msgstr ""
3465 4005
3466 4006 #, python-format
@@ -3563,6 +4103,10 b' msgid "%d largefiles cached\\n"'
3563 4103 msgstr "%d largefiles cachade\n"
3564 4104
3565 4105 #, python-format
4106 msgid "--all-largefiles is incompatible with non-local destination %s"
4107 msgstr "--all-largefiles är inkompatibel med icke-lokal destination %s"
4108
4109 #, python-format
3566 4110 msgid "unknown archive type '%s'"
3567 4111 msgstr "okänd arkivtyp '%s'"
3568 4112
@@ -3674,6 +4218,12 b' msgstr ""'
3674 4218 msgid "display outgoing largefiles"
3675 4219 msgstr "visa utgående largefiles"
3676 4220
4221 msgid "download all pulled versions of largefiles"
4222 msgstr ""
4223
4224 msgid "download all versions of all largefiles"
4225 msgstr ""
4226
3677 4227 msgid "manage a stack of patches"
3678 4228 msgstr "hantera en uppsättning patchar"
3679 4229
@@ -3748,7 +4298,7 b' msgstr ""'
3748 4298 "andra fallet."
3749 4299
3750 4300 msgid ""
3751 "It may be desirable for mq changesets in the secret phase (see\n"
4301 "It may be desirable for mq changesets to be kept in the secret phase (see\n"
3752 4302 ":hg:`help phases`), which can be enabled with the following setting::"
3753 4303 msgstr ""
3754 4304 "Det kan vara önskvärt att hålla alla mq-ändringar i secret-fasen (se\n"
@@ -3763,10 +4313,35 b' msgstr ""'
3763 4313
3764 4314 msgid ""
3765 4315 "You will by default be managing a patch queue named \"patches\". You can\n"
3766 "create other, independent patch queues with the :hg:`qqueue` command.\n"
4316 "create other, independent patch queues with the :hg:`qqueue` command."
3767 4317 msgstr ""
3768 4318 "Du kommer som standard att handera en patchkö vid namn \"patches\". Du\n"
3769 "kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`.\n"
4319 "kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`."
4320
4321 msgid ""
4322 "If the working directory contains uncommitted files, qpush, qpop and\n"
4323 "qgoto abort immediately. If -f/--force is used, the changes are\n"
4324 "discarded. Setting::"
4325 msgstr ""
4326 "Om arbetskatalogen innehåller oarkiverade filer så kommer qpush, qpop\n"
4327 "och qgoto omedelbart att avslutas. Om -f/--force används, så kommer\n"
4328 "ändringarna att kastas bort. Inställningen::"
4329
4330 msgid ""
4331 " [mq]\n"
4332 " keepchanges = True"
4333 msgstr ""
4334 " [mq]\n"
4335 " keepchanges = True"
4336
4337 msgid ""
4338 "make them behave as if --keep-changes were passed, and non-conflicting\n"
4339 "local changes will be tolerated and preserved. If incompatible options\n"
4340 "such as -f/--force or --exact are passed, this setting is ignored.\n"
4341 msgstr ""
4342 "får dom att uppföra sig som om --keep-changes angetts, och konfliktfria\n"
4343 "lokala ändringar tolereras och bevaras. Om inkompatibla flaggor som\n"
4344 "-f/--force eller --exact anges, så ignoreras den här inställningen.\n"
3770 4345
3771 4346 msgid "print first line of patch header"
3772 4347 msgstr "skriv ut första raden i patchheadern"
@@ -3827,6 +4402,10 b' msgid "error removing undo: %s\\n"'
3827 4402 msgstr ""
3828 4403
3829 4404 #, python-format
4405 msgid "saving current version of %s as %s\n"
4406 msgstr "sparar nuvarande revision av %s som %s\n"
4407
4408 #, python-format
3830 4409 msgid "apply failed for patch %s"
3831 4410 msgstr ""
3832 4411
@@ -3858,16 +4437,22 b' msgstr ""'
3858 4437
3859 4438 #, python-format
3860 4439 msgid "applying %s\n"
3861 msgstr ""
4440 msgstr "applicerar %s\n"
3862 4441
3863 4442 #, python-format
3864 4443 msgid "unable to read %s\n"
3865 msgstr ""
4444 msgstr "kan inte läsa %s\n"
4445
4446 msgid "local changes found, refresh first"
4447 msgstr "lokala ändringar hittades, uppdatera först"
3866 4448
3867 4449 #, python-format
3868 4450 msgid "patch %s is empty\n"
3869 4451 msgstr ""
3870 4452
4453 msgid "qpush exactly duplicates child changeset"
4454 msgstr ""
4455
3871 4456 msgid "repository commit failed"
3872 4457 msgstr ""
3873 4458
@@ -3918,9 +4503,6 b' msgstr ""'
3918 4503 msgid "uncommitted changes in subrepository %s"
3919 4504 msgstr "oarkiverade ändringar i underarkivet %s"
3920 4505
3921 msgid "local changes found, refresh first"
3922 msgstr ""
3923
3924 4506 msgid "local changes found"
3925 4507 msgstr ""
3926 4508
@@ -3944,6 +4526,9 b' msgstr "\\"%s\\" finns redan som katalog"'
3944 4526 msgid "patch \"%s\" already exists"
3945 4527 msgstr "patchen \"%s\" existerar redan"
3946 4528
4529 msgid "cannot use both --force and --keep-changes"
4530 msgstr "kan inte ange både --force och --keep-changes"
4531
3947 4532 msgid "cannot manage merge changesets"
3948 4533 msgstr "kan inte hantera sammanfogningar"
3949 4534
@@ -3994,6 +4579,9 b' msgstr ""'
3994 4579 msgid "patch series already fully applied\n"
3995 4580 msgstr ""
3996 4581
4582 msgid "cannot use --exact and --keep-changes together"
4583 msgstr "kan inte använda --exact och --keep-changes tillsammans"
4584
3997 4585 msgid "cannot use --exact and --move together"
3998 4586 msgstr "kan inte använda --exact och --move tillsammans"
3999 4587
@@ -4039,6 +4627,12 b' msgstr ""'
4039 4627 msgid "popping would remove a revision not managed by this patch queue"
4040 4628 msgstr ""
4041 4629
4630 msgid "popping would remove an immutable revision"
4631 msgstr ""
4632
4633 msgid "see \"hg help phases\" for details"
4634 msgstr "se \"hg help phases\" för detaljer"
4635
4042 4636 msgid "deletions found between repo revs"
4043 4637 msgstr ""
4044 4638
@@ -4052,6 +4646,9 b' msgstr ""'
4052 4646 msgid "cannot refresh a revision with children"
4053 4647 msgstr ""
4054 4648
4649 msgid "cannot refresh immutable revision"
4650 msgstr ""
4651
4055 4652 msgid ""
4056 4653 "refresh interrupted while patch was popped! (revert --all, qpush to "
4057 4654 "recover)\n"
@@ -4064,8 +4661,8 b' msgstr ""'
4064 4661 msgid "patch %s is not in series file"
4065 4662 msgstr ""
4066 4663
4067 msgid "No saved patch data found\n"
4068 msgstr ""
4664 msgid "no saved patch data found\n"
4665 msgstr "ingen sparad patchdata hittades\n"
4069 4666
4070 4667 #, python-format
4071 4668 msgid "restoring status: %s\n"
@@ -4085,8 +4682,8 b' msgstr ""'
4085 4682 msgid "updating queue directory\n"
4086 4683 msgstr "uppdaterar kökatalog\n"
4087 4684
4088 msgid "Unable to load queue repository\n"
4089 msgstr ""
4685 msgid "unable to load queue repository\n"
4686 msgstr "kan inte öppna köarkiv\n"
4090 4687
4091 4688 msgid "save: no patches applied, exiting\n"
4092 4689 msgstr ""
@@ -4107,6 +4704,9 b' msgstr ""'
4107 4704 msgid "option \"-r\" not valid when importing files"
4108 4705 msgstr ""
4109 4706
4707 msgid "no files or revisions specified"
4708 msgstr "inga filer eller revisioner angivna"
4709
4110 4710 msgid "option \"-n\" not valid when importing multiple patches"
4111 4711 msgstr ""
4112 4712
@@ -4130,9 +4730,6 b' msgstr ""'
4130 4730 msgid "revision %d is not mutable"
4131 4731 msgstr ""
4132 4732
4133 msgid "see \"hg help phases\" for details"
4134 msgstr ""
4135
4136 4733 #, python-format
4137 4734 msgid "cannot import merge revision %d"
4138 4735 msgstr ""
@@ -4187,8 +4784,8 b' msgid ""'
4187 4784 " use the :hg:`qfinish` command."
4188 4785 msgstr ""
4189 4786
4190 msgid "show only the last patch"
4191 msgstr "visa bara den sista patchen"
4787 msgid "show only the preceding applied patch"
4788 msgstr "visa bara den föregående applicerade patchen"
4192 4789
4193 4790 msgid "hg qapplied [-1] [-s] [PATCH]"
4194 4791 msgstr "hg qapplied [-1] [-s] [PATCH]"
@@ -4235,11 +4832,11 b' msgstr "anv\xc3\xa4nd gits ut\xc3\xb6kade diff-format"'
4235 4832 msgid "qpush after importing"
4236 4833 msgstr ""
4237 4834
4238 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
4239 msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... FIL..."
4240
4241 msgid "import a patch"
4242 msgstr "importera en patch"
4835 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]..."
4836 msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... [FIL]..."
4837
4838 msgid "import a patch or existing changeset"
4839 msgstr "importera en patch eller existerande ändring"
4243 4840
4244 4841 msgid ""
4245 4842 " The patch is inserted into the series after the last applied\n"
@@ -4396,19 +4993,19 b' msgid "hg qtop [-s]"'
4396 4993 msgstr "hg qtop [-s]"
4397 4994
4398 4995 msgid "print the name of the current patch"
4399 msgstr ""
4996 msgstr "visa namnet på den nuvarande patchen"
4400 4997
4401 4998 msgid "hg qnext [-s]"
4402 4999 msgstr "hg qnext [-s]"
4403 5000
4404 msgid "print the name of the next patch"
4405 msgstr ""
5001 msgid "print the name of the next pushable patch"
5002 msgstr "visa namnet på den nästkommande patchen"
4406 5003
4407 5004 msgid "hg qprev [-s]"
4408 5005 msgstr "hg qprev [-s]"
4409 5006
4410 msgid "print the name of the previous patch"
4411 msgstr ""
5007 msgid "print the name of the preceding applied patch"
5008 msgstr "skriv ut namnet på föregående applicerade patch"
4412 5009
4413 5010 msgid "import uncommitted changes (DEPRECATED)"
4414 5011 msgstr "importera icke arkiverade ändringar (FÖRLEGAD)"
@@ -4416,9 +5013,6 b' msgstr "importera icke arkiverade \xc3\xa4ndringar (F\xc3\x96RLEGAD)"'
4416 5013 msgid "add \"From: <current user>\" to patch"
4417 5014 msgstr ""
4418 5015
4419 msgid "USER"
4420 msgstr ""
4421
4422 5016 msgid "add \"From: <USER>\" to patch"
4423 5017 msgstr ""
4424 5018
@@ -4569,8 +5163,8 b' msgid "qfold requires at least one patch'
4569 5163 msgstr ""
4570 5164
4571 5165 #, python-format
4572 msgid "Skipping already folded patch %s\n"
4573 msgstr "Hoppar över redan hopvikta patchen %s\n"
5166 msgid "skipping already folded patch %s\n"
5167 msgstr "hoppar över redan hopvikta patchen %s\n"
4574 5168
4575 5169 #, python-format
4576 5170 msgid "qfold cannot fold already applied patch %s"
@@ -4580,9 +5174,15 b' msgstr ""'
4580 5174 msgid "error folding patch %s"
4581 5175 msgstr ""
4582 5176
5177 msgid "tolerate non-conflicting local changes"
5178 msgstr ""
5179
4583 5180 msgid "overwrite any local changes"
4584 5181 msgstr ""
4585 5182
5183 msgid "do not save backup copies of files"
5184 msgstr "spara inte backup-kopior av filer"
5185
4586 5186 msgid "hg qgoto [OPTION]... PATCH"
4587 5187 msgstr ""
4588 5188
@@ -4670,8 +5270,10 b' msgid "push the next patch onto the stac'
4670 5270 msgstr ""
4671 5271
4672 5272 msgid ""
4673 " When -f/--force is applied, all local changes in patched files\n"
4674 " will be lost."
5273 " By default, abort if the working directory contains uncommitted\n"
5274 " changes. With --keep-changes, abort only if the uncommitted files\n"
5275 " overlap with patched files. With -f/--force, backup and patch over\n"
5276 " uncommitted changes."
4675 5277 msgstr ""
4676 5278
4677 5279 msgid "no saved queues found, please use -n\n"
@@ -4697,9 +5299,16 b' msgid "pop the current patch off the sta'
4697 5299 msgstr ""
4698 5300
4699 5301 msgid ""
4700 " By default, pops off the top of the patch stack. If given a patch\n"
4701 " name, keeps popping off patches until the named patch is at the\n"
4702 " top of the stack."
5302 " Without argument, pops off the top of the patch stack. If given a\n"
5303 " patch name, keeps popping off patches until the named patch is at\n"
5304 " the top of the stack."
5305 msgstr ""
5306
5307 msgid ""
5308 " By default, abort if the working directory contains uncommitted\n"
5309 " changes. With --keep-changes, abort only if the uncommitted files\n"
5310 " overlap with patched files. With -f/--force, backup and discard\n"
5311 " changes made to such files."
4703 5312 msgstr ""
4704 5313
4705 5314 #, python-format
@@ -4784,11 +5393,17 b' msgstr "inga s\xc3\xa4kerhetskopior"'
4784 5393 msgid "no backups (DEPRECATED)"
4785 5394 msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
4786 5395
5396 msgid "ignored (DEPRECATED)"
5397 msgstr "ignorerad (FÖRÅLDRAD)"
5398
4787 5399 msgid "do not modify working copy during strip"
4788 5400 msgstr "modifiera inte arbetskopian vid strippning"
4789 5401
4790 msgid "hg strip [-k] [-f] [-n] REV..."
4791 msgstr "hg strip [-k] [-f] [-n] REV..."
5402 msgid "remove revs only reachable from given bookmark"
5403 msgstr "radera revisioner som bara nås från givet bokmärke"
5404
5405 msgid "hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV..."
5406 msgstr "hg strip [-k] [-f] [-n] [-B bokmärke] [-r] REV..."
4792 5407
4793 5408 msgid "strip changesets and all their descendants from the repository"
4794 5409 msgstr ""
@@ -4821,6 +5436,20 b' msgid ""'
4821 5436 " operation completes."
4822 5437 msgstr ""
4823 5438
5439 msgid ""
5440 " Strip is not a history-rewriting operation and can be used on\n"
5441 " changesets in the public phase. But if the stripped changesets have\n"
5442 " been pushed to a remote repository you will likely pull them again."
5443 msgstr ""
5444
5445 #, python-format
5446 msgid "bookmark '%s' not found"
5447 msgstr "bokmärket '%s' hittades inte"
5448
5449 #, python-format
5450 msgid "bookmark '%s' deleted\n"
5451 msgstr "bokmärket '%s' raderad\n"
5452
4824 5453 msgid "empty revision set"
4825 5454 msgstr "tomt revisionsset"
4826 5455
@@ -5034,15 +5663,12 b' msgstr ""'
5034 5663 msgid "cannot commit over an applied mq patch"
5035 5664 msgstr ""
5036 5665
5037 msgid "source has mq patches applied"
5038 msgstr ""
5039
5040 5666 #, python-format
5041 5667 msgid "mq status file refers to unknown node %s\n"
5042 5668 msgstr ""
5043 5669
5044 5670 #, python-format
5045 msgid "Tag %s overrides mq patch of the same name\n"
5671 msgid "tag %s overrides mq patch of the same name\n"
5046 5672 msgstr ""
5047 5673
5048 5674 msgid "cannot import over an applied patch"
@@ -5085,15 +5711,15 b' msgid "hooks for sending email push noti'
5085 5711 msgstr ""
5086 5712
5087 5713 msgid ""
5088 "This extension let you run hooks sending email notifications when\n"
5089 "changesets are being pushed, from the sending or receiving side."
5714 "This extension implements hooks to send email notifications when\n"
5715 "changesets are sent from or received by the local repository."
5090 5716 msgstr ""
5091 5717
5092 5718 msgid ""
5093 5719 "First, enable the extension as explained in :hg:`help extensions`, and\n"
5094 "register the hook you want to run. ``incoming`` and ``outgoing`` hooks\n"
5095 "are run by the changesets receiver while the ``outgoing`` one is for\n"
5096 "the sender::"
5720 "register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n"
5721 "are run when changesets are received, while ``outgoing`` hooks are for\n"
5722 "changesets sent to another repository::"
5097 5723 msgstr ""
5098 5724
5099 5725 msgid ""
@@ -5110,15 +5736,15 b' msgid ""'
5110 5736 msgstr ""
5111 5737
5112 5738 msgid ""
5113 "Now the hooks are running, subscribers must be assigned to\n"
5114 "repositories. Use the ``[usersubs]`` section to map repositories to a\n"
5115 "given email or the ``[reposubs]`` section to map emails to a single\n"
5116 "repository::"
5739 "This registers the hooks. To enable notification, subscribers must\n"
5740 "be assigned to repositories. The ``[usersubs]`` section maps multiple\n"
5741 "repositories to a given recipient. The ``[reposubs]`` section maps\n"
5742 "multiple recipients to a single repository::"
5117 5743 msgstr ""
5118 5744
5119 5745 msgid ""
5120 5746 " [usersubs]\n"
5121 " # key is subscriber email, value is a comma-separated list of glob\n"
5747 " # key is subscriber email, value is a comma-separated list of repo glob\n"
5122 5748 " # patterns\n"
5123 5749 " user@host = pattern"
5124 5750 msgstr ""
@@ -5132,8 +5758,13 b' msgstr ""'
5132 5758
5133 5759 msgid ""
5134 5760 "Glob patterns are matched against absolute path to repository\n"
5135 "root. The subscriptions can be defined in their own file and\n"
5136 "referenced with::"
5761 "root."
5762 msgstr ""
5763
5764 msgid ""
5765 "In order to place them under direct user management, ``[usersubs]`` and\n"
5766 "``[reposubs]`` sections may be placed in a separate ``hgrc`` file and\n"
5767 "incorporated by reference::"
5137 5768 msgstr ""
5138 5769
5139 5770 msgid ""
@@ -5142,14 +5773,8 b' msgid ""'
5142 5773 msgstr ""
5143 5774
5144 5775 msgid ""
5145 "Alternatively, they can be added to Mercurial configuration files by\n"
5146 "setting the previous entry to an empty value."
5147 msgstr ""
5148
5149 msgid ""
5150 "At this point, notifications should be generated but will not be sent until "
5151 "you\n"
5152 "set the ``notify.test`` entry to ``False``."
5776 "Notifications will not be sent until the ``notify.test`` value is set\n"
5777 "to ``False``; see below."
5153 5778 msgstr ""
5154 5779
5155 5780 msgid ""
@@ -5165,20 +5790,26 b' msgstr ""'
5165 5790
5166 5791 msgid ""
5167 5792 "notify.sources\n"
5168 " Space separated list of change sources. Notifications are sent only\n"
5169 " if it includes the incoming or outgoing changes source. Incoming\n"
5170 " sources can be ``serve`` for changes coming from http or ssh,\n"
5171 " ``pull`` for pulled changes, ``unbundle`` for changes added by\n"
5172 " :hg:`unbundle` or ``push`` for changes being pushed\n"
5173 " locally. Outgoing sources are the same except for ``unbundle`` which\n"
5174 " is replaced by ``bundle``. Default: serve."
5175 msgstr ""
5793 " Space-separated list of change sources. Notifications are activated only\n"
5794 " when a changeset's source is in this list. Sources may be:"
5795 msgstr ""
5796
5797 msgid ""
5798 " :``serve``: changesets received via http or ssh\n"
5799 " :``pull``: changesets received via ``hg pull``\n"
5800 " :``unbundle``: changesets received via ``hg unbundle``\n"
5801 " :``push``: changesets sent or received via ``hg push``\n"
5802 " :``bundle``: changesets sent via ``hg unbundle``"
5803 msgstr ""
5804
5805 msgid " Default: serve."
5806 msgstr " Standard: serve"
5176 5807
5177 5808 msgid ""
5178 5809 "notify.strip\n"
5179 5810 " Number of leading slashes to strip from url paths. By default, "
5180 5811 "notifications\n"
5181 " references repositories with their absolute path. ``notify.strip`` let "
5812 " reference repositories with their absolute path. ``notify.strip`` lets "
5182 5813 "you\n"
5183 5814 " turn them into relative paths. For example, ``notify.strip=3`` will "
5184 5815 "change\n"
@@ -5187,8 +5818,7 b' msgstr ""'
5187 5818
5188 5819 msgid ""
5189 5820 "notify.domain\n"
5190 " If subscribers emails or the from email have no domain set, complete them\n"
5191 " with this value."
5821 " Default email domain for sender or recipients with no explicit domain."
5192 5822 msgstr ""
5193 5823
5194 5824 msgid ""
@@ -5203,29 +5833,31 b' msgstr ""'
5203 5833
5204 5834 msgid ""
5205 5835 "notify.incoming\n"
5206 " Template to use when run as incoming hook, override ``notify.template``."
5836 " Template to use when run as an incoming hook, overriding ``notify."
5837 "template``."
5207 5838 msgstr ""
5208 5839
5209 5840 msgid ""
5210 5841 "notify.outgoing\n"
5211 " Template to use when run as outgoing hook, override ``notify.template``."
5842 " Template to use when run as an outgoing hook, overriding ``notify."
5843 "template``."
5212 5844 msgstr ""
5213 5845
5214 5846 msgid ""
5215 5847 "notify.changegroup\n"
5216 " Template to use when running as changegroup hook, override\n"
5848 " Template to use when running as a changegroup hook, overriding\n"
5217 5849 " ``notify.template``."
5218 5850 msgstr ""
5219 5851
5220 5852 msgid ""
5221 5853 "notify.maxdiff\n"
5222 5854 " Maximum number of diff lines to include in notification email. Set to 0\n"
5223 " to disable the diff, -1 to include all of it. Default: 300."
5855 " to disable the diff, or -1 to include all of it. Default: 300."
5224 5856 msgstr ""
5225 5857
5226 5858 msgid ""
5227 5859 "notify.maxsubject\n"
5228 " Maximum number of characters in emails subject line. Default: 67."
5860 " Maximum number of characters in email's subject line. Default: 67."
5229 5861 msgstr ""
5230 5862
5231 5863 msgid ""
@@ -5245,26 +5877,25 b' msgstr ""'
5245 5877
5246 5878 msgid ""
5247 5879 "notify.fromauthor\n"
5248 " If set, use the first committer of the changegroup for the \"From\" field "
5249 "of\n"
5250 " the notification mail. If not set, take the user from the pushing repo.\n"
5251 " Default: False."
5252 msgstr ""
5253
5254 msgid ""
5255 "If set, the following entries will also be used to customize the "
5880 " If set, use the committer of the first changeset in a changegroup for\n"
5881 " the \"From\" field of the notification mail. If not set, take the user\n"
5882 " from the pushing repo. Default: False."
5883 msgstr ""
5884
5885 msgid ""
5886 "If set, the following entries will also be used to customize the\n"
5256 5887 "notifications:"
5257 5888 msgstr ""
5258 5889
5259 5890 msgid ""
5260 5891 "email.from\n"
5261 " Email ``From`` address to use if none can be found in generated email "
5262 "content."
5892 " Email ``From`` address to use if none can be found in the generated\n"
5893 " email content."
5263 5894 msgstr ""
5264 5895
5265 5896 msgid ""
5266 5897 "web.baseurl\n"
5267 " Root repository browsing URL to combine with repository paths when making\n"
5898 " Root repository URL to combine with repository paths when making\n"
5268 5899 " references. See also ``notify.strip``."
5269 5900 msgstr ""
5270 5901
@@ -5311,20 +5942,6 b' msgid ""'
5311 5942 msgstr ""
5312 5943
5313 5944 msgid ""
5314 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
5315 "setting::"
5316 msgstr ""
5317 "Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n"
5318 "genom att sätta::"
5319
5320 msgid ""
5321 " [pager]\n"
5322 " quiet = True"
5323 msgstr ""
5324 " [pager]\n"
5325 " quiet = True"
5326
5327 msgid ""
5328 5945 "You can disable the pager for certain commands by adding them to the\n"
5329 5946 "pager.ignore list::"
5330 5947 msgstr ""
@@ -5456,6 +6073,9 b' msgstr ""'
5456 6073 "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n"
5457 6074 "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n"
5458 6075
6076 msgid "send patches as inline message text (default)"
6077 msgstr ""
6078
5459 6079 msgid "send patches as attachments"
5460 6080 msgstr ""
5461 6081
@@ -5574,7 +6194,9 b' msgid ""'
5574 6194 " By default the patch is included as text in the email body for\n"
5575 6195 " easy reviewing. Using the -a/--attach option will instead create\n"
5576 6196 " an attachment for the patch. With -i/--inline an inline attachment\n"
5577 " will be created."
6197 " will be created. You can include a patch both as text in the email\n"
6198 " body and as a regular or an inline attachment by combining the\n"
6199 " -a/--attach or -i/--inline with the --body option."
5578 6200 msgstr ""
5579 6201
5580 6202 msgid ""
@@ -5650,10 +6272,6 b' msgid ""'
5650 6272 " "
5651 6273 msgstr ""
5652 6274
5653 #, python-format
5654 msgid "comparing with %s\n"
5655 msgstr "jämför med %s\n"
5656
5657 6275 msgid "no changes found\n"
5658 6276 msgstr "inga ändringar hittades\n"
5659 6277
@@ -5675,7 +6293,7 b' msgid ""'
5675 6293 msgstr ""
5676 6294
5677 6295 #, python-format
5678 msgid "This patch series consists of %d patches."
6296 msgid "this patch series consists of %d patches."
5679 6297 msgstr ""
5680 6298
5681 6299 msgid "no recipient addresses provided"
@@ -5698,11 +6316,11 b' msgstr ""'
5698 6316 msgid "patchbomb canceled"
5699 6317 msgstr ""
5700 6318
5701 msgid "Displaying "
5702 msgstr "Visar "
5703
5704 msgid "Sending "
5705 msgstr "Sänder "
6319 msgid "displaying "
6320 msgstr "visar "
6321
6322 msgid "sending "
6323 msgstr "sänder "
5706 6324
5707 6325 msgid "sending"
5708 6326 msgstr "sänder"
@@ -5847,12 +6465,12 b' msgid "warning: %s\\n"'
5847 6465 msgstr ""
5848 6466
5849 6467 #, python-format
5850 msgid "Removing file %s\n"
5851 msgstr ""
5852
5853 #, python-format
5854 msgid "Removing directory %s\n"
5855 msgstr ""
6468 msgid "removing file %s\n"
6469 msgstr "tar bort file %s\n"
6470
6471 #, python-format
6472 msgid "removing directory %s\n"
6473 msgstr "tar bort katalogen %s\n"
5856 6474
5857 6475 msgid "command to move sets of revisions to a different ancestor"
5858 6476 msgstr ""
@@ -5899,8 +6517,8 b' msgstr ""'
5899 6517 msgid "keep original branch names"
5900 6518 msgstr ""
5901 6519
5902 msgid "force detaching of source from its original branch"
5903 msgstr ""
6520 msgid "(DEPRECATED)"
6521 msgstr "(FÖRLEGAD)"
5904 6522
5905 6523 msgid "specify merge tool"
5906 6524 msgstr "ange sammanfogningsverktyg"
@@ -5990,9 +6608,6 b' msgstr ""'
5990 6608 msgid "cannot use collapse with continue or abort"
5991 6609 msgstr ""
5992 6610
5993 msgid "cannot use detach with continue or abort"
5994 msgstr "kan inte använda detach med continue eller abort"
5995
5996 6611 msgid "abort and continue do not allow specifying revisions"
5997 6612 msgstr ""
5998 6613
@@ -6008,12 +6623,6 b' msgstr ""'
6008 6623 msgid "cannot specify both a revision and a source"
6009 6624 msgstr "kan inte ange både en revision och en källa"
6010 6625
6011 msgid "detach requires a revision to be specified"
6012 msgstr "detach kräver att en revision anges"
6013
6014 msgid "cannot specify a base with detach"
6015 msgstr "kan inte ange en bas med detach"
6016
6017 6626 msgid "can't remove original changesets with unrebased descendants"
6018 6627 msgstr ""
6019 6628
@@ -6069,7 +6678,8 b' msgstr ""'
6069 6678 msgid "no rebase in progress"
6070 6679 msgstr ""
6071 6680
6072 msgid "warning: immutable rebased changeset detected, can't abort\n"
6681 #, python-format
6682 msgid "can't abort rebase due to immutable changesets %s"
6073 6683 msgstr ""
6074 6684
6075 6685 msgid "warning: new changesets detected on target branch, can't abort\n"
@@ -6090,6 +6700,10 b' msgstr ""'
6090 6700 msgid "source is ancestor of destination"
6091 6701 msgstr ""
6092 6702
6703 #, python-format
6704 msgid "updating bookmark %s\n"
6705 msgstr "uppdaterar bokmärket %s\n"
6706
6093 6707 msgid "--tool can only be used with --rebase"
6094 6708 msgstr ""
6095 6709
@@ -6121,7 +6735,7 b' msgstr ""'
6121 6735 msgid "%d hunks, %d lines changed\n"
6122 6736 msgstr ""
6123 6737
6124 msgid "[Ynsfdaq?]"
6738 msgid "[Ynesfdaq?]"
6125 6739 msgstr ""
6126 6740
6127 6741 msgid "&Yes, record this change"
@@ -6130,6 +6744,9 b' msgstr ""'
6130 6744 msgid "&No, skip this change"
6131 6745 msgstr ""
6132 6746
6747 msgid "&Edit the change manually"
6748 msgstr ""
6749
6133 6750 msgid "&Skip remaining changes to this file"
6134 6751 msgstr ""
6135 6752
@@ -6148,6 +6765,30 b' msgstr ""'
6148 6765 msgid "&?"
6149 6766 msgstr ""
6150 6767
6768 msgid "cannot edit patch for whole file"
6769 msgstr ""
6770
6771 msgid "cannot edit patch for binary file"
6772 msgstr ""
6773
6774 msgid ""
6775 "\n"
6776 "To remove '-' lines, make them ' ' lines (context).\n"
6777 "To remove '+' lines, delete them.\n"
6778 "Lines starting with # will be removed from the patch."
6779 msgstr ""
6780
6781 msgid ""
6782 "If the patch applies cleanly, the edited hunk will immediately be\n"
6783 "added to the record list. If it does not apply cleanly, a rejects\n"
6784 "file will be generated: you can use that when you try again. If\n"
6785 "all lines of the hunk are removed, then the edit is aborted and\n"
6786 "the hunk is left unchanged.\n"
6787 msgstr ""
6788
6789 msgid "edit failed"
6790 msgstr ""
6791
6151 6792 msgid "user quit"
6152 6793 msgstr ""
6153 6794
@@ -6188,7 +6829,8 b' msgstr ""'
6188 6829
6189 6830 msgid ""
6190 6831 " y - record this change\n"
6191 " n - skip this change"
6832 " n - skip this change\n"
6833 " e - edit this change manually"
6192 6834 msgstr ""
6193 6835
6194 6836 msgid ""
@@ -6284,9 +6926,6 b' msgstr ""'
6284 6926 msgid "hardlinks are not supported on this system"
6285 6927 msgstr "hårda länkar stöds inte av detta system"
6286 6928
6287 msgid "must specify local origin repository"
6288 msgstr "måste ange lokalt utgångsarkiv"
6289
6290 6929 #, python-format
6291 6930 msgid "relinking %s to %s\n"
6292 6931 msgstr "länkar om %s till %s\n"
@@ -6448,6 +7087,10 b' msgid "skipping merge changeset %s:%s\\n"'
6448 7087 msgstr ""
6449 7088
6450 7089 #, python-format
7090 msgid "%s is not a parent of %s"
7091 msgstr "%s är inte en förälder till %s"
7092
7093 #, python-format
6451 7094 msgid "%s merged at %s\n"
6452 7095 msgstr ""
6453 7096
@@ -6465,10 +7108,6 b' msgstr ""'
6465 7108 msgid "can only omit patchfile if merging"
6466 7109 msgstr ""
6467 7110
6468 #, python-format
6469 msgid "%s: empty changeset"
6470 msgstr ""
6471
6472 7111 msgid "fix up the merge and run hg transplant --continue"
6473 7112 msgstr ""
6474 7113
@@ -6515,9 +7154,6 b' msgstr "inget s\xc3\xa5dant alternativ\\n"'
6515 7154 msgid "pull patches from REPO"
6516 7155 msgstr ""
6517 7156
6518 msgid "BRANCH"
6519 msgstr "GREN"
6520
6521 7157 msgid "pull patches from branch BRANCH"
6522 7158 msgstr ""
6523 7159
@@ -6530,6 +7166,9 b' msgstr ""'
6530 7166 msgid "merge at REV"
6531 7167 msgstr ""
6532 7168
7169 msgid "parent to choose when transplanting merge"
7170 msgstr "förälder att välja när sammanfogning transplanteras"
7171
6533 7172 msgid "append transplant info to log message"
6534 7173 msgstr ""
6535 7174
@@ -6577,7 +7216,7 b' msgid ""'
6577 7216 msgstr ""
6578 7217
6579 7218 msgid ""
6580 " :hg:`transplant --branch REVISION --all` will transplant the\n"
7219 " :hg:`transplant --branch REV --all` will transplant the\n"
6581 7220 " selected branch (up to the named revision) onto your current\n"
6582 7221 " working directory."
6583 7222 msgstr ""
@@ -6590,6 +7229,11 b' msgid ""'
6590 7229 msgstr ""
6591 7230
6592 7231 msgid ""
7232 " Merge changesets may be transplanted directly by specifying the\n"
7233 " proper parent changeset by calling :hg:`transplant --parent`."
7234 msgstr ""
7235
7236 msgid ""
6593 7237 " If no merges or revisions are provided, :hg:`transplant` will\n"
6594 7238 " start an interactive changeset browser."
6595 7239 msgstr ""
@@ -6753,7 +7397,7 b' msgid ""'
6753 7397 msgstr ""
6754 7398
6755 7399 #, python-format
6756 msgid "Attempt to commit or push text file(s) using %s line endings\n"
7400 msgid "attempt to commit or push text file(s) using %s line endings\n"
6757 7401 msgstr ""
6758 7402
6759 7403 #, python-format
@@ -6840,13 +7484,13 b' msgid "branch %s not found"'
6840 7484 msgstr "grenen %s hittades inte"
6841 7485
6842 7486 #, python-format
6843 msgid "updating bookmark %s\n"
6844 msgstr "uppdaterar bokmärket %s\n"
6845
6846 #, python-format
6847 7487 msgid "divergent bookmark %s stored as %s\n"
6848 7488 msgstr "divergent bokmärke %s lagrat som %s\n"
6849 7489
7490 #, python-format
7491 msgid "adding remote bookmark %s\n"
7492 msgstr "lägger till fjärrbokmärket %s\n"
7493
6850 7494 msgid "searching for changed bookmarks\n"
6851 7495 msgstr "söker efter ändrade bokmärken\n"
6852 7496
@@ -6854,7 +7498,7 b' msgid "no changed bookmarks found\\n"'
6854 7498 msgstr "inga ändrade bokmärken hittades\n"
6855 7499
6856 7500 msgid "unknown parent"
6857 msgstr ""
7501 msgstr "okänd förälder"
6858 7502
6859 7503 #, python-format
6860 7504 msgid "integrity check failed on %s:%d"
@@ -6941,6 +7585,10 b' msgid "%s: not overwriting - %s collides'
6941 7585 msgstr ""
6942 7586
6943 7587 #, python-format
7588 msgid "%s: can't copy - same file\n"
7589 msgstr "%s: kan inte kopiera - samma fil\n"
7590
7591 #, python-format
6944 7592 msgid "%s: not overwriting - file exists\n"
6945 7593 msgstr ""
6946 7594
@@ -7056,18 +7704,26 b' msgid "%s: no key named \'%s\'"'
7056 7704 msgstr ""
7057 7705
7058 7706 #, python-format
7059 msgid "Found revision %s from %s\n"
7060 msgstr "Hittade revision %s från %s\n"
7707 msgid "found revision %s from %s\n"
7708 msgstr "hittade revision %s från %s\n"
7061 7709
7062 7710 msgid "revision matching date not found"
7063 7711 msgstr ""
7064 7712
7065 7713 #, python-format
7714 msgid "cannot follow file not in parent revision: \"%s\""
7715 msgstr "kan inte följa fil som inte finns i förälderrevision: \"%s\""
7716
7717 #, python-format
7066 7718 msgid "cannot follow nonexistent file: \"%s\""
7067 msgstr ""
7719 msgstr "kan inte följa icke-existerande fil: \"%s\""
7068 7720
7069 7721 msgid "can only follow copies/renames for explicit filenames"
7070 msgstr ""
7722 msgstr "kan bara följa kopior/namnbyten för explicita filnamn"
7723
7724 #, python-format
7725 msgid "-G/--graph option is incompatible with --%s"
7726 msgstr "flaggan -G/--graph är inkompatibel med --%s"
7071 7727
7072 7728 #, python-format
7073 7729 msgid "adding %s\n"
@@ -7077,6 +7733,22 b' msgstr "l\xc3\xa4gger till %s\\n"'
7077 7733 msgid "skipping missing subrepository: %s\n"
7078 7734 msgstr ""
7079 7735
7736 #, python-format
7737 msgid "amending changeset %s\n"
7738 msgstr "förändrar ändringen %s\n"
7739
7740 #, python-format
7741 msgid "copying changeset %s to %s\n"
7742 msgstr "kopierar ändringen %s till %s\n"
7743
7744 #, python-format
7745 msgid "stripping intermediate changeset %s\n"
7746 msgstr "avlägsnar mellanliggande ändring %s\n"
7747
7748 #, python-format
7749 msgid "stripping amended changeset %s\n"
7750 msgstr "avlägsnar förändrad ändring %s\n"
7751
7080 7752 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
7081 7753 msgstr ""
7082 7754
@@ -7116,6 +7788,26 b' msgstr "HG: inga \xc3\xa4ndrade filer"'
7116 7788 msgid "empty commit message"
7117 7789 msgstr "tomt arkiveringsmeddelande"
7118 7790
7791 #, python-format
7792 msgid "forgetting %s\n"
7793 msgstr "glömmer %s\n"
7794
7795 #, python-format
7796 msgid "reverting %s\n"
7797 msgstr "återställer %s\n"
7798
7799 #, python-format
7800 msgid "undeleting %s\n"
7801 msgstr "ångrar radering av %s\n"
7802
7803 #, python-format
7804 msgid "file not managed: %s\n"
7805 msgstr "filen hanteras inte: %s\n"
7806
7807 #, python-format
7808 msgid "no changes needed to %s\n"
7809 msgstr "inga ändringar behövs för %s\n"
7810
7119 7811 msgid "repository root directory or name of overlay bundle file"
7120 7812 msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
7121 7813
@@ -7216,12 +7908,18 b' msgstr "visa med mallfil"'
7216 7908 msgid "display with template"
7217 7909 msgstr "visa med mall"
7218 7910
7911 msgid "show patch"
7912 msgstr "visa patch"
7913
7219 7914 msgid "do not show merges"
7220 7915 msgstr "visa inte sammanfogningar"
7221 7916
7222 7917 msgid "output diffstat-style summary of changes"
7223 7918 msgstr "visa sammanfattning av ändringar i diffstat-stil"
7224 7919
7920 msgid "show the revision DAG"
7921 msgstr "visa revisionsdiagram"
7922
7225 7923 msgid "treat all files as text"
7226 7924 msgstr "behandla alla filer som text"
7227 7925
@@ -7328,7 +8026,9 b' msgid ""'
7328 8026 " option takes a percentage between 0 (disabled) and 100 (files must\n"
7329 8027 " be identical) as its parameter. Detecting renamed files this way\n"
7330 8028 " can be expensive. After using this option, :hg:`status -C` can be\n"
7331 " used to check which files were identified as moved or renamed."
8029 " used to check which files were identified as moved or renamed.\n"
8030 " If this option is not specified, only renames of identical files\n"
8031 " are detected."
7332 8032 msgstr ""
7333 8033 " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n"
7334 8034 " parameter större än 0, kommer varje borttagen fil att jämföras med\n"
@@ -7337,7 +8037,8 b' msgstr ""'
7337 8037 " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n"
7338 8038 " på det här sättet kan ta lång tid. Efter att denna flagga har använts,\n"
7339 8039 " kan :hg:`status -C` användas för att kontrollera vilka filer som\n"
7340 " identifierades som flyttade eller omdöpta."
8040 " identifierades som flyttade eller omdöpta. Om den flaggan inte anges,\n"
8041 " upptäcks bara namnbyten för identiska filer."
7341 8042
7342 8043 msgid "similarity must be a number"
7343 8044 msgstr "likhet måste vara ett nummer"
@@ -7580,10 +8281,6 b' msgstr "kan inte \xc3\xa5terkalla en \xc3\xa4ndring utan f\xc3\xb6r\xc3\xa4ldrar"'
7580 8281 msgid "cannot backout a merge changeset"
7581 8282 msgstr "kan inte återkalla en sammanfogning"
7582 8283
7583 #, python-format
7584 msgid "%s is not a parent of %s"
7585 msgstr "%s är inte en förälder till %s"
7586
7587 8284 msgid "cannot use --parent on non-merge changeset"
7588 8285 msgstr "kan inte använda --parent på icke-sammanfogande ändring"
7589 8286
@@ -7649,16 +8346,20 b' msgstr ""'
7649 8346
7650 8347 msgid ""
7651 8348 " If you supply a command, it will be used for automatic bisection.\n"
7652 " Its exit status will be used to mark revisions as good or bad:\n"
7653 " status 0 means good, 125 means to skip the revision, 127\n"
7654 " (command not found) will abort the bisection, and any other\n"
7655 " non-zero exit status means the revision is bad."
8349 " The environment variable HG_NODE will contain the ID of the\n"
8350 " changeset being tested. The exit status of the command will be\n"
8351 " used to mark revisions as good or bad: status 0 means good, 125\n"
8352 " means to skip the revision, 127 (command not found) will abort the\n"
8353 " bisection, and any other non-zero exit status means the revision\n"
8354 " is bad."
7656 8355 msgstr ""
7657 8356 " Om du tillhandahåller ett kommando, kommer det att användas för\n"
7658 " automatisk genomsökning. Dess returkod kommer att användas för att ange\n"
7659 " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n"
7660 " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n"
7661 " genomsökningen, och alla andra värden betyder att revisionen är dålig."
8357 " automatisk genomsökning. Miljövariabeln HG_NODE kommer att innehålla\n"
8358 " ID för den ändring som testas. Returkoden från kommandot kommer att\n"
8359 " användas för att markera en revision som bra eller dålig: 0 betyer\n"
8360 " bra, 125 betyder hoppa över revionen, 127 (kommandot hittades inte)\n"
8361 " kommer att avbryta genomsökningen, och alla andra värden betyder att\n"
8362 " revisionen är dålig."
7662 8363
7663 8364 msgid " Some examples:"
7664 8365 msgstr " Några exempel:"
@@ -7740,6 +8441,15 b' msgstr ""'
7740 8441 msgid " hg log -r \"bisect(pruned)\""
7741 8442 msgstr " hg log -r \"bisect(pruned)\""
7742 8443
8444 msgid ""
8445 " - see the changeset currently being bisected (especially useful\n"
8446 " if running with -U/--noupdate)::"
8447 msgstr ""
8448 " - se ändringen som genomsöks (mest användbart med -U/--no-update)::"
8449
8450 msgid " hg log -r \"bisect(current)\""
8451 msgstr " hg log -r \"bisect(current)\""
8452
7743 8453 msgid " - see all changesets that took part in the current bisection::"
7744 8454 msgstr " - se alla ändringar som var med i den nuvarande genomsökningen::"
7745 8455
@@ -7788,6 +8498,12 b' msgstr "(anv\xc3\xa4ndning av \'hg bisect <kmd>\' \xc3\xa4r f\xc3\xb6r\xc3\xa5ldrat)\\n"'
7788 8498 msgid "incompatible arguments"
7789 8499 msgstr "inkompatibla argument"
7790 8500
8501 msgid "current bisect revision is unknown - start a new bisect to fix"
8502 msgstr ""
8503
8504 msgid "current bisect revision is a merge"
8505 msgstr ""
8506
7791 8507 #, python-format
7792 8508 msgid "failed to execute %s"
7793 8509 msgstr "misslyckades med att köra %s"
@@ -7797,8 +8513,8 b' msgid "%s killed"'
7797 8513 msgstr "%s dödad"
7798 8514
7799 8515 #, python-format
7800 msgid "Changeset %d:%s: %s\n"
7801 msgstr "Ändring %d:%s: %s\n"
8516 msgid "changeset %d:%s: %s\n"
8517 msgstr "ändring %d:%s: %s\n"
7802 8518
7803 8519 #, python-format
7804 8520 msgid "Extending search to changeset %d:%s\n"
@@ -8100,12 +8816,12 b' msgstr ""'
8100 8816 " Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n"
8101 8817 " "
8102 8818
8819 msgid "unknown bundle type specified with --type"
8820 msgstr "okänd bunttyp angiven med --type"
8821
8103 8822 msgid "--base is incompatible with specifying a destination"
8104 8823 msgstr "--base är inkompatibel med specificering av destination"
8105 8824
8106 msgid "unknown bundle type specified with --type"
8107 msgstr "okänd bunttyp angiven med --type"
8108
8109 8825 msgid "print output to file with formatted name"
8110 8826 msgstr "skriv utmatning till fil med formatterat namn"
8111 8827
@@ -8340,6 +9056,9 b' msgstr "m\xc3\xa4rk nya/saknade filer som tillagda/borttagna innan arkivering"'
8340 9056 msgid "mark a branch as closed, hiding it from the branch list"
8341 9057 msgstr "markera en gren som stängd, och göm den från grenlistan"
8342 9058
9059 msgid "amend the parent of the working dir"
9060 msgstr "förändra arbetskatalogens föräldrer"
9061
8343 9062 msgid "commit the specified files or all outstanding changes"
8344 9063 msgstr "arkivera de angivna filerna eller alla ändringar"
8345 9064
@@ -8378,6 +9097,26 b' msgstr ""'
8378 9097 " meddelande i ``.hg/last-message.txt``."
8379 9098
8380 9099 msgid ""
9100 " The --amend flag can be used to amend the parent of the\n"
9101 " working directory with a new commit that contains the changes\n"
9102 " in the parent in addition to those currently reported by :hg:`status`,\n"
9103 " if there are any. The old commit is stored in a backup bundle in\n"
9104 " ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`\n"
9105 " on how to restore it)."
9106 msgstr ""
9107
9108 msgid ""
9109 " Message, user and date are taken from the amended commit unless\n"
9110 " specified. When a message isn't specified on the command line,\n"
9111 " the editor will open with the message of the amended commit."
9112 msgstr ""
9113
9114 msgid ""
9115 " It is not possible to amend public changesets (see :hg:`help phases`)\n"
9116 " or changesets that have children."
9117 msgstr ""
9118
9119 msgid ""
8381 9120 " Returns 0 on success, 1 if nothing changed.\n"
8382 9121 " "
8383 9122 msgstr ""
@@ -8387,13 +9126,28 b' msgstr ""'
8387 9126 msgid "can only close branch heads"
8388 9127 msgstr "kan bara stänga grenhuvuden"
8389 9128
9129 msgid "cannot amend recursively"
9130 msgstr "kan inte förändra rekursivt"
9131
9132 msgid "cannot amend public changesets"
9133 msgstr "kan inte förändra publika ändringar"
9134
9135 msgid "cannot amend merge changesets"
9136 msgstr "kan inte förändra sammanfogningar"
9137
9138 msgid "cannot amend while merging"
9139 msgstr "kan inte förändra vid sammanfogning"
9140
9141 msgid "cannot amend changeset with children"
9142 msgstr "kan inte förändra ändringar med barn"
9143
9144 msgid "nothing changed\n"
9145 msgstr "inget ändrat\n"
9146
8390 9147 #, python-format
8391 9148 msgid "nothing changed (%d missing files, see 'hg status')\n"
8392 9149 msgstr "inget ändrat (%d saknade filer, se 'hg status')\n"
8393 9150
8394 msgid "nothing changed\n"
8395 msgstr "inget ändrat\n"
8396
8397 9151 msgid "created new head\n"
8398 9152 msgstr "skapade ett nytt huvud\n"
8399 9153
@@ -8691,15 +9445,15 b' msgid "test Mercurial installation"'
8691 9445 msgstr "testa Mercurial-installation"
8692 9446
8693 9447 #, python-format
8694 msgid "Checking encoding (%s)...\n"
8695 msgstr "Kontrollerar teckenkodning (%s)...\n"
9448 msgid "checking encoding (%s)...\n"
9449 msgstr "kontrollerar teckenkodning (%s)...\n"
8696 9450
8697 9451 msgid " (check that your locale is properly set)\n"
8698 9452 msgstr " (kontrollera att din locale är korrekt inställd)\n"
8699 9453
8700 9454 #, python-format
8701 msgid "Checking installed modules (%s)...\n"
8702 msgstr "Kontrollerar installerade moduler (%s)...\n"
9455 msgid "checking installed modules (%s)...\n"
9456 msgstr "kontrollerar installerade moduler (%s)...\n"
8703 9457
8704 9458 msgid " One or more extensions could not be found"
8705 9459 msgstr " En eller fler utökningar kunde inte hittas"
@@ -8708,14 +9462,14 b' msgid " (check that you compiled the ext'
8708 9462 msgstr " (kontrollera att du kompilerade utökningarna)\n"
8709 9463
8710 9464 #, python-format
8711 msgid "Checking templates (%s)...\n"
8712 msgstr "Kontrollerar mallar (%s)...\n"
9465 msgid "checking templates (%s)...\n"
9466 msgstr "kontrollerar mallar (%s)...\n"
8713 9467
8714 9468 msgid " (templates seem to have been installed incorrectly)\n"
8715 9469 msgstr " (mallar verkar vara inkorrekt installerade)\n"
8716 9470
8717 msgid "Checking commit editor...\n"
8718 msgstr "Kontrollerar arkiveringseditor...\n"
9471 msgid "checking commit editor...\n"
9472 msgstr "kontrollerar arkiveringseditor...\n"
8719 9473
8720 9474 msgid " No commit editor set and can't find vi in PATH\n"
8721 9475 msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n"
@@ -8727,14 +9481,14 b' msgstr " (specificera en arkiveringsedit'
8727 9481 msgid " Can't find editor '%s' in PATH\n"
8728 9482 msgstr " Kan inte hitta editorn '%s' i PATH\n"
8729 9483
8730 msgid "Checking username...\n"
8731 msgstr "Kontrollerar användarnamn...\n"
9484 msgid "checking username...\n"
9485 msgstr "kontrollerar användarnamn...\n"
8732 9486
8733 9487 msgid " (specify a username in your configuration file)\n"
8734 9488 msgstr " (ange ett användarnamn i din konfigurationsfil)\n"
8735 9489
8736 msgid "No problems detected\n"
8737 msgstr "Inga problem upptäcktes\n"
9490 msgid "no problems detected\n"
9491 msgstr "inga problem upptäcktes\n"
8738 9492
8739 9493 #, python-format
8740 9494 msgid "%s problems detected, please check your install!\n"
@@ -8747,10 +9501,15 b' msgid "test whether node ids are known t'
8747 9501 msgstr ""
8748 9502
8749 9503 msgid ""
8750 " Every ID must be a full-length hex node id string. Returns a list of 0s "
8751 "and 1s\n"
8752 " indicating unknown/known.\n"
8753 " "
9504 " Every ID must be a full-length hex node id string. Returns a list of 0s\n"
9505 " and 1s indicating unknown/known.\n"
9506 " "
9507 msgstr ""
9508
9509 msgid "[OBSOLETED [REPLACEMENT] [REPL... ]"
9510 msgstr ""
9511
9512 msgid "create arbitrary obsolete marker"
8754 9513 msgstr ""
8755 9514
8756 9515 msgid "REPO NAMESPACE [KEY OLD NEW]"
@@ -8768,6 +9527,25 b' msgid ""'
8768 9527 " "
8769 9528 msgstr ""
8770 9529
9530 msgid "A B"
9531 msgstr "A B"
9532
9533 #, python-format
9534 msgid "a: %s\n"
9535 msgstr "a: %s\n"
9536
9537 #, python-format
9538 msgid "b: %s\n"
9539 msgstr "b: %s\n"
9540
9541 #, python-format
9542 msgid "depth(a): %d depth(b): %d\n"
9543 msgstr ""
9544
9545 #, python-format
9546 msgid "delta: %d hdist: %d distance: %d relation: %s\n"
9547 msgstr ""
9548
8771 9549 msgid "revision to rebuild to"
8772 9550 msgstr "revision att bygga om till"
8773 9551
@@ -8806,6 +9584,12 b' msgstr ""'
8806 9584 msgid "parse and apply a revision specification"
8807 9585 msgstr ""
8808 9586
9587 msgid ""
9588 " Use --verbose to print the parsed tree before and after aliases\n"
9589 " expansion.\n"
9590 " "
9591 msgstr ""
9592
8809 9593 msgid "REV1 [REV2]"
8810 9594 msgstr "REV1 [REV2]"
8811 9595
@@ -8933,8 +9717,8 b' msgstr "diffa mot den andra f\xc3\xb6r\xc3\xa4ldern"'
8933 9717 msgid "revisions to export"
8934 9718 msgstr "revisioner att exportera"
8935 9719
8936 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
8937 msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
9720 msgid "[OPTION]... [-o OUTFILESPEC] [-r] REV..."
9721 msgstr "[FLAGGA]... [-o UTFILSPEC] [-r] REV..."
8938 9722
8939 9723 msgid "dump the header and diffs for one or more changesets"
8940 9724 msgstr "dumpa rubrik och diff för en eller fler ändringar"
@@ -9086,17 +9870,23 b' msgstr " - gl\xc3\xb6m bort filer som skulle exkluderas av .hgignore::"'
9086 9870 msgid " hg forget \"set:hgignore()\""
9087 9871 msgstr " hg forget \"set:hgignore()\""
9088 9872
9873 msgid "revisions to graft"
9874 msgstr "revisioner att ympa"
9875
9089 9876 msgid "resume interrupted graft"
9090 9877 msgstr "återuppta avbruten ympning"
9091 9878
9879 msgid "append graft info to log message"
9880 msgstr "lägg till ympningsinfo till loggmeddelande"
9881
9092 9882 msgid "record the current date as commit date"
9093 9883 msgstr "lagra det nuvarande datumet som arkiveringsdatumet"
9094 9884
9095 9885 msgid "record the current user as committer"
9096 9886 msgstr "lagra den nuvarande användaren som arkiverare"
9097 9887
9098 msgid "[OPTION]... REVISION..."
9099 msgstr "[FLAGGA]... REVISION..."
9888 msgid "[OPTION]... [-r] REV..."
9889 msgstr "[FLAGGA]... [-r] REV..."
9100 9890
9101 9891 msgid "copy changes from other branches onto the current branch"
9102 9892 msgstr "kopiera ändringar från andra grenar till den nuvarande grenen"
@@ -9114,6 +9904,9 b' msgid ""'
9114 9904 " already been grafted, or that are merges will be skipped."
9115 9905 msgstr ""
9116 9906
9907 msgid " (grafted from CHANGESETHASH)"
9908 msgstr ""
9909
9117 9910 msgid ""
9118 9911 " If a graft merge results in conflicts, the graft process is\n"
9119 9912 " interrupted so that the current merge can be manually resolved.\n"
@@ -9199,16 +9992,16 b' msgstr "ol\xc3\xb6sta konflikter, kan inte forts\xc3\xa4tta"'
9199 9992 msgid "use hg resolve and hg graft --continue"
9200 9993 msgstr "använd hg resolve och hg graft --continue"
9201 9994
9995 #, python-format
9996 msgid "graft for revision %s is empty\n"
9997 msgstr ""
9998
9202 9999 msgid "end fields with NUL"
9203 10000 msgstr "avsluta fält med NUL"
9204 10001
9205 10002 msgid "print all revisions that match"
9206 10003 msgstr "visa alla revisioner som matchar"
9207 10004
9208 msgid "follow changeset history, or file history across copies and renames"
9209 msgstr ""
9210 "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten"
9211
9212 10005 msgid "ignore case when matching"
9213 10006 msgstr "ignorera versaler/gemener vid matchning"
9214 10007
@@ -9279,8 +10072,8 b' msgstr "visa bara aktiva grenhuvuden (F\xc3\x96RLEGAD)"'
9279 10072 msgid "show normal and closed branch heads"
9280 10073 msgstr "visa normala och stängda grenhuvuden"
9281 10074
9282 msgid "[-ac] [-r STARTREV] [REV]..."
9283 msgstr "[-ac] [-r STARTREV] [REV]..."
10075 msgid "[-ct] [-r STARTREV] [REV]..."
10076 msgstr "[-ct] [-r STARTREV] [REV]..."
9284 10077
9285 10078 msgid "show current repository heads or show branch heads"
9286 10079 msgstr "visa aktuella arkivhuvuden och visar grenhuvuden"
@@ -9353,6 +10146,9 b' msgstr "visa bara hj\xc3\xa4lp f\xc3\xb6r ut\xc3\xb6kningar"'
9353 10146 msgid "show only help for commands"
9354 10147 msgstr "visa bara hjälp för kommandon"
9355 10148
10149 msgid "show topics matching keyword"
10150 msgstr "visa ämnen för nyckelord"
10151
9356 10152 msgid "[-ec] [TOPIC]"
9357 10153 msgstr "[-ec] [ÄMNE]"
9358 10154
@@ -9367,8 +10163,7 b' msgid ""'
9367 10163 " Given a topic, extension, or command name, print help for that\n"
9368 10164 " topic."
9369 10165 msgstr ""
9370 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n"
9371 " "
10166 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet."
9372 10167
9373 10168 msgid ""
9374 10169 " Returns 0 if successful.\n"
@@ -9377,42 +10172,6 b' msgstr ""'
9377 10172 " Returnerar 0 om kommandot lyckades.\n"
9378 10173 " "
9379 10174
9380 msgid "VALUE"
9381 msgstr "VÄRDE"
9382
9383 msgid "DEPRECATED"
9384 msgstr "FÖRLEGAD"
9385
9386 msgid ""
9387 "\n"
9388 "[+] marked option can be specified multiple times\n"
9389 msgstr ""
9390 "\n"
9391 "flaggor markerade med [+] kan anges flera gånger\n"
9392
9393 msgid "global options:"
9394 msgstr "globala flaggor:"
9395
9396 msgid "use \"hg help\" for the full list of commands"
9397 msgstr "använd \"hg help\" för den fulla kommandolistan"
9398
9399 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
9400 msgstr ""
9401 "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
9402
9403 #, python-format
9404 msgid "use \"hg help %s\" to show the full help text"
9405 msgstr "använd \"hg help %s\" för att visa utförlig hjälp"
9406
9407 #, python-format
9408 msgid "use \"hg -v help%s\" to show builtin aliases and global options"
9409 msgstr ""
9410 "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
9411
9412 #, python-format
9413 msgid "use \"hg -v help %s\" to show more info"
9414 msgstr "använd \"hg -v help %s\" för att visa mer info"
9415
9416 10175 #, python-format
9417 10176 msgid ""
9418 10177 "\n"
@@ -9447,6 +10206,9 b' msgstr "anv\xc3\xa4nd \\"hg help -e %s\\" f\xc3\xb6r att visa hj\xc3\xa4lp f\xc3\xb6r ut\xc3\xb6kningen %s"'
9447 10206 msgid "options:"
9448 10207 msgstr "flaggor:"
9449 10208
10209 msgid "global options:"
10210 msgstr "globala flaggor:"
10211
9450 10212 #, python-format
9451 10213 msgid ""
9452 10214 "\n"
@@ -9482,6 +10244,22 b' msgstr ""'
9482 10244 "\n"
9483 10245 "ytterligare hjälpämnen:"
9484 10246
10247 msgid "use \"hg help\" for the full list of commands"
10248 msgstr "använd \"hg help\" för den fulla kommandolistan"
10249
10250 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
10251 msgstr ""
10252 "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer"
10253
10254 #, python-format
10255 msgid "use \"hg help %s\" to show the full help text"
10256 msgstr "använd \"hg help %s\" för att visa utförlig hjälp"
10257
10258 #, python-format
10259 msgid "use \"hg -v help%s\" to show builtin aliases and global options"
10260 msgstr ""
10261 "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
10262
9485 10263 #, python-format
9486 10264 msgid ""
9487 10265 "\n"
@@ -9505,6 +10283,12 b' msgstr ""'
9505 10283 msgid "'%s' is provided by the following extension:"
9506 10284 msgstr "'%s' tillhandahålls av följande utökning:"
9507 10285
10286 msgid "Topics"
10287 msgstr "Ämnen"
10288
10289 msgid "Extension Commands"
10290 msgstr "Utökningar"
10291
9508 10292 msgid "Mercurial Distributed SCM\n"
9509 10293 msgstr "Mercurial Distribuerad SCM\n"
9510 10294
@@ -9849,42 +10633,6 b' msgstr ""'
9849 10633 " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n"
9850 10634 " innehåller blanktecken som multipla filnamn"
9851 10635
9852 msgid "only follow the first parent of merge changesets (DEPRECATED)"
9853 msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)"
9854
9855 msgid "show revisions matching date spec"
9856 msgstr "visa revisioner som matchar datumspecen"
9857
9858 msgid "show copied files"
9859 msgstr "visa kopierade filer"
9860
9861 msgid "do case-insensitive search for a given text"
9862 msgstr "gör versalokänslig sökning efter en given text"
9863
9864 msgid "include revisions where files were removed"
9865 msgstr "inkludera revisioner där filer togs bort"
9866
9867 msgid "show only merges (DEPRECATED)"
9868 msgstr "visa bara sammanfogningar (FÖRLEGAD)"
9869
9870 msgid "revisions committed by user"
9871 msgstr "revisioner arkiverade av användare"
9872
9873 msgid "show only changesets within the given named branch (DEPRECATED)"
9874 msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)"
9875
9876 msgid "show changesets within the given named branch"
9877 msgstr "visa ändringar i den namngivna grenen"
9878
9879 msgid "do not display revision or any of its ancestors"
9880 msgstr "visa inte revision eller någon av dess föräldrar"
9881
9882 msgid "show hidden changesets (DEPRECATED)"
9883 msgstr "visa dolda ändringar (FÖRLEGAD)"
9884
9885 msgid "[OPTION]... [FILE]"
9886 msgstr "[FLAGGA]... [FIL]"
9887
9888 10636 msgid "show revision history of entire repository or files"
9889 10637 msgstr "visa revisionshistorik för hela arkivet eller filer"
9890 10638
@@ -10019,6 +10767,13 b' msgstr ""'
10019 10767 " Se :hg:`help revisions` och :hg:`help revsets` för mer om hur man anger\n"
10020 10768 " revisioner."
10021 10769
10770 msgid ""
10771 " See :hg:`help templates` for more about pre-packaged styles and\n"
10772 " specifying custom templates."
10773 msgstr ""
10774 " Se :hg:`help templates` för information om mallar och filter.\n"
10775 " "
10776
10022 10777 msgid "revision to display"
10023 10778 msgstr "revision att visa"
10024 10779
@@ -10130,6 +10885,22 b' msgstr ""'
10130 10885 " Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n"
10131 10886 " "
10132 10887
10888 msgid ""
10889 "multiple matching bookmarks to merge - please merge with an explicit rev or "
10890 "bookmark"
10891 msgstr ""
10892 "flera överrensstämmande bokmärken att sammanfoga - ange en explicit revision "
10893 "eller ett bokmärke"
10894
10895 msgid "run 'hg heads' to see all heads"
10896 msgstr "kör 'hg heads' för att se alla huvuden"
10897
10898 msgid ""
10899 "no matching bookmark to merge - please merge with an explicit rev or bookmark"
10900 msgstr ""
10901 "inga överrensstämmande bokmärken att sammanfoga - ange en explicit revision "
10902 "eller ett bokmärke"
10903
10133 10904 #, python-format
10134 10905 msgid "branch '%s' has %d heads - please merge with an explicit rev"
10135 10906 msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev"
@@ -10137,13 +10908,13 b' msgstr "grenen \'%s\' har %d huvuden - sam'
10137 10908 msgid "run 'hg heads .' to see heads"
10138 10909 msgstr "kör 'hg heads .' för att se huvuden"
10139 10910
10911 msgid "heads are bookmarked - please merge with an explicit rev"
10912 msgstr "huvuden är bokmärkta - sammanfoga med en explicit revision"
10913
10140 10914 #, python-format
10141 10915 msgid "branch '%s' has one head - please merge with an explicit rev"
10142 10916 msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev"
10143 10917
10144 msgid "run 'hg heads' to see all heads"
10145 msgstr "kör 'hg heads' för att se alla huvuden"
10146
10147 10918 msgid "nothing to merge"
10148 10919 msgstr "inget att sammanfoga"
10149 10920
@@ -10306,18 +11077,24 b' msgid " public < draft < secret"'
10306 11077 msgstr " public < draft < secret"
10307 11078
10308 11079 msgid ""
10309 " Return 0 on success, 1 if no phases were changed.\n"
10310 " "
10311 msgstr ""
10312 " Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades.\n"
11080 " Return 0 on success, 1 if no phases were changed or some could not\n"
11081 " be changed.\n"
11082 " "
11083 msgstr ""
11084 " Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades eller om\n"
11085 " några inte kunde förändras.\n"
10313 11086 " "
10314 11087
10315 11088 msgid "only one phase can be specified"
10316 11089 msgstr "bara en fas kan vara angiven"
10317 11090
10318 11091 #, python-format
10319 msgid "phase change for %i changesets\n"
10320 msgstr "fasändring för %i ändringar\n"
11092 msgid "cannot move %i changesets to a more permissive phase, use --force\n"
11093 msgstr ""
11094
11095 #, python-format
11096 msgid "phase changed for %i changesets\n"
11097 msgstr "fas ändrad för %i ändringar\n"
10321 11098
10322 11099 msgid "no phases changed\n"
10323 11100 msgstr "inga faser ändrage\n"
@@ -10401,13 +11178,6 b' msgstr ""'
10401 11178 msgid "remote bookmark %s not found!"
10402 11179 msgstr "fjärrbokmärket %s hittades inte!"
10403 11180
10404 msgid ""
10405 "other repository doesn't support revision lookup, so a rev cannot be "
10406 "specified."
10407 msgstr ""
10408 "det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
10409 "anges."
10410
10411 11181 #, python-format
10412 11182 msgid "importing bookmark %s\n"
10413 11183 msgstr "importerar bokmärket %s\n"
@@ -10475,6 +11245,14 b' msgstr ""'
10475 11245 " tryckas till det andra arkivet."
10476 11246
10477 11247 msgid ""
11248 " If -B/--bookmark is used, the specified bookmarked revision, its\n"
11249 " ancestors, and the bookmark will be pushed to the remote\n"
11250 " repository."
11251 msgstr ""
11252 " Om -B/--bookmarks används, kommer den angivna bokmärkta revisionen,\n"
11253 " alla anfäder och bokmärket att tryckas till det andra arkivet."
11254
11255 msgid ""
10478 11256 " Please see :hg:`help urls` for important details about ``ssh://``\n"
10479 11257 " URLs. If DESTINATION is omitted, a default path will be used."
10480 11258 msgstr ""
@@ -10744,24 +11522,24 b' msgstr "senaste revision matchande datum'
10744 11522 msgid "revert to the specified revision"
10745 11523 msgstr "återgå till den angivna revisionen"
10746 11524
10747 msgid "do not save backup copies of files"
10748 msgstr "spara inte backup-kopior av filer"
10749
10750 11525 msgid "[OPTION]... [-r REV] [NAME]..."
10751 11526 msgstr "[FLAGGA]... [-r REV] [NAMN]..."
10752 11527
10753 11528 msgid "restore files to their checkout state"
10754 11529 msgstr "återställ filer till deras uthämtningstillstånd"
10755 11530
10756 msgid ""
10757 " .. note::\n"
11531 msgid " .. note::"
11532 msgstr " .. note::"
11533
11534 msgid ""
10758 11535 " To check out earlier revisions, you should use :hg:`update REV`.\n"
10759 " To cancel a merge (and lose your changes), use :hg:`update --clean .`."
11536 " To cancel an uncommitted merge (and lose your changes), use\n"
11537 " :hg:`update --clean .`."
10760 11538 msgstr ""
10761 11539 " .. note::\n"
10762 11540 " För att hämta ut tidigare revisioner, använd :hg:`update REV`.\n"
10763 " För att avbryta en sammanfogning (och bli av med alla ändringar),\n"
10764 " använd :hg:`update --clean .`."
11541 " För att avbryta en oarkiverad sammanfogning (och bli av med alla\n"
11542 " ändringar), använd :hg:`update --clean .`."
10765 11543
10766 11544 msgid ""
10767 11545 " With no revision specified, revert the specified files or directories\n"
@@ -10837,30 +11615,6 b' msgstr "oarkiverade \xc3\xa4ndringar, anv\xc3\xa4nd --all f\xc3\xb6r att kasta alla \xc3\xa4ndringar"'
10837 11615 msgid "use --all to revert all files"
10838 11616 msgstr "använd --all för att återställa filer"
10839 11617
10840 #, python-format
10841 msgid "forgetting %s\n"
10842 msgstr "glömmer %s\n"
10843
10844 #, python-format
10845 msgid "reverting %s\n"
10846 msgstr "återställer %s\n"
10847
10848 #, python-format
10849 msgid "undeleting %s\n"
10850 msgstr "ångrar radering av %s\n"
10851
10852 #, python-format
10853 msgid "saving current version of %s as %s\n"
10854 msgstr "sparar nuvarande revision av %s som %s\n"
10855
10856 #, python-format
10857 msgid "file not managed: %s\n"
10858 msgstr "filen hanteras inte: %s\n"
10859
10860 #, python-format
10861 msgid "no changes needed to %s\n"
10862 msgstr "inga ändringar behövs för %s\n"
10863
10864 11618 msgid "ignore safety measures"
10865 11619 msgstr "ignorera säkerhetsåtgärder"
10866 11620
@@ -10883,11 +11637,15 b' msgstr ""'
10883 11637 msgid ""
10884 11638 " Transactions are used to encapsulate the effects of all commands\n"
10885 11639 " that create new changesets or propagate existing changesets into a\n"
10886 " repository. For example, the following commands are transactional,\n"
10887 " and their effects can be rolled back:"
11640 " repository."
10888 11641 msgstr ""
10889 11642 " Transaktioner används för att kapsla in alla kommandon som skapar nya\n"
10890 " ändringar eller sprider existerade ändringar till ett arkiv.\n"
11643 " ändringar eller sprider existerade ändringar till ett arkiv."
11644
11645 msgid ""
11646 " For example, the following commands are transactional, and their\n"
11647 " effects can be rolled back:"
11648 msgstr ""
10891 11649 " Exempelvis skapar de följande kommandona transaktioner, och deras\n"
10892 11650 " ändringar kan återkallas:"
10893 11651
@@ -10909,9 +11667,9 b' msgid ""'
10909 11667 " commit transaction if it isn't checked out. Use --force to\n"
10910 11668 " override this protection."
10911 11669 msgstr ""
10912 " För att undvika permanent dataförlust så vägrar rollback att köras\n"
10913 " en arkivering om den inte är uthämtad. Använd --force för att gå förbi\n"
10914 " det här skyddet."
11670 " För att undvika permanent dataförlust så vägrar rollback att köras\n"
11671 " en arkivering om den inte är uthämtad. Använd --force för att gå\n"
11672 " förbi det här skyddet."
10915 11673
10916 11674 msgid ""
10917 11675 " This command is not intended for use on public repositories. Once\n"
@@ -11033,9 +11791,6 b' msgstr ""'
11033 11791 msgid "cannot use --stdio with --cmdserver"
11034 11792 msgstr "kan inte använda --stdio med --cmdserver"
11035 11793
11036 msgid "There is no Mercurial repository here (.hg not found)"
11037 msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
11038
11039 11794 #, python-format
11040 11795 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
11041 11796 msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n"
@@ -11516,19 +12271,19 b' msgstr ""'
11516 12271 " grenen och nuvarande bokmärket flyttas (se :hg:`help bookmarks`)."
11517 12272
11518 12273 msgid ""
11519 " If the changeset is not a descendant of the working directory's\n"
11520 " parent, the update is aborted. With the -c/--check option, the\n"
11521 " working directory is checked for uncommitted changes; if none are\n"
11522 " found, the working directory is updated to the specified\n"
11523 " changeset."
11524 msgstr ""
11525
11526 msgid ""
11527 12274 " Update sets the working directory's parent revison to the specified\n"
11528 12275 " changeset (see :hg:`help parents`)."
11529 12276 msgstr ""
11530 12277
11531 12278 msgid ""
12279 " If the changeset is not a descendant or ancestor of the working\n"
12280 " directory's parent, the update is aborted. With the -c/--check\n"
12281 " option, the working directory is checked for uncommitted changes; if\n"
12282 " none are found, the working directory is updated to the specified\n"
12283 " changeset."
12284 msgstr ""
12285
12286 msgid ""
11532 12287 " The following rules apply when the working directory contains\n"
11533 12288 " uncommitted changes:"
11534 12289 msgstr ""
@@ -11546,12 +12301,12 b' msgid ""'
11546 12301 " are preserved."
11547 12302 msgstr ""
11548 12303 " 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n"
11549 " begärda ändringen är en anfader eller ättling till arbetskatalogens\n"
11550 " förälder, kommer oarkiverade ändringar att sammanfogas med den\n"
11551 " begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n"
11552 " Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n"
11553 " en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n"
11554 " bevaras."
12304 " begärda ändringen är en anfader eller ättling till\n"
12305 " arbetskatalogens förälder, kommer oarkiverade ändringar att\n"
12306 " sammanfogas med den begärda ändringen och det sammanfogade\n"
12307 " resultatet lämnas oarkiverat. Om den begärda ändringen inte är en\n"
12308 " anfader eller ättling (dvs är i en annan gren), avbryts\n"
12309 " uppdateringen och de oarkiverade ändringarna bevaras."
11555 12310
11556 12311 msgid ""
11557 12312 " 2. With the -c/--check option, the update is aborted and the\n"
@@ -11564,8 +12319,15 b' msgid ""'
11564 12319 " 3. With the -C/--clean option, uncommitted changes are discarded and\n"
11565 12320 " the working directory is updated to the requested changeset."
11566 12321 msgstr ""
11567 " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n"
11568 " arbetskatalogen uppdateras till den begärda ändringen."
12322 " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras\n"
12323 " och arbetskatalogen uppdateras till den begärda ändringen."
12324
12325 msgid ""
12326 " To cancel an uncommitted merge (and lose your changes), use\n"
12327 " :hg:`update --clean .`."
12328 msgstr ""
12329 " För att avbryta en oarkiverad sammanfogning (och förlora dina\n"
12330 " ändringar), använd :hg:`update --clean .`."
11569 12331
11570 12332 msgid ""
11571 12333 " Use null as the changeset to remove the working directory (like\n"
@@ -11631,6 +12393,14 b' msgstr "ok\xc3\xa4nt kommando %s"'
11631 12393 msgid "cannot include %s (%s)"
11632 12394 msgstr "kan inte inkludera %s (%s)"
11633 12395
12396 #, python-format
12397 msgid "working directory has unknown parent '%s'!"
12398 msgstr ""
12399
12400 #, python-format
12401 msgid "unknown revision '%s'"
12402 msgstr ""
12403
11634 12404 msgid "not found in manifest"
11635 12405 msgstr "hittades inte i manifestet"
11636 12406
@@ -11855,11 +12625,23 b' msgstr ""'
11855 12625 msgid "abort: out of memory\n"
11856 12626 msgstr ""
11857 12627
12628 msgid "the extension author."
12629 msgstr ""
12630
12631 #, python-format
12632 msgid ""
12633 "** Unknown exception encountered with possibly-broken third-party extension "
12634 "%s\n"
12635 "** which supports versions %s of Mercurial.\n"
12636 "** Please disable %s and try your action again.\n"
12637 "** If that fixes the bug please report it to %s\n"
12638 msgstr ""
12639
11858 12640 msgid "** unknown exception encountered, please report by visiting\n"
11859 12641 msgstr ""
11860 12642
11861 12643 msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
11862 msgstr ""
12644 msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n"
11863 12645
11864 12646 #, python-format
11865 12647 msgid "** Python %s\n"
@@ -11873,6 +12655,9 b' msgstr ""'
11873 12655 msgid "** Extensions loaded: %s\n"
11874 12656 msgstr ""
11875 12657
12658 msgid "too few arguments for command alias"
12659 msgstr ""
12660
11876 12661 #, python-format
11877 12662 msgid "no definition for alias '%s'\n"
11878 12663 msgstr ""
@@ -11915,7 +12700,7 b' msgid ""'
11915 12700 msgstr ""
11916 12701
11917 12702 #, python-format
11918 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
12703 msgid "time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
11919 12704 msgstr ""
11920 12705
11921 12706 #, python-format
@@ -11938,6 +12723,17 b' msgid ""'
11938 12723 "misc/lsprof/"
11939 12724 msgstr ""
11940 12725
12726 msgid "statprof not available - install using \"easy_install statprof\""
12727 msgstr ""
12728
12729 #, python-format
12730 msgid "invalid sampling frequency '%s' - ignoring\n"
12731 msgstr ""
12732
12733 #, python-format
12734 msgid "unrecognized profiler '%s' - ignored\n"
12735 msgstr ""
12736
11941 12737 #, python-format
11942 12738 msgid "*** failed to import extension %s from %s: %s\n"
11943 12739 msgstr ""
@@ -11966,16 +12762,64 b' msgstr ""'
11966 12762 msgid "tool %s requires a GUI\n"
11967 12763 msgstr ""
11968 12764
12765 msgid ""
12766 "``internal:prompt``\n"
12767 "Asks the user which of the local or the other version to keep as\n"
12768 " the merged version."
12769 msgstr ""
12770
11969 12771 #, python-format
11970 12772 msgid ""
11971 12773 " no tool found to merge %s\n"
11972 12774 "keep (l)ocal or take (o)ther?"
11973 12775 msgstr ""
11974 12776
12777 msgid ""
12778 "``internal:local``\n"
12779 "Uses the local version of files as the merged version."
12780 msgstr ""
12781
12782 msgid ""
12783 "``internal:other``\n"
12784 "Uses the other version of files as the merged version."
12785 msgstr ""
12786
12787 msgid ""
12788 "``internal:fail``\n"
12789 "Rather than attempting to merge files that were modified on both\n"
12790 " branches, it marks them as unresolved. The resolve command must be\n"
12791 " used to resolve these conflicts."
12792 msgstr ""
12793
11975 12794 #, python-format
11976 12795 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
11977 12796 msgstr ""
11978 12797
12798 msgid ""
12799 "``internal:merge``\n"
12800 "Uses the internal non-interactive simple merge algorithm for merging\n"
12801 " files. It will fail if there are any conflicts and leave markers in\n"
12802 " the partially merged file."
12803 msgstr ""
12804
12805 #, python-format
12806 msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n"
12807 msgstr ""
12808
12809 msgid ""
12810 "``internal:dump``\n"
12811 "Creates three versions of the files to merge, containing the\n"
12812 " contents of local, other and base. These files can then be used to\n"
12813 " perform a merge manually. If the file to be merged is named\n"
12814 " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
12815 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
12816 " same directory as ``a.txt``."
12817 msgstr ""
12818
12819 #, python-format
12820 msgid "merging %s failed!\n"
12821 msgstr ""
12822
11979 12823 #, python-format
11980 12824 msgid "was merge of '%s' successful (yn)?"
11981 12825 msgstr ""
@@ -11986,14 +12830,6 b' msgid ""'
11986 12830 "was merge successful (yn)?"
11987 12831 msgstr ""
11988 12832
11989 #, python-format
11990 msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n"
11991 msgstr ""
11992
11993 #, python-format
11994 msgid "merging %s failed!\n"
11995 msgstr ""
11996
11997 12833 msgid "unterminated string"
11998 12834 msgstr ""
11999 12835
@@ -12180,6 +13016,18 b' msgstr ""'
12180 13016 msgid "copied takes no arguments"
12181 13017 msgstr "copied tar inga argument"
12182 13018
13019 msgid ""
13020 "``subrepo([pattern])``\n"
13021 " Subrepositories whose paths match the given pattern."
13022 msgstr ""
13023
13024 #. i18n: "subrepo" is a keyword
13025 msgid "subrepo takes at most one argument"
13026 msgstr "subrepo tar maximalt ett argument"
13027
13028 msgid "subrepo requires a pattern or no arguments"
13029 msgstr "subrepo kräver ett mönster eller inga argument"
13030
12183 13031 msgid "invalid token"
12184 13032 msgstr ""
12185 13033
@@ -12224,6 +13072,19 b' msgstr "d\xc3\xa5lig (implicit)"'
12224 13072 msgid "disabled extensions:"
12225 13073 msgstr "deaktiverade utökningar:"
12226 13074
13075 msgid "VALUE"
13076 msgstr "VÄRDE"
13077
13078 msgid "DEPRECATED"
13079 msgstr "FÖRLEGAD"
13080
13081 msgid ""
13082 "\n"
13083 "[+] marked option can be specified multiple times\n"
13084 msgstr ""
13085 "\n"
13086 "flaggor markerade med [+] kan anges flera gånger\n"
13087
12227 13088 msgid "Configuration Files"
12228 13089 msgstr "Konfigurationsfiler"
12229 13090
@@ -12260,8 +13121,8 b' msgstr "Anv\xc3\xa4ndning Av Mallar"'
12260 13121 msgid "URL Paths"
12261 13122 msgstr "URL-sökvägar"
12262 13123
12263 msgid "Using additional features"
12264 msgstr "Använda ytterligare funktioner"
13124 msgid "Using Additional Features"
13125 msgstr "Använda Ytterligare Funktioner"
12265 13126
12266 13127 msgid "Subrepositories"
12267 13128 msgstr "Underarkiv"
@@ -12272,8 +13133,8 b' msgstr "Konfiguration av hgweb"'
12272 13133 msgid "Glossary"
12273 13134 msgstr "Ordlista"
12274 13135
12275 msgid "syntax for Mercurial ignore files"
12276 msgstr "syntax för Mercurials ignoreringsfiler"
13136 msgid "Syntax for Mercurial Ignore Files"
13137 msgstr "Syntax för Mercurials Ignoreringsfiler"
12277 13138
12278 13139 msgid "Working with Phases"
12279 13140 msgstr "Arbeta med Faser"
@@ -12334,7 +13195,7 b' msgid ""'
12334 13195 "ones."
12335 13196 msgstr ""
12336 13197
12337 msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
13198 msgid "| (All) ``<repo>/.hg/hgrc``"
12338 13199 msgstr ""
12339 13200
12340 13201 msgid ""
@@ -12342,12 +13203,13 b' msgid ""'
12342 13203 " particular repository. This file is not version-controlled, and\n"
12343 13204 " will not get transferred during a \"clone\" operation. Options in\n"
12344 13205 " this file override options in all other configuration files. On\n"
12345 " Unix, most of this file will be ignored if it doesn't belong to a\n"
12346 " trusted user or to a trusted group. See the documentation for the\n"
12347 " ``[trusted]`` section below for more details."
12348 msgstr ""
12349
12350 msgid ""
13206 " Plan 9 and Unix, most of this file will be ignored if it doesn't\n"
13207 " belong to a trusted user or to a trusted group. See the documentation\n"
13208 " for the ``[trusted]`` section below for more details."
13209 msgstr ""
13210
13211 msgid ""
13212 "| (Plan 9) ``$home/lib/hgrc``\n"
12351 13213 "| (Unix) ``$HOME/.hgrc``\n"
12352 13214 "| (Windows) ``%USERPROFILE%\\.hgrc``\n"
12353 13215 "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
@@ -12365,6 +13227,8 b' msgid ""'
12365 13227 msgstr ""
12366 13228
12367 13229 msgid ""
13230 "| (Plan 9) ``/lib/mercurial/hgrc``\n"
13231 "| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc``\n"
12368 13232 "| (Unix) ``/etc/mercurial/hgrc``\n"
12369 13233 "| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
12370 13234 msgstr ""
@@ -12377,6 +13241,8 b' msgid ""'
12377 13241 msgstr ""
12378 13242
12379 13243 msgid ""
13244 "| (Plan 9) ``<install-root>/lib/mercurial/hgrc``\n"
13245 "| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc``\n"
12380 13246 "| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
12381 13247 "| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
12382 13248 msgstr ""
@@ -12403,9 +13269,7 b' msgid ""'
12403 13269 " keys contain PATH-like strings, every part of which must reference\n"
12404 13270 " a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n"
12405 13271 " be read. Mercurial checks each of these locations in the specified\n"
12406 " order until one or more configuration files are detected. If the\n"
12407 " pywin32 extensions are not installed, Mercurial will only look for\n"
12408 " site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``."
13272 " order until one or more configuration files are detected."
12409 13273 msgstr ""
12410 13274
12411 13275 msgid ""
@@ -12590,7 +13454,7 b' msgid ""'
12590 13454 "run arbitrary commands. As an example, ::"
12591 13455 msgstr ""
12592 13456
12593 msgid " echo = !echo"
13457 msgid " echo = !echo $@"
12594 13458 msgstr ""
12595 13459
12596 13460 msgid ""
@@ -12607,11 +13471,19 b' msgid ""'
12607 13471 msgstr ""
12608 13472
12609 13473 msgid ""
12610 "Shell aliases are executed in an environment where ``$HG`` expand to\n"
13474 "Positional arguments like ``$1``, ``$2``, etc. in the alias definition\n"
13475 "expand to the command arguments. Unmatched arguments are\n"
13476 "removed. ``$0`` expands to the alias name and ``$@`` expands to all\n"
13477 "arguments separated by a space. These expansions happen before the\n"
13478 "command is passed to the shell."
13479 msgstr ""
13480
13481 msgid ""
13482 "Shell aliases are executed in an environment where ``$HG`` expands to\n"
12611 13483 "the path of the Mercurial that was used to execute the alias. This is\n"
12612 13484 "useful when you want to call further Mercurial commands in a shell\n"
12613 13485 "alias, as was done above for the purge alias. In addition,\n"
12614 "``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n"
13486 "``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg\n"
12615 13487 "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
12616 13488 msgstr ""
12617 13489
@@ -13005,33 +13877,6 b' msgstr ""'
13005 13877
13006 13878 msgid ""
13007 13879 "\n"
13008 "``hostfingerprints``\n"
13009 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
13010 msgstr ""
13011
13012 msgid ""
13013 "Fingerprints of the certificates of known HTTPS servers.\n"
13014 "A HTTPS connection to a server with a fingerprint configured here will\n"
13015 "only succeed if the servers certificate matches the fingerprint.\n"
13016 "This is very similar to how ssh known hosts works.\n"
13017 "The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
13018 "The CA chain and web.cacerts is not used for servers with a fingerprint."
13019 msgstr ""
13020
13021 msgid "For example::"
13022 msgstr "Exempelvis::"
13023
13024 msgid ""
13025 " [hostfingerprints]\n"
13026 " hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
13027 "d6:4b:ee:cc"
13028 msgstr ""
13029
13030 msgid "This feature is only supported when using Python 2.6 or later."
13031 msgstr ""
13032
13033 msgid ""
13034 "\n"
13035 13880 "``format``\n"
13036 13881 "\"\"\"\"\"\"\"\"\"\""
13037 13882 msgstr ""
@@ -13067,164 +13912,43 b' msgid ""'
13067 13912 msgstr ""
13068 13913
13069 13914 msgid ""
13070 "``merge-patterns``\n"
13071 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
13072 msgstr ""
13073
13074 msgid ""
13075 "This section specifies merge tools to associate with particular file\n"
13076 "patterns. Tools matched here will take precedence over the default\n"
13077 "merge tool. Patterns are globs by default, rooted at the repository\n"
13078 "root."
13079 msgstr ""
13080
13081 msgid ""
13082 " [merge-patterns]\n"
13083 " **.c = kdiff3\n"
13084 " **.jpg = myimgmerge"
13085 msgstr ""
13086
13087 msgid ""
13088 "``merge-tools``\n"
13089 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
13090 msgstr ""
13091
13092 msgid ""
13093 "This section configures external merge tools to use for file-level\n"
13094 "merges."
13095 msgstr ""
13096
13097 msgid "Example ``~/.hgrc``::"
13098 msgstr ""
13099
13100 msgid ""
13101 " [merge-tools]\n"
13102 " # Override stock tool location\n"
13103 " kdiff3.executable = ~/bin/kdiff3\n"
13104 " # Specify command line\n"
13105 " kdiff3.args = $base $local $other -o $output\n"
13106 " # Give higher priority\n"
13107 " kdiff3.priority = 1"
13108 msgstr ""
13109
13110 msgid ""
13111 " # Define new tool\n"
13112 " myHtmlTool.args = -m $local $other $base $output\n"
13113 " myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
13114 " myHtmlTool.priority = 1"
13115 msgstr ""
13116
13117 msgid ""
13118 "``priority``\n"
13119 " The priority in which to evaluate this tool.\n"
13120 " Default: 0."
13121 msgstr ""
13122
13123 msgid ""
13124 "``executable``\n"
13125 " Either just the name of the executable or its pathname. On Windows,\n"
13126 " the path can use environment variables with ${ProgramFiles} syntax.\n"
13127 " Default: the tool name."
13128 msgstr ""
13129
13130 msgid ""
13131 "``args``\n"
13132 " The arguments to pass to the tool executable. You can refer to the\n"
13133 " files being merged as well as the output file through these\n"
13134 " variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
13135 " Default: ``$local $base $other``"
13136 msgstr ""
13137
13138 msgid ""
13139 "``premerge``\n"
13140 " Attempt to run internal non-interactive 3-way merge tool before\n"
13141 " launching external tool. Options are ``true``, ``false``, or ``keep``\n"
13142 " to leave markers in the file if the premerge fails.\n"
13143 " Default: True"
13144 msgstr ""
13145
13146 msgid ""
13147 "``binary``\n"
13148 " This tool can merge binary files. Defaults to False, unless tool\n"
13149 " was selected by file pattern match."
13150 msgstr ""
13151
13152 msgid ""
13153 "``symlink``\n"
13154 " This tool can merge symlinks. Defaults to False, even if tool was\n"
13155 " selected by file pattern match."
13156 msgstr ""
13157
13158 msgid ""
13159 "``check``\n"
13160 " A list of merge success-checking options:"
13161 msgstr ""
13162
13163 msgid ""
13164 " ``changed``\n"
13165 " Ask whether merge was successful when the merged file shows no changes.\n"
13166 " ``conflicts``\n"
13167 " Check whether there are conflicts even though the tool reported "
13168 "success.\n"
13169 " ``prompt``\n"
13170 " Always prompt for merge success, regardless of success reported by tool."
13171 msgstr ""
13172
13173 msgid ""
13174 "``checkchanged``\n"
13175 " True is equivalent to ``check = changed``.\n"
13176 " Default: False"
13177 msgstr ""
13178
13179 msgid ""
13180 "``checkconflicts``\n"
13181 " True is equivalent to ``check = conflicts``.\n"
13182 " Default: False"
13183 msgstr ""
13184
13185 msgid ""
13186 "``fixeol``\n"
13187 " Attempt to fix up EOL changes caused by the merge tool.\n"
13188 " Default: False"
13189 msgstr ""
13190
13191 msgid ""
13192 "``gui``\n"
13193 " This tool requires a graphical interface to run. Default: False"
13194 msgstr ""
13195
13196 msgid ""
13197 "``regkey``\n"
13198 " Windows registry key which describes install location of this\n"
13199 " tool. Mercurial will search for this key first under\n"
13200 " ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
13201 " Default: None"
13202 msgstr ""
13203
13204 msgid ""
13205 "``regkeyalt``\n"
13206 " An alternate Windows registry key to try if the first key is not\n"
13207 " found. The alternate key uses the same ``regname`` and ``regappend``\n"
13208 " semantics of the primary key. The most common use for this key\n"
13209 " is to search for 32bit applications on 64bit operating systems.\n"
13210 " Default: None"
13211 msgstr ""
13212
13213 msgid ""
13214 "``regname``\n"
13215 " Name of value to read from specified registry key. Defaults to the\n"
13216 " unnamed (default) value."
13217 msgstr ""
13218
13219 msgid ""
13220 "``regappend``\n"
13221 " String to append to the value read from the registry, typically\n"
13222 " the executable name of the tool.\n"
13223 " Default: None"
13224 msgstr ""
13225
13226 msgid ""
13227 "\n"
13915 "``graph``\n"
13916 "\"\"\"\"\"\"\"\"\""
13917 msgstr ""
13918
13919 msgid ""
13920 "Web graph view configuration. This section let you change graph\n"
13921 "elements display properties by branches, for instance to make the\n"
13922 "``default`` branch stand out."
13923 msgstr ""
13924
13925 msgid " <branch>.<argument> = <value>"
13926 msgstr ""
13927
13928 msgid ""
13929 "where ``<branch>`` is the name of the branch being\n"
13930 "customized. Example::"
13931 msgstr ""
13932
13933 msgid ""
13934 " [graph]\n"
13935 " # 2px width\n"
13936 " default.width = 2\n"
13937 " # red color\n"
13938 " default.color = FF0000"
13939 msgstr ""
13940
13941 msgid ""
13942 "``width``\n"
13943 " Set branch edges width in pixels."
13944 msgstr ""
13945
13946 msgid ""
13947 "``color``\n"
13948 " Set branch edges color in hexadecimal RGB notation."
13949 msgstr ""
13950
13951 msgid ""
13228 13952 "``hooks``\n"
13229 13953 "\"\"\"\"\"\"\"\"\""
13230 13954 msgstr ""
@@ -13463,6 +14187,33 b' msgstr ""'
13463 14187
13464 14188 msgid ""
13465 14189 "\n"
14190 "``hostfingerprints``\n"
14191 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
14192 msgstr ""
14193
14194 msgid ""
14195 "Fingerprints of the certificates of known HTTPS servers.\n"
14196 "A HTTPS connection to a server with a fingerprint configured here will\n"
14197 "only succeed if the servers certificate matches the fingerprint.\n"
14198 "This is very similar to how ssh known hosts works.\n"
14199 "The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n"
14200 "The CA chain and web.cacerts is not used for servers with a fingerprint."
14201 msgstr ""
14202
14203 msgid "For example::"
14204 msgstr "Exempelvis::"
14205
14206 msgid ""
14207 " [hostfingerprints]\n"
14208 " hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:"
14209 "d6:4b:ee:cc"
14210 msgstr ""
14211
14212 msgid "This feature is only supported when using Python 2.6 or later."
14213 msgstr ""
14214
14215 msgid ""
14216 "\n"
13466 14217 "``http_proxy``\n"
13467 14218 "\"\"\"\"\"\"\"\"\"\"\"\"\"\""
13468 14219 msgstr ""
@@ -13501,47 +14252,160 b' msgid ""'
13501 14252 msgstr ""
13502 14253
13503 14254 msgid ""
13504 "``smtp``\n"
13505 "\"\"\"\"\"\"\"\""
13506 msgstr ""
13507
13508 msgid "Configuration for extensions that need to send email messages."
13509 msgstr ""
13510
13511 msgid ""
13512 "``host``\n"
13513 " Host name of mail server, e.g. \"mail.example.com\"."
13514 msgstr ""
13515
13516 msgid ""
13517 "``port``\n"
13518 " Optional. Port to connect to on mail server. Default: 25."
13519 msgstr ""
13520
13521 msgid ""
13522 "``tls``\n"
13523 " Optional. Method to enable TLS when connecting to mail server: "
13524 "starttls,\n"
13525 " smtps or none. Default: none."
13526 msgstr ""
13527
13528 msgid ""
13529 "``username``\n"
13530 " Optional. User name for authenticating with the SMTP server.\n"
13531 " Default: none."
13532 msgstr ""
13533
13534 msgid ""
13535 "``password``\n"
13536 " Optional. Password for authenticating with the SMTP server. If not\n"
13537 " specified, interactive sessions will prompt the user for a\n"
13538 " password; non-interactive sessions will fail. Default: none."
13539 msgstr ""
13540
13541 msgid ""
13542 "``local_hostname``\n"
13543 " Optional. It's the hostname that the sender can use to identify\n"
13544 " itself to the MTA."
14255 "``merge-patterns``\n"
14256 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
14257 msgstr ""
14258
14259 msgid ""
14260 "This section specifies merge tools to associate with particular file\n"
14261 "patterns. Tools matched here will take precedence over the default\n"
14262 "merge tool. Patterns are globs by default, rooted at the repository\n"
14263 "root."
14264 msgstr ""
14265
14266 msgid ""
14267 " [merge-patterns]\n"
14268 " **.c = kdiff3\n"
14269 " **.jpg = myimgmerge"
14270 msgstr ""
14271
14272 msgid ""
14273 "``merge-tools``\n"
14274 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
14275 msgstr ""
14276
14277 msgid ""
14278 "This section configures external merge tools to use for file-level\n"
14279 "merges."
14280 msgstr ""
14281
14282 msgid "Example ``~/.hgrc``::"
14283 msgstr ""
14284
14285 msgid ""
14286 " [merge-tools]\n"
14287 " # Override stock tool location\n"
14288 " kdiff3.executable = ~/bin/kdiff3\n"
14289 " # Specify command line\n"
14290 " kdiff3.args = $base $local $other -o $output\n"
14291 " # Give higher priority\n"
14292 " kdiff3.priority = 1"
14293 msgstr ""
14294
14295 msgid ""
14296 " # Define new tool\n"
14297 " myHtmlTool.args = -m $local $other $base $output\n"
14298 " myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n"
14299 " myHtmlTool.priority = 1"
14300 msgstr ""
14301
14302 msgid ""
14303 "``priority``\n"
14304 " The priority in which to evaluate this tool.\n"
14305 " Default: 0."
14306 msgstr ""
14307
14308 msgid ""
14309 "``executable``\n"
14310 " Either just the name of the executable or its pathname. On Windows,\n"
14311 " the path can use environment variables with ${ProgramFiles} syntax.\n"
14312 " Default: the tool name."
14313 msgstr ""
14314
14315 msgid ""
14316 "``args``\n"
14317 " The arguments to pass to the tool executable. You can refer to the\n"
14318 " files being merged as well as the output file through these\n"
14319 " variables: ``$base``, ``$local``, ``$other``, ``$output``.\n"
14320 " Default: ``$local $base $other``"
14321 msgstr ""
14322
14323 msgid ""
14324 "``premerge``\n"
14325 " Attempt to run internal non-interactive 3-way merge tool before\n"
14326 " launching external tool. Options are ``true``, ``false``, or ``keep``\n"
14327 " to leave markers in the file if the premerge fails.\n"
14328 " Default: True"
14329 msgstr ""
14330
14331 msgid ""
14332 "``binary``\n"
14333 " This tool can merge binary files. Defaults to False, unless tool\n"
14334 " was selected by file pattern match."
14335 msgstr ""
14336
14337 msgid ""
14338 "``symlink``\n"
14339 " This tool can merge symlinks. Defaults to False, even if tool was\n"
14340 " selected by file pattern match."
14341 msgstr ""
14342
14343 msgid ""
14344 "``check``\n"
14345 " A list of merge success-checking options:"
14346 msgstr ""
14347
14348 msgid ""
14349 " ``changed``\n"
14350 " Ask whether merge was successful when the merged file shows no changes.\n"
14351 " ``conflicts``\n"
14352 " Check whether there are conflicts even though the tool reported "
14353 "success.\n"
14354 " ``prompt``\n"
14355 " Always prompt for merge success, regardless of success reported by tool."
14356 msgstr ""
14357
14358 msgid ""
14359 "``checkchanged``\n"
14360 " True is equivalent to ``check = changed``.\n"
14361 " Default: False"
14362 msgstr ""
14363
14364 msgid ""
14365 "``checkconflicts``\n"
14366 " True is equivalent to ``check = conflicts``.\n"
14367 " Default: False"
14368 msgstr ""
14369
14370 msgid ""
14371 "``fixeol``\n"
14372 " Attempt to fix up EOL changes caused by the merge tool.\n"
14373 " Default: False"
14374 msgstr ""
14375
14376 msgid ""
14377 "``gui``\n"
14378 " This tool requires a graphical interface to run. Default: False"
14379 msgstr ""
14380
14381 msgid ""
14382 "``regkey``\n"
14383 " Windows registry key which describes install location of this\n"
14384 " tool. Mercurial will search for this key first under\n"
14385 " ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n"
14386 " Default: None"
14387 msgstr ""
14388
14389 msgid ""
14390 "``regkeyalt``\n"
14391 " An alternate Windows registry key to try if the first key is not\n"
14392 " found. The alternate key uses the same ``regname`` and ``regappend``\n"
14393 " semantics of the primary key. The most common use for this key\n"
14394 " is to search for 32bit applications on 64bit operating systems.\n"
14395 " Default: None"
14396 msgstr ""
14397
14398 msgid ""
14399 "``regname``\n"
14400 " Name of value to read from specified registry key. Defaults to the\n"
14401 " unnamed (default) value."
14402 msgstr ""
14403
14404 msgid ""
14405 "``regappend``\n"
14406 " String to append to the value read from the registry, typically\n"
14407 " the executable name of the tool.\n"
14408 " Default: None"
13545 14409 msgstr ""
13546 14410
13547 14411 msgid ""
@@ -13624,16 +14488,39 b' msgid ""'
13624 14488 msgstr ""
13625 14489
13626 14490 msgid ""
13627 "Specifies profiling format and file output. In this section\n"
13628 "description, 'profiling data' stands for the raw data collected\n"
13629 "during profiling, while 'profiling report' stands for a statistical\n"
13630 "text report generated from the profiling data. The profiling is done\n"
13631 "using lsprof."
14491 "Specifies profiling type, format, and file output. Two profilers are\n"
14492 "supported: an instrumenting profiler (named ``ls``), and a sampling\n"
14493 "profiler (named ``stat``)."
14494 msgstr ""
14495
14496 msgid ""
14497 "In this section description, 'profiling data' stands for the raw data\n"
14498 "collected during profiling, while 'profiling report' stands for a\n"
14499 "statistical text report generated from the profiling data. The\n"
14500 "profiling is done using lsprof."
14501 msgstr ""
14502
14503 msgid ""
14504 "``type``\n"
14505 " The type of profiler to use.\n"
14506 " Default: ls."
14507 msgstr ""
14508
14509 msgid ""
14510 " ``ls``\n"
14511 " Use Python's built-in instrumenting profiler. This profiler\n"
14512 " works on all platforms, but each line number it reports is the\n"
14513 " first line of a function. This restriction makes it difficult to\n"
14514 " identify the expensive parts of a non-trivial function.\n"
14515 " ``stat``\n"
14516 " Use a third-party statistical profiler, statprof. This profiler\n"
14517 " currently runs only on Unix systems, and is most useful for\n"
14518 " profiling commands that run for longer than about 0.1 seconds."
13632 14519 msgstr ""
13633 14520
13634 14521 msgid ""
13635 14522 "``format``\n"
13636 " Profiling format.\n"
14523 " Profiling format. Specific to the ``ls`` instrumenting profiler.\n"
13637 14524 " Default: text."
13638 14525 msgstr ""
13639 14526
@@ -13649,6 +14536,12 b' msgid ""'
13649 14536 msgstr ""
13650 14537
13651 14538 msgid ""
14539 "``frequency``\n"
14540 " Sampling frequency. Specific to the ``stat`` sampling profiler.\n"
14541 " Default: 1000."
14542 msgstr ""
14543
14544 msgid ""
13652 14545 "``output``\n"
13653 14546 " File path where profiling data or report should be saved. If the\n"
13654 14547 " file exists, it is replaced. Default: None, data is printed on\n"
@@ -13686,6 +14579,12 b' msgid ""'
13686 14579 msgstr ""
13687 14580
13688 14581 msgid ""
14582 "``preferuncompressed``\n"
14583 " When set, clients will try to use the uncompressed streaming\n"
14584 " protocol. Default is False."
14585 msgstr ""
14586
14587 msgid ""
13689 14588 "``validate``\n"
13690 14589 " Whether to validate the completeness of pushed changesets by\n"
13691 14590 " checking that all new file revisions specified in manifests are\n"
@@ -13693,21 +14592,69 b' msgid ""'
13693 14592 msgstr ""
13694 14593
13695 14594 msgid ""
14595 "``smtp``\n"
14596 "\"\"\"\"\"\"\"\""
14597 msgstr ""
14598
14599 msgid "Configuration for extensions that need to send email messages."
14600 msgstr ""
14601
14602 msgid ""
14603 "``host``\n"
14604 " Host name of mail server, e.g. \"mail.example.com\"."
14605 msgstr ""
14606
14607 msgid ""
14608 "``port``\n"
14609 " Optional. Port to connect to on mail server. Default: 25."
14610 msgstr ""
14611
14612 msgid ""
14613 "``tls``\n"
14614 " Optional. Method to enable TLS when connecting to mail server: "
14615 "starttls,\n"
14616 " smtps or none. Default: none."
14617 msgstr ""
14618
14619 msgid ""
14620 "``username``\n"
14621 " Optional. User name for authenticating with the SMTP server.\n"
14622 " Default: none."
14623 msgstr ""
14624
14625 msgid ""
14626 "``password``\n"
14627 " Optional. Password for authenticating with the SMTP server. If not\n"
14628 " specified, interactive sessions will prompt the user for a\n"
14629 " password; non-interactive sessions will fail. Default: none."
14630 msgstr ""
14631
14632 msgid ""
14633 "``local_hostname``\n"
14634 " Optional. It's the hostname that the sender can use to identify\n"
14635 " itself to the MTA."
14636 msgstr ""
14637
14638 msgid ""
14639 "\n"
13696 14640 "``subpaths``\n"
13697 14641 "\"\"\"\"\"\"\"\"\"\"\"\""
13698 14642 msgstr ""
13699 14643
13700 msgid "Defines subrepositories source locations rewriting rules of the form::"
14644 msgid ""
14645 "Subrepository source URLs can go stale if a remote server changes name\n"
14646 "or becomes temporarily unavailable. This section lets you define\n"
14647 "rewrite rules of the form::"
13701 14648 msgstr ""
13702 14649
13703 14650 msgid " <pattern> = <replacement>"
13704 14651 msgstr ""
13705 14652
13706 14653 msgid ""
13707 "Where ``pattern`` is a regular expression matching the source and\n"
13708 "``replacement`` is the replacement string used to rewrite it. Groups\n"
13709 "can be matched in ``pattern`` and referenced in ``replacements``. For\n"
13710 "instance::"
14654 "where ``pattern`` is a regular expression matching a subrepository\n"
14655 "source URL and ``replacement`` is the replacement string used to\n"
14656 "rewrite it. Groups can be matched in ``pattern`` and referenced in\n"
14657 "``replacements``. For instance::"
13711 14658 msgstr ""
13712 14659
13713 14660 msgid " http://server/(.*)-hg/ = http://hg.server/\\1/"
@@ -13716,7 +14663,10 b' msgstr ""'
13716 14663 msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
13717 14664 msgstr ""
13718 14665
13719 msgid "All patterns are applied in definition order."
14666 msgid ""
14667 "Relative subrepository paths are first made absolute, and the the\n"
14668 "rewrite rules are then applied on the full (absolute) path. The rules\n"
14669 "are applied in definition order."
13720 14670 msgstr ""
13721 14671
13722 14672 msgid ""
@@ -13857,6 +14807,12 b' msgid ""'
13857 14807 msgstr ""
13858 14808
13859 14809 msgid ""
14810 "``reportoldssl``\n"
14811 " Warn if an SSL certificate is unable to be due to using Python\n"
14812 " 2.5 or earlier. True or False. Default is True."
14813 msgstr ""
14814
14815 msgid ""
13860 14816 "``report_untrusted``\n"
13861 14817 " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n"
13862 14818 " trusted user or group. True or False. Default is True."
@@ -14043,7 +14999,27 b' msgid ""'
14043 14999 " authority certificates. Environment variables and ``~user``\n"
14044 15000 " constructs are expanded in the filename. If specified on the\n"
14045 15001 " client, then it will verify the identity of remote HTTPS servers\n"
14046 " with these certificates. The form must be as follows::"
15002 " with these certificates."
15003 msgstr ""
15004
15005 msgid ""
15006 " This feature is only supported when using Python 2.6 or later. If you "
15007 "wish\n"
15008 " to use it with earlier versions of Python, install the backported\n"
15009 " version of the ssl library that is available from\n"
15010 " ``http://pypi.python.org``."
15011 msgstr ""
15012
15013 msgid ""
15014 " To disable SSL verification temporarily, specify ``--insecure`` from\n"
15015 " command line."
15016 msgstr ""
15017
15018 msgid ""
15019 " You can use OpenSSL's CA certificate file if your platform has\n"
15020 " one. On most Linux systems this will be\n"
15021 " ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to\n"
15022 " generate this file manually. The form must be as follows::"
14047 15023 msgstr ""
14048 15024
14049 15025 msgid ""
@@ -14056,31 +15032,22 b' msgid ""'
14056 15032 msgstr ""
14057 15033
14058 15034 msgid ""
14059 " This feature is only supported when using Python 2.6 or later. If you "
14060 "wish\n"
14061 " to use it with earlier versions of Python, install the backported\n"
14062 " version of the ssl library that is available from\n"
14063 " ``http://pypi.python.org``."
14064 msgstr ""
14065
14066 msgid ""
14067 " You can use OpenSSL's CA certificate file if your platform has one.\n"
14068 " On most Linux systems this will be ``/etc/ssl/certs/ca-certificates."
14069 "crt``.\n"
14070 " Otherwise you will have to generate this file manually."
14071 msgstr ""
14072
14073 msgid ""
14074 " To disable SSL verification temporarily, specify ``--insecure`` from\n"
14075 " command line."
14076 msgstr ""
14077
14078 msgid ""
14079 15035 "``cache``\n"
14080 15036 " Whether to support caching in hgweb. Defaults to True."
14081 15037 msgstr ""
14082 15038
14083 15039 msgid ""
15040 "``collapse``\n"
15041 " With ``descend`` enabled, repositories in subdirectories are shown at\n"
15042 " a single level alongside repositories in the current path. With\n"
15043 " ``collapse`` also enabled, repositories residing at a deeper level than\n"
15044 " the current path are grouped behind navigable directory entries that\n"
15045 " lead to the locations of these repositories. In effect, this setting\n"
15046 " collapses each collection of repositories found within a subdirectory\n"
15047 " into a single entry for that subdirectory. Default is False."
15048 msgstr ""
15049
15050 msgid ""
14084 15051 "``contact``\n"
14085 15052 " Name or email address of the person in charge of the repository.\n"
14086 15053 " Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty."
@@ -14139,6 +15106,15 b' msgid ""'
14139 15106 msgstr ""
14140 15107
14141 15108 msgid ""
15109 "``comparisoncontext``\n"
15110 " Number of lines of context to show in side-by-side file comparison. If\n"
15111 " negative or the value ``full``, whole files are shown. Default is 5.\n"
15112 " This setting can be overridden by a ``context`` request parameter to "
15113 "the\n"
15114 " ``comparison`` command, taking the same values."
15115 msgstr ""
15116
15117 msgid ""
14142 15118 "``hidden``\n"
14143 15119 " Whether to hide the repository in the hgwebdir index.\n"
14144 15120 " Default is False."
@@ -14858,7 +15834,7 b' msgstr ""'
14858 15834
14859 15835 msgid ""
14860 15836 "Close changeset\n"
14861 " See 'Changeset, close'."
15837 " See 'Head, closed branch'"
14862 15838 msgstr ""
14863 15839
14864 15840 msgid ""
@@ -14969,6 +15945,13 b' msgid ""'
14969 15945 msgstr ""
14970 15946
14971 15947 msgid ""
15948 "Draft\n"
15949 " Changesets in the draft phase have not been shared with publishing\n"
15950 " repositories and may thus be safely changed by history-modifying\n"
15951 " extensions. See :hg:`help phases`."
15952 msgstr ""
15953
15954 msgid ""
14972 15955 "Graph\n"
14973 15956 " See DAG and :hg:`help graphlog`."
14974 15957 msgstr ""
@@ -14999,6 +15982,11 b' msgid ""'
14999 15982 msgstr ""
15000 15983
15001 15984 msgid ""
15985 " Closed heads can be re-opened by committing new changeset as the\n"
15986 " child of the changeset that marks a head as closed."
15987 msgstr ""
15988
15989 msgid ""
15002 15990 "Head, repository\n"
15003 15991 " A topological head which has not been closed."
15004 15992 msgstr ""
@@ -15099,6 +16087,19 b' msgid " Example: \\"You will need to p'
15099 16087 msgstr ""
15100 16088
15101 16089 msgid ""
16090 "Phase\n"
16091 " A per-changeset state tracking how the changeset has been or\n"
16092 " should be shared. See :hg:`help phases`."
16093 msgstr ""
16094
16095 msgid ""
16096 "Public\n"
16097 " Changesets in the public phase have been shared with publishing\n"
16098 " repositories and are therefore considered immutable. See :hg:`help\n"
16099 " phases`."
16100 msgstr ""
16101
16102 msgid ""
15102 16103 "Pull\n"
15103 16104 " An operation in which changesets in a remote repository which are\n"
15104 16105 " not in the local repository are brought into the local\n"
@@ -15173,6 +16174,12 b' msgid ""'
15173 16174 msgstr ""
15174 16175
15175 16176 msgid ""
16177 "Secret\n"
16178 " Changesets in the secret phase may not be shared via push, pull,\n"
16179 " or clone. See :hg:`help phases`."
16180 msgstr ""
16181
16182 msgid ""
15176 16183 "Tag\n"
15177 16184 " An alternative name given to a changeset. Tags can be used in all\n"
15178 16185 " places where Mercurial expects a changeset ID, e.g., with\n"
@@ -15276,6 +16283,13 b' msgid ""'
15276 16283 msgstr ""
15277 16284
15278 16285 msgid ""
16286 "Files that are already tracked are not affected by .hgignore, even\n"
16287 "if they appear in .hgignore. An untracked file X can be explicitly\n"
16288 "added with :hg:`add X`, even if X would be excluded by a pattern\n"
16289 "in .hgignore."
16290 msgstr ""
16291
16292 msgid ""
15279 16293 "An ignore file is a plain text file consisting of a list of patterns,\n"
15280 16294 "with one pattern per line. Empty lines are skipped. The ``#``\n"
15281 16295 "character is treated as a comment character, and the ``\\`` character\n"
@@ -15316,6 +16330,12 b' msgid ""'
15316 16330 msgstr ""
15317 16331
15318 16332 msgid ""
16333 ".. note::\n"
16334 " Patterns specified in other than ``.hgignore`` are always rooted.\n"
16335 " Please see :hg:`help patterns` for details."
16336 msgstr ""
16337
16338 msgid ""
15319 16339 "Example\n"
15320 16340 "-------"
15321 16341 msgstr ""
@@ -15342,21 +16362,22 b' msgstr ""'
15342 16362
15343 16363 msgid ""
15344 16364 "Mercurial's internal web server, hgweb, can serve either a single\n"
15345 "repository, or a collection of them. In the latter case, a special\n"
15346 "configuration file can be used to specify the repository paths to use\n"
15347 "and global web configuration options."
16365 "repository, or a tree of repositories. In the second case, repository\n"
16366 "paths and global options can be defined using a dedicated\n"
16367 "configuration file common to :hg:`serve`, ``hgweb.wsgi``,\n"
16368 "``hgweb.cgi`` and ``hgweb.fcgi``."
15348 16369 msgstr ""
15349 16370 "Mercurials interna webbserver, hgweb, kan endera dela ut ett arkiv, eller\n"
15350 "flera stycken. I det senare fallet, så kan en speciell konfigurationsfil\n"
15351 "användas för att ange arkivsökvägarna att använda och globala alternativ\n"
15352 "för webbkonfiguration"
15353
15354 msgid ""
15355 "This file uses the same syntax as other Mercurial configuration files,\n"
15356 "but only the following sections are recognized:"
16371 "en trädstruktur med arkiv. I det andra fallet kan arkivsökvägar och\n"
16372 "globala flaggor definieras med en dedikerad konfigurationsfil som delas\n"
16373 "av :hg:`serve`, ``hgweb.wsgi``, ``hgweb.cgi`` och ``hgweb.fcgi``."
16374
16375 msgid ""
16376 "This file uses the same syntax as other Mercurial configuration files\n"
16377 "but recognizes only the following sections:"
15357 16378 msgstr ""
15358 16379 "Denna fil använder samma syntax som Mercurials övriga konfigurationsfiler,\n"
15359 "men bara de följande sektionerna används:"
16380 "men använder bara de följande sektionerna:"
15360 16381
15361 16382 msgid ""
15362 16383 " - web\n"
@@ -15367,83 +16388,82 b' msgstr ""'
15367 16388 " - paths\n"
15368 16389 " - collections"
15369 16390
15370 msgid ""
15371 "The ``web`` section can specify all the settings described in the web\n"
15372 "section of the hgrc(5) documentation. See :hg:`help config` for\n"
15373 "information on where to find the manual page."
15374 msgstr ""
15375 "Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n"
15376 "i hgrc(5)-dokumentationen. Se :hg:`help config` för information om var\n"
15377 "manualsidan hittas."
15378
15379 msgid ""
15380 "The ``paths`` section provides mappings of physical repository\n"
15381 "paths to virtual ones. For instance::"
15382 msgstr ""
15383 "Sektionen ``paths`` mappar upp fysiska arkiv till virtuella. Exempelvis::"
16391 msgid "The ``web`` options are thorougly described in :hg:`help config`."
16392 msgstr "Flaggorna för ``web`` finns utförligt beskrivna i :hg:`help config`."
16393
16394 msgid ""
16395 "The ``paths`` section maps URL paths to paths of repositories in the\n"
16396 "filesystem. hgweb will not expose the filesystem directly - only\n"
16397 "Mercurial repositories can be published and only according to the\n"
16398 "configuration."
16399 msgstr ""
16400 "Sektionen ``paths`` matchar URL-sökvägar till arkivsökvägar i filsystemet.\n"
16401 "hgweb kommer inte att exponera filsystemet direkt - bara Mercurial-arkiv\n"
16402 "kan publiceras och bara som konfigurationen medger."
16403
16404 msgid ""
16405 "The left hand side is the path in the URL. Note that hgweb reserves\n"
16406 "subpaths like ``rev`` or ``file``, try using different names for\n"
16407 "nested repositories to avoid confusing effects."
16408 msgstr ""
16409 "Den vänstra sidan är sökvägen i URL:en. Notera att hgweb reserverar\n"
16410 "undersökvägar som ``rev`` eller ``file``, försök att anvädna andra namn\n"
16411 "för nästlade arkiv för att undvika förbryllande fenomen."
16412
16413 msgid ""
16414 "The right hand side is the path in the filesystem. If the specified\n"
16415 "path ends with ``*`` or ``**`` the filesystem will be searched\n"
16416 "recursively for repositories below that point.\n"
16417 "With ``*`` it will not recurse into the repositories it finds (except for\n"
16418 "``.hg/patches``).\n"
16419 "With ``**`` it will also search inside repository working directories\n"
16420 "and possibly find subrepositories."
16421 msgstr ""
16422 "Den högra sidan är sökvägen i filsystemet. Om den angivna sökvägen slutar\n"
16423 "med ``*`` eller ``**`` så kommer filsystemet att genomsökas rekursivt\n"
16424 "efter arkiv från den punkten.\n"
16425 "Med ``*`` så kommer sökningen inte att fortsätta in i funna arkiv (med\n"
16426 "undantag för ``.hg/patches``).\n"
16427 "Med ``**`` så kommer sökningen att fortsätta i arkivets arbetskopia och\n"
16428 "möjligen hitta underarkiv."
16429
16430 msgid "In this example::"
16431 msgstr "I det här exemplet::"
15384 16432
15385 16433 msgid ""
15386 16434 " [paths]\n"
15387 " projects/a = /foo/bar\n"
15388 " projects/b = /baz/quux\n"
15389 " web/root = /real/root/*\n"
15390 " / = /real/root2/*\n"
15391 " virtual/root2 = /real/root2/**"
16435 " /projects/a = /srv/tmprepos/a\n"
16436 " /projects/b = c:/repos/b\n"
16437 " / = /srv/repos/*\n"
16438 " /user/bob = /home/bob/repos/**"
15392 16439 msgstr ""
15393 16440 " [paths]\n"
15394 " projekt/a = /foo/bar\n"
15395 " projekt/b = /baz/quux\n"
15396 " web/rot = /riktig/rot/*\n"
15397 " / = /riktig/rot2/*\n"
15398 " virtuell/rot2 = /riktig/rot2/**"
16441 " /projects/a = /srv/tmprepos/a\n"
16442 " /projects/b = c:/repos/b\n"
16443 " / = /srv/repos/*\n"
16444 " /user/bob = /home/bob/repos/**"
15399 16445
15400 16446 msgid ""
15401 16447 "- The first two entries make two repositories in different directories\n"
15402 16448 " appear under the same directory in the web interface\n"
15403 "- The third entry maps every Mercurial repository found in '/real/root'\n"
15404 " into 'web/root'. This format is preferred over the [collections] one,\n"
15405 " since using absolute paths as configuration keys is not supported on "
15406 "every\n"
15407 " platform (especially on Windows).\n"
15408 "- The fourth entry is a special case mapping all repositories in\n"
15409 " '/real/root2' in the root of the virtual directory.\n"
15410 "- The fifth entry recursively finds all repositories under the real\n"
15411 " root, and maps their relative paths under the virtual root."
15412 msgstr ""
15413 "- De första två posterna gör att två arkiv i olika kataloger visas under\n"
15414 " samma katalog i webbgränssnittet\n"
15415 "- Den tredje posten mappar alla Mercurial-arkiv som hittas i '/riktig/rot'\n"
15416 " i 'web/rot'. Detta format är att föredra över det i [collections],\n"
15417 " eftersom användning av absoluta sökvägar som konfigurationsnycklar inte\n"
15418 " stödjs på alla plattformar (särskilt Windows).\n"
15419 "- Den fjärde posten är ett specialfall som mappar alla arkiv i\n"
15420 " '/riktig/rot2' i roten på den virtuella katalogen.\n"
15421 "- Den femte posten söker rekursivt efter alla arkiv under den riktiga\n"
15422 " roten, och mappar deras relativa sökvägar under den virtuella roten."
15423
15424 msgid ""
15425 "The ``collections`` section provides mappings of trees of physical\n"
15426 "repositories paths to virtual ones, though the paths syntax is generally\n"
15427 "preferred. For instance::"
15428 msgstr ""
15429 "Sektionen ``collections`` mappar upp träd av fysiska arkiv till virtuella,\n"
15430 "men användning av paths är generellt sett att föredra. Exempel::"
15431
15432 msgid ""
15433 " [collections]\n"
15434 " /foo = /foo"
15435 msgstr ""
15436 " [collections]\n"
15437 " /foo = /foo"
15438
15439 msgid ""
15440 "Here, the left side will be stripped off all repositories found in the\n"
15441 "right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n"
15442 "``bar`` and ``quux/baz`` respectively.\n"
15443 msgstr ""
15444 "Här kommer den vänstra sidan att strippas från alla arkiv som hittas i den\n"
15445 "högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n"
15446 "visas som ``bar``och ``quux/baz``.\n"
16449 "- The third entry will publish every Mercurial repository found in\n"
16450 " ``/srv/repos/``, for instance the repository ``/srv/repos/quux/``\n"
16451 " will appear as ``http://server/quux/``\n"
16452 "- The fourth entry will publish both ``http://server/user/bob/quux/``\n"
16453 " and ``http://server/user/bob/quux/testsubrepo/``"
16454 msgstr ""
16455 "- De första två posterna gör att två arkiv i olika kataloger dyker upp\n"
16456 " under samma katalog i webbgränssnittet\n"
16457 "- Den tredje posten publicerar alla Mercurial-arkiv som hittas i\n"
16458 " ``/srv/repos/``, exempelvis kommer arkivet ``/srv/repos/quux/``\n"
16459 " att dyka upp som ``http://server/quux/``\n"
16460 "- Den fjärde posten publicerar både ``http://server/user/bob/quux/``\n"
16461 " och ``http://server/user/bob/quux/testsubrepo/``"
16462
16463 msgid ""
16464 "The ``collections`` section is deprecated and has been superseeded by\n"
16465 "``paths``.\n"
16466 msgstr "Sektionen ``collections`` är föråldrad och har ersatts av ``paths``.\n"
15447 16467
15448 16468 msgid "To merge files Mercurial uses merge tools."
15449 16469 msgstr ""
@@ -15497,44 +16517,7 b' msgid ""'
15497 16517 "merge tools are:"
15498 16518 msgstr ""
15499 16519
15500 msgid ""
15501 "``internal:merge``\n"
15502 " Uses the internal non-interactive simple merge algorithm for merging\n"
15503 " files. It will fail if there are any conflicts and leave markers in\n"
15504 " the partially merged file."
15505 msgstr ""
15506
15507 msgid ""
15508 "``internal:fail``\n"
15509 " Rather than attempting to merge files that were modified on both\n"
15510 " branches, it marks them as unresolved. The resolve command must be\n"
15511 " used to resolve these conflicts."
15512 msgstr ""
15513
15514 msgid ""
15515 "``internal:local``\n"
15516 " Uses the local version of files as the merged version."
15517 msgstr ""
15518
15519 msgid ""
15520 "``internal:other``\n"
15521 " Uses the other version of files as the merged version."
15522 msgstr ""
15523
15524 msgid ""
15525 "``internal:prompt``\n"
15526 " Asks the user which of the local or the other version to keep as\n"
15527 " the merged version."
15528 msgstr ""
15529
15530 msgid ""
15531 "``internal:dump``\n"
15532 " Creates three versions of the files to merge, containing the\n"
15533 " contents of local, other and base. These files can then be used to\n"
15534 " perform a merge manually. If the file to be merged is named\n"
15535 " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
15536 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
15537 " same directory as ``a.txt``."
16520 msgid ".. internaltoolsmarker"
15538 16521 msgstr ""
15539 16522
15540 16523 msgid ""
@@ -15660,6 +16643,12 b' msgid "Alternate pattern notations must '
15660 16643 msgstr "Alternativa mönsternotationer måste anges explicit."
15661 16644
15662 16645 msgid ""
16646 ".. note::\n"
16647 " Patterns specified in ``.hgignore`` are not rooted. \n"
16648 " Please see :hg:`help hgignore` for details."
16649 msgstr ""
16650
16651 msgid ""
15663 16652 "To use a plain path name without any pattern matching, start it with\n"
15664 16653 "``path:``. These path names must completely match starting at the\n"
15665 16654 "current repository root."
@@ -15771,7 +16760,7 b' msgid ""'
15771 16760 "These phases are ordered (public < draft < secret) and no changeset\n"
15772 16761 "can be in a lower phase than its ancestors. For instance, if a\n"
15773 16762 "changeset is public, all its ancestors are also public. Lastly,\n"
15774 "changeset phases only be changed towards the public phase."
16763 "changeset phases should only be changed towards the public phase."
15775 16764 msgstr ""
15776 16765
15777 16766 msgid ""
@@ -15873,6 +16862,12 b' msgstr " - visa en lista med \xc3\xa4ndringsrevision och fas::"'
15873 16862 msgid " hg log --template \"{rev} {phase}\\n\""
15874 16863 msgstr " hg log --template \"{rev} {phase}\\n\""
15875 16864
16865 msgid " - resynchronize draft changesets relative to a remote repository::"
16866 msgstr ""
16867
16868 msgid " hg phase -fd 'outgoing(URL)' "
16869 msgstr " hg phase -fd 'outgoing(URL)' "
16870
15876 16871 msgid ""
15877 16872 "See :hg:`help phase` for more information on manually manipulating phases.\n"
15878 16873 msgstr ""
@@ -15909,22 +16904,21 b' msgstr ""'
15909 16904 "fullängdsidentifierare."
15910 16905
15911 16906 msgid ""
15912 "Any other string is treated as a tag or branch name. A tag name is a\n"
15913 "symbolic name associated with a revision identifier. A branch name\n"
15914 "denotes the tipmost revision of that branch. Tag and branch names must\n"
15915 "not contain the \":\" character."
15916 msgstr ""
15917 "Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n"
15918 "ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n"
15919 "anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n"
15920 "innehålla tecknet \":\"."
15921
15922 msgid ""
15923 "The reserved name \"tip\" is a special tag that always identifies the\n"
15924 "most recent revision."
15925 msgstr ""
15926 "Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n"
15927 "identifierar den senaste revisionen."
16907 "Any other string is treated as a bookmark, tag, or branch name. A\n"
16908 "bookmark is a movable pointer to a revision. A tag is a permanent name\n"
16909 "associated with a revision. A branch name denotes the tipmost revision\n"
16910 "of that branch. Bookmark, tag, and branch names must not contain the \":\"\n"
16911 "character."
16912 msgstr ""
16913 "Alla andra strängar behandlas som bokmärken, märken eller grennamn. Ett\n"
16914 "bokmärke är en flyttbar pekare till en revision. Ett märkesnamn är ett\n"
16915 "permanent namn associerad med en revisionsidentifierare. Ett grennamn\n"
16916 "anger den högsta revisionen på den grenen. Bokmärken, märken och\n"
16917 "grennamn kan inte innehålla tecknet \":\"."
16918
16919 msgid "The reserved name \"tip\" always identifies the most recent revision."
16920 msgstr ""
16921 "Det reserverade namnet \"tip\" identifierar alltid den senaste revisionen."
15928 16922
15929 16923 msgid ""
15930 16924 "The reserved name \"null\" indicates the null revision. This is the\n"
@@ -16129,7 +17123,8 b' msgid ""'
16129 17123 msgstr ""
16130 17124
16131 17125 msgid ""
16132 "2. Nested repository references. They are defined in ``.hgsub`` and\n"
17126 "2. Nested repository references. They are defined in ``.hgsub``, which\n"
17127 " should be placed in the root of working directory, and\n"
16133 17128 " tell where the subrepository checkouts come from. Mercurial\n"
16134 17129 " subrepositories are referenced like:"
16135 17130 msgstr ""
@@ -16159,7 +17154,8 b' msgid ""'
16159 17154 msgstr ""
16160 17155
16161 17156 msgid ""
16162 "3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
17157 "3. Nested repository states. They are defined in ``.hgsubstate``, which\n"
17158 " is placed in the root of working directory, and\n"
16163 17159 " capture whatever information is required to restore the\n"
16164 17160 " subrepositories to the state they were committed in a parent\n"
16165 17161 " repository changeset. Mercurial automatically record the nested\n"
@@ -16496,6 +17492,9 b' msgstr "uppdaterar arbetskatalog\\n"'
16496 17492 msgid "destination directory: %s\n"
16497 17493 msgstr "destinationskatalog: %s\n"
16498 17494
17495 msgid "empty destination path is not valid"
17496 msgstr "en tom destinationssökväg är inte giltig"
17497
16499 17498 #, python-format
16500 17499 msgid "destination '%s' already exists"
16501 17500 msgstr "destinationen '%s' finns redan"
@@ -16559,8 +17558,12 b' msgid "cannot start server at \'%s:%d\': %'
16559 17558 msgstr ""
16560 17559
16561 17560 #, python-format
17561 msgid "(binary file %s, hash: %s)"
17562 msgstr "(binär fil %s, hash: %s)"
17563
17564 #, python-format
16562 17565 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
16563 msgstr ""
17566 msgstr "%d filer ändrade, %d tillägg(+), %d raderingar(-)\n"
16564 17567
16565 17568 #, python-format
16566 17569 msgid "calling hook %s: %s\n"
@@ -16616,6 +17619,10 b' msgstr ""'
16616 17619 msgid "warning: %s hook %s\n"
16617 17620 msgstr ""
16618 17621
17622 #, python-format
17623 msgid "loading %s hook failed:\n"
17624 msgstr ""
17625
16619 17626 msgid "kb"
16620 17627 msgstr "kb"
16621 17628
@@ -16708,14 +17715,6 b' msgstr ""'
16708 17715 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
16709 17716 msgstr ""
16710 17717
16711 #, python-format
16712 msgid "working directory has unknown parent '%s'!"
16713 msgstr ""
16714
16715 #, python-format
16716 msgid "unknown revision '%s'"
16717 msgstr ""
16718
16719 17718 msgid "abandoned transaction found - run hg recover"
16720 17719 msgstr ""
16721 17720
@@ -16777,12 +17776,16 b' msgid "cannot partially commit a merge ('
16777 17776 msgstr ""
16778 17777 "kan inte delvis arkivera en sammanfogning (ange inte filer eller mönster"
16779 17778
17779 #, python-format
17780 msgid "commit with new subrepo %s excluded"
17781 msgstr ""
17782
17783 msgid "use --subrepos for recursive commit"
17784 msgstr ""
17785
16780 17786 msgid "can't commit subrepos without .hgsub"
16781 17787 msgstr "kan inte arkivera underarkiv utan .hgsub"
16782 17788
16783 msgid "use --subrepos for recursive commit"
16784 msgstr ""
16785
16786 17789 msgid "file not found!"
16787 17790 msgstr "filen hittades inte!"
16788 17791
@@ -16792,12 +17795,15 b' msgstr ""'
16792 17795 msgid "file not tracked!"
16793 17796 msgstr "filen spåras inte!"
16794 17797
17798 msgid "cannot commit merge with missing files"
17799 msgstr "kan inte arkivera sammanfogning när filer saknas"
17800
16795 17801 msgid "unresolved merge conflicts (see hg help resolve)"
16796 17802 msgstr "olösta sammanfogningskonflikter (se hg help resolve)"
16797 17803
16798 17804 #, python-format
16799 17805 msgid "committing subrepository %s\n"
16800 msgstr ""
17806 msgstr "arkiverar underarkiv %s\n"
16801 17807
16802 17808 #, python-format
16803 17809 msgid "note: commit message saved in %s\n"
@@ -16817,10 +17823,24 b' msgstr ""'
16817 17823 "deldragningar kan inte göras eftersom det andra arkivet inte stödjer "
16818 17824 "changegroupsubset."
16819 17825
17826 msgid "destination does not support push"
17827 msgstr "destinationen stödjer inte tryckning"
17828
17829 #, python-format
17830 msgid "push includes an obsolete changeset: %s!"
17831 msgstr "tryckningen innehåller en förlegad ändring: %s!"
17832
17833 #, python-format
17834 msgid "push includes an unstable changeset: %s!"
17835 msgstr "tryckningen innehåller en instabil ändring: %s!"
17836
16820 17837 #, python-format
16821 17838 msgid "updating %s to public failed!\n"
16822 17839 msgstr "uppdatera %s till publik misslyckades!\n"
16823 17840
17841 msgid "failed to push obsolete markers!\n"
17842 msgstr "kunde inte trycka förlegad-markörerna!\n"
17843
16824 17844 #, python-format
16825 17845 msgid "%d changesets found\n"
16826 17846 msgstr "%d ändringar hittades\n"
@@ -16865,8 +17885,8 b' msgstr " (%+d huvuden)"'
16865 17885 msgid "added %d changesets with %d changes to %d files%s\n"
16866 17886 msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n"
16867 17887
16868 msgid "Unexpected response from remote server:"
16869 msgstr ""
17888 msgid "unexpected response from remote server:"
17889 msgstr "oväntat svar från server:"
16870 17890
16871 17891 msgid "operation forbidden by server"
16872 17892 msgstr ""
@@ -16884,6 +17904,9 b' msgstr "str\xc3\xb6mmar alla \xc3\xa4ndringar\\n"'
16884 17904 msgid "%d files to transfer, %s of data\n"
16885 17905 msgstr "%d filer att överföra, %s med data\n"
16886 17906
17907 msgid "clone"
17908 msgstr ""
17909
16887 17910 #, python-format
16888 17911 msgid "transferred %s in %.1f seconds (%s/sec)\n"
16889 17912 msgstr "överförde %s på %.1f sekunder (%s/sek)\n"
@@ -17024,6 +18047,10 b' msgstr "h\xc3\xa4mtar %s till %s\\n"'
17024 18047 msgid "note: possible conflict - %s was renamed multiple times to:\n"
17025 18048 msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n"
17026 18049
18050 #, python-format
18051 msgid "note: possible conflict - %s was deleted and renamed to:\n"
18052 msgstr "notera: möjlig konflikt - %s raderades och döptes om till:\n"
18053
17027 18054 msgid "merging with a working directory ancestor has no effect"
17028 18055 msgstr ""
17029 18056
@@ -17071,6 +18098,24 b' msgid "Warning!"'
17071 18098 msgstr "Varning!"
17072 18099
17073 18100 #, python-format
18101 msgid "parsing obsolete marker: unknown version %r"
18102 msgstr "tolkar förlegad-markering: okänd version %r"
18103
18104 #, python-format
18105 msgid ""
18106 "parsing obsolete marker: metadata is too short, %d bytes expected, got %d"
18107 msgstr ""
18108 "tolkar förlegad-markering: metadata är för kort, %d bytes förväntades, fick "
18109 "%d"
18110
18111 #, python-format
18112 msgid "unknown key: %r"
18113 msgstr "okänd nyckel: %r"
18114
18115 msgid "unexpected old value"
18116 msgstr "oväntat gammalt värde"
18117
18118 #, python-format
17074 18119 msgid "unexpected token: %s"
17075 18120 msgstr ""
17076 18121
@@ -17130,11 +18175,16 b' msgstr ""'
17130 18175 msgid "bad hunk #%d old text line %d"
17131 18176 msgstr ""
17132 18177
17133 msgid "could not extract binary patch"
17134 msgstr ""
17135
17136 #, python-format
17137 msgid "binary patch is %d bytes, not %d"
18178 #, python-format
18179 msgid "could not extract \"%s\" binary data"
18180 msgstr ""
18181
18182 #, python-format
18183 msgid "could not decode \"%s\" binary patch: %s"
18184 msgstr ""
18185
18186 #, python-format
18187 msgid "\"%s\" length is %d bytes, should be %d"
17138 18188 msgstr ""
17139 18189
17140 18190 #, python-format
@@ -17145,6 +18195,10 b' msgid "undefined source and destination '
17145 18195 msgstr ""
17146 18196
17147 18197 #, python-format
18198 msgid "failed to synchronize metadata for \"%s\""
18199 msgstr ""
18200
18201 #, python-format
17148 18202 msgid "cannot create %s: destination already exists"
17149 18203 msgstr ""
17150 18204
@@ -17164,6 +18218,13 b' msgid "patch failed to apply"'
17164 18218 msgstr ""
17165 18219
17166 18220 #, python-format
18221 msgid "cannot %s; remote repository does not support the %r capability"
18222 msgstr "kan inte %s; fjärrarkivet har inte %r-förmågan"
18223
18224 msgid "cannot change null revision phase"
18225 msgstr "kan inte ändra fas för null-revisionen"
18226
18227 #, python-format
17167 18228 msgid "ignoring inconsistent public root from remote: %s\n"
17168 18229 msgstr ""
17169 18230
@@ -17172,6 +18233,10 b' msgid "ignoring unexpected root from rem'
17172 18233 msgstr ""
17173 18234
17174 18235 #, python-format
18236 msgid "phases.new-commit: not a valid phase name ('%s')"
18237 msgstr ""
18238
18239 #, python-format
17175 18240 msgid "exited with status %d"
17176 18241 msgstr ""
17177 18242
@@ -17187,6 +18252,10 b' msgid "adding branch\\n"'
17187 18252 msgstr ""
17188 18253
17189 18254 #, python-format
18255 msgid "error removing %s: %s\n"
18256 msgstr "fel vid radering av %s: %s\n"
18257
18258 #, python-format
17190 18259 msgid "strip failed, full bundle stored in '%s'\n"
17191 18260 msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n"
17192 18261
@@ -17195,7 +18264,7 b' msgid "strip failed, partial bundle stor'
17195 18264 msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n"
17196 18265
17197 18266 #, python-format
17198 msgid "cannot %s; remote repository does not support the %r capability"
18267 msgid "revlog decompress error: %s"
17199 18268 msgstr ""
17200 18269
17201 18270 #, python-format
@@ -17298,7 +18367,8 b' msgid ""'
17298 18367 " - ``range`` : csets taking part in the bisection\n"
17299 18368 " - ``pruned`` : csets that are goods, bads or skipped\n"
17300 18369 " - ``untested`` : csets whose fate is yet unknown\n"
17301 " - ``ignored`` : csets ignored due to DAG topology"
18370 " - ``ignored`` : csets ignored due to DAG topology\n"
18371 " - ``current`` : the cset currently being bisected"
17302 18372 msgstr ""
17303 18373
17304 18374 msgid "bisect requires a string"
@@ -17309,6 +18379,13 b' msgid ""'
17309 18379 " The named bookmark or all bookmarks."
17310 18380 msgstr ""
17311 18381
18382 msgid ""
18383 " If `name` starts with `re:`, the remainder of the name is treated as\n"
18384 " a regular expression. To match a bookmark that actually starts with `re:"
18385 "`,\n"
18386 " use the prefix `literal:`."
18387 msgstr ""
18388
17312 18389 #. i18n: "bookmark" is a keyword
17313 18390 msgid "bookmark takes one or no arguments"
17314 18391 msgstr "bookmark tar ett eller inga argument"
@@ -17317,6 +18394,10 b' msgstr "bookmark tar ett eller inga argu'
17317 18394 msgid "the argument to bookmark must be a string"
17318 18395 msgstr "argumentet till bookmark måste vara en sträng"
17319 18396
18397 #, python-format
18398 msgid "no bookmarks exist that match '%s'"
18399 msgstr ""
18400
17320 18401 msgid ""
17321 18402 "``branch(string or set)``\n"
17322 18403 " All changesets belonging to the given branch or the branches of the "
@@ -17325,6 +18406,13 b' msgid ""'
17325 18406 msgstr ""
17326 18407
17327 18408 msgid ""
18409 " If `string` starts with `re:`, the remainder of the name is treated as\n"
18410 " a regular expression. To match a branch that actually starts with `re:"
18411 "`,\n"
18412 " use the prefix `literal:`."
18413 msgstr ""
18414
18415 msgid ""
17328 18416 "``children(set)``\n"
17329 18417 " Child changesets of changesets in set."
17330 18418 msgstr ""
@@ -17346,7 +18434,19 b' msgstr ""'
17346 18434
17347 18435 #. i18n: "contains" is a keyword
17348 18436 msgid "contains requires a pattern"
17349 msgstr "contain kräver ett mönster"
18437 msgstr "contains kräver ett mönster"
18438
18439 msgid ""
18440 "``converted([id])``\n"
18441 " Changesets converted from the given identifier in the old repository if\n"
18442 " present, or all converted changesets if no identifier is specified."
18443 msgstr ""
18444
18445 msgid "converted takes one or no arguments"
18446 msgstr "converted tar ett eller inga argument"
18447
18448 msgid "converted requires a revision"
18449 msgstr "converted kräver en revision"
17350 18450
17351 18451 msgid ""
17352 18452 "``date(interval)``\n"
@@ -17372,6 +18472,15 b' msgid ""'
17372 18472 msgstr ""
17373 18473
17374 18474 msgid ""
18475 "``destination([set])``\n"
18476 " Changesets that were created by a graft, transplant or rebase "
18477 "operation,\n"
18478 " with the given revisions specified as the source. Omitting the optional "
18479 "set\n"
18480 " is the same as passing all()."
18481 msgstr ""
18482
18483 msgid ""
17375 18484 "``draft()``\n"
17376 18485 " Changeset in draft phase."
17377 18486 msgstr ""
@@ -17380,6 +18489,35 b' msgid "draft takes no arguments"'
17380 18489 msgstr "draft tar inga argument"
17381 18490
17382 18491 msgid ""
18492 "``extinct()``\n"
18493 " obsolete changeset with obsolete descendant only."
18494 msgstr ""
18495
18496 msgid "obsolete takes no arguments"
18497 msgstr "obsolete tar inga argument"
18498
18499 msgid ""
18500 "``extra(label, [value])``\n"
18501 " Changesets with the given label in the extra metadata, with the given\n"
18502 " optional value."
18503 msgstr ""
18504
18505 msgid ""
18506 " If `value` starts with `re:`, the remainder of the value is treated as\n"
18507 " a regular expression. To match a value that actually starts with `re:`,\n"
18508 " use the prefix `literal:`."
18509 msgstr ""
18510
18511 msgid "extra takes at least 1 and at most 2 arguments"
18512 msgstr "extra tar minst 1 och som mest 2 argument"
18513
18514 msgid "first argument to extra must be a string"
18515 msgstr "första argumentet till extra måste vara en sträng"
18516
18517 msgid "second argument to extra must be a string"
18518 msgstr "andra argumentet till extra måste vara en sträng"
18519
18520 msgid ""
17383 18521 "``filelog(pattern)``\n"
17384 18522 " Changesets connected to the specified filelog."
17385 18523 msgstr ""
@@ -17392,6 +18530,14 b' msgid ""'
17392 18530 " An alias for limit()."
17393 18531 msgstr ""
17394 18532
18533 #, python-format
18534 msgid "%s takes no arguments or a filename"
18535 msgstr "%s tar inga argument eller ett filnamn"
18536
18537 #, python-format
18538 msgid "%s expected a filename"
18539 msgstr "%s förväntade sig ett filnamn"
18540
17395 18541 msgid ""
17396 18542 "``follow([file])``\n"
17397 18543 " An alias for ``::.`` (ancestors of the working copy's first parent).\n"
@@ -17399,13 +18545,6 b' msgid ""'
17399 18545 " including copies."
17400 18546 msgstr ""
17401 18547
17402 #. i18n: "follow" is a keyword
17403 msgid "follow takes no arguments or a filename"
17404 msgstr "follow tar inga argument eller ett filnamn"
17405
17406 msgid "follow expected a filename"
17407 msgstr "follow förväntade sig ett filnamn"
17408
17409 18548 msgid ""
17410 18549 "``all()``\n"
17411 18550 " All changesets, the same as ``0:tip``."
@@ -17430,6 +18569,23 b' msgstr "grep kr\xc3\xa4ver en str\xc3\xa4ng"'
17430 18569 msgid "invalid match pattern: %s"
17431 18570 msgstr "ogiltigt träffmönster: %s"
17432 18571
18572 #. i18n: "_matchfiles" is a keyword
18573 msgid "_matchfiles requires at least one argument"
18574 msgstr "_matchfiles kräver minst ett argument"
18575
18576 msgid "_matchfiles requires string arguments"
18577 msgstr "_matchfiles kräver strängargument"
18578
18579 msgid "_matchfiles expected at most one revision"
18580 msgstr "_matchfiles förväntade sig som mest en revision"
18581
18582 msgid "_matchfiles expected at most one default mode"
18583 msgstr "_matchfiles förvändate sig som mest ett standardläge"
18584
18585 #, python-format
18586 msgid "invalid _matchfiles prefix: %s"
18587 msgstr "ogiltigt _matchfiles-prefix: %s"
18588
17433 18589 msgid ""
17434 18590 "``file(pattern)``\n"
17435 18591 " Changesets affecting files matched by pattern."
@@ -17539,6 +18695,24 b' msgid "id requires a string"'
17539 18695 msgstr "id kräver en sträng"
17540 18696
17541 18697 msgid ""
18698 "``obsolete()``\n"
18699 " Mutable changeset with a newer version."
18700 msgstr ""
18701
18702 msgid ""
18703 "``origin([set])``\n"
18704 " Changesets that were specified as a source for the grafts, transplants "
18705 "or\n"
18706 " rebases that created the given revisions. Omitting the optional set is "
18707 "the\n"
18708 " same as passing all(). If a changeset created by these operations is "
18709 "itself\n"
18710 " specified as a source for one of these operations, only the source "
18711 "changeset\n"
18712 " for the first operation is selected."
18713 msgstr ""
18714
18715 msgid ""
17542 18716 "``outgoing([path])``\n"
17543 18717 " Changesets not found in the specified destination repository, or the\n"
17544 18718 " default push location."
@@ -17578,6 +18752,12 b' msgid ""'
17578 18752 msgstr ""
17579 18753
17580 18754 msgid ""
18755 " If any of specified revisions is not present in the local repository,\n"
18756 " the query is normally aborted. But this predicate allows the query\n"
18757 " to continue even in such cases."
18758 msgstr ""
18759
18760 msgid ""
17581 18761 "``public()``\n"
17582 18762 " Changeset in public phase."
17583 18763 msgstr ""
@@ -17631,13 +18811,60 b' msgid "rev expects a number"'
17631 18811 msgstr "rev förväntar sig ett nummer"
17632 18812
17633 18813 msgid ""
18814 "``matching(revision [, field])``\n"
18815 " Changesets in which a given set of fields match the set of fields in "
18816 "the\n"
18817 " selected revision or set."
18818 msgstr ""
18819
18820 msgid ""
18821 " To match more than one field pass the list of fields to match separated\n"
18822 " by spaces (e.g. ``author description``)."
18823 msgstr ""
18824
18825 msgid ""
18826 " Valid fields are most regular revision fields and some special fields."
18827 msgstr ""
18828
18829 msgid ""
18830 " Regular revision fields are ``description``, ``author``, ``branch``,\n"
18831 " ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``\n"
18832 " and ``diff``.\n"
18833 " Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the\n"
18834 " contents of the revision. Two revisions matching their ``diff`` will\n"
18835 " also match their ``files``."
18836 msgstr ""
18837
18838 msgid ""
18839 " Special fields are ``summary`` and ``metadata``:\n"
18840 " ``summary`` matches the first line of the description.\n"
18841 " ``metadata`` is equivalent to matching ``description user date``\n"
18842 " (i.e. it matches the main metadata fields)."
18843 msgstr ""
18844
18845 msgid ""
18846 " ``metadata`` is the default field which is used when no fields are\n"
18847 " specified. You can match more than one field at a time."
18848 msgstr ""
18849
18850 msgid "matching takes 1 or 2 arguments"
18851 msgstr "matching tar 1 eller 2 argument"
18852
18853 msgid "matching requires a string as its second argument"
18854 msgstr "matching kräver en sträng som sitt andra argument"
18855
18856 #, python-format
18857 msgid "unexpected field name passed to matching: %s"
18858 msgstr "oväntat fältnamn skickat till matching: %s"
18859
18860 msgid ""
17634 18861 "``reverse(set)``\n"
17635 18862 " Reverse order of set."
17636 18863 msgstr ""
17637 18864
17638 18865 msgid ""
17639 18866 "``roots(set)``\n"
17640 " Changesets with no parent changeset in set."
18867 " Changesets in set with no parent changeset in set."
17641 18868 msgstr ""
17642 18869
17643 18870 msgid ""
@@ -17676,6 +18903,10 b' msgstr "sort-spec m\xc3\xa5ste vara en str\xc3\xa4ng"'
17676 18903 msgid "unknown sort key %r"
17677 18904 msgstr "okänd sorteringsnyckel %r"
17678 18905
18906 #, python-format
18907 msgid "invalid regular expression: %s"
18908 msgstr "ogiltigt reguljärt uttryck: %s"
18909
17679 18910 msgid ""
17680 18911 "``tag([name])``\n"
17681 18912 " The specified tag by name, or all tagged revisions if no name is given."
@@ -17689,11 +18920,27 b' msgstr "tag tar ett eller inga argument"'
17689 18920 msgid "the argument to tag must be a string"
17690 18921 msgstr "argumentet till tag måste vara en sträng"
17691 18922
18923 #, python-format
18924 msgid "no tags exist that match '%s'"
18925 msgstr "inga märken finns som matchar '%s'"
18926
18927 msgid ""
18928 "``unstable()``\n"
18929 " Unstable changesets are non-obsolete with obsolete descendants."
18930 msgstr ""
18931
17692 18932 msgid ""
17693 18933 "``user(string)``\n"
17694 18934 " User name contains string. The match is case-insensitive."
17695 18935 msgstr ""
17696 18936
18937 msgid ""
18938 " If `string` starts with `re:`, the remainder of the string is treated "
18939 "as\n"
18940 " a regular expression. To match a user that actually contains `re:`, use\n"
18941 " the prefix `literal:`."
18942 msgstr ""
18943
17697 18944 msgid "can't negate that"
17698 18945 msgstr "kan inte negera det"
17699 18946
@@ -17701,6 +18948,10 b' msgid "not a symbol"'
17701 18948 msgstr "inte en symbol"
17702 18949
17703 18950 #, python-format
18951 msgid "infinite expansion of revset alias \"%s\" detected"
18952 msgstr ""
18953
18954 #, python-format
17704 18955 msgid "invalid number of arguments: %s"
17705 18956 msgstr "felaktigt antal argument: %s"
17706 18957
@@ -17739,6 +18990,9 b' msgstr ""'
17739 18990 msgid "could not symlink to %r: %s"
17740 18991 msgstr ""
17741 18992
18993 msgid "empty revision range"
18994 msgstr "tomt revisionsset"
18995
17742 18996 #, python-format
17743 18997 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
17744 18998 msgstr ""
@@ -17899,6 +19153,10 b' msgid "subrepo spec file %s not found"'
17899 19153 msgstr ""
17900 19154
17901 19155 #, python-format
19156 msgid "invalid subrepository revision specifier in .hgsubstate line %d"
19157 msgstr ""
19158
19159 #, python-format
17902 19160 msgid "bad subrepository pattern in %s: %s"
17903 19161 msgstr ""
17904 19162
@@ -17971,6 +19229,10 b' msgid "pushing subrepo %s to %s\\n"'
17971 19229 msgstr "trycker underarkivet %s till %s\n"
17972 19230
17973 19231 #, python-format
19232 msgid "reverting subrepo %s\n"
19233 msgstr "återställer underarkivet %s\n"
19234
19235 #, python-format
17974 19236 msgid "'svn' executable not found for subrepo '%s'"
17975 19237 msgstr ""
17976 19238
@@ -17980,10 +19242,22 b' msgstr "kan inte h\xc3\xa4mta version p\xc3\xa5 svn-verktyg"'
17980 19242 msgid "cannot commit svn externals"
17981 19243 msgstr ""
17982 19244
19245 msgid "cannot commit missing svn entries"
19246 msgstr ""
19247
19248 msgid "failed to commit svn changes"
19249 msgstr "kunde inte arkivera svn-ändringar"
19250
17983 19251 #, python-format
17984 19252 msgid "not removing repo %s because it has changes.\n"
17985 19253 msgstr "raderar inte arkivet %s eftersom den har ändringar.\n"
17986 19254
19255 msgid "cannot retrieve git version"
19256 msgstr "kan inte hämta git-version"
19257
19258 msgid "git subrepo requires at least 1.6.0 or later"
19259 msgstr "git-underarkiv kräver minst 1.6.0 eller senare"
19260
17987 19261 #, python-format
17988 19262 msgid "revision %s does not exist in subrepo %s\n"
17989 19263 msgstr "revisionen %s existerar inte i underarkivet %s\n"
@@ -18010,14 +19284,14 b' msgstr "trycker grenen %s fr\xc3\xa5n underarkivet %s\\n"'
18010 19284 #, python-format
18011 19285 msgid ""
18012 19286 "no branch checked out in subrepo %s\n"
18013 "cannot push revision %s"
19287 "cannot push revision %s\n"
18014 19288 msgstr ""
18015 19289 "ingen gren uthämtar i underarkivet %s\n"
18016 "kan inte trycka revison %s"
19290 "kan inte trycka revison %s\n"
18017 19291
18018 19292 #, python-format
18019 19293 msgid "%s, line %s: %s\n"
18020 msgstr ""
19294 msgstr "%s, rad %s: %s\n"
18021 19295
18022 19296 msgid "cannot parse entry"
18023 19297 msgstr ""
@@ -18109,7 +19383,26 b' msgid ""'
18109 19383 " XML entities."
18110 19384 msgstr ""
18111 19385
18112 msgid ":person: Any text. Returns the text before an email address."
19386 msgid ""
19387 ":person: Any text. Returns the name before an email address,\n"
19388 " interpreting it as per RFC 5322."
19389 msgstr ""
19390
19391 msgid ""
19392 " >>> person('foo@bar')\n"
19393 " 'foo'\n"
19394 " >>> person('Foo Bar <foo@bar>')\n"
19395 " 'Foo Bar'\n"
19396 " >>> person('\"Foo Bar\" <foo@bar>')\n"
19397 " 'Foo Bar'\n"
19398 " >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
19399 " 'Foo \"buz\" Bar'\n"
19400 " >>> # The following are invalid, but do exist in real-life\n"
19401 " ...\n"
19402 " >>> person('Foo \"buz\" Bar <foo@bar>')\n"
19403 " 'Foo \"buz\" Bar'\n"
19404 " >>> person('\"Foo Bar <foo@bar>')\n"
19405 " 'Foo Bar'"
18113 19406 msgstr ""
18114 19407
18115 19408 msgid ""
@@ -18160,7 +19453,12 b' msgid ""'
18160 19453 " \"foo bar\" becomes \"foo%20bar\"."
18161 19454 msgstr ""
18162 19455
18163 msgid ":user: Any text. Returns the user portion of an email address."
19456 msgid ""
19457 ":user: Any text. Returns a short representation of a user name or email\n"
19458 " address."
19459 msgstr ""
19460
19461 msgid ":emailuser: Any text. Returns the user portion of an email address."
18164 19462 msgstr ""
18165 19463
18166 19464 msgid ":author: String. The unmodified author of the changeset."
@@ -18248,6 +19546,13 b' msgstr ""'
18248 19546 msgid ":tags: List of strings. Any tags associated with the changeset."
18249 19547 msgstr ""
18250 19548
19549 msgid ""
19550 ":parents: List of strings. The parents of the changeset in \"rev:node\"\n"
19551 " format. If the changeset has only one \"natural\" parent (the "
19552 "predecessor\n"
19553 " revision) nothing is shown."
19554 msgstr ""
19555
18251 19556 #, python-format
18252 19557 msgid "unknown method '%s'"
18253 19558 msgstr "okänd metod '%s'"
@@ -18301,12 +19606,12 b' msgid "already have changeset "'
18301 19606 msgstr "har redan ändringen "
18302 19607
18303 19608 #, python-format
18304 msgid "Not trusting file %s from untrusted user %s, group %s\n"
18305 msgstr "Litar inte på filen %s från opålitlig användare %s, grupp %s\n"
18306
18307 #, python-format
18308 msgid "Ignored: %s\n"
18309 msgstr ""
19609 msgid "not trusting file %s from untrusted user %s, group %s\n"
19610 msgstr "litar inte på filen %s från opålitlig användare %s, grupp %s\n"
19611
19612 #, python-format
19613 msgid "ignored: %s\n"
19614 msgstr "ignorerad: %s\n"
18310 19615
18311 19616 #, python-format
18312 19617 msgid "(deprecated '%%' in path %s=%s from %s)\n"
@@ -18324,8 +19629,8 b' msgid "enter a commit username:"'
18324 19629 msgstr ""
18325 19630
18326 19631 #, python-format
18327 msgid "No username found, using '%s' instead\n"
18328 msgstr "Inget användarnamn hittades, använder '%s' istället\n"
19632 msgid "no username found, using '%s' instead\n"
19633 msgstr "inget användarnamn hittades, använder '%s' istället\n"
18329 19634
18330 19635 msgid "no username supplied (see \"hg help config\")"
18331 19636 msgstr "inget användarnamn angivet (se \"hg help config\")"
@@ -18341,10 +19646,7 b' msgid "unrecognized response\\n"'
18341 19646 msgstr ""
18342 19647
18343 19648 msgid "password: "
18344 msgstr ""
18345
18346 msgid "edit failed"
18347 msgstr ""
19649 msgstr "lösenord: "
18348 19650
18349 19651 msgid "http authorization required"
18350 19652 msgstr "http-autenticiering krävs"
General Comments 0
You need to be logged in to leave comments. Login now