diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 23:53+0200\n" -"PO-Revision-Date: 2009-09-28 00:44+0200\n" +"POT-Creation-Date: 2009-09-29 00:26+0200\n" +"PO-Revision-Date: 2009-09-29 00:41+0200\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -3874,22 +3874,22 @@ msgid "" msgstr "" msgid "cannot use both abort and continue" -msgstr "" +msgstr "abort og continue kan ikke angives samtidig" msgid "cannot use collapse with continue or abort" -msgstr "" +msgstr "continue eller abort kan ikke angives samtidig med collapse" msgid "abort and continue do not allow specifying revisions" -msgstr "" +msgstr "abort og continue tillader ikke at der angives revisioner" msgid "cannot specify both a revision and a base" -msgstr "" +msgstr "man kan ikke angive både en revision og en basis" msgid "nothing to rebase\n" msgstr "" msgid "cannot use both keepbranches and extrafn" -msgstr "" +msgstr "man kan ikke bruge både keepbranches og extrafn" msgid "rebase merging completed\n" msgstr "" @@ -3902,7 +3902,7 @@ msgstr "" #, python-format msgid "%d revisions have been skipped\n" -msgstr "" +msgstr "sprang %d revisioner over\n" msgid " set parents\n" msgstr "" @@ -5637,23 +5637,25 @@ msgid "" "\n" " With no arguments, show all repository head changesets.\n" "\n" -" Repository \"heads\" are changesets that don't have child\n" -" changesets. They are where development generally takes place and\n" -" are the usual targets for update and merge operations.\n" +" Repository \"heads\" are changesets with no child changesets. They are\n" +" where development generally takes place and are the usual targets\n" +" for update and merge operations.\n" "\n" " If one or more REV is given, the \"branch heads\" will be shown for\n" -" the named branch associated with that revision. The name of the\n" -" branch is called the revision's branch tag.\n" -"\n" -" Branch heads are revisions on a given named branch that do not have\n" -" any descendants on the same branch. A branch head could be a true head\n" -" or it could be the last changeset on a branch before a new branch\n" -" was created. If none of the branch heads are true heads, the branch\n" -" is considered inactive. If -c/--closed is specified, also show branch\n" -" heads marked closed (see hg commit --close-branch).\n" -"\n" -" If STARTREV is specified only those heads (or branch heads) that\n" -" are descendants of STARTREV will be displayed.\n" +" the named branch associated with the specified changeset(s).\n" +"\n" +" Branch heads are changesets on a named branch with no descendants on\n" +" the same branch. A branch head could be a \"true\" (repository) head,\n" +" or it could be the last changeset on that branch before it was\n" +" merged into another branch, or it could be the last changeset on the\n" +" branch before a new branch was created. If none of the branch heads\n" +" are true heads, the branch is considered inactive.\n" +"\n" +" If -c/--closed is specified, also show branch heads marked closed\n" +" (see hg commit --close-branch).\n" +"\n" +" If STARTREV is specified, only those heads that are descendants of\n" +" STARTREV will be displayed.\n" " " msgstr "" @@ -6625,6 +6627,9 @@ msgstr "" " Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "man kan ikke angive både -c/--check og -C/--clean" + msgid "uncommitted local changes" msgstr "udeponerede lokale ændringer" @@ -6639,6 +6644,14 @@ msgid "" " integrity of their crosslinks and indices.\n" " " msgstr "" +"verificer depotets integritet\n" +"\n" +" Verificer integreteten af det aktuelle depot.\n" +"\n" +" Dette vil lave en udførlig kontrol af depotets integritet.\n" +" Hashværdier og tjeksummer valideres for hver indgang i\n" +" historikfilen, manifæstet og fulgte filer. Desuden valideres\n" +" integriteten af deres krydslinks og indekser." msgid "output version and copyright information" msgstr "udskriv version- og copyrightinformation" @@ -6653,6 +6666,11 @@ msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" +"\n" +"Copyright (C) 2005-2009 Matt Mackall og andre\n" +"Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n" +"gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n" +"NOGET BESTEMT FORMÅL.\n" msgid "repository root directory or symbolic path name" msgstr "depotrodfolder eller symbolsk stinavn" @@ -6835,10 +6853,10 @@ msgid "[-gbsr] [-c CMD] [REV]" msgstr "[-gbsr] [-c KOMMANDO] [REV]" msgid "set branch name even if it shadows an existing branch" -msgstr "" +msgstr "sæt grennavnet selv hvis det overskygger en eksisterende gren" msgid "reset branch name to parent branch name" -msgstr "" +msgstr "nulstil grennavnet til forældre-grennavnet" msgid "[-fC] [NAME]" msgstr "[-fC] [NAVN]" @@ -6961,7 +6979,7 @@ msgid "[OPTION]... [-r REV1 [-r REV2]] [ msgstr "[TILVALG]... [-r REV1 [-r REV2]] [FIL]..." msgid "diff against the second parent" -msgstr "" +msgstr "find forskelle i forhold til den anden forældre" msgid "[OPTION]... [-o OUTFILESPEC] REV..." msgstr "[TILVALG]... [-o UDFILSPECIFIKATION] REV..." diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1356,23 +1356,25 @@ def heads(ui, repo, *branchrevs, **opts) With no arguments, show all repository head changesets. - Repository "heads" are changesets that don't have child - changesets. They are where development generally takes place and - are the usual targets for update and merge operations. + Repository "heads" are changesets with no child changesets. They are + where development generally takes place and are the usual targets + for update and merge operations. If one or more REV is given, the "branch heads" will be shown for - the named branch associated with that revision. The name of the - branch is called the revision's branch tag. - - Branch heads are revisions on a given named branch that do not have - any descendants on the same branch. A branch head could be a true head - or it could be the last changeset on a branch before a new branch - was created. If none of the branch heads are true heads, the branch - is considered inactive. If -c/--closed is specified, also show branch - heads marked closed (see hg commit --close-branch). - - If STARTREV is specified only those heads (or branch heads) that - are descendants of STARTREV will be displayed. + the named branch associated with the specified changeset(s). + + Branch heads are changesets on a named branch with no descendants on + the same branch. A branch head could be a "true" (repository) head, + or it could be the last changeset on that branch before it was + merged into another branch, or it could be the last changeset on the + branch before a new branch was created. If none of the branch heads + are true heads, the branch is considered inactive. + + If -c/--closed is specified, also show branch heads marked closed + (see hg commit --close-branch). + + If STARTREV is specified, only those heads that are descendants of + STARTREV will be displayed. """ if opts.get('rev'): start = repo.lookup(opts['rev']) @@ -3047,7 +3049,10 @@ def update(ui, repo, node=None, rev=None if not rev: rev = node - if not clean and check: + if check and clean: + raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) + + if check: # we could use dirty() but we can ignore merge and branch trivia c = repo[None] if c.modified() or c.added() or c.removed():