Show More
This diff has been collapsed as it changes many lines, (1098 lines changed) Show them Hide them | |||
@@ -17,8 +17,8 b' msgid ""' | |||
|
17 | 17 | msgstr "" |
|
18 | 18 | "Project-Id-Version: Mercurial\n" |
|
19 | 19 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
20 |
"POT-Creation-Date: 2010-0 |
|
|
21 |
"PO-Revision-Date: 2010-0 |
|
|
20 | "POT-Creation-Date: 2010-10-23 16:24+0200\n" | |
|
21 | "PO-Revision-Date: 2010-10-23 16:26+0200\n" | |
|
22 | 22 | "Last-Translator: <mg@lazybytes.net>\n" |
|
23 | 23 | "Language-Team: Danish\n" |
|
24 | 24 | "Language: \n" |
@@ -37,8 +37,16 b' msgstr "Valgmuligheder"' | |||
|
37 | 37 | msgid "Commands" |
|
38 | 38 | msgstr "Kommandoer" |
|
39 | 39 | |
|
40 |
msgid " |
|
|
41 | msgstr " tilvalg:" | |
|
40 | msgid "Extensions" | |
|
41 | msgstr "Udvidelser" | |
|
42 | ||
|
43 | msgid "" | |
|
44 | "This section contains help for extensions that are distributed together with " | |
|
45 | "Mercurial. Help for other extensions is available in the help system." | |
|
46 | msgstr "" | |
|
47 | ||
|
48 | msgid "options:" | |
|
49 | msgstr "tilvalg:" | |
|
42 | 50 | |
|
43 | 51 | #, python-format |
|
44 | 52 | msgid " aliases: %s" |
@@ -83,7 +91,7 b' msgstr ""' | |||
|
83 | 91 | |
|
84 | 92 | msgid "" |
|
85 | 93 | "Branch-based Access Control\n" |
|
86 | "---------------------------" | |
|
94 | "..........................." | |
|
87 | 95 | msgstr "" |
|
88 | 96 | |
|
89 | 97 | msgid "" |
@@ -107,7 +115,7 b' msgstr ""' | |||
|
107 | 115 | |
|
108 | 116 | msgid "" |
|
109 | 117 | "Path-based Access Control\n" |
|
110 | "-------------------------" | |
|
118 | "........................." | |
|
111 | 119 | msgstr "" |
|
112 | 120 | |
|
113 | 121 | msgid "" |
@@ -119,7 +127,7 b' msgstr ""' | |||
|
119 | 127 | |
|
120 | 128 | msgid "" |
|
121 | 129 | "Groups\n" |
|
122 | "------" | |
|
130 | "......" | |
|
123 | 131 | msgstr "" |
|
124 | 132 | |
|
125 | 133 | msgid "" |
@@ -136,7 +144,7 b' msgstr ""' | |||
|
136 | 144 | |
|
137 | 145 | msgid "" |
|
138 | 146 | "Example Configuration\n" |
|
139 | "---------------------" | |
|
147 | "....................." | |
|
140 | 148 | msgstr "" |
|
141 | 149 | |
|
142 | 150 | msgid "::" |
@@ -327,7 +335,13 b' msgid ""' | |||
|
327 | 335 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" |
|
328 | 336 | " directory's parent revision with the given name. If you specify\n" |
|
329 | 337 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
330 |
" the bookmark is assigned to that revision. |
|
|
338 | " the bookmark is assigned to that revision." | |
|
339 | msgstr "" | |
|
340 | ||
|
341 | msgid "" | |
|
342 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |
|
343 | " push` and :hg:`help pull`). This requires the bookmark extension to be\n" | |
|
344 | " enabled for both the local and remote repositories.\n" | |
|
331 | 345 | " " |
|
332 | 346 | msgstr "" |
|
333 | 347 | |
@@ -409,6 +423,22 b' msgstr "bogm\xc3\xa6rke der skal eksporteres"' | |||
|
409 | 423 | msgid "compare bookmark" |
|
410 | 424 | msgstr "sammenlign bogmærke" |
|
411 | 425 | |
|
426 | msgid "bookmark takes one or no arguments" | |
|
427 | msgstr "bookmark tager et eller to argumenter" | |
|
428 | ||
|
429 | msgid "the argument to bookmark must be a string" | |
|
430 | msgstr "" | |
|
431 | ||
|
432 | msgid "" | |
|
433 | "\n" | |
|
434 | "Added by the bookmarks extension:" | |
|
435 | msgstr "" | |
|
436 | ||
|
437 | msgid "" | |
|
438 | "``bookmark([name])``\n" | |
|
439 | " The named bookmark or all bookmarks.\n" | |
|
440 | msgstr "" | |
|
441 | ||
|
412 | 442 | msgid "force" |
|
413 | 443 | msgstr "gennemtving" |
|
414 | 444 | |
@@ -998,6 +1028,8 b' msgstr "ignorerer ukendt farve/effekt %r' | |||
|
998 | 1028 | msgid "win32console not found, please install pywin32\n" |
|
999 | 1029 | msgstr "win32console blev ikke fundet, installer venligst pywin32\n" |
|
1000 | 1030 | |
|
1031 | #. i18n: 'always', 'auto', and 'never' are keywords and should | |
|
1032 | #. not be translated | |
|
1001 | 1033 | msgid "when to colorize (boolean, always, auto, or never)" |
|
1002 | 1034 | msgstr "" |
|
1003 | 1035 | "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller " |
@@ -1190,7 +1222,7 b' msgstr ""' | |||
|
1190 | 1222 | |
|
1191 | 1223 | msgid "" |
|
1192 | 1224 | " Mercurial Source\n" |
|
1193 | " ----------------" | |
|
1225 | " ''''''''''''''''" | |
|
1194 | 1226 | msgstr "" |
|
1195 | 1227 | |
|
1196 | 1228 | msgid "" |
@@ -1207,7 +1239,7 b' msgstr ""' | |||
|
1207 | 1239 | |
|
1208 | 1240 | msgid "" |
|
1209 | 1241 | " CVS Source\n" |
|
1210 | " ----------" | |
|
1242 | " ''''''''''" | |
|
1211 | 1243 | msgstr "" |
|
1212 | 1244 | |
|
1213 | 1245 | msgid "" |
@@ -1264,7 +1296,7 b' msgstr ""' | |||
|
1264 | 1296 | |
|
1265 | 1297 | msgid "" |
|
1266 | 1298 | " Subversion Source\n" |
|
1267 | " -----------------" | |
|
1299 | " '''''''''''''''''" | |
|
1268 | 1300 | msgstr "" |
|
1269 | 1301 | |
|
1270 | 1302 | msgid "" |
@@ -1302,7 +1334,7 b' msgstr ""' | |||
|
1302 | 1334 | |
|
1303 | 1335 | msgid "" |
|
1304 | 1336 | " Perforce Source\n" |
|
1305 | " ---------------" | |
|
1337 | " '''''''''''''''" | |
|
1306 | 1338 | msgstr "" |
|
1307 | 1339 | |
|
1308 | 1340 | msgid "" |
@@ -1326,7 +1358,7 b' msgstr ""' | |||
|
1326 | 1358 | |
|
1327 | 1359 | msgid "" |
|
1328 | 1360 | " Mercurial Destination\n" |
|
1329 | " ---------------------" | |
|
1361 | " '''''''''''''''''''''" | |
|
1330 | 1362 | msgstr "" |
|
1331 | 1363 | |
|
1332 | 1364 | msgid "" |
@@ -1665,6 +1697,13 b' msgstr "kr\xc3\xa6ver darcs version 2.1 eller nyere (fandt %r)"' | |||
|
1665 | 1697 | msgid "Python ElementTree module is not available" |
|
1666 | 1698 | msgstr "Python ElementTree modulet er ikke tilstede" |
|
1667 | 1699 | |
|
1700 | #, python-format | |
|
1701 | msgid "%s repository format is unsupported, please upgrade" | |
|
1702 | msgstr "" | |
|
1703 | ||
|
1704 | msgid "failed to detect repository format!" | |
|
1705 | msgstr "" | |
|
1706 | ||
|
1668 | 1707 | msgid "internal calling inconsistency" |
|
1669 | 1708 | msgstr "intern kaldeinkonsistens" |
|
1670 | 1709 | |
@@ -1982,7 +2021,7 b' msgstr ""' | |||
|
1982 | 2021 | |
|
1983 | 2022 | msgid "" |
|
1984 | 2023 | "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" |
|
1985 | " ``CRLF`` override the default interpretation of ``native`` for\n" | |
|
2024 | " ``CRLF`` to override the default interpretation of ``native`` for\n" | |
|
1986 | 2025 | " checkout. This can be used with :hg:`archive` on Unix, say, to\n" |
|
1987 | 2026 | " generate an archive where files have line endings for Windows." |
|
1988 | 2027 | msgstr "" |
@@ -2205,12 +2244,14 b' msgid ""' | |||
|
2205 | 2244 | " order, use --switch-parent." |
|
2206 | 2245 | msgstr "" |
|
2207 | 2246 | |
|
2208 | msgid "" | |
|
2209 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
|
2247 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
|
2248 | msgstr "" | |
|
2249 | " Se :hg:`help dates` for en liste af gyldige formater til -d/--date." | |
|
2250 | ||
|
2251 | msgid "" | |
|
2252 | " Returns 0 on success.\n" | |
|
2210 | 2253 | " " |
|
2211 | 2254 | msgstr "" |
|
2212 | " Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" | |
|
2213 | " " | |
|
2214 | 2255 | |
|
2215 | 2256 | msgid "" |
|
2216 | 2257 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" |
@@ -2321,6 +2362,13 b' msgstr ""' | |||
|
2321 | 2362 | " Hvis der ikke angives en revision, så bruges forældren til\n" |
|
2322 | 2363 | " arbejdskataloget, eller tip, hvis der ikke er hentet en revision." |
|
2323 | 2364 | |
|
2365 | msgid "" | |
|
2366 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
|
2367 | " " | |
|
2368 | msgstr "" | |
|
2369 | " Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" | |
|
2370 | " " | |
|
2371 | ||
|
2324 | 2372 | msgid "uncommitted merge - please provide a specific revision" |
|
2325 | 2373 | msgstr "udeponeret sammenføjning - angiv venligst en specifik revision" |
|
2326 | 2374 | |
@@ -2876,8 +2924,9 b' msgid ""' | |||
|
2876 | 2924 | msgstr "" |
|
2877 | 2925 | |
|
2878 | 2926 | msgid "" |
|
2879 | "NOTE: the more specific you are in your filename patterns the less you\n" | |
|
2880 | "lose speed in huge repositories." | |
|
2927 | ".. note::\n" | |
|
2928 | " The more specific you are in your filename patterns the less you\n" | |
|
2929 | " lose speed in huge repositories." | |
|
2881 | 2930 | msgstr "" |
|
2882 | 2931 | |
|
2883 | 2932 | msgid "" |
@@ -3537,6 +3586,9 b' msgstr ""' | |||
|
3537 | 3586 | msgid "print the patches already applied" |
|
3538 | 3587 | msgstr "udskriver rettelserne som allerede er anvendt" |
|
3539 | 3588 | |
|
3589 | msgid " Returns 0 on success." | |
|
3590 | msgstr "" | |
|
3591 | ||
|
3540 | 3592 | msgid "only one patch applied\n" |
|
3541 | 3593 | msgstr "kun én rettelse er anvendt\n" |
|
3542 | 3594 | |
@@ -3607,10 +3659,15 b' msgstr ""' | |||
|
3607 | 3659 | msgid " To import an existing patch while renaming it::" |
|
3608 | 3660 | msgstr "" |
|
3609 | 3661 | |
|
3610 | msgid "" | |
|
3611 | " hg qimport -e existing-patch -n new-name\n" | |
|
3662 | msgid " hg qimport -e existing-patch -n new-name" | |
|
3663 | msgstr "" | |
|
3664 | ||
|
3665 | msgid "" | |
|
3666 | " Returns 0 if import succeeded.\n" | |
|
3612 | 3667 | " " |
|
3613 | 3668 | msgstr "" |
|
3669 | " Returnerer 0 hvis importeringen lykkedes.\n" | |
|
3670 | " " | |
|
3614 | 3671 | |
|
3615 | 3672 | msgid "init a new queue repository (DEPRECATED)" |
|
3616 | 3673 | msgstr "opret et nyt kø-depot (FORÆLDET)" |
@@ -3653,9 +3710,15 b' msgstr ""' | |||
|
3653 | 3710 | |
|
3654 | 3711 | msgid "" |
|
3655 | 3712 | " The patch directory must be a nested Mercurial repository, as\n" |
|
3656 |
" would be created by :hg:`init --mq`. |
|
|
3713 | " would be created by :hg:`init --mq`." | |
|
3714 | msgstr "" | |
|
3715 | ||
|
3716 | msgid "" | |
|
3717 | " Return 0 on success.\n" | |
|
3657 | 3718 | " " |
|
3658 | 3719 | msgstr "" |
|
3720 | " Returnerer 0 ved succes.\n" | |
|
3721 | " " | |
|
3659 | 3722 | |
|
3660 | 3723 | msgid "versioned patch repository not found (see init --mq)" |
|
3661 | 3724 | msgstr "versionsstyret rettelsesdepot blev ikke fundet (se init --mq)" |
@@ -3718,9 +3781,19 b' msgid ""' | |||
|
3718 | 3781 | " Use the -g/--git option to keep the patch in the git extended diff\n" |
|
3719 | 3782 | " format. Read the diffs help topic for more information on why this\n" |
|
3720 | 3783 | " is important for preserving permission changes and copy/rename\n" |
|
3721 |
" information. |
|
|
3784 | " information." | |
|
3785 | msgstr "" | |
|
3786 | " Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" | |
|
3787 | " git diff-format. Se :hg:`help diffs` for mere information om\n" | |
|
3788 | " hvorfor dette er vigtigt for at bevare filrettigheder og\n" | |
|
3789 | " information om kopieringer og omdøbninger." | |
|
3790 | ||
|
3791 | msgid "" | |
|
3792 | " Returns 0 on successful creation of a new patch.\n" | |
|
3722 | 3793 | " " |
|
3723 | 3794 | msgstr "" |
|
3795 | " Returnerer 0 hvis patchen blev oprettet.\n" | |
|
3796 | " " | |
|
3724 | 3797 | |
|
3725 | 3798 | msgid "update the current patch" |
|
3726 | 3799 | msgstr "opdater den aktuelle patch" |
@@ -3753,14 +3826,12 b' msgid ""' | |||
|
3753 | 3826 | " hg add/remove/copy/rename work as usual, though you might want to\n" |
|
3754 | 3827 | " use git-style patches (-g/--git or [diff] git=1) to track copies\n" |
|
3755 | 3828 | " and renames. See the diffs help topic for more information on the\n" |
|
3756 |
" git diff format. |
|
|
3757 | " " | |
|
3829 | " git diff format." | |
|
3758 | 3830 | msgstr "" |
|
3759 | 3831 | " hg add/remove/copy/rename virker som sædvanlig, dog vil du måske\n" |
|
3760 | 3832 | " bruge git-patches (-g/--git eller [diff] git=1) for at følge\n" |
|
3761 | 3833 | " kopier og omdøbninger. Se 'hg help diffs' for mere information om\n" |
|
3762 |
" git diff formatet. |
|
|
3763 | " " | |
|
3834 | " git diff formatet." | |
|
3764 | 3835 | |
|
3765 | 3836 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
|
3766 | 3837 | msgstr "tilvalg \"-e\" er inkompatibelt med \"-m\" eller \"-l\"" |
@@ -3783,14 +3854,12 b' msgid ""' | |||
|
3783 | 3854 | " Use :hg:`diff` if you only want to see the changes made since the\n" |
|
3784 | 3855 | " last qrefresh, or :hg:`export qtip` if you want to see changes\n" |
|
3785 | 3856 | " made by the current patch without including changes made since the\n" |
|
3786 |
" qrefresh. |
|
|
3787 | " " | |
|
3857 | " qrefresh." | |
|
3788 | 3858 | msgstr "" |
|
3789 | 3859 | " Brug :hg:`diff` hvis du kun vil se ændringer lavet siden den\n" |
|
3790 | 3860 | " sidste qrefresh, eller :hg:`export qtip` hvis du vil se ændringer\n" |
|
3791 | 3861 | " lavet af den nuværende patch uden at inkludere ændringer lavet\n" |
|
3792 |
" siden qrefresh. |
|
|
3793 | " " | |
|
3862 | " siden qrefresh." | |
|
3794 | 3863 | |
|
3795 | 3864 | msgid "fold the named patches into the current patch" |
|
3796 | 3865 | msgstr "" |
@@ -3806,7 +3875,7 b' msgstr ""' | |||
|
3806 | 3875 | |
|
3807 | 3876 | msgid "" |
|
3808 | 3877 | " The header for each folded patch will be concatenated with the\n" |
|
3809 |
" current patch header, separated by a line of |
|
|
3878 | " current patch header, separated by a line of ``* * *``." | |
|
3810 | 3879 | msgstr "" |
|
3811 | 3880 | |
|
3812 | 3881 | msgid "qfold requires at least one patch name" |
@@ -3849,22 +3918,21 b' msgstr ""' | |||
|
3849 | 3918 | |
|
3850 | 3919 | msgid "" |
|
3851 | 3920 | " With no arguments, print the currently active guards.\n" |
|
3852 |
" With arguments, set guards for the named patch. |
|
|
3853 | " NOTE: Specifying negative guards now requires '--'." | |
|
3854 | msgstr "" | |
|
3855 | " Uden argumenter vises de nuværende aktive filtre.\n" | |
|
3856 | " Med argumenter sættes filtre for den navngivne rettelse.\n" | |
|
3857 | " BEMÆRK: negative filtre skal nu specificeres med '--'." | |
|
3921 | " With arguments, set guards for the named patch." | |
|
3922 | msgstr "" | |
|
3923 | " Uden argumenter: vis de aktiverede filtre.\n" | |
|
3924 | " Med argumenter: sæt filtre for den navngivne patch." | |
|
3925 | ||
|
3926 | msgid "" | |
|
3927 | " .. note::\n" | |
|
3928 | " Specifying negative guards now requires '--'." | |
|
3929 | msgstr "" | |
|
3858 | 3930 | |
|
3859 | 3931 | msgid " To set guards on another patch::" |
|
3860 | 3932 | msgstr " For at sætte filtre på en anden rettelse::" |
|
3861 | 3933 | |
|
3862 | msgid "" | |
|
3863 |
" hg qguard other.patch -- +2.6.17 -stable |
|
|
3864 | " " | |
|
3865 | msgstr "" | |
|
3866 | " hg qguard other.patch -- +2.6.17 -stable\n" | |
|
3867 | " " | |
|
3934 | msgid " hg qguard other.patch -- +2.6.17 -stable" | |
|
3935 | msgstr " hg qguard other.patch -- +2.6.17 -stable" | |
|
3868 | 3936 | |
|
3869 | 3937 | msgid "cannot mix -l/--list with options or arguments" |
|
3870 | 3938 | msgstr "kan ikke blande -l/--list med tilvalg eller argumenter" |
@@ -3884,11 +3952,16 b' msgstr "skub den n\xc3\xa6ste rettelse p\xc3\xa5 stakken"' | |||
|
3884 | 3952 | |
|
3885 | 3953 | msgid "" |
|
3886 | 3954 | " When -f/--force is applied, all local changes in patched files\n" |
|
3887 |
" will be lost. |
|
|
3888 | " " | |
|
3955 | " will be lost." | |
|
3889 | 3956 | msgstr "" |
|
3890 | 3957 | " Når -f/--force er angivet, så vil alle lokale ændringer i de\n" |
|
3891 |
" rettede filer gå tabt. |
|
|
3958 | " rettede filer gå tabt." | |
|
3959 | ||
|
3960 | msgid "" | |
|
3961 | " Return 0 on succces.\n" | |
|
3962 | " " | |
|
3963 | msgstr "" | |
|
3964 | " Returnerer 0 ved succes.\n" | |
|
3892 | 3965 | " " |
|
3893 | 3966 | |
|
3894 | 3967 | msgid "no saved queues found, please use -n\n" |
@@ -3904,13 +3977,11 b' msgstr "fjern den aktuelle rettelse fra ' | |||
|
3904 | 3977 | msgid "" |
|
3905 | 3978 | " By default, pops off the top of the patch stack. If given a patch\n" |
|
3906 | 3979 | " name, keeps popping off patches until the named patch is at the\n" |
|
3907 |
" top of the stack. |
|
|
3908 | " " | |
|
3980 | " top of the stack." | |
|
3909 | 3981 | msgstr "" |
|
3910 | 3982 | " Som standard fjernes toppen af stakken. Hvis der angives en\n" |
|
3911 | 3983 | " rettelse, så vil der blive fjernet rettelser indtil den angivne\n" |
|
3912 |
" rettelse er på toppen af stakken. |
|
|
3913 | " " | |
|
3984 | " rettelse er på toppen af stakken." | |
|
3914 | 3985 | |
|
3915 | 3986 | #, python-format |
|
3916 | 3987 | msgid "using patch queue: %s\n" |
@@ -3937,8 +4008,8 b' msgstr "En rettelse ved navn %s eksister' | |||
|
3937 | 4008 | msgid "restore the queue state saved by a revision (DEPRECATED)" |
|
3938 | 4009 | msgstr "" |
|
3939 | 4010 | |
|
3940 |
msgid " This command is deprecated, use rebase |
|
|
3941 | msgstr "" | |
|
4011 | msgid " This command is deprecated, use :hg:`rebase` instead." | |
|
4012 | msgstr " Denne kommando er forældet. Brug :hg:`rebase` i stedet." | |
|
3942 | 4013 | |
|
3943 | 4014 | msgid "save current queue state (DEPRECATED)" |
|
3944 | 4015 | msgstr "" |
@@ -3985,8 +4056,10 b' msgstr ""' | |||
|
3985 | 4056 | |
|
3986 | 4057 | msgid "" |
|
3987 | 4058 | " Use the --no-backup option to discard the backup bundle once the\n" |
|
3988 |
" operation completes. |
|
|
3989 | " " | |
|
4059 | " operation completes." | |
|
4060 | msgstr "" | |
|
4061 | ||
|
4062 | msgid "empty revision set" | |
|
3990 | 4063 | msgstr "" |
|
3991 | 4064 | |
|
3992 | 4065 | msgid "set or print guarded patches to push" |
@@ -4115,8 +4188,7 b' msgstr ""' | |||
|
4115 | 4188 | msgid "" |
|
4116 | 4189 | " This can be especially useful if your changes have been applied to\n" |
|
4117 | 4190 | " an upstream repository, or if you are about to push your changes\n" |
|
4118 |
" to upstream. |
|
|
4119 | " " | |
|
4191 | " to upstream." | |
|
4120 | 4192 | msgstr "" |
|
4121 | 4193 | |
|
4122 | 4194 | msgid "no revisions specified" |
@@ -4148,8 +4220,7 b' msgstr ""' | |||
|
4148 | 4220 | msgid "" |
|
4149 | 4221 | " To delete an existing queue, use --delete. You cannot delete the " |
|
4150 | 4222 | "currently\n" |
|
4151 |
" active queue. |
|
|
4152 | " " | |
|
4223 | " active queue." | |
|
4153 | 4224 | msgstr "" |
|
4154 | 4225 | |
|
4155 | 4226 | msgid "patches applied - cannot set new queue active" |
@@ -4261,8 +4332,8 b' msgstr "behold rettelsesfil"' | |||
|
4261 | 4332 | msgid "stop managing a revision (DEPRECATED)" |
|
4262 | 4333 | msgstr "" |
|
4263 | 4334 | |
|
4264 |
msgid "hg qdelete [-k] [ |
|
|
4265 |
msgstr "hg qdelete [-k] [ |
|
|
4335 | msgid "hg qdelete [-k] [PATCH]..." | |
|
4336 | msgstr "hg qdelete [-k] [RETTELSE]..." | |
|
4266 | 4337 | |
|
4267 | 4338 | msgid "edit patch header" |
|
4268 | 4339 | msgstr "rediger rettelsens hoved" |
@@ -4354,11 +4425,11 b' msgstr ""' | |||
|
4354 | 4425 | msgid "forget any local changes to patched files" |
|
4355 | 4426 | msgstr "glem eventuelle lokale ændringer i de rettede filer" |
|
4356 | 4427 | |
|
4357 |
msgid "hg qpop [-a] [- |
|
|
4358 |
msgstr "hg qpop [-a] [- |
|
|
4359 | ||
|
4360 | msgid "apply if the patch has rejects" | |
|
4361 | msgstr "" | |
|
4428 | msgid "hg qpop [-a] [-f] [PATCH | INDEX]" | |
|
4429 | msgstr "hg qpop [-a] [-f] [RETTELSE | INDEKS]" | |
|
4430 | ||
|
4431 | msgid "apply on top of local changes" | |
|
4432 | msgstr "anvend ovenpå lokale ændringer" | |
|
4362 | 4433 | |
|
4363 | 4434 | msgid "list patch name in commit text" |
|
4364 | 4435 | msgstr "" |
@@ -4375,8 +4446,8 b' msgstr "sammenf\xc3\xb8j med navngiven k\xc3\xb8 (FOR\xc3\x86LDET)"' | |||
|
4375 | 4446 | msgid "reorder patch series and apply only the patch" |
|
4376 | 4447 | msgstr "" |
|
4377 | 4448 | |
|
4378 |
msgid "hg qpush [-f] [-l] [-a] [- |
|
|
4379 |
msgstr "hg qpush [-f] [-l] [-a] [- |
|
|
4449 | msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" | |
|
4450 | msgstr "hg qpush [-f] [-l] [-a] [--move] [RETTELSE | INDEKS]" | |
|
4380 | 4451 | |
|
4381 | 4452 | msgid "refresh only files already in the patch and specified files" |
|
4382 | 4453 | msgstr "genopfrisk kun filer som allerede findes i rettelsen og angivne filer" |
@@ -4460,8 +4531,11 b' msgstr "ingen backupper"' | |||
|
4460 | 4531 | msgid "no backups (DEPRECATED)" |
|
4461 | 4532 | msgstr "ingen backupper (FORÆLDET)" |
|
4462 | 4533 | |
|
4463 | msgid "hg strip [-f] [-n] REV..." | |
|
4464 | msgstr "hg strip [-f] [-n] REV..." | |
|
4534 | msgid "do not modify working copy during strip" | |
|
4535 | msgstr "" | |
|
4536 | ||
|
4537 | msgid "hg strip [-k] [-f] [-n] REV..." | |
|
4538 | msgstr "hg strip [-k] [-f] [-n] REV..." | |
|
4465 | 4539 | |
|
4466 | 4540 | msgid "hg qtop [-s]" |
|
4467 | 4541 | msgstr "hg qtop [-s]" |
@@ -4632,6 +4706,18 b' msgid ""' | |||
|
4632 | 4706 | msgstr "" |
|
4633 | 4707 | |
|
4634 | 4708 | msgid "" |
|
4709 | "By default, the pager is only executed if a command has output. To\n" | |
|
4710 | "force the pager to run even if a command prints nothing, set::" | |
|
4711 | msgstr "" | |
|
4712 | ||
|
4713 | msgid "" | |
|
4714 | " [pager]\n" | |
|
4715 | " force = True" | |
|
4716 | msgstr "" | |
|
4717 | " [pager]\n" | |
|
4718 | " force = True" | |
|
4719 | ||
|
4720 | msgid "" | |
|
4635 | 4721 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
|
4636 | 4722 | "setting::" |
|
4637 | 4723 | msgstr "" |
@@ -4675,8 +4761,19 b' msgstr ""' | |||
|
4675 | 4761 | |
|
4676 | 4762 | msgid "" |
|
4677 | 4763 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" |
|
4678 |
"to specify them in your user configuration file. |
|
|
4679 | msgstr "" | |
|
4764 | "to specify them in your user configuration file." | |
|
4765 | msgstr "" | |
|
4766 | ||
|
4767 | msgid "" | |
|
4768 | "The --pager=... option can also be used to control when the pager is\n" | |
|
4769 | "used. Use a boolean value like yes, no, on, off, or use auto for\n" | |
|
4770 | "normal behavior.\n" | |
|
4771 | msgstr "" | |
|
4772 | ||
|
4773 | msgid "when to paginate (boolean, always, auto, or never)" | |
|
4774 | msgstr "" | |
|
4775 | "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller " | |
|
4776 | "\"never\")" | |
|
4680 | 4777 | |
|
4681 | 4778 | msgid "interpret suffixes to refer to ancestor revisions" |
|
4682 | 4779 | msgstr "fortolk suffikser for at referere til forfader-revisioner" |
@@ -4742,12 +4839,6 b' msgid ""' | |||
|
4742 | 4839 | msgstr "" |
|
4743 | 4840 | |
|
4744 | 4841 | msgid "" |
|
4745 | "With the -d/--diffstat or -c/--confirm options, you will be presented\n" | |
|
4746 | "with a final summary of all messages and asked for confirmation before\n" | |
|
4747 | "the messages are sent." | |
|
4748 | msgstr "" | |
|
4749 | ||
|
4750 | msgid "" | |
|
4751 | 4842 | "To configure other defaults, add a section like this to your hgrc\n" |
|
4752 | 4843 | "file::" |
|
4753 | 4844 | msgstr "" |
@@ -4772,39 +4863,6 b' msgid ""' | |||
|
4772 | 4863 | msgstr "" |
|
4773 | 4864 | |
|
4774 | 4865 | msgid "" |
|
4775 | "To avoid sending patches prematurely, it is a good idea to first run\n" | |
|
4776 | "the :hg:`email` command with the \"-n\" option (test only). You will be\n" | |
|
4777 | "prompted for an email recipient address, a subject and an introductory\n" | |
|
4778 | "message describing the patches of your patchbomb. Then when all is\n" | |
|
4779 | "done, patchbomb messages are displayed. If the PAGER environment\n" | |
|
4780 | "variable is set, your pager will be fired up once for each patchbomb\n" | |
|
4781 | "message, so you can verify everything is alright." | |
|
4782 | msgstr "" | |
|
4783 | ||
|
4784 | msgid "" | |
|
4785 | "The -m/--mbox option is also very useful. Instead of previewing each\n" | |
|
4786 | "patchbomb message in a pager or sending the messages directly, it will\n" | |
|
4787 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" | |
|
4788 | "can be previewed with any mail user agent which supports UNIX mbox\n" | |
|
4789 | "files, e.g. with mutt::" | |
|
4790 | msgstr "" | |
|
4791 | ||
|
4792 | msgid " % mutt -R -f mbox" | |
|
4793 | msgstr "" | |
|
4794 | ||
|
4795 | msgid "" | |
|
4796 | "When you are previewing the patchbomb messages, you can use ``formail``\n" | |
|
4797 | "(a utility that is commonly installed as part of the procmail\n" | |
|
4798 | "package), to send each message out::" | |
|
4799 | msgstr "" | |
|
4800 | ||
|
4801 | msgid " % formail -s sendmail -bm -t < mbox" | |
|
4802 | msgstr " % formail -s sendmail -bm -t < mbox" | |
|
4803 | ||
|
4804 | msgid "That should be all. Now your patchbomb is on its way out." | |
|
4805 | msgstr "" | |
|
4806 | ||
|
4807 | msgid "" | |
|
4808 | 4866 | "You can also either configure the method option in the email section\n" |
|
4809 | 4867 | "to be a sendmail compatible mailer or fill out the [smtp] section so\n" |
|
4810 | 4868 | "that the patchbomb extension can automatically send patchbombs\n" |
@@ -4832,10 +4890,21 b' msgid ""' | |||
|
4832 | 4890 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
4833 | 4891 | " the first line of the changeset description as the subject text.\n" |
|
4834 | 4892 | " The message contains two or three parts. First, the changeset\n" |
|
4835 | " description. Next, (optionally) if the diffstat program is\n" | |
|
4836 | " installed and -d/--diffstat is used, the result of running\n" | |
|
4837 | " diffstat on the patch. Finally, the patch itself, as generated by\n" | |
|
4838 | " :hg:`export`." | |
|
4893 | " description." | |
|
4894 | msgstr "" | |
|
4895 | ||
|
4896 | msgid "" | |
|
4897 | " With the -d/--diffstat option, if the diffstat program is\n" | |
|
4898 | " installed, the result of running diffstat on the patch is inserted." | |
|
4899 | msgstr "" | |
|
4900 | ||
|
4901 | msgid " Finally, the patch itself, as generated by :hg:`export`." | |
|
4902 | msgstr "" | |
|
4903 | ||
|
4904 | msgid "" | |
|
4905 | " With the -d/--diffstat or -c/--confirm options, you will be presented\n" | |
|
4906 | " with a final summary of all messages and asked for confirmation before\n" | |
|
4907 | " the messages are sent." | |
|
4839 | 4908 | msgstr "" |
|
4840 | 4909 | |
|
4841 | 4910 | msgid "" |
@@ -4858,6 +4927,23 b' msgid ""' | |||
|
4858 | 4927 | msgstr "" |
|
4859 | 4928 | |
|
4860 | 4929 | msgid "" |
|
4930 | " With -m/--mbox, instead of previewing each patchbomb message in a\n" | |
|
4931 | " pager or sending the messages directly, it will create a UNIX\n" | |
|
4932 | " mailbox file with the patch emails. This mailbox file can be\n" | |
|
4933 | " previewed with any mail user agent which supports UNIX mbox\n" | |
|
4934 | " files." | |
|
4935 | msgstr "" | |
|
4936 | ||
|
4937 | msgid "" | |
|
4938 | " With -n/--test, all steps will run, but mail will not be sent.\n" | |
|
4939 | " You will be prompted for an email recipient address, a subject and\n" | |
|
4940 | " an introductory message describing the patches of your patchbomb.\n" | |
|
4941 | " Then when all is done, patchbomb messages are displayed. If the\n" | |
|
4942 | " PAGER environment variable is set, your pager will be fired up once\n" | |
|
4943 | " for each patchbomb message, so you can verify everything is alright." | |
|
4944 | msgstr "" | |
|
4945 | ||
|
4946 | msgid "" | |
|
4861 | 4947 | " hg email -r 3000 # send patch 3000 only\n" |
|
4862 | 4948 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
|
4863 | 4949 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" |
@@ -4880,6 +4966,15 b' msgid ""' | |||
|
4880 | 4966 | msgstr "" |
|
4881 | 4967 | |
|
4882 | 4968 | msgid "" |
|
4969 | " hg email -o -m mbox && # generate an mbox file...\n" | |
|
4970 | " mutt -R -f mbox # ... and view it with mutt\n" | |
|
4971 | " hg email -o -m mbox && # generate an mbox file ...\n" | |
|
4972 | " formail -s sendmail \\ # ... and use formail to send from the " | |
|
4973 | "mbox\n" | |
|
4974 | " -bm -t < mbox # ... using sendmail" | |
|
4975 | msgstr "" | |
|
4976 | ||
|
4977 | msgid "" | |
|
4883 | 4978 | " Before using this command, you will need to enable email in your\n" |
|
4884 | 4979 | " hgrc. See the [email] section in hgrc(5) for details.\n" |
|
4885 | 4980 | " " |
@@ -5237,8 +5332,8 b' msgstr "man kan ikke bruge b\xc3\xa5de keepbranches og extrafn"' | |||
|
5237 | 5332 | msgid "rebasing" |
|
5238 | 5333 | msgstr "" |
|
5239 | 5334 | |
|
5240 |
msgid " |
|
|
5241 |
msgstr " |
|
|
5335 | msgid "changesets" | |
|
5336 | msgstr "ændringer" | |
|
5242 | 5337 | |
|
5243 | 5338 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" |
|
5244 | 5339 | msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue" |
@@ -5392,10 +5487,6 b' msgstr ""' | |||
|
5392 | 5487 | " Hvis en liste af filer er udeladt, så vil alle ændringer\n" |
|
5393 | 5488 | " rapporteret af :hg:`status` være kandidater til at blive optaget." |
|
5394 | 5489 | |
|
5395 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
|
5396 | msgstr "" | |
|
5397 | " Se :hg:`help dates` for en liste af gyldige formater til -d/--date." | |
|
5398 | ||
|
5399 | 5490 | msgid "" |
|
5400 | 5491 | " You will be prompted for whether to record changes to each\n" |
|
5401 | 5492 | " modified file, and for files with multiple changes, for each\n" |
@@ -5447,9 +5538,6 b' msgstr "kan ikke deponere en sammenf\xc3\xb8jning partielt (brug i stedet hg commit)"' | |||
|
5447 | 5538 | msgid "no changes to record\n" |
|
5448 | 5539 | msgstr "ingen ændringer at optage\n" |
|
5449 | 5540 | |
|
5450 | msgid "patch failed to apply" | |
|
5451 | msgstr "rettelse kunne ikke tilføjes" | |
|
5452 | ||
|
5453 | 5541 | msgid "hg record [OPTION]... [FILE]..." |
|
5454 | 5542 | msgstr "hg record [TILVALG]... [FIL]..." |
|
5455 | 5543 | |
@@ -5525,9 +5613,6 b' msgstr "kilden og destinationen er p\xc3\xa5 forskellige enheder"' | |||
|
5525 | 5613 | msgid "not linkable: %s\n" |
|
5526 | 5614 | msgstr "kan ikke sammenkædes: %s\n" |
|
5527 | 5615 | |
|
5528 | msgid " files" | |
|
5529 | msgstr " filer" | |
|
5530 | ||
|
5531 | 5616 | msgid "pruning" |
|
5532 | 5617 | msgstr "beskærer" |
|
5533 | 5618 | |
@@ -5621,15 +5706,16 b' msgid ""' | |||
|
5621 | 5706 | msgstr "" |
|
5622 | 5707 | |
|
5623 | 5708 | msgid "" |
|
5624 | " NOTE: using rollback or extensions that destroy/modify history\n" | |
|
5625 | " (mq, rebase, etc.) can cause considerable confusion with shared\n" | |
|
5626 | " clones. In particular, if two shared clones are both updated to\n" | |
|
5627 | " the same changeset, and one of them destroys that changeset with\n" | |
|
5628 | " rollback, the other clone will suddenly stop working: all\n" | |
|
5629 | " operations will fail with \"abort: working directory has unknown\n" | |
|
5630 | " parent\". The only known workaround is to use debugsetparents on\n" | |
|
5631 | " the broken clone to reset it to a changeset that still exists\n" | |
|
5632 | " (e.g. tip).\n" | |
|
5709 | " .. note::\n" | |
|
5710 | " using rollback or extensions that destroy/modify history (mq,\n" | |
|
5711 | " rebase, etc.) can cause considerable confusion with shared\n" | |
|
5712 | " clones. In particular, if two shared clones are both updated to\n" | |
|
5713 | " the same changeset, and one of them destroys that changeset\n" | |
|
5714 | " with rollback, the other clone will suddenly stop working: all\n" | |
|
5715 | " operations will fail with \"abort: working directory has unknown\n" | |
|
5716 | " parent\". The only known workaround is to use debugsetparents on\n" | |
|
5717 | " the broken clone to reset it to a changeset that still exists\n" | |
|
5718 | " (e.g. tip).\n" | |
|
5633 | 5719 | " " |
|
5634 | 5720 | msgstr "" |
|
5635 | 5721 | |
@@ -5786,6 +5872,19 b' msgstr "udest\xc3\xa5ende udeponeret sammenf\xc3\xb8jning"' | |||
|
5786 | 5872 | msgid "outstanding local changes" |
|
5787 | 5873 | msgstr "udestående lokale ændringer" |
|
5788 | 5874 | |
|
5875 | msgid "" | |
|
5876 | "\n" | |
|
5877 | "Added by the transplant extension:" | |
|
5878 | msgstr "" | |
|
5879 | ||
|
5880 | msgid "" | |
|
5881 | "``transplanted(set)``\n" | |
|
5882 | " Transplanted changesets in set.\n" | |
|
5883 | msgstr "" | |
|
5884 | ||
|
5885 | msgid "Specifying Revision Sets" | |
|
5886 | msgstr "Angivning af af mængder af revisioner" | |
|
5887 | ||
|
5789 | 5888 | msgid "pull patches from REPO" |
|
5790 | 5889 | msgstr "hiv rettelser fra DEPOT" |
|
5791 | 5890 | |
@@ -6080,9 +6179,6 b' msgstr "gr\xc3\xa6nsen skal v\xc3\xa6re et positivt heltal"' | |||
|
6080 | 6179 | msgid "limit must be positive" |
|
6081 | 6180 | msgstr "grænsen skal være positiv" |
|
6082 | 6181 | |
|
6083 | msgid "too many revisions specified" | |
|
6084 | msgstr "der er specificeret for mange revisioner" | |
|
6085 | ||
|
6086 | 6182 | #, python-format |
|
6087 | 6183 | msgid "invalid format spec '%%%s' in output filename" |
|
6088 | 6184 | msgstr "ugyldig formatspecifikation '%%%s' i output filnavn" |
@@ -6408,11 +6504,6 b' msgstr ""' | |||
|
6408 | 6504 | " annotering alligevel, selvom resultatet sandsynligvis vil være\n" |
|
6409 | 6505 | " hverken brugbart eller ønskværdigt." |
|
6410 | 6506 | |
|
6411 | msgid "" | |
|
6412 | " Returns 0 on success.\n" | |
|
6413 | " " | |
|
6414 | msgstr "" | |
|
6415 | ||
|
6416 | 6507 | msgid "at least one filename or pattern is required" |
|
6417 | 6508 | msgstr "kræver mindst et filnavn eller mønster" |
|
6418 | 6509 | |
@@ -6473,33 +6564,38 b' msgid "reverse effect of earlier changes' | |||
|
6473 | 6564 | msgstr "omgør effekten af tidligere ændringer" |
|
6474 | 6565 | |
|
6475 | 6566 | msgid "" |
|
6476 | " Commit the backed out changes as a new changeset. The new\n" | |
|
6477 |
" changeset i |
|
|
6478 | msgstr "" | |
|
6479 | " Deponerer de omgjorte ændringer som en ny ændring. Den nye ændring\n" | |
|
6480 | " er et barn af den omgjorte ændring." | |
|
6481 | ||
|
6482 | msgid "" | |
|
6483 | " If you backout a changeset other than the tip, a new head is\n" | |
|
6484 | " created. This head will be the new tip and you should merge this\n" | |
|
6485 | " backout changeset with another head." | |
|
6486 | msgstr "" | |
|
6487 | " Hvis du omgør en ændring som ikke er spidsen, så vil et der blive\n" | |
|
6488 | " lavet et nyt hoved. Dette hoved vil være den nye spids og du bør\n" | |
|
6489 | " sammenføje denne omgjorte ændring med et andet hoved (det\n" | |
|
6490 | " nuværende hoved som standard)." | |
|
6491 | ||
|
6492 | msgid "" | |
|
6567 | " The backout command merges the reverse effect of the reverted\n" | |
|
6568 | " changeset into the working directory." | |
|
6569 | msgstr "" | |
|
6570 | ||
|
6571 | msgid "" | |
|
6572 | " With the --merge option, it first commits the reverted changes\n" | |
|
6573 | " as a new changeset. This new changeset is a child of the reverted\n" | |
|
6574 | " changeset.\n" | |
|
6493 | 6575 | " The --merge option remembers the parent of the working directory\n" |
|
6494 | 6576 | " before starting the backout, then merges the new head with that\n" |
|
6495 | " changeset afterwards. This saves you from doing the merge by hand.\n" | |
|
6496 | " The result of this merge is not committed, as with a normal merge." | |
|
6497 | msgstr "" | |
|
6498 | " Med --merge tilvalget vil forælderen til arbejdskataloget blive\n" | |
|
6499 | " husket og det nye hoved vil blive sammenføjet med denne ændring\n" | |
|
6500 | " bagefter. Dette sparer dig for at lave sammenføjningen selv.\n" | |
|
6501 | " Resultatet af denne sammenføjning er ikke lagt i depot, som ved en\n" | |
|
6502 |
" |
|
|
6577 | " changeset afterwards.\n" | |
|
6578 | " This will result in an explicit merge in the history." | |
|
6579 | msgstr "" | |
|
6580 | " Med --merge tilvalget bliver de omgjorte ændringer først deponeret\n" | |
|
6581 | " som en ny ændring. Denne nye ændring vil være et barn af den\n" | |
|
6582 | " omgjorte ændring. Derefter bliver det nye hoved sammenføjet med\n" | |
|
6583 | " arbejdskatalogets forælderrevision. Derved skabes der en eksplicit\n" | |
|
6584 | " sammenføjning i historien." | |
|
6585 | ||
|
6586 | msgid "" | |
|
6587 | " If you backout a changeset other than the original parent of the\n" | |
|
6588 | " working directory, the result of this merge is not committed,\n" | |
|
6589 | " as with a normal merge. Otherwise, no merge is needed and the\n" | |
|
6590 | " commit is automatic." | |
|
6591 | msgstr "" | |
|
6592 | ||
|
6593 | msgid "" | |
|
6594 | " Note that the default behavior (without --merge) has changed in\n" | |
|
6595 | " version 1.7. To restore the previous default behavior, use\n" | |
|
6596 | " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" | |
|
6597 | " the ongoing merge." | |
|
6598 | msgstr "" | |
|
6503 | 6599 | |
|
6504 | 6600 | msgid "please specify just one revision" |
|
6505 | 6601 | msgstr "angiv venligst kun en revision" |
@@ -6531,12 +6627,6 b' msgstr "\xc3\xa6ndring %s bakker \xc3\xa6ndring %s ud\\n"' | |||
|
6531 | 6627 | msgid "merging with changeset %s\n" |
|
6532 | 6628 | msgstr "sammenføjer med ændring %s\n" |
|
6533 | 6629 | |
|
6534 | msgid "the backout changeset is a new head - do not forget to merge\n" | |
|
6535 | msgstr "" | |
|
6536 | ||
|
6537 | msgid "(use \"backout --merge\" if you want to auto-merge)\n" | |
|
6538 | msgstr "(brug \"backout --merge\" hvis du vil sammenføje automatisk)\n" | |
|
6539 | ||
|
6540 | 6630 | msgid "subdivision search of changesets" |
|
6541 | 6631 | msgstr "" |
|
6542 | 6632 | |
@@ -7283,14 +7373,15 b' msgid " Differences between files are' | |||
|
7283 | 7373 | msgstr " Ændringerne mellem filerne vises i unified diff-formatet." |
|
7284 | 7374 | |
|
7285 | 7375 | msgid "" |
|
7286 | " NOTE: diff may generate unexpected results for merges, as it will\n" | |
|
7287 | " default to comparing against the working directory's first parent\n" | |
|
7288 | " changeset if no revisions are specified." | |
|
7289 | msgstr "" | |
|
7290 | " BEMÆRK: diff kan generere overraskende resultater for\n" | |
|
7291 | " sammenføjninger, idet den som udgangspunkt vil sammenligne med\n" | |
|
7292 | " arbejdskatalogets første forælder, hvis der ikke angivet en\n" | |
|
7293 | " revision." | |
|
7376 | " .. note::\n" | |
|
7377 | " diff may generate unexpected results for merges, as it will\n" | |
|
7378 | " default to comparing against the working directory's first\n" | |
|
7379 | " parent changeset if no revisions are specified." | |
|
7380 | msgstr "" | |
|
7381 | " .. note::\n" | |
|
7382 | " diff kan generere overraskende resultater for sammenføjninger,\n" | |
|
7383 | " idet den som udgangspunkt vil sammenligne med arbejdskatalogets\n" | |
|
7384 | " første forælder, hvis der ikke angivet en revision." | |
|
7294 | 7385 | |
|
7295 | 7386 | msgid "" |
|
7296 | 7387 | " Alternatively you can specify -c/--change with a revision to see\n" |
@@ -7333,13 +7424,15 b' msgstr ""' | |||
|
7333 | 7424 | " og deponeringsbeskeden." |
|
7334 | 7425 | |
|
7335 | 7426 | msgid "" |
|
7336 | " NOTE: export may generate unexpected diff output for merge\n" | |
|
7337 | " changesets, as it will compare the merge changeset against its\n" | |
|
7338 | " first parent only." | |
|
7339 | msgstr "" | |
|
7340 | " BEMÆRK: export kan generere uventet diff uddata for\n" | |
|
7341 | " sammenføjningsændringer idet den kun vil sammenligne\n" | |
|
7342 | " sammenføjningsændringen med dennes første forælder." | |
|
7427 | " .. note::\n" | |
|
7428 | " export may generate unexpected diff output for merge\n" | |
|
7429 | " changesets, as it will compare the merge changeset against its\n" | |
|
7430 | " first parent only." | |
|
7431 | msgstr "" | |
|
7432 | " .. note::\n" | |
|
7433 | " export kan generere uventet diff uddata for\n" | |
|
7434 | " sammenføjningsændringer idet den kun vil sammenligne\n" | |
|
7435 | " sammenføjningsændringen med dennes første forælder." | |
|
7343 | 7436 | |
|
7344 | 7437 | msgid "" |
|
7345 | 7438 | " Output may be to a file, in which case the name of the file is\n" |
@@ -7814,13 +7907,13 b' msgstr ""' | |||
|
7814 | 7907 | " følger kun den første forældre for sammenføjningsrevisioner." |
|
7815 | 7908 | |
|
7816 | 7909 | msgid "" |
|
7817 | " If no revision range is specified, the default is tip:0 unless\n" | |
|
7910 | " If no revision range is specified, the default is ``tip:0`` unless\n" | |
|
7818 | 7911 | " --follow is set, in which case the working directory parent is\n" |
|
7819 | 7912 | " used as the starting revision. You can specify a revision set for\n" |
|
7820 | 7913 | " log, see :hg:`help revsets` for more information." |
|
7821 | 7914 | msgstr "" |
|
7822 |
" Hvis der ikke angives et revisionsinterval, da bruges |
|
|
7823 | " standard, med mindre --follow er brugt, i hvilket tilfælde\n" | |
|
7915 | " Hvis der ikke angives et revisionsinterval, da bruges ``tip:0``\n" | |
|
7916 | " som standard, med mindre --follow er brugt, i hvilket tilfælde\n" | |
|
7824 | 7917 | " arbejdskatalogets forælder bruges som startrevision. Du kan\n" |
|
7825 | 7918 | " specificere en mængde af ændringer til log, se :hg:`help revsets`\n" |
|
7826 | 7919 | " for mere information." |
@@ -7837,15 +7930,17 b' msgstr ""' | |||
|
7837 | 7930 | " listen af ændrede filer og den fulde deponeringsbesked." |
|
7838 | 7931 | |
|
7839 | 7932 | msgid "" |
|
7840 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
|
7841 | " changesets, as it will only compare the merge changeset against\n" | |
|
7842 | " its first parent. Also, only files different from BOTH parents\n" | |
|
7843 | " will appear in files:." | |
|
7844 | msgstr "" | |
|
7845 | " BEMÆRK: log -p/--patch kan generere uventet diff output for\n" | |
|
7846 | " sammenføjningsændringer idet den kun sammenligner ændringen med\n" | |
|
7847 | " dennes første forælder. Ydermere vises kun filer som er\n" | |
|
7848 | " forskellige fra BEGGE forældre i files:." | |
|
7933 | " .. note::\n" | |
|
7934 | " log -p/--patch may generate unexpected diff output for merge\n" | |
|
7935 | " changesets, as it will only compare the merge changeset against\n" | |
|
7936 | " its first parent. Also, only files different from BOTH parents\n" | |
|
7937 | " will appear in files:." | |
|
7938 | msgstr "" | |
|
7939 | " .. note::\n" | |
|
7940 | " log -p/--patch kan generere uventet diff output for\n" | |
|
7941 | " sammenføjningsændringer idet den kun sammenligner ændringen med\n" | |
|
7942 | " dennes første forælder. Ydermere vises kun filer som er\n" | |
|
7943 | " forskellige fra BEGGE forældre i files:." | |
|
7849 | 7944 | |
|
7850 | 7945 | msgid "output the current or given revision of the project manifest" |
|
7851 | 7946 | msgstr "" |
@@ -7883,6 +7978,12 b' msgstr ""' | |||
|
7883 | 7978 | " næste deponerede ændring får to forældre." |
|
7884 | 7979 | |
|
7885 | 7980 | msgid "" |
|
7981 | " ``--tool`` can be used to specify the merge tool used for file\n" | |
|
7982 | " merges. It overrides the HGMERGE environment variable and your\n" | |
|
7983 | " configuration files." | |
|
7984 | msgstr "" | |
|
7985 | ||
|
7986 | msgid "" | |
|
7886 | 7987 | " If no revision is specified, the working directory's parent is a\n" |
|
7887 | 7988 | " head revision, and the current branch contains exactly one other\n" |
|
7888 | 7989 | " head, the other head is merged with by default. Otherwise, an\n" |
@@ -7893,6 +7994,10 b' msgstr ""' | |||
|
7893 | 7994 | " hoved, så sammenføjes der med dette hoved som standard. Ellers\n" |
|
7894 | 7995 | " skal en eksplicit revision angives." |
|
7895 | 7996 | |
|
7997 | msgid " :hg:`resolve` must be used to resolve unresolved files." | |
|
7998 | msgstr "" | |
|
7999 | " :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen" | |
|
8000 | ||
|
7896 | 8001 | msgid "" |
|
7897 | 8002 | " To undo an uncommitted merge, use :hg:`update --clean .` which\n" |
|
7898 | 8003 | " will check out a clean copy of the original merge parent, losing\n" |
@@ -8249,10 +8354,13 b' msgid " The resolve command can be us' | |||
|
8249 | 8354 | msgstr "" |
|
8250 | 8355 | |
|
8251 | 8356 | msgid "" |
|
8252 |
" - :hg:`resolve FILE...`: attempt to re-merge the |
|
|
8253 | " discarding any previous merge attempts. Re-merging is not\n" | |
|
8357 | " - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the " | |
|
8358 | "specified\n" | |
|
8359 | " files, discarding any previous merge attempts. Re-merging is not\n" | |
|
8254 | 8360 | " performed for files already marked as resolved. Use ``--all/-a``\n" |
|
8255 | " to selects all unresolved files." | |
|
8361 | " to selects all unresolved files. ``--tool`` can be used to specify\n" | |
|
8362 | " the merge tool used for the given files. It overrides the HGMERGE\n" | |
|
8363 | " environment variable and your configuration files." | |
|
8256 | 8364 | msgstr "" |
|
8257 | 8365 | |
|
8258 | 8366 | msgid "" |
@@ -8297,13 +8405,13 b' msgid "restore individual files or direc' | |||
|
8297 | 8405 | msgstr "" |
|
8298 | 8406 | |
|
8299 | 8407 | msgid "" |
|
8300 | " NOTE: This command is most likely not what you are looking for. revert\n" | |
|
8301 | " will partially overwrite content in the working directory without " | |
|
8302 | "changing\n" | |
|
8303 | " the working directory parents. Use :hg:`update -r rev` to check out " | |
|
8304 | "earlier\n" | |
|
8305 |
" |
|
|
8306 |
" |
|
|
8408 | " .. note::\n" | |
|
8409 | " This command is most likely not what you are looking for.\n" | |
|
8410 | " Revert will partially overwrite content in the working\n" | |
|
8411 | " directory without changing the working directory parents. Use\n" | |
|
8412 | " :hg:`update -r rev` to check out earlier revisions, or\n" | |
|
8413 | " :hg:`update --clean .` to undo a merge which has added another\n" | |
|
8414 | " parent." | |
|
8307 | 8415 | msgstr "" |
|
8308 | 8416 | |
|
8309 | 8417 | msgid "" |
@@ -8493,16 +8601,18 b' msgstr ""' | |||
|
8493 | 8601 | " -u/--unknown eller -i/--ignored." |
|
8494 | 8602 | |
|
8495 | 8603 | msgid "" |
|
8496 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
8497 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
8498 | " report permission changes and diff only reports changes relative\n" | |
|
8499 | " to one merge parent." | |
|
8500 | msgstr "" | |
|
8501 | " BEMÆRK: status kan tilsyneladende være forskellig fra diff hvis\n" | |
|
8502 | " rettigheder er blevet ændret eller hvis en sammenføjning har\n" | |
|
8503 | " fundet sted. Det normale diff-format rapporterer ikke ændringer i\n" | |
|
8504 | " rettigheder og diff rapporterer kun ænringer relativt til en\n" | |
|
8505 | " sammenføjningsforældre." | |
|
8604 | " .. note::\n" | |
|
8605 | " status may appear to disagree with diff if permissions have\n" | |
|
8606 | " changed or a merge has occurred. The standard diff format does\n" | |
|
8607 | " not report permission changes and diff only reports changes\n" | |
|
8608 | " relative to one merge parent." | |
|
8609 | msgstr "" | |
|
8610 | " .. note::\n" | |
|
8611 | " status kan tilsyneladende være forskellig fra diff hvis\n" | |
|
8612 | " rettigheder er blevet ændret eller hvis en sammenføjning har\n" | |
|
8613 | " fundet sted. Det normale diff-format rapporterer ikke ændringer\n" | |
|
8614 | " i rettigheder og diff rapporterer kun ænringer relativt til en\n" | |
|
8615 | " sammenføjningsforældre." | |
|
8506 | 8616 | |
|
8507 | 8617 | msgid "" |
|
8508 | 8618 | " If one revision is given, it is used as the base revision.\n" |
@@ -8747,18 +8857,20 b' msgstr "opdater arbejdskataloget (eller ' | |||
|
8747 | 8857 | |
|
8748 | 8858 | msgid "" |
|
8749 | 8859 | " Update the repository's working directory to the specified\n" |
|
8860 | " changeset. If no changeset is specified, update to the tip of the\n" | |
|
8861 | " current named branch." | |
|
8862 | msgstr "" | |
|
8863 | " Opdater depotets arbejdskatalog til den angivne ændring. Hvis der\n" | |
|
8864 | " ikke angives en ændring, da opdateres til spidsen af den nuværende\n" | |
|
8865 | " gren." | |
|
8866 | ||
|
8867 | msgid "" | |
|
8868 | " If the changeset is not a descendant of the working directory's\n" | |
|
8869 | " parent, the update is aborted. With the -c/--check option, the\n" | |
|
8870 | " working directory is checked for uncommitted changes; if none are\n" | |
|
8871 | " found, the working directory is updated to the specified\n" | |
|
8750 | 8872 | " changeset." |
|
8751 | msgstr " Opdater depotets arbejdskatalog til den angivne ændring." | |
|
8752 | ||
|
8753 | msgid "" | |
|
8754 | " If no changeset is specified, attempt to update to the tip of the\n" | |
|
8755 | " current branch. If this changeset is a descendant of the working\n" | |
|
8756 | " directory's parent, update to it, otherwise abort." | |
|
8757 | msgstr "" | |
|
8758 | " Hvis der ikke er angivet nogen ændring, forsøg da at opdatere til\n" | |
|
8759 | " spidsen af den nuværende gren. Hvis denne ændring nedstammer fra\n" | |
|
8760 | " arbejdskatalogets forælder, da opdateres der til det, ellers\n" | |
|
8761 | " afbrydes der." | |
|
8873 | msgstr "" | |
|
8762 | 8874 | |
|
8763 | 8875 | msgid "" |
|
8764 | 8876 | " The following rules apply when the working directory contains\n" |
@@ -8808,8 +8920,8 b' msgstr ""' | |||
|
8808 | 8920 | " :hg:`clone -U`)." |
|
8809 | 8921 | |
|
8810 | 8922 | msgid "" |
|
8811 |
" If you want to update just one file to an older changeset, use |
|
|
8812 | "`revert`." | |
|
8923 | " If you want to update just one file to an older changeset, use\n" | |
|
8924 | " :hg:`revert`." | |
|
8813 | 8925 | msgstr "" |
|
8814 | 8926 | " Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n" |
|
8815 | 8927 | " brug da :hg:`revert`." |
@@ -9048,6 +9160,9 b' msgstr ""' | |||
|
9048 | 9160 | msgid "parent to choose when backing out merge" |
|
9049 | 9161 | msgstr "" |
|
9050 | 9162 | |
|
9163 | msgid "specify merge tool" | |
|
9164 | msgstr "angiv sammenføjningsværktøj" | |
|
9165 | ||
|
9051 | 9166 | msgid "revision to backout" |
|
9052 | 9167 | msgstr "revision som skal bakkes ud" |
|
9053 | 9168 | |
@@ -9273,8 +9388,11 b' msgstr "s\xc3\xb8g kun i filer som er \xc3\xa6ndret i det angivne interval"' | |||
|
9273 | 9388 | msgid "[OPTION]... PATTERN [FILE]..." |
|
9274 | 9389 | msgstr "[TILVALG]... MØNSTER [FIL]..." |
|
9275 | 9390 | |
|
9276 | msgid "show only heads which are descendants of REV" | |
|
9277 | msgstr "vis kun hoveder som er efterkommere af REV" | |
|
9391 | msgid "show only heads which are descendants of STARTREV" | |
|
9392 | msgstr "vis kun hoveder som er efterkommere af STARTREV" | |
|
9393 | ||
|
9394 | msgid "STARTREV" | |
|
9395 | msgstr "STARTREV" | |
|
9278 | 9396 | |
|
9279 | 9397 | msgid "show topological heads only" |
|
9280 | 9398 | msgstr "" |
@@ -9285,8 +9403,8 b' msgstr "vis kun aktive gren-hoveder (FOR\xc3\x86LDET)"' | |||
|
9285 | 9403 | msgid "show normal and closed branch heads" |
|
9286 | 9404 | msgstr "vis normale og lukkede grenhoveder" |
|
9287 | 9405 | |
|
9288 | msgid "[-ac] [-r REV] [REV]..." | |
|
9289 | msgstr "[-ac] [-r REV] [REV]..." | |
|
9406 | msgid "[-ac] [-r STARTREV] [REV]..." | |
|
9407 | msgstr "[-ac] [-r STARTREV] [REV]..." | |
|
9290 | 9408 | |
|
9291 | 9409 | msgid "[TOPIC]" |
|
9292 | 9410 | msgstr "[EMNE]" |
@@ -9521,8 +9639,8 b' msgstr "prefiks sti at udstille fra (def' | |||
|
9521 | 9639 | msgid "name to show in web pages (default: working directory)" |
|
9522 | 9640 | msgstr "navn der skal vises på websider (standard: arbejdskatalog)" |
|
9523 | 9641 | |
|
9524 |
msgid "name of the hgweb config file (se |
|
|
9525 |
msgstr "navn på hgweb konfigurationsfil (se |
|
|
9642 | msgid "name of the hgweb config file (see \"hg help hgweb\")" | |
|
9643 | msgstr "navn på hgweb konfigurationsfil (se \"hg help hgweb\")" | |
|
9526 | 9644 | |
|
9527 | 9645 | msgid "name of the hgweb config file (DEPRECATED)" |
|
9528 | 9646 | msgstr "navn på hgweb konfigurationsfilen (FORÆLDET)" |
@@ -9614,8 +9732,8 b' msgstr "[-u] FIL..."' | |||
|
9614 | 9732 | msgid "discard uncommitted changes (no backup)" |
|
9615 | 9733 | msgstr "kasser ikke-deponerede ændringer (ingen sikkerhedskopi)" |
|
9616 | 9734 | |
|
9617 |
msgid " |
|
|
9618 |
msgstr " |
|
|
9735 | msgid "update across branches if no uncommitted changes" | |
|
9736 | msgstr "opdater på tværs af grene hvis der er ingen udeponerede ændringer" | |
|
9619 | 9737 | |
|
9620 | 9738 | msgid "[-c] [-C] [-d DATE] [[-r] REV]" |
|
9621 | 9739 | msgstr "[-c] [-C] [-d DATO] [[-r] REV]" |
@@ -9777,6 +9895,10 b' msgid "abort: %s\\n"' | |||
|
9777 | 9895 | msgstr "afbrudt: %s\n" |
|
9778 | 9896 | |
|
9779 | 9897 | #, python-format |
|
9898 | msgid "(%s)\n" | |
|
9899 | msgstr "(%s)\n" | |
|
9900 | ||
|
9901 | #, python-format | |
|
9780 | 9902 | msgid "hg: parse error at %s: %s\n" |
|
9781 | 9903 | msgstr "hg: konfigurationsfejl på %s: %s\n" |
|
9782 | 9904 | |
@@ -9837,10 +9959,6 b' msgstr "dr\xc3\xa6bt!\\n"' | |||
|
9837 | 9959 | msgid "hg: unknown command '%s'\n" |
|
9838 | 9960 | msgstr "hg: ukendt kommando '%s'\n" |
|
9839 | 9961 | |
|
9840 | #, python-format | |
|
9841 | msgid "(%s)\n" | |
|
9842 | msgstr "" | |
|
9843 | ||
|
9844 | 9962 | msgid "(did you forget to compile extensions?)\n" |
|
9845 | 9963 | msgstr "(glemte du at kompilere udvidelserne?)\n" |
|
9846 | 9964 | |
@@ -10050,12 +10168,12 b' msgstr "Angivning af en enkelt revision"' | |||
|
10050 | 10168 | msgid "Specifying Multiple Revisions" |
|
10051 | 10169 | msgstr "Angivning af flere revisioner" |
|
10052 | 10170 | |
|
10053 | msgid "Specifying Revision Sets" | |
|
10054 | msgstr "Angivning af af mængder af revisioner" | |
|
10055 | ||
|
10056 | 10171 | msgid "Diff Formats" |
|
10057 | 10172 | msgstr "" |
|
10058 | 10173 | |
|
10174 | msgid "Merge Tools" | |
|
10175 | msgstr "" | |
|
10176 | ||
|
10059 | 10177 | msgid "Template Usage" |
|
10060 | 10178 | msgstr "Brug af skabeloner" |
|
10061 | 10179 | |
@@ -11087,6 +11205,187 b' msgid ""' | |||
|
11087 | 11205 | "``bar`` and ``quux/baz`` respectively.\n" |
|
11088 | 11206 | msgstr "" |
|
11089 | 11207 | |
|
11208 | msgid "To merge files Mercurial uses merge tools." | |
|
11209 | msgstr "" | |
|
11210 | ||
|
11211 | msgid "" | |
|
11212 | "A merge tool combines two different versions of a file into a merged\n" | |
|
11213 | "file. Merge tools are given the two files and the greatest common\n" | |
|
11214 | "ancestor of the two file versions, so they can determine the changes\n" | |
|
11215 | "made on both branches." | |
|
11216 | msgstr "" | |
|
11217 | ||
|
11218 | msgid "" | |
|
11219 | "Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n" | |
|
11220 | ":hg:`backout` and in several extensions." | |
|
11221 | msgstr "" | |
|
11222 | ||
|
11223 | msgid "" | |
|
11224 | "Usually, the merge tool tries to automatically reconcile the files by\n" | |
|
11225 | "combining all non-overlapping changes that occurred separately in\n" | |
|
11226 | "the two different evolutions of the same initial base file. Furthermore, " | |
|
11227 | "some\n" | |
|
11228 | "interactive merge programs make it easier to manually resolve\n" | |
|
11229 | "conflicting merges, either in a graphical way, or by inserting some\n" | |
|
11230 | "conflict markers. Mercurial does not include any interactive merge\n" | |
|
11231 | "programs but relies on external tools for that." | |
|
11232 | msgstr "" | |
|
11233 | ||
|
11234 | msgid "" | |
|
11235 | "Available merge tools\n" | |
|
11236 | "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" | |
|
11237 | msgstr "" | |
|
11238 | ||
|
11239 | msgid "" | |
|
11240 | "External merge tools and their properties and usage is configured in the\n" | |
|
11241 | "merge-tools configuration section - see hgrc(5) - but they can often also " | |
|
11242 | "just\n" | |
|
11243 | "be named by their executable." | |
|
11244 | msgstr "" | |
|
11245 | ||
|
11246 | msgid "" | |
|
11247 | "A merge tool is generally usable if its executable can be found on the\n" | |
|
11248 | "system and if it can handle the merge. The executable can be found on the\n" | |
|
11249 | "system if it either is an absolute or relative executable path or the name " | |
|
11250 | "of\n" | |
|
11251 | "an application in the executable search path. The tool is assumed to be " | |
|
11252 | "able\n" | |
|
11253 | "to handle the merge if it can handle symlinks if the file is a symlink, if " | |
|
11254 | "it\n" | |
|
11255 | "can handle binary files if the file is binary, and if a GUI is available if " | |
|
11256 | "the\n" | |
|
11257 | "tool requires a GUI." | |
|
11258 | msgstr "" | |
|
11259 | ||
|
11260 | msgid "" | |
|
11261 | "There are a some internal merge tools which can be used. The internal\n" | |
|
11262 | "merge tools are:" | |
|
11263 | msgstr "" | |
|
11264 | ||
|
11265 | msgid "" | |
|
11266 | "``internal:merge``\n" | |
|
11267 | " Uses the internal non-interactive simple merge algorithm for merging " | |
|
11268 | "files.\n" | |
|
11269 | " It will fail if there are any conflicts." | |
|
11270 | msgstr "" | |
|
11271 | ||
|
11272 | msgid "" | |
|
11273 | "``internal:fail``\n" | |
|
11274 | " Rather than attempting to merge files that were modified on both\n" | |
|
11275 | " branches, it marks these files as unresolved. Then the resolve\n" | |
|
11276 | " command must be used to mark files resolved." | |
|
11277 | msgstr "" | |
|
11278 | ||
|
11279 | msgid "" | |
|
11280 | "``internal:local``\n" | |
|
11281 | " Uses the local version of files as the merged version." | |
|
11282 | msgstr "" | |
|
11283 | ||
|
11284 | msgid "" | |
|
11285 | "``internal:other``\n" | |
|
11286 | " Uses the other version of files as the merged version." | |
|
11287 | msgstr "" | |
|
11288 | ||
|
11289 | msgid "" | |
|
11290 | "``internal:prompt``\n" | |
|
11291 | " Asks the user which of the local or the other version to keep as\n" | |
|
11292 | " the merged version." | |
|
11293 | msgstr "" | |
|
11294 | ||
|
11295 | msgid "" | |
|
11296 | "``internal:dump``\n" | |
|
11297 | " Creates three versions of the files to merge, containing the\n" | |
|
11298 | " contents of local, other and base. These files can then be used to\n" | |
|
11299 | " perform a merge manually. If the file to be merged is named\n" | |
|
11300 | " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" | |
|
11301 | " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" | |
|
11302 | " same directory as ``a.txt``." | |
|
11303 | msgstr "" | |
|
11304 | ||
|
11305 | msgid "" | |
|
11306 | "Internal tools are always available and do not require a GUI but will by " | |
|
11307 | "default\n" | |
|
11308 | "not handle symlinks or binary files." | |
|
11309 | msgstr "" | |
|
11310 | ||
|
11311 | msgid "" | |
|
11312 | "Choosing a merge tool\n" | |
|
11313 | "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" | |
|
11314 | msgstr "" | |
|
11315 | ||
|
11316 | msgid "Mercurial uses these rules when decing which merge tool to use:" | |
|
11317 | msgstr "" | |
|
11318 | ||
|
11319 | msgid "" | |
|
11320 | "0. If a tool has been specified with the --tool option to merge or resolve, " | |
|
11321 | "it\n" | |
|
11322 | " is used. If it is the name of a tool in the merge-tools configuration, " | |
|
11323 | "its\n" | |
|
11324 | " configuration is used. Otherwise the specified tool must be executable " | |
|
11325 | "by\n" | |
|
11326 | " the shell." | |
|
11327 | msgstr "" | |
|
11328 | ||
|
11329 | msgid "" | |
|
11330 | "1. If the ``HGMERGE`` environment variable is present, its value is used " | |
|
11331 | "and\n" | |
|
11332 | " must be executable by the shell." | |
|
11333 | msgstr "" | |
|
11334 | ||
|
11335 | msgid "" | |
|
11336 | "2. If the filename of the file to be merged matches any of the patterns in " | |
|
11337 | "the\n" | |
|
11338 | " merge-patterns configuration section, the first usable merge tool\n" | |
|
11339 | " corresponding to a matching pattern is used. Here, binary capabilities of " | |
|
11340 | "the\n" | |
|
11341 | " merge tool are not considered." | |
|
11342 | msgstr "" | |
|
11343 | ||
|
11344 | msgid "" | |
|
11345 | "3. If ui.merge is set it will be considered next. If the value is not the " | |
|
11346 | "name\n" | |
|
11347 | " of a configured tool, the specified value is used and must be executable " | |
|
11348 | "by\n" | |
|
11349 | " the shell. Otherwise the named tool is used if it is usable." | |
|
11350 | msgstr "" | |
|
11351 | ||
|
11352 | msgid "" | |
|
11353 | "4. If any usable merge tools are present in the merge-tools configuration\n" | |
|
11354 | " section, the one with the higest priority is used." | |
|
11355 | msgstr "" | |
|
11356 | ||
|
11357 | msgid "" | |
|
11358 | "5. If a program named ``hgmerge`` can be found on the system, it is used - " | |
|
11359 | "but\n" | |
|
11360 | " it will by default not be used for symlinks and binary files." | |
|
11361 | msgstr "" | |
|
11362 | ||
|
11363 | msgid "" | |
|
11364 | "6. If the file to be merged is not binary and is not a symlink, then\n" | |
|
11365 | " ``internal:merge`` is used." | |
|
11366 | msgstr "" | |
|
11367 | ||
|
11368 | msgid "7. The merge of the file fails and must be resolved before commit." | |
|
11369 | msgstr "" | |
|
11370 | ||
|
11371 | msgid "" | |
|
11372 | ".. note::\n" | |
|
11373 | " After selecting a merge program, Mercurial will by default attempt\n" | |
|
11374 | " to merge the files using a simple merge algorithm first. Only if it " | |
|
11375 | "doesn't\n" | |
|
11376 | " succeed because of conflicting changes Mercurial will actually execute " | |
|
11377 | "the\n" | |
|
11378 | " merge program. Whether to use the simple merge algorithm first can be\n" | |
|
11379 | " controlled by the premerge setting of the merge tool. Premerge is enabled " | |
|
11380 | "by\n" | |
|
11381 | " default unless the file is binary or a symlink." | |
|
11382 | msgstr "" | |
|
11383 | ||
|
11384 | msgid "" | |
|
11385 | "See the merge-tools and ui sections of hgrc(5) for details on the\n" | |
|
11386 | "configuration of merge tools.\n" | |
|
11387 | msgstr "" | |
|
11388 | ||
|
11090 | 11389 | msgid "" |
|
11091 | 11390 | "When Mercurial accepts more than one revision, they may be specified\n" |
|
11092 | 11391 | "individually, or provided as a topologically continuous range,\n" |
@@ -11243,8 +11542,13 b' msgid ""' | |||
|
11243 | 11542 | "Identifiers such as branch names must be quoted with single or double\n" |
|
11244 | 11543 | "quotes if they contain characters outside of\n" |
|
11245 | 11544 | "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" |
|
11246 | "predicates. Special characters can be used in quoted identifiers by\n" | |
|
11247 | "escaping them, e.g., ``\\n`` is interpreted as a newline." | |
|
11545 | "predicates." | |
|
11546 | msgstr "" | |
|
11547 | ||
|
11548 | msgid "" | |
|
11549 | "Special characters can be used in quoted identifiers by escaping them,\n" | |
|
11550 | "e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" | |
|
11551 | "interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." | |
|
11248 | 11552 | msgstr "" |
|
11249 | 11553 | |
|
11250 | 11554 | msgid "There is a single prefix operator:" |
@@ -11362,12 +11666,13 b' msgstr ""' | |||
|
11362 | 11666 | |
|
11363 | 11667 | msgid "" |
|
11364 | 11668 | "``grep(regex)``\n" |
|
11365 | " Like ``keyword(string)`` but accepts a regex." | |
|
11669 | " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" | |
|
11670 | " to ensure special escape characters are handled correctly." | |
|
11366 | 11671 | msgstr "" |
|
11367 | 11672 | |
|
11368 | 11673 | msgid "" |
|
11369 | 11674 | "``head()``\n" |
|
11370 | " Changeset is a head." | |
|
11675 | " Changeset is a named branch head." | |
|
11371 | 11676 | msgstr "" |
|
11372 | 11677 | |
|
11373 | 11678 | msgid "" |
@@ -11376,6 +11681,11 b' msgid ""' | |||
|
11376 | 11681 | msgstr "" |
|
11377 | 11682 | |
|
11378 | 11683 | msgid "" |
|
11684 | "``id(string)``\n" | |
|
11685 | " Revision non-ambiguously specified by the given hex string prefix" | |
|
11686 | msgstr "" | |
|
11687 | ||
|
11688 | msgid "" | |
|
11379 | 11689 | "``keyword(string)``\n" |
|
11380 | 11690 | " Search commit message, user name, and names of changed files for\n" |
|
11381 | 11691 | " string." |
@@ -11439,6 +11749,11 b' msgid ""' | |||
|
11439 | 11749 | msgstr "" |
|
11440 | 11750 | |
|
11441 | 11751 | msgid "" |
|
11752 | "``rev(number)``\n" | |
|
11753 | " Revision with the given numeric identifier." | |
|
11754 | msgstr "" | |
|
11755 | ||
|
11756 | msgid "" | |
|
11442 | 11757 | "``reverse(set)``\n" |
|
11443 | 11758 | " Reverse order of set." |
|
11444 | 11759 | msgstr "" |
@@ -11466,8 +11781,8 b' msgid ""' | |||
|
11466 | 11781 | msgstr "" |
|
11467 | 11782 | |
|
11468 | 11783 | msgid "" |
|
11469 |
"``tag |
|
|
11470 | " Changeset is tagged." | |
|
11784 | "``tag(name)``\n" | |
|
11785 | " The specified tag by name, or all tagged revisions if no name is given." | |
|
11471 | 11786 | msgstr "" |
|
11472 | 11787 | |
|
11473 | 11788 | msgid "" |
@@ -11497,21 +11812,50 b' msgstr ""' | |||
|
11497 | 11812 | " -P x -> !::x\n" |
|
11498 | 11813 | " -l x -> limit(expr, x)" |
|
11499 | 11814 | |
|
11500 |
msgid "Some sample queries: |
|
|
11501 | msgstr "" | |
|
11502 | ||
|
11503 | msgid "" | |
|
11504 | " hg log -r 'branch(default)'\n" | |
|
11505 | " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | |
|
11506 | " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | |
|
11507 | " hg log -r 'sort(date(\"May 2008\"), user)'\n" | |
|
11508 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" | |
|
11509 | msgstr "" | |
|
11510 | " hg log -r 'branch(default)'\n" | |
|
11511 | " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | |
|
11512 | " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | |
|
11513 | " hg log -r 'sort(date(\"May 2008\"), user)'\n" | |
|
11514 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" | |
|
11815 | msgid "Some sample queries:" | |
|
11816 | msgstr "" | |
|
11817 | ||
|
11818 | msgid "- Changesets on the default branch::" | |
|
11819 | msgstr "- Ændringer på default grenen::" | |
|
11820 | ||
|
11821 | msgid " hg log -r \"branch(default)\"" | |
|
11822 | msgstr " hg log -r \"branch(default)\"" | |
|
11823 | ||
|
11824 | msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" | |
|
11825 | msgstr "" | |
|
11826 | ||
|
11827 | msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" | |
|
11828 | msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\"" | |
|
11829 | ||
|
11830 | msgid "- Open branch heads::" | |
|
11831 | msgstr "- Åbne grenhoveder::" | |
|
11832 | ||
|
11833 | msgid " hg log -r \"head() and not closed()\"" | |
|
11834 | msgstr " hg log -r \"head() and not closed()\"" | |
|
11835 | ||
|
11836 | msgid "" | |
|
11837 | "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" | |
|
11838 | " ``hgext/*``::" | |
|
11839 | msgstr "" | |
|
11840 | ||
|
11841 | msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" | |
|
11842 | msgstr " hg log -r \"1.3::1.5 and keyword(bug) and file(\"hgext/*\")\"" | |
|
11843 | ||
|
11844 | msgid "- Changesets in committed May 2008, sorted by user::" | |
|
11845 | msgstr "" | |
|
11846 | ||
|
11847 | msgid " hg log -r \"sort(date('May 2008'), user)\"" | |
|
11848 | msgstr " hg log -r \"sort(date(\"May 2008\"), user)\"" | |
|
11849 | ||
|
11850 | msgid "" | |
|
11851 | "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" | |
|
11852 | " release::" | |
|
11853 | msgstr "" | |
|
11854 | ||
|
11855 | msgid "" | |
|
11856 | " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |
|
11857 | "())\"\n" | |
|
11858 | msgstr " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())\"\n" | |
|
11515 | 11859 | |
|
11516 | 11860 | msgid "" |
|
11517 | 11861 | "Mercurial allows you to customize output of commands through\n" |
@@ -11684,6 +12028,11 b' msgid ""' | |||
|
11684 | 12028 | " and \">\" with XML entities." |
|
11685 | 12029 | msgstr "" |
|
11686 | 12030 | |
|
12031 | msgid "" | |
|
12032 | ":hex: Any text. Convert a binary Mercurial node identifier into\n" | |
|
12033 | " its long hexadecimal representation." | |
|
12034 | msgstr "" | |
|
12035 | ||
|
11687 | 12036 | msgid ":fill68: Any text. Wraps the text to fit in 68 columns." |
|
11688 | 12037 | msgstr "" |
|
11689 | 12038 | |
@@ -11796,6 +12145,11 b' msgid ""' | |||
|
11796 | 12145 | "server." |
|
11797 | 12146 | msgstr "" |
|
11798 | 12147 | |
|
12148 | msgid "" | |
|
12149 | "Note that the security of HTTPS URLs depends on proper configuration of\n" | |
|
12150 | "web.cacerts." | |
|
12151 | msgstr "" | |
|
12152 | ||
|
11799 | 12153 | msgid "Some notes about using SSH with Mercurial:" |
|
11800 | 12154 | msgstr "" |
|
11801 | 12155 | |
@@ -12199,9 +12553,6 b' msgstr "bundter filer"' | |||
|
12199 | 12553 | msgid "adding changesets\n" |
|
12200 | 12554 | msgstr "tilføjer ændringer\n" |
|
12201 | 12555 | |
|
12202 | msgid "changesets" | |
|
12203 | msgstr "ændringer" | |
|
12204 | ||
|
12205 | 12556 | msgid "received changelog group is empty" |
|
12206 | 12557 | msgstr "modtagen changelog-gruppe er tom" |
|
12207 | 12558 | |
@@ -12372,7 +12723,7 b' msgid "getting %s to %s\\n"' | |||
|
12372 | 12723 | msgstr "henter %s til %s\n" |
|
12373 | 12724 | |
|
12374 | 12725 | #, python-format |
|
12375 | msgid "warning: detected divergent renames of %s to:\n" | |
|
12726 | msgid "note: possible conflict - %s was renamed multiple times to:\n" | |
|
12376 | 12727 | msgstr "" |
|
12377 | 12728 | |
|
12378 | 12729 | #, python-format |
@@ -12389,15 +12740,42 b' msgid "outstanding uncommitted changes (' | |||
|
12389 | 12740 | msgstr "" |
|
12390 | 12741 | "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" |
|
12391 | 12742 | |
|
12392 | msgid "" | |
|
12393 | "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " | |
|
12394 | "changes)" | |
|
12395 | msgstr "" | |
|
12396 | "krydser grene (brug 'hg merge' for at sammenføje eller 'hg update -C' for at " | |
|
12397 | "kassere ændringerne)" | |
|
12398 | ||
|
12399 | msgid "crosses branches (use 'hg merge' or use 'hg update -c')" | |
|
12400 | msgstr "krydser grene (brug 'hg merge' eller 'hg update -c')" | |
|
12743 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
|
12744 | msgstr "" | |
|
12745 | "krydser grene (sammenføj grenene eller brug --clean for at kassere " | |
|
12746 | "ændringerne)" | |
|
12747 | ||
|
12748 | msgid "crosses branches (merge branches or use --check to force update)" | |
|
12749 | msgstr "" | |
|
12750 | "krydser grene (sammenføj grenene eller brug --check for at forcere " | |
|
12751 | "opdateringen)" | |
|
12752 | ||
|
12753 | msgid "Attention:" | |
|
12754 | msgstr "" | |
|
12755 | ||
|
12756 | msgid "Caution:" | |
|
12757 | msgstr "Forsigtig:" | |
|
12758 | ||
|
12759 | msgid "!Danger!" | |
|
12760 | msgstr "!Fare!" | |
|
12761 | ||
|
12762 | msgid "Error:" | |
|
12763 | msgstr "Fejl:" | |
|
12764 | ||
|
12765 | msgid "Hint:" | |
|
12766 | msgstr "" | |
|
12767 | ||
|
12768 | msgid "Important:" | |
|
12769 | msgstr "Vigtigt:" | |
|
12770 | ||
|
12771 | msgid "Note:" | |
|
12772 | msgstr "Bemærk:" | |
|
12773 | ||
|
12774 | msgid "Tip:" | |
|
12775 | msgstr "Tip:" | |
|
12776 | ||
|
12777 | msgid "Warning!" | |
|
12778 | msgstr "Advarsel!" | |
|
12401 | 12779 | |
|
12402 | 12780 | #, python-format |
|
12403 | 12781 | msgid "cannot create %s: destination already exists" |
@@ -12477,14 +12855,8 b' msgstr "patch kommando fejlede: %s"' | |||
|
12477 | 12855 | msgid "unsupported line endings type: %s" |
|
12478 | 12856 | msgstr "linieendelse %s understøttes ikke" |
|
12479 | 12857 | |
|
12480 | msgid "" | |
|
12481 | "internal patcher failed\n" | |
|
12482 | "please report details to http://mercurial.selenic.com/bts/\n" | |
|
12483 | "or mercurial@selenic.com\n" | |
|
12484 | msgstr "" | |
|
12485 | "intern lappe-funktionalitet fejlede\n" | |
|
12486 | "angiv venligst fejldetaljer på http://mercurial.selenic.com/bts/\n" | |
|
12487 | "eller mercurial@selenic.com\n" | |
|
12858 | msgid "patch failed to apply" | |
|
12859 | msgstr "rettelse kunne ikke tilføjes" | |
|
12488 | 12860 | |
|
12489 | 12861 | #, python-format |
|
12490 | 12862 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
@@ -12557,12 +12929,12 b' msgstr ""' | |||
|
12557 | 12929 | msgid "%s not found in the transaction" |
|
12558 | 12930 | msgstr "%s ikke fundet i transaktionen" |
|
12559 | 12931 | |
|
12932 | msgid "consistency error in delta" | |
|
12933 | msgstr "konsistensfejl i delta" | |
|
12934 | ||
|
12560 | 12935 | msgid "unknown base" |
|
12561 | 12936 | msgstr "" |
|
12562 | 12937 | |
|
12563 | msgid "consistency error adding group" | |
|
12564 | msgstr "konsistensfejl ved tilføjelse af gruppe" | |
|
12565 | ||
|
12566 | 12938 | msgid "unterminated string" |
|
12567 | 12939 | msgstr "" |
|
12568 | 12940 | |
@@ -12583,16 +12955,31 b' msgstr ""' | |||
|
12583 | 12955 | msgid "not a function: %s" |
|
12584 | 12956 | msgstr "ikke en funktion: %s" |
|
12585 | 12957 | |
|
12586 |
msgid " |
|
|
12587 | msgstr "" | |
|
12588 | ||
|
12589 | msgid "limit wants a number" | |
|
12590 | msgstr "" | |
|
12958 | msgid "id requires one argument" | |
|
12959 | msgstr "id kræver et argument" | |
|
12960 | ||
|
12961 | msgid "id requires a string" | |
|
12962 | msgstr "" | |
|
12963 | ||
|
12964 | msgid "rev requires one argument" | |
|
12965 | msgstr "" | |
|
12966 | ||
|
12967 | msgid "rev requires a number" | |
|
12968 | msgstr "" | |
|
12969 | ||
|
12970 | msgid "rev expects a number" | |
|
12971 | msgstr "rev forventer et revisionsnummer" | |
|
12972 | ||
|
12973 | msgid "limit requires two arguments" | |
|
12974 | msgstr "limit kræver to argumenter" | |
|
12975 | ||
|
12976 | msgid "limit requires a number" | |
|
12977 | msgstr "limit kræver et tal" | |
|
12591 | 12978 | |
|
12592 | 12979 | msgid "limit expects a number" |
|
12593 | 12980 | msgstr "" |
|
12594 | 12981 | |
|
12595 |
msgid "ancestor |
|
|
12982 | msgid "ancestor requires two arguments" | |
|
12596 | 12983 | msgstr "" |
|
12597 | 12984 | |
|
12598 | 12985 | msgid "ancestor arguments must be single revisions" |
@@ -12601,31 +12988,35 b' msgstr ""' | |||
|
12601 | 12988 | msgid "follow takes no arguments" |
|
12602 | 12989 | msgstr "" |
|
12603 | 12990 | |
|
12604 |
msgid "date |
|
|
12605 | msgstr "" | |
|
12606 | ||
|
12607 |
msgid "keyword |
|
|
12608 | msgstr "" | |
|
12609 | ||
|
12610 |
msgid "grep |
|
|
12611 | msgstr "" | |
|
12612 | ||
|
12613 | msgid "author wants a string" | |
|
12614 | msgstr "" | |
|
12615 | ||
|
12616 | msgid "file wants a pattern" | |
|
12617 | msgstr "" | |
|
12618 | ||
|
12619 | msgid "contains wants a pattern" | |
|
12620 | msgstr "" | |
|
12621 | ||
|
12622 | msgid "modifies wants a pattern" | |
|
12623 | msgstr "" | |
|
12624 | ||
|
12625 | msgid "adds wants a pattern" | |
|
12626 | msgstr "" | |
|
12627 | ||
|
12628 | msgid "removes wants a pattern" | |
|
12991 | msgid "date requires a string" | |
|
12992 | msgstr "" | |
|
12993 | ||
|
12994 | msgid "keyword requires a string" | |
|
12995 | msgstr "" | |
|
12996 | ||
|
12997 | msgid "grep requires a string" | |
|
12998 | msgstr "" | |
|
12999 | ||
|
13000 | #, python-format | |
|
13001 | msgid "invalid match pattern: %s" | |
|
13002 | msgstr "ugyldigt søgemønster: %s" | |
|
13003 | ||
|
13004 | msgid "author requires a string" | |
|
13005 | msgstr "" | |
|
13006 | ||
|
13007 | msgid "file requires a pattern" | |
|
13008 | msgstr "" | |
|
13009 | ||
|
13010 | msgid "contains requires a pattern" | |
|
13011 | msgstr "" | |
|
13012 | ||
|
13013 | msgid "modifies requires a pattern" | |
|
13014 | msgstr "" | |
|
13015 | ||
|
13016 | msgid "adds requires a pattern" | |
|
13017 | msgstr "" | |
|
13018 | ||
|
13019 | msgid "removes requires a pattern" | |
|
12629 | 13020 | msgstr "" |
|
12630 | 13021 | |
|
12631 | 13022 | msgid "merge takes no arguments" |
@@ -12637,7 +13028,7 b' msgstr ""' | |||
|
12637 | 13028 | msgid "head takes no arguments" |
|
12638 | 13029 | msgstr "" |
|
12639 | 13030 | |
|
12640 |
msgid "sort |
|
|
13031 | msgid "sort requires one or two arguments" | |
|
12641 | 13032 | msgstr "" |
|
12642 | 13033 | |
|
12643 | 13034 | msgid "sort spec must be a string" |
@@ -12650,10 +13041,13 b' msgstr "ukendt sorteringsn\xc3\xb8gle %r"' | |||
|
12650 | 13041 | msgid "all takes no arguments" |
|
12651 | 13042 | msgstr "" |
|
12652 | 13043 | |
|
12653 |
msgid "outgoing |
|
|
12654 | msgstr "" | |
|
12655 | ||
|
12656 |
msgid "tag |
|
|
13044 | msgid "outgoing requires a repository path" | |
|
13045 | msgstr "" | |
|
13046 | ||
|
13047 | msgid "tag takes one or no arguments" | |
|
13048 | msgstr "" | |
|
13049 | ||
|
13050 | msgid "the argument to tag must be a string" | |
|
12657 | 13051 | msgstr "" |
|
12658 | 13052 | |
|
12659 | 13053 | msgid "can't negate that" |
@@ -12748,12 +13142,16 b' msgid ""' | |||
|
12748 | 13142 | msgstr "" |
|
12749 | 13143 | |
|
12750 | 13144 | #, python-format |
|
13145 | msgid "default path for subrepository %s not found" | |
|
13146 | msgstr "" | |
|
13147 | ||
|
13148 | #, python-format | |
|
12751 | 13149 | msgid "unknown subrepo type %s" |
|
12752 | 13150 | msgstr "ukendt underdepottype %s" |
|
12753 | 13151 | |
|
12754 | 13152 | #, python-format |
|
12755 | msgid "warning: %s in %s\n" | |
|
12756 | msgstr "advarsel: %s i %s\n" | |
|
13153 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" | |
|
13154 | msgstr "advarsel: fejl \"%s\" i underdepot \"%s\"\n" | |
|
12757 | 13155 | |
|
12758 | 13156 | #, python-format |
|
12759 | 13157 | msgid "removing subrepo %s\n" |
@@ -12785,6 +13183,9 b' msgstr ""' | |||
|
12785 | 13183 | msgid "node '%s' is not well formed" |
|
12786 | 13184 | msgstr "knude '%s' er ikke korrekt formet" |
|
12787 | 13185 | |
|
13186 | msgid ".hg/tags.cache is corrupt, rebuilding it\n" | |
|
13187 | msgstr "" | |
|
13188 | ||
|
12788 | 13189 | msgid "unmatched quotes" |
|
12789 | 13190 | msgstr "" |
|
12790 | 13191 | |
@@ -12829,6 +13230,10 b' msgid "Ignored: %s\\n"' | |||
|
12829 | 13230 | msgstr "Ignoreret: %s\n" |
|
12830 | 13231 | |
|
12831 | 13232 | #, python-format |
|
13233 | msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
|
13234 | msgstr "" | |
|
13235 | ||
|
13236 | #, python-format | |
|
12832 | 13237 | msgid "ignoring untrusted configuration option %s.%s = %s\n" |
|
12833 | 13238 | msgstr "" |
|
12834 | 13239 | |
@@ -12850,10 +13255,6 b' msgstr "intet brugernavn angivet (se \\"h' | |||
|
12850 | 13255 | msgid "username %s contains a newline\n" |
|
12851 | 13256 | msgstr "brugernavn %s indeholder et linieskift\n" |
|
12852 | 13257 | |
|
12853 | #, python-format | |
|
12854 | msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
|
12855 | msgstr "" | |
|
12856 | ||
|
12857 | 13258 | msgid "response expected" |
|
12858 | 13259 | msgstr "svar forventet" |
|
12859 | 13260 | |
@@ -12894,7 +13295,18 b' msgstr "ignorerer ugyldig [auth] n\xc3\xb8gle \'%s\'\\n"' | |||
|
12894 | 13295 | msgid "certificate checking requires Python 2.6" |
|
12895 | 13296 | msgstr "" |
|
12896 | 13297 | |
|
12897 | msgid "server identity verification succeeded\n" | |
|
13298 | msgid "no certificate received" | |
|
13299 | msgstr "modtog ikke noget certifikat" | |
|
13300 | ||
|
13301 | #, python-format | |
|
13302 | msgid "certificate is for %s" | |
|
13303 | msgstr "certifikatet er for %s" | |
|
13304 | ||
|
13305 | msgid "no commonName found in certificate" | |
|
13306 | msgstr "" | |
|
13307 | ||
|
13308 | #, python-format | |
|
13309 | msgid "%s certificate error: %s" | |
|
12898 | 13310 | msgstr "" |
|
12899 | 13311 | |
|
12900 | 13312 | #, python-format |
@@ -13044,6 +13456,9 b' msgstr "depotet bruger revlog format %d\\' | |||
|
13044 | 13456 | msgid "checking changesets\n" |
|
13045 | 13457 | msgstr "kontrollerer ændringer\n" |
|
13046 | 13458 | |
|
13459 | msgid "checking" | |
|
13460 | msgstr "kontrollerer" | |
|
13461 | ||
|
13047 | 13462 | #, python-format |
|
13048 | 13463 | msgid "unpacking changeset %s" |
|
13049 | 13464 | msgstr "udpakker ændring %s" |
@@ -13085,9 +13500,6 b' msgstr "kontrollerer filer\\n"' | |||
|
13085 | 13500 | msgid "cannot decode filename '%s'" |
|
13086 | 13501 | msgstr "kan ikke dekode filnavn '%s'" |
|
13087 | 13502 | |
|
13088 | msgid "checking" | |
|
13089 | msgstr "kontrollerer" | |
|
13090 | ||
|
13091 | 13503 | #, python-format |
|
13092 | 13504 | msgid "broken revlog! (%s)" |
|
13093 | 13505 | msgstr "beskadiget revlog! (%s)" |
This diff has been collapsed as it changes many lines, (1924 lines changed) Show them Hide them | |||
@@ -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- |
|
|
17 |
"PO-Revision-Date: 2010- |
|
|
16 | "POT-Creation-Date: 2010-10-21 15:40+0200\n" | |
|
17 | "PO-Revision-Date: 2010-10-21 16:56+0200\n" | |
|
18 | 18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
|
19 | 19 | "Language-Team: Swedish\n" |
|
20 | 20 | "Language: Swedish\n" |
@@ -32,8 +32,18 b' msgstr "Flaggor"' | |||
|
32 | 32 | msgid "Commands" |
|
33 | 33 | msgstr "Kommandon" |
|
34 | 34 | |
|
35 |
msgid " |
|
|
36 | msgstr " flaggor:" | |
|
35 | msgid "Extensions" | |
|
36 | msgstr "Utökningar" | |
|
37 | ||
|
38 | msgid "" | |
|
39 | "This section contains help for extensions that is distributed together with " | |
|
40 | "Mercurial. Help for other extensions is available in the help system." | |
|
41 | msgstr "" | |
|
42 | "Den här sektioner innehåller hjälp för utökningar som levereras med " | |
|
43 | "Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet." | |
|
44 | ||
|
45 | msgid "options:" | |
|
46 | msgstr "flaggor:" | |
|
37 | 47 | |
|
38 | 48 | #, python-format |
|
39 | 49 | msgid " aliases: %s" |
@@ -78,8 +88,10 b' msgstr ""' | |||
|
78 | 88 | |
|
79 | 89 | msgid "" |
|
80 | 90 | "Branch-based Access Control\n" |
|
81 | "---------------------------" | |
|
82 | msgstr "" | |
|
91 | "..........................." | |
|
92 | msgstr "" | |
|
93 | "Grenbaserad Åtkomstkontroll\n" | |
|
94 | "..........................." | |
|
83 | 95 | |
|
84 | 96 | msgid "" |
|
85 | 97 | "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" |
@@ -102,8 +114,10 b' msgstr ""' | |||
|
102 | 114 | |
|
103 | 115 | msgid "" |
|
104 | 116 | "Path-based Access Control\n" |
|
105 | "-------------------------" | |
|
106 | msgstr "" | |
|
117 | "........................." | |
|
118 | msgstr "" | |
|
119 | "Sökvägsbaserad Åtkomstkontroll\n" | |
|
120 | ".............................." | |
|
107 | 121 | |
|
108 | 122 | msgid "" |
|
109 | 123 | "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" |
@@ -114,8 +128,10 b' msgstr ""' | |||
|
114 | 128 | |
|
115 | 129 | msgid "" |
|
116 | 130 | "Groups\n" |
|
117 | "------" | |
|
118 | msgstr "" | |
|
131 | "......" | |
|
132 | msgstr "" | |
|
133 | "Grupper\n" | |
|
134 | "......." | |
|
119 | 135 | |
|
120 | 136 | msgid "" |
|
121 | 137 | "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" |
@@ -131,8 +147,10 b' msgstr ""' | |||
|
131 | 147 | |
|
132 | 148 | msgid "" |
|
133 | 149 | "Example Configuration\n" |
|
134 | "---------------------" | |
|
135 | msgstr "" | |
|
150 | "....................." | |
|
151 | msgstr "" | |
|
152 | "Exempelkonfiguration\n" | |
|
153 | "...................." | |
|
136 | 154 | |
|
137 | 155 | msgid "::" |
|
138 | 156 | msgstr "::" |
@@ -293,7 +311,7 b' msgid ""' | |||
|
293 | 311 | "By default, when several bookmarks point to the same changeset, they\n" |
|
294 | 312 | "will all move forward together. It is possible to obtain a more\n" |
|
295 | 313 | "git-like experience by adding the following configuration option to\n" |
|
296 | "your .hgrc::" | |
|
314 | "your configuration file::" | |
|
297 | 315 | msgstr "" |
|
298 | 316 | |
|
299 | 317 | msgid "" |
@@ -318,7 +336,13 b' msgid ""' | |||
|
318 | 336 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" |
|
319 | 337 | " directory's parent revision with the given name. If you specify\n" |
|
320 | 338 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
321 |
" the bookmark is assigned to that revision. |
|
|
339 | " the bookmark is assigned to that revision." | |
|
340 | msgstr "" | |
|
341 | ||
|
342 | msgid "" | |
|
343 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |
|
344 | " push` and :hg:`help pull`). This requires the bookmark extension to be\n" | |
|
345 | " enabled for both the local and remote repositories.\n" | |
|
322 | 346 | " " |
|
323 | 347 | msgstr "" |
|
324 | 348 | |
@@ -374,6 +398,10 b' msgstr "exporterar bokm\xc3\xa4rket %s\\n"' | |||
|
374 | 398 | msgid "deleting remote bookmark %s\n" |
|
375 | 399 | msgstr "raderar fjärrbokmärket %s\n" |
|
376 | 400 | |
|
401 | #, python-format | |
|
402 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |
|
403 | msgstr "bokmärket %s existerar inte i lokal- eller fjärrarkiv!\n" | |
|
404 | ||
|
377 | 405 | msgid "searching for changes\n" |
|
378 | 406 | msgstr "söker efter ändringar\n" |
|
379 | 407 | |
@@ -387,12 +415,35 b' msgstr "j\xc3\xa4mf\xc3\xb6r med %s\\n"' | |||
|
387 | 415 | msgid "bookmark to import" |
|
388 | 416 | msgstr "bokmärke att importera" |
|
389 | 417 | |
|
418 | msgid "BOOKMARK" | |
|
419 | msgstr "BOKMÄRKE" | |
|
420 | ||
|
390 | 421 | msgid "bookmark to export" |
|
391 | 422 | msgstr "bokmärke att exportera" |
|
392 | 423 | |
|
393 | 424 | msgid "compare bookmark" |
|
394 | 425 | msgstr "jämför bokmärke" |
|
395 | 426 | |
|
427 | msgid "bookmark takes one or no arguments" | |
|
428 | msgstr "bookmark tar ett eller inga argument" | |
|
429 | ||
|
430 | msgid "the argument to bookmark must be a string" | |
|
431 | msgstr "argumentet till bookmark måste vara en sträng" | |
|
432 | ||
|
433 | msgid "" | |
|
434 | "\n" | |
|
435 | "Added by the bookmarks extension:" | |
|
436 | msgstr "" | |
|
437 | "\n" | |
|
438 | "Tillagda av bookmarks-utökningen:" | |
|
439 | ||
|
440 | msgid "" | |
|
441 | "``bookmark([name])``\n" | |
|
442 | " The named bookmark or all bookmarks.\n" | |
|
443 | msgstr "" | |
|
444 | "``bookmark([namn])``\n" | |
|
445 | " Det angivna bokmärket eller alla bokmärken.\n" | |
|
446 | ||
|
396 | 447 | msgid "force" |
|
397 | 448 | msgstr "tvinga" |
|
398 | 449 | |
@@ -768,6 +819,10 b' msgid ""' | |||
|
768 | 819 | " " |
|
769 | 820 | msgstr "" |
|
770 | 821 | |
|
822 | #, python-format | |
|
823 | msgid "skipping malformed alias: %s\n" | |
|
824 | msgstr "hoppar över defekt alias: %s\n" | |
|
825 | ||
|
771 | 826 | msgid "count rate for the specified revision or range" |
|
772 | 827 | msgstr "" |
|
773 | 828 | |
@@ -835,8 +890,8 b' msgstr ""' | |||
|
835 | 890 | "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" |
|
836 | 891 | "render_text, som kan användas för att lägga till effekter på valfri text." |
|
837 | 892 | |
|
838 |
msgid "Default effects may be overridden from |
|
|
839 |
msgstr "Standardeffekter kan ersättas från |
|
|
893 | msgid "Default effects may be overridden from your configuration file::" | |
|
894 | msgstr "Standardeffekter kan ersättas från din konfiturationsfil::" | |
|
840 | 895 | |
|
841 | 896 | msgid "" |
|
842 | 897 | " [color]\n" |
@@ -905,6 +960,17 b' msgid " bookmarks.current = green"' | |||
|
905 | 960 | msgstr " bookmarks.current = green" |
|
906 | 961 | |
|
907 | 962 | msgid "" |
|
963 | " branches.active = none\n" | |
|
964 | " branches.closed = black bold\n" | |
|
965 | " branches.current = green\n" | |
|
966 | " branches.inactive = none" | |
|
967 | msgstr "" | |
|
968 | " branches.active = none\n" | |
|
969 | " branches.closed = black bold\n" | |
|
970 | " branches.current = green\n" | |
|
971 | " branches.inactive = none" | |
|
972 | ||
|
973 | msgid "" | |
|
908 | 974 | "The color extension will try to detect whether to use ANSI codes or\n" |
|
909 | 975 | "Win32 console APIs, unless it is made explicit::" |
|
910 | 976 | msgstr "" |
@@ -928,8 +994,8 b' msgstr "ignorerar ok\xc3\xa4nd f\xc3\xa4rg/effekt %r (konfigurerad i color.%s)\\n"' | |||
|
928 | 994 | msgid "win32console not found, please install pywin32\n" |
|
929 | 995 | msgstr "win32console hittades inte, installera pywin32\n" |
|
930 | 996 | |
|
931 | msgid "when to colorize (always, auto, or never)" | |
|
932 | msgstr "när färgläggning ska ske (always, auto eller never)" | |
|
997 | msgid "when to colorize (boolean, always, auto, or never)" | |
|
998 | msgstr "när färgläggning ska ske (boolean, always, auto eller never)" | |
|
933 | 999 | |
|
934 | 1000 | msgid "TYPE" |
|
935 | 1001 | msgstr "TYP" |
@@ -971,9 +1037,12 b' msgstr ""' | |||
|
971 | 1037 | |
|
972 | 1038 | msgid "" |
|
973 | 1039 | " If no destination directory name is specified, it defaults to the\n" |
|
974 |
" basename of the source with |
|
|
1040 | " basename of the source with ``-hg`` appended. If the destination\n" | |
|
975 | 1041 | " repository doesn't exist, it will be created." |
|
976 | 1042 | msgstr "" |
|
1043 | " Om ingen destinationskatalog anges, kommer basnamnet för källan med\n" | |
|
1044 | " ``-hg`` tillagd. Om destinationsarkivet inte existerar, så kommer det\n" | |
|
1045 | " att skapas." | |
|
977 | 1046 | |
|
978 | 1047 | msgid "" |
|
979 | 1048 | " By default, all sources except Mercurial will use --branchsort.\n" |
@@ -1011,16 +1080,21 b' msgstr ""' | |||
|
1011 | 1080 | |
|
1012 | 1081 | msgid "" |
|
1013 | 1082 | " If the file doesn't exist, it's automatically created. It's\n" |
|
1014 |
" updated on each commit copied, so convert |
|
|
1083 | " updated on each commit copied, so :hg:`convert` can be interrupted\n" | |
|
1015 | 1084 | " and can be run repeatedly to copy new commits." |
|
1016 | 1085 | msgstr "" |
|
1017 | 1086 | |
|
1018 | 1087 | msgid "" |
|
1019 |
" The |
|
|
1020 |
" |
|
|
1021 |
" |
|
|
1022 |
" |
|
|
1023 | " srcauthor=whatever string you want" | |
|
1088 | " The authormap is a simple text file that maps each source commit\n" | |
|
1089 | " author to a destination commit author. It is handy for source SCMs\n" | |
|
1090 | " that use unix logins to identify authors (eg: CVS). One line per\n" | |
|
1091 | " author mapping and the line format is::" | |
|
1092 | msgstr "" | |
|
1093 | ||
|
1094 | msgid " source author = destination author" | |
|
1095 | msgstr "" | |
|
1096 | ||
|
1097 | msgid " Empty lines and lines starting with a ``#`` are ignored." | |
|
1024 | 1098 | msgstr "" |
|
1025 | 1099 | |
|
1026 | 1100 | msgid "" |
@@ -1039,20 +1113,20 b' msgid " rename path/to/source path/' | |||
|
1039 | 1113 | msgstr " rename sökväg/till/källa sökväg/till/destination" |
|
1040 | 1114 | |
|
1041 | 1115 | msgid "" |
|
1042 |
" Comment lines start with |
|
|
1116 | " Comment lines start with ``#``. A specified path matches if it\n" | |
|
1043 | 1117 | " equals the full relative name of a file or one of its parent\n" |
|
1044 |
" directories. The |
|
|
1045 | " matching path applies, so line order does not matter." | |
|
1046 | msgstr "" | |
|
1047 | ||
|
1048 | msgid "" | |
|
1049 |
" The |
|
|
1118 | " directories. The ``include`` or ``exclude`` directive with the\n" | |
|
1119 | " longest matching path applies, so line order does not matter." | |
|
1120 | msgstr "" | |
|
1121 | ||
|
1122 | msgid "" | |
|
1123 | " The ``include`` directive causes a file, or all files under a\n" | |
|
1050 | 1124 | " directory, to be included in the destination repository, and the\n" |
|
1051 | 1125 | " exclusion of all other files and directories not explicitly\n" |
|
1052 |
" included. The |
|
|
1053 |
" be omitted. The |
|
|
1054 |
" is converted. To rename from a subdirectory into the root of |
|
|
1055 |
" repository, use |
|
|
1126 | " included. The ``exclude`` directive causes files or directories to\n" | |
|
1127 | " be omitted. The ``rename`` directive renames a file or directory if\n" | |
|
1128 | " it is converted. To rename from a subdirectory into the root of\n" | |
|
1129 | " the repository, use ``.`` as the path to rename to." | |
|
1056 | 1130 | msgstr "" |
|
1057 | 1131 | |
|
1058 | 1132 | msgid "" |
@@ -1061,7 +1135,14 b' msgid ""' | |||
|
1061 | 1135 | " useful if you want to e.g. give a Subversion merge two parents, or\n" |
|
1062 | 1136 | " graft two disconnected series of history together. Each entry\n" |
|
1063 | 1137 | " contains a key, followed by a space, followed by one or two\n" |
|
1064 | " comma-separated values. The key is the revision ID in the source\n" | |
|
1138 | " comma-separated values::" | |
|
1139 | msgstr "" | |
|
1140 | ||
|
1141 | msgid " key parent1, parent2" | |
|
1142 | msgstr "" | |
|
1143 | ||
|
1144 | msgid "" | |
|
1145 | " The key is the revision ID in the source\n" | |
|
1065 | 1146 | " revision control system whose parents should be modified (same\n" |
|
1066 | 1147 | " format as a key in .hg/shamap). The values are the revision IDs\n" |
|
1067 | 1148 | " (in either the source or destination revision control system) that\n" |
@@ -1077,17 +1158,26 b' msgid ""' | |||
|
1077 | 1158 | " conjunction with a splicemap, it allows for a powerful combination\n" |
|
1078 | 1159 | " to help fix even the most badly mismanaged repositories and turn them\n" |
|
1079 | 1160 | " into nicely structured Mercurial repositories. The branchmap contains\n" |
|
1080 | " lines of the form \"original_branch_name new_branch_name\".\n" | |
|
1081 | " \"original_branch_name\" is the name of the branch in the source\n" | |
|
1082 | " repository, and \"new_branch_name\" is the name of the branch is the\n" | |
|
1083 | " destination repository. This can be used to (for instance) move code\n" | |
|
1084 | " in one repository from \"default\" to a named branch." | |
|
1161 | " lines of the form::" | |
|
1162 | msgstr "" | |
|
1163 | ||
|
1164 | msgid " original_branch_name new_branch_name" | |
|
1165 | msgstr "" | |
|
1166 | ||
|
1167 | msgid "" | |
|
1168 | " where \"original_branch_name\" is the name of the branch in the\n" | |
|
1169 | " source repository, and \"new_branch_name\" is the name of the branch\n" | |
|
1170 | " is the destination repository. No whitespace is allowed in the\n" | |
|
1171 | " branch names. This can be used to (for instance) move code in one\n" | |
|
1172 | " repository from \"default\" to a named branch." | |
|
1085 | 1173 | msgstr "" |
|
1086 | 1174 | |
|
1087 | 1175 | msgid "" |
|
1088 | 1176 | " Mercurial Source\n" |
|
1089 | " ----------------" | |
|
1090 | msgstr "" | |
|
1177 | " ''''''''''''''''" | |
|
1178 | msgstr "" | |
|
1179 | " Mercurial-källa\n" | |
|
1180 | " '''''''''''''''" | |
|
1091 | 1181 | |
|
1092 | 1182 | msgid "" |
|
1093 | 1183 | " --config convert.hg.ignoreerrors=False (boolean)\n" |
@@ -1103,8 +1193,10 b' msgstr ""' | |||
|
1103 | 1193 | |
|
1104 | 1194 | msgid "" |
|
1105 | 1195 | " CVS Source\n" |
|
1106 | " ----------" | |
|
1107 | msgstr "" | |
|
1196 | " ''''''''''" | |
|
1197 | msgstr "" | |
|
1198 | " CVS-källa\n" | |
|
1199 | " '''''''''" | |
|
1108 | 1200 | |
|
1109 | 1201 | msgid "" |
|
1110 | 1202 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
@@ -1160,8 +1252,10 b' msgstr ""' | |||
|
1160 | 1252 | |
|
1161 | 1253 | msgid "" |
|
1162 | 1254 | " Subversion Source\n" |
|
1163 | " -----------------" | |
|
1164 | msgstr "" | |
|
1255 | " '''''''''''''''''" | |
|
1256 | msgstr "" | |
|
1257 | " Subversion-källa\n" | |
|
1258 | " ''''''''''''''''" | |
|
1165 | 1259 | |
|
1166 | 1260 | msgid "" |
|
1167 | 1261 | " Subversion source detects classical trunk/branches/tags layouts.\n" |
@@ -1198,8 +1292,10 b' msgstr ""' | |||
|
1198 | 1292 | |
|
1199 | 1293 | msgid "" |
|
1200 | 1294 | " Perforce Source\n" |
|
1201 | " ---------------" | |
|
1202 | msgstr "" | |
|
1295 | " '''''''''''''''" | |
|
1296 | msgstr "" | |
|
1297 | " Perforce-källa\n" | |
|
1298 | " ''''''''''''''" | |
|
1203 | 1299 | |
|
1204 | 1300 | msgid "" |
|
1205 | 1301 | " The Perforce (P4) importer can be given a p4 depot path or a\n" |
@@ -1222,8 +1318,10 b' msgstr ""' | |||
|
1222 | 1318 | |
|
1223 | 1319 | msgid "" |
|
1224 | 1320 | " Mercurial Destination\n" |
|
1225 | " ---------------------" | |
|
1226 | msgstr "" | |
|
1321 | " '''''''''''''''''''''" | |
|
1322 | msgstr "" | |
|
1323 | " Mercurial-destination\n" | |
|
1324 | " '''''''''''''''''''''" | |
|
1227 | 1325 | |
|
1228 | 1326 | msgid "" |
|
1229 | 1327 | " --config convert.hg.clonebranches=False (boolean)\n" |
@@ -1253,21 +1351,24 b' msgid ""' | |||
|
1253 | 1351 | " dates." |
|
1254 | 1352 | msgstr "" |
|
1255 | 1353 | |
|
1256 | msgid "username mapping filename" | |
|
1354 | msgid "username mapping filename (DEPRECATED, use --authormap instead)" | |
|
1355 | msgstr "" | |
|
1356 | ||
|
1357 | msgid "source repository type" | |
|
1257 | 1358 | msgstr "" |
|
1258 | 1359 | |
|
1259 | 1360 | msgid "destination repository type" |
|
1260 | 1361 | msgstr "" |
|
1261 | 1362 | |
|
1363 | msgid "import up to target revision REV" | |
|
1364 | msgstr "" | |
|
1365 | ||
|
1366 | msgid "remap usernames using this file" | |
|
1367 | msgstr "" | |
|
1368 | ||
|
1262 | 1369 | msgid "remap file names using contents of file" |
|
1263 | 1370 | msgstr "" |
|
1264 | 1371 | |
|
1265 | msgid "import up to target revision REV" | |
|
1266 | msgstr "" | |
|
1267 | ||
|
1268 | msgid "source repository type" | |
|
1269 | msgstr "" | |
|
1270 | ||
|
1271 | 1372 | msgid "splice synthesized history into place" |
|
1272 | 1373 | msgstr "" |
|
1273 | 1374 | |
@@ -1382,8 +1483,8 b' msgstr "convert: %s\\n"' | |||
|
1382 | 1483 | msgid "%s: unknown repository type" |
|
1383 | 1484 | msgstr "%s: okänd arkivtyp" |
|
1384 | 1485 | |
|
1385 |
msgid " |
|
|
1386 | msgstr "hämtar fil" | |
|
1486 | msgid "getting files" | |
|
1487 | msgstr "hämtar filer" | |
|
1387 | 1488 | |
|
1388 | 1489 | msgid "revisions" |
|
1389 | 1490 | msgstr "revisioner" |
@@ -1555,6 +1656,13 b' msgstr ""' | |||
|
1555 | 1656 | msgid "Python ElementTree module is not available" |
|
1556 | 1657 | msgstr "" |
|
1557 | 1658 | |
|
1659 | #, python-format | |
|
1660 | msgid "%s repository format is unsupported, please upgrade" | |
|
1661 | msgstr "" | |
|
1662 | ||
|
1663 | msgid "failed to detect repository format!" | |
|
1664 | msgstr "" | |
|
1665 | ||
|
1558 | 1666 | msgid "internal calling inconsistency" |
|
1559 | 1667 | msgstr "" |
|
1560 | 1668 | |
@@ -1562,10 +1670,18 b' msgid "errors in filemap"' | |||
|
1562 | 1670 | msgstr "" |
|
1563 | 1671 | |
|
1564 | 1672 | #, python-format |
|
1673 | msgid "%s:%d: path to %s is missing\n" | |
|
1674 | msgstr "" | |
|
1675 | ||
|
1676 | #, python-format | |
|
1565 | 1677 | msgid "%s:%d: %r already in %s list\n" |
|
1566 | 1678 | msgstr "" |
|
1567 | 1679 | |
|
1568 | 1680 | #, python-format |
|
1681 | msgid "%s:%d: superfluous / in %s %r\n" | |
|
1682 | msgstr "" | |
|
1683 | ||
|
1684 | #, python-format | |
|
1569 | 1685 | msgid "%s:%d: unknown directive %r\n" |
|
1570 | 1686 | msgstr "" |
|
1571 | 1687 | |
@@ -1749,7 +1865,7 b' msgstr ""' | |||
|
1749 | 1865 | msgid "unable to cope with svn output" |
|
1750 | 1866 | msgstr "" |
|
1751 | 1867 | |
|
1752 | msgid "XXX TAGS NOT IMPLEMENTED YET\n" | |
|
1868 | msgid "writing Subversion tags is not yet implemented\n" | |
|
1753 | 1869 | msgstr "" |
|
1754 | 1870 | |
|
1755 | 1871 | msgid "automatically manage newlines in repository files" |
@@ -1974,9 +2090,13 b' msgid ""' | |||
|
1974 | 2090 | " revisions are specified, the working directory files are compared\n" |
|
1975 | 2091 | " to its parent." |
|
1976 | 2092 | msgstr "" |
|
2093 | " När två revisionsargument ges, kommer ändringar mellan revisionerna\n" | |
|
2094 | " att visas. Om bara en revision anges så jämförs den revisionen med\n" | |
|
2095 | " arbetskatalogen, och, när ingen revision anges, jämförs arbetskatalogen\n" | |
|
2096 | " med dess förälder." | |
|
1977 | 2097 | |
|
1978 | 2098 | msgid "CMD" |
|
1979 | msgstr "" | |
|
2099 | msgstr "KMD" | |
|
1980 | 2100 | |
|
1981 | 2101 | msgid "comparison program to run" |
|
1982 | 2102 | msgstr "" |
@@ -2032,29 +2152,36 b' msgid ""' | |||
|
2032 | 2152 | " order, use --switch-parent." |
|
2033 | 2153 | msgstr "" |
|
2034 | 2154 | |
|
2035 | msgid "" | |
|
2036 |
" S |
|
|
2155 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
|
2156 | msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." | |
|
2157 | ||
|
2158 | msgid "" | |
|
2159 | " Returns 0 on success.\n" | |
|
2037 | 2160 | " " |
|
2038 | 2161 | msgstr "" |
|
2039 | " Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" | |
|
2162 | " Returnerar 0 om kommandot lyckades.\n" | |
|
2040 | 2163 | " " |
|
2041 | 2164 | |
|
2042 | 2165 | msgid "" |
|
2043 | 2166 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" |
|
2044 | 2167 | msgstr "" |
|
2168 | "arbetskatalogen är inte på grentoppen (använd \"hg update\" för att hämta ut " | |
|
2169 | "grentoppen)" | |
|
2045 | 2170 | |
|
2046 | 2171 | msgid "outstanding uncommitted merge" |
|
2047 | msgstr "" | |
|
2172 | msgstr "kvarvarande oarkiverad sammanfogning" | |
|
2048 | 2173 | |
|
2049 | 2174 | msgid "outstanding uncommitted changes" |
|
2050 | msgstr "" | |
|
2175 | msgstr "kvarvarande oarkiverade ändringar" | |
|
2051 | 2176 | |
|
2052 | 2177 | msgid "working directory is missing some files" |
|
2053 | msgstr "" | |
|
2178 | msgstr "arbetskatalogen saknar några filer" | |
|
2054 | 2179 | |
|
2055 | 2180 | msgid "" |
|
2056 | 2181 | "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" |
|
2057 | 2182 | msgstr "" |
|
2183 | "flera huvuden i denna gren (använd \"hg heads .\" och \"hg merge\" för att " | |
|
2184 | "sammanfoga)" | |
|
2058 | 2185 | |
|
2059 | 2186 | #, python-format |
|
2060 | 2187 | msgid "pulling from %s\n" |
@@ -2064,79 +2191,92 b' msgid ""' | |||
|
2064 | 2191 | "Other repository doesn't support revision lookup, so a rev cannot be " |
|
2065 | 2192 | "specified." |
|
2066 | 2193 | msgstr "" |
|
2194 | "Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " | |
|
2195 | "anges." | |
|
2067 | 2196 | |
|
2068 | 2197 | #, python-format |
|
2069 | 2198 | msgid "" |
|
2070 | 2199 | "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" |
|
2071 | 2200 | "\" to merge them)\n" |
|
2072 | 2201 | msgstr "" |
|
2202 | "sammanfogar inte med %d andra nya grenhuvuden (använd \"hg heads .\" och " | |
|
2203 | "\"hg merge\" för att sammanfoga dem)\n" | |
|
2073 | 2204 | |
|
2074 | 2205 | #, python-format |
|
2075 | 2206 | msgid "updating to %d:%s\n" |
|
2076 | msgstr "" | |
|
2207 | msgstr "uppdaterar till %d:%s\n" | |
|
2077 | 2208 | |
|
2078 | 2209 | #, python-format |
|
2079 | 2210 | msgid "merging with %d:%s\n" |
|
2080 | msgstr "" | |
|
2211 | msgstr "sammanfogar med %d:%s\n" | |
|
2081 | 2212 | |
|
2082 | 2213 | #, python-format |
|
2083 | 2214 | msgid "new changeset %d:%s merges remote changes with local\n" |
|
2084 | msgstr "" | |
|
2215 | msgstr "nya ändringen %d:%s sammanfogar fjärrändringar med lokala\n" | |
|
2085 | 2216 | |
|
2086 | 2217 | msgid "a specific revision you would like to pull" |
|
2087 | msgstr "" | |
|
2218 | msgstr "en specifik revision som du vill dra" | |
|
2088 | 2219 | |
|
2089 | 2220 | msgid "edit commit message" |
|
2090 | msgstr "" | |
|
2221 | msgstr "redigera arkiveringsmeddelande" | |
|
2091 | 2222 | |
|
2092 | 2223 | msgid "edit commit message (DEPRECATED)" |
|
2093 | msgstr "" | |
|
2224 | msgstr "redigera arkiveringsmeddelande (FÖRÅLDRAD)" | |
|
2094 | 2225 | |
|
2095 | 2226 | msgid "switch parents when merging" |
|
2096 | msgstr "" | |
|
2227 | msgstr "byt föräldrar vid sammanfogning" | |
|
2097 | 2228 | |
|
2098 | 2229 | msgid "hg fetch [SOURCE]" |
|
2099 | msgstr "" | |
|
2230 | msgstr "hg fetch [KÄLLA]" | |
|
2100 | 2231 | |
|
2101 | 2232 | msgid "commands to sign and verify changesets" |
|
2102 | msgstr "" | |
|
2233 | msgstr "kommandon för att signera och verifiera ändringar" | |
|
2103 | 2234 | |
|
2104 | 2235 | msgid "error while verifying signature" |
|
2105 | msgstr "" | |
|
2236 | msgstr "fel vid verifiering av signatur" | |
|
2106 | 2237 | |
|
2107 | 2238 | #, python-format |
|
2108 | 2239 | msgid "%s Bad signature from \"%s\"\n" |
|
2109 | msgstr "" | |
|
2240 | msgstr "%s Dålig signatur från \"%s\"\n" | |
|
2110 | 2241 | |
|
2111 | 2242 | #, python-format |
|
2112 | 2243 | msgid "%s Note: Signature has expired (signed by: \"%s\")\n" |
|
2113 | msgstr "" | |
|
2244 | msgstr "%s Notera: Signaturen har gått ut (signerad av: \"%s\")\n" | |
|
2114 | 2245 | |
|
2115 | 2246 | #, python-format |
|
2116 | 2247 | msgid "%s Note: This key has expired (signed by: \"%s\")\n" |
|
2117 | msgstr "" | |
|
2248 | msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n" | |
|
2118 | 2249 | |
|
2119 | 2250 | msgid "list signed changesets" |
|
2120 | msgstr "" | |
|
2251 | msgstr "visa signerade ändringar" | |
|
2121 | 2252 | |
|
2122 | 2253 | #, python-format |
|
2123 | 2254 | msgid "%s:%d node does not exist\n" |
|
2124 | msgstr "" | |
|
2255 | msgstr "%s:%d noden existerar inte\n" | |
|
2125 | 2256 | |
|
2126 | 2257 | msgid "verify all the signatures there may be for a particular revision" |
|
2127 | msgstr "" | |
|
2258 | msgstr "verifiera alla signaturerna som finns för en viss revision" | |
|
2128 | 2259 | |
|
2129 | 2260 | #, python-format |
|
2130 | 2261 | msgid "No valid signature for %s\n" |
|
2131 | msgstr "" | |
|
2262 | msgstr "Ingen giltig signatur för %s\n" | |
|
2132 | 2263 | |
|
2133 | 2264 | msgid "add a signature for the current or given revision" |
|
2134 | msgstr "" | |
|
2265 | msgstr "lägg till en signatur för den aktuella eller angivna revisionen" | |
|
2135 | 2266 | |
|
2136 | 2267 | msgid "" |
|
2137 | 2268 | " If no revision is given, the parent of the working directory is used,\n" |
|
2138 | 2269 | " or tip if no revision is checked out." |
|
2139 | 2270 | msgstr "" |
|
2271 | " Om ingen revision anges, så används arbetskatalogens föräldern, eller\n" | |
|
2272 | " toppen om ingen revision är uthämtad." | |
|
2273 | ||
|
2274 | msgid "" | |
|
2275 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
|
2276 | " " | |
|
2277 | msgstr "" | |
|
2278 | " Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" | |
|
2279 | " " | |
|
2140 | 2280 | |
|
2141 | 2281 | msgid "uncommitted merge - please provide a specific revision" |
|
2142 | 2282 | msgstr "" |
@@ -2145,7 +2285,7 b' msgstr ""' | |||
|
2145 | 2285 | msgid "Signing %d:%s\n" |
|
2146 | 2286 | msgstr "Signerar %d:%s\n" |
|
2147 | 2287 | |
|
2148 |
msgid " |
|
|
2288 | msgid "error while signing" | |
|
2149 | 2289 | msgstr "" |
|
2150 | 2290 | |
|
2151 | 2291 | msgid "" |
@@ -2313,7 +2453,7 b' msgstr ""' | |||
|
2313 | 2453 | msgid "" |
|
2314 | 2454 | "The :hg:`view` command will launch the hgk Tcl script. For this command\n" |
|
2315 | 2455 | "to work, hgk must be in your search path. Alternately, you can specify\n" |
|
2316 |
"the path to hgk in your |
|
|
2456 | "the path to hgk in your configuration file::" | |
|
2317 | 2457 | msgstr "" |
|
2318 | 2458 | |
|
2319 | 2459 | msgid "" |
@@ -2642,6 +2782,11 b' msgid ""' | |||
|
2642 | 2782 | msgstr "" |
|
2643 | 2783 | |
|
2644 | 2784 | msgid "" |
|
2785 | "Keywords expand to the changeset data pertaining to the latest change\n" | |
|
2786 | "relative to the working directory parent of each file." | |
|
2787 | msgstr "" | |
|
2788 | ||
|
2789 | msgid "" | |
|
2645 | 2790 | "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" |
|
2646 | 2791 | "sections of hgrc files." |
|
2647 | 2792 | msgstr "" |
@@ -2663,8 +2808,9 b' msgid ""' | |||
|
2663 | 2808 | msgstr "" |
|
2664 | 2809 | |
|
2665 | 2810 | msgid "" |
|
2666 | "NOTE: the more specific you are in your filename patterns the less you\n" | |
|
2667 | "lose speed in huge repositories." | |
|
2811 | ".. note::\n" | |
|
2812 | " The more specific you are in your filename patterns the less you\n" | |
|
2813 | " lose speed in huge repositories." | |
|
2668 | 2814 | msgstr "" |
|
2669 | 2815 | |
|
2670 | 2816 | msgid "" |
@@ -3248,6 +3394,10 b' msgstr ""' | |||
|
3248 | 3394 | msgid "patch %s does not exist" |
|
3249 | 3395 | msgstr "" |
|
3250 | 3396 | |
|
3397 | #, python-format | |
|
3398 | msgid "renaming %s to %s\n" | |
|
3399 | msgstr "döper om %s till %s\n" | |
|
3400 | ||
|
3251 | 3401 | msgid "need --name to import a patch from -" |
|
3252 | 3402 | msgstr "" |
|
3253 | 3403 | |
@@ -3276,6 +3426,9 b' msgstr ""' | |||
|
3276 | 3426 | msgid "print the patches already applied" |
|
3277 | 3427 | msgstr "" |
|
3278 | 3428 | |
|
3429 | msgid " Returns 0 on success." | |
|
3430 | msgstr " Returnerar 0 om kommandot lyckades." | |
|
3431 | ||
|
3279 | 3432 | msgid "only one patch applied\n" |
|
3280 | 3433 | msgstr "" |
|
3281 | 3434 | |
@@ -3321,9 +3474,21 b' msgstr ""' | |||
|
3321 | 3474 | msgid "" |
|
3322 | 3475 | " To import a patch from standard input, pass - as the patch file.\n" |
|
3323 | 3476 | " When importing from standard input, a patch name must be specified\n" |
|
3324 |
" using the --name flag. |
|
|
3477 | " using the --name flag." | |
|
3478 | msgstr "" | |
|
3479 | ||
|
3480 | msgid " To import an existing patch while renaming it::" | |
|
3481 | msgstr "" | |
|
3482 | ||
|
3483 | msgid " hg qimport -e existing-patch -n new-name" | |
|
3484 | msgstr "" | |
|
3485 | ||
|
3486 | msgid "" | |
|
3487 | " Returns 0 if import succeeded.\n" | |
|
3325 | 3488 | " " |
|
3326 | 3489 | msgstr "" |
|
3490 | " Returnerar 0 om importeringen lyckades.\n" | |
|
3491 | " " | |
|
3327 | 3492 | |
|
3328 | 3493 | msgid "init a new queue repository (DEPRECATED)" |
|
3329 | 3494 | msgstr "" |
@@ -3359,9 +3524,15 b' msgstr ""' | |||
|
3359 | 3524 | |
|
3360 | 3525 | msgid "" |
|
3361 | 3526 | " The patch directory must be a nested Mercurial repository, as\n" |
|
3362 |
" would be created by :hg:`init --mq`. |
|
|
3527 | " would be created by :hg:`init --mq`." | |
|
3528 | msgstr "" | |
|
3529 | ||
|
3530 | msgid "" | |
|
3531 | " Return 0 on success.\n" | |
|
3363 | 3532 | " " |
|
3364 | 3533 | msgstr "" |
|
3534 | " Returnerar 0 om kommandot lyckades.\n" | |
|
3535 | " " | |
|
3365 | 3536 | |
|
3366 | 3537 | msgid "versioned patch repository not found (see init --mq)" |
|
3367 | 3538 | msgstr "versionshanterat patcharkiv hittades inte (se init --mq)" |
@@ -3425,12 +3596,18 b' msgid ""' | |||
|
3425 | 3596 | " Use the -g/--git option to keep the patch in the git extended diff\n" |
|
3426 | 3597 | " format. Read the diffs help topic for more information on why this\n" |
|
3427 | 3598 | " is important for preserving permission changes and copy/rename\n" |
|
3428 |
" information. |
|
|
3599 | " information." | |
|
3600 | msgstr "" | |
|
3601 | ||
|
3602 | msgid "" | |
|
3603 | " Returns 0 on successful creation of a new patch.\n" | |
|
3429 | 3604 | " " |
|
3430 | 3605 | msgstr "" |
|
3606 | " Returnerar 0 om en patch skapades.\n" | |
|
3607 | " " | |
|
3431 | 3608 | |
|
3432 | 3609 | msgid "update the current patch" |
|
3433 | msgstr "" | |
|
3610 | msgstr "uppdatera den nuvarande patchen" | |
|
3434 | 3611 | |
|
3435 | 3612 | msgid "" |
|
3436 | 3613 | " If any file patterns are provided, the refreshed patch will\n" |
@@ -3444,11 +3621,18 b' msgid ""' | |||
|
3444 | 3621 | msgstr "" |
|
3445 | 3622 | |
|
3446 | 3623 | msgid "" |
|
3624 | " If -e/--edit is specified, Mercurial will start your configured editor " | |
|
3625 | "for\n" | |
|
3626 | " you to enter a message. In case qrefresh fails, you will find a backup " | |
|
3627 | "of\n" | |
|
3628 | " your message in ``.hg/last-message.txt``." | |
|
3629 | msgstr "" | |
|
3630 | ||
|
3631 | msgid "" | |
|
3447 | 3632 | " hg add/remove/copy/rename work as usual, though you might want to\n" |
|
3448 | 3633 | " use git-style patches (-g/--git or [diff] git=1) to track copies\n" |
|
3449 | 3634 | " and renames. See the diffs help topic for more information on the\n" |
|
3450 |
" git diff format. |
|
|
3451 | " " | |
|
3635 | " git diff format." | |
|
3452 | 3636 | msgstr "" |
|
3453 | 3637 | |
|
3454 | 3638 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
@@ -3468,8 +3652,7 b' msgid ""' | |||
|
3468 | 3652 | " Use :hg:`diff` if you only want to see the changes made since the\n" |
|
3469 | 3653 | " last qrefresh, or :hg:`export qtip` if you want to see changes\n" |
|
3470 | 3654 | " made by the current patch without including changes made since the\n" |
|
3471 |
" qrefresh. |
|
|
3472 | " " | |
|
3655 | " qrefresh." | |
|
3473 | 3656 | msgstr "" |
|
3474 | 3657 | |
|
3475 | 3658 | msgid "fold the named patches into the current patch" |
@@ -3486,25 +3669,22 b' msgstr ""' | |||
|
3486 | 3669 | |
|
3487 | 3670 | msgid "" |
|
3488 | 3671 | " The header for each folded patch will be concatenated with the\n" |
|
3489 |
" current patch header, separated by a line of |
|
|
3672 | " current patch header, separated by a line of ``* * *``." | |
|
3490 | 3673 | msgstr "" |
|
3491 | 3674 | |
|
3492 | 3675 | msgid "qfold requires at least one patch name" |
|
3493 | 3676 | msgstr "" |
|
3494 | 3677 | |
|
3495 | msgid "No patches applied" | |
|
3496 | msgstr "" | |
|
3497 | ||
|
3498 | #, python-format | |
|
3499 | msgid "Skipping already folded patch %s" | |
|
3500 | msgstr "" | |
|
3678 | #, python-format | |
|
3679 | msgid "Skipping already folded patch %s\n" | |
|
3680 | msgstr "Hoppar över redan hopvikta patchen %s\n" | |
|
3501 | 3681 | |
|
3502 | 3682 | #, python-format |
|
3503 | 3683 | msgid "qfold cannot fold already applied patch %s" |
|
3504 | 3684 | msgstr "" |
|
3505 | 3685 | |
|
3506 | 3686 | #, python-format |
|
3507 |
msgid " |
|
|
3687 | msgid "error folding patch %s" | |
|
3508 | 3688 | msgstr "" |
|
3509 | 3689 | |
|
3510 | 3690 | msgid "push or pop patches until named patch is at top of stack" |
@@ -3524,16 +3704,18 b' msgstr ""' | |||
|
3524 | 3704 | |
|
3525 | 3705 | msgid "" |
|
3526 | 3706 | " With no arguments, print the currently active guards.\n" |
|
3527 |
" With arguments, set guards for the named patch. |
|
|
3528 | " NOTE: Specifying negative guards now requires '--'." | |
|
3707 | " With arguments, set guards for the named patch." | |
|
3708 | msgstr "" | |
|
3709 | ||
|
3710 | msgid "" | |
|
3711 | " .. note::\n" | |
|
3712 | " Specifying negative guards now requires '--'." | |
|
3529 | 3713 | msgstr "" |
|
3530 | 3714 | |
|
3531 | 3715 | msgid " To set guards on another patch::" |
|
3532 | 3716 | msgstr "" |
|
3533 | 3717 | |
|
3534 | msgid "" | |
|
3535 | " hg qguard other.patch -- +2.6.17 -stable\n" | |
|
3536 | " " | |
|
3718 | msgid " hg qguard other.patch -- +2.6.17 -stable" | |
|
3537 | 3719 | msgstr "" |
|
3538 | 3720 | |
|
3539 | 3721 | msgid "cannot mix -l/--list with options or arguments" |
@@ -3554,9 +3736,15 b' msgstr ""' | |||
|
3554 | 3736 | |
|
3555 | 3737 | msgid "" |
|
3556 | 3738 | " When -f/--force is applied, all local changes in patched files\n" |
|
3557 |
" will be lost. |
|
|
3739 | " will be lost." | |
|
3740 | msgstr "" | |
|
3741 | ||
|
3742 | msgid "" | |
|
3743 | " Return 0 on succces.\n" | |
|
3558 | 3744 | " " |
|
3559 | 3745 | msgstr "" |
|
3746 | " Returnerar 0 om kommandot lyckades.\n" | |
|
3747 | " " | |
|
3560 | 3748 | |
|
3561 | 3749 | msgid "no saved queues found, please use -n\n" |
|
3562 | 3750 | msgstr "" |
@@ -3571,8 +3759,7 b' msgstr ""' | |||
|
3571 | 3759 | msgid "" |
|
3572 | 3760 | " By default, pops off the top of the patch stack. If given a patch\n" |
|
3573 | 3761 | " name, keeps popping off patches until the named patch is at the\n" |
|
3574 |
" top of the stack. |
|
|
3575 | " " | |
|
3762 | " top of the stack." | |
|
3576 | 3763 | msgstr "" |
|
3577 | 3764 | |
|
3578 | 3765 | #, python-format |
@@ -3595,15 +3782,11 b' msgstr ""' | |||
|
3595 | 3782 | msgid "A patch named %s already exists in the series file" |
|
3596 | 3783 | msgstr "" |
|
3597 | 3784 | |
|
3598 | #, python-format | |
|
3599 | msgid "renaming %s to %s\n" | |
|
3600 | msgstr "döper om %s till %s\n" | |
|
3601 | ||
|
3602 | 3785 | msgid "restore the queue state saved by a revision (DEPRECATED)" |
|
3603 | 3786 | msgstr "" |
|
3604 | 3787 | |
|
3605 |
msgid " This command is deprecated, use rebase |
|
|
3606 | msgstr "" | |
|
3788 | msgid " This command is deprecated, use :hg:`rebase` instead." | |
|
3789 | msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället." | |
|
3607 | 3790 | |
|
3608 | 3791 | msgid "save current queue state (DEPRECATED)" |
|
3609 | 3792 | msgstr "" |
@@ -3620,15 +3803,13 b' msgstr ""' | |||
|
3620 | 3803 | msgid "copy %s to %s\n" |
|
3621 | 3804 | msgstr "" |
|
3622 | 3805 | |
|
3623 |
msgid "strip |
|
|
3624 | msgstr "" | |
|
3625 | ||
|
3626 | msgid "" | |
|
3627 |
" The strip command removes |
|
|
3628 | " number is greater than or equal to REV, and then restores any\n" | |
|
3629 | " changesets that are not descendants of REV. If the working\n" | |
|
3630 | " directory has uncommitted changes, the operation is aborted unless\n" | |
|
3631 | " the --force flag is supplied." | |
|
3806 | msgid "strip changesets and all their descendants from the repository" | |
|
3807 | msgstr "" | |
|
3808 | ||
|
3809 | msgid "" | |
|
3810 | " The strip command removes the specified changesets and all their\n" | |
|
3811 | " descendants. If the working directory has uncommitted changes,\n" | |
|
3812 | " the operation is aborted unless the --force flag is supplied." | |
|
3632 | 3813 | msgstr "" |
|
3633 | 3814 | |
|
3634 | 3815 | msgid "" |
@@ -3648,10 +3829,12 b' msgid ""' | |||
|
3648 | 3829 | msgstr "" |
|
3649 | 3830 | |
|
3650 | 3831 | msgid "" |
|
3651 | " Use the --nobackup option to discard the backup bundle once the\n" | |
|
3652 |
" operation completes. |
|
|
3653 | " " | |
|
3654 | msgstr "" | |
|
3832 | " Use the --no-backup option to discard the backup bundle once the\n" | |
|
3833 | " operation completes." | |
|
3834 | msgstr "" | |
|
3835 | ||
|
3836 | msgid "empty revision set" | |
|
3837 | msgstr "tomt revisionsset" | |
|
3655 | 3838 | |
|
3656 | 3839 | msgid "set or print guarded patches to push" |
|
3657 | 3840 | msgstr "" |
@@ -3748,8 +3931,7 b' msgstr ""' | |||
|
3748 | 3931 | msgid "" |
|
3749 | 3932 | " This can be especially useful if your changes have been applied to\n" |
|
3750 | 3933 | " an upstream repository, or if you are about to push your changes\n" |
|
3751 |
" to upstream. |
|
|
3752 | " " | |
|
3934 | " to upstream." | |
|
3753 | 3935 | msgstr "" |
|
3754 | 3936 | |
|
3755 | 3937 | msgid "no revisions specified" |
@@ -3781,13 +3963,18 b' msgstr ""' | |||
|
3781 | 3963 | msgid "" |
|
3782 | 3964 | " To delete an existing queue, use --delete. You cannot delete the " |
|
3783 | 3965 | "currently\n" |
|
3784 |
" active queue. |
|
|
3785 | " " | |
|
3966 | " active queue." | |
|
3786 | 3967 | msgstr "" |
|
3787 | 3968 | |
|
3788 | 3969 | msgid "patches applied - cannot set new queue active" |
|
3789 | 3970 | msgstr "" |
|
3790 | 3971 | |
|
3972 | msgid "cannot delete queue that does not exist" | |
|
3973 | msgstr "" | |
|
3974 | ||
|
3975 | msgid "cannot delete currently active queue" | |
|
3976 | msgstr "" | |
|
3977 | ||
|
3791 | 3978 | msgid " (active)\n" |
|
3792 | 3979 | msgstr " (aktiv)\n" |
|
3793 | 3980 | |
@@ -3798,10 +3985,12 b' msgstr ""' | |||
|
3798 | 3985 | msgid "queue \"%s\" already exists" |
|
3799 | 3986 | msgstr "kön \"%s\" finns redan" |
|
3800 | 3987 | |
|
3801 | msgid "cannot delete queue that does not exist" | |
|
3802 | msgstr "" | |
|
3803 | ||
|
3804 | msgid "cannot delete currently active queue" | |
|
3988 | #, python-format | |
|
3989 | msgid "can't rename \"%s\" to its current name" | |
|
3990 | msgstr "" | |
|
3991 | ||
|
3992 | #, python-format | |
|
3993 | msgid "non-queue directory \"%s\" already exists" | |
|
3805 | 3994 | msgstr "" |
|
3806 | 3995 | |
|
3807 | 3996 | msgid "use --create to create a new queue" |
@@ -3827,8 +4016,8 b' msgstr ""' | |||
|
3827 | 4016 | msgid "only a local queue repository may be initialized" |
|
3828 | 4017 | msgstr "bara ett lokalt köarkiv kan initialiseras" |
|
3829 | 4018 | |
|
3830 |
msgid " |
|
|
3831 |
msgstr " |
|
|
4019 | msgid "there is no Mercurial repository here (.hg not found)" | |
|
4020 | msgstr "det finns inget Mercurial-arkiv här (.hg hittades inte)" | |
|
3832 | 4021 | |
|
3833 | 4022 | msgid "no queue repository" |
|
3834 | 4023 | msgstr "inget köarkiv" |
@@ -3886,8 +4075,8 b' msgstr ""' | |||
|
3886 | 4075 | msgid "stop managing a revision (DEPRECATED)" |
|
3887 | 4076 | msgstr "" |
|
3888 | 4077 | |
|
3889 |
msgid "hg qdelete [-k] [ |
|
|
3890 | msgstr "" | |
|
4078 | msgid "hg qdelete [-k] [PATCH]..." | |
|
4079 | msgstr "hg qdelete [-k] [PATCH]..." | |
|
3891 | 4080 | |
|
3892 | 4081 | msgid "edit patch header" |
|
3893 | 4082 | msgstr "" |
@@ -3979,10 +4168,10 b' msgstr ""' | |||
|
3979 | 4168 | msgid "forget any local changes to patched files" |
|
3980 | 4169 | msgstr "" |
|
3981 | 4170 | |
|
3982 |
msgid "hg qpop [-a] [- |
|
|
3983 | msgstr "" | |
|
3984 | ||
|
3985 | msgid "apply if the patch has rejects" | |
|
4171 | msgid "hg qpop [-a] [-f] [PATCH | INDEX]" | |
|
4172 | msgstr "hg qpop [-a] [-f] [PATCH | INDEX]" | |
|
4173 | ||
|
4174 | msgid "apply on top of local changes" | |
|
3986 | 4175 | msgstr "" |
|
3987 | 4176 | |
|
3988 | 4177 | msgid "list patch name in commit text" |
@@ -4000,8 +4189,8 b' msgstr ""' | |||
|
4000 | 4189 | msgid "reorder patch series and apply only the patch" |
|
4001 | 4190 | msgstr "omordna patchserien och applicera bara patchen" |
|
4002 | 4191 | |
|
4003 |
msgid "hg qpush [-f] [-l] [-a] [- |
|
|
4004 |
msgstr "hg qpush [-f] [-l] [-a] [- |
|
|
4192 | msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" | |
|
4193 | msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" | |
|
4005 | 4194 | |
|
4006 | 4195 | msgid "refresh only files already in the patch and specified files" |
|
4007 | 4196 | msgstr "" |
@@ -4084,25 +4273,31 b' msgstr ""' | |||
|
4084 | 4273 | "ättling till REV (FÖRLEGAD)" |
|
4085 | 4274 | |
|
4086 | 4275 | msgid "no backups" |
|
4087 | msgstr "" | |
|
4088 | ||
|
4089 | msgid "hg strip [-f] [-n] REV" | |
|
4090 | msgstr "hg strip [-f] [-n] REV" | |
|
4276 | msgstr "inga säkerhetskopior" | |
|
4277 | ||
|
4278 | msgid "no backups (DEPRECATED)" | |
|
4279 | msgstr "inga säkerhetskopior (FÖRÅLDRAD)" | |
|
4280 | ||
|
4281 | msgid "do not modify working copy during strip" | |
|
4282 | msgstr "modifiera inte arbetskopian vid strippning" | |
|
4283 | ||
|
4284 | msgid "hg strip [-k] [-f] [-n] REV..." | |
|
4285 | msgstr "hg strip [-k] [-f] [-n] REV..." | |
|
4091 | 4286 | |
|
4092 | 4287 | msgid "hg qtop [-s]" |
|
4093 | msgstr "" | |
|
4288 | msgstr "hg qtop [-s]" | |
|
4094 | 4289 | |
|
4095 | 4290 | msgid "show only the first patch" |
|
4096 | 4291 | msgstr "visa bara den första patchen" |
|
4097 | 4292 | |
|
4098 | 4293 | msgid "hg qunapplied [-1] [-s] [PATCH]" |
|
4099 | msgstr "" | |
|
4294 | msgstr "hg qunapplied [-1] [-s] [PATCH]" | |
|
4100 | 4295 | |
|
4101 | 4296 | msgid "finish all applied changesets" |
|
4102 | 4297 | msgstr "" |
|
4103 | 4298 | |
|
4104 | 4299 | msgid "hg qfinish [-a] [REV]..." |
|
4105 | msgstr "" | |
|
4300 | msgstr "hg qfinish [-a] [REV]..." | |
|
4106 | 4301 | |
|
4107 | 4302 | msgid "list all available queues" |
|
4108 | 4303 | msgstr "visa alla tillgängliga köer" |
@@ -4110,9 +4305,15 b' msgstr "visa alla tillg\xc3\xa4ngliga k\xc3\xb6er"' | |||
|
4110 | 4305 | msgid "create new queue" |
|
4111 | 4306 | msgstr "skapa ny kö" |
|
4112 | 4307 | |
|
4308 | msgid "rename active queue" | |
|
4309 | msgstr "döp om aktiv kö" | |
|
4310 | ||
|
4113 | 4311 | msgid "delete reference to queue" |
|
4114 | 4312 | msgstr "" |
|
4115 | 4313 | |
|
4314 | msgid "delete queue, and remove patch dir" | |
|
4315 | msgstr "" | |
|
4316 | ||
|
4116 | 4317 | msgid "[OPTION] [QUEUE]" |
|
4117 | 4318 | msgstr "[FLAGGA] [KÖ]" |
|
4118 | 4319 | |
@@ -4244,14 +4445,32 b' msgid ""' | |||
|
4244 | 4445 | msgstr "" |
|
4245 | 4446 | |
|
4246 | 4447 | msgid "" |
|
4448 | "By default, the pager is only executed if a command has output. To\n" | |
|
4449 | "force the pager to run even if a command prints nothing, set::" | |
|
4450 | msgstr "" | |
|
4451 | "Som standard körs bara pagineraren om ett kommando visar något. För att\n" | |
|
4452 | "tvinga pagineraren att köra även om ett kommando inte visar något, sätt::" | |
|
4453 | ||
|
4454 | msgid "" | |
|
4455 | " [pager]\n" | |
|
4456 | " force = True" | |
|
4457 | msgstr "" | |
|
4458 | " [pager]\n" | |
|
4459 | " force = True" | |
|
4460 | ||
|
4461 | msgid "" | |
|
4247 | 4462 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
|
4248 | 4463 | "setting::" |
|
4249 | 4464 | msgstr "" |
|
4465 | "Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n" | |
|
4466 | "genom att sätta::" | |
|
4250 | 4467 | |
|
4251 | 4468 | msgid "" |
|
4252 | 4469 | " [pager]\n" |
|
4253 | 4470 | " quiet = True" |
|
4254 | 4471 | msgstr "" |
|
4472 | " [pager]\n" | |
|
4473 | " quiet = True" | |
|
4255 | 4474 | |
|
4256 | 4475 | msgid "" |
|
4257 | 4476 | "You can disable the pager for certain commands by adding them to the\n" |
@@ -4283,8 +4502,22 b' msgstr ""' | |||
|
4283 | 4502 | |
|
4284 | 4503 | msgid "" |
|
4285 | 4504 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" |
|
4286 | "to specify them in the global .hgrc\n" | |
|
4287 | msgstr "" | |
|
4505 | "to specify them in your user configuration file." | |
|
4506 | msgstr "" | |
|
4507 | "För att ignorera globala kommandon som :hg:`version` eller :hg:`help`, så\n" | |
|
4508 | "måste du ange dem i din användarkonfigurationsfil." | |
|
4509 | ||
|
4510 | msgid "" | |
|
4511 | "The --pager=... option can also be used to control when the pager is\n" | |
|
4512 | "used. Use a boolean value like yes, no, on, off, or use auto for\n" | |
|
4513 | "normal behavior.\n" | |
|
4514 | msgstr "" | |
|
4515 | "Flaggan --pager=... kan också användas för att kontrollera när pagineraren\n" | |
|
4516 | "används. Använd ett booleskt värde som yes, no, on off, eller använd auto\n" | |
|
4517 | "för normalt uppförande.\n" | |
|
4518 | ||
|
4519 | msgid "when to paginate (boolean, always, auto, or never)" | |
|
4520 | msgstr "när paginering ska ske (boolean, always, auto eller never)" | |
|
4288 | 4521 | |
|
4289 | 4522 | msgid "interpret suffixes to refer to ancestor revisions" |
|
4290 | 4523 | msgstr "" |
@@ -4339,12 +4572,6 b' msgid ""' | |||
|
4339 | 4572 | msgstr "" |
|
4340 | 4573 | |
|
4341 | 4574 | msgid "" |
|
4342 | "With the -d/--diffstat option, you will be prompted for each changeset\n" | |
|
4343 | "with a diffstat summary and the changeset summary, so you can be sure\n" | |
|
4344 | "you are sending the right changes." | |
|
4345 | msgstr "" | |
|
4346 | ||
|
4347 | msgid "" | |
|
4348 | 4575 | "To configure other defaults, add a section like this to your hgrc\n" |
|
4349 | 4576 | "file::" |
|
4350 | 4577 | msgstr "" |
@@ -4369,39 +4596,6 b' msgid ""' | |||
|
4369 | 4596 | msgstr "" |
|
4370 | 4597 | |
|
4371 | 4598 | msgid "" |
|
4372 | "To avoid sending patches prematurely, it is a good idea to first run\n" | |
|
4373 | "the :hg:`email` command with the \"-n\" option (test only). You will be\n" | |
|
4374 | "prompted for an email recipient address, a subject and an introductory\n" | |
|
4375 | "message describing the patches of your patchbomb. Then when all is\n" | |
|
4376 | "done, patchbomb messages are displayed. If the PAGER environment\n" | |
|
4377 | "variable is set, your pager will be fired up once for each patchbomb\n" | |
|
4378 | "message, so you can verify everything is alright." | |
|
4379 | msgstr "" | |
|
4380 | ||
|
4381 | msgid "" | |
|
4382 | "The -m/--mbox option is also very useful. Instead of previewing each\n" | |
|
4383 | "patchbomb message in a pager or sending the messages directly, it will\n" | |
|
4384 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" | |
|
4385 | "can be previewed with any mail user agent which supports UNIX mbox\n" | |
|
4386 | "files, e.g. with mutt::" | |
|
4387 | msgstr "" | |
|
4388 | ||
|
4389 | msgid " % mutt -R -f mbox" | |
|
4390 | msgstr "" | |
|
4391 | ||
|
4392 | msgid "" | |
|
4393 | "When you are previewing the patchbomb messages, you can use ``formail``\n" | |
|
4394 | "(a utility that is commonly installed as part of the procmail\n" | |
|
4395 | "package), to send each message out::" | |
|
4396 | msgstr "" | |
|
4397 | ||
|
4398 | msgid " % formail -s sendmail -bm -t < mbox" | |
|
4399 | msgstr "" | |
|
4400 | ||
|
4401 | msgid "That should be all. Now your patchbomb is on its way out." | |
|
4402 | msgstr "" | |
|
4403 | ||
|
4404 | msgid "" | |
|
4405 | 4599 | "You can also either configure the method option in the email section\n" |
|
4406 | 4600 | "to be a sendmail compatible mailer or fill out the [smtp] section so\n" |
|
4407 | 4601 | "that the patchbomb extension can automatically send patchbombs\n" |
@@ -4416,12 +4610,6 b' msgstr "%s Ange ett giltigt v\xc3\xa4rde"' | |||
|
4416 | 4610 | msgid "Please enter a valid value.\n" |
|
4417 | 4611 | msgstr "Ange ett giltigt värde.\n" |
|
4418 | 4612 | |
|
4419 | msgid "does the diffstat above look okay?" | |
|
4420 | msgstr "ser diffstaten ovanför okej ut?" | |
|
4421 | ||
|
4422 | msgid "diffstat rejected" | |
|
4423 | msgstr "diffstat avvisad" | |
|
4424 | ||
|
4425 | 4613 | msgid "send changesets by email" |
|
4426 | 4614 | msgstr "" |
|
4427 | 4615 | |
@@ -4435,10 +4623,21 b' msgid ""' | |||
|
4435 | 4623 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
4436 | 4624 | " the first line of the changeset description as the subject text.\n" |
|
4437 | 4625 | " The message contains two or three parts. First, the changeset\n" |
|
4438 | " description. Next, (optionally) if the diffstat program is\n" | |
|
4439 | " installed and -d/--diffstat is used, the result of running\n" | |
|
4440 | " diffstat on the patch. Finally, the patch itself, as generated by\n" | |
|
4441 | " :hg:`export`." | |
|
4626 | " description." | |
|
4627 | msgstr "" | |
|
4628 | ||
|
4629 | msgid "" | |
|
4630 | " With the -d/--diffstat option, if the diffstat program is\n" | |
|
4631 | " installed, the result of running diffstat on the patch is inserted." | |
|
4632 | msgstr "" | |
|
4633 | ||
|
4634 | msgid " Finally, the patch itself, as generated by :hg:`export`." | |
|
4635 | msgstr "" | |
|
4636 | ||
|
4637 | msgid "" | |
|
4638 | " With the -d/--diffstat or -c/--confirm options, you will be presented\n" | |
|
4639 | " with a final summary of all messages and asked for confirmation before\n" | |
|
4640 | " the messages are sent." | |
|
4442 | 4641 | msgstr "" |
|
4443 | 4642 | |
|
4444 | 4643 | msgid "" |
@@ -4461,6 +4660,23 b' msgid ""' | |||
|
4461 | 4660 | msgstr "" |
|
4462 | 4661 | |
|
4463 | 4662 | msgid "" |
|
4663 | " With -m/--mbox, instead of previewing each patchbomb message in a\n" | |
|
4664 | " pager or sending the messages directly, it will create a UNIX\n" | |
|
4665 | " mailbox file with the patch emails. This mailbox file can be\n" | |
|
4666 | " previewed with any mail user agent which supports UNIX mbox\n" | |
|
4667 | " files." | |
|
4668 | msgstr "" | |
|
4669 | ||
|
4670 | msgid "" | |
|
4671 | " With -n/--test, all steps will run, but mail will not be sent.\n" | |
|
4672 | " You will be prompted for an email recipient address, a subject and\n" | |
|
4673 | " an introductory message describing the patches of your patchbomb.\n" | |
|
4674 | " Then when all is done, patchbomb messages are displayed. If the\n" | |
|
4675 | " PAGER environment variable is set, your pager will be fired up once\n" | |
|
4676 | " for each patchbomb message, so you can verify everything is alright." | |
|
4677 | msgstr "" | |
|
4678 | ||
|
4679 | msgid "" | |
|
4464 | 4680 | " hg email -r 3000 # send patch 3000 only\n" |
|
4465 | 4681 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
|
4466 | 4682 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" |
@@ -4483,6 +4699,15 b' msgid ""' | |||
|
4483 | 4699 | msgstr "" |
|
4484 | 4700 | |
|
4485 | 4701 | msgid "" |
|
4702 | " hg email -o -m mbox && # generate an mbox file...\n" | |
|
4703 | " mutt -R -f mbox # ... and view it with mutt\n" | |
|
4704 | " hg email -o -m mbox && # generate an mbox file ...\n" | |
|
4705 | " formail -s sendmail \\ # ... and use formail to send from the " | |
|
4706 | "mbox\n" | |
|
4707 | " -bm -t < mbox # ... using sendmail" | |
|
4708 | msgstr "" | |
|
4709 | ||
|
4710 | msgid "" | |
|
4486 | 4711 | " Before using this command, you will need to enable email in your\n" |
|
4487 | 4712 | " hgrc. See the [email] section in hgrc(5) for details.\n" |
|
4488 | 4713 | " " |
@@ -4509,17 +4734,37 b' msgstr ""' | |||
|
4509 | 4734 | msgid "This patch series consists of %d patches." |
|
4510 | 4735 | msgstr "" |
|
4511 | 4736 | |
|
4512 | msgid "Final summary:\n" | |
|
4737 | msgid "" | |
|
4738 | "\n" | |
|
4739 | "Final summary:" | |
|
4740 | msgstr "" | |
|
4741 | ||
|
4742 | msgid "are you sure you want to send (yn)?" | |
|
4743 | msgstr "" | |
|
4744 | ||
|
4745 | msgid "&No" | |
|
4746 | msgstr "" | |
|
4747 | ||
|
4748 | msgid "&Yes" | |
|
4749 | msgstr "" | |
|
4750 | ||
|
4751 | msgid "patchbomb canceled" | |
|
4513 | 4752 | msgstr "" |
|
4514 | 4753 | |
|
4515 | 4754 | msgid "Displaying " |
|
4516 | msgstr "" | |
|
4755 | msgstr "Visar " | |
|
4517 | 4756 | |
|
4518 | 4757 | msgid "Writing " |
|
4519 | msgstr "" | |
|
4758 | msgstr "Skriver " | |
|
4759 | ||
|
4760 | msgid "writing" | |
|
4761 | msgstr "skriver" | |
|
4520 | 4762 | |
|
4521 | 4763 | msgid "Sending " |
|
4522 | msgstr "" | |
|
4764 | msgstr "Sänder " | |
|
4765 | ||
|
4766 | msgid "sending" | |
|
4767 | msgstr "sänder" | |
|
4523 | 4768 | |
|
4524 | 4769 | msgid "send patches as attachments" |
|
4525 | 4770 | msgstr "" |
@@ -4533,6 +4778,9 b' msgstr ""' | |||
|
4533 | 4778 | msgid "email addresses of copy recipients" |
|
4534 | 4779 | msgstr "" |
|
4535 | 4780 | |
|
4781 | msgid "ask for confirmation before sending" | |
|
4782 | msgstr "" | |
|
4783 | ||
|
4536 | 4784 | msgid "add diffstat output to messages" |
|
4537 | 4785 | msgstr "" |
|
4538 | 4786 | |
@@ -4804,6 +5052,12 b' msgstr ""' | |||
|
4804 | 5052 | msgid "cannot use both keepbranches and extrafn" |
|
4805 | 5053 | msgstr "" |
|
4806 | 5054 | |
|
5055 | msgid "rebasing" | |
|
5056 | msgstr "" | |
|
5057 | ||
|
5058 | msgid "changesets" | |
|
5059 | msgstr "ändringar" | |
|
5060 | ||
|
4807 | 5061 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" |
|
4808 | 5062 | msgstr "fixa olösta konflikter med hg resolve, kör sedan hg rebase --continue" |
|
4809 | 5063 | |
@@ -4954,9 +5208,6 b' msgstr ""' | |||
|
4954 | 5208 | " Om filer inte anges, kommer alla ändringar som :hg:`status`\n" |
|
4955 | 5209 | " rapporterar att arkiveras." |
|
4956 | 5210 | |
|
4957 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
|
4958 | msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." | |
|
4959 | ||
|
4960 | 5211 | msgid "" |
|
4961 | 5212 | " You will be prompted for whether to record changes to each\n" |
|
4962 | 5213 | " modified file, and for files with multiple changes, for each\n" |
@@ -4998,9 +5249,6 b' msgstr ""' | |||
|
4998 | 5249 | msgid "no changes to record\n" |
|
4999 | 5250 | msgstr "" |
|
5000 | 5251 | |
|
5001 | msgid "patch failed to apply" | |
|
5002 | msgstr "" | |
|
5003 | ||
|
5004 | 5252 | msgid "hg record [OPTION]... [FILE]..." |
|
5005 | 5253 | msgstr "" |
|
5006 | 5254 | |
@@ -5076,9 +5324,6 b' msgstr ""' | |||
|
5076 | 5324 | msgid "not linkable: %s\n" |
|
5077 | 5325 | msgstr "inte länkbar: %s\n" |
|
5078 | 5326 | |
|
5079 | msgid " files" | |
|
5080 | msgstr " filer" | |
|
5081 | ||
|
5082 | 5327 | msgid "pruning" |
|
5083 | 5328 | msgstr "putsar" |
|
5084 | 5329 | |
@@ -5162,15 +5407,16 b' msgid ""' | |||
|
5162 | 5407 | msgstr "" |
|
5163 | 5408 | |
|
5164 | 5409 | msgid "" |
|
5165 | " NOTE: using rollback or extensions that destroy/modify history\n" | |
|
5166 | " (mq, rebase, etc.) can cause considerable confusion with shared\n" | |
|
5167 | " clones. In particular, if two shared clones are both updated to\n" | |
|
5168 | " the same changeset, and one of them destroys that changeset with\n" | |
|
5169 | " rollback, the other clone will suddenly stop working: all\n" | |
|
5170 | " operations will fail with \"abort: working directory has unknown\n" | |
|
5171 | " parent\". The only known workaround is to use debugsetparents on\n" | |
|
5172 | " the broken clone to reset it to a changeset that still exists\n" | |
|
5173 | " (e.g. tip).\n" | |
|
5410 | " .. note::\n" | |
|
5411 | " using rollback or extensions that destroy/modify history (mq,\n" | |
|
5412 | " rebase, etc.) can cause considerable confusion with shared\n" | |
|
5413 | " clones. In particular, if two shared clones are both updated to\n" | |
|
5414 | " the same changeset, and one of them destroys that changeset\n" | |
|
5415 | " with rollback, the other clone will suddenly stop working: all\n" | |
|
5416 | " operations will fail with \"abort: working directory has unknown\n" | |
|
5417 | " parent\". The only known workaround is to use debugsetparents on\n" | |
|
5418 | " the broken clone to reset it to a changeset that still exists\n" | |
|
5419 | " (e.g. tip).\n" | |
|
5174 | 5420 | " " |
|
5175 | 5421 | msgstr "" |
|
5176 | 5422 | |
@@ -5221,7 +5467,7 b' msgstr ""' | |||
|
5221 | 5467 | msgid "%s: empty changeset" |
|
5222 | 5468 | msgstr "" |
|
5223 | 5469 | |
|
5224 |
msgid " |
|
|
5470 | msgid "fix up the merge and run hg transplant --continue" | |
|
5225 | 5471 | msgstr "" |
|
5226 | 5472 | |
|
5227 | 5473 | #, python-format |
@@ -5334,6 +5580,21 b' msgstr ""' | |||
|
5334 | 5580 | msgid "outstanding local changes" |
|
5335 | 5581 | msgstr "" |
|
5336 | 5582 | |
|
5583 | msgid "" | |
|
5584 | "\n" | |
|
5585 | "Added by the transplant extension:" | |
|
5586 | msgstr "" | |
|
5587 | "\n" | |
|
5588 | "Tillagda av transplant-utökningen:" | |
|
5589 | ||
|
5590 | msgid "" | |
|
5591 | "``transplanted(set)``\n" | |
|
5592 | " Transplanted changesets in set.\n" | |
|
5593 | msgstr "" | |
|
5594 | ||
|
5595 | msgid "Specifying Revision Sets" | |
|
5596 | msgstr "Ange Revisionsset" | |
|
5597 | ||
|
5337 | 5598 | msgid "pull patches from REPO" |
|
5338 | 5599 | msgstr "" |
|
5339 | 5600 | |
@@ -5566,18 +5827,6 b' msgstr ""' | |||
|
5566 | 5827 | msgid "integrity check failed on %s:%d" |
|
5567 | 5828 | msgstr "" |
|
5568 | 5829 | |
|
5569 | #, python-format | |
|
5570 | msgid "%s: not a Mercurial bundle file" | |
|
5571 | msgstr "" | |
|
5572 | ||
|
5573 | #, python-format | |
|
5574 | msgid "%s: unknown bundle version" | |
|
5575 | msgstr "" | |
|
5576 | ||
|
5577 | #, python-format | |
|
5578 | msgid "%s: unknown bundle compression type" | |
|
5579 | msgstr "" | |
|
5580 | ||
|
5581 | 5830 | msgid "cannot create new bundle repository" |
|
5582 | 5831 | msgstr "" |
|
5583 | 5832 | |
@@ -5585,6 +5834,14 b' msgstr ""' | |||
|
5585 | 5834 | msgid "premature EOF reading chunk (got %d bytes, expected %d)" |
|
5586 | 5835 | msgstr "" |
|
5587 | 5836 | |
|
5837 | #, python-format | |
|
5838 | msgid "%s: not a Mercurial bundle" | |
|
5839 | msgstr "%s: inte en Mercurial-buntfil" | |
|
5840 | ||
|
5841 | #, python-format | |
|
5842 | msgid "%s: unknown bundle version %s" | |
|
5843 | msgstr "%s: okänd buntversion %s" | |
|
5844 | ||
|
5588 | 5845 | msgid "empty username" |
|
5589 | 5846 | msgstr "tomt användarnamn" |
|
5590 | 5847 | |
@@ -5609,9 +5866,6 b' msgstr ""' | |||
|
5609 | 5866 | msgid "limit must be positive" |
|
5610 | 5867 | msgstr "" |
|
5611 | 5868 | |
|
5612 | msgid "too many revisions specified" | |
|
5613 | msgstr "för många revisioner angivna" | |
|
5614 | ||
|
5615 | 5869 | #, python-format |
|
5616 | 5870 | msgid "invalid format spec '%%%s' in output filename" |
|
5617 | 5871 | msgstr "" |
@@ -5768,6 +6022,10 b' msgstr ""' | |||
|
5768 | 6022 | msgid "can only follow copies/renames for explicit filenames" |
|
5769 | 6023 | msgstr "" |
|
5770 | 6024 | |
|
6025 | #, python-format | |
|
6026 | msgid "skipping missing subrepository: %s\n" | |
|
6027 | msgstr "" | |
|
6028 | ||
|
5771 | 6029 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
|
5772 | 6030 | msgstr "" |
|
5773 | 6031 | |
@@ -5928,13 +6186,6 b' msgstr ""' | |||
|
5928 | 6186 | " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" |
|
5929 | 6187 | " om resultatet antagligen inte kommer att vara användbart." |
|
5930 | 6188 | |
|
5931 | msgid "" | |
|
5932 | " Returns 0 on success.\n" | |
|
5933 | " " | |
|
5934 | msgstr "" | |
|
5935 | " Returnerar 0 om kommandot lyckades.\n" | |
|
5936 | " " | |
|
5937 | ||
|
5938 | 6189 | msgid "at least one filename or pattern is required" |
|
5939 | 6190 | msgstr "" |
|
5940 | 6191 | |
@@ -6010,32 +6261,50 b' msgid "reverse effect of earlier changes' | |||
|
6010 | 6261 | msgstr "omvänd effekten från en tidigare ändring" |
|
6011 | 6262 | |
|
6012 | 6263 | msgid "" |
|
6013 | " Commit the backed out changes as a new changeset. The new\n" | |
|
6014 |
" changeset i |
|
|
6015 | msgstr "" | |
|
6016 | " Arkivera de återkallade ändringarna som en ny ändring. Den nya\n" | |
|
6017 | " ändringen är ett barn till den återkallade ändringen." | |
|
6018 | ||
|
6019 | msgid "" | |
|
6020 | " If you backout a changeset other than the tip, a new head is\n" | |
|
6021 | " created. This head will be the new tip and you should merge this\n" | |
|
6022 | " backout changeset with another head." | |
|
6023 | msgstr "" | |
|
6024 | " Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n" | |
|
6025 | " Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n" | |
|
6026 | " ett annat huvud." | |
|
6027 | ||
|
6028 | msgid "" | |
|
6264 | " The backout command merges the reverse effect of the reverted\n" | |
|
6265 | " changeset into the working directory." | |
|
6266 | msgstr "" | |
|
6267 | " Kommandot backout sammanfogar den omvända effekven av den återkallade\n" | |
|
6268 | " ändringen i arbetskatalogen." | |
|
6269 | ||
|
6270 | msgid "" | |
|
6271 | " With the --merge option, it first commits the reverted changes\n" | |
|
6272 | " as a new changeset. This new changeset is a child of the reverted\n" | |
|
6273 | " changeset.\n" | |
|
6029 | 6274 | " The --merge option remembers the parent of the working directory\n" |
|
6030 | 6275 | " before starting the backout, then merges the new head with that\n" |
|
6031 | " changeset afterwards. This saves you from doing the merge by hand.\n" | |
|
6032 | " The result of this merge is not committed, as with a normal merge." | |
|
6033 | msgstr "" | |
|
6276 | " changeset afterwards.\n" | |
|
6277 | " This will result in an explicit merge in the history." | |
|
6278 | msgstr "" | |
|
6279 | " Med flaggan --merge arkiveras först de återkallade ändringarna som en\n" | |
|
6280 | " ny ändring. Denna ny ändring är en ättling till den återkallade\n" | |
|
6281 | " ändringen.\n" | |
|
6034 | 6282 | " Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n" |
|
6035 | 6283 | " återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n" |
|
6036 | " ändringen efteråt. Detta gör att du inte behöver göra sammanfogningen\n" | |
|
6037 | " manuellt. Resultatet av sammanfogningen arkiveras inte, precis som en\n" | |
|
6038 | " vanlig sammanfogning." | |
|
6284 | " ändringen efteråt.\n" | |
|
6285 | " Detta resulterar i en explicit sammanfogning i historiken" | |
|
6286 | ||
|
6287 | msgid "" | |
|
6288 | " If you backout a changeset other than the original parent of the\n" | |
|
6289 | " working directory, the result of this merge is not committed,\n" | |
|
6290 | " as with a normal merge. Otherwise, no merge is needed and the\n" | |
|
6291 | " commit is automatic." | |
|
6292 | msgstr "" | |
|
6293 | " Om du tar tillbaka en annan ändring än originalföräldern till\n" | |
|
6294 | " arbetskatalogen, så arkiveras inte resultatet av sammanfogningen, som\n" | |
|
6295 | " vid en normal sammanfogning. Annars behövs ingen sammanfogning, och\n" | |
|
6296 | " arkiveringen är automatisk." | |
|
6297 | ||
|
6298 | msgid "" | |
|
6299 | " Note that the default behavior (without --merge) has changed in\n" | |
|
6300 | " version 1.7. To restore the previous default behavior, use\n" | |
|
6301 | " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" | |
|
6302 | " the ongoing merge." | |
|
6303 | msgstr "" | |
|
6304 | " Notera att standardförfarandet (utan --merge) har ändrats i version\n" | |
|
6305 | " 1.7. För att återställa det gamla standardförfarandet, använd :hg:`\n" | |
|
6306 | " backout --merge` och sedan :hg:`update --clean .` för att bli av med\n" | |
|
6307 | " den pågående sammanfogningen." | |
|
6039 | 6308 | |
|
6040 | 6309 | msgid "please specify just one revision" |
|
6041 | 6310 | msgstr "specificera bara en revision" |
@@ -6067,12 +6336,6 b' msgstr "\xc3\xa4ndringen %s \xc3\xa5terkallar \xc3\xa4ndringen %s\\n"' | |||
|
6067 | 6336 | msgid "merging with changeset %s\n" |
|
6068 | 6337 | msgstr "sammanfogar med ändring %s\n" |
|
6069 | 6338 | |
|
6070 | msgid "the backout changeset is a new head - do not forget to merge\n" | |
|
6071 | msgstr "återkallningsändringen är ett nytt huvud - glöm inte att sammanfoga\n" | |
|
6072 | ||
|
6073 | msgid "(use \"backout --merge\" if you want to auto-merge)\n" | |
|
6074 | msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n" | |
|
6075 | ||
|
6076 | 6339 | msgid "subdivision search of changesets" |
|
6077 | 6340 | msgstr "genomsökning av ändringar med halveringsmetoden" |
|
6078 | 6341 | |
@@ -6120,6 +6383,12 b' msgstr "Den f\xc3\xb6rsta bra revisionen \xc3\xa4r:\\n"' | |||
|
6120 | 6383 | msgid "The first bad revision is:\n" |
|
6121 | 6384 | msgstr "Den första dåliga revisionen är:\n" |
|
6122 | 6385 | |
|
6386 | #, python-format | |
|
6387 | msgid "" | |
|
6388 | "Not all ancestors of this changeset have been checked.\n" | |
|
6389 | "To check the other ancestors, start from the common ancestor, %s.\n" | |
|
6390 | msgstr "" | |
|
6391 | ||
|
6123 | 6392 | msgid "Due to skipped revisions, the first good revision could be any of:\n" |
|
6124 | 6393 | msgstr "" |
|
6125 | 6394 | "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" |
@@ -6490,11 +6759,15 b' msgstr ""' | |||
|
6490 | 6759 | " eller flaggorna -I/-X." |
|
6491 | 6760 | |
|
6492 | 6761 | msgid "" |
|
6493 |
" If no commit message is specified, |
|
|
6494 | " started to prompt you for a message." | |
|
6495 | msgstr "" | |
|
6496 | " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" | |
|
6497 | " att startas och fråga om meddelandet." | |
|
6762 | " If no commit message is specified, Mercurial starts your\n" | |
|
6763 | " configured editor where you can enter a message. In case your\n" | |
|
6764 | " commit fails, you will find a backup of your message in\n" | |
|
6765 | " ``.hg/last-message.txt``." | |
|
6766 | msgstr "" | |
|
6767 | " Om inget arkiveringsmeddelande anges, startar Mercurial din\n" | |
|
6768 | " konfigurerade editor där du kan skriva ett meddelande. Om din\n" | |
|
6769 | " arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n" | |
|
6770 | " meddelande i ``.hg/last-message.txt``." | |
|
6498 | 6771 | |
|
6499 | 6772 | msgid "" |
|
6500 | 6773 | " Returns 0 on success, 1 if nothing changed.\n" |
@@ -6600,7 +6873,7 b' msgstr ""' | |||
|
6600 | 6873 | |
|
6601 | 6874 | msgid "" |
|
6602 | 6875 | " All string valued-elements are either strictly alphanumeric, or must\n" |
|
6603 | " be enclosed in double quotes (\"...\"), with \"\" as escape character." | |
|
6876 | " be enclosed in double quotes (\"...\"), with \"\\\" as escape character." | |
|
6604 | 6877 | msgstr "" |
|
6605 | 6878 | |
|
6606 | 6879 | msgid "" |
@@ -6759,7 +7032,8 b' msgstr ""' | |||
|
6759 | 7032 | msgid " (check that your locale is properly set)\n" |
|
6760 | 7033 | msgstr "" |
|
6761 | 7034 | |
|
6762 | msgid "Checking extensions...\n" | |
|
7035 | #, python-format | |
|
7036 | msgid "Checking installed modules (%s)...\n" | |
|
6763 | 7037 | msgstr "" |
|
6764 | 7038 | |
|
6765 | 7039 | msgid " One or more extensions could not be found" |
@@ -6788,7 +7062,7 b' msgstr ""' | |||
|
6788 | 7062 | |
|
6789 | 7063 | msgid "" |
|
6790 | 7064 | " (Current patch tool may be incompatible with patch, or misconfigured. " |
|
6791 |
"Please check your |
|
|
7065 | "Please check your configuration file)\n" | |
|
6792 | 7066 | msgstr "" |
|
6793 | 7067 | |
|
6794 | 7068 | msgid "" |
@@ -6802,7 +7076,7 b' msgstr ""' | |||
|
6802 | 7076 | msgid " No commit editor set and can't find vi in PATH\n" |
|
6803 | 7077 | msgstr "" |
|
6804 | 7078 | |
|
6805 |
msgid " (specify a commit editor in your |
|
|
7079 | msgid " (specify a commit editor in your configuration file)\n" | |
|
6806 | 7080 | msgstr "" |
|
6807 | 7081 | |
|
6808 | 7082 | #, python-format |
@@ -6812,7 +7086,7 b' msgstr ""' | |||
|
6812 | 7086 | msgid "Checking username...\n" |
|
6813 | 7087 | msgstr "" |
|
6814 | 7088 | |
|
6815 |
msgid " (specify a username in your |
|
|
7089 | msgid " (specify a username in your configuration file)\n" | |
|
6816 | 7090 | msgstr "" |
|
6817 | 7091 | |
|
6818 | 7092 | msgid "No problems detected\n" |
@@ -6846,13 +7120,15 b' msgid " Differences between files are' | |||
|
6846 | 7120 | msgstr " Skillnaderna mellan filerna visas i unified diff-format." |
|
6847 | 7121 | |
|
6848 | 7122 | msgid "" |
|
6849 | " NOTE: diff may generate unexpected results for merges, as it will\n" | |
|
6850 | " default to comparing against the working directory's first parent\n" | |
|
6851 | " changeset if no revisions are specified." | |
|
6852 | msgstr "" | |
|
6853 | " NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n" | |
|
6854 | " eftersom den som standard kommer att jämföra mot arbetskatalogens\n" | |
|
6855 | " tidigare ändring om ingen revision anges." | |
|
7123 | " .. note::\n" | |
|
7124 | " diff may generate unexpected results for merges, as it will\n" | |
|
7125 | " default to comparing against the working directory's first\n" | |
|
7126 | " parent changeset if no revisions are specified." | |
|
7127 | msgstr "" | |
|
7128 | " .. note::\n" | |
|
7129 | " diff kan generera oväntade resultat för sammanfogningar eftersom\n" | |
|
7130 | " den som standard kommer att jämföra mot arbetskatalogens tidigare\n" | |
|
7131 | " ändring om ingen revision anges." | |
|
6856 | 7132 | |
|
6857 | 7133 | msgid "" |
|
6858 | 7134 | " Alternatively you can specify -c/--change with a revision to see\n" |
@@ -6893,13 +7169,14 b' msgstr ""' | |||
|
6893 | 7169 | " arkiveringskommentar." |
|
6894 | 7170 | |
|
6895 | 7171 | msgid "" |
|
6896 | " NOTE: export may generate unexpected diff output for merge\n" | |
|
6897 | " changesets, as it will compare the merge changeset against its\n" | |
|
6898 | " first parent only." | |
|
6899 | msgstr "" | |
|
6900 | " NOTERA: export kan generera oväntade resultat för sammanfogningar,\n" | |
|
6901 | " eftersom den som standard bara kommer att jämföra mot den första\n" | |
|
6902 | " föräldern." | |
|
7172 | " .. note::\n" | |
|
7173 | " export may generate unexpected diff output for merge\n" | |
|
7174 | " changesets, as it will compare the merge changeset against its\n" | |
|
7175 | " first parent only." | |
|
7176 | msgstr "" | |
|
7177 | " .. note::\n" | |
|
7178 | " export kan generera oväntade resultat för sammanfogningar, eftersom\n" | |
|
7179 | " den som standard bara kommer att jämföra mot den första föräldern." | |
|
6903 | 7180 | |
|
6904 | 7181 | msgid "" |
|
6905 | 7182 | " Output may be to a file, in which case the name of the file is\n" |
@@ -6910,20 +7187,20 b' msgstr ""' | |||
|
6910 | 7187 | |
|
6911 | 7188 | msgid "" |
|
6912 | 7189 | " :``%%``: literal \"%\" character\n" |
|
6913 |
" :``%H``: changeset hash (40 |
|
|
7190 | " :``%H``: changeset hash (40 hexadecimal digits)\n" | |
|
6914 | 7191 | " :``%N``: number of patches being generated\n" |
|
6915 | 7192 | " :``%R``: changeset revision number\n" |
|
6916 | 7193 | " :``%b``: basename of the exporting repository\n" |
|
6917 |
" :``%h``: short-form changeset hash (12 |
|
|
7194 | " :``%h``: short-form changeset hash (12 hexadecimal digits)\n" | |
|
6918 | 7195 | " :``%n``: zero-padded sequence number, starting at 1\n" |
|
6919 | 7196 | " :``%r``: zero-padded changeset revision number" |
|
6920 | 7197 | msgstr "" |
|
6921 | 7198 | " :``%%``: ett \"%\"-tecken\n" |
|
6922 |
" :``%H``: ändringshash (40 hexadecimala |
|
|
7199 | " :``%H``: ändringshash (40 hexadecimala siffror)\n" | |
|
6923 | 7200 | " :``%N``: antal genererade patchar\n" |
|
6924 | 7201 | " :``%R``: ändringens revisionsnummer\n" |
|
6925 | 7202 | " :``%b``: basnamn för det exporterande arkivet\n" |
|
6926 |
" :``%h``: kort ändringshash (12 hexadecimala |
|
|
7203 | " :``%h``: kort ändringshash (12 hexadecimala siffror)\n" | |
|
6927 | 7204 | " :``%n``: nollpaddat sekvensnummer, börjar med 1\n" |
|
6928 | 7205 | " :``%r``: nollpaddat ändringsrevisionsnummer" |
|
6929 | 7206 | |
@@ -7142,6 +7419,14 b' msgid "(no help text available)"' | |||
|
7142 | 7419 | msgstr "(ingen hjälptext tillgänglig)" |
|
7143 | 7420 | |
|
7144 | 7421 | #, python-format |
|
7422 | msgid "shell alias for::" | |
|
7423 | msgstr "skal-alias för::" | |
|
7424 | ||
|
7425 | #, python-format | |
|
7426 | msgid " %s" | |
|
7427 | msgstr " %s" | |
|
7428 | ||
|
7429 | #, python-format | |
|
7145 | 7430 | msgid "alias for: hg %s" |
|
7146 | 7431 | msgstr "alias för: hg %s" |
|
7147 | 7432 | |
@@ -7331,6 +7616,9 b' msgstr ""' | |||
|
7331 | 7616 | " Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" |
|
7332 | 7617 | " " |
|
7333 | 7618 | |
|
7619 | msgid "cannot combine --bundle and --subrepos" | |
|
7620 | msgstr "" | |
|
7621 | ||
|
7334 | 7622 | msgid "create a new repository in the given directory" |
|
7335 | 7623 | msgstr "skapa ett nytt arkiv i den angivna katalogen" |
|
7336 | 7624 | |
@@ -7434,15 +7722,17 b' msgstr ""' | |||
|
7434 | 7722 | " visas listan med ändrade filer och fullständigt arkiveringsmeddelande." |
|
7435 | 7723 | |
|
7436 | 7724 | msgid "" |
|
7437 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
|
7438 | " changesets, as it will only compare the merge changeset against\n" | |
|
7439 | " its first parent. Also, only files different from BOTH parents\n" | |
|
7440 | " will appear in files:." | |
|
7441 | msgstr "" | |
|
7442 | " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" | |
|
7443 | " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" | |
|
7444 | " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" | |
|
7445 | " föräldrarna att visas i filer:." | |
|
7725 | " .. note::\n" | |
|
7726 | " log -p/--patch may generate unexpected diff output for merge\n" | |
|
7727 | " changesets, as it will only compare the merge changeset against\n" | |
|
7728 | " its first parent. Also, only files different from BOTH parents\n" | |
|
7729 | " will appear in files:." | |
|
7730 | msgstr "" | |
|
7731 | " .. note::\n" | |
|
7732 | " log -p/--patch kan generera oväntad diff-utmatning för\n" | |
|
7733 | " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot\n" | |
|
7734 | " den första förälder. Dessutom kommer bara filer som skiljer sig från\n" | |
|
7735 | " BÅDA föräldrarna att visas i filer:." | |
|
7446 | 7736 | |
|
7447 | 7737 | msgid "output the current or given revision of the project manifest" |
|
7448 | 7738 | msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" |
@@ -7485,6 +7775,15 b' msgstr ""' | |||
|
7485 | 7775 | " föräldrar." |
|
7486 | 7776 | |
|
7487 | 7777 | msgid "" |
|
7778 | " ``--tool`` can be used to specify the merge tool used for file\n" | |
|
7779 | " merges. It overrides the HGMERGE environment variable and your\n" | |
|
7780 | " configuration files." | |
|
7781 | msgstr "" | |
|
7782 | " ``--tool`` kan användas för att ange sammanfogningsverktyg att\n" | |
|
7783 | " använda för filsammanfogningar. Det har högre prioritet än\n" | |
|
7784 | " miljövariabeln HGMERGE och dina konfigurationsfiler." | |
|
7785 | ||
|
7786 | msgid "" | |
|
7488 | 7787 | " If no revision is specified, the working directory's parent is a\n" |
|
7489 | 7788 | " head revision, and the current branch contains exactly one other\n" |
|
7490 | 7789 | " head, the other head is merged with by default. Otherwise, an\n" |
@@ -7495,6 +7794,9 b' msgstr ""' | |||
|
7495 | 7794 | " det andra huvudet som standard. Om inte, måste en explicit revision\n" |
|
7496 | 7795 | " anges." |
|
7497 | 7796 | |
|
7797 | msgid " :hg:`resolve` must be used to resolve unresolved files." | |
|
7798 | msgstr " :hg:`resolve` måste användas för att lösa olästa filer." | |
|
7799 | ||
|
7498 | 7800 | msgid "" |
|
7499 | 7801 | " To undo an uncommitted merge, use :hg:`update --clean .` which\n" |
|
7500 | 7802 | " will check out a clean copy of the original merge parent, losing\n" |
@@ -7596,12 +7898,13 b' msgstr ""' | |||
|
7596 | 7898 | " definitionen för alla tillgängliga namn." |
|
7597 | 7899 | |
|
7598 | 7900 | msgid "" |
|
7599 | " Path names are defined in the [paths] section of\n" | |
|
7600 |
" ``/etc/mercurial/ |
|
|
7901 | " Path names are defined in the [paths] section of your\n" | |
|
7902 | " configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n" | |
|
7601 | 7903 | " repository, ``.hg/hgrc`` is used, too." |
|
7602 | 7904 | msgstr "" |
|
7603 |
" Sökvägar definieras i sektionen [paths] i |
|
|
7604 |
" `` |
|
|
7905 | " Sökvägar definieras i sektionen [paths] i din konfigurationsfil och i\n" | |
|
7906 | " ``/etc/mercurial/hgrc``. Om det körs i ett arkiv, så används\n" | |
|
7907 | " ``.hg/hgrc`` också." | |
|
7605 | 7908 | |
|
7606 | 7909 | msgid "" |
|
7607 | 7910 | " The path names ``default`` and ``default-push`` have a special\n" |
@@ -7675,6 +7978,13 b' msgstr ""' | |||
|
7675 | 7978 | " filer.\n" |
|
7676 | 7979 | " " |
|
7677 | 7980 | |
|
7981 | msgid "" | |
|
7982 | "other repository doesn't support revision lookup, so a rev cannot be " | |
|
7983 | "specified." | |
|
7984 | msgstr "" | |
|
7985 | "det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " | |
|
7986 | "anges." | |
|
7987 | ||
|
7678 | 7988 | msgid "push changes to the specified destination" |
|
7679 | 7989 | msgstr "tryck ändringar till den specificerade destinationen" |
|
7680 | 7990 | |
@@ -7830,17 +8140,17 b' msgid "not removing %s: file is untracke' | |||
|
7830 | 8140 | msgstr "raderar inte %s: filen är inte hanterad\n" |
|
7831 | 8141 | |
|
7832 | 8142 | #, python-format |
|
7833 |
msgid "not removing %s: file |
|
|
7834 |
msgstr "raderar inte %s: filen |
|
|
7835 | ||
|
7836 | msgid "still exists" | |
|
7837 | msgstr "existerar fortfarande" | |
|
7838 | ||
|
7839 | msgid "is modified" | |
|
7840 | msgstr "är modifierad" | |
|
7841 | ||
|
7842 | msgid "has been marked for add" | |
|
7843 | msgstr "har markerats för addering" | |
|
8143 | msgid "not removing %s: file still exists (use -f to force removal)\n" | |
|
8144 | msgstr "raderar inte %s: filen finns fortfarande (använd -f för att tvinga)\n" | |
|
8145 | ||
|
8146 | #, python-format | |
|
8147 | msgid "not removing %s: file is modified (use -f to force removal)\n" | |
|
8148 | msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n" | |
|
8149 | ||
|
8150 | #, python-format | |
|
8151 | msgid "" | |
|
8152 | "not removing %s: file has been marked for add (use -f to force removal)\n" | |
|
8153 | msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n" | |
|
7844 | 8154 | |
|
7845 | 8155 | msgid "rename files; equivalent of copy + remove" |
|
7846 | 8156 | msgstr "döp om filer; likvärdig med kopiering + radering" |
@@ -7862,58 +8172,54 b' msgstr ""' | |||
|
7862 | 8172 | " namnbyte innan det, se :hg:`revert`.\n" |
|
7863 | 8173 | " " |
|
7864 | 8174 | |
|
7865 | msgid "various operations to help finish a merge" | |
|
7866 | msgstr "diverse operationer för att slutföra sammanfogningar" | |
|
7867 | ||
|
7868 | msgid "" | |
|
7869 | " This command includes several actions that are often useful while\n" | |
|
7870 | " performing a merge, after running ``merge`` but before running\n" | |
|
7871 | " ``commit``. (It is only meaningful if your working directory has\n" | |
|
7872 | " two parents.) It is most relevant for merges with unresolved\n" | |
|
7873 | " conflicts, which are typically a result of non-interactive merging with\n" | |
|
7874 | " ``internal:merge`` or a command-line merge tool like ``diff3``." | |
|
7875 | msgstr "" | |
|
7876 | " Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n" | |
|
7877 | " en sammanfogning utförs, efter att ``merge`` körts men innan\n" | |
|
7878 | " ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n" | |
|
7879 | " föräldrar.) Det är mest relevant för sammanfogningar med olösta\n" | |
|
7880 | " konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n" | |
|
7881 | " med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``." | |
|
7882 | ||
|
7883 | msgid " The available actions are:" | |
|
7884 | msgstr " Tillgängliga handlingar är:" | |
|
7885 | ||
|
7886 | msgid "" | |
|
7887 | " 1) list files that were merged with conflicts (U, for unresolved)\n" | |
|
7888 | " and without conflicts (R, for resolved): ``hg resolve -l``\n" | |
|
7889 | " (this is like ``status`` for merges)\n" | |
|
7890 | " 2) record that you have resolved conflicts in certain files:\n" | |
|
7891 | " ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" | |
|
7892 | " 3) forget that you have resolved conflicts in certain files:\n" | |
|
7893 | " ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" | |
|
7894 | " 4) discard your current attempt(s) at resolving conflicts and\n" | |
|
7895 | " restart the merge from scratch: ``hg resolve file...``\n" | |
|
7896 | " (or ``-a`` for all unresolved files)" | |
|
7897 | msgstr "" | |
|
7898 | " 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n" | |
|
7899 | " utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n" | |
|
7900 | " ``status`` för sammanfogningar)\n" | |
|
7901 | " 2) lagra att du har löst konflikter i vissa filer:\n" | |
|
7902 | " ``hg resolve -m [fil ...]`` (standard: markera alla olösta filer)\n" | |
|
7903 | " 3) glöm att du har löst konflikter i vissa filer\n" | |
|
7904 | " ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n" | |
|
7905 | " 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n" | |
|
7906 | " sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n" | |
|
7907 | " för alla olösta filer)" | |
|
7908 | ||
|
7909 | msgid "" | |
|
7910 | " Note that Mercurial will not let you commit files with unresolved merge\n" | |
|
7911 | " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" | |
|
7912 | " after a conflicting merge." | |
|
8175 | msgid "redo merges or set/view the merge status of files" | |
|
8176 | msgstr "" | |
|
8177 | ||
|
8178 | msgid "" | |
|
8179 | " Merges with unresolved conflicts are often the result of\n" | |
|
8180 | " non-interactive merging using the ``internal:merge`` configuration\n" | |
|
8181 | " setting, or a command-line merge tool like ``diff3``. The resolve\n" | |
|
8182 | " command is used to manage the files involved in a merge, after\n" | |
|
8183 | " :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" | |
|
8184 | " working directory must have two parents)." | |
|
8185 | msgstr "" | |
|
8186 | ||
|
8187 | msgid " The resolve command can be used in the following ways:" | |
|
8188 | msgstr "" | |
|
8189 | ||
|
8190 | msgid "" | |
|
8191 | " - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n" | |
|
8192 | " files, discarding any previous merge attempts. Re-merging is not\n" | |
|
8193 | " performed for files already marked as resolved. Use ``--all/-a``\n" | |
|
8194 | " to selects all unresolved files. ``--tool`` can be used to specify\n" | |
|
8195 | " the merge tool used for the given files. It overrides the HGMERGE\n" | |
|
8196 | " environment variable and your configuration files." | |
|
8197 | msgstr "" | |
|
8198 | ||
|
8199 | msgid "" | |
|
8200 | " - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n" | |
|
8201 | " (e.g. after having manually fixed-up the files). The default is\n" | |
|
8202 | " to mark all unresolved files." | |
|
8203 | msgstr "" | |
|
8204 | ||
|
8205 | msgid "" | |
|
8206 | " - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n" | |
|
8207 | " default is to mark all resolved files." | |
|
8208 | msgstr "" | |
|
8209 | ||
|
8210 | msgid "" | |
|
8211 | " - :hg:`resolve -l`: list files which had or still have conflicts.\n" | |
|
8212 | " In the printed list, ``U`` = unresolved and ``R`` = resolved." | |
|
8213 | msgstr "" | |
|
8214 | ||
|
8215 | msgid "" | |
|
8216 | " Note that Mercurial will not let you commit files with unresolved\n" | |
|
8217 | " merge conflicts. You must use :hg:`resolve -m ...` before you can\n" | |
|
8218 | " commit after a conflicting merge." | |
|
7913 | 8219 | msgstr "" |
|
7914 | 8220 | " Notera att Mercurial inte låter dig arkivera filer med olösta\n" |
|
7915 |
" konflikter från sammanfogningar. Du måste använda |
|
|
7916 | " innan du kan arkivera efter en sammanfogning med konflikter" | |
|
8221 | " konflikter från sammanfogningar. Du måste använda :hg:`resolve -m ...`\n" | |
|
8222 | " innan du kan arkivera efter en sammanfogning med konflikter." | |
|
7917 | 8223 | |
|
7918 | 8224 | msgid "" |
|
7919 | 8225 | " Returns 0 on success, 1 if any files fail a resolve attempt.\n" |
@@ -7937,19 +8243,20 b' msgid "restore individual files or direc' | |||
|
7937 | 8243 | msgstr "återställ filer eller kataloger till ett tidigare tillstånd" |
|
7938 | 8244 | |
|
7939 | 8245 | msgid "" |
|
7940 | " NOTE: This command is most likely not what you are looking for. revert\n" | |
|
7941 | " will partially overwrite content in the working directory without " | |
|
7942 | "changing\n" | |
|
7943 | " the working directory parents. Use :hg:`update -r rev` to check out " | |
|
7944 | "earlier\n" | |
|
7945 |
" |
|
|
7946 |
" |
|
|
7947 | msgstr "" | |
|
7948 | " NOTERA: Det här kommandot är troligtvis inte det du letar efter.\n" | |
|
7949 | " revert kommer att delvis skriva över innehåll i arbetskatalogen utan\n" | |
|
7950 | " att ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för\n" | |
|
7951 | " att hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" | |
|
7952 | " ångra en sammanfogning som har lagt till fler föräldrar." | |
|
8246 | " .. note::\n" | |
|
8247 | " This command is most likely not what you are looking for.\n" | |
|
8248 | " Revert will partially overwrite content in the working\n" | |
|
8249 | " directory without changing the working directory parents. Use\n" | |
|
8250 | " :hg:`update -r rev` to check out earlier revisions, or\n" | |
|
8251 | " :hg:`update --clean .` to undo a merge which has added another\n" | |
|
8252 | " parent." | |
|
8253 | msgstr "" | |
|
8254 | " .. note::\n" | |
|
8255 | " Det här kommandot är troligtvis inte det du letar efter. Revert\n" | |
|
8256 | " kommer att delvis skriva över innehåll i arbetskatalogen utan att\n" | |
|
8257 | " ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n" | |
|
8258 | " hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" | |
|
8259 | " ångra en sammanfogning som har lagt till fler föräldrar." | |
|
7953 | 8260 | |
|
7954 | 8261 | msgid "" |
|
7955 | 8262 | " With no revision specified, revert the named files or directories\n" |
@@ -8153,6 +8460,9 b' msgstr ""' | |||
|
8153 | 8460 | " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" |
|
8154 | 8461 | " som portnummer; då visar servern det portnummer som används." |
|
8155 | 8462 | |
|
8463 | msgid "There is no Mercurial repository here (.hg not found)" | |
|
8464 | msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" | |
|
8465 | ||
|
8156 | 8466 | #, python-format |
|
8157 | 8467 | msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
|
8158 | 8468 | msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" |
@@ -8182,15 +8492,17 b' msgstr ""' | |||
|
8182 | 8492 | " inte bes om explicit med -u/--unknown eller -i/--ignored." |
|
8183 | 8493 | |
|
8184 | 8494 | msgid "" |
|
8185 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
8186 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
8187 | " report permission changes and diff only reports changes relative\n" | |
|
8188 | " to one merge parent." | |
|
8189 | msgstr "" | |
|
8190 | " NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n" | |
|
8191 | " en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" | |
|
8192 | " inte förändringar av tillstånd och diff rapporterar bara ändringar\n" | |
|
8193 | " relativt till en förälder vid sammanfogningar." | |
|
8495 | " .. note::\n" | |
|
8496 | " status may appear to disagree with diff if permissions have\n" | |
|
8497 | " changed or a merge has occurred. The standard diff format does\n" | |
|
8498 | " not report permission changes and diff only reports changes\n" | |
|
8499 | " relative to one merge parent." | |
|
8500 | msgstr "" | |
|
8501 | " .. note::\n" | |
|
8502 | " status kan verka osams med diff om tillstånd har ändrat eller en\n" | |
|
8503 | " sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" | |
|
8504 | " inte förändringar av tillstånd och diff rapporterar bara ändringar\n" | |
|
8505 | " relativt till en förälder vid sammanfogningar." | |
|
8194 | 8506 | |
|
8195 | 8507 | msgid "" |
|
8196 | 8508 | " If one revision is given, it is used as the base revision.\n" |
@@ -8460,17 +8772,20 b' msgstr "uppdatera arbetskatalogen (eller v\xc3\xa4xla mellan revisioner)"' | |||
|
8460 | 8772 | |
|
8461 | 8773 | msgid "" |
|
8462 | 8774 | " Update the repository's working directory to the specified\n" |
|
8775 | " changeset. If no changeset is specified, update to the tip of the\n" | |
|
8776 | " current named branch." | |
|
8777 | msgstr "" | |
|
8778 | " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n" | |
|
8779 | " ändring anes, så uppdateras till toppen på den nuvarande namngivna\n" | |
|
8780 | " grenen." | |
|
8781 | ||
|
8782 | msgid "" | |
|
8783 | " If the changeset is not a descendant of the working directory's\n" | |
|
8784 | " parent, the update is aborted. With the -c/--check option, the\n" | |
|
8785 | " working directory is checked for uncommitted changes; if none are\n" | |
|
8786 | " found, the working directory is updated to the specified\n" | |
|
8463 | 8787 | " changeset." |
|
8464 | msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen." | |
|
8465 | ||
|
8466 | msgid "" | |
|
8467 | " If no changeset is specified, attempt to update to the tip of the\n" | |
|
8468 | " current branch. If this changeset is a descendant of the working\n" | |
|
8469 | " directory's parent, update to it, otherwise abort." | |
|
8470 | msgstr "" | |
|
8471 | " Om ingen ändring anges, kommer ett försök att göras för att hämta ut\n" | |
|
8472 | " toppen på den nuvarande grenen. Om ändringen är en ättling till\n" | |
|
8473 | " arbetskatalogens föräldrar, uppdatera till det, annars avbryt." | |
|
8788 | msgstr "" | |
|
8474 | 8789 | |
|
8475 | 8790 | msgid "" |
|
8476 | 8791 | " The following rules apply when the working directory contains\n" |
@@ -8515,15 +8830,15 b' msgid ""' | |||
|
8515 | 8830 | " Use null as the changeset to remove the working directory (like\n" |
|
8516 | 8831 | " :hg:`clone -U`)." |
|
8517 | 8832 | msgstr "" |
|
8518 |
" Använd null som ändring för att radera arbetskatalogen (som |
|
|
8519 | " -U`)." | |
|
8520 | ||
|
8521 | msgid "" | |
|
8522 |
" If you want to update just one file to an older changeset, use |
|
|
8523 | "`revert`." | |
|
8524 | msgstr "" | |
|
8525 |
" Om du vill uppdatera bara en fil till en äldre ändring, använd |
|
|
8526 | "`revert`." | |
|
8833 | " Använd null som ändring för att radera arbetskatalogen (som\n" | |
|
8834 | " :hg:`clone -U`)." | |
|
8835 | ||
|
8836 | msgid "" | |
|
8837 | " If you want to update just one file to an older changeset, use\n" | |
|
8838 | " :hg:`revert`." | |
|
8839 | msgstr "" | |
|
8840 | " Om du vill uppdatera bara en fil till en äldre ändring, använd\n" | |
|
8841 | " :hg:`revert`." | |
|
8527 | 8842 | |
|
8528 | 8843 | msgid "cannot specify both -c/--check and -C/--clean" |
|
8529 | 8844 | msgstr "" |
@@ -8697,6 +9012,9 b' msgstr ""' | |||
|
8697 | 9012 | msgid "guess renamed files by similarity (0<=s<=100)" |
|
8698 | 9013 | msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" |
|
8699 | 9014 | |
|
9015 | msgid "recurse into subrepositories" | |
|
9016 | msgstr "gå in i underarkiv" | |
|
9017 | ||
|
8700 | 9018 | msgid "[OPTION]... [FILE]..." |
|
8701 | 9019 | msgstr "[FLAGGA]... [FIL]..." |
|
8702 | 9020 | |
@@ -8980,20 +9298,23 b' msgstr "s\xc3\xb6k filer enbart inom ett givet revisionsomr\xc3\xa5de"' | |||
|
8980 | 9298 | msgid "[OPTION]... PATTERN [FILE]..." |
|
8981 | 9299 | msgstr "[FLAGGA]... MÖNSTER [FIL]..." |
|
8982 | 9300 | |
|
8983 | msgid "show only heads which are descendants of REV" | |
|
8984 |
msgstr "visa bara huvuden som |
|
|
9301 | msgid "show only heads which are descendants of STARTREV" | |
|
9302 | msgstr "visa bara huvuden som är ättlingar till STARTREV" | |
|
9303 | ||
|
9304 | msgid "STARTREV" | |
|
9305 | msgstr "STARTREV" | |
|
8985 | 9306 | |
|
8986 | 9307 | msgid "show topological heads only" |
|
8987 | 9308 | msgstr "visa bara topologiska huvuden" |
|
8988 | 9309 | |
|
8989 |
msgid "show active branchheads only |
|
|
8990 |
msgstr "visa bara aktiva grenhuvuden |
|
|
9310 | msgid "show active branchheads only (DEPRECATED)" | |
|
9311 | msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)" | |
|
8991 | 9312 | |
|
8992 | 9313 | msgid "show normal and closed branch heads" |
|
8993 | 9314 | msgstr "visa normala och stängda grenhuvuden" |
|
8994 | 9315 | |
|
8995 | msgid "[-ac] [-r REV] [REV]..." | |
|
8996 | msgstr "[-ac] [-r REV] [REV]..." | |
|
9316 | msgid "[-ac] [-r STARTREV] [REV]..." | |
|
9317 | msgstr "[-ac] [-r STARTREV] [REV]..." | |
|
8997 | 9318 | |
|
8998 | 9319 | msgid "[TOPIC]" |
|
8999 | 9320 | msgstr "[ÄMNE]" |
@@ -9117,6 +9438,9 b' msgstr "[-r REV]"' | |||
|
9117 | 9438 | msgid "force a merge with outstanding changes" |
|
9118 | 9439 | msgstr "tvinga en sammanfogning med utestående ändringar" |
|
9119 | 9440 | |
|
9441 | msgid "specify merge tool" | |
|
9442 | msgstr "ange sammanfogningsverktyg" | |
|
9443 | ||
|
9120 | 9444 | msgid "revision to merge" |
|
9121 | 9445 | msgstr "revision att sammanfoga" |
|
9122 | 9446 | |
@@ -9181,10 +9505,10 b' msgid "list state of files needing merge' | |||
|
9181 | 9505 | msgstr "visa status för filer som behöver sammanfogas" |
|
9182 | 9506 | |
|
9183 | 9507 | msgid "mark files as resolved" |
|
9184 |
msgstr "markera file |
|
|
9185 | ||
|
9186 |
msgid " |
|
|
9187 |
msgstr " |
|
|
9508 | msgstr "markera filer som lösta" | |
|
9509 | ||
|
9510 | msgid "mark files as unresolved" | |
|
9511 | msgstr "markera filer som olösta" | |
|
9188 | 9512 | |
|
9189 | 9513 | msgid "hide status prefix" |
|
9190 | 9514 | msgstr "göm statusprefix" |
@@ -9228,8 +9552,8 b' msgstr "s\xc3\xb6kv\xc3\xa4gsprefix att dela ut fr\xc3\xa5n (standard: serverrot)"' | |||
|
9228 | 9552 | msgid "name to show in web pages (default: working directory)" |
|
9229 | 9553 | msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" |
|
9230 | 9554 | |
|
9231 |
msgid "name of the hgweb config file (se |
|
|
9232 |
msgstr "namn på webdir-konfigurationsfil ( |
|
|
9555 | msgid "name of the hgweb config file (see \"hg help hgweb\")" | |
|
9556 | msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")" | |
|
9233 | 9557 | |
|
9234 | 9558 | msgid "name of the hgweb config file (DEPRECATED)" |
|
9235 | 9559 | msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" |
@@ -9321,8 +9645,8 b' msgstr "[-u] FIL..."' | |||
|
9321 | 9645 | msgid "discard uncommitted changes (no backup)" |
|
9322 | 9646 | msgstr "kassera oarkiverade ändringar (ingen backup)" |
|
9323 | 9647 | |
|
9324 |
msgid " |
|
|
9325 | msgstr "leta efter icke arkiverade ändringar" | |
|
9648 | msgid "update across branches if no uncommitted changes" | |
|
9649 | msgstr "" | |
|
9326 | 9650 | |
|
9327 | 9651 | msgid "[-c] [-C] [-d DATE] [[-r] REV]" |
|
9328 | 9652 | msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" |
@@ -9334,6 +9658,10 b' msgstr ""' | |||
|
9334 | 9658 | msgid "not found in manifest" |
|
9335 | 9659 | msgstr "" |
|
9336 | 9660 | |
|
9661 | #, python-format | |
|
9662 | msgid "no such file in rev %s" | |
|
9663 | msgstr "" | |
|
9664 | ||
|
9337 | 9665 | msgid "branch name not in UTF-8!" |
|
9338 | 9666 | msgstr "" |
|
9339 | 9667 | |
@@ -9378,6 +9706,18 b' msgid "copy failed: %s is not a file or ' | |||
|
9378 | 9706 | msgstr "" |
|
9379 | 9707 | |
|
9380 | 9708 | #, python-format |
|
9709 | msgid "invalid character in dag description: %s..." | |
|
9710 | msgstr "" | |
|
9711 | ||
|
9712 | #, python-format | |
|
9713 | msgid "expected id %i, got %i" | |
|
9714 | msgstr "" | |
|
9715 | ||
|
9716 | #, python-format | |
|
9717 | msgid "parent id %i is larger than current id %i" | |
|
9718 | msgstr "" | |
|
9719 | ||
|
9720 | #, python-format | |
|
9381 | 9721 | msgid "invalid event type in dag: %s" |
|
9382 | 9722 | msgstr "" |
|
9383 | 9723 | |
@@ -9442,24 +9782,24 b' msgid "repository is unrelated"' | |||
|
9442 | 9782 | msgstr "arkivet är obesläktat" |
|
9443 | 9783 | |
|
9444 | 9784 | #, python-format |
|
9445 |
msgid " |
|
|
9446 |
msgstr " |
|
|
9447 | ||
|
9448 |
msgid " |
|
|
9449 | msgstr "avbryter: push skapar nya fjärrhuvuden!\n" | |
|
9450 | ||
|
9451 | msgid "(you should pull and merge or use push -f to force)\n" | |
|
9452 | msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" | |
|
9453 | ||
|
9454 | msgid "(did you forget to merge? use push -f to force)\n" | |
|
9455 | msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" | |
|
9456 | ||
|
9457 | #, python-format | |
|
9458 | msgid "abort: push creates new remote branches: %s!\n" | |
|
9459 | msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" | |
|
9460 | ||
|
9461 | msgid "(use 'hg push --new-branch' to create new remote branches)\n" | |
|
9462 | msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n" | |
|
9785 | msgid "push creates new remote branches: %s!" | |
|
9786 | msgstr "push skapar nya fjärrhuvuden: %s!" | |
|
9787 | ||
|
9788 | msgid "use 'hg push --new-branch' to create new remote branches" | |
|
9789 | msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar" | |
|
9790 | ||
|
9791 | #, python-format | |
|
9792 | msgid "push creates new remote heads on branch '%s'!" | |
|
9793 | msgstr "push skapar nya fjärrhuvuden på grenen '%s'!" | |
|
9794 | ||
|
9795 | msgid "push creates new remote heads!" | |
|
9796 | msgstr "push skapar nya fjärrhuvuden!" | |
|
9797 | ||
|
9798 | msgid "you should pull and merge or use push -f to force" | |
|
9799 | msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga" | |
|
9800 | ||
|
9801 | msgid "did you forget to merge? use push -f to force" | |
|
9802 | msgstr "glömde du att sammanfoga? använd push -f för att tvinga" | |
|
9463 | 9803 | |
|
9464 | 9804 | msgid "note: unsynced remote changes!\n" |
|
9465 | 9805 | msgstr "notera: osynkade fjärrändringar!\n" |
@@ -9476,6 +9816,9 b' msgstr ""' | |||
|
9476 | 9816 | msgid "hg: parse error: %s\n" |
|
9477 | 9817 | msgstr "" |
|
9478 | 9818 | |
|
9819 | msgid "entering debugger - type c to continue starting hg or h for help\n" | |
|
9820 | msgstr "" | |
|
9821 | ||
|
9479 | 9822 | #, python-format |
|
9480 | 9823 | msgid "" |
|
9481 | 9824 | "hg: command '%s' is ambiguous:\n" |
@@ -9524,6 +9867,10 b' msgstr ""' | |||
|
9524 | 9867 | msgid "hg: unknown command '%s'\n" |
|
9525 | 9868 | msgstr "" |
|
9526 | 9869 | |
|
9870 | #, python-format | |
|
9871 | msgid "(%s)\n" | |
|
9872 | msgstr "" | |
|
9873 | ||
|
9527 | 9874 | msgid "(did you forget to compile extensions?)\n" |
|
9528 | 9875 | msgstr "" |
|
9529 | 9876 | |
@@ -9574,6 +9921,12 b' msgid "no definition for alias \'%s\'\\n"' | |||
|
9574 | 9921 | msgstr "" |
|
9575 | 9922 | |
|
9576 | 9923 | #, python-format |
|
9924 | msgid "" | |
|
9925 | "error in definition for alias '%s': %s may only be given on the command " | |
|
9926 | "line\n" | |
|
9927 | msgstr "" | |
|
9928 | ||
|
9929 | #, python-format | |
|
9577 | 9930 | msgid "alias '%s' resolves to unknown command '%s'\n" |
|
9578 | 9931 | msgstr "" |
|
9579 | 9932 | |
@@ -9593,10 +9946,10 b' msgstr "fel n\xc3\xa4r nuvarande arbetskatalog h\xc3\xa4mtades: %s"' | |||
|
9593 | 9946 | msgid "extension '%s' overrides commands: %s\n" |
|
9594 | 9947 | msgstr "utökningen '%s' tar över dessa kommandon: %s\n" |
|
9595 | 9948 | |
|
9596 |
msgid " |
|
|
9597 | msgstr "" | |
|
9598 | ||
|
9599 |
msgid " |
|
|
9949 | msgid "option --config may not be abbreviated!" | |
|
9950 | msgstr "" | |
|
9951 | ||
|
9952 | msgid "option --cwd may not be abbreviated!" | |
|
9600 | 9953 | msgstr "" |
|
9601 | 9954 | |
|
9602 | 9955 | msgid "" |
@@ -9679,12 +10032,6 b' msgstr ""' | |||
|
9679 | 10032 | msgid "was merge of '%s' successful (yn)?" |
|
9680 | 10033 | msgstr "" |
|
9681 | 10034 | |
|
9682 | msgid "&No" | |
|
9683 | msgstr "" | |
|
9684 | ||
|
9685 | msgid "&Yes" | |
|
9686 | msgstr "" | |
|
9687 | ||
|
9688 | 10035 | #, python-format |
|
9689 | 10036 | msgid "" |
|
9690 | 10037 | " output file %s appears unchanged\n" |
@@ -9695,8 +10042,11 b' msgstr ""' | |||
|
9695 | 10042 | msgid "merging %s failed!\n" |
|
9696 | 10043 | msgstr "" |
|
9697 | 10044 | |
|
9698 | #, python-format | |
|
9699 | msgid "Inconsistent state, %s:%s is good and bad" | |
|
10045 | msgid "starting revisions are not directly related" | |
|
10046 | msgstr "" | |
|
10047 | ||
|
10048 | #, python-format | |
|
10049 | msgid "inconsistent state, %s:%s is good and bad" | |
|
9700 | 10050 | msgstr "" |
|
9701 | 10051 | |
|
9702 | 10052 | #, python-format |
@@ -9724,12 +10074,12 b' msgstr "Ange En Revision"' | |||
|
9724 | 10074 | msgid "Specifying Multiple Revisions" |
|
9725 | 10075 | msgstr "Ange Flera Revisioner" |
|
9726 | 10076 | |
|
9727 | msgid "Specifying Revision Sets" | |
|
9728 | msgstr "Ange Revisionsset" | |
|
9729 | ||
|
9730 | 10077 | msgid "Diff Formats" |
|
9731 | 10078 | msgstr "Diff-format" |
|
9732 | 10079 | |
|
10080 | msgid "Merge Tools" | |
|
10081 | msgstr "Sammanfogningsverktyg" | |
|
10082 | ||
|
9733 | 10083 | msgid "Template Usage" |
|
9734 | 10084 | msgstr "Användning Av Mallar" |
|
9735 | 10085 | |
@@ -9975,8 +10325,8 b' msgstr ""' | |||
|
9975 | 10325 | msgid "" |
|
9976 | 10326 | "To make Mercurial produce the git extended diff format, use the --git\n" |
|
9977 | 10327 | "option available for many commands, or set 'git = True' in the [diff]\n" |
|
9978 |
"section of your |
|
|
9979 | "importing diffs in this format or using them in the mq extension.\n" | |
|
10328 | "section of your configuration file. You do not need to set this option\n" | |
|
10329 | "when importing diffs in this format or using them in the mq extension.\n" | |
|
9980 | 10330 | msgstr "" |
|
9981 | 10331 | |
|
9982 | 10332 | msgid "" |
@@ -10001,8 +10351,8 b' msgstr ""' | |||
|
10001 | 10351 | "HGEDITOR\n" |
|
10002 | 10352 | " Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR." |
|
10003 | 10353 | |
|
10004 |
msgid " (deprecated, use |
|
|
10005 |
msgstr " (föråldrad, använd |
|
|
10354 | msgid " (deprecated, use configuration file)" | |
|
10355 | msgstr " (föråldrad, använd konfigurationsfilen)" | |
|
10006 | 10356 | |
|
10007 | 10357 | msgid "" |
|
10008 | 10358 | "HGENCODING\n" |
@@ -10031,10 +10381,10 b' msgstr ""' | |||
|
10031 | 10381 | |
|
10032 | 10382 | msgid "" |
|
10033 | 10383 | "HGRCPATH\n" |
|
10034 |
" A list of files or directories to search for |
|
|
10035 |
" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH |
|
|
10036 |
" platform default search path is used. If empty, only |
|
|
10037 | " from the current repository is read." | |
|
10384 | " A list of files or directories to search for configuration\n" | |
|
10385 | " files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n" | |
|
10386 | " is not set, platform default search path is used. If empty, only\n" | |
|
10387 | " the .hg/hgrc from the current repository is read." | |
|
10038 | 10388 | msgstr "" |
|
10039 | 10389 | |
|
10040 | 10390 | msgid " For each element in HGRCPATH:" |
@@ -10047,9 +10397,9 b' msgstr ""' | |||
|
10047 | 10397 | |
|
10048 | 10398 | msgid "" |
|
10049 | 10399 | "HGPLAIN\n" |
|
10050 |
" When set, this disables any |
|
|
10051 |
" Mercurial's default output. This includes encoding |
|
|
10052 | " verbose mode, debug mode, quiet mode, tracebacks, and\n" | |
|
10400 | " When set, this disables any configuration settings that might\n" | |
|
10401 | " change Mercurial's default output. This includes encoding,\n" | |
|
10402 | " defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n" | |
|
10053 | 10403 | " localization. This can be useful when scripting against Mercurial\n" |
|
10054 | 10404 | " in the face of existing user configuration." |
|
10055 | 10405 | msgstr "" |
@@ -10067,7 +10417,7 b' msgstr ""' | |||
|
10067 | 10417 | |
|
10068 | 10418 | msgid "" |
|
10069 | 10419 | " - HGUSER (deprecated)\n" |
|
10070 |
" - |
|
|
10420 | " - configuration files from the HGRCPATH\n" | |
|
10071 | 10421 | " - EMAIL\n" |
|
10072 | 10422 | " - interactive prompt\n" |
|
10073 | 10423 | " - LOGNAME (with ``@hostname`` appended)" |
@@ -10132,12 +10482,13 b' msgstr ""' | |||
|
10132 | 10482 | "upp till användaren att aktiverade utökningar om de behövs." |
|
10133 | 10483 | |
|
10134 | 10484 | msgid "" |
|
10135 | "To enable the \"foo\" extension, either shipped with Mercurial or in\n" | |
|
10136 |
" |
|
|
10137 | "this::" | |
|
10485 | "To enable the \"foo\" extension, either shipped with Mercurial or in the\n" | |
|
10486 | "Python search path, create an entry for it in your configuration file,\n" | |
|
10487 | "like this::" | |
|
10138 | 10488 | msgstr "" |
|
10139 | 10489 | "För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n" |
|
10140 |
"eller finns i Pythons sökväg, skapa en post för den i din |
|
|
10490 | "eller finns i Pythons sökväg, skapa en post för den i din\n" | |
|
10491 | "konfigurationsfil, så här::" | |
|
10141 | 10492 | |
|
10142 | 10493 | msgid "" |
|
10143 | 10494 | " [extensions]\n" |
@@ -10157,11 +10508,11 b' msgstr ""' | |||
|
10157 | 10508 | " minfunktion = ~/.hgext/minfunktion.py" |
|
10158 | 10509 | |
|
10159 | 10510 | msgid "" |
|
10160 |
"To explicitly disable an extension enabled in a |
|
|
10161 | "scope, prepend its path with !::" | |
|
10162 | msgstr "" | |
|
10163 |
"För att explicit deaktivera en utökning som aktiverats i en |
|
|
10164 | "omfång, börja dess sökväg med !::" | |
|
10511 | "To explicitly disable an extension enabled in a configuration file of\n" | |
|
10512 | "broader scope, prepend its path with !::" | |
|
10513 | msgstr "" | |
|
10514 | "För att explicit deaktivera en utökning som aktiverats i en\n" | |
|
10515 | "konfigurationsfil med större omfång, börja dess sökväg med !::" | |
|
10165 | 10516 | |
|
10166 | 10517 | msgid "" |
|
10167 | 10518 | " [extensions]\n" |
@@ -10199,7 +10550,7 b' msgid ""' | |||
|
10199 | 10550 | " a remote repository, since new heads may be created by these\n" |
|
10200 | 10551 | " operations. Note that the term branch can also be used informally\n" |
|
10201 | 10552 | " to describe a development process in which certain development is\n" |
|
10202 | " done independently of other development.This is sometimes done\n" | |
|
10553 | " done independently of other development. This is sometimes done\n" | |
|
10203 | 10554 | " explicitly with a named branch, but it can also be done locally,\n" |
|
10204 | 10555 | " using bookmarks or clones and anonymous branches." |
|
10205 | 10556 | msgstr "" |
@@ -10239,6 +10590,21 b' msgid ""' | |||
|
10239 | 10590 | msgstr "" |
|
10240 | 10591 | |
|
10241 | 10592 | msgid "" |
|
10593 | "Branch, inactive\n" | |
|
10594 | " If a named branch has no topological heads, it is considered to be\n" | |
|
10595 | " inactive. As an example, a feature branch becomes inactive when it\n" | |
|
10596 | " is merged into the default branch. The :hg:`branches` command\n" | |
|
10597 | " shows inactive branches by default, though they can be hidden with\n" | |
|
10598 | " :hg:`branches --active`." | |
|
10599 | msgstr "" | |
|
10600 | ||
|
10601 | msgid "" | |
|
10602 | " NOTE: this concept is deprecated because it is too implicit.\n" | |
|
10603 | " Branches should now be explicitly closed using :hg:`commit\n" | |
|
10604 | " --close-branch` when they are no longer needed." | |
|
10605 | msgstr "" | |
|
10606 | ||
|
10607 | msgid "" | |
|
10242 | 10608 | "Branch, named\n" |
|
10243 | 10609 | " A collection of changesets which have the same branch name. By\n" |
|
10244 | 10610 | " default, children of a changeset in a named branch belong to the\n" |
@@ -10294,8 +10660,8 b' msgstr ""' | |||
|
10294 | 10660 | msgid "" |
|
10295 | 10661 | "Changeset id\n" |
|
10296 | 10662 | " A SHA-1 hash that uniquely identifies a changeset. It may be\n" |
|
10297 |
" represented as either a \"long\" 40 |
|
|
10298 |
" \"short\" 12 |
|
|
10663 | " represented as either a \"long\" 40 hexadecimal digit string, or a\n" | |
|
10664 | " \"short\" 12 hexadecimal digit string." | |
|
10299 | 10665 | msgstr "" |
|
10300 | 10666 | |
|
10301 | 10667 | msgid "" |
@@ -10796,6 +11162,128 b' msgstr ""' | |||
|
10796 | 11162 | "högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n" |
|
10797 | 11163 | "visas som ``bar``och ``quux/baz``.\n" |
|
10798 | 11164 | |
|
11165 | msgid "To merge files Mercurial uses merge tools." | |
|
11166 | msgstr "" | |
|
11167 | ||
|
11168 | msgid "" | |
|
11169 | "A merge tool combines two different versions of a file into a merged\n" | |
|
11170 | "file. Merge tools are given the two files and the greatest common\n" | |
|
11171 | "ancestor of the two file versions, so they can determine the changes\n" | |
|
11172 | "made on both branches." | |
|
11173 | msgstr "" | |
|
11174 | ||
|
11175 | msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." | |
|
11176 | msgstr "" | |
|
11177 | ||
|
11178 | msgid "" | |
|
11179 | "Usually, the merge tool tries to automatically, by combining all the\n" | |
|
11180 | "non-overlapping changes that occurred separately in the two different\n" | |
|
11181 | "evolutions of the same initial base file. Furthermore, some\n" | |
|
11182 | "interactive merge programs make it easier to manually resolve\n" | |
|
11183 | "conflicting merges, either in a graphical way, or by inserting some\n" | |
|
11184 | "conflict markers. Mercurial does not include any interactive merge\n" | |
|
11185 | "programs but relies on external tools for that. External merge tools\n" | |
|
11186 | "and their properties and usage is configured in merge-tools section -\n" | |
|
11187 | "see hgrc(5)." | |
|
11188 | msgstr "" | |
|
11189 | ||
|
11190 | msgid "" | |
|
11191 | "There are a some internal merge tools which can be used. The internal\n" | |
|
11192 | "merge tools are:" | |
|
11193 | msgstr "" | |
|
11194 | ||
|
11195 | msgid "" | |
|
11196 | "``internal:merge``\n" | |
|
11197 | " Uses the internal non-interactive merge tool for merging files." | |
|
11198 | msgstr "" | |
|
11199 | ||
|
11200 | msgid "" | |
|
11201 | "``internal:fail``\n" | |
|
11202 | " Rather than attempting to merge files that were modified on both\n" | |
|
11203 | " branches, it marks these files as unresolved. Then the resolve\n" | |
|
11204 | " command must be used to mark files resolved." | |
|
11205 | msgstr "" | |
|
11206 | ||
|
11207 | msgid "" | |
|
11208 | "``internal:local``\n" | |
|
11209 | " Uses the local version of files as the merged version." | |
|
11210 | msgstr "" | |
|
11211 | ||
|
11212 | msgid "" | |
|
11213 | "``internal:other``\n" | |
|
11214 | " Uses the remote version of files as the merged version." | |
|
11215 | msgstr "" | |
|
11216 | ||
|
11217 | msgid "" | |
|
11218 | "``internal:prompt``\n" | |
|
11219 | " Asks the user which of the local or the other version to keep as\n" | |
|
11220 | " the merged version." | |
|
11221 | msgstr "" | |
|
11222 | ||
|
11223 | msgid "" | |
|
11224 | "``internal:dump``\n" | |
|
11225 | " Creates three versions of the files to merge, containing the\n" | |
|
11226 | " contents of local, other and base. These files can then be used to\n" | |
|
11227 | " perform a merge manually. If the file merged is name ``a.txt``,\n" | |
|
11228 | " these files will accordingly be named ``a.txt.local``,\n" | |
|
11229 | " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" | |
|
11230 | " same directory as the file to merge." | |
|
11231 | msgstr "" | |
|
11232 | ||
|
11233 | msgid "How Mercurial decides which merge program to use" | |
|
11234 | msgstr "" | |
|
11235 | ||
|
11236 | msgid "" | |
|
11237 | "1. If the ``HGMERGE`` environment variable is present, it is used. If\n" | |
|
11238 | " specified it must be either an executable path or the name of an\n" | |
|
11239 | " application in your executable search path." | |
|
11240 | msgstr "" | |
|
11241 | ||
|
11242 | msgid "" | |
|
11243 | "2. If the filename of the file to be merged matches any of the\n" | |
|
11244 | " patterns in the merge-patterns configuration section, then the\n" | |
|
11245 | " corresponding merge tool is used, unless the file to be merged is a\n" | |
|
11246 | " symlink. Here binary capabilities of the merge tool are not\n" | |
|
11247 | " considered." | |
|
11248 | msgstr "" | |
|
11249 | ||
|
11250 | msgid "3. If ui.merge is set, it is used." | |
|
11251 | msgstr "" | |
|
11252 | ||
|
11253 | msgid "" | |
|
11254 | "4. If any merge tools are present in the merge-tools configuration\n" | |
|
11255 | " section, and any of the tools can be found on the system, the\n" | |
|
11256 | " priority settings are used to determine which one to use. Binary,\n" | |
|
11257 | " symlink and GUI capabilities do also have to match." | |
|
11258 | msgstr "" | |
|
11259 | ||
|
11260 | msgid "5. If a program named ``hgmerge`` exists on the system, it is used." | |
|
11261 | msgstr "" | |
|
11262 | ||
|
11263 | msgid "" | |
|
11264 | "6. If the file to be merged is not binary and is not a symlink, then\n" | |
|
11265 | " ``internal:merge`` is used." | |
|
11266 | msgstr "" | |
|
11267 | ||
|
11268 | msgid "7. The merge fails." | |
|
11269 | msgstr "" | |
|
11270 | ||
|
11271 | msgid "" | |
|
11272 | ".. note::\n" | |
|
11273 | " After selecting a merge program, Mercurial will by default attempt\n" | |
|
11274 | " to merge the files using a simple merge algorithm first, to see if\n" | |
|
11275 | " they can be merged without conflicts. Only if there are conflicting\n" | |
|
11276 | " changes Mercurial will actually execute the merge program. Whether\n" | |
|
11277 | " to use the simple merge algorithm first can be controlled be the\n" | |
|
11278 | " premerge setting of the merge tool, which is enabled by default\n" | |
|
11279 | " unless the file is binary or symlink." | |
|
11280 | msgstr "" | |
|
11281 | ||
|
11282 | msgid "" | |
|
11283 | "See the merge-tools and ui sections of hgrc(5) for details on\n" | |
|
11284 | "configuration of merge tools.\n" | |
|
11285 | msgstr "" | |
|
11286 | ||
|
10799 | 11287 | msgid "" |
|
10800 | 11288 | "When Mercurial accepts more than one revision, they may be specified\n" |
|
10801 | 11289 | "individually, or provided as a topologically continuous range,\n" |
@@ -10984,8 +11472,13 b' msgid ""' | |||
|
10984 | 11472 | "Identifiers such as branch names must be quoted with single or double\n" |
|
10985 | 11473 | "quotes if they contain characters outside of\n" |
|
10986 | 11474 | "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" |
|
10987 | "predicates. Special characters can be used in quoted identifiers by\n" | |
|
10988 | "escaping them, e.g., ``\\n`` is interpreted as a newline." | |
|
11475 | "predicates." | |
|
11476 | msgstr "" | |
|
11477 | ||
|
11478 | msgid "" | |
|
11479 | "Special characters can be used in quoted identifiers by escaping them,\n" | |
|
11480 | "e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" | |
|
11481 | "interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." | |
|
10989 | 11482 | msgstr "" |
|
10990 | 11483 | |
|
10991 | 11484 | msgid "There is a single prefix operator:" |
@@ -11063,8 +11556,7 b' msgstr ""' | |||
|
11063 | 11556 | |
|
11064 | 11557 | msgid "" |
|
11065 | 11558 | "``branch(set)``\n" |
|
11066 | " The branch names are found for changesets in set, and the result is\n" | |
|
11067 | " all changesets belonging to one those branches." | |
|
11559 | " All changesets belonging to the branches of changesets in set." | |
|
11068 | 11560 | msgstr "" |
|
11069 | 11561 | |
|
11070 | 11562 | msgid "" |
@@ -11089,12 +11581,12 b' msgstr ""' | |||
|
11089 | 11581 | |
|
11090 | 11582 | msgid "" |
|
11091 | 11583 | "``descendants(set)``\n" |
|
11092 | " Changesets which are decendants of changesets in set." | |
|
11584 | " Changesets which are descendants of changesets in set." | |
|
11093 | 11585 | msgstr "" |
|
11094 | 11586 | |
|
11095 | 11587 | msgid "" |
|
11096 | 11588 | "``file(pattern)``\n" |
|
11097 |
" Changesets |
|
|
11589 | " Changesets affecting files matched by pattern." | |
|
11098 | 11590 | msgstr "" |
|
11099 | 11591 | |
|
11100 | 11592 | msgid "" |
@@ -11104,12 +11596,13 b' msgstr ""' | |||
|
11104 | 11596 | |
|
11105 | 11597 | msgid "" |
|
11106 | 11598 | "``grep(regex)``\n" |
|
11107 | " Like ``keyword(string)`` but accepts a regex." | |
|
11599 | " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" | |
|
11600 | " to ensure special escape characters are handled correctly." | |
|
11108 | 11601 | msgstr "" |
|
11109 | 11602 | |
|
11110 | 11603 | msgid "" |
|
11111 | 11604 | "``head()``\n" |
|
11112 | " Changeset is a head." | |
|
11605 | " Changeset is a named branch head." | |
|
11113 | 11606 | msgstr "" |
|
11114 | 11607 | |
|
11115 | 11608 | msgid "" |
@@ -11118,6 +11611,11 b' msgid ""' | |||
|
11118 | 11611 | msgstr "" |
|
11119 | 11612 | |
|
11120 | 11613 | msgid "" |
|
11614 | "``id(string)``\n" | |
|
11615 | " Revision non-ambiguously specified by the given hex string prefix" | |
|
11616 | msgstr "" | |
|
11617 | ||
|
11618 | msgid "" | |
|
11121 | 11619 | "``keyword(string)``\n" |
|
11122 | 11620 | " Search commit message, user name, and names of changed files for\n" |
|
11123 | 11621 | " string." |
@@ -11134,18 +11632,24 b' msgid ""' | |||
|
11134 | 11632 | msgstr "" |
|
11135 | 11633 | |
|
11136 | 11634 | msgid "" |
|
11635 | "``min(set)``\n" | |
|
11636 | " Changeset with lowest revision number in set." | |
|
11637 | msgstr "" | |
|
11638 | ||
|
11639 | msgid "" | |
|
11137 | 11640 | "``merge()``\n" |
|
11138 | 11641 | " Changeset is a merge changeset." |
|
11139 | 11642 | msgstr "" |
|
11140 | 11643 | |
|
11141 | 11644 | msgid "" |
|
11142 | 11645 | "``modifies(pattern)``\n" |
|
11143 |
" Changesets |
|
|
11646 | " Changesets modifying files matched by pattern." | |
|
11144 | 11647 | msgstr "" |
|
11145 | 11648 | |
|
11146 | 11649 | msgid "" |
|
11147 | 11650 | "``outgoing([path])``\n" |
|
11148 | " Changesets missing in path." | |
|
11651 | " Changesets not found in the specified destination repository, or the\n" | |
|
11652 | " default push location." | |
|
11149 | 11653 | msgstr "" |
|
11150 | 11654 | |
|
11151 | 11655 | msgid "" |
@@ -11164,11 +11668,22 b' msgid ""' | |||
|
11164 | 11668 | msgstr "" |
|
11165 | 11669 | |
|
11166 | 11670 | msgid "" |
|
11671 | "``present(set)``\n" | |
|
11672 | " An empty set, if any revision in set isn't found; otherwise,\n" | |
|
11673 | " all revisions in set." | |
|
11674 | msgstr "" | |
|
11675 | ||
|
11676 | msgid "" | |
|
11167 | 11677 | "``removes(pattern)``\n" |
|
11168 | 11678 | " Changesets which remove files matching pattern." |
|
11169 | 11679 | msgstr "" |
|
11170 | 11680 | |
|
11171 | 11681 | msgid "" |
|
11682 | "``rev(number)``\n" | |
|
11683 | " Revision with the given numeric identifier." | |
|
11684 | msgstr "" | |
|
11685 | ||
|
11686 | msgid "" | |
|
11172 | 11687 | "``reverse(set)``\n" |
|
11173 | 11688 | " Reverse order of set." |
|
11174 | 11689 | msgstr "" |
@@ -11196,8 +11711,8 b' msgid ""' | |||
|
11196 | 11711 | msgstr "" |
|
11197 | 11712 | |
|
11198 | 11713 | msgid "" |
|
11199 |
"``tag |
|
|
11200 | " Changeset is tagged." | |
|
11714 | "``tag(name)``\n" | |
|
11715 | " The specified tag by name, or all tagged revisions if no name is given." | |
|
11201 | 11716 | msgstr "" |
|
11202 | 11717 | |
|
11203 | 11718 | msgid "" |
@@ -11219,15 +11734,49 b' msgid ""' | |||
|
11219 | 11734 | " -l x -> limit(expr, x)" |
|
11220 | 11735 | msgstr "" |
|
11221 | 11736 | |
|
11222 |
msgid "Some sample queries: |
|
|
11223 | msgstr "" | |
|
11224 | ||
|
11225 | msgid "" | |
|
11226 | " hg log -r 'branch(default)'\n" | |
|
11227 | " hg log -r 'branch(default) and 1.5:: and not merge()'\n" | |
|
11228 | " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" | |
|
11229 | " hg log -r 'sort(date(\"May 2008\"), user)'\n" | |
|
11230 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" | |
|
11737 | msgid "Some sample queries:" | |
|
11738 | msgstr "" | |
|
11739 | ||
|
11740 | msgid "- Changesets on the default branch::" | |
|
11741 | msgstr "- Ändringar på default-grenen::" | |
|
11742 | ||
|
11743 | msgid " hg log -r 'branch(default)'" | |
|
11744 | msgstr " hg log -r 'branch(default)'" | |
|
11745 | ||
|
11746 | msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" | |
|
11747 | msgstr "" | |
|
11748 | ||
|
11749 | msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" | |
|
11750 | msgstr "" | |
|
11751 | ||
|
11752 | msgid "- Open branch heads::" | |
|
11753 | msgstr "- Öppna grenhuvuden::" | |
|
11754 | ||
|
11755 | msgid " hg log -r 'head() and not closed()'" | |
|
11756 | msgstr "" | |
|
11757 | ||
|
11758 | msgid "" | |
|
11759 | "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" | |
|
11760 | " ``hgext/*``::" | |
|
11761 | msgstr "" | |
|
11762 | ||
|
11763 | msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" | |
|
11764 | msgstr "" | |
|
11765 | ||
|
11766 | msgid "- Changesets in committed May 2008, sorted by user::" | |
|
11767 | msgstr "" | |
|
11768 | ||
|
11769 | msgid " hg log -r 'sort(date(\"May 2008\"), user)'" | |
|
11770 | msgstr "" | |
|
11771 | ||
|
11772 | msgid "" | |
|
11773 | "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" | |
|
11774 | " release::" | |
|
11775 | msgstr "" | |
|
11776 | ||
|
11777 | msgid "" | |
|
11778 | " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |
|
11779 | "())'\n" | |
|
11231 | 11780 | msgstr "" |
|
11232 | 11781 | |
|
11233 | 11782 | msgid "" |
@@ -11276,6 +11825,9 b' msgid ""' | |||
|
11276 | 11825 | " committed. Will be empty if the branch name was default." |
|
11277 | 11826 | msgstr "" |
|
11278 | 11827 | |
|
11828 | msgid ":children: List of strings. The children of the changeset." | |
|
11829 | msgstr "" | |
|
11830 | ||
|
11279 | 11831 | msgid ":date: Date information. The date when the changeset was committed." |
|
11280 | 11832 | msgstr "" |
|
11281 | 11833 | |
@@ -11312,8 +11864,8 b' msgid ":file_dels: List of strings. File' | |||
|
11312 | 11864 | msgstr "" |
|
11313 | 11865 | |
|
11314 | 11866 | msgid "" |
|
11315 |
":node: String. The changeset identification hash, as a 40 |
|
|
11316 |
" |
|
|
11867 | ":node: String. The changeset identification hash, as a 40 hexadecimal\n" | |
|
11868 | " digit string." | |
|
11317 | 11869 | msgstr "" |
|
11318 | 11870 | |
|
11319 | 11871 | msgid ":parents: List of strings. The parents of the changeset." |
@@ -11394,6 +11946,11 b' msgid ""' | |||
|
11394 | 11946 | " and \">\" with XML entities." |
|
11395 | 11947 | msgstr "" |
|
11396 | 11948 | |
|
11949 | msgid "" | |
|
11950 | ":hex: Any text. Convert a binary Mercurial node identifier into\n" | |
|
11951 | " its long hexadecimal representation." | |
|
11952 | msgstr "" | |
|
11953 | ||
|
11397 | 11954 | msgid ":fill68: Any text. Wraps the text to fit in 68 columns." |
|
11398 | 11955 | msgstr "" |
|
11399 | 11956 | |
@@ -11445,12 +12002,17 b' msgstr ""' | |||
|
11445 | 12002 | |
|
11446 | 12003 | msgid "" |
|
11447 | 12004 | ":short: Changeset hash. Returns the short form of a changeset hash,\n" |
|
11448 |
" i.e. a 12 |
|
|
12005 | " i.e. a 12 hexadecimal digit string." | |
|
11449 | 12006 | msgstr "" |
|
11450 | 12007 | |
|
11451 | 12008 | msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." |
|
11452 | 12009 | msgstr "" |
|
11453 | 12010 | |
|
12011 | msgid "" | |
|
12012 | ":stringify: Any type. Turns the value into text by converting values into\n" | |
|
12013 | " text and concatenating them." | |
|
12014 | msgstr "" | |
|
12015 | ||
|
11454 | 12016 | msgid ":strip: Any text. Strips all leading and trailing whitespace." |
|
11455 | 12017 | msgstr "" |
|
11456 | 12018 | |
@@ -11496,6 +12058,11 b' msgid ""' | |||
|
11496 | 12058 | "server." |
|
11497 | 12059 | msgstr "" |
|
11498 | 12060 | |
|
12061 | msgid "" | |
|
12062 | "Note that the security of HTTPS URLs depends on proper configuration of\n" | |
|
12063 | "web.cacerts." | |
|
12064 | msgstr "" | |
|
12065 | ||
|
11499 | 12066 | msgid "Some notes about using SSH with Mercurial:" |
|
11500 | 12067 | msgstr "" |
|
11501 | 12068 | |
@@ -11522,13 +12089,13 b' msgid ""' | |||
|
11522 | 12089 | msgstr "" |
|
11523 | 12090 | |
|
11524 | 12091 | msgid "" |
|
11525 |
" Alternatively specify \"ssh -C\" as your ssh command in your |
|
|
11526 | " with the --ssh command line option." | |
|
11527 | msgstr "" | |
|
11528 | ||
|
11529 | msgid "" | |
|
11530 |
"These URLs can all be stored in your |
|
|
11531 | "[paths] section like so::" | |
|
12092 | " Alternatively specify \"ssh -C\" as your ssh command in your\n" | |
|
12093 | " configuration file or with the --ssh command line option." | |
|
12094 | msgstr "" | |
|
12095 | ||
|
12096 | msgid "" | |
|
12097 | "These URLs can all be stored in your configuration file with path\n" | |
|
12098 | "aliases under the [paths] section like so::" | |
|
11532 | 12099 | msgstr "" |
|
11533 | 12100 | |
|
11534 | 12101 | msgid "" |
@@ -11618,7 +12185,7 b' msgid "use \'hg resolve\' to retry unresol' | |||
|
11618 | 12185 | msgstr "" |
|
11619 | 12186 | |
|
11620 | 12187 | msgid "" |
|
11621 | "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " | |
|
12188 | "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " | |
|
11622 | 12189 | "abandon\n" |
|
11623 | 12190 | msgstr "" |
|
11624 | 12191 | |
@@ -11629,6 +12196,10 b' msgstr ""' | |||
|
11629 | 12196 | msgid "error reading %s/.hg/hgrc: %s\n" |
|
11630 | 12197 | msgstr "" |
|
11631 | 12198 | |
|
12199 | #, python-format | |
|
12200 | msgid "error accessing repository at %s\n" | |
|
12201 | msgstr "" | |
|
12202 | ||
|
11632 | 12203 | msgid "SSL support is unavailable" |
|
11633 | 12204 | msgstr "" |
|
11634 | 12205 | |
@@ -11733,24 +12304,9 b' msgstr ""' | |||
|
11733 | 12304 | msgid "'%s' uses newer protocol %s" |
|
11734 | 12305 | msgstr "" |
|
11735 | 12306 | |
|
11736 | msgid "look up remote revision" | |
|
11737 | msgstr "" | |
|
11738 | ||
|
11739 | msgid "unexpected response:" | |
|
11740 | msgstr "" | |
|
11741 | ||
|
11742 | msgid "look up remote changes" | |
|
11743 | msgstr "" | |
|
11744 | ||
|
11745 | msgid "push failed (unexpected response):" | |
|
11746 | msgstr "" | |
|
11747 | ||
|
11748 | msgid "remote: " | |
|
11749 | msgstr "fjärr: " | |
|
11750 | ||
|
11751 | 12307 | #, python-format |
|
11752 | 12308 | msgid "push failed: %s" |
|
11753 | msgstr "" | |
|
12309 | msgstr "tryckning misslyckades: %s" | |
|
11754 | 12310 | |
|
11755 | 12311 | msgid "Python support for SSL and HTTPS is not installed" |
|
11756 | 12312 | msgstr "" |
@@ -11874,10 +12430,10 b' msgid "requesting all changes\\n"' | |||
|
11874 | 12430 | msgstr "efterfrågar alla ändringar\n" |
|
11875 | 12431 | |
|
11876 | 12432 | msgid "" |
|
11877 |
" |
|
|
12433 | "partial pull cannot be done because other repository doesn't support " | |
|
11878 | 12434 | "changegroupsubset." |
|
11879 | 12435 | msgstr "" |
|
11880 |
" |
|
|
12436 | "deldragningar kan inte göras eftersom det andra arkivet inte stödjer " | |
|
11881 | 12437 | "changegroupsubset." |
|
11882 | 12438 | |
|
11883 | 12439 | #, python-format |
@@ -11903,9 +12459,6 b' msgstr "buntar filer"' | |||
|
11903 | 12459 | msgid "adding changesets\n" |
|
11904 | 12460 | msgstr "lägger till ändringar\n" |
|
11905 | 12461 | |
|
11906 | msgid "changesets" | |
|
11907 | msgstr "ändringar" | |
|
11908 | ||
|
11909 | 12462 | msgid "received changelog group is empty" |
|
11910 | 12463 | msgstr "mottagen ändringsgrupp är tom" |
|
11911 | 12464 | |
@@ -11956,8 +12509,8 b' msgstr "%d filer att \xc3\xb6verf\xc3\xb6ra, %s med data\\n"' | |||
|
11956 | 12509 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
11957 | 12510 | msgstr "överförde %s på %.1f sekunder (%s/sek)\n" |
|
11958 | 12511 | |
|
11959 |
msgid " |
|
|
11960 |
msgstr " |
|
|
12512 | msgid "smtp.host not configured - cannot send mail" | |
|
12513 | msgstr "smtp.host är inte konfigurerad - kan inte sända mail" | |
|
11961 | 12514 | |
|
11962 | 12515 | #, python-format |
|
11963 | 12516 | msgid "sending mail: smtp host %s, port %s\n" |
@@ -12001,6 +12554,13 b' msgid "failed to remove %s from manifest' | |||
|
12001 | 12554 | msgstr "" |
|
12002 | 12555 | |
|
12003 | 12556 | #, python-format |
|
12557 | msgid "invalid pattern (%s): %s" | |
|
12558 | msgstr "ogiltigt mönster (%s): %s" | |
|
12559 | ||
|
12560 | msgid "invalid pattern" | |
|
12561 | msgstr "ogiltigt mönster" | |
|
12562 | ||
|
12563 | #, python-format | |
|
12004 | 12564 | msgid "diff context lines count must be an integer, not %r" |
|
12005 | 12565 | msgstr "" |
|
12006 | 12566 | |
@@ -12058,23 +12618,23 b' msgstr "uppdaterar"' | |||
|
12058 | 12618 | |
|
12059 | 12619 | #, python-format |
|
12060 | 12620 | msgid "update failed to remove %s: %s!\n" |
|
12061 | msgstr "" | |
|
12621 | msgstr "update kunde inte ta bort %s: %s!\n" | |
|
12062 | 12622 | |
|
12063 | 12623 | #, python-format |
|
12064 | 12624 | msgid "getting %s\n" |
|
12065 | msgstr "" | |
|
12625 | msgstr "hämtar %s\n" | |
|
12066 | 12626 | |
|
12067 | 12627 | #, python-format |
|
12068 | 12628 | msgid "getting %s to %s\n" |
|
12069 | msgstr "" | |
|
12070 | ||
|
12071 | #, python-format | |
|
12072 | msgid "warning: detected divergent renames of %s to:\n" | |
|
12073 | msgstr "" | |
|
12629 | msgstr "hämtar %s till %s\n" | |
|
12630 | ||
|
12631 | #, python-format | |
|
12632 | msgid "note: possible conflict - %s was renamed multiple times to:\n" | |
|
12633 | msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n" | |
|
12074 | 12634 | |
|
12075 | 12635 | #, python-format |
|
12076 | 12636 | msgid "branch %s not found" |
|
12077 | msgstr "" | |
|
12637 | msgstr "grenen %s hittades inte" | |
|
12078 | 12638 | |
|
12079 | 12639 | msgid "merging with a working directory ancestor has no effect" |
|
12080 | 12640 | msgstr "" |
@@ -12085,13 +12645,38 b' msgstr ""' | |||
|
12085 | 12645 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
12086 | 12646 | msgstr "" |
|
12087 | 12647 | |
|
12088 | msgid "" | |
|
12089 | "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " | |
|
12090 | "changes)" | |
|
12091 | msgstr "" | |
|
12092 | ||
|
12093 | msgid "crosses branches (use 'hg merge' or use 'hg update -c')" | |
|
12094 | msgstr "" | |
|
12648 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
|
12649 | msgstr "" | |
|
12650 | ||
|
12651 | msgid "crosses branches (merge branches or use --check to force update)" | |
|
12652 | msgstr "" | |
|
12653 | ||
|
12654 | msgid "Attention:" | |
|
12655 | msgstr "" | |
|
12656 | ||
|
12657 | msgid "Caution:" | |
|
12658 | msgstr "" | |
|
12659 | ||
|
12660 | msgid "!Danger!" | |
|
12661 | msgstr "" | |
|
12662 | ||
|
12663 | msgid "Error:" | |
|
12664 | msgstr "Fel:" | |
|
12665 | ||
|
12666 | msgid "Hint:" | |
|
12667 | msgstr "" | |
|
12668 | ||
|
12669 | msgid "Important:" | |
|
12670 | msgstr "Viktigt:" | |
|
12671 | ||
|
12672 | msgid "Note:" | |
|
12673 | msgstr "Notera:" | |
|
12674 | ||
|
12675 | msgid "Tip:" | |
|
12676 | msgstr "Tips:" | |
|
12677 | ||
|
12678 | msgid "Warning!" | |
|
12679 | msgstr "Varning!" | |
|
12095 | 12680 | |
|
12096 | 12681 | #, python-format |
|
12097 | 12682 | msgid "cannot create %s: destination already exists" |
@@ -12168,17 +12753,11 b' msgid "patch command failed: %s"' | |||
|
12168 | 12753 | msgstr "" |
|
12169 | 12754 | |
|
12170 | 12755 | #, python-format |
|
12171 |
msgid " |
|
|
12172 | msgstr "" | |
|
12173 | ||
|
12174 | msgid "" | |
|
12175 | "internal patcher failed\n" | |
|
12176 | "please report details to http://mercurial.selenic.com/bts/\n" | |
|
12177 | "or mercurial@selenic.com\n" | |
|
12178 | msgstr "" | |
|
12179 | "den interna patcharen misslyckades\n" | |
|
12180 | "rapportera detaljer till http://mercurial.selenic.com/bts/\n" | |
|
12181 | "eller mercurial@selenic.com\n" | |
|
12756 | msgid "unsupported line endings type: %s" | |
|
12757 | msgstr "" | |
|
12758 | ||
|
12759 | msgid "patch failed to apply" | |
|
12760 | msgstr "" | |
|
12182 | 12761 | |
|
12183 | 12762 | #, python-format |
|
12184 | 12763 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
@@ -12251,12 +12830,12 b' msgstr ""' | |||
|
12251 | 12830 | msgid "%s not found in the transaction" |
|
12252 | 12831 | msgstr "" |
|
12253 | 12832 | |
|
12833 | msgid "consistency error in delta" | |
|
12834 | msgstr "" | |
|
12835 | ||
|
12254 | 12836 | msgid "unknown base" |
|
12255 | 12837 | msgstr "" |
|
12256 | 12838 | |
|
12257 | msgid "consistency error adding group" | |
|
12258 | msgstr "" | |
|
12259 | ||
|
12260 | 12839 | msgid "unterminated string" |
|
12261 | 12840 | msgstr "" |
|
12262 | 12841 | |
@@ -12277,17 +12856,32 b' msgstr "kan inte anv\xc3\xa4nda en lista i detta sammanhang"' | |||
|
12277 | 12856 | msgid "not a function: %s" |
|
12278 | 12857 | msgstr "inte en funktion: %s" |
|
12279 | 12858 | |
|
12280 |
msgid " |
|
|
12281 |
msgstr " |
|
|
12282 | ||
|
12283 | msgid "limit wants a number" | |
|
12284 | msgstr "limit vill ha ett nummer" | |
|
12859 | msgid "id requires one argument" | |
|
12860 | msgstr "id kräver ett argument" | |
|
12861 | ||
|
12862 | msgid "id requires a string" | |
|
12863 | msgstr "id kräver en sträng" | |
|
12864 | ||
|
12865 | msgid "rev requires one argument" | |
|
12866 | msgstr "rev kräver ett argument" | |
|
12867 | ||
|
12868 | msgid "rev requires a number" | |
|
12869 | msgstr "rev kräver ett nummer" | |
|
12870 | ||
|
12871 | msgid "rev expects a number" | |
|
12872 | msgstr "rev förväntar sig ett nummer" | |
|
12873 | ||
|
12874 | msgid "limit requires two arguments" | |
|
12875 | msgstr "limit kräver två argument" | |
|
12876 | ||
|
12877 | msgid "limit requires a number" | |
|
12878 | msgstr "limit kräver ett nummer" | |
|
12285 | 12879 | |
|
12286 | 12880 | msgid "limit expects a number" |
|
12287 | 12881 | msgstr "limit förväntar sig ett nummer" |
|
12288 | 12882 | |
|
12289 |
msgid "ancestor |
|
|
12290 |
msgstr "ancestor |
|
|
12883 | msgid "ancestor requires two arguments" | |
|
12884 | msgstr "ancestor kräver två argument" | |
|
12291 | 12885 | |
|
12292 | 12886 | msgid "ancestor arguments must be single revisions" |
|
12293 | 12887 | msgstr "argument till ancestor måste vara singelrevisioner" |
@@ -12295,32 +12889,36 b' msgstr "argument till ancestor m\xc3\xa5ste vara singelrevisioner"' | |||
|
12295 | 12889 | msgid "follow takes no arguments" |
|
12296 | 12890 | msgstr "follow tar inga argument" |
|
12297 | 12891 | |
|
12298 |
msgid "date |
|
|
12299 |
msgstr "date |
|
|
12300 | ||
|
12301 |
msgid "keyword |
|
|
12302 |
msgstr "keyword |
|
|
12303 | ||
|
12304 |
msgid "grep |
|
|
12305 |
msgstr "grep |
|
|
12306 | ||
|
12307 | msgid "author wants a string" | |
|
12308 | msgstr "author vill ha ett mönster" | |
|
12309 | ||
|
12310 | msgid "file wants a pattern" | |
|
12311 | msgstr "file vill ha ett mönster" | |
|
12312 | ||
|
12313 | msgid "contains wants a pattern" | |
|
12314 | msgstr "contains vill ha ett mönster" | |
|
12315 | ||
|
12316 | msgid "modifies wants a pattern" | |
|
12317 | msgstr "modifies vill ha ett mönster" | |
|
12318 | ||
|
12319 | msgid "adds wants a pattern" | |
|
12320 | msgstr "adds vill ha ett mönster" | |
|
12321 | ||
|
12322 | msgid "removes wants a pattern" | |
|
12323 | msgstr "removes vill ha ett mänster" | |
|
12892 | msgid "date requires a string" | |
|
12893 | msgstr "date kräver en sträng" | |
|
12894 | ||
|
12895 | msgid "keyword requires a string" | |
|
12896 | msgstr "keyword kräver en sträng" | |
|
12897 | ||
|
12898 | msgid "grep requires a string" | |
|
12899 | msgstr "grep kräver en sträng" | |
|
12900 | ||
|
12901 | #, python-format | |
|
12902 | msgid "invalid match pattern: %s" | |
|
12903 | msgstr "ogiltigt träffmönster: %s" | |
|
12904 | ||
|
12905 | msgid "author requires a string" | |
|
12906 | msgstr "author kräver en sträng" | |
|
12907 | ||
|
12908 | msgid "file requires a pattern" | |
|
12909 | msgstr "file kräver ett mönster" | |
|
12910 | ||
|
12911 | msgid "contains requires a pattern" | |
|
12912 | msgstr "contains kräver ett mönster" | |
|
12913 | ||
|
12914 | msgid "modifies requires a pattern" | |
|
12915 | msgstr "modifies kräver ett mönster" | |
|
12916 | ||
|
12917 | msgid "adds requires a pattern" | |
|
12918 | msgstr "adds kräver ett mönster" | |
|
12919 | ||
|
12920 | msgid "removes requires a pattern" | |
|
12921 | msgstr "removes kräver ett mänster" | |
|
12324 | 12922 | |
|
12325 | 12923 | msgid "merge takes no arguments" |
|
12326 | 12924 | msgstr "merge tar inga argument" |
@@ -12331,8 +12929,8 b' msgstr "closed tar inga argument"' | |||
|
12331 | 12929 | msgid "head takes no arguments" |
|
12332 | 12930 | msgstr "head tar inga argument" |
|
12333 | 12931 | |
|
12334 |
msgid "sort |
|
|
12335 |
msgstr "sort |
|
|
12932 | msgid "sort requires one or two arguments" | |
|
12933 | msgstr "sort kräver ett eller två argument" | |
|
12336 | 12934 | |
|
12337 | 12935 | msgid "sort spec must be a string" |
|
12338 | 12936 | msgstr "sort-spec måste vara en sträng" |
@@ -12344,11 +12942,14 b' msgstr "ok\xc3\xa4nd sorteringsnyckel %r"' | |||
|
12344 | 12942 | msgid "all takes no arguments" |
|
12345 | 12943 | msgstr "all tar inga argument" |
|
12346 | 12944 | |
|
12347 |
msgid "outgoing |
|
|
12348 |
msgstr "outgoing |
|
|
12349 | ||
|
12350 |
msgid "tag |
|
|
12351 |
msgstr "tag |
|
|
12945 | msgid "outgoing requires a repository path" | |
|
12946 | msgstr "outgoing kräver en arkivsökväg" | |
|
12947 | ||
|
12948 | msgid "tag takes one or no arguments" | |
|
12949 | msgstr "tag tar ett eller inga argument" | |
|
12950 | ||
|
12951 | msgid "the argument to tag must be a string" | |
|
12952 | msgstr "argumentet till tag måste vara en sträng" | |
|
12352 | 12953 | |
|
12353 | 12954 | msgid "can't negate that" |
|
12354 | 12955 | msgstr "kan inte negera det" |
@@ -12357,17 +12958,17 b' msgid "not a symbol"' | |||
|
12357 | 12958 | msgstr "inte en symbol" |
|
12358 | 12959 | |
|
12359 | 12960 | msgid "empty query" |
|
12360 | msgstr "" | |
|
12961 | msgstr "tom fråga" | |
|
12361 | 12962 | |
|
12362 | 12963 | msgid "searching for exact renames" |
|
12363 | msgstr "" | |
|
12964 | msgstr "söker efter exakta namnbyten" | |
|
12364 | 12965 | |
|
12365 | 12966 | msgid "searching for similar files" |
|
12366 | 12967 | msgstr "söker efter liknande filer" |
|
12367 | 12968 | |
|
12368 | 12969 | #, python-format |
|
12369 | 12970 | msgid "%s looks like a binary file." |
|
12370 | msgstr "" | |
|
12971 | msgstr "%s verkar vara en binärfil." | |
|
12371 | 12972 | |
|
12372 | 12973 | msgid "can only specify two labels." |
|
12373 | 12974 | msgstr "" |
@@ -12385,13 +12986,16 b' msgstr ""' | |||
|
12385 | 12986 | msgid "no suitable response from remote hg" |
|
12386 | 12987 | msgstr "" |
|
12387 | 12988 | |
|
12989 | msgid "remote: " | |
|
12990 | msgstr "fjärr: " | |
|
12991 | ||
|
12992 | msgid "unexpected response:" | |
|
12993 | msgstr "oväntat svar:" | |
|
12994 | ||
|
12388 | 12995 | #, python-format |
|
12389 | 12996 | msgid "push refused: %s" |
|
12390 | 12997 | msgstr "" |
|
12391 | 12998 | |
|
12392 | msgid "unsynced changes" | |
|
12393 | msgstr "" | |
|
12394 | ||
|
12395 | 12999 | #, python-format |
|
12396 | 13000 | msgid "'%s' does not appear to be an hg repository" |
|
12397 | 13001 | msgstr "" |
@@ -12414,6 +13018,10 b' msgid "missing ] in subrepo source"' | |||
|
12414 | 13018 | msgstr "" |
|
12415 | 13019 | |
|
12416 | 13020 | #, python-format |
|
13021 | msgid "bad subrepository pattern in %s: %s" | |
|
13022 | msgstr "" | |
|
13023 | ||
|
13024 | #, python-format | |
|
12417 | 13025 | msgid "" |
|
12418 | 13026 | " subrepository sources for %s differ\n" |
|
12419 | 13027 | "use (l)ocal source (%s) or (r)emote source (%s)?" |
@@ -12435,10 +13043,18 b' msgid ""' | |||
|
12435 | 13043 | msgstr "" |
|
12436 | 13044 | |
|
12437 | 13045 | #, python-format |
|
13046 | msgid "default path for subrepository %s not found" | |
|
13047 | msgstr "" | |
|
13048 | ||
|
13049 | #, python-format | |
|
12438 | 13050 | msgid "unknown subrepo type %s" |
|
12439 | 13051 | msgstr "" |
|
12440 | 13052 | |
|
12441 | 13053 | #, python-format |
|
13054 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" | |
|
13055 | msgstr "" | |
|
13056 | ||
|
13057 | #, python-format | |
|
12442 | 13058 | msgid "removing subrepo %s\n" |
|
12443 | 13059 | msgstr "" |
|
12444 | 13060 | |
@@ -12468,6 +13084,9 b' msgstr ""' | |||
|
12468 | 13084 | msgid "node '%s' is not well formed" |
|
12469 | 13085 | msgstr "" |
|
12470 | 13086 | |
|
13087 | msgid ".hg/tags.cache is corrupt, rebuilding it\n" | |
|
13088 | msgstr ".hg/tags.cache är korrupt, bygger om den\n" | |
|
13089 | ||
|
12471 | 13090 | msgid "unmatched quotes" |
|
12472 | 13091 | msgstr "" |
|
12473 | 13092 | |
@@ -12512,6 +13131,10 b' msgid "Ignored: %s\\n"' | |||
|
12512 | 13131 | msgstr "" |
|
12513 | 13132 | |
|
12514 | 13133 | #, python-format |
|
13134 | msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
|
13135 | msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" | |
|
13136 | ||
|
13137 | #, python-format | |
|
12515 | 13138 | msgid "ignoring untrusted configuration option %s.%s = %s\n" |
|
12516 | 13139 | msgstr "" |
|
12517 | 13140 | |
@@ -12533,10 +13156,6 b' msgstr "inget anv\xc3\xa4ndarnamn angivet (se \\"hg help config\\")"' | |||
|
12533 | 13156 | msgid "username %s contains a newline\n" |
|
12534 | 13157 | msgstr "" |
|
12535 | 13158 | |
|
12536 | #, python-format | |
|
12537 | msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
|
12538 | msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" | |
|
12539 | ||
|
12540 | 13159 | msgid "response expected" |
|
12541 | 13160 | msgstr "" |
|
12542 | 13161 | |
@@ -12577,12 +13196,23 b' msgstr "ignorerar ogiltig [auth]-nyckel ' | |||
|
12577 | 13196 | msgid "certificate checking requires Python 2.6" |
|
12578 | 13197 | msgstr "certifikatkontroll kräver Python 2.6" |
|
12579 | 13198 | |
|
12580 | msgid "server identity verification succeeded\n" | |
|
12581 | msgstr "verifiering av serveridentitet lyckades\n" | |
|
13199 | msgid "no certificate received" | |
|
13200 | msgstr "inget certifikat mottaget" | |
|
13201 | ||
|
13202 | #, python-format | |
|
13203 | msgid "certificate is for %s" | |
|
13204 | msgstr "certifikat är för %s" | |
|
13205 | ||
|
13206 | msgid "no commonName found in certificate" | |
|
13207 | msgstr "inget commonName hittades i certifikat" | |
|
13208 | ||
|
13209 | #, python-format | |
|
13210 | msgid "%s certificate error: %s" | |
|
13211 | msgstr "%s certifikatfel: %s" | |
|
12582 | 13212 | |
|
12583 | 13213 | #, python-format |
|
12584 | 13214 | msgid "command '%s' failed: %s" |
|
12585 | msgstr "" | |
|
13215 | msgstr "kommandot '%s' misslyckades: %s" | |
|
12586 | 13216 | |
|
12587 | 13217 | #, python-format |
|
12588 | 13218 | msgid "path contains illegal component: %s" |
@@ -12604,8 +13234,8 b' msgid "could not symlink to %r: %s"' | |||
|
12604 | 13234 | msgstr "" |
|
12605 | 13235 | |
|
12606 | 13236 | #, python-format |
|
12607 |
msgid "invalid date: %r |
|
|
12608 | msgstr "" | |
|
13237 | msgid "invalid date: %r" | |
|
13238 | msgstr "ogiltigt datum: %r" | |
|
12609 | 13239 | |
|
12610 | 13240 | #, python-format |
|
12611 | 13241 | msgid "date exceeds 32 bits: %d" |
@@ -12659,6 +13289,10 b' msgstr ""' | |||
|
12659 | 13289 | msgid "%.0f bytes" |
|
12660 | 13290 | msgstr "" |
|
12661 | 13291 | |
|
13292 | #, python-format | |
|
13293 | msgid "no port number associated with service '%s'" | |
|
13294 | msgstr "" | |
|
13295 | ||
|
12662 | 13296 | msgid "cannot verify bundle or remote repos" |
|
12663 | 13297 | msgstr "" |
|
12664 | 13298 | |
@@ -12723,6 +13357,9 b' msgstr "arkivet anv\xc3\xa4nder revlog-format %d\\n"' | |||
|
12723 | 13357 | msgid "checking changesets\n" |
|
12724 | 13358 | msgstr "kontrollerar ändringar\n" |
|
12725 | 13359 | |
|
13360 | msgid "checking" | |
|
13361 | msgstr "kontrollerar" | |
|
13362 | ||
|
12726 | 13363 | #, python-format |
|
12727 | 13364 | msgid "unpacking changeset %s" |
|
12728 | 13365 | msgstr "packar upp ändringen %s" |
@@ -12764,9 +13401,6 b' msgstr "kontrollerar filer\\n"' | |||
|
12764 | 13401 | msgid "cannot decode filename '%s'" |
|
12765 | 13402 | msgstr "kan inte avkoda filnamnet '%s'" |
|
12766 | 13403 | |
|
12767 | msgid "checking" | |
|
12768 | msgstr "kontrollerar" | |
|
12769 | ||
|
12770 | 13404 | #, python-format |
|
12771 | 13405 | msgid "broken revlog! (%s)" |
|
12772 | 13406 | msgstr "skadad revlog! (%s)" |
@@ -12828,3 +13462,15 b' msgstr "(f\xc3\xb6rsta skadade \xc3\xa4ndringen verkar vara %d)\\n"' | |||
|
12828 | 13462 | |
|
12829 | 13463 | msgid "user name not available - set USERNAME environment variable" |
|
12830 | 13464 | msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME" |
|
13465 | ||
|
13466 | msgid "look up remote revision" | |
|
13467 | msgstr "söker fjärrevision" | |
|
13468 | ||
|
13469 | msgid "look up remote changes" | |
|
13470 | msgstr "söker fjärrändringar" | |
|
13471 | ||
|
13472 | msgid "push failed:" | |
|
13473 | msgstr "tryckning misslyckades:" | |
|
13474 | ||
|
13475 | msgid "push failed (unexpected response):" | |
|
13476 | msgstr "tryckning misslyckades (oväntat svar):" |
General Comments 0
You need to be logged in to leave comments.
Login now