Mercurial > hg
changeset 12834:b814f67d41c0 stable
i18n: merge with main
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 23 Oct 2010 16:24:07 +0200 |
| parents | 93776857e17e (diff) 58bc5024805d (current diff) |
| children | b6bf1f501f9f |
| files | |
| diffstat | 2 files changed, 1963 insertions(+), 974 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Sat Oct 23 00:18:10 2010 +0200 +++ b/i18n/da.po Sat Oct 23 16:24:07 2010 +0200 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-09-18 21:41+0200\n" -"PO-Revision-Date: 2010-09-18 22:02+0200\n" +"POT-Creation-Date: 2010-10-23 14:31+0200\n" +"PO-Revision-Date: 2010-10-23 15:02+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "Language: \n" @@ -37,8 +37,16 @@ msgid "Commands" msgstr "Kommandoer" -msgid " options:" -msgstr " tilvalg:" +msgid "Extensions" +msgstr "Udvidelser" + +msgid "" +"This section contains help for extensions that is distributed together with " +"Mercurial. Help for other extensions is available in the help system." +msgstr "" + +msgid "options:" +msgstr "tilvalg:" #, python-format msgid " aliases: %s" @@ -83,7 +91,7 @@ msgid "" "Branch-based Access Control\n" -"---------------------------" +"..........................." msgstr "" msgid "" @@ -107,7 +115,7 @@ msgid "" "Path-based Access Control\n" -"-------------------------" +"........................." msgstr "" msgid "" @@ -119,7 +127,7 @@ msgid "" "Groups\n" -"------" +"......" msgstr "" msgid "" @@ -136,7 +144,7 @@ msgid "" "Example Configuration\n" -"---------------------" +"....................." msgstr "" msgid "::" @@ -327,7 +335,13 @@ " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" -" the bookmark is assigned to that revision.\n" +" the bookmark is assigned to that revision." +msgstr "" + +msgid "" +" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" +" push` and :hg:`help pull`). This requires the bookmark extension to be\n" +" enabled for both the local and remote repositories.\n" " " msgstr "" @@ -409,6 +423,22 @@ msgid "compare bookmark" msgstr "sammenlign bogmærke" +msgid "bookmark takes one or no arguments" +msgstr "bookmark tager et eller to argumenter" + +msgid "the argument to bookmark must be a string" +msgstr "" + +msgid "" +"\n" +"Added by the bookmarks extension:" +msgstr "" + +msgid "" +"``bookmark([name])``\n" +" The named bookmark or all bookmarks.\n" +msgstr "" + msgid "force" msgstr "gennemtving" @@ -1190,7 +1220,7 @@ msgid "" " Mercurial Source\n" -" ----------------" +" ''''''''''''''''" msgstr "" msgid "" @@ -1207,7 +1237,7 @@ msgid "" " CVS Source\n" -" ----------" +" ''''''''''" msgstr "" msgid "" @@ -1264,7 +1294,7 @@ msgid "" " Subversion Source\n" -" -----------------" +" '''''''''''''''''" msgstr "" msgid "" @@ -1302,7 +1332,7 @@ msgid "" " Perforce Source\n" -" ---------------" +" '''''''''''''''" msgstr "" msgid "" @@ -1326,7 +1356,7 @@ msgid "" " Mercurial Destination\n" -" ---------------------" +" '''''''''''''''''''''" msgstr "" msgid "" @@ -1665,6 +1695,13 @@ msgid "Python ElementTree module is not available" msgstr "Python ElementTree modulet er ikke tilstede" +#, python-format +msgid "%s repository format is unsupported, please upgrade" +msgstr "" + +msgid "failed to detect repository format!" +msgstr "" + msgid "internal calling inconsistency" msgstr "intern kaldeinkonsistens" @@ -2205,12 +2242,14 @@ " order, use --switch-parent." msgstr "" -msgid "" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr "" +" Se :hg:`help dates` for en liste af gyldige formater til -d/--date." + +msgid "" +" Returns 0 on success.\n" " " msgstr "" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" -" " msgid "" "working dir not at branch tip (use \"hg update\" to check out branch tip)" @@ -2321,6 +2360,13 @@ " Hvis der ikke angives en revision, så bruges forældren til\n" " arbejdskataloget, eller tip, hvis der ikke er hentet en revision." +msgid "" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" " +msgstr "" +" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" +" " + msgid "uncommitted merge - please provide a specific revision" msgstr "udeponeret sammenføjning - angiv venligst en specifik revision" @@ -2876,8 +2922,9 @@ msgstr "" msgid "" -"NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories." +".. note::\n" +" The more specific you are in your filename patterns the less you\n" +" lose speed in huge repositories." msgstr "" msgid "" @@ -3537,6 +3584,9 @@ msgid "print the patches already applied" msgstr "udskriver rettelserne som allerede er anvendt" +msgid " Returns 0 on success." +msgstr "" + msgid "only one patch applied\n" msgstr "kun én rettelse er anvendt\n" @@ -3607,10 +3657,15 @@ msgid " To import an existing patch while renaming it::" msgstr "" -msgid "" -" hg qimport -e existing-patch -n new-name\n" +msgid " hg qimport -e existing-patch -n new-name" +msgstr "" + +msgid "" +" Returns 0 if import succeeded.\n" " " msgstr "" +" Returnerer 0 hvis importeringen lykkedes.\n" +" " msgid "init a new queue repository (DEPRECATED)" msgstr "opret et nyt kø-depot (FORÆLDET)" @@ -3653,9 +3708,15 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by :hg:`init --mq`.\n" +" would be created by :hg:`init --mq`." +msgstr "" + +msgid "" +" Return 0 on success.\n" " " msgstr "" +" Returnerer 0 ved succes.\n" +" " msgid "versioned patch repository not found (see init --mq)" msgstr "versionsstyret rettelsesdepot blev ikke fundet (se init --mq)" @@ -3718,9 +3779,19 @@ " Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" -" information.\n" +" information." +msgstr "" +" Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" +" git diff-format. Se :hg:`help diffs` for mere information om\n" +" hvorfor dette er vigtigt for at bevare filrettigheder og\n" +" information om kopieringer og omdøbninger." + +msgid "" +" Returns 0 on successful creation of a new patch.\n" " " msgstr "" +" Returnerer 0 hvis patchen blev oprettet.\n" +" " msgid "update the current patch" msgstr "opdater den aktuelle patch" @@ -3753,14 +3824,12 @@ " hg add/remove/copy/rename work as usual, though you might want to\n" " use git-style patches (-g/--git or [diff] git=1) to track copies\n" " and renames. See the diffs help topic for more information on the\n" -" git diff format.\n" -" " +" git diff format." msgstr "" " hg add/remove/copy/rename virker som sædvanlig, dog vil du måske\n" " bruge git-patches (-g/--git eller [diff] git=1) for at følge\n" " kopier og omdøbninger. Se 'hg help diffs' for mere information om\n" -" git diff formatet.\n" -" " +" git diff formatet." msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" msgstr "tilvalg \"-e\" er inkompatibelt med \"-m\" eller \"-l\"" @@ -3783,14 +3852,12 @@ " Use :hg:`diff` if you only want to see the changes made since the\n" " last qrefresh, or :hg:`export qtip` if you want to see changes\n" " made by the current patch without including changes made since the\n" -" qrefresh.\n" -" " +" qrefresh." msgstr "" " Brug :hg:`diff` hvis du kun vil se ændringer lavet siden den\n" " sidste qrefresh, eller :hg:`export qtip` hvis du vil se ændringer\n" " lavet af den nuværende patch uden at inkludere ændringer lavet\n" -" siden qrefresh.\n" -" " +" siden qrefresh." msgid "fold the named patches into the current patch" msgstr "" @@ -3806,7 +3873,7 @@ msgid "" " The header for each folded patch will be concatenated with the\n" -" current patch header, separated by a line of '* * *'." +" current patch header, separated by a line of ``* * *``." msgstr "" msgid "qfold requires at least one patch name" @@ -3849,22 +3916,21 @@ msgid "" " With no arguments, print the currently active guards.\n" -" With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'." -msgstr "" -" Uden argumenter vises de nuværende aktive filtre.\n" -" Med argumenter sættes filtre for den navngivne rettelse.\n" -" BEMÆRK: negative filtre skal nu specificeres med '--'." +" With arguments, set guards for the named patch." +msgstr "" +" Uden argumenter: vis de aktiverede filtre.\n" +" Med argumenter: sæt filtre for den navngivne patch." + +msgid "" +" .. note::\n" +" Specifying negative guards now requires '--'." +msgstr "" msgid " To set guards on another patch::" msgstr " For at sætte filtre på en anden rettelse::" -msgid "" -" hg qguard other.patch -- +2.6.17 -stable\n" -" " -msgstr "" -" hg qguard other.patch -- +2.6.17 -stable\n" -" " +msgid " hg qguard other.patch -- +2.6.17 -stable" +msgstr " hg qguard other.patch -- +2.6.17 -stable" msgid "cannot mix -l/--list with options or arguments" msgstr "kan ikke blande -l/--list med tilvalg eller argumenter" @@ -3884,11 +3950,16 @@ msgid "" " When -f/--force is applied, all local changes in patched files\n" -" will be lost.\n" -" " +" will be lost." msgstr "" " Når -f/--force er angivet, så vil alle lokale ændringer i de\n" -" rettede filer gå tabt.\n" +" rettede filer gå tabt." + +msgid "" +" Return 0 on succces.\n" +" " +msgstr "" +" Returnerer 0 ved succes.\n" " " msgid "no saved queues found, please use -n\n" @@ -3904,13 +3975,11 @@ msgid "" " By default, pops off the top of the patch stack. If given a patch\n" " name, keeps popping off patches until the named patch is at the\n" -" top of the stack.\n" -" " +" top of the stack." msgstr "" " Som standard fjernes toppen af stakken. Hvis der angives en\n" " rettelse, så vil der blive fjernet rettelser indtil den angivne\n" -" rettelse er på toppen af stakken.\n" -" " +" rettelse er på toppen af stakken." #, python-format msgid "using patch queue: %s\n" @@ -3937,8 +4006,8 @@ msgid "restore the queue state saved by a revision (DEPRECATED)" msgstr "" -msgid " This command is deprecated, use rebase --mq instead." -msgstr "" +msgid " This command is deprecated, use :hg:`rebase` instead." +msgstr " Denne kommando er forældet. Brug :hg:`rebase` i stedet." msgid "save current queue state (DEPRECATED)" msgstr "" @@ -3985,8 +4054,10 @@ msgid "" " Use the --no-backup option to discard the backup bundle once the\n" -" operation completes.\n" -" " +" operation completes." +msgstr "" + +msgid "empty revision set" msgstr "" msgid "set or print guarded patches to push" @@ -4115,8 +4186,7 @@ msgid "" " This can be especially useful if your changes have been applied to\n" " an upstream repository, or if you are about to push your changes\n" -" to upstream.\n" -" " +" to upstream." msgstr "" msgid "no revisions specified" @@ -4148,8 +4218,7 @@ msgid "" " To delete an existing queue, use --delete. You cannot delete the " "currently\n" -" active queue.\n" -" " +" active queue." msgstr "" msgid "patches applied - cannot set new queue active" @@ -4261,8 +4330,8 @@ msgid "stop managing a revision (DEPRECATED)" msgstr "" -msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "hg qdelete [-k] [-r REV]... [RETTELSE]..." +msgid "hg qdelete [-k] [PATCH]..." +msgstr "hg qdelete [-k] [RETTELSE]..." msgid "edit patch header" msgstr "rediger rettelsens hoved" @@ -4354,11 +4423,11 @@ msgid "forget any local changes to patched files" msgstr "glem eventuelle lokale ændringer i de rettede filer" -msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "hg qpop [-a] [-n NAVN] [-f] [RETTELSE | INDEKS]" - -msgid "apply if the patch has rejects" -msgstr "" +msgid "hg qpop [-a] [-f] [PATCH | INDEX]" +msgstr "hg qpop [-a] [-f] [RETTELSE | INDEKS]" + +msgid "apply on top of local changes" +msgstr "anvend ovenpå lokale ændringer" msgid "list patch name in commit text" msgstr "" @@ -4375,8 +4444,8 @@ msgid "reorder patch series and apply only the patch" msgstr "" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [--move] [RETTELSE | INDEKS]" +msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [--move] [RETTELSE | INDEKS]" msgid "refresh only files already in the patch and specified files" msgstr "genopfrisk kun filer som allerede findes i rettelsen og angivne filer" @@ -4460,8 +4529,11 @@ msgid "no backups (DEPRECATED)" msgstr "ingen backupper (FORÆLDET)" -msgid "hg strip [-f] [-n] REV..." -msgstr "hg strip [-f] [-n] REV..." +msgid "do not modify working copy during strip" +msgstr "" + +msgid "hg strip [-k] [-f] [-n] REV..." +msgstr "hg strip [-k] [-f] [-n] REV..." msgid "hg qtop [-s]" msgstr "hg qtop [-s]" @@ -4632,6 +4704,18 @@ msgstr "" msgid "" +"By default, the pager is only executed if a command has output. To\n" +"force the pager to run even if a command prints nothing, set::" +msgstr "" + +msgid "" +" [pager]\n" +" force = True" +msgstr "" +" [pager]\n" +" force = True" + +msgid "" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" "setting::" msgstr "" @@ -4675,8 +4759,17 @@ msgid "" "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" -"to specify them in your user configuration file.\n" -msgstr "" +"to specify them in your user configuration file." +msgstr "" + +msgid "" +"The --pager=... option can also be used to control when the pager is\n" +"used. Use a boolean value like yes, no, on, off, or use auto for\n" +"normal behavior.\n" +msgstr "" + +msgid "when to paginate (boolean, always, auto, or never)" +msgstr "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller \"never\")" msgid "interpret suffixes to refer to ancestor revisions" msgstr "fortolk suffikser for at referere til forfader-revisioner" @@ -4742,12 +4835,6 @@ msgstr "" msgid "" -"With the -d/--diffstat or -c/--confirm options, you will be presented\n" -"with a final summary of all messages and asked for confirmation before\n" -"the messages are sent." -msgstr "" - -msgid "" "To configure other defaults, add a section like this to your hgrc\n" "file::" msgstr "" @@ -4772,39 +4859,6 @@ msgstr "" msgid "" -"To avoid sending patches prematurely, it is a good idea to first run\n" -"the :hg:`email` command with the \"-n\" option (test only). You will be\n" -"prompted for an email recipient address, a subject and an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If the PAGER environment\n" -"variable is set, your pager will be fired up once for each patchbomb\n" -"message, so you can verify everything is alright." -msgstr "" - -msgid "" -"The -m/--mbox option is also very useful. Instead of previewing each\n" -"patchbomb message in a pager or sending the messages directly, it will\n" -"create a UNIX mailbox file with the patch emails. This mailbox file\n" -"can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt::" -msgstr "" - -msgid " % mutt -R -f mbox" -msgstr "" - -msgid "" -"When you are previewing the patchbomb messages, you can use ``formail``\n" -"(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out::" -msgstr "" - -msgid " % formail -s sendmail -bm -t < mbox" -msgstr " % formail -s sendmail -bm -t < mbox" - -msgid "That should be all. Now your patchbomb is on its way out." -msgstr "" - -msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -4832,10 +4886,21 @@ " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" " The message contains two or three parts. First, the changeset\n" -" description. Next, (optionally) if the diffstat program is\n" -" installed and -d/--diffstat is used, the result of running\n" -" diffstat on the patch. Finally, the patch itself, as generated by\n" -" :hg:`export`." +" description." +msgstr "" + +msgid "" +" With the -d/--diffstat option, if the diffstat program is\n" +" installed, the result of running diffstat on the patch is inserted." +msgstr "" + +msgid " Finally, the patch itself, as generated by :hg:`export`." +msgstr "" + +msgid "" +" With the -d/--diffstat or -c/--confirm options, you will be presented\n" +" with a final summary of all messages and asked for confirmation before\n" +" the messages are sent." msgstr "" msgid "" @@ -4858,6 +4923,23 @@ msgstr "" msgid "" +" With -m/--mbox, instead of previewing each patchbomb message in a\n" +" pager or sending the messages directly, it will create a UNIX\n" +" mailbox file with the patch emails. This mailbox file can be\n" +" previewed with any mail user agent which supports UNIX mbox\n" +" files." +msgstr "" + +msgid "" +" With -n/--test, all steps will run, but mail will not be sent.\n" +" You will be prompted for an email recipient address, a subject and\n" +" an introductory message describing the patches of your patchbomb.\n" +" Then when all is done, patchbomb messages are displayed. If the\n" +" PAGER environment variable is set, your pager will be fired up once\n" +" for each patchbomb message, so you can verify everything is alright." +msgstr "" + +msgid "" " hg email -r 3000 # send patch 3000 only\n" " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" " hg email -r 3000:3005 # send patches 3000 through 3005\n" @@ -4880,6 +4962,15 @@ msgstr "" msgid "" +" hg email -o -m mbox && # generate an mbox file...\n" +" mutt -R -f mbox # ... and view it with mutt\n" +" hg email -o -m mbox && # generate an mbox file ...\n" +" formail -s sendmail \\ # ... and use formail to send from the " +"mbox\n" +" -bm -t < mbox # ... using sendmail" +msgstr "" + +msgid "" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" " " @@ -5237,8 +5328,8 @@ msgid "rebasing" msgstr "" -msgid " changesets" -msgstr " ændringer" +msgid "changesets" +msgstr "ændringer" msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue" @@ -5392,10 +5483,6 @@ " Hvis en liste af filer er udeladt, så vil alle ændringer\n" " rapporteret af :hg:`status` være kandidater til at blive optaget." -msgid " See :hg:`help dates` for a list of formats valid for -d/--date." -msgstr "" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date." - msgid "" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" @@ -5447,9 +5534,6 @@ msgid "no changes to record\n" msgstr "ingen ændringer at optage\n" -msgid "patch failed to apply" -msgstr "rettelse kunne ikke tilføjes" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [TILVALG]... [FIL]..." @@ -5525,9 +5609,6 @@ msgid "not linkable: %s\n" msgstr "kan ikke sammenkædes: %s\n" -msgid " files" -msgstr " filer" - msgid "pruning" msgstr "beskærer" @@ -5621,15 +5702,16 @@ msgstr "" msgid "" -" NOTE: using rollback or extensions that destroy/modify history\n" -" (mq, rebase, etc.) can cause considerable confusion with shared\n" -" clones. In particular, if two shared clones are both updated to\n" -" the same changeset, and one of them destroys that changeset with\n" -" rollback, the other clone will suddenly stop working: all\n" -" operations will fail with \"abort: working directory has unknown\n" -" parent\". The only known workaround is to use debugsetparents on\n" -" the broken clone to reset it to a changeset that still exists\n" -" (e.g. tip).\n" +" .. note::\n" +" using rollback or extensions that destroy/modify history (mq,\n" +" rebase, etc.) can cause considerable confusion with shared\n" +" clones. In particular, if two shared clones are both updated to\n" +" the same changeset, and one of them destroys that changeset\n" +" with rollback, the other clone will suddenly stop working: all\n" +" operations will fail with \"abort: working directory has unknown\n" +" parent\". The only known workaround is to use debugsetparents on\n" +" the broken clone to reset it to a changeset that still exists\n" +" (e.g. tip).\n" " " msgstr "" @@ -5786,6 +5868,19 @@ msgid "outstanding local changes" msgstr "udestående lokale ændringer" +msgid "" +"\n" +"Added by the transplant extension:" +msgstr "" + +msgid "" +"``transplanted(set)``\n" +" Transplanted changesets in set.\n" +msgstr "" + +msgid "Specifying Revision Sets" +msgstr "Angivning af af mængder af revisioner" + msgid "pull patches from REPO" msgstr "hiv rettelser fra DEPOT" @@ -6080,9 +6175,6 @@ msgid "limit must be positive" msgstr "grænsen skal være positiv" -msgid "too many revisions specified" -msgstr "der er specificeret for mange revisioner" - #, python-format msgid "invalid format spec '%%%s' in output filename" msgstr "ugyldig formatspecifikation '%%%s' i output filnavn" @@ -6408,11 +6500,6 @@ " annotering alligevel, selvom resultatet sandsynligvis vil være\n" " hverken brugbart eller ønskværdigt." -msgid "" -" Returns 0 on success.\n" -" " -msgstr "" - msgid "at least one filename or pattern is required" msgstr "kræver mindst et filnavn eller mønster" @@ -6473,33 +6560,38 @@ msgstr "omgør effekten af tidligere ændringer" msgid "" -" Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset." -msgstr "" -" Deponerer de omgjorte ændringer som en ny ændring. Den nye ændring\n" -" er et barn af den omgjorte ændring." - -msgid "" -" If you backout a changeset other than the tip, a new head is\n" -" created. This head will be the new tip and you should merge this\n" -" backout changeset with another head." -msgstr "" -" Hvis du omgør en ændring som ikke er spidsen, så vil et der blive\n" -" lavet et nyt hoved. Dette hoved vil være den nye spids og du bør\n" -" sammenføje denne omgjorte ændring med et andet hoved (det\n" -" nuværende hoved som standard)." - -msgid "" +" The backout command merges the reverse effect of the reverted\n" +" changeset into the working directory." +msgstr "" + +msgid "" +" With the --merge option, it first commits the reverted changes\n" +" as a new changeset. This new changeset is a child of the reverted\n" +" changeset.\n" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" -" changeset afterwards. This saves you from doing the merge by hand.\n" -" The result of this merge is not committed, as with a normal merge." -msgstr "" -" Med --merge tilvalget vil forælderen til arbejdskataloget blive\n" -" husket og det nye hoved vil blive sammenføjet med denne ændring\n" -" bagefter. Dette sparer dig for at lave sammenføjningen selv.\n" -" Resultatet af denne sammenføjning er ikke lagt i depot, som ved en\n" -" normal sammenføjning." +" changeset afterwards.\n" +" This will result in an explicit merge in the history." +msgstr "" +" Med --merge tilvalget bliver de omgjorte ændringer først deponeret\n" +" som en ny ændring. Denne nye ændring vil være et barn af den\n" +" omgjorte ændring. Derefter bliver det nye hoved sammenføjet med\n" +" arbejdskatalogets forælderrevision. Derved skabes der en eksplicit\n" +" sammenføjning i historien." + +msgid "" +" If you backout a changeset other than the original parent of the\n" +" working directory, the result of this merge is not committed,\n" +" as with a normal merge. Otherwise, no merge is needed and the\n" +" commit is automatic." +msgstr "" + +msgid "" +" Note that the default behavior (without --merge) has changed in\n" +" version 1.7. To restore the previous default behavior, use\n" +" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" +" the ongoing merge." +msgstr "" msgid "please specify just one revision" msgstr "angiv venligst kun en revision" @@ -6531,12 +6623,6 @@ msgid "merging with changeset %s\n" msgstr "sammenføjer med ændring %s\n" -msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "" - -msgid "(use \"backout --merge\" if you want to auto-merge)\n" -msgstr "(brug \"backout --merge\" hvis du vil sammenføje automatisk)\n" - msgid "subdivision search of changesets" msgstr "" @@ -7283,14 +7369,15 @@ msgstr " Ændringerne mellem filerne vises i unified diff-formatet." msgid "" -" NOTE: diff may generate unexpected results for merges, as it will\n" -" default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified." -msgstr "" -" BEMÆRK: diff kan generere overraskende resultater for\n" -" sammenføjninger, idet den som udgangspunkt vil sammenligne med\n" -" arbejdskatalogets første forælder, hvis der ikke angivet en\n" -" revision." +" .. note::\n" +" diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first\n" +" parent changeset if no revisions are specified." +msgstr "" +" .. note::\n" +" diff kan generere overraskende resultater for sammenføjninger,\n" +" idet den som udgangspunkt vil sammenligne med arbejdskatalogets\n" +" første forælder, hvis der ikke angivet en revision." msgid "" " Alternatively you can specify -c/--change with a revision to see\n" @@ -7333,13 +7420,15 @@ " og deponeringsbeskeden." msgid "" -" NOTE: export may generate unexpected diff output for merge\n" -" changesets, as it will compare the merge changeset against its\n" -" first parent only." -msgstr "" -" BEMÆRK: export kan generere uventet diff uddata for\n" -" sammenføjningsændringer idet den kun vil sammenligne\n" -" sammenføjningsændringen med dennes første forælder." +" .. note::\n" +" export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only." +msgstr "" +" .. note::\n" +" export kan generere uventet diff uddata for\n" +" sammenføjningsændringer idet den kun vil sammenligne\n" +" sammenføjningsændringen med dennes første forælder." msgid "" " Output may be to a file, in which case the name of the file is\n" @@ -7837,15 +7926,17 @@ " listen af ændrede filer og den fulde deponeringsbesked." msgid "" -" NOTE: log -p/--patch may generate unexpected diff output for merge\n" -" changesets, as it will only compare the merge changeset against\n" -" its first parent. Also, only files different from BOTH parents\n" -" will appear in files:." -msgstr "" -" BEMÆRK: log -p/--patch kan generere uventet diff output for\n" -" sammenføjningsændringer idet den kun sammenligner ændringen med\n" -" dennes første forælder. Ydermere vises kun filer som er\n" -" forskellige fra BEGGE forældre i files:." +" .. note::\n" +" log -p/--patch may generate unexpected diff output for merge\n" +" changesets, as it will only compare the merge changeset against\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:." +msgstr "" +" .. note::\n" +" log -p/--patch kan generere uventet diff output for\n" +" sammenføjningsændringer idet den kun sammenligner ændringen med\n" +" dennes første forælder. Ydermere vises kun filer som er\n" +" forskellige fra BEGGE forældre i files:." msgid "output the current or given revision of the project manifest" msgstr "" @@ -7883,6 +7974,12 @@ " næste deponerede ændring får to forældre." msgid "" +" ``--tool`` can be used to specify the merge tool used for file\n" +" merges. It overrides the HGMERGE environment variable and your\n" +" configuration files." +msgstr "" + +msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" @@ -7893,6 +7990,9 @@ " hoved, så sammenføjes der med dette hoved som standard. Ellers\n" " skal en eksplicit revision angives." +msgid " :hg:`resolve` must be used to resolve unresolved files." +msgstr " :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen" + msgid "" " To undo an uncommitted merge, use :hg:`update --clean .` which\n" " will check out a clean copy of the original merge parent, losing\n" @@ -8249,10 +8349,12 @@ msgstr "" msgid "" -" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n" -" discarding any previous merge attempts. Re-merging is not\n" +" - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n" +" files, discarding any previous merge attempts. Re-merging is not\n" " performed for files already marked as resolved. Use ``--all/-a``\n" -" to selects all unresolved files." +" to selects all unresolved files. ``--tool`` can be used to specify\n" +" the merge tool used for the given files. It overrides the HGMERGE\n" +" environment variable and your configuration files." msgstr "" msgid "" @@ -8297,13 +8399,13 @@ msgstr "" msgid "" -" NOTE: This command is most likely not what you are looking for. revert\n" -" will partially overwrite content in the working directory without " -"changing\n" -" the working directory parents. Use :hg:`update -r rev` to check out " -"earlier\n" -" revisions, or :hg:`update --clean .` to undo a merge which has added\n" -" another parent." +" .. note::\n" +" This command is most likely not what you are looking for.\n" +" Revert will partially overwrite content in the working\n" +" directory without changing the working directory parents. Use\n" +" :hg:`update -r rev` to check out earlier revisions, or\n" +" :hg:`update --clean .` to undo a merge which has added another\n" +" parent." msgstr "" msgid "" @@ -8493,16 +8595,18 @@ " -u/--unknown eller -i/--ignored." msgid "" -" NOTE: status may appear to disagree with diff if permissions have\n" -" changed or a merge has occurred. The standard diff format does not\n" -" report permission changes and diff only reports changes relative\n" -" to one merge parent." -msgstr "" -" BEMÆRK: status kan tilsyneladende være forskellig fra diff hvis\n" -" rettigheder er blevet ændret eller hvis en sammenføjning har\n" -" fundet sted. Det normale diff-format rapporterer ikke ændringer i\n" -" rettigheder og diff rapporterer kun ænringer relativt til en\n" -" sammenføjningsforældre." +" .. note::\n" +" status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does\n" +" not report permission changes and diff only reports changes\n" +" relative to one merge parent." +msgstr "" +" .. note::\n" +" status kan tilsyneladende være forskellig fra diff hvis\n" +" rettigheder er blevet ændret eller hvis en sammenføjning har\n" +" fundet sted. Det normale diff-format rapporterer ikke ændringer\n" +" i rettigheder og diff rapporterer kun ænringer relativt til en\n" +" sammenføjningsforældre." msgid "" " If one revision is given, it is used as the base revision.\n" @@ -8747,18 +8851,20 @@ msgid "" " Update the repository's working directory to the specified\n" +" changeset. If no changeset is specified, update to the tip of the\n" +" current named branch." +msgstr "" +" Opdater depotets arbejdskatalog til den angivne ændring. Hvis der\n" +" ikke angives en ændring, da opdateres til spidsen af den nuværende\n" +" gren." + +msgid "" +" If the changeset is not a descendant of the working directory's\n" +" parent, the update is aborted. With the -c/--check option, the\n" +" working directory is checked for uncommitted changes; if none are\n" +" found, the working directory is updated to the specified\n" " changeset." -msgstr " Opdater depotets arbejdskatalog til den angivne ændring." - -msgid "" -" If no changeset is specified, attempt to update to the tip of the\n" -" current branch. If this changeset is a descendant of the working\n" -" directory's parent, update to it, otherwise abort." -msgstr "" -" Hvis der ikke er angivet nogen ændring, forsøg da at opdatere til\n" -" spidsen af den nuværende gren. Hvis denne ændring nedstammer fra\n" -" arbejdskatalogets forælder, da opdateres der til det, ellers\n" -" afbrydes der." +msgstr "" msgid "" " The following rules apply when the working directory contains\n" @@ -8808,8 +8914,8 @@ " :hg:`clone -U`)." msgid "" -" If you want to update just one file to an older changeset, use :hg:" -"`revert`." +" If you want to update just one file to an older changeset, use\n" +" :hg:`revert`." msgstr "" " Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n" " brug da :hg:`revert`." @@ -9273,8 +9379,11 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "[TILVALG]... MØNSTER [FIL]..." -msgid "show only heads which are descendants of REV" -msgstr "vis kun hoveder som er efterkommere af REV" +msgid "show only heads which are descendants of STARTREV" +msgstr "vis kun hoveder som er efterkommere af STARTREV" + +msgid "STARTREV" +msgstr "STARTREV" msgid "show topological heads only" msgstr "" @@ -9285,8 +9394,8 @@ msgid "show normal and closed branch heads" msgstr "vis normale og lukkede grenhoveder" -msgid "[-ac] [-r REV] [REV]..." -msgstr "[-ac] [-r REV] [REV]..." +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r STARTREV] [REV]..." msgid "[TOPIC]" msgstr "[EMNE]" @@ -9410,6 +9519,9 @@ msgid "force a merge with outstanding changes" msgstr "" +msgid "specify merge tool" +msgstr "angiv sammenføjningsværktøj" + msgid "revision to merge" msgstr "revision der skal sammenføjes" @@ -9521,8 +9633,8 @@ msgid "name to show in web pages (default: working directory)" msgstr "navn der skal vises på websider (standard: arbejdskatalog)" -msgid "name of the hgweb config file (serve more than one repository)" -msgstr "navn på hgweb konfigurationsfil (serve mere end et depot)" +msgid "name of the hgweb config file (see \"hg help hgweb\")" +msgstr "navn på hgweb konfigurationsfil (se \"hg help hgweb\")" msgid "name of the hgweb config file (DEPRECATED)" msgstr "navn på hgweb konfigurationsfilen (FORÆLDET)" @@ -9614,8 +9726,8 @@ msgid "discard uncommitted changes (no backup)" msgstr "kasser ikke-deponerede ændringer (ingen sikkerhedskopi)" -msgid "check for uncommitted changes" -msgstr "kontroller for udeponerede ændringer" +msgid "update across branches if no uncommitted changes" +msgstr "opdater på tværs af grene hvis der er ingen udeponerede ændringer" msgid "[-c] [-C] [-d DATE] [[-r] REV]" msgstr "[-c] [-C] [-d DATO] [[-r] REV]" @@ -10050,12 +10162,12 @@ msgid "Specifying Multiple Revisions" msgstr "Angivning af flere revisioner" -msgid "Specifying Revision Sets" -msgstr "Angivning af af mængder af revisioner" - msgid "Diff Formats" msgstr "" +msgid "Merge Tools" +msgstr "" + msgid "Template Usage" msgstr "Brug af skabeloner" @@ -11087,6 +11199,128 @@ "``bar`` and ``quux/baz`` respectively.\n" msgstr "" +msgid "To merge files Mercurial uses merge tools." +msgstr "" + +msgid "" +"A merge tool combines two different versions of a file into a merged\n" +"file. Merge tools are given the two files and the greatest common\n" +"ancestor of the two file versions, so they can determine the changes\n" +"made on both branches." +msgstr "" + +msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." +msgstr "" + +msgid "" +"Usually, the merge tool tries to automatically, by combining all the\n" +"non-overlapping changes that occurred separately in the two different\n" +"evolutions of the same initial base file. Furthermore, some\n" +"interactive merge programs make it easier to manually resolve\n" +"conflicting merges, either in a graphical way, or by inserting some\n" +"conflict markers. Mercurial does not include any interactive merge\n" +"programs but relies on external tools for that. External merge tools\n" +"and their properties and usage is configured in merge-tools section -\n" +"see hgrc(5)." +msgstr "" + +msgid "" +"There are a some internal merge tools which can be used. The internal\n" +"merge tools are:" +msgstr "" + +msgid "" +"``internal:merge``\n" +" Uses the internal non-interactive merge tool for merging files." +msgstr "" + +msgid "" +"``internal:fail``\n" +" Rather than attempting to merge files that were modified on both\n" +" branches, it marks these files as unresolved. Then the resolve\n" +" command must be used to mark files resolved." +msgstr "" + +msgid "" +"``internal:local``\n" +" Uses the local version of files as the merged version." +msgstr "" + +msgid "" +"``internal:other``\n" +" Uses the remote version of files as the merged version." +msgstr "" + +msgid "" +"``internal:prompt``\n" +" Asks the user which of the local or the other version to keep as\n" +" the merged version." +msgstr "" + +msgid "" +"``internal:dump``\n" +" Creates three versions of the files to merge, containing the\n" +" contents of local, other and base. These files can then be used to\n" +" perform a merge manually. If the file merged is name ``a.txt``,\n" +" these files will accordingly be named ``a.txt.local``,\n" +" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" +" same directory as the file to merge." +msgstr "" + +msgid "How Mercurial decides which merge program to use" +msgstr "" + +msgid "" +"1. If the ``HGMERGE`` environment variable is present, it is used. If\n" +" specified it must be either an executable path or the name of an\n" +" application in your executable search path." +msgstr "" + +msgid "" +"2. If the filename of the file to be merged matches any of the\n" +" patterns in the merge-patterns configuration section, then the\n" +" corresponding merge tool is used, unless the file to be merged is a\n" +" symlink. Here binary capabilities of the merge tool are not\n" +" considered." +msgstr "" + +msgid "3. If ui.merge is set, it is used." +msgstr "" + +msgid "" +"4. If any merge tools are present in the merge-tools configuration\n" +" section, and any of the tools can be found on the system, the\n" +" priority settings are used to determine which one to use. Binary,\n" +" symlink and GUI capabilities do also have to match." +msgstr "" + +msgid "5. If a program named ``hgmerge`` exists on the system, it is used." +msgstr "" + +msgid "" +"6. If the file to be merged is not binary and is not a symlink, then\n" +" ``internal:merge`` is used." +msgstr "" + +msgid "7. The merge fails." +msgstr "" + +msgid "" +".. note::\n" +" After selecting a merge program, Mercurial will by default attempt\n" +" to merge the files using a simple merge algorithm first, to see if\n" +" they can be merged without conflicts. Only if there are conflicting\n" +" changes Mercurial will actually execute the merge program. Whether\n" +" to use the simple merge algorithm first can be controlled be the\n" +" premerge setting of the merge tool, which is enabled by default\n" +" unless the file is binary or symlink." +msgstr "" + +msgid "" +"See the merge-tools and ui sections of hgrc(5) for details on\n" +"configuration of merge tools.\n" +msgstr "" + msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" @@ -11243,8 +11477,13 @@ "Identifiers such as branch names must be quoted with single or double\n" "quotes if they contain characters outside of\n" "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" -"predicates. Special characters can be used in quoted identifiers by\n" -"escaping them, e.g., ``\\n`` is interpreted as a newline." +"predicates." +msgstr "" + +msgid "" +"Special characters can be used in quoted identifiers by escaping them,\n" +"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" +"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." msgstr "" msgid "There is a single prefix operator:" @@ -11362,12 +11601,13 @@ msgid "" "``grep(regex)``\n" -" Like ``keyword(string)`` but accepts a regex." +" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" +" to ensure special escape characters are handled correctly." msgstr "" msgid "" "``head()``\n" -" Changeset is a head." +" Changeset is a named branch head." msgstr "" msgid "" @@ -11376,6 +11616,11 @@ msgstr "" msgid "" +"``id(string)``\n" +" Revision non-ambiguously specified by the given hex string prefix" +msgstr "" + +msgid "" "``keyword(string)``\n" " Search commit message, user name, and names of changed files for\n" " string." @@ -11439,6 +11684,11 @@ msgstr "" msgid "" +"``rev(number)``\n" +" Revision with the given numeric identifier." +msgstr "" + +msgid "" "``reverse(set)``\n" " Reverse order of set." msgstr "" @@ -11466,8 +11716,8 @@ msgstr "" msgid "" -"``tagged()``\n" -" Changeset is tagged." +"``tag(name)``\n" +" The specified tag by name, or all tagged revisions if no name is given." msgstr "" msgid "" @@ -11497,21 +11747,50 @@ " -P x -> !::x\n" " -l x -> limit(expr, x)" -msgid "Some sample queries::" -msgstr "" - -msgid "" -" hg log -r 'branch(default)'\n" -" hg log -r 'branch(default) and 1.5:: and not merge()'\n" -" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" -" hg log -r 'sort(date(\"May 2008\"), user)'\n" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" -msgstr "" -" hg log -r 'branch(default)'\n" -" hg log -r 'branch(default) and 1.5:: and not merge()'\n" -" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" -" hg log -r 'sort(date(\"May 2008\"), user)'\n" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgid "Some sample queries:" +msgstr "" + +msgid "- Changesets on the default branch::" +msgstr "- Ændringer på default grenen::" + +msgid " hg log -r 'branch(default)'" +msgstr " hg log -r 'branch(default)'" + +msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" +msgstr "" + +msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" +msgstr " hg log -r 'branch(default) and 1.5:: and not merge()'" + +msgid "- Open branch heads::" +msgstr "- Åbne grenhoveder::" + +msgid " hg log -r 'head() and not closed()'" +msgstr " hg log -r 'head() and not closed()'" + +msgid "" +"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" +" ``hgext/*``::" +msgstr "" + +msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" +msgstr " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" + +msgid "- Changesets in committed May 2008, sorted by user::" +msgstr "" + +msgid " hg log -r 'sort(date(\"May 2008\"), user)'" +msgstr " hg log -r 'sort(date(\"May 2008\"), user)'" + +msgid "" +"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" +" release::" +msgstr "" + +msgid "" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())'\n" +msgstr " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" msgid "" "Mercurial allows you to customize output of commands through\n" @@ -11684,6 +11963,11 @@ " and \">\" with XML entities." msgstr "" +msgid "" +":hex: Any text. Convert a binary Mercurial node identifier into\n" +" its long hexadecimal representation." +msgstr "" + msgid ":fill68: Any text. Wraps the text to fit in 68 columns." msgstr "" @@ -11796,6 +12080,11 @@ "server." msgstr "" +msgid "" +"Note that the security of HTTPS URLs depends on proper configuration of\n" +"web.cacerts." +msgstr "" + msgid "Some notes about using SSH with Mercurial:" msgstr "" @@ -12199,9 +12488,6 @@ msgid "adding changesets\n" msgstr "tilføjer ændringer\n" -msgid "changesets" -msgstr "ændringer" - msgid "received changelog group is empty" msgstr "modtagen changelog-gruppe er tom" @@ -12372,7 +12658,7 @@ msgstr "henter %s til %s\n" #, python-format -msgid "warning: detected divergent renames of %s to:\n" +msgid "note: possible conflict - %s was renamed multiple times to:\n" msgstr "" #, python-format @@ -12389,15 +12675,38 @@ msgstr "" "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" -msgid "" -"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " -"changes)" -msgstr "" -"krydser grene (brug 'hg merge' for at sammenføje eller 'hg update -C' for at " -"kassere ændringerne)" - -msgid "crosses branches (use 'hg merge' or use 'hg update -c')" -msgstr "krydser grene (brug 'hg merge' eller 'hg update -c')" +msgid "crosses branches (merge branches or use --clean to discard changes)" +msgstr "krydser grene (sammenføj grenene eller brug --clean for at kassere ændringerne)" + +msgid "crosses branches (merge branches or use --check to force update)" +msgstr "krydser grene (sammenføj grenene eller brug --check for at forcere opdateringen)" + +msgid "Attention:" +msgstr "" + +msgid "Caution:" +msgstr "Forsigtig:" + +msgid "!Danger!" +msgstr "!Fare!" + +msgid "Error:" +msgstr "Fejl:" + +msgid "Hint:" +msgstr "" + +msgid "Important:" +msgstr "Vigtigt:" + +msgid "Note:" +msgstr "Bemærk:" + +msgid "Tip:" +msgstr "Tip:" + +msgid "Warning!" +msgstr "Advarsel!" #, python-format msgid "cannot create %s: destination already exists" @@ -12477,14 +12786,8 @@ msgid "unsupported line endings type: %s" msgstr "linieendelse %s understøttes ikke" -msgid "" -"internal patcher failed\n" -"please report details to http://mercurial.selenic.com/bts/\n" -"or mercurial@selenic.com\n" -msgstr "" -"intern lappe-funktionalitet fejlede\n" -"angiv venligst fejldetaljer på http://mercurial.selenic.com/bts/\n" -"eller mercurial@selenic.com\n" +msgid "patch failed to apply" +msgstr "rettelse kunne ikke tilføjes" #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" @@ -12557,12 +12860,12 @@ msgid "%s not found in the transaction" msgstr "%s ikke fundet i transaktionen" +msgid "consistency error in delta" +msgstr "konsistensfejl i delta" + msgid "unknown base" msgstr "" -msgid "consistency error adding group" -msgstr "konsistensfejl ved tilføjelse af gruppe" - msgid "unterminated string" msgstr "" @@ -12583,16 +12886,31 @@ msgid "not a function: %s" msgstr "ikke en funktion: %s" -msgid "limit wants two arguments" -msgstr "" - -msgid "limit wants a number" -msgstr "" +msgid "id requires one argument" +msgstr "id kræver et argument" + +msgid "id requires a string" +msgstr "" + +msgid "rev requires one argument" +msgstr "" + +msgid "rev requires a number" +msgstr "" + +msgid "rev expects a number" +msgstr "rev forventer et revisionsnummer" + +msgid "limit requires two arguments" +msgstr "limit kræver to argumenter" + +msgid "limit requires a number" +msgstr "limit kræver et tal" msgid "limit expects a number" msgstr "" -msgid "ancestor wants two arguments" +msgid "ancestor requires two arguments" msgstr "" msgid "ancestor arguments must be single revisions" @@ -12601,31 +12919,35 @@ msgid "follow takes no arguments" msgstr "" -msgid "date wants a string" -msgstr "" - -msgid "keyword wants a string" -msgstr "" - -msgid "grep wants a string" -msgstr "" - -msgid "author wants a string" -msgstr "" - -msgid "file wants a pattern" -msgstr "" - -msgid "contains wants a pattern" -msgstr "" - -msgid "modifies wants a pattern" -msgstr "" - -msgid "adds wants a pattern" -msgstr "" - -msgid "removes wants a pattern" +msgid "date requires a string" +msgstr "" + +msgid "keyword requires a string" +msgstr "" + +msgid "grep requires a string" +msgstr "" + +#, python-format +msgid "invalid match pattern: %s" +msgstr "ugyldigt søgemønster: %s" + +msgid "author requires a string" +msgstr "" + +msgid "file requires a pattern" +msgstr "" + +msgid "contains requires a pattern" +msgstr "" + +msgid "modifies requires a pattern" +msgstr "" + +msgid "adds requires a pattern" +msgstr "" + +msgid "removes requires a pattern" msgstr "" msgid "merge takes no arguments" @@ -12637,7 +12959,7 @@ msgid "head takes no arguments" msgstr "" -msgid "sort wants one or two arguments" +msgid "sort requires one or two arguments" msgstr "" msgid "sort spec must be a string" @@ -12650,10 +12972,13 @@ msgid "all takes no arguments" msgstr "" -msgid "outgoing wants a repository path" -msgstr "" - -msgid "tagged takes no arguments" +msgid "outgoing requires a repository path" +msgstr "" + +msgid "tag takes one or no arguments" +msgstr "" + +msgid "the argument to tag must be a string" msgstr "" msgid "can't negate that" @@ -12748,12 +13073,16 @@ msgstr "" #, python-format +msgid "default path for subrepository %s not found" +msgstr "" + +#, python-format msgid "unknown subrepo type %s" msgstr "ukendt underdepottype %s" #, python-format -msgid "warning: %s in %s\n" -msgstr "advarsel: %s i %s\n" +msgid "warning: error \"%s\" in subrepository \"%s\"\n" +msgstr "advarsel: fejl \"%s\" i underdepot \"%s\"\n" #, python-format msgid "removing subrepo %s\n" @@ -12785,6 +13114,9 @@ msgid "node '%s' is not well formed" msgstr "knude '%s' er ikke korrekt formet" +msgid ".hg/tags.cache is corrupt, rebuilding it\n" +msgstr "" + msgid "unmatched quotes" msgstr "" @@ -12829,6 +13161,10 @@ msgstr "Ignoreret: %s\n" #, python-format +msgid "(deprecated '%%' in path %s=%s from %s)\n" +msgstr "" + +#, python-format msgid "ignoring untrusted configuration option %s.%s = %s\n" msgstr "" @@ -12850,10 +13186,6 @@ msgid "username %s contains a newline\n" msgstr "brugernavn %s indeholder et linieskift\n" -#, python-format -msgid "(deprecated '%%' in path %s=%s from %s)\n" -msgstr "" - msgid "response expected" msgstr "svar forventet" @@ -12894,7 +13226,18 @@ msgid "certificate checking requires Python 2.6" msgstr "" -msgid "server identity verification succeeded\n" +msgid "no certificate received" +msgstr "modtog ikke noget certifikat" + +#, python-format +msgid "certificate is for %s" +msgstr "certifikatet er for %s" + +msgid "no commonName found in certificate" +msgstr "" + +#, python-format +msgid "%s certificate error: %s" msgstr "" #, python-format @@ -13044,6 +13387,9 @@ msgid "checking changesets\n" msgstr "kontrollerer ændringer\n" +msgid "checking" +msgstr "kontrollerer" + #, python-format msgid "unpacking changeset %s" msgstr "udpakker ændring %s" @@ -13085,9 +13431,6 @@ msgid "cannot decode filename '%s'" msgstr "kan ikke dekode filnavn '%s'" -msgid "checking" -msgstr "kontrollerer" - #, python-format msgid "broken revlog! (%s)" msgstr "beskadiget revlog! (%s)"
--- a/i18n/sv.po Sat Oct 23 00:18:10 2010 +0200 +++ b/i18n/sv.po Sat Oct 23 16:24:07 2010 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-08-01 22:36+0200\n" -"PO-Revision-Date: 2010-08-01 22:42+0200\n" +"POT-Creation-Date: 2010-10-21 15:40+0200\n" +"PO-Revision-Date: 2010-10-21 16:56+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "Language: Swedish\n" @@ -32,8 +32,18 @@ msgid "Commands" msgstr "Kommandon" -msgid " options:" -msgstr " flaggor:" +msgid "Extensions" +msgstr "Utökningar" + +msgid "" +"This section contains help for extensions that is distributed together with " +"Mercurial. Help for other extensions is available in the help system." +msgstr "" +"Den här sektioner innehåller hjälp för utökningar som levereras med " +"Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet." + +msgid "options:" +msgstr "flaggor:" #, python-format msgid " aliases: %s" @@ -78,8 +88,10 @@ msgid "" "Branch-based Access Control\n" -"---------------------------" -msgstr "" +"..........................." +msgstr "" +"Grenbaserad Åtkomstkontroll\n" +"..........................." msgid "" "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" @@ -102,8 +114,10 @@ msgid "" "Path-based Access Control\n" -"-------------------------" -msgstr "" +"........................." +msgstr "" +"Sökvägsbaserad Åtkomstkontroll\n" +".............................." msgid "" "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" @@ -114,8 +128,10 @@ msgid "" "Groups\n" -"------" -msgstr "" +"......" +msgstr "" +"Grupper\n" +"......." msgid "" "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" @@ -131,8 +147,10 @@ msgid "" "Example Configuration\n" -"---------------------" -msgstr "" +"....................." +msgstr "" +"Exempelkonfiguration\n" +"...................." msgid "::" msgstr "::" @@ -293,7 +311,7 @@ "By default, when several bookmarks point to the same changeset, they\n" "will all move forward together. It is possible to obtain a more\n" "git-like experience by adding the following configuration option to\n" -"your .hgrc::" +"your configuration file::" msgstr "" msgid "" @@ -318,7 +336,13 @@ " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" -" the bookmark is assigned to that revision.\n" +" the bookmark is assigned to that revision." +msgstr "" + +msgid "" +" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" +" push` and :hg:`help pull`). This requires the bookmark extension to be\n" +" enabled for both the local and remote repositories.\n" " " msgstr "" @@ -374,6 +398,10 @@ msgid "deleting remote bookmark %s\n" msgstr "raderar fjärrbokmärket %s\n" +#, python-format +msgid "bookmark %s does not exist on the local or remote repository!\n" +msgstr "bokmärket %s existerar inte i lokal- eller fjärrarkiv!\n" + msgid "searching for changes\n" msgstr "söker efter ändringar\n" @@ -387,12 +415,35 @@ msgid "bookmark to import" msgstr "bokmärke att importera" +msgid "BOOKMARK" +msgstr "BOKMÄRKE" + msgid "bookmark to export" msgstr "bokmärke att exportera" msgid "compare bookmark" msgstr "jämför bokmärke" +msgid "bookmark takes one or no arguments" +msgstr "bookmark tar ett eller inga argument" + +msgid "the argument to bookmark must be a string" +msgstr "argumentet till bookmark måste vara en sträng" + +msgid "" +"\n" +"Added by the bookmarks extension:" +msgstr "" +"\n" +"Tillagda av bookmarks-utökningen:" + +msgid "" +"``bookmark([name])``\n" +" The named bookmark or all bookmarks.\n" +msgstr "" +"``bookmark([namn])``\n" +" Det angivna bokmärket eller alla bokmärken.\n" + msgid "force" msgstr "tvinga" @@ -768,6 +819,10 @@ " " msgstr "" +#, python-format +msgid "skipping malformed alias: %s\n" +msgstr "hoppar över defekt alias: %s\n" + msgid "count rate for the specified revision or range" msgstr "" @@ -835,8 +890,8 @@ "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" "render_text, som kan användas för att lägga till effekter på valfri text." -msgid "Default effects may be overridden from the .hgrc file::" -msgstr "Standardeffekter kan ersättas från .hgrc-filen::" +msgid "Default effects may be overridden from your configuration file::" +msgstr "Standardeffekter kan ersättas från din konfiturationsfil::" msgid "" " [color]\n" @@ -905,6 +960,17 @@ msgstr " bookmarks.current = green" msgid "" +" branches.active = none\n" +" branches.closed = black bold\n" +" branches.current = green\n" +" branches.inactive = none" +msgstr "" +" branches.active = none\n" +" branches.closed = black bold\n" +" branches.current = green\n" +" branches.inactive = none" + +msgid "" "The color extension will try to detect whether to use ANSI codes or\n" "Win32 console APIs, unless it is made explicit::" msgstr "" @@ -928,8 +994,8 @@ msgid "win32console not found, please install pywin32\n" msgstr "win32console hittades inte, installera pywin32\n" -msgid "when to colorize (always, auto, or never)" -msgstr "när färgläggning ska ske (always, auto eller never)" +msgid "when to colorize (boolean, always, auto, or never)" +msgstr "när färgläggning ska ske (boolean, always, auto eller never)" msgid "TYPE" msgstr "TYP" @@ -971,9 +1037,12 @@ msgid "" " If no destination directory name is specified, it defaults to the\n" -" basename of the source with '-hg' appended. If the destination\n" +" basename of the source with ``-hg`` appended. If the destination\n" " repository doesn't exist, it will be created." msgstr "" +" Om ingen destinationskatalog anges, kommer basnamnet för källan med\n" +" ``-hg`` tillagd. Om destinationsarkivet inte existerar, så kommer det\n" +" att skapas." msgid "" " By default, all sources except Mercurial will use --branchsort.\n" @@ -1011,16 +1080,21 @@ msgid "" " If the file doesn't exist, it's automatically created. It's\n" -" updated on each commit copied, so convert-repo can be interrupted\n" +" updated on each commit copied, so :hg:`convert` can be interrupted\n" " and can be run repeatedly to copy new commits." msgstr "" msgid "" -" The [username mapping] file is a simple text file that maps each\n" -" source commit author to a destination commit author. It is handy\n" -" for source SCMs that use unix logins to identify authors (eg:\n" -" CVS). One line per author mapping and the line format is:\n" -" srcauthor=whatever string you want" +" The authormap is a simple text file that maps each source commit\n" +" author to a destination commit author. It is handy for source SCMs\n" +" that use unix logins to identify authors (eg: CVS). One line per\n" +" author mapping and the line format is::" +msgstr "" + +msgid " source author = destination author" +msgstr "" + +msgid " Empty lines and lines starting with a ``#`` are ignored." msgstr "" msgid "" @@ -1039,20 +1113,20 @@ msgstr " rename sökväg/till/källa sökväg/till/destination" msgid "" -" Comment lines start with '#'. A specificed path matches if it\n" +" Comment lines start with ``#``. A specified path matches if it\n" " equals the full relative name of a file or one of its parent\n" -" directories. The 'include' or 'exclude' directive with the longest\n" -" matching path applies, so line order does not matter." -msgstr "" - -msgid "" -" The 'include' directive causes a file, or all files under a\n" +" directories. The ``include`` or ``exclude`` directive with the\n" +" longest matching path applies, so line order does not matter." +msgstr "" + +msgid "" +" The ``include`` directive causes a file, or all files under a\n" " directory, to be included in the destination repository, and the\n" " exclusion of all other files and directories not explicitly\n" -" included. The 'exclude' directive causes files or directories to\n" -" be omitted. The 'rename' directive renames a file or directory if\n" -" is converted. To rename from a subdirectory into the root of the\n" -" repository, use '.' as the path to rename to." +" included. The ``exclude`` directive causes files or directories to\n" +" be omitted. The ``rename`` directive renames a file or directory if\n" +" it is converted. To rename from a subdirectory into the root of\n" +" the repository, use ``.`` as the path to rename to." msgstr "" msgid "" @@ -1061,7 +1135,14 @@ " useful if you want to e.g. give a Subversion merge two parents, or\n" " graft two disconnected series of history together. Each entry\n" " contains a key, followed by a space, followed by one or two\n" -" comma-separated values. The key is the revision ID in the source\n" +" comma-separated values::" +msgstr "" + +msgid " key parent1, parent2" +msgstr "" + +msgid "" +" The key is the revision ID in the source\n" " revision control system whose parents should be modified (same\n" " format as a key in .hg/shamap). The values are the revision IDs\n" " (in either the source or destination revision control system) that\n" @@ -1077,17 +1158,26 @@ " conjunction with a splicemap, it allows for a powerful combination\n" " to help fix even the most badly mismanaged repositories and turn them\n" " into nicely structured Mercurial repositories. The branchmap contains\n" -" lines of the form \"original_branch_name new_branch_name\".\n" -" \"original_branch_name\" is the name of the branch in the source\n" -" repository, and \"new_branch_name\" is the name of the branch is the\n" -" destination repository. This can be used to (for instance) move code\n" -" in one repository from \"default\" to a named branch." +" lines of the form::" +msgstr "" + +msgid " original_branch_name new_branch_name" +msgstr "" + +msgid "" +" where \"original_branch_name\" is the name of the branch in the\n" +" source repository, and \"new_branch_name\" is the name of the branch\n" +" is the destination repository. No whitespace is allowed in the\n" +" branch names. This can be used to (for instance) move code in one\n" +" repository from \"default\" to a named branch." msgstr "" msgid "" " Mercurial Source\n" -" ----------------" -msgstr "" +" ''''''''''''''''" +msgstr "" +" Mercurial-källa\n" +" '''''''''''''''" msgid "" " --config convert.hg.ignoreerrors=False (boolean)\n" @@ -1103,8 +1193,10 @@ msgid "" " CVS Source\n" -" ----------" -msgstr "" +" ''''''''''" +msgstr "" +" CVS-källa\n" +" '''''''''" msgid "" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" @@ -1160,8 +1252,10 @@ msgid "" " Subversion Source\n" -" -----------------" -msgstr "" +" '''''''''''''''''" +msgstr "" +" Subversion-källa\n" +" ''''''''''''''''" msgid "" " Subversion source detects classical trunk/branches/tags layouts.\n" @@ -1198,8 +1292,10 @@ msgid "" " Perforce Source\n" -" ---------------" -msgstr "" +" '''''''''''''''" +msgstr "" +" Perforce-källa\n" +" ''''''''''''''" msgid "" " The Perforce (P4) importer can be given a p4 depot path or a\n" @@ -1222,8 +1318,10 @@ msgid "" " Mercurial Destination\n" -" ---------------------" -msgstr "" +" '''''''''''''''''''''" +msgstr "" +" Mercurial-destination\n" +" '''''''''''''''''''''" msgid "" " --config convert.hg.clonebranches=False (boolean)\n" @@ -1253,21 +1351,24 @@ " dates." msgstr "" -msgid "username mapping filename" +msgid "username mapping filename (DEPRECATED, use --authormap instead)" +msgstr "" + +msgid "source repository type" msgstr "" msgid "destination repository type" msgstr "" +msgid "import up to target revision REV" +msgstr "" + +msgid "remap usernames using this file" +msgstr "" + msgid "remap file names using contents of file" msgstr "" -msgid "import up to target revision REV" -msgstr "" - -msgid "source repository type" -msgstr "" - msgid "splice synthesized history into place" msgstr "" @@ -1382,8 +1483,8 @@ msgid "%s: unknown repository type" msgstr "%s: okänd arkivtyp" -msgid "retrieving file" -msgstr "hämtar fil" +msgid "getting files" +msgstr "hämtar filer" msgid "revisions" msgstr "revisioner" @@ -1555,6 +1656,13 @@ msgid "Python ElementTree module is not available" msgstr "" +#, python-format +msgid "%s repository format is unsupported, please upgrade" +msgstr "" + +msgid "failed to detect repository format!" +msgstr "" + msgid "internal calling inconsistency" msgstr "" @@ -1562,10 +1670,18 @@ msgstr "" #, python-format +msgid "%s:%d: path to %s is missing\n" +msgstr "" + +#, python-format msgid "%s:%d: %r already in %s list\n" msgstr "" #, python-format +msgid "%s:%d: superfluous / in %s %r\n" +msgstr "" + +#, python-format msgid "%s:%d: unknown directive %r\n" msgstr "" @@ -1749,7 +1865,7 @@ msgid "unable to cope with svn output" msgstr "" -msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgid "writing Subversion tags is not yet implemented\n" msgstr "" msgid "automatically manage newlines in repository files" @@ -1974,9 +2090,13 @@ " revisions are specified, the working directory files are compared\n" " to its parent." msgstr "" +" När två revisionsargument ges, kommer ändringar mellan revisionerna\n" +" att visas. Om bara en revision anges så jämförs den revisionen med\n" +" arbetskatalogen, och, när ingen revision anges, jämförs arbetskatalogen\n" +" med dess förälder." msgid "CMD" -msgstr "" +msgstr "KMD" msgid "comparison program to run" msgstr "" @@ -2032,29 +2152,36 @@ " order, use --switch-parent." msgstr "" -msgid "" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." + +msgid "" +" Returns 0 on success.\n" " " msgstr "" -" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" +" Returnerar 0 om kommandot lyckades.\n" " " msgid "" "working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" +"arbetskatalogen är inte på grentoppen (använd \"hg update\" för att hämta ut " +"grentoppen)" msgid "outstanding uncommitted merge" -msgstr "" +msgstr "kvarvarande oarkiverad sammanfogning" msgid "outstanding uncommitted changes" -msgstr "" +msgstr "kvarvarande oarkiverade ändringar" msgid "working directory is missing some files" -msgstr "" +msgstr "arbetskatalogen saknar några filer" msgid "" "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" +"flera huvuden i denna gren (använd \"hg heads .\" och \"hg merge\" för att " +"sammanfoga)" #, python-format msgid "pulling from %s\n" @@ -2064,79 +2191,92 @@ "Other repository doesn't support revision lookup, so a rev cannot be " "specified." msgstr "" +"Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " +"anges." #, python-format msgid "" "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" "\" to merge them)\n" msgstr "" +"sammanfogar inte med %d andra nya grenhuvuden (använd \"hg heads .\" och " +"\"hg merge\" för att sammanfoga dem)\n" #, python-format msgid "updating to %d:%s\n" -msgstr "" +msgstr "uppdaterar till %d:%s\n" #, python-format msgid "merging with %d:%s\n" -msgstr "" +msgstr "sammanfogar med %d:%s\n" #, python-format msgid "new changeset %d:%s merges remote changes with local\n" -msgstr "" +msgstr "nya ändringen %d:%s sammanfogar fjärrändringar med lokala\n" msgid "a specific revision you would like to pull" -msgstr "" +msgstr "en specifik revision som du vill dra" msgid "edit commit message" -msgstr "" +msgstr "redigera arkiveringsmeddelande" msgid "edit commit message (DEPRECATED)" -msgstr "" +msgstr "redigera arkiveringsmeddelande (FÖRÅLDRAD)" msgid "switch parents when merging" -msgstr "" +msgstr "byt föräldrar vid sammanfogning" msgid "hg fetch [SOURCE]" -msgstr "" +msgstr "hg fetch [KÄLLA]" msgid "commands to sign and verify changesets" -msgstr "" +msgstr "kommandon för att signera och verifiera ändringar" msgid "error while verifying signature" -msgstr "" +msgstr "fel vid verifiering av signatur" #, python-format msgid "%s Bad signature from \"%s\"\n" -msgstr "" +msgstr "%s Dålig signatur från \"%s\"\n" #, python-format msgid "%s Note: Signature has expired (signed by: \"%s\")\n" -msgstr "" +msgstr "%s Notera: Signaturen har gått ut (signerad av: \"%s\")\n" #, python-format msgid "%s Note: This key has expired (signed by: \"%s\")\n" -msgstr "" +msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n" msgid "list signed changesets" -msgstr "" +msgstr "visa signerade ändringar" #, python-format msgid "%s:%d node does not exist\n" -msgstr "" +msgstr "%s:%d noden existerar inte\n" msgid "verify all the signatures there may be for a particular revision" -msgstr "" +msgstr "verifiera alla signaturerna som finns för en viss revision" #, python-format msgid "No valid signature for %s\n" -msgstr "" +msgstr "Ingen giltig signatur för %s\n" msgid "add a signature for the current or given revision" -msgstr "" +msgstr "lägg till en signatur för den aktuella eller angivna revisionen" msgid "" " If no revision is given, the parent of the working directory is used,\n" " or tip if no revision is checked out." msgstr "" +" Om ingen revision anges, så används arbetskatalogens föräldern, eller\n" +" toppen om ingen revision är uthämtad." + +msgid "" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" " +msgstr "" +" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" +" " msgid "uncommitted merge - please provide a specific revision" msgstr "" @@ -2145,7 +2285,7 @@ msgid "Signing %d:%s\n" msgstr "Signerar %d:%s\n" -msgid "Error while signing" +msgid "error while signing" msgstr "" msgid "" @@ -2313,7 +2453,7 @@ msgid "" "The :hg:`view` command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" -"the path to hgk in your .hgrc file::" +"the path to hgk in your configuration file::" msgstr "" msgid "" @@ -2642,6 +2782,11 @@ msgstr "" msgid "" +"Keywords expand to the changeset data pertaining to the latest change\n" +"relative to the working directory parent of each file." +msgstr "" + +msgid "" "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" "sections of hgrc files." msgstr "" @@ -2663,8 +2808,9 @@ msgstr "" msgid "" -"NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories." +".. note::\n" +" The more specific you are in your filename patterns the less you\n" +" lose speed in huge repositories." msgstr "" msgid "" @@ -3248,6 +3394,10 @@ msgid "patch %s does not exist" msgstr "" +#, python-format +msgid "renaming %s to %s\n" +msgstr "döper om %s till %s\n" + msgid "need --name to import a patch from -" msgstr "" @@ -3276,6 +3426,9 @@ msgid "print the patches already applied" msgstr "" +msgid " Returns 0 on success." +msgstr " Returnerar 0 om kommandot lyckades." + msgid "only one patch applied\n" msgstr "" @@ -3321,9 +3474,21 @@ msgid "" " To import a patch from standard input, pass - as the patch file.\n" " When importing from standard input, a patch name must be specified\n" -" using the --name flag.\n" +" using the --name flag." +msgstr "" + +msgid " To import an existing patch while renaming it::" +msgstr "" + +msgid " hg qimport -e existing-patch -n new-name" +msgstr "" + +msgid "" +" Returns 0 if import succeeded.\n" " " msgstr "" +" Returnerar 0 om importeringen lyckades.\n" +" " msgid "init a new queue repository (DEPRECATED)" msgstr "" @@ -3359,9 +3524,15 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by :hg:`init --mq`.\n" +" would be created by :hg:`init --mq`." +msgstr "" + +msgid "" +" Return 0 on success.\n" " " msgstr "" +" Returnerar 0 om kommandot lyckades.\n" +" " msgid "versioned patch repository not found (see init --mq)" msgstr "versionshanterat patcharkiv hittades inte (se init --mq)" @@ -3425,12 +3596,18 @@ " Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" -" information.\n" +" information." +msgstr "" + +msgid "" +" Returns 0 on successful creation of a new patch.\n" " " msgstr "" +" Returnerar 0 om en patch skapades.\n" +" " msgid "update the current patch" -msgstr "" +msgstr "uppdatera den nuvarande patchen" msgid "" " If any file patterns are provided, the refreshed patch will\n" @@ -3444,11 +3621,18 @@ msgstr "" msgid "" +" If -e/--edit is specified, Mercurial will start your configured editor " +"for\n" +" you to enter a message. In case qrefresh fails, you will find a backup " +"of\n" +" your message in ``.hg/last-message.txt``." +msgstr "" + +msgid "" " hg add/remove/copy/rename work as usual, though you might want to\n" " use git-style patches (-g/--git or [diff] git=1) to track copies\n" " and renames. See the diffs help topic for more information on the\n" -" git diff format.\n" -" " +" git diff format." msgstr "" msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" @@ -3468,8 +3652,7 @@ " Use :hg:`diff` if you only want to see the changes made since the\n" " last qrefresh, or :hg:`export qtip` if you want to see changes\n" " made by the current patch without including changes made since the\n" -" qrefresh.\n" -" " +" qrefresh." msgstr "" msgid "fold the named patches into the current patch" @@ -3486,25 +3669,22 @@ msgid "" " The header for each folded patch will be concatenated with the\n" -" current patch header, separated by a line of '* * *'." +" current patch header, separated by a line of ``* * *``." msgstr "" msgid "qfold requires at least one patch name" msgstr "" -msgid "No patches applied" -msgstr "" - -#, python-format -msgid "Skipping already folded patch %s" -msgstr "" +#, python-format +msgid "Skipping already folded patch %s\n" +msgstr "Hoppar över redan hopvikta patchen %s\n" #, python-format msgid "qfold cannot fold already applied patch %s" msgstr "" #, python-format -msgid "Error folding patch %s" +msgid "error folding patch %s" msgstr "" msgid "push or pop patches until named patch is at top of stack" @@ -3524,16 +3704,18 @@ msgid "" " With no arguments, print the currently active guards.\n" -" With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'." +" With arguments, set guards for the named patch." +msgstr "" + +msgid "" +" .. note::\n" +" Specifying negative guards now requires '--'." msgstr "" msgid " To set guards on another patch::" msgstr "" -msgid "" -" hg qguard other.patch -- +2.6.17 -stable\n" -" " +msgid " hg qguard other.patch -- +2.6.17 -stable" msgstr "" msgid "cannot mix -l/--list with options or arguments" @@ -3554,9 +3736,15 @@ msgid "" " When -f/--force is applied, all local changes in patched files\n" -" will be lost.\n" +" will be lost." +msgstr "" + +msgid "" +" Return 0 on succces.\n" " " msgstr "" +" Returnerar 0 om kommandot lyckades.\n" +" " msgid "no saved queues found, please use -n\n" msgstr "" @@ -3571,8 +3759,7 @@ msgid "" " By default, pops off the top of the patch stack. If given a patch\n" " name, keeps popping off patches until the named patch is at the\n" -" top of the stack.\n" -" " +" top of the stack." msgstr "" #, python-format @@ -3595,15 +3782,11 @@ msgid "A patch named %s already exists in the series file" msgstr "" -#, python-format -msgid "renaming %s to %s\n" -msgstr "döper om %s till %s\n" - msgid "restore the queue state saved by a revision (DEPRECATED)" msgstr "" -msgid " This command is deprecated, use rebase --mq instead." -msgstr "" +msgid " This command is deprecated, use :hg:`rebase` instead." +msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället." msgid "save current queue state (DEPRECATED)" msgstr "" @@ -3620,15 +3803,13 @@ msgid "copy %s to %s\n" msgstr "" -msgid "strip a changeset and all its descendants from the repository" -msgstr "" - -msgid "" -" The strip command removes all changesets whose local revision\n" -" number is greater than or equal to REV, and then restores any\n" -" changesets that are not descendants of REV. If the working\n" -" directory has uncommitted changes, the operation is aborted unless\n" -" the --force flag is supplied." +msgid "strip changesets and all their descendants from the repository" +msgstr "" + +msgid "" +" The strip command removes the specified changesets and all their\n" +" descendants. If the working directory has uncommitted changes,\n" +" the operation is aborted unless the --force flag is supplied." msgstr "" msgid "" @@ -3648,10 +3829,12 @@ msgstr "" msgid "" -" Use the --nobackup option to discard the backup bundle once the\n" -" operation completes.\n" -" " -msgstr "" +" Use the --no-backup option to discard the backup bundle once the\n" +" operation completes." +msgstr "" + +msgid "empty revision set" +msgstr "tomt revisionsset" msgid "set or print guarded patches to push" msgstr "" @@ -3748,8 +3931,7 @@ msgid "" " This can be especially useful if your changes have been applied to\n" " an upstream repository, or if you are about to push your changes\n" -" to upstream.\n" -" " +" to upstream." msgstr "" msgid "no revisions specified" @@ -3781,13 +3963,18 @@ msgid "" " To delete an existing queue, use --delete. You cannot delete the " "currently\n" -" active queue.\n" -" " +" active queue." msgstr "" msgid "patches applied - cannot set new queue active" msgstr "" +msgid "cannot delete queue that does not exist" +msgstr "" + +msgid "cannot delete currently active queue" +msgstr "" + msgid " (active)\n" msgstr " (aktiv)\n" @@ -3798,10 +3985,12 @@ msgid "queue \"%s\" already exists" msgstr "kön \"%s\" finns redan" -msgid "cannot delete queue that does not exist" -msgstr "" - -msgid "cannot delete currently active queue" +#, python-format +msgid "can't rename \"%s\" to its current name" +msgstr "" + +#, python-format +msgid "non-queue directory \"%s\" already exists" msgstr "" msgid "use --create to create a new queue" @@ -3827,8 +4016,8 @@ msgid "only a local queue repository may be initialized" msgstr "bara ett lokalt köarkiv kan initialiseras" -msgid "There is no Mercurial repository here (.hg not found)" -msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" +msgid "there is no Mercurial repository here (.hg not found)" +msgstr "det finns inget Mercurial-arkiv här (.hg hittades inte)" msgid "no queue repository" msgstr "inget köarkiv" @@ -3886,8 +4075,8 @@ msgid "stop managing a revision (DEPRECATED)" msgstr "" -msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "" +msgid "hg qdelete [-k] [PATCH]..." +msgstr "hg qdelete [-k] [PATCH]..." msgid "edit patch header" msgstr "" @@ -3979,10 +4168,10 @@ msgid "forget any local changes to patched files" msgstr "" -msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "" - -msgid "apply if the patch has rejects" +msgid "hg qpop [-a] [-f] [PATCH | INDEX]" +msgstr "hg qpop [-a] [-f] [PATCH | INDEX]" + +msgid "apply on top of local changes" msgstr "" msgid "list patch name in commit text" @@ -4000,8 +4189,8 @@ msgid "reorder patch series and apply only the patch" msgstr "omordna patchserien och applicera bara patchen" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAMN] [--move] [PATCH | INDEX]" +msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" msgid "refresh only files already in the patch and specified files" msgstr "" @@ -4084,25 +4273,31 @@ "ättling till REV (FÖRLEGAD)" msgid "no backups" -msgstr "" - -msgid "hg strip [-f] [-n] REV" -msgstr "hg strip [-f] [-n] REV" +msgstr "inga säkerhetskopior" + +msgid "no backups (DEPRECATED)" +msgstr "inga säkerhetskopior (FÖRÅLDRAD)" + +msgid "do not modify working copy during strip" +msgstr "modifiera inte arbetskopian vid strippning" + +msgid "hg strip [-k] [-f] [-n] REV..." +msgstr "hg strip [-k] [-f] [-n] REV..." msgid "hg qtop [-s]" -msgstr "" +msgstr "hg qtop [-s]" msgid "show only the first patch" msgstr "visa bara den första patchen" msgid "hg qunapplied [-1] [-s] [PATCH]" -msgstr "" +msgstr "hg qunapplied [-1] [-s] [PATCH]" msgid "finish all applied changesets" msgstr "" msgid "hg qfinish [-a] [REV]..." -msgstr "" +msgstr "hg qfinish [-a] [REV]..." msgid "list all available queues" msgstr "visa alla tillgängliga köer" @@ -4110,9 +4305,15 @@ msgid "create new queue" msgstr "skapa ny kö" +msgid "rename active queue" +msgstr "döp om aktiv kö" + msgid "delete reference to queue" msgstr "" +msgid "delete queue, and remove patch dir" +msgstr "" + msgid "[OPTION] [QUEUE]" msgstr "[FLAGGA] [KÖ]" @@ -4244,14 +4445,32 @@ msgstr "" msgid "" +"By default, the pager is only executed if a command has output. To\n" +"force the pager to run even if a command prints nothing, set::" +msgstr "" +"Som standard körs bara pagineraren om ett kommando visar något. För att\n" +"tvinga pagineraren att köra även om ett kommando inte visar något, sätt::" + +msgid "" +" [pager]\n" +" force = True" +msgstr "" +" [pager]\n" +" force = True" + +msgid "" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" "setting::" msgstr "" +"Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n" +"genom att sätta::" msgid "" " [pager]\n" " quiet = True" msgstr "" +" [pager]\n" +" quiet = True" msgid "" "You can disable the pager for certain commands by adding them to the\n" @@ -4283,8 +4502,22 @@ msgid "" "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" -"to specify them in the global .hgrc\n" -msgstr "" +"to specify them in your user configuration file." +msgstr "" +"För att ignorera globala kommandon som :hg:`version` eller :hg:`help`, så\n" +"måste du ange dem i din användarkonfigurationsfil." + +msgid "" +"The --pager=... option can also be used to control when the pager is\n" +"used. Use a boolean value like yes, no, on, off, or use auto for\n" +"normal behavior.\n" +msgstr "" +"Flaggan --pager=... kan också användas för att kontrollera när pagineraren\n" +"används. Använd ett booleskt värde som yes, no, on off, eller använd auto\n" +"för normalt uppförande.\n" + +msgid "when to paginate (boolean, always, auto, or never)" +msgstr "när paginering ska ske (boolean, always, auto eller never)" msgid "interpret suffixes to refer to ancestor revisions" msgstr "" @@ -4339,12 +4572,6 @@ msgstr "" msgid "" -"With the -d/--diffstat option, you will be prompted for each changeset\n" -"with a diffstat summary and the changeset summary, so you can be sure\n" -"you are sending the right changes." -msgstr "" - -msgid "" "To configure other defaults, add a section like this to your hgrc\n" "file::" msgstr "" @@ -4369,39 +4596,6 @@ msgstr "" msgid "" -"To avoid sending patches prematurely, it is a good idea to first run\n" -"the :hg:`email` command with the \"-n\" option (test only). You will be\n" -"prompted for an email recipient address, a subject and an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If the PAGER environment\n" -"variable is set, your pager will be fired up once for each patchbomb\n" -"message, so you can verify everything is alright." -msgstr "" - -msgid "" -"The -m/--mbox option is also very useful. Instead of previewing each\n" -"patchbomb message in a pager or sending the messages directly, it will\n" -"create a UNIX mailbox file with the patch emails. This mailbox file\n" -"can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt::" -msgstr "" - -msgid " % mutt -R -f mbox" -msgstr "" - -msgid "" -"When you are previewing the patchbomb messages, you can use ``formail``\n" -"(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out::" -msgstr "" - -msgid " % formail -s sendmail -bm -t < mbox" -msgstr "" - -msgid "That should be all. Now your patchbomb is on its way out." -msgstr "" - -msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -4416,12 +4610,6 @@ msgid "Please enter a valid value.\n" msgstr "Ange ett giltigt värde.\n" -msgid "does the diffstat above look okay?" -msgstr "ser diffstaten ovanför okej ut?" - -msgid "diffstat rejected" -msgstr "diffstat avvisad" - msgid "send changesets by email" msgstr "" @@ -4435,10 +4623,21 @@ " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" " The message contains two or three parts. First, the changeset\n" -" description. Next, (optionally) if the diffstat program is\n" -" installed and -d/--diffstat is used, the result of running\n" -" diffstat on the patch. Finally, the patch itself, as generated by\n" -" :hg:`export`." +" description." +msgstr "" + +msgid "" +" With the -d/--diffstat option, if the diffstat program is\n" +" installed, the result of running diffstat on the patch is inserted." +msgstr "" + +msgid " Finally, the patch itself, as generated by :hg:`export`." +msgstr "" + +msgid "" +" With the -d/--diffstat or -c/--confirm options, you will be presented\n" +" with a final summary of all messages and asked for confirmation before\n" +" the messages are sent." msgstr "" msgid "" @@ -4461,6 +4660,23 @@ msgstr "" msgid "" +" With -m/--mbox, instead of previewing each patchbomb message in a\n" +" pager or sending the messages directly, it will create a UNIX\n" +" mailbox file with the patch emails. This mailbox file can be\n" +" previewed with any mail user agent which supports UNIX mbox\n" +" files." +msgstr "" + +msgid "" +" With -n/--test, all steps will run, but mail will not be sent.\n" +" You will be prompted for an email recipient address, a subject and\n" +" an introductory message describing the patches of your patchbomb.\n" +" Then when all is done, patchbomb messages are displayed. If the\n" +" PAGER environment variable is set, your pager will be fired up once\n" +" for each patchbomb message, so you can verify everything is alright." +msgstr "" + +msgid "" " hg email -r 3000 # send patch 3000 only\n" " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" " hg email -r 3000:3005 # send patches 3000 through 3005\n" @@ -4483,6 +4699,15 @@ msgstr "" msgid "" +" hg email -o -m mbox && # generate an mbox file...\n" +" mutt -R -f mbox # ... and view it with mutt\n" +" hg email -o -m mbox && # generate an mbox file ...\n" +" formail -s sendmail \\ # ... and use formail to send from the " +"mbox\n" +" -bm -t < mbox # ... using sendmail" +msgstr "" + +msgid "" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" " " @@ -4509,17 +4734,37 @@ msgid "This patch series consists of %d patches." msgstr "" -msgid "Final summary:\n" +msgid "" +"\n" +"Final summary:" +msgstr "" + +msgid "are you sure you want to send (yn)?" +msgstr "" + +msgid "&No" +msgstr "" + +msgid "&Yes" +msgstr "" + +msgid "patchbomb canceled" msgstr "" msgid "Displaying " -msgstr "" +msgstr "Visar " msgid "Writing " -msgstr "" +msgstr "Skriver " + +msgid "writing" +msgstr "skriver" msgid "Sending " -msgstr "" +msgstr "Sänder " + +msgid "sending" +msgstr "sänder" msgid "send patches as attachments" msgstr "" @@ -4533,6 +4778,9 @@ msgid "email addresses of copy recipients" msgstr "" +msgid "ask for confirmation before sending" +msgstr "" + msgid "add diffstat output to messages" msgstr "" @@ -4804,6 +5052,12 @@ msgid "cannot use both keepbranches and extrafn" msgstr "" +msgid "rebasing" +msgstr "" + +msgid "changesets" +msgstr "ändringar" + msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "fixa olösta konflikter med hg resolve, kör sedan hg rebase --continue" @@ -4954,9 +5208,6 @@ " Om filer inte anges, kommer alla ändringar som :hg:`status`\n" " rapporterar att arkiveras." -msgid " See :hg:`help dates` for a list of formats valid for -d/--date." -msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." - msgid "" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" @@ -4998,9 +5249,6 @@ msgid "no changes to record\n" msgstr "" -msgid "patch failed to apply" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "" @@ -5076,9 +5324,6 @@ msgid "not linkable: %s\n" msgstr "inte länkbar: %s\n" -msgid " files" -msgstr " filer" - msgid "pruning" msgstr "putsar" @@ -5162,15 +5407,16 @@ msgstr "" msgid "" -" NOTE: using rollback or extensions that destroy/modify history\n" -" (mq, rebase, etc.) can cause considerable confusion with shared\n" -" clones. In particular, if two shared clones are both updated to\n" -" the same changeset, and one of them destroys that changeset with\n" -" rollback, the other clone will suddenly stop working: all\n" -" operations will fail with \"abort: working directory has unknown\n" -" parent\". The only known workaround is to use debugsetparents on\n" -" the broken clone to reset it to a changeset that still exists\n" -" (e.g. tip).\n" +" .. note::\n" +" using rollback or extensions that destroy/modify history (mq,\n" +" rebase, etc.) can cause considerable confusion with shared\n" +" clones. In particular, if two shared clones are both updated to\n" +" the same changeset, and one of them destroys that changeset\n" +" with rollback, the other clone will suddenly stop working: all\n" +" operations will fail with \"abort: working directory has unknown\n" +" parent\". The only known workaround is to use debugsetparents on\n" +" the broken clone to reset it to a changeset that still exists\n" +" (e.g. tip).\n" " " msgstr "" @@ -5221,7 +5467,7 @@ msgid "%s: empty changeset" msgstr "" -msgid "Fix up the merge and run hg transplant --continue" +msgid "fix up the merge and run hg transplant --continue" msgstr "" #, python-format @@ -5334,6 +5580,21 @@ msgid "outstanding local changes" msgstr "" +msgid "" +"\n" +"Added by the transplant extension:" +msgstr "" +"\n" +"Tillagda av transplant-utökningen:" + +msgid "" +"``transplanted(set)``\n" +" Transplanted changesets in set.\n" +msgstr "" + +msgid "Specifying Revision Sets" +msgstr "Ange Revisionsset" + msgid "pull patches from REPO" msgstr "" @@ -5566,18 +5827,6 @@ msgid "integrity check failed on %s:%d" msgstr "" -#, python-format -msgid "%s: not a Mercurial bundle file" -msgstr "" - -#, python-format -msgid "%s: unknown bundle version" -msgstr "" - -#, python-format -msgid "%s: unknown bundle compression type" -msgstr "" - msgid "cannot create new bundle repository" msgstr "" @@ -5585,6 +5834,14 @@ msgid "premature EOF reading chunk (got %d bytes, expected %d)" msgstr "" +#, python-format +msgid "%s: not a Mercurial bundle" +msgstr "%s: inte en Mercurial-buntfil" + +#, python-format +msgid "%s: unknown bundle version %s" +msgstr "%s: okänd buntversion %s" + msgid "empty username" msgstr "tomt användarnamn" @@ -5609,9 +5866,6 @@ msgid "limit must be positive" msgstr "" -msgid "too many revisions specified" -msgstr "för många revisioner angivna" - #, python-format msgid "invalid format spec '%%%s' in output filename" msgstr "" @@ -5768,6 +6022,10 @@ msgid "can only follow copies/renames for explicit filenames" msgstr "" +#, python-format +msgid "skipping missing subrepository: %s\n" +msgstr "" + msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." msgstr "" @@ -5928,13 +6186,6 @@ " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" " om resultatet antagligen inte kommer att vara användbart." -msgid "" -" Returns 0 on success.\n" -" " -msgstr "" -" Returnerar 0 om kommandot lyckades.\n" -" " - msgid "at least one filename or pattern is required" msgstr "" @@ -6010,32 +6261,50 @@ msgstr "omvänd effekten från en tidigare ändring" msgid "" -" Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset." -msgstr "" -" Arkivera de återkallade ändringarna som en ny ändring. Den nya\n" -" ändringen är ett barn till den återkallade ändringen." - -msgid "" -" If you backout a changeset other than the tip, a new head is\n" -" created. This head will be the new tip and you should merge this\n" -" backout changeset with another head." -msgstr "" -" Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n" -" Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n" -" ett annat huvud." - -msgid "" +" The backout command merges the reverse effect of the reverted\n" +" changeset into the working directory." +msgstr "" +" Kommandot backout sammanfogar den omvända effekven av den återkallade\n" +" ändringen i arbetskatalogen." + +msgid "" +" With the --merge option, it first commits the reverted changes\n" +" as a new changeset. This new changeset is a child of the reverted\n" +" changeset.\n" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" -" changeset afterwards. This saves you from doing the merge by hand.\n" -" The result of this merge is not committed, as with a normal merge." -msgstr "" +" changeset afterwards.\n" +" This will result in an explicit merge in the history." +msgstr "" +" Med flaggan --merge arkiveras först de återkallade ändringarna som en\n" +" ny ändring. Denna ny ändring är en ättling till den återkallade\n" +" ändringen.\n" " Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n" " återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n" -" ändringen efteråt. Detta gör att du inte behöver göra sammanfogningen\n" -" manuellt. Resultatet av sammanfogningen arkiveras inte, precis som en\n" -" vanlig sammanfogning." +" ändringen efteråt.\n" +" Detta resulterar i en explicit sammanfogning i historiken" + +msgid "" +" If you backout a changeset other than the original parent of the\n" +" working directory, the result of this merge is not committed,\n" +" as with a normal merge. Otherwise, no merge is needed and the\n" +" commit is automatic." +msgstr "" +" Om du tar tillbaka en annan ändring än originalföräldern till\n" +" arbetskatalogen, så arkiveras inte resultatet av sammanfogningen, som\n" +" vid en normal sammanfogning. Annars behövs ingen sammanfogning, och\n" +" arkiveringen är automatisk." + +msgid "" +" Note that the default behavior (without --merge) has changed in\n" +" version 1.7. To restore the previous default behavior, use\n" +" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" +" the ongoing merge." +msgstr "" +" Notera att standardförfarandet (utan --merge) har ändrats i version\n" +" 1.7. För att återställa det gamla standardförfarandet, använd :hg:`\n" +" backout --merge` och sedan :hg:`update --clean .` för att bli av med\n" +" den pågående sammanfogningen." msgid "please specify just one revision" msgstr "specificera bara en revision" @@ -6067,12 +6336,6 @@ msgid "merging with changeset %s\n" msgstr "sammanfogar med ändring %s\n" -msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "återkallningsändringen är ett nytt huvud - glöm inte att sammanfoga\n" - -msgid "(use \"backout --merge\" if you want to auto-merge)\n" -msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n" - msgid "subdivision search of changesets" msgstr "genomsökning av ändringar med halveringsmetoden" @@ -6120,6 +6383,12 @@ msgid "The first bad revision is:\n" msgstr "Den första dåliga revisionen är:\n" +#, python-format +msgid "" +"Not all ancestors of this changeset have been checked.\n" +"To check the other ancestors, start from the common ancestor, %s.\n" +msgstr "" + msgid "Due to skipped revisions, the first good revision could be any of:\n" msgstr "" "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" @@ -6490,11 +6759,15 @@ " eller flaggorna -I/-X." msgid "" -" If no commit message is specified, the configured editor is\n" -" started to prompt you for a message." -msgstr "" -" Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" -" att startas och fråga om meddelandet." +" If no commit message is specified, Mercurial starts your\n" +" configured editor where you can enter a message. In case your\n" +" commit fails, you will find a backup of your message in\n" +" ``.hg/last-message.txt``." +msgstr "" +" Om inget arkiveringsmeddelande anges, startar Mercurial din\n" +" konfigurerade editor där du kan skriva ett meddelande. Om din\n" +" arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n" +" meddelande i ``.hg/last-message.txt``." msgid "" " Returns 0 on success, 1 if nothing changed.\n" @@ -6600,7 +6873,7 @@ msgid "" " All string valued-elements are either strictly alphanumeric, or must\n" -" be enclosed in double quotes (\"...\"), with \"\" as escape character." +" be enclosed in double quotes (\"...\"), with \"\\\" as escape character." msgstr "" msgid "" @@ -6759,7 +7032,8 @@ msgid " (check that your locale is properly set)\n" msgstr "" -msgid "Checking extensions...\n" +#, python-format +msgid "Checking installed modules (%s)...\n" msgstr "" msgid " One or more extensions could not be found" @@ -6788,7 +7062,7 @@ msgid "" " (Current patch tool may be incompatible with patch, or misconfigured. " -"Please check your .hgrc file)\n" +"Please check your configuration file)\n" msgstr "" msgid "" @@ -6802,7 +7076,7 @@ msgid " No commit editor set and can't find vi in PATH\n" msgstr "" -msgid " (specify a commit editor in your .hgrc file)\n" +msgid " (specify a commit editor in your configuration file)\n" msgstr "" #, python-format @@ -6812,7 +7086,7 @@ msgid "Checking username...\n" msgstr "" -msgid " (specify a username in your .hgrc file)\n" +msgid " (specify a username in your configuration file)\n" msgstr "" msgid "No problems detected\n" @@ -6846,13 +7120,15 @@ msgstr " Skillnaderna mellan filerna visas i unified diff-format." msgid "" -" NOTE: diff may generate unexpected results for merges, as it will\n" -" default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified." -msgstr "" -" NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n" -" eftersom den som standard kommer att jämföra mot arbetskatalogens\n" -" tidigare ändring om ingen revision anges." +" .. note::\n" +" diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first\n" +" parent changeset if no revisions are specified." +msgstr "" +" .. note::\n" +" diff kan generera oväntade resultat för sammanfogningar eftersom\n" +" den som standard kommer att jämföra mot arbetskatalogens tidigare\n" +" ändring om ingen revision anges." msgid "" " Alternatively you can specify -c/--change with a revision to see\n" @@ -6893,13 +7169,14 @@ " arkiveringskommentar." msgid "" -" NOTE: export may generate unexpected diff output for merge\n" -" changesets, as it will compare the merge changeset against its\n" -" first parent only." -msgstr "" -" NOTERA: export kan generera oväntade resultat för sammanfogningar,\n" -" eftersom den som standard bara kommer att jämföra mot den första\n" -" föräldern." +" .. note::\n" +" export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only." +msgstr "" +" .. note::\n" +" export kan generera oväntade resultat för sammanfogningar, eftersom\n" +" den som standard bara kommer att jämföra mot den första föräldern." msgid "" " Output may be to a file, in which case the name of the file is\n" @@ -6910,20 +7187,20 @@ msgid "" " :``%%``: literal \"%\" character\n" -" :``%H``: changeset hash (40 bytes of hexadecimal)\n" +" :``%H``: changeset hash (40 hexadecimal digits)\n" " :``%N``: number of patches being generated\n" " :``%R``: changeset revision number\n" " :``%b``: basename of the exporting repository\n" -" :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n" +" :``%h``: short-form changeset hash (12 hexadecimal digits)\n" " :``%n``: zero-padded sequence number, starting at 1\n" " :``%r``: zero-padded changeset revision number" msgstr "" " :``%%``: ett \"%\"-tecken\n" -" :``%H``: ändringshash (40 hexadecimala bytes)\n" +" :``%H``: ändringshash (40 hexadecimala siffror)\n" " :``%N``: antal genererade patchar\n" " :``%R``: ändringens revisionsnummer\n" " :``%b``: basnamn för det exporterande arkivet\n" -" :``%h``: kort ändringshash (12 hexadecimala bytes)\n" +" :``%h``: kort ändringshash (12 hexadecimala siffror)\n" " :``%n``: nollpaddat sekvensnummer, börjar med 1\n" " :``%r``: nollpaddat ändringsrevisionsnummer" @@ -7142,6 +7419,14 @@ msgstr "(ingen hjälptext tillgänglig)" #, python-format +msgid "shell alias for::" +msgstr "skal-alias för::" + +#, python-format +msgid " %s" +msgstr " %s" + +#, python-format msgid "alias for: hg %s" msgstr "alias för: hg %s" @@ -7331,6 +7616,9 @@ " Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" " " +msgid "cannot combine --bundle and --subrepos" +msgstr "" + msgid "create a new repository in the given directory" msgstr "skapa ett nytt arkiv i den angivna katalogen" @@ -7434,15 +7722,17 @@ " visas listan med ändrade filer och fullständigt arkiveringsmeddelande." msgid "" -" NOTE: log -p/--patch may generate unexpected diff output for merge\n" -" changesets, as it will only compare the merge changeset against\n" -" its first parent. Also, only files different from BOTH parents\n" -" will appear in files:." -msgstr "" -" NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" -" sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" -" första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" -" föräldrarna att visas i filer:." +" .. note::\n" +" log -p/--patch may generate unexpected diff output for merge\n" +" changesets, as it will only compare the merge changeset against\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:." +msgstr "" +" .. note::\n" +" log -p/--patch kan generera oväntad diff-utmatning för\n" +" sammanfogningar, eftersom det bara kommer att jämföra ändringen mot\n" +" den första förälder. Dessutom kommer bara filer som skiljer sig från\n" +" BÅDA föräldrarna att visas i filer:." msgid "output the current or given revision of the project manifest" msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" @@ -7485,6 +7775,15 @@ " föräldrar." msgid "" +" ``--tool`` can be used to specify the merge tool used for file\n" +" merges. It overrides the HGMERGE environment variable and your\n" +" configuration files." +msgstr "" +" ``--tool`` kan användas för att ange sammanfogningsverktyg att\n" +" använda för filsammanfogningar. Det har högre prioritet än\n" +" miljövariabeln HGMERGE och dina konfigurationsfiler." + +msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" @@ -7495,6 +7794,9 @@ " det andra huvudet som standard. Om inte, måste en explicit revision\n" " anges." +msgid " :hg:`resolve` must be used to resolve unresolved files." +msgstr " :hg:`resolve` måste användas för att lösa olästa filer." + msgid "" " To undo an uncommitted merge, use :hg:`update --clean .` which\n" " will check out a clean copy of the original merge parent, losing\n" @@ -7596,12 +7898,13 @@ " definitionen för alla tillgängliga namn." msgid "" -" Path names are defined in the [paths] section of\n" -" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" +" Path names are defined in the [paths] section of your\n" +" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n" " repository, ``.hg/hgrc`` is used, too." msgstr "" -" Sökvägar definieras i sektionen [paths] i ``/etc/mercurial/hgrc`` och\n" -" ``$HOME/.hgrc``. Om det körs i ett arkiv, så används ``.hg/hgrc`` också." +" Sökvägar definieras i sektionen [paths] i din konfigurationsfil och i\n" +" ``/etc/mercurial/hgrc``. Om det körs i ett arkiv, så används\n" +" ``.hg/hgrc`` också." msgid "" " The path names ``default`` and ``default-push`` have a special\n" @@ -7675,6 +7978,13 @@ " filer.\n" " " +msgid "" +"other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" +"det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " +"anges." + msgid "push changes to the specified destination" msgstr "tryck ändringar till den specificerade destinationen" @@ -7830,17 +8140,17 @@ msgstr "raderar inte %s: filen är inte hanterad\n" #, python-format -msgid "not removing %s: file %s (use -f to force removal)\n" -msgstr "raderar inte %s: filen %s (använd -f för att tvinga)\n" - -msgid "still exists" -msgstr "existerar fortfarande" - -msgid "is modified" -msgstr "är modifierad" - -msgid "has been marked for add" -msgstr "har markerats för addering" +msgid "not removing %s: file still exists (use -f to force removal)\n" +msgstr "raderar inte %s: filen finns fortfarande (använd -f för att tvinga)\n" + +#, python-format +msgid "not removing %s: file is modified (use -f to force removal)\n" +msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n" + +#, python-format +msgid "" +"not removing %s: file has been marked for add (use -f to force removal)\n" +msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n" msgid "rename files; equivalent of copy + remove" msgstr "döp om filer; likvärdig med kopiering + radering" @@ -7862,58 +8172,54 @@ " namnbyte innan det, se :hg:`revert`.\n" " " -msgid "various operations to help finish a merge" -msgstr "diverse operationer för att slutföra sammanfogningar" - -msgid "" -" This command includes several actions that are often useful while\n" -" performing a merge, after running ``merge`` but before running\n" -" ``commit``. (It is only meaningful if your working directory has\n" -" two parents.) It is most relevant for merges with unresolved\n" -" conflicts, which are typically a result of non-interactive merging with\n" -" ``internal:merge`` or a command-line merge tool like ``diff3``." -msgstr "" -" Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n" -" en sammanfogning utförs, efter att ``merge`` körts men innan\n" -" ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n" -" föräldrar.) Det är mest relevant för sammanfogningar med olösta\n" -" konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n" -" med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``." - -msgid " The available actions are:" -msgstr " Tillgängliga handlingar är:" - -msgid "" -" 1) list files that were merged with conflicts (U, for unresolved)\n" -" and without conflicts (R, for resolved): ``hg resolve -l``\n" -" (this is like ``status`` for merges)\n" -" 2) record that you have resolved conflicts in certain files:\n" -" ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" -" 3) forget that you have resolved conflicts in certain files:\n" -" ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" -" 4) discard your current attempt(s) at resolving conflicts and\n" -" restart the merge from scratch: ``hg resolve file...``\n" -" (or ``-a`` for all unresolved files)" -msgstr "" -" 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n" -" utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n" -" ``status`` för sammanfogningar)\n" -" 2) lagra att du har löst konflikter i vissa filer:\n" -" ``hg resolve -m [fil ...]`` (standard: markera alla olösta filer)\n" -" 3) glöm att du har löst konflikter i vissa filer\n" -" ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n" -" 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n" -" sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n" -" för alla olösta filer)" - -msgid "" -" Note that Mercurial will not let you commit files with unresolved merge\n" -" conflicts. You must use ``hg resolve -m ...`` before you can commit\n" -" after a conflicting merge." +msgid "redo merges or set/view the merge status of files" +msgstr "" + +msgid "" +" Merges with unresolved conflicts are often the result of\n" +" non-interactive merging using the ``internal:merge`` configuration\n" +" setting, or a command-line merge tool like ``diff3``. The resolve\n" +" command is used to manage the files involved in a merge, after\n" +" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" +" working directory must have two parents)." +msgstr "" + +msgid " The resolve command can be used in the following ways:" +msgstr "" + +msgid "" +" - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n" +" files, discarding any previous merge attempts. Re-merging is not\n" +" performed for files already marked as resolved. Use ``--all/-a``\n" +" to selects all unresolved files. ``--tool`` can be used to specify\n" +" the merge tool used for the given files. It overrides the HGMERGE\n" +" environment variable and your configuration files." +msgstr "" + +msgid "" +" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n" +" (e.g. after having manually fixed-up the files). The default is\n" +" to mark all unresolved files." +msgstr "" + +msgid "" +" - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n" +" default is to mark all resolved files." +msgstr "" + +msgid "" +" - :hg:`resolve -l`: list files which had or still have conflicts.\n" +" In the printed list, ``U`` = unresolved and ``R`` = resolved." +msgstr "" + +msgid "" +" Note that Mercurial will not let you commit files with unresolved\n" +" merge conflicts. You must use :hg:`resolve -m ...` before you can\n" +" commit after a conflicting merge." msgstr "" " Notera att Mercurial inte låter dig arkivera filer med olösta\n" -" konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" -" innan du kan arkivera efter en sammanfogning med konflikter" +" konflikter från sammanfogningar. Du måste använda :hg:`resolve -m ...`\n" +" innan du kan arkivera efter en sammanfogning med konflikter." msgid "" " Returns 0 on success, 1 if any files fail a resolve attempt.\n" @@ -7937,19 +8243,20 @@ msgstr "återställ filer eller kataloger till ett tidigare tillstånd" msgid "" -" NOTE: This command is most likely not what you are looking for. revert\n" -" will partially overwrite content in the working directory without " -"changing\n" -" the working directory parents. Use :hg:`update -r rev` to check out " -"earlier\n" -" revisions, or :hg:`update --clean .` to undo a merge which has added\n" -" another parent." -msgstr "" -" NOTERA: Det här kommandot är troligtvis inte det du letar efter.\n" -" revert kommer att delvis skriva över innehåll i arbetskatalogen utan\n" -" att ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för\n" -" att hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" -" ångra en sammanfogning som har lagt till fler föräldrar." +" .. note::\n" +" This command is most likely not what you are looking for.\n" +" Revert will partially overwrite content in the working\n" +" directory without changing the working directory parents. Use\n" +" :hg:`update -r rev` to check out earlier revisions, or\n" +" :hg:`update --clean .` to undo a merge which has added another\n" +" parent." +msgstr "" +" .. note::\n" +" Det här kommandot är troligtvis inte det du letar efter. Revert\n" +" kommer att delvis skriva över innehåll i arbetskatalogen utan att\n" +" ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n" +" hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n" +" ångra en sammanfogning som har lagt till fler föräldrar." msgid "" " With no revision specified, revert the named files or directories\n" @@ -8153,6 +8460,9 @@ " För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n" " som portnummer; då visar servern det portnummer som används." +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" + #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" @@ -8182,15 +8492,17 @@ " inte bes om explicit med -u/--unknown eller -i/--ignored." msgid "" -" NOTE: status may appear to disagree with diff if permissions have\n" -" changed or a merge has occurred. The standard diff format does not\n" -" report permission changes and diff only reports changes relative\n" -" to one merge parent." -msgstr "" -" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n" -" en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" -" inte förändringar av tillstånd och diff rapporterar bara ändringar\n" -" relativt till en förälder vid sammanfogningar." +" .. note::\n" +" status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does\n" +" not report permission changes and diff only reports changes\n" +" relative to one merge parent." +msgstr "" +" .. note::\n" +" status kan verka osams med diff om tillstånd har ändrat eller en\n" +" sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n" +" inte förändringar av tillstånd och diff rapporterar bara ändringar\n" +" relativt till en förälder vid sammanfogningar." msgid "" " If one revision is given, it is used as the base revision.\n" @@ -8460,17 +8772,20 @@ msgid "" " Update the repository's working directory to the specified\n" +" changeset. If no changeset is specified, update to the tip of the\n" +" current named branch." +msgstr "" +" Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n" +" ändring anes, så uppdateras till toppen på den nuvarande namngivna\n" +" grenen." + +msgid "" +" If the changeset is not a descendant of the working directory's\n" +" parent, the update is aborted. With the -c/--check option, the\n" +" working directory is checked for uncommitted changes; if none are\n" +" found, the working directory is updated to the specified\n" " changeset." -msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen." - -msgid "" -" If no changeset is specified, attempt to update to the tip of the\n" -" current branch. If this changeset is a descendant of the working\n" -" directory's parent, update to it, otherwise abort." -msgstr "" -" Om ingen ändring anges, kommer ett försök att göras för att hämta ut\n" -" toppen på den nuvarande grenen. Om ändringen är en ättling till\n" -" arbetskatalogens föräldrar, uppdatera till det, annars avbryt." +msgstr "" msgid "" " The following rules apply when the working directory contains\n" @@ -8515,15 +8830,15 @@ " Use null as the changeset to remove the working directory (like\n" " :hg:`clone -U`)." msgstr "" -" Använd null som ändring för att radera arbetskatalogen (som :hg:`clone\n" -" -U`)." - -msgid "" -" If you want to update just one file to an older changeset, use :hg:" -"`revert`." -msgstr "" -" Om du vill uppdatera bara en fil till en äldre ändring, använd :hg:" -"`revert`." +" Använd null som ändring för att radera arbetskatalogen (som\n" +" :hg:`clone -U`)." + +msgid "" +" If you want to update just one file to an older changeset, use\n" +" :hg:`revert`." +msgstr "" +" Om du vill uppdatera bara en fil till en äldre ändring, använd\n" +" :hg:`revert`." msgid "cannot specify both -c/--check and -C/--clean" msgstr "" @@ -8697,6 +9012,9 @@ msgid "guess renamed files by similarity (0<=s<=100)" msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" +msgid "recurse into subrepositories" +msgstr "gå in i underarkiv" + msgid "[OPTION]... [FILE]..." msgstr "[FLAGGA]... [FIL]..." @@ -8980,20 +9298,23 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "[FLAGGA]... MÖNSTER [FIL]..." -msgid "show only heads which are descendants of REV" -msgstr "visa bara huvuden som har REV som anfader" +msgid "show only heads which are descendants of STARTREV" +msgstr "visa bara huvuden som är ättlingar till STARTREV" + +msgid "STARTREV" +msgstr "STARTREV" msgid "show topological heads only" msgstr "visa bara topologiska huvuden" -msgid "show active branchheads only [DEPRECATED]" -msgstr "visa bara aktiva grenhuvuden [FÖRLEGAD]" +msgid "show active branchheads only (DEPRECATED)" +msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)" msgid "show normal and closed branch heads" msgstr "visa normala och stängda grenhuvuden" -msgid "[-ac] [-r REV] [REV]..." -msgstr "[-ac] [-r REV] [REV]..." +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r STARTREV] [REV]..." msgid "[TOPIC]" msgstr "[ÄMNE]" @@ -9117,6 +9438,9 @@ msgid "force a merge with outstanding changes" msgstr "tvinga en sammanfogning med utestående ändringar" +msgid "specify merge tool" +msgstr "ange sammanfogningsverktyg" + msgid "revision to merge" msgstr "revision att sammanfoga" @@ -9181,10 +9505,10 @@ msgstr "visa status för filer som behöver sammanfogas" msgid "mark files as resolved" -msgstr "markera filen som löst" - -msgid "unmark files as resolved" -msgstr "avmarkera filen som löst" +msgstr "markera filer som lösta" + +msgid "mark files as unresolved" +msgstr "markera filer som olösta" msgid "hide status prefix" msgstr "göm statusprefix" @@ -9228,8 +9552,8 @@ msgid "name to show in web pages (default: working directory)" msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" -msgid "name of the hgweb config file (serve more than one repository)" -msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)" +msgid "name of the hgweb config file (see \"hg help hgweb\")" +msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")" msgid "name of the hgweb config file (DEPRECATED)" msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" @@ -9321,8 +9645,8 @@ msgid "discard uncommitted changes (no backup)" msgstr "kassera oarkiverade ändringar (ingen backup)" -msgid "check for uncommitted changes" -msgstr "leta efter icke arkiverade ändringar" +msgid "update across branches if no uncommitted changes" +msgstr "" msgid "[-c] [-C] [-d DATE] [[-r] REV]" msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" @@ -9334,6 +9658,10 @@ msgid "not found in manifest" msgstr "" +#, python-format +msgid "no such file in rev %s" +msgstr "" + msgid "branch name not in UTF-8!" msgstr "" @@ -9378,6 +9706,18 @@ msgstr "" #, python-format +msgid "invalid character in dag description: %s..." +msgstr "" + +#, python-format +msgid "expected id %i, got %i" +msgstr "" + +#, python-format +msgid "parent id %i is larger than current id %i" +msgstr "" + +#, python-format msgid "invalid event type in dag: %s" msgstr "" @@ -9442,24 +9782,24 @@ msgstr "arkivet är obesläktat" #, python-format -msgid "abort: push creates new remote heads on branch '%s'!\n" -msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" - -msgid "abort: push creates new remote heads!\n" -msgstr "avbryter: push skapar nya fjärrhuvuden!\n" - -msgid "(you should pull and merge or use push -f to force)\n" -msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" - -msgid "(did you forget to merge? use push -f to force)\n" -msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" - -#, python-format -msgid "abort: push creates new remote branches: %s!\n" -msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" - -msgid "(use 'hg push --new-branch' to create new remote branches)\n" -msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n" +msgid "push creates new remote branches: %s!" +msgstr "push skapar nya fjärrhuvuden: %s!" + +msgid "use 'hg push --new-branch' to create new remote branches" +msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar" + +#, python-format +msgid "push creates new remote heads on branch '%s'!" +msgstr "push skapar nya fjärrhuvuden på grenen '%s'!" + +msgid "push creates new remote heads!" +msgstr "push skapar nya fjärrhuvuden!" + +msgid "you should pull and merge or use push -f to force" +msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga" + +msgid "did you forget to merge? use push -f to force" +msgstr "glömde du att sammanfoga? använd push -f för att tvinga" msgid "note: unsynced remote changes!\n" msgstr "notera: osynkade fjärrändringar!\n" @@ -9476,6 +9816,9 @@ msgid "hg: parse error: %s\n" msgstr "" +msgid "entering debugger - type c to continue starting hg or h for help\n" +msgstr "" + #, python-format msgid "" "hg: command '%s' is ambiguous:\n" @@ -9524,6 +9867,10 @@ msgid "hg: unknown command '%s'\n" msgstr "" +#, python-format +msgid "(%s)\n" +msgstr "" + msgid "(did you forget to compile extensions?)\n" msgstr "" @@ -9574,6 +9921,12 @@ msgstr "" #, python-format +msgid "" +"error in definition for alias '%s': %s may only be given on the command " +"line\n" +msgstr "" + +#, python-format msgid "alias '%s' resolves to unknown command '%s'\n" msgstr "" @@ -9593,10 +9946,10 @@ msgid "extension '%s' overrides commands: %s\n" msgstr "utökningen '%s' tar över dessa kommandon: %s\n" -msgid "Option --config may not be abbreviated!" -msgstr "" - -msgid "Option --cwd may not be abbreviated!" +msgid "option --config may not be abbreviated!" +msgstr "" + +msgid "option --cwd may not be abbreviated!" msgstr "" msgid "" @@ -9679,12 +10032,6 @@ msgid "was merge of '%s' successful (yn)?" msgstr "" -msgid "&No" -msgstr "" - -msgid "&Yes" -msgstr "" - #, python-format msgid "" " output file %s appears unchanged\n" @@ -9695,8 +10042,11 @@ msgid "merging %s failed!\n" msgstr "" -#, python-format -msgid "Inconsistent state, %s:%s is good and bad" +msgid "starting revisions are not directly related" +msgstr "" + +#, python-format +msgid "inconsistent state, %s:%s is good and bad" msgstr "" #, python-format @@ -9724,12 +10074,12 @@ msgid "Specifying Multiple Revisions" msgstr "Ange Flera Revisioner" -msgid "Specifying Revision Sets" -msgstr "Ange Revisionsset" - msgid "Diff Formats" msgstr "Diff-format" +msgid "Merge Tools" +msgstr "Sammanfogningsverktyg" + msgid "Template Usage" msgstr "Användning Av Mallar" @@ -9975,8 +10325,8 @@ msgid "" "To make Mercurial produce the git extended diff format, use the --git\n" "option available for many commands, or set 'git = True' in the [diff]\n" -"section of your hgrc. You do not need to set this option when\n" -"importing diffs in this format or using them in the mq extension.\n" +"section of your configuration file. You do not need to set this option\n" +"when importing diffs in this format or using them in the mq extension.\n" msgstr "" msgid "" @@ -10001,8 +10351,8 @@ "HGEDITOR\n" " Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR." -msgid " (deprecated, use .hgrc)" -msgstr " (föråldrad, använd .hgrc)" +msgid " (deprecated, use configuration file)" +msgstr " (föråldrad, använd konfigurationsfilen)" msgid "" "HGENCODING\n" @@ -10031,10 +10381,10 @@ msgid "" "HGRCPATH\n" -" A list of files or directories to search for hgrc files. Item\n" -" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" -" platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read." +" A list of files or directories to search for configuration\n" +" files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n" +" is not set, platform default search path is used. If empty, only\n" +" the .hg/hgrc from the current repository is read." msgstr "" msgid " For each element in HGRCPATH:" @@ -10047,9 +10397,9 @@ msgid "" "HGPLAIN\n" -" When set, this disables any options in .hgrc that might change\n" -" Mercurial's default output. This includes encoding, defaults,\n" -" verbose mode, debug mode, quiet mode, tracebacks, and\n" +" When set, this disables any configuration settings that might\n" +" change Mercurial's default output. This includes encoding,\n" +" defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n" " localization. This can be useful when scripting against Mercurial\n" " in the face of existing user configuration." msgstr "" @@ -10067,7 +10417,7 @@ msgid "" " - HGUSER (deprecated)\n" -" - hgrc files from the HGRCPATH\n" +" - configuration files from the HGRCPATH\n" " - EMAIL\n" " - interactive prompt\n" " - LOGNAME (with ``@hostname`` appended)" @@ -10132,12 +10482,13 @@ "upp till användaren att aktiverade utökningar om de behövs." msgid "" -"To enable the \"foo\" extension, either shipped with Mercurial or in\n" -"the Python search path, create an entry for it in your hgrc, like\n" -"this::" +"To enable the \"foo\" extension, either shipped with Mercurial or in the\n" +"Python search path, create an entry for it in your configuration file,\n" +"like this::" msgstr "" "För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n" -"eller finns i Pythons sökväg, skapa en post för den i din hgrc, så här::" +"eller finns i Pythons sökväg, skapa en post för den i din\n" +"konfigurationsfil, så här::" msgid "" " [extensions]\n" @@ -10157,11 +10508,11 @@ " minfunktion = ~/.hgext/minfunktion.py" msgid "" -"To explicitly disable an extension enabled in an hgrc of broader\n" -"scope, prepend its path with !::" -msgstr "" -"För att explicit deaktivera en utökning som aktiverats i en hgrc med större\n" -"omfång, börja dess sökväg med !::" +"To explicitly disable an extension enabled in a configuration file of\n" +"broader scope, prepend its path with !::" +msgstr "" +"För att explicit deaktivera en utökning som aktiverats i en\n" +"konfigurationsfil med större omfång, börja dess sökväg med !::" msgid "" " [extensions]\n" @@ -10199,7 +10550,7 @@ " a remote repository, since new heads may be created by these\n" " operations. Note that the term branch can also be used informally\n" " to describe a development process in which certain development is\n" -" done independently of other development.This is sometimes done\n" +" done independently of other development. This is sometimes done\n" " explicitly with a named branch, but it can also be done locally,\n" " using bookmarks or clones and anonymous branches." msgstr "" @@ -10239,6 +10590,21 @@ msgstr "" msgid "" +"Branch, inactive\n" +" If a named branch has no topological heads, it is considered to be\n" +" inactive. As an example, a feature branch becomes inactive when it\n" +" is merged into the default branch. The :hg:`branches` command\n" +" shows inactive branches by default, though they can be hidden with\n" +" :hg:`branches --active`." +msgstr "" + +msgid "" +" NOTE: this concept is deprecated because it is too implicit.\n" +" Branches should now be explicitly closed using :hg:`commit\n" +" --close-branch` when they are no longer needed." +msgstr "" + +msgid "" "Branch, named\n" " A collection of changesets which have the same branch name. By\n" " default, children of a changeset in a named branch belong to the\n" @@ -10294,8 +10660,8 @@ msgid "" "Changeset id\n" " A SHA-1 hash that uniquely identifies a changeset. It may be\n" -" represented as either a \"long\" 40-byte hexadecimal string, or a\n" -" \"short\" 12-byte hexadecimal string." +" represented as either a \"long\" 40 hexadecimal digit string, or a\n" +" \"short\" 12 hexadecimal digit string." msgstr "" msgid "" @@ -10796,6 +11162,128 @@ "högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n" "visas som ``bar``och ``quux/baz``.\n" +msgid "To merge files Mercurial uses merge tools." +msgstr "" + +msgid "" +"A merge tool combines two different versions of a file into a merged\n" +"file. Merge tools are given the two files and the greatest common\n" +"ancestor of the two file versions, so they can determine the changes\n" +"made on both branches." +msgstr "" + +msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." +msgstr "" + +msgid "" +"Usually, the merge tool tries to automatically, by combining all the\n" +"non-overlapping changes that occurred separately in the two different\n" +"evolutions of the same initial base file. Furthermore, some\n" +"interactive merge programs make it easier to manually resolve\n" +"conflicting merges, either in a graphical way, or by inserting some\n" +"conflict markers. Mercurial does not include any interactive merge\n" +"programs but relies on external tools for that. External merge tools\n" +"and their properties and usage is configured in merge-tools section -\n" +"see hgrc(5)." +msgstr "" + +msgid "" +"There are a some internal merge tools which can be used. The internal\n" +"merge tools are:" +msgstr "" + +msgid "" +"``internal:merge``\n" +" Uses the internal non-interactive merge tool for merging files." +msgstr "" + +msgid "" +"``internal:fail``\n" +" Rather than attempting to merge files that were modified on both\n" +" branches, it marks these files as unresolved. Then the resolve\n" +" command must be used to mark files resolved." +msgstr "" + +msgid "" +"``internal:local``\n" +" Uses the local version of files as the merged version." +msgstr "" + +msgid "" +"``internal:other``\n" +" Uses the remote version of files as the merged version." +msgstr "" + +msgid "" +"``internal:prompt``\n" +" Asks the user which of the local or the other version to keep as\n" +" the merged version." +msgstr "" + +msgid "" +"``internal:dump``\n" +" Creates three versions of the files to merge, containing the\n" +" contents of local, other and base. These files can then be used to\n" +" perform a merge manually. If the file merged is name ``a.txt``,\n" +" these files will accordingly be named ``a.txt.local``,\n" +" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" +" same directory as the file to merge." +msgstr "" + +msgid "How Mercurial decides which merge program to use" +msgstr "" + +msgid "" +"1. If the ``HGMERGE`` environment variable is present, it is used. If\n" +" specified it must be either an executable path or the name of an\n" +" application in your executable search path." +msgstr "" + +msgid "" +"2. If the filename of the file to be merged matches any of the\n" +" patterns in the merge-patterns configuration section, then the\n" +" corresponding merge tool is used, unless the file to be merged is a\n" +" symlink. Here binary capabilities of the merge tool are not\n" +" considered." +msgstr "" + +msgid "3. If ui.merge is set, it is used." +msgstr "" + +msgid "" +"4. If any merge tools are present in the merge-tools configuration\n" +" section, and any of the tools can be found on the system, the\n" +" priority settings are used to determine which one to use. Binary,\n" +" symlink and GUI capabilities do also have to match." +msgstr "" + +msgid "5. If a program named ``hgmerge`` exists on the system, it is used." +msgstr "" + +msgid "" +"6. If the file to be merged is not binary and is not a symlink, then\n" +" ``internal:merge`` is used." +msgstr "" + +msgid "7. The merge fails." +msgstr "" + +msgid "" +".. note::\n" +" After selecting a merge program, Mercurial will by default attempt\n" +" to merge the files using a simple merge algorithm first, to see if\n" +" they can be merged without conflicts. Only if there are conflicting\n" +" changes Mercurial will actually execute the merge program. Whether\n" +" to use the simple merge algorithm first can be controlled be the\n" +" premerge setting of the merge tool, which is enabled by default\n" +" unless the file is binary or symlink." +msgstr "" + +msgid "" +"See the merge-tools and ui sections of hgrc(5) for details on\n" +"configuration of merge tools.\n" +msgstr "" + msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" @@ -10984,8 +11472,13 @@ "Identifiers such as branch names must be quoted with single or double\n" "quotes if they contain characters outside of\n" "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" -"predicates. Special characters can be used in quoted identifiers by\n" -"escaping them, e.g., ``\\n`` is interpreted as a newline." +"predicates." +msgstr "" + +msgid "" +"Special characters can be used in quoted identifiers by escaping them,\n" +"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" +"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." msgstr "" msgid "There is a single prefix operator:" @@ -11063,8 +11556,7 @@ msgid "" "``branch(set)``\n" -" The branch names are found for changesets in set, and the result is\n" -" all changesets belonging to one those branches." +" All changesets belonging to the branches of changesets in set." msgstr "" msgid "" @@ -11089,12 +11581,12 @@ msgid "" "``descendants(set)``\n" -" Changesets which are decendants of changesets in set." +" Changesets which are descendants of changesets in set." msgstr "" msgid "" "``file(pattern)``\n" -" Changesets which manually affected files matching pattern." +" Changesets affecting files matched by pattern." msgstr "" msgid "" @@ -11104,12 +11596,13 @@ msgid "" "``grep(regex)``\n" -" Like ``keyword(string)`` but accepts a regex." +" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" +" to ensure special escape characters are handled correctly." msgstr "" msgid "" "``head()``\n" -" Changeset is a head." +" Changeset is a named branch head." msgstr "" msgid "" @@ -11118,6 +11611,11 @@ msgstr "" msgid "" +"``id(string)``\n" +" Revision non-ambiguously specified by the given hex string prefix" +msgstr "" + +msgid "" "``keyword(string)``\n" " Search commit message, user name, and names of changed files for\n" " string." @@ -11134,18 +11632,24 @@ msgstr "" msgid "" +"``min(set)``\n" +" Changeset with lowest revision number in set." +msgstr "" + +msgid "" "``merge()``\n" " Changeset is a merge changeset." msgstr "" msgid "" "``modifies(pattern)``\n" -" Changesets which modify files matching pattern." +" Changesets modifying files matched by pattern." msgstr "" msgid "" "``outgoing([path])``\n" -" Changesets missing in path." +" Changesets not found in the specified destination repository, or the\n" +" default push location." msgstr "" msgid "" @@ -11164,11 +11668,22 @@ msgstr "" msgid "" +"``present(set)``\n" +" An empty set, if any revision in set isn't found; otherwise,\n" +" all revisions in set." +msgstr "" + +msgid "" "``removes(pattern)``\n" " Changesets which remove files matching pattern." msgstr "" msgid "" +"``rev(number)``\n" +" Revision with the given numeric identifier." +msgstr "" + +msgid "" "``reverse(set)``\n" " Reverse order of set." msgstr "" @@ -11196,8 +11711,8 @@ msgstr "" msgid "" -"``tagged()``\n" -" Changeset is tagged." +"``tag(name)``\n" +" The specified tag by name, or all tagged revisions if no name is given." msgstr "" msgid "" @@ -11219,15 +11734,49 @@ " -l x -> limit(expr, x)" msgstr "" -msgid "Some sample queries::" -msgstr "" - -msgid "" -" hg log -r 'branch(default)'\n" -" hg log -r 'branch(default) and 1.5:: and not merge()'\n" -" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" -" hg log -r 'sort(date(\"May 2008\"), user)'\n" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgid "Some sample queries:" +msgstr "" + +msgid "- Changesets on the default branch::" +msgstr "- Ändringar på default-grenen::" + +msgid " hg log -r 'branch(default)'" +msgstr " hg log -r 'branch(default)'" + +msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" +msgstr "" + +msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" +msgstr "" + +msgid "- Open branch heads::" +msgstr "- Öppna grenhuvuden::" + +msgid " hg log -r 'head() and not closed()'" +msgstr "" + +msgid "" +"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" +" ``hgext/*``::" +msgstr "" + +msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" +msgstr "" + +msgid "- Changesets in committed May 2008, sorted by user::" +msgstr "" + +msgid " hg log -r 'sort(date(\"May 2008\"), user)'" +msgstr "" + +msgid "" +"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" +" release::" +msgstr "" + +msgid "" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())'\n" msgstr "" msgid "" @@ -11276,6 +11825,9 @@ " committed. Will be empty if the branch name was default." msgstr "" +msgid ":children: List of strings. The children of the changeset." +msgstr "" + msgid ":date: Date information. The date when the changeset was committed." msgstr "" @@ -11312,8 +11864,8 @@ msgstr "" msgid "" -":node: String. The changeset identification hash, as a 40-character\n" -" hexadecimal string." +":node: String. The changeset identification hash, as a 40 hexadecimal\n" +" digit string." msgstr "" msgid ":parents: List of strings. The parents of the changeset." @@ -11394,6 +11946,11 @@ " and \">\" with XML entities." msgstr "" +msgid "" +":hex: Any text. Convert a binary Mercurial node identifier into\n" +" its long hexadecimal representation." +msgstr "" + msgid ":fill68: Any text. Wraps the text to fit in 68 columns." msgstr "" @@ -11445,12 +12002,17 @@ msgid "" ":short: Changeset hash. Returns the short form of a changeset hash,\n" -" i.e. a 12-byte hexadecimal string." +" i.e. a 12 hexadecimal digit string." msgstr "" msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." msgstr "" +msgid "" +":stringify: Any type. Turns the value into text by converting values into\n" +" text and concatenating them." +msgstr "" + msgid ":strip: Any text. Strips all leading and trailing whitespace." msgstr "" @@ -11496,6 +12058,11 @@ "server." msgstr "" +msgid "" +"Note that the security of HTTPS URLs depends on proper configuration of\n" +"web.cacerts." +msgstr "" + msgid "Some notes about using SSH with Mercurial:" msgstr "" @@ -11522,13 +12089,13 @@ msgstr "" msgid "" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option." -msgstr "" - -msgid "" -"These URLs can all be stored in your hgrc with path aliases under the\n" -"[paths] section like so::" +" Alternatively specify \"ssh -C\" as your ssh command in your\n" +" configuration file or with the --ssh command line option." +msgstr "" + +msgid "" +"These URLs can all be stored in your configuration file with path\n" +"aliases under the [paths] section like so::" msgstr "" msgid "" @@ -11618,7 +12185,7 @@ msgstr "" msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " +"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " "abandon\n" msgstr "" @@ -11629,6 +12196,10 @@ msgid "error reading %s/.hg/hgrc: %s\n" msgstr "" +#, python-format +msgid "error accessing repository at %s\n" +msgstr "" + msgid "SSL support is unavailable" msgstr "" @@ -11733,24 +12304,9 @@ msgid "'%s' uses newer protocol %s" msgstr "" -msgid "look up remote revision" -msgstr "" - -msgid "unexpected response:" -msgstr "" - -msgid "look up remote changes" -msgstr "" - -msgid "push failed (unexpected response):" -msgstr "" - -msgid "remote: " -msgstr "fjärr: " - #, python-format msgid "push failed: %s" -msgstr "" +msgstr "tryckning misslyckades: %s" msgid "Python support for SSL and HTTPS is not installed" msgstr "" @@ -11874,10 +12430,10 @@ msgstr "efterfrågar alla ändringar\n" msgid "" -"Partial pull cannot be done because other repository doesn't support " +"partial pull cannot be done because other repository doesn't support " "changegroupsubset." msgstr "" -"Deldragningar kan inte göras eftersom det andra arkivet inte stödjer " +"deldragningar kan inte göras eftersom det andra arkivet inte stödjer " "changegroupsubset." #, python-format @@ -11903,9 +12459,6 @@ msgid "adding changesets\n" msgstr "lägger till ändringar\n" -msgid "changesets" -msgstr "ändringar" - msgid "received changelog group is empty" msgstr "mottagen ändringsgrupp är tom" @@ -11956,8 +12509,8 @@ msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "överförde %s på %.1f sekunder (%s/sek)\n" -msgid "no [smtp]host in hgrc - cannot send mail" -msgstr "ingen [smtp]server i hgrc - kan inte sända mail" +msgid "smtp.host not configured - cannot send mail" +msgstr "smtp.host är inte konfigurerad - kan inte sända mail" #, python-format msgid "sending mail: smtp host %s, port %s\n" @@ -12001,6 +12554,13 @@ msgstr "" #, python-format +msgid "invalid pattern (%s): %s" +msgstr "ogiltigt mönster (%s): %s" + +msgid "invalid pattern" +msgstr "ogiltigt mönster" + +#, python-format msgid "diff context lines count must be an integer, not %r" msgstr "" @@ -12058,23 +12618,23 @@ #, python-format msgid "update failed to remove %s: %s!\n" -msgstr "" +msgstr "update kunde inte ta bort %s: %s!\n" #, python-format msgid "getting %s\n" -msgstr "" +msgstr "hämtar %s\n" #, python-format msgid "getting %s to %s\n" -msgstr "" - -#, python-format -msgid "warning: detected divergent renames of %s to:\n" -msgstr "" +msgstr "hämtar %s till %s\n" + +#, python-format +msgid "note: possible conflict - %s was renamed multiple times to:\n" +msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n" #, python-format msgid "branch %s not found" -msgstr "" +msgstr "grenen %s hittades inte" msgid "merging with a working directory ancestor has no effect" msgstr "" @@ -12085,13 +12645,38 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "" -msgid "" -"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " -"changes)" -msgstr "" - -msgid "crosses branches (use 'hg merge' or use 'hg update -c')" -msgstr "" +msgid "crosses branches (merge branches or use --clean to discard changes)" +msgstr "" + +msgid "crosses branches (merge branches or use --check to force update)" +msgstr "" + +msgid "Attention:" +msgstr "" + +msgid "Caution:" +msgstr "" + +msgid "!Danger!" +msgstr "" + +msgid "Error:" +msgstr "Fel:" + +msgid "Hint:" +msgstr "" + +msgid "Important:" +msgstr "Viktigt:" + +msgid "Note:" +msgstr "Notera:" + +msgid "Tip:" +msgstr "Tips:" + +msgid "Warning!" +msgstr "Varning!" #, python-format msgid "cannot create %s: destination already exists" @@ -12168,17 +12753,11 @@ msgstr "" #, python-format -msgid "Unsupported line endings type: %s" -msgstr "" - -msgid "" -"internal patcher failed\n" -"please report details to http://mercurial.selenic.com/bts/\n" -"or mercurial@selenic.com\n" -msgstr "" -"den interna patcharen misslyckades\n" -"rapportera detaljer till http://mercurial.selenic.com/bts/\n" -"eller mercurial@selenic.com\n" +msgid "unsupported line endings type: %s" +msgstr "" + +msgid "patch failed to apply" +msgstr "" #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" @@ -12251,12 +12830,12 @@ msgid "%s not found in the transaction" msgstr "" +msgid "consistency error in delta" +msgstr "" + msgid "unknown base" msgstr "" -msgid "consistency error adding group" -msgstr "" - msgid "unterminated string" msgstr "" @@ -12277,17 +12856,32 @@ msgid "not a function: %s" msgstr "inte en funktion: %s" -msgid "limit wants two arguments" -msgstr "limit vill ha två argument" - -msgid "limit wants a number" -msgstr "limit vill ha ett nummer" +msgid "id requires one argument" +msgstr "id kräver ett argument" + +msgid "id requires a string" +msgstr "id kräver en sträng" + +msgid "rev requires one argument" +msgstr "rev kräver ett argument" + +msgid "rev requires a number" +msgstr "rev kräver ett nummer" + +msgid "rev expects a number" +msgstr "rev förväntar sig ett nummer" + +msgid "limit requires two arguments" +msgstr "limit kräver två argument" + +msgid "limit requires a number" +msgstr "limit kräver ett nummer" msgid "limit expects a number" msgstr "limit förväntar sig ett nummer" -msgid "ancestor wants two arguments" -msgstr "ancestor vill ha två argument" +msgid "ancestor requires two arguments" +msgstr "ancestor kräver två argument" msgid "ancestor arguments must be single revisions" msgstr "argument till ancestor måste vara singelrevisioner" @@ -12295,32 +12889,36 @@ msgid "follow takes no arguments" msgstr "follow tar inga argument" -msgid "date wants a string" -msgstr "date vill ha en sträng" - -msgid "keyword wants a string" -msgstr "keyword vill ha en sträng" - -msgid "grep wants a string" -msgstr "grep vill ha en sträng" - -msgid "author wants a string" -msgstr "author vill ha ett mönster" - -msgid "file wants a pattern" -msgstr "file vill ha ett mönster" - -msgid "contains wants a pattern" -msgstr "contains vill ha ett mönster" - -msgid "modifies wants a pattern" -msgstr "modifies vill ha ett mönster" - -msgid "adds wants a pattern" -msgstr "adds vill ha ett mönster" - -msgid "removes wants a pattern" -msgstr "removes vill ha ett mänster" +msgid "date requires a string" +msgstr "date kräver en sträng" + +msgid "keyword requires a string" +msgstr "keyword kräver en sträng" + +msgid "grep requires a string" +msgstr "grep kräver en sträng" + +#, python-format +msgid "invalid match pattern: %s" +msgstr "ogiltigt träffmönster: %s" + +msgid "author requires a string" +msgstr "author kräver en sträng" + +msgid "file requires a pattern" +msgstr "file kräver ett mönster" + +msgid "contains requires a pattern" +msgstr "contains kräver ett mönster" + +msgid "modifies requires a pattern" +msgstr "modifies kräver ett mönster" + +msgid "adds requires a pattern" +msgstr "adds kräver ett mönster" + +msgid "removes requires a pattern" +msgstr "removes kräver ett mänster" msgid "merge takes no arguments" msgstr "merge tar inga argument" @@ -12331,8 +12929,8 @@ msgid "head takes no arguments" msgstr "head tar inga argument" -msgid "sort wants one or two arguments" -msgstr "sort vill ha ett eller två argument" +msgid "sort requires one or two arguments" +msgstr "sort kräver ett eller två argument" msgid "sort spec must be a string" msgstr "sort-spec måste vara en sträng" @@ -12344,11 +12942,14 @@ msgid "all takes no arguments" msgstr "all tar inga argument" -msgid "outgoing wants a repository path" -msgstr "outgoing vill ha en arkivsökväg" - -msgid "tagged takes no arguments" -msgstr "tagged tar inga argument" +msgid "outgoing requires a repository path" +msgstr "outgoing kräver en arkivsökväg" + +msgid "tag takes one or no arguments" +msgstr "tag tar ett eller inga argument" + +msgid "the argument to tag must be a string" +msgstr "argumentet till tag måste vara en sträng" msgid "can't negate that" msgstr "kan inte negera det" @@ -12357,17 +12958,17 @@ msgstr "inte en symbol" msgid "empty query" -msgstr "" +msgstr "tom fråga" msgid "searching for exact renames" -msgstr "" +msgstr "söker efter exakta namnbyten" msgid "searching for similar files" msgstr "söker efter liknande filer" #, python-format msgid "%s looks like a binary file." -msgstr "" +msgstr "%s verkar vara en binärfil." msgid "can only specify two labels." msgstr "" @@ -12385,13 +12986,16 @@ msgid "no suitable response from remote hg" msgstr "" +msgid "remote: " +msgstr "fjärr: " + +msgid "unexpected response:" +msgstr "oväntat svar:" + #, python-format msgid "push refused: %s" msgstr "" -msgid "unsynced changes" -msgstr "" - #, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -12414,6 +13018,10 @@ msgstr "" #, python-format +msgid "bad subrepository pattern in %s: %s" +msgstr "" + +#, python-format msgid "" " subrepository sources for %s differ\n" "use (l)ocal source (%s) or (r)emote source (%s)?" @@ -12435,10 +13043,18 @@ msgstr "" #, python-format +msgid "default path for subrepository %s not found" +msgstr "" + +#, python-format msgid "unknown subrepo type %s" msgstr "" #, python-format +msgid "warning: error \"%s\" in subrepository \"%s\"\n" +msgstr "" + +#, python-format msgid "removing subrepo %s\n" msgstr "" @@ -12468,6 +13084,9 @@ msgid "node '%s' is not well formed" msgstr "" +msgid ".hg/tags.cache is corrupt, rebuilding it\n" +msgstr ".hg/tags.cache är korrupt, bygger om den\n" + msgid "unmatched quotes" msgstr "" @@ -12512,6 +13131,10 @@ msgstr "" #, python-format +msgid "(deprecated '%%' in path %s=%s from %s)\n" +msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" + +#, python-format msgid "ignoring untrusted configuration option %s.%s = %s\n" msgstr "" @@ -12533,10 +13156,6 @@ msgid "username %s contains a newline\n" msgstr "" -#, python-format -msgid "(deprecated '%%' in path %s=%s from %s)\n" -msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n" - msgid "response expected" msgstr "" @@ -12577,12 +13196,23 @@ msgid "certificate checking requires Python 2.6" msgstr "certifikatkontroll kräver Python 2.6" -msgid "server identity verification succeeded\n" -msgstr "verifiering av serveridentitet lyckades\n" +msgid "no certificate received" +msgstr "inget certifikat mottaget" + +#, python-format +msgid "certificate is for %s" +msgstr "certifikat är för %s" + +msgid "no commonName found in certificate" +msgstr "inget commonName hittades i certifikat" + +#, python-format +msgid "%s certificate error: %s" +msgstr "%s certifikatfel: %s" #, python-format msgid "command '%s' failed: %s" -msgstr "" +msgstr "kommandot '%s' misslyckades: %s" #, python-format msgid "path contains illegal component: %s" @@ -12604,8 +13234,8 @@ msgstr "" #, python-format -msgid "invalid date: %r " -msgstr "" +msgid "invalid date: %r" +msgstr "ogiltigt datum: %r" #, python-format msgid "date exceeds 32 bits: %d" @@ -12659,6 +13289,10 @@ msgid "%.0f bytes" msgstr "" +#, python-format +msgid "no port number associated with service '%s'" +msgstr "" + msgid "cannot verify bundle or remote repos" msgstr "" @@ -12723,6 +13357,9 @@ msgid "checking changesets\n" msgstr "kontrollerar ändringar\n" +msgid "checking" +msgstr "kontrollerar" + #, python-format msgid "unpacking changeset %s" msgstr "packar upp ändringen %s" @@ -12764,9 +13401,6 @@ msgid "cannot decode filename '%s'" msgstr "kan inte avkoda filnamnet '%s'" -msgid "checking" -msgstr "kontrollerar" - #, python-format msgid "broken revlog! (%s)" msgstr "skadad revlog! (%s)" @@ -12828,3 +13462,15 @@ msgid "user name not available - set USERNAME environment variable" msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME" + +msgid "look up remote revision" +msgstr "söker fjärrevision" + +msgid "look up remote changes" +msgstr "söker fjärrändringar" + +msgid "push failed:" +msgstr "tryckning misslyckades:" + +msgid "push failed (unexpected response):" +msgstr "tryckning misslyckades (oväntat svar):"