##// END OF EJS Templates
Merge with hg-i18n
Martin Geisler -
r10549:b9773601 merge 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: 2010-02-16 18:12+0100\n"
17 "PO-Revision-Date: 2010-02-16 22:01+0100\n"
16 "POT-Creation-Date: 2010-02-24 19:41+0100\n"
17 "PO-Revision-Date: 2010-02-24 19:47+0100\n"
18 18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
19 19 "Language-Team: Swedish\n"
20 20 "MIME-Version: 1.0\n"
@@ -159,8 +159,11 b' msgstr ""'
159 159 msgid "a bookmark cannot have the name of an existing branch"
160 160 msgstr ""
161 161
162 msgid "no bookmarks set\n"
163 msgstr "inga bokmärken satta\n"
164
162 165 msgid "force"
163 msgstr ""
166 msgstr "tvinga"
164 167
165 168 msgid "revision"
166 169 msgstr "revision"
@@ -1436,6 +1439,10 b' msgstr ""'
1436 1439 msgid "uncommitted merge - please provide a specific revision"
1437 1440 msgstr ""
1438 1441
1442 #, python-format
1443 msgid "Signing %d:%s\n"
1444 msgstr "Signerar %d:%s\n"
1445
1439 1446 msgid "Error while signing"
1440 1447 msgstr ""
1441 1448
@@ -1554,6 +1561,10 b' msgid ""'
1554 1561 msgstr ""
1555 1562
1556 1563 #, python-format
1564 msgid "%s returned an error: %s"
1565 msgstr "%s returnerade ett fel: %s"
1566
1567 #, python-format
1557 1568 msgid "hgcia: sending update to %s\n"
1558 1569 msgstr ""
1559 1570
@@ -1987,6 +1998,9 b' msgstr ""'
1987 1998 msgid "unhooked all commit hooks\n"
1988 1999 msgstr ""
1989 2000
2001 msgid "hg keyword configuration and expansion example"
2002 msgstr "exempel på nyckelordskonfiguration och -expansion i hg"
2003
1990 2004 msgid ""
1991 2005 "\n"
1992 2006 "\tkeywords expanded\n"
@@ -2718,6 +2732,10 b' msgstr ""'
2718 2732 msgid "A patch named %s already exists in the series file"
2719 2733 msgstr ""
2720 2734
2735 #, python-format
2736 msgid "renaming %s to %s\n"
2737 msgstr "döper om %s till %s\n"
2738
2721 2739 msgid ""
2722 2740 "restore the queue state saved by a revision (DEPRECATED)\n"
2723 2741 "\n"
@@ -3988,8 +4006,28 b' msgstr ""'
3988 4006 msgid "commit failed"
3989 4007 msgstr ""
3990 4008
4009 msgid ""
4010 "y: transplant this changeset\n"
4011 "n: skip this changeset\n"
4012 "m: merge at this changeset\n"
4013 "p: show patch\n"
4014 "c: commit selected changesets\n"
4015 "q: cancel transplant\n"
4016 "?: show this help\n"
4017 msgstr ""
4018 "y: transplantera denna ändring\n"
4019 "n: hoppa över denna ändring\n"
4020 "m: sammanfoga vid denna ändring\n"
4021 "p: visa patch\n"
4022 "c: arkivera valda ändringar\n"
4023 "q: avbryt transplantation\n"
4024 "?: visa denna hjälp\n"
4025
3991 4026 msgid "apply changeset? [ynmpcq?]:"
3992 msgstr ""
4027 msgstr "applicera ändring? [ynmpcq?]:"
4028
4029 msgid "no such option\n"
4030 msgstr "inget sådant alternativ\n"
3993 4031
3994 4032 msgid ""
3995 4033 "transplant changesets from another branch\n"
@@ -5352,6 +5390,9 b' msgid ""'
5352 5390 " revisions are specified, the working directory files are compared\n"
5353 5391 " to its parent.\n"
5354 5392 "\n"
5393 " Alternatively you can specify -c/--change with a revision to see\n"
5394 " the changes in that changeset relative to its first parent.\n"
5395 "\n"
5355 5396 " Without the -a/--text option, diff will avoid generating diffs of\n"
5356 5397 " files it detects as binary. With -a, diff will generate a diff\n"
5357 5398 " anyway, probably with undesirable results.\n"
@@ -5375,6 +5416,9 b' msgstr ""'
5375 5416 " arbetskatalogen, och om ingen revision anges, jämförs arbetskatalogens\n"
5376 5417 " filer med dess förälder.\n"
5377 5418 "\n"
5419 " Alternativt så kan du ange -c/--change med en revision för att se\n"
5420 " modifikationerna i den ändringen relativt till dess första förälder.\n"
5421 "\n"
5378 5422 " Utan flaggan -a/--text, kommer diff att försöka undvika att visa\n"
5379 5423 " skillnader mellan binära filer. Med -a, kommer en diff att skapas ändå,\n"
5380 5424 " troligtvis med oönskade resultat.\n"
@@ -7217,8 +7261,8 b' msgstr "[FLAGGA]..."'
7217 7261 msgid "revision to check"
7218 7262 msgstr "revision att kontrollera"
7219 7263
7220 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7221 msgstr "[FLAGGA]... [-r REV1 [-r REV2]] [FIL]..."
7264 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
7265 msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
7222 7266
7223 7267 msgid "diff against the second parent"
7224 7268 msgstr "diffa mot den andra föräldern"
@@ -8799,6 +8843,12 b' msgstr ""'
8799 8843 msgid "searching for changes\n"
8800 8844 msgstr "söker efter ändringar\n"
8801 8845
8846 msgid "queries"
8847 msgstr "frågar"
8848
8849 msgid "searching"
8850 msgstr "söker"
8851
8802 8852 msgid "already have changeset "
8803 8853 msgstr ""
8804 8854
@@ -8844,25 +8894,46 b' msgstr "notera: osynkade fj\xc3\xa4rr\xc3\xa4ndringar!\\n"'
8844 8894 msgid "%d changesets found\n"
8845 8895 msgstr "%d ändringar hittades\n"
8846 8896
8897 msgid "bundle changes"
8898 msgstr "bunta ändringar"
8899
8900 msgid "chunks"
8901 msgstr "stycken"
8902
8903 msgid "bundle manifests"
8904 msgstr "bunta manifest"
8905
8847 8906 #, python-format
8848 8907 msgid "empty or missing revlog for %s"
8849 8908 msgstr "tom eller saknad revlog för %s"
8850 8909
8910 msgid "bundle files"
8911 msgstr "bunta filer"
8912
8851 8913 msgid "adding changesets\n"
8852 8914 msgstr "lägger till ändringar\n"
8853 8915
8916 msgid "changesets"
8917 msgstr "ändringar"
8918
8854 8919 msgid "received changelog group is empty"
8855 8920 msgstr "mottagen ändringsgrupp är tom"
8856 8921
8857 8922 msgid "adding manifests\n"
8858 8923 msgstr "lägger till manifest\n"
8859 8924
8925 msgid "manifests"
8926 msgstr "manifest"
8927
8860 8928 msgid "adding file changes\n"
8861 8929 msgstr "lägger till filändringar\n"
8862 8930
8863 8931 msgid "received file revlog group is empty"
8864 8932 msgstr "mottagen revlog-grupp för filer är tom"
8865 8933
8934 msgid "files"
8935 msgstr "filer"
8936
8866 8937 #, python-format
8867 8938 msgid "missing file data for %s:%s - run hg verify"
8868 8939 msgstr "fildata för %s:%s saknas - kör hg verify"
@@ -9061,12 +9132,12 b' msgid "file %s already exists\\n"'
9061 9132 msgstr ""
9062 9133
9063 9134 #, python-format
9064 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
9065 msgstr ""
9066
9067 #, python-format
9068 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
9069 msgstr ""
9135 msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
9136 msgstr "Stycke #%d lyckades vid %d med luddigheten %d (offset %d rader).\n"
9137
9138 #, python-format
9139 msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
9140 msgstr "Stycke #%d lyckades vid %d (offset %d rader).\n"
9070 9141
9071 9142 #, python-format
9072 9143 msgid "Hunk #%d FAILED at %d\n"
@@ -9383,6 +9454,10 b' msgstr ""'
9383 9454 msgid "http auth: user %s, password %s\n"
9384 9455 msgstr ""
9385 9456
9457 #, python-format
9458 msgid "ignoring invalid [auth] key '%s'\n"
9459 msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
9460
9386 9461 msgid "certificate checking requires Python 2.6"
9387 9462 msgstr "certifikatkontroll kräver Python 2.6"
9388 9463
@@ -9532,6 +9607,9 b' msgstr "arkivet anv\xc3\xa4nder revlog-format %d\\n"'
9532 9607 msgid "checking changesets\n"
9533 9608 msgstr "kontrollerar ändringar\n"
9534 9609
9610 msgid "changelog"
9611 msgstr "ändringslogg"
9612
9535 9613 #, python-format
9536 9614 msgid "unpacking changeset %s"
9537 9615 msgstr ""
@@ -9553,6 +9631,9 b' msgstr ""'
9553 9631 msgid "crosschecking files in changesets and manifests\n"
9554 9632 msgstr "korskontrollerar filer i ändringar och manifest\n"
9555 9633
9634 msgid "crosscheck"
9635 msgstr "korskontroll"
9636
9556 9637 #, python-format
9557 9638 msgid "changeset refers to unknown manifest %s"
9558 9639 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now