| branch | stable |
| changeset 17239 | 848a1c1e51cd |
| parent 16035 | b2392a395fcf |
| child 17279 | 1f0dd9766654 |
| 17228:d1b49b02bc16 | 17239:848a1c1e51cd |
|---|---|
2 # Svensk översättning för Mercurial |
2 # Svensk översättning för Mercurial |
3 # Copyright (C) 2009-2012 Matt Mackall and others |
3 # Copyright (C) 2009-2012 Matt Mackall and others |
4 # |
4 # |
5 # Translation dictionary: |
5 # Translation dictionary: |
6 # |
6 # |
7 # amend förändra |
|
7 # changeset ändring |
8 # changeset ändring |
8 # commit arkivera |
9 # commit arkivera |
10 # graft ympa |
|
9 # merge sammanfoga |
11 # merge sammanfoga |
12 # strip avlägsna |
|
10 # tag märke |
13 # tag märke |
11 # |
14 # |
12 msgid "" |
15 msgid "" |
13 msgstr "" |
16 msgstr "" |
14 "Project-Id-Version: Mercurial\n" |
17 "Project-Id-Version: Mercurial\n" |
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
18 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
16 "POT-Creation-Date: 2012-01-30 16:25+0100\n" |
19 "POT-Creation-Date: 2012-07-23 20:26+0200\n" |
17 "PO-Revision-Date: 2012-01-30 16:27+0100\n" |
20 "PO-Revision-Date: 2012-07-23 20:38+0200\n" |
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
21 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
19 "Language-Team: Swedish\n" |
22 "Language-Team: Swedish\n" |
20 "Language: Swedish\n" |
23 "Language: Swedish\n" |
21 "MIME-Version: 1.0\n" |
24 "MIME-Version: 1.0\n" |
22 "Content-Type: text/plain; charset=utf-8\n" |
25 "Content-Type: text/plain; charset=utf-8\n" |
108 msgstr "" |
111 msgstr "" |
109 |
112 |
110 msgid "" |
113 msgid "" |
111 "- a comma-separated list containing users and groups, or\n" |
114 "- a comma-separated list containing users and groups, or\n" |
112 "- an asterisk, to match anyone;" |
115 "- an asterisk, to match anyone;" |
116 msgstr "" |
|
117 |
|
118 msgid "" |
|
119 "You can add the \"!\" prefix to a user or group name to invert the sense\n" |
|
120 "of the match." |
|
113 msgstr "" |
121 msgstr "" |
114 |
122 |
115 msgid "" |
123 msgid "" |
116 "Path-based Access Control\n" |
124 "Path-based Access Control\n" |
117 "........................." |
125 "........................." |
260 " # under the \"images\" folder:\n" |
268 " # under the \"images\" folder:\n" |
261 " images/** = jack, @designers" |
269 " images/** = jack, @designers" |
262 msgstr "" |
270 msgstr "" |
263 |
271 |
264 msgid "" |
272 msgid "" |
265 " # Everyone (except for \"user6\" - see acl.deny above) will have write\n" |
273 " # Everyone (except for \"user6\" and \"@hg-denied\" - see acl.deny above)\n" |
266 " # access to any file under the \"resources\" folder (except for 1\n" |
274 " # will have write access to any file under the \"resources\" folder\n" |
267 " # file. See acl.deny):\n" |
275 " # (except for 1 file. See acl.deny):\n" |
268 " src/main/resources/** = *" |
276 " src/main/resources/** = *" |
269 msgstr "" |
277 msgstr "" |
270 |
278 |
271 msgid " .hgtags = release_engineer" |
279 msgid " .hgtags = release_engineer" |
280 msgstr "" |
|
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" |
|
272 msgstr "" |
338 msgstr "" |
273 |
339 |
274 #, python-format |
340 #, python-format |
275 msgid "group '%s' is undefined" |
341 msgid "group '%s' is undefined" |
276 msgstr "" |
342 msgstr "" |
303 "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
369 "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
304 "that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n" |
370 "that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n" |
305 "the Mercurial template mechanism." |
371 "the Mercurial template mechanism." |
306 msgstr "" |
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 msgstr "" |
377 msgstr "" |
310 |
378 |
311 msgid "Three basic modes of access to Bugzilla are provided:" |
379 msgid "Three basic modes of access to Bugzilla are provided:" |
312 msgstr "" |
380 msgstr "" |
313 |
381 |
332 "must be run on the host with the Bugzilla install, and requires\n" |
400 "must be run on the host with the Bugzilla install, and requires\n" |
333 "permission to read Bugzilla configuration details and the necessary\n" |
401 "permission to read Bugzilla configuration details and the necessary\n" |
334 "MySQL user and password to have full access rights to the Bugzilla\n" |
402 "MySQL user and password to have full access rights to the Bugzilla\n" |
335 "database. For these reasons this access mode is now considered\n" |
403 "database. For these reasons this access mode is now considered\n" |
336 "deprecated, and will not be updated for new Bugzilla versions going\n" |
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 msgstr "" |
406 msgstr "" |
339 |
407 |
340 msgid "" |
408 msgid "" |
341 "Access via XMLRPC needs a Bugzilla username and password to be specified\n" |
409 "Access via XMLRPC needs a Bugzilla username and password to be specified\n" |
342 "in the configuration. Comments are added under that username. Since the\n" |
410 "in the configuration. Comments are added under that username. Since the\n" |
343 "configuration must be readable by all Mercurial users, it is recommended\n" |
411 "configuration must be readable by all Mercurial users, it is recommended\n" |
344 "that the rights of that user are restricted in Bugzilla to the minimum\n" |
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 msgstr "" |
415 msgstr "" |
347 |
416 |
348 msgid "" |
417 msgid "" |
349 "Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n" |
418 "Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n" |
350 "email to the Bugzilla email interface to submit comments to bugs.\n" |
419 "email to the Bugzilla email interface to submit comments to bugs.\n" |
351 "The From: address in the email is set to the email address of the Mercurial\n" |
420 "The From: address in the email is set to the email address of the Mercurial\n" |
352 "user, so the comment appears to come from the Mercurial user. In the event\n" |
421 "user, so the comment appears to come from the Mercurial user. In the event\n" |
353 "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" |
422 "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" |
354 "user, the email associated with the Bugzilla username used to log into\n" |
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 msgstr "" |
426 msgstr "" |
357 |
427 |
358 msgid "Configuration items common to all access modes:" |
428 msgid "Configuration items common to all access modes:" |
359 msgstr "" |
429 msgstr "" |
360 |
430 |
373 " including 2.18." |
443 " including 2.18." |
374 msgstr "" |
444 msgstr "" |
375 |
445 |
376 msgid "" |
446 msgid "" |
377 "bugzilla.regexp\n" |
447 "bugzilla.regexp\n" |
378 " Regular expression to match bug IDs in changeset commit message.\n" |
448 " Regular expression to match bug IDs for update in changeset commit " |
379 " Must contain one \"()\" group. The default expression matches ``Bug\n" |
449 "message.\n" |
380 " 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n" |
450 " It must contain one \"()\" named group ``<ids>`` containing the bug\n" |
381 " ``Bug 1234 and 5678`` and variations thereof. Matching is case\n" |
451 " IDs separated by non-digit characters. It may also contain\n" |
382 " insensitive." |
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 msgstr "" |
485 msgstr "" |
384 |
486 |
385 msgid "" |
487 msgid "" |
386 "bugzilla.style\n" |
488 "bugzilla.style\n" |
387 " The style file to use when formatting comments." |
489 " The style file to use when formatting comments." |
649 |
751 |
650 msgid "unknown database schema" |
752 msgid "unknown database schema" |
651 msgstr "" |
753 msgstr "" |
652 |
754 |
653 #, python-format |
755 #, python-format |
756 msgid "bug %d does not exist\n" |
|
757 msgstr "bugg %d existerar inte\n" |
|
758 |
|
759 #, python-format |
|
654 msgid "bug %d already knows about changeset %s\n" |
760 msgid "bug %d already knows about changeset %s\n" |
655 msgstr "" |
761 msgstr "" |
656 |
762 |
657 msgid "telling bugzilla to send mail:\n" |
763 msgid "telling bugzilla to send mail:\n" |
658 msgstr "" |
764 msgstr "" |
680 msgid "cannot find bugzilla user id for %s" |
786 msgid "cannot find bugzilla user id for %s" |
681 msgstr "" |
787 msgstr "" |
682 |
788 |
683 #, python-format |
789 #, python-format |
684 msgid "cannot find bugzilla user id for %s or %s" |
790 msgid "cannot find bugzilla user id for %s or %s" |
791 msgstr "" |
|
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" |
|
685 msgstr "" |
797 msgstr "" |
686 |
798 |
687 msgid "configuration 'bzemail' missing" |
799 msgid "configuration 'bzemail' missing" |
688 msgstr "'bzemail' inte konfigurerad" |
800 msgstr "'bzemail' inte konfigurerad" |
689 |
801 |
692 msgstr "" |
804 msgstr "" |
693 |
805 |
694 #, python-format |
806 #, python-format |
695 msgid "bugzilla version %s not supported" |
807 msgid "bugzilla version %s not supported" |
696 msgstr "bugzilla version %s stöds inte" |
808 msgstr "bugzilla version %s stöds inte" |
809 |
|
810 #, python-format |
|
811 msgid "%s: invalid hours\n" |
|
812 msgstr "%s: ogiltiga timmar\n" |
|
697 |
813 |
698 msgid "" |
814 msgid "" |
699 "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
815 "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
700 "details:\n" |
816 "details:\n" |
701 "\t{desc|tabindent}" |
817 "\t{desc|tabindent}" |
707 |
823 |
708 #, python-format |
824 #, python-format |
709 msgid "Bugzilla error: %s" |
825 msgid "Bugzilla error: %s" |
710 msgstr "Bugzilla-fel: %s" |
826 msgstr "Bugzilla-fel: %s" |
711 |
827 |
712 msgid "command to display child changesets" |
828 msgid "command to display child changesets (DEPRECATED)" |
713 msgstr "" |
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 msgid "show the children of the given or working directory revision" |
838 msgid "show the children of the given or working directory revision" |
716 msgstr "" |
839 msgstr "" |
717 |
840 |
718 msgid "" |
841 msgid "" |
735 |
858 |
736 msgid "command to display statistics about repository history" |
859 msgid "command to display statistics about repository history" |
737 msgstr "" |
860 msgstr "" |
738 |
861 |
739 #, python-format |
862 #, python-format |
740 msgid "Revision %d is a merge, ignoring...\n" |
863 msgid "revision %d is a merge, ignoring...\n" |
741 msgstr "" |
864 msgstr "" |
742 |
865 |
743 msgid "analyzing" |
866 msgid "analyzing" |
744 msgstr "analyserar" |
867 msgstr "analyserar" |
745 |
868 |
1545 |
1668 |
1546 msgid "bzr source type could not be determined\n" |
1669 msgid "bzr source type could not be determined\n" |
1547 msgstr "" |
1670 msgstr "" |
1548 |
1671 |
1549 #, python-format |
1672 #, python-format |
1550 msgid "%s is not a valid revision in current branch" |
1673 msgid "%s is not a valid revision" |
1551 msgstr "" |
1674 msgstr "%s är inte en giltig revision" |
1552 |
1675 |
1553 #, python-format |
1676 #, python-format |
1554 msgid "%s is not available in %s anymore" |
1677 msgid "%s is not available in %s anymore" |
1555 msgstr "" |
1678 msgstr "" |
1556 |
1679 |
1570 msgid "syntax error in %s(%d): key/value pair expected" |
1693 msgid "syntax error in %s(%d): key/value pair expected" |
1571 msgstr "" |
1694 msgstr "" |
1572 |
1695 |
1573 #, python-format |
1696 #, python-format |
1574 msgid "could not open map file %r: %s" |
1697 msgid "could not open map file %r: %s" |
1698 msgstr "" |
|
1699 |
|
1700 #, python-format |
|
1701 msgid "syntax error in %s(%d): child parent1[,parent2] expected" |
|
1575 msgstr "" |
1702 msgstr "" |
1576 |
1703 |
1577 #, python-format |
1704 #, python-format |
1578 msgid "%s: invalid source repository type" |
1705 msgid "%s: invalid source repository type" |
1579 msgstr "%s: ogiltig typ för källarkiv" |
1706 msgstr "%s: ogiltig typ för källarkiv" |
1602 |
1729 |
1603 msgid "scanning" |
1730 msgid "scanning" |
1604 msgstr "skannar" |
1731 msgstr "skannar" |
1605 |
1732 |
1606 #, python-format |
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 msgid "unknown sort mode: %s" |
1742 msgid "unknown sort mode: %s" |
1608 msgstr "" |
1743 msgstr "" |
1609 |
1744 |
1610 #, python-format |
1745 #, python-format |
1611 msgid "cycle detected between %s and %s" |
1746 msgid "cycle detected between %s and %s" |
1613 |
1748 |
1614 msgid "not all revisions were sorted" |
1749 msgid "not all revisions were sorted" |
1615 msgstr "" |
1750 msgstr "" |
1616 |
1751 |
1617 #, python-format |
1752 #, python-format |
1618 msgid "Writing author map file %s\n" |
1753 msgid "writing author map file %s\n" |
1619 msgstr "" |
1754 msgstr "" |
1620 |
1755 |
1621 #, python-format |
1756 #, python-format |
1622 msgid "Ignoring bad line in author map file %s: %s\n" |
1757 msgid "ignoring bad line in author map file %s: %s\n" |
1623 msgstr "" |
1758 msgstr "" |
1624 |
1759 |
1625 #, python-format |
1760 #, python-format |
1626 msgid "mapping author %s to %s\n" |
1761 msgid "mapping author %s to %s\n" |
1627 msgstr "" |
1762 msgstr "" |
1862 |
1997 |
1863 msgid "updating bookmarks\n" |
1998 msgid "updating bookmarks\n" |
1864 msgstr "uppdaterar bokmärken\n" |
1999 msgstr "uppdaterar bokmärken\n" |
1865 |
2000 |
1866 #, python-format |
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 msgid "%s is not a valid start revision" |
2008 msgid "%s is not a valid start revision" |
1868 msgstr "" |
2009 msgstr "" |
1869 |
2010 |
1870 #, python-format |
2011 #, python-format |
1871 msgid "ignoring: %s\n" |
2012 msgid "ignoring: %s\n" |
1922 msgstr "" |
2063 msgstr "" |
1923 |
2064 |
1924 msgid "collecting p4 changelists\n" |
2065 msgid "collecting p4 changelists\n" |
1925 msgstr "" |
2066 msgstr "" |
1926 |
2067 |
2068 msgid "debugsvnlog could not load Subversion python bindings" |
|
2069 msgstr "" |
|
2070 |
|
1927 msgid "Mercurial failed to run itself, check hg executable is in PATH" |
2071 msgid "Mercurial failed to run itself, check hg executable is in PATH" |
1928 msgstr "" |
2072 msgstr "" |
1929 |
2073 |
1930 #, python-format |
2074 #, python-format |
1931 msgid "log stream exception '%s'" |
2075 msgid "log stream exception '%s'" |
1938 |
2082 |
1939 #, python-format |
2083 #, python-format |
1940 msgid "%s does not look like a Subversion repository" |
2084 msgid "%s does not look like a Subversion repository" |
1941 msgstr "%s verkar inte vara ett Subversion-arkiv" |
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 msgstr "" |
2088 msgstr "" |
1945 |
2089 |
1946 #, python-format |
2090 #, python-format |
1947 msgid "Subversion python bindings %d.%d found, 1.4 or later required" |
2091 msgid "Subversion python bindings %d.%d found, 1.4 or later required" |
1948 msgstr "" |
2092 msgstr "" |
2021 |
2165 |
2022 msgid "unable to cope with svn output" |
2166 msgid "unable to cope with svn output" |
2023 msgstr "" |
2167 msgstr "" |
2024 |
2168 |
2025 msgid "writing Subversion tags is not yet implemented\n" |
2169 msgid "writing Subversion tags is not yet implemented\n" |
2170 msgstr "" |
|
2171 |
|
2172 #, python-format |
|
2173 msgid "" |
|
2174 "splice map revision %s not found in subversion child map (revision lookups " |
|
2175 "are not implemented)" |
|
2026 msgstr "" |
2176 msgstr "" |
2027 |
2177 |
2028 msgid "automatically manage newlines in repository files" |
2178 msgid "automatically manage newlines in repository files" |
2029 msgstr "" |
2179 msgstr "" |
2030 |
2180 |
2209 msgid "" |
2359 msgid "" |
2210 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
2360 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
2211 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" |
2361 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" |
2212 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" |
2362 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" |
2213 " # your .vimrc\n" |
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 msgstr "" |
2366 msgstr "" |
2216 |
2367 |
2217 msgid "Tool arguments can include variables that are expanded at runtime::" |
2368 msgid "Tool arguments can include variables that are expanded at runtime::" |
2218 msgstr "" |
2369 msgstr "" |
2219 |
2370 |
2322 |
2473 |
2323 #, python-format |
2474 #, python-format |
2324 msgid "hg %s [OPTION]... [FILE]..." |
2475 msgid "hg %s [OPTION]... [FILE]..." |
2325 msgstr "" |
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 msgstr "" |
2528 msgstr "" |
2329 |
2529 |
2330 msgid "pull changes from a remote repository, merge new changes if needed." |
2530 msgid "pull changes from a remote repository, merge new changes if needed." |
2331 msgstr "" |
2531 msgstr "" |
2332 |
2532 |
2341 " Otherwise, the working directory is updated to include the new\n" |
2541 " Otherwise, the working directory is updated to include the new\n" |
2342 " changes." |
2542 " changes." |
2343 msgstr "" |
2543 msgstr "" |
2344 |
2544 |
2345 msgid "" |
2545 msgid "" |
2346 " When a merge occurs, the newly pulled changes are assumed to be\n" |
2546 " When a merge is needed, the working directory is first updated to\n" |
2347 " \"authoritative\". The head of the new changes is used as the first\n" |
2547 " the newly pulled changes. Local changes are then merged into the\n" |
2348 " parent, with local changes as the second. To switch the merge\n" |
2548 " pulled changes. To switch the merge order, use --switch-parent." |
2349 " order, use --switch-parent." |
|
2350 msgstr "" |
2549 msgstr "" |
2351 |
2550 |
2352 msgid " See :hg:`help dates` for a list of formats valid for -d/--date." |
2551 msgid " See :hg:`help dates` for a list of formats valid for -d/--date." |
2353 msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." |
2552 msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." |
2354 |
2553 |
2383 #, python-format |
2582 #, python-format |
2384 msgid "pulling from %s\n" |
2583 msgid "pulling from %s\n" |
2385 msgstr "drar från %s\n" |
2584 msgstr "drar från %s\n" |
2386 |
2585 |
2387 msgid "" |
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 "specified." |
2588 "specified." |
2390 msgstr "" |
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 "anges." |
2591 "anges." |
2393 |
2592 |
2394 #, python-format |
2593 #, python-format |
2395 msgid "" |
2594 msgid "" |
2396 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" |
2595 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" |
2452 |
2651 |
2453 #, python-format |
2652 #, python-format |
2454 msgid "%s:%d node does not exist\n" |
2653 msgid "%s:%d node does not exist\n" |
2455 msgstr "%s:%d noden existerar inte\n" |
2654 msgstr "%s:%d noden existerar inte\n" |
2456 |
2655 |
2457 msgid "hg sigcheck REVISION" |
2656 msgid "hg sigcheck REV" |
2458 msgstr "hg sigcheck REVISION" |
2657 msgstr "hg sigcheck REV" |
2459 |
2658 |
2460 msgid "verify all the signatures there may be for a particular revision" |
2659 msgid "verify all the signatures there may be for a particular revision" |
2461 msgstr "verifiera alla signaturerna som finns för en viss revision" |
2660 msgstr "verifiera alla signaturerna som finns för en viss revision" |
2462 |
2661 |
2463 #, python-format |
2662 #, python-format |
2464 msgid "No valid signature for %s\n" |
2663 msgid "no valid signature for %s\n" |
2465 msgstr "Ingen giltig signatur för %s\n" |
2664 msgstr "ingen giltig signatur för %s\n" |
2466 |
2665 |
2467 msgid "make the signature local" |
2666 msgid "make the signature local" |
2468 msgstr "gör signaturen lokal" |
2667 msgstr "gör signaturen lokal" |
2469 |
2668 |
2470 msgid "sign even if the sigfile is modified" |
2669 msgid "sign even if the sigfile is modified" |
2483 msgstr "TEXT" |
2682 msgstr "TEXT" |
2484 |
2683 |
2485 msgid "commit message" |
2684 msgid "commit message" |
2486 msgstr "arkiveringsmeddelande" |
2685 msgstr "arkiveringsmeddelande" |
2487 |
2686 |
2488 msgid "hg sign [OPTION]... [REVISION]..." |
2687 msgid "hg sign [OPTION]... [REV]..." |
2489 msgstr "hg sign [FLAGGA]... [REVISION]..." |
2688 msgstr "hg sign [FLAGGA]... [REV]..." |
2490 |
2689 |
2491 msgid "add a signature for the current or given revision" |
2690 msgid "add a signature for the current or given revision" |
2492 msgstr "lägg till en signatur för den aktuella eller angivna revisionen" |
2691 msgstr "lägg till en signatur för den aktuella eller angivna revisionen" |
2493 |
2692 |
2494 msgid "" |
2693 msgid "" |
2507 |
2706 |
2508 msgid "uncommitted merge - please provide a specific revision" |
2707 msgid "uncommitted merge - please provide a specific revision" |
2509 msgstr "oarkiverad sammanfogning - ange en specifik revision" |
2708 msgstr "oarkiverad sammanfogning - ange en specifik revision" |
2510 |
2709 |
2511 #, python-format |
2710 #, python-format |
2512 msgid "Signing %d:%s\n" |
2711 msgid "signing %d:%s\n" |
2513 msgstr "Signerar %d:%s\n" |
2712 msgstr "signerar %d:%s\n" |
2514 |
2713 |
2515 msgid "error while signing" |
2714 msgid "error while signing" |
2516 msgstr "fel vid signering" |
2715 msgstr "fel vid signering" |
2517 |
2716 |
2518 msgid "" |
2717 msgid "" |
2535 msgstr "" |
2734 msgstr "" |
2536 "Denna utökning lägger till flaggan --graph till kommandona incoming,\n" |
2735 "Denna utökning lägger till flaggan --graph till kommandona incoming,\n" |
2537 "outgoing och log. När flaggan anges, visas också en ASCII-version av\n" |
2736 "outgoing och log. När flaggan anges, visas också en ASCII-version av\n" |
2538 "revisionsgrafen.\n" |
2737 "revisionsgrafen.\n" |
2539 |
2738 |
2540 #, python-format |
2739 msgid "follow changeset history, or file history across copies and renames" |
2541 msgid "-G/--graph option is incompatible with --%s" |
2740 msgstr "" |
2542 msgstr "flaggan -G/--graph är inkompatibel med --%s" |
2741 "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" |
2543 |
2742 |
2544 msgid "-G/--graph option is incompatible with --follow with file argument" |
2743 msgid "only follow the first parent of merge changesets (DEPRECATED)" |
2545 msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument" |
2744 msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)" |
2546 |
2745 |
2547 msgid "NUM" |
2746 msgid "show revisions matching date spec" |
2548 msgstr "NUM" |
2747 msgstr "visa revisioner som matchar datumspecen" |
2549 |
2748 |
2550 msgid "limit number of changes displayed" |
2749 msgid "show copied files" |
2551 msgstr "begränsa antalet visade ändringar" |
2750 msgstr "visa kopierade filer" |
2552 |
2751 |
2553 msgid "show patch" |
2752 msgid "do case-insensitive search for a given text" |
2554 msgstr "visa patch" |
2753 msgstr "gör versalokänslig sökning efter en given text" |
2555 |
2754 |
2556 msgid "show the specified revision or range" |
2755 msgid "show the specified revision or range" |
2557 msgstr "visa den specifika revisionen eller serien" |
2756 msgstr "visa den specifika revisionen eller serien" |
2558 |
2757 |
2559 msgid "hg glog [OPTION]... [FILE]" |
2758 msgid "include revisions where files were removed" |
2560 msgstr "hg glog [FLAGGA]... [FIL]" |
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 msgid "show revision history alongside an ASCII revision graph" |
2788 msgid "show revision history alongside an ASCII revision graph" |
2563 msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf" |
2789 msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf" |
2564 |
2790 |
2565 msgid "" |
2791 msgid "" |
2574 " directory.\n" |
2800 " directory.\n" |
2575 " " |
2801 " " |
2576 msgstr "" |
2802 msgstr "" |
2577 " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" |
2803 " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" |
2578 " " |
2804 " " |
2579 |
|
2580 msgid "show the revision DAG" |
|
2581 msgstr "visa revisionsdiagram" |
|
2582 |
2805 |
2583 msgid "hooks for integrating with the CIA.vc notification service" |
2806 msgid "hooks for integrating with the CIA.vc notification service" |
2584 msgstr "" |
2807 msgstr "" |
2585 |
2808 |
2586 msgid "" |
2809 msgid "" |
2705 msgstr "" |
2928 msgstr "" |
2706 |
2929 |
2707 msgid "start interactive history viewer" |
2930 msgid "start interactive history viewer" |
2708 msgstr "" |
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 msgid "hg view [-l LIMIT] [REVRANGE]" |
2939 msgid "hg view [-l LIMIT] [REVRANGE]" |
2711 msgstr "" |
2940 msgstr "" |
2712 |
2941 |
2713 msgid "generate patch" |
2942 msgid "generate patch" |
2714 msgstr "" |
2943 msgstr "" |
2761 |
2990 |
2762 msgid "hg debug-rev-list [OPTION]... REV..." |
2991 msgid "hg debug-rev-list [OPTION]... REV..." |
2763 msgstr "" |
2992 msgstr "" |
2764 |
2993 |
2765 msgid "syntax highlighting for hgweb (requires Pygments)" |
2994 msgid "syntax highlighting for hgweb (requires Pygments)" |
2766 msgstr "" |
2995 msgstr "syntaxfärgning för hgweb (kräver Pygments)" |
2767 |
2996 |
2768 msgid "" |
2997 msgid "" |
2769 "It depends on the Pygments syntax highlighting library:\n" |
2998 "It depends on the Pygments syntax highlighting library:\n" |
2770 "http://pygments.org/" |
2999 "http://pygments.org/" |
2771 msgstr "" |
3000 msgstr "" |
3001 "Den beror på syntaxfärgningsbiblioteket Pygments:\n" |
|
3002 "http://pygments.org/" |
|
2772 |
3003 |
2773 msgid "There is a single configuration option::" |
3004 msgid "There is a single configuration option::" |
2774 msgstr "" |
3005 msgstr "Det finns ett enda konfigurationsalternativ::" |
2775 |
3006 |
2776 msgid "" |
3007 msgid "" |
2777 " [web]\n" |
3008 " [web]\n" |
2778 " pygments_style = <style>" |
3009 " pygments_style = <style>" |
2779 msgstr "" |
3010 msgstr "" |
3011 " [web]\n" |
|
3012 " pygments_style = <style>" |
|
2780 |
3013 |
2781 msgid "The default is 'colorful'.\n" |
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 msgid "accelerate status report using Linux's inotify service" |
3312 msgid "accelerate status report using Linux's inotify service" |
2785 msgstr "" |
3313 msgstr "" |
2786 |
3314 |
2787 msgid "start an inotify server for this repository" |
3315 msgid "start an inotify server for this repository" |
3423 |
3951 |
3424 #, python-format |
3952 #, python-format |
3425 msgid "largefile %s missing from store (needs to be uploaded)" |
3953 msgid "largefile %s missing from store (needs to be uploaded)" |
3426 msgstr "" |
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 msgid "getting changed largefiles\n" |
3964 msgid "getting changed largefiles\n" |
3429 msgstr "" |
3965 msgstr "hämtar ändrade largefiles\n" |
3430 |
3966 |
3431 #, python-format |
3967 #, python-format |
3432 msgid "%d largefiles updated, %d removed\n" |
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 msgstr "" |
3973 msgstr "" |
3434 |
3974 |
3435 msgid "minimum size (MB) for files to be converted as largefiles" |
3975 msgid "minimum size (MB) for files to be converted as largefiles" |
3436 msgstr "" |
3976 msgstr "" |
3437 |
3977 |
3451 #, python-format |
3991 #, python-format |
3452 msgid "unknown operating system: %s\n" |
3992 msgid "unknown operating system: %s\n" |
3453 msgstr "okänt operativsystem: %s\n" |
3993 msgstr "okänt operativsystem: %s\n" |
3454 |
3994 |
3455 #, python-format |
3995 #, python-format |
3456 msgid "Found %s in store\n" |
3996 msgid "found %s in store\n" |
3457 msgstr "" |
3997 msgstr "" |
3458 |
3998 |
3459 #, python-format |
3999 #, python-format |
3460 msgid "Found %s in system cache\n" |
4000 msgid "found %s in system cache\n" |
3461 msgstr "" |
4001 msgstr "" |
3462 |
4002 |
3463 msgid "Can't get file locally" |
4003 msgid "can't get file locally" |
3464 msgstr "" |
4004 msgstr "" |
3465 |
4005 |
3466 #, python-format |
4006 #, python-format |
3467 msgid "" |
4007 msgid "" |
3468 "changeset %s: %s missing\n" |
4008 "changeset %s: %s missing\n" |
3561 #, python-format |
4101 #, python-format |
3562 msgid "%d largefiles cached\n" |
4102 msgid "%d largefiles cached\n" |
3563 msgstr "%d largefiles cachade\n" |
4103 msgstr "%d largefiles cachade\n" |
3564 |
4104 |
3565 #, python-format |
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 msgid "unknown archive type '%s'" |
4110 msgid "unknown archive type '%s'" |
3567 msgstr "okänd arkivtyp '%s'" |
4111 msgstr "okänd arkivtyp '%s'" |
3568 |
4112 |
3569 msgid "cannot give prefix when archiving to files" |
4113 msgid "cannot give prefix when archiving to files" |
3570 msgstr "" |
4114 msgstr "" |
3671 msgid "verify largefile contents not just existence" |
4215 msgid "verify largefile contents not just existence" |
3672 msgstr "" |
4216 msgstr "" |
3673 |
4217 |
3674 msgid "display outgoing largefiles" |
4218 msgid "display outgoing largefiles" |
3675 msgstr "visa utgående largefiles" |
4219 msgstr "visa utgående largefiles" |
4220 |
|
4221 msgid "download all pulled versions of largefiles" |
|
4222 msgstr "" |
|
4223 |
|
4224 msgid "download all versions of all largefiles" |
|
4225 msgstr "" |
|
3676 |
4226 |
3677 msgid "manage a stack of patches" |
4227 msgid "manage a stack of patches" |
3678 msgstr "hantera en uppsättning patchar" |
4228 msgstr "hantera en uppsättning patchar" |
3679 |
4229 |
3680 msgid "" |
4230 msgid "" |
3746 "satt till 'yes' eller 'no', kommer mq att ignorera sektionen [diff] och\n" |
4296 "satt till 'yes' eller 'no', kommer mq att ignorera sektionen [diff] och\n" |
3747 "alltid generera git- eller vanliga patchar, även om data kan tappas i det\n" |
4297 "alltid generera git- eller vanliga patchar, även om data kan tappas i det\n" |
3748 "andra fallet." |
4298 "andra fallet." |
3749 |
4299 |
3750 msgid "" |
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 ":hg:`help phases`), which can be enabled with the following setting::" |
4302 ":hg:`help phases`), which can be enabled with the following setting::" |
3753 msgstr "" |
4303 msgstr "" |
3754 "Det kan vara önskvärt att hålla alla mq-ändringar i secret-fasen (se\n" |
4304 "Det kan vara önskvärt att hålla alla mq-ändringar i secret-fasen (se\n" |
3755 ":hg:`help phases`), något som kan aktiveras med följande inställning::" |
4305 ":hg:`help phases`), något som kan aktiveras med följande inställning::" |
3756 |
4306 |
3761 " [mq]\n" |
4311 " [mq]\n" |
3762 " secret = True" |
4312 " secret = True" |
3763 |
4313 |
3764 msgid "" |
4314 msgid "" |
3765 "You will by default be managing a patch queue named \"patches\". You can\n" |
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 msgstr "" |
4317 msgstr "" |
3768 "Du kommer som standard att handera en patchkö vid namn \"patches\". Du\n" |
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 msgid "print first line of patch header" |
4346 msgid "print first line of patch header" |
3772 msgstr "skriv ut första raden i patchheadern" |
4347 msgstr "skriv ut första raden i patchheadern" |
3773 |
4348 |
3774 #, python-format |
4349 #, python-format |
3825 #, python-format |
4400 #, python-format |
3826 msgid "error removing undo: %s\n" |
4401 msgid "error removing undo: %s\n" |
3827 msgstr "" |
4402 msgstr "" |
3828 |
4403 |
3829 #, python-format |
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 msgid "apply failed for patch %s" |
4409 msgid "apply failed for patch %s" |
3831 msgstr "" |
4410 msgstr "" |
3832 |
4411 |
3833 #, python-format |
4412 #, python-format |
3834 msgid "patch didn't work out, merging %s\n" |
4413 msgid "patch didn't work out, merging %s\n" |
3856 msgid "patch failed, unable to continue (try -v)\n" |
4435 msgid "patch failed, unable to continue (try -v)\n" |
3857 msgstr "" |
4436 msgstr "" |
3858 |
4437 |
3859 #, python-format |
4438 #, python-format |
3860 msgid "applying %s\n" |
4439 msgid "applying %s\n" |
3861 msgstr "" |
4440 msgstr "applicerar %s\n" |
3862 |
4441 |
3863 #, python-format |
4442 #, python-format |
3864 msgid "unable to read %s\n" |
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 #, python-format |
4449 #, python-format |
3868 msgid "patch %s is empty\n" |
4450 msgid "patch %s is empty\n" |
4451 msgstr "" |
|
4452 |
|
4453 msgid "qpush exactly duplicates child changeset" |
|
3869 msgstr "" |
4454 msgstr "" |
3870 |
4455 |
3871 msgid "repository commit failed" |
4456 msgid "repository commit failed" |
3872 msgstr "" |
4457 msgstr "" |
3873 |
4458 |
3916 |
4501 |
3917 #, python-format |
4502 #, python-format |
3918 msgid "uncommitted changes in subrepository %s" |
4503 msgid "uncommitted changes in subrepository %s" |
3919 msgstr "oarkiverade ändringar i underarkivet %s" |
4504 msgstr "oarkiverade ändringar i underarkivet %s" |
3920 |
4505 |
3921 msgid "local changes found, refresh first" |
|
3922 msgstr "" |
|
3923 |
|
3924 msgid "local changes found" |
4506 msgid "local changes found" |
3925 msgstr "" |
4507 msgstr "" |
3926 |
4508 |
3927 #, python-format |
4509 #, python-format |
3928 msgid "\"%s\" cannot be used as the name of a patch" |
4510 msgid "\"%s\" cannot be used as the name of a patch" |
3942 |
4524 |
3943 #, python-format |
4525 #, python-format |
3944 msgid "patch \"%s\" already exists" |
4526 msgid "patch \"%s\" already exists" |
3945 msgstr "patchen \"%s\" existerar redan" |
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 msgid "cannot manage merge changesets" |
4532 msgid "cannot manage merge changesets" |
3948 msgstr "kan inte hantera sammanfogningar" |
4533 msgstr "kan inte hantera sammanfogningar" |
3949 |
4534 |
3950 #, python-format |
4535 #, python-format |
3951 msgid "cannot write patch \"%s\": %s" |
4536 msgid "cannot write patch \"%s\": %s" |
3992 msgstr "" |
4577 msgstr "" |
3993 |
4578 |
3994 msgid "patch series already fully applied\n" |
4579 msgid "patch series already fully applied\n" |
3995 msgstr "" |
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 msgid "cannot use --exact and --move together" |
4585 msgid "cannot use --exact and --move together" |
3998 msgstr "kan inte använda --exact och --move tillsammans" |
4586 msgstr "kan inte använda --exact och --move tillsammans" |
3999 |
4587 |
4000 msgid "cannot push --exact with applied patches" |
4588 msgid "cannot push --exact with applied patches" |
4001 msgstr "kan inte trycka --exakt med applicerade patchar" |
4589 msgstr "kan inte trycka --exakt med applicerade patchar" |
4037 msgstr "" |
4625 msgstr "" |
4038 |
4626 |
4039 msgid "popping would remove a revision not managed by this patch queue" |
4627 msgid "popping would remove a revision not managed by this patch queue" |
4040 msgstr "" |
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 msgid "deletions found between repo revs" |
4636 msgid "deletions found between repo revs" |
4043 msgstr "" |
4637 msgstr "" |
4044 |
4638 |
4045 #, python-format |
4639 #, python-format |
4046 msgid "popping %s\n" |
4640 msgid "popping %s\n" |
4048 |
4642 |
4049 msgid "patch queue now empty\n" |
4643 msgid "patch queue now empty\n" |
4050 msgstr "" |
4644 msgstr "" |
4051 |
4645 |
4052 msgid "cannot refresh a revision with children" |
4646 msgid "cannot refresh a revision with children" |
4647 msgstr "" |
|
4648 |
|
4649 msgid "cannot refresh immutable revision" |
|
4053 msgstr "" |
4650 msgstr "" |
4054 |
4651 |
4055 msgid "" |
4652 msgid "" |
4056 "refresh interrupted while patch was popped! (revert --all, qpush to " |
4653 "refresh interrupted while patch was popped! (revert --all, qpush to " |
4057 "recover)\n" |
4654 "recover)\n" |
4062 |
4659 |
4063 #, python-format |
4660 #, python-format |
4064 msgid "patch %s is not in series file" |
4661 msgid "patch %s is not in series file" |
4065 msgstr "" |
4662 msgstr "" |
4066 |
4663 |
4067 msgid "No saved patch data found\n" |
4664 msgid "no saved patch data found\n" |
4068 msgstr "" |
4665 msgstr "ingen sparad patchdata hittades\n" |
4069 |
4666 |
4070 #, python-format |
4667 #, python-format |
4071 msgid "restoring status: %s\n" |
4668 msgid "restoring status: %s\n" |
4072 msgstr "" |
4669 msgstr "" |
4073 |
4670 |
4083 msgstr "" |
4680 msgstr "" |
4084 |
4681 |
4085 msgid "updating queue directory\n" |
4682 msgid "updating queue directory\n" |
4086 msgstr "uppdaterar kökatalog\n" |
4683 msgstr "uppdaterar kökatalog\n" |
4087 |
4684 |
4088 msgid "Unable to load queue repository\n" |
4685 msgid "unable to load queue repository\n" |
4089 msgstr "" |
4686 msgstr "kan inte öppna köarkiv\n" |
4090 |
4687 |
4091 msgid "save: no patches applied, exiting\n" |
4688 msgid "save: no patches applied, exiting\n" |
4092 msgstr "" |
4689 msgstr "" |
4093 |
4690 |
4094 msgid "status is already saved\n" |
4691 msgid "status is already saved\n" |
4105 msgstr "" |
4702 msgstr "" |
4106 |
4703 |
4107 msgid "option \"-r\" not valid when importing files" |
4704 msgid "option \"-r\" not valid when importing files" |
4108 msgstr "" |
4705 msgstr "" |
4109 |
4706 |
4707 msgid "no files or revisions specified" |
|
4708 msgstr "inga filer eller revisioner angivna" |
|
4709 |
|
4110 msgid "option \"-n\" not valid when importing multiple patches" |
4710 msgid "option \"-n\" not valid when importing multiple patches" |
4111 msgstr "" |
4711 msgstr "" |
4112 |
4712 |
4113 #, python-format |
4713 #, python-format |
4114 msgid "revision %d is the root of more than one branch" |
4714 msgid "revision %d is the root of more than one branch" |
4126 msgid "revision %d has unmanaged children" |
4726 msgid "revision %d has unmanaged children" |
4127 msgstr "" |
4727 msgstr "" |
4128 |
4728 |
4129 #, python-format |
4729 #, python-format |
4130 msgid "revision %d is not mutable" |
4730 msgid "revision %d is not mutable" |
4131 msgstr "" |
|
4132 |
|
4133 msgid "see \"hg help phases\" for details" |
|
4134 msgstr "" |
4731 msgstr "" |
4135 |
4732 |
4136 #, python-format |
4733 #, python-format |
4137 msgid "cannot import merge revision %d" |
4734 msgid "cannot import merge revision %d" |
4138 msgstr "" |
4735 msgstr "" |
4185 msgid "" |
4782 msgid "" |
4186 " To stop managing a patch and move it into permanent history,\n" |
4783 " To stop managing a patch and move it into permanent history,\n" |
4187 " use the :hg:`qfinish` command." |
4784 " use the :hg:`qfinish` command." |
4188 msgstr "" |
4785 msgstr "" |
4189 |
4786 |
4190 msgid "show only the last patch" |
4787 msgid "show only the preceding applied patch" |
4191 msgstr "visa bara den sista patchen" |
4788 msgstr "visa bara den föregående applicerade patchen" |
4192 |
4789 |
4193 msgid "hg qapplied [-1] [-s] [PATCH]" |
4790 msgid "hg qapplied [-1] [-s] [PATCH]" |
4194 msgstr "hg qapplied [-1] [-s] [PATCH]" |
4791 msgstr "hg qapplied [-1] [-s] [PATCH]" |
4195 |
4792 |
4196 msgid "print the patches already applied" |
4793 msgid "print the patches already applied" |
4233 msgstr "använd gits utökade diff-format" |
4830 msgstr "använd gits utökade diff-format" |
4234 |
4831 |
4235 msgid "qpush after importing" |
4832 msgid "qpush after importing" |
4236 msgstr "" |
4833 msgstr "" |
4237 |
4834 |
4238 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." |
4835 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..." |
4836 msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... [FIL]..." |
4240 |
4837 |
4241 msgid "import a patch" |
4838 msgid "import a patch or existing changeset" |
4242 msgstr "importera en patch" |
4839 msgstr "importera en patch eller existerande ändring" |
4243 |
4840 |
4244 msgid "" |
4841 msgid "" |
4245 " The patch is inserted into the series after the last applied\n" |
4842 " The patch is inserted into the series after the last applied\n" |
4246 " patch. If no patches have been applied, qimport prepends the patch\n" |
4843 " patch. If no patches have been applied, qimport prepends the patch\n" |
4247 " to the series." |
4844 " to the series." |
4394 |
4991 |
4395 msgid "hg qtop [-s]" |
4992 msgid "hg qtop [-s]" |
4396 msgstr "hg qtop [-s]" |
4993 msgstr "hg qtop [-s]" |
4397 |
4994 |
4398 msgid "print the name of the current patch" |
4995 msgid "print the name of the current patch" |
4399 msgstr "" |
4996 msgstr "visa namnet på den nuvarande patchen" |
4400 |
4997 |
4401 msgid "hg qnext [-s]" |
4998 msgid "hg qnext [-s]" |
4402 msgstr "hg qnext [-s]" |
4999 msgstr "hg qnext [-s]" |
4403 |
5000 |
4404 msgid "print the name of the next patch" |
5001 msgid "print the name of the next pushable patch" |
4405 msgstr "" |
5002 msgstr "visa namnet på den nästkommande patchen" |
4406 |
5003 |
4407 msgid "hg qprev [-s]" |
5004 msgid "hg qprev [-s]" |
4408 msgstr "hg qprev [-s]" |
5005 msgstr "hg qprev [-s]" |
4409 |
5006 |
4410 msgid "print the name of the previous patch" |
5007 msgid "print the name of the preceding applied patch" |
4411 msgstr "" |
5008 msgstr "skriv ut namnet på föregående applicerade patch" |
4412 |
5009 |
4413 msgid "import uncommitted changes (DEPRECATED)" |
5010 msgid "import uncommitted changes (DEPRECATED)" |
4414 msgstr "importera icke arkiverade ändringar (FÖRLEGAD)" |
5011 msgstr "importera icke arkiverade ändringar (FÖRLEGAD)" |
4415 |
5012 |
4416 msgid "add \"From: <current user>\" to patch" |
5013 msgid "add \"From: <current user>\" to patch" |
4417 msgstr "" |
|
4418 |
|
4419 msgid "USER" |
|
4420 msgstr "" |
5014 msgstr "" |
4421 |
5015 |
4422 msgid "add \"From: <USER>\" to patch" |
5016 msgid "add \"From: <USER>\" to patch" |
4423 msgstr "" |
5017 msgstr "" |
4424 |
5018 |
4567 |
5161 |
4568 msgid "qfold requires at least one patch name" |
5162 msgid "qfold requires at least one patch name" |
4569 msgstr "" |
5163 msgstr "" |
4570 |
5164 |
4571 #, python-format |
5165 #, python-format |
4572 msgid "Skipping already folded patch %s\n" |
5166 msgid "skipping already folded patch %s\n" |
4573 msgstr "Hoppar över redan hopvikta patchen %s\n" |
5167 msgstr "hoppar över redan hopvikta patchen %s\n" |
4574 |
5168 |
4575 #, python-format |
5169 #, python-format |
4576 msgid "qfold cannot fold already applied patch %s" |
5170 msgid "qfold cannot fold already applied patch %s" |
4577 msgstr "" |
5171 msgstr "" |
4578 |
5172 |
4579 #, python-format |
5173 #, python-format |
4580 msgid "error folding patch %s" |
5174 msgid "error folding patch %s" |
4581 msgstr "" |
5175 msgstr "" |
4582 |
5176 |
5177 msgid "tolerate non-conflicting local changes" |
|
5178 msgstr "" |
|
5179 |
|
4583 msgid "overwrite any local changes" |
5180 msgid "overwrite any local changes" |
4584 msgstr "" |
5181 msgstr "" |
5182 |
|
5183 msgid "do not save backup copies of files" |
|
5184 msgstr "spara inte backup-kopior av filer" |
|
4585 |
5185 |
4586 msgid "hg qgoto [OPTION]... PATCH" |
5186 msgid "hg qgoto [OPTION]... PATCH" |
4587 msgstr "" |
5187 msgstr "" |
4588 |
5188 |
4589 msgid "push or pop patches until named patch is at top of stack" |
5189 msgid "push or pop patches until named patch is at top of stack" |
4668 |
5268 |
4669 msgid "push the next patch onto the stack" |
5269 msgid "push the next patch onto the stack" |
4670 msgstr "" |
5270 msgstr "" |
4671 |
5271 |
4672 msgid "" |
5272 msgid "" |
4673 " When -f/--force is applied, all local changes in patched files\n" |
5273 " By default, abort if the working directory contains uncommitted\n" |
4674 " will be lost." |
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 msgstr "" |
5277 msgstr "" |
4676 |
5278 |
4677 msgid "no saved queues found, please use -n\n" |
5279 msgid "no saved queues found, please use -n\n" |
4678 msgstr "" |
5280 msgstr "" |
4679 |
5281 |
4695 |
5297 |
4696 msgid "pop the current patch off the stack" |
5298 msgid "pop the current patch off the stack" |
4697 msgstr "" |
5299 msgstr "" |
4698 |
5300 |
4699 msgid "" |
5301 msgid "" |
4700 " By default, pops off the top of the patch stack. If given a patch\n" |
5302 " Without argument, pops off the top of the patch stack. If given a\n" |
4701 " name, keeps popping off patches until the named patch is at the\n" |
5303 " patch name, keeps popping off patches until the named patch is at\n" |
4702 " top of the stack." |
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 msgstr "" |
5312 msgstr "" |
4704 |
5313 |
4705 #, python-format |
5314 #, python-format |
4706 msgid "using patch queue: %s\n" |
5315 msgid "using patch queue: %s\n" |
4707 msgstr "" |
5316 msgstr "" |
4782 msgstr "inga säkerhetskopior" |
5391 msgstr "inga säkerhetskopior" |
4783 |
5392 |
4784 msgid "no backups (DEPRECATED)" |
5393 msgid "no backups (DEPRECATED)" |
4785 msgstr "inga säkerhetskopior (FÖRÅLDRAD)" |
5394 msgstr "inga säkerhetskopior (FÖRÅLDRAD)" |
4786 |
5395 |
5396 msgid "ignored (DEPRECATED)" |
|
5397 msgstr "ignorerad (FÖRÅLDRAD)" |
|
5398 |
|
4787 msgid "do not modify working copy during strip" |
5399 msgid "do not modify working copy during strip" |
4788 msgstr "modifiera inte arbetskopian vid strippning" |
5400 msgstr "modifiera inte arbetskopian vid strippning" |
4789 |
5401 |
4790 msgid "hg strip [-k] [-f] [-n] REV..." |
5402 msgid "remove revs only reachable from given bookmark" |
4791 msgstr "hg strip [-k] [-f] [-n] REV..." |
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 msgid "strip changesets and all their descendants from the repository" |
5408 msgid "strip changesets and all their descendants from the repository" |
4794 msgstr "" |
5409 msgstr "" |
4795 |
5410 |
4796 msgid "" |
5411 msgid "" |
4818 |
5433 |
4819 msgid "" |
5434 msgid "" |
4820 " Use the --no-backup option to discard the backup bundle once the\n" |
5435 " Use the --no-backup option to discard the backup bundle once the\n" |
4821 " operation completes." |
5436 " operation completes." |
4822 msgstr "" |
5437 msgstr "" |
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" |
|
4823 |
5452 |
4824 msgid "empty revision set" |
5453 msgid "empty revision set" |
4825 msgstr "tomt revisionsset" |
5454 msgstr "tomt revisionsset" |
4826 |
5455 |
4827 msgid "disable all guards" |
5456 msgid "disable all guards" |
5032 msgstr "" |
5661 msgstr "" |
5033 |
5662 |
5034 msgid "cannot commit over an applied mq patch" |
5663 msgid "cannot commit over an applied mq patch" |
5035 msgstr "" |
5664 msgstr "" |
5036 |
5665 |
5037 msgid "source has mq patches applied" |
|
5038 msgstr "" |
|
5039 |
|
5040 #, python-format |
5666 #, python-format |
5041 msgid "mq status file refers to unknown node %s\n" |
5667 msgid "mq status file refers to unknown node %s\n" |
5042 msgstr "" |
5668 msgstr "" |
5043 |
5669 |
5044 #, python-format |
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 msgstr "" |
5672 msgstr "" |
5047 |
5673 |
5048 msgid "cannot import over an applied patch" |
5674 msgid "cannot import over an applied patch" |
5049 msgstr "kan inte importera över en applicerad patch" |
5675 msgstr "kan inte importera över en applicerad patch" |
5050 |
5676 |
5083 |
5709 |
5084 msgid "hooks for sending email push notifications" |
5710 msgid "hooks for sending email push notifications" |
5085 msgstr "" |
5711 msgstr "" |
5086 |
5712 |
5087 msgid "" |
5713 msgid "" |
5088 "This extension let you run hooks sending email notifications when\n" |
5714 "This extension implements hooks to send email notifications when\n" |
5089 "changesets are being pushed, from the sending or receiving side." |
5715 "changesets are sent from or received by the local repository." |
5090 msgstr "" |
5716 msgstr "" |
5091 |
5717 |
5092 msgid "" |
5718 msgid "" |
5093 "First, enable the extension as explained in :hg:`help extensions`, and\n" |
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" |
5720 "register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n" |
5095 "are run by the changesets receiver while the ``outgoing`` one is for\n" |
5721 "are run when changesets are received, while ``outgoing`` hooks are for\n" |
5096 "the sender::" |
5722 "changesets sent to another repository::" |
5097 msgstr "" |
5723 msgstr "" |
5098 |
5724 |
5099 msgid "" |
5725 msgid "" |
5100 " [hooks]\n" |
5726 " [hooks]\n" |
5101 " # one email for each incoming changeset\n" |
5727 " # one email for each incoming changeset\n" |
5108 " # one email for all outgoing changesets\n" |
5734 " # one email for all outgoing changesets\n" |
5109 " outgoing.notify = python:hgext.notify.hook" |
5735 " outgoing.notify = python:hgext.notify.hook" |
5110 msgstr "" |
5736 msgstr "" |
5111 |
5737 |
5112 msgid "" |
5738 msgid "" |
5113 "Now the hooks are running, subscribers must be assigned to\n" |
5739 "This registers the hooks. To enable notification, subscribers must\n" |
5114 "repositories. Use the ``[usersubs]`` section to map repositories to a\n" |
5740 "be assigned to repositories. The ``[usersubs]`` section maps multiple\n" |
5115 "given email or the ``[reposubs]`` section to map emails to a single\n" |
5741 "repositories to a given recipient. The ``[reposubs]`` section maps\n" |
5116 "repository::" |
5742 "multiple recipients to a single repository::" |
5117 msgstr "" |
5743 msgstr "" |
5118 |
5744 |
5119 msgid "" |
5745 msgid "" |
5120 " [usersubs]\n" |
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 " # patterns\n" |
5748 " # patterns\n" |
5123 " user@host = pattern" |
5749 " user@host = pattern" |
5124 msgstr "" |
5750 msgstr "" |
5125 |
5751 |
5126 msgid "" |
5752 msgid "" |
5130 " pattern = user@host" |
5756 " pattern = user@host" |
5131 msgstr "" |
5757 msgstr "" |
5132 |
5758 |
5133 msgid "" |
5759 msgid "" |
5134 "Glob patterns are matched against absolute path to repository\n" |
5760 "Glob patterns are matched against absolute path to repository\n" |
5135 "root. The subscriptions can be defined in their own file and\n" |
5761 "root." |
5136 "referenced with::" |
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 msgstr "" |
5768 msgstr "" |
5138 |
5769 |
5139 msgid "" |
5770 msgid "" |
5140 " [notify]\n" |
5771 " [notify]\n" |
5141 " config = /path/to/subscriptionsfile" |
5772 " config = /path/to/subscriptionsfile" |
5142 msgstr "" |
5773 msgstr "" |
5143 |
5774 |
5144 msgid "" |
5775 msgid "" |
5145 "Alternatively, they can be added to Mercurial configuration files by\n" |
5776 "Notifications will not be sent until the ``notify.test`` value is set\n" |
5146 "setting the previous entry to an empty value." |
5777 "to ``False``; see below." |
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``." |
|
5153 msgstr "" |
5778 msgstr "" |
5154 |
5779 |
5155 msgid "" |
5780 msgid "" |
5156 "Notifications content can be tweaked with the following configuration " |
5781 "Notifications content can be tweaked with the following configuration " |
5157 "entries:" |
5782 "entries:" |
5163 "True." |
5788 "True." |
5164 msgstr "" |
5789 msgstr "" |
5165 |
5790 |
5166 msgid "" |
5791 msgid "" |
5167 "notify.sources\n" |
5792 "notify.sources\n" |
5168 " Space separated list of change sources. Notifications are sent only\n" |
5793 " Space-separated list of change sources. Notifications are activated only\n" |
5169 " if it includes the incoming or outgoing changes source. Incoming\n" |
5794 " when a changeset's source is in this list. Sources may be:" |
5170 " sources can be ``serve`` for changes coming from http or ssh,\n" |
5795 msgstr "" |
5171 " ``pull`` for pulled changes, ``unbundle`` for changes added by\n" |
5796 |
5172 " :hg:`unbundle` or ``push`` for changes being pushed\n" |
5797 msgid "" |
5173 " locally. Outgoing sources are the same except for ``unbundle`` which\n" |
5798 " :``serve``: changesets received via http or ssh\n" |
5174 " is replaced by ``bundle``. Default: serve." |
5799 " :``pull``: changesets received via ``hg pull``\n" |
5175 msgstr "" |
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 msgid "" |
5808 msgid "" |
5178 "notify.strip\n" |
5809 "notify.strip\n" |
5179 " Number of leading slashes to strip from url paths. By default, " |
5810 " Number of leading slashes to strip from url paths. By default, " |
5180 "notifications\n" |
5811 "notifications\n" |
5181 " references repositories with their absolute path. ``notify.strip`` let " |
5812 " reference repositories with their absolute path. ``notify.strip`` lets " |
5182 "you\n" |
5813 "you\n" |
5183 " turn them into relative paths. For example, ``notify.strip=3`` will " |
5814 " turn them into relative paths. For example, ``notify.strip=3`` will " |
5184 "change\n" |
5815 "change\n" |
5185 " ``/long/path/repository`` into ``repository``. Default: 0." |
5816 " ``/long/path/repository`` into ``repository``. Default: 0." |
5186 msgstr "" |
5817 msgstr "" |
5187 |
5818 |
5188 msgid "" |
5819 msgid "" |
5189 "notify.domain\n" |
5820 "notify.domain\n" |
5190 " If subscribers emails or the from email have no domain set, complete them\n" |
5821 " Default email domain for sender or recipients with no explicit domain." |
5191 " with this value." |
|
5192 msgstr "" |
5822 msgstr "" |
5193 |
5823 |
5194 msgid "" |
5824 msgid "" |
5195 "notify.style\n" |
5825 "notify.style\n" |
5196 " Style file to use when formatting emails." |
5826 " Style file to use when formatting emails." |
5201 " Template to use when formatting emails." |
5831 " Template to use when formatting emails." |
5202 msgstr "" |
5832 msgstr "" |
5203 |
5833 |
5204 msgid "" |
5834 msgid "" |
5205 "notify.incoming\n" |
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 msgstr "" |
5838 msgstr "" |
5208 |
5839 |
5209 msgid "" |
5840 msgid "" |
5210 "notify.outgoing\n" |
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 msgstr "" |
5844 msgstr "" |
5213 |
5845 |
5214 msgid "" |
5846 msgid "" |
5215 "notify.changegroup\n" |
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 " ``notify.template``." |
5849 " ``notify.template``." |
5218 msgstr "" |
5850 msgstr "" |
5219 |
5851 |
5220 msgid "" |
5852 msgid "" |
5221 "notify.maxdiff\n" |
5853 "notify.maxdiff\n" |
5222 " Maximum number of diff lines to include in notification email. Set to 0\n" |
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 msgstr "" |
5856 msgstr "" |
5225 |
5857 |
5226 msgid "" |
5858 msgid "" |
5227 "notify.maxsubject\n" |
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 msgstr "" |
5861 msgstr "" |
5230 |
5862 |
5231 msgid "" |
5863 msgid "" |
5232 "notify.diffstat\n" |
5864 "notify.diffstat\n" |
5233 " Set to True to include a diffstat before diff content. Default: True." |
5865 " Set to True to include a diffstat before diff content. Default: True." |
5243 " If set, append mails to this mbox file instead of sending. Default: None." |
5875 " If set, append mails to this mbox file instead of sending. Default: None." |
5244 msgstr "" |
5876 msgstr "" |
5245 |
5877 |
5246 msgid "" |
5878 msgid "" |
5247 "notify.fromauthor\n" |
5879 "notify.fromauthor\n" |
5248 " If set, use the first committer of the changegroup for the \"From\" field " |
5880 " If set, use the committer of the first changeset in a changegroup for\n" |
5249 "of\n" |
5881 " the \"From\" field of the notification mail. If not set, take the user\n" |
5250 " the notification mail. If not set, take the user from the pushing repo.\n" |
5882 " from the pushing repo. Default: False." |
5251 " Default: False." |
5883 msgstr "" |
5252 msgstr "" |
5884 |
5253 |
5885 msgid "" |
5254 msgid "" |
5886 "If set, the following entries will also be used to customize the\n" |
5255 "If set, the following entries will also be used to customize the " |
|
5256 "notifications:" |
5887 "notifications:" |
5257 msgstr "" |
5888 msgstr "" |
5258 |
5889 |
5259 msgid "" |
5890 msgid "" |
5260 "email.from\n" |
5891 "email.from\n" |
5261 " Email ``From`` address to use if none can be found in generated email " |
5892 " Email ``From`` address to use if none can be found in the generated\n" |
5262 "content." |
5893 " email content." |
5263 msgstr "" |
5894 msgstr "" |
5264 |
5895 |
5265 msgid "" |
5896 msgid "" |
5266 "web.baseurl\n" |
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 " references. See also ``notify.strip``." |
5899 " references. See also ``notify.strip``." |
5269 msgstr "" |
5900 msgstr "" |
5270 |
5901 |
5271 #, python-format |
5902 #, python-format |
5272 msgid "%s: %d new changesets" |
5903 msgid "%s: %d new changesets" |
5307 |
5938 |
5308 msgid "" |
5939 msgid "" |
5309 "If no pager is set, the pager extensions uses the environment variable\n" |
5940 "If no pager is set, the pager extensions uses the environment variable\n" |
5310 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." |
5941 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." |
5311 msgstr "" |
5942 msgstr "" |
5312 |
|
5313 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 |
5943 |
5327 msgid "" |
5944 msgid "" |
5328 "You can disable the pager for certain commands by adding them to the\n" |
5945 "You can disable the pager for certain commands by adding them to the\n" |
5329 "pager.ignore list::" |
5946 "pager.ignore list::" |
5330 msgstr "" |
5947 msgstr "" |
5454 "Du kan också endera konfigurera alternativet method i email-sektionen att\n" |
6071 "Du kan också endera konfigurera alternativet method i email-sektionen att\n" |
5455 "vara en sendmail-kompatibel sändare eller fylla i sektionen [smtp] så att\n" |
6072 "vara en sendmail-kompatibel sändare eller fylla i sektionen [smtp] så att\n" |
5456 "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n" |
6073 "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n" |
5457 "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n" |
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 msgid "send patches as attachments" |
6079 msgid "send patches as attachments" |
5460 msgstr "" |
6080 msgstr "" |
5461 |
6081 |
5462 msgid "send patches as inline attachments" |
6082 msgid "send patches as inline attachments" |
5463 msgstr "" |
6083 msgstr "" |
5572 |
6192 |
5573 msgid "" |
6193 msgid "" |
5574 " By default the patch is included as text in the email body for\n" |
6194 " By default the patch is included as text in the email body for\n" |
5575 " easy reviewing. Using the -a/--attach option will instead create\n" |
6195 " easy reviewing. Using the -a/--attach option will instead create\n" |
5576 " an attachment for the patch. With -i/--inline an inline attachment\n" |
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 msgstr "" |
6200 msgstr "" |
5579 |
6201 |
5580 msgid "" |
6202 msgid "" |
5581 " With -o/--outgoing, emails will be generated for patches not found\n" |
6203 " With -o/--outgoing, emails will be generated for patches not found\n" |
5582 " in the destination repository (or only those which are ancestors\n" |
6204 " in the destination repository (or only those which are ancestors\n" |
5648 " Before using this command, you will need to enable email in your\n" |
6270 " Before using this command, you will need to enable email in your\n" |
5649 " hgrc. See the [email] section in hgrc(5) for details.\n" |
6271 " hgrc. See the [email] section in hgrc(5) for details.\n" |
5650 " " |
6272 " " |
5651 msgstr "" |
6273 msgstr "" |
5652 |
6274 |
5653 #, python-format |
|
5654 msgid "comparing with %s\n" |
|
5655 msgstr "jämför med %s\n" |
|
5656 |
|
5657 msgid "no changes found\n" |
6275 msgid "no changes found\n" |
5658 msgstr "inga ändringar hittades\n" |
6276 msgstr "inga ändringar hittades\n" |
5659 |
6277 |
5660 msgid "specify at least one changeset with -r or -o" |
6278 msgid "specify at least one changeset with -r or -o" |
5661 msgstr "" |
6279 msgstr "" |
5673 "\n" |
6291 "\n" |
5674 "Write the introductory message for the patch series." |
6292 "Write the introductory message for the patch series." |
5675 msgstr "" |
6293 msgstr "" |
5676 |
6294 |
5677 #, python-format |
6295 #, python-format |
5678 msgid "This patch series consists of %d patches." |
6296 msgid "this patch series consists of %d patches." |
5679 msgstr "" |
6297 msgstr "" |
5680 |
6298 |
5681 msgid "no recipient addresses provided" |
6299 msgid "no recipient addresses provided" |
5682 msgstr "inga mottagaradresser angavs" |
6300 msgstr "inga mottagaradresser angavs" |
5683 |
6301 |
5696 msgstr "" |
6314 msgstr "" |
5697 |
6315 |
5698 msgid "patchbomb canceled" |
6316 msgid "patchbomb canceled" |
5699 msgstr "" |
6317 msgstr "" |
5700 |
6318 |
5701 msgid "Displaying " |
6319 msgid "displaying " |
5702 msgstr "Visar " |
6320 msgstr "visar " |
5703 |
6321 |
5704 msgid "Sending " |
6322 msgid "sending " |
5705 msgstr "Sänder " |
6323 msgstr "sänder " |
5706 |
6324 |
5707 msgid "sending" |
6325 msgid "sending" |
5708 msgstr "sänder" |
6326 msgstr "sänder" |
5709 |
6327 |
5710 msgid "writing" |
6328 msgid "writing" |
5845 #, python-format |
6463 #, python-format |
5846 msgid "warning: %s\n" |
6464 msgid "warning: %s\n" |
5847 msgstr "" |
6465 msgstr "" |
5848 |
6466 |
5849 #, python-format |
6467 #, python-format |
5850 msgid "Removing file %s\n" |
6468 msgid "removing file %s\n" |
5851 msgstr "" |
6469 msgstr "tar bort file %s\n" |
5852 |
6470 |
5853 #, python-format |
6471 #, python-format |
5854 msgid "Removing directory %s\n" |
6472 msgid "removing directory %s\n" |
5855 msgstr "" |
6473 msgstr "tar bort katalogen %s\n" |
5856 |
6474 |
5857 msgid "command to move sets of revisions to a different ancestor" |
6475 msgid "command to move sets of revisions to a different ancestor" |
5858 msgstr "" |
6476 msgstr "" |
5859 |
6477 |
5860 msgid "" |
6478 msgid "" |
5897 msgstr "" |
6515 msgstr "" |
5898 |
6516 |
5899 msgid "keep original branch names" |
6517 msgid "keep original branch names" |
5900 msgstr "" |
6518 msgstr "" |
5901 |
6519 |
5902 msgid "force detaching of source from its original branch" |
6520 msgid "(DEPRECATED)" |
5903 msgstr "" |
6521 msgstr "(FÖRLEGAD)" |
5904 |
6522 |
5905 msgid "specify merge tool" |
6523 msgid "specify merge tool" |
5906 msgstr "ange sammanfogningsverktyg" |
6524 msgstr "ange sammanfogningsverktyg" |
5907 |
6525 |
5908 msgid "continue an interrupted rebase" |
6526 msgid "continue an interrupted rebase" |
5988 msgstr "" |
6606 msgstr "" |
5989 |
6607 |
5990 msgid "cannot use collapse with continue or abort" |
6608 msgid "cannot use collapse with continue or abort" |
5991 msgstr "" |
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 msgid "abort and continue do not allow specifying revisions" |
6611 msgid "abort and continue do not allow specifying revisions" |
5997 msgstr "" |
6612 msgstr "" |
5998 |
6613 |
5999 msgid "tool option will be ignored\n" |
6614 msgid "tool option will be ignored\n" |
6000 msgstr "" |
6615 msgstr "" |
6006 msgstr "" |
6621 msgstr "" |
6007 |
6622 |
6008 msgid "cannot specify both a revision and a source" |
6623 msgid "cannot specify both a revision and a source" |
6009 msgstr "kan inte ange både en revision och en källa" |
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 msgid "can't remove original changesets with unrebased descendants" |
6626 msgid "can't remove original changesets with unrebased descendants" |
6018 msgstr "" |
6627 msgstr "" |
6019 |
6628 |
6020 msgid "use --keep to keep original changesets" |
6629 msgid "use --keep to keep original changesets" |
6021 msgstr "använd --keep för att bevara originaländringarna" |
6630 msgstr "använd --keep för att bevara originaländringarna" |
6067 msgstr "" |
6676 msgstr "" |
6068 |
6677 |
6069 msgid "no rebase in progress" |
6678 msgid "no rebase in progress" |
6070 msgstr "" |
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 msgstr "" |
6683 msgstr "" |
6074 |
6684 |
6075 msgid "warning: new changesets detected on target branch, can't abort\n" |
6685 msgid "warning: new changesets detected on target branch, can't abort\n" |
6076 msgstr "" |
6686 msgstr "" |
6077 |
6687 |
6087 msgid "can't rebase multiple roots" |
6697 msgid "can't rebase multiple roots" |
6088 msgstr "" |
6698 msgstr "" |
6089 |
6699 |
6090 msgid "source is ancestor of destination" |
6700 msgid "source is ancestor of destination" |
6091 msgstr "" |
6701 msgstr "" |
6702 |
|
6703 #, python-format |
|
6704 msgid "updating bookmark %s\n" |
|
6705 msgstr "uppdaterar bokmärket %s\n" |
|
6092 |
6706 |
6093 msgid "--tool can only be used with --rebase" |
6707 msgid "--tool can only be used with --rebase" |
6094 msgstr "" |
6708 msgstr "" |
6095 |
6709 |
6096 msgid "rebase working directory to branch head" |
6710 msgid "rebase working directory to branch head" |
6119 |
6733 |
6120 #, python-format |
6734 #, python-format |
6121 msgid "%d hunks, %d lines changed\n" |
6735 msgid "%d hunks, %d lines changed\n" |
6122 msgstr "" |
6736 msgstr "" |
6123 |
6737 |
6124 msgid "[Ynsfdaq?]" |
6738 msgid "[Ynesfdaq?]" |
6125 msgstr "" |
6739 msgstr "" |
6126 |
6740 |
6127 msgid "&Yes, record this change" |
6741 msgid "&Yes, record this change" |
6128 msgstr "" |
6742 msgstr "" |
6129 |
6743 |
6130 msgid "&No, skip this change" |
6744 msgid "&No, skip this change" |
6131 msgstr "" |
6745 msgstr "" |
6132 |
6746 |
6747 msgid "&Edit the change manually" |
|
6748 msgstr "" |
|
6749 |
|
6133 msgid "&Skip remaining changes to this file" |
6750 msgid "&Skip remaining changes to this file" |
6134 msgstr "" |
6751 msgstr "" |
6135 |
6752 |
6136 msgid "Record remaining changes to this &file" |
6753 msgid "Record remaining changes to this &file" |
6137 msgstr "" |
6754 msgstr "" |
6144 |
6761 |
6145 msgid "&Quit, recording no changes" |
6762 msgid "&Quit, recording no changes" |
6146 msgstr "" |
6763 msgstr "" |
6147 |
6764 |
6148 msgid "&?" |
6765 msgid "&?" |
6766 msgstr "" |
|
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" |
|
6149 msgstr "" |
6790 msgstr "" |
6150 |
6791 |
6151 msgid "user quit" |
6792 msgid "user quit" |
6152 msgstr "" |
6793 msgstr "" |
6153 |
6794 |
6186 " possible::" |
6827 " possible::" |
6187 msgstr "" |
6828 msgstr "" |
6188 |
6829 |
6189 msgid "" |
6830 msgid "" |
6190 " y - record this change\n" |
6831 " y - record this change\n" |
6191 " n - skip this change" |
6832 " n - skip this change\n" |
6833 " e - edit this change manually" |
|
6192 msgstr "" |
6834 msgstr "" |
6193 |
6835 |
6194 msgid "" |
6836 msgid "" |
6195 " s - skip remaining changes to this file\n" |
6837 " s - skip remaining changes to this file\n" |
6196 " f - record remaining changes to this file" |
6838 " f - record remaining changes to this file" |
6281 " " |
6923 " " |
6282 msgstr "" |
6924 msgstr "" |
6283 |
6925 |
6284 msgid "hardlinks are not supported on this system" |
6926 msgid "hardlinks are not supported on this system" |
6285 msgstr "hårda länkar stöds inte av detta system" |
6927 msgstr "hårda länkar stöds inte av detta system" |
6286 |
|
6287 msgid "must specify local origin repository" |
|
6288 msgstr "måste ange lokalt utgångsarkiv" |
|
6289 |
6928 |
6290 #, python-format |
6929 #, python-format |
6291 msgid "relinking %s to %s\n" |
6930 msgid "relinking %s to %s\n" |
6292 msgstr "länkar om %s till %s\n" |
6931 msgstr "länkar om %s till %s\n" |
6293 |
6932 |
6446 #, python-format |
7085 #, python-format |
6447 msgid "skipping merge changeset %s:%s\n" |
7086 msgid "skipping merge changeset %s:%s\n" |
6448 msgstr "" |
7087 msgstr "" |
6449 |
7088 |
6450 #, python-format |
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 msgid "%s merged at %s\n" |
7094 msgid "%s merged at %s\n" |
6452 msgstr "" |
7095 msgstr "" |
6453 |
7096 |
6454 #, python-format |
7097 #, python-format |
6455 msgid "%s transplanted to %s\n" |
7098 msgid "%s transplanted to %s\n" |
6461 |
7104 |
6462 msgid "filter failed" |
7105 msgid "filter failed" |
6463 msgstr "" |
7106 msgstr "" |
6464 |
7107 |
6465 msgid "can only omit patchfile if merging" |
7108 msgid "can only omit patchfile if merging" |
6466 msgstr "" |
|
6467 |
|
6468 #, python-format |
|
6469 msgid "%s: empty changeset" |
|
6470 msgstr "" |
7109 msgstr "" |
6471 |
7110 |
6472 msgid "fix up the merge and run hg transplant --continue" |
7111 msgid "fix up the merge and run hg transplant --continue" |
6473 msgstr "" |
7112 msgstr "" |
6474 |
7113 |
6513 msgstr "inget sådant alternativ\n" |
7152 msgstr "inget sådant alternativ\n" |
6514 |
7153 |
6515 msgid "pull patches from REPO" |
7154 msgid "pull patches from REPO" |
6516 msgstr "" |
7155 msgstr "" |
6517 |
7156 |
6518 msgid "BRANCH" |
|
6519 msgstr "GREN" |
|
6520 |
|
6521 msgid "pull patches from branch BRANCH" |
7157 msgid "pull patches from branch BRANCH" |
6522 msgstr "" |
7158 msgstr "" |
6523 |
7159 |
6524 msgid "pull all changesets up to BRANCH" |
7160 msgid "pull all changesets up to BRANCH" |
6525 msgstr "" |
7161 msgstr "" |
6527 msgid "skip over REV" |
7163 msgid "skip over REV" |
6528 msgstr "" |
7164 msgstr "" |
6529 |
7165 |
6530 msgid "merge at REV" |
7166 msgid "merge at REV" |
6531 msgstr "" |
7167 msgstr "" |
7168 |
|
7169 msgid "parent to choose when transplanting merge" |
|
7170 msgstr "förälder att välja när sammanfogning transplanteras" |
|
6532 |
7171 |
6533 msgid "append transplant info to log message" |
7172 msgid "append transplant info to log message" |
6534 msgstr "" |
7173 msgstr "" |
6535 |
7174 |
6536 msgid "continue last transplant session after repair" |
7175 msgid "continue last transplant session after repair" |
6575 " transplanted, otherwise you will be prompted to select the\n" |
7214 " transplanted, otherwise you will be prompted to select the\n" |
6576 " changesets you want." |
7215 " changesets you want." |
6577 msgstr "" |
7216 msgstr "" |
6578 |
7217 |
6579 msgid "" |
7218 msgid "" |
6580 " :hg:`transplant --branch REVISION --all` will transplant the\n" |
7219 " :hg:`transplant --branch REV --all` will transplant the\n" |
6581 " selected branch (up to the named revision) onto your current\n" |
7220 " selected branch (up to the named revision) onto your current\n" |
6582 " working directory." |
7221 " working directory." |
6583 msgstr "" |
7222 msgstr "" |
6584 |
7223 |
6585 msgid "" |
7224 msgid "" |
6586 " You can optionally mark selected transplanted changesets as merge\n" |
7225 " You can optionally mark selected transplanted changesets as merge\n" |
6587 " changesets. You will not be prompted to transplant any ancestors\n" |
7226 " changesets. You will not be prompted to transplant any ancestors\n" |
6588 " of a merged transplant, and you can merge descendants of them\n" |
7227 " of a merged transplant, and you can merge descendants of them\n" |
6589 " normally instead of transplanting them." |
7228 " normally instead of transplanting them." |
7229 msgstr "" |
|
7230 |
|
7231 msgid "" |
|
7232 " Merge changesets may be transplanted directly by specifying the\n" |
|
7233 " proper parent changeset by calling :hg:`transplant --parent`." |
|
6590 msgstr "" |
7234 msgstr "" |
6591 |
7235 |
6592 msgid "" |
7236 msgid "" |
6593 " If no merges or revisions are provided, :hg:`transplant` will\n" |
7237 " If no merges or revisions are provided, :hg:`transplant` will\n" |
6594 " start an interactive changeset browser." |
7238 " start an interactive changeset browser." |
6751 "Before your next commit, please reconsider your encode/decode settings in \n" |
7395 "Before your next commit, please reconsider your encode/decode settings in \n" |
6752 "Mercurial.ini or %s.\n" |
7396 "Mercurial.ini or %s.\n" |
6753 msgstr "" |
7397 msgstr "" |
6754 |
7398 |
6755 #, python-format |
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 msgstr "" |
7401 msgstr "" |
6758 |
7402 |
6759 #, python-format |
7403 #, python-format |
6760 msgid "in %s: %s\n" |
7404 msgid "in %s: %s\n" |
6761 msgstr "" |
7405 msgstr "" |
6838 #, python-format |
7482 #, python-format |
6839 msgid "branch %s not found" |
7483 msgid "branch %s not found" |
6840 msgstr "grenen %s hittades inte" |
7484 msgstr "grenen %s hittades inte" |
6841 |
7485 |
6842 #, python-format |
7486 #, python-format |
6843 msgid "updating bookmark %s\n" |
|
6844 msgstr "uppdaterar bokmärket %s\n" |
|
6845 |
|
6846 #, python-format |
|
6847 msgid "divergent bookmark %s stored as %s\n" |
7487 msgid "divergent bookmark %s stored as %s\n" |
6848 msgstr "divergent bokmärke %s lagrat som %s\n" |
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 msgid "searching for changed bookmarks\n" |
7494 msgid "searching for changed bookmarks\n" |
6851 msgstr "söker efter ändrade bokmärken\n" |
7495 msgstr "söker efter ändrade bokmärken\n" |
6852 |
7496 |
6853 msgid "no changed bookmarks found\n" |
7497 msgid "no changed bookmarks found\n" |
6854 msgstr "inga ändrade bokmärken hittades\n" |
7498 msgstr "inga ändrade bokmärken hittades\n" |
6855 |
7499 |
6856 msgid "unknown parent" |
7500 msgid "unknown parent" |
6857 msgstr "" |
7501 msgstr "okänd förälder" |
6858 |
7502 |
6859 #, python-format |
7503 #, python-format |
6860 msgid "integrity check failed on %s:%d" |
7504 msgid "integrity check failed on %s:%d" |
6861 msgstr "" |
7505 msgstr "" |
6862 |
7506 |
6939 #, python-format |
7583 #, python-format |
6940 msgid "%s: not overwriting - %s collides with %s\n" |
7584 msgid "%s: not overwriting - %s collides with %s\n" |
6941 msgstr "" |
7585 msgstr "" |
6942 |
7586 |
6943 #, python-format |
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 msgid "%s: not overwriting - file exists\n" |
7592 msgid "%s: not overwriting - file exists\n" |
6945 msgstr "" |
7593 msgstr "" |
6946 |
7594 |
6947 #, python-format |
7595 #, python-format |
6948 msgid "%s: not recording move - %s does not exist\n" |
7596 msgid "%s: not recording move - %s does not exist\n" |
7054 #, python-format |
7702 #, python-format |
7055 msgid "%s: no key named '%s'" |
7703 msgid "%s: no key named '%s'" |
7056 msgstr "" |
7704 msgstr "" |
7057 |
7705 |
7058 #, python-format |
7706 #, python-format |
7059 msgid "Found revision %s from %s\n" |
7707 msgid "found revision %s from %s\n" |
7060 msgstr "Hittade revision %s från %s\n" |
7708 msgstr "hittade revision %s från %s\n" |
7061 |
7709 |
7062 msgid "revision matching date not found" |
7710 msgid "revision matching date not found" |
7063 msgstr "" |
7711 msgstr "" |
7064 |
7712 |
7065 #, python-format |
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 msgid "cannot follow nonexistent file: \"%s\"" |
7718 msgid "cannot follow nonexistent file: \"%s\"" |
7067 msgstr "" |
7719 msgstr "kan inte följa icke-existerande fil: \"%s\"" |
7068 |
7720 |
7069 msgid "can only follow copies/renames for explicit filenames" |
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 #, python-format |
7728 #, python-format |
7073 msgid "adding %s\n" |
7729 msgid "adding %s\n" |
7074 msgstr "lägger till %s\n" |
7730 msgstr "lägger till %s\n" |
7075 |
7731 |
7076 #, python-format |
7732 #, python-format |
7077 msgid "skipping missing subrepository: %s\n" |
7733 msgid "skipping missing subrepository: %s\n" |
7078 msgstr "" |
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 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
7752 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
7081 msgstr "" |
7753 msgstr "" |
7082 |
7754 |
7083 msgid "HG: Leave message empty to abort commit." |
7755 msgid "HG: Leave message empty to abort commit." |
7084 msgstr "" |
7756 msgstr "" |
7114 msgstr "HG: inga ändrade filer" |
7786 msgstr "HG: inga ändrade filer" |
7115 |
7787 |
7116 msgid "empty commit message" |
7788 msgid "empty commit message" |
7117 msgstr "tomt arkiveringsmeddelande" |
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 msgid "repository root directory or name of overlay bundle file" |
7811 msgid "repository root directory or name of overlay bundle file" |
7120 msgstr "arkivrotkatalog eller namn på påläggsbuntfil" |
7812 msgstr "arkivrotkatalog eller namn på påläggsbuntfil" |
7121 |
7813 |
7122 msgid "DIR" |
7814 msgid "DIR" |
7123 msgstr "" |
7815 msgstr "" |
7214 msgstr "visa med mallfil" |
7906 msgstr "visa med mallfil" |
7215 |
7907 |
7216 msgid "display with template" |
7908 msgid "display with template" |
7217 msgstr "visa med mall" |
7909 msgstr "visa med mall" |
7218 |
7910 |
7911 msgid "show patch" |
|
7912 msgstr "visa patch" |
|
7913 |
|
7219 msgid "do not show merges" |
7914 msgid "do not show merges" |
7220 msgstr "visa inte sammanfogningar" |
7915 msgstr "visa inte sammanfogningar" |
7221 |
7916 |
7222 msgid "output diffstat-style summary of changes" |
7917 msgid "output diffstat-style summary of changes" |
7223 msgstr "visa sammanfattning av ändringar i diffstat-stil" |
7918 msgstr "visa sammanfattning av ändringar i diffstat-stil" |
7919 |
|
7920 msgid "show the revision DAG" |
|
7921 msgstr "visa revisionsdiagram" |
|
7224 |
7922 |
7225 msgid "treat all files as text" |
7923 msgid "treat all files as text" |
7226 msgstr "behandla alla filer som text" |
7924 msgstr "behandla alla filer som text" |
7227 |
7925 |
7228 msgid "omit dates from diff headers" |
7926 msgid "omit dates from diff headers" |
7326 " parameter greater than 0, this compares every removed file with\n" |
8024 " parameter greater than 0, this compares every removed file with\n" |
7327 " every added file and records those similar enough as renames. This\n" |
8025 " every added file and records those similar enough as renames. This\n" |
7328 " option takes a percentage between 0 (disabled) and 100 (files must\n" |
8026 " option takes a percentage between 0 (disabled) and 100 (files must\n" |
7329 " be identical) as its parameter. Detecting renamed files this way\n" |
8027 " be identical) as its parameter. Detecting renamed files this way\n" |
7330 " can be expensive. After using this option, :hg:`status -C` can be\n" |
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 msgstr "" |
8032 msgstr "" |
7333 " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" |
8033 " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" |
7334 " parameter större än 0, kommer varje borttagen fil att jämföras med\n" |
8034 " parameter större än 0, kommer varje borttagen fil att jämföras med\n" |
7335 " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" |
8035 " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" |
7336 " namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" |
8036 " namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" |
7337 " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" |
8037 " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" |
7338 " på det här sättet kan ta lång tid. Efter att denna flagga har använts,\n" |
8038 " på det här sättet kan ta lång tid. Efter att denna flagga har använts,\n" |
7339 " kan :hg:`status -C` användas för att kontrollera vilka filer som\n" |
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 msgid "similarity must be a number" |
8043 msgid "similarity must be a number" |
7343 msgstr "likhet måste vara ett nummer" |
8044 msgstr "likhet måste vara ett nummer" |
7344 |
8045 |
7345 msgid "similarity must be between 0 and 100" |
8046 msgid "similarity must be between 0 and 100" |
7577 msgid "cannot backout a change with no parents" |
8278 msgid "cannot backout a change with no parents" |
7578 msgstr "kan inte återkalla en ändring utan föräldrar" |
8279 msgstr "kan inte återkalla en ändring utan föräldrar" |
7579 |
8280 |
7580 msgid "cannot backout a merge changeset" |
8281 msgid "cannot backout a merge changeset" |
7581 msgstr "kan inte återkalla en sammanfogning" |
8282 msgstr "kan inte återkalla en sammanfogning" |
7582 |
|
7583 #, python-format |
|
7584 msgid "%s is not a parent of %s" |
|
7585 msgstr "%s är inte en förälder till %s" |
|
7586 |
8283 |
7587 msgid "cannot use --parent on non-merge changeset" |
8284 msgid "cannot use --parent on non-merge changeset" |
7588 msgstr "kan inte använda --parent på icke-sammanfogande ändring" |
8285 msgstr "kan inte använda --parent på icke-sammanfogande ändring" |
7589 |
8286 |
7590 #, python-format |
8287 #, python-format |
7647 " Som en genväg kan du också använda revisionsargumentet för att markera\n" |
8344 " Som en genväg kan du också använda revisionsargumentet för att markera\n" |
7648 " en revision som bra eller dålig utan att kontrollera den först." |
8345 " en revision som bra eller dålig utan att kontrollera den först." |
7649 |
8346 |
7650 msgid "" |
8347 msgid "" |
7651 " If you supply a command, it will be used for automatic bisection.\n" |
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" |
8349 " The environment variable HG_NODE will contain the ID of the\n" |
7653 " status 0 means good, 125 means to skip the revision, 127\n" |
8350 " changeset being tested. The exit status of the command will be\n" |
7654 " (command not found) will abort the bisection, and any other\n" |
8351 " used to mark revisions as good or bad: status 0 means good, 125\n" |
7655 " non-zero exit status means the revision is bad." |
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 msgstr "" |
8355 msgstr "" |
7657 " Om du tillhandahåller ett kommando, kommer det att användas för\n" |
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" |
8357 " automatisk genomsökning. Miljövariabeln HG_NODE kommer att innehålla\n" |
7659 " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" |
8358 " ID för den ändring som testas. Returkoden från kommandot kommer att\n" |
7660 " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n" |
8359 " användas för att markera en revision som bra eller dålig: 0 betyer\n" |
7661 " genomsökningen, och alla andra värden betyder att revisionen är dålig." |
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 msgid " Some examples:" |
8364 msgid " Some examples:" |
7664 msgstr " Några exempel:" |
8365 msgstr " Några exempel:" |
7665 |
8366 |
7666 msgid "" |
8367 msgid "" |
7738 " genomsökningen::" |
8439 " genomsökningen::" |
7739 |
8440 |
7740 msgid " hg log -r \"bisect(pruned)\"" |
8441 msgid " hg log -r \"bisect(pruned)\"" |
7741 msgstr " hg log -r \"bisect(pruned)\"" |
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 msgid " - see all changesets that took part in the current bisection::" |
8453 msgid " - see all changesets that took part in the current bisection::" |
7744 msgstr " - se alla ändringar som var med i den nuvarande genomsökningen::" |
8454 msgstr " - se alla ändringar som var med i den nuvarande genomsökningen::" |
7745 |
8455 |
7746 msgid " hg log -r \"bisect(range)\"" |
8456 msgid " hg log -r \"bisect(range)\"" |
7747 msgstr " hg log -r \"bisect(range)\"" |
8457 msgstr " hg log -r \"bisect(range)\"" |
7786 msgstr "(användning av 'hg bisect <kmd>' är föråldrat)\n" |
8496 msgstr "(användning av 'hg bisect <kmd>' är föråldrat)\n" |
7787 |
8497 |
7788 msgid "incompatible arguments" |
8498 msgid "incompatible arguments" |
7789 msgstr "inkompatibla argument" |
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 #, python-format |
8507 #, python-format |
7792 msgid "failed to execute %s" |
8508 msgid "failed to execute %s" |
7793 msgstr "misslyckades med att köra %s" |
8509 msgstr "misslyckades med att köra %s" |
7794 |
8510 |
7795 #, python-format |
8511 #, python-format |
7796 msgid "%s killed" |
8512 msgid "%s killed" |
7797 msgstr "%s dödad" |
8513 msgstr "%s dödad" |
7798 |
8514 |
7799 #, python-format |
8515 #, python-format |
7800 msgid "Changeset %d:%s: %s\n" |
8516 msgid "changeset %d:%s: %s\n" |
7801 msgstr "Ändring %d:%s: %s\n" |
8517 msgstr "ändring %d:%s: %s\n" |
7802 |
8518 |
7803 #, python-format |
8519 #, python-format |
7804 msgid "Extending search to changeset %d:%s\n" |
8520 msgid "Extending search to changeset %d:%s\n" |
7805 msgstr "Utökar sökningen till ändringen %d:%s\n" |
8521 msgstr "Utökar sökningen till ändringen %d:%s\n" |
7806 |
8522 |
8098 " " |
8814 " " |
8099 msgstr "" |
8815 msgstr "" |
8100 " Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n" |
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 msgid "--base is incompatible with specifying a destination" |
8822 msgid "--base is incompatible with specifying a destination" |
8104 msgstr "--base är inkompatibel med specificering av destination" |
8823 msgstr "--base är inkompatibel med specificering av destination" |
8105 |
|
8106 msgid "unknown bundle type specified with --type" |
|
8107 msgstr "okänd bunttyp angiven med --type" |
|
8108 |
8824 |
8109 msgid "print output to file with formatted name" |
8825 msgid "print output to file with formatted name" |
8110 msgstr "skriv utmatning till fil med formatterat namn" |
8826 msgstr "skriv utmatning till fil med formatterat namn" |
8111 |
8827 |
8112 msgid "print the given revision" |
8828 msgid "print the given revision" |
8338 msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering" |
9054 msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering" |
8339 |
9055 |
8340 msgid "mark a branch as closed, hiding it from the branch list" |
9056 msgid "mark a branch as closed, hiding it from the branch list" |
8341 msgstr "markera en gren som stängd, och göm den från grenlistan" |
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 msgid "commit the specified files or all outstanding changes" |
9062 msgid "commit the specified files or all outstanding changes" |
8344 msgstr "arkivera de angivna filerna eller alla ändringar" |
9063 msgstr "arkivera de angivna filerna eller alla ändringar" |
8345 |
9064 |
8346 msgid "" |
9065 msgid "" |
8347 " Commit changes to the given files into the repository. Unlike a\n" |
9066 " Commit changes to the given files into the repository. Unlike a\n" |
8376 " konfigurerade editor där du kan skriva ett meddelande. Om din\n" |
9095 " konfigurerade editor där du kan skriva ett meddelande. Om din\n" |
8377 " arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n" |
9096 " arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n" |
8378 " meddelande i ``.hg/last-message.txt``." |
9097 " meddelande i ``.hg/last-message.txt``." |
8379 |
9098 |
8380 msgid "" |
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 " Returns 0 on success, 1 if nothing changed.\n" |
9120 " Returns 0 on success, 1 if nothing changed.\n" |
8382 " " |
9121 " " |
8383 msgstr "" |
9122 msgstr "" |
8384 " Returnerar 0 om kommandot lyckades, 1 om ingenting ändrades.\n" |
9123 " Returnerar 0 om kommandot lyckades, 1 om ingenting ändrades.\n" |
8385 " " |
9124 " " |
8386 |
9125 |
8387 msgid "can only close branch heads" |
9126 msgid "can only close branch heads" |
8388 msgstr "kan bara stänga grenhuvuden" |
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 #, python-format |
9147 #, python-format |
8391 msgid "nothing changed (%d missing files, see 'hg status')\n" |
9148 msgid "nothing changed (%d missing files, see 'hg status')\n" |
8392 msgstr "inget ändrat (%d saknade filer, se 'hg status')\n" |
9149 msgstr "inget ändrat (%d saknade filer, se 'hg status')\n" |
8393 |
|
8394 msgid "nothing changed\n" |
|
8395 msgstr "inget ändrat\n" |
|
8396 |
9150 |
8397 msgid "created new head\n" |
9151 msgid "created new head\n" |
8398 msgstr "skapade ett nytt huvud\n" |
9152 msgstr "skapade ett nytt huvud\n" |
8399 |
9153 |
8400 #, python-format |
9154 #, python-format |
8689 |
9443 |
8690 msgid "test Mercurial installation" |
9444 msgid "test Mercurial installation" |
8691 msgstr "testa Mercurial-installation" |
9445 msgstr "testa Mercurial-installation" |
8692 |
9446 |
8693 #, python-format |
9447 #, python-format |
8694 msgid "Checking encoding (%s)...\n" |
9448 msgid "checking encoding (%s)...\n" |
8695 msgstr "Kontrollerar teckenkodning (%s)...\n" |
9449 msgstr "kontrollerar teckenkodning (%s)...\n" |
8696 |
9450 |
8697 msgid " (check that your locale is properly set)\n" |
9451 msgid " (check that your locale is properly set)\n" |
8698 msgstr " (kontrollera att din locale är korrekt inställd)\n" |
9452 msgstr " (kontrollera att din locale är korrekt inställd)\n" |
8699 |
9453 |
8700 #, python-format |
9454 #, python-format |
8701 msgid "Checking installed modules (%s)...\n" |
9455 msgid "checking installed modules (%s)...\n" |
8702 msgstr "Kontrollerar installerade moduler (%s)...\n" |
9456 msgstr "kontrollerar installerade moduler (%s)...\n" |
8703 |
9457 |
8704 msgid " One or more extensions could not be found" |
9458 msgid " One or more extensions could not be found" |
8705 msgstr " En eller fler utökningar kunde inte hittas" |
9459 msgstr " En eller fler utökningar kunde inte hittas" |
8706 |
9460 |
8707 msgid " (check that you compiled the extensions)\n" |
9461 msgid " (check that you compiled the extensions)\n" |
8708 msgstr " (kontrollera att du kompilerade utökningarna)\n" |
9462 msgstr " (kontrollera att du kompilerade utökningarna)\n" |
8709 |
9463 |
8710 #, python-format |
9464 #, python-format |
8711 msgid "Checking templates (%s)...\n" |
9465 msgid "checking templates (%s)...\n" |
8712 msgstr "Kontrollerar mallar (%s)...\n" |
9466 msgstr "kontrollerar mallar (%s)...\n" |
8713 |
9467 |
8714 msgid " (templates seem to have been installed incorrectly)\n" |
9468 msgid " (templates seem to have been installed incorrectly)\n" |
8715 msgstr " (mallar verkar vara inkorrekt installerade)\n" |
9469 msgstr " (mallar verkar vara inkorrekt installerade)\n" |
8716 |
9470 |
8717 msgid "Checking commit editor...\n" |
9471 msgid "checking commit editor...\n" |
8718 msgstr "Kontrollerar arkiveringseditor...\n" |
9472 msgstr "kontrollerar arkiveringseditor...\n" |
8719 |
9473 |
8720 msgid " No commit editor set and can't find vi in PATH\n" |
9474 msgid " No commit editor set and can't find vi in PATH\n" |
8721 msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n" |
9475 msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n" |
8722 |
9476 |
8723 msgid " (specify a commit editor in your configuration file)\n" |
9477 msgid " (specify a commit editor in your configuration file)\n" |
8725 |
9479 |
8726 #, python-format |
9480 #, python-format |
8727 msgid " Can't find editor '%s' in PATH\n" |
9481 msgid " Can't find editor '%s' in PATH\n" |
8728 msgstr " Kan inte hitta editorn '%s' i PATH\n" |
9482 msgstr " Kan inte hitta editorn '%s' i PATH\n" |
8729 |
9483 |
8730 msgid "Checking username...\n" |
9484 msgid "checking username...\n" |
8731 msgstr "Kontrollerar användarnamn...\n" |
9485 msgstr "kontrollerar användarnamn...\n" |
8732 |
9486 |
8733 msgid " (specify a username in your configuration file)\n" |
9487 msgid " (specify a username in your configuration file)\n" |
8734 msgstr " (ange ett användarnamn i din konfigurationsfil)\n" |
9488 msgstr " (ange ett användarnamn i din konfigurationsfil)\n" |
8735 |
9489 |
8736 msgid "No problems detected\n" |
9490 msgid "no problems detected\n" |
8737 msgstr "Inga problem upptäcktes\n" |
9491 msgstr "inga problem upptäcktes\n" |
8738 |
9492 |
8739 #, python-format |
9493 #, python-format |
8740 msgid "%s problems detected, please check your install!\n" |
9494 msgid "%s problems detected, please check your install!\n" |
8741 msgstr "%s problem upptäcktes, kontrollera din installation!\n" |
9495 msgstr "%s problem upptäcktes, kontrollera din installation!\n" |
8742 |
9496 |
8745 |
9499 |
8746 msgid "test whether node ids are known to a repo" |
9500 msgid "test whether node ids are known to a repo" |
8747 msgstr "" |
9501 msgstr "" |
8748 |
9502 |
8749 msgid "" |
9503 msgid "" |
8750 " Every ID must be a full-length hex node id string. Returns a list of 0s " |
9504 " Every ID must be a full-length hex node id string. Returns a list of 0s\n" |
8751 "and 1s\n" |
9505 " and 1s indicating unknown/known.\n" |
8752 " indicating unknown/known.\n" |
|
8753 " " |
9506 " " |
9507 msgstr "" |
|
9508 |
|
9509 msgid "[OBSOLETED [REPLACEMENT] [REPL... ]" |
|
9510 msgstr "" |
|
9511 |
|
9512 msgid "create arbitrary obsolete marker" |
|
8754 msgstr "" |
9513 msgstr "" |
8755 |
9514 |
8756 msgid "REPO NAMESPACE [KEY OLD NEW]" |
9515 msgid "REPO NAMESPACE [KEY OLD NEW]" |
8757 msgstr "" |
9516 msgstr "" |
8758 |
9517 |
8766 " With five args, set a key to new if it currently is set to old.\n" |
9525 " With five args, set a key to new if it currently is set to old.\n" |
8767 " Reports success or failure.\n" |
9526 " Reports success or failure.\n" |
8768 " " |
9527 " " |
8769 msgstr "" |
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 msgid "revision to rebuild to" |
9549 msgid "revision to rebuild to" |
8772 msgstr "revision att bygga om till" |
9550 msgstr "revision att bygga om till" |
8773 |
9551 |
8774 msgid "[-r REV] [REV]" |
9552 msgid "[-r REV] [REV]" |
8775 msgstr "[-r REV] [REV]" |
9553 msgstr "[-r REV] [REV]" |
8802 |
9580 |
8803 msgid "show data and statistics about a revlog" |
9581 msgid "show data and statistics about a revlog" |
8804 msgstr "" |
9582 msgstr "" |
8805 |
9583 |
8806 msgid "parse and apply a revision specification" |
9584 msgid "parse and apply a revision specification" |
9585 msgstr "" |
|
9586 |
|
9587 msgid "" |
|
9588 " Use --verbose to print the parsed tree before and after aliases\n" |
|
9589 " expansion.\n" |
|
9590 " " |
|
8807 msgstr "" |
9591 msgstr "" |
8808 |
9592 |
8809 msgid "REV1 [REV2]" |
9593 msgid "REV1 [REV2]" |
8810 msgstr "REV1 [REV2]" |
9594 msgstr "REV1 [REV2]" |
8811 |
9595 |
8931 msgstr "diffa mot den andra föräldern" |
9715 msgstr "diffa mot den andra föräldern" |
8932 |
9716 |
8933 msgid "revisions to export" |
9717 msgid "revisions to export" |
8934 msgstr "revisioner att exportera" |
9718 msgstr "revisioner att exportera" |
8935 |
9719 |
8936 msgid "[OPTION]... [-o OUTFILESPEC] REV..." |
9720 msgid "[OPTION]... [-o OUTFILESPEC] [-r] REV..." |
8937 msgstr "[FLAGGA]... [-o UTFILSPEC] REV..." |
9721 msgstr "[FLAGGA]... [-o UTFILSPEC] [-r] REV..." |
8938 |
9722 |
8939 msgid "dump the header and diffs for one or more changesets" |
9723 msgid "dump the header and diffs for one or more changesets" |
8940 msgstr "dumpa rubrik och diff för en eller fler ändringar" |
9724 msgstr "dumpa rubrik och diff för en eller fler ändringar" |
8941 |
9725 |
8942 msgid " Print the changeset header and diffs for one or more revisions." |
9726 msgid " Print the changeset header and diffs for one or more revisions." |
9084 msgstr " - glöm bort filer som skulle exkluderas av .hgignore::" |
9868 msgstr " - glöm bort filer som skulle exkluderas av .hgignore::" |
9085 |
9869 |
9086 msgid " hg forget \"set:hgignore()\"" |
9870 msgid " hg forget \"set:hgignore()\"" |
9087 msgstr " hg forget \"set:hgignore()\"" |
9871 msgstr " hg forget \"set:hgignore()\"" |
9088 |
9872 |
9873 msgid "revisions to graft" |
|
9874 msgstr "revisioner att ympa" |
|
9875 |
|
9089 msgid "resume interrupted graft" |
9876 msgid "resume interrupted graft" |
9090 msgstr "återuppta avbruten ympning" |
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 msgid "record the current date as commit date" |
9882 msgid "record the current date as commit date" |
9093 msgstr "lagra det nuvarande datumet som arkiveringsdatumet" |
9883 msgstr "lagra det nuvarande datumet som arkiveringsdatumet" |
9094 |
9884 |
9095 msgid "record the current user as committer" |
9885 msgid "record the current user as committer" |
9096 msgstr "lagra den nuvarande användaren som arkiverare" |
9886 msgstr "lagra den nuvarande användaren som arkiverare" |
9097 |
9887 |
9098 msgid "[OPTION]... REVISION..." |
9888 msgid "[OPTION]... [-r] REV..." |
9099 msgstr "[FLAGGA]... REVISION..." |
9889 msgstr "[FLAGGA]... [-r] REV..." |
9100 |
9890 |
9101 msgid "copy changes from other branches onto the current branch" |
9891 msgid "copy changes from other branches onto the current branch" |
9102 msgstr "kopiera ändringar från andra grenar till den nuvarande grenen" |
9892 msgstr "kopiera ändringar från andra grenar till den nuvarande grenen" |
9103 |
9893 |
9104 msgid "" |
9894 msgid "" |
9112 msgid "" |
9902 msgid "" |
9113 " Changesets that are ancestors of the current revision, that have\n" |
9903 " Changesets that are ancestors of the current revision, that have\n" |
9114 " already been grafted, or that are merges will be skipped." |
9904 " already been grafted, or that are merges will be skipped." |
9115 msgstr "" |
9905 msgstr "" |
9116 |
9906 |
9907 msgid " (grafted from CHANGESETHASH)" |
|
9908 msgstr "" |
|
9909 |
|
9117 msgid "" |
9910 msgid "" |
9118 " If a graft merge results in conflicts, the graft process is\n" |
9911 " If a graft merge results in conflicts, the graft process is\n" |
9119 " interrupted so that the current merge can be manually resolved.\n" |
9912 " interrupted so that the current merge can be manually resolved.\n" |
9120 " Once all conflicts are addressed, the graft process can be\n" |
9913 " Once all conflicts are addressed, the graft process can be\n" |
9121 " continued with the -c/--continue option." |
9914 " continued with the -c/--continue option." |
9197 msgstr "olösta konflikter, kan inte fortsätta" |
9990 msgstr "olösta konflikter, kan inte fortsätta" |
9198 |
9991 |
9199 msgid "use hg resolve and hg graft --continue" |
9992 msgid "use hg resolve and hg graft --continue" |
9200 msgstr "använd hg resolve och hg graft --continue" |
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 msgid "end fields with NUL" |
9999 msgid "end fields with NUL" |
9203 msgstr "avsluta fält med NUL" |
10000 msgstr "avsluta fält med NUL" |
9204 |
10001 |
9205 msgid "print all revisions that match" |
10002 msgid "print all revisions that match" |
9206 msgstr "visa alla revisioner som matchar" |
10003 msgstr "visa alla revisioner som matchar" |
9207 |
|
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 |
10004 |
9212 msgid "ignore case when matching" |
10005 msgid "ignore case when matching" |
9213 msgstr "ignorera versaler/gemener vid matchning" |
10006 msgstr "ignorera versaler/gemener vid matchning" |
9214 |
10007 |
9215 msgid "print only filenames and revisions that match" |
10008 msgid "print only filenames and revisions that match" |
9277 msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)" |
10070 msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)" |
9278 |
10071 |
9279 msgid "show normal and closed branch heads" |
10072 msgid "show normal and closed branch heads" |
9280 msgstr "visa normala och stängda grenhuvuden" |
10073 msgstr "visa normala och stängda grenhuvuden" |
9281 |
10074 |
9282 msgid "[-ac] [-r STARTREV] [REV]..." |
10075 msgid "[-ct] [-r STARTREV] [REV]..." |
9283 msgstr "[-ac] [-r STARTREV] [REV]..." |
10076 msgstr "[-ct] [-r STARTREV] [REV]..." |
9284 |
10077 |
9285 msgid "show current repository heads or show branch heads" |
10078 msgid "show current repository heads or show branch heads" |
9286 msgstr "visa aktuella arkivhuvuden och visar grenhuvuden" |
10079 msgstr "visa aktuella arkivhuvuden och visar grenhuvuden" |
9287 |
10080 |
9288 msgid " With no arguments, show all repository branch heads." |
10081 msgid " With no arguments, show all repository branch heads." |
9351 msgstr "visa bara hjälp för utökningar" |
10144 msgstr "visa bara hjälp för utökningar" |
9352 |
10145 |
9353 msgid "show only help for commands" |
10146 msgid "show only help for commands" |
9354 msgstr "visa bara hjälp för kommandon" |
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 msgid "[-ec] [TOPIC]" |
10152 msgid "[-ec] [TOPIC]" |
9357 msgstr "[-ec] [ÄMNE]" |
10153 msgstr "[-ec] [ÄMNE]" |
9358 |
10154 |
9359 msgid "show help for a given topic or a help overview" |
10155 msgid "show help for a given topic or a help overview" |
9360 msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt" |
10156 msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt" |
9365 |
10161 |
9366 msgid "" |
10162 msgid "" |
9367 " Given a topic, extension, or command name, print help for that\n" |
10163 " Given a topic, extension, or command name, print help for that\n" |
9368 " topic." |
10164 " topic." |
9369 msgstr "" |
10165 msgstr "" |
9370 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" |
10166 " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet." |
9371 " " |
|
9372 |
10167 |
9373 msgid "" |
10168 msgid "" |
9374 " Returns 0 if successful.\n" |
10169 " Returns 0 if successful.\n" |
9375 " " |
10170 " " |
9376 msgstr "" |
10171 msgstr "" |
9377 " Returnerar 0 om kommandot lyckades.\n" |
10172 " Returnerar 0 om kommandot lyckades.\n" |
9378 " " |
10173 " " |
9379 |
10174 |
9380 msgid "VALUE" |
10175 #, python-format |
9381 msgstr "VÄRDE" |
|
9382 |
|
9383 msgid "DEPRECATED" |
|
9384 msgstr "FÖRLEGAD" |
|
9385 |
|
9386 msgid "" |
10176 msgid "" |
9387 "\n" |
10177 "\n" |
9388 "[+] marked option can be specified multiple times\n" |
10178 "aliases: %s\n" |
9389 msgstr "" |
10179 msgstr "" |
9390 "\n" |
10180 "\n" |
9391 "flaggor markerade med [+] kan anges flera gånger\n" |
10181 "alias: %s\n" |
10182 |
|
10183 msgid "(no help text available)" |
|
10184 msgstr "(ingen hjälptext tillgänglig)" |
|
10185 |
|
10186 #, python-format |
|
10187 msgid "shell alias for::" |
|
10188 msgstr "skal-alias för::" |
|
10189 |
|
10190 #, python-format |
|
10191 msgid " %s" |
|
10192 msgstr " %s" |
|
10193 |
|
10194 #, python-format |
|
10195 msgid "alias for: hg %s" |
|
10196 msgstr "alias för: hg %s" |
|
10197 |
|
10198 #, python-format |
|
10199 msgid "%s" |
|
10200 msgstr "%s" |
|
10201 |
|
10202 #, python-format |
|
10203 msgid "use \"hg help -e %s\" to show help for the %s extension" |
|
10204 msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s" |
|
10205 |
|
10206 msgid "options:" |
|
10207 msgstr "flaggor:" |
|
9392 |
10208 |
9393 msgid "global options:" |
10209 msgid "global options:" |
9394 msgstr "globala flaggor:" |
10210 msgstr "globala flaggor:" |
9395 |
10211 |
10212 #, python-format |
|
10213 msgid "" |
|
10214 "\n" |
|
10215 "use \"hg help %s\" to show the full help text\n" |
|
10216 msgstr "" |
|
10217 "\n" |
|
10218 "använd \"hg help %s\" för att visa fullständig hjälptext\n" |
|
10219 |
|
10220 #, python-format |
|
10221 msgid "" |
|
10222 "\n" |
|
10223 "use \"hg -v help %s\" to show more info\n" |
|
10224 msgstr "" |
|
10225 "\n" |
|
10226 "använd \"hg -v help %s\" för att visa mer information\n" |
|
10227 |
|
10228 msgid "basic commands:" |
|
10229 msgstr "grundläggande kommandon:" |
|
10230 |
|
10231 msgid "list of commands:" |
|
10232 msgstr "kommandolista:" |
|
10233 |
|
10234 msgid "no commands defined\n" |
|
10235 msgstr "inga kommandon definierade\n" |
|
10236 |
|
10237 msgid "enabled extensions:" |
|
10238 msgstr "aktiverade utökningar:" |
|
10239 |
|
10240 msgid "" |
|
10241 "\n" |
|
10242 "additional help topics:" |
|
10243 msgstr "" |
|
10244 "\n" |
|
10245 "ytterligare hjälpämnen:" |
|
10246 |
|
9396 msgid "use \"hg help\" for the full list of commands" |
10247 msgid "use \"hg help\" for the full list of commands" |
9397 msgstr "använd \"hg help\" för den fulla kommandolistan" |
10248 msgstr "använd \"hg help\" för den fulla kommandolistan" |
9398 |
10249 |
9399 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" |
10250 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" |
9400 msgstr "" |
10251 msgstr "" |
9408 msgid "use \"hg -v help%s\" to show builtin aliases and global options" |
10259 msgid "use \"hg -v help%s\" to show builtin aliases and global options" |
9409 msgstr "" |
10260 msgstr "" |
9410 "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor" |
10261 "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor" |
9411 |
10262 |
9412 #, python-format |
10263 #, 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 #, python-format |
|
9417 msgid "" |
|
9418 "\n" |
|
9419 "aliases: %s\n" |
|
9420 msgstr "" |
|
9421 "\n" |
|
9422 "alias: %s\n" |
|
9423 |
|
9424 msgid "(no help text available)" |
|
9425 msgstr "(ingen hjälptext tillgänglig)" |
|
9426 |
|
9427 #, python-format |
|
9428 msgid "shell alias for::" |
|
9429 msgstr "skal-alias för::" |
|
9430 |
|
9431 #, python-format |
|
9432 msgid " %s" |
|
9433 msgstr " %s" |
|
9434 |
|
9435 #, python-format |
|
9436 msgid "alias for: hg %s" |
|
9437 msgstr "alias för: hg %s" |
|
9438 |
|
9439 #, python-format |
|
9440 msgid "%s" |
|
9441 msgstr "%s" |
|
9442 |
|
9443 #, python-format |
|
9444 msgid "use \"hg help -e %s\" to show help for the %s extension" |
|
9445 msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s" |
|
9446 |
|
9447 msgid "options:" |
|
9448 msgstr "flaggor:" |
|
9449 |
|
9450 #, python-format |
|
9451 msgid "" |
|
9452 "\n" |
|
9453 "use \"hg help %s\" to show the full help text\n" |
|
9454 msgstr "" |
|
9455 "\n" |
|
9456 "använd \"hg help %s\" för att visa fullständig hjälptext\n" |
|
9457 |
|
9458 #, python-format |
|
9459 msgid "" |
|
9460 "\n" |
|
9461 "use \"hg -v help %s\" to show more info\n" |
|
9462 msgstr "" |
|
9463 "\n" |
|
9464 "använd \"hg -v help %s\" för att visa mer information\n" |
|
9465 |
|
9466 msgid "basic commands:" |
|
9467 msgstr "grundläggande kommandon:" |
|
9468 |
|
9469 msgid "list of commands:" |
|
9470 msgstr "kommandolista:" |
|
9471 |
|
9472 msgid "no commands defined\n" |
|
9473 msgstr "inga kommandon definierade\n" |
|
9474 |
|
9475 msgid "enabled extensions:" |
|
9476 msgstr "aktiverade utökningar:" |
|
9477 |
|
9478 msgid "" |
|
9479 "\n" |
|
9480 "additional help topics:" |
|
9481 msgstr "" |
|
9482 "\n" |
|
9483 "ytterligare hjälpämnen:" |
|
9484 |
|
9485 #, python-format |
|
9486 msgid "" |
10264 msgid "" |
9487 "\n" |
10265 "\n" |
9488 "use \"hg help -c %s\" to see help for the %s command\n" |
10266 "use \"hg help -c %s\" to see help for the %s command\n" |
9489 msgstr "" |
10267 msgstr "" |
9490 "\n" |
10268 "\n" |
9502 "använd \"hg help extensions\" för information om aktivering av utökningar\n" |
10280 "använd \"hg help extensions\" för information om aktivering av utökningar\n" |
9503 |
10281 |
9504 #, python-format |
10282 #, python-format |
9505 msgid "'%s' is provided by the following extension:" |
10283 msgid "'%s' is provided by the following extension:" |
9506 msgstr "'%s' tillhandahålls av följande utökning:" |
10284 msgstr "'%s' tillhandahålls av följande utökning:" |
10285 |
|
10286 msgid "Topics" |
|
10287 msgstr "Ämnen" |
|
10288 |
|
10289 msgid "Extension Commands" |
|
10290 msgstr "Utökningar" |
|
9507 |
10291 |
9508 msgid "Mercurial Distributed SCM\n" |
10292 msgid "Mercurial Distributed SCM\n" |
9509 msgstr "Mercurial Distribuerad SCM\n" |
10293 msgstr "Mercurial Distribuerad SCM\n" |
9510 |
10294 |
9511 msgid "identify the specified revision" |
10295 msgid "identify the specified revision" |
9847 " Om du vill skicka utmatningen från detta kommando till kommandot\n" |
10631 " Om du vill skicka utmatningen från detta kommando till kommandot\n" |
9848 " \"xargs\", använd flaggan -0 till både detta kommando och \"xargs\".\n" |
10632 " \"xargs\", använd flaggan -0 till både detta kommando och \"xargs\".\n" |
9849 " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" |
10633 " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" |
9850 " innehåller blanktecken som multipla filnamn" |
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 msgid "show revision history of entire repository or files" |
10636 msgid "show revision history of entire repository or files" |
9889 msgstr "visa revisionshistorik för hela arkivet eller filer" |
10637 msgstr "visa revisionshistorik för hela arkivet eller filer" |
9890 |
10638 |
9891 msgid "" |
10639 msgid "" |
9892 " Print the revision history of the specified files or the entire\n" |
10640 " Print the revision history of the specified files or the entire\n" |
10017 " specifying revisions." |
10765 " specifying revisions." |
10018 msgstr "" |
10766 msgstr "" |
10019 " Se :hg:`help revisions` och :hg:`help revsets` för mer om hur man anger\n" |
10767 " Se :hg:`help revisions` och :hg:`help revsets` för mer om hur man anger\n" |
10020 " revisioner." |
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 msgid "revision to display" |
10777 msgid "revision to display" |
10023 msgstr "revision att visa" |
10778 msgstr "revision att visa" |
10024 |
10779 |
10025 msgid "list files from all revisions" |
10780 msgid "list files from all revisions" |
10026 msgstr "visa filer från alla revisioner" |
10781 msgstr "visa filer från alla revisioner" |
10128 " " |
10883 " " |
10129 msgstr "" |
10884 msgstr "" |
10130 " Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n" |
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 #, python-format |
10904 #, python-format |
10134 msgid "branch '%s' has %d heads - please merge with an explicit rev" |
10905 msgid "branch '%s' has %d heads - please merge with an explicit rev" |
10135 msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev" |
10906 msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev" |
10136 |
10907 |
10137 msgid "run 'hg heads .' to see heads" |
10908 msgid "run 'hg heads .' to see heads" |
10138 msgstr "kör 'hg heads .' för att se huvuden" |
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 #, python-format |
10914 #, python-format |
10141 msgid "branch '%s' has one head - please merge with an explicit rev" |
10915 msgid "branch '%s' has one head - please merge with an explicit rev" |
10142 msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev" |
10916 msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev" |
10143 |
|
10144 msgid "run 'hg heads' to see all heads" |
|
10145 msgstr "kör 'hg heads' för att se alla huvuden" |
|
10146 |
10917 |
10147 msgid "nothing to merge" |
10918 msgid "nothing to merge" |
10148 msgstr "inget att sammanfoga" |
10919 msgstr "inget att sammanfoga" |
10149 |
10920 |
10150 msgid "use 'hg update' instead" |
10921 msgid "use 'hg update' instead" |
10304 |
11075 |
10305 msgid " public < draft < secret" |
11076 msgid " public < draft < secret" |
10306 msgstr " public < draft < secret" |
11077 msgstr " public < draft < secret" |
10307 |
11078 |
10308 msgid "" |
11079 msgid "" |
10309 " Return 0 on success, 1 if no phases were changed.\n" |
11080 " Return 0 on success, 1 if no phases were changed or some could not\n" |
11081 " be changed.\n" |
|
10310 " " |
11082 " " |
10311 msgstr "" |
11083 msgstr "" |
10312 " Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades.\n" |
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 msgid "only one phase can be specified" |
11088 msgid "only one phase can be specified" |
10316 msgstr "bara en fas kan vara angiven" |
11089 msgstr "bara en fas kan vara angiven" |
10317 |
11090 |
10318 #, python-format |
11091 #, python-format |
10319 msgid "phase change for %i changesets\n" |
11092 msgid "cannot move %i changesets to a more permissive phase, use --force\n" |
10320 msgstr "fasändring för %i ändringar\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 msgid "no phases changed\n" |
11099 msgid "no phases changed\n" |
10323 msgstr "inga faser ändrage\n" |
11100 msgstr "inga faser ändrage\n" |
10324 |
11101 |
10325 #, python-format |
11102 #, python-format |
10399 |
11176 |
10400 #, python-format |
11177 #, python-format |
10401 msgid "remote bookmark %s not found!" |
11178 msgid "remote bookmark %s not found!" |
10402 msgstr "fjärrbokmärket %s hittades inte!" |
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 #, python-format |
11181 #, python-format |
10412 msgid "importing bookmark %s\n" |
11182 msgid "importing bookmark %s\n" |
10413 msgstr "importerar bokmärket %s\n" |
11183 msgstr "importerar bokmärket %s\n" |
10414 |
11184 |
10415 msgid "force push" |
11185 msgid "force push" |
10471 " If -r/--rev is used, the specified revision and all its ancestors\n" |
11241 " If -r/--rev is used, the specified revision and all its ancestors\n" |
10472 " will be pushed to the remote repository." |
11242 " will be pushed to the remote repository." |
10473 msgstr "" |
11243 msgstr "" |
10474 " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" |
11244 " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" |
10475 " tryckas till det andra arkivet." |
11245 " tryckas till det andra arkivet." |
11246 |
|
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." |
|
10476 |
11254 |
10477 msgid "" |
11255 msgid "" |
10478 " Please see :hg:`help urls` for important details about ``ssh://``\n" |
11256 " Please see :hg:`help urls` for important details about ``ssh://``\n" |
10479 " URLs. If DESTINATION is omitted, a default path will be used." |
11257 " URLs. If DESTINATION is omitted, a default path will be used." |
10480 msgstr "" |
11258 msgstr "" |
10742 msgstr "senaste revision matchande datum" |
11520 msgstr "senaste revision matchande datum" |
10743 |
11521 |
10744 msgid "revert to the specified revision" |
11522 msgid "revert to the specified revision" |
10745 msgstr "återgå till den angivna revisionen" |
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 msgid "[OPTION]... [-r REV] [NAME]..." |
11525 msgid "[OPTION]... [-r REV] [NAME]..." |
10751 msgstr "[FLAGGA]... [-r REV] [NAMN]..." |
11526 msgstr "[FLAGGA]... [-r REV] [NAMN]..." |
10752 |
11527 |
10753 msgid "restore files to their checkout state" |
11528 msgid "restore files to their checkout state" |
10754 msgstr "återställ filer till deras uthämtningstillstånd" |
11529 msgstr "återställ filer till deras uthämtningstillstånd" |
10755 |
11530 |
10756 msgid "" |
11531 msgid " .. note::" |
10757 " .. note::\n" |
11532 msgstr " .. note::" |
11533 |
|
11534 msgid "" |
|
10758 " To check out earlier revisions, you should use :hg:`update REV`.\n" |
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 msgstr "" |
11538 msgstr "" |
10761 " .. note::\n" |
11539 " .. note::\n" |
10762 " För att hämta ut tidigare revisioner, använd :hg:`update REV`.\n" |
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" |
11541 " För att avbryta en oarkiverad sammanfogning (och bli av med alla\n" |
10764 " använd :hg:`update --clean .`." |
11542 " ändringar), använd :hg:`update --clean .`." |
10765 |
11543 |
10766 msgid "" |
11544 msgid "" |
10767 " With no revision specified, revert the specified files or directories\n" |
11545 " With no revision specified, revert the specified files or directories\n" |
10768 " to the contents they had in the parent of the working directory.\n" |
11546 " to the contents they had in the parent of the working directory.\n" |
10769 " This restores the contents of files to an unmodified\n" |
11547 " This restores the contents of files to an unmodified\n" |
10835 msgstr "oarkiverade ändringar, använd --all för att kasta alla ändringar" |
11613 msgstr "oarkiverade ändringar, använd --all för att kasta alla ändringar" |
10836 |
11614 |
10837 msgid "use --all to revert all files" |
11615 msgid "use --all to revert all files" |
10838 msgstr "använd --all för att återställa filer" |
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 msgid "ignore safety measures" |
11618 msgid "ignore safety measures" |
10865 msgstr "ignorera säkerhetsåtgärder" |
11619 msgstr "ignorera säkerhetsåtgärder" |
10866 |
11620 |
10867 msgid "roll back the last transaction (dangerous)" |
11621 msgid "roll back the last transaction (dangerous)" |
10868 msgstr "återgång från den senaste transaktionen (farligt)" |
11622 msgstr "återgång från den senaste transaktionen (farligt)" |
10881 " arbetskatalogen." |
11635 " arbetskatalogen." |
10882 |
11636 |
10883 msgid "" |
11637 msgid "" |
10884 " Transactions are used to encapsulate the effects of all commands\n" |
11638 " Transactions are used to encapsulate the effects of all commands\n" |
10885 " that create new changesets or propagate existing changesets into a\n" |
11639 " that create new changesets or propagate existing changesets into a\n" |
10886 " repository. For example, the following commands are transactional,\n" |
11640 " repository." |
10887 " and their effects can be rolled back:" |
|
10888 msgstr "" |
11641 msgstr "" |
10889 " Transaktioner används för att kapsla in alla kommandon som skapar nya\n" |
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." |
10891 " Exempelvis skapar de följande kommandona transaktioner, och deras\n" |
11644 |
10892 " ändringar kan återkallas:" |
11645 msgid "" |
10893 |
11646 " For example, the following commands are transactional, and their\n" |
10894 msgid "" |
11647 " effects can be rolled back:" |
10895 " - commit\n" |
11648 msgstr "" |
10896 " - import\n" |
11649 " Exempelvis skapar de följande kommandona transaktioner, och deras\n" |
10897 " - pull\n" |
11650 " ändringar kan återkallas:" |
10898 " - push (with this repository as the destination)\n" |
11651 |
10899 " - unbundle" |
11652 msgid "" |
10900 msgstr "" |
11653 " - commit\n" |
10901 " - commit\n" |
11654 " - import\n" |
10902 " - import\n" |
11655 " - pull\n" |
10903 " - pull\n" |
11656 " - push (with this repository as the destination)\n" |
10904 " - push (med det här arkivet som destination)\n" |
11657 " - unbundle" |
10905 " - unbundle" |
11658 msgstr "" |
10906 |
11659 " - commit\n" |
10907 msgid "" |
11660 " - import\n" |
10908 " To avoid permanent data loss, rollback will refuse to rollback a\n" |
11661 " - pull\n" |
10909 " commit transaction if it isn't checked out. Use --force to\n" |
11662 " - push (med det här arkivet som destination)\n" |
10910 " override this protection." |
11663 " - unbundle" |
10911 msgstr "" |
11664 |
10912 " För att undvika permanent dataförlust så vägrar rollback att köras på\n" |
11665 msgid "" |
10913 " en arkivering om den inte är uthämtad. Använd --force för att gå förbi\n" |
11666 " To avoid permanent data loss, rollback will refuse to rollback a\n" |
10914 " det här skyddet." |
11667 " commit transaction if it isn't checked out. Use --force to\n" |
11668 " override this protection." |
|
11669 msgstr "" |
|
11670 " För att undvika permanent dataförlust så vägrar rollback att köras\n" |
|
11671 " på 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 msgid "" |
11674 msgid "" |
10917 " This command is not intended for use on public repositories. Once\n" |
11675 " This command is not intended for use on public repositories. Once\n" |
10918 " changes are visible for pull by other users, rolling a transaction\n" |
11676 " changes are visible for pull by other users, rolling a transaction\n" |
10919 " back locally is ineffective (someone else may already have pulled\n" |
11677 " back locally is ineffective (someone else may already have pulled\n" |
11030 " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" |
11788 " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" |
11031 " som portnummer; då visar servern det portnummer som används." |
11789 " som portnummer; då visar servern det portnummer som används." |
11032 |
11790 |
11033 msgid "cannot use --stdio with --cmdserver" |
11791 msgid "cannot use --stdio with --cmdserver" |
11034 msgstr "kan inte använda --stdio med --cmdserver" |
11792 msgstr "kan inte använda --stdio med --cmdserver" |
11035 |
|
11036 msgid "There is no Mercurial repository here (.hg not found)" |
|
11037 msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" |
|
11038 |
11793 |
11039 #, python-format |
11794 #, python-format |
11040 msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
11795 msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
11041 msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" |
11796 msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" |
11042 |
11797 |
11514 " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n" |
12269 " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n" |
11515 " ändring anges, så uppdateras till toppen på den nuvarande namngivna\n" |
12270 " ändring anges, så uppdateras till toppen på den nuvarande namngivna\n" |
11516 " grenen och nuvarande bokmärket flyttas (se :hg:`help bookmarks`)." |
12271 " grenen och nuvarande bokmärket flyttas (se :hg:`help bookmarks`)." |
11517 |
12272 |
11518 msgid "" |
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 " Update sets the working directory's parent revison to the specified\n" |
12274 " Update sets the working directory's parent revison to the specified\n" |
11528 " changeset (see :hg:`help parents`)." |
12275 " changeset (see :hg:`help parents`)." |
11529 msgstr "" |
12276 msgstr "" |
11530 |
12277 |
11531 msgid "" |
12278 msgid "" |
11532 " The following rules apply when the working directory contains\n" |
12279 " If the changeset is not a descendant or ancestor of the working\n" |
11533 " uncommitted changes:" |
12280 " directory's parent, the update is aborted. With the -c/--check\n" |
11534 msgstr "" |
12281 " option, the working directory is checked for uncommitted changes; if\n" |
11535 " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" |
12282 " none are found, the working directory is updated to the specified\n" |
11536 " ändringar:" |
12283 " changeset." |
11537 |
12284 msgstr "" |
11538 msgid "" |
12285 |
11539 " 1. If neither -c/--check nor -C/--clean is specified, and if\n" |
12286 msgid "" |
11540 " the requested changeset is an ancestor or descendant of\n" |
12287 " The following rules apply when the working directory contains\n" |
11541 " the working directory's parent, the uncommitted changes\n" |
12288 " uncommitted changes:" |
11542 " are merged into the requested changeset and the merged\n" |
12289 msgstr "" |
11543 " result is left uncommitted. If the requested changeset is\n" |
12290 " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" |
11544 " not an ancestor or descendant (that is, it is on another\n" |
12291 " ändringar:" |
11545 " branch), the update is aborted and the uncommitted changes\n" |
12292 |
11546 " are preserved." |
12293 msgid "" |
11547 msgstr "" |
12294 " 1. If neither -c/--check nor -C/--clean is specified, and if\n" |
11548 " 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n" |
12295 " the requested changeset is an ancestor or descendant of\n" |
11549 " begärda ändringen är en anfader eller ättling till arbetskatalogens\n" |
12296 " the working directory's parent, the uncommitted changes\n" |
11550 " förälder, kommer oarkiverade ändringar att sammanfogas med den\n" |
12297 " are merged into the requested changeset and the merged\n" |
11551 " begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n" |
12298 " result is left uncommitted. If the requested changeset is\n" |
11552 " Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n" |
12299 " not an ancestor or descendant (that is, it is on another\n" |
11553 " en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n" |
12300 " branch), the update is aborted and the uncommitted changes\n" |
11554 " bevaras." |
12301 " are preserved." |
11555 |
12302 msgstr "" |
11556 msgid "" |
12303 " 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n" |
11557 " 2. With the -c/--check option, the update is aborted and the\n" |
12304 " begärda ändringen är en anfader eller ättling till\n" |
11558 " uncommitted changes are preserved." |
12305 " arbetskatalogens förälder, kommer oarkiverade ändringar att\n" |
11559 msgstr "" |
12306 " sammanfogas med den begärda ändringen och det sammanfogade\n" |
11560 " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" |
12307 " resultatet lämnas oarkiverat. Om den begärda ändringen inte är en\n" |
11561 " ändringarna lämnas." |
12308 " anfader eller ättling (dvs är i en annan gren), avbryts\n" |
11562 |
12309 " uppdateringen och de oarkiverade ändringarna bevaras." |
11563 msgid "" |
12310 |
11564 " 3. With the -C/--clean option, uncommitted changes are discarded and\n" |
12311 msgid "" |
11565 " the working directory is updated to the requested changeset." |
12312 " 2. With the -c/--check option, the update is aborted and the\n" |
11566 msgstr "" |
12313 " uncommitted changes are preserved." |
11567 " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n" |
12314 msgstr "" |
11568 " arbetskatalogen uppdateras till den begärda ändringen." |
12315 " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" |
12316 " ändringarna lämnas." |
|
12317 |
|
12318 msgid "" |
|
12319 " 3. With the -C/--clean option, uncommitted changes are discarded and\n" |
|
12320 " the working directory is updated to the requested changeset." |
|
12321 msgstr "" |
|
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 msgid "" |
12332 msgid "" |
11571 " Use null as the changeset to remove the working directory (like\n" |
12333 " Use null as the changeset to remove the working directory (like\n" |
11572 " :hg:`clone -U`)." |
12334 " :hg:`clone -U`)." |
11573 msgstr "" |
12335 msgstr "" |
11629 |
12391 |
11630 #, python-format |
12392 #, python-format |
11631 msgid "cannot include %s (%s)" |
12393 msgid "cannot include %s (%s)" |
11632 msgstr "kan inte inkludera %s (%s)" |
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 msgid "not found in manifest" |
12404 msgid "not found in manifest" |
11635 msgstr "hittades inte i manifestet" |
12405 msgstr "hittades inte i manifestet" |
11636 |
12406 |
11637 #, python-format |
12407 #, python-format |
11638 msgid "no such file in rev %s" |
12408 msgid "no such file in rev %s" |
11853 msgstr "" |
12623 msgstr "" |
11854 |
12624 |
11855 msgid "abort: out of memory\n" |
12625 msgid "abort: out of memory\n" |
11856 msgstr "" |
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 msgid "** unknown exception encountered, please report by visiting\n" |
12640 msgid "** unknown exception encountered, please report by visiting\n" |
11859 msgstr "" |
12641 msgstr "" |
11860 |
12642 |
11861 msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" |
12643 msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" |
11862 msgstr "" |
12644 msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n" |
11863 |
12645 |
11864 #, python-format |
12646 #, python-format |
11865 msgid "** Python %s\n" |
12647 msgid "** Python %s\n" |
11866 msgstr "" |
12648 msgstr "" |
11867 |
12649 |
11869 msgid "** Mercurial Distributed SCM (version %s)\n" |
12651 msgid "** Mercurial Distributed SCM (version %s)\n" |
11870 msgstr "" |
12652 msgstr "" |
11871 |
12653 |
11872 #, python-format |
12654 #, python-format |
11873 msgid "** Extensions loaded: %s\n" |
12655 msgid "** Extensions loaded: %s\n" |
12656 msgstr "" |
|
12657 |
|
12658 msgid "too few arguments for command alias" |
|
11874 msgstr "" |
12659 msgstr "" |
11875 |
12660 |
11876 #, python-format |
12661 #, python-format |
11877 msgid "no definition for alias '%s'\n" |
12662 msgid "no definition for alias '%s'\n" |
11878 msgstr "" |
12663 msgstr "" |
11913 "option -R has to be separated from other options (e.g. not -qR) and --" |
12698 "option -R has to be separated from other options (e.g. not -qR) and --" |
11914 "repository may only be abbreviated as --repo!" |
12699 "repository may only be abbreviated as --repo!" |
11915 msgstr "" |
12700 msgstr "" |
11916 |
12701 |
11917 #, python-format |
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 msgstr "" |
12704 msgstr "" |
11920 |
12705 |
11921 #, python-format |
12706 #, python-format |
11922 msgid "repository '%s' is not local" |
12707 msgid "repository '%s' is not local" |
11923 msgstr "arkivet '%s' är inte lokalt" |
12708 msgstr "arkivet '%s' är inte lokalt" |
11936 msgid "" |
12721 msgid "" |
11937 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" |
12722 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" |
11938 "misc/lsprof/" |
12723 "misc/lsprof/" |
11939 msgstr "" |
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 #, python-format |
12737 #, python-format |
11942 msgid "*** failed to import extension %s from %s: %s\n" |
12738 msgid "*** failed to import extension %s from %s: %s\n" |
11943 msgstr "" |
12739 msgstr "" |
11944 |
12740 |
11945 #, python-format |
12741 #, python-format |
11964 |
12760 |
11965 #, python-format |
12761 #, python-format |
11966 msgid "tool %s requires a GUI\n" |
12762 msgid "tool %s requires a GUI\n" |
11967 msgstr "" |
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 #, python-format |
12771 #, python-format |
11970 msgid "" |
12772 msgid "" |
11971 " no tool found to merge %s\n" |
12773 " no tool found to merge %s\n" |
11972 "keep (l)ocal or take (o)ther?" |
12774 "keep (l)ocal or take (o)ther?" |
11973 msgstr "" |
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 #, python-format |
12794 #, python-format |
11976 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" |
12795 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" |
12796 msgstr "" |
|
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" |
|
11977 msgstr "" |
12821 msgstr "" |
11978 |
12822 |
11979 #, python-format |
12823 #, python-format |
11980 msgid "was merge of '%s' successful (yn)?" |
12824 msgid "was merge of '%s' successful (yn)?" |
11981 msgstr "" |
12825 msgstr "" |
11982 |
12826 |
11983 #, python-format |
12827 #, python-format |
11984 msgid "" |
12828 msgid "" |
11985 " output file %s appears unchanged\n" |
12829 " output file %s appears unchanged\n" |
11986 "was merge successful (yn)?" |
12830 "was merge successful (yn)?" |
11987 msgstr "" |
|
11988 |
|
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 "" |
12831 msgstr "" |
11996 |
12832 |
11997 msgid "unterminated string" |
12833 msgid "unterminated string" |
11998 msgstr "" |
12834 msgstr "" |
11999 |
12835 |
12178 |
13014 |
12179 #. i18n: "copied" is a keyword |
13015 #. i18n: "copied" is a keyword |
12180 msgid "copied takes no arguments" |
13016 msgid "copied takes no arguments" |
12181 msgstr "copied tar inga argument" |
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 msgid "invalid token" |
13031 msgid "invalid token" |
12184 msgstr "" |
13032 msgstr "" |
12185 |
13033 |
12186 msgid "starting revisions are not directly related" |
13034 msgid "starting revisions are not directly related" |
12187 msgstr "" |
13035 msgstr "" |
12222 msgstr "dålig (implicit)" |
13070 msgstr "dålig (implicit)" |
12223 |
13071 |
12224 msgid "disabled extensions:" |
13072 msgid "disabled extensions:" |
12225 msgstr "deaktiverade utökningar:" |
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 msgid "Configuration Files" |
13088 msgid "Configuration Files" |
12228 msgstr "Konfigurationsfiler" |
13089 msgstr "Konfigurationsfiler" |
12229 |
13090 |
12230 msgid "Date Formats" |
13091 msgid "Date Formats" |
12231 msgstr "Datumformat" |
13092 msgstr "Datumformat" |
12258 msgstr "Användning Av Mallar" |
13119 msgstr "Användning Av Mallar" |
12259 |
13120 |
12260 msgid "URL Paths" |
13121 msgid "URL Paths" |
12261 msgstr "URL-sökvägar" |
13122 msgstr "URL-sökvägar" |
12262 |
13123 |
12263 msgid "Using additional features" |
13124 msgid "Using Additional Features" |
12264 msgstr "Använda ytterligare funktioner" |
13125 msgstr "Använda Ytterligare Funktioner" |
12265 |
13126 |
12266 msgid "Subrepositories" |
13127 msgid "Subrepositories" |
12267 msgstr "Underarkiv" |
13128 msgstr "Underarkiv" |
12268 |
13129 |
12269 msgid "Configuring hgweb" |
13130 msgid "Configuring hgweb" |
12270 msgstr "Konfiguration av hgweb" |
13131 msgstr "Konfiguration av hgweb" |
12271 |
13132 |
12272 msgid "Glossary" |
13133 msgid "Glossary" |
12273 msgstr "Ordlista" |
13134 msgstr "Ordlista" |
12274 |
13135 |
12275 msgid "syntax for Mercurial ignore files" |
13136 msgid "Syntax for Mercurial Ignore Files" |
12276 msgstr "syntax för Mercurials ignoreringsfiler" |
13137 msgstr "Syntax för Mercurials Ignoreringsfiler" |
12277 |
13138 |
12278 msgid "Working with Phases" |
13139 msgid "Working with Phases" |
12279 msgstr "Arbeta med Faser" |
13140 msgstr "Arbeta med Faser" |
12280 |
13141 |
12281 msgid "" |
13142 msgid "" |
12332 "alphabetical order, later ones overriding earlier ones. Where multiple\n" |
13193 "alphabetical order, later ones overriding earlier ones. Where multiple\n" |
12333 "paths are given below, settings from earlier paths override later\n" |
13194 "paths are given below, settings from earlier paths override later\n" |
12334 "ones." |
13195 "ones." |
12335 msgstr "" |
13196 msgstr "" |
12336 |
13197 |
12337 msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``" |
13198 msgid "| (All) ``<repo>/.hg/hgrc``" |
12338 msgstr "" |
13199 msgstr "" |
12339 |
13200 |
12340 msgid "" |
13201 msgid "" |
12341 " Per-repository configuration options that only apply in a\n" |
13202 " Per-repository configuration options that only apply in a\n" |
12342 " particular repository. This file is not version-controlled, and\n" |
13203 " particular repository. This file is not version-controlled, and\n" |
12343 " will not get transferred during a \"clone\" operation. Options in\n" |
13204 " will not get transferred during a \"clone\" operation. Options in\n" |
12344 " this file override options in all other configuration files. On\n" |
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" |
13206 " Plan 9 and Unix, most of this file will be ignored if it doesn't\n" |
12346 " trusted user or to a trusted group. See the documentation for the\n" |
13207 " belong to a trusted user or to a trusted group. See the documentation\n" |
12347 " ``[trusted]`` section below for more details." |
13208 " for the ``[trusted]`` section below for more details." |
12348 msgstr "" |
13209 msgstr "" |
12349 |
13210 |
12350 msgid "" |
13211 msgid "" |
13212 "| (Plan 9) ``$home/lib/hgrc``\n" |
|
12351 "| (Unix) ``$HOME/.hgrc``\n" |
13213 "| (Unix) ``$HOME/.hgrc``\n" |
12352 "| (Windows) ``%USERPROFILE%\\.hgrc``\n" |
13214 "| (Windows) ``%USERPROFILE%\\.hgrc``\n" |
12353 "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n" |
13215 "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n" |
12354 "| (Windows) ``%HOME%\\.hgrc``\n" |
13216 "| (Windows) ``%HOME%\\.hgrc``\n" |
12355 "| (Windows) ``%HOME%\\Mercurial.ini``" |
13217 "| (Windows) ``%HOME%\\Mercurial.ini``" |
12363 "installation\n" |
13225 "installation\n" |
12364 " options." |
13226 " options." |
12365 msgstr "" |
13227 msgstr "" |
12366 |
13228 |
12367 msgid "" |
13229 msgid "" |
13230 "| (Plan 9) ``/lib/mercurial/hgrc``\n" |
|
13231 "| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc``\n" |
|
12368 "| (Unix) ``/etc/mercurial/hgrc``\n" |
13232 "| (Unix) ``/etc/mercurial/hgrc``\n" |
12369 "| (Unix) ``/etc/mercurial/hgrc.d/*.rc``" |
13233 "| (Unix) ``/etc/mercurial/hgrc.d/*.rc``" |
12370 msgstr "" |
13234 msgstr "" |
12371 |
13235 |
12372 msgid "" |
13236 msgid "" |
12375 " executed by any user in any directory. Options in these files\n" |
13239 " executed by any user in any directory. Options in these files\n" |
12376 " override per-installation options." |
13240 " override per-installation options." |
12377 msgstr "" |
13241 msgstr "" |
12378 |
13242 |
12379 msgid "" |
13243 msgid "" |
13244 "| (Plan 9) ``<install-root>/lib/mercurial/hgrc``\n" |
|
13245 "| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc``\n" |
|
12380 "| (Unix) ``<install-root>/etc/mercurial/hgrc``\n" |
13246 "| (Unix) ``<install-root>/etc/mercurial/hgrc``\n" |
12381 "| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``" |
13247 "| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``" |
12382 msgstr "" |
13248 msgstr "" |
12383 |
13249 |
12384 msgid "" |
13250 msgid "" |
12401 " which Mercurial is running. Options in these files apply to all\n" |
13267 " which Mercurial is running. Options in these files apply to all\n" |
12402 " Mercurial commands executed by any user in any directory. Registry\n" |
13268 " Mercurial commands executed by any user in any directory. Registry\n" |
12403 " keys contain PATH-like strings, every part of which must reference\n" |
13269 " keys contain PATH-like strings, every part of which must reference\n" |
12404 " a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n" |
13270 " a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n" |
12405 " be read. Mercurial checks each of these locations in the specified\n" |
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" |
13272 " order until one or more configuration files are detected." |
12407 " pywin32 extensions are not installed, Mercurial will only look for\n" |
|
12408 " site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``." |
|
12409 msgstr "" |
13273 msgstr "" |
12410 |
13274 |
12411 msgid "" |
13275 msgid "" |
12412 "Syntax\n" |
13276 "Syntax\n" |
12413 "------" |
13277 "------" |
12588 "An alias can start with an exclamation point (``!``) to make it a\n" |
13452 "An alias can start with an exclamation point (``!``) to make it a\n" |
12589 "shell alias. A shell alias is executed with the shell and will let you\n" |
13453 "shell alias. A shell alias is executed with the shell and will let you\n" |
12590 "run arbitrary commands. As an example, ::" |
13454 "run arbitrary commands. As an example, ::" |
12591 msgstr "" |
13455 msgstr "" |
12592 |
13456 |
12593 msgid " echo = !echo" |
13457 msgid " echo = !echo $@" |
12594 msgstr "" |
13458 msgstr "" |
12595 |
13459 |
12596 msgid "" |
13460 msgid "" |
12597 "will let you do ``hg echo foo`` to have ``foo`` printed in your\n" |
13461 "will let you do ``hg echo foo`` to have ``foo`` printed in your\n" |
12598 "terminal. A better example might be::" |
13462 "terminal. A better example might be::" |
12605 "which will make ``hg purge`` delete all unknown files in the\n" |
13469 "which will make ``hg purge`` delete all unknown files in the\n" |
12606 "repository in the same manner as the purge extension." |
13470 "repository in the same manner as the purge extension." |
12607 msgstr "" |
13471 msgstr "" |
12608 |
13472 |
12609 msgid "" |
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 "the path of the Mercurial that was used to execute the alias. This is\n" |
13483 "the path of the Mercurial that was used to execute the alias. This is\n" |
12612 "useful when you want to call further Mercurial commands in a shell\n" |
13484 "useful when you want to call further Mercurial commands in a shell\n" |
12613 "alias, as was done above for the purge alias. In addition,\n" |
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 "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``." |
13487 "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``." |
12616 msgstr "" |
13488 msgstr "" |
12617 |
13489 |
12618 msgid "" |
13490 msgid "" |
12619 ".. note:: Some global configuration options such as ``-R`` are\n" |
13491 ".. note:: Some global configuration options such as ``-R`` are\n" |
13003 " myfeature = ~/.hgext/myfeature.py" |
13875 " myfeature = ~/.hgext/myfeature.py" |
13004 msgstr "" |
13876 msgstr "" |
13005 |
13877 |
13006 msgid "" |
13878 msgid "" |
13007 "\n" |
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 "``format``\n" |
13880 "``format``\n" |
13036 "\"\"\"\"\"\"\"\"\"\"" |
13881 "\"\"\"\"\"\"\"\"\"\"" |
13037 msgstr "" |
13882 msgstr "" |
13038 |
13883 |
13039 msgid "" |
13884 msgid "" |
13065 " option ensures that the on-disk format of newly created\n" |
13910 " option ensures that the on-disk format of newly created\n" |
13066 " repositories will be compatible with Mercurial before version 1.7." |
13911 " repositories will be compatible with Mercurial before version 1.7." |
13067 msgstr "" |
13912 msgstr "" |
13068 |
13913 |
13069 msgid "" |
13914 msgid "" |
13070 "``merge-patterns``\n" |
13915 "``graph``\n" |
13071 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
13916 "\"\"\"\"\"\"\"\"\"" |
13072 msgstr "" |
13917 msgstr "" |
13073 |
13918 |
13074 msgid "" |
13919 msgid "" |
13075 "This section specifies merge tools to associate with particular file\n" |
13920 "Web graph view configuration. This section let you change graph\n" |
13076 "patterns. Tools matched here will take precedence over the default\n" |
13921 "elements display properties by branches, for instance to make the\n" |
13077 "merge tool. Patterns are globs by default, rooted at the repository\n" |
13922 "``default`` branch stand out." |
13078 "root." |
13923 msgstr "" |
13079 msgstr "" |
13924 |
13080 |
13925 msgid " <branch>.<argument> = <value>" |
13081 msgid "" |
13926 msgstr "" |
13082 " [merge-patterns]\n" |
13927 |
13083 " **.c = kdiff3\n" |
13928 msgid "" |
13084 " **.jpg = myimgmerge" |
13929 "where ``<branch>`` is the name of the branch being\n" |
13085 msgstr "" |
13930 "customized. Example::" |
13086 |
13931 msgstr "" |
13087 msgid "" |
13932 |
13088 "``merge-tools``\n" |
13933 msgid "" |
13089 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
13934 " [graph]\n" |
13090 msgstr "" |
13935 " # 2px width\n" |
13091 |
13936 " default.width = 2\n" |
13092 msgid "" |
13937 " # red color\n" |
13093 "This section configures external merge tools to use for file-level\n" |
13938 " default.color = FF0000" |
13094 "merges." |
13939 msgstr "" |
13095 msgstr "" |
13940 |
13096 |
13941 msgid "" |
13097 msgid "Example ``~/.hgrc``::" |
13942 "``width``\n" |
13098 msgstr "" |
13943 " Set branch edges width in pixels." |
13099 |
13944 msgstr "" |
13100 msgid "" |
13945 |
13101 " [merge-tools]\n" |
13946 msgid "" |
13102 " # Override stock tool location\n" |
13947 "``color``\n" |
13103 " kdiff3.executable = ~/bin/kdiff3\n" |
13948 " Set branch edges color in hexadecimal RGB notation." |
13104 " # Specify command line\n" |
13949 msgstr "" |
13105 " kdiff3.args = $base $local $other -o $output\n" |
13950 |
13106 " # Give higher priority\n" |
13951 msgid "" |
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" |
|
13228 "``hooks``\n" |
13952 "``hooks``\n" |
13229 "\"\"\"\"\"\"\"\"\"" |
13953 "\"\"\"\"\"\"\"\"\"" |
13230 msgstr "" |
13954 msgstr "" |
13231 |
13955 |
13232 msgid "" |
13956 msgid "" |
13461 "is treated as a failure." |
14185 "is treated as a failure." |
13462 msgstr "" |
14186 msgstr "" |
13463 |
14187 |
13464 msgid "" |
14188 msgid "" |
13465 "\n" |
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 "``http_proxy``\n" |
14217 "``http_proxy``\n" |
13467 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
14218 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
13468 msgstr "" |
14219 msgstr "" |
13469 |
14220 |
13470 msgid "" |
14221 msgid "" |
13499 " Optional. Always use the proxy, even for localhost and any entries\n" |
14250 " Optional. Always use the proxy, even for localhost and any entries\n" |
13500 " in ``http_proxy.no``. True or False. Default: False." |
14251 " in ``http_proxy.no``. True or False. Default: False." |
13501 msgstr "" |
14252 msgstr "" |
13502 |
14253 |
13503 msgid "" |
14254 msgid "" |
13504 "``smtp``\n" |
14255 "``merge-patterns``\n" |
13505 "\"\"\"\"\"\"\"\"" |
14256 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
13506 msgstr "" |
14257 msgstr "" |
13507 |
14258 |
13508 msgid "Configuration for extensions that need to send email messages." |
14259 msgid "" |
13509 msgstr "" |
14260 "This section specifies merge tools to associate with particular file\n" |
13510 |
14261 "patterns. Tools matched here will take precedence over the default\n" |
13511 msgid "" |
14262 "merge tool. Patterns are globs by default, rooted at the repository\n" |
13512 "``host``\n" |
14263 "root." |
13513 " Host name of mail server, e.g. \"mail.example.com\"." |
14264 msgstr "" |
13514 msgstr "" |
14265 |
13515 |
14266 msgid "" |
13516 msgid "" |
14267 " [merge-patterns]\n" |
13517 "``port``\n" |
14268 " **.c = kdiff3\n" |
13518 " Optional. Port to connect to on mail server. Default: 25." |
14269 " **.jpg = myimgmerge" |
13519 msgstr "" |
14270 msgstr "" |
13520 |
14271 |
13521 msgid "" |
14272 msgid "" |
13522 "``tls``\n" |
14273 "``merge-tools``\n" |
13523 " Optional. Method to enable TLS when connecting to mail server: " |
14274 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
13524 "starttls,\n" |
14275 msgstr "" |
13525 " smtps or none. Default: none." |
14276 |
13526 msgstr "" |
14277 msgid "" |
13527 |
14278 "This section configures external merge tools to use for file-level\n" |
13528 msgid "" |
14279 "merges." |
13529 "``username``\n" |
14280 msgstr "" |
13530 " Optional. User name for authenticating with the SMTP server.\n" |
14281 |
13531 " Default: none." |
14282 msgid "Example ``~/.hgrc``::" |
13532 msgstr "" |
14283 msgstr "" |
13533 |
14284 |
13534 msgid "" |
14285 msgid "" |
13535 "``password``\n" |
14286 " [merge-tools]\n" |
13536 " Optional. Password for authenticating with the SMTP server. If not\n" |
14287 " # Override stock tool location\n" |
13537 " specified, interactive sessions will prompt the user for a\n" |
14288 " kdiff3.executable = ~/bin/kdiff3\n" |
13538 " password; non-interactive sessions will fail. Default: none." |
14289 " # Specify command line\n" |
13539 msgstr "" |
14290 " kdiff3.args = $base $local $other -o $output\n" |
13540 |
14291 " # Give higher priority\n" |
13541 msgid "" |
14292 " kdiff3.priority = 1" |
13542 "``local_hostname``\n" |
14293 msgstr "" |
13543 " Optional. It's the hostname that the sender can use to identify\n" |
14294 |
13544 " itself to the MTA." |
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 msgstr "" |
14409 msgstr "" |
13546 |
14410 |
13547 msgid "" |
14411 msgid "" |
13548 "\n" |
14412 "\n" |
13549 "``patch``\n" |
14413 "``patch``\n" |
13622 "``profiling``\n" |
14486 "``profiling``\n" |
13623 "\"\"\"\"\"\"\"\"\"\"\"\"\"" |
14487 "\"\"\"\"\"\"\"\"\"\"\"\"\"" |
13624 msgstr "" |
14488 msgstr "" |
13625 |
14489 |
13626 msgid "" |
14490 msgid "" |
13627 "Specifies profiling format and file output. In this section\n" |
14491 "Specifies profiling type, format, and file output. Two profilers are\n" |
13628 "description, 'profiling data' stands for the raw data collected\n" |
14492 "supported: an instrumenting profiler (named ``ls``), and a sampling\n" |
13629 "during profiling, while 'profiling report' stands for a statistical\n" |
14493 "profiler (named ``stat``)." |
13630 "text report generated from the profiling data. The profiling is done\n" |
14494 msgstr "" |
13631 "using lsprof." |
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 msgstr "" |
14519 msgstr "" |
13633 |
14520 |
13634 msgid "" |
14521 msgid "" |
13635 "``format``\n" |
14522 "``format``\n" |
13636 " Profiling format.\n" |
14523 " Profiling format. Specific to the ``ls`` instrumenting profiler.\n" |
13637 " Default: text." |
14524 " Default: text." |
13638 msgstr "" |
14525 msgstr "" |
13639 |
14526 |
13640 msgid "" |
14527 msgid "" |
13641 " ``text``\n" |
14528 " ``text``\n" |
13644 " not kept.\n" |
14531 " not kept.\n" |
13645 " ``kcachegrind``\n" |
14532 " ``kcachegrind``\n" |
13646 " Format profiling data for kcachegrind use: when saving to a\n" |
14533 " Format profiling data for kcachegrind use: when saving to a\n" |
13647 " file, the generated file can directly be loaded into\n" |
14534 " file, the generated file can directly be loaded into\n" |
13648 " kcachegrind." |
14535 " kcachegrind." |
14536 msgstr "" |
|
14537 |
|
14538 msgid "" |
|
14539 "``frequency``\n" |
|
14540 " Sampling frequency. Specific to the ``stat`` sampling profiler.\n" |
|
14541 " Default: 1000." |
|
13649 msgstr "" |
14542 msgstr "" |
13650 |
14543 |
13651 msgid "" |
14544 msgid "" |
13652 "``output``\n" |
14545 "``output``\n" |
13653 " File path where profiling data or report should be saved. If the\n" |
14546 " File path where profiling data or report should be saved. If the\n" |
13684 " the write lock while determining what data to transfer.\n" |
14577 " the write lock while determining what data to transfer.\n" |
13685 " Default is True." |
14578 " Default is True." |
13686 msgstr "" |
14579 msgstr "" |
13687 |
14580 |
13688 msgid "" |
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 "``validate``\n" |
14588 "``validate``\n" |
13690 " Whether to validate the completeness of pushed changesets by\n" |
14589 " Whether to validate the completeness of pushed changesets by\n" |
13691 " checking that all new file revisions specified in manifests are\n" |
14590 " checking that all new file revisions specified in manifests are\n" |
13692 " present. Default is False." |
14591 " present. Default is False." |
13693 msgstr "" |
14592 msgstr "" |
13694 |
14593 |
13695 msgid "" |
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 "``subpaths``\n" |
14640 "``subpaths``\n" |
13697 "\"\"\"\"\"\"\"\"\"\"\"\"" |
14641 "\"\"\"\"\"\"\"\"\"\"\"\"" |
13698 msgstr "" |
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 msgstr "" |
14648 msgstr "" |
13702 |
14649 |
13703 msgid " <pattern> = <replacement>" |
14650 msgid " <pattern> = <replacement>" |
13704 msgstr "" |
14651 msgstr "" |
13705 |
14652 |
13706 msgid "" |
14653 msgid "" |
13707 "Where ``pattern`` is a regular expression matching the source and\n" |
14654 "where ``pattern`` is a regular expression matching a subrepository\n" |
13708 "``replacement`` is the replacement string used to rewrite it. Groups\n" |
14655 "source URL and ``replacement`` is the replacement string used to\n" |
13709 "can be matched in ``pattern`` and referenced in ``replacements``. For\n" |
14656 "rewrite it. Groups can be matched in ``pattern`` and referenced in\n" |
13710 "instance::" |
14657 "``replacements``. For instance::" |
13711 msgstr "" |
14658 msgstr "" |
13712 |
14659 |
13713 msgid " http://server/(.*)-hg/ = http://hg.server/\\1/" |
14660 msgid " http://server/(.*)-hg/ = http://hg.server/\\1/" |
13714 msgstr "" |
14661 msgstr "" |
13715 |
14662 |
13716 msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``." |
14663 msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``." |
13717 msgstr "" |
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 msgstr "" |
14670 msgstr "" |
13721 |
14671 |
13722 msgid "" |
14672 msgid "" |
13723 "``trusted``\n" |
14673 "``trusted``\n" |
13724 "\"\"\"\"\"\"\"\"\"\"\"" |
14674 "\"\"\"\"\"\"\"\"\"\"\"" |
13855 "``remotecmd``\n" |
14805 "``remotecmd``\n" |
13856 " remote command to use for clone/push/pull operations. Default is ``hg``." |
14806 " remote command to use for clone/push/pull operations. Default is ``hg``." |
13857 msgstr "" |
14807 msgstr "" |
13858 |
14808 |
13859 msgid "" |
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 "``report_untrusted``\n" |
14816 "``report_untrusted``\n" |
13861 " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" |
14817 " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" |
13862 " trusted user or group. True or False. Default is True." |
14818 " trusted user or group. True or False. Default is True." |
13863 msgstr "" |
14819 msgstr "" |
13864 |
14820 |
14041 "``cacerts``\n" |
14997 "``cacerts``\n" |
14042 " Path to file containing a list of PEM encoded certificate\n" |
14998 " Path to file containing a list of PEM encoded certificate\n" |
14043 " authority certificates. Environment variables and ``~user``\n" |
14999 " authority certificates. Environment variables and ``~user``\n" |
14044 " constructs are expanded in the filename. If specified on the\n" |
15000 " constructs are expanded in the filename. If specified on the\n" |
14045 " client, then it will verify the identity of remote HTTPS servers\n" |
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 msgstr "" |
15023 msgstr "" |
14048 |
15024 |
14049 msgid "" |
15025 msgid "" |
14050 " -----BEGIN CERTIFICATE-----\n" |
15026 " -----BEGIN CERTIFICATE-----\n" |
14051 " ... (certificate in base64 PEM encoding) ...\n" |
15027 " ... (certificate in base64 PEM encoding) ...\n" |
14054 " ... (certificate in base64 PEM encoding) ...\n" |
15030 " ... (certificate in base64 PEM encoding) ...\n" |
14055 " -----END CERTIFICATE-----" |
15031 " -----END CERTIFICATE-----" |
14056 msgstr "" |
15032 msgstr "" |
14057 |
15033 |
14058 msgid "" |
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 "``cache``\n" |
15035 "``cache``\n" |
14080 " Whether to support caching in hgweb. Defaults to True." |
15036 " Whether to support caching in hgweb. Defaults to True." |
15037 msgstr "" |
|
15038 |
|
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." |
|
14081 msgstr "" |
15048 msgstr "" |
14082 |
15049 |
14083 msgid "" |
15050 msgid "" |
14084 "``contact``\n" |
15051 "``contact``\n" |
14085 " Name or email address of the person in charge of the repository.\n" |
15052 " Name or email address of the person in charge of the repository.\n" |
14137 "``errorlog``\n" |
15104 "``errorlog``\n" |
14138 " Where to output the error log. Default is stderr." |
15105 " Where to output the error log. Default is stderr." |
14139 msgstr "" |
15106 msgstr "" |
14140 |
15107 |
14141 msgid "" |
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 "``hidden``\n" |
15118 "``hidden``\n" |
14143 " Whether to hide the repository in the hgwebdir index.\n" |
15119 " Whether to hide the repository in the hgwebdir index.\n" |
14144 " Default is False." |
15120 " Default is False." |
14145 msgstr "" |
15121 msgstr "" |
14146 |
15122 |
14856 " See 'Changeset, child'." |
15832 " See 'Changeset, child'." |
14857 msgstr "" |
15833 msgstr "" |
14858 |
15834 |
14859 msgid "" |
15835 msgid "" |
14860 "Close changeset\n" |
15836 "Close changeset\n" |
14861 " See 'Changeset, close'." |
15837 " See 'Head, closed branch'" |
14862 msgstr "" |
15838 msgstr "" |
14863 |
15839 |
14864 msgid "" |
15840 msgid "" |
14865 "Closed branch\n" |
15841 "Closed branch\n" |
14866 " See 'Branch, closed'." |
15842 " See 'Branch, closed'." |
14967 " to the files introduced manually or by a merge. The repository\n" |
15943 " to the files introduced manually or by a merge. The repository\n" |
14968 " metadata exists in the .hg directory inside the working directory." |
15944 " metadata exists in the .hg directory inside the working directory." |
14969 msgstr "" |
15945 msgstr "" |
14970 |
15946 |
14971 msgid "" |
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 "Graph\n" |
15955 "Graph\n" |
14973 " See DAG and :hg:`help graphlog`." |
15956 " See DAG and :hg:`help graphlog`." |
14974 msgstr "" |
15957 msgstr "" |
14975 |
15958 |
14976 msgid "" |
15959 msgid "" |
14994 "Head, closed branch\n" |
15977 "Head, closed branch\n" |
14995 " A changeset that marks a head as no longer interesting. The closed\n" |
15978 " A changeset that marks a head as no longer interesting. The closed\n" |
14996 " head is no longer listed by :hg:`heads`. A branch is considered\n" |
15979 " head is no longer listed by :hg:`heads`. A branch is considered\n" |
14997 " closed when all its heads are closed and consequently is not\n" |
15980 " closed when all its heads are closed and consequently is not\n" |
14998 " listed by :hg:`branches`." |
15981 " listed by :hg:`branches`." |
15982 msgstr "" |
|
15983 |
|
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." |
|
14999 msgstr "" |
15987 msgstr "" |
15000 |
15988 |
15001 msgid "" |
15989 msgid "" |
15002 "Head, repository\n" |
15990 "Head, repository\n" |
15003 " A topological head which has not been closed." |
15991 " A topological head which has not been closed." |
15094 " (Verb) The process of using a patch file to transform one\n" |
16082 " (Verb) The process of using a patch file to transform one\n" |
15095 " changeset into another." |
16083 " changeset into another." |
15096 msgstr "" |
16084 msgstr "" |
15097 |
16085 |
15098 msgid " Example: \"You will need to patch that revision.\"" |
16086 msgid " Example: \"You will need to patch that revision.\"" |
16087 msgstr "" |
|
16088 |
|
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`." |
|
15099 msgstr "" |
16100 msgstr "" |
15100 |
16101 |
15101 msgid "" |
16102 msgid "" |
15102 "Pull\n" |
16103 "Pull\n" |
15103 " An operation in which changesets in a remote repository which are\n" |
16104 " An operation in which changesets in a remote repository which are\n" |
15171 " A changeset that has only the null changeset as its parent. Most\n" |
16172 " A changeset that has only the null changeset as its parent. Most\n" |
15172 " repositories have only a single root changeset." |
16173 " repositories have only a single root changeset." |
15173 msgstr "" |
16174 msgstr "" |
15174 |
16175 |
15175 msgid "" |
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 "Tag\n" |
16183 "Tag\n" |
15177 " An alternative name given to a changeset. Tags can be used in all\n" |
16184 " An alternative name given to a changeset. Tags can be used in all\n" |
15178 " places where Mercurial expects a changeset ID, e.g., with\n" |
16185 " places where Mercurial expects a changeset ID, e.g., with\n" |
15179 " :hg:`update`. The creation of a tag is stored in the history and\n" |
16186 " :hg:`update`. The creation of a tag is stored in the history and\n" |
15180 " will thus automatically be shared with other using push and pull." |
16187 " will thus automatically be shared with other using push and pull." |
15274 "commands support the ``-I`` and ``-X`` options; see\n" |
16281 "commands support the ``-I`` and ``-X`` options; see\n" |
15275 ":hg:`help <command>` and :hg:`help patterns` for details." |
16282 ":hg:`help <command>` and :hg:`help patterns` for details." |
15276 msgstr "" |
16283 msgstr "" |
15277 |
16284 |
15278 msgid "" |
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 "An ignore file is a plain text file consisting of a list of patterns,\n" |
16293 "An ignore file is a plain text file consisting of a list of patterns,\n" |
15280 "with one pattern per line. Empty lines are skipped. The ``#``\n" |
16294 "with one pattern per line. Empty lines are skipped. The ``#``\n" |
15281 "character is treated as a comment character, and the ``\\`` character\n" |
16295 "character is treated as a comment character, and the ``\\`` character\n" |
15282 "is treated as an escape character." |
16296 "is treated as an escape character." |
15283 msgstr "" |
16297 msgstr "" |
15314 "and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n" |
16328 "and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n" |
15315 "regexp pattern, start it with ``^``." |
16329 "regexp pattern, start it with ``^``." |
15316 msgstr "" |
16330 msgstr "" |
15317 |
16331 |
15318 msgid "" |
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 "Example\n" |
16339 "Example\n" |
15320 "-------" |
16340 "-------" |
15321 msgstr "" |
16341 msgstr "" |
15322 |
16342 |
15323 msgid "Here is an example ignore file. ::" |
16343 msgid "Here is an example ignore file. ::" |
15340 " ^\\.pc/\n" |
16360 " ^\\.pc/\n" |
15341 msgstr "" |
16361 msgstr "" |
15342 |
16362 |
15343 msgid "" |
16363 msgid "" |
15344 "Mercurial's internal web server, hgweb, can serve either a single\n" |
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" |
16365 "repository, or a tree of repositories. In the second case, repository\n" |
15346 "configuration file can be used to specify the repository paths to use\n" |
16366 "paths and global options can be defined using a dedicated\n" |
15347 "and global web configuration options." |
16367 "configuration file common to :hg:`serve`, ``hgweb.wsgi``,\n" |
16368 "``hgweb.cgi`` and ``hgweb.fcgi``." |
|
15348 msgstr "" |
16369 msgstr "" |
15349 "Mercurials interna webbserver, hgweb, kan endera dela ut ett arkiv, eller\n" |
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" |
16371 "en trädstruktur med arkiv. I det andra fallet kan arkivsökvägar och\n" |
15351 "användas för att ange arkivsökvägarna att använda och globala alternativ\n" |
16372 "globala flaggor definieras med en dedikerad konfigurationsfil som delas\n" |
15352 "för webbkonfiguration" |
16373 "av :hg:`serve`, ``hgweb.wsgi``, ``hgweb.cgi`` och ``hgweb.fcgi``." |
15353 |
16374 |
15354 msgid "" |
16375 msgid "" |
15355 "This file uses the same syntax as other Mercurial configuration files,\n" |
16376 "This file uses the same syntax as other Mercurial configuration files\n" |
15356 "but only the following sections are recognized:" |
16377 "but recognizes only the following sections:" |
15357 msgstr "" |
16378 msgstr "" |
15358 "Denna fil använder samma syntax som Mercurials övriga konfigurationsfiler,\n" |
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 msgid "" |
16382 msgid "" |
15362 " - web\n" |
16383 " - web\n" |
15363 " - paths\n" |
16384 " - paths\n" |
15364 " - collections" |
16385 " - collections" |
15365 msgstr "" |
16386 msgstr "" |
15366 " - web\n" |
16387 " - web\n" |
15367 " - paths\n" |
16388 " - paths\n" |
15368 " - collections" |
16389 " - collections" |
15369 |
16390 |
15370 msgid "" |
16391 msgid "The ``web`` options are thorougly described in :hg:`help config`." |
15371 "The ``web`` section can specify all the settings described in the web\n" |
16392 msgstr "Flaggorna för ``web`` finns utförligt beskrivna i :hg:`help config`." |
15372 "section of the hgrc(5) documentation. See :hg:`help config` for\n" |
16393 |
15373 "information on where to find the manual page." |
16394 msgid "" |
15374 msgstr "" |
16395 "The ``paths`` section maps URL paths to paths of repositories in the\n" |
15375 "Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n" |
16396 "filesystem. hgweb will not expose the filesystem directly - only\n" |
15376 "i hgrc(5)-dokumentationen. Se :hg:`help config` för information om var\n" |
16397 "Mercurial repositories can be published and only according to the\n" |
15377 "manualsidan hittas." |
16398 "configuration." |
15378 |
16399 msgstr "" |
15379 msgid "" |
16400 "Sektionen ``paths`` matchar URL-sökvägar till arkivsökvägar i filsystemet.\n" |
15380 "The ``paths`` section provides mappings of physical repository\n" |
16401 "hgweb kommer inte att exponera filsystemet direkt - bara Mercurial-arkiv\n" |
15381 "paths to virtual ones. For instance::" |
16402 "kan publiceras och bara som konfigurationen medger." |
15382 msgstr "" |
16403 |
15383 "Sektionen ``paths`` mappar upp fysiska arkiv till virtuella. Exempelvis::" |
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 msgid "" |
16433 msgid "" |
15386 " [paths]\n" |
16434 " [paths]\n" |
15387 " projects/a = /foo/bar\n" |
16435 " /projects/a = /srv/tmprepos/a\n" |
15388 " projects/b = /baz/quux\n" |
16436 " /projects/b = c:/repos/b\n" |
15389 " web/root = /real/root/*\n" |
16437 " / = /srv/repos/*\n" |
15390 " / = /real/root2/*\n" |
16438 " /user/bob = /home/bob/repos/**" |
15391 " virtual/root2 = /real/root2/**" |
|
15392 msgstr "" |
16439 msgstr "" |
15393 " [paths]\n" |
16440 " [paths]\n" |
15394 " projekt/a = /foo/bar\n" |
16441 " /projects/a = /srv/tmprepos/a\n" |
15395 " projekt/b = /baz/quux\n" |
16442 " /projects/b = c:/repos/b\n" |
15396 " web/rot = /riktig/rot/*\n" |
16443 " / = /srv/repos/*\n" |
15397 " / = /riktig/rot2/*\n" |
16444 " /user/bob = /home/bob/repos/**" |
15398 " virtuell/rot2 = /riktig/rot2/**" |
|
15399 |
16445 |
15400 msgid "" |
16446 msgid "" |
15401 "- The first two entries make two repositories in different directories\n" |
16447 "- The first two entries make two repositories in different directories\n" |
15402 " appear under the same directory in the web interface\n" |
16448 " appear under the same directory in the web interface\n" |
15403 "- The third entry maps every Mercurial repository found in '/real/root'\n" |
16449 "- The third entry will publish every Mercurial repository found in\n" |
15404 " into 'web/root'. This format is preferred over the [collections] one,\n" |
16450 " ``/srv/repos/``, for instance the repository ``/srv/repos/quux/``\n" |
15405 " since using absolute paths as configuration keys is not supported on " |
16451 " will appear as ``http://server/quux/``\n" |
15406 "every\n" |
16452 "- The fourth entry will publish both ``http://server/user/bob/quux/``\n" |
15407 " platform (especially on Windows).\n" |
16453 " and ``http://server/user/bob/quux/testsubrepo/``" |
15408 "- The fourth entry is a special case mapping all repositories in\n" |
16454 msgstr "" |
15409 " '/real/root2' in the root of the virtual directory.\n" |
16455 "- De första två posterna gör att två arkiv i olika kataloger dyker upp\n" |
15410 "- The fifth entry recursively finds all repositories under the real\n" |
16456 " under samma katalog i webbgränssnittet\n" |
15411 " root, and maps their relative paths under the virtual root." |
16457 "- Den tredje posten publicerar alla Mercurial-arkiv som hittas i\n" |
15412 msgstr "" |
16458 " ``/srv/repos/``, exempelvis kommer arkivet ``/srv/repos/quux/``\n" |
15413 "- De första två posterna gör att två arkiv i olika kataloger visas under\n" |
16459 " att dyka upp som ``http://server/quux/``\n" |
15414 " samma katalog i webbgränssnittet\n" |
16460 "- Den fjärde posten publicerar både ``http://server/user/bob/quux/``\n" |
15415 "- Den tredje posten mappar alla Mercurial-arkiv som hittas i '/riktig/rot'\n" |
16461 " och ``http://server/user/bob/quux/testsubrepo/``" |
15416 " i 'web/rot'. Detta format är att föredra över det i [collections],\n" |
16462 |
15417 " eftersom användning av absoluta sökvägar som konfigurationsnycklar inte\n" |
16463 msgid "" |
15418 " stödjs på alla plattformar (särskilt Windows).\n" |
16464 "The ``collections`` section is deprecated and has been superseeded by\n" |
15419 "- Den fjärde posten är ett specialfall som mappar alla arkiv i\n" |
16465 "``paths``.\n" |
15420 " '/riktig/rot2' i roten på den virtuella katalogen.\n" |
16466 msgstr "Sektionen ``collections`` är föråldrad och har ersatts av ``paths``.\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" |
|
15447 |
16467 |
15448 msgid "To merge files Mercurial uses merge tools." |
16468 msgid "To merge files Mercurial uses merge tools." |
15449 msgstr "" |
16469 msgstr "" |
15450 |
16470 |
15451 msgid "" |
16471 msgid "" |
15495 msgid "" |
16515 msgid "" |
15496 "There are some internal merge tools which can be used. The internal\n" |
16516 "There are some internal merge tools which can be used. The internal\n" |
15497 "merge tools are:" |
16517 "merge tools are:" |
15498 msgstr "" |
16518 msgstr "" |
15499 |
16519 |
15500 msgid "" |
16520 msgid ".. internaltoolsmarker" |
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``." |
|
15538 msgstr "" |
16521 msgstr "" |
15539 |
16522 |
15540 msgid "" |
16523 msgid "" |
15541 "Internal tools are always available and do not require a GUI but will by " |
16524 "Internal tools are always available and do not require a GUI but will by " |
15542 "default\n" |
16525 "default\n" |
15658 |
16641 |
15659 msgid "Alternate pattern notations must be specified explicitly." |
16642 msgid "Alternate pattern notations must be specified explicitly." |
15660 msgstr "Alternativa mönsternotationer måste anges explicit." |
16643 msgstr "Alternativa mönsternotationer måste anges explicit." |
15661 |
16644 |
15662 msgid "" |
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 "To use a plain path name without any pattern matching, start it with\n" |
16652 "To use a plain path name without any pattern matching, start it with\n" |
15664 "``path:``. These path names must completely match starting at the\n" |
16653 "``path:``. These path names must completely match starting at the\n" |
15665 "current repository root." |
16654 "current repository root." |
15666 msgstr "" |
16655 msgstr "" |
15667 "För att använda en enkel sökväg utan någon mönstermatching, börja den med\n" |
16656 "För att använda en enkel sökväg utan någon mönstermatching, börja den med\n" |
15769 |
16758 |
15770 msgid "" |
16759 msgid "" |
15771 "These phases are ordered (public < draft < secret) and no changeset\n" |
16760 "These phases are ordered (public < draft < secret) and no changeset\n" |
15772 "can be in a lower phase than its ancestors. For instance, if a\n" |
16761 "can be in a lower phase than its ancestors. For instance, if a\n" |
15773 "changeset is public, all its ancestors are also public. Lastly,\n" |
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 msgstr "" |
16764 msgstr "" |
15776 |
16765 |
15777 msgid "" |
16766 msgid "" |
15778 "How are phases managed?\n" |
16767 "How are phases managed?\n" |
15779 "-----------------------" |
16768 "-----------------------" |
15871 msgstr " - visa en lista med ändringsrevision och fas::" |
16860 msgstr " - visa en lista med ändringsrevision och fas::" |
15872 |
16861 |
15873 msgid " hg log --template \"{rev} {phase}\\n\"" |
16862 msgid " hg log --template \"{rev} {phase}\\n\"" |
15874 msgstr " hg log --template \"{rev} {phase}\\n\"" |
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 msgid "" |
16871 msgid "" |
15877 "See :hg:`help phase` for more information on manually manipulating phases.\n" |
16872 "See :hg:`help phase` for more information on manually manipulating phases.\n" |
15878 msgstr "" |
16873 msgstr "" |
15879 "Se :hg:`help phase` för mer information om att manuellt änddra faser.\n" |
16874 "Se :hg:`help phase` för mer information om att manuellt änddra faser.\n" |
15880 |
16875 |
15907 "revisionsidentifierare och refereras till som en kort identifierare. En\n" |
16902 "revisionsidentifierare och refereras till som en kort identifierare. En\n" |
15908 "kort identifierare är bara giltig om det är prefixet för exakt en\n" |
16903 "kort identifierare är bara giltig om det är prefixet för exakt en\n" |
15909 "fullängdsidentifierare." |
16904 "fullängdsidentifierare." |
15910 |
16905 |
15911 msgid "" |
16906 msgid "" |
15912 "Any other string is treated as a tag or branch name. A tag name is a\n" |
16907 "Any other string is treated as a bookmark, tag, or branch name. A\n" |
15913 "symbolic name associated with a revision identifier. A branch name\n" |
16908 "bookmark is a movable pointer to a revision. A tag is a permanent name\n" |
15914 "denotes the tipmost revision of that branch. Tag and branch names must\n" |
16909 "associated with a revision. A branch name denotes the tipmost revision\n" |
15915 "not contain the \":\" character." |
16910 "of that branch. Bookmark, tag, and branch names must not contain the \":\"\n" |
15916 msgstr "" |
16911 "character." |
15917 "Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n" |
16912 msgstr "" |
15918 "ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n" |
16913 "Alla andra strängar behandlas som bokmärken, märken eller grennamn. Ett\n" |
15919 "anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n" |
16914 "bokmärke är en flyttbar pekare till en revision. Ett märkesnamn är ett\n" |
15920 "innehålla tecknet \":\"." |
16915 "permanent namn associerad med en revisionsidentifierare. Ett grennamn\n" |
15921 |
16916 "anger den högsta revisionen på den grenen. Bokmärken, märken och\n" |
15922 msgid "" |
16917 "grennamn kan inte innehålla tecknet \":\"." |
15923 "The reserved name \"tip\" is a special tag that always identifies the\n" |
16918 |
15924 "most recent revision." |
16919 msgid "The reserved name \"tip\" always identifies the most recent revision." |
15925 msgstr "" |
16920 msgstr "" |
15926 "Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n" |
16921 "Det reserverade namnet \"tip\" identifierar alltid den senaste revisionen." |
15927 "identifierar den senaste revisionen." |
|
15928 |
16922 |
15929 msgid "" |
16923 msgid "" |
15930 "The reserved name \"null\" indicates the null revision. This is the\n" |
16924 "The reserved name \"null\" indicates the null revision. This is the\n" |
15931 "revision of an empty repository, and the parent of revision 0." |
16925 "revision of an empty repository, and the parent of revision 0." |
15932 msgstr "" |
16926 msgstr "" |
16127 "1. Nested repository checkouts. They can appear anywhere in the\n" |
17121 "1. Nested repository checkouts. They can appear anywhere in the\n" |
16128 " parent working directory." |
17122 " parent working directory." |
16129 msgstr "" |
17123 msgstr "" |
16130 |
17124 |
16131 msgid "" |
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 " tell where the subrepository checkouts come from. Mercurial\n" |
17128 " tell where the subrepository checkouts come from. Mercurial\n" |
16134 " subrepositories are referenced like:" |
17129 " subrepositories are referenced like:" |
16135 msgstr "" |
17130 msgstr "" |
16136 |
17131 |
16137 msgid " path/to/nested = https://example.com/nested/repo/path" |
17132 msgid " path/to/nested = https://example.com/nested/repo/path" |
16157 " repositories, you have to create and add it to the parent\n" |
17152 " repositories, you have to create and add it to the parent\n" |
16158 " repository before using subrepositories." |
17153 " repository before using subrepositories." |
16159 msgstr "" |
17154 msgstr "" |
16160 |
17155 |
16161 msgid "" |
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 " capture whatever information is required to restore the\n" |
17159 " capture whatever information is required to restore the\n" |
16164 " subrepositories to the state they were committed in a parent\n" |
17160 " subrepositories to the state they were committed in a parent\n" |
16165 " repository changeset. Mercurial automatically record the nested\n" |
17161 " repository changeset. Mercurial automatically record the nested\n" |
16166 " repositories states when committing in the parent repository." |
17162 " repositories states when committing in the parent repository." |
16167 msgstr "" |
17163 msgstr "" |
16494 |
17490 |
16495 #, python-format |
17491 #, python-format |
16496 msgid "destination directory: %s\n" |
17492 msgid "destination directory: %s\n" |
16497 msgstr "destinationskatalog: %s\n" |
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 #, python-format |
17498 #, python-format |
16500 msgid "destination '%s' already exists" |
17499 msgid "destination '%s' already exists" |
16501 msgstr "destinationen '%s' finns redan" |
17500 msgstr "destinationen '%s' finns redan" |
16502 |
17501 |
16503 #, python-format |
17502 #, python-format |
16557 #, python-format |
17556 #, python-format |
16558 msgid "cannot start server at '%s:%d': %s" |
17557 msgid "cannot start server at '%s:%d': %s" |
16559 msgstr "" |
17558 msgstr "" |
16560 |
17559 |
16561 #, python-format |
17560 #, python-format |
17561 msgid "(binary file %s, hash: %s)" |
|
17562 msgstr "(binär fil %s, hash: %s)" |
|
17563 |
|
17564 #, python-format |
|
16562 msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
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 #, python-format |
17568 #, python-format |
16566 msgid "calling hook %s: %s\n" |
17569 msgid "calling hook %s: %s\n" |
16567 msgstr "" |
17570 msgstr "" |
16568 |
17571 |
16612 msgid "%s hook %s" |
17615 msgid "%s hook %s" |
16613 msgstr "" |
17616 msgstr "" |
16614 |
17617 |
16615 #, python-format |
17618 #, python-format |
16616 msgid "warning: %s hook %s\n" |
17619 msgid "warning: %s hook %s\n" |
17620 msgstr "" |
|
17621 |
|
17622 #, python-format |
|
17623 msgid "loading %s hook failed:\n" |
|
16617 msgstr "" |
17624 msgstr "" |
16618 |
17625 |
16619 msgid "kb" |
17626 msgid "kb" |
16620 msgstr "kb" |
17627 msgstr "kb" |
16621 |
17628 |
16706 msgstr "" |
17713 msgstr "" |
16707 |
17714 |
16708 msgid "working copy of .hgtags is changed (please commit .hgtags manually)" |
17715 msgid "working copy of .hgtags is changed (please commit .hgtags manually)" |
16709 msgstr "" |
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 msgid "abandoned transaction found - run hg recover" |
17718 msgid "abandoned transaction found - run hg recover" |
16720 msgstr "" |
17719 msgstr "" |
16721 |
17720 |
16722 msgid "rolling back interrupted transaction\n" |
17721 msgid "rolling back interrupted transaction\n" |
16723 msgstr "" |
17722 msgstr "" |
16775 |
17774 |
16776 msgid "cannot partially commit a merge (do not specify files or patterns)" |
17775 msgid "cannot partially commit a merge (do not specify files or patterns)" |
16777 msgstr "" |
17776 msgstr "" |
16778 "kan inte delvis arkivera en sammanfogning (ange inte filer eller mönster" |
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 msgid "can't commit subrepos without .hgsub" |
17786 msgid "can't commit subrepos without .hgsub" |
16781 msgstr "kan inte arkivera underarkiv utan .hgsub" |
17787 msgstr "kan inte arkivera underarkiv utan .hgsub" |
16782 |
17788 |
16783 msgid "use --subrepos for recursive commit" |
|
16784 msgstr "" |
|
16785 |
|
16786 msgid "file not found!" |
17789 msgid "file not found!" |
16787 msgstr "filen hittades inte!" |
17790 msgstr "filen hittades inte!" |
16788 |
17791 |
16789 msgid "no match under directory!" |
17792 msgid "no match under directory!" |
16790 msgstr "" |
17793 msgstr "" |
16791 |
17794 |
16792 msgid "file not tracked!" |
17795 msgid "file not tracked!" |
16793 msgstr "filen spåras inte!" |
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 msgid "unresolved merge conflicts (see hg help resolve)" |
17801 msgid "unresolved merge conflicts (see hg help resolve)" |
16796 msgstr "olösta sammanfogningskonflikter (se hg help resolve)" |
17802 msgstr "olösta sammanfogningskonflikter (se hg help resolve)" |
16797 |
17803 |
16798 #, python-format |
17804 #, python-format |
16799 msgid "committing subrepository %s\n" |
17805 msgid "committing subrepository %s\n" |
16800 msgstr "" |
17806 msgstr "arkiverar underarkiv %s\n" |
16801 |
17807 |
16802 #, python-format |
17808 #, python-format |
16803 msgid "note: commit message saved in %s\n" |
17809 msgid "note: commit message saved in %s\n" |
16804 msgstr "" |
17810 msgstr "" |
16805 |
17811 |
16815 "changegroupsubset." |
17821 "changegroupsubset." |
16816 msgstr "" |
17822 msgstr "" |
16817 "deldragningar kan inte göras eftersom det andra arkivet inte stödjer " |
17823 "deldragningar kan inte göras eftersom det andra arkivet inte stödjer " |
16818 "changegroupsubset." |
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 #, python-format |
17837 #, python-format |
16821 msgid "updating %s to public failed!\n" |
17838 msgid "updating %s to public failed!\n" |
16822 msgstr "uppdatera %s till publik misslyckades!\n" |
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 #, python-format |
17844 #, python-format |
16825 msgid "%d changesets found\n" |
17845 msgid "%d changesets found\n" |
16826 msgstr "%d ändringar hittades\n" |
17846 msgstr "%d ändringar hittades\n" |
16827 |
17847 |
16828 msgid "bundling" |
17848 msgid "bundling" |
16863 |
17883 |
16864 #, python-format |
17884 #, python-format |
16865 msgid "added %d changesets with %d changes to %d files%s\n" |
17885 msgid "added %d changesets with %d changes to %d files%s\n" |
16866 msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n" |
17886 msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n" |
16867 |
17887 |
16868 msgid "Unexpected response from remote server:" |
17888 msgid "unexpected response from remote server:" |
16869 msgstr "" |
17889 msgstr "oväntat svar från server:" |
16870 |
17890 |
16871 msgid "operation forbidden by server" |
17891 msgid "operation forbidden by server" |
16872 msgstr "" |
17892 msgstr "" |
16873 |
17893 |
16874 msgid "locking the remote repository failed" |
17894 msgid "locking the remote repository failed" |
16882 |
17902 |
16883 #, python-format |
17903 #, python-format |
16884 msgid "%d files to transfer, %s of data\n" |
17904 msgid "%d files to transfer, %s of data\n" |
16885 msgstr "%d filer att överföra, %s med data\n" |
17905 msgstr "%d filer att överföra, %s med data\n" |
16886 |
17906 |
17907 msgid "clone" |
|
17908 msgstr "" |
|
17909 |
|
16887 #, python-format |
17910 #, python-format |
16888 msgid "transferred %s in %.1f seconds (%s/sec)\n" |
17911 msgid "transferred %s in %.1f seconds (%s/sec)\n" |
16889 msgstr "överförde %s på %.1f sekunder (%s/sek)\n" |
17912 msgstr "överförde %s på %.1f sekunder (%s/sek)\n" |
16890 |
17913 |
16891 msgid "can't use TLS: Python SSL support not installed" |
17914 msgid "can't use TLS: Python SSL support not installed" |
17022 |
18045 |
17023 #, python-format |
18046 #, python-format |
17024 msgid "note: possible conflict - %s was renamed multiple times to:\n" |
18047 msgid "note: possible conflict - %s was renamed multiple times to:\n" |
17025 msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n" |
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 msgid "merging with a working directory ancestor has no effect" |
18054 msgid "merging with a working directory ancestor has no effect" |
17028 msgstr "" |
18055 msgstr "" |
17029 |
18056 |
17030 msgid "use 'hg update' or check 'hg heads'" |
18057 msgid "use 'hg update' or check 'hg heads'" |
17031 msgstr "använd 'hg update' eller kontrollera 'hg heads'" |
18058 msgstr "använd 'hg update' eller kontrollera 'hg heads'" |
17069 |
18096 |
17070 msgid "Warning!" |
18097 msgid "Warning!" |
17071 msgstr "Varning!" |
18098 msgstr "Varning!" |
17072 |
18099 |
17073 #, python-format |
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 msgid "unexpected token: %s" |
18119 msgid "unexpected token: %s" |
17075 msgstr "" |
18120 msgstr "" |
17076 |
18121 |
17077 #, python-format |
18122 #, python-format |
17078 msgid "not a prefix: %s" |
18123 msgid "not a prefix: %s" |
17128 |
18173 |
17129 #, python-format |
18174 #, python-format |
17130 msgid "bad hunk #%d old text line %d" |
18175 msgid "bad hunk #%d old text line %d" |
17131 msgstr "" |
18176 msgstr "" |
17132 |
18177 |
17133 msgid "could not extract binary patch" |
18178 #, python-format |
17134 msgstr "" |
18179 msgid "could not extract \"%s\" binary data" |
17135 |
18180 msgstr "" |
17136 #, python-format |
18181 |
17137 msgid "binary patch is %d bytes, not %d" |
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 msgstr "" |
18188 msgstr "" |
17139 |
18189 |
17140 #, python-format |
18190 #, python-format |
17141 msgid "unable to strip away %d of %d dirs from %s" |
18191 msgid "unable to strip away %d of %d dirs from %s" |
17142 msgstr "" |
18192 msgstr "" |
17143 |
18193 |
17144 msgid "undefined source and destination files" |
18194 msgid "undefined source and destination files" |
17145 msgstr "" |
18195 msgstr "" |
17146 |
18196 |
17147 #, python-format |
18197 #, python-format |
18198 msgid "failed to synchronize metadata for \"%s\"" |
|
18199 msgstr "" |
|
18200 |
|
18201 #, python-format |
|
17148 msgid "cannot create %s: destination already exists" |
18202 msgid "cannot create %s: destination already exists" |
17149 msgstr "" |
18203 msgstr "" |
17150 |
18204 |
17151 #, python-format |
18205 #, python-format |
17152 msgid "unsupported parser state: %s" |
18206 msgid "unsupported parser state: %s" |
17162 |
18216 |
17163 msgid "patch failed to apply" |
18217 msgid "patch failed to apply" |
17164 msgstr "" |
18218 msgstr "" |
17165 |
18219 |
17166 #, python-format |
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 msgid "ignoring inconsistent public root from remote: %s\n" |
18228 msgid "ignoring inconsistent public root from remote: %s\n" |
17168 msgstr "" |
18229 msgstr "" |
17169 |
18230 |
17170 #, python-format |
18231 #, python-format |
17171 msgid "ignoring unexpected root from remote: %i %s\n" |
18232 msgid "ignoring unexpected root from remote: %i %s\n" |
17172 msgstr "" |
18233 msgstr "" |
17173 |
18234 |
17174 #, python-format |
18235 #, python-format |
18236 msgid "phases.new-commit: not a valid phase name ('%s')" |
|
18237 msgstr "" |
|
18238 |
|
18239 #, python-format |
|
17175 msgid "exited with status %d" |
18240 msgid "exited with status %d" |
17176 msgstr "" |
18241 msgstr "" |
17177 |
18242 |
17178 #, python-format |
18243 #, python-format |
17179 msgid "killed by signal %d" |
18244 msgid "killed by signal %d" |
17183 msgid "saved backup bundle to %s\n" |
18248 msgid "saved backup bundle to %s\n" |
17184 msgstr "" |
18249 msgstr "" |
17185 |
18250 |
17186 msgid "adding branch\n" |
18251 msgid "adding branch\n" |
17187 msgstr "" |
18252 msgstr "" |
18253 |
|
18254 #, python-format |
|
18255 msgid "error removing %s: %s\n" |
|
18256 msgstr "fel vid radering av %s: %s\n" |
|
17188 |
18257 |
17189 #, python-format |
18258 #, python-format |
17190 msgid "strip failed, full bundle stored in '%s'\n" |
18259 msgid "strip failed, full bundle stored in '%s'\n" |
17191 msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n" |
18260 msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n" |
17192 |
18261 |
17193 #, python-format |
18262 #, python-format |
17194 msgid "strip failed, partial bundle stored in '%s'\n" |
18263 msgid "strip failed, partial bundle stored in '%s'\n" |
17195 msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n" |
18264 msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n" |
17196 |
18265 |
17197 #, python-format |
18266 #, python-format |
17198 msgid "cannot %s; remote repository does not support the %r capability" |
18267 msgid "revlog decompress error: %s" |
17199 msgstr "" |
18268 msgstr "" |
17200 |
18269 |
17201 #, python-format |
18270 #, python-format |
17202 msgid "unknown compression type %r" |
18271 msgid "unknown compression type %r" |
17203 msgstr "" |
18272 msgstr "" |
17296 " - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n" |
18365 " - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n" |
17297 " - ``goods``, ``bads`` : csets topologicaly good/bad\n" |
18366 " - ``goods``, ``bads`` : csets topologicaly good/bad\n" |
17298 " - ``range`` : csets taking part in the bisection\n" |
18367 " - ``range`` : csets taking part in the bisection\n" |
17299 " - ``pruned`` : csets that are goods, bads or skipped\n" |
18368 " - ``pruned`` : csets that are goods, bads or skipped\n" |
17300 " - ``untested`` : csets whose fate is yet unknown\n" |
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 msgstr "" |
18372 msgstr "" |
17303 |
18373 |
17304 msgid "bisect requires a string" |
18374 msgid "bisect requires a string" |
17305 msgstr "bisect kräver en sträng" |
18375 msgstr "bisect kräver en sträng" |
17306 |
18376 |
17307 msgid "" |
18377 msgid "" |
17308 "``bookmark([name])``\n" |
18378 "``bookmark([name])``\n" |
17309 " The named bookmark or all bookmarks." |
18379 " The named bookmark or all bookmarks." |
18380 msgstr "" |
|
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:`." |
|
17310 msgstr "" |
18387 msgstr "" |
17311 |
18388 |
17312 #. i18n: "bookmark" is a keyword |
18389 #. i18n: "bookmark" is a keyword |
17313 msgid "bookmark takes one or no arguments" |
18390 msgid "bookmark takes one or no arguments" |
17314 msgstr "bookmark tar ett eller inga argument" |
18391 msgstr "bookmark tar ett eller inga argument" |
17315 |
18392 |
17316 #. i18n: "bookmark" is a keyword |
18393 #. i18n: "bookmark" is a keyword |
17317 msgid "the argument to bookmark must be a string" |
18394 msgid "the argument to bookmark must be a string" |
17318 msgstr "argumentet till bookmark måste vara en sträng" |
18395 msgstr "argumentet till bookmark måste vara en sträng" |
18396 |
|
18397 #, python-format |
|
18398 msgid "no bookmarks exist that match '%s'" |
|
18399 msgstr "" |
|
17319 |
18400 |
17320 msgid "" |
18401 msgid "" |
17321 "``branch(string or set)``\n" |
18402 "``branch(string or set)``\n" |
17322 " All changesets belonging to the given branch or the branches of the " |
18403 " All changesets belonging to the given branch or the branches of the " |
17323 "given\n" |
18404 "given\n" |
17324 " changesets." |
18405 " changesets." |
17325 msgstr "" |
18406 msgstr "" |
17326 |
18407 |
17327 msgid "" |
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 "``children(set)``\n" |
18416 "``children(set)``\n" |
17329 " Child changesets of changesets in set." |
18417 " Child changesets of changesets in set." |
17330 msgstr "" |
18418 msgstr "" |
17331 |
18419 |
17332 msgid "" |
18420 msgid "" |
17344 " for information about file patterns." |
18432 " for information about file patterns." |
17345 msgstr "" |
18433 msgstr "" |
17346 |
18434 |
17347 #. i18n: "contains" is a keyword |
18435 #. i18n: "contains" is a keyword |
17348 msgid "contains requires a pattern" |
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 msgid "" |
18451 msgid "" |
17352 "``date(interval)``\n" |
18452 "``date(interval)``\n" |
17353 " Changesets within the interval, see :hg:`help dates`." |
18453 " Changesets within the interval, see :hg:`help dates`." |
17354 msgstr "" |
18454 msgstr "" |
17370 "``descendants(set)``\n" |
18470 "``descendants(set)``\n" |
17371 " Changesets which are descendants of changesets in set." |
18471 " Changesets which are descendants of changesets in set." |
17372 msgstr "" |
18472 msgstr "" |
17373 |
18473 |
17374 msgid "" |
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 "``draft()``\n" |
18484 "``draft()``\n" |
17376 " Changeset in draft phase." |
18485 " Changeset in draft phase." |
17377 msgstr "" |
18486 msgstr "" |
17378 |
18487 |
17379 msgid "draft takes no arguments" |
18488 msgid "draft takes no arguments" |
17380 msgstr "draft tar inga argument" |
18489 msgstr "draft tar inga argument" |
17381 |
18490 |
17382 msgid "" |
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 "``filelog(pattern)``\n" |
18521 "``filelog(pattern)``\n" |
17384 " Changesets connected to the specified filelog." |
18522 " Changesets connected to the specified filelog." |
17385 msgstr "" |
18523 msgstr "" |
17386 |
18524 |
17387 msgid "filelog requires a pattern" |
18525 msgid "filelog requires a pattern" |
17389 |
18527 |
17390 msgid "" |
18528 msgid "" |
17391 "``first(set, [n])``\n" |
18529 "``first(set, [n])``\n" |
17392 " An alias for limit()." |
18530 " An alias for limit()." |
17393 msgstr "" |
18531 msgstr "" |
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" |
|
17394 |
18540 |
17395 msgid "" |
18541 msgid "" |
17396 "``follow([file])``\n" |
18542 "``follow([file])``\n" |
17397 " An alias for ``::.`` (ancestors of the working copy's first parent).\n" |
18543 " An alias for ``::.`` (ancestors of the working copy's first parent).\n" |
17398 " If a filename is specified, the history of the given file is followed,\n" |
18544 " If a filename is specified, the history of the given file is followed,\n" |
17399 " including copies." |
18545 " including copies." |
17400 msgstr "" |
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 msgid "" |
18548 msgid "" |
17410 "``all()``\n" |
18549 "``all()``\n" |
17411 " All changesets, the same as ``0:tip``." |
18550 " All changesets, the same as ``0:tip``." |
17412 msgstr "" |
18551 msgstr "" |
17413 |
18552 |
17428 |
18567 |
17429 #, python-format |
18568 #, python-format |
17430 msgid "invalid match pattern: %s" |
18569 msgid "invalid match pattern: %s" |
17431 msgstr "ogiltigt träffmönster: %s" |
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 msgid "" |
18589 msgid "" |
17434 "``file(pattern)``\n" |
18590 "``file(pattern)``\n" |
17435 " Changesets affecting files matched by pattern." |
18591 " Changesets affecting files matched by pattern." |
17436 msgstr "" |
18592 msgstr "" |
17437 |
18593 |
17537 #. i18n: "id" is a keyword |
18693 #. i18n: "id" is a keyword |
17538 msgid "id requires a string" |
18694 msgid "id requires a string" |
17539 msgstr "id kräver en sträng" |
18695 msgstr "id kräver en sträng" |
17540 |
18696 |
17541 msgid "" |
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 "``outgoing([path])``\n" |
18716 "``outgoing([path])``\n" |
17543 " Changesets not found in the specified destination repository, or the\n" |
18717 " Changesets not found in the specified destination repository, or the\n" |
17544 " default push location." |
18718 " default push location." |
17545 msgstr "" |
18719 msgstr "" |
17546 |
18720 |
17573 |
18747 |
17574 msgid "" |
18748 msgid "" |
17575 "``present(set)``\n" |
18749 "``present(set)``\n" |
17576 " An empty set, if any revision in set isn't found; otherwise,\n" |
18750 " An empty set, if any revision in set isn't found; otherwise,\n" |
17577 " all revisions in set." |
18751 " all revisions in set." |
18752 msgstr "" |
|
18753 |
|
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." |
|
17578 msgstr "" |
18758 msgstr "" |
17579 |
18759 |
17580 msgid "" |
18760 msgid "" |
17581 "``public()``\n" |
18761 "``public()``\n" |
17582 " Changeset in public phase." |
18762 " Changeset in public phase." |
17629 #. i18n: "rev" is a keyword |
18809 #. i18n: "rev" is a keyword |
17630 msgid "rev expects a number" |
18810 msgid "rev expects a number" |
17631 msgstr "rev förväntar sig ett nummer" |
18811 msgstr "rev förväntar sig ett nummer" |
17632 |
18812 |
17633 msgid "" |
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 "``reverse(set)``\n" |
18861 "``reverse(set)``\n" |
17635 " Reverse order of set." |
18862 " Reverse order of set." |
17636 msgstr "" |
18863 msgstr "" |
17637 |
18864 |
17638 msgid "" |
18865 msgid "" |
17639 "``roots(set)``\n" |
18866 "``roots(set)``\n" |
17640 " Changesets with no parent changeset in set." |
18867 " Changesets in set with no parent changeset in set." |
17641 msgstr "" |
18868 msgstr "" |
17642 |
18869 |
17643 msgid "" |
18870 msgid "" |
17644 "``secret()``\n" |
18871 "``secret()``\n" |
17645 " Changeset in secret phase." |
18872 " Changeset in secret phase." |
17674 |
18901 |
17675 #, python-format |
18902 #, python-format |
17676 msgid "unknown sort key %r" |
18903 msgid "unknown sort key %r" |
17677 msgstr "okänd sorteringsnyckel %r" |
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 msgid "" |
18910 msgid "" |
17680 "``tag([name])``\n" |
18911 "``tag([name])``\n" |
17681 " The specified tag by name, or all tagged revisions if no name is given." |
18912 " The specified tag by name, or all tagged revisions if no name is given." |
17682 msgstr "" |
18913 msgstr "" |
17683 |
18914 |
17687 |
18918 |
17688 #. i18n: "tag" is a keyword |
18919 #. i18n: "tag" is a keyword |
17689 msgid "the argument to tag must be a string" |
18920 msgid "the argument to tag must be a string" |
17690 msgstr "argumentet till tag måste vara en sträng" |
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 msgid "" |
18932 msgid "" |
17693 "``user(string)``\n" |
18933 "``user(string)``\n" |
17694 " User name contains string. The match is case-insensitive." |
18934 " User name contains string. The match is case-insensitive." |
17695 msgstr "" |
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 msgid "can't negate that" |
18944 msgid "can't negate that" |
17698 msgstr "kan inte negera det" |
18945 msgstr "kan inte negera det" |
17699 |
18946 |
17700 msgid "not a symbol" |
18947 msgid "not a symbol" |
17701 msgstr "inte en symbol" |
18948 msgstr "inte en symbol" |
17702 |
18949 |
17703 #, python-format |
18950 #, python-format |
18951 msgid "infinite expansion of revset alias \"%s\" detected" |
|
18952 msgstr "" |
|
18953 |
|
18954 #, python-format |
|
17704 msgid "invalid number of arguments: %s" |
18955 msgid "invalid number of arguments: %s" |
17705 msgstr "felaktigt antal argument: %s" |
18956 msgstr "felaktigt antal argument: %s" |
17706 |
18957 |
17707 msgid "empty query" |
18958 msgid "empty query" |
17708 msgstr "tom fråga" |
18959 msgstr "tom fråga" |
17737 |
18988 |
17738 #, python-format |
18989 #, python-format |
17739 msgid "could not symlink to %r: %s" |
18990 msgid "could not symlink to %r: %s" |
17740 msgstr "" |
18991 msgstr "" |
17741 |
18992 |
18993 msgid "empty revision range" |
|
18994 msgstr "tomt revisionsset" |
|
18995 |
|
17742 #, python-format |
18996 #, python-format |
17743 msgid "recording removal of %s as rename to %s (%d%% similar)\n" |
18997 msgid "recording removal of %s as rename to %s (%d%% similar)\n" |
17744 msgstr "" |
18998 msgstr "" |
17745 |
18999 |
17746 #, python-format |
19000 #, python-format |
17897 #, python-format |
19151 #, python-format |
17898 msgid "subrepo spec file %s not found" |
19152 msgid "subrepo spec file %s not found" |
17899 msgstr "" |
19153 msgstr "" |
17900 |
19154 |
17901 #, python-format |
19155 #, python-format |
19156 msgid "invalid subrepository revision specifier in .hgsubstate line %d" |
|
19157 msgstr "" |
|
19158 |
|
19159 #, python-format |
|
17902 msgid "bad subrepository pattern in %s: %s" |
19160 msgid "bad subrepository pattern in %s: %s" |
17903 msgstr "" |
19161 msgstr "" |
17904 |
19162 |
17905 msgid "missing ] in subrepo source" |
19163 msgid "missing ] in subrepo source" |
17906 msgstr "" |
19164 msgstr "" |
17969 #, python-format |
19227 #, python-format |
17970 msgid "pushing subrepo %s to %s\n" |
19228 msgid "pushing subrepo %s to %s\n" |
17971 msgstr "trycker underarkivet %s till %s\n" |
19229 msgstr "trycker underarkivet %s till %s\n" |
17972 |
19230 |
17973 #, python-format |
19231 #, python-format |
19232 msgid "reverting subrepo %s\n" |
|
19233 msgstr "återställer underarkivet %s\n" |
|
19234 |
|
19235 #, python-format |
|
17974 msgid "'svn' executable not found for subrepo '%s'" |
19236 msgid "'svn' executable not found for subrepo '%s'" |
17975 msgstr "" |
19237 msgstr "" |
17976 |
19238 |
17977 msgid "cannot retrieve svn tool version" |
19239 msgid "cannot retrieve svn tool version" |
17978 msgstr "kan inte hämta version på svn-verktyg" |
19240 msgstr "kan inte hämta version på svn-verktyg" |
17979 |
19241 |
17980 msgid "cannot commit svn externals" |
19242 msgid "cannot commit svn externals" |
17981 msgstr "" |
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 #, python-format |
19251 #, python-format |
17984 msgid "not removing repo %s because it has changes.\n" |
19252 msgid "not removing repo %s because it has changes.\n" |
17985 msgstr "raderar inte arkivet %s eftersom den har ändringar.\n" |
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 #, python-format |
19261 #, python-format |
17988 msgid "revision %s does not exist in subrepo %s\n" |
19262 msgid "revision %s does not exist in subrepo %s\n" |
17989 msgstr "revisionen %s existerar inte i underarkivet %s\n" |
19263 msgstr "revisionen %s existerar inte i underarkivet %s\n" |
17990 |
19264 |
17991 #, python-format |
19265 #, python-format |
18008 msgstr "trycker grenen %s från underarkivet %s\n" |
19282 msgstr "trycker grenen %s från underarkivet %s\n" |
18009 |
19283 |
18010 #, python-format |
19284 #, python-format |
18011 msgid "" |
19285 msgid "" |
18012 "no branch checked out in subrepo %s\n" |
19286 "no branch checked out in subrepo %s\n" |
18013 "cannot push revision %s" |
19287 "cannot push revision %s\n" |
18014 msgstr "" |
19288 msgstr "" |
18015 "ingen gren uthämtar i underarkivet %s\n" |
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 #, python-format |
19292 #, python-format |
18019 msgid "%s, line %s: %s\n" |
19293 msgid "%s, line %s: %s\n" |
18020 msgstr "" |
19294 msgstr "%s, rad %s: %s\n" |
18021 |
19295 |
18022 msgid "cannot parse entry" |
19296 msgid "cannot parse entry" |
18023 msgstr "" |
19297 msgstr "" |
18024 |
19298 |
18025 #, python-format |
19299 #, python-format |
18107 msgid "" |
19381 msgid "" |
18108 ":obfuscate: Any text. Returns the input text rendered as a sequence of\n" |
19382 ":obfuscate: Any text. Returns the input text rendered as a sequence of\n" |
18109 " XML entities." |
19383 " XML entities." |
18110 msgstr "" |
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 msgstr "" |
19406 msgstr "" |
18114 |
19407 |
18115 msgid "" |
19408 msgid "" |
18116 ":rfc3339date: Date. Returns a date using the Internet date format\n" |
19409 ":rfc3339date: Date. Returns a date using the Internet date format\n" |
18117 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
19410 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
18158 msgid "" |
19451 msgid "" |
18159 ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" |
19452 ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" |
18160 " \"foo bar\" becomes \"foo%20bar\"." |
19453 " \"foo bar\" becomes \"foo%20bar\"." |
18161 msgstr "" |
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 msgstr "" |
19462 msgstr "" |
18165 |
19463 |
18166 msgid ":author: String. The unmodified author of the changeset." |
19464 msgid ":author: String. The unmodified author of the changeset." |
18167 msgstr "" |
19465 msgstr "" |
18168 |
19466 |
18246 msgstr "" |
19544 msgstr "" |
18247 |
19545 |
18248 msgid ":tags: List of strings. Any tags associated with the changeset." |
19546 msgid ":tags: List of strings. Any tags associated with the changeset." |
18249 msgstr "" |
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 #, python-format |
19556 #, python-format |
18252 msgid "unknown method '%s'" |
19557 msgid "unknown method '%s'" |
18253 msgstr "okänd metod '%s'" |
19558 msgstr "okänd metod '%s'" |
18254 |
19559 |
18255 msgid "expected a symbol" |
19560 msgid "expected a symbol" |
18299 |
19604 |
18300 msgid "already have changeset " |
19605 msgid "already have changeset " |
18301 msgstr "har redan ändringen " |
19606 msgstr "har redan ändringen " |
18302 |
19607 |
18303 #, python-format |
19608 #, python-format |
18304 msgid "Not trusting file %s from untrusted user %s, group %s\n" |
19609 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" |
19610 msgstr "litar inte på filen %s från opålitlig användare %s, grupp %s\n" |
18306 |
19611 |
18307 #, python-format |
19612 #, python-format |
18308 msgid "Ignored: %s\n" |
19613 msgid "ignored: %s\n" |
18309 msgstr "" |
19614 msgstr "ignorerad: %s\n" |
18310 |
19615 |
18311 #, python-format |
19616 #, python-format |
18312 msgid "(deprecated '%%' in path %s=%s from %s)\n" |
19617 msgid "(deprecated '%%' in path %s=%s from %s)\n" |
18313 msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" |
19618 msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" |
18314 |
19619 |
18322 |
19627 |
18323 msgid "enter a commit username:" |
19628 msgid "enter a commit username:" |
18324 msgstr "" |
19629 msgstr "" |
18325 |
19630 |
18326 #, python-format |
19631 #, python-format |
18327 msgid "No username found, using '%s' instead\n" |
19632 msgid "no username found, using '%s' instead\n" |
18328 msgstr "Inget användarnamn hittades, använder '%s' istället\n" |
19633 msgstr "inget användarnamn hittades, använder '%s' istället\n" |
18329 |
19634 |
18330 msgid "no username supplied (see \"hg help config\")" |
19635 msgid "no username supplied (see \"hg help config\")" |
18331 msgstr "inget användarnamn angivet (se \"hg help config\")" |
19636 msgstr "inget användarnamn angivet (se \"hg help config\")" |
18332 |
19637 |
18333 #, python-format |
19638 #, python-format |
18339 |
19644 |
18340 msgid "unrecognized response\n" |
19645 msgid "unrecognized response\n" |
18341 msgstr "" |
19646 msgstr "" |
18342 |
19647 |
18343 msgid "password: " |
19648 msgid "password: " |
18344 msgstr "" |
19649 msgstr "lösenord: " |
18345 |
|
18346 msgid "edit failed" |
|
18347 msgstr "" |
|
18348 |
19650 |
18349 msgid "http authorization required" |
19651 msgid "http authorization required" |
18350 msgstr "http-autenticiering krävs" |
19652 msgstr "http-autenticiering krävs" |
18351 |
19653 |
18352 msgid "http authorization required\n" |
19654 msgid "http authorization required\n" |