# HG changeset patch # User Martin Geisler # Date 2009-07-20 21:24:12 # Node ID be4fb30595eef7d6b8039c56c7c71ca69a8edf4f # Parent 2ab9ec0f9703b9f666640114154c1bf163a3673f i18n-da: synchronized with 78e54b9f3a62 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-06-30 23:18+0200\n" -"PO-Revision-Date: 2009-06-30 23:28+0200\n" +"POT-Creation-Date: 2009-07-20 23:05+0200\n" +"PO-Revision-Date: 2009-07-20 23:22+0200\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -1004,8 +1004,10 @@ msgstr "forbinder til %s\n" msgid "CVS pserver authentication failed" msgstr "CVS pserver godkendelse fejlede" -msgid "server sucks" -msgstr "serveren sutter" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)" #, python-format msgid "%d bytes missing from remote file" @@ -4575,6 +4577,10 @@ msgid "HG: branch '%s'" msgstr "HG: gren '%s'" #, python-format +msgid "HG: subrepo %s" +msgstr "HG: underdepot %s" + +#, python-format msgid "HG: added %s" msgstr "HG: tilføjet %s" @@ -4878,7 +4884,8 @@ msgid "" " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -4898,9 +4905,11 @@ msgid "" "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If -a/--active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -4908,10 +4917,11 @@ msgstr "" "vis navngivne grene i depotet\n" "\n" " Viser depotets navngivne grene og indikerer hvilke der er\n" -" inaktive. Hvis -a/--active angivet, da vises kun aktive grene.\n" -"\n" -" En gren er anses for at være aktiv hvis den indeholder\n" -" depothoveder.\n" +" inaktive. Hvis -c/--closed er angivet, så vises lukkede grene også\n" +" (se hg commit --close-branch).\n" +"\n" +" Hvis -a/--active er angivet, da vises kun aktive grene. En gren er\n" +" anses for at være aktiv hvis den indeholder depothoveder.\n" "\n" " Brug kommandoen 'hg update' for at skifte til en eksisterende\n" " gren.\n" @@ -5098,6 +5108,9 @@ msgstr "" " Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " +msgid "nothing changed\n" +msgstr "ingen ændringer\n" + msgid "created new head\n" msgstr "lavede et nyt hoved\n" @@ -5495,7 +5508,8 @@ msgid "" " 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.\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" @@ -6689,6 +6703,9 @@ msgstr "[-fC] [NAVN]" msgid "show only branches that have unmerged heads" msgstr "vil kun grene som har usammenføjne hoveder" +msgid "show normal and closed heads" +msgstr "vis normale og lukkede hoveder" + msgid "[-a]" msgstr "[-a]" @@ -6836,9 +6853,6 @@ msgstr "vis kun hoveder som er efterkomm msgid "show only the active heads from open branches" msgstr "vis kun aktive hoveder fra åbne grene" -msgid "show normal and closed heads" -msgstr "vis normale og lukkede hoveder" - msgid "[-r STARTREV] [REV]..." msgstr "[-r STARTREV] [REV]..." @@ -7926,17 +7940,19 @@ msgid "" "\n" " Valid URLs are of the form:\n" "\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" "\n" " Paths in the local filesystem can either point to Mercurial\n" " repositories or to bundle files (as created by 'hg bundle' or\n" " 'hg incoming --bundle').\n" "\n" " An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\n" +" or changeset to use from the remote repository. See also 'hg help\n" +" revisions'.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" " only possible if the feature is explicitly enabled on the remote\n" @@ -8292,9 +8308,6 @@ msgstr "ingen træffer under kataloget!" msgid "file not tracked!" msgstr "filen følges ikke!" -msgid "nothing changed\n" -msgstr "ingen ændringer\n" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "uløste sammenføjningskonflikter (se hg resolve)" @@ -9198,7 +9211,7 @@ msgid "empty or missing copy source revl msgstr "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format