##// END OF EJS Templates
i18n-sv: snchronized with ed9f40bc346f
Jens Bäckman -
r16035:b2392a39 stable
parent child Browse files
Show More
@@ -13,8 +13,8 b' msgid ""'
13 13 msgstr ""
14 14 "Project-Id-Version: Mercurial\n"
15 15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
16 "POT-Creation-Date: 2012-01-25 08:34+0100\n"
17 "PO-Revision-Date: 2012-01-25 09:32+0100\n"
16 "POT-Creation-Date: 2012-01-30 16:25+0100\n"
17 "PO-Revision-Date: 2012-01-30 16:27+0100\n"
18 18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
19 19 "Language-Team: Swedish\n"
20 20 "Language: Swedish\n"
@@ -3748,6 +3748,20 b' msgstr ""'
3748 3748 "andra fallet."
3749 3749
3750 3750 msgid ""
3751 "It may be desirable for mq changesets in the secret phase (see\n"
3752 ":hg:`help phases`), which can be enabled with the following setting::"
3753 msgstr ""
3754 "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::"
3756
3757 msgid ""
3758 " [mq]\n"
3759 " secret = True"
3760 msgstr ""
3761 " [mq]\n"
3762 " secret = True"
3763
3764 msgid ""
3751 3765 "You will by default be managing a patch queue named \"patches\". You can\n"
3752 3766 "create other, independent patch queues with the :hg:`qqueue` command.\n"
3753 3767 msgstr ""
@@ -9430,6 +9444,9 b' msgstr "%s"'
9430 9444 msgid "use \"hg help -e %s\" to show help for the %s extension"
9431 9445 msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s"
9432 9446
9447 msgid "options:"
9448 msgstr "flaggor:"
9449
9433 9450 #, python-format
9434 9451 msgid ""
9435 9452 "\n"
@@ -10657,7 +10674,8 b' msgid ""'
10657 10674 " setting, or a command-line merge tool like ``diff3``. The resolve\n"
10658 10675 " command is used to manage the files involved in a merge, after\n"
10659 10676 " :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
10660 " working directory must have two parents)."
10677 " working directory must have two parents). See :hg:`help\n"
10678 " merge-tools` for information on configuring merge tools."
10661 10679 msgstr ""
10662 10680
10663 10681 msgid " The resolve command can be used in the following ways:"
@@ -12257,6 +12275,9 b' msgstr "Ordlista"'
12257 12275 msgid "syntax for Mercurial ignore files"
12258 12276 msgstr "syntax för Mercurials ignoreringsfiler"
12259 12277
12278 msgid "Working with Phases"
12279 msgstr "Arbeta med Faser"
12280
12260 12281 msgid ""
12261 12282 "The Mercurial system uses a set of configuration files to control\n"
12262 12283 "aspects of its behavior."
@@ -13574,7 +13595,30 b' msgid ""'
13574 13595 msgstr ""
13575 13596
13576 13597 msgid ""
13577 "\n"
13598 "``phases``\n"
13599 "\"\"\"\"\"\"\"\"\"\""
13600 msgstr ""
13601
13602 msgid ""
13603 "Specifies default handling of phases. See :hg:`help phases` for more\n"
13604 "information about working with phases."
13605 msgstr ""
13606
13607 msgid ""
13608 "``publish``\n"
13609 " Controls draft phase behavior when working as a server. When true,\n"
13610 " pushed changesets are set to public in both client and server and\n"
13611 " pulled or cloned changesets are set to public in the client.\n"
13612 " Default: True"
13613 msgstr ""
13614
13615 msgid ""
13616 "``new-commit``\n"
13617 " Phase of newly-created commits.\n"
13618 " Default: draft"
13619 msgstr ""
13620
13621 msgid ""
13578 13622 "``profiling``\n"
13579 13623 "\"\"\"\"\"\"\"\"\"\"\"\"\""
13580 13624 msgstr ""
@@ -15703,6 +15747,137 b' msgstr ""'
15703 15747 msgid "See also :hg:`help filesets`.\n"
15704 15748 msgstr ""
15705 15749
15750 msgid ""
15751 "What are phases?\n"
15752 "----------------"
15753 msgstr ""
15754
15755 msgid ""
15756 "Phases are a system for tracking which changesets have been or should\n"
15757 "be shared. This helps prevent common mistakes when modifying history\n"
15758 "(for instance, with the mq or rebase extensions)."
15759 msgstr ""
15760
15761 msgid "Each changeset in a repository is in one of the following phases:"
15762 msgstr ""
15763
15764 msgid ""
15765 " - public : changeset is visible on a public server\n"
15766 " - draft : changeset is not yet published\n"
15767 " - secret : changeset should not be pushed, pulled, or cloned"
15768 msgstr ""
15769
15770 msgid ""
15771 "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"
15773 "changeset is public, all its ancestors are also public. Lastly,\n"
15774 "changeset phases only be changed towards the public phase."
15775 msgstr ""
15776
15777 msgid ""
15778 "How are phases managed?\n"
15779 "-----------------------"
15780 msgstr ""
15781
15782 msgid ""
15783 "For the most part, phases should work transparently. By default, a\n"
15784 "changeset is created in the draft phase and is moved into the public\n"
15785 "phase when it is pushed to another repository."
15786 msgstr ""
15787
15788 msgid ""
15789 "Once changesets become public, extensions like mq and rebase will\n"
15790 "refuse to operate on them to prevent creating duplicate changesets.\n"
15791 "Phases can also be manually manipulated with the :hg:`phase` command\n"
15792 "if needed. See :hg:`help -v phase` for examples."
15793 msgstr ""
15794
15795 msgid ""
15796 "Phases and servers\n"
15797 "------------------"
15798 msgstr ""
15799
15800 msgid "Normally, all servers are ``publishing`` by default. This means::"
15801 msgstr ""
15802
15803 msgid ""
15804 " - all draft changesets that are pulled or cloned appear in phase\n"
15805 " public on the client"
15806 msgstr ""
15807
15808 msgid ""
15809 " - all draft changesets that are pushed appear as public on both\n"
15810 " client and server"
15811 msgstr ""
15812
15813 msgid " - secret changesets are neither pushed, pulled, or cloned"
15814 msgstr ""
15815
15816 msgid ""
15817 ".. note::\n"
15818 " Pulling a draft changeset from a publishing server does not mark it\n"
15819 " as public on the server side due to the read-only nature of pull."
15820 msgstr ""
15821
15822 msgid ""
15823 "Sometimes it may be desirable to push and pull changesets in the draft\n"
15824 "phase to share unfinished work. This can be done by setting a\n"
15825 "repository to disable publishing in its configuration file::"
15826 msgstr ""
15827
15828 msgid ""
15829 " [phases]\n"
15830 " publish = False"
15831 msgstr ""
15832 " [phases]\n"
15833 " publish = False"
15834
15835 msgid "See :hg:`help config` for more information on config files."
15836 msgstr "Se :hg:`help config` för mer information om konfigurationsfiler."
15837
15838 msgid ""
15839 ".. note::\n"
15840 " Servers running older versions of Mercurial are treated as\n"
15841 " publishing."
15842 msgstr ""
15843
15844 msgid ""
15845 "Examples\n"
15846 "--------"
15847 msgstr ""
15848 "Exempel\n"
15849 "-------"
15850
15851 msgid " - list changesets in draft or secret phase::"
15852 msgstr " - visa ändringar i draft- eller secret-fasen::"
15853
15854 msgid " hg log -r \"not public()\""
15855 msgstr " hg log -r \"not public()\""
15856
15857 msgid " - change all secret changesets to draft::"
15858 msgstr " - ändra alla secret-ändringar till draft::"
15859
15860 msgid " hg phase --draft \"secret()\""
15861 msgstr " hg phase --draft \"secret()\""
15862
15863 msgid ""
15864 " - forcibly move the current changeset and descendants from public to draft::"
15865 msgstr " - tvinga nuvarande ändring och ättlingar från public till draft::"
15866
15867 msgid " hg phase --force --draft ."
15868 msgstr " hg phase --force --draft ."
15869
15870 msgid " - show a list of changeset revision and phase::"
15871 msgstr " - visa en lista med ändringsrevision och fas::"
15872
15873 msgid " hg log --template \"{rev} {phase}\\n\""
15874 msgstr " hg log --template \"{rev} {phase}\\n\""
15875
15876 msgid ""
15877 "See :hg:`help phase` for more information on manually manipulating phases.\n"
15878 msgstr ""
15879 "Se :hg:`help phase` för mer information om att manuellt änddra faser.\n"
15880
15706 15881 msgid "Mercurial supports several ways to specify individual revisions."
15707 15882 msgstr "Mercurial stöder flera sätt att ange individuella revisioner."
15708 15883
@@ -17411,15 +17586,15 b' msgid "public takes no arguments"'
17411 17586 msgstr "public tar inga argument"
17412 17587
17413 17588 msgid ""
17414 "``remote([id], [path])``\n"
17589 "``remote([id [,path]])``\n"
17415 17590 " Local revision that corresponds to the given identifier in a\n"
17416 17591 " remote repository, if present. Here, the '.' identifier is a\n"
17417 17592 " synonym for the current local branch."
17418 17593 msgstr ""
17419 17594
17420 17595 #. i18n: "remote" is a keyword
17421 msgid "remote takes one or two arguments"
17422 msgstr "remote tar ett eller två argument"
17596 msgid "remote takes one, two or no arguments"
17597 msgstr "remote tar ett, två eller inga argument"
17423 17598
17424 17599 #. i18n: "remote" is a keyword
17425 17600 msgid "remote requires a string id"
@@ -17533,6 +17708,10 b' msgid "empty query"'
17533 17708 msgstr "tom fråga"
17534 17709
17535 17710 #, python-format
17711 msgid "no changes found (ignored %d secret changesets)\n"
17712 msgstr "inga ändringar hittades (ignorerade %d hemliga ändringar)\n"
17713
17714 #, python-format
17536 17715 msgid "ui.portablefilenames value is invalid ('%s')"
17537 17716 msgstr ""
17538 17717
@@ -17673,8 +17852,11 b' msgid "%s certificate error: no certific'
17673 17852 msgstr "%s certifikatfel: inget certifikat mottaget"
17674 17853
17675 17854 #, python-format
17676 msgid "invalid certificate for %s with fingerprint %s"
17677 msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
17855 msgid "certificate for %s has unexpected fingerprint %s"
17856 msgstr "certifikatet för %s har oväntat fingeravtryck %s"
17857
17858 msgid "check hostfingerprint configuration"
17859 msgstr "kontrollera hostfingerprint-konfiguration"
17678 17860
17679 17861 #, python-format
17680 17862 msgid "%s certificate error: %s"
General Comments 0
You need to be logged in to leave comments. Login now