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-11-10 20:42+0100\n" -"PO-Revision-Date: 2009-11-11 22:54+0100\n" +"POT-Creation-Date: 2009-12-30 00:34+0100\n" +"PO-Revision-Date: 2009-12-30 03:25+0100\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -135,74 +135,74 @@ msgid "" "- backout, commit, import, tag: Specify the commit date.\n" "- log, revert, update: Select revision(s) by date.\n" "\n" -"Many date formats are valid. Here are some examples::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" -" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" -" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" -" \"Dec 6\" (midnight)\n" -" \"13:18\" (today assumed)\n" -" \"3:39\" (3:39AM assumed)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -"Lastly, there is Mercurial's internal format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"Many date formats are valid. Here are some examples:\n" +"\n" +"- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n" +"- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n" +"- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n" +"- ``Dec 6`` (midnight)\n" +"- ``13:18`` (today assumed)\n" +"- ``3:39`` (3:39AM assumed)\n" +"- ``3:39pm`` (15:39)\n" +"- ``2006-12-06 13:18:29`` (ISO 8601 format)\n" +"- ``2006-12-6 13:18``\n" +"- ``2006-12-6``\n" +"- ``12-6``\n" +"- ``12/6``\n" +"- ``12/6/6`` (Dec 6 2006)\n" +"\n" +"Lastly, there is Mercurial's internal format:\n" +"\n" +"- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)\n" "\n" "This is the internal representation format for dates. unixtime is the\n" "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" "the offset of the local timezone, in seconds west of UTC (negative if\n" "the timezone is east of UTC).\n" "\n" -"The log command also accepts date ranges::\n" -"\n" -" \"<{datetime}\" - at or before a given date/time\n" -" \">{datetime}\" - on or after a given date/time\n" -" \"{datetime} to {datetime}\" - a date range, inclusive\n" -" \"-{days}\" - within a given number of days of today\n" +"The log command also accepts date ranges:\n" +"\n" +"- ``<{datetime}`` - at or before a given date/time\n" +"- ``>{datetime}`` - on or after a given date/time\n" +"- ``{datetime} to {datetime}`` - a date range, inclusive\n" +"- ``-{days}`` - within a given number of days of today\n" msgstr "" "Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n" "\n" "- backout, commit, import, tag: specificer commit-datoen.\n" "- log, revert, update: vælg revisioner efter dato.\n" "\n" -"Der er mange gyldige datoformater. Her er nogle eksempler::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" -" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" -" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" -" \"Dec 6\" (midnat)\n" -" \"13:18\" (antager dags dato)\n" -" \"3:39\"\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (6. dec. 2006)\n" -"\n" -"Endelig er der Mercurials interne format::\n" -"\n" -" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" +"Der er mange gyldige datoformater. Her er nogle eksempler:\n" +"\n" +"- ``Wed Dec 6 13:18:29 2006`` (antager lokal tidszone)\n" +"- ``Dec 6 13:18 -0600`` (antager år, tidszone er angivet)\n" +"- ``Dec 6 13:18 UTC`` (UTC og GMT er aliaser for +0000)\n" +"- ``Dec 6`` (midnat)\n" +"- ``13:18`` (antager dags dato)\n" +"- ``3:39``\n" +"- ``3:39pm`` (15:39)\n" +"- ``2006-12-06 13:18:29`` (ISO 8601 format)\n" +"- ``2006-12-6 13:18``\n" +"- ``2006-12-6``\n" +"- ``12-6``\n" +"- ``12/6``\n" +"- ``12/6/6`` (6. dec. 2006)\n" +"\n" +"Endelig er der Mercurials interne format:\n" +"\n" +"- ``1165432709 0`` (Ons 6. dec. 13:18:29 2006 UTC)\n" "\n" "Dette er den interne repræsentation af datoer. unixtime er\n" "antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" "UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" "for UTC (negativ hvis tidszonen er øst for UTC).\n" "\n" -"Kommandoen log accepterer også datointervaller::\n" -"\n" -" \"<{date}\" - på eller før den angivne dato/tidspunkt\n" -" \">{date}\" - på eller efter den angivne dato/tidspunkt\n" -" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" -" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n" +"Kommandoen log accepterer også datointervaller:\n" +"\n" +"- ``<{date}`` - på eller før den angivne dato/tidspunkt\n" +"- ``>{date}`` - på eller efter den angivne dato/tidspunkt\n" +"- ``{date} to {date}`` - et datointerval, inklusiv endepunkterne\n" +"- ``-{days}`` - indenfor et angivet antal dage, fra dags dato\n" msgid "" "Mercurial's default format for showing changes between two versions of\n" @@ -1813,6 +1813,11 @@ msgstr "samler p4 changelists\n" msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "Mercurial kunne ikke køre sig selv, kontroller om hg er i PATH" +msgid "" +"svn: cannot probe remote repository, assume it could be a subversion " +"repository. Use --source-type if you know better.\n" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "Subversion python bindingerne kunne ikke indlæses" @@ -2449,23 +2454,23 @@ msgstr "navn på fil at skrive process ID til" msgid "hg inserve [OPTION]..." msgstr "hg inserve [TILVALG]..." -msgid "(found dead inotify server socket; removing it)\n" -msgstr "(fandt død inotify server sokkel; fjerner den)\n" - -#, python-format -msgid "could not start inotify server: %s\n" -msgstr "kunne ikke starte inotify server: %s\n" - -#, python-format -msgid "could not talk to new inotify server: %s\n" -msgstr "kunne ikke snakke med ny inotify server: %s\n" - -#, python-format -msgid "failed to contact inotify server: %s\n" -msgstr "kontakt med inotify server miskykkedes: %s\n" - -msgid "received empty answer from inotify server" -msgstr "modtog tomt svar fra inotify server" +msgid "inotify-client: found dead inotify server socket; removing it\n" +msgstr "inotify-klient: fandt død inotify server sokkel; fjerner den\n" + +#, python-format +msgid "inotify-client: could not start inotify server: %s\n" +msgstr "inotify-klient: kunne ikke starte inotify server: %s\n" + +#, python-format +msgid "inotify-client: could not talk to new inotify server: %s\n" +msgstr "inotify-klient: kunne ikke snakke med ny inotify server: %s\n" + +#, python-format +msgid "inotify-client: failed to contact inotify server: %s\n" +msgstr "inotify-klient: kontakt med inotify server mislykkedes: %s\n" + +msgid "inotify-client: received empty answer from inotify server" +msgstr "inotify-klient: modtog tomt svar fra inotify server" #, python-format msgid "(inotify: received response from incompatible server version %d)\n" @@ -2567,9 +2572,13 @@ msgstr "%s læser %d hændelser\n" msgid "%s hooking back up with %d bytes readable\n" msgstr "" -#, python-format -msgid "could not start server: %s" -msgstr "kunne ikke starte server: %s" +msgid "cannot start: socket is already bound" +msgstr "" + +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" +msgstr "" #, python-format msgid "answering query for %r\n" @@ -3507,7 +3516,8 @@ msgid "" " With arguments, set guards for the named patch.\n" " NOTE: Specifying negative guards now requires '--'.\n" "\n" -" To set guards on another patch:\n" +" To set guards on another patch::\n" +"\n" " hg qguard -- other.patch +2.6.17 -stable\n" " " msgstr "" @@ -3640,7 +3650,7 @@ msgid "" " qselect to tell mq which guards to use. A patch will be pushed if\n" " it has no guards or any positive guards match the currently\n" " selected guard, but will not be pushed if any negative guards\n" -" match the current guard. For example:\n" +" match the current guard. For example::\n" "\n" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" @@ -3708,11 +3718,12 @@ msgstr "deaktiverede filtre\n" #, python-format msgid "number of unguarded, unapplied patches has changed from %d to %d\n" -msgstr "antallet af ufiltrerede og ikke-anvendte rettelser har ændret sig fra %dtil %d\n" +msgstr "antallet af ufiltrerede og ikke-anvendte rettelser har ændret sig fra %d til %d\n" #, python-format msgid "number of guarded, applied patches has changed from %d to %d\n" -msgstr "antallet af filtrerede og anvendte rettelser har ændret sig fra %d til %d\n" +msgstr "" +"antallet af filtrerede og anvendte rettelser har ændret sig fra %d til %d\n" msgid "guards in series file:\n" msgstr "filtre i seriefilen:\n" @@ -4132,10 +4143,13 @@ msgid "" " ignore = version, help, update\n" "\n" "You can also enable the pager only for certain commands using\n" -"pager.attend::\n" +"pager.attend. Below is the default list of commands to be paged::\n" "\n" " [pager]\n" -" attend = log\n" +" attend = annotate, cat, diff, export, glog, log, qdiff\n" +"\n" +"Setting pager.attend to an empty value will cause all commands to be\n" +"paged.\n" "\n" "If pager.attend is present, pager.ignore will be ignored.\n" "\n" @@ -4661,9 +4675,6 @@ msgstr "undersøg ændringer i %s?" msgid " and " msgstr " og " -msgid "y" -msgstr "j" - #, python-format msgid "record this change to %r?" msgstr "optag denne ændring i %r?" @@ -4805,6 +4816,43 @@ msgstr "" msgid "[ORIGIN]" msgstr "" +msgid "" +"extend schemes with shortcuts to repository swarms\n" +"\n" +"This extension allows you to specify shortcuts for parent URLs with a\n" +"lot of repositories to act like a scheme, for example::\n" +"\n" +" [schemes]\n" +" py = http://code.python.org/hg/\n" +"\n" +"After that you can use it like::\n" +"\n" +" hg clone py://trunk/\n" +"\n" +"Additionally there is support for some more complex schemas, for\n" +"example used by Google Code::\n" +"\n" +" [schemes]\n" +" gcode = http://{1}.googlecode.com/hg/\n" +"\n" +"The syntax is taken from Mercurial templates, and you have unlimited\n" +"number of variables, starting with ``{1}`` and continuing with\n" +"``{2}``, ``{3}`` and so on. This variables will receive parts of URL\n" +"supplied, split by ``/``. Anything not specified as ``{part}`` will be\n" +"just appended to an URL.\n" +"\n" +"For convenience, the extension adds these schemes by default::\n" +"\n" +" [schemes]\n" +" py = http://hg.python.org/\n" +" bb = https://bitbucket.org/\n" +" bb+ssh = ssh://hg@bitbucket.org/\n" +" gcode = https://{1}.googlecode.com/hg/\n" +"\n" +"You can override a predefined scheme by defining a new scheme with the\n" +"same name.\n" +msgstr "" + msgid "share a common history between several working directories" msgstr "" @@ -5458,14 +5506,14 @@ msgid "" " directory; use -r/--rev to specify a different revision.\n" "\n" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are::\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" types are:\n" +"\n" +" :``files``: a directory full of files (default)\n" +" :``tar``: tar archive, uncompressed\n" +" :``tbz2``: tar archive, compressed using bzip2\n" +" :``tgz``: tar archive, compressed using gzip\n" +" :``uzip``: zip archive, uncompressed\n" +" :``zip``: zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" " using a format string; see 'hg help export' for details.\n" @@ -5702,6 +5750,12 @@ msgstr "" " gren.\n" " " +msgid " (closed)" +msgstr " (lukket)" + +msgid " (inactive)" +msgstr " (inaktiv)" + msgid "" "create a changegroup file\n" "\n" @@ -5742,11 +5796,11 @@ msgid "" "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions::\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repository root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions:\n" +"\n" +" :``%s``: basename of file being printed\n" +" :``%d``: dirname of file being printed, or '.' if in repository root\n" +" :``%p``: root-relative path name of file being printed\n" " " msgstr "" "udskriv den aktuelle eller en given revision af filer\n" @@ -5758,12 +5812,12 @@ msgstr "" "\n" " Output kan gemmes i en fil hvis navn angives med et formatstreng.\n" " Reglerne for formatteringen er de samme som for export-kommandoen\n" -" med følgende tilføjelser::\n" -"\n" -" %s grundnavn for filen som udskrives\n" -" %d katalognavn for filen som blvier udskrevet\n" -" eller '.' hvis filen er i katalogets rod\n" -" %p rod-relativ sti for filen som bliver udkrevet\n" +" med følgende tilføjelser:\n" +"\n" +" :``%s``: grundnavn for filen som udskrives\n" +" :``%d``: katalognavn for filen som blvier udskrevet\n" +" eller '.' hvis filen er i katalogets rod\n" +" :``%p``: rod-relativ sti for filen som bliver udkrevet\n" " " msgid "" @@ -5779,18 +5833,18 @@ msgid "" "\n" " See 'hg help urls' for valid source format details.\n" "\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " If the -U/--noupdate option is specified, the new clone will contain\n" " only a repository (.hg) and no working copy (the working copy parent\n" " will be the null changeset). Otherwise, clone will initially check\n" " out (in order of precedence):\n" "\n" -" a) the changeset, tag or branch specified with -u/--updaterev\n" -" b) the changeset, tag or branch given with the first -r/--rev\n" -" c) the head of the default branch\n" +" a) the changeset, tag or branch specified with -u/--updaterev\n" +" b) the changeset, tag or branch given with the first -r/--rev\n" +" c) the head of the default branch\n" "\n" " Use 'hg clone -u . src dst' to checkout the source repository's\n" " parent changeset (applicable for local source repositories only).\n" @@ -5799,8 +5853,8 @@ msgid "" " by listing each changeset (tag, or branch name) with -r/--rev.\n" " If -r/--rev is used, the cloned repository will contain only a subset\n" " of the changesets of the source repository. Only the set of changesets\n" -" defined by all -r/--rev options (including their direct and indirect\n" -" parent changesets) will be pulled into the destination repository.\n" +" defined by all -r/--rev options (including all their ancestors)\n" +" will be pulled into the destination repository.\n" " No subsequent changesets (including subsequent tags) will be present\n" " in the destination.\n" "\n" @@ -5839,20 +5893,20 @@ msgstr "" "\n" " Se 'hg help urls' for detaljer om gyldige formatter for kilden.\n" "\n" -" Det er muligt at specificere en ssh:// URL som destination, men\n" -" der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" +" Det er muligt at specificere en ``ssh://`` URL som destination,\n" +" men der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" " arbejdskatalog på den anden side. Se venligst 'hg help urls' for\n" -" vigtige detaljer om ssh:// URLer.\n" +" vigtige detaljer om ``ssh://`` URLer.\n" "\n" " Hvis -U/--noupdate tilvalget bruges vil den nye klon kun indeholde\n" " et depot (.hg) og intet arbejdskatalog (arbejdskatalogets forælder\n" " er sat til nul revisionen). Ellers vil clone kommandoen hente\n" "\n" -" a) ændringen, mærkaten eller grenen specificeret med\n" -" -u/--updaterev\n" -" b) ændringen, mærkaten eller grenen angivet med den første\n" -" -r/--rev\n" -" c) hovedet af default grenen\n" +" a) ændringen, mærkaten eller grenen specificeret med\n" +" -u/--updaterev\n" +" b) ændringen, mærkaten eller grenen angivet med den første\n" +" -r/--rev\n" +" c) hovedet af default grenen\n" "\n" " Brug 'hg clone -u . kilde destination' for at hente ændringen i\n" " kildedepotet ud i destinations depotet (kan kun anvendes ved\n" @@ -5863,10 +5917,9 @@ msgstr "" " grennavn) med -r/--rev. Hvis -r/--rev tilvalget bruges, så vil det\n" " klonede depot kun indeholde en delmængde af ændringerne i\n" " kildedepotet. Det er kun mængden af ændringer defineret af alle\n" -" -r/--rev tilvalgene (inklusiv deres direkte og indirekte forfædre)\n" -" som vil blive hevet ind i destinationsdepotet. Ingen efterfølgende\n" -" revisioner (inklusiv efterfølgende mærkater) vil findes i\n" -" destinationen.\n" +" -r/--rev tilvalgene (inklusiv alle deres forfædre) som vil blive\n" +" hevet ind i destinationsdepotet. Ingen efterfølgende revisioner\n" +" (inklusiv efterfølgende mærkater) vil findes i destinationen.\n" "\n" " Brug af -r/--rev (eller 'clone kilde#rev destination') medfører\n" " --pull, selv ved lokale depoter.\n" @@ -6193,16 +6246,16 @@ msgid "" " first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows::\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\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" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" +" given using a format string. The formatting rules are as follows:\n" +"\n" +" :``%%``: literal \"%\" character\n" +" :``%H``: changeset hash (40 bytes of hexadecimal)\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" +" :``%n``: zero-padded sequence number, starting at 1\n" +" :``%r``: zero-padded changeset revision number\n" "\n" " Without the -a/--text option, export will avoid generating diffs\n" " of files it detects as binary. With -a, export will generate a\n" @@ -6228,16 +6281,16 @@ msgstr "" " sammenføjningsændringen med dennes første forælder.\n" "\n" " Uddata kan gemmes i en fil, og filnavnet er givet ved en\n" -" format-streng. Formatteringsreglerne er som følger::\n" -"\n" -" %% litteral % tegn\n" -" %H ændringshash (40 byte heksadecimal)\n" -" %N antallet af rettelser som bliver genereret\n" -" %R revisionnummer for ændringen\n" -" %b grundnavn for det eksporterede depot\n" -" %h kortform ændringshash (12 byte heksadecimal)\n" -" %n nul-fyldt sekvensnummer, startende ved 1\n" -" %r nul-fyldt revisionsnummer for ændringen\n" +" format-streng. Formatteringsreglerne er som følger:\n" +"\n" +" :``%%``: litteral \"%\" tegn\n" +" :``%H``: ændringshash (40 byte heksadecimal)\n" +" :``%N``: antallet af rettelser som bliver genereret\n" +" :``%R``: revisionnummer for ændringen\n" +" :``%b``: grundnavn for det eksporterede depot\n" +" :``%h``: kortform ændringshash (12 byte heksadecimal)\n" +" :``%n``: nul-fyldt sekvensnummer, startende ved 1\n" +" :``%r``: nul-fyldt revisionsnummer for ændringen\n" "\n" " Uden -a/--text tilvalget vil annotate undgå at behandle filer som\n" " den detekterer som binære. Med -a vil annotate generere en\n" @@ -6408,9 +6461,6 @@ msgstr "valgmuligheder:\n" msgid "no commands defined\n" msgstr "ingen kommandoer defineret\n" -msgid "enabled extensions:" -msgstr "aktiverede udvidelser:" - msgid "no help text available" msgstr "ingen hjælpetekst tilgængelig" @@ -6432,6 +6482,9 @@ msgstr "" "basale kommandoer:\n" "\n" +msgid "enabled extensions:" +msgstr "aktiverede udvidelser:" + msgid "DEPRECATED" msgstr "" @@ -6530,7 +6583,7 @@ msgid "" "\n" " If no directory is given, the current directory is used.\n" "\n" -" It is possible to specify an ssh:// URL as the destination.\n" +" It is possible to specify an ``ssh://`` URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -6542,7 +6595,7 @@ msgstr "" " Hvis intet katalog er angivet vil det nuværende katalog bliver\n" " anvendt.\n" "\n" -" Det er muligt at angive en ssh:// URL som destination.\n" +" Det er muligt at angive en ``ssh://`` URL som destination.\n" " Se 'hg help urls' for mere information.\n" " " @@ -6807,7 +6860,7 @@ msgid "" " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see 'hg help urls' for important details about ssh://\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -6828,8 +6881,8 @@ msgstr "" " Hvis -r/--rev bruges, så vil den navngivne revision og alle dets\n" " forfædre bliver skubbet til det andet depot.\n" "\n" -" Se venligst 'hg help urls' for vigtige detaljer om ssh:// URL'er.\n" -" Hvis DESTINATION udelades vil en standard sti blive brugt.\n" +" Se venligst 'hg help urls' for vigtige detaljer om ``ssh://``\n" +" URL'er. Hvis DESTINATION udelades vil en standard sti blive brugt.\n" " " #, python-format @@ -7047,13 +7100,13 @@ msgid "" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back::\n" -"\n" -" commit\n" -" import\n" -" pull\n" -" push (with this repository as destination)\n" -" unbundle\n" +" and their effects can be rolled back:\n" +"\n" +" - commit\n" +" - import\n" +" - pull\n" +" - push (with this repository as destination)\n" +" - unbundle\n" "\n" " This command is not intended for use on public repositories. Once\n" " changes are visible for pull by other users, rolling a transaction\n" @@ -7352,13 +7405,13 @@ msgid "" " The following rules apply when the working directory contains\n" " uncommitted changes:\n" "\n" -" 1. If neither -c/--check nor -C/--clean is specified, uncommitted\n" -" changes are merged into the requested changeset, and the merged " -"result\n" -" is left uncommitted. Updating and merging will occur only if the\n" -" requested changeset is an ancestor or descendant of the parent\n" -" changeset. Otherwise, the update is aborted and the uncommitted " -"changes\n" +" 1. If neither -c/--check nor -C/--clean is specified, and if\n" +" the requested changeset is an ancestor or descendant of\n" +" the working directory's parent, the uncommitted changes\n" +" are merged into the requested changeset and the merged\n" +" result is left uncommitted. If the requested changeset is\n" +" not an ancestor or descendant (that is, it is on another\n" +" branch), the update is aborted and the uncommitted changes\n" " are preserved.\n" "\n" " 2. With the -c/--check option, the update is aborted and the\n" @@ -7388,13 +7441,14 @@ msgstr "" " De følgende regler gælder når arbejdskataloget indeholder\n" " udeponerede ændringer:\n" "\n" -" 1. Hvis hverken -c/--check eler -C/--clean er angivet, så bliver\n" -" udeponerede ændringer føjet ind i den ønskede ændring og det\n" -" sammenføjne resultat bliver efterlad udeponeret. Opdateringen\n" -" eller sammenføjningen vil kun finde sted hvis den ønskede\n" -" ændring er forfar til eller nedstammer fra forældreændringen.\n" -" Ellers vil opdateringen blive afbrudt og de udeponerede\n" -" ændringer bliver bevaret.\n" +" 1. Hvis hverken -c/--check eller -C/--clean er angivet og hvis den\n" +" ønskede ændring er en forfar til eller nedstammer fra\n" +" arbejdskatalogets forældre, så bliver udeponerede ændringer\n" +" føjet ind i den ønskede ændring og det sammenføjne resultat\n" +" bliver efterlad udeponeret. Hvis den ønskede ændring ikke er\n" +" forfar til eller nedstammer fra forældreændringen (det vil\n" +" sige, den er på en anden gren), så vil opdateringen blive\n" +" afbrudt og de udeponerede ændringer bliver bevaret.\n" "\n" " 2. Med -c/--check tilvalget vil opdateringen blive afbrudt og de\n" " udeponerede ændringer bliver bevaret.\n" @@ -7639,8 +7693,8 @@ msgstr "brug kommando for at kontrollere tilstanden af ændringen" msgid "do not update to target" msgstr "undlad at opdatere til målet" -msgid "[-gbsr] [-c CMD] [REV]" -msgstr "[-gbsr] [-c KOMMANDO] [REV]" +msgid "[-gbsr] [-U] [-c CMD] [REV]" +msgstr "[-gbsr] [-U] [-c KOMMANDO] [REV]" msgid "set branch name even if it shadows an existing branch" msgstr "sæt grennavnet selv hvis det overskygger en eksisterende gren" @@ -7657,8 +7711,8 @@ msgstr "vil kun grene som har usammenføjne hoveder" msgid "show normal and closed branches" msgstr "vis normale og lukkede grene" -msgid "[-a]" -msgstr "[-a]" +msgid "[-ac]" +msgstr "[-ac]" msgid "run even when remote repository is unrelated" msgstr "kør selv hvis fjerndepotet er urelateret" @@ -7675,8 +7729,8 @@ msgstr "" msgid "bundle compression type to use" msgstr "" -msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" -msgstr "[-f] [-a] [-r REV]... [--base REV]... FIL [MÅL]" +msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FIL [MÅL]" msgid "print output to file with formatted name" msgstr "" @@ -7696,8 +7750,8 @@ msgstr "klonen vil kun indeholde et depo msgid "revision, tag or branch to check out" msgstr "revision, mærkat eller gren som skal hentes ud" -msgid "a changeset you would like to have after cloning" -msgstr "en ændringer du gerne vil have efter kloningen" +msgid "clone only the specified revisions and ancestors" +msgstr "klon kun de specificerede revisioner og deres forfædre" msgid "[OPTION]... SOURCE [DEST]" msgstr "[TILVALG]... KILDE [MÅL]" @@ -7810,8 +7864,8 @@ msgstr "vis kun de aktive grenhoveder fra åbne grene" msgid "show normal and closed branch heads" msgstr "vis normale og lukkede grenhoveder" -msgid "[-r STARTREV] [REV]..." -msgstr "[-r STARTREV] [REV]..." +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r STARTREV] [REV]..." msgid "[TOPIC]" msgstr "[EMNE]" @@ -7929,8 +7983,8 @@ msgstr "revision der skal sammenføjes" msgid "review revisions to merge (no merge is performed)" msgstr "" -msgid "[-f] [[-r] REV]" -msgstr "[-f] [[-r] REV]" +msgid "[-P] [-f] [[-r] REV]" +msgstr "[-P] [-f] [[-r] REV]" msgid "a specific revision up to which you would like to push" msgstr "" @@ -8088,11 +8142,11 @@ msgstr "revision der skal mærkes" msgid "remove a tag" msgstr "fjern en mærkat" -msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." -msgstr "[-l] [-m TEKST] [-d DATO] [-u BRUGER] [-r REV] NAVN..." - -msgid "[-p]" -msgstr "[-p]" +msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "[-f] [-l] [-m TEKST] [-d DATO] [-u BRUGER] [-r REV] NAVN..." + +msgid "[-p] [-g]" +msgstr "[-p] [-g]" msgid "update to new tip if changesets were unbundled" msgstr "opdater til ny spids hvis ændringer blev pakket ud" @@ -8110,6 +8164,10 @@ msgid "[-c] [-C] [-d DATE] [[-r] REV]" msgstr "[-c] [-C] [-d DATO] [[-r] REV]" #, python-format +msgid "config error at %s:%d: cannot include %s (%s)" +msgstr "konfigurationsfejl på %s:%d: kan ikke inkludere %s (%s)" + +#, python-format msgid "config error at %s:%d: '%s'" msgstr "konfigurationsfejl på %s:%d: '%s'" @@ -8274,8 +8332,8 @@ msgid "alias '%s' resolves to ambiguous msgstr "alias '%s' oversætter til tvetydig kommando '%s'\n" #, python-format -msgid "malformed --config option: %s" -msgstr "misdannet --config tilvalg: %s" +msgid "malformed --config option: %r (use --config section.name=value)" +msgstr "misdannet --config tilvalg: %r (brug --config sektion.navn=værdi)" #, python-format msgid "extension '%s' overrides commands: %s\n" @@ -8490,6 +8548,12 @@ msgstr "" msgid "%s hook is invalid (\"%s\" not in a module)" msgstr "" +msgid "exception from first failed import attempt:\n" +msgstr "fejltekst fra første fejlede import-forsøg:\n" + +msgid "exception from second failed import attempt:\n" +msgstr "fejltekst fra andet fejlede import-forsøg:\n" + #, python-format msgid "%s hook is invalid (import of \"%s\" failed)" msgstr "" @@ -8632,7 +8696,7 @@ msgid "unknown revision '%s'" msgstr "ukendt revision '%s'" msgid "abandoned transaction found - run hg recover" -msgstr "" +msgstr "fandt en efterladt transaktion - kør hg recover" msgid "rolling back interrupted transaction\n" msgstr "ruller afbrudt transaktion tilbage\n" @@ -8665,6 +8729,8 @@ msgstr "arbejdskatalog for %s" msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" +"kan ikke deponere en sammenføjning partielt (undgå at specificere filer " +"eller mønstre)" msgid "file not found!" msgstr "filen blev ikke fundet!" @@ -8695,6 +8761,8 @@ msgid "" "%s: files over 10MB may cause memory and performance problems\n" "(use 'hg revert %s' to unadd the file)\n" msgstr "" +"%s: filer på over 10 MB kan skabe hukommelses- og ydelsesproblemer\n" +"(brug 'hg revert %s' for at u-tilføje filen)\n" #, python-format msgid "%s not added: only files and symlinks supported currently\n" @@ -8756,7 +8824,7 @@ msgid "(did you forget to merge? use pus msgstr "(glemte du at sammenføje? brug push -f for at gennemtvinge)\n" msgid "note: unsynced remote changes!\n" -msgstr "" +msgstr "bemærk: usynkroniserede ændringer i fjernsystemet!\n" #, python-format msgid "%d changesets found\n" @@ -8799,10 +8867,10 @@ msgid "locking the remote repository fai msgstr "låsning af fjerndepotet fejlede" msgid "the server sent an unknown error code" -msgstr "" +msgstr "serveren sendte en ukendt fejlkode" msgid "streaming all changes\n" -msgstr "" +msgstr "streamer alle ændringer\n" #, python-format msgid "%d files to transfer, %s of data\n" @@ -8817,7 +8885,7 @@ msgstr "" #, python-format msgid "sending mail: smtp host %s, port %s\n" -msgstr "" +msgstr "sender mail: smtp host %s, port %s\n" msgid "can't use TLS: Python SSL support not installed" msgstr "kan ikke bruge TLS: Python SSL support er ikke installeret" @@ -8842,7 +8910,7 @@ msgstr "" #, python-format msgid "ignoring invalid sendcharset: %s\n" -msgstr "" +msgstr "ignorerer ugyldigt sendcharset: %s\n" #, python-format msgid "invalid email address: %s"