Show More
This diff has been collapsed as it changes many lines, (626 lines changed) Show them Hide them | |||
@@ -1,6 +1,6 b'' | |||
|
1 | 1 | # Danish translations for Mercurial |
|
2 | 2 | # Danske oversættelser for Mercurial |
|
3 | # Copyright (C) 2009 Matt Mackall and others | |
|
3 | # Copyright (C) 2009, 2010 Matt Mackall and others | |
|
4 | 4 | # |
|
5 | 5 | # Translation dictionary: |
|
6 | 6 | # |
@@ -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: 20 |
|
|
21 |
"PO-Revision-Date: 20 |
|
|
20 | "POT-Creation-Date: 2010-02-28 17:12+0100\n" | |
|
21 | "PO-Revision-Date: 2010-02-28 18:06+0100\n" | |
|
22 | 22 | "Last-Translator: <mg@lazybytes.net>\n" |
|
23 | 23 | "Language-Team: Danish\n" |
|
24 | 24 | "MIME-Version: 1.0\n" |
@@ -165,6 +165,9 b' msgstr "bogm\xc3\xa6rkenavn kan ikke indeholde linieskift"' | |||
|
165 | 165 | msgid "a bookmark cannot have the name of an existing branch" |
|
166 | 166 | msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren" |
|
167 | 167 | |
|
168 | msgid "no bookmarks set\n" | |
|
169 | msgstr "" | |
|
170 | ||
|
168 | 171 | msgid "force" |
|
169 | 172 | msgstr "gennemtving" |
|
170 | 173 | |
@@ -530,8 +533,9 b' msgstr "hg churn [-d DATO] [-r REV] [--a' | |||
|
530 | 533 | msgid "" |
|
531 | 534 | "colorize output from some commands\n" |
|
532 | 535 | "\n" |
|
533 |
"This extension modifies the status command to add color to |
|
|
534 | "to reflect file status, the qseries command to add color to reflect\n" | |
|
536 | "This extension modifies the status and resolve commands to add color to " | |
|
537 | "their\n" | |
|
538 | "output to reflect file status, the qseries command to add color to reflect\n" | |
|
535 | 539 | "patch status (applied, unapplied, missing), and to diff-related\n" |
|
536 | 540 | "commands to highlight additions, removals, diff headers, and trailing\n" |
|
537 | 541 | "whitespace.\n" |
@@ -569,14 +573,17 b' msgid ""' | |||
|
569 | 573 | " diff.changed = white\n" |
|
570 | 574 | " diff.trailingwhitespace = bold red_background\n" |
|
571 | 575 | "\n" |
|
576 | " resolve.unresolved = red bold\n" | |
|
577 | " resolve.resolved = green bold\n" | |
|
578 | "\n" | |
|
572 | 579 | " bookmarks.current = green\n" |
|
573 | 580 | msgstr "" |
|
574 | 581 | "farvelæg output for nogle kommandoer\n" |
|
575 | 582 | "\n" |
|
576 |
"Denne udvidelse ændrer status-kommandoen så de |
|
|
577 |
"output for at afspejle filstatus, |
|
|
578 | "tilføjer farve for at afspejle status for rettelsen (anvendt,\n" | |
|
579 |
"ikke-anvendt, manglende), og |
|
|
583 | "Denne udvidelse ændrer status- og resolve-kommandoerne så de tilføjer\n" | |
|
584 | "farve til deres output for at afspejle filstatus, qseries-kommandoen\n" | |
|
585 | "så den tilføjer farve for at afspejle status for rettelsen (anvendt,\n" | |
|
586 | "ikke-anvendt, manglende), og diff-relaterede kommandoer så de\n" | |
|
580 | 587 | "fremhæver tilføjelser, fjernelser, diff-hoveder og mellemrum i\n" |
|
581 | 588 | "slutningen af linier.\n" |
|
582 | 589 | "\n" |
@@ -614,6 +621,9 b' msgstr ""' | |||
|
614 | 621 | " diff.changed = white\n" |
|
615 | 622 | " diff.trailingwhitespace = bold red_background\n" |
|
616 | 623 | "\n" |
|
624 | " resolve.unresolved = red bold\\n\"\n" | |
|
625 | " resolve.resolved = green bold\\n\"\n" | |
|
626 | "\n" | |
|
617 | 627 | " bookmarks.current = green\n" |
|
618 | 628 | |
|
619 | 629 | msgid "when to colorize (always, auto, or never)" |
@@ -1542,6 +1552,10 b' msgstr ""' | |||
|
1542 | 1552 | msgid "uncommitted merge - please provide a specific revision" |
|
1543 | 1553 | msgstr "udeponeret sammenføjning - angiv venligst en specifik revision" |
|
1544 | 1554 | |
|
1555 | #, python-format | |
|
1556 | msgid "Signing %d:%s\n" | |
|
1557 | msgstr "Underskriver: %d:%s\n" | |
|
1558 | ||
|
1545 | 1559 | msgid "Error while signing" |
|
1546 | 1560 | msgstr "Fejl ved underskrivning" |
|
1547 | 1561 | |
@@ -1674,6 +1688,10 b' msgid ""' | |||
|
1674 | 1688 | msgstr "" |
|
1675 | 1689 | |
|
1676 | 1690 | #, python-format |
|
1691 | msgid "%s returned an error: %s" | |
|
1692 | msgstr "%s returnerede en fejl: %s" | |
|
1693 | ||
|
1694 | #, python-format | |
|
1677 | 1695 | msgid "hgcia: sending update to %s\n" |
|
1678 | 1696 | msgstr "hgcia: sender opdatering til %s\n" |
|
1679 | 1697 | |
@@ -2150,6 +2168,9 b' msgstr ""' | |||
|
2150 | 2168 | msgid "unhooked all commit hooks\n" |
|
2151 | 2169 | msgstr "" |
|
2152 | 2170 | |
|
2171 | msgid "hg keyword configuration and expansion example" | |
|
2172 | msgstr "" | |
|
2173 | ||
|
2153 | 2174 | msgid "" |
|
2154 | 2175 | "\n" |
|
2155 | 2176 | "\tkeywords expanded\n" |
@@ -2269,6 +2290,18 b' msgid ""' | |||
|
2269 | 2290 | " add known patch to applied stack qpush\n" |
|
2270 | 2291 | " remove patch from applied stack qpop\n" |
|
2271 | 2292 | " refresh contents of top applied patch qrefresh\n" |
|
2293 | "\n" | |
|
2294 | "By default, mq will automatically use git patches when required to\n" | |
|
2295 | "avoid losing file mode changes, copy records, binary files or empty\n" | |
|
2296 | "files creations or deletions. This behaviour can be configured with::\n" | |
|
2297 | "\n" | |
|
2298 | " [mq]\n" | |
|
2299 | " git = auto/keep/yes/no\n" | |
|
2300 | "\n" | |
|
2301 | "If set to 'keep', mq will obey the [diff] section configuration while\n" | |
|
2302 | "preserving existing git patches upon qrefresh. If set to 'yes' or\n" | |
|
2303 | "'no', mq will override the [diff] section and always generate git or\n" | |
|
2304 | "regular patches, possibly losing data in the second case.\n" | |
|
2272 | 2305 | msgstr "" |
|
2273 | 2306 | "håndter en stak af rettelser\n" |
|
2274 | 2307 | "\n" |
@@ -2293,6 +2326,24 b' msgstr ""' | |||
|
2293 | 2326 | " anvend og put rettelse på stakken qpush\n" |
|
2294 | 2327 | " fjern rettelse fra stakken qpop\n" |
|
2295 | 2328 | " genopfrisk indholdet af den øverste rettelse qrefresh\n" |
|
2329 | "\n" | |
|
2330 | "Som udgangspunkt vil mq automatisk bruge git rettelser når det er\n" | |
|
2331 | "nødvendigt for at undgå at miste information om ændring af\n" | |
|
2332 | "filrettigheder, information om kopier, binære filer eller oprettelse\n" | |
|
2333 | "og sletning af tomme filer. Dette kan konfigureres med::\n" | |
|
2334 | "\n" | |
|
2335 | " [mq]\n" | |
|
2336 | " git = auto/keep/yes/no\n" | |
|
2337 | "\n" | |
|
2338 | "Hvis tilvalget er sat til 'keep', så vil mq adlyde [diff] sektionen\n" | |
|
2339 | "samtidig med at den bevarer eksisterende git rettelser ved qrefresh.\n" | |
|
2340 | "Hvis det sættes til 'yes' eller 'no', så vil mq ignorere [diff]\n" | |
|
2341 | "sektionen og altid generere git eller normale rettelser, med mulighed\n" | |
|
2342 | "for tab af data i det sidste tilfælde.\n" | |
|
2343 | ||
|
2344 | #, python-format | |
|
2345 | msgid "mq.git option can be auto/keep/yes/no got %s" | |
|
2346 | msgstr "" | |
|
2296 | 2347 | |
|
2297 | 2348 | #, python-format |
|
2298 | 2349 | msgid "%s appears more than once in %s" |
@@ -2380,18 +2431,6 b' msgid "unable to read %s\\n"' | |||
|
2380 | 2431 | msgstr "kan ikke læse %s\n" |
|
2381 | 2432 | |
|
2382 | 2433 | #, python-format |
|
2383 | msgid "imported patch %s\n" | |
|
2384 | msgstr "importeret rettelse %s\n" | |
|
2385 | ||
|
2386 | #, python-format | |
|
2387 | msgid "" | |
|
2388 | "\n" | |
|
2389 | "imported patch %s" | |
|
2390 | msgstr "" | |
|
2391 | "\n" | |
|
2392 | "importeret rettelse %s" | |
|
2393 | ||
|
2394 | #, python-format | |
|
2395 | 2434 | msgid "patch %s is empty\n" |
|
2396 | 2435 | msgstr "rettelsen %s er tom\n" |
|
2397 | 2436 | |
@@ -2444,6 +2483,9 b' msgstr "\\"%s\\" kan ikke bruges som navnet p\xc3\xa5 en rettelse"' | |||
|
2444 | 2483 | msgid "patch \"%s\" already exists" |
|
2445 | 2484 | msgstr "rettelsen \"%s\" findes allerede" |
|
2446 | 2485 | |
|
2486 | msgid "cannot manage merge changesets" | |
|
2487 | msgstr "kan ikke håndtere sammenføjninger" | |
|
2488 | ||
|
2447 | 2489 | #, python-format |
|
2448 | 2490 | msgid "error unlinking %s\n" |
|
2449 | 2491 | msgstr "fejl ved sletning af %s\n" |
@@ -2707,21 +2749,27 b' msgstr ""' | |||
|
2707 | 2749 | " " |
|
2708 | 2750 | |
|
2709 | 2751 | msgid "" |
|
2710 | "init a new queue repository\n" | |
|
2752 | "init a new queue repository (DEPRECATED)\n" | |
|
2711 | 2753 | "\n" |
|
2712 | 2754 | " The queue repository is unversioned by default. If\n" |
|
2713 | 2755 | " -c/--create-repo is specified, qinit will create a separate nested\n" |
|
2714 | 2756 | " repository for patches (qinit -c may also be run later to convert\n" |
|
2715 | 2757 | " an unversioned patch repository into a versioned one). You can use\n" |
|
2716 | " qcommit to commit changes to this queue repository." | |
|
2717 | msgstr "" | |
|
2718 | "opret et nyt kø-depot\n" | |
|
2758 | " qcommit to commit changes to this queue repository.\n" | |
|
2759 | "\n" | |
|
2760 | " This command is deprecated. Without -c, it's implied by other relevant\n" | |
|
2761 | " commands. With -c, use hg init -Q instead." | |
|
2762 | msgstr "" | |
|
2763 | "opret et nyt kø-depot (FORÆLDET)\n" | |
|
2719 | 2764 | "\n" |
|
2720 | 2765 | " Kø-depotet er uversioneret som standard. Hvis -c/--create-repo\n" |
|
2721 | 2766 | " bruges, så vil qinit oprettet et separat indlejret depot til\n" |
|
2722 | 2767 | " patches (qinit -c kan også bruges senere for at konvertere et\n" |
|
2723 | 2768 | " uversioneret patch depot til et versioneret et). Du kan bruge\n" |
|
2724 | " qcommit for at deponere ændringer i dette kø-depot." | |
|
2769 | " qcommit for at deponere ændringer i dette kø-depot.\n" | |
|
2770 | "\n" | |
|
2771 | " Denne kommando er forældet. Uden -c er den kommandoen ikke\n" | |
|
2772 | " nødvendig, med -c bør hg init -Q bruges i stedet." | |
|
2725 | 2773 | |
|
2726 | 2774 | msgid "" |
|
2727 | 2775 | "clone main and patch repository at same time\n" |
@@ -2755,8 +2803,11 b' msgstr "stripper anvendte rettelser fra ' | |||
|
2755 | 2803 | msgid "updating destination repository\n" |
|
2756 | 2804 | msgstr "opdaterer destinationsdepotet\n" |
|
2757 | 2805 | |
|
2758 | msgid "commit changes in the queue repository" | |
|
2759 | msgstr "deponerer ændringer i kødepotet" | |
|
2806 | msgid "" | |
|
2807 | "commit changes in the queue repository (DEPRECATED)\n" | |
|
2808 | "\n" | |
|
2809 | " This command is deprecated; use hg -Q commit instead." | |
|
2810 | msgstr "" | |
|
2760 | 2811 | |
|
2761 | 2812 | msgid "print the entire series file" |
|
2762 | 2813 | msgstr "udskriver hele series filen" |
@@ -2909,7 +2960,7 b' msgid ""' | |||
|
2909 | 2960 | "\n" |
|
2910 | 2961 | " To set guards on another patch::\n" |
|
2911 | 2962 | "\n" |
|
2912 |
" hg qguard |
|
|
2963 | " hg qguard other.patch -- +2.6.17 -stable\n" | |
|
2913 | 2964 | " " |
|
2914 | 2965 | msgstr "" |
|
2915 | 2966 | "sæt eller vis filtre for en rettelse\n" |
@@ -2927,7 +2978,7 b' msgstr ""' | |||
|
2927 | 2978 | "\n" |
|
2928 | 2979 | " For at sætte filtre på en anden rettelse::\n" |
|
2929 | 2980 | "\n" |
|
2930 |
" hg qguard |
|
|
2981 | " hg qguard other.patch -- +2.6.17 -stable\n" | |
|
2931 | 2982 | " " |
|
2932 | 2983 | |
|
2933 | 2984 | msgid "cannot mix -l/--list with options or arguments" |
@@ -3001,11 +3052,21 b' msgstr "%s eksisterer allerede"' | |||
|
3001 | 3052 | msgid "A patch named %s already exists in the series file" |
|
3002 | 3053 | msgstr "En rettelse ved navn %s eksisterer allerede i serien" |
|
3003 | 3054 | |
|
3004 | msgid "restore the queue state saved by a revision" | |
|
3005 | msgstr "" | |
|
3006 | ||
|
3007 | msgid "save current queue state" | |
|
3008 | msgstr "gem tilstanden for den nuværende kø" | |
|
3055 | #, python-format | |
|
3056 | msgid "renaming %s to %s\n" | |
|
3057 | msgstr "omdøber %s til %s\n" | |
|
3058 | ||
|
3059 | msgid "" | |
|
3060 | "restore the queue state saved by a revision (DEPRECATED)\n" | |
|
3061 | "\n" | |
|
3062 | " This command is deprecated, use rebase --mq instead." | |
|
3063 | msgstr "" | |
|
3064 | ||
|
3065 | msgid "" | |
|
3066 | "save current queue state (DEPRECATED)\n" | |
|
3067 | "\n" | |
|
3068 | " This command is deprecated, use rebase --mq instead." | |
|
3069 | msgstr "" | |
|
3009 | 3070 | |
|
3010 | 3071 | #, python-format |
|
3011 | 3072 | msgid "destination %s exists and is not a directory" |
@@ -3174,6 +3235,9 b' msgstr "M\xc3\xa6rkaten %s overstyrer mq rettelse med samme navn\\n"' | |||
|
3174 | 3235 | msgid "cannot import over an applied patch" |
|
3175 | 3236 | msgstr "kan ikke importere henover en anvendt rettelse" |
|
3176 | 3237 | |
|
3238 | msgid "operate on patch repository" | |
|
3239 | msgstr "arbejd på rettelsesdepot" | |
|
3240 | ||
|
3177 | 3241 | msgid "print first line of patch header" |
|
3178 | 3242 | msgstr "udskriv første linie i rettelsens hoved" |
|
3179 | 3243 | |
@@ -3234,8 +3298,8 b' msgstr "vis alle rettelser og filtre"' | |||
|
3234 | 3298 | msgid "drop all guards" |
|
3235 | 3299 | msgstr "drop alle filtre" |
|
3236 | 3300 | |
|
3237 |
msgid "hg qguard [-l] [-n] |
|
|
3238 |
msgstr "hg qguard [-l] [-n] |
|
|
3301 | msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" | |
|
3302 | msgstr "hg qguard [-l] [-n] [RETTELSE] [-- [+VAGT]... [-VAGT]...]" | |
|
3239 | 3303 | |
|
3240 | 3304 | msgid "hg qheader [PATCH]" |
|
3241 | 3305 | msgstr "hg qheader [RETTELSE]" |
@@ -3267,8 +3331,8 b' msgstr "opret k\xc3\xb8-repository"' | |||
|
3267 | 3331 | msgid "hg qinit [-c]" |
|
3268 | 3332 | msgstr "hg qinit [-c]" |
|
3269 | 3333 | |
|
3270 |
msgid "import uncommitted changes |
|
|
3271 |
msgstr "importer |
|
|
3334 | msgid "import uncommitted changes (DEPRECATED)" | |
|
3335 | msgstr "importer udeponerede ændringer (FORÆLDET)" | |
|
3272 | 3336 | |
|
3273 | 3337 | msgid "add \"From: <current user>\" to patch" |
|
3274 | 3338 | msgstr "tilføj \"From: <aktuel bruger>\" til rettelsen" |
@@ -3294,7 +3358,7 b' msgstr "hg qprev [-s]"' | |||
|
3294 | 3358 | msgid "pop all patches" |
|
3295 | 3359 | msgstr "fjern alle rettelser" |
|
3296 | 3360 | |
|
3297 | msgid "queue name to pop" | |
|
3361 | msgid "queue name to pop (DEPRECATED)" | |
|
3298 | 3362 | msgstr "" |
|
3299 | 3363 | |
|
3300 | 3364 | msgid "forget any local changes to patched files" |
@@ -3312,11 +3376,11 b' msgstr ""' | |||
|
3312 | 3376 | msgid "apply all patches" |
|
3313 | 3377 | msgstr "anvend alle rettelser" |
|
3314 | 3378 | |
|
3315 | msgid "merge from another queue" | |
|
3316 | msgstr "" | |
|
3317 | ||
|
3318 | msgid "merge queue name" | |
|
3319 | msgstr "" | |
|
3379 | msgid "merge from another queue (DEPRECATED)" | |
|
3380 | msgstr "sammenføj med en anden kø (FORÆLDET)" | |
|
3381 | ||
|
3382 | msgid "merge queue name (DEPRECATED)" | |
|
3383 | msgstr "sammenføj med navngiven kø (FORÆLDET)" | |
|
3320 | 3384 | |
|
3321 | 3385 | msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" |
|
3322 | 3386 | msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [RETTELSE | INDEKS]" |
@@ -3618,6 +3682,9 b' msgid ""' | |||
|
3618 | 3682 | " cc = cc1, cc2, ...\n" |
|
3619 | 3683 | " bcc = bcc1, bcc2, ...\n" |
|
3620 | 3684 | "\n" |
|
3685 | "Use ``[patchbomb]`` as configuration section name if you need to\n" | |
|
3686 | "override global ``[email]`` address settings.\n" | |
|
3687 | "\n" | |
|
3621 | 3688 | "Then you can use the \"hg email\" command to mail a series of changesets\n" |
|
3622 | 3689 | "as a patchbomb.\n" |
|
3623 | 3690 | "\n" |
@@ -3827,6 +3894,30 b' msgstr "send en introduktionsmail for en' | |||
|
3827 | 3894 | msgid "hg email [OPTION]... [DEST]..." |
|
3828 | 3895 | msgstr "hg email [TILVALG]... [MÅL]..." |
|
3829 | 3896 | |
|
3897 | msgid "" | |
|
3898 | "show progress bars for some actions\n" | |
|
3899 | "\n" | |
|
3900 | "This extension uses the progress information logged by hg commands\n" | |
|
3901 | "to draw progress bars that are as informative as possible. Some progress\n" | |
|
3902 | "bars only offer indeterminate information, while others have a definite\n" | |
|
3903 | "end point.\n" | |
|
3904 | "\n" | |
|
3905 | "The following settings are available::\n" | |
|
3906 | "\n" | |
|
3907 | " [progress]\n" | |
|
3908 | " delay = 3 # number of seconds (float) before showing the progress bar\n" | |
|
3909 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" | |
|
3910 | " format = topic bar number # format of the progress bar\n" | |
|
3911 | " width = <none> # if set, the maximum width of the progress information\n" | |
|
3912 | " # (that is, min(width, term width) will be used)\n" | |
|
3913 | " clear-complete = True # clear the progress bar after it's done\n" | |
|
3914 | "\n" | |
|
3915 | "Valid entries for the format field are topic, bar, number, unit, and\n" | |
|
3916 | "item. item defaults to the last 20 characters of the item, but this\n" | |
|
3917 | "can be changed by adding either ``-<num>`` which would take the last\n" | |
|
3918 | "num characters, or ``+<num>`` for the first num characters.\n" | |
|
3919 | msgstr "" | |
|
3920 | ||
|
3830 | 3921 | msgid "command to delete untracked files from the working directory" |
|
3831 | 3922 | msgstr "kommando til at slette filer fra arbejdskataloget som ikke følges" |
|
3832 | 3923 | |
@@ -3924,18 +4015,34 b' msgstr "abort og continue kan ikke angiv' | |||
|
3924 | 4015 | msgid "cannot use collapse with continue or abort" |
|
3925 | 4016 | msgstr "continue eller abort kan ikke angives samtidig med collapse" |
|
3926 | 4017 | |
|
4018 | msgid "cannot use detach with continue or abort" | |
|
4019 | msgstr "continue eller abort kan ikke angives samtidig med detach" | |
|
4020 | ||
|
3927 | 4021 | msgid "abort and continue do not allow specifying revisions" |
|
3928 | 4022 | msgstr "abort og continue tillader ikke at der angives revisioner" |
|
3929 | 4023 | |
|
3930 | 4024 | msgid "cannot specify both a revision and a base" |
|
3931 | 4025 | msgstr "man kan ikke angive både en revision og en basis" |
|
3932 | 4026 | |
|
4027 | msgid "detach requires a revision to be specified" | |
|
4028 | msgstr "der skal angives en revision til detach" | |
|
4029 | ||
|
4030 | msgid "cannot specify a base with detach" | |
|
4031 | msgstr "kan ikke angive --rev og --change på samme tid" | |
|
4032 | ||
|
3933 | 4033 | msgid "nothing to rebase\n" |
|
3934 | 4034 | msgstr "" |
|
3935 | 4035 | |
|
3936 | 4036 | msgid "cannot use both keepbranches and extrafn" |
|
3937 | 4037 | msgstr "man kan ikke bruge både keepbranches og extrafn" |
|
3938 | 4038 | |
|
4039 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | |
|
4040 | msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue" | |
|
4041 | ||
|
4042 | #, python-format | |
|
4043 | msgid "no changes, revision %d skipped\n" | |
|
4044 | msgstr "ingen ændringer, revision %d sprunget over\n" | |
|
4045 | ||
|
3939 | 4046 | msgid "rebase merging completed\n" |
|
3940 | 4047 | msgstr "" |
|
3941 | 4048 | |
@@ -3949,12 +4056,8 b' msgstr ""' | |||
|
3949 | 4056 | msgid "%d revisions have been skipped\n" |
|
3950 | 4057 | msgstr "sprang %d revisioner over\n" |
|
3951 | 4058 | |
|
3952 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | |
|
3953 | msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue" | |
|
3954 | ||
|
3955 | #, python-format | |
|
3956 | msgid "no changes, revision %d skipped\n" | |
|
3957 | msgstr "ingen ændringer, revision %d sprunget over\n" | |
|
4059 | msgid "unable to collapse, there is more than one external parent" | |
|
4060 | msgstr "" | |
|
3958 | 4061 | |
|
3959 | 4062 | #, python-format |
|
3960 | 4063 | msgid "cannot use revision %d as base, result would have 3 parents" |
@@ -3978,9 +4081,6 b' msgstr "kilden er forfader til destinati' | |||
|
3978 | 4081 | msgid "source is descendant of destination" |
|
3979 | 4082 | msgstr "kilden nedstammer fra destinationen" |
|
3980 | 4083 | |
|
3981 | msgid "unable to collapse, there is more than one external parent" | |
|
3982 | msgstr "" | |
|
3983 | ||
|
3984 | 4084 | msgid "rebase working directory to branch head" |
|
3985 | 4085 | msgstr "" |
|
3986 | 4086 | |
@@ -4002,6 +4102,9 b' msgstr "behold de originale \xc3\xa6ndringer"' | |||
|
4002 | 4102 | msgid "keep original branch names" |
|
4003 | 4103 | msgstr "behold originale grennavne" |
|
4004 | 4104 | |
|
4105 | msgid "force detaching of source from its original branch" | |
|
4106 | msgstr "" | |
|
4107 | ||
|
4005 | 4108 | msgid "continue an interrupted rebase" |
|
4006 | 4109 | msgstr "" |
|
4007 | 4110 | |
@@ -4009,11 +4112,9 b' msgid "abort an interrupted rebase"' | |||
|
4009 | 4112 | msgstr "" |
|
4010 | 4113 | |
|
4011 | 4114 | msgid "" |
|
4012 |
"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [-- |
|
|
4013 | "| [-c] | [-a]" | |
|
4014 | msgstr "" | |
|
4015 | "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " | |
|
4016 | "| [-c] | [-a]" | |
|
4115 | "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--" | |
|
4116 | "keepbranches] | [-c] | [-a]" | |
|
4117 | msgstr "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]" | |
|
4017 | 4118 | |
|
4018 | 4119 | msgid "commands to interactively select changes for commit/qrefresh" |
|
4019 | 4120 | msgstr "" |
@@ -4172,6 +4273,9 b' msgid ""' | |||
|
4172 | 4273 | " " |
|
4173 | 4274 | msgstr "" |
|
4174 | 4275 | |
|
4276 | msgid "hardlinks are not supported on this system" | |
|
4277 | msgstr "Hårde lænker er ikke supporteret på dette system" | |
|
4278 | ||
|
4175 | 4279 | #, python-format |
|
4176 | 4280 | msgid "relinking %s to %s\n" |
|
4177 | 4281 | msgstr "" |
@@ -4250,8 +4354,15 b' msgid ""' | |||
|
4250 | 4354 | " Initialize a new repository and working directory that shares its\n" |
|
4251 | 4355 | " history with another repository.\n" |
|
4252 | 4356 | "\n" |
|
4253 | " NOTE: actions that change history such as rollback or moving the\n" | |
|
4254 | " source may confuse sharers.\n" | |
|
4357 | " NOTE: using rollback or extensions that destroy/modify history\n" | |
|
4358 | " (mq, rebase, etc.) can cause considerable confusion with shared\n" | |
|
4359 | " clones. In particular, if two shared clones are both updated to\n" | |
|
4360 | " the same changeset, and one of them destroys that changeset with\n" | |
|
4361 | " rollback, the other clone will suddenly stop working: all\n" | |
|
4362 | " operations will fail with \"abort: working directory has unknown\n" | |
|
4363 | " parent\". The only known workaround is to use debugsetparents on\n" | |
|
4364 | " the broken clone to reset it to a changeset that still exists\n" | |
|
4365 | " (e.g. tip).\n" | |
|
4255 | 4366 | " " |
|
4256 | 4367 | msgstr "" |
|
4257 | 4368 | |
@@ -4317,9 +4428,22 b' msgstr ""' | |||
|
4317 | 4428 | msgid "commit failed" |
|
4318 | 4429 | msgstr "deponering fejlede" |
|
4319 | 4430 | |
|
4431 | msgid "" | |
|
4432 | "y: transplant this changeset\n" | |
|
4433 | "n: skip this changeset\n" | |
|
4434 | "m: merge at this changeset\n" | |
|
4435 | "p: show patch\n" | |
|
4436 | "c: commit selected changesets\n" | |
|
4437 | "q: cancel transplant\n" | |
|
4438 | "?: show this help\n" | |
|
4439 | msgstr "" | |
|
4440 | ||
|
4320 | 4441 | msgid "apply changeset? [ynmpcq?]:" |
|
4321 | 4442 | msgstr "" |
|
4322 | 4443 | |
|
4444 | msgid "no such option\n" | |
|
4445 | msgstr "tilvalget findes ikke\n" | |
|
4446 | ||
|
4323 | 4447 | msgid "" |
|
4324 | 4448 | "transplant changesets from another branch\n" |
|
4325 | 4449 | "\n" |
@@ -4580,6 +4704,10 b' msgstr "tomt brugernavn"' | |||
|
4580 | 4704 | msgid "username %s contains a newline" |
|
4581 | 4705 | msgstr "brugernavn %s indeholder et linieskift" |
|
4582 | 4706 | |
|
4707 | #, python-format | |
|
4708 | msgid "the name '%s' is reserved" | |
|
4709 | msgstr "navnet '%s' er reserveret" | |
|
4710 | ||
|
4583 | 4711 | msgid "options --message and --logfile are mutually exclusive" |
|
4584 | 4712 | msgstr "" |
|
4585 | 4713 | |
@@ -4670,6 +4798,9 b' msgstr "ingen filer at kopiere"' | |||
|
4670 | 4798 | msgid "(consider using --after)\n" |
|
4671 | 4799 | msgstr "(overvej at bruge --after)\n" |
|
4672 | 4800 | |
|
4801 | msgid "child process failed to start" | |
|
4802 | msgstr "" | |
|
4803 | ||
|
4673 | 4804 | #, python-format |
|
4674 | 4805 | msgid "changeset: %d:%s\n" |
|
4675 | 4806 | msgstr "ændring: %d:%s\n" |
@@ -4798,6 +4929,20 b' msgid ""' | |||
|
4798 | 4929 | " undo an add before that, see hg forget.\n" |
|
4799 | 4930 | "\n" |
|
4800 | 4931 | " If no names are given, add all files to the repository.\n" |
|
4932 | "\n" | |
|
4933 | " .. container:: verbose\n" | |
|
4934 | "\n" | |
|
4935 | " An example showing how new (unknown) files are added\n" | |
|
4936 | " automatically by ``hg add``::\n" | |
|
4937 | "\n" | |
|
4938 | " $ ls\n" | |
|
4939 | " foo.c\n" | |
|
4940 | " $ hg status\n" | |
|
4941 | " ? foo.c\n" | |
|
4942 | " $ hg add\n" | |
|
4943 | " adding foo.c\n" | |
|
4944 | " $ hg status\n" | |
|
4945 | " A foo.c\n" | |
|
4801 | 4946 | " " |
|
4802 | 4947 | msgstr "" |
|
4803 | 4948 | "tilføj de angivne filer ved næste deponering\n" |
@@ -4809,6 +4954,20 b' msgstr ""' | |||
|
4809 | 4954 | "\n" |
|
4810 | 4955 | " Hvis der ikke er angivet nogen navne tilføjes alle filer til\n" |
|
4811 | 4956 | " depotet.\n" |
|
4957 | "\n" | |
|
4958 | " .. container:: verbose\n" | |
|
4959 | "\n" | |
|
4960 | " An example showing how new (unknown) files are added\n" | |
|
4961 | " automatically by ``hg add``::\n" | |
|
4962 | "\n" | |
|
4963 | " $ ls\n" | |
|
4964 | " foo.c\n" | |
|
4965 | " $ hg status\n" | |
|
4966 | " ? foo.c\n" | |
|
4967 | " $ hg add\n" | |
|
4968 | " adding foo.c\n" | |
|
4969 | " $ hg status\n" | |
|
4970 | " A foo.c\n" | |
|
4812 | 4971 | " " |
|
4813 | 4972 | |
|
4814 | 4973 | msgid "" |
@@ -5153,8 +5312,8 b' msgid ""' | |||
|
5153 | 5312 | " Generate a compressed changegroup file collecting changesets not\n" |
|
5154 | 5313 | " known to be in another repository.\n" |
|
5155 | 5314 | "\n" |
|
5156 |
" If |
|
|
5157 |
" |
|
|
5315 | " If you omit the destination repository, then hg assumes the\n" | |
|
5316 | " destination will have all the nodes you specify with --base\n" | |
|
5158 | 5317 | " parameters. To create a bundle containing all changesets, use\n" |
|
5159 | 5318 | " -a/--all (or --base null).\n" |
|
5160 | 5319 | "\n" |
@@ -5235,7 +5394,9 b' msgid ""' | |||
|
5235 | 5394 | "\n" |
|
5236 | 5395 | " a) the changeset, tag or branch specified with -u/--updaterev\n" |
|
5237 | 5396 | " b) the changeset, tag or branch given with the first -r/--rev\n" |
|
5238 |
" c) the |
|
|
5397 | " c) the branch given with the first -b/--branch\n" | |
|
5398 | " d) the branch given with the url#branch source syntax\n" | |
|
5399 | " e) the head of the default branch\n" | |
|
5239 | 5400 | "\n" |
|
5240 | 5401 | " Use 'hg clone -u . src dst' to checkout the source repository's\n" |
|
5241 | 5402 | " parent changeset (applicable for local source repositories only).\n" |
@@ -5297,7 +5458,9 b' msgstr ""' | |||
|
5297 | 5458 | " -u/--updaterev\n" |
|
5298 | 5459 | " b) ændringen, mærkaten eller grenen angivet med den første\n" |
|
5299 | 5460 | " -r/--rev\n" |
|
5300 | " c) hovedet af default grenen\n" | |
|
5461 | " c) grenen angivet med det første -b/--branch tilvalg\n" | |
|
5462 | " d) grenen angivet ved url#gren syntaksen\n" | |
|
5463 | " e) hovedet af default grenen\n" | |
|
5301 | 5464 | "\n" |
|
5302 | 5465 | " Brug 'hg clone -u . kilde destination' for at hente ændringen i\n" |
|
5303 | 5466 | " kildedepotet ud i destinations depotet (kan kun anvendes ved\n" |
@@ -5592,6 +5755,9 b' msgid ""' | |||
|
5592 | 5755 | " revisions are specified, the working directory files are compared\n" |
|
5593 | 5756 | " to its parent.\n" |
|
5594 | 5757 | "\n" |
|
5758 | " Alternatively you can specify -c/--change with a revision to see\n" | |
|
5759 | " the changes in that changeset relative to its first parent.\n" | |
|
5760 | "\n" | |
|
5595 | 5761 | " Without the -a/--text option, diff will avoid generating diffs of\n" |
|
5596 | 5762 | " files it detects as binary. With -a, diff will generate a diff\n" |
|
5597 | 5763 | " anyway, probably with undesirable results.\n" |
@@ -5616,6 +5782,9 b' msgstr ""' | |||
|
5616 | 5782 | " denne revision med arbejdskataloget, og når der ikke angives nogen\n" |
|
5617 | 5783 | " revisioner, så sammenlignes arbejdskataloget med dennes forælder.\n" |
|
5618 | 5784 | "\n" |
|
5785 | " Du kan alternativt angive -c/--change med en revision for at se\n" | |
|
5786 | " ændringerne i den revision relativt til dens første forælder.\n" | |
|
5787 | "\n" | |
|
5619 | 5788 | " Uden -a/--text tilvalget vil diff undgå at generere ændringer for\n" |
|
5620 | 5789 | " filer som den detekterer som binære. Med -a vil diff generere\n" |
|
5621 | 5790 | " ændringer alligevel, sandsynligvis med uønskede resultater.\n" |
@@ -5629,8 +5798,9 b' msgid ""' | |||
|
5629 | 5798 | "\n" |
|
5630 | 5799 | " Print the changeset header and diffs for one or more revisions.\n" |
|
5631 | 5800 | "\n" |
|
5632 | " The information shown in the changeset header is: author,\n" | |
|
5633 |
" changeset hash, parent(s) and commit |
|
|
5801 | " The information shown in the changeset header is: author, date,\n" | |
|
5802 | " branch name (if non-default), changeset hash, parent(s) and commit\n" | |
|
5803 | " comment.\n" | |
|
5634 | 5804 | "\n" |
|
5635 | 5805 | " NOTE: export may generate unexpected diff output for merge\n" |
|
5636 | 5806 | " changesets, as it will compare the merge changeset against its\n" |
@@ -5664,8 +5834,9 b' msgstr ""' | |||
|
5664 | 5834 | " Udskriv ændrings-hovedet og ændringerne for en eller flere\n" |
|
5665 | 5835 | " revisioner.\n" |
|
5666 | 5836 | "\n" |
|
5667 | " Informationen som vises i ændrings-hovedet er: forfatter,\n" | |
|
5668 | " ændringshash, forældrene og deponeringsbeskeden.\n" | |
|
5837 | " Informationen som vises i ændrings-hovedet er: forfatter, dato,\n" | |
|
5838 | " grennavn (hvis forskellig fra default), ændringshash, forældrene\n" | |
|
5839 | " og deponeringsbeskeden.\n" | |
|
5669 | 5840 | "\n" |
|
5670 | 5841 | " BEMÆRK: export kan generere uventet diff uddata for\n" |
|
5671 | 5842 | " sammenføjningsændringer idet den kun vil sammenligne\n" |
@@ -5761,44 +5932,35 b' msgstr "grep: ugyldigt s\xc3\xb8gem\xc3\xb8nster: %s\\n"' | |||
|
5761 | 5932 | msgid "" |
|
5762 | 5933 | "show current repository heads or show branch heads\n" |
|
5763 | 5934 | "\n" |
|
5764 |
" With no arguments, show all repository head |
|
|
5935 | " With no arguments, show all repository branch heads.\n" | |
|
5765 | 5936 | "\n" |
|
5766 | 5937 | " Repository \"heads\" are changesets with no child changesets. They are\n" |
|
5767 | 5938 | " where development generally takes place and are the usual targets\n" |
|
5768 | " for update and merge operations.\n" | |
|
5769 | "\n" | |
|
5770 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
5771 | " the named branch associated with the specified changeset(s).\n" | |
|
5772 | "\n" | |
|
5773 | " Branch heads are changesets on a named branch with no descendants on\n" | |
|
5774 | " the same branch. A branch head could be a \"true\" (repository) head,\n" | |
|
5775 | " or it could be the last changeset on that branch before it was\n" | |
|
5776 | " merged into another branch, or it could be the last changeset on the\n" | |
|
5777 | " branch before a new branch was created. If none of the branch heads\n" | |
|
5778 | " are true heads, the branch is considered inactive.\n" | |
|
5939 | " for update and merge operations. Branch heads are changesets that have\n" | |
|
5940 | " no child changeset on the same branch.\n" | |
|
5941 | "\n" | |
|
5942 | " If one or more REVs are given, only branch heads on the branches\n" | |
|
5943 | " associated with the specified changesets are shown.\n" | |
|
5779 | 5944 | "\n" |
|
5780 | 5945 | " If -c/--closed is specified, also show branch heads marked closed\n" |
|
5781 | 5946 | " (see hg commit --close-branch).\n" |
|
5782 | 5947 | "\n" |
|
5783 | 5948 | " If STARTREV is specified, only those heads that are descendants of\n" |
|
5784 | 5949 | " STARTREV will be displayed.\n" |
|
5785 | " " | |
|
5786 | msgstr "" | |
|
5787 | ||
|
5788 | msgid "you must specify a branch to use --closed" | |
|
5789 | msgstr "" | |
|
5790 | ||
|
5791 | #, python-format | |
|
5792 | msgid "no open branch heads on branch %s\n" | |
|
5793 | msgstr "ingen åbne gren-hoveder på gren %s\n" | |
|
5794 | ||
|
5795 | #, python-format | |
|
5796 | msgid "no changes on branch %s containing %s are reachable from %s\n" | |
|
5797 | msgstr "ingen ændringer på gren %s som indeholder %s kan nås fra %s\n" | |
|
5798 | ||
|
5799 | #, python-format | |
|
5800 | msgid "no changes on branch %s are reachable from %s\n" | |
|
5801 | msgstr "ingen ændringer på gren %s kan nås fra %s\n" | |
|
5950 | "\n" | |
|
5951 | " If -t/--topo is specified, named branch mechanics will be ignored and " | |
|
5952 | "only\n" | |
|
5953 | " changesets without children will be shown.\n" | |
|
5954 | " " | |
|
5955 | msgstr "" | |
|
5956 | ||
|
5957 | #, python-format | |
|
5958 | msgid "no open branch heads found on branches %s" | |
|
5959 | msgstr "fandt ingen åbne gren-hoveder på grenene %s" | |
|
5960 | ||
|
5961 | #, python-format | |
|
5962 | msgid " (started at %s)" | |
|
5963 | msgstr " (startet ved %s)" | |
|
5802 | 5964 | |
|
5803 | 5965 | msgid "" |
|
5804 | 5966 | "show help for a given topic or a help overview\n" |
@@ -5846,6 +6008,12 b' msgstr ""' | |||
|
5846 | 6008 | msgid "(no help text available)" |
|
5847 | 6009 | msgstr "(ingen hjælpetekst tilgængelig)" |
|
5848 | 6010 | |
|
6011 | #, python-format | |
|
6012 | msgid "" | |
|
6013 | "\n" | |
|
6014 | "use \"hg -v help %s\" to show verbose help\n" | |
|
6015 | msgstr "\nbrug \"hg -v help %s\" for at se udførlig hjælp\n" | |
|
6016 | ||
|
5849 | 6017 | msgid "options:\n" |
|
5850 | 6018 | msgstr "valgmuligheder:\n" |
|
5851 | 6019 | |
@@ -5863,6 +6031,13 b' msgstr ""' | |||
|
5863 | 6031 | "%s udvidelse - %s\n" |
|
5864 | 6032 | "\n" |
|
5865 | 6033 | |
|
6034 | msgid "use \"hg help extensions\" for information on enabling extensions\n" | |
|
6035 | msgstr "" | |
|
6036 | ||
|
6037 | #, python-format | |
|
6038 | msgid "'%s' is provided by the following extension:" | |
|
6039 | msgstr "" | |
|
6040 | ||
|
5866 | 6041 | msgid "Mercurial Distributed SCM\n" |
|
5867 | 6042 | msgstr "Mercurial Distribueret SCM\n" |
|
5868 | 6043 | |
@@ -5940,11 +6115,8 b' msgid ""' | |||
|
5940 | 6115 | " " |
|
5941 | 6116 | msgstr "" |
|
5942 | 6117 | |
|
5943 | msgid "applying patch from stdin\n" | |
|
5944 | msgstr "anvender rettelse fra standardinddata\n" | |
|
5945 | ||
|
5946 | msgid "no diffs found" | |
|
5947 | msgstr "fandt ingen ændringer" | |
|
6118 | msgid "to working directory" | |
|
6119 | msgstr "til arbejdskatalog" | |
|
5948 | 6120 | |
|
5949 | 6121 | msgid "not a Mercurial patch" |
|
5950 | 6122 | msgstr "ikke en Mercurial patch" |
@@ -5952,6 +6124,16 b' msgstr "ikke en Mercurial patch"' | |||
|
5952 | 6124 | msgid "patch is damaged or loses information" |
|
5953 | 6125 | msgstr "rettelsen er beskadiget eller mister information" |
|
5954 | 6126 | |
|
6127 | msgid "applying patch from stdin\n" | |
|
6128 | msgstr "anvender rettelse fra standardinddata\n" | |
|
6129 | ||
|
6130 | #, python-format | |
|
6131 | msgid "applied %s\n" | |
|
6132 | msgstr "anvendte %s\n" | |
|
6133 | ||
|
6134 | msgid "no diffs found" | |
|
6135 | msgstr "fandt ingen ændringer" | |
|
6136 | ||
|
5955 | 6137 | msgid "" |
|
5956 | 6138 | "show new changesets found in source\n" |
|
5957 | 6139 | "\n" |
@@ -6113,13 +6295,18 b' msgstr ""' | |||
|
6113 | 6295 | " " |
|
6114 | 6296 | |
|
6115 | 6297 | #, python-format |
|
6116 | msgid "branch '%s' has %d heads - please merge with an explicit rev" | |
|
6117 | msgstr "" | |
|
6118 | "gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision" | |
|
6119 | ||
|
6120 | #, python-format | |
|
6121 | msgid "branch '%s' has one head - please merge with an explicit rev" | |
|
6122 | msgstr "gren '%s' har et hoved - sammenføj venligst med en eksplicit revision" | |
|
6298 | msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" | |
|
6299 | msgstr "afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision\n" | |
|
6300 | ||
|
6301 | msgid "(run 'hg heads .' to see heads)\n" | |
|
6302 | msgstr "(kør 'hg heads .' for at se hoveder)\n" | |
|
6303 | ||
|
6304 | #, python-format | |
|
6305 | msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" | |
|
6306 | msgstr "afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit revision\n" | |
|
6307 | ||
|
6308 | msgid "(run 'hg heads' to see all heads)\n" | |
|
6309 | msgstr "(kør 'hg heads' for at se alle hoveder)\n" | |
|
6123 | 6310 | |
|
6124 | 6311 | msgid "there is nothing to merge" |
|
6125 | 6312 | msgstr "der er ikke noget at sammenføje" |
@@ -6136,13 +6323,13 b' msgstr ""' | |||
|
6136 | 6323 | "sammenføj med en eksplicit revision" |
|
6137 | 6324 | |
|
6138 | 6325 | msgid "" |
|
6139 | "show changesets not found in destination\n" | |
|
6326 | "show changesets not found in the destination\n" | |
|
6140 | 6327 | "\n" |
|
6141 | 6328 | " Show changesets not found in the specified destination repository\n" |
|
6142 | 6329 | " or the default push location. These are the changesets that would\n" |
|
6143 | 6330 | " be pushed if a push was requested.\n" |
|
6144 | 6331 | "\n" |
|
6145 |
" See pull for valid destination format |
|
|
6332 | " See pull for details of valid destination formats.\n" | |
|
6146 | 6333 | " " |
|
6147 | 6334 | msgstr "" |
|
6148 | 6335 | |
@@ -6237,7 +6424,7 b' msgstr ""' | |||
|
6237 | 6424 | msgid "" |
|
6238 | 6425 | "push changes to the specified destination\n" |
|
6239 | 6426 | "\n" |
|
6240 |
" Push changes from the local repository to the |
|
|
6427 | " Push changes from the local repository to the specified destination.\n" | |
|
6241 | 6428 | "\n" |
|
6242 | 6429 | " This is the symmetrical operation for pull. It moves changes from\n" |
|
6243 | 6430 | " the current repository to a different one. If the destination is\n" |
@@ -6257,7 +6444,8 b' msgid ""' | |||
|
6257 | 6444 | msgstr "" |
|
6258 | 6445 | "skub ændringer til den angivne destination\n" |
|
6259 | 6446 | "\n" |
|
6260 |
" Skubber ændringer fra det lokale depot til den givne |
|
|
6447 | " Skubber ændringer fra det lokale depot til den angivne\n" | |
|
6448 | " destination.\n" | |
|
6261 | 6449 | "\n" |
|
6262 | 6450 | " Dette er den symmetriske operation for pull. Den flytter ændringer\n" |
|
6263 | 6451 | " fra det nuværende depot til et andet. Hvis destinationen er lokal,\n" |
@@ -6387,7 +6575,7 b' msgid ""' | |||
|
6387 | 6575 | " will be overwritten if the merge is retried with resolve. The\n" |
|
6388 | 6576 | " -m/--mark switch should be used to mark the file as resolved.\n" |
|
6389 | 6577 | "\n" |
|
6390 | " You can specify a set of files to operate on, or use the -a/-all\n" | |
|
6578 | " You can specify a set of files to operate on, or use the -a/--all\n" | |
|
6391 | 6579 | " switch to select all unresolved files.\n" |
|
6392 | 6580 | "\n" |
|
6393 | 6581 | " This command also allows listing resolved files and manually\n" |
@@ -6422,8 +6610,8 b' msgid ""' | |||
|
6422 | 6610 | " to the contents they had in the parent of the working directory.\n" |
|
6423 | 6611 | " This restores the contents of the affected files to an unmodified\n" |
|
6424 | 6612 | " state and unschedules adds, removes, copies, and renames. If the\n" |
|
6425 |
" working directory has two parents, you must explicitly specify |
|
|
6426 |
" revision |
|
|
6613 | " working directory has two parents, you must explicitly specify a\n" | |
|
6614 | " revision.\n" | |
|
6427 | 6615 | "\n" |
|
6428 | 6616 | " Using the -r/--rev option, revert the given files or directories\n" |
|
6429 | 6617 | " to their contents as of a specific revision. This can be helpful\n" |
@@ -6496,7 +6684,7 b' msgid ""' | |||
|
6496 | 6684 | " - commit\n" |
|
6497 | 6685 | " - import\n" |
|
6498 | 6686 | " - pull\n" |
|
6499 | " - push (with this repository as destination)\n" | |
|
6687 | " - push (with this repository as the destination)\n" | |
|
6500 | 6688 | " - unbundle\n" |
|
6501 | 6689 | "\n" |
|
6502 | 6690 | " This command is not intended for use on public repositories. Once\n" |
@@ -6728,10 +6916,6 b' msgstr ""' | |||
|
6728 | 6916 | msgid "tag names must be unique" |
|
6729 | 6917 | msgstr "mærkatnavne skal være unikke" |
|
6730 | 6918 | |
|
6731 | #, python-format | |
|
6732 | msgid "the name '%s' is reserved" | |
|
6733 | msgstr "navnet '%s' er reserveret" | |
|
6734 | ||
|
6735 | 6919 | msgid "--rev and --remove are incompatible" |
|
6736 | 6920 | msgstr "--rev og --remove er inkompatible" |
|
6737 | 6921 | |
@@ -6919,8 +7103,8 b' msgstr "undertryk output"' | |||
|
6919 | 7103 | msgid "enable additional output" |
|
6920 | 7104 | msgstr "aktiver yderlig output" |
|
6921 | 7105 | |
|
6922 | msgid "set/override config option" | |
|
6923 | msgstr "sæt/overskriv konfigurationopsætning" | |
|
7106 | msgid "set/override config option (use 'section.name=value')" | |
|
7107 | msgstr "angiv eller overskriv tilvalg (brug 'sektion.navn=værdi')" | |
|
6924 | 7108 | |
|
6925 | 7109 | msgid "enable debugging output" |
|
6926 | 7110 | msgstr "aktiver fejlsøgningsinformation" |
@@ -6988,7 +7172,7 b' msgstr "vis ikke sammenf\xc3\xb8jninger"' | |||
|
6988 | 7172 | msgid "treat all files as text" |
|
6989 | 7173 | msgstr "behandl alle filer som tekst" |
|
6990 | 7174 | |
|
6991 |
msgid " |
|
|
7175 | msgid "omit dates from diff headers" | |
|
6992 | 7176 | msgstr "inkluder ikke datoer i diff-hoveder" |
|
6993 | 7177 | |
|
6994 | 7178 | msgid "show which function each change is in" |
@@ -7021,12 +7205,18 b' msgstr "[TILVALG]... [FIL]..."' | |||
|
7021 | 7205 | msgid "annotate the specified revision" |
|
7022 | 7206 | msgstr "annotér den angivne revision" |
|
7023 | 7207 | |
|
7024 |
msgid "follow |
|
|
7025 | msgstr "følg kopier og omdøbninger" | |
|
7208 | msgid "follow copies and renames (DEPRECATED)" | |
|
7209 | msgstr "følg kopier og omdøbninger (FORÆLDET)" | |
|
7210 | ||
|
7211 | msgid "don't follow copies and renames" | |
|
7212 | msgstr "følg ikke kopier og omdøbninger" | |
|
7026 | 7213 | |
|
7027 | 7214 | msgid "list the author (long with -v)" |
|
7028 | 7215 | msgstr "vis forfatteren (lang med -v)" |
|
7029 | 7216 | |
|
7217 | msgid "list the filename" | |
|
7218 | msgstr "vis filnavnet" | |
|
7219 | ||
|
7030 | 7220 | msgid "list the date (short with -q)" |
|
7031 | 7221 | msgstr "vis datoen (kort med -q)" |
|
7032 | 7222 | |
@@ -7108,13 +7298,16 b' msgstr "vis normale og lukkede grene"' | |||
|
7108 | 7298 | msgid "[-ac]" |
|
7109 | 7299 | msgstr "[-ac]" |
|
7110 | 7300 | |
|
7111 |
msgid "run even when |
|
|
7301 | msgid "run even when the destination is unrelated" | |
|
7112 | 7302 | msgstr "kør selv hvis fjerndepotet er urelateret" |
|
7113 | 7303 | |
|
7114 | msgid "a changeset up to which you would like to bundle" | |
|
7115 | msgstr "" | |
|
7116 | ||
|
7117 | msgid "a base changeset to specify instead of a destination" | |
|
7304 | msgid "a changeset intended to be added to the destination" | |
|
7305 | msgstr "" | |
|
7306 | ||
|
7307 | msgid "a specific branch you would like to bundle" | |
|
7308 | msgstr "en bestemt gren som du gerne vil pakke sammen" | |
|
7309 | ||
|
7310 | msgid "a base changeset assumed to be available at the destination" | |
|
7118 | 7311 | msgstr "" |
|
7119 | 7312 | |
|
7120 | 7313 | msgid "bundle all changesets in the repository" |
@@ -7138,14 +7331,17 b' msgstr ""' | |||
|
7138 | 7331 | msgid "[OPTION]... FILE..." |
|
7139 | 7332 | msgstr "[TILVALG]... FIL..." |
|
7140 | 7333 | |
|
7141 |
msgid "the clone will |
|
|
7142 |
msgstr "klonen vil |
|
|
7334 | msgid "the clone will include an empty working copy (only a repository)" | |
|
7335 | msgstr "klonen vil indeholde et tomt arbejdsbibliotek (kun et depot)" | |
|
7143 | 7336 | |
|
7144 | 7337 | msgid "revision, tag or branch to check out" |
|
7145 | 7338 | msgstr "revision, mærkat eller gren som skal hentes ud" |
|
7146 | 7339 | |
|
7147 |
msgid " |
|
|
7148 | msgstr "klon kun de specificerede revisioner og deres forfædre" | |
|
7340 | msgid "include the specified changeset" | |
|
7341 | msgstr "inkluder den angivne revision" | |
|
7342 | ||
|
7343 | msgid "clone only the specified branch" | |
|
7344 | msgstr "klon kun den angivne gren" | |
|
7149 | 7345 | |
|
7150 | 7346 | msgid "[OPTION]... SOURCE [DEST]" |
|
7151 | 7347 | msgstr "[TILVALG]... KILDE [MÅL]" |
@@ -7216,8 +7412,8 b' msgstr "[TILVALG]..."' | |||
|
7216 | 7412 | msgid "revision to check" |
|
7217 | 7413 | msgstr "revision som skal undersøges" |
|
7218 | 7414 | |
|
7219 | msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." | |
|
7220 | msgstr "[TILVALG]... [-r REV1 [-r REV2]] [FIL]..." | |
|
7415 | msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." | |
|
7416 | msgstr "[TILVALG]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..." | |
|
7221 | 7417 | |
|
7222 | 7418 | msgid "diff against the second parent" |
|
7223 | 7419 | msgstr "find forskelle i forhold til den anden forældre" |
@@ -7255,8 +7451,11 b' msgstr "[TILVALG]... M\xc3\x98NSTER [FIL]..."' | |||
|
7255 | 7451 | msgid "show only heads which are descendants of REV" |
|
7256 | 7452 | msgstr "vis kun hoveder som er efterkommere af REV" |
|
7257 | 7453 | |
|
7258 | msgid "show only the active branch heads from open branches" | |
|
7259 | msgstr "vis kun de aktive grenhoveder fra åbne grene" | |
|
7454 | msgid "show topological heads only" | |
|
7455 | msgstr "" | |
|
7456 | ||
|
7457 | msgid "show active branchheads only [DEPRECATED]" | |
|
7458 | msgstr "vis kun aktive gren-hoveder (FORÆLDET)" | |
|
7260 | 7459 | |
|
7261 | 7460 | msgid "show normal and closed branch heads" |
|
7262 | 7461 | msgstr "vis normale og lukkede grenhoveder" |
@@ -7308,14 +7507,20 b' msgstr ""' | |||
|
7308 | 7507 | msgid "[OPTION]... PATCH..." |
|
7309 | 7508 | msgstr "[TILVALG]... RETTELSE..." |
|
7310 | 7509 | |
|
7510 | msgid "run even if remote repository is unrelated" | |
|
7511 | msgstr "kør selv hvis fjerndepotet er urelateret" | |
|
7512 | ||
|
7311 | 7513 | msgid "show newest record first" |
|
7312 | 7514 | msgstr "vis nyeste postering først" |
|
7313 | 7515 | |
|
7314 | 7516 | msgid "file to store the bundles into" |
|
7315 | 7517 | msgstr "fil hvor bundterne skal gemmes" |
|
7316 | 7518 | |
|
7317 | msgid "a specific remote revision up to which you would like to pull" | |
|
7318 | msgstr "en specifik revision op til hvilken du gerne vil trække" | |
|
7519 | msgid "a remote changeset intended to be added" | |
|
7520 | msgstr "" | |
|
7521 | ||
|
7522 | msgid "a specific branch you would like to pull" | |
|
7523 | msgstr "en bestemt gren du gerne vil hive ned" | |
|
7319 | 7524 | |
|
7320 | 7525 | msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" |
|
7321 | 7526 | msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILNAVN] [KILDE]" |
@@ -7323,7 +7528,7 b' msgstr "[-p] [-n] [-M] [-f] [-r REV]... ' | |||
|
7323 | 7528 | msgid "[-e CMD] [--remotecmd CMD] [DEST]" |
|
7324 | 7529 | msgstr "[-e KOMMANDO] [--remotecmd KOMMANDO] [MÅL]" |
|
7325 | 7530 | |
|
7326 |
msgid "search the repository as it |
|
|
7531 | msgid "search the repository as it is in REV" | |
|
7327 | 7532 | msgstr "" |
|
7328 | 7533 | |
|
7329 | 7534 | msgid "end filenames with NUL, for use with xargs" |
@@ -7383,13 +7588,16 b' msgstr ""' | |||
|
7383 | 7588 | msgid "[-P] [-f] [[-r] REV]" |
|
7384 | 7589 | msgstr "[-P] [-f] [[-r] REV]" |
|
7385 | 7590 | |
|
7386 | msgid "a specific revision up to which you would like to push" | |
|
7387 | msgstr "" | |
|
7591 | msgid "a changeset intended to be included in the destination" | |
|
7592 | msgstr "" | |
|
7593 | ||
|
7594 | msgid "a specific branch you would like to push" | |
|
7595 | msgstr "en bestemt gren du gerne vil skubbe ud" | |
|
7388 | 7596 | |
|
7389 | 7597 | msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" |
|
7390 | 7598 | msgstr "[-M] [-p] [-n] [-f] [-r REV]... [MÅL]" |
|
7391 | 7599 | |
|
7392 |
msgid "show parents |
|
|
7600 | msgid "show parents of the specified revision" | |
|
7393 | 7601 | msgstr "vis forældre for den angivne revision" |
|
7394 | 7602 | |
|
7395 | 7603 | msgid "[-r REV] [FILE]" |
@@ -7398,8 +7606,11 b' msgstr "[-r REV] [FIL]"' | |||
|
7398 | 7606 | msgid "[NAME]" |
|
7399 | 7607 | msgstr "[NAVN]" |
|
7400 | 7608 | |
|
7401 |
msgid "update to new |
|
|
7402 |
msgstr "opdater til de |
|
|
7609 | msgid "update to new branch head if changesets were pulled" | |
|
7610 | msgstr "opdater til det nye gren-hovede hvis ændringer blev trukket ned" | |
|
7611 | ||
|
7612 | msgid "run even when remote repository is unrelated" | |
|
7613 | msgstr "kør selv hvis fjerndepotet er urelateret" | |
|
7403 | 7614 | |
|
7404 | 7615 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
|
7405 | 7616 | msgstr "[-u] [-f] [-r REV]... [-e KOMMANDO] [--remotecmd KOMMANDO] [KILDE]" |
@@ -7443,8 +7654,8 b' msgstr "f\xc3\xb8r alle \xc3\xa6ndringer tilbage n\xc3\xa5r inget argument angives"' | |||
|
7443 | 7654 | msgid "tipmost revision matching date" |
|
7444 | 7655 | msgstr "" |
|
7445 | 7656 | |
|
7446 | msgid "revision to revert to" | |
|
7447 | msgstr "revision der skal føres tilbage til" | |
|
7657 | msgid "revert to the specified revision" | |
|
7658 | msgstr "vend tilbage til den angivne revision" | |
|
7448 | 7659 | |
|
7449 | 7660 | msgid "do not save backup copies of files" |
|
7450 | 7661 | msgstr "gem ikke sikkerhedskopier af filer" |
@@ -7548,8 +7759,8 b' msgstr "[-f] [-l] [-m TEKST] [-d DATO] [' | |||
|
7548 | 7759 | msgid "[-p] [-g]" |
|
7549 | 7760 | msgstr "[-p] [-g]" |
|
7550 | 7761 | |
|
7551 |
msgid "update to new |
|
|
7552 |
msgstr "opdater til ny |
|
|
7762 | msgid "update to new branch head if changesets were unbundled" | |
|
7763 | msgstr "opdater til nyt gren-hoved hvis ændringer blev pakket ud" | |
|
7553 | 7764 | |
|
7554 | 7765 | msgid "[-u] FILE..." |
|
7555 | 7766 | msgstr "[-u] FIL..." |
@@ -8115,6 +8326,16 b' msgid ""' | |||
|
8115 | 8326 | " - if it's a directory, all files ending with .rc are added\n" |
|
8116 | 8327 | " - otherwise, the file itself will be added\n" |
|
8117 | 8328 | "\n" |
|
8329 | "HGPLAIN\n" | |
|
8330 | " When set, this disables any options in .hgrc that might change\n" | |
|
8331 | " Mercurial's default output. This includes encoding, defaults,\n" | |
|
8332 | " verbose mode, debug mode, quiet mode, tracebacks, and\n" | |
|
8333 | " localization. This can be useful when scripting against Mercurial\n" | |
|
8334 | " in the face of existing user configuration.\n" | |
|
8335 | "\n" | |
|
8336 | " Equivalent options set via command line flags or environment\n" | |
|
8337 | " variables are not overridden.\n" | |
|
8338 | "\n" | |
|
8118 | 8339 | "HGUSER\n" |
|
8119 | 8340 | " This is the string used as the author of a commit. If not set,\n" |
|
8120 | 8341 | " available values will be considered in this order:\n" |
@@ -8542,6 +8763,9 b' msgid ""' | |||
|
8542 | 8763 | " prefer it over 'default' if both are defined.\n" |
|
8543 | 8764 | msgstr "" |
|
8544 | 8765 | |
|
8766 | msgid "dirstate branch not accessible" | |
|
8767 | msgstr "" | |
|
8768 | ||
|
8545 | 8769 | msgid "can only share local repositories" |
|
8546 | 8770 | msgstr "kan kun dele lokale depoter" |
|
8547 | 8771 | |
@@ -8713,6 +8937,9 b' msgstr ""' | |||
|
8713 | 8937 | msgid "push failed (unexpected response):" |
|
8714 | 8938 | msgstr "skub fejlede (uventet svar):" |
|
8715 | 8939 | |
|
8940 | msgid "remote: " | |
|
8941 | msgstr "fjernsystem: " | |
|
8942 | ||
|
8716 | 8943 | #, python-format |
|
8717 | 8944 | msgid "push failed: %s" |
|
8718 | 8945 | msgstr "skub fejlede: %s" |
@@ -8867,6 +9094,12 b' msgstr "kopiering fejlede: %s er ikke en fil eller en symbolsk l\xc3\xa6nge\\n"' | |||
|
8867 | 9094 | msgid "searching for changes\n" |
|
8868 | 9095 | msgstr "leder efter ændringer\n" |
|
8869 | 9096 | |
|
9097 | msgid "queries" | |
|
9098 | msgstr "" | |
|
9099 | ||
|
9100 | msgid "searching" | |
|
9101 | msgstr "søger" | |
|
9102 | ||
|
8870 | 9103 | msgid "already have changeset " |
|
8871 | 9104 | msgstr "har allerede ændringen " |
|
8872 | 9105 | |
@@ -8885,8 +9118,8 b' msgid ""' | |||
|
8885 | 9118 | msgstr "" |
|
8886 | 9119 | |
|
8887 | 9120 | #, python-format |
|
8888 | msgid "abort: push creates new remote branch '%s'!\n" | |
|
8889 |
msgstr "afbrudt: skub laver ny gren '%s' |
|
|
9121 | msgid "abort: push creates new remote heads on branch '%s'!\n" | |
|
9122 | msgstr "afbrudt: skub laver nye hoveder på grenen '%s'!\n" | |
|
8890 | 9123 | |
|
8891 | 9124 | msgid "abort: push creates new remote heads!\n" |
|
8892 | 9125 | msgstr "afbrudt: skub laver nye fjern-hoveder!\n" |
@@ -8894,6 +9127,16 b' msgstr "afbrudt: skub laver nye fjern-ho' | |||
|
8894 | 9127 | msgid "(did you forget to merge? use push -f to force)\n" |
|
8895 | 9128 | msgstr "(glemte du at sammenføje? brug push -f for at gennemtvinge)\n" |
|
8896 | 9129 | |
|
9130 | msgid "(you should pull and merge or use push -f to force)\n" | |
|
9131 | msgstr "(du skal hive og sammenføje eller bruge -f for at gennemtvinge)\n" | |
|
9132 | ||
|
9133 | #, python-format | |
|
9134 | msgid "abort: push creates new remote branches: %s!\n" | |
|
9135 | msgstr "afbrudt: skub laver nye grene i fjerndepotet: %s!\n" | |
|
9136 | ||
|
9137 | msgid "(use 'hg push -f' to force)\n" | |
|
9138 | msgstr "(brug push -f for at gennemtvinge)\n" | |
|
9139 | ||
|
8897 | 9140 | msgid "note: unsynced remote changes!\n" |
|
8898 | 9141 | msgstr "bemærk: usynkroniserede ændringer i fjernsystemet!\n" |
|
8899 | 9142 | |
@@ -8901,25 +9144,50 b' msgstr "bem\xc3\xa6rk: usynkroniserede \xc3\xa6ndringer i fjernsystemet!\\n"' | |||
|
8901 | 9144 | msgid "%d changesets found\n" |
|
8902 | 9145 | msgstr "fandt %d ændringer\n" |
|
8903 | 9146 | |
|
9147 | msgid "bundle changes" | |
|
9148 | msgstr "" | |
|
9149 | ||
|
9150 | msgid "chunks" | |
|
9151 | msgstr "" | |
|
9152 | ||
|
9153 | msgid "bundle manifests" | |
|
9154 | msgstr "" | |
|
9155 | ||
|
8904 | 9156 | #, python-format |
|
8905 | 9157 | msgid "empty or missing revlog for %s" |
|
8906 | 9158 | msgstr "tom eller manglende revlog for %s" |
|
8907 | 9159 | |
|
9160 | msgid "bundle files" | |
|
9161 | msgstr "" | |
|
9162 | ||
|
8908 | 9163 | msgid "adding changesets\n" |
|
8909 | 9164 | msgstr "tilføjer ændringer\n" |
|
8910 | 9165 | |
|
9166 | msgid "changesets" | |
|
9167 | msgstr "ændringer" | |
|
9168 | ||
|
8911 | 9169 | msgid "received changelog group is empty" |
|
8912 | 9170 | msgstr "modtagen changelog-gruppe er tom" |
|
8913 | 9171 | |
|
8914 | 9172 | msgid "adding manifests\n" |
|
8915 | 9173 | msgstr "tilføjer manifester\n" |
|
8916 | 9174 | |
|
9175 | msgid "manifests" | |
|
9176 | msgstr "manifester" | |
|
9177 | ||
|
8917 | 9178 | msgid "adding file changes\n" |
|
8918 | 9179 | msgstr "tilføjer filændringer\n" |
|
8919 | 9180 | |
|
8920 | 9181 | msgid "received file revlog group is empty" |
|
8921 | 9182 | msgstr "" |
|
8922 | 9183 | |
|
9184 | msgid "files" | |
|
9185 | msgstr "filer" | |
|
9186 | ||
|
9187 | #, python-format | |
|
9188 | msgid "missing file data for %s:%s - run hg verify" | |
|
9189 | msgstr "" | |
|
9190 | ||
|
8923 | 9191 | #, python-format |
|
8924 | 9192 | msgid " (%+d heads)" |
|
8925 | 9193 | msgstr " (%+d hoveder)" |
@@ -9117,11 +9385,11 b' msgid "file %s already exists\\n"' | |||
|
9117 | 9385 | msgstr "filen %s eksisterer allerede\n" |
|
9118 | 9386 | |
|
9119 | 9387 | #, python-format |
|
9120 |
msgid "Hunk #%d succeeded at %d |
|
|
9121 | msgstr "" | |
|
9122 | ||
|
9123 | #, python-format | |
|
9124 |
msgid "Hunk #%d succeeded at %d |
|
|
9388 | msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n" | |
|
9389 | msgstr "" | |
|
9390 | ||
|
9391 | #, python-format | |
|
9392 | msgid "Hunk #%d succeeded at %d (offset %d lines).\n" | |
|
9125 | 9393 | msgstr "" |
|
9126 | 9394 | |
|
9127 | 9395 | #, python-format |
@@ -9193,6 +9461,9 b' msgstr "kan ikke %s: fjerdepotet underst\xc3\xb8tter ikke %r egenskaben"' | |||
|
9193 | 9461 | msgid "unknown compression type %r" |
|
9194 | 9462 | msgstr "ukendt kompressionstype %r" |
|
9195 | 9463 | |
|
9464 | msgid "index entry flags need RevlogNG" | |
|
9465 | msgstr "" | |
|
9466 | ||
|
9196 | 9467 | #, python-format |
|
9197 | 9468 | msgid "index %s unknown flags %#04x for format v0" |
|
9198 | 9469 | msgstr "indeks %s ukendt flag %#04x for format v0" |
@@ -9252,9 +9523,6 b' msgstr "kunne ikke oprette fjerndepot"' | |||
|
9252 | 9523 | msgid "no suitable response from remote hg" |
|
9253 | 9524 | msgstr "intet brugbart svar fra fjernsystemets hg" |
|
9254 | 9525 | |
|
9255 | msgid "remote: " | |
|
9256 | msgstr "fjernsystem: " | |
|
9257 | ||
|
9258 | 9526 | #, python-format |
|
9259 | 9527 | msgid "push refused: %s" |
|
9260 | 9528 | msgstr "skub afvist: %s" |
@@ -9277,6 +9545,13 b' msgid "invalid entry in fncache, line %s' | |||
|
9277 | 9545 | msgstr "" |
|
9278 | 9546 | |
|
9279 | 9547 | #, python-format |
|
9548 | msgid "subrepo spec file %s not found" | |
|
9549 | msgstr "underdepot spec-fil %s blev ikke fundet" | |
|
9550 | ||
|
9551 | msgid "missing ] in subrepo source" | |
|
9552 | msgstr "manglende ] i underdepot kilde" | |
|
9553 | ||
|
9554 | #, python-format | |
|
9280 | 9555 | msgid "" |
|
9281 | 9556 | " subrepository sources for %s differ\n" |
|
9282 | 9557 | "use (l)ocal source (%s) or (r)emote source (%s)?" |
@@ -9298,6 +9573,10 b' msgid ""' | |||
|
9298 | 9573 | msgstr "" |
|
9299 | 9574 | |
|
9300 | 9575 | #, python-format |
|
9576 | msgid "unknown subrepo type %s" | |
|
9577 | msgstr "ukendt underdepottype %s" | |
|
9578 | ||
|
9579 | #, python-format | |
|
9301 | 9580 | msgid "removing subrepo %s\n" |
|
9302 | 9581 | msgstr "fjerner underdepot %s\n" |
|
9303 | 9582 | |
@@ -9309,6 +9588,13 b' msgstr "hiver fra underdepot %s\\n"' | |||
|
9309 | 9588 | msgid "pushing subrepo %s\n" |
|
9310 | 9589 | msgstr "skubber til underdepot %s\n" |
|
9311 | 9590 | |
|
9591 | msgid "cannot commit svn externals" | |
|
9592 | msgstr "kan ikke deponere svn externals" | |
|
9593 | ||
|
9594 | #, python-format | |
|
9595 | msgid "not removing repo %s because it has changes.\n" | |
|
9596 | msgstr "fjerner ikke depotet %s fordi det er ændret.\n" | |
|
9597 | ||
|
9312 | 9598 | #, python-format |
|
9313 | 9599 | msgid "%s, line %s: %s\n" |
|
9314 | 9600 | msgstr "%s, linie %s: %s\n" |
@@ -9419,6 +9705,16 b' msgid "http auth: user %s, password %s\\n' | |||
|
9419 | 9705 | msgstr "http godkendelse: bruger %s, kodeord %s\n" |
|
9420 | 9706 | |
|
9421 | 9707 | #, python-format |
|
9708 | msgid "ignoring invalid [auth] key '%s'\n" | |
|
9709 | msgstr "ignorerer ugyldig [auth] nøgle '%s'\n" | |
|
9710 | ||
|
9711 | msgid "certificate checking requires Python 2.6" | |
|
9712 | msgstr "" | |
|
9713 | ||
|
9714 | msgid "server identity verification succeeded\n" | |
|
9715 | msgstr "" | |
|
9716 | ||
|
9717 | #, python-format | |
|
9422 | 9718 | msgid "command '%s' failed: %s" |
|
9423 | 9719 | msgstr "kommandoen '%s' fejlede: %s" |
|
9424 | 9720 | |
@@ -9561,6 +9857,9 b' msgstr "depotet bruger revlog format %d\\' | |||
|
9561 | 9857 | msgid "checking changesets\n" |
|
9562 | 9858 | msgstr "kontrollerer ændringer\n" |
|
9563 | 9859 | |
|
9860 | msgid "changelog" | |
|
9861 | msgstr "" | |
|
9862 | ||
|
9564 | 9863 | #, python-format |
|
9565 | 9864 | msgid "unpacking changeset %s" |
|
9566 | 9865 | msgstr "udpakker ændring %s" |
@@ -9582,6 +9881,9 b' msgstr "l\xc3\xa6ser manifestforskel %s"' | |||
|
9582 | 9881 | msgid "crosschecking files in changesets and manifests\n" |
|
9583 | 9882 | msgstr "krydstjekker filer i ændringer og manifester\n" |
|
9584 | 9883 | |
|
9884 | msgid "crosscheck" | |
|
9885 | msgstr "" | |
|
9886 | ||
|
9585 | 9887 | #, python-format |
|
9586 | 9888 | msgid "changeset refers to unknown manifest %s" |
|
9587 | 9889 | msgstr "ændring refererer til et ukendt manifest %s" |
General Comments 0
You need to be logged in to leave comments.
Login now