# HG changeset patch # User Matt Mackall # Date 1258925782 21600 # Node ID 369592fdc2e48fa9538f76fb0efa16fe1fc87dbb # Parent 95517eb3c9a736947eafbe5f8c79e3e3b84e3f66# Parent 2b6e40fdc615283edf2d7f6d9cbf2d189f7213b1 Merge with i18n diff -r 95517eb3c9a7 -r 369592fdc2e4 i18n/da.po --- a/i18n/da.po Sun Nov 22 19:11:12 2009 +0100 +++ b/i18n/da.po Sun Nov 22 15:36:22 2009 -0600 @@ -17,8 +17,8 @@ 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-11-22 21:02+0100\n" +"PO-Revision-Date: 2009-11-22 21:33+0100\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -135,37 +135,37 @@ "- 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" @@ -174,23 +174,23 @@ "\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" +"- ``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" +"- ``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" @@ -199,10 +199,10 @@ "\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" +"- ``<{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 @@ 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" @@ -3507,7 +3512,8 @@ " 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 +3646,7 @@ " 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 +3714,14 @@ #, 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 %dtil %" +"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 +4141,13 @@ " 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 +4673,6 @@ msgid " and " msgstr " og " -msgid "y" -msgstr "j" - #, python-format msgid "record this change to %r?" msgstr "optag denne ændring i %r?" @@ -4744,32 +4753,27 @@ msgid "" "recreate hardlinks between two repositories\n" "\n" -" When repositories are cloned locally, their data files will be " -"hardlinked\n" -" so that they only use the space of a single repository.\n" -"\n" -" Unfortunately, subsequent pulls into either repository will break " -"hardlinks\n" -" for any files touched by the new changesets, even if both repositories " -"end\n" -" up pulling the same changes.\n" -"\n" -" Similarly, passing --rev to \"hg clone\" will fail to use\n" -" any hardlinks, falling back to a complete copy of the source " -"repository.\n" -"\n" -" This command lets you recreate those hardlinks and reclaim that wasted\n" -" space.\n" -"\n" -" This repository will be relinked to share space with ORIGIN, which must " -"be\n" -" on the same local disk. If ORIGIN is omitted, looks for \"default-relink" -"\",\n" -" then \"default\", in [paths].\n" -"\n" -" Do not attempt any read operations on this repository while the command " -"is\n" -" running. (Both repositories will be locked against writes.)\n" +" When repositories are cloned locally, their data files will be\n" +" hardlinked so that they only use the space of a single repository.\n" +"\n" +" Unfortunately, subsequent pulls into either repository will break\n" +" hardlinks for any files touched by the new changesets, even if\n" +" both repositories end up pulling the same changes.\n" +"\n" +" Similarly, passing --rev to \"hg clone\" will fail to use any\n" +" hardlinks, falling back to a complete copy of the source\n" +" repository.\n" +"\n" +" This command lets you recreate those hardlinks and reclaim that\n" +" wasted space.\n" +"\n" +" This repository will be relinked to share space with ORIGIN, which\n" +" must be on the same local disk. If ORIGIN is omitted, looks for\n" +" \"default-relink\", then \"default\", in [paths].\n" +"\n" +" Do not attempt any read operations on this repository while the\n" +" command is running. (Both repositories will be locked against\n" +" writes.)\n" " " msgstr "" @@ -5458,14 +5462,14 @@ " 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" @@ -5742,11 +5746,11 @@ "\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 +5762,12 @@ "\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 "" @@ -5788,9 +5792,9 @@ " 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 +5803,8 @@ " 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" @@ -5848,11 +5852,11 @@ " 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 +5867,9 @@ " 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 +6196,16 @@ " 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" @@ -6230,14 +6233,14 @@ " 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" +" :``%%``: 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 +6411,6 @@ 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 +6432,9 @@ "basale kommandoer:\n" "\n" +msgid "enabled extensions:" +msgstr "aktiverede udvidelser:" + msgid "DEPRECATED" msgstr "" @@ -7047,13 +7050,13 @@ " 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 +7355,13 @@ " 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 +7391,14 @@ " 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" @@ -7696,8 +7700,8 @@ 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]" @@ -8266,6 +8270,16 @@ msgstr "ingen definition for alias '%s'\n" #, python-format +msgid "" +"alias for: hg %s\n" +"\n" +"%s" +msgstr "" +"alias for: hg %s\n" +"\n" +"%s" + +#, python-format msgid "alias '%s' resolves to unknown command '%s'\n" msgstr "alias '%s' oversætter til ukendt kommando '%s'\n" @@ -8274,8 +8288,8 @@ 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 +8504,12 @@ 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 +8652,7 @@ 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 +8685,8 @@ 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 +8717,8 @@ "%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 +8780,7 @@ 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 +8823,10 @@ 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 +8841,7 @@ #, 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 +8866,7 @@ #, python-format msgid "ignoring invalid sendcharset: %s\n" -msgstr "" +msgstr "ignorerer ugyldigt sendcharset: %s\n" #, python-format msgid "invalid email address: %s" diff -r 95517eb3c9a7 -r 369592fdc2e4 i18n/sv.po --- a/i18n/sv.po Sun Nov 22 19:11:12 2009 +0100 +++ b/i18n/sv.po Sun Nov 22 15:36:22 2009 -0600 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:01+0100\n" -"PO-Revision-Date: 2009-11-10 20:06+0100\n" +"POT-Creation-Date: 2009-11-22 19:02+0100\n" +"PO-Revision-Date: 2009-11-22 19:37+0100\n" "Last-Translator: Jens Bäckman \n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -85,6 +85,43 @@ "- on Unix-like systems: ``man hgrc``\n" "- online: http://www.selenic.com/mercurial/hgrc.5.html\n" msgstr "" +"Mercurial läser konfigurationsdata från flera filer, om de existerar.\n" +"Nedan listar vi den mest specifika filen först.\n" +"\n" +"Under Windows läses dessa konfigurationsfiler:\n" +"\n" +"- ``\\.hg\\hgrc``\n" +"- ``%USERPROFILE%\\.hgrc``\n" +"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%HOME%\\.hgrc``\n" +"- ``%HOME%\\Mercurial.ini``\n" +"- ``C:\\Mercurial\\Mercurial.ini``\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" +"- ``\\Mercurial.ini``\n" +"\n" +"Under Unix läses dessa filer:\n" +"\n" +"- ``/.hg/hgrc``\n" +"- ``$HOME/.hgrc``\n" +"- ``/etc/mercurial/hgrc``\n" +"- ``/etc/mercurial/hgrc.d/*.rc``\n" +"- ``/etc/mercurial/hgrc``\n" +"- ``/etc/mercurial/hgrc.d/*.rc``\n" +"\n" +"Konfigurationsfilerna för Mercurial använder ett enkelt ini-filformat. En\n" +"file består av sektioner, som inleds av en rubrik (ex ``[sektion]``) och\n" +"följs av rader med ``namn = värde``::\n" +"\n" +" [ui]\n" +" username = Förnamn Efternamn \n" +" verbose = True\n" +"\n" +"Raderna ovanför refereras till som ``ui.username`` och\n" +"``ui.verbose``. Läs man-sidan för hgrc för en full beskrivning av alla\n" +"möjliga konfigurationsvärden:\n" +"\n" +"- under Unix-liknande system: ``man hgrc``\n" +"- online: http://www.selenic.com/mercurial/hgrc.5.html\n" msgid "" "Some commands allow the user to specify a date, e.g.:\n" @@ -92,37 +129,37 @@ "- 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 "" msgid "" @@ -1599,6 +1636,11 @@ msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "" +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 "" @@ -3118,7 +3160,8 @@ " 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 "" @@ -3213,7 +3256,7 @@ " 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" @@ -3663,10 +3706,13 @@ " 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" @@ -4161,9 +4207,6 @@ msgid " and " msgstr "" -msgid "y" -msgstr "" - #, python-format msgid "record this change to %r?" msgstr "" @@ -4222,32 +4265,27 @@ msgid "" "recreate hardlinks between two repositories\n" "\n" -" When repositories are cloned locally, their data files will be " -"hardlinked\n" -" so that they only use the space of a single repository.\n" -"\n" -" Unfortunately, subsequent pulls into either repository will break " -"hardlinks\n" -" for any files touched by the new changesets, even if both repositories " -"end\n" -" up pulling the same changes.\n" -"\n" -" Similarly, passing --rev to \"hg clone\" will fail to use\n" -" any hardlinks, falling back to a complete copy of the source " -"repository.\n" -"\n" -" This command lets you recreate those hardlinks and reclaim that wasted\n" -" space.\n" -"\n" -" This repository will be relinked to share space with ORIGIN, which must " -"be\n" -" on the same local disk. If ORIGIN is omitted, looks for \"default-relink" -"\",\n" -" then \"default\", in [paths].\n" -"\n" -" Do not attempt any read operations on this repository while the command " -"is\n" -" running. (Both repositories will be locked against writes.)\n" +" When repositories are cloned locally, their data files will be\n" +" hardlinked so that they only use the space of a single repository.\n" +"\n" +" Unfortunately, subsequent pulls into either repository will break\n" +" hardlinks for any files touched by the new changesets, even if\n" +" both repositories end up pulling the same changes.\n" +"\n" +" Similarly, passing --rev to \"hg clone\" will fail to use any\n" +" hardlinks, falling back to a complete copy of the source\n" +" repository.\n" +"\n" +" This command lets you recreate those hardlinks and reclaim that\n" +" wasted space.\n" +"\n" +" This repository will be relinked to share space with ORIGIN, which\n" +" must be on the same local disk. If ORIGIN is omitted, looks for\n" +" \"default-relink\", then \"default\", in [paths].\n" +"\n" +" Do not attempt any read operations on this repository while the\n" +" command is running. (Both repositories will be locked against\n" +" writes.)\n" " " msgstr "" @@ -4863,12 +4901,27 @@ " can be expensive.\n" " " msgstr "" +"lägg till alla nya nya filer, radera alla saknade filer\n" +"\n" +" Lägg till alla nya filer och radera alla saknade filer från arkivet.\n" +"\n" +" Nya filer ignoreras om de överrensstämmer något av mönstren i\n" +" .hgignore. Precis som med add, kommer ändringarna att träda i kraft vid\n" +" nästa arkivering.\n" +"\n" +" Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" +" parameter större än 0, kommer varje borttagen fil att jämföras med\n" +" varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" +" namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" +" (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" +" på det här sättet kan ta lång tid.\n" +" " msgid "similarity must be a number" -msgstr "" +msgstr "likhet måste vara ett nummer" msgid "similarity must be between 0 and 100" -msgstr "" +msgstr "likhet måste vara mellan 0 och 100" msgid "" "show changeset information by line for each file\n" @@ -4914,14 +4967,14 @@ " 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" @@ -4932,15 +4985,37 @@ " removed.\n" " " msgstr "" +"skapa ett icke versionshanterat arkiv från en arkivresision\n" +"\n" +" Som standard används revisonen för arbetskatalogens förälder; använd\n" +" -r/--rev för att specificera en annan revision.\n" +"\n" +" För att definiera vilken typ av arkiv som ska skapas, använd -t/--type.\n" +" Giltiga typer är::\n" +"\n" +" :``files``: en katalog fylld med filer (standard)\n" +" :``tar``: tar-arkiv, okomprimerad\n" +" :``tbz2``: tar-arkiv, komprimerad med bzip2\n" +" :``tgz``: tar-arkiv, komprimerad med gzip\n" +" :``uzip``: zip-arkiv, okomprimerad\n" +" :``zip``: zip-arkiv, komprimerad med deflate\n" +"\n" +" Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n" +" formatsträng; se 'hg help export' för detaljer.\n" +"\n" +" Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n" +" -p/--prefix för att specificera en formatsträn för prefixet. Som\n" +" standard används basnamnet för arkivet, med suffix borttagna.\n" +" " msgid "no working directory: please specify a revision" -msgstr "" +msgstr "ingen arbetskatalog: specificera en revision" msgid "repository root cannot be destination" -msgstr "" +msgstr "arkivroten kan inte vara destinationen" msgid "cannot archive plain files to stdout" -msgstr "" +msgstr "kan inte arkivera rena filer till stdout" msgid "" "reverse effect of earlier changeset\n" @@ -4960,42 +5035,59 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" +"omvänd effekten från en tidigare ändring\n" +"\n" +" Arkivera de återkallade ändringarna som en ny ändring. Den nya\n" +" ändringen är ett barn till den återkallade ändringen.\n" +"\n" +" 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.\n" +"\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.\n" +"\n" +" Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" +" " msgid "please specify just one revision" -msgstr "" +msgstr "specificera bara en revision" msgid "please specify a revision to backout" -msgstr "" +msgstr "specificera en revision att återkalla" msgid "cannot backout change on a different branch" -msgstr "" +msgstr "kan inte återkalla en ändring på en annan gren" msgid "cannot backout a change with no parents" -msgstr "" +msgstr "kan inte återkalla en ändring utan föräldrar" msgid "cannot backout a merge changeset without --parent" -msgstr "" +msgstr "kan inte återkalla en sammanfogande ändring utan --parent" #, python-format msgid "%s is not a parent of %s" -msgstr "" +msgstr "%s är inte en förälder till %s" msgid "cannot use --parent on non-merge changeset" -msgstr "" +msgstr "kan inte använda --parent på icke-sammanfogande ändring" #, python-format msgid "changeset %s backs out changeset %s\n" -msgstr "" +msgstr "ändringen %s återkallar ändringen %s\n" #, python-format msgid "merging with changeset %s\n" -msgstr "" +msgstr "sammanfogar med ändring %s\n" msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "" +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 "" +msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n" msgid "" "subdivision search of changesets\n" @@ -5146,11 +5238,11 @@ "\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 "" @@ -5176,9 +5268,9 @@ " 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" @@ -5187,8 +5279,8 @@ " 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" @@ -5236,9 +5328,9 @@ " förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" " att hämta ut (i prioritetsordning):\n" "\n" -" a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" -" b) ändringen, taggen eller grenen given med den första -r/--rev\n" -" c) huvudet på grenen 'default'\n" +" a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" +" b) ändringen, taggen eller grenen given med den första -r/--rev\n" +" c) huvudet på grenen 'default'\n" "\n" " Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n" " föräldraänrding (gäller bara för lokala arkiv).\n" @@ -5247,9 +5339,9 @@ " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (inklusive direkta och indirekta föräldrar) kommer att dras in\n" -" i destinationsarkivet. Inga efterföljande ändringar (inklusive\n" -" efterföljande märken) kommer att finnas i destinationen.\n" +" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" +" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" +" att finnas i destinationen.\n" "\n" " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" " --pull, även för lokala arkiv.\n" @@ -5574,16 +5666,16 @@ " 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" @@ -5610,14 +5702,14 @@ " Utmatning kan vara till en fil, och då anges namnet på filen med en\n" " formatsträng. Formateringsreglerna är som följer::\n" "\n" -" %% ett \"%\"-tecken\n" -" %H ändringshash (40 hexadecimala bytes)\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" -" %n nollpaddat sekvensnummer, börjar med 1\n" -" %r nollpaddat ändringsrevisionsnummer\n" +" :``%%``: ett \"%\"-tecken\n" +" :``%H``: ändringshash (40 hexadecimala bytes)\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" +" :``%n``: nollpaddat sekvensnummer, börjar med 1\n" +" :``%r``: nollpaddat ändringsrevisionsnummer\n" "\n" " Utan flaggan -a/--text, kommer export att undvika skapandet av diffar\n" " av filer som upptäcks vara binära. Med -a, kommer filen att exporteras\n" @@ -5783,25 +5875,24 @@ "alias: %s\n" msgid "(no help text available)" -msgstr "" +msgstr "(ingen hjälptext tillgänglig)" msgid "options:\n" msgstr "flaggor:\n" msgid "no commands defined\n" -msgstr "" - -msgid "enabled extensions:" -msgstr "aktiverade utökningar:" +msgstr "inga kommandon definierade\n" msgid "no help text available" -msgstr "" +msgstr "ingen hjälptext tillgänglig" #, python-format msgid "" "%s extension - %s\n" "\n" msgstr "" +"%s-utökning - %s\n" +"\n" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial Distribuerad SCM\n" @@ -5813,6 +5904,9 @@ "grundläggande kommandon:\n" "\n" +msgid "enabled extensions:" +msgstr "aktiverade utökningar:" + msgid "DEPRECATED" msgstr "FÖRLEGAD" @@ -6417,13 +6511,13 @@ " 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" @@ -6706,6 +6800,11 @@ " bundle command.\n" " " msgstr "" +"applicera en eller flera filer med ändringar\n" +"\n" +" Applicera en eller flera komprimerade filer med ändringar genererade\n" +" av bundle-kommandot.\n" +" " msgid "" "update working directory\n" @@ -6720,13 +6819,13 @@ " 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" @@ -6755,12 +6854,13 @@ " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" " ändringar:\n" "\n" -" 1. Om varken -c/--check eller -C/--clean specificeras, kommer\n" -" oarkiverade ändringar att sammanfogas med den begärda ändringen,\n" -" och det sammanfogade resultatet lämnas oarkiverat. Uppdatering och\n" -" sammanfogning kommer bara att göras om den begärda ändringen är en\n" -" anfader eller ättling till föräldraändringen. Om inte, avbryts\n" -" uppdateringen och de oarkiverade ändringarna lämnas.\n" +" 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n" +" begärda ändringen är en anfader eller ättling till arbetskatalogens\n" +" förälder, kommer oarkiverade ändringar att sammanfogas med den\n" +" begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n" +" Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n" +" en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n" +" bevaras.\n" "\n" " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" " ändringarna lämnas.\n" @@ -6794,13 +6894,21 @@ " integrity of their crosslinks and indices.\n" " " msgstr "" +"verifiera arkivets integritet\n" +"\n" +" Verifiera det aktuella arkivets integritet.\n" +"\n" +" Detta genomför en omfattande kontroll av arkivets integritet, validerar\n" +" hash- och checksummor för varje notering i ändringsloggen, manifestet,\n" +" och spårade filer, såväl som integriteten av korslänkar och indexar.\n" +" " msgid "output version and copyright information" -msgstr "" +msgstr "visa version och copyright-information" #, python-format msgid "Mercurial Distributed SCM (version %s)\n" -msgstr "" +msgstr "Mercurial Distribuerad SCM (version %s)\n" msgid "" "\n" @@ -6808,6 +6916,10 @@ "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 och andra\n" +"Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n" +"garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n" msgid "repository root directory or name of overlay bundle file" msgstr "arkivrotkatalog eller namn på påläggsbuntfil" @@ -6918,7 +7030,7 @@ msgstr "visa sammanfattning av ändringar i diffstat-stil" msgid "guess renamed files by similarity (0<=s<=100)" -msgstr "" +msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" msgid "[OPTION]... [FILE]..." msgstr "[FLAGGA]... [FIL]..." @@ -6948,31 +7060,31 @@ msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..." msgid "do not pass files through decoders" -msgstr "" +msgstr "passera inte filer genom dekoders" msgid "directory prefix for files in archive" -msgstr "" +msgstr "katalogprefix för filer i arkiv" msgid "revision to distribute" -msgstr "" +msgstr "revision att distribuera" msgid "type of distribution to create" -msgstr "" +msgstr "distributionstyp att skapa" msgid "[OPTION]... DEST" -msgstr "" +msgstr "[FLAGGA]... DEST" msgid "merge with old dirstate parent after backout" -msgstr "" +msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning" msgid "parent to choose when backing out merge" -msgstr "" +msgstr "förälder att välja när en sammanfogning återkallas" msgid "revision to backout" -msgstr "" +msgstr "revision att återkalla" msgid "[OPTION]... [-r] REV" -msgstr "" +msgstr "[FLAGGA]... [-r] REV" msgid "reset bisect state" msgstr "" @@ -7029,7 +7141,7 @@ msgstr "" msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" -msgstr "" +msgstr "[-f] [-a] [-r REV]... [--base REV]... FIL [DEST]" msgid "print output to file with formatted name" msgstr "skriv utmatning till fil med formatterat namn" @@ -7049,8 +7161,8 @@ msgid "revision, tag or branch to check out" msgstr "revision, märke eller gren att hämta ut" -msgid "a changeset you would like to have after cloning" -msgstr "en ändring du skulle vilja ha efter kloning" +msgid "clone only the specified revisions and ancestors" +msgstr "klona bara specificerade revisioner och anfäder" msgid "[OPTION]... SOURCE [DEST]" msgstr "[FLAGGA]... KÄLLA [DEST]" @@ -7068,7 +7180,7 @@ msgstr "" msgid "[OPTION]... [SOURCE]... DEST" -msgstr "" +msgstr "[FLAGGA]... [KÄLLA]... DEST" msgid "[INDEX] REV1 REV2" msgstr "" @@ -7449,10 +7561,10 @@ msgstr "" msgid "update to new tip if changesets were unbundled" -msgstr "" +msgstr "uppdatera till ny topp om ändringas packades upp" msgid "[-u] FILE..." -msgstr "" +msgstr "[-u] FIL..." msgid "discard uncommitted changes (no backup)" msgstr "kassera oarkiverade ändringar (ingen backup)" @@ -7516,7 +7628,7 @@ #, python-format msgid "abort: %s\n" -msgstr "" +msgstr "avbryter: %s\n" #, python-format msgid "hg: %s\n" @@ -7616,6 +7728,16 @@ msgstr "" #, python-format +msgid "" +"alias for: hg %s\n" +"\n" +"%s" +msgstr "" +"alias för: hg %s\n" +"\n" +"%s" + +#, python-format msgid "alias '%s' resolves to unknown command '%s'\n" msgstr "" @@ -7624,7 +7746,7 @@ msgstr "" #, python-format -msgid "malformed --config option: %s" +msgid "malformed --config option: %r (use --config section.name=value)" msgstr "" #, python-format @@ -7734,7 +7856,7 @@ msgstr "" msgid "Configuration Files" -msgstr "" +msgstr "Konfigurationsfiler" msgid "Date Formats" msgstr "" @@ -7834,6 +7956,12 @@ msgid "%s hook is invalid (\"%s\" not in a module)" msgstr "" +msgid "exception from first failed import attempt:\n" +msgstr "" + +msgid "exception from second failed import attempt:\n" +msgstr "" + #, python-format msgid "%s hook is invalid (import of \"%s\" failed)" msgstr "" @@ -8579,7 +8707,7 @@ msgstr "" msgid "no username supplied (see \"hg help config\")" -msgstr "" +msgstr "inget användarnamn angivet (se \"hg help config\")" #, python-format msgid "username %s contains a newline\n"